upgrade to 1.3.28 + IPv6 patch.

This version of Apache is principally a security and bug fix release.
Of particular note is that 1.3.28 addresses and fixes the following
issues:  CAN-2003-0460 (cve.mitre.org) (rotatelogs bug), VU#379828
(infinite loop potential), and file descriptor leakage .

4 files changed, 39 insertions, 36 deletions

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 8c11835390d..e41ebaf5da8 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2003/07/30 01:53:15 grant Exp $
+# $NetBSD: Makefile,v 1.79 2003/09/12 08:26:44 itojun Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -8,19 +8,17 @@
 
 DISTNAME=		apache_${APACHE_VERSION}
 PKGNAME=		apache6-${APACHE_VERSION}
-PKGREVISION=		3
-APACHE_VERSION=		1.3.27
+APACHE_VERSION=		1.3.28
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
-			${MASTER_SITE_APACHE:=httpd/old/} \
-			http://www.NetBSD.org/images/logos/
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
-			sitedrivenby.gif
-
-PATCH_SITES+=		${MASTER_SITE_LOCAL}
-PATCHFILES+=		${IPV6_PATCH}
-IPV6_PATCH=		apache-1.3.26-ipv6.diff.gz
-PATCH_DIST_STRIP=	-p1
+			${MASTER_SITE_APACHE:=httpd/old/}
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${NETBSD_LOGO}
+
+PATCH_SITES+=		http://www.tendra.org/~asmodai/ipv6/
+PATCHFILES+=		apache-1.3.28-v6-20030911.diff.gz
+
+NETBSD_LOGO=		sitedrivenby.gif
+SITES_${NETBSD_LOGO}=	
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://httpd.apache.org/
diff --git a/www/apache6/PLIST b/www/apache6/PLIST
index 946dd3f2523..45da4ec46cd 100644
--- a/www/apache6/PLIST
+++ b/www/apache6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/10/06 12:50:00 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/09/12 08:26:45 itojun Exp $
 bin/checkgid
 bin/dbmmanage
 bin/htdigest
@@ -101,7 +101,7 @@ share/httpd/htdocs/index.html.ru.ucs2
 share/httpd/htdocs/index.html.ru.ucs4
 share/httpd/htdocs/index.html.ru.utf8
 share/httpd/htdocs/index.html.se
-share/httpd/htdocs/index.html.zh
+share/httpd/htdocs/index.html.zh-tw.big5
 share/httpd/htdocs/manual/LICENSE
 share/httpd/htdocs/manual/bind.html.en
 share/httpd/htdocs/manual/bind.html.fr
@@ -115,7 +115,9 @@ share/httpd/htdocs/manual/configuring.html.en
 share/httpd/htdocs/manual/configuring.html.fr
 share/httpd/htdocs/manual/configuring.html.html
 share/httpd/htdocs/manual/configuring.html.ja.jis
-share/httpd/htdocs/manual/content-negotiation.html
+share/httpd/htdocs/manual/content-negotiation.html.en
+share/httpd/htdocs/manual/content-negotiation.html.html
+share/httpd/htdocs/manual/content-negotiation.html.ja.jis
 share/httpd/htdocs/manual/custom-error.html.en
 share/httpd/htdocs/manual/custom-error.html.fr
 share/httpd/htdocs/manual/custom-error.html.html
@@ -134,13 +136,13 @@ share/httpd/htdocs/manual/handler.html.en
 share/httpd/htdocs/manual/handler.html.html
 share/httpd/htdocs/manual/handler.html.ja.jis
 share/httpd/htdocs/manual/header.html
-share/httpd/htdocs/manual/howto/htaccess.html
 share/httpd/htdocs/manual/howto/auth.html
 share/httpd/htdocs/manual/howto/cgi.html.en
 share/httpd/htdocs/manual/howto/cgi.html.html
 share/httpd/htdocs/manual/howto/cgi.html.ja.jis
 share/httpd/htdocs/manual/howto/footer.html
 share/httpd/htdocs/manual/howto/header.html
+share/httpd/htdocs/manual/howto/htaccess.html
 share/httpd/htdocs/manual/howto/ssi.html.en
 share/httpd/htdocs/manual/howto/ssi.html.html
 share/httpd/htdocs/manual/howto/ssi.html.ja.jis
@@ -200,6 +202,7 @@ share/httpd/htdocs/manual/misc/windoz_keepalive.html
 share/httpd/htdocs/manual/mod/core.html.en
 share/httpd/htdocs/manual/mod/core.html.fr
 share/httpd/htdocs/manual/mod/core.html.html
+share/httpd/htdocs/manual/mod/core.html.ja.jis
 share/httpd/htdocs/manual/mod/directive-dict.html.en
 share/httpd/htdocs/manual/mod/directive-dict.html.fr
 share/httpd/htdocs/manual/mod/directive-dict.html.html
@@ -219,19 +222,21 @@ share/httpd/htdocs/manual/mod/index.html.en
 share/httpd/htdocs/manual/mod/index.html.fr
 share/httpd/htdocs/manual/mod/index.html.html
 share/httpd/htdocs/manual/mod/index.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_alias.html.en
-share/httpd/htdocs/manual/mod/mod_alias.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_auth.html.en
-share/httpd/htdocs/manual/mod/mod_auth.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_access.html.en
 share/httpd/htdocs/manual/mod/mod_access.html.html
 share/httpd/htdocs/manual/mod/mod_access.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_actions.html.en
 share/httpd/htdocs/manual/mod/mod_actions.html.html
 share/httpd/htdocs/manual/mod/mod_actions.html.ja.jis
+share/httpd/htdocs/manual/mod/mod_alias.html.en
+share/httpd/htdocs/manual/mod/mod_alias.html.html
+share/httpd/htdocs/manual/mod/mod_alias.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_asis.html.en
 share/httpd/htdocs/manual/mod/mod_asis.html.html
 share/httpd/htdocs/manual/mod/mod_asis.html.ja.jis
+share/httpd/htdocs/manual/mod/mod_auth.html.en
+share/httpd/htdocs/manual/mod/mod_auth.html.html
+share/httpd/htdocs/manual/mod/mod_auth.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_auth_anon.html
 share/httpd/htdocs/manual/mod/mod_auth_db.html
 share/httpd/htdocs/manual/mod/mod_auth_dbm.html
@@ -262,7 +267,9 @@ share/httpd/htdocs/manual/mod/mod_info.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_isapi.html
 share/httpd/htdocs/manual/mod/mod_log_agent.html
 share/httpd/htdocs/manual/mod/mod_log_common.html
-share/httpd/htdocs/manual/mod/mod_log_config.html
+share/httpd/htdocs/manual/mod/mod_log_config.html.en
+share/httpd/htdocs/manual/mod/mod_log_config.html.html
+share/httpd/htdocs/manual/mod/mod_log_config.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_log_referer.html
 share/httpd/htdocs/manual/mod/mod_mime.html.en
 share/httpd/htdocs/manual/mod/mod_mime.html.html
diff --git a/www/apache6/distinfo b/www/apache6/distinfo
index fa1424e9ed3..ec2ac0211d6 100644
--- a/www/apache6/distinfo
+++ b/www/apache6/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.14 2002/10/06 12:50:00 tron Exp $
+$NetBSD: distinfo,v 1.15 2003/09/12 08:26:45 itojun Exp $
 
-SHA1 (apache_1.3.27.tar.gz) = 2e3a2c8acd546d84f0c4a42de2b1f69dca6828f8
-Size (apache_1.3.27.tar.gz) = 2306052 bytes
-SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
-Size (sitedrivenby.gif) = 8519 bytes
-SHA1 (apache-1.3.26-ipv6.diff.gz) = 610bba0fd90b43834abab1f574ac4c6ebbce6989
-Size (apache-1.3.26-ipv6.diff.gz) = 35421 bytes
-SHA1 (patch-aa) = d8305a8a00d1d017a4e49f35329d5011c4d39ff8
+SHA1 (apache_1.3.28.tar.gz) = a4d0a9c57a53cb641928c882a9d3b6fd645e4e3e
+Size (apache_1.3.28.tar.gz) = 2388111 bytes
+SHA1 (apache-1.3.28-v6-20030911.diff.gz) = fc279dcee91606649f06f74d35d6b5ee38b063b4
+Size (apache-1.3.28-v6-20030911.diff.gz) = 36926 bytes
+SHA1 (patch-aa) = 6388498d251bb4bde65954803ff0b0bce21b27f8
 SHA1 (patch-ab) = 7619dbf1cf584f9e92998fe25de0860bfbeb277e
 SHA1 (patch-ac) = d4dd4f5521a7c713a038dec2606dad14356d746f
 SHA1 (patch-ae) = 2e4e7aab1cff7ddc82697946eeb8d13cd3aa1df0
diff --git a/www/apache6/patches/patch-aa b/www/apache6/patches/patch-aa
index 169871084e9..6ea0f149a6f 100644
--- a/www/apache6/patches/patch-aa
+++ b/www/apache6/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2002/01/01 06:22:55 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2003/09/12 08:26:46 itojun Exp $
 
---- Makefile.tmpl.orig	Sat Oct  6 18:01:09 2001
-+++ Makefile.tmpl
+--- Makefile.tmpl.orig	2003-04-28 22:32:12.000000000 +0900
++++ Makefile.tmpl	2003-09-12 17:20:50.000000000 +0900
 @@ -328,20 +328,7 @@
  			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
  			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
@@ -19,11 +19,11 @@ $NetBSD: patch-aa,v 1.7 2002/01/01 06:22:55 jlam Exp $
 -		sed	-e 's:SharedModule:AddModule:' \
 -			-e 's:modules/[^/]*/::' \
 -			-e 's:[ 	]lib: mod_:' \
--			-e 's:\.[soam].*$$:.c:' >>$(SRC)/.apaci.install.conf; \
+-			-e 's:\.[dsoam].*$$:.c:' >>$(SRC)/.apaci.install.conf; \
  	fi
  	@echo "<=== [programs]"
  
-@@ -457,7 +444,7 @@
+@@ -459,7 +446,7 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.7 2002/01/01 06:22:55 jlam Exp $
  		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
  	else \
  		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-@@ -479,9 +466,10 @@
+@@ -481,9 +468,10 @@
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
@@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.7 2002/01/01 06:22:55 jlam Exp $
  		done; \
  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
-@@ -495,7 +483,7 @@
+@@ -497,7 +485,7 @@
  #   and initial config files while preserving existing ones.
  install-config:
  	@echo "===> [config: Installing Apache configuration files]"