mutt: Update to version 1.12.0

Changes since version 1.11.4:
! $ssl_use_tlsv1 and $ssl_use_tlsv1_1 now default to unset.
+ $auto_subscribe, when set, automatically adds an email with the List-Post
  header to the subscribe list.
! Fcc now occurs after sending a message.  If the fcc fails, mutt will prompt
  to try again, or to try another mailbox.
+ Basic protected header ("memory hole") support added for the Subject header.
  See the config vars: $crypt_protected_headers_read,
  $crypt_protected_headers_save, $crypt_protected_headers_subject,
  and $crypt_protected_headers_write.
! Color names can be prefixed with "light" in addition to "bright".  "bright"
  colors are bold face, while "light" are non-bold.
! Color commands can now include an attribute (e.g. bold, underline).
! $pgp_use_gpg_agent defaults set.
+ <descend-directory> in the browser menu allows entering nested maildir
  directories.
+ <group-chat-reply> replies to all, but preserves To recipients in the reply.
+ $include_encrypted, default unset, prevents separately encrypted contents
  from being included in a reply.  This helps to prevent a decryption oracle
  attack.
! With gpgme >= 1.11, recipient keys with a trailing '!' now force subkey use,
  as with classic gpg.
! In send mode, %{charset} mailcap expansion uses the current charset of the
  file.
+ $imap_fetch_chunk_size allows fetching new headers in groups of this size.
  This might help with timeouts during opening of huge mailboxes.
  If you have huge mailboxes, you should also try $imap_qresync.
! <toggle-write> can be invoked from the pager too.
+ The $forward_attachments quadoption allows including attachments in
  inline-forwards (i.e. $mime_forward unset, $forward_decode set.)

4 files changed, 15 insertions, 14 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index a3487284bb4..223bbb8c78d 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.208 2019/03/14 08:15:13 tron Exp $
+# $NetBSD: Makefile,v 1.209 2019/05/26 08:43:14 tron Exp $
 
-DISTNAME=		mutt-1.11.4
+DISTNAME=		mutt-1.12.0
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/pub/mutt/
 
diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST
index 9153f51a7af..df9bc736a1b 100644
--- a/mail/mutt/PLIST
+++ b/mail/mutt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2018/11/26 12:26:19 tron Exp $
+@comment $NetBSD: PLIST,v 1.26 2019/05/26 08:43:14 tron Exp $
 bin/flea
 bin/mutt
 bin/mutt_dotlock
@@ -79,6 +79,7 @@ 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
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index a3aeb9a3d02..345605ad137 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.72 2019/03/14 08:15:13 tron Exp $
+$NetBSD: distinfo,v 1.73 2019/05/26 08:43:14 tron Exp $
 
-SHA1 (mutt-1.11.4.tar.gz) = 969d099ff31c42d63768e5011698ad4a0dffc840
-RMD160 (mutt-1.11.4.tar.gz) = b1443cf6c8596ea5fb593e144e3e2c7852e4c1c7
-SHA512 (mutt-1.11.4.tar.gz) = 18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb
-Size (mutt-1.11.4.tar.gz) = 4582417 bytes
-SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
+SHA1 (mutt-1.12.0.tar.gz) = 7fa9b0324bfd6c6d2cc8a909c0b49e1400891d23
+RMD160 (mutt-1.12.0.tar.gz) = 83e85beeafb69db6610403444d9b0276a9259c02
+SHA512 (mutt-1.12.0.tar.gz) = b9482af3bfeb39ab8be7244deda49b56a77cfa15b3dfc7dd2b0ec2d7eba8e32b742b7a254ff64e6827a6f74f563830276bf950e8b2b192d27a1fd6b1df70443c
+Size (mutt-1.12.0.tar.gz) = 4668896 bytes
+SHA1 (patch-aa) = ffa6fc8af174b3caf3286f24ea6330b4a27d91a1
 SHA1 (patch-ab) = 3d094b6bdb2b2ffac8ce6a1d3a306714c9f01835
 SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
 SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344
diff --git a/mail/mutt/patches/patch-aa b/mail/mutt/patches/patch-aa
index e0ccd84096e..ebf97f65f36 100644
--- a/mail/mutt/patches/patch-aa
+++ b/mail/mutt/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2015/09/03 14:49:02 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2019/05/26 08:43:14 tron Exp $
 
---- send.c.orig	Sun Feb  1 12:10:58 2004
-+++ send.c
-@@ -1689,6 +1689,13 @@ full_fcc:
+--- 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 @@
      }
    }
  
@@ -15,4 +15,4 @@ $NetBSD: patch-aa,v 1.8 2015/09/03 14:49:02 wiz Exp $
 +#endif
  
    rv = 0;
-   
+