Pullup ticket #3436 - requested by drochner

devel/apr: security patch

Revisions pulled up:
- devel/apr/Makefile                                            1.63
- devel/apr/distinfo                                            1.31
- devel/apr/patches/patch-aa                                    1.5

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Fri May 20 09:23:16 UTC 2011

   Modified Files:
           pkgsrc/devel/apr: Makefile distinfo
   Added Files:
           pkgsrc/devel/apr/patches: patch-aa

   Log Message:
   add patch from upstream tp fix a regression in the last release
   which could cause hangs
   bump PKGREV

3 files changed, 40 insertions, 2 deletions

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 0cb474e4210..8a74f09ad6f 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.61.4.1 2011/05/15 09:32:37 sbd Exp $
+# $NetBSD: Makefile,v 1.61.4.2 2011/05/21 09:02:08 tron Exp $
 
 DISTNAME=	apr-1.4.4
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE:=apr/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/apr/distinfo b/devel/apr/distinfo
index d3988968464..5d97a3ec1b5 100644
--- a/devel/apr/distinfo
+++ b/devel/apr/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.29.4.1 2011/05/15 09:32:37 sbd Exp $
+$NetBSD: distinfo,v 1.29.4.2 2011/05/21 09:02:08 tron Exp $
 
 SHA1 (apr-1.4.4.tar.bz2) = d05cd65ec169c06174ca7c8978179289777f8dae
 RMD160 (apr-1.4.4.tar.bz2) = 3715774150253d024d79fcf3295f39f822229b85
 Size (apr-1.4.4.tar.bz2) = 759604 bytes
+SHA1 (patch-aa) = 5fb9bc6157c24884efd5d42179ceec0e0af448eb
diff --git a/devel/apr/patches/patch-aa b/devel/apr/patches/patch-aa
new file mode 100644
index 00000000000..48a8f662349
--- /dev/null
+++ b/devel/apr/patches/patch-aa
@@ -0,0 +1,36 @@
+$NetBSD: patch-aa,v 1.5.2.2 2011/05/21 09:02:08 tron Exp $
+
+--- strings/apr_fnmatch.c.orig	2011-05-03 04:51:24.000000000 +0000
++++ strings/apr_fnmatch.c
+@@ -196,7 +196,10 @@ APR_DECLARE(int) apr_fnmatch(const char 
+     const char *mismatch = NULL;
+     int matchlen = 0;
+ 
+-    while (*pattern)
++    if (*pattern == '*')
++        goto firstsegment;
++
++    while (*pattern && *string)
+     {
+         /* Match balanced slashes, starting a new segment pattern
+          */
+@@ -207,6 +210,7 @@ APR_DECLARE(int) apr_fnmatch(const char 
+             ++string;
+         }            
+ 
++firstsegment:
+         /* At the beginning of each segment, validate leading period behavior.
+          */
+         if ((flags & APR_FNM_PERIOD) && (*string == '.'))
+@@ -361,9 +365,9 @@ APR_DECLARE(int) apr_fnmatch(const char 
+             return APR_FNM_NOMATCH;
+     }
+ 
+-    /* pattern is at EOS; if string is also, declare success
++    /* Where both pattern and string are at EOS, declare success
+      */
+-    if (!*string)
++    if (!*string && !*pattern)
+         return 0;
+ 
+     /* pattern didn't match to the end of string */