| 1 |
commit: 62e7ee4bf96b14a426a9b05738b00f84bbcb979d |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 22 21:49:50 2022 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 22 21:49:50 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62e7ee4b |
| 7 |
|
| 8 |
www-apps/tt-rss: Update no-chmod patch for 99999999 |
| 9 |
|
| 10 |
Thanks to ppn for the patch. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/853139 |
| 13 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 14 |
|
| 15 |
www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch | 26 ++++++++++++++++++++++++++ |
| 16 |
www-apps/tt-rss/tt-rss-99999999.ebuild | 2 +- |
| 17 |
2 files changed, 27 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 000000000000..05de80b127c5 |
| 22 |
--- /dev/null |
| 23 |
+++ b/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch |
| 24 |
@@ -0,0 +1,26 @@ |
| 25 |
+These files may be written and then updated by the web interface user or the |
| 26 |
+update daemon user, so they need to be group writeable. We enforce this with |
| 27 |
+ACLs rather than chmod though. |
| 28 |
+ |
| 29 |
+diff -Naur a/classes/pref/feeds.php b/classes/pref/feeds.php |
| 30 |
+--- a/classes/pref/feeds.php 2022-02-18 13:44:03.000000000 +0000 |
| 31 |
++++ b/classes/pref/feeds.php 2022-02-19 15:37:55.000723992 +0000 |
| 32 |
+@@ -490,7 +490,6 @@ |
| 33 |
+ |
| 34 |
+ if (file_exists($new_filename)) unlink($new_filename); |
| 35 |
+ if (rename($tmp_file, $new_filename)) { |
| 36 |
+- chmod($new_filename, 0644); |
| 37 |
+ |
| 38 |
+ $feed->set([ |
| 39 |
+ 'favicon_avg_color' => null, |
| 40 |
+diff -Naur a/classes/rssutils.php b/classes/rssutils.php |
| 41 |
+--- a/classes/rssutils.php 2022-06-20 09:37:43.205998915 +0000 |
| 42 |
++++ b/classes/rssutils.php 2022-06-20 09:38:01.002279039 +0000 |
| 43 |
+@@ -1758,7 +1758,6 @@ |
| 44 |
+ |
| 45 |
+ fwrite($fp, $contents); |
| 46 |
+ fclose($fp); |
| 47 |
+- chmod($icon_file, 0644); |
| 48 |
+ clearstatcache(); |
| 49 |
+ |
| 50 |
+ return $icon_file; |
| 51 |
|
| 52 |
diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-99999999.ebuild |
| 53 |
index e91fad7a3c67..89e1ba0ce816 100644 |
| 54 |
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild |
| 55 |
+++ b/www-apps/tt-rss/tt-rss-99999999.ebuild |
| 56 |
@@ -51,7 +51,7 @@ DEPEND=" |
| 57 |
need_httpd_cgi # From webapp.eclass |
| 58 |
|
| 59 |
PATCHES=( |
| 60 |
- "${FILESDIR}"/${PN}-no-chmod.patch |
| 61 |
+ "${FILESDIR}"/${PN}-no-chmod-r2.patch |
| 62 |
) |
| 63 |
|
| 64 |
src_install() { |
Archives