neomutt: update to 20200417.

2020-04-17  Richard Russon  <rich@flatcap.org>
* Features
  - Fluid layout for Compose Screen, see: https://vimeo.com/407231157
  - Trivial Database (TDB) header cache backend
  - RocksDB header cache backend
  - Add <sidebar-first> and <sidebar-last> functions
* Bug Fixes
  - add error for CLI empty emails
  - Allow spaces and square brackets in paths
  - browser: fix hidden mailboxes
  - fix initial email display
  - notmuch: fix time window search.
  - fix resize bugs
  - notmuch: fix entire-thread: update current email pointer
  - sidebar: support indenting and shortening of names
  - Handle variables inside backticks in sidebar_whitelist
  - browser: fix mask regex error reporting
* Translations
  - 100.00% Lithuanian
  - 98.88% Chinese (simplified)
* Build
  - Use regexes for common parsing tasks: urls, dates
  - Add configure option `--pcre2` -- Enable PCRE2 regular expressions
  - Add configure option `--tdb` -- Use TDB for the header cache
  - Add configure option `--rocksdb` -- Use RocksDB for the header cache
  - Create libstore (key/value backends)
  - Update to latest autosetup
  - Update to latest acutest.h
  - Rename `doc/` directory to `docs/`
  - make: fix location of .Po dependency files
  - Change libcompress to be more universal
  - Fix test fails on х32
  - fix uidvalidity to unsigned 32-bit int
* Code
  - Increase test coverage
  - Fix memory leaks
  - Fix null checks
* Upstream
  - Buffer refactoring
  - Fix use-after-free in mutt_str_replace()
  - Clarify PGP Pseudo-header S<id> duration
  - Try to respect MUTT_QUIET for IMAP contexts too
  - Limit recurse depth when parsing mime messages

4 files changed, 38 insertions, 9 deletions

diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index 5e8c5d63fad..82088231bcf 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2020/03/21 10:50:30 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2020/04/17 18:01:34 wiz Exp $
 
-DISTNAME=		neomutt-20200320
+DISTNAME=		neomutt-20200417
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=		${PKGVERSION_NOREV}
diff --git a/mail/neomutt/PLIST b/mail/neomutt/PLIST
index e8b270cb273..de1a95bb946 100644
--- a/mail/neomutt/PLIST
+++ b/mail/neomutt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2019/11/06 12:28:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.20 2020/04/17 18:01:34 wiz Exp $
 bin/neomutt
 libexec/neomutt/pgpewrap
 libexec/neomutt/smime_keys
@@ -9,7 +9,6 @@ man/man5/mbox_neomutt.5
 man/man5/mmdf_neomutt.5
 man/man5/neomuttrc.5
 share/doc/neomutt/CODE_OF_CONDUCT.md
-share/doc/neomutt/COPYRIGHT.md
 share/doc/neomutt/ChangeLog.md
 share/doc/neomutt/INSTALL.md
 share/doc/neomutt/LICENSE.md
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index 5445b7c1b1f..b55fcd04c46 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.41 2020/03/21 10:50:30 wiz Exp $
+$NetBSD: distinfo,v 1.42 2020/04/17 18:01:34 wiz Exp $
 
-SHA1 (neomutt-20200320-20200320.tar.gz) = b9fd6b7df2012ac1ba6d0ab841fea808ea0c1045
-RMD160 (neomutt-20200320-20200320.tar.gz) = 0baceed1a38bb367e7aa0f17ed91c8169c58ee78
-SHA512 (neomutt-20200320-20200320.tar.gz) = 6f47b29e2c941c3f47e3916f2fdb5e9a7cdac0221c88f9e5df1914cf6d28f7ae0ec63e0a20b271300771e073908714d2ab4c14646b617c26d48f91071ed344b2
-Size (neomutt-20200320-20200320.tar.gz) = 3304719 bytes
+SHA1 (neomutt-20200417-20200417.tar.gz) = cefa7bdcacce0f38674f92c5f6aa3faad18f34c8
+RMD160 (neomutt-20200417-20200417.tar.gz) = 2fdd21070f63fa3f5b1e8e1ea392562cc6faba31
+SHA512 (neomutt-20200417-20200417.tar.gz) = d23c2d72b6c783246e799fb14f9d2c6484580123766a33784fee065bdb23066a1178fd1ab0e1cc8d7f90d39a2a04950dcc70ed1a1d405676472fdc6e819dac17
+Size (neomutt-20200417-20200417.tar.gz) = 3322435 bytes
+SHA1 (patch-opcodes.h) = 06299d4cfe14ea370cd3d18f1ae597e3e195da56
 SHA1 (patch-resize.c) = b747f878459950462d56e01bada2d01b49fca088
diff --git a/mail/neomutt/patches/patch-opcodes.h b/mail/neomutt/patches/patch-opcodes.h
new file mode 100644
index 00000000000..3e0a1e288bf
--- /dev/null
+++ b/mail/neomutt/patches/patch-opcodes.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-opcodes.h,v 1.1 2020/04/17 18:01:34 wiz Exp $
+
+ensure OP_NULL is always first
+
+A recent refactoring altered the ordering of the OPs when autocrypt was
+enabled.  This mean that OP_NULL wasn't 0 any more.
+
+Fixes: #2268
+
+https://github.com/neomutt/neomutt/commit/9e7537caddb9c6adc720bb3322a7512cf51ab025
+
+--- opcodes.h.orig	2020-04-17 11:53:50.000000000 +0000
++++ opcodes.h
+@@ -37,7 +37,6 @@
+ #endif
+ 
+ #define OPS_CORE(_fmt) \
+-  _fmt(OP_NULL,                           N_("null operation")) \
+   _fmt(OP_ATTACH_COLLAPSE,                N_("toggle display of subparts")) \
+   _fmt(OP_ATTACH_VIEW_MAILCAP,            N_("force viewing of attachment using mailcap")) \
+   _fmt(OP_ATTACH_VIEW_TEXT,               N_("view attachment as text")) \
+@@ -317,6 +316,7 @@
+   _fmt(OP_COMPOSE_SMIME_MENU,             N_("show S/MIME options")) \
+ 
+ #define OPS(_fmt) \
++  _fmt(OP_NULL,                           N_("null operation")) \
+   OPS_AUTOCRYPT(_fmt) \
+   OPS_CORE(_fmt) \
+   OPS_SIDEBAR(_fmt) \