From: Vincent Bernat Date: Sat, 7 Nov 2009 16:41:37 +0000 (+0100) Subject: Imported Debian patch 0.3.1-1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=082b0b4208b3295cb86375499339474bff2be54c;p=roundcube.git Imported Debian patch 0.3.1-1 --- diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian new file mode 100644 index 0000000..2bd82c1 --- /dev/null +++ b/debian/NEWS.Debian @@ -0,0 +1,15 @@ +roundcube (0.3-3) unstable; urgency=low + + * Starting from Roundcube 0.3, an incompatibility with Suhosin session + encryption is present. This can be resolved by tuning php.ini for + Roundcube with the "suhosin.session.encrypt" set to "Off". + + We ship a .htaccess in /var/lib/roundcube to disable this + option. However, this only works with a webserver like Apache with + mod_php. If you are using a webserver with PHP configured as a *CGI + process, you need to tune the php.ini for this process: either turn of + globally Suhosin session encryption in /etc/php5/conf.d/suhosin or you + can provide your own php.ini to php5-cgi with "-c" option. + + -- Vincent Bernat Mon, 02 Nov 2009 19:48:22 +0100 + diff --git a/debian/changelog b/debian/changelog index a77c67f..4d477ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +roundcube (0.3.1-1) unstable; urgency=low + + * New upstream release. + * Add a notice in NEWS.Debian about php.ini options that should be set + to get Roundcube working properly. Closes: #549428, #552508. + + -- Vincent Bernat Sat, 07 Nov 2009 17:41:37 +0100 + roundcube (0.3-2) unstable; urgency=low * Really fix #544579 since the default value is null without diff --git a/debian/patches/dbconfig-common_support.patch b/debian/patches/dbconfig-common_support.patch index f6f01c2..61938fa 100644 --- a/debian/patches/dbconfig-common_support.patch +++ b/debian/patches/dbconfig-common_support.patch @@ -2,17 +2,19 @@ The default db.inc.php is modified to adapt it to the use of dbconfig-common pac --- roundcube_0.1~beta2.2/config/db.inc.php.dist 2006-03-20 23:08:51.000000000 +0100 +++ roundcube_0.1~beta2.2/config/db.inc.php.dist 2007-03-13 14:33:38.000000000 +0100 -@@ -14,13 +14,20 @@ +@@ -14,15 +14,20 @@ $rcmail_config = array(); -// PEAR database DSN for read/write operations -// format is db_provider://user:password@host/database +-// For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php -// currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql - -$rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail'; -// postgres example: 'pgsql://roundcube:pass@localhost/roundcubemail'; --// sqlite example: 'sqlite://./sqlite.db?mode=0646'; +-// Warning: for SQLite use absolute path in DSN: +-// sqlite example: 'sqlite:////full/path/to/sqlite.db?mode=0646'; +/* Do not set db_dsnw here, use dpkg-reconfigure roundcube to configure database ! */ + +include_once("/etc/roundcube/debian-db.php"); @@ -30,4 +32,3 @@ The default db.inc.php is modified to adapt it to the use of dbconfig-common pac // PEAR database DSN for read only operations (if empty write database will be used) // useful for database replication - diff --git a/debian/rules b/debian/rules index d737fee..9b7dccb 100755 --- a/debian/rules +++ b/debian/rules @@ -41,6 +41,7 @@ binary-install/roundcube-core:: find $(CURDIR)/debian/roundcube-core/usr/share/roundcube -type f -print0 | xargs -r0 chmod -x # Remove useless file rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/*.sh + rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/decrypt.php find $(CURDIR)/debian/roundcube-core -name '._*' -print0 | xargs -r0 rm find $(CURDIR)/debian/roundcube-core -name '*.js.src' -print0 | xargs -r0 rm # Remove files shipped in tinymce package