diff -Nru exim4-4.84/debian/changelog exim4-4.84/debian/changelog --- exim4-4.84/debian/changelog 2015-01-14 12:26:31.000000000 +0100 +++ exim4-4.84/debian/changelog 2015-03-19 23:11:10.000000000 +0100 @@ -1,3 +1,32 @@ +exim4 (4.84-8ubuntu1) vivid; urgency=low + + * Merge from Debian unstable. (LP: #1434300) Remaining changes: + - debian/control, debian/patches/fix_smtp_banner.patch: + + Show Ubuntu distribution in SMTP banner. + + Build-Depends on lsb-release. + - debian/control: + + Don't provide default-mta; in Ubuntu, + we want postfix to be the default. + + -- Artur Rona Thu, 19 Mar 2015 00:15:40 +0100 + +exim4 (4.84-8) unstable; urgency=medium + + * Pull 83_Remove-limit-on-remove_headers-item-size.-Bug-1533.patch and + 84_Fix-truncation-of-items-in-headers_remove-lists-this.patch from + upstream GIT which fix breakage of string-expansion in headers_remove + commands. (Thanks Gordon Dickens, for the pointer.) + + -- Andreas Metzler Tue, 17 Feb 2015 18:00:42 +0100 + +exim4 (4.84-7) unstable; urgency=medium + + * Tighten dependency of exim4 on exim4-base to (>= ${source:Version}) and + (<< ${source:Version}.1), at least source version, but not the next + sourceful upload. Closes: #777246 + + -- Andreas Metzler Sat, 07 Feb 2015 15:12:33 +0100 + exim4 (4.84-6ubuntu1) vivid; urgency=medium * Resynchronise with Debian. Remaining changes: @@ -4910,4 +4939,3 @@ -- Mark Baker Mon, 4 Mar 2002 23:04:52 +0000 - diff -Nru exim4-4.84/debian/control exim4-4.84/debian/control --- exim4-4.84/debian/control 2015-01-14 12:26:06.000000000 +0100 +++ exim4-4.84/debian/control 2015-02-18 11:09:08.000000000 +0100 @@ -123,7 +123,10 @@ Package: exim4 Architecture: all -Depends: ${misc:Depends}, debconf (>= 1.4.69) | cdebconf (>= 0.39), exim4-base (>= ${Upstream-Version}), exim4-daemon-light | exim4-daemon-heavy | exim4-daemon-custom +Depends: ${misc:Depends}, debconf (>= 1.4.69) | cdebconf (>= 0.39), + exim4-base (>= ${source:Version}), + exim4-base (<< ${source:Version}.1), + exim4-daemon-light | exim4-daemon-heavy | exim4-daemon-custom Description: metapackage to ease Exim MTA (v4) installation Exim (v4) is a mail transport agent. exim4 is the metapackage depending on the essential components for a basic exim4 installation. diff -Nru exim4-4.84/debian/patches/83_Remove-limit-on-remove_headers-item-size.-Bug-1533.patch exim4-4.84/debian/patches/83_Remove-limit-on-remove_headers-item-size.-Bug-1533.patch --- exim4-4.84/debian/patches/83_Remove-limit-on-remove_headers-item-size.-Bug-1533.patch 1970-01-01 01:00:00.000000000 +0100 +++ exim4-4.84/debian/patches/83_Remove-limit-on-remove_headers-item-size.-Bug-1533.patch 2015-02-17 17:56:19.000000000 +0100 @@ -0,0 +1,43 @@ +From 8bc732e8b03ebb4309f4b42626917148d176db49 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Sun, 5 Oct 2014 21:31:20 +0100 +Subject: [PATCH] Remove limit on remove_headers item size. Bug 1533 + +--- + doc/doc-txt/ChangeLog | 5 +++++ + src/src/transport.c | 3 +-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +| diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog +| index 76ecc20..0b03894 100644 +| --- a/doc/doc-txt/ChangeLog +| +++ b/doc/doc-txt/ChangeLog +| @@ -44,6 +44,11 @@ JH/05 Fix results-pipe from transport process. Several recipients, combined +| to notice due to the introduction of conection certificate information, +| the item size being so much larger. Found and fixed by Wolfgang Breyha. +| +| +JH/06 Bug 1533: Fix truncation of items in headers_remove lists. A fixed +| + size buffer was used, resulting in syntax errors when an expansion +| + exceeded it. +| + +| + +| Exim version 4.84 +| ----------------- +| TL/01 Bugzilla 1506: Re-add a 'return NULL' to silence complaints from static +diff --git a/src/transport.c b/src/transport.c +index 31437b1..15c30bf 100644 +--- a/src/transport.c ++++ b/src/transport.c +@@ -643,8 +643,7 @@ for (h = header_list; h != NULL; h = h->next) if (h->type != htype_old) + { + int sep = ':'; /* This is specified as a colon-separated list */ + uschar *s, *ss; +- uschar buffer[128]; +- while ((s = string_nextinlist(&list, &sep, buffer, sizeof(buffer)))) ++ while ((s = string_nextinlist(&list, &sep, NULL, 0))) + { + int len; + +-- +2.1.4 + diff -Nru exim4-4.84/debian/patches/84_Fix-truncation-of-items-in-headers_remove-lists-this.patch exim4-4.84/debian/patches/84_Fix-truncation-of-items-in-headers_remove-lists-this.patch --- exim4-4.84/debian/patches/84_Fix-truncation-of-items-in-headers_remove-lists-this.patch 1970-01-01 01:00:00.000000000 +0100 +++ exim4-4.84/debian/patches/84_Fix-truncation-of-items-in-headers_remove-lists-this.patch 2015-02-17 17:54:35.000000000 +0100 @@ -0,0 +1,28 @@ +From 97f83c7a669a525a5f5964a5c0708c311673b87f Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Thu, 29 Jan 2015 17:42:47 +0000 +Subject: [PATCH] Fix truncation of items in headers_remove lists, this time in + routers. Bug 1533 + +--- + src/src/routers/rf_get_munge_headers.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/routers/rf_get_munge_headers.c b/src/routers/rf_get_munge_headers.c +index a4a13b0..3125f31 100644 +--- a/src/routers/rf_get_munge_headers.c ++++ b/src/routers/rf_get_munge_headers.c +@@ -90,9 +90,8 @@ if (rblock->remove_headers) + uschar * list = rblock->remove_headers; + int sep = ':'; + uschar * s; +- uschar buffer[128]; + +- while ((s = string_nextinlist(&list, &sep, buffer, sizeof(buffer)))) ++ while ((s = string_nextinlist(&list, &sep, NULL, 0))) + if (!(s = expand_string(s))) + { + if (!expand_string_forcedfail) +-- +2.1.4 + diff -Nru exim4-4.84/debian/patches/series exim4-4.84/debian/patches/series --- exim4-4.84/debian/patches/series 2015-01-14 12:26:06.000000000 +0100 +++ exim4-4.84/debian/patches/series 2015-03-19 00:15:29.000000000 +0100 @@ -11,4 +11,6 @@ 80_mime_empty_charset.diff 81_buffer-overrun-in-spam-acl.diff 82_quoted-or-r-2047-encoded.diff +83_Remove-limit-on-remove_headers-item-size.-Bug-1533.patch +84_Fix-truncation-of-items-in-headers_remove-lists-this.patch fix_smtp_banner.patch