From b12335bc70a64551d55d7c1623f247d7727e8c2c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 9 Feb 2025 08:11:03 +0100 Subject: update to 1.6.10 always use composer-generators --- roundcubemail-1.6-confpath.patch | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'roundcubemail-1.6-confpath.patch') diff --git a/roundcubemail-1.6-confpath.patch b/roundcubemail-1.6-confpath.patch index 0b372ee..d9d50e3 100644 --- a/roundcubemail-1.6-confpath.patch +++ b/roundcubemail-1.6-confpath.patch @@ -1,7 +1,7 @@ -diff -up ./config/defaults.inc.php.rpm ./config/defaults.inc.php ---- ./config/defaults.inc.php.rpm 2022-03-06 21:32:08.000000000 +0100 -+++ ./config/defaults.inc.php 2022-03-07 11:48:41.252956405 +0100 -@@ -525,11 +525,11 @@ $config['user_aliases'] = false; +diff -up roundcubemail-1.6.10/config/defaults.inc.php.rpm roundcubemail-1.6.10/config/defaults.inc.php +--- roundcubemail-1.6.10/config/defaults.inc.php.rpm 2025-02-08 09:47:42.000000000 +0100 ++++ roundcubemail-1.6.10/config/defaults.inc.php 2025-02-09 08:05:33.268275358 +0100 +@@ -540,11 +540,11 @@ $config['user_aliases'] = false; // use this folder to store log files // must be writeable for the user who runs PHP process (Apache user if mod_php is being used) // This is used by the 'file' log driver. @@ -15,16 +15,16 @@ diff -up ./config/defaults.inc.php.rpm ./config/defaults.inc.php // expire files in temp_dir after 48 hours // possible units: s, m, h, d, w -@@ -763,7 +763,7 @@ $config['mime_magic'] = null; +@@ -778,7 +778,7 @@ $config['mime_magic'] = null; // This is used to derive mime-types from the filename extension or vice versa. // Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system, - // download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types + // download it from https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types -$config['mime_types'] = null; +$config['mime_types'] = '/etc/mime.types'; // path to imagemagick identify binary (if not set we'll use Imagick or GD extensions) $config['im_identify_path'] = null; -@@ -1452,3 +1452,7 @@ $config['message_show_email'] = false; +@@ -1480,3 +1480,7 @@ $config['message_show_email'] = false; // 0 - Reply-All always // 1 - Reply-List if mailing list is detected $config['reply_all_mode'] = 0; @@ -32,9 +32,9 @@ diff -up ./config/defaults.inc.php.rpm ./config/defaults.inc.php +// Keys directory for all users. +// Must be writeable by PHP process, and not in the web server document root +$config['enigma_pgp_homedir'] = '/var/lib/roundcubemail/enigma'; -diff -up ./plugins/enigma/config.inc.php.dist.rpm ./plugins/enigma/config.inc.php.dist ---- ./plugins/enigma/config.inc.php.dist.rpm 2022-03-06 21:32:08.000000000 +0100 -+++ ./plugins/enigma/config.inc.php.dist 2022-03-07 11:48:41.252956405 +0100 +diff -up roundcubemail-1.6.10/plugins/enigma/config.inc.php.dist.rpm roundcubemail-1.6.10/plugins/enigma/config.inc.php.dist +--- roundcubemail-1.6.10/plugins/enigma/config.inc.php.dist.rpm 2025-02-08 09:47:42.000000000 +0100 ++++ roundcubemail-1.6.10/plugins/enigma/config.inc.php.dist 2025-02-09 08:04:38.723191340 +0100 @@ -12,10 +12,6 @@ $config['enigma_smime_driver'] = 'phpssl // Enables logging of enigma operations (including Crypt_GPG debug info) $config['enigma_debug'] = false; @@ -46,9 +46,9 @@ diff -up ./plugins/enigma/config.inc.php.dist.rpm ./plugins/enigma/config.inc.ph // Location of gpg binary. By default it will be auto-detected. // This is also a way to force gpg2 use if there are both 1.x and 2.x on the system. $config['enigma_pgp_binary'] = ''; -diff -up ./program/include/iniset.php.rpm ./program/include/iniset.php ---- ./program/include/iniset.php.rpm 2022-03-06 21:32:09.000000000 +0100 -+++ ./program/include/iniset.php 2022-03-07 11:49:54.668718920 +0100 +diff -up roundcubemail-1.6.10/program/include/iniset.php.rpm roundcubemail-1.6.10/program/include/iniset.php +--- roundcubemail-1.6.10/program/include/iniset.php.rpm 2025-02-08 09:47:42.000000000 +0100 ++++ roundcubemail-1.6.10/program/include/iniset.php 2025-02-09 08:04:38.723191340 +0100 @@ -32,7 +32,7 @@ if (!defined('INSTALL_PATH')) { } @@ -67,9 +67,9 @@ diff -up ./program/include/iniset.php.rpm ./program/include/iniset.php // Show basic error message on fatal PHP error register_shutdown_function('rcmail_error_handler'); -diff -up ./program/lib/Roundcube/bootstrap.php.rpm ./program/lib/Roundcube/bootstrap.php ---- ./program/lib/Roundcube/bootstrap.php.rpm 2022-03-06 21:32:09.000000000 +0100 -+++ ./program/lib/Roundcube/bootstrap.php 2022-03-07 11:48:41.252956405 +0100 +diff -up roundcubemail-1.6.10/program/lib/Roundcube/bootstrap.php.rpm roundcubemail-1.6.10/program/lib/Roundcube/bootstrap.php +--- roundcubemail-1.6.10/program/lib/Roundcube/bootstrap.php.rpm 2025-02-08 09:47:42.000000000 +0100 ++++ roundcubemail-1.6.10/program/lib/Roundcube/bootstrap.php 2025-02-09 08:04:38.723191340 +0100 @@ -71,7 +71,7 @@ if (!defined('RCUBE_INSTALL_PATH')) { } -- cgit