6 files changed, 22 insertions, 78 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 51fb7ee32d85..b937bd2563c7 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	mutt
-PORTVERSION=	1.4.2.1
-PORTREVISION=	3
+PORTVERSION=	1.4.2.2
+PORTREVISION=	0
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 0bd432e2d1a3..ca9a36dbde5c 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,9 +1,9 @@
-MD5 (mutt/mutt-1.4.2.1i.tar.gz) = 710bd56d3c4c4bcd1403bc4e053f7476
-SHA256 (mutt/mutt-1.4.2.1i.tar.gz) = ff2cb647ece6c85842bb42943774b434f0059267a0cd55922e95b32202cb66d5
-SIZE (mutt/mutt-1.4.2.1i.tar.gz) = 2611253
-MD5 (mutt/patch-1.4.2.1.rr.compressed.gz) = d73694d88089c32e051b0682ab3bca15
-SHA256 (mutt/patch-1.4.2.1.rr.compressed.gz) = e1603586a359b73f9df614d0b8485689845cb370cbf0775192821dbb6c33a98b
-SIZE (mutt/patch-1.4.2.1.rr.compressed.gz) = 10125
-MD5 (mutt/patch-1.4.2.1.vvv.initials.gz) = fd5cca0c29b4e0fb4cf56cec023a5ab6
-SHA256 (mutt/patch-1.4.2.1.vvv.initials.gz) = ba396d6870922e469a1d22a4e061b342ce058340a7de73950ab6240075207060
-SIZE (mutt/patch-1.4.2.1.vvv.initials.gz) = 686
+MD5 (mutt/mutt-1.4.2.2i.tar.gz) = 51a08429c5bd5c34af3f4268b8cbcda3
+SHA256 (mutt/mutt-1.4.2.2i.tar.gz) = 3e7d16b9d37712149c68ab2ad837dcfa799bed432f8a21696dcd5c0595799397
+SIZE (mutt/mutt-1.4.2.2i.tar.gz) = 2676306
+MD5 (mutt/patch-1.4.2.2.rr.compressed.gz) = 32eeaeaefa82dc869a5af9a32e7279e2
+SHA256 (mutt/patch-1.4.2.2.rr.compressed.gz) = 3f70a8b666e1dd5342acb418aac8cb4a1ab68559b389346052bb1078a3b8dfee
+SIZE (mutt/patch-1.4.2.2.rr.compressed.gz) = 10191
+MD5 (mutt/patch-1.4.2.2.vvv.initials.gz) = b6618c8c0007ca0114b98f6c1174d1e6
+SHA256 (mutt/patch-1.4.2.2.vvv.initials.gz) = 2ab42c9bd369bacf7cad603e242e110c9adfdf18f477ce065fef8dbfbd1a8474
+SIZE (mutt/patch-1.4.2.2.vvv.initials.gz) = 690
diff --git a/mail/mutt/files/patch-imap-browse.c b/mail/mutt/files/patch-imap-browse.c
deleted file mode 100644
index 86cda3140e69..000000000000
--- a/mail/mutt/files/patch-imap-browse.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- imap/browse.c.orig
-+++ imap/browse.c
-@@ -505,7 +505,7 @@ static int browse_get_namespace (IMAP_DA
- 	    if (*s == '\"')
- 	    {
- 	      s++;
--	      while (*s && *s != '\"') 
-+	      while (*s && *s != '\"' && n < sizeof (ns) - 1) 
- 	      {
- 		if (*s == '\\')
- 		  s++;
-@@ -516,12 +516,14 @@ static int browse_get_namespace (IMAP_DA
- 		s++;
- 	    }
- 	    else
--	      while (*s && !ISSPACE (*s)) 
-+	      while (*s && !ISSPACE (*s) && n < sizeof (ns) - 1)
- 	      {
- 		ns[n++] = *s;
- 		s++;
- 	      }
- 	    ns[n] = '\0';
-+	    if (n == sizeof (ns) - 1)
-+	      dprint (1, (debugfile, "browse_get_namespace: too long: [%s]\n", ns));
- 	    /* delim? */
- 	    s = imap_next_word (s);
- 	    /* delimiter is meaningless if namespace is "". Why does
-
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 51fb7ee32d85..b937bd2563c7 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	mutt
-PORTVERSION=	1.4.2.1
-PORTREVISION=	3
+PORTVERSION=	1.4.2.2
+PORTREVISION=	0
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
index 0bd432e2d1a3..ca9a36dbde5c 100644
--- a/mail/mutt14/distinfo
+++ b/mail/mutt14/distinfo
@@ -1,9 +1,9 @@
-MD5 (mutt/mutt-1.4.2.1i.tar.gz) = 710bd56d3c4c4bcd1403bc4e053f7476
-SHA256 (mutt/mutt-1.4.2.1i.tar.gz) = ff2cb647ece6c85842bb42943774b434f0059267a0cd55922e95b32202cb66d5
-SIZE (mutt/mutt-1.4.2.1i.tar.gz) = 2611253
-MD5 (mutt/patch-1.4.2.1.rr.compressed.gz) = d73694d88089c32e051b0682ab3bca15
-SHA256 (mutt/patch-1.4.2.1.rr.compressed.gz) = e1603586a359b73f9df614d0b8485689845cb370cbf0775192821dbb6c33a98b
-SIZE (mutt/patch-1.4.2.1.rr.compressed.gz) = 10125
-MD5 (mutt/patch-1.4.2.1.vvv.initials.gz) = fd5cca0c29b4e0fb4cf56cec023a5ab6
-SHA256 (mutt/patch-1.4.2.1.vvv.initials.gz) = ba396d6870922e469a1d22a4e061b342ce058340a7de73950ab6240075207060
-SIZE (mutt/patch-1.4.2.1.vvv.initials.gz) = 686
+MD5 (mutt/mutt-1.4.2.2i.tar.gz) = 51a08429c5bd5c34af3f4268b8cbcda3
+SHA256 (mutt/mutt-1.4.2.2i.tar.gz) = 3e7d16b9d37712149c68ab2ad837dcfa799bed432f8a21696dcd5c0595799397
+SIZE (mutt/mutt-1.4.2.2i.tar.gz) = 2676306
+MD5 (mutt/patch-1.4.2.2.rr.compressed.gz) = 32eeaeaefa82dc869a5af9a32e7279e2
+SHA256 (mutt/patch-1.4.2.2.rr.compressed.gz) = 3f70a8b666e1dd5342acb418aac8cb4a1ab68559b389346052bb1078a3b8dfee
+SIZE (mutt/patch-1.4.2.2.rr.compressed.gz) = 10191
+MD5 (mutt/patch-1.4.2.2.vvv.initials.gz) = b6618c8c0007ca0114b98f6c1174d1e6
+SHA256 (mutt/patch-1.4.2.2.vvv.initials.gz) = 2ab42c9bd369bacf7cad603e242e110c9adfdf18f477ce065fef8dbfbd1a8474
+SIZE (mutt/patch-1.4.2.2.vvv.initials.gz) = 690
diff --git a/mail/mutt14/files/patch-imap-browse.c b/mail/mutt14/files/patch-imap-browse.c
deleted file mode 100644
index 86cda3140e69..000000000000
--- a/mail/mutt14/files/patch-imap-browse.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- imap/browse.c.orig
-+++ imap/browse.c
-@@ -505,7 +505,7 @@ static int browse_get_namespace (IMAP_DA
- 	    if (*s == '\"')
- 	    {
- 	      s++;
--	      while (*s && *s != '\"') 
-+	      while (*s && *s != '\"' && n < sizeof (ns) - 1) 
- 	      {
- 		if (*s == '\\')
- 		  s++;
-@@ -516,12 +516,14 @@ static int browse_get_namespace (IMAP_DA
- 		s++;
- 	    }
- 	    else
--	      while (*s && !ISSPACE (*s)) 
-+	      while (*s && !ISSPACE (*s) && n < sizeof (ns) - 1)
- 	      {
- 		ns[n++] = *s;
- 		s++;
- 	      }
- 	    ns[n] = '\0';
-+	    if (n == sizeof (ns) - 1)
-+	      dprint (1, (debugfile, "browse_get_namespace: too long: [%s]\n", ns));
- 	    /* delim? */
- 	    s = imap_next_word (s);
- 	    /* delimiter is meaningless if namespace is "". Why does
-