Merge lp:~yolanda.robla/ubuntu/saucy/exim4/update_smtp_banner into lp:ubuntu/saucy/exim4

Proposed by Yolanda Robla
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~yolanda.robla/ubuntu/saucy/exim4/update_smtp_banner
Merge into: lp:ubuntu/saucy/exim4
Diff against target: 98 lines (+66/-1)
4 files modified
debian/changelog (+8/-0)
debian/control (+1/-1)
debian/patches/fix_smtp_banner.patch (+56/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~yolanda.robla/ubuntu/saucy/exim4/update_smtp_banner
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Robie Basak Approve
Review via email: mp+170631@code.launchpad.net

Description of the change

Displaying EXIM_DISTRIBUTION on SMTP banner

To post a comment you must log in.
51. By Yolanda Robla

removed EDITME patches

52. By Yolanda Robla

revert previous version

Revision history for this message
Robie Basak (racb) wrote :

lgtm

Some comments (probably not worth fixing):

* lsb_release ends up being called twice, but it doesn't really matter.
* Line wrapping in debian/changelog
* debian/changelog says UNRELEASED, but I assume that a sponsor would fix that on upload?

I don't have permissions to sponsor an upload quite yet. But perhaps I will in a couple of weeks :)

review: Approve
53. By Yolanda Robla

debian/patches/fix_smtp_banner.patch: updated SMTP banner
with Ubuntu distribution

Revision history for this message
Martin Pitt (pitti) wrote :

Robbie: For the record, "UNRELEASED" is fine for sponsored branches; the sponsor should merge that as is. Only when you do an upload you do "dch -r" to change UNRELEASED to "saucy", debcommit -r that, and upload.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-27 09:32:02 +0000
3+++ debian/changelog 2013-06-20 15:49:31 +0000
4@@ -1,3 +1,11 @@
5+exim4 (4.80-7ubuntu3) saucy; urgency=low
6+
7+ * debian/patches/fix_smtp_banner.patch: updated SMTP banner
8+ with Ubuntu distribution
9+ * debian/control: added lsb-release build dependency
10+
11+ -- Yolanda Robla <yolanda.robla@canonical.com> Tue, 18 Jun 2013 19:17:43 +0200
12+
13 exim4 (4.80-7ubuntu2) saucy; urgency=low
14
15 * debian/tests: Add autopkgtest.
16
17=== modified file 'debian/control'
18--- debian/control 2013-05-22 15:53:44 +0000
19+++ debian/control 2013-06-20 15:49:31 +0000
20@@ -12,7 +12,7 @@
21 lynx-cur | lynx, docbook-xml, libpcre3-dev, libldap2-dev, libpam0g-dev,
22 libident-dev, libdb5.1-dev, libxmu-dev, libxt-dev, libxext-dev, libx11-dev,
23 libxaw7-dev, libpq-dev, libmysqlclient-dev | libmysqlclient15-dev,
24- libsqlite3-dev, libperl-dev, libgnutls-dev, libsasl2-dev
25+ libsqlite3-dev, libperl-dev, libgnutls-dev, libsasl2-dev, lsb-release
26 XS-Testsuite: autopkgtest
27
28 Package: exim4-base
29
30=== added file 'debian/patches/fix_smtp_banner.patch'
31--- debian/patches/fix_smtp_banner.patch 1970-01-01 00:00:00 +0000
32+++ debian/patches/fix_smtp_banner.patch 2013-06-20 15:49:31 +0000
33@@ -0,0 +1,56 @@
34+Description: Add EXIM_DISTRIBUTION var to display it on the
35+ SMTP banner
36+Origin: https://blueprints.launchpad.net/ubuntu/+spec/servercloud-s-server-app-banner-updates
37+Author: Yolanda Robla <yolanda.robla@canonical.com>
38+Last-Update: 2013-06-20
39+
40+=== modified file 'src/exim.h'
41+--- a/src/exim.h 2012-05-29 19:33:07 +0000
42++++ b/src/exim.h 2013-06-19 09:39:24 +0000
43+@@ -566,4 +566,8 @@
44+ #endif
45+ #endif
46+
47++#ifndef EXIM_DISTRIBUTION
48++ #define EXIM_DISTRIBUTION ""
49++#endif
50++
51+ /* End of exim.h */
52+
53+--- a/src/globals.c 2013-06-19 13:20:00.809922000 +0000
54++++ b/src/globals.c 2013-06-20 08:16:19.212132999 +0000
55+@@ -1104,7 +1104,7 @@
56+ uschar *smtp_active_hostname = NULL;
57+ BOOL smtp_authenticated = FALSE;
58+ uschar *smtp_banner = US"$smtp_active_hostname ESMTP "
59+- "Exim $version_number $tod_full"
60++ "Exim $version_number " EXIM_DISTRIBUTION " $tod_full"
61+ "\0<---------------Space to patch smtp_banner->";
62+ BOOL smtp_batched_input = FALSE;
63+ BOOL smtp_check_spool_space = TRUE;
64+--- a/src/config.h.defaults 2013-06-19 13:20:00.809922000 +0000
65++++ b/src/config.h.defaults 2013-06-20 09:43:43.948132999 +0000
66+@@ -195,4 +195,6 @@
67+ #define SC_EXIM_DEC "%" SCNd64 /* scanf decimal */
68+ #endif
69+
70++#define EXIM_DISTRIBUTION
71++
72+ /* End of config.h.defaults */
73+
74+--- a/scripts/Configure-config.h 2013-06-19 13:20:00.809922000 +0000
75++++ b/scripts/Configure-config.h 2013-06-20 13:45:07.676132999 +0000
76+@@ -23,6 +23,12 @@
77+ if [ "$1" != "" ] ; then MAKE=$1 ; fi
78+ if [ "$MAKE" = "" ] ; then MAKE=make ; fi
79+
80++# exporting distribution to use it in smtp banner
81++if test -x /usr/bin/lsb_release && lsb_release -si; then
82++ export EXIM_DISTRIBUTION=\"$(lsb_release -si)\"
83++else
84++ export EXIM_DISTRIBUTION=\"\"
85++fi
86+ $MAKE buildconfig || exit 1
87+
88+ # BEWARE: tab characters needed in the following sed command. They have had
89+
90
91=== modified file 'debian/patches/series'
92--- debian/patches/series 2013-04-08 18:13:15 +0000
93+++ debian/patches/series 2013-06-20 15:49:31 +0000
94@@ -16,3 +16,4 @@
95 84_CVE-2012-5671.patch
96 85_server_set_id_SPA.diff
97 86_Dovecot-robustness.diff
98+fix_smtp_banner.patch

Subscribers

People subscribed via source and target branches

to all changes: