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