gentoo auto-resync : 17:09:2023 - 23:04:24

6 files changed, 59 insertions, 59 deletions

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 1732628bf4e8..2dc7abd310f2 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,11 +1,11 @@
-AUX permissions-r1 1189 BLAKE2B 5411939128bac5718d47b91b1f189805e675ecc7142ef47750863dc8c4f2654c48cb7fbbb65457ee0074de1e293faffb71d97672cb04ef5113bfad31c0309558 SHA512 7ffade42d37d6c400c3df10f47165a6f83602182dde82da420ad61244f8db3a22675120d52877e892a959e911307bee759caa843aed25496a244e883fabaa8e3
+AUX permissions-r1 1296 BLAKE2B e62b17eecf08c79a6a63eba85280db62253bea9ae7b85abdfeee7d7e430f57bb934468062d5481d79867a09526e4190df1a13c1b0928800d499bf9528afe10a7 SHA512 62960d83977eda6b7ce797e6c9272def43f4ee658cff3128203a0158ab0ac1e28c4604543f5be040639e76c72ae4ad87c77afabed8e0cc3d8770ec45600b5e66
 AUX postinstall-en-with-daemon-r1.txt 586 BLAKE2B 8a8c24cb93373af40ca662bc5453bbf3f2628ba0e39f0053405010e9c91e032167a7da9feb335782a679af1efee004bd134694fb655a5992cc3b1f8d3712b8db SHA512 e57ae761499454ce26c5bf58b7faa1cdfa05a7409bc4fc2b2ade16097a8131e279ffb09be2d5b39e80a17fd1c9533e795c6908548097f318106f1c7cac00e65d
 AUX postinstall-en.txt 102 BLAKE2B e4edc2c0a482cb8ba822b902e553680626081336abe42421380404c179324c2243eb07c4934ff70ce07b0c9c4777af14c803e1adf08768ea76c1660612e111d3 SHA512 2b1a6e9faf17b36e7011b488cde989d890fa23e87d5f88aa91a1d9597bb55400db74e413742c9d15acbc745a25f23b1533ad6fdb829d04dc21ff5898c7d98ccf
-AUX tt-rss-no-chmod.patch 934 BLAKE2B ef6c7a85ded012b3d9b2369b19ff657dc8b3954b2c94d30b47c42ca83d660b98f753ece525156beb544ed1d0660162e06a07c1e2bef963543bac7eee15cc676c SHA512 659c00f349aecc994d7b95c721e85f5ffca12b56ea81fefed5dc675d33a2a8d6fb3968891065b2f73b52d21e736ea8e95163062103ecf15cd448a0797cf37807
-AUX ttrssd.confd-r2 1581 BLAKE2B ce18840ddb58704abb9311d02e27cfc179bba43668b90cb358082466d55bb54acdb5806f73cb24dbc758981c477eeb6a50c472043323abaf50572f7d2eeee4b1 SHA512 15957854718a4decf7ac9784e955fc090755343008facd3d65d7e72f3e00df170215514a5435378180110c6f4584df9e5580eb45775816eb3f5c58d09e03d249
+AUX tt-rss-no-chmod.patch 740 BLAKE2B 38bb66330ab33c67c2e0df680942d53149c5d2422643842311d5e1b351c243572a8dd325d7bbf86d388f3972108ffb58be84ad3953fa08ba9f315069316b672c SHA512 51f00f7eb1896909eed6d20e947ac60fa52b8ca51416406a21d69f6880c878f7d727d2ed031af923399e2da4c7c69a1da9d3d94875a94ef600c4e05d8cc782be
+AUX ttrssd.confd-r2 1536 BLAKE2B 6ccecdadb0167ec4e245f95f14a3ad4d37dccebb52dbe3213603c387868b485b4d0dab73622540ebb10943349cbaa62ecc131804d8d595f7c1a68f3595b6bf1d SHA512 b83d5c2aa2077cdcd03206e060070cbdae399efac8b922992e5c5c20e904637958ecd9f2ca8e842d43d1ebc70593868968f82e0d471732a0cbff7b2a074eb5f0
 AUX ttrssd.initd-r4 2863 BLAKE2B 28a0b410b8425bcf4c9abc5197ff777b06347c1cdefa021b9f8fb32d256b9ca72e0c175ac412b3aa41e7f75e30446741b7f6445d1293b1a59c19e3eba2ec52e6 SHA512 8ff7a6b2f1cb38baa0c13fa7c7f5ee1b54bf2ff2111ad62649d36cf3b12e5b82f9ef3eb6b6c904daa8565a7d2cd817daaba322f4aa03b5f3c5ffdefced730f82
 AUX ttrssd.logrotated-r1 135 BLAKE2B dc653add518cd3ed5296097d51ca2346e102edcbad5ec82397713ded489e8ed8e49af928331e58b80152f13bddc37d673c67440df388651c875cfbd37ff62080 SHA512 c292020a55688c6edb4306d9d8144ad7d30be94fda08467b8bbe560c7bf02b0877d9591123a226dd030e9a9c01b79df4a3696e54fd1ece0dbdef1c285cdae97a
-DIST tt-rss-20220218.tar.gz 9916433 BLAKE2B 318969b6e5156842079bf68c4ea614e5e60e21d8caa46b1a78f2cef051904da30e5091838f6e10f6f610d8ee39c7922137aeb60b7cd5004cabc1d2cdf65edfa8 SHA512 38a81dd737462724bc52ca3915350c175abe548cd566a4f9a5e1d5efda9287d0666e9348e5b13dd20549360501de5b0bfb659292fb650f7a60fdab8b63cf8202
-EBUILD tt-rss-20220218.ebuild 1930 BLAKE2B 52f0b5cdbe6d4c530ddb36af51afd43ad3706a116667dac82ae2911b10d5917fd7239a4a1f1fa1c614a384ea3c9fe42a0d87a670920929a74062c2cd1264ef35 SHA512 9cad813c775b3d150bde8f21ec01c38e0c4dd0ce1abe7ecc8f00b50ecee9c80dcce7d822f10282070e4d1e37c0818efec6d960a383ec039b1190cf4bde551291
-EBUILD tt-rss-99999999.ebuild 2043 BLAKE2B d372a968724766e146fa467c02224cc5ff53c31c88117c948d519fba2feb08c948b758bd546e8390dfe11e690343b14dd4c6fc7b2efba6ba8870ca2409aeeea5 SHA512 3c42712d66978b7c82e0a334469c182b1891336506399af8f976d72240430481b32a6ab7b392557dd83c9ca883bdbb4b391240fefbe0afda4cdd88b7ee7e6c6c
+DIST tt-rss-20230901.tar.xz 5368876 BLAKE2B af7dc8c7003f9bd83f656a1596458302eb29b7f27428e38e9cbc7fdeb0b920079622b577e5e578069d8475c265061efeb23648da621ad66263370a748512d49c SHA512 02111c89a3dc8fbf94be38d87fa90770eaaa644672aeeb7c1ece3ac7137c5a4f2f0f4412319bd887305f365fc7da9bfe3f644495a5655e8a351ecdae97a04d35
+EBUILD tt-rss-20230901.ebuild 1881 BLAKE2B 5467be84f396ef0a4dc72247ed46030a5d50083ff61a28d5416ca287f609d3c8679c874e45d47433e2fa1c0f63f5a60c4925fad1a41b74356af29d0f54864328 SHA512 de00e26d9443fd6b6d484aaf33a422045d66e6b458f0b95ae32aeeb0c439ea122a6db06bc884c6ab05358f3d74b635e0a7a5fabbdfa1234ffa3bcf83610d1d4f
+EBUILD tt-rss-99999999.ebuild 2076 BLAKE2B f181caac84c4c2724edd24c9ceae61cdf595a501250db6f815ed4cf923029525c7e24d080dc86a4c5dd7de25775e886cff7f560fcc4f05f501fee20f3e084922 SHA512 da26682cc515b3236f4e28640429ac787abdbfe417bd48248b6735b30eddc5f40fb0268ac303da20ad8fbb9eb7cf20eba52ce91695d985143e36a0c9ab4bbc6c
 MISC metadata.xml 374 BLAKE2B 659dd027265141ba90d4bf8abe45e12ed5187c866605f939f26fd4b55911870c8cca907c96f4bae2f84cb43c1691a6eb79eabe671e4b3de0c34d9befb6ed4c46 SHA512 ab38e1e98bb90c292576830d65ad6871dc6feab2a93d7cc9a580f1333e6c7859cb215ef44952b3e9018b431ca0c4c7f61fd0ee6d2daa86bde971ab2e113ba0bc
diff --git a/www-apps/tt-rss/files/permissions-r1 b/www-apps/tt-rss/files/permissions-r1
index e50b4406646d..0ca420e97beb 100644
--- a/www-apps/tt-rss/files/permissions-r1
+++ b/www-apps/tt-rss/files/permissions-r1
@@ -3,22 +3,27 @@
 cd "${MY_INSTALLDIR}"
 
 if [[ $1 = install ]]; then
+	# Ensure database credentials are secure.
+	[[ -e config.php ]] || touch config.php
+	chown --no-dereference "${VHOST_SERVER_UID}":ttrssd config.php
+	chmod 00440 config.php
+
 	# We need to lock down cache/ for the operations below to be
 	# safe. The permissions match the webapp-config defaults but these
 	# can be changed and existing installations may also differ.
 	chown root:root cache/
 	chmod 00755 cache/
 
-	chgrp --no-dereference ttrssd feed-icons/ lock/ cache/*/
-	chmod g+ws feed-icons/ lock/ cache/*/
+	chgrp --no-dereference ttrssd lock/ cache/*/
+	chmod g+ws lock/ cache/*/
 
-	# Files within lock/ are exclusively written by the update daemon.
-	# feed-icons/ and cache/ holds files that are modified in place by both
-	# processes and therefore ACLs are required to ensure that the files
-	# themselves are created as group writable.
-	if ! setfacl --modify d:g::rwX feed-icons/ cache/*/; then
+	# Files within lock/ are exclusively written by the update daemon. cache/
+	# subdirectories hold files that are modified in place by both processes and
+	# therefore ACLs are required to ensure that the files themselves are
+	# created as group writable.
+	if ! setfacl --modify d:g::rwX cache/*/; then
 		echo "WARNING: ACLs are not available on this filesystem. Either enable them or set TTRSSD_USER to your PHP user in /etc/conf.d/ttrssd to avoid permission issues."
-	elif [[ -n $(find feed-icons/ cache/ -type f ! -name ".*" ! -name index.html ! \( -group ttrssd -perm -020 \) -print -quit) ]]; then
-		echo "WARNING: Files that are not writable by the ttrssd group found within the cache or feed-icons directories. Either delete them or correct their permissions."
+	elif [[ -n $(find cache/ -type f ! -name ".*" ! -name index.html ! \( -group ttrssd -perm -020 \) -print -quit) ]]; then
+		echo "WARNING: Files that are not writable by the ttrssd group found within the cache directory. Either delete them or correct their permissions."
 	fi
 fi
diff --git a/www-apps/tt-rss/files/tt-rss-no-chmod.patch b/www-apps/tt-rss/files/tt-rss-no-chmod.patch
index e51e66eaed22..4dd41af4bb12 100644
--- a/www-apps/tt-rss/files/tt-rss-no-chmod.patch
+++ b/www-apps/tt-rss/files/tt-rss-no-chmod.patch
@@ -1,26 +1,18 @@
-These files may be written and then updated by the web interface user or the
-update daemon user, so they need to be group writeable. We enforce this with
-ACLs rather than chmod though.
-
-diff --color -Naur a/classes/pref/feeds.php b/classes/pref/feeds.php
---- a/classes/pref/feeds.php	2022-02-18 13:44:03.000000000 +0000
-+++ b/classes/pref/feeds.php	2022-02-19 15:37:55.000723992 +0000
-@@ -490,7 +490,6 @@
-
- 				if (file_exists($new_filename)) unlink($new_filename);
- 					if (rename($tmp_file, $new_filename)) {
--						chmod($new_filename, 0644);
-
- 						$feed->set([
- 							'favicon_avg_color' => null,
-diff --color -Naur a/classes/rssutils.php b/classes/rssutils.php
---- a/classes/rssutils.php	2022-02-18 13:44:03.000000000 +0000
-+++ b/classes/rssutils.php	2022-02-19 15:37:40.393312123 +0000
-@@ -1728,7 +1728,6 @@
-
- 		fwrite($fp, $contents);
- 		fclose($fp);
--		chmod($icon_file, 0644);
- 		clearstatcache();
-
- 		return $icon_file;
+diff --git a/plugins/cache_starred_images/init.php b/plugins/cache_starred_images/init.php
+index 208eafde9..05b5a1a93 100755
+--- a/plugins/cache_starred_images/init.php
++++ b/plugins/cache_starred_images/init.php
+@@ -24,11 +24,8 @@ class Cache_Starred_Images extends Plugin {
+ 		$this->cache = DiskCache::instance("starred-images");
+ 		$this->cache_status = DiskCache::instance("starred-images.status-files");
+ 
+-		if ($this->cache->make_dir())
+-			chmod($this->cache->get_dir(), 0777);
+-
+-		if ($this->cache_status->make_dir())
+-			chmod($this->cache_status->get_dir(), 0777);
++		$this->cache->make_dir();
++		$this->cache_status->make_dir();
+ 
+ 		if (!$this->cache->exists(".no-auto-expiry"))
+ 			$this->cache->put(".no-auto-expiry", "");
diff --git a/www-apps/tt-rss/files/ttrssd.confd-r2 b/www-apps/tt-rss/files/ttrssd.confd-r2
index b169b548bb9a..7546d096d08b 100644
--- a/www-apps/tt-rss/files/ttrssd.confd-r2
+++ b/www-apps/tt-rss/files/ttrssd.confd-r2
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Space-separated paths of TT-RSS instances that you want to start the
@@ -24,10 +24,9 @@ LOG_DIR="/var/log/ttrssd"
 # User to run the update daemon as. You should not run this as
 # root. If ACLs are unavailable on the filesystem used by the TT-RSS
 # instances then choosing the same user that serves the PHP web
-# interface is recommended to avoid permission issues. You *must* add
-# this user to the ttrssd group. If the PHP user is not the same as
-# the web server user (e.g. apache or nginx) then this user must be
-# added to the ttrssd group too.
+# interface is recommended to avoid permission issues. Either way, you
+# *must* add these users to the ttrssd group unless everything is
+# running as the web server user (e.g. apache or nginx).
 #
 # Default:
 #  TTRSSD_USER="ttrssd"
diff --git a/www-apps/tt-rss/tt-rss-20220218.ebuild b/www-apps/tt-rss/tt-rss-20230901.ebuild
index 720630a250db..284e1f60ac70 100644
--- a/www-apps/tt-rss/tt-rss-20220218.ebuild
+++ b/www-apps/tt-rss/tt-rss-20230901.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,13 +7,13 @@ inherit webapp
 
 DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
 HOMEPAGE="https://tt-rss.org/"
-SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz" # Upstream git frontend blocks wget?
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.xz"
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="8.0 7.4"
+PHP_SLOTS="8.2"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {
@@ -62,12 +62,12 @@ src_install() {
 	insinto "${MY_HTDOCSDIR}"
 	doins -r *
 
-	# When updating, grep the plugins directory for additional CACHE_DIR
-	# instances as they cannot be created later due to permissions.
-	dodir "${MY_HTDOCSDIR}"/cache/starred-images
+	# When updating, grep the code for additional DiskCache::instances as they
+	# cannot be created later due to permissions.
+	keepdir "${MY_HTDOCSDIR}"/cache/{feed-icons,starred-images}
 
 	local dir
-	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
+	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,lock}/; do
 		webapp_serverowned "${dir#${ED}}"
 	done
 
diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-99999999.ebuild
index a821a1e6edb9..668d1007ed48 100644
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild
+++ b/www-apps/tt-rss/tt-rss-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SLOT="${PV}" # Single live slot.
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="8.1 8.0 7.4"
+PHP_SLOTS="8.2"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {
@@ -50,18 +50,22 @@ DEPEND="
 
 need_httpd_cgi # From webapp.eclass
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-no-chmod.patch
+)
+
 src_install() {
 	webapp_src_preinst
 
 	insinto "${MY_HTDOCSDIR}"
 	doins -r *
 
-	# When updating, grep the plugins directory for additional CACHE_DIR
-	# instances as they cannot be created later due to permissions.
-	dodir "${MY_HTDOCSDIR}"/cache/starred-images
+	# When updating, grep the code for additional DiskCache::instances as they
+	# cannot be created later due to permissions.
+	keepdir "${MY_HTDOCSDIR}"/cache/{feed-icons,starred-images}
 
 	local dir
-	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
+	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,lock}/; do
 		webapp_serverowned "${dir#${ED}}"
 	done