Bug#773465: unblock: exim4/4.84-5

[Andreas Metzler]

Control: retitle -1 unblock: exim4/4.84-6

On 2014-12-20 Julien Cristau  wrote:
> On Fri, Dec 19, 2014 at 18:43:46 +0100, Andreas Metzler wrote:
[...]
>> I can either back out this change for jessie and re-upload or can
>> upload a better fix. - I guess I will add a something like --dry-run to
>> /usr/sbin/update-exim4.conf.

>> Which of these options would you prefer?

> I'm not sure, so I'm happy to trust your judgement on that, just wanted
> to raise the potential issue.

Thank you. I have just uploaded -6 with this change reverted.

cu Andreas
-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'


signature.asc
Description: Digital signature

Bug#773465: unblock: exim4/4.84-5

[Julien Cristau]

On Fri, Dec 19, 2014 at 18:43:46 +0100, Andreas Metzler wrote:

> On 2014-12-19 Julien Cristau  wrote:
> > On Thu, Dec 18, 2014 at 18:59:35 +0100, Andreas Metzler wrote:
> 
> > > +  * Change the init script's restart order from { regenerate_config; 
> > > stop;
> > > +start ; } to { stop; regenerate_config; start ; }. (Thanks, Jakub 
> > > Warmuz)
> > > +Closes: #768874
> 
> > Does this mean that, if there's an error in the config, exim could be
> > left stopped by the init script restart action, where previously the
> > user would be notified of the error before stopping the daemon?
> 
> Good point.
> 
> I can either back out this change for jessie and re-upload or can
> upload a better fix. - I guess I will add a something like --dry-run to
> /usr/sbin/update-exim4.conf.
> 
> Which of these options would you prefer?
> 
I'm not sure, so I'm happy to trust your judgement on that, just wanted
to raise the potential issue.

Cheers,
Julien


signature.asc
Description: Digital signature

Bug#773465: unblock: exim4/4.84-5

[Andreas Metzler]

On 2014-12-19 Julien Cristau  wrote:
> On Thu, Dec 18, 2014 at 18:59:35 +0100, Andreas Metzler wrote:

> > +  * Change the init script's restart order from { regenerate_config; stop;
> > +start ; } to { stop; regenerate_config; start ; }. (Thanks, Jakub 
> > Warmuz)
> > +Closes: #768874

> Does this mean that, if there's an error in the config, exim could be
> left stopped by the init script restart action, where previously the
> user would be notified of the error before stopping the daemon?

Good point.

I can either back out this change for jessie and re-upload or can
upload a better fix. - I guess I will add a something like --dry-run to
/usr/sbin/update-exim4.conf.

Which of these options would you prefer?

cu Andreas

-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#773465: unblock: exim4/4.84-5

[Julien Cristau]

On Thu, Dec 18, 2014 at 18:59:35 +0100, Andreas Metzler wrote:

> +  * Change the init script's restart order from { regenerate_config; stop;
> +start ; } to { stop; regenerate_config; start ; }. (Thanks, Jakub Warmuz)
> +Closes: #768874

Does this mean that, if there's an error in the config, exim could be
left stopped by the init script restart action, where previously the
user would be notified of the error before stopping the daemon?

Cheers,
Julien


signature.asc
Description: Digital signature

Bug#773465: unblock: exim4/4.84-5

[Andreas Metzler]

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package exim4.

unblock exim4/4.84-5

This is a bugfix only upload, featuring two fixes of important
priority:
* 82_quoted-or-r-2047-encoded.diff pulled from upstream git (sans
  testsuite), extends the fix in 4.84-2.
This can fixes a crash in the MIME ACL.

* 81_buffer-overrun-in-spam-acl.diff from upstream git. Fix a buffer
  overrun with control characters in argument of spam= acl condition.
  

Thanks, cu Andreas
-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -Nru exim4-4.84/debian/changelog exim4-4.84/debian/changelog
--- exim4-4.84/debian/changelog	2014-10-19 13:36:07.0 +0200
+++ exim4-4.84/debian/changelog	2014-12-17 19:03:45.0 +0100
@@ -1,3 +1,24 @@
+exim4 (4.84-5) unstable; urgency=medium
+
+  * 82_quoted-or-r-2047-encoded.diff pulled from upstream git (sans
+testsuite), extends the fix in 4.84-2.
+
+ -- Andreas Metzler   Wed, 17 Dec 2014 19:03:39 +0100
+
+exim4 (4.84-4) unstable; urgency=medium
+
+  * Unset message_prefix/message_sufix in maildrop_pipe transport. Maildrop
+neither expects a mbox-style From nor an empty line add the end. (Thanks,
+Edward Betts) Closes: #769396
+  * Change the init script's restart order from { regenerate_config; stop;
+start ; } to { stop; regenerate_config; start ; }. (Thanks, Jakub Warmuz)
+Closes: #768874
+  * 81_buffer-overrun-in-spam-acl.diff from upstream git. Fix a buffer overrun
+with control characters in argument of spam= acl condition.
+
+
+ -- Andreas Metzler   Sun, 30 Nov 2014 08:24:04 +0100
+
 exim4 (4.84-3) unstable; urgency=medium
 
   * Apply patch to Italian (it) debconf template translation, thanks to
diff -Nru exim4-4.84/debian/debconf/conf.d/transport/30_exim4-config_maildrop_pipe exim4-4.84/debian/debconf/conf.d/transport/30_exim4-config_maildrop_pipe
--- exim4-4.84/debian/debconf/conf.d/transport/30_exim4-config_maildrop_pipe	2012-09-23 12:07:23.0 +0200
+++ exim4-4.84/debian/debconf/conf.d/transport/30_exim4-config_maildrop_pipe	2014-11-18 18:58:37.0 +0100
@@ -4,6 +4,8 @@
   driver = pipe
   path = "/bin:/usr/bin:/usr/local/bin"
   command = "/usr/bin/maildrop"
+  message_prefix =
+  message_suffix =
   return_path_add
   delivery_date_add
   envelope_to_add
diff -Nru exim4-4.84/debian/exim4-base.exim4.init exim4-4.84/debian/exim4-base.exim4.init
--- exim4-4.84/debian/exim4-base.exim4.init	2014-07-22 19:16:03.0 +0200
+++ exim4-4.84/debian/exim4-base.exim4.init	2014-11-18 18:58:37.0 +0100
@@ -239,10 +239,10 @@
 ;;
   restart)
 log_daemon_msg "Stopping MTA for restart"
+stop_exim
 # regenerate exim4.conf
 upex4conf
 isconfigvalid
-stop_exim
 log_end_msg 0
 sleep 2
 log_daemon_msg "Restarting MTA"
diff -Nru exim4-4.84/debian/patches/81_buffer-overrun-in-spam-acl.diff exim4-4.84/debian/patches/81_buffer-overrun-in-spam-acl.diff
--- exim4-4.84/debian/patches/81_buffer-overrun-in-spam-acl.diff	1970-01-01 01:00:00.0 +0100
+++ exim4-4.84/debian/patches/81_buffer-overrun-in-spam-acl.diff	2014-12-17 18:55:57.0 +0100
@@ -0,0 +1,26 @@
+From e252eb8c71ea3bddb32bf73bddc8b22cfde2bc3a Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Thu, 27 Nov 2014 16:26:44 +
+Subject: [PATCH] Fix buffer overrun in spam= acl condition.  Bug 1552
+
+---
+ src/spam.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/spam.c b/src/spam.c
+index 7eb6fbf..76bf7d6 100644
+--- a/src/spam.c
 b/src/spam.c
+@@ -129,7 +129,8 @@ spam(uschar **listptr)
+ (spamd_address_container *)store_get(sizeof(spamd_address_container));
+ 
+   /* grok spamd address and port */
+-  if( sscanf(CS address, "%s %u", this_spamd->tcp_addr, &(this_spamd->tcp_port)) != 2 ) {
++  if (sscanf(CS address, "%23s %u", this_spamd->tcp_addr, &(this_spamd->tcp_port)) != 2)
++{
+ log_write(0, LOG_MAIN,
+   "spam acl condition: warning - invalid spamd address: '%s'", address);
+ continue;
+-- 
+2.1.3
+
diff -Nru exim4-4.84/debian/patches/82_quoted-or-r-2047-encoded.diff exim4-4.84/debian/patches/82_quoted-or-r-2047-encoded.diff
--- exim4-4.84/debian/patches/82_quoted-or-r-2047-encoded.diff	1970-01-01 01:00:00.0 +0100
+++ exim4-4.84/debian/patches/82_quoted-or-r-2047-encoded.diff	2014-12-17 19:01:38.0 +0100
@@ -0,0 +1,194 @@
+From 5c6cf6a0d5cb7da39e7fde01dca1ff862c1fa1c8 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Sun, 14 Dec 2014 15:15:34 +
+Subject: [PATCH] Account properly for quoted or 2047-encoded MIME parameters
+ while walking headers. Bug 1558
+
+---
+ src/mime.c  | 103 ++--