Kolab Groupware OBS

roundcubemail.spec Changed

@@ -47,9 +47,9 @@
 %global tmpdir /var/lib/roundcubemail
 
 Name:           roundcubemail
-Version:        1.2.4
+Version:        1.2.5
 
-Release:        4%{?dist}
+Release:        1%{?dist}
 
 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -66,13 +66,6 @@
 Source100:      plesk.config.inc.php
 Source101:      plesk.password.inc.php
 
-Patch0001:      0001-Fix-so-settings-upload.inc-could-not-be-used-by-plug.patch
-Patch0002:      0002-Update-changelog.patch
-Patch0003:      0003-Remove-redundant-spaces-from-generated-contact-names.patch
-Patch0004:      0004-Fix-regression-in-LDAP-fuzzy-search-where-it-always-.patch
-Patch0005:      0005-Fix-bug-where-namespace-prefix-could-not-be-truncate.patch
-Patch0006:      0006-Fix-re-positioning-of-the-fixed-header-of-messages-l.patch
-
 Patch201:       default-configuration.patch
 
 BuildArch:      noarch
@@ -1082,13 +1075,6 @@
 cp -vf %{SOURCE101} plugins/password/config.inc.php.dist
 %endif
 
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-
 %patch201 -p1
 
 # Remove the results of patching when there's an incidental offset
@@ -2872,6 +2858,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Apr 28 2017 Timotheus Pokorra <tp@tbits.net> - 1.2.5-1
+- Check in upstream 1.2.5 release
+
 * Tue Apr 25 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.2.4-4
 - Correct config.inc.php

0001-Fix-so-settings-upload.inc-could-not-be-used-by-plug.patch Deleted

@@ -1,42 +0,0 @@
-From fa62496107d69198b70820d914abd3148d68e602 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Fri, 17 Mar 2017 10:49:13 +0100
-Subject: [PATCH 1/6] Fix so settings/upload.inc could not be used by plugins
- (#5694)
-
----
- CHANGELOG                         | 1 +
- program/steps/settings/upload.inc | 5 +++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 360242a..7ce0291 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -25,6 +25,7 @@ RELEASE 1.2.4
- - Add rewrite rule to disable access to /vendor/bin folder in .htaccess (#5630)
- - Fix bug where it was too easy accidentally move a folder when using the subscription checkbox (#5655)
- - Fix XSS issue in handling of a style tag inside of an svg element
-+- Fix so settings/upload.inc could not be used by plugins (#5694)
- 
- RELEASE 1.2.3
- -------------
-diff --git a/program/steps/settings/upload.inc b/program/steps/settings/upload.inc
-index 0cf7ae6..5e91f1d 100644
---- a/program/steps/settings/upload.inc
-+++ b/program/steps/settings/upload.inc
-@@ -27,6 +27,11 @@ if (!empty($_GET['_progress'])) {
- $from = rcube_utils::get_input_value('_from', rcube_utils::INPUT_GET);
- $type = preg_replace('/(add|edit)-/', '', $from);
- 
-+// Plugins in Settings may use this file for some uploads (#5694)
-+// Make sure it does not contain a dot, which is a special character
-+// when using rcube_session::append() below
-+$type = str_replace('.', '-', $type);
-+
- if ($RCMAIL->action == 'upload-display') {
-     $id = 'undefined';
- 
--- 
-2.9.3
-

0002-Update-changelog.patch Deleted

@@ -1,33 +0,0 @@
-From d5be34ad17faeb520d958a868784c49d58c015a2 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Fri, 17 Mar 2017 10:50:33 +0100
-Subject: [PATCH 2/6] Update changelog
-
----
- CHANGELOG | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 7ce0291..e345387 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -1,6 +1,8 @@
- CHANGELOG Roundcube Webmail
- ===========================
- 
-+- Fix so settings/upload.inc could not be used by plugins (#5694)
-+
- RELEASE 1.2.4
- -------------
- - Managesieve: Fix handling of scripts with nested rules (#5540)
-@@ -25,7 +27,6 @@ RELEASE 1.2.4
- - Add rewrite rule to disable access to /vendor/bin folder in .htaccess (#5630)
- - Fix bug where it was too easy accidentally move a folder when using the subscription checkbox (#5655)
- - Fix XSS issue in handling of a style tag inside of an svg element
--- Fix so settings/upload.inc could not be used by plugins (#5694)
- 
- RELEASE 1.2.3
- -------------
--- 
-2.9.3
-

0003-Remove-redundant-spaces-from-generated-contact-names.patch Deleted

@@ -1,60 +0,0 @@
-From 6a178b3a7f0331feab65727c5e2ddefbd08367ee Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Mon, 20 Mar 2017 09:15:50 +0100
-Subject: [PATCH 3/6] Remove redundant spaces from generated contact names
-
----
- config/defaults.inc.php                     | 10 +++++-----
- program/lib/Roundcube/rcube_addressbook.php |  8 ++++++--
- 2 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/config/defaults.inc.php b/config/defaults.inc.php
-index 6bf250b..2a2e550 100644
---- a/config/defaults.inc.php
-+++ b/config/defaults.inc.php
-@@ -1032,11 +1032,11 @@ $config['addressbook_pagesize'] = 50;
- // sort contacts by this col (preferably either one of name, firstname, surname)
- $config['addressbook_sort_col'] = 'surname';
- 
--// the way how contact names are displayed in the list
--// 0: display name
--// 1: (prefix) firstname middlename surname (suffix)
--// 2: (prefix) surname firstname middlename (suffix)
--// 3: (prefix) surname, firstname middlename (suffix)
-+// The way how contact names are displayed in the list.
-+// 0: prefix firstname middlename surname suffix (only if display name is not set)
-+// 1: firstname middlename surname
-+// 2: surname firstname middlename
-+// 3: surname, firstname middlename
- $config['addressbook_name_listing'] = 0;
- 
- // use this timezone to display date/time
-diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php
-index 3943fcf..1db4c30 100644
---- a/program/lib/Roundcube/rcube_addressbook.php
-+++ b/program/lib/Roundcube/rcube_addressbook.php
-@@ -497,8 +497,11 @@ abstract class rcube_addressbook
-         $contact = rcube::get_instance()->plugins->exec_hook('contact_displayname', $contact);
-         $fn = $contact['name'];
- 
--        if (!$fn)  // default display name composition according to vcard standard
--            $fn = trim(join(' ', array_filter(array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix']))));
-+        // default display name composition according to vcard standard
-+        if (!$fn) {
-+            $fn = join(' ', array_filter(array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix'])));
-+            $fn = trim(preg_replace('/\s+/', ' ', $fn));
-+        }
- 
-         // use email address part for name
-         $email = self::get_col_values('email', $contact, true);
-@@ -547,6 +550,7 @@ abstract class rcube_addressbook
-         }
- 
-         $fn = trim($fn, ', ');
-+        $fn = preg_replace('/\s+/', ' ', $fn);
- 
-         // fallbacks...
-         if ($fn === '') {
--- 
-2.9.3
-

0004-Fix-regression-in-LDAP-fuzzy-search-where-it-always-.patch Deleted

@@ -1,39 +0,0 @@
-From 0fffea28c14e435ac63dc34c2d864dd17ac58b5d Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Fri, 31 Mar 2017 09:45:21 +0200
-Subject: [PATCH 4/6] Fix regression in LDAP fuzzy search where it always used
- prefix search instead (#5713)
-
----
- CHANGELOG                            | 1 +
- program/lib/Roundcube/rcube_ldap.php | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index e345387..fb04e76 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
- ===========================
- 
- - Fix so settings/upload.inc could not be used by plugins (#5694)
-+- Fix regression in LDAP fuzzy search where it always used prefix search instead (#5713)
- 
- RELEASE 1.2.4
- -------------
-diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
-index 6778d9b..441a6a3 100644
---- a/program/lib/Roundcube/rcube_ldap.php
-+++ b/program/lib/Roundcube/rcube_ldap.php
-@@ -840,7 +840,7 @@ class rcube_ldap extends rcube_addressbook
-             }
- 
-             // compose a full-text-like search filter
--            $filter = rcube_ldap_generic::fulltext_search_filter($value, $attributes, $mode);
-+            $filter = rcube_ldap_generic::fulltext_search_filter($value, $attributes, $mode & ~rcube_addressbook::SEARCH_GROUPS);
-         }
- 
-         // add required (non empty) fields filter
--- 
-2.9.3
-

0005-Fix-bug-where-namespace-prefix-could-not-be-truncate.patch Deleted

@@ -1,112 +0,0 @@
-From 2f6ca6d6729603e227a7b041204bed8ea61edd5f Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Sat, 1 Apr 2017 09:45:07 +0200
-Subject: [PATCH 5/6] Fix bug where namespace prefix could not be truncated on
- folders list if show_real_foldernames=true (#5695)
-
----
- program/include/rcmail.php             | 25 +++++++++++++++++--------
- program/steps/settings/edit_folder.inc |  9 +++++----
- program/steps/settings/folders.inc     |  5 +++--
- 4 files changed, 26 insertions(+), 14 deletions(-)
-
-diff --git a/program/include/rcmail.php b/program/include/rcmail.php
-index 68e0d6b..5dc7415 100644
---- a/program/include/rcmail.php
-+++ b/program/include/rcmail.php
-@@ -1674,12 +1674,13 @@ class rcmail extends rcube
-      * Try to localize the given IMAP folder name.
-      * UTF-7 decode it in case no localized text was found
-      *
--     * @param string $name      Folder name
--     * @param bool   $with_path Enable path localization
-+     * @param string $name        Folder name
-+     * @param bool   $with_path   Enable path localization
-+     * @param bool   $path_remove Remove the path
-      *
-      * @return string Localized folder name in UTF-8 encoding
-      */
--    public function localize_foldername($name, $with_path = false)
-+    public function localize_foldername($name, $with_path = false, $path_remove = false)
-     {
-         $realnames = $this->config->get('show_real_foldernames');
- 
-@@ -1687,12 +1688,20 @@ class rcmail extends rcube
-             return $this->gettext($folder_class);
-         }
- 
-+        $storage   = $this->get_storage();
-+        $delimiter = $storage->get_hierarchy_delimiter();
-+
-+        // Remove the path
-+        if ($path_remove) {
-+            if (strpos($name, $delimiter)) {
-+                $path = explode($delimiter, $name);
-+                $name = array_pop($path);
-+            }
-+        }
-         // try to localize path of the folder
--        if ($with_path && !$realnames) {
--            $storage   = $this->get_storage();
--            $delimiter = $storage->get_hierarchy_delimiter();
--            $path      = explode($delimiter, $name);
--            $count     = count($path);
-+        else if ($with_path && !$realnames) {
-+            $path  = explode($delimiter, $name);
-+            $count = count($path);
- 
-             if ($count > 1) {
-                 for ($i = 1; $i < $count; $i++) {
-diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
-index 8ddc17e..c16f2ca 100644
---- a/program/steps/settings/edit_folder.inc
-+++ b/program/steps/settings/edit_folder.inc
-@@ -86,20 +86,21 @@ function rcmail_folder_form($attrib)
- 
-     // Location (name)
-     if ($options['protected']) {
--        $foldername = str_replace($delimiter, ' &raquo; ', rcube::Q($RCMAIL->localize_folderpath($mbox)));
-+        $foldername = str_replace($delimiter, ' &raquo; ', rcube::Q($RCMAIL->localize_foldername($mbox, false, true)));
-     }
-     else if ($options['norename']) {
-         $foldername = rcube::Q($folder);
-     }
-     else {
--        if (isset($_POST['_name']))
-+        if (isset($_POST['_name'])) {
-             $folder = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true));
-+        }
- 
-         $foldername = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30));
-         $foldername = $foldername->show($folder);
- 
--        if ($options['special']) {
--            $foldername .= '&nbsp;(' . rcube::Q($RCMAIL->localize_foldername($mbox)) .')';
-+        if ($options['special'] && ($sname = $RCMAIL->localize_foldername($mbox, false, true)) != $folder) {
-+            $foldername .= '&nbsp;(' . rcube::Q($sname) .')';
-         }
-     }
- 
-diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
-index 345eb47..a7fab76 100644
---- a/program/steps/settings/folders.inc
-+++ b/program/steps/settings/folders.inc
-@@ -277,12 +277,13 @@ function rcmail_subscription_form($attrib)
-     foreach ($list_folders as $i => $folder) {
-         $sub_key    = array_search($folder['id'], $a_subscribed);
-         $subscribed = $sub_key !== false;
--        $protected  = $folder['id'] == 'INBOX' || ($protect_default && isset($special_folders[$folder['id']]));
-+        $special    = $folder['id'] == 'INBOX' || isset($special_folders[$folder['id']]);
-+        $protected  = $folder['id'] == 'INBOX' || ($protect_default && $special);
-         $noselect   = false;
-         $classes    = array();
- 
-         $folder_utf8    = rcube_charset::convert($folder['id'], 'UTF7-IMAP');
--        $display_folder = rcube::Q($protected ? $RCMAIL->localize_foldername($folder['id']) : $folder['name']);
-+        $display_folder = rcube::Q($special ? $RCMAIL->localize_foldername($folder['id'], false, true) : $folder['name']);
- 
-         if ($folder['virtual']) {
-             $classes[] = 'virtual';
--- 
-2.9.3
-

0006-Fix-re-positioning-of-the-fixed-header-of-messages-l.patch Deleted

debian.changelog Changed

debian.series Changed

roundcubemail-1.2.4.tar.gz/CHANGELOG -> roundcubemail-1.2.5.tar.gz/CHANGELOG Changed

@@ -1,6 +1,15 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+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)
+- Fix so settings/upload.inc could not be used by plugins (#5694)
+- Fix regression in LDAP fuzzy search where it always used prefix search instead (#5713)
+- Fix bug where namespace prefix could not be truncated on folders list if show_real_foldernames=true (#5695)
+- Fix bug where base_dn setting was ignored inside group_filters (#5720)
+- Password: Fix security issue in virtualmin and sasl drivers [CVE-2017-8114]
+
 RELEASE 1.2.4
 -------------
 - Managesieve: Fix handling of scripts with nested rules (#5540)
@@ -24,7 +33,7 @@
 - Fix update of group name in the contacts list header on group rename (#5648)
 - Add rewrite rule to disable access to /vendor/bin folder in .htaccess (#5630)
 - Fix bug where it was too easy accidentally move a folder when using the subscription checkbox (#5655)
-- Fix XSS issue in handling of a style tag inside of an svg element
+- Fix XSS issue in handling of a style tag inside of an svg element (CVE-2017-6820)
 
 RELEASE 1.2.3
 -------------

roundcubemail-1.2.4.tar.gz/config/defaults.inc.php -> roundcubemail-1.2.5.tar.gz/config/defaults.inc.php Changed

roundcubemail-1.2.4.tar.gz/index.php -> roundcubemail-1.2.5.tar.gz/index.php Changed

roundcubemail-1.2.4.tar.gz/installer/index.php -> roundcubemail-1.2.5.tar.gz/installer/index.php Changed

roundcubemail-1.2.4.tar.gz/plugins/password/drivers/sasl.php -> roundcubemail-1.2.5.tar.gz/plugins/password/drivers/sasl.php Changed

roundcubemail-1.2.4.tar.gz/plugins/password/drivers/virtualmin.php -> roundcubemail-1.2.5.tar.gz/plugins/password/drivers/virtualmin.php Changed

roundcubemail-1.2.4.tar.gz/program/include/iniset.php -> roundcubemail-1.2.5.tar.gz/program/include/iniset.php Changed

roundcubemail-1.2.4.tar.gz/program/include/rcmail.php -> roundcubemail-1.2.5.tar.gz/program/include/rcmail.php Changed

@@ -1674,12 +1674,13 @@
      * Try to localize the given IMAP folder name.
      * UTF-7 decode it in case no localized text was found
      *
-     * @param string $name      Folder name
-     * @param bool   $with_path Enable path localization
+     * @param string $name        Folder name
+     * @param bool   $with_path   Enable path localization
+     * @param bool   $path_remove Remove the path
      *
      * @return string Localized folder name in UTF-8 encoding
      */
-    public function localize_foldername($name, $with_path = false)
+    public function localize_foldername($name, $with_path = false, $path_remove = false)
     {
         $realnames = $this->config->get('show_real_foldernames');
 
@@ -1687,12 +1688,20 @@
             return $this->gettext($folder_class);
         }
 
+        $storage   = $this->get_storage();
+        $delimiter = $storage->get_hierarchy_delimiter();
+
+        // Remove the path
+        if ($path_remove) {
+            if (strpos($name, $delimiter)) {
+                $path = explode($delimiter, $name);
+                $name = array_pop($path);
+            }
+        }
         // try to localize path of the folder
-        if ($with_path && !$realnames) {
-            $storage   = $this->get_storage();
-            $delimiter = $storage->get_hierarchy_delimiter();
-            $path      = explode($delimiter, $name);
-            $count     = count($path);
+        else if ($with_path && !$realnames) {
+            $path  = explode($delimiter, $name);
+            $count = count($path);
 
             if ($count > 1) {
                 for ($i = 1; $i < $count; $i++) {

roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/bootstrap.php -> roundcubemail-1.2.5.tar.gz/program/lib/Roundcube/bootstrap.php Changed

roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/rcube_addressbook.php -> roundcubemail-1.2.5.tar.gz/program/lib/Roundcube/rcube_addressbook.php Changed

roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/rcube_ldap.php -> roundcubemail-1.2.5.tar.gz/program/lib/Roundcube/rcube_ldap.php Changed

roundcubemail-1.2.4.tar.gz/program/steps/settings/edit_folder.inc -> roundcubemail-1.2.5.tar.gz/program/steps/settings/edit_folder.inc Changed

@@ -86,20 +86,21 @@
 
     // Location (name)
     if ($options['protected']) {
-        $foldername = str_replace($delimiter, ' &raquo; ', rcube::Q($RCMAIL->localize_folderpath($mbox)));
+        $foldername = str_replace($delimiter, ' &raquo; ', rcube::Q($RCMAIL->localize_foldername($mbox, false, true)));
     }
     else if ($options['norename']) {
         $foldername = rcube::Q($folder);
     }
     else {
-        if (isset($_POST['_name']))
+        if (isset($_POST['_name'])) {
             $folder = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true));
+        }
 
         $foldername = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30));
         $foldername = $foldername->show($folder);
 
-        if ($options['special']) {
-            $foldername .= '&nbsp;(' . rcube::Q($RCMAIL->localize_foldername($mbox)) .')';
+        if ($options['special'] && ($sname = $RCMAIL->localize_foldername($mbox, false, true)) != $folder) {
+            $foldername .= '&nbsp;(' . rcube::Q($sname) .')';
         }
     }

roundcubemail-1.2.4.tar.gz/program/steps/settings/folders.inc -> roundcubemail-1.2.5.tar.gz/program/steps/settings/folders.inc Changed

roundcubemail-1.2.4.tar.gz/program/steps/settings/upload.inc -> roundcubemail-1.2.5.tar.gz/program/steps/settings/upload.inc Changed

roundcubemail-1.2.4.tar.gz/skins/larry/ui.js -> roundcubemail-1.2.5.tar.gz/skins/larry/ui.js Changed

roundcubemail.dsc Changed

Changes of Revision 18