Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_164209037286350"
MIME-Version: 1.0
Date: Thu, 13 Jan 2022 16:12:52 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/mail/neomutt
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20220113161252.586DFFB24@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_164209037286350
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Thu Jan 13 16:12:52 UTC 2022

Modified Files:
	pkgsrc/mail/neomutt: Makefile distinfo
Added Files:
	pkgsrc/mail/neomutt/patches: patch-send_sendlib.c

Log Message:
neomutt: revert an upstream commit to fix a segfault

A bug report is already open about this upstream.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/mail/neomutt/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/mail/neomutt/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/neomutt/patches/patch-send_sendlib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_164209037286350
Content-Disposition: inline
Content-Length: 2582
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/neomutt/Makefile
diff -u pkgsrc/mail/neomutt/Makefile:1.73 pkgsrc/mail/neomutt/Makefile:1.74
--- pkgsrc/mail/neomutt/Makefile:1.73	Wed Dec  8 16:05:29 2021
+++ pkgsrc/mail/neomutt/Makefile	Thu Jan 13 16:12:52 2022
@@ -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}

Index: pkgsrc/mail/neomutt/distinfo
diff -u pkgsrc/mail/neomutt/distinfo:1.56 pkgsrc/mail/neomutt/distinfo:1.57
--- pkgsrc/mail/neomutt/distinfo:1.56	Fri Oct 29 23:09:24 2021
+++ pkgsrc/mail/neomutt/distinfo	Thu Jan 13 16:12:52 2022
@@ -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

Added files:

Index: pkgsrc/mail/neomutt/patches/patch-send_sendlib.c
diff -u /dev/null pkgsrc/mail/neomutt/patches/patch-send_sendlib.c:1.1
--- /dev/null	Thu Jan 13 16:12:52 2022
+++ pkgsrc/mail/neomutt/patches/patch-send_sendlib.c	Thu Jan 13 16:12:52 2022
@@ -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 */


--_----------=_164209037286350--