Merge ~kstenerud/ubuntu/+source/exim4:merge-4.92-2-disco into ubuntu/+source/exim4:debian/sid
- Git
- lp:~kstenerud/ubuntu/+source/exim4
- merge-4.92-2-disco
- Merge into debian/sid
Status: | Merged |
---|---|
Merge reported by: | Christian Ehrhardt |
Merged at revision: | 7116bb326faa2919453eef497ed1f90614ca1f7e |
Proposed branch: | ~kstenerud/ubuntu/+source/exim4:merge-4.92-2-disco |
Merge into: | ubuntu/+source/exim4:debian/sid |
Diff against target: |
1001 lines (+686/-2) 4 files modified
debian/changelog (+628/-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 | Pending | ||
Canonical Server packageset reviewers | Pending | ||
Review via email: mp+363958@code.launchpad.net |
Commit message
Description of the change
PPA: https:/
Install:
lxc launch ubuntu-daily:disco tester && lxc exec tester bash
add-apt-repository -y ppa:kstenerud/
apt update && apt dist-upgrade -y && apt install -y exim4 &&
exim4 --version
Upgrade:
lxc launch ubuntu-daily:disco tester && lxc exec tester bash
apt update && apt dist-upgrade -y && apt install -y exim4 &&
exim4 --version
add-apt-repository -y ppa:kstenerud/
exim4 --version
Package tests:
autopkgtest [11:48:00]: @@@@@@@
daemon PASS
security PASS
Christian Ehrhardt (paelzer) wrote : | # |
Tagging will not help as this is affected by the "empty Dir" issues.
Christian Ehrhardt (paelzer) wrote : | # |
Building - https:/
Please track migration
Preview Diff
1 | diff --git a/debian/changelog b/debian/changelog |
2 | index 8ff807f..279185f 100644 |
3 | --- a/debian/changelog |
4 | +++ b/debian/changelog |
5 | @@ -1,3 +1,12 @@ |
6 | +exim4 (4.92-2ubuntu1) disco; urgency=medium |
7 | + |
8 | + * Merge with Debian unstable (LP: #1818444). 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 | + -- Karl Stenerud <kstenerud@gmail.com> Tue, 05 Mar 2019 10:55:48 +0100 |
14 | + |
15 | exim4 (4.92-2) unstable; urgency=medium |
16 | |
17 | * Upload to unstable. |
18 | @@ -54,6 +63,21 @@ exim4 (4.92~RC4-3) unstable; urgency=medium |
19 | |
20 | -- Andreas Metzler <ametzler@debian.org> Sun, 20 Jan 2019 17:52:39 +0100 |
21 | |
22 | +exim4 (4.92~RC4-2ubuntu2) disco; urgency=medium |
23 | + |
24 | + * No-change rebuild against libmysqlclient21 |
25 | + |
26 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 01 Feb 2019 16:57:54 +0000 |
27 | + |
28 | +exim4 (4.92~RC4-2ubuntu1) disco; urgency=medium |
29 | + |
30 | + * Merge with Debian unstable (LP: #1811095). Remaining changes: |
31 | + - Show Ubuntu distribution in SMTP banner |
32 | + + Build-Depends on lsb-release to detect Distribution. |
33 | + + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
34 | + |
35 | + -- Karl Stenerud <kstenerud@gmail.com> Thu, 10 Jan 2019 16:41:45 +0100 |
36 | + |
37 | exim4 (4.92~RC4-2) unstable; urgency=medium |
38 | |
39 | * Upload to unstable. |
40 | @@ -147,6 +171,22 @@ exim4 (4.91-7) unstable; urgency=low |
41 | |
42 | -- Andreas Metzler <ametzler@debian.org> Sun, 26 Aug 2018 11:33:15 +0200 |
43 | |
44 | +exim4 (4.91-6ubuntu2) disco; urgency=medium |
45 | + |
46 | + * No-change rebuild for the perl 5.28 transition. |
47 | + |
48 | + -- Adam Conrad <adconrad@ubuntu.com> Fri, 02 Nov 2018 18:08:13 -0600 |
49 | + |
50 | +exim4 (4.91-6ubuntu1) cosmic; urgency=medium |
51 | + |
52 | + * Merge with Debian unstable. Remaining changes: |
53 | + - Show Ubuntu distribution in SMTP banner |
54 | + + Build-Depends on lsb-release to detect Distribution. |
55 | + + d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
56 | + [DEP3 header updated to indicate it has been forwarded to Debian] |
57 | + |
58 | + -- Andreas Hasenack <andreas@canonical.com> Mon, 30 Jul 2018 15:35:06 -0300 |
59 | + |
60 | exim4 (4.91-6) unstable; urgency=low |
61 | |
62 | * Update from exim-4_91+fixes branch: |
63 | @@ -158,6 +198,16 @@ exim4 (4.91-6) unstable; urgency=low |
64 | |
65 | -- Andreas Metzler <ametzler@debian.org> Fri, 20 Jul 2018 11:21:24 +0200 |
66 | |
67 | +exim4 (4.91-5ubuntu1) cosmic; urgency=medium |
68 | + |
69 | + * Merge with Debian unstable. Remaining changes: |
70 | + - Show Ubuntu distribution in SMTP banner |
71 | + - Build-Depends on lsb-release to detect Distribution. |
72 | + - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
73 | + [DEP3 header updated to indicate it has been forwarded to Debian] |
74 | + |
75 | + -- Andreas Hasenack <andreas@canonical.com> Tue, 03 Jul 2018 11:13:08 -0300 |
76 | + |
77 | exim4 (4.91-5) unstable; urgency=medium |
78 | |
79 | * Update from exim-4_91+fixes branch: |
80 | @@ -167,6 +217,15 @@ exim4 (4.91-5) unstable; urgency=medium |
81 | |
82 | -- Andreas Metzler <ametzler@debian.org> Sat, 09 Jun 2018 18:10:39 +0200 |
83 | |
84 | +exim4 (4.91-4ubuntu1) cosmic; urgency=medium |
85 | + |
86 | + * Merge from Debian testing, Remaining changes: |
87 | + - Show Ubuntu distribution in SMTP banner |
88 | + - Build-Depends on lsb-release to detect Distribution. |
89 | + - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
90 | + |
91 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 30 May 2018 12:46:14 +0200 |
92 | + |
93 | exim4 (4.91-4) unstable; urgency=medium |
94 | |
95 | * Update from exim-4_91+fixes branch: |
96 | @@ -285,6 +344,15 @@ exim4 (4.90.1-2) unstable; urgency=medium |
97 | |
98 | -- Andreas Metzler <ametzler@debian.org> Sat, 10 Mar 2018 14:25:51 +0100 |
99 | |
100 | +exim4 (4.90.1-1ubuntu1) bionic; urgency=medium |
101 | + |
102 | + * Merge from Debian testing, Remaining changes: |
103 | + - Show Ubuntu distribution in SMTP banner |
104 | + - Build-Depends on lsb-release to detect Distribution. |
105 | + - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
106 | + |
107 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 14 Feb 2018 17:01:14 +0100 |
108 | + |
109 | exim4 (4.90.1-1) unstable; urgency=high |
110 | |
111 | * New upstream version, fixing CVE-2018-6789. Closes: #890000 |
112 | @@ -479,6 +547,15 @@ exim4 (4.89-10) unstable; urgency=critical |
113 | |
114 | -- Andreas Metzler <ametzler@debian.org> Sat, 25 Nov 2017 11:43:24 +0100 |
115 | |
116 | +exim4 (4.89-9ubuntu1) bionic; urgency=medium |
117 | + |
118 | + * Merge from Debian unstable, 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> Thu, 16 Nov 2017 10:02:23 +0100 |
124 | + |
125 | exim4 (4.89-9) unstable; urgency=medium |
126 | |
127 | * Upload to unstable. |
128 | @@ -521,6 +598,42 @@ exim4 (4.89-6) unstable; urgency=medium |
129 | |
130 | -- Andreas Metzler <ametzler@debian.org> Sat, 09 Sep 2017 15:29:39 +0200 |
131 | |
132 | +exim4 (4.89-5ubuntu1.3) artful-security; urgency=medium |
133 | + |
134 | + * SECURITY UPDATE: Buffer overflow in base64d() |
135 | + - debian/patches/CVE-2018-6789.patch: fix overflow in src/base64.c. |
136 | + - CVE-2018-6789 |
137 | + |
138 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Sat, 10 Feb 2018 14:12:27 -0500 |
139 | + |
140 | +exim4 (4.89-5ubuntu1.2) artful-security; urgency=medium |
141 | + |
142 | + * SECURITY UPDATE: stack-exhaustion remote DoS |
143 | + - debian/patches/CVE-2017-16944.patch: do not treat the first lonely |
144 | + dot special in src/receive.c, src/smtp_in.c. |
145 | + - CVE-2017-16944 |
146 | + |
147 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Wed, 29 Nov 2017 08:59:31 -0500 |
148 | + |
149 | +exim4 (4.89-5ubuntu1.1) artful-security; urgency=medium |
150 | + |
151 | + * SECURITY UPDATE: remote code execution via use-after-free |
152 | + - debian/patches/CVE-2017-16943.patch: avoid release of store if there |
153 | + have been later allocations in src/receive.c. |
154 | + - CVE-2017-16943 |
155 | + |
156 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Mon, 27 Nov 2017 07:37:47 -0500 |
157 | + |
158 | +exim4 (4.89-5ubuntu1) artful; urgency=medium |
159 | + |
160 | + * Merge from Debian testing. |
161 | + Remaining changes: |
162 | + - Show Ubuntu distribution in SMTP banner |
163 | + - Build-Depends on lsb-release to detect Distribution. |
164 | + - d/p/fix_smtp_banner.patch: Show Ubuntu distribution in SMTP banner. |
165 | + |
166 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 16 Aug 2017 15:42:47 +0200 |
167 | + |
168 | exim4 (4.89-5) unstable; urgency=medium |
169 | |
170 | * Update to exim-4_89+fixes branch: |
171 | @@ -565,6 +678,20 @@ exim4 (4.89-4) unstable; urgency=low |
172 | |
173 | -- Andreas Metzler <ametzler@debian.org> Sat, 15 Jul 2017 12:46:16 +0200 |
174 | |
175 | +exim4 (4.89-3ubuntu2) artful; urgency=medium |
176 | + |
177 | + * No-change rebuild for perl 5.26.0. |
178 | + |
179 | + -- Matthias Klose <doko@ubuntu.com> Wed, 26 Jul 2017 20:02:24 +0000 |
180 | + |
181 | +exim4 (4.89-3ubuntu1) artful; urgency=medium |
182 | + |
183 | + * Merge from Debian. Remaining changes: |
184 | + - Show Ubuntu distribution in SMTP banner. |
185 | + - Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch) |
186 | + |
187 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 27 Jun 2017 10:20:42 -0400 |
188 | + |
189 | exim4 (4.89-3) unstable; urgency=high |
190 | |
191 | * Re-upload to unstable. |
192 | @@ -577,6 +704,15 @@ exim4 (4.89-2+deb9u1) stretch-security; urgency=medium |
193 | |
194 | -- <jmm@debian.org> Wed, 14 Jun 2017 07:03:07 +0200 |
195 | |
196 | +exim4 (4.89-2ubuntu1) artful; urgency=medium |
197 | + |
198 | + * Merge from Debian testing. |
199 | + Remaining changes: |
200 | + + Show Ubuntu distribution in SMTP banner. |
201 | + + Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch) |
202 | + |
203 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 01 Jun 2017 11:58:00 +0200 |
204 | + |
205 | exim4 (4.89-2) unstable; urgency=medium |
206 | |
207 | * Revert addition of header "# pidfile: /var/run/exim4/exim.pid" to |
208 | @@ -668,6 +804,17 @@ exim4 (4.89~RC1-1) unstable; urgency=low |
209 | |
210 | -- Andreas Metzler <ametzler@debian.org> Tue, 31 Jan 2017 19:52:50 +0100 |
211 | |
212 | +exim4 (4.88-5ubuntu1) zesty; urgency=medium |
213 | + |
214 | + * Merge from Debian unstable. |
215 | + Version 4.88 fixes CVE-2016-9963 (LP: #1654750) and symlink |
216 | + local root escalation (LP: #1580454) |
217 | + Remaining changes: |
218 | + + Show Ubuntu distribution in SMTP banner. |
219 | + + Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch) |
220 | + |
221 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 24 Jan 2017 10:15:09 +0100 |
222 | + |
223 | exim4 (4.88-5) unstable; urgency=medium |
224 | |
225 | * 78_Disable-chunking-BDAT-by-default.patch: Change default value of main |
226 | @@ -820,6 +967,20 @@ exim4 (4.88~RC1-1) experimental; urgency=low |
227 | |
228 | -- Andreas Metzler <ametzler@debian.org> Sun, 25 Sep 2016 15:44:00 +0200 |
229 | |
230 | +exim4 (4.87-3ubuntu2) zesty; urgency=medium |
231 | + |
232 | + * No-change rebuild for perl 5.24 transition |
233 | + |
234 | + -- Iain Lane <iain@orangesquash.org.uk> Mon, 24 Oct 2016 10:08:10 +0100 |
235 | + |
236 | +exim4 (4.87-3ubuntu1) yakkety; urgency=medium |
237 | + |
238 | + * Merge from Debian unstable. Remaining changes: |
239 | + + Show Ubuntu distribution in SMTP banner. |
240 | + + Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch) |
241 | + |
242 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 26 Jul 2016 13:30:09 +0200 |
243 | + |
244 | exim4 (4.87-3) unstable; urgency=medium |
245 | |
246 | * Pull multiple patches from upstream GIT: |
247 | @@ -993,6 +1154,48 @@ exim4 (4.87~RC1-1) experimental; urgency=medium |
248 | |
249 | -- Andreas Metzler <ametzler@debian.org> Fri, 11 Dec 2015 20:15:30 +0100 |
250 | |
251 | +exim4 (4.86.2-2ubuntu2.3) xenial-security; urgency=medium |
252 | + |
253 | + * SECURITY UPDATE: Buffer overflow in base64d() |
254 | + - debian/patches/CVE-2018-6789.patch: fix overflow in |
255 | + src/auths/b64decode.c. |
256 | + - CVE-2018-6789 |
257 | + |
258 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Sat, 10 Feb 2018 14:18:40 -0500 |
259 | + |
260 | +exim4 (4.86.2-2ubuntu2.2) xenial-security; urgency=medium |
261 | + |
262 | + * SECURITY UPDATE: memory leak |
263 | + - debian/patches/93_CVE-2017-1000368.patch: free -p argument if |
264 | + allocation was required. |
265 | + - CVE-2017-1000368 |
266 | + |
267 | + -- Steve Beattie <sbeattie@ubuntu.com> Fri, 02 Jun 2017 22:07:28 -0700 |
268 | + |
269 | +exim4 (4.86.2-2ubuntu2.1) xenial-security; urgency=medium |
270 | + |
271 | + * SECURITY UPDATE: DKIM information leakage |
272 | + - debian/patches/CVE-2016-9963.patch: fix information leakage in |
273 | + src/dkim.c, src/transports/smtp.c. |
274 | + - CVE-2016-9963 |
275 | + |
276 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 05 Jan 2017 08:29:10 -0500 |
277 | + |
278 | +exim4 (4.86.2-2ubuntu2) xenial; urgency=medium |
279 | + |
280 | + * Rebuild against libmysqlclient20. |
281 | + |
282 | + -- Robie Basak <robie.basak@ubuntu.com> Tue, 05 Apr 2016 12:21:41 +0000 |
283 | + |
284 | +exim4 (4.86.2-2ubuntu1) xenial; urgency=medium |
285 | + |
286 | + * Merge from Debian unstable. Remaining changes: |
287 | + - debian.control, debian/patches/fix_smtp_banner.patch |
288 | + + Show Ubuntu distribution in SMTP banner. |
289 | + + Build-Depends on lsb-release. |
290 | + |
291 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 15 Mar 2016 11:56:18 -0400 |
292 | + |
293 | exim4 (4.86.2-2) unstable; urgency=high |
294 | |
295 | * Bump exim4-config Breaks to exim4-daemon-* (<< 4.86.2). Closes: #816790 |
296 | @@ -1014,6 +1217,27 @@ exim4 (4.86.2-1) unstable; urgency=high |
297 | |
298 | -- Andreas Metzler <ametzler@debian.org> Tue, 01 Mar 2016 19:34:39 +0100 |
299 | |
300 | +exim4 (4.86-7ubuntu3) xenial; urgency=medium |
301 | + |
302 | + * No-change rebuild for gnutls transition. |
303 | + |
304 | + -- Matthias Klose <doko@ubuntu.com> Wed, 17 Feb 2016 22:40:56 +0000 |
305 | + |
306 | +exim4 (4.86-7ubuntu2) xenial; urgency=medium |
307 | + |
308 | + * Rebuild for Perl 5.22.1. |
309 | + |
310 | + -- Colin Watson <cjwatson@ubuntu.com> Fri, 18 Dec 2015 10:30:54 +0000 |
311 | + |
312 | +exim4 (4.86-7ubuntu1) xenial; urgency=medium |
313 | + |
314 | + * Merge from Debian unstable. Remaining changes: |
315 | + - debian.control, debian/patches/fix_smtp_banner.patch |
316 | + + Show Ubuntu distribution in SMTP banner. |
317 | + + Build-Depends on lsb-release. |
318 | + |
319 | + -- Pierre-André MOREY <pierre-andre.morey@canonical.com> Mon, 14 Dec 2015 14:23:51 +0100 |
320 | + |
321 | exim4 (4.86-7) unstable; urgency=medium |
322 | |
323 | * Allow arch-indep build (dpkg-buildpackage -A). Closes: #806023 |
324 | @@ -1064,6 +1288,15 @@ exim4 (4.86-4) unstable; urgency=medium |
325 | |
326 | -- Andreas Metzler <ametzler@debian.org> Sat, 17 Oct 2015 15:01:01 +0200 |
327 | |
328 | +exim4 (4.86-3ubuntu1) wily; urgency=medium |
329 | + |
330 | + * Merge from Debian unstable. (LP: #1485369) Remaining changes: |
331 | + - debian/control, debian/patches/fix_smtp_banner.patch: |
332 | + + Show Ubuntu distribution in SMTP banner. |
333 | + + Build-Depends on lsb-release. |
334 | + |
335 | + -- Artur Rona <ari-tczew@ubuntu.com> Thu, 17 Sep 2015 13:18:20 +0100 |
336 | + |
337 | exim4 (4.86-3) unstable; urgency=medium |
338 | |
339 | * Pull three patches from upstream git: |
340 | @@ -1104,6 +1337,15 @@ exim4 (4.86~RC5-1) unstable; urgency=medium |
341 | |
342 | -- Andreas Metzler <ametzler@debian.org> Sat, 18 Jul 2015 11:46:11 +0200 |
343 | |
344 | +exim4 (4.86~RC4-2ubuntu1) wily; urgency=low |
345 | + |
346 | + * Merge from Debian unstable. (LP: #1166671) 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 | + -- Artur Rona <ari-tczew@ubuntu.com> Mon, 06 Jul 2015 12:09:36 +0200 |
352 | + |
353 | exim4 (4.86~RC4-2) unstable; urgency=medium |
354 | |
355 | * Drop libmysqlclient15-dev alternative build-dependency. Closes: #790463 |
356 | @@ -1268,6 +1510,18 @@ exim4 (4.85~RC1+dfsg-1) experimental; urgency=medium |
357 | |
358 | -- Andreas Metzler <ametzler@debian.org> Tue, 18 Nov 2014 19:28:20 +0100 |
359 | |
360 | +exim4 (4.84-8ubuntu1) vivid; urgency=low |
361 | + |
362 | + * Merge from Debian unstable. (LP: #1434300) 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 | + - debian/control: |
367 | + + Don't provide default-mta; in Ubuntu, |
368 | + we want postfix to be the default. |
369 | + |
370 | + -- Artur Rona <ari-tczew@ubuntu.com> Thu, 19 Mar 2015 00:15:40 +0100 |
371 | + |
372 | exim4 (4.84-8) unstable; urgency=medium |
373 | |
374 | * Pull 83_Remove-limit-on-remove_headers-item-size.-Bug-1533.patch and |
375 | @@ -1285,6 +1539,15 @@ exim4 (4.84-7) unstable; urgency=medium |
376 | |
377 | -- Andreas Metzler <ametzler@debian.org> Sat, 07 Feb 2015 15:12:33 +0100 |
378 | |
379 | +exim4 (4.84-6ubuntu1) vivid; urgency=medium |
380 | + |
381 | + * Resynchronise with Debian. Remaining changes: |
382 | + - Show Ubuntu distribution in SMTP banner. |
383 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
384 | + default. |
385 | + |
386 | + -- Colin Watson <cjwatson@ubuntu.com> Wed, 14 Jan 2015 11:26:29 +0000 |
387 | + |
388 | exim4 (4.84-6) unstable; urgency=medium |
389 | |
390 | * Revert init script's restart order change in 4.84-4 for the time being. |
391 | @@ -1293,6 +1556,15 @@ exim4 (4.84-6) unstable; urgency=medium |
392 | |
393 | -- Andreas Metzler <ametzler@debian.org> Sun, 21 Dec 2014 14:07:12 +0100 |
394 | |
395 | +exim4 (4.84-5ubuntu1) vivid; urgency=medium |
396 | + |
397 | + * Resynchronise with Debian. Remaining changes: |
398 | + - Show Ubuntu distribution in SMTP banner. |
399 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
400 | + default. |
401 | + |
402 | + -- Colin Watson <cjwatson@ubuntu.com> Thu, 18 Dec 2014 15:26:17 +0000 |
403 | + |
404 | exim4 (4.84-5) unstable; urgency=medium |
405 | |
406 | * 82_quoted-or-r-2047-encoded.diff pulled from upstream git (sans |
407 | @@ -1300,6 +1572,15 @@ exim4 (4.84-5) unstable; urgency=medium |
408 | |
409 | -- Andreas Metzler <ametzler@debian.org> Wed, 17 Dec 2014 19:03:39 +0100 |
410 | |
411 | +exim4 (4.84-4ubuntu1) 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> Tue, 02 Dec 2014 15:28:46 +0000 |
419 | + |
420 | exim4 (4.84-4) unstable; urgency=medium |
421 | |
422 | * Unset message_prefix/message_sufix in maildrop_pipe transport. Maildrop |
423 | @@ -1314,6 +1595,15 @@ exim4 (4.84-4) unstable; urgency=medium |
424 | |
425 | -- Andreas Metzler <ametzler@debian.org> Sun, 30 Nov 2014 08:24:04 +0100 |
426 | |
427 | +exim4 (4.84-3ubuntu1) 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> Tue, 11 Nov 2014 13:43:35 +0000 |
435 | + |
436 | exim4 (4.84-3) unstable; urgency=medium |
437 | |
438 | * Apply patch to Italian (it) debconf template translation, thanks to |
439 | @@ -1343,6 +1633,24 @@ exim4 (4.84~RC2-1) unstable; urgency=medium |
440 | |
441 | -- Andreas Metzler <ametzler@debian.org> Sat, 09 Aug 2014 07:42:00 +0200 |
442 | |
443 | +exim4 (4.84~RC1-3ubuntu2) utopic; urgency=medium |
444 | + |
445 | + * Rebuild for Perl 5.20.0. |
446 | + |
447 | + -- Colin Watson <cjwatson@ubuntu.com> Thu, 21 Aug 2014 12:18:13 +0100 |
448 | + |
449 | +exim4 (4.84~RC1-3ubuntu1) utopic; urgency=low |
450 | + |
451 | + * Merge from Debian unstable (LP: #1351470). Remaining changes: |
452 | + - Show Ubuntu distribution on smtp: |
453 | + + debian/patches/fix_smtp_banner.patch: updated SMTP banner |
454 | + with Ubuntu distribution |
455 | + + debian/control: added lsb-release build dependency |
456 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
457 | + default. |
458 | + |
459 | + -- Corey Bryant <corey.bryant@canonical.com> Mon, 04 Aug 2014 11:48:39 -0400 |
460 | + |
461 | exim4 (4.84~RC1-3) unstable; urgency=medium |
462 | |
463 | * Third try. Simply comment *custom* in debian/control. |
464 | @@ -1411,6 +1719,18 @@ exim4 (4.83~RC1-1) experimental; urgency=medium |
465 | |
466 | -- Andreas Metzler <ametzler@debian.org> Thu, 29 May 2014 13:09:04 +0200 |
467 | |
468 | +exim4 (4.82.1-2ubuntu1) utopic; urgency=low |
469 | + |
470 | + * Merge from Debian unstable (LP: #1348074). Remaining changes: |
471 | + - Show Ubuntu distribution on smtp: |
472 | + + debian/patches/fix_smtp_banner.patch: updated SMTP banner |
473 | + with Ubuntu distribution |
474 | + + debian/control: added lsb-release build dependency |
475 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
476 | + default. |
477 | + |
478 | + -- Robie Basak <robie.basak@ubuntu.com> Fri, 25 Jul 2014 15:53:09 +0000 |
479 | + |
480 | exim4 (4.82.1-2) unstable; urgency=high |
481 | |
482 | * [87_double_expansion.diff] from upstream. Stop unwanted double expansion |
483 | @@ -1428,6 +1748,18 @@ exim4 (4.82.1-1) unstable; urgency=high |
484 | |
485 | -- Andreas Metzler <ametzler@debian.org> Wed, 28 May 2014 19:01:43 +0200 |
486 | |
487 | +exim4 (4.82-8ubuntu1) utopic; urgency=medium |
488 | + |
489 | + * Merge from Debian unstable. Remaining changes: |
490 | + - Show Ubuntu distribution on smtp: |
491 | + + debian/patches/fix_smtp_banner.patch: updated SMTP banner |
492 | + with Ubuntu distribution |
493 | + + debian/control: added lsb-release build dependency |
494 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
495 | + default. |
496 | + |
497 | + -- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 17 May 2014 01:50:20 +0100 |
498 | + |
499 | exim4 (4.82-8) unstable; urgency=medium |
500 | |
501 | * Now that GMP has been relicensed to LGPLv3+/GPLv2+ build exim against |
502 | @@ -1491,6 +1823,78 @@ exim4 (4.82-4) unstable; urgency=medium |
503 | |
504 | -- Andreas Metzler <ametzler@debian.org> Sun, 09 Feb 2014 19:41:34 +0100 |
505 | |
506 | +exim4 (4.82-3ubuntu2.4) trusty-security; urgency=medium |
507 | + |
508 | + * SECURITY UPDATE: Buffer overflow in base64d() |
509 | + - debian/patches/CVE-2018-6789.patch: fix overflow in |
510 | + src/auths/b64decode.c. |
511 | + - CVE-2018-6789 |
512 | + |
513 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Sat, 10 Feb 2018 14:19:43 -0500 |
514 | + |
515 | +exim4 (4.82-3ubuntu2.3) trusty-security; urgency=medium |
516 | + |
517 | + * SECURITY UPDATE: memory leak |
518 | + - debian/patches/CVE-2017-1000368.patch: free -p argument if |
519 | + allocation was required. |
520 | + - CVE-2017-1000368 |
521 | + |
522 | + -- Steve Beattie <sbeattie@ubuntu.com> Fri, 02 Jun 2017 22:44:35 -0700 |
523 | + |
524 | +exim4 (4.82-3ubuntu2.2) trusty-security; urgency=medium |
525 | + |
526 | + * SECURITY UPDATE: DKIM information leakage |
527 | + - debian/patches/CVE-2016-9963.patch: fix information leakage in |
528 | + src/dkim.c, src/transports/smtp.c. |
529 | + - CVE-2016-9963 |
530 | + |
531 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 05 Jan 2017 08:31:06 -0500 |
532 | + |
533 | +exim4 (4.82-3ubuntu2.1) trusty-security; urgency=medium |
534 | + |
535 | + * SECURITY UPDATE: privilege escalation via crafted lookup value |
536 | + - debian/patches/CVE-2014-2972.patch: only expand integers for integer |
537 | + math once. |
538 | + - CVE-2014-2972 |
539 | + * SECURITY UPDATE: privilege escalation when used with perl_startup |
540 | + - debian/patches/CVE-2016-1531.patch: add new add_environment and |
541 | + keep_environment configuration options. |
542 | + - debian/patches/CVE-2016-1531-2.patch: don't issue env warning if env |
543 | + is empty. |
544 | + - debian/patches/CVE-2016-1531-3.patch: store the initial working |
545 | + directory, expand $initial_cwd. |
546 | + - debian/patches/CVE-2016-1531-4.patch: delay chdir(/) until we opened |
547 | + the main config. |
548 | + - Add macros MAIN_KEEP_ENVIRONMENT and MAIN_ADD_ENVIRONMENT to set the |
549 | + new options. Set "keep_environment =" by default to avoid a runtime |
550 | + warning. |
551 | + - Bump exim4-config Breaks to exim4-daemon-* (<< 4.82-3ubuntu2.1). |
552 | + - debian/exim4-config.NEWS: Add entry to warn of potential breakage. |
553 | + - CVE-2016-1531 |
554 | + * WARNING: This update may break existing installations. |
555 | + |
556 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Mon, 14 Mar 2016 12:57:00 -0400 |
557 | + |
558 | +exim4 (4.82-3ubuntu2) trusty; urgency=medium |
559 | + |
560 | + * debian/tests/control: Add missing python test dependency, as |
561 | + debian/tests/security calls python. |
562 | + |
563 | + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 25 Feb 2014 17:33:13 +0100 |
564 | + |
565 | +exim4 (4.82-3ubuntu1) trusty; urgency=low |
566 | + |
567 | + * Merge from Debian unstable (LP: #1259620). Remaining changes: |
568 | + - Show Ubuntu distribution on smtp: |
569 | + + debian/patches/fix_smtp_banner.patch: updated SMTP banner |
570 | + with Ubuntu distribution |
571 | + + debian/control: added lsb-release build dependency |
572 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
573 | + default. |
574 | + - Build-depend on db5.3. |
575 | + |
576 | + -- Yolanda Robla <yolanda.robla@canonical.com> Tue, 10 Dec 2013 17:07:20 +0000 |
577 | + |
578 | exim4 (4.82-3) unstable; urgency=low |
579 | |
580 | * Upload to unstable. |
581 | @@ -1571,6 +1975,21 @@ exim4 (4.82~rc1-1) experimental; urgency=low |
582 | |
583 | -- Andreas Metzler <ametzler@debian.org> Sun, 29 Sep 2013 14:43:25 +0200 |
584 | |
585 | +exim4 (4.80-9ubuntu2) trusty; urgency=low |
586 | + |
587 | + * Build-depend on libdb5.3-dev, instead of libdb5.1-dev. |
588 | + |
589 | + -- Dmitrijs Ledkovs <xnox@ubuntu.com> Mon, 04 Nov 2013 12:14:54 +0000 |
590 | + |
591 | +exim4 (4.80-9ubuntu1) trusty; urgency=low |
592 | + |
593 | + * Resynchronise with Debian. Remaining changes: |
594 | + - Don't provide default-mta; in Ubuntu, we want postfix to be the |
595 | + default. |
596 | + - Add "Ubuntu" to SMTP banner. |
597 | + |
598 | + -- Colin Watson <cjwatson@ubuntu.com> Mon, 28 Oct 2013 11:55:21 -0700 |
599 | + |
600 | exim4 (4.80-9) unstable; urgency=low |
601 | |
602 | * Upload to unstable. |
603 | @@ -1617,6 +2036,34 @@ exim4 (4.80-8) experimental; urgency=low |
604 | |
605 | -- Andreas Metzler <ametzler@debian.org> Sun, 01 Sep 2013 15:58:49 +0200 |
606 | |
607 | +exim4 (4.80-7ubuntu4) trusty; urgency=low |
608 | + |
609 | + * Rebuild for Perl 5.18. |
610 | + |
611 | + -- Colin Watson <cjwatson@ubuntu.com> Wed, 23 Oct 2013 10:24:08 +0100 |
612 | + |
613 | +exim4 (4.80-7ubuntu3) saucy; urgency=low |
614 | + |
615 | + * debian/patches/fix_smtp_banner.patch: updated SMTP banner |
616 | + with Ubuntu distribution |
617 | + * debian/control: added lsb-release build dependency |
618 | + |
619 | + -- Yolanda Robla <yolanda.robla@canonical.com> Tue, 18 Jun 2013 19:17:43 +0200 |
620 | + |
621 | +exim4 (4.80-7ubuntu2) saucy; urgency=low |
622 | + |
623 | + * debian/tests: Add autopkgtest. |
624 | + |
625 | + -- Yolanda <yolanda.robla@canonical.com> Mon, 27 May 2013 11:31:35 +0200 |
626 | + |
627 | +exim4 (4.80-7ubuntu1) raring; urgency=low |
628 | + |
629 | + * Merge from Debian unstable (LP: #1166383). Remaining changes: |
630 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
631 | + we want postfix to be the default. |
632 | + |
633 | + -- Robie Basak <robie.basak@canonical.com> Mon, 08 Apr 2013 18:13:15 +0100 |
634 | + |
635 | exim4 (4.80-7) unstable; urgency=low |
636 | |
637 | * Use exim's ${quote:xxx} operator when invoking spfquery to disallow |
638 | @@ -1636,6 +2083,14 @@ exim4 (4.80-6) unstable; urgency=low |
639 | |
640 | -- Andreas Metzler <ametzler@debian.org> Wed, 21 Nov 2012 19:08:53 +0100 |
641 | |
642 | +exim4 (4.80-5.1ubuntu1) raring; urgency=low |
643 | + |
644 | + * Merge from Debian. Remaining changes: |
645 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
646 | + we want postfix to be the default. |
647 | + |
648 | + -- Oussama Bounaim <o.bounaim@gmail.com> Sun, 11 Nov 2012 07:11:06 +0100 |
649 | + |
650 | exim4 (4.80-5.1) unstable; urgency=high |
651 | |
652 | * Non-maintainer upload by the Security Team. |
653 | @@ -1663,6 +2118,23 @@ exim4 (4.80-4) unstable; urgency=low |
654 | |
655 | -- Andreas Metzler <ametzler@debian.org> Sat, 23 Jun 2012 18:35:03 +0200 |
656 | |
657 | +exim4 (4.80-3ubuntu1.1) quantal-security; urgency=low |
658 | + |
659 | + * SECURITY UPDATE: arbitrary code execution via dns decode logic |
660 | + - debian/patches/CVE-2012-5671.patch: adjust max length and validate |
661 | + against it in src/pdkim/pdkim.h, src/dkim.c. |
662 | + - CVE-2012-5671 |
663 | + |
664 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 25 Oct 2012 08:22:46 -0400 |
665 | + |
666 | +exim4 (4.80-3ubuntu1) quantal; urgency=low |
667 | + |
668 | + * Merge from Debian unstable. Remaining changes: |
669 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
670 | + we want postfix to be the default. |
671 | + |
672 | + -- Clint Byrum <clint@ubuntu.com> Thu, 14 Jun 2012 15:28:08 -0700 |
673 | + |
674 | exim4 (4.80-3) unstable; urgency=low |
675 | |
676 | * Pull 75_openssl_sni.diff from upstream. - Segfault caused by NULL |
677 | @@ -1810,6 +2282,26 @@ exim4 (4.76-4) experimental; urgency=low |
678 | |
679 | -- Andreas Metzler <ametzler@debian.org> Sat, 24 Sep 2011 18:36:08 +0200 |
680 | |
681 | +exim4 (4.76-3ubuntu3) precise; urgency=low |
682 | + |
683 | + * Rebuild for libmysqlclient transition |
684 | + |
685 | + -- Clint Byrum <clint@ubuntu.com> Wed, 23 Nov 2011 23:29:35 -0800 |
686 | + |
687 | +exim4 (4.76-3ubuntu2) precise; urgency=low |
688 | + |
689 | + * Rebuild for Perl 5.14. |
690 | + |
691 | + -- Colin Watson <cjwatson@ubuntu.com> Wed, 16 Nov 2011 01:22:39 +0000 |
692 | + |
693 | +exim4 (4.76-3ubuntu1) precise; urgency=low |
694 | + |
695 | + * Merge from debian unstable. Remaining changes: |
696 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
697 | + we want postfix to be the default. |
698 | + |
699 | + -- Stéphane Graber <stgraber@ubuntu.com> Thu, 20 Oct 2011 11:29:07 -0400 |
700 | + |
701 | exim4 (4.76-3) unstable; urgency=low |
702 | |
703 | * [exim4-base.cron.daily] Correct invocation of mail(1), options need to be |
704 | @@ -1830,6 +2322,14 @@ exim4 (4.76-3) unstable; urgency=low |
705 | |
706 | -- Andreas Metzler <ametzler@debian.org> Sun, 18 Sep 2011 11:49:13 +0200 |
707 | |
708 | +exim4 (4.76-2ubuntu1) oneiric; urgency=low |
709 | + |
710 | + * Merge from debian unstable. Remaining changes: |
711 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
712 | + we want postfix to be the default. |
713 | + |
714 | + -- Stéphane Graber <stgraber@ubuntu.com> Mon, 30 May 2011 17:48:56 -0400 |
715 | + |
716 | exim4 (4.76-2) unstable; urgency=low |
717 | |
718 | * debian/rules: Remove test/ and test-stamp on clean. |
719 | @@ -1842,6 +2342,14 @@ exim4 (4.76-2) unstable; urgency=low |
720 | |
721 | -- Andreas Metzler <ametzler@debian.org> Sun, 29 May 2011 18:21:03 +0200 |
722 | |
723 | +exim4 (4.76-1ubuntu1) oneiric; urgency=low |
724 | + |
725 | + * Merge from debian unstable. Remaining changes (LP: #779391): |
726 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
727 | + we want postfix to be the default. |
728 | + |
729 | + -- Stéphane Graber <stgraber@ubuntu.com> Mon, 23 May 2011 12:37:30 -0400 |
730 | + |
731 | exim4 (4.76-1) unstable; urgency=low |
732 | |
733 | * New upstream version. |
734 | @@ -1888,6 +2396,14 @@ exim4 (4.75-3) unstable; urgency=high |
735 | |
736 | -- Andreas Metzler <ametzler@debian.org> Fri, 06 May 2011 20:08:51 +0200 |
737 | |
738 | +exim4 (4.75-2ubuntu1) oneiric; urgency=low |
739 | + |
740 | + * Merge from debian unstable. Remaining changes: |
741 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
742 | + we want postfix to be the default. |
743 | + |
744 | + -- Stéphane Graber <stgraber@ubuntu.com> Fri, 06 May 2011 14:51:28 -0400 |
745 | + |
746 | exim4 (4.75-2) unstable; urgency=low |
747 | |
748 | * clamav socket on Debian is clamd:/var/run/clamav/clamd.ctl, fix |
749 | @@ -1930,6 +2446,24 @@ exim4 (4.74-2) unstable; urgency=low |
750 | |
751 | -- Andreas Metzler <ametzler@debian.org> Thu, 24 Feb 2011 19:02:07 +0100 |
752 | |
753 | +exim4 (4.74-1ubuntu1) natty; urgency=low |
754 | + |
755 | + * Merge from debian experimental. Remaining changes: (LP: #713855) |
756 | + - debian/patches/71_exiq_grep_error_on_messages_without_size.patch: |
757 | + + Improve handling of broken messages when "exim4 -bp" (mailq) |
758 | + reports lines without size info. (Closes: #528625) |
759 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
760 | + we want postfix to be the default. |
761 | + - debian/{control,rules}: Add and enable hardened build for PIE. |
762 | + (Closes: #542726) |
763 | + * Update 71_exiq_grep_error_on_messages_without_size.patch to get way |
764 | + which upstream has fixed it. Probably it can be dropped with next |
765 | + upstream release. |
766 | + * This upload fixes CVE: (LP: #708023) |
767 | + - CVE-2011-0017 |
768 | + |
769 | + -- Artur Rona <ari-tczew@ubuntu.com> Wed, 09 Feb 2011 21:31:35 +0100 |
770 | + |
771 | exim4 (4.74-1) experimental; urgency=low |
772 | |
773 | * 4.74 release, should build on hurd again. |
774 | @@ -1955,6 +2489,20 @@ exim4 (4.74~rc2-1) experimental; urgency=low |
775 | |
776 | -- Andreas Metzler <ametzler@debian.org> Sun, 23 Jan 2011 14:02:36 +0100 |
777 | |
778 | +exim4 (4.73~rc1-1ubuntu1) natty; urgency=low |
779 | + |
780 | + * Merge from debian unstable. Remaining changes: (LP: #697934) |
781 | + - debian/patches/71_exiq_grep_error_on_messages_without_size.patch: |
782 | + + Improve handling of broken messages when "exim4 -bp" (mailq) |
783 | + reports lines without size info. |
784 | + - debian/control: Don't declare a Provides: default-mta; in Ubuntu, |
785 | + we want postfix to be the default. |
786 | + - debian/{control,rules}: Add and enable hardened build for PIE. |
787 | + (Closes: #542726) |
788 | + * Drop B-D on libmysqlclient15-dev, resolved in Debian. |
789 | + |
790 | + -- Artur Rona <ari-tczew@ubuntu.com> Tue, 28 Dec 2010 22:20:17 +0100 |
791 | + |
792 | exim4 (4.73~rc1-1) experimental; urgency=low |
793 | |
794 | * New upstream release candidate. |
795 | @@ -2050,6 +2598,20 @@ exim4 (4.72-3) unstable; urgency=low |
796 | |
797 | -- Andreas Metzler <ametzler@debian.org> Sun, 26 Dec 2010 15:13:08 +0100 |
798 | |
799 | +exim4 (4.72-2ubuntu1) natty; urgency=low |
800 | + |
801 | + * Merge from debian unstable. Remaining changes: (LP: #671615) |
802 | + - debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: |
803 | + Improve handling of broken messages when "exim4 -bp" (mailq) reports |
804 | + lines without size info. |
805 | + - Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be |
806 | + the default. |
807 | + - debian/control: Change build dependencies to MySQL 5.1. |
808 | + - debian/{control,rules}: add and enable hardened build for PIE |
809 | + (Closes: #542726). |
810 | + |
811 | + -- Artur Rona <ari-tczew@ubuntu.com> Fri, 05 Nov 2010 21:05:47 +0100 |
812 | + |
813 | exim4 (4.72-2) unstable; urgency=low |
814 | |
815 | [ Marc Haber ] |
816 | @@ -2073,6 +2635,20 @@ exim4 (4.72-2) unstable; urgency=low |
817 | |
818 | -- Andreas Metzler <ametzler@debian.org> Sat, 30 Oct 2010 13:38:26 +0200 |
819 | |
820 | +exim4 (4.72-1ubuntu1) maverick; urgency=low |
821 | + |
822 | + * Merge with Debian unstable (LP: #609620). Remaining changes: |
823 | + + debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: |
824 | + Improve handling of broken messages when "exim4 -bp" (mailq) reports |
825 | + lines without size info. |
826 | + + Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be |
827 | + the default. |
828 | + + debian/control: Change build dependencies to MySQL 5.1. |
829 | + + debian/{control,rules}: add and enable hardened build for PIE |
830 | + (Closes: #542726). |
831 | + |
832 | + -- Artur Rona <ari-tczew@tlen.pl> Sun, 25 Jul 2010 02:00:42 +0200 |
833 | + |
834 | exim4 (4.72-1) unstable; urgency=low |
835 | |
836 | * New upstream release. (Identical to the git snapshot previously |
837 | @@ -2124,6 +2700,20 @@ exim4 (4.71-4) unstable; urgency=low |
838 | |
839 | -- Andreas Metzler <ametzler@debian.org> Thu, 25 Mar 2010 17:34:30 +0100 |
840 | |
841 | +exim4 (4.71-3ubuntu1) lucid; urgency=low |
842 | + |
843 | + * Merge with Debian unstable (lp: #501657). Remaining changes: |
844 | + + debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: |
845 | + Improve handling of broken messages when "exim4 -bp" (mailq) reports |
846 | + lines without size info. |
847 | + + Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be |
848 | + the default. |
849 | + + debian/control: Change build dependencies to MySQL 5.1. |
850 | + + debian/{control,rules}: add and enable hardened build for PIE |
851 | + (Debian bug 542726). |
852 | + |
853 | + -- Michael Bienia <geser@ubuntu.com> Fri, 01 Jan 2010 16:28:19 +0100 |
854 | + |
855 | exim4 (4.71-3) unstable; urgency=low |
856 | |
857 | * exim4-base.cron.daily: Do not run exim_tidydb on Berkeley DB logfiles. |
858 | @@ -2238,6 +2828,35 @@ exim4 (4.70~cvs+20091017-1) experimental; urgency=low |
859 | |
860 | -- Andreas Metzler <ametzler@debian.org> Sat, 17 Oct 2009 14:26:54 +0200 |
861 | |
862 | +exim4 (4.69-11ubuntu4) karmic; urgency=low |
863 | + |
864 | + * debian/{control,rules}: add and enable hardened build for PIE |
865 | + (Debian bug 542726). |
866 | + |
867 | + -- Kees Cook <kees@ubuntu.com> Thu, 20 Aug 2009 17:33:26 -0700 |
868 | + |
869 | +exim4 (4.69-11ubuntu3) karmic; urgency=low |
870 | + |
871 | + * debian/control: Change build dependencies to MySQL 5.1. |
872 | + |
873 | + -- Mathias Gug <mathiaz@ubuntu.com> Mon, 17 Aug 2009 17:57:26 -0400 |
874 | + |
875 | +exim4 (4.69-11ubuntu2) karmic; urgency=low |
876 | + |
877 | + * Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be |
878 | + the default. |
879 | + |
880 | + -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 03 Jun 2009 15:39:14 +0000 |
881 | + |
882 | +exim4 (4.69-11ubuntu1) karmic; urgency=low |
883 | + |
884 | + * Merge from debian unstable (LP: #375923), remaining changes: |
885 | + - debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: |
886 | + Improve handling of broken messages when "exim4 -bp" (mailq) reports |
887 | + lines without size info |
888 | + |
889 | + -- Thierry Carrez <thierry.carrez@ubuntu.com> Wed, 13 May 2009 12:15:29 +0200 |
890 | + |
891 | exim4 (4.69-11) unstable; urgency=medium |
892 | |
893 | * Build-Depend on lynx-cur|lynx instead of lynx. (lynx is just a dummy |
894 | @@ -2295,6 +2914,15 @@ exim4 (4.69-10) unstable; urgency=low |
895 | |
896 | -- Andreas Metzler <ametzler@debian.org> Sat, 02 May 2009 09:05:56 +0200 |
897 | |
898 | +exim4 (4.69-9ubuntu1) jaunty; urgency=low |
899 | + |
900 | + [ Daniel van Eeden <launchpad@myname.nl> ] |
901 | + * debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch: |
902 | + Improve handling of broken messages when "exim4 -bp" (mailq) reports lines |
903 | + w/o size info, LP: #18194 |
904 | + |
905 | + -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 11 Feb 2009 06:43:52 -0600 |
906 | + |
907 | exim4 (4.69-9) unstable; urgency=medium |
908 | |
909 | * [update-exim4.conf]: Use POSIX character classes [:alnum:] or explicit |
910 | diff --git a/debian/control b/debian/control |
911 | index cd773bb..bd816d4 100644 |
912 | --- a/debian/control |
913 | +++ b/debian/control |
914 | @@ -1,7 +1,8 @@ |
915 | Source: exim4 |
916 | Section: mail |
917 | Priority: standard |
918 | -Maintainer: Exim4 Maintainers <pkg-exim4-maintainers@lists.alioth.debian.org> |
919 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
920 | +XSBC-Original-Maintainer: Exim4 Maintainers <pkg-exim4-maintainers@lists.alioth.debian.org> |
921 | Uploaders: |
922 | Andreas Metzler <ametzler@debian.org>, |
923 | Marc Haber <mh+debian-packages@zugschlus.de> |
924 | @@ -31,7 +32,8 @@ Build-Depends: |
925 | libxt-dev, |
926 | lynx, |
927 | po-debconf, |
928 | - xsltproc |
929 | + xsltproc, |
930 | + lsb-release |
931 | |
932 | Package: exim4-base |
933 | Architecture: any |
934 | diff --git a/debian/patches/fix_smtp_banner.patch b/debian/patches/fix_smtp_banner.patch |
935 | new file mode 100644 |
936 | index 0000000..615eb5a |
937 | --- /dev/null |
938 | +++ b/debian/patches/fix_smtp_banner.patch |
939 | @@ -0,0 +1,53 @@ |
940 | +Description: Add EXIM_DISTRIBUTION var to display it on the SMTP banner |
941 | +Origin: https://blueprints.launchpad.net/ubuntu/+spec/servercloud-s-server-app-banner-updates |
942 | +Author: Yolanda Robla <yolanda.robla@canonical.com> |
943 | +Forwarded: https://salsa.debian.org/exim-team/exim4/merge_requests/2 |
944 | +Last-Update: 2018-07-03 |
945 | + |
946 | +--- a/src/globals.c |
947 | ++++ b/src/globals.c |
948 | +@@ -1443,7 +1443,7 @@ int smtp_accept_queue_per_connection = 10; |
949 | + int smtp_accept_reserve = 0; |
950 | + uschar *smtp_active_hostname = NULL; |
951 | + uschar *smtp_banner = US"$smtp_active_hostname ESMTP " |
952 | +- "Exim $version_number $tod_full" |
953 | ++ "Exim $version_number " EXIM_DISTRIBUTION " $tod_full" |
954 | + "\0<---------------Space to patch smtp_banner->"; |
955 | + int smtp_ch_index = 0; |
956 | + uschar *smtp_cmd_argument = NULL; |
957 | +--- a/src/config.h.defaults |
958 | ++++ b/src/config.h.defaults |
959 | +@@ -224,4 +224,6 @@ for EXIM_ARITH_MAX and _MIN in OS/oh.h-FOO */ |
960 | + #define SC_EXIM_ARITH "%" SCNi64 /* scanf incl. 0x prefix */ |
961 | + #define SC_EXIM_DEC "%" SCNd64 /* scanf decimal */ |
962 | + |
963 | ++#define EXIM_DISTRIBUTION |
964 | ++ |
965 | + /* End of config.h.defaults */ |
966 | +--- a/scripts/Configure-config.h |
967 | ++++ b/scripts/Configure-config.h |
968 | +@@ -23,6 +23,12 @@ |
969 | + if [ "$1" != "" ] ; then MAKE=$1 ; fi |
970 | + if [ "$MAKE" = "" ] ; then MAKE=make ; fi |
971 | + |
972 | ++# exporting distribution to use it in smtp banner |
973 | ++if test -x /usr/bin/lsb_release && lsb_release -si; then |
974 | ++ export EXIM_DISTRIBUTION=\"$(lsb_release -si)\" |
975 | ++else |
976 | ++ export EXIM_DISTRIBUTION=\"\" |
977 | ++fi |
978 | + $MAKE buildconfig || exit 1 |
979 | + |
980 | + # BEWARE: tab characters needed in the following sed command. They have had |
981 | +--- a/src/exim.h |
982 | ++++ b/src/exim.h |
983 | +@@ -597,5 +597,9 @@ default to EDQUOT if it exists, otherwise ENOSPC. */ |
984 | + # define EXIM_GROUPLIST_SIZE NGROUPS_MAX |
985 | + #endif |
986 | + |
987 | ++#ifndef EXIM_DISTRIBUTION |
988 | ++ #define EXIM_DISTRIBUTION "" |
989 | ++#endif |
990 | ++ |
991 | + #endif |
992 | + /* End of exim.h */ |
993 | diff --git a/debian/patches/series b/debian/patches/series |
994 | index 258f86b..df84ef8 100644 |
995 | --- a/debian/patches/series |
996 | +++ b/debian/patches/series |
997 | @@ -11,3 +11,4 @@ |
998 | 75_03-Fix-info-on-using-local_scan-in-the-default-Makefile.patch |
999 | 75_04-GnuTLS-Fix-client-detection-of-server-reject-of-clie.patch |
1000 | 90_localscan_dlopen.dpatch |
1001 | +fix_smtp_banner.patch |
The usual trivial exim4 merge LGTM and is fix only, sponsoring to Disco