Run of fresh-snapshots for dma

Try this locally (using silver-platter):

debian-svp new-upstream --snapshot dma 

Merge these changes:

git pull https://janitor.debian.net/git/dma fresh-snapshots/main

Summary

Merged new upstream version: 0.12+git20190918.a2fb617 (was: 0.12).

Diff

=== modified file 'debian/changelog'
--- a/debian/changelog	2019-08-22 19:19:51 +0000
+++ b/debian/changelog	2019-10-14 07:23:02 +0000
@@ -1,3 +1,9 @@
+dma (0.12+git20190918.a2fb617-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 14 Oct 2019 07:22:53 +0000
+
 dma (0.12-1) unstable; urgency=medium
 
   * New upstream release

=== modified file 'debian/patches/03-debian-locations.patch'
--- a/debian/patches/03-debian-locations.patch	2016-01-03 19:06:36 +0000
+++ b/debian/patches/03-debian-locations.patch	2019-10-14 07:23:20 +0000
@@ -6,9 +6,11 @@
 Author: Peter Pentchev <roam@ringlet.net>
 Last-Update: 2010-07-27
 
---- a/dma.8
-+++ b/dma.8
-@@ -165,7 +165,7 @@ can be configured in
+Index: dma/dma.8
+===================================================================
+--- dma.orig/dma.8
++++ dma/dma.8
+@@ -168,7 +168,7 @@ can be configured in
  .Pa dma.conf .
  .Bl -tag -width 4n
  .It Ic SMARTHOST Xo
@@ -17,8 +19,10 @@
  .Xc
  If you want to send outgoing mails via a smarthost, set this variable to
  your smarthosts address.
---- a/dma.conf
-+++ b/dma.conf
+Index: dma/dma.conf
+===================================================================
+--- dma.orig/dma.conf
++++ dma/dma.conf
 @@ -4,7 +4,7 @@
  # smarthost support.
  # NOTE: on Debian systems this is handled via debconf!

=== modified file 'dma.8'
--- a/dma.8	2015-11-27 09:39:02 +0000
+++ b/dma.8	2019-10-14 07:23:02 +0000
@@ -89,8 +89,11 @@
 .It Fl f Ar sender
 Set sender address (envelope-from) to
 .Ar sender .
-This overrides the value of the environment variable
-.Ev EMAIL .
+This overrides the value of the
+.Ev EMAIL
+environment variable, but is overridden by the
+.Sq MASQUERADE
+config file setting.
 .It Fl i
 Ignore dots alone on lines by themselves in incoming messages.
 This should be set if you are reading data from a file.
@@ -283,7 +286,7 @@
 Masquerade the envelope-from addresses with this address/hostname.
 Use this setting if mails are not accepted by destination mail servers
 because your sender domain is invalid.
-This setting is overridden by the
+This setting overrides the
 .Fl f
 flag and the
 .Ev EMAIL
@@ -328,6 +331,8 @@
 Use a plain address, in the form of
 .Li user@example.com .
 This value will be overridden when the
+.Sq MASQUERADE
+config file setting or the
 .Fl f
 flag is used.
 .El

=== modified file 'dma.c'
--- a/dma.c	2019-08-22 09:16:10 +0000
+++ b/dma.c	2019-10-14 07:23:02 +0000
@@ -100,15 +100,14 @@
 	const char *addr;
 	char *sender;
 
-	if (osender) {
+	if (config.masquerade_user) {
+		addr = config.masquerade_user;
+	} else if (osender) {
 		addr = osender;
 	} else if (getenv("EMAIL") != NULL) {
 		addr = getenv("EMAIL");
 	} else {
-		if (config.masquerade_user)
-			addr = config.masquerade_user;
-		else
-			addr = username;
+		addr = username;
 	}
 
 	if (!strchr(addr, '@')) {

=== modified file 'mail.c'
--- a/mail.c	2019-08-22 09:16:10 +0000
+++ b/mail.c	2019-10-14 07:23:02 +0000
@@ -354,6 +354,7 @@
 	int had_from = 0;
 	int had_messagid = 0;
 	int had_date = 0;
+	int had_first_line = 0;
 	int had_last_line = 0;
 	int nocopy = 0;
 
@@ -391,6 +392,15 @@
 			line[linelen + 1] = 0;
 			had_last_line = 1;
 		}
+		if (!had_first_line) {
+			/*
+			 * Ignore a leading RFC-976 From_ or >From_ line mistakenly
+			 * inserted by some programs.
+			 */
+			if (strprefixcmp(line, "From ") == 0 || strprefixcmp(line, ">From ") == 0)
+				continue;
+			had_first_line = 1;
+		}
 		if (!had_headers) {
 			/*
 			 * Unless this is a continuation, switch of

Full build log Full worker log