summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2022-06-22 22:49:50 +0100
committerJames Le Cuirot <chewi@gentoo.org>2022-06-22 22:49:50 +0100
commit62e7ee4bf96b14a426a9b05738b00f84bbcb979d (patch)
tree61028861e980ea036f438568431f2689fe1c446e /www-apps/tt-rss
parentdev-util/uglifyjs: Bump to 3.16.1, drop old 3.16.0 (diff)
downloadgentoo-62e7ee4bf96b14a426a9b05738b00f84bbcb979d.tar.gz
gentoo-62e7ee4bf96b14a426a9b05738b00f84bbcb979d.tar.bz2
gentoo-62e7ee4bf96b14a426a9b05738b00f84bbcb979d.zip
www-apps/tt-rss: Update no-chmod patch for 99999999
Thanks to ppn for the patch. Closes: https://bugs.gentoo.org/853139 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'www-apps/tt-rss')
-rw-r--r--www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch26
-rw-r--r--www-apps/tt-rss/tt-rss-99999999.ebuild2
2 files changed, 27 insertions, 1 deletions
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() {