[pkgsrc/trunk]: pkgsrc/mail/neomutt neomutt: revert an upstream commit to fix...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fb7559ed9ea5
branches:  trunk
changeset: 371745:fb7559ed9ea5
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jan 13 16:12:52 2022 +0000

description:
neomutt: revert an upstream commit to fix a segfault

A bug report is already open about this upstream.

Bump PKGREVISION.

diffstat:

 mail/neomutt/Makefile                     |   4 ++--
 mail/neomutt/distinfo                     |   3 ++-
 mail/neomutt/patches/patch-send_sendlib.c |  30 ++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)

diffs (58 lines):

diff -r 5ccc149e4f11 -r fb7559ed9ea5 mail/neomutt/Makefile
--- a/mail/neomutt/Makefile     Thu Jan 13 15:28:56 2022 +0000
+++ b/mail/neomutt/Makefile     Thu Jan 13 16:12:52 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2021/12/08 16:05:29 adam Exp $
+# $NetBSD: Makefile,v 1.74 2022/01/13 16:12:52 wiz Exp $
 
 DISTNAME=              neomutt-20211029
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            mail
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=            ${PKGVERSION_NOREV}
diff -r 5ccc149e4f11 -r fb7559ed9ea5 mail/neomutt/distinfo
--- a/mail/neomutt/distinfo     Thu Jan 13 15:28:56 2022 +0000
+++ b/mail/neomutt/distinfo     Thu Jan 13 16:12:52 2022 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.56 2021/10/29 23:09:24 wiz Exp $
+$NetBSD: distinfo,v 1.57 2022/01/13 16:12:52 wiz Exp $
 
 BLAKE2s (neomutt-20211029-20211029.tar.gz) = e72d7c9a041a2b20d7494ba1cc089b07b68708c37d5fa8a7e15f11784c6447d3
 SHA512 (neomutt-20211029-20211029.tar.gz) = 7335a4451aa8657aa83988b42fb78c5ebdc82ce4395d93d1eb2fded36b02d3fac9b8fed3cf1353042ecebe11e6ccdd9d403b99f068555693901b1700791e3ae0
 Size (neomutt-20211029-20211029.tar.gz) = 3702926 bytes
+SHA1 (patch-send_sendlib.c) = 10d820a67c077b4ea25badcbbd478ac365b20105
diff -r 5ccc149e4f11 -r fb7559ed9ea5 mail/neomutt/patches/patch-send_sendlib.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/neomutt/patches/patch-send_sendlib.c Thu Jan 13 16:12:52 2022 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-send_sendlib.c,v 1.1 2022/01/13 16:12:52 wiz Exp $
+
+Back out the patch for
+https://github.com/neomutt/neomutt/issues/3086
+since it causes segfaults, see
+https://github.com/neomutt/neomutt/issues/3129
+
+--- send/sendlib.c.orig        2021-10-29 12:49:16.000000000 +0000
++++ send/sendlib.c
+@@ -1547,6 +1547,7 @@ int mutt_write_fcc(const char *path, str
+   if (!mx_mbox_open(m_fcc, MUTT_APPEND | MUTT_QUIET))
+   {
+     mutt_debug(LL_DEBUG1, "unable to open mailbox %s in append-mode, aborting\n", path);
++    mailbox_free(&m_fcc);
+     goto done;
+   }
+ 
+@@ -1745,10 +1746,8 @@ int mutt_write_fcc(const char *path, str
+     set_noconv_flags(e->body, false);
+ 
+ done:
+-  m_fcc->append = old_append;
+-  if (m_fcc->flags == MB_HIDDEN)
+-    mailbox_free(&m_fcc);
+-
++  if (m_fcc)
++    m_fcc->append = old_append;
+ #ifdef RECORD_FOLDER_HOOK
+   /* We ran a folder hook for the destination mailbox,
+    * now we run it for the user's current mailbox */