roundcubemail: fix for enigma plugin

1 files changed, 0 insertions, 71 deletions

diff --git a/roundcubemail-1.1.0-confpath.patch b/roundcubemail-1.1.0-confpath.patch
deleted file mode 100644
index c015e52..0000000
--- a/roundcubemail-1.1.0-confpath.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -up roundcubemail-1.1.0/config/defaults.inc.php.orig roundcubemail-1.1.0/config/defaults.inc.php
---- roundcubemail-1.1.0/config/defaults.inc.php.orig	2015-02-16 17:39:52.274132735 +0100
-+++ roundcubemail-1.1.0/config/defaults.inc.php	2015-02-16 17:46:10.336534781 +0100
-@@ -321,11 +321,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/';
- 
- // expire files in temp_dir after 48 hours
- // possible units: s, m, h, d, w
-@@ -511,7 +511,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;
-diff -up roundcubemail-1.1.0/installer/index.php.orig roundcubemail-1.1.0/installer/index.php
---- roundcubemail-1.1.0/installer/index.php.orig	2015-02-16 17:39:52.274132735 +0100
-+++ roundcubemail-1.1.0/installer/index.php	2015-02-16 17:41:44.115547278 +0100
-@@ -41,7 +41,7 @@ ini_set('display_errors', 1);
- 
- define('INSTALL_PATH', realpath(__DIR__ . '/../').'/');
- define('RCUBE_INSTALL_PATH', INSTALL_PATH);
--define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/');
-+define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/');
- 
- $include_path  = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
- $include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
-diff -up roundcubemail-1.1.0/program/include/iniset.php.orig roundcubemail-1.1.0/program/include/iniset.php
---- roundcubemail-1.1.0/program/include/iniset.php.orig	2015-02-08 14:48:56.000000000 +0100
-+++ roundcubemail-1.1.0/program/include/iniset.php	2015-02-16 17:39:52.274132735 +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 roundcubemail-1.1.0/program/lib/Roundcube/bootstrap.php.orig roundcubemail-1.1.0/program/lib/Roundcube/bootstrap.php
---- roundcubemail-1.1.0/program/lib/Roundcube/bootstrap.php.orig	2015-02-08 14:48:56.000000000 +0100
-+++ roundcubemail-1.1.0/program/lib/Roundcube/bootstrap.php	2015-02-16 17:39:52.274132735 +0100
-@@ -66,7 +66,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')) {