Merge ~mitchdz/ubuntu/+source/exim4:merge-lp2018070-mantic into ubuntu/+source/exim4:debian/sid

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/exim4-merge-lp2018070

autopkgtest results using mantic
autopkgtest [06:49:43]: test basic: -----------------------]
autopkgtest [06:49:44]: test basic: - - - - - - - - - - results - - - - - - - - - -
basic PASS
autopkgtest [06:49:44]: @@@@@@@@@@@@@@@@@@@@ summary
basic PASS

[Lena Voytek (lvoytek)]

Merge LGTM! Luckily there are no additional remaining changes this time. Maintained changes, changelog entry, and maintainer update all look good. I can sponsor the upload if you would like

review: Approve

[Mitchell Dzurick (mitchdz)]

Yes a sponsor would be great, thank you!

[Lena Voytek (lvoytek)]

Done

dput ubuntu ../exim4_4.96-15ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../exim4_4.96-15ubuntu1_source.changes: Valid signature from 34B8AD7D9529E793
Checking signature on .dsc
gpg: ../exim4_4.96-15ubuntu1.dsc: Valid signature from 34B8AD7D9529E793
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading exim4_4.96-15ubuntu1.dsc: done.
  Uploading exim4_4.96-15ubuntu1.debian.tar.xz: done.
  Uploading exim4_4.96-15ubuntu1_source.buildinfo: done.
  Uploading exim4_4.96-15ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/EDITME.exim4-heavy.diff b/debian/EDITME.exim4-heavy.diff
index 0a63d8b..26faf78 100644
--- a/debian/EDITME.exim4-heavy.diff
+++ b/debian/EDITME.exim4-heavy.diff
@@ -150,18 +150,6 @@
  
  
  #------------------------------------------------------------------------------
-@@ -1056,9 +1059,9 @@
- # installed on your system (www.libspf2.org). Depending on where it is installed
- # you may have to edit the CFLAGS and LDFLAGS lines.
- 
--# SUPPORT_SPF=yes
-+SUPPORT_SPF=yes
- # CFLAGS  += -I/usr/local/include
--# LDFLAGS += -lspf2
-+LDFLAGS += -lspf2
- 
- 
- #------------------------------------------------------------------------------
 @@ -1387,7 +1390,7 @@
  # local part) can be increased by changing this value. It should be set to
  # a multiple of 16.
diff --git a/debian/changelog b/debian/changelog
index fbbb8c2..42dd28c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+exim4 (4.96-15ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2018070). Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution
+        in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+    - Disable external SPF support to avoid Build-Depends on libspf2-dev
+      (only available in universe). SPF can still be implemented via
+      spf-tools-perl, as documented in exim4.conf.template. This reverts
+      Vcs-Git commit 494f1fe, first released in 4.95~RC0-1.
+       + d/control: drop Build-Depends on libspf2-dev.
+       + d/d/c/a/30_exim4-config_check_rcpt: restore SPF logic based
+         on spfquery.mail-spf-perl from spf-tools-perl.
+       + d/EDITME.exim4-heavy.diff: disable support for libspf2.
+
+ -- Mitchell Dzurick <[e-mail]>  Fri, 19 May 2023 13:32:18 -0700
+
 exim4 (4.96-15) unstable; urgency=medium
 
   * Pull from upstream GIT master:
@@ -7,6 +25,24 @@ exim4 (4.96-15) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Wed, 10 May 2023 18:30:35 +0200
 
+exim4 (4.96-14ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #2008016). Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution
+        in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+    - Disable external SPF support to avoid Build-Depends on libspf2-dev
+      (only available in universe). SPF can still be implemented via
+      spf-tools-perl, as documented in exim4.conf.template. This reverts
+      Vcs-Git commit 494f1fe, first released in 4.95~RC0-1.
+       + d/control: drop Build-Depends on libspf2-dev.
+       + d/d/c/a/30_exim4-config_check_rcpt: restore SPF logic based
+         on spfquery.mail-spf-perl from spf-tools-perl.
+       + d/EDITME.exim4-heavy.diff: disable support for libspf2.
+
+ -- Bryce Harrington <[e-mail]>  Tue, 21 Feb 2023 19:52:34 +0000
+
 exim4 (4.96-14) unstable; urgency=medium
 
   * Pull from upstream GIT master:
@@ -51,6 +87,25 @@ exim4 (4.96-10) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Mon, 19 Dec 2022 18:23:13 +0100
 
+exim4 (4.96-9ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable. (LP: #1993399) Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution
+        in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+    - Disable external SPF support to avoid Build-Depends on libspf2-dev
+      (only available in universe). SPF can still be implemented via
+      spf-tools-perl, as documented in exim4.conf.template. (LP #1952738)
+      This reverts Vcs-Git commit 494f1fe, first released in 4.95~RC0-1.
+      Changes:
+       + d/control: drop Build-Depends on libspf2-dev.
+       + d/d/c/a/30_exim4-config_check_rcpt: restore SPF logic based
+         on spfquery.mail-spf-perl from spf-tools-perl.
+       + d/EDITME.exim4-heavy.diff: disable support for libspf2.
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 08 Dec 2022 12:19:10 -0500
+
 exim4 (4.96-9) unstable; urgency=medium
 
   * Cherrypick three fixes from upstream GIT master:
@@ -113,6 +168,31 @@ exim4 (4.96-4) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Sun, 11 Sep 2022 13:38:26 +0200
 
+exim4 (4.96-3ubuntu2) lunar; urgency=medium
+
+  * Rebuild against new perlapi-5.36.
+
+ -- Gianfranco Costamagna <[e-mail]>  Sat, 05 Nov 2022 09:11:59 +0100
+
+exim4 (4.96-3ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable. (LP: #1971274) Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution
+        in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+    - Disable external SPF support to avoid Build-Depends on libspf2-dev
+      (only available in universe). SPF can still be implemented via
+      spf-tools-perl, as documented in exim4.conf.template. (LP #1952738)
+      This reverts Vcs-Git commit 494f1fe, first released in 4.95~RC0-1.
+      Changes:
+       + d/control: drop Build-Depends on libspf2-dev.
+       + d/d/c/a/30_exim4-config_check_rcpt: restore SPF logic based
+         on spfquery.mail-spf-perl from spf-tools-perl.
+       + d/EDITME.exim4-heavy.diff: disable support for libspf2.
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 14 Jul 2022 10:33:39 +0200
+
 exim4 (4.96-3) unstable; urgency=medium
 
   * Fix error messages of test-groff -b -mandoc -dAD=l -rF0 -rHY=0 -t -w w -z
@@ -202,6 +282,40 @@ exim4 (4.95-5) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sun, 10 Apr 2022 13:57:43 +0200
 
+exim4 (4.95-4ubuntu3) kinetic; urgency=medium
+
+  * d/p/lp1974214-segfault-smtp-delivery-0{1,2}.patch: Fix segfault when
+    there's an SMTP delivery attempt following a deferral. (LP: #1974214)
+
+ -- Sergio Durigan Junior <[e-mail]>  Fri, 03 Jun 2022 17:37:10 -0400
+
+exim4 (4.95-4ubuntu2) jammy; urgency=medium
+
+  * d/p/lp1966923-exiqgrep-syntax-error.patch: Fix exiqgrep syntax error,
+    improve the validation of command-line options and add a new -E option
+    to allow specifying a binary to be used. (LP: #1966923)
+
+ -- Sergio Durigan Junior <[e-mail]>  Wed, 30 Mar 2022 16:45:24 -0400
+
+exim4 (4.95-4ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution
+        in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+    - Disable external SPF support to avoid Build-Depends on libspf2-dev
+      (only available in universe). SPF can still be implemented via
+      spf-tools-perl, as documented in exim4.conf.template. (LP #1952738)
+      This reverts Vcs-Git commit 494f1fe, first released in 4.95~RC0-1.
+      Changes:
+       + d/control: drop Build-Depends on libspf2-dev.
+       + d/d/c/a/30_exim4-config_check_rcpt: restore SPF logic based
+         on spfquery.mail-spf-perl from spf-tools-perl.
+       + d/EDITME.exim4-heavy.diff: disable support for libspf2.
+
+ -- Utkarsh Gupta <[e-mail]>  Fri, 25 Feb 2022 01:47:15 +0530
+
 exim4 (4.95-4) unstable; urgency=low
 
   * Fix typo in exiqgrep.8.
@@ -234,6 +348,36 @@ exim4 (4.95-3) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Thu, 16 Dec 2021 19:26:32 +0100
 
+exim4 (4.95-2ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild for the perl update.
+
+ -- Matthias Klose <[e-mail]>  Sun, 06 Feb 2022 14:52:48 +0100
+
+exim4 (4.95-2ubuntu2) jammy; urgency=medium
+
+  * New delta:
+    - Disable external SPF support to avoid Build-Depends on libspf2-dev
+      (only available in universe). SPF can still be implemented via
+      spf-tools-perl, as documented in exim4.conf.template. (LP: #1952738)
+      This reverts Vcs-Git commit 494f1fe, first released in 4.95~RC0-1.
+      Changes:
+        + d/control: drop Build-Depends on libspf2-dev.
+        + d/d/c/a/30_exim4-config_check_rcpt: restore SPF logic based
+          on spfquery.mail-spf-perl from spf-tools-perl.
+        + d/EDITME.exim4-heavy.diff: disable support for libspf2.
+
+ -- Paride Legovini <[e-mail]>  Wed, 01 Dec 2021 11:48:10 +0100
+
+exim4 (4.95-2ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946857). Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+
+ -- Lena Voytek <[e-mail]>  Tue, 09 Nov 2021 10:10:14 -0700
+
 exim4 (4.95-2) unstable; urgency=medium
 
   * 75_30-Avoid-calling-gettimeofday-select-per-char-for-cmdli.patch from
@@ -308,6 +452,21 @@ exim4 (4.95~RC0-1) experimental; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Mon, 19 Jul 2021 13:10:00 +0200
 
+exim4 (4.94.2-7ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild against libidn12
+
+ -- Steve Langasek <[e-mail]>  Sun, 07 Nov 2021 05:31:31 +0000
+
+exim4 (4.94.2-7ubuntu2) impish; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+
+ -- Miriam Espana Acebal <[e-mail]>  Thu, 15 Jul 2021 13:23:50 +0200
+
 exim4 (4.94.2-7) unstable; urgency=medium
 
   * 73_05-Fix-tainted-message-for-fakereject.patch from upstream +fixes
@@ -354,6 +513,25 @@ exim4 (4.94.2-3) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Thu, 13 May 2021 18:53:53 +0200
 
+exim4 (4.94.2-2ubuntu2) impish; urgency=medium
+
+  * No-change rebuild due to OpenLDAP soname bump.
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 21 Jun 2021 17:47:09 -0400
+
+exim4 (4.94.2-2ubuntu1) impish; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+  * Dropped changes:
+    - debian/patches/sec-202105/*.patch: backport patches from upstream to
+      correct issues.
+      [Included in 4.94.2-1]
+
+ -- Utkarsh Gupta <[e-mail]>  Tue, 11 May 2021 18:25:10 +0530
+
 exim4 (4.94.2-2) unstable; urgency=medium
 
   * Updates from exim-4.94.2+fixes:
@@ -466,6 +644,28 @@ exim4 (4.94-16) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Wed, 17 Mar 2021 13:50:44 +0100
 
+exim4 (4.94-15ubuntu1.2) hirsute-security; urgency=medium
+
+  * SECURITY UPDATE: Multiple security issues
+    - debian/patches/sec-202105/*.patch: backport patches from upstream to
+      correct issues.
+    - CVE-2020-28007, CVE-2020-28008, CVE-2020-28009, CVE-2020-28010,
+      CVE-2020-28011, CVE-2020-28012, CVE-2020-28013, CVE-2020-28014,
+      CVE-2020-28015, CVE-2020-28016, CVE-2020-28017, CVE-2020-28018,
+      CVE-2020-28019, CVE-2020-28021, CVE-2020-28022, CVE-2020-28023,
+      CVE-2020-28024, CVE-2020-28025, CVE-2020-28026, CVE-2021-27216
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 30 Apr 2021 08:46:21 -0400
+
+exim4 (4.94-15ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable (LP: #1916744). Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+
+ -- Utkarsh Gupta <[e-mail]>  Wed, 24 Feb 2021 17:32:37 +0530
+
 exim4 (4.94-15) unstable; urgency=medium
 
   * Update from exim-4.94+fixes:
@@ -490,6 +690,15 @@ exim4 (4.94-13) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sat, 30 Jan 2021 14:50:50 +0100
 
+exim4 (4.94-12ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+
+ -- Bryce Harrington <[e-mail]>  Wed, 20 Jan 2021 19:35:04 -0800
+
 exim4 (4.94-12) unstable; urgency=medium
 
   * Update from exim-4.94+fixes:
@@ -524,6 +733,15 @@ exim4 (4.94-10) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Sat, 19 Dec 2020 12:03:56 +0100
 
+exim4 (4.94-9ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+
+ -- Bryce Harrington <[e-mail]>  Sat, 07 Nov 2020 01:01:32 +0000
+
 exim4 (4.94-9) unstable; urgency=low
 
   * Update from exim-4.94+fixes:
@@ -553,6 +771,15 @@ exim4 (4.94-8) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Thu, 17 Sep 2020 06:54:00 +0200
 
+exim4 (4.94-7ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 24 Aug 2020 16:36:31 -0400
+
 exim4 (4.94-7) unstable; urgency=low
 
   * Update from exim-4.94+fixes:
@@ -563,6 +790,15 @@ exim4 (4.94-7) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Fri, 24 Jul 2020 13:31:47 +0200
 
+exim4 (4.94-6ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+
+ -- Sergio Durigan Junior <[e-mail]>  Thu, 13 Aug 2020 13:49:10 -0400
+
 exim4 (4.94-6) unstable; urgency=medium
 
   * Fix typo (missing "S") in REMOTE_SMTP_SMARTHOST_TLS_VERIFY_HOSTS macro.
@@ -614,6 +850,15 @@ exim4 (4.94-3) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Fri, 19 Jun 2020 10:31:26 +0200
 
+exim4 (4.94-2ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1881723). Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release to detect Distribution.
+
+ -- Bryce Harrington <[e-mail]>  Fri, 12 Jun 2020 01:55:28 +0000
+
 exim4 (4.94-2) unstable; urgency=low
 
   * Tighten package interdependencies.  With 4.94's daemon avoiding of
@@ -716,6 +961,15 @@ exim4 (4.93-16) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sat, 09 May 2020 19:10:34 +0200
 
+exim4 (4.93-15ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + Build-Depends on lsb-release to detect Distribution.
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 05 May 2020 15:37:59 -0400
+
 exim4 (4.93-15) unstable; urgency=low
 
   * Update from exim-4.93+fixes:
@@ -735,6 +989,15 @@ exim4 (4.93-14) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Fri, 10 Apr 2020 13:53:34 +0200
 
+exim4 (4.93-13ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + Build-Depends on lsb-release to detect Distribution.
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Bryce Harrington <[e-mail]>  Fri, 27 Mar 2020 16:00:03 -0700
+
 exim4 (4.93-13) unstable; urgency=medium
 
   * Update from exim-4.93+fixes:
@@ -746,6 +1009,15 @@ exim4 (4.93-13) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sat, 21 Mar 2020 11:39:19 +0100
 
+exim4 (4.93-12ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + Build-Depends on lsb-release to detect Distribution.
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Bryce Harrington <[e-mail]>  Fri, 13 Mar 2020 14:25:38 -0700
+
 exim4 (4.93-12) unstable; urgency=low
 
   * Update from exim-4.93+fixes:
@@ -761,6 +1033,15 @@ exim4 (4.93-12) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Sat, 29 Feb 2020 15:53:44 +0100
 
+exim4 (4.93-11ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + Build-Depends on lsb-release to detect Distribution.
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Bryce Harrington <[e-mail]>  Wed, 26 Feb 2020 02:34:11 +0000
+
 exim4 (4.93-11) unstable; urgency=medium
 
   * Update from exim-4.93+fixes:
@@ -780,6 +1061,15 @@ exim4 (4.93-10) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sat, 01 Feb 2020 11:06:29 +0100
 
+exim4 (4.93-9ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable (LP: #1860051). Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      - Build-Depends on lsb-release to detect Distribution.
+    - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 17 Jan 2020 09:39:13 +0100
+
 exim4 (4.93-9) unstable; urgency=medium
 
   * Add 74_22-Taint-hybrid-checking-mode.patch.
@@ -899,6 +1189,25 @@ exim4 (4.93~RC3-1) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Sun, 17 Nov 2019 11:37:15 +0100
 
+exim4 (4.93~RC2-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + Build-Depends on lsb-release to detect Distribution.
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+  * Dropped:
+    - SECURITY UPDATE: remote command execution
+      + d/p/CVE-2019-15846.patch: ensure not to interpret '\\'
+        before '\0' in src/string.c
+      + CVE-2019-15846
+      [Now in upstream as of 4.92.2-1]
+    - SECURITY UPDATE: heap-based buffer overflow in string_vformat
+      + debian/patches/CVE-2019-16928.patch: fix overflow in src/string.c.
+      + CVE-2019-16928
+      [Now upstream as of 4.92.3-1]
+
+ -- Bryce Harrington <[e-mail]>  Wed, 13 Nov 2019 18:56:58 -0800
+
 exim4 (4.93~RC2-1) unstable; urgency=low
 
   * New upstream beta version.
@@ -1055,6 +1364,42 @@ exim4 (4.92.1-2) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Wed, 14 Aug 2019 09:25:28 +0200
 
+exim4 (4.92.1-1ubuntu4) focal; urgency=medium
+
+  * No-change rebuild for the perl update.
+
+ -- Matthias Klose <[e-mail]>  Fri, 18 Oct 2019 19:27:29 +0000
+
+exim4 (4.92.1-1ubuntu3) eoan; urgency=medium
+
+  * SECURITY UPDATE: heap-based buffer overflow in string_vformat
+    - debian/patches/CVE-2019-16928.patch: fix overflow in src/string.c.
+    - CVE-2019-16928
+
+ -- Marc Deslauriers <[e-mail]>  Sat, 28 Sep 2019 11:05:50 -0400
+
+exim4 (4.92.1-1ubuntu2) eoan; urgency=medium
+
+  * SECURITY UPDATE: remote command execution
+    - debian/patches/CVE-2019-15846.patch: ensure not to interpret '\\'
+      before '\0' in src/string.c
+    - CVE-2019-15846
+
+ -- Alex Murray <[e-mail]>  Thu, 05 Sep 2019 11:29:48 +0930
+
+exim4 (4.92.1-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + Build-Depends on lsb-release to detect Distribution.
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+  * Dropped:
+    - d/p/CVE-2019-13917.patch: avoid re-expansion in ${sort } in
+      src/expand.c.
+      [Fixed in 4.92.1]
+
+ -- Bryce Harrington <[e-mail]>  Mon, 12 Aug 2019 19:18:33 -0700
+
 exim4 (4.92.1-1) unstable; urgency=low
 
   * New upstream bugfix release. (4.92.1 is 4.92 + the fix for CVE-2019-13917,
@@ -1125,6 +1470,24 @@ exim4 (4.92-8) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Sat, 08 Jun 2019 17:37:43 +0200
 
+exim4 (4.92-7ubuntu2) eoan; urgency=medium
+
+  * SECURITY UPDATE: code execution via ${sort }
+    - debian/patches/CVE-2019-13917.patch: avoid re-expansion in ${sort }
+      in src/expand.c.
+    - CVE-2019-13917
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 25 Jul 2019 12:58:39 -0400
+
+exim4 (4.92-7ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + Build-Depends on lsb-release to detect Distribution.
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Bryce Harrington <[e-mail]>  Mon, 13 May 2019 13:48:18 -0700
+
 exim4 (4.92-7) unstable; urgency=medium
 
   * Upload to unstable.
@@ -1152,6 +1515,15 @@ exim4 (4.92-5) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sun, 07 Apr 2019 13:39:31 +0200
 
+exim4 (4.92-4ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable (LP: #1821339). Remaining changes:
+  * Show Ubuntu distribution in SMTP banner
+    - Build-Depends on lsb-release to detect Distribution.
+    - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Karl Stenerud <[e-mail]>  Mon, 25 Mar 2019 12:02:33 +0100
+
 exim4 (4.92-4) unstable; urgency=medium
 
   * Another patch from exim-4.92+fixes branch:
@@ -1170,6 +1542,15 @@ exim4 (4.92-3) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Wed, 20 Mar 2019 17:01:29 +0100
 
+exim4 (4.92-2ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable (LP: #1818444). Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + Build-Depends on lsb-release to detect Distribution.
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Karl Stenerud <[e-mail]>  Tue, 05 Mar 2019 10:55:48 +0100
+
 exim4 (4.92-2) unstable; urgency=medium
 
   * Upload to unstable.
@@ -1226,6 +1607,21 @@ exim4 (4.92~RC4-3) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sun, 20 Jan 2019 17:52:39 +0100
 
+exim4 (4.92~RC4-2ubuntu2) disco; urgency=medium
+
+  * No-change rebuild against libmysqlclient21
+
+ -- Steve Langasek <[e-mail]>  Fri, 01 Feb 2019 16:57:54 +0000
+
+exim4 (4.92~RC4-2ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable (LP: #1811095). Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + Build-Depends on lsb-release to detect Distribution.
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Karl Stenerud <[e-mail]>  Thu, 10 Jan 2019 16:41:45 +0100
+
 exim4 (4.92~RC4-2) unstable; urgency=medium
 
   * Upload to unstable.
@@ -1319,6 +1715,22 @@ exim4 (4.91-7) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Sun, 26 Aug 2018 11:33:15 +0200
 
+exim4 (4.91-6ubuntu2) disco; urgency=medium
+
+  * No-change rebuild for the perl 5.28 transition.
+
+ -- Adam Conrad <[e-mail]>  Fri, 02 Nov 2018 18:08:13 -0600
+
+exim4 (4.91-6ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      + Build-Depends on lsb-release to detect Distribution.
+      + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+        [DEP3 header updated to indicate it has been forwarded to Debian]
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 30 Jul 2018 15:35:06 -0300
+
 exim4 (4.91-6) unstable; urgency=low
 
   * Update from exim-4_91+fixes branch:
@@ -1330,6 +1742,16 @@ exim4 (4.91-6) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Fri, 20 Jul 2018 11:21:24 +0200
 
+exim4 (4.91-5ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      - Build-Depends on lsb-release to detect Distribution.
+      - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+        [DEP3 header updated to indicate it has been forwarded to Debian]
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 03 Jul 2018 11:13:08 -0300
+
 exim4 (4.91-5) unstable; urgency=medium
 
   * Update from exim-4_91+fixes branch:
@@ -1339,6 +1761,15 @@ exim4 (4.91-5) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sat, 09 Jun 2018 18:10:39 +0200
 
+exim4 (4.91-4ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian testing, Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      - Build-Depends on lsb-release to detect Distribution.
+      - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 30 May 2018 12:46:14 +0200
+
 exim4 (4.91-4) unstable; urgency=medium
 
   * Update from exim-4_91+fixes branch:
@@ -1457,6 +1888,15 @@ exim4 (4.90.1-2) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sat, 10 Mar 2018 14:25:51 +0100
 
+exim4 (4.90.1-1ubuntu1) bionic; urgency=medium
+
+  * Merge from Debian testing, Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      - Build-Depends on lsb-release to detect Distribution.
+      - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 14 Feb 2018 17:01:14 +0100
+
 exim4 (4.90.1-1) unstable; urgency=high
 
   * New upstream version, fixing CVE-2018-6789. Closes: #890000
@@ -1651,6 +2091,15 @@ exim4 (4.89-10) unstable; urgency=critical
 
  -- Andreas Metzler <[e-mail]>  Sat, 25 Nov 2017 11:43:24 +0100
 
+exim4 (4.89-9ubuntu1) bionic; urgency=medium
+
+  * Merge from Debian unstable, Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      - Build-Depends on lsb-release to detect Distribution.
+      - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 16 Nov 2017 10:02:23 +0100
+
 exim4 (4.89-9) unstable; urgency=medium
 
   * Upload to unstable.
@@ -1693,6 +2142,42 @@ exim4 (4.89-6) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sat, 09 Sep 2017 15:29:39 +0200
 
+exim4 (4.89-5ubuntu1.3) artful-security; urgency=medium
+
+  * SECURITY UPDATE: Buffer overflow in base64d()
+    - debian/patches/CVE-2018-6789.patch: fix overflow in src/base64.c.
+    - CVE-2018-6789
+
+ -- Marc Deslauriers <[e-mail]>  Sat, 10 Feb 2018 14:12:27 -0500
+
+exim4 (4.89-5ubuntu1.2) artful-security; urgency=medium
+
+  * SECURITY UPDATE: stack-exhaustion remote DoS
+    - debian/patches/CVE-2017-16944.patch: do not treat the first lonely
+      dot special in src/receive.c, src/smtp_in.c.
+    - CVE-2017-16944
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 29 Nov 2017 08:59:31 -0500
+
+exim4 (4.89-5ubuntu1.1) artful-security; urgency=medium
+
+  * SECURITY UPDATE: remote code execution via use-after-free
+    - debian/patches/CVE-2017-16943.patch: avoid release of store if there
+      have been later allocations in src/receive.c.
+    - CVE-2017-16943
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 27 Nov 2017 07:37:47 -0500
+
+exim4 (4.89-5ubuntu1) artful; urgency=medium
+
+  * Merge from Debian testing.
+    Remaining changes:
+    - Show Ubuntu distribution in SMTP banner
+      - Build-Depends on lsb-release to detect Distribution.
+      - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 16 Aug 2017 15:42:47 +0200
+
 exim4 (4.89-5) unstable; urgency=medium
 
   * Update to exim-4_89+fixes branch:
@@ -1737,6 +2222,20 @@ exim4 (4.89-4) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Sat, 15 Jul 2017 12:46:16 +0200
 
+exim4 (4.89-3ubuntu2) artful; urgency=medium
+
+  * No-change rebuild for perl 5.26.0.
+
+ -- Matthias Klose <[e-mail]>  Wed, 26 Jul 2017 20:02:24 +0000
+
+exim4 (4.89-3ubuntu1) artful; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner.
+    - Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch)
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 27 Jun 2017 10:20:42 -0400
+
 exim4 (4.89-3) unstable; urgency=high
 
   * Re-upload to unstable.
@@ -1749,6 +2248,15 @@ exim4 (4.89-2+deb9u1) stretch-security; urgency=medium
 
  --  <[e-mail]>  Wed, 14 Jun 2017 07:03:07 +0200
 
+exim4 (4.89-2ubuntu1) artful; urgency=medium
+
+  * Merge from Debian testing.
+    Remaining changes:
+    + Show Ubuntu distribution in SMTP banner.
+    + Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 01 Jun 2017 11:58:00 +0200
+
 exim4 (4.89-2) unstable; urgency=medium
 
   * Revert addition of header "# pidfile: /var/run/exim4/exim.pid" to
@@ -1840,6 +2348,17 @@ exim4 (4.89~RC1-1) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Tue, 31 Jan 2017 19:52:50 +0100
 
+exim4 (4.88-5ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable.
+    Version 4.88 fixes CVE-2016-9963 (LP: #1654750) and symlink
+    local root escalation (LP: #1580454)
+    Remaining changes:
+    + Show Ubuntu distribution in SMTP banner.
+    + Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 24 Jan 2017 10:15:09 +0100
+
 exim4 (4.88-5) unstable; urgency=medium
 
   * 78_Disable-chunking-BDAT-by-default.patch: Change default value of main
@@ -1992,6 +2511,20 @@ exim4 (4.88~RC1-1) experimental; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Sun, 25 Sep 2016 15:44:00 +0200
 
+exim4 (4.87-3ubuntu2) zesty; urgency=medium
+
+  * No-change rebuild for perl 5.24 transition
+
+ -- Iain Lane <[e-mail]>  Mon, 24 Oct 2016 10:08:10 +0100
+
+exim4 (4.87-3ubuntu1) yakkety; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    + Show Ubuntu distribution in SMTP banner.
+    + Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 26 Jul 2016 13:30:09 +0200
+
 exim4 (4.87-3) unstable; urgency=medium
 
   * Pull multiple patches from upstream GIT:
@@ -2165,6 +2698,48 @@ exim4 (4.87~RC1-1) experimental; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Fri, 11 Dec 2015 20:15:30 +0100
 
+exim4 (4.86.2-2ubuntu2.3) xenial-security; urgency=medium
+
+  * SECURITY UPDATE: Buffer overflow in base64d()
+    - debian/patches/CVE-2018-6789.patch: fix overflow in
+      src/auths/b64decode.c.
+    - CVE-2018-6789
+
+ -- Marc Deslauriers <[e-mail]>  Sat, 10 Feb 2018 14:18:40 -0500
+
+exim4 (4.86.2-2ubuntu2.2) xenial-security; urgency=medium
+
+  * SECURITY UPDATE: memory leak
+    - debian/patches/93_CVE-2017-1000368.patch: free -p argument if
+      allocation was required.
+    - CVE-2017-1000368
+
+ -- Steve Beattie <[e-mail]>  Fri, 02 Jun 2017 22:07:28 -0700
+
+exim4 (4.86.2-2ubuntu2.1) xenial-security; urgency=medium
+
+  * SECURITY UPDATE: DKIM information leakage
+    - debian/patches/CVE-2016-9963.patch: fix information leakage in
+      src/dkim.c, src/transports/smtp.c.
+    - CVE-2016-9963
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 05 Jan 2017 08:29:10 -0500
+
+exim4 (4.86.2-2ubuntu2) xenial; urgency=medium
+
+  * Rebuild against libmysqlclient20.
+
+ -- Robie Basak <[e-mail]>  Tue, 05 Apr 2016 12:21:41 +0000
+
+exim4 (4.86.2-2ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian.control, debian/patches/fix_smtp_banner.patch
+      + Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release.
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 15 Mar 2016 11:56:18 -0400
+
 exim4 (4.86.2-2) unstable; urgency=high
 
   * Bump exim4-config Breaks to exim4-daemon-* (<< 4.86.2). Closes: #816790
@@ -2186,6 +2761,27 @@ exim4 (4.86.2-1) unstable; urgency=high
 
  -- Andreas Metzler <[e-mail]>  Tue, 01 Mar 2016 19:34:39 +0100
 
+exim4 (4.86-7ubuntu3) xenial; urgency=medium
+
+  * No-change rebuild for gnutls transition.
+
+ -- Matthias Klose <[e-mail]>  Wed, 17 Feb 2016 22:40:56 +0000
+
+exim4 (4.86-7ubuntu2) xenial; urgency=medium
+
+  * Rebuild for Perl 5.22.1.
+
+ -- Colin Watson <[e-mail]>  Fri, 18 Dec 2015 10:30:54 +0000
+
+exim4 (4.86-7ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian.control, debian/patches/fix_smtp_banner.patch
+      + Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release.
+
+ -- Pierre-André MOREY <[e-mail]>  Mon, 14 Dec 2015 14:23:51 +0100
+
 exim4 (4.86-7) unstable; urgency=medium
 
   * Allow arch-indep build (dpkg-buildpackage -A). Closes: #806023
@@ -2236,6 +2832,15 @@ exim4 (4.86-4) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sat, 17 Oct 2015 15:01:01 +0200
 
+exim4 (4.86-3ubuntu1) wily; urgency=medium
+
+  * Merge from Debian unstable. (LP: #1485369) Remaining changes:
+    - debian/control, debian/patches/fix_smtp_banner.patch:
+      + Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release.
+
+ -- Artur Rona <[e-mail]>  Thu, 17 Sep 2015 13:18:20 +0100
+
 exim4 (4.86-3) unstable; urgency=medium
 
   * Pull three patches from upstream git:
@@ -2276,6 +2881,15 @@ exim4 (4.86~RC5-1) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sat, 18 Jul 2015 11:46:11 +0200
 
+exim4 (4.86~RC4-2ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable. (LP: #1166671) Remaining changes:
+    - debian/control, debian/patches/fix_smtp_banner.patch:
+      + Show Ubuntu distribution in SMTP banner.
+      + Build-Depends on lsb-release.
+
+ -- Artur Rona <[e-mail]>  Mon, 06 Jul 2015 12:09:36 +0200
+
 exim4 (4.86~RC4-2) unstable; urgency=medium
 
   * Drop libmysqlclient15-dev alternative build-dependency. Closes: #790463
@@ -2440,6 +3054,18 @@ exim4 (4.85~RC1+dfsg-1) experimental; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Tue, 18 Nov 2014 19:28:20 +0100
 
+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 <[e-mail]>  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
@@ -2457,6 +3083,15 @@ exim4 (4.84-7) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sat, 07 Feb 2015 15:12:33 +0100
 
+exim4 (4.84-6ubuntu1) vivid; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Show Ubuntu distribution in SMTP banner.
+    - Don't provide default-mta; in Ubuntu, we want postfix to be the
+      default.
+
+ -- Colin Watson <[e-mail]>  Wed, 14 Jan 2015 11:26:29 +0000
+
 exim4 (4.84-6) unstable; urgency=medium
 
   * Revert init script's restart order change in 4.84-4 for the time being.
@@ -2465,6 +3100,15 @@ exim4 (4.84-6) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sun, 21 Dec 2014 14:07:12 +0100
 
+exim4 (4.84-5ubuntu1) vivid; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Show Ubuntu distribution in SMTP banner.
+    - Don't provide default-mta; in Ubuntu, we want postfix to be the
+      default.
+
+ -- Colin Watson <[e-mail]>  Thu, 18 Dec 2014 15:26:17 +0000
+
 exim4 (4.84-5) unstable; urgency=medium
 
   * 82_quoted-or-r-2047-encoded.diff pulled from upstream git (sans
@@ -2472,6 +3116,15 @@ exim4 (4.84-5) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Wed, 17 Dec 2014 19:03:39 +0100
 
+exim4 (4.84-4ubuntu1) vivid; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Show Ubuntu distribution in SMTP banner.
+    - Don't provide default-mta; in Ubuntu, we want postfix to be the
+      default.
+
+ -- Colin Watson <[e-mail]>  Tue, 02 Dec 2014 15:28:46 +0000
+
 exim4 (4.84-4) unstable; urgency=medium
 
   * Unset message_prefix/message_sufix in maildrop_pipe transport. Maildrop
@@ -2486,6 +3139,15 @@ exim4 (4.84-4) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sun, 30 Nov 2014 08:24:04 +0100
 
+exim4 (4.84-3ubuntu1) vivid; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Show Ubuntu distribution in SMTP banner.
+    - Don't provide default-mta; in Ubuntu, we want postfix to be the
+      default.
+
+ -- Colin Watson <[e-mail]>  Tue, 11 Nov 2014 13:43:35 +0000
+
 exim4 (4.84-3) unstable; urgency=medium
 
   * Apply patch to Italian (it) debconf template translation, thanks to
@@ -2515,6 +3177,24 @@ exim4 (4.84~RC2-1) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sat, 09 Aug 2014 07:42:00 +0200
 
+exim4 (4.84~RC1-3ubuntu2) utopic; urgency=medium
+
+  * Rebuild for Perl 5.20.0.
+
+ -- Colin Watson <[e-mail]>  Thu, 21 Aug 2014 12:18:13 +0100
+
+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 <[e-mail]>  Mon, 04 Aug 2014 11:48:39 -0400
+
 exim4 (4.84~RC1-3) unstable; urgency=medium
 
   * Third try. Simply comment *custom* in debian/control.
@@ -2583,6 +3263,18 @@ exim4 (4.83~RC1-1) experimental; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  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
@@ -2600,6 +3292,18 @@ exim4 (4.82.1-1) unstable; urgency=high
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  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
@@ -2663,6 +3367,78 @@ exim4 (4.82-4) unstable; urgency=medium
 
  -- Andreas Metzler <[e-mail]>  Sun, 09 Feb 2014 19:41:34 +0100
 
+exim4 (4.82-3ubuntu2.4) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: Buffer overflow in base64d()
+    - debian/patches/CVE-2018-6789.patch: fix overflow in
+      src/auths/b64decode.c.
+    - CVE-2018-6789
+
+ -- Marc Deslauriers <[e-mail]>  Sat, 10 Feb 2018 14:19:43 -0500
+
+exim4 (4.82-3ubuntu2.3) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: memory leak
+    - debian/patches/CVE-2017-1000368.patch: free -p argument if
+      allocation was required.
+    - CVE-2017-1000368
+
+ -- Steve Beattie <[e-mail]>  Fri, 02 Jun 2017 22:44:35 -0700
+
+exim4 (4.82-3ubuntu2.2) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: DKIM information leakage
+    - debian/patches/CVE-2016-9963.patch: fix information leakage in
+      src/dkim.c, src/transports/smtp.c.
+    - CVE-2016-9963
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 05 Jan 2017 08:31:06 -0500
+
+exim4 (4.82-3ubuntu2.1) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: privilege escalation via crafted lookup value
+    - debian/patches/CVE-2014-2972.patch: only expand integers for integer
+      math once.
+    - CVE-2014-2972
+  * SECURITY UPDATE: privilege escalation when used with perl_startup
+    - debian/patches/CVE-2016-1531.patch: add new add_environment and
+      keep_environment configuration options. 
+    - debian/patches/CVE-2016-1531-2.patch: don't issue env warning if env
+      is empty.
+    - debian/patches/CVE-2016-1531-3.patch: store the initial working
+      directory, expand $initial_cwd.
+    - debian/patches/CVE-2016-1531-4.patch: delay chdir(/) until we opened
+      the main config.
+    - Add macros MAIN_KEEP_ENVIRONMENT and MAIN_ADD_ENVIRONMENT to set the
+      new options. Set "keep_environment =" by default to avoid a runtime
+      warning.
+    - Bump exim4-config Breaks to exim4-daemon-* (<< 4.82-3ubuntu2.1).
+    - debian/exim4-config.NEWS: Add entry to warn of potential breakage.
+    - CVE-2016-1531
+  * WARNING: This update may break existing installations.
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 14 Mar 2016 12:57:00 -0400
+
+exim4 (4.82-3ubuntu2) trusty; urgency=medium
+
+  * debian/tests/control: Add missing python test dependency, as
+    debian/tests/security calls python.
+
+ -- Martin Pitt <[e-mail]>  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 <[e-mail]>  Tue, 10 Dec 2013 17:07:20 +0000
+
 exim4 (4.82-3) unstable; urgency=low
 
   * Upload to unstable.
@@ -2743,6 +3519,21 @@ exim4 (4.82~rc1-1) experimental; urgency=low
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Mon, 28 Oct 2013 11:55:21 -0700
+
 exim4 (4.80-9) unstable; urgency=low
 
   * Upload to unstable.
@@ -2789,6 +3580,34 @@ exim4 (4.80-8) experimental; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Sun, 01 Sep 2013 15:58:49 +0200
 
+exim4 (4.80-7ubuntu4) trusty; urgency=low
+
+  * Rebuild for Perl 5.18.
+
+ -- Colin Watson <[e-mail]>  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 <[e-mail]>  Tue, 18 Jun 2013 19:17:43 +0200
+
+exim4 (4.80-7ubuntu2) saucy; urgency=low
+
+  * debian/tests: Add autopkgtest.
+
+ -- Yolanda <[e-mail]>  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 <[e-mail]>  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
@@ -2808,6 +3627,14 @@ exim4 (4.80-6) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  Sun, 11 Nov 2012 07:11:06 +0100
+
 exim4 (4.80-5.1) unstable; urgency=high
 
   * Non-maintainer upload by the Security Team.
@@ -2835,6 +3662,23 @@ exim4 (4.80-4) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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
@@ -2982,6 +3826,26 @@ exim4 (4.76-4) experimental; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Sat, 24 Sep 2011 18:36:08 +0200
 
+exim4 (4.76-3ubuntu3) precise; urgency=low
+
+  * Rebuild for libmysqlclient transition
+
+ -- Clint Byrum <[e-mail]>  Wed, 23 Nov 2011 23:29:35 -0800
+
+exim4 (4.76-3ubuntu2) precise; urgency=low
+
+  * Rebuild for Perl 5.14.
+
+ -- Colin Watson <[e-mail]>  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 <[e-mail]>  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
@@ -3002,6 +3866,14 @@ exim4 (4.76-3) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  Mon, 30 May 2011 17:48:56 -0400
+
 exim4 (4.76-2) unstable; urgency=low
 
   * debian/rules: Remove test/ and test-stamp on clean.
@@ -3014,6 +3886,14 @@ exim4 (4.76-2) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  Mon, 23 May 2011 12:37:30 -0400
+
 exim4 (4.76-1) unstable; urgency=low
 
   * New upstream version.
@@ -3060,6 +3940,14 @@ exim4 (4.75-3) unstable; urgency=high
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  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
@@ -3102,6 +3990,24 @@ exim4 (4.74-2) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  Wed, 09 Feb 2011 21:31:35 +0100
+
 exim4 (4.74-1) experimental; urgency=low
 
   * 4.74 release, should build on hurd again.
@@ -3127,6 +4033,20 @@ exim4 (4.74~rc2-1) experimental; urgency=low
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  Tue, 28 Dec 2010 22:20:17 +0100
+
 exim4 (4.73~rc1-1) experimental; urgency=low
 
   * New upstream release candidate.
@@ -3222,6 +4142,20 @@ exim4 (4.72-3) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  Fri, 05 Nov 2010 21:05:47 +0100
+
 exim4 (4.72-2) unstable; urgency=low
 
   [ Marc Haber ]
@@ -3245,6 +4179,20 @@ exim4 (4.72-2) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  Sun, 25 Jul 2010 02:00:42 +0200
+
 exim4 (4.72-1) unstable; urgency=low
 
   * New upstream release. (Identical to the git snapshot previously
@@ -3296,6 +4244,20 @@ exim4 (4.71-4) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  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.
@@ -3410,6 +4372,35 @@ exim4 (4.70~cvs+20091017-1) experimental; urgency=low
 
  -- Andreas Metzler <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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
@@ -3467,6 +4458,15 @@ exim4 (4.69-10) unstable; urgency=low
 
  -- Andreas Metzler <[e-mail]>  Sat, 02 May 2009 09:05:56 +0200
 
+exim4 (4.69-9ubuntu1) jaunty; urgency=low
+
+  [ Daniel van Eeden <[e-mail]> ]
+  * 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 <[e-mail]>  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
diff --git a/debian/control b/debian/control
index 383145d..2210560 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@
 Source: exim4
 Section: mail
 Priority: standard
-Maintainer: Exim4 Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Exim4 Maintainers <[e-mail]>
 Uploaders:
  Andreas Metzler <[e-mail]>,
  Marc Haber <[e-mail]>,
@@ -29,7 +30,6 @@ Build-Depends:
  libperl-dev,
  libpq-dev,
  libsasl2-dev,
- libspf2-dev,
  libsqlite3-dev,
  libx11-dev,
  libxaw7-dev,
@@ -39,6 +39,7 @@ Build-Depends:
  lynx,
  po-debconf,
  xsltproc,
+ lsb-release
 
 Package: exim4-base
 Architecture: any
diff --git a/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt b/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt
index 0403165..a6b8305 100644
--- a/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt
+++ b/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt
@@ -273,24 +273,46 @@ acl_check_rcpt:
   .endif
 
 
+  # Use spfquery to perform a pair of SPF checks.
+  #
+  # This is quite costly in terms of DNS lookups (~6 lookups per mail).  Do not
+  # enable if that's an issue.  Also note that if you enable this, you must
+  # install "spf-tools-perl" which provides the spfquery command.
+  # Missing spf-tools-perl will trigger the "Unexpected error in
+  # SPF check" warning.
   .ifdef CHECK_RCPT_SPF
-  .ifdef _HAVE_SPF
   deny
     !acl = acl_local_deny_exceptions
-    spf = fail
+    condition = ${run{/usr/bin/spfquery.mail-spf-perl --ip \
+                   ${quote:$sender_host_address} --identity \
+                   ${if def:sender_address_domain \
+                       {--scope mfrom  --identity ${quote:$sender_address}}\
+                       {--scope helo --identity ${quote:$sender_helo_name}}}}\
+                   {no}{${if eq {$runrc}{1}{yes}{no}}}}
     message = [SPF] $sender_host_address is not allowed to send mail from \
               ${if def:sender_address_domain {$sender_address_domain}{$sender_helo_name}}.
     log_message = SPF check failed.
 
   defer
     !acl = acl_local_deny_exceptions
-    spf = temperror
+    condition = ${if eq {$runrc}{5}{yes}{no}}
     message = Temporary DNS error while checking SPF record.  Try again later.
 
   warn
-    spf = pass:softfail:neutral:permerror
-    add_header = :at_start:$spf_received
-  .endif
+    condition = ${if <={$runrc}{6}{yes}{no}}
+    add_header = Received-SPF: ${if eq {$runrc}{0}{pass}\
+                                {${if eq {$runrc}{2}{softfail}\
+                                 {${if eq {$runrc}{3}{neutral}\
+				  {${if eq {$runrc}{4}{permerror}\
+				   {${if eq {$runrc}{6}{none}{error}}}}}}}}}\
+				} client-ip=$sender_host_address; \
+				${if def:sender_address_domain \
+				   {envelope-from=${sender_address}; }{}}\
+				helo=$sender_helo_name
+
+  warn
+    condition = ${if >{$runrc}{6}{yes}{no}}
+    log_message = Unexpected error in SPF check.
   .endif
 
 
diff --git a/debian/patches/fix_smtp_banner.patch b/debian/patches/fix_smtp_banner.patch
 new file mode 100644
index 0000000..7009a95
--- /dev/null
+++ b/debian/patches/fix_smtp_banner.patch
@@ -0,0 +1,55 @@
+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 <[e-mail]>
+Forwarded: https://salsa.debian.org/exim-team/exim4/merge_requests/2
+Last-Update: 2021-11-08
+
+--- a/src/globals.c
++++ b/src/globals.c
+@@ -1489,7 +1489,7 @@
+ uschar *smtp_active_hostname   = NULL;
+ int	smtp_backlog_monitor   = 0;
+ 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->";
+ int     smtp_ch_index          = 0;
+ uschar *smtp_cmd_argument      = NULL;
+--- a/src/config.h.defaults
++++ b/src/config.h.defaults
+@@ -234,4 +234,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 */
+--- a/scripts/Configure-config.h
++++ b/scripts/Configure-config.h
+@@ -23,6 +23,13 @@
+ 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
+--- a/src/exim.h
++++ b/src/exim.h
+@@ -651,6 +651,10 @@
+ # define EXIM_GROUPLIST_SIZE NGROUPS_MAX
+ #endif
+ 
++#ifndef EXIM_DISTRIBUTION
++  #define EXIM_DISTRIBUTION ""
++#endif
++
+ /* Linux has TCP_CORK, FreeBSD has TCP_NOPUSH; they do pretty much the same */
+ 
+ #ifdef TCP_CORK
diff --git a/debian/patches/series b/debian/patches/series
index 62ab922..1c681dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,4 @@
 75_66-Fix-crash-in-expansions.patch
 75_70-Fix-variable-initialisation-in-smtp-transport.-Bug-2.patch
 90_localscan_dlopen.dpatch
+fix_smtp_banner.patch