From: Vincent Bernat Date: Sat, 13 Dec 2008 13:36:02 +0000 (+0100) Subject: Imported Debian patch 0.2~alpha-3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2320bc24eaf182d86816d273ca7485ff6554e39c;p=roundcube.git Imported Debian patch 0.2~alpha-3 --- diff --git a/debian/changelog b/debian/changelog index 77fc14f..4f0290e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +roundcube (0.2~alpha-3) experimental; urgency=high + + [ Vincent Bernat ] + * Fix a vulnerability in the use of preg_replace (Closes: #508628). + * Adapt descriptions of roundcube-database packages to refer them as + metapackages instead of virtual package (Closes: #495434). + * Add robots.txt from upstream, even if in some configuration, it will + not be considered (Closes: #499108). + * Do not ship .htaccess files. Restrictions are set in Apache or + Lighttpd configuration files (Closes: #500202). + + [ Romain Beauxis ] + * Changed versioned dependency of rouncube from binary:Version to + source:Version since these are all architecture independent packages. + + -- Vincent Bernat Sat, 13 Dec 2008 14:36:02 +0100 + roundcube (0.2~alpha-2) experimental; urgency=low [ Vincent Bernat ] diff --git a/debian/control b/debian/control index e36adcc..e1057b2 100644 --- a/debian/control +++ b/debian/control @@ -23,11 +23,11 @@ Description: skinnable AJAX based webmail solution for IMAP servers The user interface is fully skinnable using XHTML and CSS 2. . This package provides the core code for roundcube. You should install - it along with one of the roundcube database virtual packages. + it along with one of the roundcube database metapackages. Package: roundcube Architecture: all -Depends: roundcube-sqlite | roundcube-db, roundcube-core (= ${binary:Version}) +Depends: roundcube-sqlite | roundcube-db, roundcube-core (= ${source:Version}) Description: skinnable AJAX based webmail solution for IMAP servers RoundCube Webmail is a browser-based multilingual IMAP client with an application-like user interface. It provides full functionality @@ -43,7 +43,7 @@ Architecture: all Depends: php5-mysql, mysql-client | virtual-mysql-client Suggests: mysql-server Provides: roundcube-db -Description: virtual package providing MySQL dependencies for RoundCube +Description: metapackage providing MySQL dependencies for RoundCube This package provides MySQL dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install this one if you want to use a MySQL database with RoundCube. @@ -53,7 +53,7 @@ Architecture: all Depends: php5-pgsql, postgresql-client-8.1 | postgresql-client Suggests: postgresql-server Provides: roundcube-db -Description: virtual package providing PostgreSQL dependencies for RoundCube +Description: metapackage providing PostgreSQL dependencies for RoundCube This package provides PostgreSQL dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install this one if you want to use a PostgreSQL database with RoundCube. @@ -62,7 +62,7 @@ Package: roundcube-sqlite Architecture: all Depends: php5-sqlite, sqlite Provides: roundcube-db -Description: virtual package providing sqlite dependencies for RoundCube +Description: metapackage providing sqlite dependencies for RoundCube This package provides sqlite dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install this one if you want to use a sqlite database with RoundCube. diff --git a/debian/control.in b/debian/control.in index cbfa75b..76e727a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,11 +23,11 @@ Description: skinnable AJAX based webmail solution for IMAP servers The user interface is fully skinnable using XHTML and CSS 2. . This package provides the core code for roundcube. You should install - it along with one of the roundcube database virtual packages. + it along with one of the roundcube database metapackages. Package: roundcube Architecture: all -Depends: roundcube-sqlite | roundcube-db, roundcube-core (= ${binary:Version}) +Depends: roundcube-sqlite | roundcube-db, roundcube-core (= ${source:Version}) Description: skinnable AJAX based webmail solution for IMAP servers RoundCube Webmail is a browser-based multilingual IMAP client with an application-like user interface. It provides full functionality @@ -43,7 +43,7 @@ Architecture: all Depends: php5-mysql, mysql-client | virtual-mysql-client Suggests: mysql-server Provides: roundcube-db -Description: virtual package providing MySQL dependencies for RoundCube +Description: metapackage providing MySQL dependencies for RoundCube This package provides MySQL dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install this one if you want to use a MySQL database with RoundCube. @@ -53,7 +53,7 @@ Architecture: all Depends: php5-pgsql, postgresql-client-8.1 | postgresql-client Suggests: postgresql-server Provides: roundcube-db -Description: virtual package providing PostgreSQL dependencies for RoundCube +Description: metapackage providing PostgreSQL dependencies for RoundCube This package provides PostgreSQL dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install this one if you want to use a PostgreSQL database with RoundCube. @@ -62,7 +62,7 @@ Package: roundcube-sqlite Architecture: all Depends: php5-sqlite, sqlite Provides: roundcube-db -Description: virtual package providing sqlite dependencies for RoundCube +Description: metapackage providing sqlite dependencies for RoundCube This package provides sqlite dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install this one if you want to use a sqlite database with RoundCube. diff --git a/debian/patches/dont-use-preg-e-option.patch b/debian/patches/dont-use-preg-e-option.patch new file mode 100644 index 0000000..1179a86 --- /dev/null +++ b/debian/patches/dont-use-preg-e-option.patch @@ -0,0 +1,121 @@ +--- roundcube-0.2~alpha/program/lib/html2text.php 2008-04-12 15:54:45.000000000 +0200 ++++ roundcube-0.2~alpha/program/lib/html2text.php 2008-12-13 14:21:44.000000000 +0100 +@@ -99,6 +99,22 @@ + */ + var $width = 70; + ++ /** ++ * List of preg* regular expression patterns to search for ++ * and replace using callback function. ++ * ++ * @var array $callback_search ++ * @access public ++ */ ++ var $callback_search = array( ++ '/<(h)[123456][^>]*>(.*?)<\/h[123456]>/i', // H1 - H3 ++ '/<(b)[^>]*>(.*?)<\/b>/i', // ++ '/<(strong)[^>]*>(.*?)<\/strong>/i', // ++ '/<(a) [^>]*href=("|\')([^"\']+)\2[^>]*>(.*?)<\/a>/i', ++ // ++ '/<(th)[^>]*>(.*?)<\/th>/i', // and ++ ); ++ + /** + * List of preg* regular expression patterns to search for, + * used in conjunction with $replace. +@@ -112,12 +128,8 @@ + "/[\n\t]+/", // Newlines and tabs + '/]*>.*?<\/script>/i', //