@@ -49,7 +49,7 @@

 Name:           roundcubemail

 Version:        1.2.5

-Release:        4%{?dist}

+Release:        6%{?dist}

 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client

@@ -68,10 +68,23 @@

 Patch201:       default-configuration.patch

+Patch0001:      0001-Fix-bug-where-comment-notation-within-style-tag-woul.patch

+Patch0002:      0002-Fix-bug-where-it-wasn-t-possible-to-scroll-folders-l.patch

+Patch0003:      0003-Fix-addressbook-searching-by-gender-5757.patch

+Patch0004:      0004-Enigma-Fix-compatibility-with-assets_dir.patch

+Patch0005:      0005-Fix-SQL-syntax-error-on-MariaDB-10.2-5774.patch

+Patch0006:      0006-Fix-bug-where-it-wasn-t-possible-to-set-timezone-to-.patch

+

 BuildArch:      noarch

 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)

 BuildRequires:  composer

+%if 0%{?fedora}

+# fix issue:

+# have choice for php-composer(justinrainbow/json-schema) >= 2.0 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema

+# have choice for php-composer(justinrainbow/json-schema) < 5 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema php-JsonSchema

+BuildRequires:  php-justinrainbow-json-schema4

+%endif

 %if 0%{?plesk} < 1

 BuildRequires:  php-gd

@@ -148,6 +161,12 @@

 Requires:       php-common >= 5.3

 %endif

+%if 0%{?fedora}

+# to avoid on OBS, for packages depending on roundcubemail-core: 

+# have choice for webserver needed by roundcubemail-core: lighttpd httpd nginx cherokee

+Requires:       httpd

+%endif

+

 Requires:       php-gd

 Requires:       php-mbstring

 Requires:       php-mcrypt

@@ -2861,6 +2880,14 @@

 %defattr(-,root,root,-)

 %changelog

+* Fri Jun 16 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.2.5-6

+- Fix saving preferences (timezone)

+- Fix syntax error against MariaDB 10.2

+- Fix assets for enigma plugin

+

+* Thu May 25 2017 Timotheus Pokorra <tp@tbits.net> - 1.2.5-5

+- avoid problems on Fedora, roundcubemail-core requires webserver but there are several available

+

 * Wed May 10 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.2.5-2

 - Fix log rotation in Plesk

​

@@ -0,0 +1,64 @@

+From 9bfacb4d3c6e687a3921fe52dfc98d67db0f99fa Mon Sep 17 00:00:00 2001

+From: Aleksander Machniak <alec@alec.pl>

+Date: Fri, 5 May 2017 11:51:23 +0200

+Subject: [PATCH 1/6] Fix bug where comment notation within style tag would

+ cause the whole style to be ignored (#5747)

+

+---

+ CHANGELOG                             |  2 ++

+ program/lib/Roundcube/rcube_utils.php |  1 +

+ tests/Framework/Utils.php             | 13 +++++++++++++

+ 3 files changed, 16 insertions(+)

+

+diff --git a/CHANGELOG b/CHANGELOG

+index facd8b329..5bd46f0d3 100644

+--- a/CHANGELOG

++++ b/CHANGELOG

+@@ -1,6 +1,8 @@

+ CHANGELOG Roundcube Webmail

+ ===========================

+ 

++- Fix bug where comment notation within style tag would cause the whole style to be ignored (#5747)

++

+ RELEASE 1.2.5

+ -------------

+ - Fix re-positioning of the fixed header of messages list in Chrome when using minimal mode toggle and About dialog (#5711)

+diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php

+index 34d5d7193..c198c30e7 100644

+--- a/program/lib/Roundcube/rcube_utils.php

++++ b/program/lib/Roundcube/rcube_utils.php

+@@ -499,6 +499,7 @@ class rcube_utils

+     public static function xss_entity_decode($content)

+     {

+         $out = html_entity_decode(html_entity_decode($content));

++        $out = trim(preg_replace('/(^<!--|-->$)/', '', trim($out)));

+         $out = preg_replace_callback('/\\\([0-9a-f]{4})/i',

+             array(self, 'xss_entity_decode_callback'), $out);

+         $out = preg_replace('#/\*.*\*/#Ums', '', $out);

+diff --git a/tests/Framework/Utils.php b/tests/Framework/Utils.php

+index ba04e1545..71e9f3e30 100644

+--- a/tests/Framework/Utils.php

++++ b/tests/Framework/Utils.php

+@@ -220,6 +220,19 @@ class Framework_Utils extends PHPUnit_Framework_TestCase

+         $this->assertEquals("#rcmbody { background-image: url(data:image/png;base64,123); }", $mod, "Data URIs in url() allowed");

+     }

+ 

++    function test_xss_entity_decode()

++    {

++        $mod = rcube_utils::xss_entity_decode("&lt;img/src=x onerror=alert(1)// </b>");

++        $this->assertNotContains('<img', $mod, "Strip (encoded) tags from style node");

++

++        $mod = rcube_utils::xss_entity_decode('#foo:after{content:"\003Cimg/src=x onerror=alert(2)>";}');

++        $this->assertNotContains('<img', $mod, "Strip (encoded) tags from content property");

++

++        // #5747

++        $mod = rcube_utils::xss_entity_decode('<!-- #foo { content:css; } -->');

++        $this->assertContains('#foo', $mod, "Strip HTML comments from content, but not the content");

++    }

++

+     /**

+      * Check rcube_utils::explode_quoted_string()

+      */

+-- 

+2.13.0

+

​

@@ -0,0 +1,55 @@

+From 1b8d76644769cbe2bcbddb657aafed550999aebf Mon Sep 17 00:00:00 2001

+From: Aleksander Machniak <alec@alec.pl>

+Date: Fri, 5 May 2017 13:41:49 +0200

+Subject: [PATCH 2/6] Fix bug where it wasn't possible to scroll folders list

+ in Edge (#5750)

+

+---

+ CHANGELOG            | 1 +

+ skins/larry/mail.css | 4 +---

+ 2 files changed, 2 insertions(+), 3 deletions(-)

+

+diff --git a/CHANGELOG b/CHANGELOG

+index 5bd46f0d3..e83c007ce 100644

+--- a/CHANGELOG

++++ b/CHANGELOG

+@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail

+ ===========================

+ 

+ - Fix bug where comment notation within style tag would cause the whole style to be ignored (#5747)

++- Fix bug where it wasn't possible to scroll folders list in Edge (#5750)

+ 

+ RELEASE 1.2.5

+ -------------

+diff --git a/skins/larry/mail.css b/skins/larry/mail.css

+index e29265643..155e16b01 100644

+--- a/skins/larry/mail.css

++++ b/skins/larry/mail.css

+@@ -16,7 +16,7 @@

+   left: 0;

+   width: 200px;

+   bottom: 0;

+-  z-index: 2;

++  z-index: 1; /* fixes scrolling in Edge (#5750) */

+ }

+ 

+ #mailview-right {

+@@ -25,7 +25,6 @@

+   left: 212px;

+   right: 0;

+   bottom: 0;

+-  z-index: 3;

+ }

+ 

+ #mailview-right.fullwidth {

+@@ -224,7 +223,6 @@ html.mozilla #mailboxlist > li:first-child {

+   left: 0;

+   height: 40px;

+   white-space: nowrap;

+-  z-index: 10;

+ }

+ 

+ #messagetoolbar.fullwidth {

+-- 

+2.13.0

+

​

@@ -0,0 +1,41 @@

+From 58d7cdc3fcff334d29bcd7d6e7ceb4f0a360e41a Mon Sep 17 00:00:00 2001

+From: Aleksander Machniak <alec@alec.pl>

+Date: Thu, 11 May 2017 08:56:42 +0200

+Subject: [PATCH 3/6] Fix addressbook searching by gender (#5757)

+

+---

+ CHANGELOG                                   | 1 +

+ program/lib/Roundcube/rcube_addressbook.php | 5 +++++

+ 2 files changed, 6 insertions(+)

+

+diff --git a/CHANGELOG b/CHANGELOG

+index e83c007ce..b71909661 100644

+--- a/CHANGELOG

++++ b/CHANGELOG

+@@ -3,6 +3,7 @@ CHANGELOG Roundcube Webmail

+ 

+ - Fix bug where comment notation within style tag would cause the whole style to be ignored (#5747)

+ - Fix bug where it wasn't possible to scroll folders list in Edge (#5750)

++- Fix addressbook searching by gender (#5757)

+ 

+ RELEASE 1.2.5

+ -------------

+diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php

+index 1db4c303d..ae56bab5a 100644

+--- a/program/lib/Roundcube/rcube_addressbook.php

++++ b/program/lib/Roundcube/rcube_addressbook.php

+@@ -670,6 +670,11 @@ abstract class rcube_addressbook

+                 && $value->format('Ymd') == $search->format('Ymd'));

+         }

+ 

++        // Gender is a special value, must use strict comparison (#5757)

++        if ($colname == 'gender') {

++            $mode = self::SEARCH_STRICT;

++        }

++

+         // composite field, e.g. address

+         foreach ((array)$value as $val) {

+             $val = mb_strtolower($val);

+-- 

+2.13.0

+

​

@@ -0,0 +1,66 @@

+From 793bf96747237641082169ac0dceeb8834db993a Mon Sep 17 00:00:00 2001

+From: Aleksander Machniak <alec@alec.pl>

+Date: Sun, 21 May 2017 09:49:42 +0200

+Subject: [PATCH 4/6] Enigma: Fix compatibility with assets_dir

+

+---

+ CHANGELOG                        |  1 +

+ plugins/enigma/lib/enigma_ui.php | 20 ++++----------------

+ 2 files changed, 5 insertions(+), 16 deletions(-)

+

+diff --git a/CHANGELOG b/CHANGELOG

+index b71909661..d2a648e15 100644

+--- a/CHANGELOG

++++ b/CHANGELOG

+@@ -1,6 +1,7 @@

+ CHANGELOG Roundcube Webmail

+ ===========================

+ 

++- Enigma: Fix compatibility with assets_dir

+ - Fix bug where comment notation within style tag would cause the whole style to be ignored (#5747)

+ - Fix bug where it wasn't possible to scroll folders list in Edge (#5750)

+ - Fix addressbook searching by gender (#5757)

+diff --git a/plugins/enigma/lib/enigma_ui.php b/plugins/enigma/lib/enigma_ui.php

+index 03d7c208a..f4d9c48ba 100644

+--- a/plugins/enigma/lib/enigma_ui.php

++++ b/plugins/enigma/lib/enigma_ui.php

+@@ -116,14 +116,12 @@ class enigma_ui

+      */

+     function add_css()

+     {

+-        if ($this->css_loaded)

++        if ($this->css_loaded) {

+             return;

+-

+-        $skin_path = $this->enigma->local_skin_path();

+-        if (is_file($this->home . "/$skin_path/enigma.css")) {

+-            $this->enigma->include_stylesheet("$skin_path/enigma.css");

+         }

+ 

++        $skin_path = $this->enigma->local_skin_path();

++        $this->enigma->include_stylesheet("$skin_path/enigma.css");

+         $this->css_loaded = true;

+     }

+ 

+@@ -185,17 +183,7 @@ class enigma_ui

+      */

+     function tpl_key_frame($attrib)

+     {

+-        if (!$attrib['id']) {

+-            $attrib['id'] = 'rcmkeysframe';

+-        }

+-

+-        $attrib['name'] = $attrib['id'];

+-

+-        $this->rc->output->set_env('contentframe', $attrib['name']);

+-        $this->rc->output->set_env('blankpage', $attrib['src'] ?

+-            $this->rc->output->abs_url($attrib['src']) : 'program/resources/blank.gif');

+-

+-        return $this->rc->output->frame($attrib);

++        return $this->rc->output->frame($attrib, true);

+     }

+ 

+     /**

+-- 

+2.13.0

+

​

@@ -0,0 +1,47 @@

+From 913ffcfbbec71529c7ffb1ee675bd7b5decf571f Mon Sep 17 00:00:00 2001

+From: Aleksander Machniak <alec@alec.pl>

+Date: Sun, 28 May 2017 20:23:13 +0200

+Subject: [PATCH 5/6] Fix SQL syntax error on MariaDB 10.2 (#5774)

+

+---

+ CHANGELOG                                | 1 +

+ program/lib/Roundcube/rcube_contacts.php | 4 ++--

+ 2 files changed, 3 insertions(+), 2 deletions(-)

+

+diff --git a/CHANGELOG b/CHANGELOG

+index d2a648e15..2cb45faba 100644

+--- a/CHANGELOG

++++ b/CHANGELOG

+@@ -5,6 +5,7 @@ CHANGELOG Roundcube Webmail

+ - Fix bug where comment notation within style tag would cause the whole style to be ignored (#5747)

+ - Fix bug where it wasn't possible to scroll folders list in Edge (#5750)

+ - Fix addressbook searching by gender (#5757)

++- Fix SQL syntax error on MariaDB 10.2 (#5774)

+ 

+ RELEASE 1.2.5

+ -------------

+diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php

+index ef42328fe..532a5685f 100644

+--- a/program/lib/Roundcube/rcube_contacts.php

++++ b/program/lib/Roundcube/rcube_contacts.php

+@@ -502,7 +502,7 @@ class rcube_contacts extends rcube_addressbook

+ 

+         // count contacts for this user

+         $sql_result = $this->db->query(

+-            "SELECT COUNT(c.`contact_id`) AS rows".

++            "SELECT COUNT(c.`contact_id`) AS cnt".

+             " FROM " . $this->db->table_name($this->db_name, true) . " AS c".

+                 $join.

+             " WHERE c.`del` <> 1".

+@@ -515,7 +515,7 @@ class rcube_contacts extends rcube_addressbook

+ 

+         $sql_arr = $this->db->fetch_assoc($sql_result);

+ 

+-        $this->cache['count'] = (int) $sql_arr['rows'];

++        $this->cache['count'] = (int) $sql_arr['cnt'];

+ 

+         return $this->cache['count'];

+     }

+-- 

+2.13.0

+

​

@@ -0,0 +1,48 @@

+From 3d498cd632362d2fb19f578d8e96e8785580c490 Mon Sep 17 00:00:00 2001

+From: Aleksander Machniak <alec@alec.pl>

+Date: Sat, 3 Jun 2017 19:00:00 +0200

+Subject: [PATCH 6/6] Fix bug where it wasn't possible to set timezone to

+ auto-detected value (#5782)

+

+---

+ CHANGELOG                            | 1 +

+ program/lib/Roundcube/rcube_user.php | 4 +++-

+ 2 files changed, 4 insertions(+), 1 deletion(-)

+

+diff --git a/CHANGELOG b/CHANGELOG

+index 2cb45faba..e4d5c375d 100644

+--- a/CHANGELOG

++++ b/CHANGELOG

+@@ -6,6 +6,7 @@ CHANGELOG Roundcube Webmail

+ - Fix bug where it wasn't possible to scroll folders list in Edge (#5750)

+ - Fix addressbook searching by gender (#5757)

+ - Fix SQL syntax error on MariaDB 10.2 (#5774)

++- Fix bug where it wasn't possible to set timezone to auto-detected value (#5782)

+ 

+ RELEASE 1.2.5

+ -------------

+diff --git a/program/lib/Roundcube/rcube_user.php b/program/lib/Roundcube/rcube_user.php

+index bda6e54b6..472cec368 100644

+--- a/program/lib/Roundcube/rcube_user.php

++++ b/program/lib/Roundcube/rcube_user.php

+@@ -188,14 +188,16 @@ class rcube_user

+         $a_user_prefs = $plugin['prefs'];

+         $old_prefs    = $plugin['old'];

+         $config       = $this->rc->config;

++        $defaults     = $config->all();

+ 

+         // merge (partial) prefs array with existing settings

+         $this->prefs = $save_prefs = $a_user_prefs + $old_prefs;

+         unset($save_prefs['language']);

+ 

+         // don't save prefs with default values if they haven't been changed yet

++        // Warning: we use result of rcube_config::all() here instead of just get() (#5782)

+         foreach ($a_user_prefs as $key => $value) {

+-            if ($value === null || (!isset($old_prefs[$key]) && ($value == $config->get($key)))) {

++            if ($value === null || (!isset($old_prefs[$key]) && $value === $defaults[$key])) {

+                 unset($save_prefs[$key]);

+             }

+         }

+-- 

+2.13.0

+

​

@@ -1,3 +1,11 @@

+roundcubemail (1.2.5-0~kolab6) unstable; urgency=low

+

+  * Fix saving preferences (timezone)

+  * Fix syntax error against MariaDB 10.2

+  * Fix assets for enigma plugin

+

+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 16 Jun 2017 11:11:11 +0200

+

 roundcubemail (1.2.5-0~kolab5) unstable; urgency=low

   * Fix upgrade path

​

@@ -1,1 +1,7 @@

 default-configuration.patch -p1

+0001-Fix-bug-where-comment-notation-within-style-tag-woul.patch -p1

+0002-Fix-bug-where-it-wasn-t-possible-to-scroll-folders-l.patch -p1

+0003-Fix-addressbook-searching-by-gender-5757.patch -p1

+0004-Enigma-Fix-compatibility-with-assets_dir.patch -p1

+0005-Fix-SQL-syntax-error-on-MariaDB-10.2-5774.patch -p1

+0006-Fix-bug-where-it-wasn-t-possible-to-set-timezone-to-.patch -p1

​

@@ -2,7 +2,7 @@

 Source: roundcubemail

 Binary: roundcubemail

 Architecture: all

-Version: 1:1.2.5-0~kolab5

+Version: 1:1.2.5-0~kolab6

 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>

 Uploaders: Paul Klos <kolab@klos2day.nl>

 Homepage: http://www.roundcube.net/

​