Pullup ticket #6372 - requested by wiz

mail/neomutt: security fix

Revisions pulled up:
- mail/neomutt/Makefile                                         1.64-1.65
- mail/neomutt/PLIST                                            1.22
- mail/neomutt/distinfo                                         1.47-1.48

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Sun Sep 27 14:58:46 UTC 2020

   Modified Files:
   	pkgsrc/mail/neomutt: Makefile distinfo

   Log Message:
   neomutt: update to 20200925.

   2020-09-25  Richard Russon  <rich@flatcap.org>
   * Features
     - Compose: display user-defined headers
     - Address Book / Query: live sorting
     - Address Book / Query: patterns for searching
     - Config: Add '+=' and '-=' operators for String Lists
     - Config: Add '+=' operator for Strings
     - Allow postfix query ':setenv NAME?' for env vars
   * Bug Fixes
     - Fix crash when searching with invalid regexes
     - Compose: Prevent infinite loop of `send2-hook`s
     - Fix sidebar on new/removed mailboxes
     - Restore indentation for named mailboxes
     - Prevent half-parsing an alias
     - Remove folder creation prompt for POP path
     - Show error if `$message_cachedir` doesn't point to a valid directory
     - Fix tracking LastDir in case of IMAP paths with Unicode characters
     - Make sure all mail gets applied the index limit
     - Add warnings to -Q query CLI option
     - Fix index tracking functionality
   * Changed Config
     - Add `$compose_show_user_headers` (yes)
   * Translations
     - 100% Czech
     - 100% Lithuanian
     - Split up usage strings
   * Build
     - Run shellcheck on hcachever.sh
     - Add the Address Sanitizer
     - Move compose files to lib under compose/
     - Move address config into libaddress
     - Update to latest acutest - fixes a memory leak in the unit tests
   * Code
     - Implement ARRAY API
     - Deglobalised the Config Sort functions
     - Refactor the Sidebar to be Event-Driven
     - Refactor the Color Event
     - Refactor the Commands list
     - Make ctx_update_tables private
     - Reduce the scope/deps of some Validator functions
     - Use the Email's IMAP UID instead of an increasing number as index
     - debug: log window focus

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Fri Nov 20 16:34:53 UTC 2020

   Modified Files:
   	pkgsrc/mail/neomutt: Makefile PLIST distinfo

   Log Message:
   neomutt: update to 20201120.

   2020-11-20  Richard Russon  <rich@flatcap.org>
   * Security
     - imap: close connection on all failures
   * Features
     - alias: add <limit> function to Alias/Query dialogs
     - config: add validators for {imap,smtp,pop}_authenticators
     - config: warn when signature file is missing or not readable
     - smtp: support for native SMTP LOGIN auth mech
     - notmuch: show originating folder in index
   * Bug Fixes
     - sidebar: prevent the divider colour bleeding out
     - sidebar: fix <sidebar-{next,prev}-new>
     - notmuch: fix <entire-thread> query for current email
     - restore shutdown-hook functionality
     - crash in reply-to
     - user-after-free in folder-hook
     - fix some leaks
     - fix application of limits to modified mailboxes
     - write Date header when postponing
   * Translations
     - 100% Lithuanian
     - 100% Czech
     - 70% Turkish
   * Docs
     - Document that $sort_alias affects the query menu
   * Build
     - improve ASAN flags
     - add SASL and S/MIME to --everything
     - fix contrib (un)install
   * Code
     - my_hdr compose screen notifications
     - add contracts to the MXAPI
     - maildir refactoring
     - further reduce the use of global variables
   * Upstream
     - Add $count_alternatives to count attachments inside alternatives

3 files changed, 11 insertions, 9 deletions

diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index 8abc2119ecf..fe37bd2f995 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2020/08/31 18:09:58 wiz Exp $
+# $NetBSD: Makefile,v 1.63.2.1 2020/12/11 08:50:44 bsiegert Exp $
 
-DISTNAME=		neomutt-20200821
-PKGREVISION=		2
+DISTNAME=		neomutt-20201120
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=		${PKGVERSION_NOREV}
diff --git a/mail/neomutt/PLIST b/mail/neomutt/PLIST
index e6715a443ba..ad8c5d47f2e 100644
--- a/mail/neomutt/PLIST
+++ b/mail/neomutt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2020/06/22 06:08:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21.4.1 2020/12/11 08:50:44 bsiegert Exp $
 bin/neomutt
 libexec/neomutt/pgpewrap
 ${PLIST.smime}libexec/neomutt/smime_keys
@@ -8,11 +8,14 @@ man/man1/smime_keys_neomutt.1
 man/man5/mbox_neomutt.5
 man/man5/mmdf_neomutt.5
 man/man5/neomuttrc.5
+share/doc/neomutt/AUTHORS.md
 share/doc/neomutt/CODE_OF_CONDUCT.md
+share/doc/neomutt/CONTRIBUTING.md
 share/doc/neomutt/ChangeLog.md
 share/doc/neomutt/INSTALL.md
 share/doc/neomutt/LICENSE.md
 share/doc/neomutt/README.md
+share/doc/neomutt/SECURITY.md
 share/doc/neomutt/advancedusage.html
 share/doc/neomutt/colorschemes/neonwolf-256.neomuttrc
 share/doc/neomutt/colorschemes/solarized-dark-256.neomuttrc
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index 2d0eb00ef6c..ee1a0db8946 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.46 2020/08/21 14:53:28 wiz Exp $
+$NetBSD: distinfo,v 1.46.2.1 2020/12/11 08:50:44 bsiegert Exp $
 
-SHA1 (neomutt-20200821-20200821.tar.gz) = 46dc66a15ae698b97fbcce1cff45c273b1a55b31
-RMD160 (neomutt-20200821-20200821.tar.gz) = bfc1aa8400df33bd2278aba7f54e0f3b449518ea
-SHA512 (neomutt-20200821-20200821.tar.gz) = f7cba9123613c34711b84ab9f5ccab840be38876da20b29d281c142a3b4f5d582b879d727c95232b0fcc7b41947d05bf89707232d3980e160bcdba68784d6eef
-Size (neomutt-20200821-20200821.tar.gz) = 3404856 bytes
+SHA1 (neomutt-20201120-20201120.tar.gz) = 368b18d398493705fec5ca55436f4929f4b31dc1
+RMD160 (neomutt-20201120-20201120.tar.gz) = 133beffc2887dd851104a59add8cbf0d3f3500e4
+SHA512 (neomutt-20201120-20201120.tar.gz) = 31c0cbfdf2b772f61b4c9bce97c9a2ad9fffb6ae21e562522544ad94247dfaa530334d90bd550eae1efc2b94a467ed959e4abb79b14261da7092f146a2e08e11
+Size (neomutt-20201120-20201120.tar.gz) = 3456322 bytes
 SHA1 (patch-resize.c) = b747f878459950462d56e01bada2d01b49fca088