From a0eb5ad64584d5b5f69ccfb909be65690a61ce61 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Mon, 18 Oct 2010 17:39:44 +0000 Subject: [PATCH] Add a patch to avoid duplicate boundaries in headers when adding an attachment. Closes: #599586. --- debian/changelog | 4 +++- debian/patches/fix-599586.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-599586.patch diff --git a/debian/changelog b/debian/changelog index c281558..347654c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ roundcube (0.3.1-6) UNRELEASED; urgency=low Closes: #596181. * Update Portuguese debconf translation, thanks to Christian Perrier. Closes: #599575. + * Add a patch to avoid duplicate boundaries in headers when adding an + attachment. Closes: #599586. - -- Vincent Bernat Sat, 09 Oct 2010 11:19:15 +0200 + -- Vincent Bernat Mon, 18 Oct 2010 19:39:09 +0200 roundcube (0.3.1-5) unstable; urgency=low diff --git a/debian/patches/fix-599586.patch b/debian/patches/fix-599586.patch new file mode 100644 index 0000000..2ac3d77 --- /dev/null +++ b/debian/patches/fix-599586.patch @@ -0,0 +1,21 @@ +Fix #599586 which was caused by duplicate boundaries. The fix is to +simply use _addMixedPart from original Mail_Mime class which is recent +enough in our case. + +--- roundcube/program/include/rcube_mail_mime.php~ 2009-05-01 19:58:12.000000000 +0200 ++++ roundcube/program/include/rcube_mail_mime.php 2010-10-18 19:31:33.751930400 +0200 +@@ -102,12 +102,12 @@ + * @return object The multipart/mixed mimePart object + * @access private + */ +- function &_addMixedPart() ++ /* function &_addMixedPart() + { + $params['content_type'] = $this->_headers['Content-Type'] ? $this->_headers['Content-Type'] : 'multipart/mixed'; + $ret = new Mail_mimePart('', $params); + return $ret; +- } ++ } */ + + + /** diff --git a/debian/patches/series b/debian/patches/series index b2874f4..8d2af00 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ dont-limit-email-local-part.patch disable-dns-prefetch.patch default-charset-utf8.patch received-headers-sa.patch +fix-599586.patch -- 2.39.2