@@ -43,7 +43,7 @@

 Name:           roundcubemail

 Version:        1.1.0

-Release:        1%{?dist}

+Release:        2%{?dist}

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

@@ -2993,6 +2993,9 @@

 %defattr(-,root,root,-)

 %changelog

+* Sun Feb 15 2015 Daniel Hoffend <dh@dotlan.net> - - 1.1.0-2

+- Remove odfviewer configuration in roundcubemail.conf

+

 * Sat Feb 14 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.1.0-1

 - Final release of 1.1.0

​

@@ -1,3 +1,10 @@

+roundcubemail (1:1.1.0-0~kolab2) unstable; urgency=low

+

+  * Fix CSRF RewriteRules for Debian/Ubuntu #4573

+  * Remove odfviewer configuration in roundcubemail.conf

+

+ -- Daniel Hoffend <dh@dotlan.net>  Sun, 15 Feb 2015 23:58:00 +0100

+

 roundcubemail (1:1.1.0-0~kolab1) unstable; urgency=low

   * Stable upstream release 1.1.0

​

@@ -97,5 +97,8 @@

    mkdir -p $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available

    install -pm 644 $(CURDIR)/debian/conf/roundcubemail.conf $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available/roundcubemail.conf

+   # Install .htaccess cause rewrite rules in roundcubemail.conf are omitted thanks to default-vhost

+   install -pm 644 $(CURDIR)/debian/conf/.htaccess $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/public_html/.htaccess

+

 override_dh_compress:

    dh_compress -Xsql   

​

@@ -0,0 +1,6 @@

+# rewrite rule for CSRF

+RewriteEngine On

+RewriteCond %{REQUEST_URI}  ^/roundcubemail

+RewriteRule ^[a-f0-9]{16}(/.*) /roundcubemail/$1 [PT,L]

+RewriteCond %{REQUEST_URI}  ^/webmail

+RewriteRule ^[a-f0-9]{16}(/.*) /webmail/$1 [PT,L]

​

@@ -21,7 +21,7 @@

 <Directory "/usr/share/roundcubemail/public_html">

     Options +FollowSymLinks

-    AllowOverride None

+    AllowOverride FileInfo

     <ifModule mod_authz_core.c>

         Require all granted

     </ifModule>

​

@@ -39,14 +39,6 @@

     configure)

         fixperms

         update_database

-        if [ -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-available/000-default" ]; then

-            newConfigLines="\tRewriteEngine On\n \

-\tRewriteRule ^/roundcubemail/[a-f0-9]{16}/(.*) /roundcubemail/\$1 [PT,L]\n \

-\tRewriteRule ^/webmail/[a-f0-9]{16}/(.*) /webmail/\$1 [PT,L]\n"

-            sed -i -e "s~</VirtualHost>~$newConfigLines</VirtualHost>~" /etc/apache2/sites-enabled/000-default

-

-            sed -i -e "s~Rewrite~#Rewrite~g" /etc/apache2/sites-available/roundcubemail.conf

-        fi

         a2enmod rewrite

         if [ -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-enabled/roundcubemail.conf" ]; then

             a2ensite roundcubemail.conf

​

@@ -19,16 +19,6 @@

     </IfModule>

 </LocationMatch>

-<LocationMatch "/(roundcubemail|webmail)/assets/plugins/odfviewer/files/">

-    <IfModule mod_deflate.c>

-        SetOutputFilter NONE

-    </IfModule>

-

-    <IfModule mod_expires.c>

-        ExpiresActive Off

-    </IfModule>

-</LocationMatch>

-

 <Directory "/usr/share/roundcubemail/public_html">

     Options +FollowSymLinks

     AllowOverride None

​

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

 Source: roundcubemail

 Binary: roundcubemail

 Architecture: all

-Version: 1:1.1.0-0~kolab1

+Version: 1:1.1.0-0~kolab2

 Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>

 Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>

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

​