gentoo resync : 29.12.2022

3 files changed, 29 insertions, 2 deletions

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index fbc3e67b9723..c59fcaa3b3b1 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,11 +1,12 @@
 AUX permissions-r1 1189 BLAKE2B 5411939128bac5718d47b91b1f189805e675ecc7142ef47750863dc8c4f2654c48cb7fbbb65457ee0074de1e293faffb71d97672cb04ef5113bfad31c0309558 SHA512 7ffade42d37d6c400c3df10f47165a6f83602182dde82da420ad61244f8db3a22675120d52877e892a959e911307bee759caa843aed25496a244e883fabaa8e3
 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-r2.patch 930 BLAKE2B 57d63f4b27a8ef80553ae5fbca66726db2acd73a1bb9eeb34eace5f37e437a48b9f50b2576fcc8b0be80215c866b236c57b605a0ce226d10a9e40a9eb1eb8ddc SHA512 cd537f7a01de02fc000b5ddf34bafe4832353fd87b8677dd86a6e4bcee3b1f5f747c42cf966b97d095b5a3beed2213cd7b4211be003cb6942b8fcb2f1f937d8a
 AUX tt-rss-no-chmod.patch 934 BLAKE2B ef6c7a85ded012b3d9b2369b19ff657dc8b3954b2c94d30b47c42ca83d660b98f753ece525156beb544ed1d0660162e06a07c1e2bef963543bac7eee15cc676c SHA512 659c00f349aecc994d7b95c721e85f5ffca12b56ea81fefed5dc675d33a2a8d6fb3968891065b2f73b52d21e736ea8e95163062103ecf15cd448a0797cf37807
 AUX ttrssd.confd-r2 1581 BLAKE2B ce18840ddb58704abb9311d02e27cfc179bba43668b90cb358082466d55bb54acdb5806f73cb24dbc758981c477eeb6a50c472043323abaf50572f7d2eeee4b1 SHA512 15957854718a4decf7ac9784e955fc090755343008facd3d65d7e72f3e00df170215514a5435378180110c6f4584df9e5580eb45775816eb3f5c58d09e03d249
 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 1927 BLAKE2B f533ff2137699ee6696856cbaadbb0773eea148f45c13e8c7736d2212078171c8629f17c53e0701ddc6b27d69328a7e634854a9e6b8e5c9097be6bd0bf9b2481 SHA512 9edac5cb8ffc212c74f35aa0f16289dafd4c88ba3de7bcb75113c5f8e5e4fae1603de3c087cf3cba3bc8599dd7797ae3838403f76ce851e453b05a47fdb1a803
-EBUILD tt-rss-99999999.ebuild 2092 BLAKE2B e784b3bd22094b2584e2a799b220a80a97680cdb3b3f3f80a2fef49b7ea91ec0a9df3fd172c411abe5f9999b3df410fcd16f72d091c63ab229344fb905d77ebd SHA512 b1bb0ace278597ec63cb05f7a2c649d2d85115bc78a910930d8a88185ddd288a08a50e7f83dea153866409c54ec89ed81523011b75fceda4c7e7f9b4ec9fe4df
+EBUILD tt-rss-99999999.ebuild 2095 BLAKE2B 48eba6ada7e044849ab98970716aa3811d663df9f2c4d19b183e5ca08c763f4db83ed6585c8b7412848f227e2f93c6ed6fb2ccf64da03694cda49bca54ca0d19 SHA512 3e4397360072b66119aa09fa1f8f6762cdac3a29409b89c16a086dbc1dbc9c1490c80b862e112995e2f8cf1975fa2ad05fd40d17404f26bc84d7a421ff9d5e98
 MISC metadata.xml 374 BLAKE2B 659dd027265141ba90d4bf8abe45e12ed5187c866605f939f26fd4b55911870c8cca907c96f4bae2f84cb43c1691a6eb79eabe671e4b3de0c34d9befb6ed4c46 SHA512 ab38e1e98bb90c292576830d65ad6871dc6feab2a93d7cc9a580f1333e6c7859cb215ef44952b3e9018b431ca0c4c7f61fd0ee6d2daa86bde971ab2e113ba0bc
diff --git a/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch b/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch
new file mode 100644
index 000000000000..05de80b127c5
--- /dev/null
+++ b/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch
@@ -0,0 +1,26 @@
+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 -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 -Naur a/classes/rssutils.php b/classes/rssutils.php
+--- a/classes/rssutils.php	2022-06-20 09:37:43.205998915 +0000
++++ b/classes/rssutils.php	2022-06-20 09:38:01.002279039 +0000
+@@ -1758,7 +1758,6 @@
+ 
+ 				fwrite($fp, $contents);
+ 				fclose($fp);
+-				chmod($icon_file, 0644);
+ 				clearstatcache();
+ 
+ 				return $icon_file;
diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-99999999.ebuild
index e91fad7a3c67..89e1ba0ce816 100644
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild
+++ b/www-apps/tt-rss/tt-rss-99999999.ebuild
@@ -51,7 +51,7 @@ DEPEND="
 need_httpd_cgi # From webapp.eclass
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-no-chmod.patch
+	"${FILESDIR}"/${PN}-no-chmod-r2.patch
 )
 
 src_install() {