diff --git a/.gitignore b/.gitignore index 266941c..841fb20 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /roundcubemail.conf /roundcubemail.logrotate /roundcubemail-README.rpm +/roundcubemail-1.0.3-dep.tar.gz diff --git a/roundcubemail-1.0.0-confpath.patch b/roundcubemail-1.0.0-confpath.patch deleted file mode 100644 index 8256f06..0000000 --- a/roundcubemail-1.0.0-confpath.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -up roundcubemail-1.0.0-dep/config/defaults.inc.php.rpm roundcubemail-1.0.0-dep/config/defaults.inc.php ---- roundcubemail-1.0.0-dep/config/defaults.inc.php.rpm 2014-04-06 16:13:17.000000000 +0200 -+++ roundcubemail-1.0.0-dep/config/defaults.inc.php 2014-05-08 16:30:40.712838264 +0200 -@@ -293,10 +293,10 @@ $config['user_aliases'] = false; - - // use this folder to store log files (must be writeable for apache user) - // 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 apache user) --$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 -@@ -474,7 +474,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 - $config['im_identify_path'] = null; -diff -up roundcubemail-1.0.0-dep/installer/index.php.rpm roundcubemail-1.0.0-dep/installer/index.php ---- roundcubemail-1.0.0-dep/installer/index.php.rpm 2014-04-06 16:13:17.000000000 +0200 -+++ roundcubemail-1.0.0-dep/installer/index.php 2014-05-08 16:30:40.712838264 +0200 -@@ -41,7 +41,7 @@ ini_set('display_errors', 1); - - define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/'); - 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.0.0-dep/installer/rcube_install.php.rpm roundcubemail-1.0.0-dep/installer/rcube_install.php ---- roundcubemail-1.0.0-dep/installer/rcube_install.php.rpm 2014-05-08 16:30:44.987857419 +0200 -+++ roundcubemail-1.0.0-dep/installer/rcube_install.php 2014-05-08 16:30:54.986902235 +0200 -@@ -490,7 +490,6 @@ class rcube_install - $types = array( - 'application/zip' => 'zip', - 'application/x-tar' => 'tar', -- 'application/java-archive' => 'jar', - 'image/gif' => 'gif', - 'image/svg+xml' => 'svg', - ); -diff -up roundcubemail-1.0.0-dep/program/include/iniset.php.rpm roundcubemail-1.0.0-dep/program/include/iniset.php ---- roundcubemail-1.0.0-dep/program/include/iniset.php.rpm 2014-04-06 16:13:17.000000000 +0200 -+++ roundcubemail-1.0.0-dep/program/include/iniset.php 2014-05-08 16:30:40.712838264 +0200 -@@ -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.0.0-dep/program/lib/Roundcube/bootstrap.php.rpm roundcubemail-1.0.0-dep/program/lib/Roundcube/bootstrap.php ---- roundcubemail-1.0.0-dep/program/lib/Roundcube/bootstrap.php.rpm 2014-04-06 16:13:18.000000000 +0200 -+++ roundcubemail-1.0.0-dep/program/lib/Roundcube/bootstrap.php 2014-05-08 16:30:40.712838264 +0200 -@@ -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')) { diff --git a/roundcubemail-1.0.3-confpath.patch b/roundcubemail-1.0.3-confpath.patch new file mode 100644 index 0000000..aa30a79 --- /dev/null +++ b/roundcubemail-1.0.3-confpath.patch @@ -0,0 +1,70 @@ +diff -up roundcubemail-1.0.0-dep/config/defaults.inc.php.rpm roundcubemail-1.0.0-dep/config/defaults.inc.php +--- roundcubemail-1.0.0-dep/config/defaults.inc.php.rpm 2014-04-06 16:13:17.000000000 +0200 ++++ roundcubemail-1.0.0-dep/config/defaults.inc.php 2014-05-08 16:30:40.712838264 +0200 +@@ -293,10 +293,10 @@ $config['user_aliases'] = false; + + // use this folder to store log files (must be writeable for apache user) + // 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 apache user) +-$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 +@@ -474,7 +474,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 + $config['im_identify_path'] = null; +diff -up roundcubemail-1.0.0-dep/installer/index.php.rpm roundcubemail-1.0.0-dep/installer/index.php +--- roundcubemail-1.0.0-dep/installer/index.php.rpm 2014-04-06 16:13:17.000000000 +0200 ++++ roundcubemail-1.0.0-dep/installer/index.php 2014-05-08 16:30:40.712838264 +0200 +@@ -41,7 +41,7 @@ ini_set('display_errors', 1); + + define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/'); + 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.0.0-dep/program/include/iniset.php.rpm roundcubemail-1.0.0-dep/program/include/iniset.php +--- roundcubemail-1.0.0-dep/program/include/iniset.php.rpm 2014-04-06 16:13:17.000000000 +0200 ++++ roundcubemail-1.0.0-dep/program/include/iniset.php 2014-05-08 16:30:40.712838264 +0200 +@@ -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.0.0-dep/program/lib/Roundcube/bootstrap.php.rpm roundcubemail-1.0.0-dep/program/lib/Roundcube/bootstrap.php +--- roundcubemail-1.0.0-dep/program/lib/Roundcube/bootstrap.php.rpm 2014-04-06 16:13:18.000000000 +0200 ++++ roundcubemail-1.0.0-dep/program/lib/Roundcube/bootstrap.php 2014-05-08 16:30:40.712838264 +0200 +@@ -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')) { diff --git a/roundcubemail-README.rpm b/roundcubemail-README.rpm index 945c3e3..afb5445 100644 --- a/roundcubemail-README.rpm +++ b/roundcubemail-README.rpm @@ -35,7 +35,10 @@ UPGRADING: when upgrading from < 1.0 the old configuration files named main.inc.php and db.inc.php are now deprecated and should be replaced with one single config.inc.php file. Run the /usr/share/roundcube/bin/update.sh script as root to get this conversion done or manually merge the files. The update -script will also update the database configuration. +script will also update the database configuration. Check the permissions of +the config.inc.php file and all backups the script creates! Make sure they +are not world-readable, as they may contain sensitive information (e.g. +database passwords). NOTE: the new config.inc.php should only contain options that differ from the ones listed in defaults.inc.php. diff --git a/roundcubemail.spec b/roundcubemail.spec index 3bec9c9..51a23f8 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -1,7 +1,7 @@ %define roundcubedir %{_datadir}/roundcubemail %global _logdir /var/log Name: roundcubemail -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: Round Cube Webmail is a browser-based multilingual IMAP client @@ -28,7 +28,7 @@ Source4: roundcubemail-README.rpm Patch0: roundcubemail-0.9.3-no_swf.patch # Non-upstreamable: Adjusts config path to Fedora policy -Patch1: roundcubemail-1.0.0-confpath.patch +Patch1: roundcubemail-1.0.3-confpath.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) @@ -172,6 +172,10 @@ rm -rf %{buildroot} %changelog +* Tue Oct 14 2014 Adam Williamson - 1.0.3-1 +- update to 1.0.3 +- drop small chunk of confpath.patch that got done upstream + * Mon Jul 21 2014 Adam Williamson - 1.0.2-1 - Update to 1.0.2 diff --git a/sources b/sources index 5d9f182..6d35326 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f568eaa76f84abcef960a9f281f4e1f7 roundcubemail-1.0.2-dep.tar.gz +6b4fa210489b550608b2176a0ed58796 roundcubemail-1.0.3-dep.tar.gz