[pkgsrc/pkgsrc-2008Q2]: pkgsrc/www/apache2 Pullup ticket 2477 - requested by ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e34e71bdd087
branches:  pkgsrc-2008Q2
changeset: 544228:e34e71bdd087
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Aug 10 11:57:39 2008 +0000

description:
Pullup ticket 2477 - requested by kefren
Security patch for apache2

Revisions pulled up:
- www/apache2/Makefile          1.126
- www/apache2/distinfo          1.54
- www/apache2/patches/patch-aq  1.5
---
Module Name:    pkgsrc
Committed By:   kefren
Date:           Sat Aug  9 20:33:38 UTC 2008

Modified Files:
        pkgsrc/www/apache2: Makefile distinfo
Added Files:
        pkgsrc/www/apache2/patches: patch-aq

Log Message:
CVE-2008-2939
bump PKGREVISION

diffstat:

 www/apache2/Makefile         |   4 ++--
 www/apache2/distinfo         |   3 ++-
 www/apache2/patches/patch-aq |  11 +++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r 2f4c58c45c4b -r e34e71bdd087 www/apache2/Makefile
--- a/www/apache2/Makefile      Fri Aug 08 14:39:50 2008 +0000
+++ b/www/apache2/Makefile      Sun Aug 10 11:57:39 2008 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.125 2008/07/10 15:18:23 joerg Exp $
+# $NetBSD: Makefile,v 1.125.4.1 2008/08/10 11:57:39 tron Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       apache-${APACHE_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www
 
 HOMEPAGE=      http://httpd.apache.org/
diff -r 2f4c58c45c4b -r e34e71bdd087 www/apache2/distinfo
--- a/www/apache2/distinfo      Fri Aug 08 14:39:50 2008 +0000
+++ b/www/apache2/distinfo      Sun Aug 10 11:57:39 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2008/06/20 13:28:08 he Exp $
+$NetBSD: distinfo,v 1.53.4.1 2008/08/10 11:57:39 tron Exp $
 
 SHA1 (httpd-2.0.63.tar.bz2) = 20e2b64944e38e96491af788a37cb709d2c5b755
 RMD160 (httpd-2.0.63.tar.bz2) = f6a7de59860f627ac40b245fcf742fb07e1b4870
@@ -14,3 +14,4 @@
 SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
 SHA1 (patch-ao) = c629a7563d0e555922526e26b266251144a14ff6
 SHA1 (patch-ap) = 260b9c88bbcb238a81319ff5bef523ec6d765a27
+SHA1 (patch-aq) = ef712b4f0573bb59185eba4143db6917daa7c8bc
diff -r 2f4c58c45c4b -r e34e71bdd087 www/apache2/patches/patch-aq
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache2/patches/patch-aq      Sun Aug 10 11:57:39 2008 +0000
@@ -0,0 +1,11 @@
+$NetBSD: patch-aq,v 1.4.8.1 2008/08/10 11:57:39 tron 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));