From: Vincent Bernat Date: Sat, 29 Sep 2012 09:32:19 +0000 (+0200) Subject: Refresh all patches. X-Git-Url: https://git.donarmstrong.com/?p=roundcube.git;a=commitdiff_plain;h=5073df0f02f556142911afec7b1bfa193eb0de7a Refresh all patches. --- diff --git a/debian/patches/correct_install_path.patch b/debian/patches/correct_install_path.patch index 6afa098..8970045 100644 --- a/debian/patches/correct_install_path.patch +++ b/debian/patches/correct_install_path.patch @@ -1,15 +1,15 @@ Install path is /var/lib/roundcube for Debian. Don't try to guess it. -Index: b/program/include/iniset.php +Index: roundcube/program/include/iniset.php =================================================================== ---- a/program/include/iniset.php 2010-07-17 17:33:04.000000000 +0200 -+++ b/program/include/iniset.php 2010-07-17 17:33:23.000000000 +0200 -@@ -42,7 +42,7 @@ +--- roundcube.orig/program/include/iniset.php 2012-09-29 11:30:58.643126935 +0200 ++++ roundcube/program/include/iniset.php 2012-09-29 11:31:44.360041205 +0200 +@@ -43,7 +43,7 @@ define('RCMAIL_START', microtime(true)); if (!defined('INSTALL_PATH')) { - define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/'); + define('INSTALL_PATH', '/var/lib/roundcube/'); } - + if (!defined('RCMAIL_CONFIG_DIR')) { diff --git a/debian/patches/cve-2012-3508.patch b/debian/patches/cve-2012-3508.patch index 07914b1..0da56c8 100644 --- a/debian/patches/cve-2012-3508.patch +++ b/debian/patches/cve-2012-3508.patch @@ -4,8 +4,8 @@ See: Index: roundcube/program/js/app.js.src =================================================================== ---- roundcube.orig/program/js/app.js.src 2012-04-28 10:26:30.133307979 +0200 -+++ roundcube/program/js/app.js.src 2012-08-26 14:19:04.611476200 +0200 +--- roundcube.orig/program/js/app.js.src 2012-09-29 11:30:55.775069564 +0200 ++++ roundcube/program/js/app.js.src 2012-09-29 11:31:50.300159966 +0200 @@ -3183,8 +3183,7 @@ input_message = $("[name='_message']"), message = input_message.val(), @@ -70,8 +70,8 @@ Index: roundcube/program/js/app.js.src this.env.identity = id; Index: roundcube/program/steps/mail/compose.inc =================================================================== ---- roundcube.orig/program/steps/mail/compose.inc 2012-02-04 09:18:15.186795165 +0100 -+++ roundcube/program/steps/mail/compose.inc 2012-08-26 14:19:04.615476279 +0200 +--- roundcube.orig/program/steps/mail/compose.inc 2012-09-29 11:30:55.775069564 +0200 ++++ roundcube/program/steps/mail/compose.inc 2012-09-29 11:31:50.304160044 +0200 @@ -520,7 +520,7 @@ function rcmail_compose_header_from($attrib) diff --git a/debian/patches/dbconfig-common_support.patch b/debian/patches/dbconfig-common_support.patch index 574c67e..fb61443 100644 --- a/debian/patches/dbconfig-common_support.patch +++ b/debian/patches/dbconfig-common_support.patch @@ -1,9 +1,9 @@ The default db.inc.php is modified to adapt it to the use of dbconfig-common package. -Index: b/config/db.inc.php.dist +Index: roundcube/config/db.inc.php.dist =================================================================== ---- a/config/db.inc.php.dist 2010-07-17 17:33:04.000000000 +0200 -+++ b/config/db.inc.php.dist 2010-07-17 17:33:23.000000000 +0200 +--- roundcube.orig/config/db.inc.php.dist 2012-09-29 11:31:38.219918435 +0200 ++++ roundcube/config/db.inc.php.dist 2012-09-29 11:31:42.800010013 +0200 @@ -14,15 +14,20 @@ $rcmail_config = array(); diff --git a/debian/patches/debianize_password_plugin.patch b/debian/patches/debianize_password_plugin.patch index 3b23ab2..5186ef0 100644 --- a/debian/patches/debianize_password_plugin.patch +++ b/debian/patches/debianize_password_plugin.patch @@ -2,10 +2,10 @@ Description: specify Debian path and group names in password plugin Forwarded: not-needed Author: Jérémy Bobbio -diff --git a/plugins/password/README b/plugins/password/README -index 81e4f1e..bdb8264 100644 ---- a/plugins/password/README -+++ b/plugins/password/README +Index: roundcube/plugins/password/README +=================================================================== +--- roundcube.orig/plugins/password/README 2012-09-29 11:30:56.595085968 +0200 ++++ roundcube/plugins/password/README 2012-09-29 11:31:48.628126539 +0200 @@ -133,7 +133,8 @@ Installation: @@ -16,7 +16,7 @@ index 81e4f1e..bdb8264 100644 documented within it. Compile the wrapper program: -@@ -200,7 +201,8 @@ +@@ -202,7 +203,8 @@ ---------------------------- As in sasl driver this one allows to change password using shell @@ -26,7 +26,7 @@ index 81e4f1e..bdb8264 100644 installation instructions. See also config.inc.php.dist file. -@@ -225,8 +227,9 @@ +@@ -227,8 +229,9 @@ Driver that adds functionality to change the systems user password via the 'chpasswd' command. See config.inc.php.dist file. @@ -38,10 +38,10 @@ index 81e4f1e..bdb8264 100644 2.12. LDAP - no PEAR (ldap_simple) -diff --git a/plugins/password/drivers/chgsaslpasswd.c b/plugins/password/drivers/chgsaslpasswd.c -index bcdcb2e..2c3bbf9 100644 ---- a/plugins/password/drivers/chgsaslpasswd.c -+++ b/plugins/password/drivers/chgsaslpasswd.c +Index: roundcube/plugins/password/drivers/chgsaslpasswd.c +=================================================================== +--- roundcube.orig/plugins/password/drivers/chgsaslpasswd.c 2012-09-29 11:30:56.595085968 +0200 ++++ roundcube/plugins/password/drivers/chgsaslpasswd.c 2012-09-29 11:31:48.628126539 +0200 @@ -8,7 +8,7 @@ /* INSTALLING: @@ -51,10 +51,10 @@ index bcdcb2e..2c3bbf9 100644 strip chgsaslpasswd chmod 4550 chgsaslpasswd */ -diff --git a/plugins/password/drivers/chgvirtualminpasswd.c b/plugins/password/drivers/chgvirtualminpasswd.c -index 4e2299c..12989c6 100644 ---- a/plugins/password/drivers/chgvirtualminpasswd.c -+++ b/plugins/password/drivers/chgvirtualminpasswd.c +Index: roundcube/plugins/password/drivers/chgvirtualminpasswd.c +=================================================================== +--- roundcube.orig/plugins/password/drivers/chgvirtualminpasswd.c 2012-09-29 11:30:56.595085968 +0200 ++++ roundcube/plugins/password/drivers/chgvirtualminpasswd.c 2012-09-29 11:31:48.640126779 +0200 @@ -7,7 +7,7 @@ /* INSTALLING: diff --git a/debian/patches/default-charset-utf8.patch b/debian/patches/default-charset-utf8.patch index 8e840b2..8159629 100644 --- a/debian/patches/default-charset-utf8.patch +++ b/debian/patches/default-charset-utf8.patch @@ -1,10 +1,10 @@ Switch to UTF-8 as default charset -Index: b/config/main.inc.php.dist +Index: roundcube/config/main.inc.php.dist =================================================================== ---- a/config/main.inc.php.dist 2010-07-17 17:33:24.000000000 +0200 -+++ b/config/main.inc.php.dist 2010-07-17 17:33:25.000000000 +0200 -@@ -489,7 +489,7 @@ +--- roundcube.orig/config/main.inc.php.dist 2012-09-29 11:31:46.232078634 +0200 ++++ roundcube/config/main.inc.php.dist 2012-09-29 11:31:47.872111424 +0200 +@@ -646,7 +646,7 @@ // ---------------------------------- // Use this charset as fallback for message decoding diff --git a/debian/patches/loginbox-size.patch b/debian/patches/loginbox-size.patch index 74c693f..830ed1a 100644 --- a/debian/patches/loginbox-size.patch +++ b/debian/patches/loginbox-size.patch @@ -1,10 +1,10 @@ Fix size of login box to accommodate sk_SK locale -Index: b/skins/default/common.css +Index: roundcube/skins/default/common.css =================================================================== ---- a/skins/default/common.css 2009-10-06 12:00:33.000000000 +0200 -+++ b/skins/default/common.css 2010-07-17 17:33:24.000000000 +0200 -@@ -677,7 +677,7 @@ +--- roundcube.orig/skins/default/common.css 2012-09-29 11:30:57.427102611 +0200 ++++ roundcube/skins/default/common.css 2012-09-29 11:31:47.080095589 +0200 +@@ -731,7 +731,7 @@ margin-left: auto; margin-right: auto; margin-top: 50px; diff --git a/debian/patches/use-debian-jquery-ui.patch b/debian/patches/use-debian-jquery-ui.patch index e9173cb..5c209ba 100644 --- a/debian/patches/use-debian-jquery-ui.patch +++ b/debian/patches/use-debian-jquery-ui.patch @@ -1,10 +1,10 @@ Use packaged libjs-jquery-ui. -diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php -index 7ed2018..5f4545c 100644 ---- a/plugins/jqueryui/jqueryui.php -+++ b/plugins/jqueryui/jqueryui.php -@@ -21,18 +21,18 @@ class jqueryui extends rcube_plugin +Index: roundcube/plugins/jqueryui/jqueryui.php +=================================================================== +--- roundcube.orig/plugins/jqueryui/jqueryui.php 2012-09-29 11:30:56.195077966 +0200 ++++ roundcube/plugins/jqueryui/jqueryui.php 2012-09-29 11:31:49.528144533 +0200 +@@ -21,18 +21,18 @@ $this->load_config(); // include UI scripts diff --git a/debian/patches/use_packaged_tinymce.patch b/debian/patches/use_packaged_tinymce.patch index 4382673..15c6bd1 100644 --- a/debian/patches/use_packaged_tinymce.patch +++ b/debian/patches/use_packaged_tinymce.patch @@ -1,10 +1,10 @@ Use tinymce from tinycme package instead of the shipped one. -Index: b/program/steps/mail/sendmail.inc +Index: roundcube/program/steps/mail/sendmail.inc =================================================================== ---- a/program/steps/mail/sendmail.inc 2009-10-14 12:52:27.000000000 +0200 -+++ b/program/steps/mail/sendmail.inc 2010-07-17 17:33:23.000000000 +0200 -@@ -115,7 +115,7 @@ +--- roundcube.orig/program/steps/mail/sendmail.inc 2012-09-29 11:30:58.259119253 +0200 ++++ roundcube/program/steps/mail/sendmail.inc 2012-09-29 11:31:45.368061359 +0200 +@@ -118,7 +118,7 @@ // sanitize image name so resulting attachment doesn't leave images dir $image_name = preg_replace('/[^a-zA-Z0-9_\.\-]/i', '', $image_name); diff --git a/debian/patches/use_pspell.patch b/debian/patches/use_pspell.patch index d50c423..ac8618a 100644 --- a/debian/patches/use_pspell.patch +++ b/debian/patches/use_pspell.patch @@ -1,10 +1,10 @@ Instead of using Google by default, we use pspell to avoid to send each mail to Google... -Index: b/config/main.inc.php.dist +Index: roundcube/config/main.inc.php.dist =================================================================== ---- a/config/main.inc.php.dist 2010-07-17 17:33:23.000000000 +0200 -+++ b/config/main.inc.php.dist 2010-07-17 17:33:24.000000000 +0200 -@@ -376,7 +376,7 @@ +--- roundcube.orig/config/main.inc.php.dist 2012-09-29 11:30:57.895111972 +0200 ++++ roundcube/config/main.inc.php.dist 2012-09-29 11:31:46.232078634 +0200 +@@ -441,7 +441,7 @@ // Set the spell checking engine. 'googie' is the default. 'pspell' is also available, // but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. diff --git a/debian/patches/uuencoded-attachments.patch b/debian/patches/uuencoded-attachments.patch index fb48aed..72741f2 100644 --- a/debian/patches/uuencoded-attachments.patch +++ b/debian/patches/uuencoded-attachments.patch @@ -7,8 +7,10 @@ Source: Patch from Michał Mirosław. ---- a/program/include/rcube_message.php.orig 2012-01-17 08:50:40.000000000 +0100 -+++ a/program/include/rcube_message.php 2012-09-06 19:54:54.000000000 +0200 +Index: roundcube/program/include/rcube_message.php +=================================================================== +--- roundcube.orig/program/include/rcube_message.php 2012-09-29 11:30:54.555045159 +0200 ++++ roundcube/program/include/rcube_message.php 2012-09-29 11:31:51.044174849 +0200 @@ -622,8 +622,7 @@ $part->body = $this->imap->get_message_part($this->uid, $part->mime_id, $part);