diff -Nru exim4-4.84~RC1/debian/changelog exim4-4.84~RC1/debian/changelog --- exim4-4.84~RC1/debian/changelog 2014-08-02 03:29:18.000000000 -0400 +++ exim4-4.84~RC1/debian/changelog 2014-08-04 11:50:20.000000000 -0400 @@ -1,3 +1,15 @@ +exim4 (4.84~RC1-3ubuntu1) utopic; urgency=low + + * Merge from Debian unstable (LP: #1351470). Remaining changes: + - Show Ubuntu distribution on smtp: + + debian/patches/fix_smtp_banner.patch: updated SMTP banner + with Ubuntu distribution + + debian/control: added lsb-release build dependency + - Don't provide default-mta; in Ubuntu, we want postfix to be the + default. + + -- Corey Bryant Mon, 04 Aug 2014 11:48:39 -0400 + exim4 (4.84~RC1-3) unstable; urgency=medium * Third try. Simply comment *custom* in debian/control. @@ -66,6 +78,18 @@ -- Andreas Metzler Thu, 29 May 2014 13:09:04 +0200 +exim4 (4.82.1-2ubuntu1) utopic; urgency=low + + * Merge from Debian unstable (LP: #1348074). Remaining changes: + - Show Ubuntu distribution on smtp: + + debian/patches/fix_smtp_banner.patch: updated SMTP banner + with Ubuntu distribution + + debian/control: added lsb-release build dependency + - Don't provide default-mta; in Ubuntu, we want postfix to be the + default. + + -- Robie Basak Fri, 25 Jul 2014 15:53:09 +0000 + exim4 (4.82.1-2) unstable; urgency=high * [87_double_expansion.diff] from upstream. Stop unwanted double expansion @@ -83,6 +107,18 @@ -- Andreas Metzler Wed, 28 May 2014 19:01:43 +0200 +exim4 (4.82-8ubuntu1) utopic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Show Ubuntu distribution on smtp: + + debian/patches/fix_smtp_banner.patch: updated SMTP banner + with Ubuntu distribution + + debian/control: added lsb-release build dependency + - Don't provide default-mta; in Ubuntu, we want postfix to be the + default. + + -- Dimitri John Ledkov Sat, 17 May 2014 01:50:20 +0100 + exim4 (4.82-8) unstable; urgency=medium * Now that GMP has been relicensed to LGPLv3+/GPLv2+ build exim against @@ -146,6 +182,26 @@ -- Andreas Metzler Sun, 09 Feb 2014 19:41:34 +0100 +exim4 (4.82-3ubuntu2) trusty; urgency=medium + + * debian/tests/control: Add missing python test dependency, as + debian/tests/security calls python. + + -- Martin Pitt Tue, 25 Feb 2014 17:33:13 +0100 + +exim4 (4.82-3ubuntu1) trusty; urgency=low + + * Merge from Debian unstable (LP: #1259620). Remaining changes: + - Show Ubuntu distribution on smtp: + + debian/patches/fix_smtp_banner.patch: updated SMTP banner + with Ubuntu distribution + + debian/control: added lsb-release build dependency + - Don't provide default-mta; in Ubuntu, we want postfix to be the + default. + - Build-depend on db5.3. + + -- Yolanda Robla Tue, 10 Dec 2013 17:07:20 +0000 + exim4 (4.82-3) unstable; urgency=low * Upload to unstable. @@ -226,6 +282,21 @@ -- Andreas Metzler Sun, 29 Sep 2013 14:43:25 +0200 +exim4 (4.80-9ubuntu2) trusty; urgency=low + + * Build-depend on libdb5.3-dev, instead of libdb5.1-dev. + + -- Dmitrijs Ledkovs Mon, 04 Nov 2013 12:14:54 +0000 + +exim4 (4.80-9ubuntu1) trusty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Don't provide default-mta; in Ubuntu, we want postfix to be the + default. + - Add "Ubuntu" to SMTP banner. + + -- Colin Watson Mon, 28 Oct 2013 11:55:21 -0700 + exim4 (4.80-9) unstable; urgency=low * Upload to unstable. @@ -272,6 +343,34 @@ -- Andreas Metzler Sun, 01 Sep 2013 15:58:49 +0200 +exim4 (4.80-7ubuntu4) trusty; urgency=low + + * Rebuild for Perl 5.18. + + -- Colin Watson Wed, 23 Oct 2013 10:24:08 +0100 + +exim4 (4.80-7ubuntu3) saucy; urgency=low + + * debian/patches/fix_smtp_banner.patch: updated SMTP banner + with Ubuntu distribution + * debian/control: added lsb-release build dependency + + -- Yolanda Robla Tue, 18 Jun 2013 19:17:43 +0200 + +exim4 (4.80-7ubuntu2) saucy; urgency=low + + * debian/tests: Add autopkgtest. + + -- Yolanda Mon, 27 May 2013 11:31:35 +0200 + +exim4 (4.80-7ubuntu1) raring; urgency=low + + * Merge from Debian unstable (LP: #1166383). Remaining changes: + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, + we want postfix to be the default. + + -- Robie Basak Mon, 08 Apr 2013 18:13:15 +0100 + exim4 (4.80-7) unstable; urgency=low * Use exim's ${quote:xxx} operator when invoking spfquery to disallow @@ -291,6 +390,14 @@ -- Andreas Metzler Wed, 21 Nov 2012 19:08:53 +0100 +exim4 (4.80-5.1ubuntu1) raring; urgency=low + + * Merge from Debian. Remaining changes: + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, + we want postfix to be the default. + + -- Oussama Bounaim Sun, 11 Nov 2012 07:11:06 +0100 + exim4 (4.80-5.1) unstable; urgency=high * Non-maintainer upload by the Security Team. @@ -318,6 +425,23 @@ -- Andreas Metzler Sat, 23 Jun 2012 18:35:03 +0200 +exim4 (4.80-3ubuntu1.1) quantal-security; urgency=low + + * SECURITY UPDATE: arbitrary code execution via dns decode logic + - debian/patches/CVE-2012-5671.patch: adjust max length and validate + against it in src/pdkim/pdkim.h, src/dkim.c. + - CVE-2012-5671 + + -- Marc Deslauriers Thu, 25 Oct 2012 08:22:46 -0400 + +exim4 (4.80-3ubuntu1) quantal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, + we want postfix to be the default. + + -- Clint Byrum Thu, 14 Jun 2012 15:28:08 -0700 + exim4 (4.80-3) unstable; urgency=low * Pull 75_openssl_sni.diff from upstream. - Segfault caused by NULL @@ -465,6 +589,26 @@ -- Andreas Metzler Sat, 24 Sep 2011 18:36:08 +0200 +exim4 (4.76-3ubuntu3) precise; urgency=low + + * Rebuild for libmysqlclient transition + + -- Clint Byrum Wed, 23 Nov 2011 23:29:35 -0800 + +exim4 (4.76-3ubuntu2) precise; urgency=low + + * Rebuild for Perl 5.14. + + -- Colin Watson Wed, 16 Nov 2011 01:22:39 +0000 + +exim4 (4.76-3ubuntu1) precise; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, + we want postfix to be the default. + + -- Stéphane Graber Thu, 20 Oct 2011 11:29:07 -0400 + exim4 (4.76-3) unstable; urgency=low * [exim4-base.cron.daily] Correct invocation of mail(1), options need to be @@ -485,6 +629,14 @@ -- Andreas Metzler Sun, 18 Sep 2011 11:49:13 +0200 +exim4 (4.76-2ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, + we want postfix to be the default. + + -- Stéphane Graber Mon, 30 May 2011 17:48:56 -0400 + exim4 (4.76-2) unstable; urgency=low * debian/rules: Remove test/ and test-stamp on clean. @@ -497,6 +649,14 @@ -- Andreas Metzler Sun, 29 May 2011 18:21:03 +0200 +exim4 (4.76-1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes (LP: #779391): + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, + we want postfix to be the default. + + -- Stéphane Graber Mon, 23 May 2011 12:37:30 -0400 + exim4 (4.76-1) unstable; urgency=low * New upstream version. @@ -543,6 +703,14 @@ -- Andreas Metzler Fri, 06 May 2011 20:08:51 +0200 +exim4 (4.75-2ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, + we want postfix to be the default. + + -- Stéphane Graber Fri, 06 May 2011 14:51:28 -0400 + exim4 (4.75-2) unstable; urgency=low * clamav socket on Debian is clamd:/var/run/clamav/clamd.ctl, fix @@ -585,6 +753,24 @@ -- Andreas Metzler Thu, 24 Feb 2011 19:02:07 +0100 +exim4 (4.74-1ubuntu1) natty; urgency=low + + * Merge from debian experimental. Remaining changes: (LP: #713855) + - debian/patches/71_exiq_grep_error_on_messages_without_size.patch: + + Improve handling of broken messages when "exim4 -bp" (mailq) + reports lines without size info. (Closes: #528625) + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, + we want postfix to be the default. + - debian/{control,rules}: Add and enable hardened build for PIE. + (Closes: #542726) + * Update 71_exiq_grep_error_on_messages_without_size.patch to get way + which upstream has fixed it. Probably it can be dropped with next + upstream release. + * This upload fixes CVE: (LP: #708023) + - CVE-2011-0017 + + -- Artur Rona Wed, 09 Feb 2011 21:31:35 +0100 + exim4 (4.74-1) experimental; urgency=low * 4.74 release, should build on hurd again. @@ -610,6 +796,20 @@ -- Andreas Metzler Sun, 23 Jan 2011 14:02:36 +0100 +exim4 (4.73~rc1-1ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: (LP: #697934) + - debian/patches/71_exiq_grep_error_on_messages_without_size.patch: + + Improve handling of broken messages when "exim4 -bp" (mailq) + reports lines without size info. + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, + we want postfix to be the default. + - debian/{control,rules}: Add and enable hardened build for PIE. + (Closes: #542726) + * Drop B-D on libmysqlclient15-dev, resolved in Debian. + + -- Artur Rona Tue, 28 Dec 2010 22:20:17 +0100 + exim4 (4.73~rc1-1) experimental; urgency=low * New upstream release candidate. @@ -705,6 +905,20 @@ -- Andreas Metzler Sun, 26 Dec 2010 15:13:08 +0100 +exim4 (4.72-2ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: (LP: #671615) + - debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: + Improve handling of broken messages when "exim4 -bp" (mailq) reports + lines without size info. + - Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be + the default. + - debian/control: Change build dependencies to MySQL 5.1. + - debian/{control,rules}: add and enable hardened build for PIE + (Closes: #542726). + + -- Artur Rona Fri, 05 Nov 2010 21:05:47 +0100 + exim4 (4.72-2) unstable; urgency=low [ Marc Haber ] @@ -728,6 +942,20 @@ -- Andreas Metzler Sat, 30 Oct 2010 13:38:26 +0200 +exim4 (4.72-1ubuntu1) maverick; urgency=low + + * Merge with Debian unstable (LP: #609620). Remaining changes: + + debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: + Improve handling of broken messages when "exim4 -bp" (mailq) reports + lines without size info. + + Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be + the default. + + debian/control: Change build dependencies to MySQL 5.1. + + debian/{control,rules}: add and enable hardened build for PIE + (Closes: #542726). + + -- Artur Rona Sun, 25 Jul 2010 02:00:42 +0200 + exim4 (4.72-1) unstable; urgency=low * New upstream release. (Identical to the git snapshot previously @@ -779,6 +1007,20 @@ -- Andreas Metzler Thu, 25 Mar 2010 17:34:30 +0100 +exim4 (4.71-3ubuntu1) lucid; urgency=low + + * Merge with Debian unstable (lp: #501657). Remaining changes: + + debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: + Improve handling of broken messages when "exim4 -bp" (mailq) reports + lines without size info. + + Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be + the default. + + debian/control: Change build dependencies to MySQL 5.1. + + debian/{control,rules}: add and enable hardened build for PIE + (Debian bug 542726). + + -- Michael Bienia Fri, 01 Jan 2010 16:28:19 +0100 + exim4 (4.71-3) unstable; urgency=low * exim4-base.cron.daily: Do not run exim_tidydb on Berkeley DB logfiles. @@ -893,6 +1135,35 @@ -- Andreas Metzler Sat, 17 Oct 2009 14:26:54 +0200 +exim4 (4.69-11ubuntu4) karmic; urgency=low + + * debian/{control,rules}: add and enable hardened build for PIE + (Debian bug 542726). + + -- Kees Cook Thu, 20 Aug 2009 17:33:26 -0700 + +exim4 (4.69-11ubuntu3) karmic; urgency=low + + * debian/control: Change build dependencies to MySQL 5.1. + + -- Mathias Gug Mon, 17 Aug 2009 17:57:26 -0400 + +exim4 (4.69-11ubuntu2) karmic; urgency=low + + * Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be + the default. + + -- Steve Langasek Wed, 03 Jun 2009 15:39:14 +0000 + +exim4 (4.69-11ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #375923), remaining changes: + - debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: + Improve handling of broken messages when "exim4 -bp" (mailq) reports + lines without size info + + -- Thierry Carrez Wed, 13 May 2009 12:15:29 +0200 + exim4 (4.69-11) unstable; urgency=medium * Build-Depend on lynx-cur|lynx instead of lynx. (lynx is just a dummy @@ -950,6 +1221,15 @@ -- Andreas Metzler Sat, 02 May 2009 09:05:56 +0200 +exim4 (4.69-9ubuntu1) jaunty; urgency=low + + [ Daniel van Eeden ] + * debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: + Improve handling of broken messages when "exim4 -bp" (mailq) reports lines + w/o size info, LP: #18194 + + -- Dustin Kirkland Wed, 11 Feb 2009 06:43:52 -0600 + exim4 (4.69-9) unstable; urgency=medium * [update-exim4.conf]: Use POSIX character classes [:alnum:] or explicit @@ -4530,4 +4810,3 @@ -- Mark Baker Mon, 4 Mar 2002 23:04:52 +0000 - diff -Nru exim4-4.84~RC1/debian/control exim4-4.84~RC1/debian/control --- exim4-4.84~RC1/debian/control 2014-08-02 03:28:26.000000000 -0400 +++ exim4-4.84~RC1/debian/control 2014-08-02 12:41:27.000000000 -0400 @@ -1,7 +1,8 @@ Source: exim4 Section: mail Priority: standard -Maintainer: Exim4 Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Exim4 Maintainers Uploaders: Andreas Metzler ,Marc Haber Homepage: http://www.exim.org/ Standards-Version: 3.9.5 @@ -13,7 +14,7 @@ lynx-cur | lynx, docbook-xml, libpcre3-dev, libldap2-dev, libpam0g-dev, libident-dev, libdb5.3-dev, libxmu-dev, libxt-dev, libxext-dev, libx11-dev, libxaw7-dev, libpq-dev, libmysqlclient-dev | libmysqlclient15-dev, - libsqlite3-dev, libperl-dev, libgnutls28-dev, libsasl2-dev + libsqlite3-dev, libperl-dev, libgnutls28-dev, libsasl2-dev, lsb-release XS-Testsuite: autopkgtest Package: exim4-base @@ -92,7 +93,7 @@ Package: exim4-daemon-light Architecture: any -Provides: mail-transport-agent, exim4-localscanapi-1.0, exim4-localscanapi-1.1, default-mta +Provides: mail-transport-agent, exim4-localscanapi-1.0, exim4-localscanapi-1.1 Conflicts: mail-transport-agent Replaces: mail-transport-agent, exim4-base (<= 4.61-1) Depends: exim4-base (>= ${Upstream-Version}), ${shlibs:Depends}, ${misc:Depends} diff -Nru exim4-4.84~RC1/debian/patches/fix_smtp_banner.patch exim4-4.84~RC1/debian/patches/fix_smtp_banner.patch --- exim4-4.84~RC1/debian/patches/fix_smtp_banner.patch 1969-12-31 19:00:00.000000000 -0500 +++ exim4-4.84~RC1/debian/patches/fix_smtp_banner.patch 2014-05-16 20:29:04.000000000 -0400 @@ -0,0 +1,60 @@ +Description: Add EXIM_DISTRIBUTION var to display it on the SMTP banner +Origin: https://blueprints.launchpad.net/ubuntu/+spec/servercloud-s-server-app-banner-updates +Author: Yolanda Robla +Last-Update: 2013-06-20 + +=== modified file 'src/exim.h' +Index: exim4_ubuntu/src/globals.c +=================================================================== +--- exim4_ubuntu.orig/src/globals.c 2013-12-10 17:06:29.194997355 +0000 ++++ exim4_ubuntu/src/globals.c 2013-12-10 17:06:29.190997355 +0000 +@@ -1175,7 +1175,7 @@ + uschar *smtp_active_hostname = NULL; + BOOL smtp_authenticated = FALSE; + uschar *smtp_banner = US"$smtp_active_hostname ESMTP " +- "Exim $version_number $tod_full" ++ "Exim $version_number " EXIM_DISTRIBUTION " $tod_full" + "\0<---------------Space to patch smtp_banner->"; + BOOL smtp_batched_input = FALSE; + BOOL smtp_check_spool_space = TRUE; +Index: exim4_ubuntu/src/config.h.defaults +=================================================================== +--- exim4_ubuntu.orig/src/config.h.defaults 2013-12-10 17:06:29.194997355 +0000 ++++ exim4_ubuntu/src/config.h.defaults 2013-12-10 17:06:29.190997355 +0000 +@@ -196,4 +196,6 @@ + #define SC_EXIM_ARITH "%" SCNi64 /* scanf incl. 0x prefix */ + #define SC_EXIM_DEC "%" SCNd64 /* scanf decimal */ + ++#define EXIM_DISTRIBUTION ++ + /* End of config.h.defaults */ +Index: exim4_ubuntu/scripts/Configure-config.h +=================================================================== +--- exim4_ubuntu.orig/scripts/Configure-config.h 2013-12-10 17:06:29.194997355 +0000 ++++ exim4_ubuntu/scripts/Configure-config.h 2013-12-10 17:06:29.190997355 +0000 +@@ -23,6 +23,12 @@ + if [ "$1" != "" ] ; then MAKE=$1 ; fi + if [ "$MAKE" = "" ] ; then MAKE=make ; fi + ++# exporting distribution to use it in smtp banner ++if test -x /usr/bin/lsb_release && lsb_release -si; then ++ export EXIM_DISTRIBUTION=\"$(lsb_release -si)\" ++else ++ export EXIM_DISTRIBUTION=\"\" ++fi + $MAKE buildconfig || exit 1 + + # BEWARE: tab characters needed in the following sed command. They have had +Index: exim4_ubuntu/src/exim.h +=================================================================== +--- exim4_ubuntu.orig/src/exim.h 2013-12-10 17:06:29.194997355 +0000 ++++ exim4_ubuntu/src/exim.h 2013-12-10 17:06:29.190997355 +0000 +@@ -580,4 +580,8 @@ + #endif + #endif + ++#ifndef EXIM_DISTRIBUTION ++ #define EXIM_DISTRIBUTION "" ++#endif ++ + /* End of exim.h */ diff -Nru exim4-4.84~RC1/debian/patches/series exim4-4.84~RC1/debian/patches/series --- exim4-4.84~RC1/debian/patches/series 2014-07-26 03:24:19.000000000 -0400 +++ exim4-4.84~RC1/debian/patches/series 2014-08-04 11:48:35.000000000 -0400 @@ -8,3 +8,4 @@ 66_enlarge-dh-parameters-size.dpatch 67_unnecessaryCopt.diff 70_remove_exim-users_references.dpatch +fix_smtp_banner.patch