Pullup ticket #6514 - requested by wiz

mail/neomutt: security fix

Revisions pulled up:
- mail/neomutt/Makefile                                         1.69
- mail/neomutt/PLIST                                            1.23
- mail/neomutt/distinfo                                         1.53
- mail/neomutt/patches/patch-resize.c                           deleted

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Fri Oct 15 11:43:54 UTC 2021

   Modified Files:
   	pkgsrc/mail/neomutt: Makefile PLIST distinfo
   Removed Files:
   	pkgsrc/mail/neomutt/patches: patch-resize.c

   Log Message:
   neomutt: update to 20211015.

   * Security
     - Fix CVE-2021-32055
   * Features
     - threads: implement the `$use_threads` feature
       https://neomutt.org/feature/use-threads
     - hooks: allow a -noregex param to folder and mbox hooks
     - mailing lists: implement list-(un)subscribe using RFC2369 headers
     - mailcap: implement x-neomutt-nowrap flag
     - pager: add `$local_date_header` option
     - imap, smtp: add support for authenticating using XOAUTH2
     - Allow `<sync-mailbox`> to fail quietly
     - imap: speed up server-side searches
     - pager: improve skip-quoted and skip-headers
     - notmuch: open database with user's configuration
     - notmuch: implement `<vfolder-window-reset>`
     - config: allow += modification of my_ variables
     - notmuch: tolerate file renames behind neomutt's back
     - pager: implement `$pager_read_delay`
     - notmuch: validate `nm_query_window_timebase`
     - notmuch: make $nm_record work in non-notmuch mailboxes
     - compose: add `$greeting` - a welcome message on top of emails
     - notmuch: show additional mail in query windows
   * Changed Config
   - Renamed lots of config, e.g.  `askbcc` to `ask_bcc`.
   * Bug Fixes
     - imap: fix crash on external IMAP events
     - notmuch: handle missing libnotmuch version bumps
     - imap: add sanity check for qresync
     - notmuch: allow windows with 0 duration
     - index: fix index selection on `<collapse-all>`
     - imap: fix crash when sync'ing labels
     - search: fix searching by Message-Id in `<mark-message>`
     - threads: fix double sorting of threads
     - stats: don't check mailbox stats unless told
     - alias: fix crash on empty query
     - pager: honor mid-message config changes
     - mailbox: don't propagate read-only state across reopens
     - hcache: fix caching new labels in the header cache
     - crypto: set invalidity flags for gpgme/smime keys
     - notmuch: fix parsing of multiple `type=`
     - notmuch: validate $nm_default_url
     - messages: avoid unnecessary opening of messages
     - imap: fix seqset iterator when it ends in a comma
     - build: refuse to build without pcre2 when pcre2 is linked in ncurses
   * Translation updates

4 files changed, 12 insertions, 24 deletions

diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index 523a2bcce1f..b9cdb36d6d1 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2021/05/24 19:52:43 wiz Exp $
+# $NetBSD: Makefile,v 1.67.4.1 2021/10/16 17:44:34 tm Exp $
 
-DISTNAME=		neomutt-20201127
-PKGREVISION=		1
+DISTNAME=		neomutt-20211015
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=		${PKGVERSION_NOREV}
diff --git a/mail/neomutt/PLIST b/mail/neomutt/PLIST
index bc80b9a6a87..4bf4d2d664e 100644
--- a/mail/neomutt/PLIST
+++ b/mail/neomutt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2020/11/20 16:34:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22.8.1 2021/10/16 17:44:34 tm Exp $
 bin/neomutt
 libexec/neomutt/pgpewrap
 ${PLIST.smime}libexec/neomutt/smime_keys
@@ -51,6 +51,8 @@ share/doc/neomutt/manual.txt
 share/doc/neomutt/mime.types
 share/doc/neomutt/mimesupport.html
 share/doc/neomutt/miscellany.html
+share/doc/neomutt/oauth2/mutt_oauth2.py
+share/doc/neomutt/oauth2/mutt_oauth2.py.README
 share/doc/neomutt/optionalfeatures.html
 share/doc/neomutt/reference.html
 share/doc/neomutt/samples/Mush.rc
@@ -93,11 +95,13 @@ share/locale/it/LC_MESSAGES/neomutt.mo
 share/locale/ja/LC_MESSAGES/neomutt.mo
 share/locale/ko/LC_MESSAGES/neomutt.mo
 share/locale/lt/LC_MESSAGES/neomutt.mo
+share/locale/nb_NO/LC_MESSAGES/neomutt.mo
 share/locale/nl/LC_MESSAGES/neomutt.mo
 share/locale/pl/LC_MESSAGES/neomutt.mo
 share/locale/pt_BR/LC_MESSAGES/neomutt.mo
 share/locale/ru/LC_MESSAGES/neomutt.mo
 share/locale/sk/LC_MESSAGES/neomutt.mo
+share/locale/sr/LC_MESSAGES/neomutt.mo
 share/locale/sv/LC_MESSAGES/neomutt.mo
 share/locale/tr/LC_MESSAGES/neomutt.mo
 share/locale/uk/LC_MESSAGES/neomutt.mo
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index 20a16e5d8fa..700cee79038 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.49 2020/12/09 23:10:01 wiz Exp $
+$NetBSD: distinfo,v 1.49.8.1 2021/10/16 17:44:34 tm Exp $
 
-SHA1 (neomutt-20201127-20201127.tar.gz) = 414126d5f0c4f4f4d2b530cdf0fca204b0bad45f
-RMD160 (neomutt-20201127-20201127.tar.gz) = 39775af74d2bac31b3f3d6b1197d6318711230b3
-SHA512 (neomutt-20201127-20201127.tar.gz) = 01e45aa00794cfb1c74a45a7f144962c8ab6dee03b0e5ce39a24d0c50817b909cac440a072c5d8b21ee7656c37b77bba4ba818de73710ccc3b0f76fd3ddd71cf
-Size (neomutt-20201127-20201127.tar.gz) = 3456248 bytes
-SHA1 (patch-resize.c) = b747f878459950462d56e01bada2d01b49fca088
+SHA1 (neomutt-20211015-20211015.tar.gz) = 15c19ec6e32d980ab1ee1da8e018177ad35112f5
+RMD160 (neomutt-20211015-20211015.tar.gz) = 1018ea7ab2e175b3a270a83c70ae5e3eff74d356
+SHA512 (neomutt-20211015-20211015.tar.gz) = b466fa73567b3f97c084133315dc8b35578ca369018a7beccb0e6f18324add262c591671c4fc60defd3c9623db7e95e2f631a6df10b0ef3869cf0e4a6b0eec03
+Size (neomutt-20211015-20211015.tar.gz) = 3727778 bytes
diff --git a/mail/neomutt/patches/patch-resize.c b/mail/neomutt/patches/patch-resize.c
deleted file mode 100644
index d91c432e35a..00000000000
--- a/mail/neomutt/patches/patch-resize.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-resize.c,v 1.3 2020/01/16 13:52:39 tm Exp $
-
-Required to have the correct struct information for winsize.
-
---- resize.c.orig	2019-11-29 15:02:20.000000000 +0000
-+++ resize.c
-@@ -43,6 +43,7 @@
- #include <ioctl.h>
- #endif
- #endif
-+#include <termios.h>
- 
- /**
-  * mutt_get_winsize - Use an ioctl to get the window size