Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: mailut...@packages.debian.org
Control: affects -1 + src:mailutils

Please unblock package mailutils

I tried getting this before the start of the freeze, but apparently was
a few hours late.

This revision just fixes a long standing crash in mail(1), which is
related to certain locale setting.

The patch to the actual fix is a two-liner, but this upload also
included some other minor packaging tweaks like updating
Standards-Version or lintian overrides.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock mailutils/1:3.15-4
diff -Nru mailutils-3.15/debian/changelog mailutils-3.15/debian/changelog
--- mailutils-3.15/debian/changelog     2022-09-13 23:16:02.000000000 +0200
+++ mailutils-3.15/debian/changelog     2023-03-03 17:00:20.000000000 +0100
@@ -1,3 +1,16 @@
+mailutils (1:3.15-4) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * Update lintian override info to new format on line 1.
+  * Update standards version to 4.6.1, no changes needed.
+
+  [ Jordi Mallach ]
+  * Add patch from Dave Love to fix a locale-related crash
+    (closes: #944372, #1031702).
+  * Update Standards-Version to 4.6.2, with no changes needed.
+
+ -- Jordi Mallach <jo...@debian.org>  Fri, 03 Mar 2023 17:00:20 +0100
+
 mailutils (1:3.15-3) unstable; urgency=medium
 
   [ Jordi Mallach ]
diff -Nru mailutils-3.15/debian/control mailutils-3.15/debian/control
--- mailutils-3.15/debian/control       2022-09-13 21:34:33.000000000 +0200
+++ mailutils-3.15/debian/control       2023-03-03 16:52:35.000000000 +0100
@@ -30,7 +30,7 @@
                python3-dev,
                texinfo,
                zlib1g-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/debian/mailutils.git
 Vcs-Browser: https://salsa.debian.org/debian/mailutils
 Homepage: https://www.gnu.org/software/mailutils/
diff -Nru mailutils-3.15/debian/mailutils.lintian-overrides 
mailutils-3.15/debian/mailutils.lintian-overrides
--- mailutils-3.15/debian/mailutils.lintian-overrides   2022-04-18 
16:45:34.000000000 +0200
+++ mailutils-3.15/debian/mailutils.lintian-overrides   2023-03-03 
15:26:36.000000000 +0100
@@ -1 +1 @@
-mailutils: elevated-privileges usr/bin/dotlock.mailutils 2755 root/root
+mailutils: elevated-privileges 2755 root/root [usr/bin/dotlock.mailutils]
diff -Nru mailutils-3.15/debian/patches/locale_crash.patch 
mailutils-3.15/debian/patches/locale_crash.patch
--- mailutils-3.15/debian/patches/locale_crash.patch    1970-01-01 
01:00:00.000000000 +0100
+++ mailutils-3.15/debian/patches/locale_crash.patch    2023-03-03 
15:31:36.000000000 +0100
@@ -0,0 +1,35 @@
+From f7fa005e21c56aae550c71d1ebc43030e1063601 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <g...@gnu.org>
+Date: Tue, 21 Feb 2023 14:18:34 +0200
+Subject: Fix coredump in mail.
+
+Patch proposed by Dave Love <dave.l...@manchester.ac.uk>
+
+* mail/util.c (util_get_charset): Check if charset is not NULL
+before strdup'ing it.
+---
+ mail/util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mail/util.c b/mail/util.c
+index b7a8e07..710b2af 100644
+--- a/mail/util.c
++++ b/mail/util.c
+@@ -1218,12 +1218,12 @@ util_get_charset (void)
+     {
+       struct mu_lc_all lc_all = { .flags = 0 };
+       char *tmp = getenv ("LC_ALL");
+-      if (!tmp)
++      if (!tmp || !*tmp)
+       tmp = getenv ("LANG");
+ 
+       if (tmp && mu_parse_lc_all (tmp, &lc_all, MU_LC_CSET) == 0)
+       {
+-        charset = mu_strdup (lc_all.charset);
++        charset = lc_all.charset ? mu_strdup (lc_all.charset) : NULL;
+         mu_lc_all_free (&lc_all);
+       }
+       else
+-- 
+cgit v1.1
+
diff -Nru mailutils-3.15/debian/patches/series 
mailutils-3.15/debian/patches/series
--- mailutils-3.15/debian/patches/series        2022-04-18 16:45:34.000000000 
+0200
+++ mailutils-3.15/debian/patches/series        2023-03-03 15:32:42.000000000 
+0100
@@ -1,3 +1,4 @@
 set_mu_sieve_moddir.patch
 guile-3.0.patch
 fix_libpq_include.patch
+locale_crash.patch

Reply via email to