Merge ~bryce/ubuntu/+source/exim4:eoan-merge-4.92-7 into ubuntu/+source/exim4:debian/sid
- Git
- lp:~bryce/ubuntu/+source/exim4
- eoan-merge-4.92-7
- Merge into debian/sid
Status: | Merged |
---|---|
Approved by: | Christian Ehrhardt |
Approved revision: | 68570c4a94778aa4d22a0889c4630175a8a3b6cd |
Merge reported by: | Andreas Hasenack |
Merged at revision: | 68570c4a94778aa4d22a0889c4630175a8a3b6cd |
Proposed branch: | ~bryce/ubuntu/+source/exim4:eoan-merge-4.92-7 |
Merge into: | ubuntu/+source/exim4:debian/sid |
Diff against target: |
1033 lines (+704/-2) 4 files modified
debian/changelog (+646/-0) debian/control (+4/-2) debian/patches/fix_smtp_banner.patch (+53/-0) debian/patches/series (+1/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Ehrhardt (community) | Approve | ||
Canonical Server packageset reviewers | Pending | ||
Canonical Server | Pending | ||
Review via email: mp+367375@code.launchpad.net |
Commit message
Description of the change
Merge with Debian's package. Only one Ubuntu change remains, which is a tweak to the banner to mention Ubuntu, which Debian has earlier declined to take into their packaging.
PPA available for testing is at:
https:/
Usual tags pushed.
Bryce Harrington (bryce) wrote : | # |
Christian Ehrhardt (paelzer) wrote : | # |
Generally LGTM, yet we don't submit/ack the branch with the ~ppa1 in the version.
I know you just did it to test your upload which is great.
But it also is only a minor fixup, so please re-push without the ppa suffix and this shall be good.
Bryce Harrington (bryce) wrote : | # |
I've updated the branch with that commit dropped. Sorry about that.
Christian Ehrhardt (paelzer) wrote : | # |
yep LGTM now +1
1. Exim is a special case, you can sponsor it as-is and we need no tagging for git-ubuntu (wont work due to empty dir)
2. get to Bed!
Christian Ehrhardt (paelzer) wrote : | # |
Discussed with andreas, the tag is worth even without being recognized by the importer.
tag upload/
Feel free to upload bryce
Andreas Hasenack (ahasenack) wrote : | # |
This migrated, manually setting the MP to merged.
Preview Diff
1 | diff --git a/debian/changelog b/debian/changelog |
2 | index b7afcf4..d543f05 100644 |
3 | --- a/debian/changelog |
4 | +++ b/debian/changelog |
5 | @@ -1,3 +1,12 @@ |
6 | +exim4 (4.92-7ubuntu1) eoan; urgency=medium |
7 | + |
8 | + * Merge with Debian unstable. Remaining changes: |
9 | + - Show Ubuntu distribution in SMTP banner |
10 | + + Build-Depends on lsb-release to detect Distribution. |
11 | + + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
12 | + |
13 | + -- Bryce Harrington <bryce@canonical.com> Mon, 13 May 2019 13:48:18 -0700 |
14 | + |
15 | exim4 (4.92-7) unstable; urgency=medium |
16 | |
17 | * Upload to unstable. |
18 | @@ -25,6 +34,15 @@ exim4 (4.92-5) unstable; urgency=medium |
19 | |
20 | -- Andreas Metzler <ametzler@debian.org> Sun, 07 Apr 2019 13:39:31 +0200 |
21 | |
22 | +exim4 (4.92-4ubuntu1) disco; urgency=medium |
23 | + |
24 | + * Merge with Debian unstable (LP: #1821339). Remaining changes: |
25 | + * Show Ubuntu distribution in SMTP banner |
26 | + - Build-Depends on lsb-release to detect Distribution. |
27 | + - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
28 | + |
29 | + -- Karl Stenerud <karl.stenerud@canonical.com> Mon, 25 Mar 2019 12:02:33 +0100 |
30 | + |
31 | exim4 (4.92-4) unstable; urgency=medium |
32 | |
33 | * Another patch from exim-4.92+fixes branch: |
34 | @@ -43,6 +61,15 @@ exim4 (4.92-3) unstable; urgency=medium |
35 | |
36 | -- Andreas Metzler <ametzler@debian.org> Wed, 20 Mar 2019 17:01:29 +0100 |
37 | |
38 | +exim4 (4.92-2ubuntu1) disco; urgency=medium |
39 | + |
40 | + * Merge with Debian unstable (LP: #1818444). Remaining changes: |
41 | + - Show Ubuntu distribution in SMTP banner |
42 | + + Build-Depends on lsb-release to detect Distribution. |
43 | + + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
44 | + |
45 | + -- Karl Stenerud <kstenerud@gmail.com> Tue, 05 Mar 2019 10:55:48 +0100 |
46 | + |
47 | exim4 (4.92-2) unstable; urgency=medium |
48 | |
49 | * Upload to unstable. |
50 | @@ -99,6 +126,21 @@ exim4 (4.92~RC4-3) unstable; urgency=medium |
51 | |
52 | -- Andreas Metzler <ametzler@debian.org> Sun, 20 Jan 2019 17:52:39 +0100 |
53 | |
54 | +exim4 (4.92~RC4-2ubuntu2) disco; urgency=medium |
55 | + |
56 | + * No-change rebuild against libmysqlclient21 |
57 | + |
58 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 01 Feb 2019 16:57:54 +0000 |
59 | + |
60 | +exim4 (4.92~RC4-2ubuntu1) disco; urgency=medium |
61 | + |
62 | + * Merge with Debian unstable (LP: #1811095). Remaining changes: |
63 | + - Show Ubuntu distribution in SMTP banner |
64 | + + Build-Depends on lsb-release to detect Distribution. |
65 | + + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
66 | + |
67 | + -- Karl Stenerud <kstenerud@gmail.com> Thu, 10 Jan 2019 16:41:45 +0100 |
68 | + |
69 | exim4 (4.92~RC4-2) unstable; urgency=medium |
70 | |
71 | * Upload to unstable. |
72 | @@ -192,6 +234,22 @@ exim4 (4.91-7) unstable; urgency=low |
73 | |
74 | -- Andreas Metzler <ametzler@debian.org> Sun, 26 Aug 2018 11:33:15 +0200 |
75 | |
76 | +exim4 (4.91-6ubuntu2) disco; urgency=medium |
77 | + |
78 | + * No-change rebuild for the perl 5.28 transition. |
79 | + |
80 | + -- Adam Conrad <adconrad@ubuntu.com> Fri, 02 Nov 2018 18:08:13 -0600 |
81 | + |
82 | +exim4 (4.91-6ubuntu1) cosmic; urgency=medium |
83 | + |
84 | + * Merge with Debian unstable. Remaining changes: |
85 | + - Show Ubuntu distribution in SMTP banner |
86 | + + Build-Depends on lsb-release to detect Distribution. |
87 | + + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
88 | + [DEP3 header updated to indicate it has been forwarded to Debian] |
89 | + |
90 | + -- Andreas Hasenack <andreas@canonical.com> Mon, 30 Jul 2018 15:35:06 -0300 |
91 | + |
92 | exim4 (4.91-6) unstable; urgency=low |
93 | |
94 | * Update from exim-4_91+fixes branch: |
95 | @@ -203,6 +261,16 @@ exim4 (4.91-6) unstable; urgency=low |
96 | |
97 | -- Andreas Metzler <ametzler@debian.org> Fri, 20 Jul 2018 11:21:24 +0200 |
98 | |
99 | +exim4 (4.91-5ubuntu1) cosmic; urgency=medium |
100 | + |
101 | + * Merge with Debian unstable. Remaining changes: |
102 | + - Show Ubuntu distribution in SMTP banner |
103 | + - Build-Depends on lsb-release to detect Distribution. |
104 | + - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
105 | + [DEP3 header updated to indicate it has been forwarded to Debian] |
106 | + |
107 | + -- Andreas Hasenack <andreas@canonical.com> Tue, 03 Jul 2018 11:13:08 -0300 |
108 | + |
109 | exim4 (4.91-5) unstable; urgency=medium |
110 | |
111 | * Update from exim-4_91+fixes branch: |
112 | @@ -212,6 +280,15 @@ exim4 (4.91-5) unstable; urgency=medium |
113 | |
114 | -- Andreas Metzler <ametzler@debian.org> Sat, 09 Jun 2018 18:10:39 +0200 |
115 | |
116 | +exim4 (4.91-4ubuntu1) cosmic; urgency=medium |
117 | + |
118 | + * Merge from Debian testing, Remaining changes: |
119 | + - Show Ubuntu distribution in SMTP banner |
120 | + - Build-Depends on lsb-release to detect Distribution. |
121 | + - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
122 | + |
123 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 30 May 2018 12:46:14 +0200 |
124 | + |
125 | exim4 (4.91-4) unstable; urgency=medium |
126 | |
127 | * Update from exim-4_91+fixes branch: |
128 | @@ -330,6 +407,15 @@ exim4 (4.90.1-2) unstable; urgency=medium |
129 | |
130 | -- Andreas Metzler <ametzler@debian.org> Sat, 10 Mar 2018 14:25:51 +0100 |
131 | |
132 | +exim4 (4.90.1-1ubuntu1) bionic; urgency=medium |
133 | + |
134 | + * Merge from Debian testing, Remaining changes: |
135 | + - Show Ubuntu distribution in SMTP banner |
136 | + - Build-Depends on lsb-release to detect Distribution. |
137 | + - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
138 | + |
139 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 14 Feb 2018 17:01:14 +0100 |
140 | + |
141 | exim4 (4.90.1-1) unstable; urgency=high |
142 | |
143 | * New upstream version, fixing CVE-2018-6789. Closes: #890000 |
144 | @@ -524,6 +610,15 @@ exim4 (4.89-10) unstable; urgency=critical |
145 | |
146 | -- Andreas Metzler <ametzler@debian.org> Sat, 25 Nov 2017 11:43:24 +0100 |
147 | |
148 | +exim4 (4.89-9ubuntu1) bionic; urgency=medium |
149 | + |
150 | + * Merge from Debian unstable, Remaining changes: |
151 | + - Show Ubuntu distribution in SMTP banner |
152 | + - Build-Depends on lsb-release to detect Distribution. |
153 | + - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
154 | + |
155 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 16 Nov 2017 10:02:23 +0100 |
156 | + |
157 | exim4 (4.89-9) unstable; urgency=medium |
158 | |
159 | * Upload to unstable. |
160 | @@ -566,6 +661,42 @@ exim4 (4.89-6) unstable; urgency=medium |
161 | |
162 | -- Andreas Metzler <ametzler@debian.org> Sat, 09 Sep 2017 15:29:39 +0200 |
163 | |
164 | +exim4 (4.89-5ubuntu1.3) artful-security; urgency=medium |
165 | + |
166 | + * SECURITY UPDATE: Buffer overflow in base64d() |
167 | + - debian/patches/CVE-2018-6789.patch: fix overflow in src/base64.c. |
168 | + - CVE-2018-6789 |
169 | + |
170 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Sat, 10 Feb 2018 14:12:27 -0500 |
171 | + |
172 | +exim4 (4.89-5ubuntu1.2) artful-security; urgency=medium |
173 | + |
174 | + * SECURITY UPDATE: stack-exhaustion remote DoS |
175 | + - debian/patches/CVE-2017-16944.patch: do not treat the first lonely |
176 | + dot special in src/receive.c, src/smtp_in.c. |
177 | + - CVE-2017-16944 |
178 | + |
179 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Wed, 29 Nov 2017 08:59:31 -0500 |
180 | + |
181 | +exim4 (4.89-5ubuntu1.1) artful-security; urgency=medium |
182 | + |
183 | + * SECURITY UPDATE: remote code execution via use-after-free |
184 | + - debian/patches/CVE-2017-16943.patch: avoid release of store if there |
185 | + have been later allocations in src/receive.c. |
186 | + - CVE-2017-16943 |
187 | + |
188 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Mon, 27 Nov 2017 07:37:47 -0500 |
189 | + |
190 | +exim4 (4.89-5ubuntu1) artful; urgency=medium |
191 | + |
192 | + * Merge from Debian testing. |
193 | + Remaining changes: |
194 | + - Show Ubuntu distribution in SMTP banner |
195 | + - Build-Depends on lsb-release to detect Distribution. |
196 | + - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
197 | + |
198 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 16 Aug 2017 15:42:47 +0200 |
199 | + |
200 | exim4 (4.89-5) unstable; urgency=medium |
201 | |
202 | * Update to exim-4_89+fixes branch: |
203 | @@ -610,6 +741,20 @@ exim4 (4.89-4) unstable; urgency=low |
204 | |
205 | -- Andreas Metzler <ametzler@debian.org> Sat, 15 Jul 2017 12:46:16 +0200 |
206 | |
207 | +exim4 (4.89-3ubuntu2) artful; urgency=medium |
208 | + |
209 | + * No-change rebuild for perl 5.26.0. |
210 | + |
211 | + -- Matthias Klose <doko@ubuntu.com> Wed, 26 Jul 2017 20:02:24 +0000 |
212 | + |
213 | +exim4 (4.89-3ubuntu1) artful; urgency=medium |
214 | + |
215 | + * Merge from Debian. Remaining changes: |
216 | + - Show Ubuntu distribution in SMTP banner. |
217 | + - Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch) |
218 | + |
219 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 27 Jun 2017 10:20:42 -0400 |
220 | + |
221 | exim4 (4.89-3) unstable; urgency=high |
222 | |
223 | * Re-upload to unstable. |
224 | @@ -622,6 +767,15 @@ exim4 (4.89-2+deb9u1) stretch-security; urgency=medium |
225 | |
226 | -- <jmm@debian.org> Wed, 14 Jun 2017 07:03:07 +0200 |
227 | |
228 | +exim4 (4.89-2ubuntu1) artful; urgency=medium |
229 | + |
230 | + * Merge from Debian testing. |
231 | + Remaining changes: |
232 | + + Show Ubuntu distribution in SMTP banner. |
233 | + + Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch) |
234 | + |
235 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 01 Jun 2017 11:58:00 +0200 |
236 | + |
237 | exim4 (4.89-2) unstable; urgency=medium |
238 | |
239 | * Revert addition of header "# pidfile: /var/run/exim4/exim.pid" to |
240 | @@ -713,6 +867,17 @@ exim4 (4.89~RC1-1) unstable; urgency=low |
241 | |
242 | -- Andreas Metzler <ametzler@debian.org> Tue, 31 Jan 2017 19:52:50 +0100 |
243 | |
244 | +exim4 (4.88-5ubuntu1) zesty; urgency=medium |
245 | + |
246 | + * Merge from Debian unstable. |
247 | + Version 4.88 fixes CVE-2016-9963 (LP: #1654750) and symlink |
248 | + local root escalation (LP: #1580454) |
249 | + Remaining changes: |
250 | + + Show Ubuntu distribution in SMTP banner. |
251 | + + Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch) |
252 | + |
253 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 24 Jan 2017 10:15:09 +0100 |
254 | + |
255 | exim4 (4.88-5) unstable; urgency=medium |
256 | |
257 | * 78_Disable-chunking-BDAT-by-default.patch: Change default value of main |
258 | @@ -865,6 +1030,20 @@ exim4 (4.88~RC1-1) experimental; urgency=low |
259 | |
260 | -- Andreas Metzler <ametzler@debian.org> Sun, 25 Sep 2016 15:44:00 +0200 |
261 | |
262 | +exim4 (4.87-3ubuntu2) zesty; urgency=medium |
263 | + |
264 | + * No-change rebuild for perl 5.24 transition |
265 | + |
266 | + -- Iain Lane <iain@orangesquash.org.uk> Mon, 24 Oct 2016 10:08:10 +0100 |
267 | + |
268 | +exim4 (4.87-3ubuntu1) yakkety; urgency=medium |
269 | + |
270 | + * Merge from Debian unstable. Remaining changes: |
271 | + + Show Ubuntu distribution in SMTP banner. |
272 | + + Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch) |
273 | + |
274 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 26 Jul 2016 13:30:09 +0200 |
275 | + |
276 | exim4 (4.87-3) unstable; urgency=medium |
277 | |
278 | * Pull multiple patches from upstream GIT: |
279 | @@ -1038,6 +1217,48 @@ exim4 (4.87~RC1-1) experimental; urgency=medium |
280 | |
281 | -- Andreas Metzler <ametzler@debian.org> Fri, 11 Dec 2015 20:15:30 +0100 |
282 | |
283 | +exim4 (4.86.2-2ubuntu2.3) xenial-security; urgency=medium |
284 | + |
285 | + * SECURITY UPDATE: Buffer overflow in base64d() |
286 | + - debian/patches/CVE-2018-6789.patch: fix overflow in |
287 | + src/auths/b64decode.c. |
288 | + - CVE-2018-6789 |
289 | + |
290 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Sat, 10 Feb 2018 14:18:40 -0500 |
291 | + |
292 | +exim4 (4.86.2-2ubuntu2.2) xenial-security; urgency=medium |
293 | + |
294 | + * SECURITY UPDATE: memory leak |
295 | + - debian/patches/93_CVE-2017-1000368.patch: free -p argument if |
296 | + allocation was required. |
297 | + - CVE-2017-1000368 |
298 | + |
299 | + -- Steve Beattie <sbeattie@ubuntu.com> Fri, 02 Jun 2017 22:07:28 -0700 |
300 | + |
301 | +exim4 (4.86.2-2ubuntu2.1) xenial-security; urgency=medium |
302 | + |
303 | + * SECURITY UPDATE: DKIM information leakage |
304 | + - debian/patches/CVE-2016-9963.patch: fix information leakage in |
305 | + src/dkim.c, src/transports/smtp.c. |
306 | + - CVE-2016-9963 |
307 | + |
308 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 05 Jan 2017 08:29:10 -0500 |
309 | + |
310 | +exim4 (4.86.2-2ubuntu2) xenial; urgency=medium |
311 | + |
312 | + * Rebuild against libmysqlclient20. |
313 | + |
314 | + -- Robie Basak <robie.basak@ubuntu.com> Tue, 05 Apr 2016 12:21:41 +0000 |
315 | + |
316 | +exim4 (4.86.2-2ubuntu1) xenial; urgency=medium |
317 | + |
318 | + * Merge from Debian unstable. Remaining changes: |
319 | + - debian.control, debian/patches/fix_smtp_banner.patch |
320 | + + Show Ubuntu distribution in SMTP banner. |
321 | + + Build-Depends on lsb-release. |
322 | + |
323 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 15 Mar 2016 11:56:18 -0400 |
324 | + |
325 | exim4 (4.86.2-2) unstable; urgency=high |
326 | |
327 | * Bump exim4-config Breaks to exim4-daemon-* (<< 4.86.2). Closes: #816790 |
328 | @@ -1059,6 +1280,27 @@ exim4 (4.86.2-1) unstable; urgency=high |
329 | |
330 | -- Andreas Metzler <ametzler@debian.org> Tue, 01 Mar 2016 19:34:39 +0100 |
331 | |
332 | +exim4 (4.86-7ubuntu3) xenial; urgency=medium |
333 | + |
334 | + * No-change rebuild for gnutls transition. |
335 | + |
336 | + -- Matthias Klose <doko@ubuntu.com> Wed, 17 Feb 2016 22:40:56 +0000 |
337 | + |
338 | +exim4 (4.86-7ubuntu2) xenial; urgency=medium |
339 | + |
340 | + * Rebuild for Perl 5.22.1. |
341 | + |
342 | + -- Colin Watson <cjwatson@ubuntu.com> Fri, 18 Dec 2015 10:30:54 +0000 |
343 | + |
344 | +exim4 (4.86-7ubuntu1) xenial; urgency=medium |
345 | + |
346 | + * Merge from Debian unstable. Remaining changes: |
347 | + - debian.control, debian/patches/fix_smtp_banner.patch |
348 | + + Show Ubuntu distribution in SMTP banner. |
349 | + + Build-Depends on lsb-release. |
350 | + |
351 | + -- Pierre-André MOREY <pierre-andre.morey@canonical.com> Mon, 14 Dec 2015 14:23:51 +0100 |
352 | + |
353 | exim4 (4.86-7) unstable; urgency=medium |
354 | |
355 | * Allow arch-indep build (dpkg-buildpackage -A). Closes: #806023 |
356 | @@ -1109,6 +1351,15 @@ exim4 (4.86-4) unstable; urgency=medium |
357 | |
358 | -- Andreas Metzler <ametzler@debian.org> Sat, 17 Oct 2015 15:01:01 +0200 |
359 | |
360 | +exim4 (4.86-3ubuntu1) wily; urgency=medium |
361 | + |
362 | + * Merge from Debian unstable. (LP: #1485369) Remaining changes: |
363 | + - debian/control, debian/patches/fix_smtp_banner.patch: |
364 | + + Show Ubuntu distribution in SMTP banner. |
365 | + + Build-Depends on lsb-release. |
366 | + |
367 | + -- Artur Rona <ari-tczew@ubuntu.com> Thu, 17 Sep 2015 13:18:20 +0100 |
368 | + |
369 | exim4 (4.86-3) unstable; urgency=medium |
370 | |
371 | * Pull three patches from upstream git: |
372 | @@ -1149,6 +1400,15 @@ exim4 (4.86~RC5-1) unstable; urgency=medium |
373 | |
374 | -- Andreas Metzler <ametzler@debian.org> Sat, 18 Jul 2015 11:46:11 +0200 |
375 | |
376 | +exim4 (4.86~RC4-2ubuntu1) wily; urgency=low |
377 | + |
378 | + * Merge from Debian unstable. (LP: #1166671) Remaining changes: |
379 | + - debian/control, debian/patches/fix_smtp_banner.patch: |
380 | + + Show Ubuntu distribution in SMTP banner. |
381 | + + Build-Depends on lsb-release. |
382 | + |
383 | + -- Artur Rona <ari-tczew@ubuntu.com> Mon, 06 Jul 2015 12:09:36 +0200 |
384 | + |
385 | exim4 (4.86~RC4-2) unstable; urgency=medium |
386 | |
387 | * Drop libmysqlclient15-dev alternative build-dependency. Closes: #790463 |
388 | @@ -1313,6 +1573,18 @@ exim4 (4.85~RC1+dfsg-1) experimental; urgency=medium |
389 | |
390 | -- Andreas Metzler <ametzler@debian.org> Tue, 18 Nov 2014 19:28:20 +0100 |
391 | |
392 | +exim4 (4.84-8ubuntu1) vivid; urgency=low |
393 | + |
394 | + * Merge from Debian unstable. (LP: #1434300) Remaining changes: |
395 | + - debian/control, debian/patches/fix_smtp_banner.patch: |
396 | + + Show Ubuntu distribution in SMTP banner. |
397 | + + Build-Depends on lsb-release. |
398 | + - debian/control: |
399 | + + Don't provide default-mta; in Ubuntu, |
400 | + we want postfix to be the default. |
401 | + |
402 | + -- Artur Rona <ari-tczew@ubuntu.com> Thu, 19 Mar 2015 00:15:40 +0100 |
403 | + |
404 | exim4 (4.84-8) unstable; urgency=medium |
405 | |
406 | * Pull 83_Remove-limit-on-remove_headers-item-size.-Bug-1533.patch and |
407 | @@ -1330,6 +1602,15 @@ exim4 (4.84-7) unstable; urgency=medium |
408 | |
409 | -- Andreas Metzler <ametzler@debian.org> Sat, 07 Feb 2015 15:12:33 +0100 |
410 | |
411 | +exim4 (4.84-6ubuntu1) vivid; urgency=medium |
412 | + |
413 | + * Resynchronise with Debian. Remaining changes: |
414 | + - Show Ubuntu distribution in SMTP banner. |
415 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
416 | + default. |
417 | + |
418 | + -- Colin Watson <cjwatson@ubuntu.com> Wed, 14 Jan 2015 11:26:29 +0000 |
419 | + |
420 | exim4 (4.84-6) unstable; urgency=medium |
421 | |
422 | * Revert init script's restart order change in 4.84-4 for the time being. |
423 | @@ -1338,6 +1619,15 @@ exim4 (4.84-6) unstable; urgency=medium |
424 | |
425 | -- Andreas Metzler <ametzler@debian.org> Sun, 21 Dec 2014 14:07:12 +0100 |
426 | |
427 | +exim4 (4.84-5ubuntu1) vivid; urgency=medium |
428 | + |
429 | + * Resynchronise with Debian. Remaining changes: |
430 | + - Show Ubuntu distribution in SMTP banner. |
431 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
432 | + default. |
433 | + |
434 | + -- Colin Watson <cjwatson@ubuntu.com> Thu, 18 Dec 2014 15:26:17 +0000 |
435 | + |
436 | exim4 (4.84-5) unstable; urgency=medium |
437 | |
438 | * 82_quoted-or-r-2047-encoded.diff pulled from upstream git (sans |
439 | @@ -1345,6 +1635,15 @@ exim4 (4.84-5) unstable; urgency=medium |
440 | |
441 | -- Andreas Metzler <ametzler@debian.org> Wed, 17 Dec 2014 19:03:39 +0100 |
442 | |
443 | +exim4 (4.84-4ubuntu1) vivid; urgency=medium |
444 | + |
445 | + * Resynchronise with Debian. Remaining changes: |
446 | + - Show Ubuntu distribution in SMTP banner. |
447 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
448 | + default. |
449 | + |
450 | + -- Colin Watson <cjwatson@ubuntu.com> Tue, 02 Dec 2014 15:28:46 +0000 |
451 | + |
452 | exim4 (4.84-4) unstable; urgency=medium |
453 | |
454 | * Unset message_prefix/message_sufix in maildrop_pipe transport. Maildrop |
455 | @@ -1359,6 +1658,15 @@ exim4 (4.84-4) unstable; urgency=medium |
456 | |
457 | -- Andreas Metzler <ametzler@debian.org> Sun, 30 Nov 2014 08:24:04 +0100 |
458 | |
459 | +exim4 (4.84-3ubuntu1) vivid; urgency=medium |
460 | + |
461 | + * Resynchronise with Debian. Remaining changes: |
462 | + - Show Ubuntu distribution in SMTP banner. |
463 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
464 | + default. |
465 | + |
466 | + -- Colin Watson <cjwatson@ubuntu.com> Tue, 11 Nov 2014 13:43:35 +0000 |
467 | + |
468 | exim4 (4.84-3) unstable; urgency=medium |
469 | |
470 | * Apply patch to Italian (it) debconf template translation, thanks to |
471 | @@ -1388,6 +1696,24 @@ exim4 (4.84~RC2-1) unstable; urgency=medium |
472 | |
473 | -- Andreas Metzler <ametzler@debian.org> Sat, 09 Aug 2014 07:42:00 +0200 |
474 | |
475 | +exim4 (4.84~RC1-3ubuntu2) utopic; urgency=medium |
476 | + |
477 | + * Rebuild for Perl 5.20.0. |
478 | + |
479 | + -- Colin Watson <cjwatson@ubuntu.com> Thu, 21 Aug 2014 12:18:13 +0100 |
480 | + |
481 | +exim4 (4.84~RC1-3ubuntu1) utopic; urgency=low |
482 | + |
483 | + * Merge from Debian unstable (LP: #1351470). Remaining changes: |
484 | + - Show Ubuntu distribution on smtp: |
485 | + + debian/patches/fix_smtp_banner.patch: updated SMTP banner |
486 | + with Ubuntu distribution |
487 | + + debian/control: added lsb-release build dependency |
488 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
489 | + default. |
490 | + |
491 | + -- Corey Bryant <corey.bryant@canonical.com> Mon, 04 Aug 2014 11:48:39 -0400 |
492 | + |
493 | exim4 (4.84~RC1-3) unstable; urgency=medium |
494 | |
495 | * Third try. Simply comment *custom* in debian/control. |
496 | @@ -1456,6 +1782,18 @@ exim4 (4.83~RC1-1) experimental; urgency=medium |
497 | |
498 | -- Andreas Metzler <ametzler@debian.org> Thu, 29 May 2014 13:09:04 +0200 |
499 | |
500 | +exim4 (4.82.1-2ubuntu1) utopic; urgency=low |
501 | + |
502 | + * Merge from Debian unstable (LP: #1348074). Remaining changes: |
503 | + - Show Ubuntu distribution on smtp: |
504 | + + debian/patches/fix_smtp_banner.patch: updated SMTP banner |
505 | + with Ubuntu distribution |
506 | + + debian/control: added lsb-release build dependency |
507 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
508 | + default. |
509 | + |
510 | + -- Robie Basak <robie.basak@ubuntu.com> Fri, 25 Jul 2014 15:53:09 +0000 |
511 | + |
512 | exim4 (4.82.1-2) unstable; urgency=high |
513 | |
514 | * [87_double_expansion.diff] from upstream. Stop unwanted double expansion |
515 | @@ -1473,6 +1811,18 @@ exim4 (4.82.1-1) unstable; urgency=high |
516 | |
517 | -- Andreas Metzler <ametzler@debian.org> Wed, 28 May 2014 19:01:43 +0200 |
518 | |
519 | +exim4 (4.82-8ubuntu1) utopic; urgency=medium |
520 | + |
521 | + * Merge from Debian unstable. Remaining changes: |
522 | + - Show Ubuntu distribution on smtp: |
523 | + + debian/patches/fix_smtp_banner.patch: updated SMTP banner |
524 | + with Ubuntu distribution |
525 | + + debian/control: added lsb-release build dependency |
526 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
527 | + default. |
528 | + |
529 | + -- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 17 May 2014 01:50:20 +0100 |
530 | + |
531 | exim4 (4.82-8) unstable; urgency=medium |
532 | |
533 | * Now that GMP has been relicensed to LGPLv3+/GPLv2+ build exim against |
534 | @@ -1536,6 +1886,78 @@ exim4 (4.82-4) unstable; urgency=medium |
535 | |
536 | -- Andreas Metzler <ametzler@debian.org> Sun, 09 Feb 2014 19:41:34 +0100 |
537 | |
538 | +exim4 (4.82-3ubuntu2.4) trusty-security; urgency=medium |
539 | + |
540 | + * SECURITY UPDATE: Buffer overflow in base64d() |
541 | + - debian/patches/CVE-2018-6789.patch: fix overflow in |
542 | + src/auths/b64decode.c. |
543 | + - CVE-2018-6789 |
544 | + |
545 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Sat, 10 Feb 2018 14:19:43 -0500 |
546 | + |
547 | +exim4 (4.82-3ubuntu2.3) trusty-security; urgency=medium |
548 | + |
549 | + * SECURITY UPDATE: memory leak |
550 | + - debian/patches/CVE-2017-1000368.patch: free -p argument if |
551 | + allocation was required. |
552 | + - CVE-2017-1000368 |
553 | + |
554 | + -- Steve Beattie <sbeattie@ubuntu.com> Fri, 02 Jun 2017 22:44:35 -0700 |
555 | + |
556 | +exim4 (4.82-3ubuntu2.2) trusty-security; urgency=medium |
557 | + |
558 | + * SECURITY UPDATE: DKIM information leakage |
559 | + - debian/patches/CVE-2016-9963.patch: fix information leakage in |
560 | + src/dkim.c, src/transports/smtp.c. |
561 | + - CVE-2016-9963 |
562 | + |
563 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 05 Jan 2017 08:31:06 -0500 |
564 | + |
565 | +exim4 (4.82-3ubuntu2.1) trusty-security; urgency=medium |
566 | + |
567 | + * SECURITY UPDATE: privilege escalation via crafted lookup value |
568 | + - debian/patches/CVE-2014-2972.patch: only expand integers for integer |
569 | + math once. |
570 | + - CVE-2014-2972 |
571 | + * SECURITY UPDATE: privilege escalation when used with perl_startup |
572 | + - debian/patches/CVE-2016-1531.patch: add new add_environment and |
573 | + keep_environment configuration options. |
574 | + - debian/patches/CVE-2016-1531-2.patch: don't issue env warning if env |
575 | + is empty. |
576 | + - debian/patches/CVE-2016-1531-3.patch: store the initial working |
577 | + directory, expand $initial_cwd. |
578 | + - debian/patches/CVE-2016-1531-4.patch: delay chdir(/) until we opened |
579 | + the main config. |
580 | + - Add macros MAIN_KEEP_ENVIRONMENT and MAIN_ADD_ENVIRONMENT to set the |
581 | + new options. Set "keep_environment =" by default to avoid a runtime |
582 | + warning. |
583 | + - Bump exim4-config Breaks to exim4-daemon-* (<< 4.82-3ubuntu2.1). |
584 | + - debian/exim4-config.NEWS: Add entry to warn of potential breakage. |
585 | + - CVE-2016-1531 |
586 | + * WARNING: This update may break existing installations. |
587 | + |
588 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Mon, 14 Mar 2016 12:57:00 -0400 |
589 | + |
590 | +exim4 (4.82-3ubuntu2) trusty; urgency=medium |
591 | + |
592 | + * debian/tests/control: Add missing python test dependency, as |
593 | + debian/tests/security calls python. |
594 | + |
595 | + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 25 Feb 2014 17:33:13 +0100 |
596 | + |
597 | +exim4 (4.82-3ubuntu1) trusty; urgency=low |
598 | + |
599 | + * Merge from Debian unstable (LP: #1259620). Remaining changes: |
600 | + - Show Ubuntu distribution on smtp: |
601 | + + debian/patches/fix_smtp_banner.patch: updated SMTP banner |
602 | + with Ubuntu distribution |
603 | + + debian/control: added lsb-release build dependency |
604 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
605 | + default. |
606 | + - Build-depend on db5.3. |
607 | + |
608 | + -- Yolanda Robla <yolanda.robla@canonical.com> Tue, 10 Dec 2013 17:07:20 +0000 |
609 | + |
610 | exim4 (4.82-3) unstable; urgency=low |
611 | |
612 | * Upload to unstable. |
613 | @@ -1616,6 +2038,21 @@ exim4 (4.82~rc1-1) experimental; urgency=low |
614 | |
615 | -- Andreas Metzler <ametzler@debian.org> Sun, 29 Sep 2013 14:43:25 +0200 |
616 | |
617 | +exim4 (4.80-9ubuntu2) trusty; urgency=low |
618 | + |
619 | + * Build-depend on libdb5.3-dev, instead of libdb5.1-dev. |
620 | + |
621 | + -- Dmitrijs Ledkovs <xnox@ubuntu.com> Mon, 04 Nov 2013 12:14:54 +0000 |
622 | + |
623 | +exim4 (4.80-9ubuntu1) trusty; urgency=low |
624 | + |
625 | + * Resynchronise with Debian. Remaining changes: |
626 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
627 | + default. |
628 | + - Add "Ubuntu" to SMTP banner. |
629 | + |
630 | + -- Colin Watson <cjwatson@ubuntu.com> Mon, 28 Oct 2013 11:55:21 -0700 |
631 | + |
632 | exim4 (4.80-9) unstable; urgency=low |
633 | |
634 | * Upload to unstable. |
635 | @@ -1662,6 +2099,34 @@ exim4 (4.80-8) experimental; urgency=low |
636 | |
637 | -- Andreas Metzler <ametzler@debian.org> Sun, 01 Sep 2013 15:58:49 +0200 |
638 | |
639 | +exim4 (4.80-7ubuntu4) trusty; urgency=low |
640 | + |
641 | + * Rebuild for Perl 5.18. |
642 | + |
643 | + -- Colin Watson <cjwatson@ubuntu.com> Wed, 23 Oct 2013 10:24:08 +0100 |
644 | + |
645 | +exim4 (4.80-7ubuntu3) saucy; urgency=low |
646 | + |
647 | + * debian/patches/fix_smtp_banner.patch: updated SMTP banner |
648 | + with Ubuntu distribution |
649 | + * debian/control: added lsb-release build dependency |
650 | + |
651 | + -- Yolanda Robla <yolanda.robla@canonical.com> Tue, 18 Jun 2013 19:17:43 +0200 |
652 | + |
653 | +exim4 (4.80-7ubuntu2) saucy; urgency=low |
654 | + |
655 | + * debian/tests: Add autopkgtest. |
656 | + |
657 | + -- Yolanda <yolanda.robla@canonical.com> Mon, 27 May 2013 11:31:35 +0200 |
658 | + |
659 | +exim4 (4.80-7ubuntu1) raring; urgency=low |
660 | + |
661 | + * Merge from Debian unstable (LP: #1166383). Remaining changes: |
662 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
663 | + we want postfix to be the default. |
664 | + |
665 | + -- Robie Basak <robie.basak@canonical.com> Mon, 08 Apr 2013 18:13:15 +0100 |
666 | + |
667 | exim4 (4.80-7) unstable; urgency=low |
668 | |
669 | * Use exim's ${quote:xxx} operator when invoking spfquery to disallow |
670 | @@ -1681,6 +2146,14 @@ exim4 (4.80-6) unstable; urgency=low |
671 | |
672 | -- Andreas Metzler <ametzler@debian.org> Wed, 21 Nov 2012 19:08:53 +0100 |
673 | |
674 | +exim4 (4.80-5.1ubuntu1) raring; urgency=low |
675 | + |
676 | + * Merge from Debian. Remaining changes: |
677 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
678 | + we want postfix to be the default. |
679 | + |
680 | + -- Oussama Bounaim <o.bounaim@gmail.com> Sun, 11 Nov 2012 07:11:06 +0100 |
681 | + |
682 | exim4 (4.80-5.1) unstable; urgency=high |
683 | |
684 | * Non-maintainer upload by the Security Team. |
685 | @@ -1708,6 +2181,23 @@ exim4 (4.80-4) unstable; urgency=low |
686 | |
687 | -- Andreas Metzler <ametzler@debian.org> Sat, 23 Jun 2012 18:35:03 +0200 |
688 | |
689 | +exim4 (4.80-3ubuntu1.1) quantal-security; urgency=low |
690 | + |
691 | + * SECURITY UPDATE: arbitrary code execution via dns decode logic |
692 | + - debian/patches/CVE-2012-5671.patch: adjust max length and validate |
693 | + against it in src/pdkim/pdkim.h, src/dkim.c. |
694 | + - CVE-2012-5671 |
695 | + |
696 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 25 Oct 2012 08:22:46 -0400 |
697 | + |
698 | +exim4 (4.80-3ubuntu1) quantal; urgency=low |
699 | + |
700 | + * Merge from Debian unstable. Remaining changes: |
701 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
702 | + we want postfix to be the default. |
703 | + |
704 | + -- Clint Byrum <clint@ubuntu.com> Thu, 14 Jun 2012 15:28:08 -0700 |
705 | + |
706 | exim4 (4.80-3) unstable; urgency=low |
707 | |
708 | * Pull 75_openssl_sni.diff from upstream. - Segfault caused by NULL |
709 | @@ -1855,6 +2345,26 @@ exim4 (4.76-4) experimental; urgency=low |
710 | |
711 | -- Andreas Metzler <ametzler@debian.org> Sat, 24 Sep 2011 18:36:08 +0200 |
712 | |
713 | +exim4 (4.76-3ubuntu3) precise; urgency=low |
714 | + |
715 | + * Rebuild for libmysqlclient transition |
716 | + |
717 | + -- Clint Byrum <clint@ubuntu.com> Wed, 23 Nov 2011 23:29:35 -0800 |
718 | + |
719 | +exim4 (4.76-3ubuntu2) precise; urgency=low |
720 | + |
721 | + * Rebuild for Perl 5.14. |
722 | + |
723 | + -- Colin Watson <cjwatson@ubuntu.com> Wed, 16 Nov 2011 01:22:39 +0000 |
724 | + |
725 | +exim4 (4.76-3ubuntu1) precise; urgency=low |
726 | + |
727 | + * Merge from debian unstable. Remaining changes: |
728 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
729 | + we want postfix to be the default. |
730 | + |
731 | + -- Stéphane Graber <stgraber@ubuntu.com> Thu, 20 Oct 2011 11:29:07 -0400 |
732 | + |
733 | exim4 (4.76-3) unstable; urgency=low |
734 | |
735 | * [exim4-base.cron.daily] Correct invocation of mail(1), options need to be |
736 | @@ -1875,6 +2385,14 @@ exim4 (4.76-3) unstable; urgency=low |
737 | |
738 | -- Andreas Metzler <ametzler@debian.org> Sun, 18 Sep 2011 11:49:13 +0200 |
739 | |
740 | +exim4 (4.76-2ubuntu1) oneiric; urgency=low |
741 | + |
742 | + * Merge from debian unstable. Remaining changes: |
743 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
744 | + we want postfix to be the default. |
745 | + |
746 | + -- Stéphane Graber <stgraber@ubuntu.com> Mon, 30 May 2011 17:48:56 -0400 |
747 | + |
748 | exim4 (4.76-2) unstable; urgency=low |
749 | |
750 | * debian/rules: Remove test/ and test-stamp on clean. |
751 | @@ -1887,6 +2405,14 @@ exim4 (4.76-2) unstable; urgency=low |
752 | |
753 | -- Andreas Metzler <ametzler@debian.org> Sun, 29 May 2011 18:21:03 +0200 |
754 | |
755 | +exim4 (4.76-1ubuntu1) oneiric; urgency=low |
756 | + |
757 | + * Merge from debian unstable. Remaining changes (LP: #779391): |
758 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
759 | + we want postfix to be the default. |
760 | + |
761 | + -- Stéphane Graber <stgraber@ubuntu.com> Mon, 23 May 2011 12:37:30 -0400 |
762 | + |
763 | exim4 (4.76-1) unstable; urgency=low |
764 | |
765 | * New upstream version. |
766 | @@ -1933,6 +2459,14 @@ exim4 (4.75-3) unstable; urgency=high |
767 | |
768 | -- Andreas Metzler <ametzler@debian.org> Fri, 06 May 2011 20:08:51 +0200 |
769 | |
770 | +exim4 (4.75-2ubuntu1) oneiric; urgency=low |
771 | + |
772 | + * Merge from debian unstable. Remaining changes: |
773 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
774 | + we want postfix to be the default. |
775 | + |
776 | + -- Stéphane Graber <stgraber@ubuntu.com> Fri, 06 May 2011 14:51:28 -0400 |
777 | + |
778 | exim4 (4.75-2) unstable; urgency=low |
779 | |
780 | * clamav socket on Debian is clamd:/var/run/clamav/clamd.ctl, fix |
781 | @@ -1975,6 +2509,24 @@ exim4 (4.74-2) unstable; urgency=low |
782 | |
783 | -- Andreas Metzler <ametzler@debian.org> Thu, 24 Feb 2011 19:02:07 +0100 |
784 | |
785 | +exim4 (4.74-1ubuntu1) natty; urgency=low |
786 | + |
787 | + * Merge from debian experimental. Remaining changes: (LP: #713855) |
788 | + - debian/patches/71_exiq_grep_error_on_messages_without_size.patch: |
789 | + + Improve handling of broken messages when "exim4 -bp" (mailq) |
790 | + reports lines without size info. (Closes: #528625) |
791 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
792 | + we want postfix to be the default. |
793 | + - debian/{control,rules}: Add and enable hardened build for PIE. |
794 | + (Closes: #542726) |
795 | + * Update 71_exiq_grep_error_on_messages_without_size.patch to get way |
796 | + which upstream has fixed it. Probably it can be dropped with next |
797 | + upstream release. |
798 | + * This upload fixes CVE: (LP: #708023) |
799 | + - CVE-2011-0017 |
800 | + |
801 | + -- Artur Rona <ari-tczew@ubuntu.com> Wed, 09 Feb 2011 21:31:35 +0100 |
802 | + |
803 | exim4 (4.74-1) experimental; urgency=low |
804 | |
805 | * 4.74 release, should build on hurd again. |
806 | @@ -2000,6 +2552,20 @@ exim4 (4.74~rc2-1) experimental; urgency=low |
807 | |
808 | -- Andreas Metzler <ametzler@debian.org> Sun, 23 Jan 2011 14:02:36 +0100 |
809 | |
810 | +exim4 (4.73~rc1-1ubuntu1) natty; urgency=low |
811 | + |
812 | + * Merge from debian unstable. Remaining changes: (LP: #697934) |
813 | + - debian/patches/71_exiq_grep_error_on_messages_without_size.patch: |
814 | + + Improve handling of broken messages when "exim4 -bp" (mailq) |
815 | + reports lines without size info. |
816 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
817 | + we want postfix to be the default. |
818 | + - debian/{control,rules}: Add and enable hardened build for PIE. |
819 | + (Closes: #542726) |
820 | + * Drop B-D on libmysqlclient15-dev, resolved in Debian. |
821 | + |
822 | + -- Artur Rona <ari-tczew@ubuntu.com> Tue, 28 Dec 2010 22:20:17 +0100 |
823 | + |
824 | exim4 (4.73~rc1-1) experimental; urgency=low |
825 | |
826 | * New upstream release candidate. |
827 | @@ -2095,6 +2661,20 @@ exim4 (4.72-3) unstable; urgency=low |
828 | |
829 | -- Andreas Metzler <ametzler@debian.org> Sun, 26 Dec 2010 15:13:08 +0100 |
830 | |
831 | +exim4 (4.72-2ubuntu1) natty; urgency=low |
832 | + |
833 | + * Merge from debian unstable. Remaining changes: (LP: #671615) |
834 | + - debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: |
835 | + Improve handling of broken messages when "exim4 -bp" (mailq) reports |
836 | + lines without size info. |
837 | + - Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be |
838 | + the default. |
839 | + - debian/control: Change build dependencies to MySQL 5.1. |
840 | + - debian/{control,rules}: add and enable hardened build for PIE |
841 | + (Closes: #542726). |
842 | + |
843 | + -- Artur Rona <ari-tczew@ubuntu.com> Fri, 05 Nov 2010 21:05:47 +0100 |
844 | + |
845 | exim4 (4.72-2) unstable; urgency=low |
846 | |
847 | [ Marc Haber ] |
848 | @@ -2118,6 +2698,20 @@ exim4 (4.72-2) unstable; urgency=low |
849 | |
850 | -- Andreas Metzler <ametzler@debian.org> Sat, 30 Oct 2010 13:38:26 +0200 |
851 | |
852 | +exim4 (4.72-1ubuntu1) maverick; urgency=low |
853 | + |
854 | + * Merge with Debian unstable (LP: #609620). Remaining changes: |
855 | + + debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: |
856 | + Improve handling of broken messages when "exim4 -bp" (mailq) reports |
857 | + lines without size info. |
858 | + + Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be |
859 | + the default. |
860 | + + debian/control: Change build dependencies to MySQL 5.1. |
861 | + + debian/{control,rules}: add and enable hardened build for PIE |
862 | + (Closes: #542726). |
863 | + |
864 | + -- Artur Rona <ari-tczew@tlen.pl> Sun, 25 Jul 2010 02:00:42 +0200 |
865 | + |
866 | exim4 (4.72-1) unstable; urgency=low |
867 | |
868 | * New upstream release. (Identical to the git snapshot previously |
869 | @@ -2169,6 +2763,20 @@ exim4 (4.71-4) unstable; urgency=low |
870 | |
871 | -- Andreas Metzler <ametzler@debian.org> Thu, 25 Mar 2010 17:34:30 +0100 |
872 | |
873 | +exim4 (4.71-3ubuntu1) lucid; urgency=low |
874 | + |
875 | + * Merge with Debian unstable (lp: #501657). Remaining changes: |
876 | + + debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: |
877 | + Improve handling of broken messages when "exim4 -bp" (mailq) reports |
878 | + lines without size info. |
879 | + + Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be |
880 | + the default. |
881 | + + debian/control: Change build dependencies to MySQL 5.1. |
882 | + + debian/{control,rules}: add and enable hardened build for PIE |
883 | + (Debian bug 542726). |
884 | + |
885 | + -- Michael Bienia <geser@ubuntu.com> Fri, 01 Jan 2010 16:28:19 +0100 |
886 | + |
887 | exim4 (4.71-3) unstable; urgency=low |
888 | |
889 | * exim4-base.cron.daily: Do not run exim_tidydb on Berkeley DB logfiles. |
890 | @@ -2283,6 +2891,35 @@ exim4 (4.70~cvs+20091017-1) experimental; urgency=low |
891 | |
892 | -- Andreas Metzler <ametzler@debian.org> Sat, 17 Oct 2009 14:26:54 +0200 |
893 | |
894 | +exim4 (4.69-11ubuntu4) karmic; urgency=low |
895 | + |
896 | + * debian/{control,rules}: add and enable hardened build for PIE |
897 | + (Debian bug 542726). |
898 | + |
899 | + -- Kees Cook <kees@ubuntu.com> Thu, 20 Aug 2009 17:33:26 -0700 |
900 | + |
901 | +exim4 (4.69-11ubuntu3) karmic; urgency=low |
902 | + |
903 | + * debian/control: Change build dependencies to MySQL 5.1. |
904 | + |
905 | + -- Mathias Gug <mathiaz@ubuntu.com> Mon, 17 Aug 2009 17:57:26 -0400 |
906 | + |
907 | +exim4 (4.69-11ubuntu2) karmic; urgency=low |
908 | + |
909 | + * Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be |
910 | + the default. |
911 | + |
912 | + -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 03 Jun 2009 15:39:14 +0000 |
913 | + |
914 | +exim4 (4.69-11ubuntu1) karmic; urgency=low |
915 | + |
916 | + * Merge from debian unstable (LP: #375923), remaining changes: |
917 | + - debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: |
918 | + Improve handling of broken messages when "exim4 -bp" (mailq) reports |
919 | + lines without size info |
920 | + |
921 | + -- Thierry Carrez <thierry.carrez@ubuntu.com> Wed, 13 May 2009 12:15:29 +0200 |
922 | + |
923 | exim4 (4.69-11) unstable; urgency=medium |
924 | |
925 | * Build-Depend on lynx-cur|lynx instead of lynx. (lynx is just a dummy |
926 | @@ -2340,6 +2977,15 @@ exim4 (4.69-10) unstable; urgency=low |
927 | |
928 | -- Andreas Metzler <ametzler@debian.org> Sat, 02 May 2009 09:05:56 +0200 |
929 | |
930 | +exim4 (4.69-9ubuntu1) jaunty; urgency=low |
931 | + |
932 | + [ Daniel van Eeden <launchpad@myname.nl> ] |
933 | + * debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: |
934 | + Improve handling of broken messages when "exim4 -bp" (mailq) reports lines |
935 | + w/o size info, LP: #18194 |
936 | + |
937 | + -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 11 Feb 2009 06:43:52 -0600 |
938 | + |
939 | exim4 (4.69-9) unstable; urgency=medium |
940 | |
941 | * [update-exim4.conf]: Use POSIX character classes [:alnum:] or explicit |
942 | diff --git a/debian/control b/debian/control |
943 | index cd773bb..bd816d4 100644 |
944 | --- a/debian/control |
945 | +++ b/debian/control |
946 | @@ -1,7 +1,8 @@ |
947 | Source: exim4 |
948 | Section: mail |
949 | Priority: standard |
950 | -Maintainer: Exim4 Maintainers <pkg-exim4-maintainers@lists.alioth.debian.org> |
951 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
952 | +XSBC-Original-Maintainer: Exim4 Maintainers <pkg-exim4-maintainers@lists.alioth.debian.org> |
953 | Uploaders: |
954 | Andreas Metzler <ametzler@debian.org>, |
955 | Marc Haber <mh+debian-packages@zugschlus.de> |
956 | @@ -31,7 +32,8 @@ Build-Depends: |
957 | libxt-dev, |
958 | lynx, |
959 | po-debconf, |
960 | - xsltproc |
961 | + xsltproc, |
962 | + lsb-release |
963 | |
964 | Package: exim4-base |
965 | Architecture: any |
966 | diff --git a/debian/patches/fix_smtp_banner.patch b/debian/patches/fix_smtp_banner.patch |
967 | new file mode 100644 |
968 | index 0000000..615eb5a |
969 | --- /dev/null |
970 | +++ b/debian/patches/fix_smtp_banner.patch |
971 | @@ -0,0 +1,53 @@ |
972 | +Description: Add EXIM_DISTRIBUTION var to display it on the SMTP banner |
973 | +Origin: https://blueprints.launchpad.net/ubuntu/+spec/servercloud-s-server-app-banner-updates |
974 | +Author: Yolanda Robla <yolanda.robla@canonical.com> |
975 | +Forwarded: https://salsa.debian.org/exim-team/exim4/merge_requests/2 |
976 | +Last-Update: 2018-07-03 |
977 | + |
978 | +--- a/src/globals.c |
979 | ++++ b/src/globals.c |
980 | +@@ -1443,7 +1443,7 @@ int smtp_accept_queue_per_connection = 10; |
981 | + int smtp_accept_reserve = 0; |
982 | + uschar *smtp_active_hostname = NULL; |
983 | + uschar *smtp_banner = US"$smtp_active_hostname ESMTP " |
984 | +- "Exim $version_number $tod_full" |
985 | ++ "Exim $version_number " EXIM_DISTRIBUTION " $tod_full" |
986 | + "\0<---------------Space to patch smtp_banner->"; |
987 | + int smtp_ch_index = 0; |
988 | + uschar *smtp_cmd_argument = NULL; |
989 | +--- a/src/config.h.defaults |
990 | ++++ b/src/config.h.defaults |
991 | +@@ -224,4 +224,6 @@ for EXIM_ARITH_MAX and _MIN in OS/oh.h-FOO */ |
992 | + #define SC_EXIM_ARITH "%" SCNi64 /* scanf incl. 0x prefix */ |
993 | + #define SC_EXIM_DEC "%" SCNd64 /* scanf decimal */ |
994 | + |
995 | ++#define EXIM_DISTRIBUTION |
996 | ++ |
997 | + /* End of config.h.defaults */ |
998 | +--- a/scripts/Configure-config.h |
999 | ++++ b/scripts/Configure-config.h |
1000 | +@@ -23,6 +23,12 @@ |
1001 | + if [ "$1" != "" ] ; then MAKE=$1 ; fi |
1002 | + if [ "$MAKE" = "" ] ; then MAKE=make ; fi |
1003 | + |
1004 | ++# exporting distribution to use it in smtp banner |
1005 | ++if test -x /usr/bin/lsb_release && lsb_release -si; then |
1006 | ++ export EXIM_DISTRIBUTION=\"$(lsb_release -si)\" |
1007 | ++else |
1008 | ++ export EXIM_DISTRIBUTION=\"\" |
1009 | ++fi |
1010 | + $MAKE buildconfig || exit 1 |
1011 | + |
1012 | + # BEWARE: tab characters needed in the following sed command. They have had |
1013 | +--- a/src/exim.h |
1014 | ++++ b/src/exim.h |
1015 | +@@ -597,5 +597,9 @@ default to EDQUOT if it exists, otherwise ENOSPC. */ |
1016 | + # define EXIM_GROUPLIST_SIZE NGROUPS_MAX |
1017 | + #endif |
1018 | + |
1019 | ++#ifndef EXIM_DISTRIBUTION |
1020 | ++ #define EXIM_DISTRIBUTION "" |
1021 | ++#endif |
1022 | ++ |
1023 | + #endif |
1024 | + /* End of exim.h */ |
1025 | diff --git a/debian/patches/series b/debian/patches/series |
1026 | index 9629062..146ee58 100644 |
1027 | --- a/debian/patches/series |
1028 | +++ b/debian/patches/series |
1029 | @@ -17,3 +17,4 @@ |
1030 | 75_09-OpenSSL-Fix-aggregation-of-messages.patch |
1031 | 75_10-Harden-plaintext-authenticator.patch |
1032 | 90_localscan_dlopen.dpatch |
1033 | +fix_smtp_banner.patch |
Tests passed for me, here's what I did:
== 0. setup ==
$ lxc launch ubuntu-daily:19.10 exim4-merge-test-a
Creating exim4-merge-test-a
Starting exim4-merge-test-a
$ lxc exec exim4-merge-test-a bash
root@exim4- merge-test- a:~# add-apt-repository -sy ppa:bryce/ exim4-merge- 4.92-7
apt update
...
...
# apt policy exim4
exim4:
Installed: (none)
Candidate: 4.92-7ubuntu1~ppa1
== 1. basic install and removal ==
# apt -y install exim4 7-minimal libpython2.7-stdlib libunbound8 mailutils mailutils-common
...
The following NEW packages will be installed:
exim4 exim4-base exim4-config exim4-daemon-light guile-2.2-libs libgc1c2 libgnutls-dane0 libgsasl7 libkyotocabinet16v5 libltdl7
libmailutils5 libmysqlclient20 libntlm0 libpython2.7 libpython2.
mysql-common
0 upgraded, 20 newly installed, 0 to remove and 3 not upgraded.
Need to get 12.9 MB of archives.
...
~# service exim4 status sysv-generator( 8) slice/exim4. service
● exim4.service - LSB: exim Mail Transport Agent
Loaded: loaded (/etc/init.d/exim4; generated)
Active: active (running) since Mon 2019-05-13 22:14:21 UTC; 42s ago
Docs: man:systemd-
Tasks: 1 (limit: 4915)
Memory: 4.1M
CGroup: /system.
└─3044 /usr/sbin/exim4 -bd -q30m
May 13 22:14:21 exim4-merge-test-a systemd[1]: Starting LSB: exim Mail Transport Agent... merge-test- a:~# echo $?
May 13 22:14:21 exim4-merge-test-a exim4[2796]: * Starting MTA
May 13 22:14:21 exim4-merge-test-a exim4[2796]: ...done.
May 13 22:14:21 exim4-merge-test-a systemd[1]: Started LSB: exim Mail Transport Agent.
root@exim4-
0
root@exim4- merge-test- a:~# apt -y remove exim4 exim4-base exim4-config
The following packages will be REMOVED:
exim4 exim4-base exim4-daemon-light exim4-config
...
# apt-cache policy exim4
exim4:
Installed: (none)
Candidate: 4.92-7ubuntu1~ppa1
== 2. simple upgrade ==
root@exim4- merge-test- a:~# apt-get install exim4-base= 4.92-4ubuntu1
...
The following NEW packages will be installed:
exim4-base exim4-config
0 upgraded, 2 newly installed, 0 to remove and 3 not upgraded.
Need to get 1241 kB of archives.
After this operation, 2681 kB of additional disk space will be used.
...
root@exim4- merge-test- a:~# apt upgrade -y -backend dconf-service fwupd fwupd-signed glib-networking glib-networking -common networking- services gsettings- desktop- schemas libarchive13 libdconf1 libefiboot1 libefivar1 libfwupd2 libgcab-1.0-0 libgpgme11 glib-1. 0-common libproxy1v5 libsmbios-c2 libsoup2.4-1 libxmlb1 sbsigntool
...
The following NEW packages will be installed:
bolt dbus-user-session dconf-gsettings
glib-
libgudev-1.0-0 libgusb2 libjson-glib-1.0-0 libjson-
secureboot-db
The following packages will be upgraded:
exim4-base ubuntu-minimal ubuntu-server ubuntu-standard
4 upgraded, 27 newly installed, 0 to remove and 0 not upgraded.
Need to get 5047 kB of archives.
After this operation, 14.7 MB of additional disk space will be used.
...
Setting up secureboot-db (1.4) ... efi/efivars/ dbx-d719b2cb- 3d3a-4596- a3bc-dad00e6765 6f share/secureboo t/updates/ dbx/MS- 2016-08- 08.bin [7085 bytes]
chattr: Permission denied while reading flags on /sys/firmware/
Filesystem keystore:
/usr/
firmware keys:
PK:
KEK:
db:
...