Update to 1.3.4

fix missing .log suffix #1520132

3 files changed, 35 insertions, 30 deletions

diff --git a/roundcubemail-1.2.1-confpath.patch b/roundcubemail-1.3.4-confpath.patch
index f92e146..dc3ebc2 100644
--- a/roundcubemail-1.2.1-confpath.patch
+++ b/roundcubemail-1.3.4-confpath.patch
@@ -1,7 +1,7 @@
-diff -up config/defaults.inc.php.rpm config/defaults.inc.php
---- roundcubemail-1.2.1/config/defaults.inc.php.rpm	2016-07-24 22:30:15.000000000 +0200
-+++ roundcubemail-1.2.1/config/defaults.inc.php	2016-07-31 18:32:28.747930911 +0200
-@@ -346,11 +346,11 @@ $config['user_aliases'] = false;
+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.
@@ -15,7 +15,7 @@ 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
-@@ -579,7 +579,7 @@ $config['mime_magic'] = null;
+@@ -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
@@ -24,7 +24,7 @@ diff -up config/defaults.inc.php.rpm config/defaults.inc.php
  
  // path to imagemagick identify binary (if not set we'll use Imagick or GD extensions)
  $config['im_identify_path'] = null;
-@@ -1211,3 +1211,7 @@ $config['message_show_email'] = false;
+@@ -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;
@@ -32,9 +32,10 @@ diff -up config/defaults.inc.php.rpm config/defaults.inc.php
 +// Keys directory for all users. Default 'enigma/home'.
 +// Must be writeable by PHP process
 +$config['enigma_pgp_homedir'] = '/var/lib/roundcubemail/enigma';
-diff -up plugins/enigma/config.inc.php.dist.rpm plugins/enigma/config.inc.php.dist
---- roundcubemail-1.2.1/plugins/enigma/config.inc.php.dist.rpm	2016-07-31 18:30:24.901231602 +0200
-+++ roundcubemail-1.2.1/plugins/enigma/config.inc.php.dist	2016-07-31 18:32:00.291770232 +0200
+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;
@@ -46,21 +47,9 @@ diff -up plugins/enigma/config.inc.php.dist.rpm plugins/enigma/config.inc.php.di
  // 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 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
+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')) {
  }
  
@@ -79,10 +68,10 @@ diff -up roundcubemail-1.1.0/program/include/iniset.php.orig roundcubemail-1.1.0
  
  
  // 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')) {
+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')) {
diff --git a/roundcubemail-pr313.patch b/roundcubemail-pr313.patch
index f68a110..2490e1a 100644
--- a/roundcubemail-pr313.patch
+++ b/roundcubemail-pr313.patch
@@ -68,3 +68,15 @@ index ef5dcb94e..401cd3f86 100644
      }
  
      /**
+diff -up ./program/lib/Roundcube/rcube_config.php.suf ./program/lib/Roundcube/rcube_config.php
+--- ./program/lib/Roundcube/rcube_config.php.suf	2018-01-15 07:32:16.149315868 +0100
++++ ./program/lib/Roundcube/rcube_config.php	2018-01-15 07:32:19.436332757 +0100
+@@ -253,7 +253,7 @@ class rcube_config
+                 ini_set('error_log', 'syslog');
+             }
+             else {
+-                ini_set('error_log', $this->prop['log_dir'].'/errors');
++                ini_set('error_log', $this->prop['log_dir'].'/errors.log');
+             }
+         }
+ 
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 57dfd66..b4eede5 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -20,7 +20,7 @@
 %global roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  1.3.3
+Version:  1.3.4
 Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -46,7 +46,7 @@ Source2: roundcubemail.logrotate
 Source4: roundcubemail-README-rpm.txt
 
 # Non-upstreamable: Adjusts config path to Fedora policy
-Patch1: roundcubemail-1.2.1-confpath.patch
+Patch1: roundcubemail-1.3.4-confpath.patch
 
 # add .log prefix to all log file names
 # see https://github.com/roundcube/roundcubemail/pull/313
@@ -327,6 +327,10 @@ fi
 
 
 %changelog
+* Mon Jan 15 2018 Remi Collet <remi@remirepo.net> - 1.3.4-1
+- Update to 1.3.4
+- fix missing .log suffix #1520132
+
 * Thu Nov  9 2017 Remi Collet <remi@remirepo.net> - 1.3.3-1
 - Update to 1.3.3