diffstat of debian/ for exim4_4.90.1-1 exim4_4.90.1-1ubuntu1 changelog | 28 ++++++++++++++++++++++ control | 5 ++-- patches/fix_smtp_banner.patch | 52 ++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 4 files changed, 84 insertions(+), 2 deletions(-) diff -Nru exim4-4.90.1/debian/changelog exim4-4.90.1/debian/changelog --- exim4-4.90.1/debian/changelog 2018-02-10 12:45:40.000000000 +0000 +++ exim4-4.90.1/debian/changelog 2018-02-14 16:02:45.000000000 +0000 @@ -1,3 +1,12 @@ +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 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 @@ -192,6 +201,15 @@ -- Andreas Metzler 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 Thu, 16 Nov 2017 10:02:23 +0100 + exim4 (4.89-9) unstable; urgency=medium * Upload to unstable. @@ -234,6 +252,16 @@ -- Andreas Metzler Sat, 09 Sep 2017 15:29:39 +0200 +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 Wed, 16 Aug 2017 15:42:47 +0200 + exim4 (4.89-5) unstable; urgency=medium * Update to exim-4_89+fixes branch: diff -Nru exim4-4.90.1/debian/control exim4-4.90.1/debian/control --- exim4-4.90.1/debian/control 2018-01-28 17:16:00.000000000 +0000 +++ exim4-4.90.1/debian/control 2018-02-14 16:03:16.000000000 +0000 @@ -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: https://www.exim.org/ Standards-Version: 4.1.3 @@ -11,7 +12,7 @@ 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, default-libmysqlclient-dev, - libsqlite3-dev, libperl-dev, libgnutls28-dev, libsasl2-dev + libsqlite3-dev, libperl-dev, libgnutls28-dev, libsasl2-dev, lsb-release Package: exim4-base Architecture: any diff -Nru exim4-4.90.1/debian/patches/fix_smtp_banner.patch exim4-4.90.1/debian/patches/fix_smtp_banner.patch --- exim4-4.90.1/debian/patches/fix_smtp_banner.patch 1970-01-01 00:00:00.000000000 +0000 +++ exim4-4.90.1/debian/patches/fix_smtp_banner.patch 2018-02-14 15:55:48.000000000 +0000 @@ -0,0 +1,52 @@ +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: 2015-07-06 + +--- a/src/globals.c ++++ b/src/globals.c +@@ -1311,7 +1311,7 @@ int smtp_accept_reserve = 0; + 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; +--- a/src/config.h.defaults ++++ b/src/config.h.defaults +@@ -210,4 +210,6 @@ for EXIM_ARITH_MAX and _MIN in OS/oh.h-F + #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,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 +--- a/src/exim.h ++++ b/src/exim.h +@@ -603,5 +603,9 @@ default to EDQUOT if it exists, otherwis + # define POLLRDHUP (POLLIN | POLLHUP) + #endif + ++#ifndef EXIM_DISTRIBUTION ++ #define EXIM_DISTRIBUTION "" ++#endif ++ + #endif + /* End of exim.h */ diff -Nru exim4-4.90.1/debian/patches/series exim4-4.90.1/debian/patches/series --- exim4-4.90.1/debian/patches/series 2018-02-10 12:45:06.000000000 +0000 +++ exim4-4.90.1/debian/patches/series 2018-02-14 15:55:23.000000000 +0000 @@ -7,3 +7,4 @@ 60_convert4r4.dpatch 67_unnecessaryCopt.diff 70_remove_exim-users_references.dpatch +fix_smtp_banner.patch