summaryrefslogtreecommitdiff
path: root/www/apache2
diff options
context:
space:
mode:
authorkefren <kefren@pkgsrc.org>2008-08-09 20:33:37 +0000
committerkefren <kefren@pkgsrc.org>2008-08-09 20:33:37 +0000
commit320bf7f57fd8aa9d32c7dfc003d9d83f32329d49 (patch)
tree265b71af10c19a7fbc43cae8e3486ab911d6c426 /www/apache2
parent94a3b96e82e78d0d8347aba805349941f3338310 (diff)
downloadpkgsrc-320bf7f57fd8aa9d32c7dfc003d9d83f32329d49.tar.gz
CVE-2008-2939
bump PKGREVISION
Diffstat (limited to 'www/apache2')
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/apache2/distinfo3
-rw-r--r--www/apache2/patches/patch-aq11
3 files changed, 15 insertions, 3 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 187c1320a28..2b98cd4a730 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.125 2008/07/10 15:18:23 joerg Exp $
+# $NetBSD: Makefile,v 1.126 2008/08/09 20:33:37 kefren Exp $
.include "Makefile.common"
PKGNAME= apache-${APACHE_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
HOMEPAGE= http://httpd.apache.org/
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index cb63100eb59..7b218b0cb82 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2008/06/20 13:28:08 he Exp $
+$NetBSD: distinfo,v 1.54 2008/08/09 20:33:38 kefren Exp $
SHA1 (httpd-2.0.63.tar.bz2) = 20e2b64944e38e96491af788a37cb709d2c5b755
RMD160 (httpd-2.0.63.tar.bz2) = f6a7de59860f627ac40b245fcf742fb07e1b4870
@@ -14,3 +14,4 @@ SHA1 (patch-al) = 9af7b6c56177d971e135f0a00b3ab9ded5d1b6dd
SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
SHA1 (patch-ao) = c629a7563d0e555922526e26b266251144a14ff6
SHA1 (patch-ap) = 260b9c88bbcb238a81319ff5bef523ec6d765a27
+SHA1 (patch-aq) = ef712b4f0573bb59185eba4143db6917daa7c8bc
diff --git a/www/apache2/patches/patch-aq b/www/apache2/patches/patch-aq
new file mode 100644
index 00000000000..8555fc0a3cc
--- /dev/null
+++ b/www/apache2/patches/patch-aq
@@ -0,0 +1,11 @@
+$NetBSD: patch-aq,v 1.5 2008/08/09 20:33:38 kefren Exp $
+--- modules/proxy/proxy_ftp.c.orig 2008-08-09 23:27:01.000000000 +0300
++++ modules/proxy/proxy_ftp.c 2008-08-09 23:27:30.000000000 +0300
+@@ -382,6 +382,7 @@
+ c->bucket_alloc));
+ }
+ if (wildcard != NULL) {
++ wildcard = ap_escape_html(p, wildcard);
+ APR_BRIGADE_INSERT_TAIL(out, apr_bucket_pool_create(wildcard,
+ strlen(wildcard), p,
+ c->bucket_alloc));