From 9f97ce8c737b4b6006f78ac1ba6a5811db8b455e Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Tue, 17 Jun 2008 00:33:40 +0200 Subject: [PATCH] Imported Debian patch 0.1.1-5 --- debian/changelog | 8 ++++++++ debian/control | 2 +- debian/control.in | 2 +- .../patches/messageid-headers-ordering.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 debian/patches/messageid-headers-ordering.patch diff --git a/debian/changelog b/debian/changelog index e2eb11a..cd80e9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +roundcube (0.1.1-5) unstable; urgency=low + + * Fix ordering of message-id in message headers, thanks to Reinhard + Tartler (Closes: #486493) + * Update Standards-Version to 3.8.0 + + -- Vincent Bernat Tue, 17 Jun 2008 00:33:40 +0200 + roundcube (0.1.1-4) unstable; urgency=low * Add Slovak debconf translation, thanks to Ivan Masár (Closes: #481376) diff --git a/debian/control b/debian/control index 954b66e..845f7c3 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian Roundcube Maintainers , Romain Beauxis Build-Depends: debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), po-debconf Homepage: http://www.roundcube.net/ -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/roundcube Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube diff --git a/debian/control.in b/debian/control.in index 39a92cb..af9fe6e 100644 --- a/debian/control.in +++ b/debian/control.in @@ -5,7 +5,7 @@ Maintainer: Debian Roundcube Maintainers , Romain Beauxis Build-Depends: @cdbs@, po-debconf Homepage: http://www.roundcube.net/ -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/roundcube Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube diff --git a/debian/patches/messageid-headers-ordering.patch b/debian/patches/messageid-headers-ordering.patch new file mode 100644 index 0000000..109d2af --- /dev/null +++ b/debian/patches/messageid-headers-ordering.patch @@ -0,0 +1,18 @@ +--- roundcubemail/program/steps/mail/sendmail.inc (revision 1232) ++++ roundcubemail/program/steps/mail/sendmail.inc (revision 1261) +@@ -211,7 +211,4 @@ + + // additional headers +-$headers['Message-ID'] = $message_id; +-$headers['X-Sender'] = $from; +- + if ($CONFIG['http_received_header']) + { +@@ -224,4 +221,7 @@ + } + ++$headers['Message-ID'] = $message_id; ++$headers['X-Sender'] = $from; ++ + if (!empty($CONFIG['useragent'])) + $headers['User-Agent'] = $CONFIG['useragent']; diff --git a/debian/patches/series b/debian/patches/series index 2bb76e7..44004ec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ use-db-backend.patch correct-magic-path.patch disable-tinymce-spellchecker.patch mysql-update-fix.patch +messageid-headers-ordering.patch -- 2.39.2