mutt: update to 1.14.4.

Remove some patches that would get voting rights soon.
Remove support for NetBSD 1.5.
pkglint cleanup.
XXX: someone should send the remaining patches upstream.

Mutt 1.14.4 was released on June 18, 2020. This is an important
bug-fix release. It fixes a possible machine-in-the-middle response
injection attack when using STARTTLS with IMAP, POP3, and SMTP
(CVE-2020-14954).

Mutt 1.14.3 was released on June 14, 2020. This is an important
bug-fix release. It fixes a possible IMAP fcc/postpone
machine-in-the-middle attack (CVE-2020-14093). It also fixes some
GnuTLS certificate prompt issues.

Mutt 1.14.2 was released on May 25, 2020. This is a bug-fix release,
fixing a few prompt buffer-size issues and adding a potential DoS
mitigation.

Mutt 1.14.1 was released on May 16, 2020. This is a bug-fix release,
fixing a documentation build issue and a few other small bugs.

Mutt 1.14.0 was released on May 2, 2020. This release has new
features and bug fixes. See the UPDATING file, or for more details
see the release notes page.

10 files changed, 75 insertions, 197 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 9527035ee8d..72057e548a1 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.229 2020/06/09 10:18:49 nia Exp $
+# $NetBSD: Makefile,v 1.230 2020/06/22 06:24:15 wiz Exp $
 
-DISTNAME=		mutt-1.13.5
-PKGREVISION=		2
+DISTNAME=		mutt-1.14.4
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/pub/mutt/
 
@@ -41,13 +40,6 @@ CONFIGURE_ENV+=		SENDMAIL=/usr/sbin/sendmail
 
 CONFIGURE_ARGS.SunOS+=	--without-wc-funcs
 
-# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh
-# there.
-#
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*)
-CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
-.endif
-
 .include "options.mk"
 
 LDFLAGS+=		${_STRIPFLAG_CC}
@@ -59,8 +51,19 @@ FILES_SUBST+=		DOCDIR=${DOCDIR}
 INSTALLATION_DIRS+=	${DOCDIR} ${EGDIR}
 
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	doc/Muttrc
-SUBST_VARS.paths+=	DOCDIR PREFIX
+SUBST_FILES.paths+=	contrib/sample.muttrc
+SUBST_FILES.paths+=	contrib/sample.muttrc-starter
+SUBST_FILES.paths+=	doc/configuration.html
+SUBST_FILES.paths+=	doc/gettingstarted.html
+SUBST_FILES.paths+=	doc/instdoc.sh.in
+SUBST_FILES.paths+=	doc/manual.html
+SUBST_FILES.paths+=	doc/manual.xml.head
+SUBST_FILES.paths+=	doc/mimesupport.html
+SUBST_FILES.paths+=	doc/mutt.info
+SUBST_FILES.paths+=	doc/mutt.texi
+SUBST_FILES.paths+=	doc/muttrc.man
+SUBST_FILES.paths+=	doc/reference.html
+SUBST_SED.paths+=	-e "s,/usr/local,${PREFIX},g"
 SUBST_STAGE.paths=	pre-configure
 
 SPECIAL_PERMS+=		bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST
index 1b1a3970d00..9420430f60a 100644
--- a/mail/mutt/PLIST
+++ b/mail/mutt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2019/12/01 00:02:34 tron Exp $
+@comment $NetBSD: PLIST,v 1.28 2020/06/22 06:24:15 wiz Exp $
 bin/flea
 bin/mutt
 bin/mutt_dotlock
@@ -39,52 +39,54 @@ share/doc/mutt/miscellany.html
 share/doc/mutt/optionalfeatures.html
 share/doc/mutt/patch-notes.txt
 share/doc/mutt/reference.html
+share/doc/mutt/samples/Mush.rc
+share/doc/mutt/samples/Pine.rc
+share/doc/mutt/samples/Tin.rc
+share/doc/mutt/samples/bgedit-detectgui.sh
+share/doc/mutt/samples/bgedit-screen-tmux.sh
+share/doc/mutt/samples/ca-bundle.crt
+share/doc/mutt/samples/colors.default
+share/doc/mutt/samples/colors.linux
+share/doc/mutt/samples/gpg.rc
+share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
+share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
+share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
+share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
+share/doc/mutt/samples/markdown2html
+share/doc/mutt/samples/mutt_xtitle
+share/doc/mutt/samples/pgp2.rc
+share/doc/mutt/samples/pgp5.rc
+share/doc/mutt/samples/pgp6.rc
+share/doc/mutt/samples/sample.mailcap
+share/doc/mutt/samples/sample.muttrc
+share/doc/mutt/samples/sample.muttrc-compress
+share/doc/mutt/samples/sample.muttrc-sidebar
+share/doc/mutt/samples/sample.muttrc-starter
+share/doc/mutt/samples/sample.muttrc-tlr
+share/doc/mutt/samples/sample.vimrc-sidebar
+share/doc/mutt/samples/smime.rc
+share/doc/mutt/samples/smime_keys_test.pl
 share/doc/mutt/security.html
 share/doc/mutt/smime-notes.txt
 share/doc/mutt/tuning.html
-share/examples/mutt/Mush.rc
 share/examples/mutt/Muttrc
 share/examples/mutt/Muttrc.dist
-share/examples/mutt/Pine.rc
-share/examples/mutt/Tin.rc
-share/examples/mutt/ca-bundle.crt
-share/examples/mutt/colors.default
-share/examples/mutt/colors.linux
-share/examples/mutt/gpg.rc
-share/examples/mutt/iconv/iconv.aix-3.2.5.rc
-share/examples/mutt/iconv/iconv.aix-4.1.5.rc
-share/examples/mutt/iconv/iconv.aix-4.2.0.rc
-share/examples/mutt/iconv/iconv.aix-4.3.2.rc
-share/examples/mutt/iconv/iconv.freebsd-3.3.rc
-share/examples/mutt/iconv/iconv.glibc-2.1.3.rc
-share/examples/mutt/iconv/iconv.glibc-2.1.90.rc
-share/examples/mutt/iconv/iconv.hpux-10.01.rc
-share/examples/mutt/iconv/iconv.hpux-10.20.rc
-share/examples/mutt/iconv/iconv.hpux-11.00.rc
-share/examples/mutt/iconv/iconv.irix-6.5.rc
-share/examples/mutt/iconv/iconv.osf1-4.0a.rc
-share/examples/mutt/iconv/iconv.osf1-4.0d.rc
-share/examples/mutt/iconv/iconv.solaris-2.4.rc
-share/examples/mutt/iconv/iconv.solaris-2.5.1.rc
-share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc
-share/examples/mutt/iconv/iconv.solaris-2.6.rc
-share/examples/mutt/iconv/iconv.solaris-2.7.rc
-share/examples/mutt/markdown2html
 share/examples/mutt/mime.types
 share/examples/mutt/mime.types.dist
-share/examples/mutt/mutt_xtitle
-share/examples/mutt/pgp2.rc
-share/examples/mutt/pgp5.rc
-share/examples/mutt/pgp6.rc
-share/examples/mutt/sample.mailcap
-share/examples/mutt/sample.muttrc
-share/examples/mutt/sample.muttrc-compress
-share/examples/mutt/sample.muttrc-sidebar
-share/examples/mutt/sample.muttrc-starter
-share/examples/mutt/sample.muttrc-tlr
-share/examples/mutt/sample.vimrc-sidebar
-share/examples/mutt/smime.rc
-share/examples/mutt/smime_keys_test.pl
 share/locale/bg/LC_MESSAGES/mutt.mo
 share/locale/ca/LC_MESSAGES/mutt.mo
 share/locale/cs/LC_MESSAGES/mutt.mo
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 2db07afab0e..aa5a7314a26 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,15 +1,10 @@
-$NetBSD: distinfo,v 1.81 2020/04/21 14:17:39 nia Exp $
+$NetBSD: distinfo,v 1.82 2020/06/22 06:24:15 wiz Exp $
 
-SHA1 (mutt-1.13.5.tar.gz) = fc678c0397ef015e0a2cd629fe471fdfb22dd38c
-RMD160 (mutt-1.13.5.tar.gz) = d742c259c370dd76ce9cc796ebd69a047848ce27
-SHA512 (mutt-1.13.5.tar.gz) = f2ea863626e5dad4854c98a1797faa97c9f14fb5161c590e88ee02afbdde7f48493bd2cce6109f9839501cf38aa238dc804f4c98f17ac97c68b48cb0bc0e5b4a
-Size (mutt-1.13.5.tar.gz) = 4902500 bytes
-SHA1 (patch-aa) = ffa6fc8af174b3caf3286f24ea6330b4a27d91a1
+SHA1 (mutt-1.14.4.tar.gz) = a04e84f816ed256f5088914d2fe0bf77e997be1d
+RMD160 (mutt-1.14.4.tar.gz) = af420f0432c6471a6d21af90a9156b209dee8210
+SHA512 (mutt-1.14.4.tar.gz) = 86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
+Size (mutt-1.14.4.tar.gz) = 5007437 bytes
 SHA1 (patch-ab) = 3d094b6bdb2b2ffac8ce6a1d3a306714c9f01835
-SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
-SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344
 SHA1 (patch-af) = fd9eb93b580ce4f2115c3db16b199578fa99ce94
-SHA1 (patch-ag) = ccf9d69c4fc1017c3a906e86dd8c60f6c8c87683
-SHA1 (patch-ah) = 047f167939367b2e0d29189348deb1c83d4b013a
+SHA1 (patch-ag) = a9bfc6041a9b763e77d9174073a3cd905c7b5f93
 SHA1 (patch-al) = 0cb26ce9f89c1f0651eb46117f62ae6275bfaf97
-SHA1 (patch-doc-Muttrc) = 4c76d20a957f21891083386b558a6f9adff15473
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk
index b642596e8d1..17b11378244 100644
--- a/mail/mutt/options.mk
+++ b/mail/mutt/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.34 2020/04/08 08:40:00 rhialto Exp $
+# $NetBSD: options.mk,v 1.35 2020/06/22 06:24:15 wiz Exp $
 
 # Global and legacy options
 
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--with-gss=${KRB5BASE}
 .if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses)
 .  include "../../mk/curses.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.curses}
-.  if !empty(CURSES_TYPE:Mcurses)
+.  if ${CURSES_TYPE:U} == curses
 OPSYSVARS+=			BUILDLINK_PASSTHRU_DIRS
 BUILDLINK_PASSTHRU_DIRS.SunOS+=	/usr/xpg4
 CONFIGURE_ARGS.SunOS+=		--with-curses=/usr/xpg4
@@ -89,9 +89,9 @@ PLIST_VARS+=		smime
 .if !empty(PKG_OPTIONS:Msmime)
 USE_TOOLS+=		perl:run
 REPLACE_PERL+=		*.pl */*.pl
-.if empty(PKG_OPTIONS:Mopenssl) && empty(PKG_OPTIONS:Mgnutls)
+.  if empty(PKG_OPTIONS:Mopenssl) && empty(PKG_OPTIONS:Mgnutls)
 PKG_FAIL_REASON+=	"The smime option requires the openssl or gnutls options."
-.endif
+.  endif
 CONFIGURE_ARGS+=	--enable-smime
 PLIST.smime=		yes
 .else
@@ -103,14 +103,14 @@ CONFIGURE_ARGS+=	--disable-smime
 ###
 .if !empty(PKG_OPTIONS:Mmutt-hcache)
 .  if !empty(PKG_OPTIONS:Mtokyocabinet)
-.  include "../../databases/tokyocabinet/buildlink3.mk"
+.    include "../../databases/tokyocabinet/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-hcache
 CONFIGURE_ARGS+=	--enable-tokyocabinet
 CONFIGURE_ARGS+=	--without-gdbm
 CONFIGURE_ARGS+=	--without-bdb
 .  else
 BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
-.  include "../../mk/bdb.buildlink3.mk"
+.    include "../../mk/bdb.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-hcache
 CONFIGURE_ARGS+=	--without-gdbm
 # BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
diff --git a/mail/mutt/patches/patch-aa b/mail/mutt/patches/patch-aa
deleted file mode 100644
index ebf97f65f36..00000000000
--- a/mail/mutt/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2019/05/26 08:43:14 tron Exp $
-
---- send.c.orig	2019-05-10 03:20:15.000000000 +0100
-+++ send.c	2019-05-26 09:32:44.000000000 +0100
-@@ -2196,6 +2196,13 @@
-     }
-   }
- 
-+#ifdef CRYPT_BACKEND_CLASSIC_PGP
-+  {
-+    /* Extend the PGP expiry time while messages are being sent. */
-+    extern time_t PgpExptime;
-+    PgpExptime = time (NULL) + PgpTimeout;
-+  }
-+#endif
- 
-   rv = 0;
- 
diff --git a/mail/mutt/patches/patch-ac b/mail/mutt/patches/patch-ac
deleted file mode 100644
index 16e549c7bbd..00000000000
--- a/mail/mutt/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2015/09/03 14:49:02 wiz Exp $
-
---- config.h.in.orig	2009-08-02 09:34:54 +0300
-+++ config.h.in	2009-08-02 09:36:37 +0300
-@@ -442,6 +442,12 @@
- /* Define to 1 if you have the `__argz_stringify' function. */
- #undef HAVE___ARGZ_STRINGIFY
- 
-+/* Define to 1 if you have the `mvchgat' function. */
-+#undef HAVE_MVCHGAT
-+
-+/* Define to 1 if you have the `mvwchgat' function. */
-+#undef HAVE_MVWCHGAT
-+
- /* Is mail spooled to the user's home directory? If defined, MAILPATH should
-    be set to the filename of the spool mailbox relative the the home
-    directory. use: configure --with-homespool=FILE */
diff --git a/mail/mutt/patches/patch-ad b/mail/mutt/patches/patch-ad
deleted file mode 100644
index c0f99e27d41..00000000000
--- a/mail/mutt/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.11 2015/09/03 21:04:34 wiz Exp $
-
---- contrib/Makefile.in.orig	2015-08-30 17:24:26.000000000 +0000
-+++ contrib/Makefile.in
-@@ -459,21 +459,20 @@ uninstall-am: uninstall-local
- 
- 
- install-data-local:
--	$(MKDIR_P) $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
-+	$(MKDIR_P) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/iconv
- 	for f in $(SAMPLES) ; do \
--		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;	\
-+		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(sysconfdir);	\
- 	done
- 	for f in $(srcdir)/iconv/*.rc ; do					\
--		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
-+		$(INSTALL) -m 644 $$f $(DESTDIR)$(sysconfdir)/iconv	  ;	\
- 	done
- 
- uninstall-local:
- 	for f in $(SAMPLES) ; do \
--		rm -f $(DESTDIR)$(docdir)/samples/$$f ; \
-+		rm -f $(DESTDIR)$(sysconfdir)/$$f ; \
- 	done
--	-rm -rf $(DESTDIR)$(docdir)/samples/iconv
--	-rmdir $(DESTDIR)$(docdir)/samples
--	-rmdir $(DESTDIR)$(docdir)
-+	-rm -rf $(DESTDIR)$(sysconfdir)/iconv
-+	-rmdir $(DESTDIR)$(sysconfdir)
- dist-hook: Makefile $(DISTFILES)
- 	mkdir -p $(distdir)/iconv
- 	for file in $(srcdir)/iconv/*.rc ; do					\
diff --git a/mail/mutt/patches/patch-ag b/mail/mutt/patches/patch-ag
index 5d3fd91487b..b8d5c3f8c69 100644
--- a/mail/mutt/patches/patch-ag
+++ b/mail/mutt/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.10 2017/03/08 10:05:34 wiz Exp $
+$NetBSD: patch-ag,v 1.11 2020/06/22 06:24:15 wiz Exp $
 
---- doc/Makefile.in.orig	2017-02-24 18:39:56.000000000 +0000
+--- doc/Makefile.in.orig	2020-06-18 21:30:08.000000000 +0000
 +++ doc/Makefile.in
-@@ -654,7 +654,7 @@ install-data-local: makedoc-all instdoc
- 	test x$(DOTLOCK_TARGET) = x || ./instdoc $(srcdir)/dotlock.man \
- 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
- 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
+@@ -561,7 +561,7 @@ install-data-local: makedoc-all instdoc
+ 	elif [ -f $(srcdir)/muttrc.man ] ; then \
+ 	  ./instdoc $(srcdir)/muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 ; \
+ 	fi
 -	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
 +	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
  	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
diff --git a/mail/mutt/patches/patch-ah b/mail/mutt/patches/patch-ah
deleted file mode 100644
index 4731c68f917..00000000000
--- a/mail/mutt/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.7 2016/08/21 11:39:31 wiz Exp $
-
-mutt_curses.h refers to event_t from mutt,h, and SHORT_STRING from lib.h,
-so include those headers here.
-
---- mutt_curses.h.orig	2016-08-11 01:47:00.000000000 +0000
-+++ mutt_curses.h
-@@ -52,6 +52,9 @@
- # include <curses.h>
- #endif
- 
-+#include "lib.h" /* for SHORT_STRING */
-+#include "mutt.h" /* for event_t */
-+
- #define MUTT_ENTER_C '\n'
- #define MUTT_ENTER_S "\n"
- 
diff --git a/mail/mutt/patches/patch-doc-Muttrc b/mail/mutt/patches/patch-doc-Muttrc
deleted file mode 100644
index c42e9d642e9..00000000000
--- a/mail/mutt/patches/patch-doc-Muttrc
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-doc-Muttrc,v 1.1 2019/12/01 00:02:34 tron Exp $
-
-Rewrite hard coded pathnames configuration file documentation
-
---- doc/Muttrc.orig	2019-11-30 18:14:44.000000000 +0000
-+++ doc/Muttrc	2019-11-30 23:50:15.102043333 +0000
-@@ -23,7 +23,7 @@
- "call urlview to extract URLs out of a message"
- 
- # Show documentation when pressing F1
--macro generic,pager <F1> "<shell-escape> less /usr/local/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation"
-+macro generic,pager <F1> "<shell-escape> less @DOCDIR@/manual.txt<Enter>" "show Mutt documentation"
- 
- # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
- # note: these macros have been subsumed by the <browse-mailboxes> function.
-@@ -1183,11 +1183,11 @@
- # filtered message is read from the standard output.
- # 
- # 
--# set dotlock_program="/usr/local/bin/mutt_dotlock"
-+# set dotlock_program="@PREFIX@/bin/mutt_dotlock"
- #
- # Name: dotlock_program
- # Type: path
--# Default: "/usr/local/bin/mutt_dotlock"
-+# Default: "@PREFIX@/bin/mutt_dotlock"
- # 
- # 
- # Contains the path of the mutt_dotlock(8) binary to be used by
-@@ -5923,7 +5923,7 @@
- # Setting this variable will cause mutt to open a pipe to a command
- # instead of a raw socket. You may be able to use this to set up
- # preauthenticated connections to your IMAP/POP3/SMTP server. Example:
--# set tunnel="ssh -q mailhost.net /usr/local/libexec/imapd"
-+# set tunnel="ssh -q mailhost.net @PREFIX@/libexec/imapd"
- # 
- # Note: For this example to work you must be able to log in to the remote
- # machine without having to enter a password.