diff -Nru exim4-4.73~rc1/debian/changelog exim4-4.73~rc1/debian/changelog --- exim4-4.73~rc1/debian/changelog 2010-12-27 19:48:38.000000000 +0100 +++ exim4-4.73~rc1/debian/changelog 2011-01-06 02:06:43.000000000 +0100 @@ -1,3 +1,17 @@ +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. @@ -63,6 +77,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 ] @@ -86,6 +114,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 @@ -137,6 +179,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. @@ -251,6 +307,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 @@ -308,6 +393,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 @@ -3887,5 +3981,3 @@ * debian/control: Short description improved (Closes: #130698) -- Mark Baker Mon, 4 Mar 2002 23:04:52 +0000 - - diff -Nru exim4-4.73~rc1/debian/control exim4-4.73~rc1/debian/control --- exim4-4.73~rc1/debian/control 2010-12-26 14:44:31.000000000 +0100 +++ exim4-4.73~rc1/debian/control 2010-12-28 22:29:43.000000000 +0100 @@ -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.1 @@ -11,7 +12,7 @@ lynx-cur | lynx, docbook-xml, libpcre3-dev, libldap2-dev, libpam0g-dev, libident-dev, libdb4.8-dev, libxmu-dev, libxt-dev, libxext-dev, libx11-dev, libxaw7-dev, libpq-dev, libmysqlclient-dev | libmysqlclient15-dev, - libsqlite3-dev, libperl-dev, libgnutls-dev, libsasl2-dev + libsqlite3-dev, libperl-dev, libgnutls-dev, libsasl2-dev, hardening-wrapper Package: exim4-base Architecture: any @@ -90,7 +91,7 @@ Package: exim4-daemon-light Architecture: any Priority: standard -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.73~rc1/debian/patches/71_exiq_grep_error_on_messages_without_size.patch exim4-4.73~rc1/debian/patches/71_exiq_grep_error_on_messages_without_size.patch --- exim4-4.73~rc1/debian/patches/71_exiq_grep_error_on_messages_without_size.patch 1970-01-01 01:00:00.000000000 +0100 +++ exim4-4.73~rc1/debian/patches/71_exiq_grep_error_on_messages_without_size.patch 2010-12-28 22:18:02.000000000 +0100 @@ -0,0 +1,35 @@ +From: Artur Rona +Description: Improve handling of broken messages when "exim4 -bp" (mailq) reports lines w/o size info. +Bug-Ubuntu: https://launchpad.net/bugs/181948 +Forwarded: no + +--- experimental~/src/exiqgrep.src ++++ experimental/src/exiqgrep.src +@@ -106,7 +106,26 @@ + # Increment message counter. + $count++; + } else { +- print STDERR "Line mismatch: $line\n"; exit 1; ++ if ($line =~ /^\s*(\w+)\s+(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) { ++ my $msg = $2; ++ $id{$msg}{age} = $1; ++ $id{$msg}{size} = "0K"; ++ $id{$msg}{from} = $3; ++ $id{$msg}{birth} = &msg_utc($msg); ++ $id{$msg}{ages} = time - $id{$msg}{birth}; ++ if ($line =~ /\*\*\* frozen \*\*\*$/) { ++ $id{$msg}{frozen} = 1; ++ } else { ++ $id{$msg}{frozen} = 0; ++ } ++ while( =~ /\s+(.*?\@.*)$/) { ++ push(@{$id{$msg}{rcpt}},$1); ++ } ++ # Increment message counter. ++ $count++; ++ } else { ++ print STDERR "Line mismatch: $line\n"; exit 1; ++ } + } + } + close(QUEUE) or die("Error closing pipe: $!\n"); diff -Nru exim4-4.73~rc1/debian/patches/series exim4-4.73~rc1/debian/patches/series --- exim4-4.73~rc1/debian/patches/series 2010-12-25 11:14:47.000000000 +0100 +++ exim4-4.73~rc1/debian/patches/series 2010-12-28 22:19:12.000000000 +0100 @@ -9,3 +9,4 @@ 66_enlarge-dh-parameters-size.dpatch 67_unnecessaryCopt.diff 70_remove_exim-users_references.dpatch +71_exiq_grep_error_on_messages_without_size.patch diff -Nru exim4-4.73~rc1/debian/rules exim4-4.73~rc1/debian/rules --- exim4-4.73~rc1/debian/rules 2010-12-25 11:03:50.000000000 +0100 +++ exim4-4.73~rc1/debian/rules 2010-12-28 22:30:38.000000000 +0100 @@ -4,6 +4,7 @@ # # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 +export DEB_BUILD_HARDENING=1 buildname=$${build:-`$(SHELL) scripts/os-type`-`$(SHELL) scripts/arch-type`}