Package: neomutt Version: 20191207+dfsg.1-1 Severity: normal Tags: patch pending
Dear maintainer, I've prepared an NMU for neomutt (versioned as 20191207+dfsg.1-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Diff in git: https://salsa.debian.org/mutt-team/neomutt/-/merge_requests/2 Regards.
diff -Nru neomutt-20191207+dfsg.1/debian/changelog neomutt-20191207+dfsg.1/debian/changelog --- neomutt-20191207+dfsg.1/debian/changelog 2020-03-02 05:04:03.000000000 -0800 +++ neomutt-20191207+dfsg.1/debian/changelog 2020-03-19 17:09:59.000000000 -0700 @@ -1,3 +1,11 @@ +neomutt (20191207+dfsg.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix segfault in pager on new message received. (Closes: #953757) + * Fix FTBFS in non-UTC timezone. (Closes: #948895) + + -- Stefano Rivera <stefa...@debian.org> Thu, 19 Mar 2020 17:09:59 -0700 + neomutt (20191207+dfsg.1-1) unstable; urgency=medium [ Andreas Henriksson ] diff -Nru neomutt-20191207+dfsg.1/debian/patches/series neomutt-20191207+dfsg.1/debian/patches/series --- neomutt-20191207+dfsg.1/debian/patches/series 2020-03-02 05:01:49.000000000 -0800 +++ neomutt-20191207+dfsg.1/debian/patches/series 2020-03-19 17:09:59.000000000 -0700 @@ -2,3 +2,5 @@ debian-specific/use_usr_bin_editor.patch debian-specific/document_debian_defaults.patch misc/smime.rc.patch +upstream/pager-segfault.patch +upstream/test-tz.patch diff -Nru neomutt-20191207+dfsg.1/debian/patches/upstream/pager-segfault.patch neomutt-20191207+dfsg.1/debian/patches/upstream/pager-segfault.patch --- neomutt-20191207+dfsg.1/debian/patches/upstream/pager-segfault.patch 1969-12-31 16:00:00.000000000 -0800 +++ neomutt-20191207+dfsg.1/debian/patches/upstream/pager-segfault.patch 2020-03-19 17:09:59.000000000 -0700 @@ -0,0 +1,27 @@ +From: Pietro Cerutti <g...@gahr.ch> +Date: Sat, 14 Dec 2019 16:18:28 +0100 +Subject: Fix crash in pager (#2039) + +Fixes #2038 + +Bug-Upstream: https://github.com/neomutt/neomutt/issues/2038 +Origin: upstream, https://github.com/neomutt/neomutt/commit/645189415f20857fc317bb862a5b9dba33f61fa8 +Bug-Debian: https://bugs.debian.org/953757 +--- + pager.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pager.c b/pager.c +index 793cdfb..1053885 100644 +--- a/pager.c ++++ b/pager.c +@@ -2422,6 +2422,9 @@ int mutt_pager(const char *banner, const char *fname, PagerFlags flags, struct P + rd.menu->current = + MIN(rd.menu->current, MAX(Context->mailbox->msg_count - 1, 0)); + struct Email *e = mutt_get_virt_email(Context->mailbox, rd.menu->current); ++ if (!e) ++ continue; ++ + index_hint = e->index; + + bool q = Context->mailbox->quiet; diff -Nru neomutt-20191207+dfsg.1/debian/patches/upstream/test-tz.patch neomutt-20191207+dfsg.1/debian/patches/upstream/test-tz.patch --- neomutt-20191207+dfsg.1/debian/patches/upstream/test-tz.patch 1969-12-31 16:00:00.000000000 -0800 +++ neomutt-20191207+dfsg.1/debian/patches/upstream/test-tz.patch 2020-03-19 17:09:59.000000000 -0700 @@ -0,0 +1,94 @@ +From: Pietro Cerutti <g...@gahr.ch> +Date: Wed, 29 Jan 2020 14:44:00 +0000 +Subject: Make sure we use the correct timezone in tests + +Fixes #2100 + +Bug-Upstream: https://github.com/neomutt/neomutt/issues/2100 +Origin: upstream, https://github.com/neomutt/neomutt/commit/8aee8ba2a2e8726bf64b95d94c77dd34512b3732 +Bug-Debian: https://bugs.debian.org/948895 +--- + test/date/mutt_date_localtime.c | 3 +++ + test/date/mutt_date_localtime_format.c | 3 +++ + test/date/mutt_date_make_imap.c | 3 +++ + test/date/mutt_date_make_time.c | 3 +++ + 4 files changed, 12 insertions(+) + +diff --git a/test/date/mutt_date_localtime.c b/test/date/mutt_date_localtime.c +index dff4a89..c573445 100644 +--- a/test/date/mutt_date_localtime.c ++++ b/test/date/mutt_date_localtime.c +@@ -24,11 +24,14 @@ + #include "acutest.h" + #include "config.h" + #include "mutt/mutt.h" ++#include <stdlib.h> + + void test_mutt_date_localtime(void) + { + // struct tm mutt_date_localtime(time_t t); + ++ setenv("TZ", "UTC", 1); ++ + { + TEST_CASE("December, 2000"); + struct tm tm = mutt_date_localtime(977745600); +diff --git a/test/date/mutt_date_localtime_format.c b/test/date/mutt_date_localtime_format.c +index 67907c1..23aa573 100644 +--- a/test/date/mutt_date_localtime_format.c ++++ b/test/date/mutt_date_localtime_format.c +@@ -24,11 +24,14 @@ + #include "acutest.h" + #include "config.h" + #include "mutt/mutt.h" ++#include <stdlib.h> + + void test_mutt_date_localtime_format(void) + { + // size_t mutt_date_localtime_format(char *buf, size_t buflen, char *format, time_t t); + ++ setenv("TZ", "UTC", 1); ++ + { + TEST_CHECK(mutt_date_localtime_format(NULL, 10, "apple", 0) == 0); + } +diff --git a/test/date/mutt_date_make_imap.c b/test/date/mutt_date_make_imap.c +index f814b9e..e6f33a7 100644 +--- a/test/date/mutt_date_make_imap.c ++++ b/test/date/mutt_date_make_imap.c +@@ -24,11 +24,14 @@ + #include "acutest.h" + #include "config.h" + #include "mutt/mutt.h" ++#include <stdlib.h> + + void test_mutt_date_make_imap(void) + { + // int mutt_date_make_imap(char *buf, size_t buflen, time_t timestamp); + ++ setenv("TZ", "UTC", 1); ++ + { + TEST_CHECK(mutt_date_make_imap(NULL, 10, 0) != 0); + } +diff --git a/test/date/mutt_date_make_time.c b/test/date/mutt_date_make_time.c +index 5fca7ce..0a5a1c6 100644 +--- a/test/date/mutt_date_make_time.c ++++ b/test/date/mutt_date_make_time.c +@@ -24,6 +24,7 @@ + #include "acutest.h" + #include "config.h" + #include "mutt/mutt.h" ++#include <stdlib.h> + + struct MakeTimeTest + { +@@ -35,6 +36,8 @@ void test_mutt_date_make_time(void) + { + // time_t mutt_date_make_time(struct tm *t, bool local); + ++ setenv("TZ", "UTC", 1); ++ + { + TEST_CHECK(mutt_date_make_time(NULL, false) != 0); + }
