[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#686412: marked as done (unblock: dma/0.0.2010.06.17-14)



Your message dated Sat, 01 Sep 2012 10:16:48 +0100
with message-id <1346491008.7606.50.camel@jacala.jungle.funky-badger.org>
and subject line Re: Bug#686412: unblock: dma/0.0.2010.06.17-14
has caused the Debian Bug report #686412,
regarding unblock: dma/0.0.2010.06.17-14
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
686412: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686412
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package dma-0.0.2010.06.17-14.  It fixes a grave
bug (#686164) with a minimal change to a patch and a refreshing
of the line numbers of several other patches.

I attach a debdiff from -13 to -14.

unblock dma/0.0.2010.06.17-14

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'stable')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-3-686-pae (SMP w/4 CPU cores)
Locale: LANG=bg_BG.UTF-8, LC_CTYPE=bg_BG.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diffstat for dma-0.0.2010.06.17 dma-0.0.2010.06.17

 changelog                          |   10 ++++++++++
 patches/20-parse-recipient.patch   |   24 +++++++++++++++++++++++-
 patches/24-random-message-id.patch |    4 ++--
 patches/28-valid-recipient.patch   |    4 ++--
 patches/40-smtp-banner.patch       |   10 +++++-----
 patches/44-newline.patch           |    6 +++---
 patches/45-received.patch          |    4 ++--
 7 files changed, 47 insertions(+), 15 deletions(-)

diff -Nru dma-0.0.2010.06.17/debian/changelog dma-0.0.2010.06.17/debian/changelog
--- dma-0.0.2010.06.17/debian/changelog	2012-03-03 02:05:37.000000000 +0200
+++ dma-0.0.2010.06.17/debian/changelog	2012-09-01 02:05:18.000000000 +0300
@@ -1,3 +1,13 @@
+dma (0.0.2010.06.17-14) unstable; urgency=low
+
+  * Fix the parsing of multiple comma-separated and bracketed addresses
+    in the 20-parse-recipient patch.  Closes: #686164
+  * Consequently, refresh (line numbering only) the 24-random-message-id,
+    28-valid-recipient, 40-smtp-banner, 44-newline and 45-received
+    patches.
+
+ -- Peter Pentchev <roam@ringlet.net>  Sat, 01 Sep 2012 02:05:15 +0300
+
 dma (0.0.2010.06.17-13) unstable; urgency=low
 
   * Update the debconf translations:
diff -Nru dma-0.0.2010.06.17/debian/patches/20-parse-recipient.patch dma-0.0.2010.06.17/debian/patches/20-parse-recipient.patch
--- dma-0.0.2010.06.17/debian/patches/20-parse-recipient.patch	2010-11-17 10:53:09.000000000 +0200
+++ dma-0.0.2010.06.17/debian/patches/20-parse-recipient.patch	2012-08-31 03:24:56.000000000 +0300
@@ -2,7 +2,7 @@
 Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
 Forwarded: http://bugs.launchpad.net/dma/+bug/599536
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2010-06-28
+Last-Update: 2012-08-31
 
 --- a/mail.c
 +++ b/mail.c
@@ -14,3 +14,25 @@
  			goto skip;
  
  		case '>':
+@@ -382,7 +383,9 @@
+ 				goto err;
+ 			ps->brackets = 0;
+ 
+-			s++;
++			do {
++				s++;
++			} while (*s != '\0' && strchr(",; \t", *s) != NULL);
+ 			goto newaddr;
+ 
+ 		case ':':
+@@ -392,7 +395,9 @@
+ 
+ 		case ',':
+ 		case ';':
+-			s++;
++			do {
++				s++;
++			} while (*s != '\0' && strchr(",; \t", *s) != NULL);
+ 			goto newaddr;
+ 
+ 		default:
diff -Nru dma-0.0.2010.06.17/debian/patches/24-random-message-id.patch dma-0.0.2010.06.17/debian/patches/24-random-message-id.patch
--- dma-0.0.2010.06.17/debian/patches/24-random-message-id.patch	2010-11-17 10:53:09.000000000 +0200
+++ dma-0.0.2010.06.17/debian/patches/24-random-message-id.patch	2012-08-31 03:27:50.000000000 +0300
@@ -3,7 +3,7 @@
 Bug-Debian: http://bugs.debian.org/544475
 Forwarded: yes
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2010-06-21
+Last-Update: 2012-08-31
 
 --- a/dma.c
 +++ b/dma.c
@@ -33,7 +33,7 @@
  #include <signal.h>
  #include <syslog.h>
  #include <unistd.h>
-@@ -514,8 +515,15 @@
+@@ -518,8 +519,15 @@
  				} else if (!had_messagid) {
  					/* XXX better msgid, assign earlier and log? */
  					had_messagid = 1;
diff -Nru dma-0.0.2010.06.17/debian/patches/28-valid-recipient.patch dma-0.0.2010.06.17/debian/patches/28-valid-recipient.patch
--- dma-0.0.2010.06.17/debian/patches/28-valid-recipient.patch	2010-11-17 10:53:09.000000000 +0200
+++ dma-0.0.2010.06.17/debian/patches/28-valid-recipient.patch	2012-08-31 03:27:38.000000000 +0300
@@ -2,11 +2,11 @@
 Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
 Forwarded: yes
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2010-06-21
+Last-Update: 2012-08-31
 
 --- a/mail.c
 +++ b/mail.c
-@@ -428,8 +428,8 @@
+@@ -432,8 +432,8 @@
  	if (addr == NULL)
  		errlog(1, NULL);
  
diff -Nru dma-0.0.2010.06.17/debian/patches/40-smtp-banner.patch dma-0.0.2010.06.17/debian/patches/40-smtp-banner.patch
--- dma-0.0.2010.06.17/debian/patches/40-smtp-banner.patch	2011-02-23 12:42:47.000000000 +0200
+++ dma-0.0.2010.06.17/debian/patches/40-smtp-banner.patch	2012-08-31 03:27:25.000000000 +0300
@@ -1,11 +1,11 @@
 Description: Fix straight SSL/TLS connections to remote MX's.
 Forwarded: http://gitorious.org/dma/dma/merge_requests/3
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2011-01-25
+Last-Update: 2012-08-31
 
---- dma-0.0.2010.06.17.orig/net.c
-+++ dma-0.0.2010.06.17/net.c
-@@ -346,10 +346,13 @@ deliver_to_host(struct qitem *it, struct
+--- a/net.c
++++ b/net.c
+@@ -346,10 +346,13 @@
  	}
  
  	/* Check first reply from remote host */
@@ -22,7 +22,7 @@
  
  	if ((config.features & SECURETRANS) != 0) {
  		error = smtp_init_crypto(fd, config.features);
-@@ -357,6 +360,9 @@ deliver_to_host(struct qitem *it, struct
+@@ -357,6 +360,9 @@
  			syslog(LOG_DEBUG, "SSL initialization successful");
  		else
  			goto out;
diff -Nru dma-0.0.2010.06.17/debian/patches/44-newline.patch dma-0.0.2010.06.17/debian/patches/44-newline.patch
--- dma-0.0.2010.06.17/debian/patches/44-newline.patch	2011-12-24 02:25:14.000000000 +0200
+++ dma-0.0.2010.06.17/debian/patches/44-newline.patch	2012-08-31 03:27:08.000000000 +0300
@@ -2,11 +2,11 @@
 Origin: upstream
 Author: Simon Schubert <2@0x2c.org>
 Bug-Debian: http://bugs.debian.org/648369
-Last-Update: 2011-12-24
+Last-Update: 2012-08-31
 
 --- a/mail.c
 +++ b/mail.c
-@@ -444,6 +444,7 @@
+@@ -448,6 +448,7 @@
  	int had_from = 0;
  	int had_messagid = 0;
  	int had_date = 0;
@@ -14,7 +14,7 @@
  	int nocopy = 0;
  
  	parse_state.state = NONE;
-@@ -463,12 +464,20 @@
+@@ -467,12 +468,20 @@
  		return (-1);
  
  	while (!feof(stdin)) {
diff -Nru dma-0.0.2010.06.17/debian/patches/45-received.patch dma-0.0.2010.06.17/debian/patches/45-received.patch
--- dma-0.0.2010.06.17/debian/patches/45-received.patch	2011-12-25 17:13:06.000000000 +0200
+++ dma-0.0.2010.06.17/debian/patches/45-received.patch	2012-08-31 03:26:58.000000000 +0300
@@ -1,7 +1,7 @@
 Description: Add semicolon before date in received: header
 Author: Miquel van Smoorenburg <miquels@cistron.nl>
 Bug-Debian: http://bugs.debian.org/650268
-Last-Update: 2011-11-28
+Last-Update: 2012-08-31
 
 --- a/mail.c
 +++ b/mail.c
@@ -14,7 +14,7 @@
  		"\t%s\n"
  		"X-Original-To: <%s>\n"
  		"From: MAILER-DAEMON <>\n"
-@@ -453,7 +453,7 @@
+@@ -457,7 +457,7 @@
  		"Received: from %s (uid %d)\n"
  		"\t(envelope-from %s)\n"
  		"\tid %s\n"

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message ---
On Sat, 2012-09-01 at 09:54 +0300, Peter Pentchev wrote:
> Please unblock package dma-0.0.2010.06.17-14.  It fixes a grave
> bug (#686164) with a minimal change to a patch and a refreshing
> of the line numbers of several other patches.

I unblocked this earlier this morning before seeing your mail; thanks.

Regards,

Adam

--- End Message ---

Reply to: