From 30b92695ce9d7dfc7e92508408c672b0f034724d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 Sep 2018 16:14:10 +0200 Subject: Update to 1.4-beta raise dependency on pear/net_sieve 1.4.3 raise dependency on kolab/net_ldap3 1.0.6 add dependency on masterminds/html5 --- roundcubemail-1.3.4-confpath.patch | 82 -------------------------------------- 1 file changed, 82 deletions(-) delete mode 100644 roundcubemail-1.3.4-confpath.patch (limited to 'roundcubemail-1.3.4-confpath.patch') diff --git a/roundcubemail-1.3.4-confpath.patch b/roundcubemail-1.3.4-confpath.patch deleted file mode 100644 index dc3ebc2..0000000 --- a/roundcubemail-1.3.4-confpath.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -up ./config/defaults.inc.php.rpm ./config/defaults.inc.php ---- ./config/defaults.inc.php.rpm 2018-01-14 14:00:49.000000000 +0100 -+++ ./config/defaults.inc.php 2018-01-15 07:19:24.805118072 +0100 -@@ -382,11 +382,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. --$config['log_dir'] = RCUBE_INSTALL_PATH . 'logs/'; -+$config['log_dir'] = '/var/log/roundcubemail/'; - - // use this folder to store temp files - // must be writeable for the user who runs PHP process (Apache user if mod_php is being used) --$config['temp_dir'] = RCUBE_INSTALL_PATH . 'temp/'; -+$config['temp_dir'] = '/var/lib/roundcubemail/temp/'; - - // expire files in temp_dir after 48 hours - // possible units: s, m, h, d, w -@@ -601,7 +601,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 --$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; -@@ -1236,3 +1236,7 @@ $config['message_show_email'] = false; - // 0 - Reply-All always - // 1 - Reply-List if mailing list is detected - $config['reply_all_mode'] = 0; -+ -+// Keys directory for all users. Default 'enigma/home'. -+// Must be writeable by PHP process -+$config['enigma_pgp_homedir'] = '/var/lib/roundcubemail/enigma'; -diff -up ./installer/index.php.rpm ./installer/index.php -diff -up ./plugins/enigma/config.inc.php.dist.rpm ./plugins/enigma/config.inc.php.dist ---- ./plugins/enigma/config.inc.php.dist.rpm 2018-01-14 14:00:50.000000000 +0100 -+++ ./plugins/enigma/config.inc.php.dist 2018-01-15 07:19:24.805118072 +0100 -@@ -12,10 +12,6 @@ $config['enigma_smime_driver'] = 'phpssl - // Enables logging of enigma operations (including Crypt_GPG debug info) - $config['enigma_debug'] = false; - --// Keys directory for all users. Default 'enigma/home'. --// Must be writeable by PHP process --$config['enigma_pgp_homedir'] = null; -- - // 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 2018-01-14 14:00:51.000000000 +0100 -+++ ./program/include/iniset.php 2018-01-15 07:19:24.806118078 +0100 -@@ -29,7 +29,7 @@ if (!defined('INSTALL_PATH')) { - } - - if (!defined('RCMAIL_CONFIG_DIR')) { -- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); -+ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); - } - - if (!defined('RCUBE_LOCALIZATION_DIR')) { -@@ -37,7 +37,7 @@ if (!defined('RCUBE_LOCALIZATION_DIR')) - } - - define('RCUBE_INSTALL_PATH', INSTALL_PATH); --define('RCUBE_CONFIG_DIR', RCMAIL_CONFIG_DIR.'/'); -+define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/'); - - - // RC include folders MUST be included FIRST to avoid other -diff -up ./program/lib/Roundcube/bootstrap.php.rpm ./program/lib/Roundcube/bootstrap.php ---- ./program/lib/Roundcube/bootstrap.php.rpm 2018-01-14 14:00:51.000000000 +0100 -+++ ./program/lib/Roundcube/bootstrap.php 2018-01-15 07:19:24.806118078 +0100 -@@ -65,7 +65,7 @@ if (!defined('RCUBE_INSTALL_PATH')) { - } - - if (!defined('RCUBE_CONFIG_DIR')) { -- define('RCUBE_CONFIG_DIR', RCUBE_INSTALL_PATH . 'config/'); -+ define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/'); - } - - if (!defined('RCUBE_PLUGINS_DIR')) { -- cgit