Update "apr" package to version 1.4.5. Change since version 1.4.4:

- Security: CVE-2011-1928
  apr_fnmatch(): Fix high CPU loop. [William Rowe]
- Fix top_builddir in installed apr_rules.mk. [Bojan Smojver]

Please note the fix for CVE-2011-1928 was previously already integrated
as a patch.

3 files changed, 6 insertions, 44 deletions

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 79d78d4b0a2..427a3c23c29 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2011/05/20 09:23:15 drochner Exp $
+# $NetBSD: Makefile,v 1.64 2011/05/22 22:41:00 tron Exp $
 
-DISTNAME=	apr-1.4.4
-PKGREVISION=	1
+DISTNAME=	apr-1.4.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE:=apr/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/apr/distinfo b/devel/apr/distinfo
index 14797bcaace..06418ed7e2e 100644
--- a/devel/apr/distinfo
+++ b/devel/apr/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.31 2011/05/20 09:23:15 drochner Exp $
+$NetBSD: distinfo,v 1.32 2011/05/22 22:41:00 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
+SHA1 (apr-1.4.5.tar.bz2) = 517de5e3cc1e3be810d9bc95508ab66bb8ebe7cb
+RMD160 (apr-1.4.5.tar.bz2) = d2a966c1b143416cd3655cf849cb5d3cb1ca2c5f
+Size (apr-1.4.5.tar.bz2) = 754763 bytes
diff --git a/devel/apr/patches/patch-aa b/devel/apr/patches/patch-aa
deleted file mode 100644
index 1ce52cd8dce..00000000000
--- a/devel/apr/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2011/05/20 09:23:15 drochner 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 */