Merge ~utkarsh/ubuntu/+source/exim4:merge-exim4-impish into ubuntu/+source/exim4:debian/sid

Proposed by Utkarsh Gupta
Status: Merged
Merge reported by: Utkarsh Gupta
Merged at revision: ba8cb54879f6f9502daab895e6dc31d9aa05c488
Proposed branch: ~utkarsh/ubuntu/+source/exim4:merge-exim4-impish
Merge into: ubuntu/+source/exim4:debian/sid
Diff against target: 1320 lines (+893/-2)
4 files modified
debian/changelog (+835/-0)
debian/control (+4/-2)
debian/patches/fix_smtp_banner.patch (+53/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Robie Basak Approve
Canonical Server packageset reviewers Pending
Canonical Server Team Pending
Ubuntu Server Dev import team Pending
Review via email: mp+402442@code.launchpad.net

Description of the change

Hello,

This MP does a merge of exim4 w/ Debian sid. The PPA can be found here:
https://launchpad.net/~utkarsh/+archive/ubuntu/experimental-dump/

The build and autopkgtest passes:
```
autopkgtest [15:57:24]: test basic: -----------------------]
autopkgtest [15:57:24]: test basic: - - - - - - - - - - results - - - - - - - - - -
basic PASS
autopkgtest [15:57:24]: @@@@@@@@@@@@@@@@@@@@ summary
basic PASS
```

Requesting you to please review and sponsor the upload. Let me know if there's anything missing. TIA! \o/

[Assigning MP review to Robie, based on previous discussions.]

To post a comment you must log in.
Revision history for this message
Robie Basak (racb) wrote :

lgtm. Checking the very large security patch being dropped seemed impractical, but I did check that it fully reverse-applies, so that gives confidence that the entire patch is indeed correctly carried on the new Debian base.

4.94.2-2 was uploaded to Debian yesterday. Would you prefer to rebase onto that, or have me sponsor this one?

review: Approve
97bde10... by Utkarsh Gupta on 2021-05-11

  * 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.

41ad245... by Utkarsh Gupta on 2021-05-11

merge-changelogs

d15226c... by Utkarsh Gupta on 2021-05-11

reconstruct-changelog

ba8cb54... by Utkarsh Gupta on 2021-05-11

update-maintainer

Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

Hi Robie,

Thanks for the review (and approving). I've further rebased on top of Debian's new upload and we're good to go now. Could you please re-review and sponsor the upload? TIA!

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

Sponsored and uploaded. Thanks!

4.94.2-4 is in Debian now, but as discussed we'll leave it for now, and catch up nearer feature freeze, to save doing this over and over again.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 6fce4de..f079512 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,16 @@
6+exim4 (4.94.2-2ubuntu1) impish; urgency=medium
7+
8+ * Merge with Debian unstable. Remaining changes:
9+ - Show Ubuntu distribution in SMTP banner
10+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
11+ + Build-Depends on lsb-release to detect Distribution.
12+ * Dropped changes:
13+ - debian/patches/sec-202105/*.patch: backport patches from upstream to
14+ correct issues.
15+ [Included in 4.94.2-1]
16+
17+ -- Utkarsh Gupta <utkarsh.gupta@canonical.com> Tue, 11 May 2021 18:25:10 +0530
18+
19 exim4 (4.94.2-2) unstable; urgency=medium
20
21 * Updates from exim-4.94.2+fixes:
22@@ -110,6 +123,28 @@ exim4 (4.94-16) unstable; urgency=medium
23
24 -- Andreas Metzler <ametzler@debian.org> Wed, 17 Mar 2021 13:50:44 +0100
25
26+exim4 (4.94-15ubuntu1.2) hirsute-security; urgency=medium
27+
28+ * SECURITY UPDATE: Multiple security issues
29+ - debian/patches/sec-202105/*.patch: backport patches from upstream to
30+ correct issues.
31+ - CVE-2020-28007, CVE-2020-28008, CVE-2020-28009, CVE-2020-28010,
32+ CVE-2020-28011, CVE-2020-28012, CVE-2020-28013, CVE-2020-28014,
33+ CVE-2020-28015, CVE-2020-28016, CVE-2020-28017, CVE-2020-28018,
34+ CVE-2020-28019, CVE-2020-28021, CVE-2020-28022, CVE-2020-28023,
35+ CVE-2020-28024, CVE-2020-28025, CVE-2020-28026, CVE-2021-27216
36+
37+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Fri, 30 Apr 2021 08:46:21 -0400
38+
39+exim4 (4.94-15ubuntu1) hirsute; urgency=medium
40+
41+ * Merge with Debian unstable (LP: #1916744). Remaining changes:
42+ - Show Ubuntu distribution in SMTP banner
43+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
44+ + Build-Depends on lsb-release to detect Distribution.
45+
46+ -- Utkarsh Gupta <utkarsh.gupta@canonical.com> Wed, 24 Feb 2021 17:32:37 +0530
47+
48 exim4 (4.94-15) unstable; urgency=medium
49
50 * Update from exim-4.94+fixes:
51@@ -134,6 +169,15 @@ exim4 (4.94-13) unstable; urgency=medium
52
53 -- Andreas Metzler <ametzler@debian.org> Sat, 30 Jan 2021 14:50:50 +0100
54
55+exim4 (4.94-12ubuntu1) hirsute; urgency=medium
56+
57+ * Merge with Debian unstable. Remaining changes:
58+ - Show Ubuntu distribution in SMTP banner
59+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
60+ + Build-Depends on lsb-release to detect Distribution.
61+
62+ -- Bryce Harrington <bryce@canonical.com> Wed, 20 Jan 2021 19:35:04 -0800
63+
64 exim4 (4.94-12) unstable; urgency=medium
65
66 * Update from exim-4.94+fixes:
67@@ -168,6 +212,15 @@ exim4 (4.94-10) unstable; urgency=low
68
69 -- Andreas Metzler <ametzler@debian.org> Sat, 19 Dec 2020 12:03:56 +0100
70
71+exim4 (4.94-9ubuntu1) hirsute; urgency=medium
72+
73+ * Merge with Debian unstable. Remaining changes:
74+ - Show Ubuntu distribution in SMTP banner
75+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
76+ + Build-Depends on lsb-release to detect Distribution.
77+
78+ -- Bryce Harrington <bryce@canonical.com> Sat, 07 Nov 2020 01:01:32 +0000
79+
80 exim4 (4.94-9) unstable; urgency=low
81
82 * Update from exim-4.94+fixes:
83@@ -197,6 +250,15 @@ exim4 (4.94-8) unstable; urgency=low
84
85 -- Andreas Metzler <ametzler@debian.org> Thu, 17 Sep 2020 06:54:00 +0200
86
87+exim4 (4.94-7ubuntu1) groovy; urgency=medium
88+
89+ * Merge with Debian unstable. Remaining changes:
90+ - Show Ubuntu distribution in SMTP banner
91+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
92+ + Build-Depends on lsb-release to detect Distribution.
93+
94+ -- Sergio Durigan Junior <sergio.durigan@canonical.com> Mon, 24 Aug 2020 16:36:31 -0400
95+
96 exim4 (4.94-7) unstable; urgency=low
97
98 * Update from exim-4.94+fixes:
99@@ -207,6 +269,15 @@ exim4 (4.94-7) unstable; urgency=low
100
101 -- Andreas Metzler <ametzler@debian.org> Fri, 24 Jul 2020 13:31:47 +0200
102
103+exim4 (4.94-6ubuntu1) groovy; urgency=medium
104+
105+ * Merge with Debian unstable. Remaining changes:
106+ - Show Ubuntu distribution in SMTP banner
107+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
108+ + Build-Depends on lsb-release to detect Distribution.
109+
110+ -- Sergio Durigan Junior <sergio.durigan@canonical.com> Thu, 13 Aug 2020 13:49:10 -0400
111+
112 exim4 (4.94-6) unstable; urgency=medium
113
114 * Fix typo (missing "S") in REMOTE_SMTP_SMARTHOST_TLS_VERIFY_HOSTS macro.
115@@ -258,6 +329,15 @@ exim4 (4.94-3) unstable; urgency=medium
116
117 -- Andreas Metzler <ametzler@debian.org> Fri, 19 Jun 2020 10:31:26 +0200
118
119+exim4 (4.94-2ubuntu1) groovy; urgency=medium
120+
121+ * Merge with Debian unstable (LP: #1881723). Remaining changes:
122+ - Show Ubuntu distribution in SMTP banner
123+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
124+ + Build-Depends on lsb-release to detect Distribution.
125+
126+ -- Bryce Harrington <bryce@canonical.com> Fri, 12 Jun 2020 01:55:28 +0000
127+
128 exim4 (4.94-2) unstable; urgency=low
129
130 * Tighten package interdependencies. With 4.94's daemon avoiding of
131@@ -360,6 +440,15 @@ exim4 (4.93-16) unstable; urgency=medium
132
133 -- Andreas Metzler <ametzler@debian.org> Sat, 09 May 2020 19:10:34 +0200
134
135+exim4 (4.93-15ubuntu1) groovy; urgency=medium
136+
137+ * Merge with Debian unstable. Remaining changes:
138+ - Show Ubuntu distribution in SMTP banner
139+ + Build-Depends on lsb-release to detect Distribution.
140+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
141+
142+ -- Sergio Durigan Junior <sergio.durigan@canonical.com> Tue, 05 May 2020 15:37:59 -0400
143+
144 exim4 (4.93-15) unstable; urgency=low
145
146 * Update from exim-4.93+fixes:
147@@ -379,6 +468,15 @@ exim4 (4.93-14) unstable; urgency=low
148
149 -- Andreas Metzler <ametzler@debian.org> Fri, 10 Apr 2020 13:53:34 +0200
150
151+exim4 (4.93-13ubuntu1) focal; urgency=medium
152+
153+ * Merge with Debian unstable. Remaining changes:
154+ - Show Ubuntu distribution in SMTP banner
155+ + Build-Depends on lsb-release to detect Distribution.
156+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
157+
158+ -- Bryce Harrington <bryce@canonical.com> Fri, 27 Mar 2020 16:00:03 -0700
159+
160 exim4 (4.93-13) unstable; urgency=medium
161
162 * Update from exim-4.93+fixes:
163@@ -390,6 +488,15 @@ exim4 (4.93-13) unstable; urgency=medium
164
165 -- Andreas Metzler <ametzler@debian.org> Sat, 21 Mar 2020 11:39:19 +0100
166
167+exim4 (4.93-12ubuntu1) focal; urgency=medium
168+
169+ * Merge with Debian unstable. Remaining changes:
170+ - Show Ubuntu distribution in SMTP banner
171+ + Build-Depends on lsb-release to detect Distribution.
172+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
173+
174+ -- Bryce Harrington <bryce@canonical.com> Fri, 13 Mar 2020 14:25:38 -0700
175+
176 exim4 (4.93-12) unstable; urgency=low
177
178 * Update from exim-4.93+fixes:
179@@ -405,6 +512,15 @@ exim4 (4.93-12) unstable; urgency=low
180
181 -- Andreas Metzler <ametzler@debian.org> Sat, 29 Feb 2020 15:53:44 +0100
182
183+exim4 (4.93-11ubuntu1) focal; urgency=medium
184+
185+ * Merge with Debian unstable. Remaining changes:
186+ - Show Ubuntu distribution in SMTP banner
187+ + Build-Depends on lsb-release to detect Distribution.
188+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
189+
190+ -- Bryce Harrington <bryce@canonical.com> Wed, 26 Feb 2020 02:34:11 +0000
191+
192 exim4 (4.93-11) unstable; urgency=medium
193
194 * Update from exim-4.93+fixes:
195@@ -424,6 +540,15 @@ exim4 (4.93-10) unstable; urgency=medium
196
197 -- Andreas Metzler <ametzler@debian.org> Sat, 01 Feb 2020 11:06:29 +0100
198
199+exim4 (4.93-9ubuntu1) focal; urgency=medium
200+
201+ * Merge with Debian unstable (LP: #1860051). Remaining changes:
202+ - Show Ubuntu distribution in SMTP banner
203+ - Build-Depends on lsb-release to detect Distribution.
204+ - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
205+
206+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Fri, 17 Jan 2020 09:39:13 +0100
207+
208 exim4 (4.93-9) unstable; urgency=medium
209
210 * Add 74_22-Taint-hybrid-checking-mode.patch.
211@@ -543,6 +668,25 @@ exim4 (4.93~RC3-1) unstable; urgency=low
212
213 -- Andreas Metzler <ametzler@debian.org> Sun, 17 Nov 2019 11:37:15 +0100
214
215+exim4 (4.93~RC2-1ubuntu1) focal; urgency=medium
216+
217+ * Merge with Debian unstable. Remaining changes:
218+ - Show Ubuntu distribution in SMTP banner
219+ + Build-Depends on lsb-release to detect Distribution.
220+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
221+ * Dropped:
222+ - SECURITY UPDATE: remote command execution
223+ + d/p/CVE-2019-15846.patch: ensure not to interpret '\\'
224+ before '\0' in src/string.c
225+ + CVE-2019-15846
226+ [Now in upstream as of 4.92.2-1]
227+ - SECURITY UPDATE: heap-based buffer overflow in string_vformat
228+ + debian/patches/CVE-2019-16928.patch: fix overflow in src/string.c.
229+ + CVE-2019-16928
230+ [Now upstream as of 4.92.3-1]
231+
232+ -- Bryce Harrington <bryce@canonical.com> Wed, 13 Nov 2019 18:56:58 -0800
233+
234 exim4 (4.93~RC2-1) unstable; urgency=low
235
236 * New upstream beta version.
237@@ -699,6 +843,42 @@ exim4 (4.92.1-2) unstable; urgency=medium
238
239 -- Andreas Metzler <ametzler@debian.org> Wed, 14 Aug 2019 09:25:28 +0200
240
241+exim4 (4.92.1-1ubuntu4) focal; urgency=medium
242+
243+ * No-change rebuild for the perl update.
244+
245+ -- Matthias Klose <doko@ubuntu.com> Fri, 18 Oct 2019 19:27:29 +0000
246+
247+exim4 (4.92.1-1ubuntu3) eoan; urgency=medium
248+
249+ * SECURITY UPDATE: heap-based buffer overflow in string_vformat
250+ - debian/patches/CVE-2019-16928.patch: fix overflow in src/string.c.
251+ - CVE-2019-16928
252+
253+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Sat, 28 Sep 2019 11:05:50 -0400
254+
255+exim4 (4.92.1-1ubuntu2) eoan; urgency=medium
256+
257+ * SECURITY UPDATE: remote command execution
258+ - debian/patches/CVE-2019-15846.patch: ensure not to interpret '\\'
259+ before '\0' in src/string.c
260+ - CVE-2019-15846
261+
262+ -- Alex Murray <alex.murray@canonical.com> Thu, 05 Sep 2019 11:29:48 +0930
263+
264+exim4 (4.92.1-1ubuntu1) eoan; urgency=medium
265+
266+ * Merge with Debian unstable. Remaining changes:
267+ - Show Ubuntu distribution in SMTP banner
268+ + Build-Depends on lsb-release to detect Distribution.
269+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
270+ * Dropped:
271+ - d/p/CVE-2019-13917.patch: avoid re-expansion in ${sort } in
272+ src/expand.c.
273+ [Fixed in 4.92.1]
274+
275+ -- Bryce Harrington <bryce@canonical.com> Mon, 12 Aug 2019 19:18:33 -0700
276+
277 exim4 (4.92.1-1) unstable; urgency=low
278
279 * New upstream bugfix release. (4.92.1 is 4.92 + the fix for CVE-2019-13917,
280@@ -769,6 +949,24 @@ exim4 (4.92-8) unstable; urgency=low
281
282 -- Andreas Metzler <ametzler@debian.org> Sat, 08 Jun 2019 17:37:43 +0200
283
284+exim4 (4.92-7ubuntu2) eoan; urgency=medium
285+
286+ * SECURITY UPDATE: code execution via ${sort }
287+ - debian/patches/CVE-2019-13917.patch: avoid re-expansion in ${sort }
288+ in src/expand.c.
289+ - CVE-2019-13917
290+
291+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 25 Jul 2019 12:58:39 -0400
292+
293+exim4 (4.92-7ubuntu1) eoan; urgency=medium
294+
295+ * Merge with Debian unstable. Remaining changes:
296+ - Show Ubuntu distribution in SMTP banner
297+ + Build-Depends on lsb-release to detect Distribution.
298+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
299+
300+ -- Bryce Harrington <bryce@canonical.com> Mon, 13 May 2019 13:48:18 -0700
301+
302 exim4 (4.92-7) unstable; urgency=medium
303
304 * Upload to unstable.
305@@ -796,6 +994,15 @@ exim4 (4.92-5) unstable; urgency=medium
306
307 -- Andreas Metzler <ametzler@debian.org> Sun, 07 Apr 2019 13:39:31 +0200
308
309+exim4 (4.92-4ubuntu1) disco; urgency=medium
310+
311+ * Merge with Debian unstable (LP: #1821339). Remaining changes:
312+ * Show Ubuntu distribution in SMTP banner
313+ - Build-Depends on lsb-release to detect Distribution.
314+ - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
315+
316+ -- Karl Stenerud <karl.stenerud@canonical.com> Mon, 25 Mar 2019 12:02:33 +0100
317+
318 exim4 (4.92-4) unstable; urgency=medium
319
320 * Another patch from exim-4.92+fixes branch:
321@@ -814,6 +1021,15 @@ exim4 (4.92-3) unstable; urgency=medium
322
323 -- Andreas Metzler <ametzler@debian.org> Wed, 20 Mar 2019 17:01:29 +0100
324
325+exim4 (4.92-2ubuntu1) disco; urgency=medium
326+
327+ * Merge with Debian unstable (LP: #1818444). Remaining changes:
328+ - Show Ubuntu distribution in SMTP banner
329+ + Build-Depends on lsb-release to detect Distribution.
330+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
331+
332+ -- Karl Stenerud <kstenerud@gmail.com> Tue, 05 Mar 2019 10:55:48 +0100
333+
334 exim4 (4.92-2) unstable; urgency=medium
335
336 * Upload to unstable.
337@@ -870,6 +1086,21 @@ exim4 (4.92~RC4-3) unstable; urgency=medium
338
339 -- Andreas Metzler <ametzler@debian.org> Sun, 20 Jan 2019 17:52:39 +0100
340
341+exim4 (4.92~RC4-2ubuntu2) disco; urgency=medium
342+
343+ * No-change rebuild against libmysqlclient21
344+
345+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 01 Feb 2019 16:57:54 +0000
346+
347+exim4 (4.92~RC4-2ubuntu1) disco; urgency=medium
348+
349+ * Merge with Debian unstable (LP: #1811095). Remaining changes:
350+ - Show Ubuntu distribution in SMTP banner
351+ + Build-Depends on lsb-release to detect Distribution.
352+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
353+
354+ -- Karl Stenerud <kstenerud@gmail.com> Thu, 10 Jan 2019 16:41:45 +0100
355+
356 exim4 (4.92~RC4-2) unstable; urgency=medium
357
358 * Upload to unstable.
359@@ -963,6 +1194,22 @@ exim4 (4.91-7) unstable; urgency=low
360
361 -- Andreas Metzler <ametzler@debian.org> Sun, 26 Aug 2018 11:33:15 +0200
362
363+exim4 (4.91-6ubuntu2) disco; urgency=medium
364+
365+ * No-change rebuild for the perl 5.28 transition.
366+
367+ -- Adam Conrad <adconrad@ubuntu.com> Fri, 02 Nov 2018 18:08:13 -0600
368+
369+exim4 (4.91-6ubuntu1) cosmic; urgency=medium
370+
371+ * Merge with Debian unstable. Remaining changes:
372+ - Show Ubuntu distribution in SMTP banner
373+ + Build-Depends on lsb-release to detect Distribution.
374+ + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
375+ [DEP3 header updated to indicate it has been forwarded to Debian]
376+
377+ -- Andreas Hasenack <andreas@canonical.com> Mon, 30 Jul 2018 15:35:06 -0300
378+
379 exim4 (4.91-6) unstable; urgency=low
380
381 * Update from exim-4_91+fixes branch:
382@@ -974,6 +1221,16 @@ exim4 (4.91-6) unstable; urgency=low
383
384 -- Andreas Metzler <ametzler@debian.org> Fri, 20 Jul 2018 11:21:24 +0200
385
386+exim4 (4.91-5ubuntu1) cosmic; urgency=medium
387+
388+ * Merge with Debian unstable. Remaining changes:
389+ - Show Ubuntu distribution in SMTP banner
390+ - Build-Depends on lsb-release to detect Distribution.
391+ - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
392+ [DEP3 header updated to indicate it has been forwarded to Debian]
393+
394+ -- Andreas Hasenack <andreas@canonical.com> Tue, 03 Jul 2018 11:13:08 -0300
395+
396 exim4 (4.91-5) unstable; urgency=medium
397
398 * Update from exim-4_91+fixes branch:
399@@ -983,6 +1240,15 @@ exim4 (4.91-5) unstable; urgency=medium
400
401 -- Andreas Metzler <ametzler@debian.org> Sat, 09 Jun 2018 18:10:39 +0200
402
403+exim4 (4.91-4ubuntu1) cosmic; urgency=medium
404+
405+ * Merge from Debian testing, Remaining changes:
406+ - Show Ubuntu distribution in SMTP banner
407+ - Build-Depends on lsb-release to detect Distribution.
408+ - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
409+
410+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 30 May 2018 12:46:14 +0200
411+
412 exim4 (4.91-4) unstable; urgency=medium
413
414 * Update from exim-4_91+fixes branch:
415@@ -1101,6 +1367,15 @@ exim4 (4.90.1-2) unstable; urgency=medium
416
417 -- Andreas Metzler <ametzler@debian.org> Sat, 10 Mar 2018 14:25:51 +0100
418
419+exim4 (4.90.1-1ubuntu1) bionic; urgency=medium
420+
421+ * Merge from Debian testing, Remaining changes:
422+ - Show Ubuntu distribution in SMTP banner
423+ - Build-Depends on lsb-release to detect Distribution.
424+ - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
425+
426+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 14 Feb 2018 17:01:14 +0100
427+
428 exim4 (4.90.1-1) unstable; urgency=high
429
430 * New upstream version, fixing CVE-2018-6789. Closes: #890000
431@@ -1295,6 +1570,15 @@ exim4 (4.89-10) unstable; urgency=critical
432
433 -- Andreas Metzler <ametzler@debian.org> Sat, 25 Nov 2017 11:43:24 +0100
434
435+exim4 (4.89-9ubuntu1) bionic; urgency=medium
436+
437+ * Merge from Debian unstable, Remaining changes:
438+ - Show Ubuntu distribution in SMTP banner
439+ - Build-Depends on lsb-release to detect Distribution.
440+ - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
441+
442+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 16 Nov 2017 10:02:23 +0100
443+
444 exim4 (4.89-9) unstable; urgency=medium
445
446 * Upload to unstable.
447@@ -1337,6 +1621,42 @@ exim4 (4.89-6) unstable; urgency=medium
448
449 -- Andreas Metzler <ametzler@debian.org> Sat, 09 Sep 2017 15:29:39 +0200
450
451+exim4 (4.89-5ubuntu1.3) artful-security; urgency=medium
452+
453+ * SECURITY UPDATE: Buffer overflow in base64d()
454+ - debian/patches/CVE-2018-6789.patch: fix overflow in src/base64.c.
455+ - CVE-2018-6789
456+
457+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Sat, 10 Feb 2018 14:12:27 -0500
458+
459+exim4 (4.89-5ubuntu1.2) artful-security; urgency=medium
460+
461+ * SECURITY UPDATE: stack-exhaustion remote DoS
462+ - debian/patches/CVE-2017-16944.patch: do not treat the first lonely
463+ dot special in src/receive.c, src/smtp_in.c.
464+ - CVE-2017-16944
465+
466+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Wed, 29 Nov 2017 08:59:31 -0500
467+
468+exim4 (4.89-5ubuntu1.1) artful-security; urgency=medium
469+
470+ * SECURITY UPDATE: remote code execution via use-after-free
471+ - debian/patches/CVE-2017-16943.patch: avoid release of store if there
472+ have been later allocations in src/receive.c.
473+ - CVE-2017-16943
474+
475+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Mon, 27 Nov 2017 07:37:47 -0500
476+
477+exim4 (4.89-5ubuntu1) artful; urgency=medium
478+
479+ * Merge from Debian testing.
480+ Remaining changes:
481+ - Show Ubuntu distribution in SMTP banner
482+ - Build-Depends on lsb-release to detect Distribution.
483+ - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner.
484+
485+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 16 Aug 2017 15:42:47 +0200
486+
487 exim4 (4.89-5) unstable; urgency=medium
488
489 * Update to exim-4_89+fixes branch:
490@@ -1381,6 +1701,20 @@ exim4 (4.89-4) unstable; urgency=low
491
492 -- Andreas Metzler <ametzler@debian.org> Sat, 15 Jul 2017 12:46:16 +0200
493
494+exim4 (4.89-3ubuntu2) artful; urgency=medium
495+
496+ * No-change rebuild for perl 5.26.0.
497+
498+ -- Matthias Klose <doko@ubuntu.com> Wed, 26 Jul 2017 20:02:24 +0000
499+
500+exim4 (4.89-3ubuntu1) artful; urgency=medium
501+
502+ * Merge from Debian. Remaining changes:
503+ - Show Ubuntu distribution in SMTP banner.
504+ - Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch)
505+
506+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 27 Jun 2017 10:20:42 -0400
507+
508 exim4 (4.89-3) unstable; urgency=high
509
510 * Re-upload to unstable.
511@@ -1393,6 +1727,15 @@ exim4 (4.89-2+deb9u1) stretch-security; urgency=medium
512
513 -- <jmm@debian.org> Wed, 14 Jun 2017 07:03:07 +0200
514
515+exim4 (4.89-2ubuntu1) artful; urgency=medium
516+
517+ * Merge from Debian testing.
518+ Remaining changes:
519+ + Show Ubuntu distribution in SMTP banner.
520+ + Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch)
521+
522+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 01 Jun 2017 11:58:00 +0200
523+
524 exim4 (4.89-2) unstable; urgency=medium
525
526 * Revert addition of header "# pidfile: /var/run/exim4/exim.pid" to
527@@ -1484,6 +1827,17 @@ exim4 (4.89~RC1-1) unstable; urgency=low
528
529 -- Andreas Metzler <ametzler@debian.org> Tue, 31 Jan 2017 19:52:50 +0100
530
531+exim4 (4.88-5ubuntu1) zesty; urgency=medium
532+
533+ * Merge from Debian unstable.
534+ Version 4.88 fixes CVE-2016-9963 (LP: #1654750) and symlink
535+ local root escalation (LP: #1580454)
536+ Remaining changes:
537+ + Show Ubuntu distribution in SMTP banner.
538+ + Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch)
539+
540+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 24 Jan 2017 10:15:09 +0100
541+
542 exim4 (4.88-5) unstable; urgency=medium
543
544 * 78_Disable-chunking-BDAT-by-default.patch: Change default value of main
545@@ -1636,6 +1990,20 @@ exim4 (4.88~RC1-1) experimental; urgency=low
546
547 -- Andreas Metzler <ametzler@debian.org> Sun, 25 Sep 2016 15:44:00 +0200
548
549+exim4 (4.87-3ubuntu2) zesty; urgency=medium
550+
551+ * No-change rebuild for perl 5.24 transition
552+
553+ -- Iain Lane <iain@orangesquash.org.uk> Mon, 24 Oct 2016 10:08:10 +0100
554+
555+exim4 (4.87-3ubuntu1) yakkety; urgency=medium
556+
557+ * Merge from Debian unstable. Remaining changes:
558+ + Show Ubuntu distribution in SMTP banner.
559+ + Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch)
560+
561+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 26 Jul 2016 13:30:09 +0200
562+
563 exim4 (4.87-3) unstable; urgency=medium
564
565 * Pull multiple patches from upstream GIT:
566@@ -1809,6 +2177,48 @@ exim4 (4.87~RC1-1) experimental; urgency=medium
567
568 -- Andreas Metzler <ametzler@debian.org> Fri, 11 Dec 2015 20:15:30 +0100
569
570+exim4 (4.86.2-2ubuntu2.3) xenial-security; urgency=medium
571+
572+ * SECURITY UPDATE: Buffer overflow in base64d()
573+ - debian/patches/CVE-2018-6789.patch: fix overflow in
574+ src/auths/b64decode.c.
575+ - CVE-2018-6789
576+
577+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Sat, 10 Feb 2018 14:18:40 -0500
578+
579+exim4 (4.86.2-2ubuntu2.2) xenial-security; urgency=medium
580+
581+ * SECURITY UPDATE: memory leak
582+ - debian/patches/93_CVE-2017-1000368.patch: free -p argument if
583+ allocation was required.
584+ - CVE-2017-1000368
585+
586+ -- Steve Beattie <sbeattie@ubuntu.com> Fri, 02 Jun 2017 22:07:28 -0700
587+
588+exim4 (4.86.2-2ubuntu2.1) xenial-security; urgency=medium
589+
590+ * SECURITY UPDATE: DKIM information leakage
591+ - debian/patches/CVE-2016-9963.patch: fix information leakage in
592+ src/dkim.c, src/transports/smtp.c.
593+ - CVE-2016-9963
594+
595+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 05 Jan 2017 08:29:10 -0500
596+
597+exim4 (4.86.2-2ubuntu2) xenial; urgency=medium
598+
599+ * Rebuild against libmysqlclient20.
600+
601+ -- Robie Basak <robie.basak@ubuntu.com> Tue, 05 Apr 2016 12:21:41 +0000
602+
603+exim4 (4.86.2-2ubuntu1) xenial; urgency=medium
604+
605+ * Merge from Debian unstable. Remaining changes:
606+ - debian.control, debian/patches/fix_smtp_banner.patch
607+ + Show Ubuntu distribution in SMTP banner.
608+ + Build-Depends on lsb-release.
609+
610+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 15 Mar 2016 11:56:18 -0400
611+
612 exim4 (4.86.2-2) unstable; urgency=high
613
614 * Bump exim4-config Breaks to exim4-daemon-* (<< 4.86.2). Closes: #816790
615@@ -1830,6 +2240,27 @@ exim4 (4.86.2-1) unstable; urgency=high
616
617 -- Andreas Metzler <ametzler@debian.org> Tue, 01 Mar 2016 19:34:39 +0100
618
619+exim4 (4.86-7ubuntu3) xenial; urgency=medium
620+
621+ * No-change rebuild for gnutls transition.
622+
623+ -- Matthias Klose <doko@ubuntu.com> Wed, 17 Feb 2016 22:40:56 +0000
624+
625+exim4 (4.86-7ubuntu2) xenial; urgency=medium
626+
627+ * Rebuild for Perl 5.22.1.
628+
629+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 18 Dec 2015 10:30:54 +0000
630+
631+exim4 (4.86-7ubuntu1) xenial; urgency=medium
632+
633+ * Merge from Debian unstable. Remaining changes:
634+ - debian.control, debian/patches/fix_smtp_banner.patch
635+ + Show Ubuntu distribution in SMTP banner.
636+ + Build-Depends on lsb-release.
637+
638+ -- Pierre-André MOREY <pierre-andre.morey@canonical.com> Mon, 14 Dec 2015 14:23:51 +0100
639+
640 exim4 (4.86-7) unstable; urgency=medium
641
642 * Allow arch-indep build (dpkg-buildpackage -A). Closes: #806023
643@@ -1880,6 +2311,15 @@ exim4 (4.86-4) unstable; urgency=medium
644
645 -- Andreas Metzler <ametzler@debian.org> Sat, 17 Oct 2015 15:01:01 +0200
646
647+exim4 (4.86-3ubuntu1) wily; urgency=medium
648+
649+ * Merge from Debian unstable. (LP: #1485369) Remaining changes:
650+ - debian/control, debian/patches/fix_smtp_banner.patch:
651+ + Show Ubuntu distribution in SMTP banner.
652+ + Build-Depends on lsb-release.
653+
654+ -- Artur Rona <ari-tczew@ubuntu.com> Thu, 17 Sep 2015 13:18:20 +0100
655+
656 exim4 (4.86-3) unstable; urgency=medium
657
658 * Pull three patches from upstream git:
659@@ -1920,6 +2360,15 @@ exim4 (4.86~RC5-1) unstable; urgency=medium
660
661 -- Andreas Metzler <ametzler@debian.org> Sat, 18 Jul 2015 11:46:11 +0200
662
663+exim4 (4.86~RC4-2ubuntu1) wily; urgency=low
664+
665+ * Merge from Debian unstable. (LP: #1166671) Remaining changes:
666+ - debian/control, debian/patches/fix_smtp_banner.patch:
667+ + Show Ubuntu distribution in SMTP banner.
668+ + Build-Depends on lsb-release.
669+
670+ -- Artur Rona <ari-tczew@ubuntu.com> Mon, 06 Jul 2015 12:09:36 +0200
671+
672 exim4 (4.86~RC4-2) unstable; urgency=medium
673
674 * Drop libmysqlclient15-dev alternative build-dependency. Closes: #790463
675@@ -2084,6 +2533,18 @@ exim4 (4.85~RC1+dfsg-1) experimental; urgency=medium
676
677 -- Andreas Metzler <ametzler@debian.org> Tue, 18 Nov 2014 19:28:20 +0100
678
679+exim4 (4.84-8ubuntu1) vivid; urgency=low
680+
681+ * Merge from Debian unstable. (LP: #1434300) Remaining changes:
682+ - debian/control, debian/patches/fix_smtp_banner.patch:
683+ + Show Ubuntu distribution in SMTP banner.
684+ + Build-Depends on lsb-release.
685+ - debian/control:
686+ + Don't provide default-mta; in Ubuntu,
687+ we want postfix to be the default.
688+
689+ -- Artur Rona <ari-tczew@ubuntu.com> Thu, 19 Mar 2015 00:15:40 +0100
690+
691 exim4 (4.84-8) unstable; urgency=medium
692
693 * Pull 83_Remove-limit-on-remove_headers-item-size.-Bug-1533.patch and
694@@ -2101,6 +2562,15 @@ exim4 (4.84-7) unstable; urgency=medium
695
696 -- Andreas Metzler <ametzler@debian.org> Sat, 07 Feb 2015 15:12:33 +0100
697
698+exim4 (4.84-6ubuntu1) vivid; urgency=medium
699+
700+ * Resynchronise with Debian. Remaining changes:
701+ - Show Ubuntu distribution in SMTP banner.
702+ - Don't provide default-mta; in Ubuntu, we want postfix to be the
703+ default.
704+
705+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 14 Jan 2015 11:26:29 +0000
706+
707 exim4 (4.84-6) unstable; urgency=medium
708
709 * Revert init script's restart order change in 4.84-4 for the time being.
710@@ -2109,6 +2579,15 @@ exim4 (4.84-6) unstable; urgency=medium
711
712 -- Andreas Metzler <ametzler@debian.org> Sun, 21 Dec 2014 14:07:12 +0100
713
714+exim4 (4.84-5ubuntu1) vivid; urgency=medium
715+
716+ * Resynchronise with Debian. Remaining changes:
717+ - Show Ubuntu distribution in SMTP banner.
718+ - Don't provide default-mta; in Ubuntu, we want postfix to be the
719+ default.
720+
721+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 18 Dec 2014 15:26:17 +0000
722+
723 exim4 (4.84-5) unstable; urgency=medium
724
725 * 82_quoted-or-r-2047-encoded.diff pulled from upstream git (sans
726@@ -2116,6 +2595,15 @@ exim4 (4.84-5) unstable; urgency=medium
727
728 -- Andreas Metzler <ametzler@debian.org> Wed, 17 Dec 2014 19:03:39 +0100
729
730+exim4 (4.84-4ubuntu1) vivid; urgency=medium
731+
732+ * Resynchronise with Debian. Remaining changes:
733+ - Show Ubuntu distribution in SMTP banner.
734+ - Don't provide default-mta; in Ubuntu, we want postfix to be the
735+ default.
736+
737+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 02 Dec 2014 15:28:46 +0000
738+
739 exim4 (4.84-4) unstable; urgency=medium
740
741 * Unset message_prefix/message_sufix in maildrop_pipe transport. Maildrop
742@@ -2130,6 +2618,15 @@ exim4 (4.84-4) unstable; urgency=medium
743
744 -- Andreas Metzler <ametzler@debian.org> Sun, 30 Nov 2014 08:24:04 +0100
745
746+exim4 (4.84-3ubuntu1) vivid; urgency=medium
747+
748+ * Resynchronise with Debian. Remaining changes:
749+ - Show Ubuntu distribution in SMTP banner.
750+ - Don't provide default-mta; in Ubuntu, we want postfix to be the
751+ default.
752+
753+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 11 Nov 2014 13:43:35 +0000
754+
755 exim4 (4.84-3) unstable; urgency=medium
756
757 * Apply patch to Italian (it) debconf template translation, thanks to
758@@ -2159,6 +2656,24 @@ exim4 (4.84~RC2-1) unstable; urgency=medium
759
760 -- Andreas Metzler <ametzler@debian.org> Sat, 09 Aug 2014 07:42:00 +0200
761
762+exim4 (4.84~RC1-3ubuntu2) utopic; urgency=medium
763+
764+ * Rebuild for Perl 5.20.0.
765+
766+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 21 Aug 2014 12:18:13 +0100
767+
768+exim4 (4.84~RC1-3ubuntu1) utopic; urgency=low
769+
770+ * Merge from Debian unstable (LP: #1351470). Remaining changes:
771+ - Show Ubuntu distribution on smtp:
772+ + debian/patches/fix_smtp_banner.patch: updated SMTP banner
773+ with Ubuntu distribution
774+ + debian/control: added lsb-release build dependency
775+ - Don't provide default-mta; in Ubuntu, we want postfix to be the
776+ default.
777+
778+ -- Corey Bryant <corey.bryant@canonical.com> Mon, 04 Aug 2014 11:48:39 -0400
779+
780 exim4 (4.84~RC1-3) unstable; urgency=medium
781
782 * Third try. Simply comment *custom* in debian/control.
783@@ -2227,6 +2742,18 @@ exim4 (4.83~RC1-1) experimental; urgency=medium
784
785 -- Andreas Metzler <ametzler@debian.org> Thu, 29 May 2014 13:09:04 +0200
786
787+exim4 (4.82.1-2ubuntu1) utopic; urgency=low
788+
789+ * Merge from Debian unstable (LP: #1348074). Remaining changes:
790+ - Show Ubuntu distribution on smtp:
791+ + debian/patches/fix_smtp_banner.patch: updated SMTP banner
792+ with Ubuntu distribution
793+ + debian/control: added lsb-release build dependency
794+ - Don't provide default-mta; in Ubuntu, we want postfix to be the
795+ default.
796+
797+ -- Robie Basak <robie.basak@ubuntu.com> Fri, 25 Jul 2014 15:53:09 +0000
798+
799 exim4 (4.82.1-2) unstable; urgency=high
800
801 * [87_double_expansion.diff] from upstream. Stop unwanted double expansion
802@@ -2244,6 +2771,18 @@ exim4 (4.82.1-1) unstable; urgency=high
803
804 -- Andreas Metzler <ametzler@debian.org> Wed, 28 May 2014 19:01:43 +0200
805
806+exim4 (4.82-8ubuntu1) utopic; urgency=medium
807+
808+ * Merge from Debian unstable. Remaining changes:
809+ - Show Ubuntu distribution on smtp:
810+ + debian/patches/fix_smtp_banner.patch: updated SMTP banner
811+ with Ubuntu distribution
812+ + debian/control: added lsb-release build dependency
813+ - Don't provide default-mta; in Ubuntu, we want postfix to be the
814+ default.
815+
816+ -- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 17 May 2014 01:50:20 +0100
817+
818 exim4 (4.82-8) unstable; urgency=medium
819
820 * Now that GMP has been relicensed to LGPLv3+/GPLv2+ build exim against
821@@ -2307,6 +2846,78 @@ exim4 (4.82-4) unstable; urgency=medium
822
823 -- Andreas Metzler <ametzler@debian.org> Sun, 09 Feb 2014 19:41:34 +0100
824
825+exim4 (4.82-3ubuntu2.4) trusty-security; urgency=medium
826+
827+ * SECURITY UPDATE: Buffer overflow in base64d()
828+ - debian/patches/CVE-2018-6789.patch: fix overflow in
829+ src/auths/b64decode.c.
830+ - CVE-2018-6789
831+
832+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Sat, 10 Feb 2018 14:19:43 -0500
833+
834+exim4 (4.82-3ubuntu2.3) trusty-security; urgency=medium
835+
836+ * SECURITY UPDATE: memory leak
837+ - debian/patches/CVE-2017-1000368.patch: free -p argument if
838+ allocation was required.
839+ - CVE-2017-1000368
840+
841+ -- Steve Beattie <sbeattie@ubuntu.com> Fri, 02 Jun 2017 22:44:35 -0700
842+
843+exim4 (4.82-3ubuntu2.2) trusty-security; urgency=medium
844+
845+ * SECURITY UPDATE: DKIM information leakage
846+ - debian/patches/CVE-2016-9963.patch: fix information leakage in
847+ src/dkim.c, src/transports/smtp.c.
848+ - CVE-2016-9963
849+
850+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 05 Jan 2017 08:31:06 -0500
851+
852+exim4 (4.82-3ubuntu2.1) trusty-security; urgency=medium
853+
854+ * SECURITY UPDATE: privilege escalation via crafted lookup value
855+ - debian/patches/CVE-2014-2972.patch: only expand integers for integer
856+ math once.
857+ - CVE-2014-2972
858+ * SECURITY UPDATE: privilege escalation when used with perl_startup
859+ - debian/patches/CVE-2016-1531.patch: add new add_environment and
860+ keep_environment configuration options.
861+ - debian/patches/CVE-2016-1531-2.patch: don't issue env warning if env
862+ is empty.
863+ - debian/patches/CVE-2016-1531-3.patch: store the initial working
864+ directory, expand $initial_cwd.
865+ - debian/patches/CVE-2016-1531-4.patch: delay chdir(/) until we opened
866+ the main config.
867+ - Add macros MAIN_KEEP_ENVIRONMENT and MAIN_ADD_ENVIRONMENT to set the
868+ new options. Set "keep_environment =" by default to avoid a runtime
869+ warning.
870+ - Bump exim4-config Breaks to exim4-daemon-* (<< 4.82-3ubuntu2.1).
871+ - debian/exim4-config.NEWS: Add entry to warn of potential breakage.
872+ - CVE-2016-1531
873+ * WARNING: This update may break existing installations.
874+
875+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Mon, 14 Mar 2016 12:57:00 -0400
876+
877+exim4 (4.82-3ubuntu2) trusty; urgency=medium
878+
879+ * debian/tests/control: Add missing python test dependency, as
880+ debian/tests/security calls python.
881+
882+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 25 Feb 2014 17:33:13 +0100
883+
884+exim4 (4.82-3ubuntu1) trusty; urgency=low
885+
886+ * Merge from Debian unstable (LP: #1259620). Remaining changes:
887+ - Show Ubuntu distribution on smtp:
888+ + debian/patches/fix_smtp_banner.patch: updated SMTP banner
889+ with Ubuntu distribution
890+ + debian/control: added lsb-release build dependency
891+ - Don't provide default-mta; in Ubuntu, we want postfix to be the
892+ default.
893+ - Build-depend on db5.3.
894+
895+ -- Yolanda Robla <yolanda.robla@canonical.com> Tue, 10 Dec 2013 17:07:20 +0000
896+
897 exim4 (4.82-3) unstable; urgency=low
898
899 * Upload to unstable.
900@@ -2387,6 +2998,21 @@ exim4 (4.82~rc1-1) experimental; urgency=low
901
902 -- Andreas Metzler <ametzler@debian.org> Sun, 29 Sep 2013 14:43:25 +0200
903
904+exim4 (4.80-9ubuntu2) trusty; urgency=low
905+
906+ * Build-depend on libdb5.3-dev, instead of libdb5.1-dev.
907+
908+ -- Dmitrijs Ledkovs <xnox@ubuntu.com> Mon, 04 Nov 2013 12:14:54 +0000
909+
910+exim4 (4.80-9ubuntu1) trusty; urgency=low
911+
912+ * Resynchronise with Debian. Remaining changes:
913+ - Don't provide default-mta; in Ubuntu, we want postfix to be the
914+ default.
915+ - Add "Ubuntu" to SMTP banner.
916+
917+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 28 Oct 2013 11:55:21 -0700
918+
919 exim4 (4.80-9) unstable; urgency=low
920
921 * Upload to unstable.
922@@ -2433,6 +3059,34 @@ exim4 (4.80-8) experimental; urgency=low
923
924 -- Andreas Metzler <ametzler@debian.org> Sun, 01 Sep 2013 15:58:49 +0200
925
926+exim4 (4.80-7ubuntu4) trusty; urgency=low
927+
928+ * Rebuild for Perl 5.18.
929+
930+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 23 Oct 2013 10:24:08 +0100
931+
932+exim4 (4.80-7ubuntu3) saucy; urgency=low
933+
934+ * debian/patches/fix_smtp_banner.patch: updated SMTP banner
935+ with Ubuntu distribution
936+ * debian/control: added lsb-release build dependency
937+
938+ -- Yolanda Robla <yolanda.robla@canonical.com> Tue, 18 Jun 2013 19:17:43 +0200
939+
940+exim4 (4.80-7ubuntu2) saucy; urgency=low
941+
942+ * debian/tests: Add autopkgtest.
943+
944+ -- Yolanda <yolanda.robla@canonical.com> Mon, 27 May 2013 11:31:35 +0200
945+
946+exim4 (4.80-7ubuntu1) raring; urgency=low
947+
948+ * Merge from Debian unstable (LP: #1166383). Remaining changes:
949+ - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
950+ we want postfix to be the default.
951+
952+ -- Robie Basak <robie.basak@canonical.com> Mon, 08 Apr 2013 18:13:15 +0100
953+
954 exim4 (4.80-7) unstable; urgency=low
955
956 * Use exim's ${quote:xxx} operator when invoking spfquery to disallow
957@@ -2452,6 +3106,14 @@ exim4 (4.80-6) unstable; urgency=low
958
959 -- Andreas Metzler <ametzler@debian.org> Wed, 21 Nov 2012 19:08:53 +0100
960
961+exim4 (4.80-5.1ubuntu1) raring; urgency=low
962+
963+ * Merge from Debian. Remaining changes:
964+ - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
965+ we want postfix to be the default.
966+
967+ -- Oussama Bounaim <o.bounaim@gmail.com> Sun, 11 Nov 2012 07:11:06 +0100
968+
969 exim4 (4.80-5.1) unstable; urgency=high
970
971 * Non-maintainer upload by the Security Team.
972@@ -2479,6 +3141,23 @@ exim4 (4.80-4) unstable; urgency=low
973
974 -- Andreas Metzler <ametzler@debian.org> Sat, 23 Jun 2012 18:35:03 +0200
975
976+exim4 (4.80-3ubuntu1.1) quantal-security; urgency=low
977+
978+ * SECURITY UPDATE: arbitrary code execution via dns decode logic
979+ - debian/patches/CVE-2012-5671.patch: adjust max length and validate
980+ against it in src/pdkim/pdkim.h, src/dkim.c.
981+ - CVE-2012-5671
982+
983+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 25 Oct 2012 08:22:46 -0400
984+
985+exim4 (4.80-3ubuntu1) quantal; urgency=low
986+
987+ * Merge from Debian unstable. Remaining changes:
988+ - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
989+ we want postfix to be the default.
990+
991+ -- Clint Byrum <clint@ubuntu.com> Thu, 14 Jun 2012 15:28:08 -0700
992+
993 exim4 (4.80-3) unstable; urgency=low
994
995 * Pull 75_openssl_sni.diff from upstream. - Segfault caused by NULL
996@@ -2626,6 +3305,26 @@ exim4 (4.76-4) experimental; urgency=low
997
998 -- Andreas Metzler <ametzler@debian.org> Sat, 24 Sep 2011 18:36:08 +0200
999
1000+exim4 (4.76-3ubuntu3) precise; urgency=low
1001+
1002+ * Rebuild for libmysqlclient transition
1003+
1004+ -- Clint Byrum <clint@ubuntu.com> Wed, 23 Nov 2011 23:29:35 -0800
1005+
1006+exim4 (4.76-3ubuntu2) precise; urgency=low
1007+
1008+ * Rebuild for Perl 5.14.
1009+
1010+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 16 Nov 2011 01:22:39 +0000
1011+
1012+exim4 (4.76-3ubuntu1) precise; urgency=low
1013+
1014+ * Merge from debian unstable. Remaining changes:
1015+ - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
1016+ we want postfix to be the default.
1017+
1018+ -- Stéphane Graber <stgraber@ubuntu.com> Thu, 20 Oct 2011 11:29:07 -0400
1019+
1020 exim4 (4.76-3) unstable; urgency=low
1021
1022 * [exim4-base.cron.daily] Correct invocation of mail(1), options need to be
1023@@ -2646,6 +3345,14 @@ exim4 (4.76-3) unstable; urgency=low
1024
1025 -- Andreas Metzler <ametzler@debian.org> Sun, 18 Sep 2011 11:49:13 +0200
1026
1027+exim4 (4.76-2ubuntu1) oneiric; urgency=low
1028+
1029+ * Merge from debian unstable. Remaining changes:
1030+ - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
1031+ we want postfix to be the default.
1032+
1033+ -- Stéphane Graber <stgraber@ubuntu.com> Mon, 30 May 2011 17:48:56 -0400
1034+
1035 exim4 (4.76-2) unstable; urgency=low
1036
1037 * debian/rules: Remove test/ and test-stamp on clean.
1038@@ -2658,6 +3365,14 @@ exim4 (4.76-2) unstable; urgency=low
1039
1040 -- Andreas Metzler <ametzler@debian.org> Sun, 29 May 2011 18:21:03 +0200
1041
1042+exim4 (4.76-1ubuntu1) oneiric; urgency=low
1043+
1044+ * Merge from debian unstable. Remaining changes (LP: #779391):
1045+ - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
1046+ we want postfix to be the default.
1047+
1048+ -- Stéphane Graber <stgraber@ubuntu.com> Mon, 23 May 2011 12:37:30 -0400
1049+
1050 exim4 (4.76-1) unstable; urgency=low
1051
1052 * New upstream version.
1053@@ -2704,6 +3419,14 @@ exim4 (4.75-3) unstable; urgency=high
1054
1055 -- Andreas Metzler <ametzler@debian.org> Fri, 06 May 2011 20:08:51 +0200
1056
1057+exim4 (4.75-2ubuntu1) oneiric; urgency=low
1058+
1059+ * Merge from debian unstable. Remaining changes:
1060+ - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
1061+ we want postfix to be the default.
1062+
1063+ -- Stéphane Graber <stgraber@ubuntu.com> Fri, 06 May 2011 14:51:28 -0400
1064+
1065 exim4 (4.75-2) unstable; urgency=low
1066
1067 * clamav socket on Debian is clamd:/var/run/clamav/clamd.ctl, fix
1068@@ -2746,6 +3469,24 @@ exim4 (4.74-2) unstable; urgency=low
1069
1070 -- Andreas Metzler <ametzler@debian.org> Thu, 24 Feb 2011 19:02:07 +0100
1071
1072+exim4 (4.74-1ubuntu1) natty; urgency=low
1073+
1074+ * Merge from debian experimental. Remaining changes: (LP: #713855)
1075+ - debian/patches/71_exiq_grep_error_on_messages_without_size.patch:
1076+ + Improve handling of broken messages when "exim4 -bp" (mailq)
1077+ reports lines without size info. (Closes: #528625)
1078+ - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
1079+ we want postfix to be the default.
1080+ - debian/{control,rules}: Add and enable hardened build for PIE.
1081+ (Closes: #542726)
1082+ * Update 71_exiq_grep_error_on_messages_without_size.patch to get way
1083+ which upstream has fixed it. Probably it can be dropped with next
1084+ upstream release.
1085+ * This upload fixes CVE: (LP: #708023)
1086+ - CVE-2011-0017
1087+
1088+ -- Artur Rona <ari-tczew@ubuntu.com> Wed, 09 Feb 2011 21:31:35 +0100
1089+
1090 exim4 (4.74-1) experimental; urgency=low
1091
1092 * 4.74 release, should build on hurd again.
1093@@ -2771,6 +3512,20 @@ exim4 (4.74~rc2-1) experimental; urgency=low
1094
1095 -- Andreas Metzler <ametzler@debian.org> Sun, 23 Jan 2011 14:02:36 +0100
1096
1097+exim4 (4.73~rc1-1ubuntu1) natty; urgency=low
1098+
1099+ * Merge from debian unstable. Remaining changes: (LP: #697934)
1100+ - debian/patches/71_exiq_grep_error_on_messages_without_size.patch:
1101+ + Improve handling of broken messages when "exim4 -bp" (mailq)
1102+ reports lines without size info.
1103+ - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
1104+ we want postfix to be the default.
1105+ - debian/{control,rules}: Add and enable hardened build for PIE.
1106+ (Closes: #542726)
1107+ * Drop B-D on libmysqlclient15-dev, resolved in Debian.
1108+
1109+ -- Artur Rona <ari-tczew@ubuntu.com> Tue, 28 Dec 2010 22:20:17 +0100
1110+
1111 exim4 (4.73~rc1-1) experimental; urgency=low
1112
1113 * New upstream release candidate.
1114@@ -2866,6 +3621,20 @@ exim4 (4.72-3) unstable; urgency=low
1115
1116 -- Andreas Metzler <ametzler@debian.org> Sun, 26 Dec 2010 15:13:08 +0100
1117
1118+exim4 (4.72-2ubuntu1) natty; urgency=low
1119+
1120+ * Merge from debian unstable. Remaining changes: (LP: #671615)
1121+ - debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch:
1122+ Improve handling of broken messages when "exim4 -bp" (mailq) reports
1123+ lines without size info.
1124+ - Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be
1125+ the default.
1126+ - debian/control: Change build dependencies to MySQL 5.1.
1127+ - debian/{control,rules}: add and enable hardened build for PIE
1128+ (Closes: #542726).
1129+
1130+ -- Artur Rona <ari-tczew@ubuntu.com> Fri, 05 Nov 2010 21:05:47 +0100
1131+
1132 exim4 (4.72-2) unstable; urgency=low
1133
1134 [ Marc Haber ]
1135@@ -2889,6 +3658,20 @@ exim4 (4.72-2) unstable; urgency=low
1136
1137 -- Andreas Metzler <ametzler@debian.org> Sat, 30 Oct 2010 13:38:26 +0200
1138
1139+exim4 (4.72-1ubuntu1) maverick; urgency=low
1140+
1141+ * Merge with Debian unstable (LP: #609620). Remaining changes:
1142+ + debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch:
1143+ Improve handling of broken messages when "exim4 -bp" (mailq) reports
1144+ lines without size info.
1145+ + Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be
1146+ the default.
1147+ + debian/control: Change build dependencies to MySQL 5.1.
1148+ + debian/{control,rules}: add and enable hardened build for PIE
1149+ (Closes: #542726).
1150+
1151+ -- Artur Rona <ari-tczew@tlen.pl> Sun, 25 Jul 2010 02:00:42 +0200
1152+
1153 exim4 (4.72-1) unstable; urgency=low
1154
1155 * New upstream release. (Identical to the git snapshot previously
1156@@ -2940,6 +3723,20 @@ exim4 (4.71-4) unstable; urgency=low
1157
1158 -- Andreas Metzler <ametzler@debian.org> Thu, 25 Mar 2010 17:34:30 +0100
1159
1160+exim4 (4.71-3ubuntu1) lucid; urgency=low
1161+
1162+ * Merge with Debian unstable (lp: #501657). Remaining changes:
1163+ + debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch:
1164+ Improve handling of broken messages when "exim4 -bp" (mailq) reports
1165+ lines without size info.
1166+ + Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be
1167+ the default.
1168+ + debian/control: Change build dependencies to MySQL 5.1.
1169+ + debian/{control,rules}: add and enable hardened build for PIE
1170+ (Debian bug 542726).
1171+
1172+ -- Michael Bienia <geser@ubuntu.com> Fri, 01 Jan 2010 16:28:19 +0100
1173+
1174 exim4 (4.71-3) unstable; urgency=low
1175
1176 * exim4-base.cron.daily: Do not run exim_tidydb on Berkeley DB logfiles.
1177@@ -3054,6 +3851,35 @@ exim4 (4.70~cvs+20091017-1) experimental; urgency=low
1178
1179 -- Andreas Metzler <ametzler@debian.org> Sat, 17 Oct 2009 14:26:54 +0200
1180
1181+exim4 (4.69-11ubuntu4) karmic; urgency=low
1182+
1183+ * debian/{control,rules}: add and enable hardened build for PIE
1184+ (Debian bug 542726).
1185+
1186+ -- Kees Cook <kees@ubuntu.com> Thu, 20 Aug 2009 17:33:26 -0700
1187+
1188+exim4 (4.69-11ubuntu3) karmic; urgency=low
1189+
1190+ * debian/control: Change build dependencies to MySQL 5.1.
1191+
1192+ -- Mathias Gug <mathiaz@ubuntu.com> Mon, 17 Aug 2009 17:57:26 -0400
1193+
1194+exim4 (4.69-11ubuntu2) karmic; urgency=low
1195+
1196+ * Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be
1197+ the default.
1198+
1199+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 03 Jun 2009 15:39:14 +0000
1200+
1201+exim4 (4.69-11ubuntu1) karmic; urgency=low
1202+
1203+ * Merge from debian unstable (LP: #375923), remaining changes:
1204+ - debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch:
1205+ Improve handling of broken messages when "exim4 -bp" (mailq) reports
1206+ lines without size info
1207+
1208+ -- Thierry Carrez <thierry.carrez@ubuntu.com> Wed, 13 May 2009 12:15:29 +0200
1209+
1210 exim4 (4.69-11) unstable; urgency=medium
1211
1212 * Build-Depend on lynx-cur|lynx instead of lynx. (lynx is just a dummy
1213@@ -3111,6 +3937,15 @@ exim4 (4.69-10) unstable; urgency=low
1214
1215 -- Andreas Metzler <ametzler@debian.org> Sat, 02 May 2009 09:05:56 +0200
1216
1217+exim4 (4.69-9ubuntu1) jaunty; urgency=low
1218+
1219+ [ Daniel van Eeden <launchpad@myname.nl> ]
1220+ * debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch:
1221+ Improve handling of broken messages when "exim4 -bp" (mailq) reports lines
1222+ w/o size info, LP: #18194
1223+
1224+ -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 11 Feb 2009 06:43:52 -0600
1225+
1226 exim4 (4.69-9) unstable; urgency=medium
1227
1228 * [update-exim4.conf]: Use POSIX character classes [:alnum:] or explicit
1229diff --git a/debian/control b/debian/control
1230index 78fce4d..68b24c0 100644
1231--- a/debian/control
1232+++ b/debian/control
1233@@ -1,7 +1,8 @@
1234 Source: exim4
1235 Section: mail
1236 Priority: standard
1237-Maintainer: Exim4 Maintainers <pkg-exim4-maintainers@lists.alioth.debian.org>
1238+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
1239+XSBC-Original-Maintainer: Exim4 Maintainers <pkg-exim4-maintainers@lists.alioth.debian.org>
1240 Uploaders:
1241 Andreas Metzler <ametzler@debian.org>,
1242 Marc Haber <mh+debian-packages@zugschlus.de>
1243@@ -34,7 +35,8 @@ Build-Depends:
1244 libxt-dev,
1245 lynx,
1246 po-debconf,
1247- xsltproc
1248+ xsltproc,
1249+ lsb-release
1250
1251 Package: exim4-base
1252 Architecture: any
1253diff --git a/debian/patches/fix_smtp_banner.patch b/debian/patches/fix_smtp_banner.patch
1254new file mode 100644
1255index 0000000..615eb5a
1256--- /dev/null
1257+++ b/debian/patches/fix_smtp_banner.patch
1258@@ -0,0 +1,53 @@
1259+Description: Add EXIM_DISTRIBUTION var to display it on the SMTP banner
1260+Origin: https://blueprints.launchpad.net/ubuntu/+spec/servercloud-s-server-app-banner-updates
1261+Author: Yolanda Robla <yolanda.robla@canonical.com>
1262+Forwarded: https://salsa.debian.org/exim-team/exim4/merge_requests/2
1263+Last-Update: 2018-07-03
1264+
1265+--- a/src/globals.c
1266++++ b/src/globals.c
1267+@@ -1443,7 +1443,7 @@ int smtp_accept_queue_per_connection = 10;
1268+ int smtp_accept_reserve = 0;
1269+ uschar *smtp_active_hostname = NULL;
1270+ uschar *smtp_banner = US"$smtp_active_hostname ESMTP "
1271+- "Exim $version_number $tod_full"
1272++ "Exim $version_number " EXIM_DISTRIBUTION " $tod_full"
1273+ "\0<---------------Space to patch smtp_banner->";
1274+ int smtp_ch_index = 0;
1275+ uschar *smtp_cmd_argument = NULL;
1276+--- a/src/config.h.defaults
1277++++ b/src/config.h.defaults
1278+@@ -224,4 +224,6 @@ for EXIM_ARITH_MAX and _MIN in OS/oh.h-FOO */
1279+ #define SC_EXIM_ARITH "%" SCNi64 /* scanf incl. 0x prefix */
1280+ #define SC_EXIM_DEC "%" SCNd64 /* scanf decimal */
1281+
1282++#define EXIM_DISTRIBUTION
1283++
1284+ /* End of config.h.defaults */
1285+--- a/scripts/Configure-config.h
1286++++ b/scripts/Configure-config.h
1287+@@ -23,6 +23,12 @@
1288+ if [ "$1" != "" ] ; then MAKE=$1 ; fi
1289+ if [ "$MAKE" = "" ] ; then MAKE=make ; fi
1290+
1291++# exporting distribution to use it in smtp banner
1292++if test -x /usr/bin/lsb_release && lsb_release -si; then
1293++ export EXIM_DISTRIBUTION=\"$(lsb_release -si)\"
1294++else
1295++ export EXIM_DISTRIBUTION=\"\"
1296++fi
1297+ $MAKE buildconfig || exit 1
1298+
1299+ # BEWARE: tab characters needed in the following sed command. They have had
1300+--- a/src/exim.h
1301++++ b/src/exim.h
1302+@@ -597,5 +597,9 @@ default to EDQUOT if it exists, otherwise ENOSPC. */
1303+ # define EXIM_GROUPLIST_SIZE NGROUPS_MAX
1304+ #endif
1305+
1306++#ifndef EXIM_DISTRIBUTION
1307++ #define EXIM_DISTRIBUTION ""
1308++#endif
1309++
1310+ #endif
1311+ /* End of exim.h */
1312diff --git a/debian/patches/series b/debian/patches/series
1313index 9a0d151..71e1a66 100644
1314--- a/debian/patches/series
1315+++ b/debian/patches/series
1316@@ -34,3 +34,4 @@
1317 75_26-Disable-taintchecks-for-mkdir-this-isn-t-part-of-4.9.patch
1318 75_27_open_logs_2744.patch
1319 90_localscan_dlopen.dpatch
1320+fix_smtp_banner.patch

Subscribers

People subscribed via source and target branches