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

Bug#606758: future unblock: dma/0.0.2010.06.17-7



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

Hi,

Thanks for your efforts on cutting great Debian releases!

I've made some changes (debdiff attached) to the dma package which
I haven't uploaded to unstable yet; do you think they are suitable
for a unstable -> testing migration during the freeze, or should I
upload to experimental instead, or just wait?

The first change is a fix for #606398 - now dma provides the
/usr/lib/sendmail symlink so some MUA's can actually, well, send
mail.  IMHO this is a usability improvement, although only for a
small portion of the MUA's.

The second change is a fix for a segfault if dma cannot resolve any
of the MX's it tries to deliver to.  This does not have any really
bad consequences - the message is still in the queue and dma will
retry the delivery in a while - but it is kind of annoying to have
segfaults show up in your syslog just because a VPN is down :)

So - what's your call?  Should I upload to unstable with a freeze
exception in mind, or should these fixes wait for the Squeeze
release?

Thanks in advance for your time!

unblock dma/0.0.2010.06.17-7

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

Kernel: Linux 2.6.32-5-686 (SMP w/2 CPU cores)
Locale: LANG=bg_BG.UTF-8, LC_CTYPE=bg_BG.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diffstat for dma-0.0.2010.06.17 dma-0.0.2010.06.17

 changelog                        |    9 +++++++
 dma.links                        |    1 
 patches/38-unresolvable-mx.patch |   47 +++++++++++++++++++++++++++++++++++++++
 patches/series                   |    1 
 4 files changed, 58 insertions(+)

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	2010-10-17 00:08:38.000000000 +0300
+++ dma-0.0.2010.06.17/debian/changelog	2010-12-11 15:38:28.000000000 +0200
@@ -1,3 +1,12 @@
+dma (0.0.2010.06.17-7) unstable; urgency=low
+
+  * Provide the /usr/lib/sendmail symlink.  Closes: #606398
+  * Add the 38-unresolvable-mx patch to fix a segfault when
+    dma is unable to, well, resolve either the provided smarthost or
+    any of the mail exchangers for the recipient domain.
+
+ -- Peter Pentchev <roam@ringlet.net>  Sat, 11 Dec 2010 15:38:10 +0200
+
 dma (0.0.2010.06.17-6) unstable; urgency=low
 
   * Add the 37-gnu-hurd patch to really fix the FTBFS on GNU/Hurd.
diff -Nru dma-0.0.2010.06.17/debian/dma.links dma-0.0.2010.06.17/debian/dma.links
--- dma-0.0.2010.06.17/debian/dma.links	2009-12-09 20:27:05.000000000 +0200
+++ dma-0.0.2010.06.17/debian/dma.links	2010-12-11 15:19:23.000000000 +0200
@@ -1,5 +1,6 @@
 usr/sbin/dma usr/bin/mailq
 usr/sbin/dma usr/bin/newaliases
+usr/sbin/dma usr/lib/sendmail
 usr/sbin/dma usr/sbin/sendmail
 usr/share/man/man8/dma.8 usr/share/man/man8/mailq.8
 usr/share/man/man8/dma.8 usr/share/man/man8/newaliases.8
diff -Nru dma-0.0.2010.06.17/debian/patches/38-unresolvable-mx.patch dma-0.0.2010.06.17/debian/patches/38-unresolvable-mx.patch
--- dma-0.0.2010.06.17/debian/patches/38-unresolvable-mx.patch	1970-01-01 02:00:00.000000000 +0200
+++ dma-0.0.2010.06.17/debian/patches/38-unresolvable-mx.patch	2010-12-11 15:37:16.000000000 +0200
@@ -0,0 +1,47 @@
+Description: Fix a segfault upon unresolvable MX's.
+ This fixes both the case when the configured smarthost is unresolvable
+ and the case when a smarthost is not used but *all* of the MX's for
+ the recipient domain are unresolvable.
+Forwarded: http://gitorious.org/dma/dma/merge_requests/2
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2010-12-11
+
+--- a/dns.c
++++ b/dns.c
+@@ -129,6 +129,7 @@
+ 	int cname_recurse;
+ 	int err;
+ 	int i;
++	int could_not_add = 0;
+ 
+ 	res_init();
+ 	searchhost = host;
+@@ -190,7 +191,8 @@
+ 			if (err < 0)
+ 				goto transerr;
+ 
+-			add_host(pref, outname, port, &hosts, &nhosts);
++			if (add_host(pref, outname, port, &hosts, &nhosts) != 0)
++				could_not_add++;
+ 			break;
+ 
+ 		case ns_t_cname:
+@@ -229,8 +231,16 @@
+ 		/*
+ 		 * If we didn't find any MX, use the hostname instead.
+ 		 */
+-		if (nhosts == 0)
+-			add_host(0, searchhost, port, &hosts, &nhosts);
++		if (nhosts == 0) {
++			/*
++			 * Kept as separate checks for clarity.
++			 * -- Peter Pentchev
++			 */
++			if (could_not_add > 0)
++				err = -1;
++			else if (add_host(0, searchhost, port, &hosts, &nhosts) != 0)
++				err = -1;
++		}
+ 
+ 		qsort(hosts, nhosts, sizeof(*hosts), sort_pref);
+ 	}
diff -Nru dma-0.0.2010.06.17/debian/patches/series dma-0.0.2010.06.17/debian/patches/series
--- dma-0.0.2010.06.17/debian/patches/series	2010-10-16 18:54:13.000000000 +0300
+++ dma-0.0.2010.06.17/debian/patches/series	2010-12-11 15:19:23.000000000 +0200
@@ -20,3 +20,4 @@
 35-delivery-retry.patch
 36-sa_nocldwait.patch
 37-gnu-hurd.patch
+38-unresolvable-mx.patch

Attachment: signature.asc
Description: Digital signature


Reply to: