1 files changed, 18 insertions, 26 deletions
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", "");