Update "mutt-devel" package to version 1.5.22. This is a bug fix/stability

release over 1.5.21.

11 files changed, 22 insertions, 175 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 7aaea9624d8..3a1fd400315 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.94 2013/05/31 12:41:15 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2013/10/18 10:23:55 tron Exp $
 
-DISTNAME=		mutt-1.5.21
-PKGREVISION=		12
+DISTNAME=		mutt-1.5.22
 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 ba0cf69629a..cb31a703e5b 100644
--- a/mail/mutt-devel/PLIST
+++ b/mail/mutt-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2010/11/07 14:52:47 tonio Exp $
+@comment $NetBSD: PLIST,v 1.24 2013/10/18 10:23:55 tron Exp $
 bin/flea
 bin/mutt
 bin/mutt_dotlock
@@ -10,6 +10,8 @@ man/man1/flea.1
 man/man1/mutt.1
 man/man1/mutt_dotlock.1
 man/man1/muttbug.1
+man/man1/pgpewrap.1
+man/man1/pgpring.1
 man/man1/smime_keys.1
 man/man5/mutt-mbox.5
 man/man5/mutt-mmdf.5
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 42f34c3af37..374a1a25cc4 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,16 +1,10 @@
-$NetBSD: distinfo,v 1.76 2013/03/09 22:15:08 is Exp $
+$NetBSD: distinfo,v 1.77 2013/10/18 10:23:55 tron Exp $
 
-SHA1 (mutt-1.5.21.tar.gz) = a8475f2618ce5d5d33bff85c0affdf21ab1d76b9
-RMD160 (mutt-1.5.21.tar.gz) = b235a42972ae410592253cdc117a90baf279f47a
-Size (mutt-1.5.21.tar.gz) = 3716886 bytes
-SHA1 (patch-1.5.21.rr.compressed.gz) = 5c0ce1e75f2360bb81316e970df75b2bab472bf8
-RMD160 (patch-1.5.21.rr.compressed.gz) = 137a1a9fa042401c078be0de177ecfed60939fbe
-Size (patch-1.5.21.rr.compressed.gz) = 10133 bytes
-SHA1 (sidebar-5302767aa6aa.gz) = 3f87da8e209213a23f228f48ac554beee15adc0a
-RMD160 (sidebar-5302767aa6aa.gz) = c4fd8186cbca3dad30de253b673b9c45cb9abf26
-Size (sidebar-5302767aa6aa.gz) = 11762 bytes
+SHA1 (mutt-1.5.22.tar.gz) = 728a114cb3a44df373dbf1292fc34dd8321057dc
+RMD160 (mutt-1.5.22.tar.gz) = e39bf0ed138e9a4c29f154003c5d42e1b53fdd73
+Size (mutt-1.5.22.tar.gz) = 3782237 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
-SHA1 (patch-ab) = 73d7fcd363d0064366c953fa61cfae9a71dcf9d4
+SHA1 (patch-ab) = 679c57975fe31ace0b2d14de1e9f1172b554a143
 SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
 SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6
@@ -23,9 +17,3 @@ SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
 SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
 SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
 SHA1 (patch-aq) = e363d8929ced9731a31af1137b111d3476a3d05d
-SHA1 (patch-lib.c) = 7a0dc485ac8351b4c41279e22cf74134462c6432
-SHA1 (patch-pop.c) = 943fec58724f4ea305fe2e4d1c48fa1c2945f087
-SHA1 (patch-pop__lib.c) = b183a9c75804189a14cdffbe2a19e52d29aa536a
-SHA1 (patch-rfc1524.c) = 78f5fb9ef54dd3c5e1ffdc9dcf0516eb7c4bd3a8
-SHA1 (patch-sendlib.c) = 627ca73a3fff118a886c665a56b22d0c3b1a6165
-SHA1 (patch-smime.c) = 5ed07d69700992767572216844e44d655f5eec7d
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index bb94c5a9e78..c3ce8dfc856 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.43 2012/08/28 20:15:41 tonio Exp $
+# $NetBSD: options.mk,v 1.44 2013/10/18 10:23:55 tron Exp $
 
 # Global and legacy options
 
@@ -8,8 +8,8 @@ PKG_OPTIONS_GROUP.display=	slang ncurses ncursesw curses
 PKG_SUPPORTED_OPTIONS=	debug gpgme idn ssl smime sasl
 PKG_SUPPORTED_OPTIONS+=	mutt-hcache tokyocabinet mutt-smtp
 # Comment the following line out on updates.
-PKG_SUPPORTED_OPTIONS+=	mutt-compressed-mbox
-PKG_SUPPORTED_OPTIONS+=	mutt-sidebar
+#PKG_SUPPORTED_OPTIONS+=	mutt-compressed-mbox
+#PKG_SUPPORTED_OPTIONS+=	mutt-sidebar
 #PKG_SUPPORTED_OPTIONS+=	mutt-xlabel
 PKG_SUGGESTED_OPTIONS=	ssl smime curses
 
diff --git a/mail/mutt-devel/patches/patch-ab b/mail/mutt-devel/patches/patch-ab
index 5253eea2b18..8b6fc03bd5b 100644
--- a/mail/mutt-devel/patches/patch-ab
+++ b/mail/mutt-devel/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.15 2010/11/07 14:52:47 tonio Exp $
+$NetBSD: patch-ab,v 1.16 2013/10/18 10:23:55 tron Exp $
 
---- Makefile.in.orig	2010-08-25 16:31:48.000000000 +0000
-+++ Makefile.in
-@@ -65,7 +65,7 @@ CONFIG_CLEAN_FILES = intl/Makefile hcach
+--- Makefile.in.orig	2013-10-18 06:49:17.000000000 +0100
++++ Makefile.in	2013-10-18 10:50:46.000000000 +0100
+@@ -109,7 +109,7 @@
  CONFIG_CLEAN_VPATH_FILES =
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
  PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.15 2010/11/07 14:52:47 tonio Exp $
  	base64.$(OBJEXT) browser.$(OBJEXT) buffy.$(OBJEXT) \
  	color.$(OBJEXT) crypt.$(OBJEXT) cryptglue.$(OBJEXT) \
  	commands.$(OBJEXT) complete.$(OBJEXT) compose.$(OBJEXT) \
-@@ -215,7 +215,7 @@ DATADIRNAME = @DATADIRNAME@
+@@ -325,7 +325,7 @@
  DBX = @DBX@
  DEBUGGER = @DEBUGGER@
  DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.15 2010/11/07 14:52:47 tonio Exp $
  	-DHAVE_CONFIG_H=1
  
  DEPDIR = @DEPDIR@
-@@ -322,7 +322,7 @@ infodir = @infodir@
+@@ -431,7 +431,7 @@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -29,16 +29,7 @@ $NetBSD: patch-ab,v 1.15 2010/11/07 14:52:47 tonio Exp $
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -346,7 +346,7 @@ SUBDIRS = m4 po intl doc contrib $(IMAP_
- bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
- @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
- BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h $(HCVERSION)
--mutt_SOURCES = \
-+mutt_SOURCES = mvchgat.c \
- 	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
- 	crypt.c cryptglue.c \
- 	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
-@@ -666,6 +666,7 @@ distclean-compile:
+@@ -786,6 +786,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc2231.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc3676.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc822.Po@am__quote@
@@ -46,14 +37,14 @@ $NetBSD: patch-ab,v 1.15 2010/11/07 14:52:47 tonio Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe_asprintf.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/score.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@
-@@ -1194,11 +1195,6 @@ install-exec-hook:
+@@ -1313,11 +1314,6 @@
  		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
  		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
  	fi
 -	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
 -		chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
 -		chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
--		{ echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
+-		{ echo "Can't fix mutt_dotlock's permissions!  This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
 -	fi
  
  install-data-local:
diff --git a/mail/mutt-devel/patches/patch-lib.c b/mail/mutt-devel/patches/patch-lib.c
deleted file mode 100644
index 784595b9d64..00000000000
--- a/mail/mutt-devel/patches/patch-lib.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-lib.c,v 1.1 2013/02/28 19:21:04 is Exp $
-
---- lib.c.orig	2013-02-28 15:59:08.000000000 +0000
-+++ lib.c
-@@ -548,7 +548,6 @@ static int mutt_mkwrapdir (const char *p
-   const char *basename;
-   char parent[_POSIX_PATH_MAX];
-   char *p;
--  int rv;
- 
-   strfcpy (parent, NONULL (path), sizeof (parent));
-   
-@@ -563,14 +562,8 @@ static int mutt_mkwrapdir (const char *p
-     basename = path;
-   }
- 
--  do 
--  {
--    snprintf (newdir, ndlen, "%s/%s", parent, ".muttXXXXXX");
--    mktemp (newdir);
--  } 
--  while ((rv = mkdir (newdir, 0700)) == -1 && errno == EEXIST);
--  
--  if (rv == -1)
-+  snprintf (newdir, ndlen, "%s/%s", parent, ".muttXXXXXX");
-+  if (mkdtemp (newdir) == NULL)
-     return -1;
-   
-   snprintf (newfile, nflen, "%s/%s", newdir, NONULL(basename));
diff --git a/mail/mutt-devel/patches/patch-pop.c b/mail/mutt-devel/patches/patch-pop.c
deleted file mode 100644
index b68ea9daee0..00000000000
--- a/mail/mutt-devel/patches/patch-pop.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-pop.c,v 1.1 2013/03/06 20:53:39 is Exp $
-
-Index: pop.c
-===================================================================
---- pop.c	(revision 6288)
-+++ pop.c	(revision 6299)
-@@ -34,4 +34,5 @@
- #include <string.h>
- #include <unistd.h>
-+#include <errno.h>
- 
- #ifdef USE_HCACHE
-@@ -142,6 +143,14 @@
-   CONTEXT *ctx = (CONTEXT *)data;
-   POP_DATA *pop_data = (POP_DATA *)ctx->data;
--
--  sscanf (line, "%d %s", &index, line);
-+  char *endp;
-+
-+  errno = 0;
-+  index = strtol(line, &endp, 10);
-+  if (errno)
-+      return -1;
-+  while (*endp == ' ')
-+      endp++;
-+  memmove(line, endp, strlen(endp) + 1);
-+
-   for (i = 0; i < ctx->msgcount; i++)
-     if (!mutt_strcmp (line, ctx->hdrs[i]->data))
diff --git a/mail/mutt-devel/patches/patch-pop__lib.c b/mail/mutt-devel/patches/patch-pop__lib.c
deleted file mode 100644
index 0a962a027f3..00000000000
--- a/mail/mutt-devel/patches/patch-pop__lib.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-pop__lib.c,v 1.1 2013/03/06 20:53:39 is Exp $
-
-Index: pop_lib.c
-===================================================================
---- pop_lib.c	(revision 6235)
-+++ pop_lib.c	(revision 6299)
-@@ -33,4 +33,5 @@
- #include <ctype.h>
- #include <netdb.h>
-+#include <errno.h>
- 
- /* given an POP mailbox name, return host, port, username and password */
-@@ -524,6 +525,14 @@
-   unsigned int index;
-   CONTEXT *ctx = (CONTEXT *)data;
--
--  sscanf (line, "%u %s", &index, line);
-+  char *endp;
-+
-+  errno = 0;
-+  index = strtoul(line, &endp, 10);
-+  if (errno)
-+      return -1;
-+  while (*endp == ' ')
-+      endp++;
-+  memmove(line, endp, strlen(endp) + 1);
-+
-   for (i = 0; i < ctx->msgcount; i++)
-   {
diff --git a/mail/mutt-devel/patches/patch-rfc1524.c b/mail/mutt-devel/patches/patch-rfc1524.c
deleted file mode 100644
index 6a9fbc09aa5..00000000000
--- a/mail/mutt-devel/patches/patch-rfc1524.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-rfc1524.c,v 1.1 2013/03/09 22:15:08 is Exp $
-
-Index: rfc1524.c
-===================================================================
---- rfc1524.c	(revision 6235)
-+++ rfc1524.c	(revision 6297)
-@@ -69,5 +69,5 @@
-     mutt_sanitize_filename (type, 0);
- 
--  while (x < clen && command[x] && y < sizeof (buf) - 1)
-+  while (x < clen - 1 && command[x] && y < sizeof (buf) - 1)
-   {
-     if (command[x] == '\\')
diff --git a/mail/mutt-devel/patches/patch-sendlib.c b/mail/mutt-devel/patches/patch-sendlib.c
deleted file mode 100644
index 1734050c6d4..00000000000
--- a/mail/mutt-devel/patches/patch-sendlib.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-sendlib.c,v 1.1 2013/03/09 22:15:08 is Exp $
-
-Index: sendlib.c
-===================================================================
---- sendlib.c	(revision 6255)
-+++ sendlib.c	(revision 6297)
-@@ -1665,5 +1665,5 @@
-      * whitespace we can fold before */
-     next = find_word (p);
--    l = MIN(sizeof (buf), next - p);
-+    l = MIN(sizeof (buf) - 1, next - p);
-     memcpy (buf, p, l);
-     buf[l] = 0;
diff --git a/mail/mutt-devel/patches/patch-smime.c b/mail/mutt-devel/patches/patch-smime.c
deleted file mode 100644
index 88d9f1463ee..00000000000
--- a/mail/mutt-devel/patches/patch-smime.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-smime.c,v 1.1 2013/03/06 20:17:43 is Exp $
-
-Index: smime.c
-===================================================================
---- smime.c	(revision 6178)
-+++ smime.c	(revision 6298)
-@@ -358,5 +358,5 @@
-   FILE *index;
-   char buf[LONG_STRING];
--  char fields[5][STRING];
-+  char fields[5][STRING+1]; /* +1 due to use of fscanf() below. the max field width does not include the null terminator (see http://dev.mutt.org/trac/ticket/3636) */
-   int numFields, hash_suffix, done, cur; /* The current entry */
-   MUTTMENU* menu;
-@@ -471,5 +471,5 @@
-   char cert_path[_POSIX_PATH_MAX];
-   char buf[LONG_STRING], prompt[STRING];
--  char fields[5][STRING];
-+  char fields[5][STRING+1]; /* +1 due to use of fscanf() below. the max field width does not include the null terminator (see http://dev.mutt.org/trac/ticket/3636) */
-   char key[STRING];  
-   int numFields;