CVS commit: pkgsrc/mail/mutt

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jun 22 06:24:15 UTC 2020

Modified Files:
        pkgsrc/mail/mutt: Makefile PLIST distinfo options.mk
        pkgsrc/mail/mutt/patches: patch-ag
Removed Files:
        pkgsrc/mail/mutt/patches: patch-aa patch-ac patch-ad patch-ah
            patch-doc-Muttrc

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 pkgsrc/mail/mutt/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/mutt/PLIST
cvs rdiff -u -r1.81 -r1.82 pkgsrc/mail/mutt/distinfo
cvs rdiff -u -r1.34 -r1.35 pkgsrc/mail/mutt/options.mk
cvs rdiff -u -r1.9 -r0 pkgsrc/mail/mutt/patches/patch-aa
cvs rdiff -u -r1.7 -r0 pkgsrc/mail/mutt/patches/patch-ac \
    pkgsrc/mail/mutt/patches/patch-ah
cvs rdiff -u -r1.11 -r0 pkgsrc/mail/mutt/patches/patch-ad
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/mutt/patches/patch-ag
cvs rdiff -u -r1.1 -r0 pkgsrc/mail/mutt/patches/patch-doc-Muttrc

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

Modified files:

Index: pkgsrc/mail/mutt/Makefile
diff -u pkgsrc/mail/mutt/Makefile:1.229 pkgsrc/mail/mutt/Makefile:1.230
--- pkgsrc/mail/mutt/Makefile:1.229     Tue Jun  9 10:18:49 2020
+++ pkgsrc/mail/mutt/Makefile   Mon Jun 22 06:24:15 2020
@@ -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/send
 
 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

Index: pkgsrc/mail/mutt/PLIST
diff -u pkgsrc/mail/mutt/PLIST:1.27 pkgsrc/mail/mutt/PLIST:1.28
--- pkgsrc/mail/mutt/PLIST:1.27 Sun Dec  1 00:02:34 2019
+++ pkgsrc/mail/mutt/PLIST      Mon Jun 22 06:24:15 2020
@@ -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

Index: pkgsrc/mail/mutt/distinfo
diff -u pkgsrc/mail/mutt/distinfo:1.81 pkgsrc/mail/mutt/distinfo:1.82
--- pkgsrc/mail/mutt/distinfo:1.81      Tue Apr 21 14:17:39 2020
+++ pkgsrc/mail/mutt/distinfo   Mon Jun 22 06:24:15 2020
@@ -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

Index: pkgsrc/mail/mutt/options.mk
diff -u pkgsrc/mail/mutt/options.mk:1.34 pkgsrc/mail/mutt/options.mk:1.35
--- pkgsrc/mail/mutt/options.mk:1.34    Wed Apr  8 08:40:00 2020
+++ pkgsrc/mail/mutt/options.mk Mon Jun 22 06:24:15 2020
@@ -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

Index: pkgsrc/mail/mutt/patches/patch-ag
diff -u pkgsrc/mail/mutt/patches/patch-ag:1.10 pkgsrc/mail/mutt/patches/patch-ag:1.11
--- pkgsrc/mail/mutt/patches/patch-ag:1.10      Wed Mar  8 10:05:34 2017
+++ pkgsrc/mail/mutt/patches/patch-ag   Mon Jun 22 06:24:15 2020
@@ -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