From 14db98734a3344536c3fc81c31edf4d06cb361b5 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Wed, 18 Jun 2008 21:38:00 +0000
Subject: Update "apache22" package to version 2.2.9. This version of Apache is
 principally a bug and security fix release. The following potential security
 flaws are addressed: - CVE-2008-2364: mod_proxy_http: Better handling of
 excessive interim   responses from origin server to prevent potential denial
 of service and   high memory usage. Reported by Ryujiro Shibuya. -
 CVE-2007-6420: mod_proxy_balancer: Prevent CSRF attacks against the  
 balancer-manager interface.

pkgsrc related notes:
- CVE-2008-2364 was already fixed in "pkgsrc"
- CVE-2007-6420 doesn't affect the package in the default configuration
  because the "proxy_balancer" isn't enabled.
---
 www/apache22/patches/patch-aa | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'www/apache22/patches/patch-aa')

diff --git a/www/apache22/patches/patch-aa b/www/apache22/patches/patch-aa
index 0689a2713b2..ce7f6a8913d 100644
--- a/www/apache22/patches/patch-aa
+++ b/www/apache22/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2007/09/08 11:02:07 tron Exp $
+$NetBSD: patch-aa,v 1.3 2008/06/18 21:38:01 tron Exp $
 
---- Makefile.in.orig	2007-04-24 12:08:01.000000000 +0100
-+++ Makefile.in	2007-09-08 11:31:13.000000000 +0100
+--- Makefile.in.orig	2008-02-04 23:00:07.000000000 +0000
++++ Makefile.in	2008-06-18 21:49:27.000000000 +0100
 @@ -4,7 +4,7 @@
  
  PROGRAM_NAME         = $(progname)
@@ -31,8 +31,8 @@ $NetBSD: patch-aa,v 1.2 2007/09/08 11:02:07 tron Exp $
  	@cd $(top_srcdir)/docs/conf; \
  	for i in mime.types magic; do \
  	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
-@@ -66,7 +66,8 @@
- 	    				-e 's#@@Port@@#$(PORT)#g' \
+@@ -69,7 +69,8 @@
+ 	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
  	    				< $$i; \
  	    		fi \
 -	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \
@@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.2 2007/09/08 11:02:07 tron Exp $
  	    	chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \
  	    	file=$$i; \
  	    	if [ "$$i" = "httpd.conf" ]; then \
-@@ -76,13 +77,16 @@
+@@ -79,13 +80,16 @@
  	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
  	    	fi; \
  	    	fi; \
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.2 2007/09/08 11:02:07 tron Exp $
  	fi
  
  # Create a sanitized config_vars.mk
-@@ -100,7 +104,7 @@
+@@ -103,7 +107,7 @@
  		  $(top_srcdir)/build/instdso.sh; do \
  	 $(INSTALL_PROGRAM) $$f $(DESTDIR)$(installbuilddir); \
  	done
@@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.2 2007/09/08 11:02:07 tron Exp $
  	@rm build/config_vars.out
  
  htdocs-srcdir = $(top_srcdir)/docs/docroot
-@@ -117,48 +121,27 @@
+@@ -120,48 +124,27 @@
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -124,7 +124,7 @@ $NetBSD: patch-aa,v 1.2 2007/09/08 11:02:07 tron Exp $
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
-@@ -204,14 +187,10 @@
+@@ -207,14 +190,10 @@
  	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
  	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
  	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
-- 
cgit v1.2.3