Bug#924644: unblock: mailutils/1:3.5-3

[Jordi Mallach <jordi@debian.org>]

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

Hello release team,

Please unblock package mailutils

I uploaded -3 with a trivial patch to fix bug #918806 that can lead to data
loss when using mail/mailx to send email with attachments.

unblock mailutils/1:3.5-3

Thanks!

Full debdiff follows.


⏚ [jordi:~/git/debian] 2 % debdiff mailutils_3.5-2.dsc mailutils_3.5-3.dsc 
diff -Nru mailutils-3.5/debian/changelog mailutils-3.5/debian/changelog
--- mailutils-3.5/debian/changelog	2019-01-06 23:35:44.000000000 +0100
+++ mailutils-3.5/debian/changelog	2019-03-14 09:32:01.000000000 +0100
@@ -1,3 +1,11 @@
+mailutils (1:3.5-3) unstable; urgency=medium
+
+  * Set gbp's debian-branch to buster.
+  * Cherry-pick patch from upstream git to avoid discarding stdin when
+    mail is used to send email with attachments (closes: #918806).
+
+ -- Jordi Mallach <jordi@debian.org>  Thu, 14 Mar 2019 09:32:01 +0100
+
 mailutils (1:3.5-2) unstable; urgency=medium
 
   * Relax the dependency on a MTA to a recommendation.
diff -Nru mailutils-3.5/debian/gbp.conf mailutils-3.5/debian/gbp.conf
--- mailutils-3.5/debian/gbp.conf	2016-11-28 12:29:24.000000000 +0100
+++ mailutils-3.5/debian/gbp.conf	2019-03-14 09:25:43.000000000 +0100
@@ -1,2 +1,3 @@
 [DEFAULT]
 pristine-tar = true
+debian-branch = buster
diff -Nru mailutils-3.5/debian/patches/mime-attachments.patch mailutils-3.5/debian/patches/mime-attachments.patch
--- mailutils-3.5/debian/patches/mime-attachments.patch	1970-01-01 01:00:00.000000000 +0100
+++ mailutils-3.5/debian/patches/mime-attachments.patch	2019-03-14 09:31:46.000000000 +0100
@@ -0,0 +1,23 @@
+commit 43214185092e714e0c233bf196f571bba5c17be0
+Author: Sergey Poznyakoff <gray@gnu.org>
+Date:   Wed Mar 13 22:42:12 2019 +0200
+
+    mail: force mime mode if at least one attachment was given
+    
+    This fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918806
+    
+    * mail/mail.c (cli_attach): Set mime_option.
+
+Index: mailutils/mail/mail.c
+===================================================================
+--- mailutils.orig/mail/mail.c
++++ mailutils/mail/mail.c
+@@ -151,6 +151,8 @@ cli_attach (struct mu_parseopt *po, stru
+ 			default_content_type, default_encoding))
+     exit (po->po_exit_error);
+ 
++  mime_option = 1;
++  
+   free (content_name);
+   content_name = NULL;
+   free (content_filename);
diff -Nru mailutils-3.5/debian/patches/series mailutils-3.5/debian/patches/series
--- mailutils-3.5/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ mailutils-3.5/debian/patches/series	2019-03-14 09:31:46.000000000 +0100
@@ -0,0 +1 @@
+mime-attachments.patch

-- System Information:
Debian Release: buster/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-3-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_WARN, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=ca_ES.UTF-8, LC_CTYPE=ca_ES.UTF-8 (charmap=UTF-8), LANGUAGE=ca_ES:ca (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled