Update "mutt" package to version 1.6.0. Changes since version 1.5.4:

+ Enabled utf-8 mailbox support for IMAP.
+ New expandos %r and %R for comma separated list of To: and Cc:
  recipients respectively.
+ Improved support for internationalized email and SMTPUTF8 (RFC653[0-3]).
! $use_idn has been renamed to $idn_decode.
+ $idn_encode controls whether outgoing email address domains will
  be IDNA encoded.  If your MTA supports it, unset to use utf-8
  email address domains.
+ The S/MIME message digest algorithm is now specified using the
  option $smime_sign_digest_alg.  Note that $smime_sign_command
  should be modified to include "-md %d".  Please see
  contrib/smime.rc.
+ $reflow_space_quotes allows format=flowed email quotes to be
  displayed with spacing between them.
! multipart draft files are now supported.
+ The "-E" command line argument causes mutt to edit draft or include files.
  All changes made in mutt will be saved back out to those files.
+ $resume_draft_files and $resume_edited_draft_files control how
  mutt processes draft files.
+ For classic gpg mode, $pgp_decryption_okay should be set to verify
  multipart/encrypted are actually encrypted.  Please see
  contrib/gpg.rc for the suggested value.
! mailto URL header parameters by default are now restricted to
  'body' and 'subject'.
+ mailto_allow and unmailto_allow can be used to add or remove
  allowed mailto header parameters.
! The method of setting $hostname has been changed.  Rather than
  scanning /etc/resolv.conf, the domain will now be determined using
  DNS calls.

4 files changed, 12 insertions, 141 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index fce0ef7879b..90503cbe402 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.176 2016/03/05 11:28:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.177 2016/04/09 08:47:36 tron Exp $
 
-DISTNAME=		mutt-1.5.24
-PKGREVISION=		3
+DISTNAME=		mutt-1.6.0
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/pub/mutt/
 
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 825a35fb896..d9be420abcd 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,18 +1,15 @@
-$NetBSD: distinfo,v 1.40 2016/02/22 12:13:26 wiz Exp $
+$NetBSD: distinfo,v 1.41 2016/04/09 08:47:36 tron Exp $
 
-SHA1 (mutt-1.5.24.tar.gz) = 38a2da5eb01ff83a90a2caee28fa2e95dbfe6898
-RMD160 (mutt-1.5.24.tar.gz) = 7fe7e653c27c9b580f958493638c1248d0ad5591
-SHA512 (mutt-1.5.24.tar.gz) = f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1
-Size (mutt-1.5.24.tar.gz) = 3897115 bytes
-SHA1 (patch-1.5.24.rr.compressed.gz) = 8da54323dfc9c1049bf0411db2f552593793e99f
-RMD160 (patch-1.5.24.rr.compressed.gz) = 2bf71a26de195ce11ed4ffa25403363cab7c9b72
-Size (patch-1.5.24.rr.compressed.gz) = 10019 bytes
+SHA1 (mutt-1.6.0.tar.gz) = bab62759af0873a94dc8b85a62a7a9e09e33c6bb
+RMD160 (mutt-1.6.0.tar.gz) = 1ea7153ef05413d0068b5478acad87927e5cecdb
+SHA512 (mutt-1.6.0.tar.gz) = 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c
+Size (mutt-1.6.0.tar.gz) = 3954591 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681
 SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
 SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344
 SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6
-SHA1 (patch-af) = edc107c535789919ba2cda5f81a4b640b6100b91
+SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61
 SHA1 (patch-ag) = b7902d2412538f15bc25b123ca742c03a3dd3a12
 SHA1 (patch-ah) = dfe747c30a44bb309cccaca1bd5174fccc3c2bed
 SHA1 (patch-al) = 49542905cde263b8d4c79f71cce3759024c804a3
@@ -21,4 +18,3 @@ SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
 SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
 SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
 SHA1 (patch-aq) = e363d8929ced9731a31af1137b111d3476a3d05d
-SHA1 (patch-crypt.c) = 05cc74fe4ff2543029d82cbeedc27302db9ec4a7
diff --git a/mail/mutt/patches/patch-af b/mail/mutt/patches/patch-af
index 29a8eb1cee2..e1424b9ad7b 100644
--- a/mail/mutt/patches/patch-af
+++ b/mail/mutt/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.6 2015/09/03 14:49:02 wiz Exp $
+$NetBSD: patch-af,v 1.7 2016/04/09 08:47:36 tron Exp $
 
 1.) On some systems, curses.h defines TRUE and FALSE, so conditionalise
     them here to avoid compiler complaints about duplicate definitions.
 
---- lib.h.orig	2014-03-12 16:03:45.000000000 +0000
-+++ lib.h	2014-12-19 20:41:07.000000000 +0000
+--- lib.h.orig	2016-04-02 19:12:22.000000000 +0100
++++ lib.h	2016-04-09 09:34:25.000000000 +0100
 @@ -54,8 +54,12 @@
  #  define N_(a) a
  # endif
@@ -18,5 +18,5 @@ $NetBSD: patch-af,v 1.6 2015/09/03 14:49:02 wiz Exp $
 +#  define FALSE 0
 +# endif
  
- # define HUGE_STRING	5120
+ # define HUGE_STRING     8192
  # define LONG_STRING     1024
diff --git a/mail/mutt/patches/patch-crypt.c b/mail/mutt/patches/patch-crypt.c
deleted file mode 100644
index 45bb61a173e..00000000000
--- a/mail/mutt/patches/patch-crypt.c
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-crypt.c,v 1.1 2016/02/22 12:13:26 wiz Exp $
-
-# HG changeset patch
-# User Kevin McCarthy <kevin@8t8.us>
-# Date 1449022827 28800
-#      Tue Dec 01 18:20:27 2015 -0800
-# Node ID 5e5aff1782dc62044197c2230d346bd492706fbf
-# Parent  428a92464d5bccccda818bed598610db212fcf7c
-Loosen mutt_signed_handler() protocol value consistency check.  (closes #3639)
-
-Apparently, for S/MIME, some MUAs mismatch the protocol value of
-the multipart/signed and the content-type of the signature: putting
-"pkcs7-signature" in one and "x-pkcs7-signature" in the other.
-
-Change mutt_signed_handler() to independently verify the values of the
-protocol and the content-type.  This still checks for correct values but
-doesn't ensure they match between the two (for S/MIME).
-
---- crypt.c.orig	2013-02-06 13:22:15.000000000 +0000
-+++ crypt.c
-@@ -772,9 +772,8 @@ static void crypt_fetch_signatures (BODY
- int mutt_signed_handler (BODY *a, STATE *s)
- {
-   char tempfile[_POSIX_PATH_MAX];
--  char *protocol;
--  int protocol_major = TYPEOTHER;
--  char *protocol_minor = NULL;
-+  int signed_type;
-+  int inconsistent = 0;
-   
-   BODY *b = a;
-   BODY **signatures = NULL;
-@@ -786,29 +785,44 @@ int mutt_signed_handler (BODY *a, STATE 
-   if (!WithCrypto)
-     return -1;
- 
--  protocol = mutt_get_parameter ("protocol", a->parameter);
-   a = a->parts;
--
--  /* extract the protocol information */
--  
--  if (protocol)
-+  signed_type = mutt_is_multipart_signed (b);
-+  if (!signed_type)
-   {
--    char major[STRING];
--    char *t;
--
--    if ((protocol_minor = strchr (protocol, '/'))) protocol_minor++;
--    
--    strfcpy (major, protocol, sizeof(major));
--    if((t = strchr(major, '/')))
--      *t = '\0';
--    
--    protocol_major = mutt_check_mime_type (major);
-+    /* A null protocol value is already checked for in mutt_body_handler() */
-+    state_printf (s, _("[-- Error: "
-+                       "Unknown multipart/signed protocol %s! --]\n\n"),
-+                  mutt_get_parameter ("protocol", b->parameter));
-+    return mutt_body_handler (a, s);
-   }
- 
--  /* consistency check */
--
--  if (!(a && a->next && a->next->type == protocol_major && 
--      !mutt_strcasecmp (a->next->subtype, protocol_minor)))
-+  if (!(a && a->next))
-+    inconsistent = 1;
-+  else
-+  {
-+    switch (signed_type)
-+    {
-+      case SIGN:
-+        if (a->next->type != TYPEMULTIPART ||
-+            ascii_strcasecmp (a->next->subtype, "mixed"))
-+          inconsistent = 1;
-+        break;
-+      case PGPSIGN:
-+        if (a->next->type != TYPEAPPLICATION ||
-+            ascii_strcasecmp (a->next->subtype, "pgp-signature"))
-+          inconsistent = 1;
-+        break;
-+      case SMIMESIGN:
-+        if (a->next->type != TYPEAPPLICATION ||
-+            (ascii_strcasecmp (a->next->subtype, "x-pkcs7-signature") &&
-+             ascii_strcasecmp (a->next->subtype, "pkcs7-signature")))
-+          inconsistent = 1;
-+        break;
-+      default:
-+        inconsistent = 1;
-+    }
-+  }
-+  if (inconsistent)
-   {
-     state_attach_puts (_("[-- Error: "
-                          "Inconsistent multipart/signed structure! --]\n\n"),
-@@ -816,27 +830,6 @@ int mutt_signed_handler (BODY *a, STATE 
-     return mutt_body_handler (a, s);
-   }
- 
--  
--  if ((WithCrypto & APPLICATION_PGP)
--      && protocol_major == TYPEAPPLICATION
--      && !ascii_strcasecmp (protocol_minor, "pgp-signature"))
--    ;
--  else if ((WithCrypto & APPLICATION_SMIME)
--           && protocol_major == TYPEAPPLICATION
--	   && !(ascii_strcasecmp (protocol_minor, "x-pkcs7-signature")
--	       && ascii_strcasecmp (protocol_minor, "pkcs7-signature")))
--    ;
--  else if (protocol_major == TYPEMULTIPART
--	   && !ascii_strcasecmp (protocol_minor, "mixed"))
--    ;
--  else
--  {
--    state_printf (s, _("[-- Error: "
--                       "Unknown multipart/signed protocol %s! --]\n\n"),
--                  protocol);
--    return mutt_body_handler (a, s);
--  }
--  
-   if (s->flags & M_DISPLAY)
-   {
-