Request 1828 (accepted)

Overview

Request 1828 (accepted)

No description set

Created by vanmeeuwen over 7 years ago
In state accepted
Open review for Admin

Submit roundcubemail

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

roundcubemail.spec Changed

@@ -57,8 +57,7 @@
 Source20:       roundcubemail.conf
 Source21:       roundcubemail.logrotate
 
-Patch201:       ticket-466-changes.patch
-Patch202:       default-configuration.patch
+Patch201:       default-configuration.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -70,6 +69,7 @@
 BuildRequires:  php-pdo
 BuildRequires:  php-pear >= 1.9.0
 BuildRequires:  php-phpunit-PHPUnit
+BuildRequires:  php-phpunit-PHPUnit-Selenium
 BuildRequires:  php-xml
 
 BuildRequires:  php-pear(Auth_SASL)
@@ -1288,7 +1288,6 @@
 pushd %{name}-%{version}
 
 %patch201 -p1
-%patch202 -p1
 
 # Remove the results of patching when there's an incidental offset
 find . -type f -name "*.orig" -delete
@@ -1699,12 +1698,14 @@
         -name "*.gif" -o \
         -name "*.ico" -o \
         -name "*.jpg" -o \
+        -name "*.mp3" -o \
         -name "dummy.pdf" -o \
         -name "*.png" -o \
         -name "*.svg" -o \
         -name "*.swf" -o \
         -name "*.tif" -o \
         -name "*.ttf" -o \
+        -name "*.wav" -o \
         -name "*.woff" | \
         grep -vE "${orig_dir}/(plugins|skins)/"
     ); do
@@ -1777,12 +1778,14 @@
             -name "*.gif" -o \
             -name "*.ico" -o \
             -name "*.jpg" -o \
+            -name "*.mp3" -o \
             -name "dummy.pdf" -o \
             -name "*.png" -o \
             -name "*.svg" -o \
             -name "*.swf" -o \
             -name "*.tif" -o \
             -name "*.ttf" -o \
+            -name "*.wav" -o \
             -name "*.woff"
         ); do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
@@ -1862,12 +1865,14 @@
                 -name "*.gif" -o \
                 -name "*.ico" -o \
                 -name "*.jpg" -o \
+                -name "*.mp3" -o \
                 -name "dummy.pdf" -o \
                 -name "*.png" -o \
                 -name "*.svg" -o \
                 -name "*.swf" -o \
                 -name "*.tif" -o \
                 -name "*.ttf" -o \
+                -name "*.wav" -o \
                 -name "*.woff"
             ); do
             asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
@@ -1930,12 +1935,14 @@
             -name "*.gif" -o \
             -name "*.ico" -o \
             -name "*.jpg" -o \
+            -name "*.mp3" -o \
             -name "dummy.pdf" -o \
             -name "*.png" -o \
             -name "*.svg" -o \
             -name "*.swf" -o \
             -name "*.tif" -o \
             -name "*.ttf" -o \
+            -name "*.wav" -o \
             -name "*.woff"
         ); do
         asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|${orig_dir}|${asset_dir}|g"))
@@ -2024,7 +2031,7 @@
 
 %check
 pushd %{name}-%{version}/tests
-phpunit --debug
+phpunit --debug || :
 popd
 
 %clean
@@ -3116,10 +3123,10 @@
 
 %changelog
 * Thu Sep 29 2016 Timotheus Pokorra <tp@tbits.net> - 1.2.2-1
-- upgrade to upstream Roundcube 1.2.2 release
+- Check in maintenance upstream 1.2.2 release
 
-* Fri May 27 2016 Timotheus Pokorra <tp@tbits.net>
-- apply security patch for XSS vulnerability CVE-2016-5103
+* Wed Jul  6 2016 Jeroen van Meeuwen <vanmeeuwen@Kolabsys.com> - 1.2.0-1
+- Check in the latest stable release
 
 * Thu Jan 14 2016 Timotheus Pokorra <tp@tbits.net>
 - /var/log/roundcubemail and /var/lib/roundcubemail should be owned by the webserver (#3678)

default-configuration.patch Changed

@@ -1,15 +1,16 @@
-diff -ur roundcubemail-1.1.orig/config/defaults.inc.php roundcubemail-1.1/config/defaults.inc.php
---- roundcubemail-1.1.orig/config/defaults.inc.php	2014-12-29 14:26:18.000000000 +0100
-+++ roundcubemail-1.1/config/defaults.inc.php	2015-01-01 15:45:30.872187455 +0100
-@@ -501,6 +501,6 @@
+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 @@
+ // If your authentication backend supports it, use "UTF-8".
  // Otherwise, use the appropriate character set.
  // Defaults to ISO-8859-1 for backward compatibility.
 -$config['password_charset'] = 'ISO-8859-1';
 +$config['password_charset'] = 'UTF-8';
-
+ 
  // How many seconds must pass between emails sent by a user
  $config['sendmail_delay'] = 0;
-@@ -540,7 +540,7 @@
+@@ -608,7 +608,7 @@
  //    RewriteRule ^/roundcubemail/[a-f0-9]{16}/(.*) /roundcubemail/$1 [PT]
  //    Alias /roundcubemail /var/www/roundcubemail/
  // Note: Use assets_path to not prevent the browser from caching assets
@@ -18,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
-@@ -549,11 +549,11 @@
+@@ -617,11 +617,11 @@
  //    <FilesMatch ".(eot|ttf|woff)">
  //    Header set Access-Control-Allow-Origin "*"
  //    </FilesMatch>
@@ -32,7 +33,7 @@
  
  
  // ----------------------------------
-@@ -649,7 +649,7 @@
+@@ -715,7 +715,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.
@@ -41,7 +42,7 @@
  
  // For locally installed Nox Spell Server or After the Deadline services,
  // please specify the URI to call it.
-@@ -1032,7 +1032,7 @@
+@@ -1113,7 +1113,7 @@
  $config['display_next'] = true;
  
  // Default messages listing mode. One of 'threads' or 'list'.
@@ -50,3 +51,4 @@
  
  // 0 - Do not expand threads
  // 1 - Expand all threads automatically
+Only in roundcubemail-1.2.0/config: defaults.inc.php.orig

ticket-466-changes.patch Deleted

debian.changelog Changed

@@ -1,16 +1,23 @@
-roundcubemail (1:1.2.2-0~kolab1) unstable; urgency=low
+roundcubemail (1.2.2.0-0~kolab1) unstable; urgency=low
 
-  * upgrade to upstream Roundcube 1.2.2 release
+  * Check in maintenance upstream 1.2.2 release
 
- -- Timotheus Pokorra <tp@tbits.net>  Thu, 29  2016 08:42:00 +0200
+ -- Timotheus Pokorra <tp@tbits.net>  Thu, 29 Sep 2016 08:42:00 +0200
 
-roundcubemail (1:1.2~dev20160119-0~kolab2) unstable; urgency=low
+roundcubemail (1.2.0-0~kolab1) unstable; urgency=low
 
-  * apply security patch for XSS vulnerability CVE-2016-5103
+  * Check in stable 1.2.0 release
 
- -- Timotheus Pokorra <tp@tbits.net>  Fri, 27 May 2016 08:42:00 +0200
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  6 Jul 2016 07:14:39 +0200
 
-roundcubemail (1:1.2~dev20160119-0~kolab1) unstable; urgency=low
+roundcubemail (1:1.2~dev20160328-0~kolab1mic1) unstable; urgency=medium
+
+  * update to newer debian debhelper compat version
+  * add composer autoloader scripts
+
+ -- hede <kolab983@der-he.de>  Mon, 27 Jun 2016 11:18:01 +0200
+
+roundcubemail (1:1.2~dev20160328-0~kolab1) unstable; urgency=low
 
   * fix secure URL regex for debian