[pkgsrc/pkgsrc-2006Q1]: pkgsrc/mail/mutt-devel Pullup ticket 1713 - requested...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/69d6f4d56c8b
branches:  pkgsrc-2006Q1
changeset: 510363:69d6f4d56c8b
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Tue Jun 27 16:59:27 2006 +0000

description:
Pullup ticket 1713 - requested by salo
security fix for mutt-devel

Revisions pulled up:
- pkgsrc/mail/mutt-devel/Makefile               1.50
- pkgsrc/mail/mutt-devel/distinfo               1.30
- pkgsrc/mail/mutt-devel/patches/patch-ae       1.5

   Module Name: pkgsrc
   Committed By:        tonio
   Date:                Tue Jun 20 14:07:31 UTC 2006

   Modified Files:
        pkgsrc/mail/mutt-devel: Makefile distinfo

   Log Message:
   Add fix for imap code from mutt's cvs repository:
   A malicious IMAP server could cause at least DoS
   Bomp PKGREVISION
---
   Module Name: pkgsrc
   Committed By:        tonio
   Date:                Tue Jun 20 14:08:05 UTC 2006

   Added Files:
        pkgsrc/mail/mutt-devel/patches: patch-ae

   Log Message:
   The patch for imap/browse

diffstat:

 mail/mutt-devel/Makefile         |   4 ++--
 mail/mutt-devel/distinfo         |   3 ++-
 mail/mutt-devel/patches/patch-ae |  29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diffs (63 lines):

diff -r a3314423cbc2 -r 69d6f4d56c8b mail/mutt-devel/Makefile
--- a/mail/mutt-devel/Makefile  Mon Jun 26 07:07:19 2006 +0000
+++ b/mail/mutt-devel/Makefile  Tue Jun 27 16:59:27 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2006/03/14 01:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.45.2.1 2006/06/27 16:59:27 ghen Exp $
 
 DISTNAME=              mutt-1.5.11
-PKGREVISION=   3
+PKGREVISION=           5
 CATEGORIES=            mail
 MUTT_SITES=            ftp://ftp.mutt.org/mutt/ \
                        ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
diff -r a3314423cbc2 -r 69d6f4d56c8b mail/mutt-devel/distinfo
--- a/mail/mutt-devel/distinfo  Mon Jun 26 07:07:19 2006 +0000
+++ b/mail/mutt-devel/distinfo  Tue Jun 27 16:59:27 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2005/10/05 20:08:32 tonio Exp $
+$NetBSD: distinfo,v 1.28.4.1 2006/06/27 16:59:27 ghen Exp $
 
 SHA1 (mutt-1.5.11.tar.gz) = cc5823016fe7de6ee3a131b19a3f78796f9f53d5
 RMD160 (mutt-1.5.11.tar.gz) = 812bfa6b1c9bfb1650341f7522298699c7b214a5
@@ -7,6 +7,7 @@
 SHA1 (patch-ab) = deab9098ad64ab77b29233a3bf3df1439f36989a
 SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
 SHA1 (patch-ad) = c427d4ef5129018f26e5a4b3ee2fa5bfb59af3b9
+SHA1 (patch-ae) = 442e3be4d0a5483e55f8e218cfbfc026e28235f5
 SHA1 (patch-ag) = 84637d95fa9aa0cf58a6e6b2c82b783efa21cf66
 SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
 SHA1 (patch-ai) = 7d9883198a22615fb1792a41fce3ee9821f48f08
diff -r a3314423cbc2 -r 69d6f4d56c8b mail/mutt-devel/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt-devel/patches/patch-ae  Tue Jun 27 16:59:27 2006 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-ae,v 1.4.4.1 2006/06/27 16:59:27 ghen Exp $
+
+--- imap/browse.c.orig 2002-02-26 10:38:56.000000000 +0000
++++ imap/browse.c      2006-06-20 10:05:32.000000000 +0100
+@@ -452,7 +452,7 @@
+           if (*s == '\"')
+           {
+             s++;
+-            while (*s && *s != '\"') 
++            while (*s && *s != '\"' && n < sizeof (ns) - 1) 
+             {
+               if (*s == '\\')
+                 s++;
+@@ -463,12 +463,14 @@
+               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