Kolab Groupware OBS

roundcubemail.spec Changed

@@ -47,9 +47,9 @@
 %global tmpdir /var/lib/roundcubemail
 
 Name:           roundcubemail
-Version:        1.3.0
+Version:        1.3.0.34
 
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -68,21 +68,6 @@
 
 Patch201:       default-configuration.patch
 
-Patch0001:      0001-Drop-ereg-dependency-fix-compat-with-PHP-7-5820.patch
-Patch0002:      0002-Update-changelog.patch
-Patch0003:      0003-Fix-decoding-non-ascii-attachment-names-from-TNEF-at.patch
-Patch0004:      0004-Fix-uninitialized-string-offset-in-rcube_utils-bin2a.patch
-Patch0005:      0005-Fix-absent-directory-error-in-install-jsdeps.sh-when.patch
-Patch0006:      0006-Skip-js-deps-installation-if-there-s-no-jsdeps.json-.patch
-Patch0007:      0007-Fix-bug-where-HTML-messages-with-media-styles-could-.patch
-Patch0008:      0008-Fix-style-issue-on-selected-and-unfocused-message-th.patch
-Patch0009:      0009-Remove-useless-box-shadows.patch
-Patch0010:      0010-Fix-bug-where-a.button-style-from-managesieve-plugin.patch
-Patch0011:      0011-Fix-position-of-selected-icon-for-Mailvelope-Encrypt.patch
-Patch0012:      0012-Fix-fatal-error-when-using-DMY-or-MDY-based-date-for.patch
-Patch0013:      0013-Add-Preferences-Mailbox-View-Main-Options-Layout-582.patch
-Patch0014:      0014-Fix-c-p-issue.patch
-
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
@@ -1076,21 +1061,6 @@
 
 %patch201 -p1
 
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
-%patch0010 -p1
-%patch0011 -p1
-%patch0012 -p1
-%patch0013 -p1
-%patch0014 -p1
-
 # Remove the results of patching when there's an incidental offset
 find . -type f -name "*.orig" -delete
 
@@ -2036,6 +2006,8 @@
     echo $str
 }
 
+find %{logdir} -mindepth 1 -maxdepth 1 -type f -exec chown %{httpd_user}:%{httpd_group} {} \;
+
 %{__sed} -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" /etc/roundcubemail/defaults.inc.php || : &> /dev/null
 
 %{__sed} -i -r -e "s/.*(\s*define$\s*'RCMAIL_VERSION'\s*,\s*').*('$;)/\1%{version}-%{release}\2/g" \

0001-Drop-ereg-dependency-fix-compat-with-PHP-7-5820.patch Deleted

0002-Update-changelog.patch Deleted

0003-Fix-decoding-non-ascii-attachment-names-from-TNEF-at.patch Deleted

@@ -1,370 +0,0 @@
-From b4c877b3d98a8eada91d65580c521e6ecaead6a8 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Tue, 27 Jun 2017 15:25:01 +0200
-Subject: [PATCH 03/14] Fix decoding non-ascii attachment names from TNEF
- attachments (#5646, #5799)
-
----
- CHANGELOG                                    |   1 +
- program/lib/Roundcube/rcube_charset.php      | 105 +++++++++++++++++++
- program/lib/Roundcube/rcube_tnef_decoder.php | 144 +++++++++++++++++++--------
- 3 files changed, 209 insertions(+), 41 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 9e2caf365..019d96f4e 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
- ===========================
- 
- - Password: Fix compatibility with PHP 7+ in cpanel_webmail driver (#5820)
-+- Fix decoding non-ascii attachment names from TNEF attachments (#5646, #5799)
- 
- RELEASE 1.3.0
- -------------
-diff --git a/program/lib/Roundcube/rcube_charset.php b/program/lib/Roundcube/rcube_charset.php
-index 9ed6f946e..86e2e17d4 100644
---- a/program/lib/Roundcube/rcube_charset.php
-+++ b/program/lib/Roundcube/rcube_charset.php
-@@ -66,6 +66,111 @@ class rcube_charset
-         'WINDOWS949'    => 'UHC',
-     );
- 
-+    /**
-+     * Windows codepages
-+     *
-+     * @var array
-+     */
-+    static public $windows_codepages = array(
-+         37 => 'IBM037',    // IBM EBCDIC US-Canada
-+        437 => 'IBM437',    // OEM United States
-+        500 => 'IBM500',    // IBM EBCDIC International
-+        708 => 'ASMO-708',  // Arabic (ASMO 708)
-+        720 => 'DOS-720',   // Arabic (Transparent ASMO); Arabic (DOS)
-+        737 => 'IBM737',    // OEM Greek (formerly 437G); Greek (DOS)
-+        775 => 'IBM775',    // OEM Baltic; Baltic (DOS)
-+        850 => 'IBM850',    // OEM Multilingual Latin 1; Western European (DOS)
-+        852 => 'IBM852',    // OEM Latin 2; Central European (DOS)
-+        855 => 'IBM855',    // OEM Cyrillic (primarily Russian)
-+        857 => 'IBM857',    // OEM Turkish; Turkish (DOS)
-+        858 => 'IBM00858',  // OEM Multilingual Latin 1 + Euro symbol
-+        860 => 'IBM860',    // OEM Portuguese; Portuguese (DOS)
-+        861 => 'IBM861',    // OEM Icelandic; Icelandic (DOS)
-+        862 => 'DOS-862',   // OEM Hebrew; Hebrew (DOS)
-+        863 => 'IBM863',    // OEM French Canadian; French Canadian (DOS)
-+        864 => 'IBM864',    // OEM Arabic; Arabic (864)
-+        865 => 'IBM865',    // OEM Nordic; Nordic (DOS)
-+        866 => 'cp866',     // OEM Russian; Cyrillic (DOS)
-+        869 => 'IBM869',    // OEM Modern Greek; Greek, Modern (DOS)
-+        870 => 'IBM870',    // IBM EBCDIC Multilingual/ROECE (Latin 2); IBM EBCDIC Multilingual Latin 2
-+        874 => 'windows-874',  // ANSI/OEM Thai (ISO 8859-11); Thai (Windows)
-+        875 => 'cp875',     // IBM EBCDIC Greek Modern
-+        932 => 'shift_jis', // ANSI/OEM Japanese; Japanese (Shift-JIS)
-+        936 => 'gb2312',    // ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312)
-+        950 => 'big5',      // ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5)
-+        1026 => 'IBM1026',      // IBM EBCDIC Turkish (Latin 5)
-+        1047 => 'IBM01047',     // IBM EBCDIC Latin 1/Open System
-+        1140 => 'IBM01140',     // IBM EBCDIC US-Canada (037 + Euro symbol); IBM EBCDIC (US-Canada-Euro)
-+        1141 => 'IBM01141',     // IBM EBCDIC Germany (20273 + Euro symbol); IBM EBCDIC (Germany-Euro)
-+        1142 => 'IBM01142',     // IBM EBCDIC Denmark-Norway (20277 + Euro symbol); IBM EBCDIC (Denmark-Norway-Euro)
-+        1143 => 'IBM01143',     // IBM EBCDIC Finland-Sweden (20278 + Euro symbol); IBM EBCDIC (Finland-Sweden-Euro)
-+        1144 => 'IBM01144',     // IBM EBCDIC Italy (20280 + Euro symbol); IBM EBCDIC (Italy-Euro)
-+        1145 => 'IBM01145',     // IBM EBCDIC Latin America-Spain (20284 + Euro symbol); IBM EBCDIC (Spain-Euro)
-+        1146 => 'IBM01146',     // IBM EBCDIC United Kingdom (20285 + Euro symbol); IBM EBCDIC (UK-Euro)
-+        1147 => 'IBM01147',     // IBM EBCDIC France (20297 + Euro symbol); IBM EBCDIC (France-Euro)
-+        1148 => 'IBM01148',     // IBM EBCDIC International (500 + Euro symbol); IBM EBCDIC (International-Euro)
-+        1149 => 'IBM01149',     // IBM EBCDIC Icelandic (20871 + Euro symbol); IBM EBCDIC (Icelandic-Euro)
-+        1200 => 'UTF-16',       // Unicode UTF-16, little endian byte order (BMP of ISO 10646); available only to managed applications
-+        1201 => 'UTF-16BE',     // Unicode UTF-16, big endian byte order; available only to managed applications
-+        1250 => 'windows-1250', // ANSI Central European; Central European (Windows)
-+        1251 => 'windows-1251', // ANSI Cyrillic; Cyrillic (Windows)
-+        1252 => 'windows-1252', // ANSI Latin 1; Western European (Windows)
-+        1253 => 'windows-1253', // ANSI Greek; Greek (Windows)
-+        1254 => 'windows-1254', // ANSI Turkish; Turkish (Windows)
-+        1255 => 'windows-1255', // ANSI Hebrew; Hebrew (Windows)
-+        1256 => 'windows-1256', // ANSI Arabic; Arabic (Windows)
-+        1257 => 'windows-1257', // ANSI Baltic; Baltic (Windows)
-+        1258 => 'windows-1258', // ANSI/OEM Vietnamese; Vietnamese (Windows)
-+        10000 => 'macintosh',   // MAC Roman; Western European (Mac)
-+        12000 => 'UTF-32',      // Unicode UTF-32, little endian byte order; available only to managed applications
-+        12001 => 'UTF-32BE',    // Unicode UTF-32, big endian byte order; available only to managed applications
-+        20127 => 'US-ASCII',    // US-ASCII (7-bit)
-+        20273 => 'IBM273',      // IBM EBCDIC Germany
-+        20277 => 'IBM277',      // IBM EBCDIC Denmark-Norway
-+        20278 => 'IBM278',      // IBM EBCDIC Finland-Sweden
-+        20280 => 'IBM280',      // IBM EBCDIC Italy
-+        20284 => 'IBM284',      // IBM EBCDIC Latin America-Spain
-+        20285 => 'IBM285',      // IBM EBCDIC United Kingdom
-+        20290 => 'IBM290',      // IBM EBCDIC Japanese Katakana Extended
-+        20297 => 'IBM297',      // IBM EBCDIC France
-+        20420 => 'IBM420',      // IBM EBCDIC Arabic
-+        20423 => 'IBM423',      // IBM EBCDIC Greek
-+        20424 => 'IBM424',      // IBM EBCDIC Hebrew
-+        20838 => 'IBM-Thai',    // IBM EBCDIC Thai
-+        20866 => 'koi8-r',      // Russian (KOI8-R); Cyrillic (KOI8-R)
-+        20871 => 'IBM871',      // IBM EBCDIC Icelandic
-+        20880 => 'IBM880',      // IBM EBCDIC Cyrillic Russian
-+        20905 => 'IBM905',      // IBM EBCDIC Turkish
-+        20924 => 'IBM00924',    // IBM EBCDIC Latin 1/Open System (1047 + Euro symbol)
-+        20932 => 'EUC-JP',      // Japanese (JIS 0208-1990 and 0212-1990)
-+        20936 => 'cp20936',     // Simplified Chinese (GB2312); Chinese Simplified (GB2312-80)
-+        20949 => 'cp20949',     // Korean Wansung
-+        21025 => 'cp1025',      // IBM EBCDIC Cyrillic Serbian-Bulgarian
-+        21866 => 'koi8-u',      // Ukrainian (KOI8-U); Cyrillic (KOI8-U)
-+        28591 => 'iso-8859-1',  // ISO 8859-1 Latin 1; Western European (ISO)
-+        28592 => 'iso-8859-2',  // ISO 8859-2 Central European; Central European (ISO)
-+        28593 => 'iso-8859-3',  // ISO 8859-3 Latin 3
-+        28594 => 'iso-8859-4',  // ISO 8859-4 Baltic
-+        28595 => 'iso-8859-5',  // ISO 8859-5 Cyrillic
-+        28596 => 'iso-8859-6',  // ISO 8859-6 Arabic
-+        28597 => 'iso-8859-7',  // ISO 8859-7 Greek
-+        28598 => 'iso-8859-8',  // ISO 8859-8 Hebrew; Hebrew (ISO-Visual)
-+        28599 => 'iso-8859-9',  // ISO 8859-9 Turkish
-+        28603 => 'iso-8859-13', // ISO 8859-13 Estonian
-+        28605 => 'iso-8859-15', // ISO 8859-15 Latin 9
-+        38598 => 'iso-8859-8-i', // ISO 8859-8 Hebrew; Hebrew (ISO-Logical)
-+        50220 => 'iso-2022-jp', // ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS)
-+        50221 => 'csISO2022JP', // ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow 1 byte Kana)
-+        50222 => 'iso-2022-jp', // ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte Kana - SO/SI)
-+        50225 => 'iso-2022-kr', // ISO 2022 Korean
-+        51932 => 'EUC-JP',      // EUC Japanese
-+        51936 => 'EUC-CN',      // EUC Simplified Chinese; Chinese Simplified (EUC)
-+        51949 => 'EUC-KR',      // EUC Korean
-+        52936 => 'hz-gb-2312',  // HZ-GB2312 Simplified Chinese; Chinese Simplified (HZ)
-+        54936 => 'GB18030',     // Windows XP and later: GB18030 Simplified Chinese (4 byte); Chinese Simplified (GB18030)
-+        65000 => 'UTF-7',
-+        65001 => 'UTF-8',
-+    );
- 
-     /**
-      * Catch an error and throw an exception.
-diff --git a/program/lib/Roundcube/rcube_tnef_decoder.php b/program/lib/Roundcube/rcube_tnef_decoder.php
-index 4930820b9..507be310b 100644
---- a/program/lib/Roundcube/rcube_tnef_decoder.php
-+++ b/program/lib/Roundcube/rcube_tnef_decoder.php
-@@ -3,7 +3,7 @@
- /**
-  +-----------------------------------------------------------------------+
-  | This file is part of the Roundcube Webmail client                     |
-- | Copyright (C) 2008-2014, The Roundcube Dev Team                       |
-+ | Copyright (C) 2008-2017, The Roundcube Dev Team                       |
-  | Copyright (C) 2002-2010, The Horde Project (http://www.horde.org/)    |
-  |                                                                       |
-  | Licensed under the GNU General Public License version 3 or            |
-@@ -15,6 +15,7 @@
-  +-----------------------------------------------------------------------+
-  | Author: Jan Schneider <jan@horde.org>                                 |
-  | Author: Michael Slusarz <slusarz@horde.org>                           |
-+ | Author: Aleksander Machniak <alec@alec.pl>                            |
-  +-----------------------------------------------------------------------+
- */
- 
-@@ -29,41 +30,70 @@
-  */
- class rcube_tnef_decoder
- {
--    const SIGNATURE = 0x223e9f78;
--    const LVL_MESSAGE = 0x01;
--    const LVL_ATTACHMENT = 0x02;
--
--    const ASUBJECT = 0x88004;
--    const AMCLASS = 0x78008;
--    const ATTACHDATA = 0x6800f;
--    const AFILENAME = 0x18010;
--    const ARENDDATA = 0x69002;
--    const AMAPIATTRS = 0x69005;
--    const AVERSION = 0x89006;
--
--    const MAPI_NULL = 0x0001;
--    const MAPI_SHORT = 0x0002;
--    const MAPI_INT = 0x0003;
--    const MAPI_FLOAT = 0x0004;
--    const MAPI_DOUBLE = 0x0005;
-+    const SIGNATURE         = 0x223e9f78;
-+    const LVL_MESSAGE       = 0x01;
-+    const LVL_ATTACHMENT    = 0x02;
-+
-+    const ASUBJECT          = 0x88004;
-+    const AMCLASS           = 0x78008;
-+    const ATTACHDATA        = 0x6800f;
-+    const AFILENAME         = 0x18010;
-+    const ARENDDATA         = 0x69002;
-+    const AMAPIATTRS        = 0x69005;
-+    const AOEMCODEPAGE      = 0x69007;
-+    const AVERSION          = 0x89006;
-+
-+    const MAPI_NULL     = 0x0001;
-+    const MAPI_SHORT    = 0x0002;
-+    const MAPI_INT      = 0x0003;
-+    const MAPI_FLOAT    = 0x0004;

0004-Fix-uninitialized-string-offset-in-rcube_utils-bin2a.patch Deleted

@@ -1,125 +0,0 @@
-From 2c6cc41c8f226c4403625c953c9e35e4a8380c76 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Tue, 27 Jun 2017 17:16:56 +0200
-Subject: [PATCH 04/14] Fix uninitialized string offset in
- rcube_utils::bin2ascii() and make sure rcube_utils::random_bytes() result has
- always requested length (#5788)
-
----
- CHANGELOG                             |  1 +
- program/lib/Roundcube/rcube_utils.php | 67 +++++++++++++----------------------
- 2 files changed, 25 insertions(+), 43 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 019d96f4e..81558ad4c 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -3,6 +3,7 @@ CHANGELOG Roundcube Webmail
- 
- - Password: Fix compatibility with PHP 7+ in cpanel_webmail driver (#5820)
- - Fix decoding non-ascii attachment names from TNEF attachments (#5646, #5799)
-+- Fix uninitialized string offset in rcube_utils::bin2ascii() and make sure rcube_utils::random_bytes() result has always requested length (#5788)
- 
- RELEASE 1.3.0
- -------------
-diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
-index 4aaaf40f2..3c0fc1eb2 100644
---- a/program/lib/Roundcube/rcube_utils.php
-+++ b/program/lib/Roundcube/rcube_utils.php
-@@ -1138,28 +1138,33 @@ class rcube_utils
-      */
-     public static function random_bytes($length, $raw = false)
-     {
-+        $hextab  = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-+        $tabsize = strlen($hextab);
-+
-         // Use PHP7 true random generator
--        if (function_exists('random_bytes')) {
--            // random_bytes() can throw an Error/TypeError/Exception in some cases
--            try {
--                $random = random_bytes($length);
--            }
--            catch (Throwable $e) {}
-+        if ($raw && function_exists('random_bytes')) {
-+            return random_bytes($length);
-         }
- 
--        if (!$random) {
--            $random = openssl_random_pseudo_bytes($length);
--        }
-+        if (!$raw && function_exists('random_int')) {
-+            $result = '';
-+            while ($length-- > 0) {
-+                $result .= $hextab[random_int(0, $tabsize - 1)];
-+            }
- 
--        if ($raw) {
--            return $random;
-+            return $result;
-         }
- 
--        $random = self::bin2ascii($random);
-+        $random = openssl_random_pseudo_bytes($length);
-+
-+        if ($random === false) {
-+            throw new Exception("Failed to get random bytes");
-+        }
- 
--        // truncate to the specified size...
--        if ($length < strlen($random)) {
--            $random = substr($random, 0, $length);
-+        if (!$raw) {
-+            for ($x = 0; $x < $length; $x++) {
-+                $random[$x] = $hextab[ord($random[$x]) % $tabsize];
-+            }
-         }
- 
-         return $random;
-@@ -1170,40 +1175,16 @@ class rcube_utils
-      *
-      * @param string $input Binary input
-      *
--     * @return string Readable output
-+     * @return string Readable output (Base62)
-+     * @deprecated since 1.3.1
-      */
-     public static function bin2ascii($input)
-     {
--        // Above method returns "hexits".
--        // Based on bin_to_readable() function in ext/session/session.c.
--        // Note: removed ",-" characters from hextab
-         $hextab = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
--        $nbits  = 6; // can be 4, 5 or 6
--        $length = strlen($input);
-         $result = '';
--        $char   = 0;
--        $i      = 0;
--        $have   = 0;
--        $mask   = (1 << $nbits) - 1;
--
--        while (true) {
--            if ($have < $nbits) {
--                if ($i < $length) {
--                    $char |= ord($input[$i++]) << $have;
--                    $have += 8;
--                }
--                else if (!$have) {
--                    break;
--                }
--                else {
--                    $have = $nbits;
--                }
--            }
- 
--            // consume nbits
--            $result .= $hextab[$char & $mask];
--            $char  >>= $nbits;
--            $have   -= $nbits;
-+        for ($x = 0; $x < strlen($input); $x++) {
-+            $result .= $hextab[ord($input[$x]) % 62];
-         }
- 
-         return $result;
--- 
-2.13.0
-

0005-Fix-absent-directory-error-in-install-jsdeps.sh-when.patch Deleted

0006-Skip-js-deps-installation-if-there-s-no-jsdeps.json-.patch Deleted

@@ -1,43 +0,0 @@
-From 6d53c6b9eb61c8eb797e4e87526e3826e8405de5 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Tue, 27 Jun 2017 17:34:46 +0200
-Subject: [PATCH 06/14] Skip js deps installation if there's no jsdeps.json and
- install-jsdeps.sh
-
----
- bin/installto.sh | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/bin/installto.sh b/bin/installto.sh
-index 45fc8f0b0..c47a8272a 100755
---- a/bin/installto.sh
-+++ b/bin/installto.sh
-@@ -100,13 +100,18 @@ if (strtolower($input) == 'y') {
-   }
- 
-   // check if js-deps are up-to-date
--  $jsdeps = json_decode(file_get_contents("$target_dir/jsdeps.json"));
--  $package = $jsdeps->dependencies[0];
--  $dest_file = $target_dir . '/' . $package->dest;
--  if (!file_exists($dest_file) || sha1_file($dest_file) !== $package->sha1) {
--      echo "Installing JavaScript dependencies...";
--      system("cd $target_dir && bin/install-jsdeps.sh");
--      echo "done.\n\n";
-+  if (file_exists("$target_dir/jsdeps.json") && file_exists("$target_dir/bin/install-jsdeps.sh")) {
-+    $jsdeps = json_decode(file_get_contents("$target_dir/jsdeps.json"));
-+    $package = $jsdeps->dependencies[0];
-+    $dest_file = $target_dir . '/' . $package->dest;
-+    if (!file_exists($dest_file) || sha1_file($dest_file) !== $package->sha1) {
-+        echo "Installing JavaScript dependencies...";
-+        system("cd $target_dir && bin/install-jsdeps.sh");
-+        echo "done.\n\n";
-+    }
-+  }
-+  else {
-+    echo "JavaScript dependencies installation skipped...\n";
-   }
- 
-   echo "Running update script at target...\n";
--- 
-2.13.0
-

0007-Fix-bug-where-HTML-messages-with-media-styles-could-.patch Deleted

@@ -1,68 +0,0 @@
-From 39fa590bad109dfc4bac70f34590d014f9a9548e Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Wed, 28 Jun 2017 08:26:05 +0200
-Subject: [PATCH 07/14] Fix bug where HTML messages with @media styles could
- moddify style of page body (#5811)
-
----
- CHANGELOG                             | 1 +
- program/lib/Roundcube/rcube_utils.php | 5 ++++-
- tests/Framework/Utils.php             | 1 +
- tests/src/media.css                   | 1 +
- 4 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 81558ad4c..9ba086ebe 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -4,6 +4,7 @@ CHANGELOG Roundcube Webmail
- - Password: Fix compatibility with PHP 7+ in cpanel_webmail driver (#5820)
- - Fix decoding non-ascii attachment names from TNEF attachments (#5646, #5799)
- - Fix uninitialized string offset in rcube_utils::bin2ascii() and make sure rcube_utils::random_bytes() result has always requested length (#5788)
-+- Fix bug where HTML messages with @media styles could moddify style of page body (#5811)
- 
- RELEASE 1.3.0
- -------------
-diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
-index 3c0fc1eb2..cc5244702 100644
---- a/program/lib/Roundcube/rcube_utils.php
-+++ b/program/lib/Roundcube/rcube_utils.php
-@@ -430,7 +430,10 @@ class rcube_utils
-         $source = preg_replace(
-             array(
-                 '/(^\s*<\!--)|(-->\s*$)/m',
--                '/(^\s*|,\s*|\}\s*)([a-z0-9\._#\*][a-z0-9\.\-_]*)/im',
-+                // (?!##str) below is to not match with ##str_replacement_0##
-+                // from rcube_string_replacer used above, this is needed for
-+                // cases like @media { body { position: fixed; } } (#5811)
-+                '/(^\s*|,\s*|\}\s*|\{\s*)((?!##str)[a-z0-9\._#\*][a-z0-9\.\-_]*)/im',
-                 '/'.preg_quote($container_id, '/').'\s+body/i',
-             ),
-             array(
-diff --git a/tests/Framework/Utils.php b/tests/Framework/Utils.php
-index 71e9f3e30..9b71acef5 100644
---- a/tests/Framework/Utils.php
-+++ b/tests/Framework/Utils.php
-@@ -183,6 +183,7 @@ class Framework_Utils extends PHPUnit_Framework_TestCase
- 
-         $this->assertContains('#rcmbody table[class=w600]', $mod, 'Replace styles nested in @media block');
-         $this->assertContains('#rcmbody {width:600px', $mod, 'Replace body selector nested in @media block');
-+        $this->assertContains('#rcmbody {min-width:474px', $mod, 'Replace body selector nested in @media block (#5811)');
-     }
- 
-     /**
-diff --git a/tests/src/media.css b/tests/src/media.css
-index 24eacc8a1..34e5b4342 100644
---- a/tests/src/media.css
-+++ b/tests/src/media.css
-@@ -15,6 +15,7 @@ div, p, a, li, td { -webkit-text-size-adjust:none; }
- 	body {width:600px !important; margin:auto !important;}
- 	.pict img {max-width:540px !important;  height:auto !important;}
- }
-+@media screen and (max-width:600px) { body {min-width:474px !important;} }
- h1{ font-weight:bold; font-size:14px;color:#3c3c3c ;margin:0px; }
- h2{ color:#8DB048 ; font-size:14px; font-weight:bold; margin-top:20px; border-bottom:1px solid #d6d6d6; padding-bottom:4px; }
- h3{ color:#7e7e7e ; font-size:14px; font-weight:bold; margin:20px 0px 0px 0px; border-bottom:1px solid #d6d6d6; padding-bottom:0px 0px 4px 0px; }
--- 
-2.13.0
-

0008-Fix-style-issue-on-selected-and-unfocused-message-th.patch Deleted

@@ -1,39 +0,0 @@
-From f12d1a90e7bbf5f9c1ea64a0597f58f618efb2f4 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Wed, 28 Jun 2017 08:28:46 +0200
-Subject: [PATCH 08/14] Fix style issue on selected and unfocused message that
- is part of a thread (#5798)
-
----
- CHANGELOG            | 1 +
- skins/larry/mail.css | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 9ba086ebe..04441b2d8 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -5,6 +5,7 @@ CHANGELOG Roundcube Webmail
- - Fix decoding non-ascii attachment names from TNEF attachments (#5646, #5799)
- - Fix uninitialized string offset in rcube_utils::bin2ascii() and make sure rcube_utils::random_bytes() result has always requested length (#5788)
- - Fix bug where HTML messages with @media styles could moddify style of page body (#5811)
-+- Fix style issue on selected and unfocused message that is part of a thread (#5798)
- 
- RELEASE 1.3.0
- -------------
-diff --git a/skins/larry/mail.css b/skins/larry/mail.css
-index 19903dbcc..ff34fdf35 100644
---- a/skins/larry/mail.css
-+++ b/skins/larry/mail.css
-@@ -279,7 +279,7 @@ table.messagelist.fixedcopy {
- /*	background-color: #fff; */
- }
- 
--.messagelist tr.thread.expanded td {
-+.messagelist tr.thread.expanded:not(.selected) td {
- 	background-color: #ededed;
- }
- 
--- 
-2.13.0
-

0009-Remove-useless-box-shadows.patch Deleted

@@ -1,39 +0,0 @@
-From b7fe41def2dcc055455c20f2209876065def44a9 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Wed, 28 Jun 2017 08:29:16 +0200
-Subject: [PATCH 09/14] Remove useless box-shadows
-
----
- plugins/enigma/skins/larry/enigma.css           | 2 --
- plugins/vcard_attachments/skins/larry/style.css | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/plugins/enigma/skins/larry/enigma.css b/plugins/enigma/skins/larry/enigma.css
-index 9115d4468..611d714e4 100644
---- a/plugins/enigma/skins/larry/enigma.css
-+++ b/plugins/enigma/skins/larry/enigma.css
-@@ -52,8 +52,6 @@ p.enigmaattachment {
-   background: #f9f9f9;
-   border: 1px solid #d3d3d3;
-   border-radius: 4px;
--  box-shadow: 0 0 2px #ccc;
--  -webkit-box-shadow: 0 0 2px #ccc;
- }
- 
- p.enigmaattachment a {
-diff --git a/plugins/vcard_attachments/skins/larry/style.css b/plugins/vcard_attachments/skins/larry/style.css
-index 3115f69db..77ee41d18 100644
---- a/plugins/vcard_attachments/skins/larry/style.css
-+++ b/plugins/vcard_attachments/skins/larry/style.css
-@@ -5,8 +5,6 @@ p.vcardattachment {
- 	background: #f9f9f9;
- 	border: 1px solid #d3d3d3;
- 	border-radius: 4px;
--	box-shadow: 0 0 2px #ccc;
--	-webkit-box-shadow: 0 0 2px #ccc;
- }
- 
- p.vcardattachment a {
--- 
-2.13.0
-

0010-Fix-bug-where-a.button-style-from-managesieve-plugin.patch Deleted

@@ -1,84 +0,0 @@
-From c608d063af249f4709506c7eaae080e922efb3a5 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Wed, 28 Jun 2017 08:30:29 +0200
-Subject: [PATCH 10/14] Fix bug where a.button style from managesieve plugin
- could impact other elements (#5800)
-
----
- CHANGELOG                                       |  1 +
- plugins/managesieve/skins/larry/managesieve.css | 14 +++++++-------
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 04441b2d8..d651324d1 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -6,6 +6,7 @@ CHANGELOG Roundcube Webmail
- - Fix uninitialized string offset in rcube_utils::bin2ascii() and make sure rcube_utils::random_bytes() result has always requested length (#5788)
- - Fix bug where HTML messages with @media styles could moddify style of page body (#5811)
- - Fix style issue on selected and unfocused message that is part of a thread (#5798)
-+- Fix bug where a.button style from managesieve plugin could impact other elements (#5800)
- 
- RELEASE 1.3.0
- -------------
-diff --git a/plugins/managesieve/skins/larry/managesieve.css b/plugins/managesieve/skins/larry/managesieve.css
-index bee53f243..f0acb64c5 100644
---- a/plugins/managesieve/skins/larry/managesieve.css
-+++ b/plugins/managesieve/skins/larry/managesieve.css
-@@ -58,7 +58,7 @@
- #filtersetslist tbody tr.disabled td
- {
-   color: #87A3AA;
--	text-decoration: line-through;
-+  text-decoration: line-through;
- }
- 
- #filtersetslist tbody td
-@@ -280,13 +280,13 @@ span.sieve.error
-   background-color: #eee;
- }
- 
--a.button
-+#filter-form a.button
- {
-   margin: 0;
-   padding: 0;
- }
- 
--a.button.add
-+#filter-form a.button.add
- {
-   background: url(images/add.png?v=a165.280) no-repeat;
-   width: 30px;
-@@ -295,7 +295,7 @@ a.button.add
-   display: inline-block;
- }
- 
--a.button.del
-+#filter-form a.button.del
- {
-   background: url(images/del.png?v=3c27.247) no-repeat;
-   width: 30px;
-@@ -303,7 +303,7 @@ a.button.del
-   display: inline-block;
- }
- 
--a.button.disabled
-+#filter-form a.button.disabled
- {
-   opacity: 0.35;
-   filter: alpha(opacity=35);
-@@ -419,8 +419,8 @@ body.iframe.mail #filter-form
- /* vacation form */
- #settings-sections .vacation a {
-   background-image: url(images/vacation_icons.png?v=e738.767);
--	background-repeat: no-repeat;
--	background-position: 7px 1px;
-+  background-repeat: no-repeat;
-+  background-position: 7px 1px;
- }
- 
- #settings-sections .vacation.selected a {
--- 
-2.13.0
-

0011-Fix-position-of-selected-icon-for-Mailvelope-Encrypt.patch Deleted

@@ -1,39 +0,0 @@
-From 515f7c13299f0f5264257622db5297bc4db9cac5 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Wed, 28 Jun 2017 08:31:31 +0200
-Subject: [PATCH 11/14] Fix position of selected icon for (Mailvelope) Encrypt
- button
-
----
- CHANGELOG              | 1 +
- skins/larry/styles.css | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index d651324d1..e3eecde3a 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -7,6 +7,7 @@ CHANGELOG Roundcube Webmail
- - Fix bug where HTML messages with @media styles could moddify style of page body (#5811)
- - Fix style issue on selected and unfocused message that is part of a thread (#5798)
- - Fix bug where a.button style from managesieve plugin could impact other elements (#5800)
-+- Fix position of selected icon for (Mailvelope) Encrypt button
- 
- RELEASE 1.3.0
- -------------
-diff --git a/skins/larry/styles.css b/skins/larry/styles.css
-index c443b3c5c..c18ea44d9 100644
---- a/skins/larry/styles.css
-+++ b/skins/larry/styles.css
-@@ -2036,7 +2036,7 @@ ul.proplist li {
- }
- 
- .toolbar a.button.encrypt.selected {
--	background-position: center -2068px;
-+	background-position: center -2065px;
- }
- 
- a.menuselector {
--- 
-2.13.0
-

0012-Fix-fatal-error-when-using-DMY-or-MDY-based-date-for.patch Deleted

@@ -1,47 +0,0 @@
-From 0f24470c5baf8005481ab4cd7278c8e64346d5af Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Wed, 28 Jun 2017 08:34:43 +0200
-Subject: [PATCH 12/14] Fix fatal error when using DMY- or MDY-based date
- format in PostgreSQL (#5808)
-
----
- CHANGELOG                                | 1 +
- program/lib/Roundcube/rcube_db_pgsql.php | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index e3eecde3a..655026a84 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -8,6 +8,7 @@ CHANGELOG Roundcube Webmail
- - Fix style issue on selected and unfocused message that is part of a thread (#5798)
- - Fix bug where a.button style from managesieve plugin could impact other elements (#5800)
- - Fix position of selected icon for (Mailvelope) Encrypt button
-+- Fix fatal error when using DMY- or MDY-based date format in PostgreSQL (#5808)
- 
- RELEASE 1.3.0
- -------------
-diff --git a/program/lib/Roundcube/rcube_db_pgsql.php b/program/lib/Roundcube/rcube_db_pgsql.php
-index d0d707a4a..e0ed46c84 100644
---- a/program/lib/Roundcube/rcube_db_pgsql.php
-+++ b/program/lib/Roundcube/rcube_db_pgsql.php
-@@ -3,7 +3,7 @@
- /**
-  +-----------------------------------------------------------------------+
-  | This file is part of the Roundcube Webmail client                     |
-- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
-+ | Copyright (C) 2005-2017, The Roundcube Dev Team                       |
-  |                                                                       |
-  | Licensed under the GNU General Public License version 3 or            |
-  | any later version with exceptions for skins & plugins.                |
-@@ -52,6 +52,7 @@ class rcube_db_pgsql extends rcube_db
-     protected function conn_configure($dsn, $dbh)
-     {
-         $dbh->query("SET NAMES 'utf8'");
-+        $dbh->query("SET DATESTYLE TO ISO");
-     }
- 
-     /**
--- 
-2.13.0
-

0013-Add-Preferences-Mailbox-View-Main-Options-Layout-582.patch Deleted

@@ -1,83 +0,0 @@
-From 3f820d76fac8ea743b4570ed86834f5409d866e6 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Fri, 30 Jun 2017 11:42:44 +0200
-Subject: [PATCH 13/14] Add Preferences > Mailbox View > Main Options > Layout
- (#5829)
-
----
- CHANGELOG                             |  1 +
- program/localization/en_US/labels.inc |  3 +++
- program/steps/settings/func.inc       | 18 ++++++++++++++++++
- program/steps/settings/save_prefs.inc |  1 +
- 4 files changed, 23 insertions(+)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 655026a84..bafb27a7d 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -1,6 +1,7 @@
- CHANGELOG Roundcube Webmail
- ===========================
- 
-+- Add Preferences > Mailbox View > Main Options > Layout (#5829)
- - Password: Fix compatibility with PHP 7+ in cpanel_webmail driver (#5820)
- - Fix decoding non-ascii attachment names from TNEF attachments (#5646, #5799)
- - Fix uninitialized string offset in rcube_utils::bin2ascii() and make sure rcube_utils::random_bytes() result has always requested length (#5788)
-diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
-index acfe45b92..2add20fc7 100644
---- a/program/localization/en_US/labels.inc
-+++ b/program/localization/en_US/labels.inc
-@@ -207,6 +207,9 @@ $labels['layout'] = 'Layout';
- $labels['layoutwidescreen'] = 'Widescreen';
- $labels['layoutdesktop'] = 'Desktop';
- $labels['layoutlist'] = 'List';
-+$labels['layoutwidescreendesc'] = 'Widescreen (3-column view)';
-+$labels['layoutdesktopdesc'] = 'Desktop (wide list and mail preview below)';
-+$labels['layoutlistdesc'] = 'List (no mail preview)';
- 
- $labels['folderactions'] = 'Folder actions...';
- $labels['compact'] = 'Compact';
-diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
-index f6c6f06c0..97132bca2 100644
---- a/program/steps/settings/func.inc
-+++ b/program/steps/settings/func.inc
-@@ -410,6 +410,24 @@ function rcmail_user_prefs($current = null)
-                 'advanced'    => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
-             );
- 
-+            if (!isset($no_override['layout'])) {
-+                if (!$current) {
-+                    continue 2;
-+                }
-+
-+                $field_id = 'rcmfd_layout';
-+                $select   = new html_select(array('name' => '_layout', 'id' => $field_id));
-+
-+                $select->add($RCMAIL->gettext('layoutwidescreendesc'), 'widescreen');
-+                $select->add($RCMAIL->gettext('layoutdesktopdesc'), 'desktop');
-+                $select->add($RCMAIL->gettext('layoutlistdesc'), 'list');
-+
-+                $blocks['main']['options']['date_format'] = array(
-+                    'title'   => html::label($field_id, rcube::Q($RCMAIL->gettext('layout'))),
-+                    'content' => $select->show($config['layout'] ?: 'widescreen'),
-+                );
-+            }
-+
-             // show config parameter for auto marking the previewed message as read
-             if (!isset($no_override['mail_read_time'])) {
-                 if (!$current) {
-diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
-index 0ddf3c7e5..a324da926 100644
---- a/program/steps/settings/save_prefs.inc
-+++ b/program/steps/settings/save_prefs.inc
-@@ -47,6 +47,7 @@ case 'general':
- 
- case 'mailbox':
-     $a_user_prefs = array(
-+        'layout'               => rcube_utils::get_input_value('_layout', rcube_utils::INPUT_POST),
-         'mail_read_time'       => isset($_POST['_mail_read_time']) ? intval($_POST['_mail_read_time']) : $CONFIG['mail_read_time'],
-         'autoexpand_threads'   => isset($_POST['_autoexpand_threads']) ? intval($_POST['_autoexpand_threads']) : 0,
-         'mdn_requests'         => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
--- 
-2.13.0
-

0014-Fix-c-p-issue.patch Deleted

@@ -1,25 +0,0 @@
-From 16e979e9d5e152e913318949ba193eda9a00bb79 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Fri, 30 Jun 2017 11:47:00 +0200
-Subject: [PATCH 14/14] Fix c/p issue
-
----
- program/steps/settings/func.inc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
-index 97132bca2..e0be8377c 100644
---- a/program/steps/settings/func.inc
-+++ b/program/steps/settings/func.inc
-@@ -422,7 +422,7 @@ function rcmail_user_prefs($current = null)
-                 $select->add($RCMAIL->gettext('layoutdesktopdesc'), 'desktop');
-                 $select->add($RCMAIL->gettext('layoutlistdesc'), 'list');
- 
--                $blocks['main']['options']['date_format'] = array(
-+                $blocks['main']['options']['layout'] = array(
-                     'title'   => html::label($field_id, rcube::Q($RCMAIL->gettext('layout'))),
-                     'content' => $select->show($config['layout'] ?: 'widescreen'),
-                 );
--- 
-2.13.0
-

debian.changelog Changed

debian.series Changed

roundcubemail-1.3.0.tar.gz -> roundcubemail-1.3.0.34.tar.gz Changed

roundcubemail.dsc Changed

Changes of Revision 77