Request 2115 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 2115 (accepted)

Check in 41 revisions ahead of upstream 1.3.0 release

Created by vanmeeuwen about 7 years ago
In state accepted

Submit roundcubemail

Submit package Kolab:Winterfell / roundcubemail to package Kolab:16 / roundcubemail

roundcubemail.spec Changed

@@ -47,9 +47,9 @@
 %global tmpdir /var/lib/roundcubemail
 
 Name:           roundcubemail
-Version:        1.2.5
+Version:        1.3.0.41
 
-Release:        6%{?dist}
+Release:        1%{?dist}
 
 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -68,13 +68,6 @@
 
 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)
 
@@ -162,7 +155,7 @@
 %endif
 
 %if 0%{?fedora}
-# to avoid on OBS, for packages depending on roundcubemail-core: 
+# 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
@@ -197,6 +190,10 @@
 # The jqueryui plugin is required.
 Requires:       %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}
 
+Obsoletes:      %{name}(plugin-legacy_browser)
+Obsoletes:      %{name}-plugin-legacy_browser
+Provides:       %{name}(plugin-legacy_browser) = %{?epoch:%{epoch}:}%{version}-%{release}
+
 Obsoletes:      %{name}(plugin-threading_as_default}
 Obsoletes:      %{name}-plugin-threading_as_default
 Provides:       %{name}-plugin-threading_as_default = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -358,6 +355,15 @@
 %description plugin-http_authentication
 Plugin http_authentication
 
+%package plugin-identicon
+Summary:        Plugin identicon
+Group:          Applications/Internet
+Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       %{name}(plugin-identicon) = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-identicon
+Plugin identicon
+
 %package plugin-identity_select
 Summary:        Plugin identity_select
 Group:          Applications/Internet
@@ -389,17 +395,6 @@
 %description plugin-krb_authentication
 Plugin krb_authentication
 
-%package plugin-legacy_browser
-Summary:        Plugin legacy_browser
-Group:          Applications/Internet
-Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-legacy_browser-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-legacy_browser-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-legacy_browser) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-legacy_browser
-Plugin legacy_browser
-
 %package plugin-managesieve
 Summary:        Plugin managesieve
 Group:          Applications/Internet
@@ -690,14 +685,6 @@
 %description plugin-krb_authentication-assets
 Plugin krb_authentication Assets
 
-%package plugin-legacy_browser-assets
-Summary:        Plugin legacy_browser Assets
-Group:          Applications/Internet
-Provides:       %{name}(plugin-legacy_browser-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-legacy_browser-assets
-Plugin legacy_browser Assets
-
 %package plugin-managesieve-assets
 Summary:        Plugin managesieve Assets
 Group:          Applications/Internet
@@ -890,18 +877,6 @@
 %description plugin-jqueryui-skin-larry
 Plugin jqueryui / Skin larry
 
-%package plugin-legacy_browser-skin-larry
-Summary:        Plugin legacy_browser / Skin larry
-Group:          Applications/Internet
-Requires:       %{name}(plugin-legacy_browser) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(plugin-legacy_browser-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-legacy_browser-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-legacy_browser-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-legacy_browser-skin-larry
-Plugin legacy_browser / Skin larry
-
 %package plugin-managesieve-skin-larry
 Summary:        Plugin managesieve / Skin larry
 Group:          Applications/Internet
@@ -1010,16 +985,6 @@
 %description plugin-jqueryui-skin-larry-assets
 Plugin jqueryui / Skin larry (Assets Package)
 
-%package plugin-legacy_browser-skin-larry-assets
-Summary:        Plugin legacy_browser / Skin larry (Assets)
-Group:          Applications/Internet
-Requires:       %{name}(plugin-legacy_browser-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       %{name}(skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       %{name}(plugin-legacy_browser-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-legacy_browser-skin-larry-assets
-Plugin legacy_browser / Skin larry (Assets Package)
-
 %package plugin-managesieve-skin-larry-assets
 Summary:        Plugin managesieve / Skin larry (Assets)
 Group:          Applications/Internet
@@ -1096,13 +1061,6 @@
 
 %patch201 -p1
 
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-
 # Remove the results of patching when there's an incidental offset
 find . -type f -name "*.orig" -delete
 
@@ -1226,7 +1184,7 @@
         echo "%posttrans plugin-$(basename ${plugin})"
         echo "if [ ! -f "%%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then"
         echo "    if [ -f \"%%{php_inidir}/apc.ini\" -o -f \"%%{php_inidir}/apcu.ini\" ]; then"
-        echo "        if [ ! -z \"\$(grep ^apc.enabled=1 %%{php_inidir}/apc{,u}.ini)\" ]; then"
+        echo "        if [ ! -z \"\$(grep ^apc.enabled=1 %%{php_inidir}/apc{,u}.ini 2>/dev/null)\" ]; then"
         echo "%if 0%%{?with_systemd}"
         echo "            /bin/systemctl condrestart %%{httpd_name}.service"
         echo "%else"
@@ -1392,8 +1350,6 @@
     %{buildroot}%{tmpdir}
 
 pushd %{name}-%{version}
-# Move robots.txt to the correct place
-%{__install} -pm 644 robots.txt %{buildroot}%{datadir}/public_html/robots.txt
 
 %if 0%{?plesk} < 1
 %{__install} -pm 644 %SOURCE20 %{buildroot}%{_ap_sysconfdir}/conf.d
@@ -1531,6 +1487,7 @@
         -name "*.tiff" -o \
         -name "*.ttf" -o \
         -name "*.wav" -o \
+        -name "*.webp" -o \
         -name "*.woff" | \
         grep -vE "${orig_dir}/(plugins|skins)/"
     ); do
@@ -1612,6 +1569,7 @@
             -name "*.tiff" -o \
             -name "*.ttf" -o \
             -name "*.wav" -o \
+            -name "*.webp" -o \
             -name "*.woff"
         ); do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
@@ -1700,6 +1658,7 @@
                 -name "*.tiff" -o \
                 -name "*.ttf" -o \
                 -name "*.wav" -o \
+                -name "*.webp" -o \
                 -name "*.woff"
             ); do
             asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
@@ -1771,6 +1730,7 @@
             -name "*.tiff" -o \
             -name "*.ttf" -o \
             -name "*.wav" -o \
+            -name "*.webp" -o \
             -name "*.woff"
         ); do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
@@ -1940,22 +1900,22 @@
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
 
-%pre plugin-identity_select
+%pre plugin-identicon
 if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
 
-%pre plugin-jqueryui
+%pre plugin-identity_select
 if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
 
-%pre plugin-krb_authentication
+%pre plugin-jqueryui
 if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
 
-%pre plugin-legacy_browser
+%pre plugin-krb_authentication
 if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
@@ -2050,6 +2010,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" \
@@ -2057,7 +2019,7 @@
 
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2079,7 +2041,7 @@
 %posttrans plugin-acl
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2094,7 +2056,7 @@
 %posttrans plugin-additional_message_headers
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2109,7 +2071,7 @@
 %posttrans plugin-archive
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2124,7 +2086,7 @@
 %posttrans plugin-attachment_reminder
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2139,7 +2101,7 @@
 %posttrans plugin-autologon
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2154,7 +2116,7 @@
 %posttrans plugin-database_attachments
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2169,7 +2131,7 @@
 %posttrans plugin-debug_logger
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2184,7 +2146,7 @@
 %posttrans plugin-emoticons
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2199,7 +2161,7 @@
 %posttrans plugin-enigma
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2214,7 +2176,7 @@
 %posttrans plugin-example_addressbook
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2229,7 +2191,7 @@
 %posttrans plugin-filesystem_attachments
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2244,7 +2206,7 @@
 %posttrans plugin-help
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2259,7 +2221,7 @@
 %posttrans plugin-hide_blockquote
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2274,7 +2236,7 @@
 %posttrans plugin-http_authentication
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2286,10 +2248,10 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-%posttrans plugin-identity_select
+%posttrans plugin-identicon
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2301,10 +2263,10 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-%posttrans plugin-jqueryui
+%posttrans plugin-identity_select
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2316,10 +2278,10 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-%posttrans plugin-krb_authentication
+%posttrans plugin-jqueryui
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2331,10 +2293,10 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-%posttrans plugin-legacy_browser
+%posttrans plugin-krb_authentication
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2349,7 +2311,7 @@
 %posttrans plugin-managesieve
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2364,7 +2326,7 @@
 %posttrans plugin-markasjunk
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2379,7 +2341,7 @@
 %posttrans plugin-new_user_dialog
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2394,7 +2356,7 @@
 %posttrans plugin-new_user_identity
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2409,7 +2371,7 @@
 %posttrans plugin-newmail_notifier
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2424,7 +2386,7 @@
 %posttrans plugin-password
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2439,7 +2401,7 @@
 %posttrans plugin-redundant_attachments
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2454,7 +2416,7 @@
 %posttrans plugin-show_additional_headers
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2469,7 +2431,7 @@
 %posttrans plugin-squirrelmail_usercopy
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2484,7 +2446,7 @@
 %posttrans plugin-subscriptions_option
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2499,7 +2461,7 @@
 %posttrans plugin-userinfo
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2514,7 +2476,7 @@
 %posttrans plugin-vcard_attachments
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2529,7 +2491,7 @@
 %posttrans plugin-virtuser_file
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2544,7 +2506,7 @@
 %posttrans plugin-virtuser_query
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2559,7 +2521,7 @@
 %posttrans plugin-zipdownload
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
 %if 0%{?with_systemd}
             /bin/systemctl condrestart %{httpd_name}.service
 %else
@@ -2649,6 +2611,9 @@
 %defattr(-,root,root,-)
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/http_authentication.inc.php
 
+%files plugin-identicon -f plugin-identicon.files
+%defattr(-,root,root,-)
+
 %files plugin-identity_select -f plugin-identity_select.files
 %defattr(-,root,root,-)
 
@@ -2660,9 +2625,6 @@
 %defattr(-,root,root,-)
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/krb_authentication.inc.php
 
-%files plugin-legacy_browser -f plugin-legacy_browser.files
-%defattr(-,root,root,-)
-
 %files plugin-managesieve -f plugin-managesieve.files
 %defattr(-,root,root,-)
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/managesieve.inc.php
@@ -2766,9 +2728,6 @@
 %files plugin-krb_authentication-assets -f plugin-krb_authentication-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-legacy_browser-assets -f plugin-legacy_browser-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-managesieve-assets -f plugin-managesieve-assets.files
 %defattr(-,root,root,-)
 
@@ -2832,9 +2791,6 @@
 %files plugin-jqueryui-skin-larry -f plugin-jqueryui-skin-larry.files
 %defattr(-,root,root,-)
 
-%files plugin-legacy_browser-skin-larry -f plugin-legacy_browser-skin-larry.files
-%defattr(-,root,root,-)
-
 %files plugin-managesieve-skin-larry -f plugin-managesieve-skin-larry.files
 %defattr(-,root,root,-)
 
@@ -2865,9 +2821,6 @@
 %files plugin-jqueryui-skin-larry-assets -f plugin-jqueryui-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files plugin-legacy_browser-skin-larry-assets -f plugin-legacy_browser-skin-larry-assets.files
-%defattr(-,root,root,-)
-
 %files plugin-managesieve-skin-larry-assets -f plugin-managesieve-skin-larry-assets.files
 %defattr(-,root,root,-)
 
@@ -2887,6 +2840,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Aug 27 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.0.41-1
+- Check in 41 revisions ahead of upstream 1.3.0 release
+
 * Mon Jun 19 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.2.5-6
 - Fix saving preferences (timezone)
 - Fix syntax error against MariaDB 10.2

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

@@ -1,64 +0,0 @@
-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('');
-+        $this->assertContains('#foo', $mod, "Strip HTML comments from content, but not the content");
-+    }
-+
-     /**
-      * Check rcube_utils::explode_quoted_string()
-      */
--- 
-2.13.0
-

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

@@ -1,55 +0,0 @@
-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
-

0003-Fix-addressbook-searching-by-gender-5757.patch Deleted

@@ -1,41 +0,0 @@
-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
-

0004-Enigma-Fix-compatibility-with-assets_dir.patch Deleted

@@ -1,66 +0,0 @@
-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
-

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

@@ -1,47 +0,0 @@
-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
-

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

@@ -1,48 +0,0 @@
-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
-

default-configuration.patch Changed

@@ -1,7 +1,7 @@
-diff -ur roundcubemail-1.2.0.orig/config/defaults.inc.php roundcubemail-1.2.0/config/defaults.inc.php
---- roundcubemail-1.2.0.orig/config/defaults.inc.php	2016-05-21 13:30:13.000000000 +0200
-+++ roundcubemail-1.2.0/config/defaults.inc.php	2016-07-06 15:32:24.191720736 +0200
-@@ -500,7 +500,7 @@
+diff -ur roundcubemail-1.3.0.orig/config/defaults.inc.php roundcubemail-1.3.0/config/defaults.inc.php
+--- roundcubemail-1.3.0.orig/config/defaults.inc.php	2017-06-26 20:51:51.000000000 +0200
++++ roundcubemail-1.3.0/config/defaults.inc.php	2017-07-01 11:36:21.094364159 +0200
+@@ -514,7 +514,7 @@
  // If your authentication backend supports it, use "UTF-8".
  // Otherwise, use the appropriate character set.
  // Defaults to ISO-8859-1 for backward compatibility.
@@ -10,8 +10,8 @@
  
  // How many seconds must pass between emails sent by a user
  $config['sendmail_delay'] = 0;
-@@ -608,7 +608,7 @@
- //    RewriteRule ^/roundcubemail/[a-f0-9]{16}/(.*) /roundcubemail/$1 [PT]
+@@ -630,7 +630,7 @@
+ //    RewriteRule ^/roundcubemail/[a-zA-Z0-9]{16}/(.*) /roundcubemail/$1 [PT]
  //    Alias /roundcubemail /var/www/roundcubemail/
  // Note: Use assets_path to not prevent the browser from caching assets
 -$config['use_secure_urls'] = false;
@@ -19,7 +19,7 @@
  
  // Allows to define separate server/path for image/js/css files
  // Warning: If the domain is different cross-domain access to some
-@@ -617,11 +617,11 @@
+@@ -639,11 +639,11 @@
  //    <FilesMatch ".(eot|ttf|woff)">
  //    Header set Access-Control-Allow-Origin "*"
  //    </FilesMatch>
@@ -33,7 +33,7 @@
  
  
  // ----------------------------------
-@@ -715,7 +715,7 @@
+@@ -737,7 +737,7 @@
  // Since Google shut down their public spell checking service, the default settings
  // connect to http://spell.roundcube.net which is a hosted service provided by Roundcube.
  // You can connect to any other googie-compliant service by setting 'spellcheck_uri' accordingly.
@@ -42,7 +42,7 @@
  
  // For locally installed Nox Spell Server or After the Deadline services,
  // please specify the URI to call it.
-@@ -1113,7 +1113,7 @@
+@@ -1138,7 +1138,7 @@
  $config['display_next'] = true;
  
  // Default messages listing mode. One of 'threads' or 'list'.
@@ -51,4 +51,4 @@
  
  // 0 - Do not expand threads
  // 1 - Expand all threads automatically
-Only in roundcubemail-1.2.0/config: defaults.inc.php.orig
+Only in roundcubemail-1.3.0/config: defaults.inc.php.orig

debian.changelog Changed

debian.rules Changed

@@ -6,13 +6,13 @@
 	dh $@
 
 override_dh_auto_build:
-	mkdir -p $$HOME/.composer
-	echo '{}' > $$HOME/.composer/composer.json
+	mkdir -p $(CURDIR)/debian/home/.composer/
+	echo '{}' > $(CURDIR)/debian/home/.composer/composer.json
 	patch -p1 < debian/patches/add-composer-autoloader.diff || :
 	if [ -x "$$(which composer.sh 2>/dev/null)" ]; then \
-		composer.sh -vvv dumpautoload --optimize ; \
+		HOME=$(CURDIR)/debian/home/ composer.sh -vvv dumpautoload --optimize ; \
 	else \
-		composer -vvv dumpautoload --optimize ; \
+		HOME=$(CURDIR)/debian/home/ composer -vvv dumpautoload --optimize ; \
 	fi
 	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_psr4.php
 	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_namespaces.php
@@ -73,6 +73,7 @@
 			-name "*.tiff" -o \
 			-name "*.ttf" -o \
 			-name "*.wav" -o \
+			-name "*.webp" -o \
 			-name "*.woff" \
 		); do \
 		asset_loc=$$(dirname $$(echo $${file} | sed \

debian.series Changed

roundcubemail-1.2.5.tar.gz -> roundcubemail-1.3.0.41.tar.gz Changed

roundcubemail.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2115 0

Request History

vanmeeuwen created request about 7 years ago

Check in 41 revisions ahead of upstream 1.3.0 release

vanmeeuwen accepted review about 7 years ago

vanmeeuwen approved review about 7 years ago

vanmeeuwen accepted request about 7 years ago