Update mail/mutt-devel to 1.5.20

The keys used are:
  !: modified feature, -: deleted feature, +: new feature

1.5.20 (2009-06-14):
  ! $fcc_attach is a quadoption now
  + $honor_disposition to honor Content-Disposition headers
  + $search_context specifies number of context lines for search results
    in pager/page-based menus
  + ssl_use_sslv2 defaults to no
  + uncolor works for header + body objects, too
  + the "flagged" and "replied" flags are enabled/supported for
    POP when built with header caching
  ! browser correctly displays maildir's mtime
  + <set-flag> and <clear-flag> work in the pager, too
  + ~x pattern also matches against In-Reply-To
  + lower case patterns for string searches perform case-insensitive
    search as regex patterns do (except IMAP)
  + $ssl_verify_dates controls whether mutt checks the validity period of
    SSL certificates
  + $ssl_verify_hostname controls whether mutt will accept certificates whose
    host names do not match the host name in the folder URL.

Disable temporarily mutt-compressed-mbox and mutt-xlabel as the patches are not
available for this version yet.

6 files changed, 19 insertions, 52 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index c52740ccb77..7a6d5870c72 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2009/04/12 08:25:43 tonio Exp $
+# $NetBSD: Makefile,v 1.75 2009/07/16 20:23:41 tonio Exp $
 
-DISTNAME=		mutt-1.5.19
-PKGREVISION=		2
+DISTNAME=		mutt-1.5.20
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
index cb0f1f4f061..8bc72223378 100644
--- a/mail/mutt-devel/PLIST
+++ b/mail/mutt-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2009/06/14 18:04:38 joerg Exp $
+@comment $NetBSD: PLIST,v 1.22 2009/07/16 20:23:41 tonio Exp $
 bin/flea
 bin/mutt
 bin/mutt_dotlock
@@ -37,6 +37,7 @@ share/doc/mutt/miscellany.html
 share/doc/mutt/optionalfeatures.html
 share/doc/mutt/patch-notes.txt
 share/doc/mutt/reference.html
+share/doc/mutt/security.html
 share/doc/mutt/smime-notes.txt
 share/doc/mutt/tuning.html
 share/examples/mutt/Mush.rc
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index f8882e5fe59..fa6c8d0b42c 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,21 +1,17 @@
-$NetBSD: distinfo,v 1.57 2009/04/12 08:25:43 tonio Exp $
+$NetBSD: distinfo,v 1.58 2009/07/16 20:23:41 tonio Exp $
 
-SHA1 (mutt-1.5.19.tar.gz) = 96e4cc1e1419ba816fcc19d77255978e62c20793
-RMD160 (mutt-1.5.19.tar.gz) = dcb8d027593bfccd62eb7aba338007bce3c7e22e
-Size (mutt-1.5.19.tar.gz) = 3558746 bytes
-SHA1 (patch-1.5.19.rr.compressed.1.gz) = c639230a5fdac96d5a4e735e320af66e4bde688a
-RMD160 (patch-1.5.19.rr.compressed.1.gz) = b8eb5201fde7511377e5588953c071d0b7e30c8d
-Size (patch-1.5.19.rr.compressed.1.gz) = 10562 bytes
-SHA1 (patch-1.5.19.sidebar.20090308.txt) = c16533176fce2b48d27cd587b63caa379258e740
-RMD160 (patch-1.5.19.sidebar.20090308.txt) = 076272ffcb70f118c1d8850c430f3d74f43ad23b
-Size (patch-1.5.19.sidebar.20090308.txt) = 51936 bytes
+SHA1 (mutt-1.5.20.tar.gz) = d2bec7a33771f128ca49b1723b06b6d248a35d31
+RMD160 (mutt-1.5.20.tar.gz) = df582f79364b9fd70a0001e76a119d8f78275ebb
+Size (mutt-1.5.20.tar.gz) = 3635047 bytes
+SHA1 (patch-1.5.20.sidebar.20090619.txt) = d72355e39674bb4f892e4af3b84fe49c94415487
+RMD160 (patch-1.5.20.sidebar.20090619.txt) = 4c693b100a320d11ea94aedb75cff63d9f6cfb3f
+Size (patch-1.5.20.sidebar.20090619.txt) = 53335 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = 39a3cbe6e1738e036cb679a22c7385ed5ac401eb
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
 SHA1 (patch-ag) = 2b76839be18271a72cb9e407f54879736f2a7ad6
 SHA1 (patch-al) = ac8d963286d9edee73ee00bdb8f4ffcd65c6cd5d
 SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
-SHA1 (patch-an) = 96eb3aeea3f567b4835eac5d799355f62ad5a455
+SHA1 (patch-an) = eae26290a7a03b3ba31d058cd154c4de8effcf98
 SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
 SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
-SHA1 (patch-aq) = d327ac440e65516515ddc1646b849b27af61e864
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index 8654748f84d..0545ecf23b7 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.35 2009/04/12 08:25:43 tonio Exp $
+# $NetBSD: options.mk,v 1.36 2009/07/16 20:23:41 tonio Exp $
 
 # Global and legacy options
 
@@ -8,7 +8,7 @@ PKG_OPTIONS_GROUP.display=	slang ncurses ncursesw curses
 PKG_SUPPORTED_OPTIONS=	debug gpgme idn ssl smime sasl
 PKG_SUPPORTED_OPTIONS+=	mutt-hcache mutt-smtp
 # Comment the following line out on updates.
-PKG_SUPPORTED_OPTIONS+=	mutt-compressed-mbox
+#PKG_SUPPORTED_OPTIONS+=	mutt-compressed-mbox
 PKG_SUPPORTED_OPTIONS+=	mutt-sidebar
 #PKG_SUPPORTED_OPTIONS+=	mutt-xlabel
 PKG_SUGGESTED_OPTIONS=	ssl smime curses
@@ -125,7 +125,7 @@ CONFIGURE_ARGS+=	--disable-smtp
 ###
 .if !empty(PKG_OPTIONS:Mmutt-sidebar)
 PATCH_SITES=		http://lunar-linux.org/~tchan/mutt/
-PATCHFILES+=		patch-1.5.19.sidebar.20090308.txt
+PATCHFILES+=		patch-1.5.20.sidebar.20090619.txt
 PATCH_DIST_STRIP=	-p1
 PATCH_FUZZ_FACTOR=	-F1
 .endif
diff --git a/mail/mutt-devel/patches/patch-an b/mail/mutt-devel/patches/patch-an
index 4a78b9e5bfb..1931358dbbe 100644
--- a/mail/mutt-devel/patches/patch-an
+++ b/mail/mutt-devel/patches/patch-an
@@ -1,10 +1,10 @@
-$NetBSD: patch-an,v 1.3 2009/01/26 22:35:03 tonio Exp $
+$NetBSD: patch-an,v 1.4 2009/07/16 20:23:41 tonio Exp $
 
 Add change_folder_next option.
 
---- init.h.orig	2009-01-05 20:20:53.000000000 +0100
+--- init.h.orig	2009-06-13 23:35:21.000000000 +0200
 +++ init.h
-@@ -341,6 +341,13 @@ struct option_t MuttVars[] = {
+@@ -355,6 +355,13 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP It should only be set in case Mutt isn't abled to determine the
    ** character set used correctly.
    */
@@ -15,6 +15,6 @@ Add change_folder_next option.
 +  ** next folder after the current folder in your mailbox list instead of
 +  ** starting at the first folder.
 +  */
-   { "check_new",	DT_BOOL, R_NONE, OPTCHECKNEW, 1 },
+   { "check_mbox_size",	DT_BOOL, R_NONE, OPTCHECKMBOXSIZE, 0 },
    /*
    ** .pp
diff --git a/mail/mutt-devel/patches/patch-aq b/mail/mutt-devel/patches/patch-aq
deleted file mode 100644
index 9663d13af03..00000000000
--- a/mail/mutt-devel/patches/patch-aq
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2009/02/05 13:45:28 tonio Exp $
-
-Avoid crash with 64bit time_t.
-From PR pkg/40548
-
---- mh.c.orig	2009-01-05 20:20:53.000000000 +0100
-+++ mh.c
-@@ -1242,8 +1242,8 @@ int maildir_open_new_message (MESSAGE * 
-   omask = umask (mh_umask (dest));
-   FOREVER
-   {
--    snprintf (path, _POSIX_PATH_MAX, "%s/tmp/%s.%ld.%u_%d.%s%s",
--	      dest->path, subdir, time (NULL), (unsigned int)getpid (),
-+    snprintf (path, _POSIX_PATH_MAX, "%s/tmp/%s.%lld.%u_%d.%s%s",
-+	      dest->path, subdir, (long long)time (NULL), (unsigned int)getpid (),
- 	      Counter++, NONULL (Hostname), suffix);
- 
-     dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
-@@ -1328,8 +1328,8 @@ int maildir_commit_message (CONTEXT * ct
-   /* construct a new file name. */
-   FOREVER
-   {
--    snprintf (path, _POSIX_PATH_MAX, "%s/%ld.%u_%d.%s%s", subdir,
--	      time (NULL), (unsigned int)getpid (), Counter++, 
-+    snprintf (path, _POSIX_PATH_MAX, "%s/%lld.%u_%d.%s%s", subdir,
-+	      (long long)time (NULL), (unsigned int)getpid (), Counter++, 
- 	      NONULL (Hostname), suffix);
-     snprintf (full, _POSIX_PATH_MAX, "%s/%s", ctx->path, path);
-