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.

6 files changed, 141 insertions, 236 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 3371ed7e082..47712b87012 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2008/06/12 14:12:19 tron Exp $
+# $NetBSD: Makefile,v 1.27 2008/06/18 21:38:00 tron Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	apache-${APACHE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	www
 
 HOMEPAGE=	http://httpd.apache.org/
@@ -27,6 +26,7 @@ CONFIGURE_ENV+=		ac_cv_path_RSYNC=/nonexistent
 CONFIGURE_ARGS+=	--with-apr=${BUILDLINK_PREFIX.apr}
 CONFIGURE_ARGS+=	--with-apr-util=${BUILDLINK_PREFIX.apr-util}
 
+CHECK_INTERPRETER_SKIP+=	lib/httpd/httpd.exp
 CHECK_PORTABILITY_SKIP+=	srclib/pcre/* \
 				srclib/apr-util/* \
 				srclib/apr/*
@@ -264,6 +264,7 @@ post-install:
 		${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/${PKGMANDIR}/$$file; \
 	done
 
-	[ ! -f ${PREFIX}/sbin/suexec ] || ${CHMOD} -w ${PREFIX}/sbin/suexec
+	${CHMOD} -x ${PREFIX}/sbin/envvars-std
+	${TEST} ! -f ${PREFIX}/sbin/suexec || ${CHMOD} -w ${PREFIX}/sbin/suexec
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache22/Makefile.common b/www/apache22/Makefile.common
index 65bcdd4fb8b..fc2e78b45cf 100644
--- a/www/apache22/Makefile.common
+++ b/www/apache22/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2008/01/21 15:07:10 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/06/18 21:38:00 tron Exp $
 
 DISTNAME=		httpd-${APACHE_VERSION}
 EXTRACT_SUFX=		.tar.bz2
 # When updating this version be sure to update the checksum.
-APACHE_VERSION=		2.2.8
+APACHE_VERSION=		2.2.9
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/} \
 			http://www.NetBSD.org/images/logos/
diff --git a/www/apache22/PLIST b/www/apache22/PLIST
index d5420596657..db46465b473 100644
--- a/www/apache22/PLIST
+++ b/www/apache22/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/06/18 21:38:01 tron Exp $
+${PLIST.suexec}sbin/suexec
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
 include/httpd/ap_config_auto.h
@@ -75,7 +76,6 @@ sbin/httxt2dbm
 sbin/logresolve
 sbin/mkcert
 sbin/rotatelogs
-${PLIST.suexec}sbin/suexec
 share/examples/httpd/extra/httpd-autoindex.conf
 share/examples/httpd/extra/httpd-dav.conf
 share/examples/httpd/extra/httpd-default.conf
@@ -355,8 +355,9 @@ share/httpd/manual/bind.html
 share/httpd/manual/bind.html.de
 share/httpd/manual/bind.html.en
 share/httpd/manual/bind.html.fr
-share/httpd/manual/bind.html.ja.euc-jp
+share/httpd/manual/bind.html.ja.utf8
 share/httpd/manual/bind.html.ko.euc-kr
+share/httpd/manual/bind.html.tr.utf8
 share/httpd/manual/caching.html
 share/httpd/manual/caching.html.en
 share/httpd/manual/caching.html.fr
@@ -364,18 +365,19 @@ share/httpd/manual/configuring.html
 share/httpd/manual/configuring.html.de
 share/httpd/manual/configuring.html.en
 share/httpd/manual/configuring.html.fr
-share/httpd/manual/configuring.html.ja.euc-jp
+share/httpd/manual/configuring.html.ja.utf8
 share/httpd/manual/configuring.html.ko.euc-kr
+share/httpd/manual/configuring.html.tr.utf8
 share/httpd/manual/content-negotiation.html
 share/httpd/manual/content-negotiation.html.en
 share/httpd/manual/content-negotiation.html.fr
-share/httpd/manual/content-negotiation.html.ja.euc-jp
+share/httpd/manual/content-negotiation.html.ja.utf8
 share/httpd/manual/content-negotiation.html.ko.euc-kr
 share/httpd/manual/convenience.map
 share/httpd/manual/custom-error.html
 share/httpd/manual/custom-error.html.en
 share/httpd/manual/custom-error.html.es
-share/httpd/manual/custom-error.html.ja.euc-jp
+share/httpd/manual/custom-error.html.ja.utf8
 share/httpd/manual/custom-error.html.ko.euc-kr
 share/httpd/manual/developer/API.html
 share/httpd/manual/developer/API.html.en
@@ -391,30 +393,31 @@ share/httpd/manual/developer/index.html
 share/httpd/manual/developer/index.html.en
 share/httpd/manual/developer/modules.html
 share/httpd/manual/developer/modules.html.en
-share/httpd/manual/developer/modules.html.ja.euc-jp
+share/httpd/manual/developer/modules.html.ja.utf8
 share/httpd/manual/developer/request.html
 share/httpd/manual/developer/request.html.en
 share/httpd/manual/developer/thread_safety.html
 share/httpd/manual/developer/thread_safety.html.en
 share/httpd/manual/dns-caveats.html
 share/httpd/manual/dns-caveats.html.en
-share/httpd/manual/dns-caveats.html.ja.euc-jp
+share/httpd/manual/dns-caveats.html.ja.utf8
 share/httpd/manual/dns-caveats.html.ko.euc-kr
 share/httpd/manual/dso.html
 share/httpd/manual/dso.html.en
-share/httpd/manual/dso.html.ja.euc-jp
+share/httpd/manual/dso.html.ja.utf8
 share/httpd/manual/dso.html.ko.euc-kr
 share/httpd/manual/env.html
 share/httpd/manual/env.html.en
-share/httpd/manual/env.html.ja.euc-jp
+share/httpd/manual/env.html.ja.utf8
 share/httpd/manual/env.html.ko.euc-kr
 share/httpd/manual/faq/index.html
 share/httpd/manual/faq/index.html.en
+share/httpd/manual/faq/index.html.tr.utf8
 share/httpd/manual/filter.html
 share/httpd/manual/filter.html.en
 share/httpd/manual/filter.html.es
 share/httpd/manual/filter.html.fr
-share/httpd/manual/filter.html.ja.euc-jp
+share/httpd/manual/filter.html.ja.utf8
 share/httpd/manual/filter.html.ko.euc-kr
 share/httpd/manual/glossary.html
 share/httpd/manual/glossary.html.de
@@ -422,39 +425,40 @@ share/httpd/manual/glossary.html.en
 share/httpd/manual/glossary.html.es
 share/httpd/manual/glossary.html.fr
 share/httpd/manual/glossary.html.ko.euc-kr
+share/httpd/manual/glossary.html.tr.utf8
 share/httpd/manual/handler.html
 share/httpd/manual/handler.html.en
 share/httpd/manual/handler.html.es
 share/httpd/manual/handler.html.fr
-share/httpd/manual/handler.html.ja.euc-jp
+share/httpd/manual/handler.html.ja.utf8
 share/httpd/manual/handler.html.ko.euc-kr
 share/httpd/manual/handler.html.ru.koi8-r
 share/httpd/manual/howto/access.html
 share/httpd/manual/howto/access.html.en
 share/httpd/manual/howto/auth.html
 share/httpd/manual/howto/auth.html.en
-share/httpd/manual/howto/auth.html.ja.euc-jp
+share/httpd/manual/howto/auth.html.ja.utf8
 share/httpd/manual/howto/auth.html.ko.euc-kr
 share/httpd/manual/howto/cgi.html
 share/httpd/manual/howto/cgi.html.en
-share/httpd/manual/howto/cgi.html.ja.euc-jp
+share/httpd/manual/howto/cgi.html.ja.utf8
 share/httpd/manual/howto/cgi.html.ko.euc-kr
 share/httpd/manual/howto/htaccess.html
 share/httpd/manual/howto/htaccess.html.en
-share/httpd/manual/howto/htaccess.html.ja.euc-jp
+share/httpd/manual/howto/htaccess.html.ja.utf8
 share/httpd/manual/howto/htaccess.html.ko.euc-kr
 share/httpd/manual/howto/htaccess.html.pt-br
 share/httpd/manual/howto/index.html
 share/httpd/manual/howto/index.html.en
-share/httpd/manual/howto/index.html.ja.euc-jp
+share/httpd/manual/howto/index.html.ja.utf8
 share/httpd/manual/howto/index.html.ko.euc-kr
 share/httpd/manual/howto/public_html.html
 share/httpd/manual/howto/public_html.html.en
-share/httpd/manual/howto/public_html.html.ja.euc-jp
+share/httpd/manual/howto/public_html.html.ja.utf8
 share/httpd/manual/howto/public_html.html.ko.euc-kr
 share/httpd/manual/howto/ssi.html
 share/httpd/manual/howto/ssi.html.en
-share/httpd/manual/howto/ssi.html.ja.euc-jp
+share/httpd/manual/howto/ssi.html.ja.utf8
 share/httpd/manual/howto/ssi.html.ko.euc-kr
 share/httpd/manual/images/apache_header.gif
 share/httpd/manual/images/caching_fig1.gif
@@ -490,29 +494,32 @@ share/httpd/manual/index.html.de
 share/httpd/manual/index.html.en
 share/httpd/manual/index.html.es
 share/httpd/manual/index.html.fr
-share/httpd/manual/index.html.ja.euc-jp
+share/httpd/manual/index.html.ja.utf8
 share/httpd/manual/index.html.ko.euc-kr
 share/httpd/manual/index.html.pt-br
+share/httpd/manual/index.html.tr.utf8
 share/httpd/manual/install.html
 share/httpd/manual/install.html.de
 share/httpd/manual/install.html.en
 share/httpd/manual/install.html.es
 share/httpd/manual/install.html.fr
-share/httpd/manual/install.html.ja.euc-jp
+share/httpd/manual/install.html.ja.utf8
 share/httpd/manual/install.html.ko.euc-kr
+share/httpd/manual/install.html.tr.utf8
 share/httpd/manual/invoking.html
 share/httpd/manual/invoking.html.de
 share/httpd/manual/invoking.html.en
 share/httpd/manual/invoking.html.es
 share/httpd/manual/invoking.html.fr
-share/httpd/manual/invoking.html.ja.euc-jp
+share/httpd/manual/invoking.html.ja.utf8
 share/httpd/manual/invoking.html.ko.euc-kr
 share/httpd/manual/invoking.html.ru.koi8-r
+share/httpd/manual/invoking.html.tr.utf8
 share/httpd/manual/license.html
 share/httpd/manual/license.html.en
 share/httpd/manual/logs.html
 share/httpd/manual/logs.html.en
-share/httpd/manual/logs.html.ja.euc-jp
+share/httpd/manual/logs.html.ja.utf8
 share/httpd/manual/logs.html.ko.euc-kr
 share/httpd/manual/misc/index.html
 share/httpd/manual/misc/index.html.en
@@ -539,42 +546,46 @@ share/httpd/manual/mod/beos.html.ko.euc-kr
 share/httpd/manual/mod/core.html
 share/httpd/manual/mod/core.html.de
 share/httpd/manual/mod/core.html.en
-share/httpd/manual/mod/core.html.ja.euc-jp
+share/httpd/manual/mod/core.html.ja.utf8
+share/httpd/manual/mod/core.html.tr.utf8
 share/httpd/manual/mod/directive-dict.html
 share/httpd/manual/mod/directive-dict.html.en
-share/httpd/manual/mod/directive-dict.html.ja.euc-jp
+share/httpd/manual/mod/directive-dict.html.ja.utf8
 share/httpd/manual/mod/directive-dict.html.ko.euc-kr
+share/httpd/manual/mod/directive-dict.html.tr.utf8
 share/httpd/manual/mod/directives.html
 share/httpd/manual/mod/directives.html.de
 share/httpd/manual/mod/directives.html.en
 share/httpd/manual/mod/directives.html.es
-share/httpd/manual/mod/directives.html.ja.euc-jp
+share/httpd/manual/mod/directives.html.ja.utf8
 share/httpd/manual/mod/directives.html.ko.euc-kr
 share/httpd/manual/mod/directives.html.ru.koi8-r
+share/httpd/manual/mod/directives.html.tr.utf8
 share/httpd/manual/mod/event.html
 share/httpd/manual/mod/event.html.en
 share/httpd/manual/mod/index.html
 share/httpd/manual/mod/index.html.de
 share/httpd/manual/mod/index.html.en
 share/httpd/manual/mod/index.html.es
-share/httpd/manual/mod/index.html.ja.euc-jp
+share/httpd/manual/mod/index.html.ja.utf8
 share/httpd/manual/mod/index.html.ko.euc-kr
+share/httpd/manual/mod/index.html.tr.utf8
 share/httpd/manual/mod/mod_actions.html
 share/httpd/manual/mod/mod_actions.html.de
 share/httpd/manual/mod/mod_actions.html.en
-share/httpd/manual/mod/mod_actions.html.ja.euc-jp
+share/httpd/manual/mod/mod_actions.html.ja.utf8
 share/httpd/manual/mod/mod_actions.html.ko.euc-kr
 share/httpd/manual/mod/mod_alias.html
 share/httpd/manual/mod/mod_alias.html.en
-share/httpd/manual/mod/mod_alias.html.ja.euc-jp
+share/httpd/manual/mod/mod_alias.html.ja.utf8
 share/httpd/manual/mod/mod_alias.html.ko.euc-kr
 share/httpd/manual/mod/mod_asis.html
 share/httpd/manual/mod/mod_asis.html.en
-share/httpd/manual/mod/mod_asis.html.ja.euc-jp
+share/httpd/manual/mod/mod_asis.html.ja.utf8
 share/httpd/manual/mod/mod_asis.html.ko.euc-kr
 share/httpd/manual/mod/mod_auth_basic.html
 share/httpd/manual/mod/mod_auth_basic.html.en
-share/httpd/manual/mod/mod_auth_basic.html.ja.euc-jp
+share/httpd/manual/mod/mod_auth_basic.html.ja.utf8
 share/httpd/manual/mod/mod_auth_basic.html.ko.euc-kr
 share/httpd/manual/mod/mod_auth_digest.html
 share/httpd/manual/mod/mod_auth_digest.html.en
@@ -583,21 +594,21 @@ share/httpd/manual/mod/mod_authn_alias.html
 share/httpd/manual/mod/mod_authn_alias.html.en
 share/httpd/manual/mod/mod_authn_anon.html
 share/httpd/manual/mod/mod_authn_anon.html.en
-share/httpd/manual/mod/mod_authn_anon.html.ja.euc-jp
+share/httpd/manual/mod/mod_authn_anon.html.ja.utf8
 share/httpd/manual/mod/mod_authn_anon.html.ko.euc-kr
 share/httpd/manual/mod/mod_authn_dbd.html
 share/httpd/manual/mod/mod_authn_dbd.html.en
 share/httpd/manual/mod/mod_authn_dbm.html
 share/httpd/manual/mod/mod_authn_dbm.html.en
-share/httpd/manual/mod/mod_authn_dbm.html.ja.euc-jp
+share/httpd/manual/mod/mod_authn_dbm.html.ja.utf8
 share/httpd/manual/mod/mod_authn_dbm.html.ko.euc-kr
 share/httpd/manual/mod/mod_authn_default.html
 share/httpd/manual/mod/mod_authn_default.html.en
-share/httpd/manual/mod/mod_authn_default.html.ja.euc-jp
+share/httpd/manual/mod/mod_authn_default.html.ja.utf8
 share/httpd/manual/mod/mod_authn_default.html.ko.euc-kr
 share/httpd/manual/mod/mod_authn_file.html
 share/httpd/manual/mod/mod_authn_file.html.en
-share/httpd/manual/mod/mod_authn_file.html.ja.euc-jp
+share/httpd/manual/mod/mod_authn_file.html.ja.utf8
 share/httpd/manual/mod/mod_authn_file.html.ko.euc-kr
 share/httpd/manual/mod/mod_authnz_ldap.html
 share/httpd/manual/mod/mod_authnz_ldap.html.en
@@ -606,92 +617,92 @@ share/httpd/manual/mod/mod_authz_dbm.html.en
 share/httpd/manual/mod/mod_authz_dbm.html.ko.euc-kr
 share/httpd/manual/mod/mod_authz_default.html
 share/httpd/manual/mod/mod_authz_default.html.en
-share/httpd/manual/mod/mod_authz_default.html.ja.euc-jp
+share/httpd/manual/mod/mod_authz_default.html.ja.utf8
 share/httpd/manual/mod/mod_authz_default.html.ko.euc-kr
 share/httpd/manual/mod/mod_authz_groupfile.html
 share/httpd/manual/mod/mod_authz_groupfile.html.en
-share/httpd/manual/mod/mod_authz_groupfile.html.ja.euc-jp
+share/httpd/manual/mod/mod_authz_groupfile.html.ja.utf8
 share/httpd/manual/mod/mod_authz_groupfile.html.ko.euc-kr
 share/httpd/manual/mod/mod_authz_host.html
 share/httpd/manual/mod/mod_authz_host.html.en
-share/httpd/manual/mod/mod_authz_host.html.ja.euc-jp
+share/httpd/manual/mod/mod_authz_host.html.ja.utf8
 share/httpd/manual/mod/mod_authz_host.html.ko.euc-kr
 share/httpd/manual/mod/mod_authz_owner.html
 share/httpd/manual/mod/mod_authz_owner.html.en
-share/httpd/manual/mod/mod_authz_owner.html.ja.euc-jp
+share/httpd/manual/mod/mod_authz_owner.html.ja.utf8
 share/httpd/manual/mod/mod_authz_owner.html.ko.euc-kr
 share/httpd/manual/mod/mod_authz_user.html
 share/httpd/manual/mod/mod_authz_user.html.en
-share/httpd/manual/mod/mod_authz_user.html.ja.euc-jp
+share/httpd/manual/mod/mod_authz_user.html.ja.utf8
 share/httpd/manual/mod/mod_authz_user.html.ko.euc-kr
 share/httpd/manual/mod/mod_autoindex.html
 share/httpd/manual/mod/mod_autoindex.html.en
-share/httpd/manual/mod/mod_autoindex.html.ja.euc-jp
+share/httpd/manual/mod/mod_autoindex.html.ja.utf8
 share/httpd/manual/mod/mod_autoindex.html.ko.euc-kr
 share/httpd/manual/mod/mod_cache.html
 share/httpd/manual/mod/mod_cache.html.en
-share/httpd/manual/mod/mod_cache.html.ja.euc-jp
+share/httpd/manual/mod/mod_cache.html.ja.utf8
 share/httpd/manual/mod/mod_cache.html.ko.euc-kr
 share/httpd/manual/mod/mod_cern_meta.html
 share/httpd/manual/mod/mod_cern_meta.html.en
 share/httpd/manual/mod/mod_cern_meta.html.ko.euc-kr
 share/httpd/manual/mod/mod_cgi.html
 share/httpd/manual/mod/mod_cgi.html.en
-share/httpd/manual/mod/mod_cgi.html.ja.euc-jp
+share/httpd/manual/mod/mod_cgi.html.ja.utf8
 share/httpd/manual/mod/mod_cgi.html.ko.euc-kr
 share/httpd/manual/mod/mod_cgid.html
 share/httpd/manual/mod/mod_cgid.html.en
-share/httpd/manual/mod/mod_cgid.html.ja.euc-jp
+share/httpd/manual/mod/mod_cgid.html.ja.utf8
 share/httpd/manual/mod/mod_cgid.html.ko.euc-kr
 share/httpd/manual/mod/mod_charset_lite.html
 share/httpd/manual/mod/mod_charset_lite.html.en
 share/httpd/manual/mod/mod_charset_lite.html.ko.euc-kr
 share/httpd/manual/mod/mod_dav.html
 share/httpd/manual/mod/mod_dav.html.en
-share/httpd/manual/mod/mod_dav.html.ja.euc-jp
+share/httpd/manual/mod/mod_dav.html.ja.utf8
 share/httpd/manual/mod/mod_dav.html.ko.euc-kr
 share/httpd/manual/mod/mod_dav_fs.html
 share/httpd/manual/mod/mod_dav_fs.html.en
-share/httpd/manual/mod/mod_dav_fs.html.ja.euc-jp
+share/httpd/manual/mod/mod_dav_fs.html.ja.utf8
 share/httpd/manual/mod/mod_dav_fs.html.ko.euc-kr
 share/httpd/manual/mod/mod_dav_lock.html
 share/httpd/manual/mod/mod_dav_lock.html.en
-share/httpd/manual/mod/mod_dav_lock.html.ja.euc-jp
+share/httpd/manual/mod/mod_dav_lock.html.ja.utf8
 share/httpd/manual/mod/mod_dbd.html
 share/httpd/manual/mod/mod_dbd.html.en
 share/httpd/manual/mod/mod_deflate.html
 share/httpd/manual/mod/mod_deflate.html.en
-share/httpd/manual/mod/mod_deflate.html.ja.euc-jp
+share/httpd/manual/mod/mod_deflate.html.ja.utf8
 share/httpd/manual/mod/mod_deflate.html.ko.euc-kr
 share/httpd/manual/mod/mod_dir.html
 share/httpd/manual/mod/mod_dir.html.en
-share/httpd/manual/mod/mod_dir.html.ja.euc-jp
+share/httpd/manual/mod/mod_dir.html.ja.utf8
 share/httpd/manual/mod/mod_dir.html.ko.euc-kr
 share/httpd/manual/mod/mod_disk_cache.html
 share/httpd/manual/mod/mod_disk_cache.html.en
-share/httpd/manual/mod/mod_disk_cache.html.ja.euc-jp
+share/httpd/manual/mod/mod_disk_cache.html.ja.utf8
 share/httpd/manual/mod/mod_disk_cache.html.ko.euc-kr
 share/httpd/manual/mod/mod_dumpio.html
 share/httpd/manual/mod/mod_dumpio.html.en
-share/httpd/manual/mod/mod_dumpio.html.ja.euc-jp
+share/httpd/manual/mod/mod_dumpio.html.ja.utf8
 share/httpd/manual/mod/mod_echo.html
 share/httpd/manual/mod/mod_echo.html.en
-share/httpd/manual/mod/mod_echo.html.ja.euc-jp
+share/httpd/manual/mod/mod_echo.html.ja.utf8
 share/httpd/manual/mod/mod_echo.html.ko.euc-kr
 share/httpd/manual/mod/mod_env.html
 share/httpd/manual/mod/mod_env.html.en
-share/httpd/manual/mod/mod_env.html.ja.euc-jp
+share/httpd/manual/mod/mod_env.html.ja.utf8
 share/httpd/manual/mod/mod_env.html.ko.euc-kr
 share/httpd/manual/mod/mod_example.html
 share/httpd/manual/mod/mod_example.html.en
 share/httpd/manual/mod/mod_example.html.ko.euc-kr
 share/httpd/manual/mod/mod_expires.html
 share/httpd/manual/mod/mod_expires.html.en
-share/httpd/manual/mod/mod_expires.html.ja.euc-jp
+share/httpd/manual/mod/mod_expires.html.ja.utf8
 share/httpd/manual/mod/mod_expires.html.ko.euc-kr
 share/httpd/manual/mod/mod_ext_filter.html
 share/httpd/manual/mod/mod_ext_filter.html.en
-share/httpd/manual/mod/mod_ext_filter.html.ja.euc-jp
+share/httpd/manual/mod/mod_ext_filter.html.ja.utf8
 share/httpd/manual/mod/mod_ext_filter.html.ko.euc-kr
 share/httpd/manual/mod/mod_file_cache.html
 share/httpd/manual/mod/mod_file_cache.html.en
@@ -700,20 +711,21 @@ share/httpd/manual/mod/mod_filter.html
 share/httpd/manual/mod/mod_filter.html.en
 share/httpd/manual/mod/mod_headers.html
 share/httpd/manual/mod/mod_headers.html.en
-share/httpd/manual/mod/mod_headers.html.ja.euc-jp
+share/httpd/manual/mod/mod_headers.html.ja.utf8
 share/httpd/manual/mod/mod_headers.html.ko.euc-kr
 share/httpd/manual/mod/mod_ident.html
 share/httpd/manual/mod/mod_ident.html.en
+share/httpd/manual/mod/mod_ident.html.ja.utf8
 share/httpd/manual/mod/mod_ident.html.ko.euc-kr
 share/httpd/manual/mod/mod_imagemap.html
 share/httpd/manual/mod/mod_imagemap.html.en
 share/httpd/manual/mod/mod_imagemap.html.ko.euc-kr
 share/httpd/manual/mod/mod_include.html
 share/httpd/manual/mod/mod_include.html.en
-share/httpd/manual/mod/mod_include.html.ja.euc-jp
+share/httpd/manual/mod/mod_include.html.ja.utf8
 share/httpd/manual/mod/mod_info.html
 share/httpd/manual/mod/mod_info.html.en
-share/httpd/manual/mod/mod_info.html.ja.euc-jp
+share/httpd/manual/mod/mod_info.html.ja.utf8
 share/httpd/manual/mod/mod_info.html.ko.euc-kr
 share/httpd/manual/mod/mod_isapi.html
 share/httpd/manual/mod/mod_isapi.html.en
@@ -722,40 +734,41 @@ share/httpd/manual/mod/mod_ldap.html
 share/httpd/manual/mod/mod_ldap.html.en
 share/httpd/manual/mod/mod_log_config.html
 share/httpd/manual/mod/mod_log_config.html.en
-share/httpd/manual/mod/mod_log_config.html.ja.euc-jp
+share/httpd/manual/mod/mod_log_config.html.ja.utf8
 share/httpd/manual/mod/mod_log_config.html.ko.euc-kr
 share/httpd/manual/mod/mod_log_forensic.html
 share/httpd/manual/mod/mod_log_forensic.html.en
-share/httpd/manual/mod/mod_log_forensic.html.ja.euc-jp
+share/httpd/manual/mod/mod_log_forensic.html.ja.utf8
 share/httpd/manual/mod/mod_logio.html
 share/httpd/manual/mod/mod_logio.html.en
-share/httpd/manual/mod/mod_logio.html.ja.euc-jp
+share/httpd/manual/mod/mod_logio.html.ja.utf8
 share/httpd/manual/mod/mod_logio.html.ko.euc-kr
 share/httpd/manual/mod/mod_mem_cache.html
 share/httpd/manual/mod/mod_mem_cache.html.en
-share/httpd/manual/mod/mod_mem_cache.html.ja.euc-jp
+share/httpd/manual/mod/mod_mem_cache.html.ja.utf8
 share/httpd/manual/mod/mod_mem_cache.html.ko.euc-kr
 share/httpd/manual/mod/mod_mime.html
 share/httpd/manual/mod/mod_mime.html.en
-share/httpd/manual/mod/mod_mime.html.ja.euc-jp
+share/httpd/manual/mod/mod_mime.html.ja.utf8
 share/httpd/manual/mod/mod_mime_magic.html
 share/httpd/manual/mod/mod_mime_magic.html.en
 share/httpd/manual/mod/mod_negotiation.html
 share/httpd/manual/mod/mod_negotiation.html.en
-share/httpd/manual/mod/mod_negotiation.html.ja.euc-jp
+share/httpd/manual/mod/mod_negotiation.html.ja.utf8
 share/httpd/manual/mod/mod_nw_ssl.html
 share/httpd/manual/mod/mod_nw_ssl.html.en
 share/httpd/manual/mod/mod_proxy.html
 share/httpd/manual/mod/mod_proxy.html.en
-share/httpd/manual/mod/mod_proxy.html.ja.euc-jp
+share/httpd/manual/mod/mod_proxy.html.ja.utf8
 share/httpd/manual/mod/mod_proxy_ajp.html
 share/httpd/manual/mod/mod_proxy_ajp.html.en
-share/httpd/manual/mod/mod_proxy_ajp.html.ja.euc-jp
+share/httpd/manual/mod/mod_proxy_ajp.html.ja.utf8
 share/httpd/manual/mod/mod_proxy_balancer.html
 share/httpd/manual/mod/mod_proxy_balancer.html.en
-share/httpd/manual/mod/mod_proxy_balancer.html.ja.euc-jp
+share/httpd/manual/mod/mod_proxy_balancer.html.ja.utf8
 share/httpd/manual/mod/mod_proxy_connect.html
 share/httpd/manual/mod/mod_proxy_connect.html.en
+share/httpd/manual/mod/mod_proxy_connect.html.ja.utf8
 share/httpd/manual/mod/mod_proxy_ftp.html
 share/httpd/manual/mod/mod_proxy_ftp.html.en
 share/httpd/manual/mod/mod_proxy_http.html
@@ -764,87 +777,91 @@ share/httpd/manual/mod/mod_rewrite.html
 share/httpd/manual/mod/mod_rewrite.html.en
 share/httpd/manual/mod/mod_setenvif.html
 share/httpd/manual/mod/mod_setenvif.html.en
-share/httpd/manual/mod/mod_setenvif.html.ja.euc-jp
+share/httpd/manual/mod/mod_setenvif.html.ja.utf8
 share/httpd/manual/mod/mod_setenvif.html.ko.euc-kr
 share/httpd/manual/mod/mod_so.html
 share/httpd/manual/mod/mod_so.html.en
-share/httpd/manual/mod/mod_so.html.ja.euc-jp
+share/httpd/manual/mod/mod_so.html.ja.utf8
 share/httpd/manual/mod/mod_so.html.ko.euc-kr
 share/httpd/manual/mod/mod_speling.html
 share/httpd/manual/mod/mod_speling.html.en
-share/httpd/manual/mod/mod_speling.html.ja.euc-jp
+share/httpd/manual/mod/mod_speling.html.ja.utf8
 share/httpd/manual/mod/mod_speling.html.ko.euc-kr
 share/httpd/manual/mod/mod_ssl.html
 share/httpd/manual/mod/mod_ssl.html.en
 share/httpd/manual/mod/mod_status.html
 share/httpd/manual/mod/mod_status.html.en
-share/httpd/manual/mod/mod_status.html.ja.euc-jp
+share/httpd/manual/mod/mod_status.html.ja.utf8
 share/httpd/manual/mod/mod_status.html.ko.euc-kr
 share/httpd/manual/mod/mod_substitute.html
 share/httpd/manual/mod/mod_substitute.html.en
 share/httpd/manual/mod/mod_suexec.html
 share/httpd/manual/mod/mod_suexec.html.en
-share/httpd/manual/mod/mod_suexec.html.ja.euc-jp
+share/httpd/manual/mod/mod_suexec.html.ja.utf8
 share/httpd/manual/mod/mod_suexec.html.ko.euc-kr
 share/httpd/manual/mod/mod_unique_id.html
 share/httpd/manual/mod/mod_unique_id.html.en
-share/httpd/manual/mod/mod_unique_id.html.ja.euc-jp
+share/httpd/manual/mod/mod_unique_id.html.ja.utf8
 share/httpd/manual/mod/mod_unique_id.html.ko.euc-kr
 share/httpd/manual/mod/mod_userdir.html
 share/httpd/manual/mod/mod_userdir.html.en
-share/httpd/manual/mod/mod_userdir.html.ja.euc-jp
+share/httpd/manual/mod/mod_userdir.html.ja.utf8
 share/httpd/manual/mod/mod_userdir.html.ko.euc-kr
 share/httpd/manual/mod/mod_usertrack.html
 share/httpd/manual/mod/mod_usertrack.html.en
 share/httpd/manual/mod/mod_version.html
 share/httpd/manual/mod/mod_version.html.en
-share/httpd/manual/mod/mod_version.html.ja.euc-jp
+share/httpd/manual/mod/mod_version.html.ja.utf8
 share/httpd/manual/mod/mod_version.html.ko.euc-kr
 share/httpd/manual/mod/mod_vhost_alias.html
 share/httpd/manual/mod/mod_vhost_alias.html.en
 share/httpd/manual/mod/module-dict.html
 share/httpd/manual/mod/module-dict.html.en
-share/httpd/manual/mod/module-dict.html.ja.euc-jp
+share/httpd/manual/mod/module-dict.html.ja.utf8
 share/httpd/manual/mod/module-dict.html.ko.euc-kr
+share/httpd/manual/mod/module-dict.html.tr.utf8
 share/httpd/manual/mod/mpm_common.html
 share/httpd/manual/mod/mpm_common.html.de
 share/httpd/manual/mod/mpm_common.html.en
-share/httpd/manual/mod/mpm_common.html.ja.euc-jp
+share/httpd/manual/mod/mpm_common.html.ja.utf8
+share/httpd/manual/mod/mpm_common.html.tr.utf8
 share/httpd/manual/mod/mpm_netware.html
 share/httpd/manual/mod/mpm_netware.html.en
 share/httpd/manual/mod/mpm_winnt.html
 share/httpd/manual/mod/mpm_winnt.html.de
 share/httpd/manual/mod/mpm_winnt.html.en
-share/httpd/manual/mod/mpm_winnt.html.ja.euc-jp
+share/httpd/manual/mod/mpm_winnt.html.ja.utf8
 share/httpd/manual/mod/mpmt_os2.html
 share/httpd/manual/mod/mpmt_os2.html.en
 share/httpd/manual/mod/prefork.html
 share/httpd/manual/mod/prefork.html.de
 share/httpd/manual/mod/prefork.html.en
-share/httpd/manual/mod/prefork.html.ja.euc-jp
+share/httpd/manual/mod/prefork.html.ja.utf8
 share/httpd/manual/mod/quickreference.html
 share/httpd/manual/mod/quickreference.html.de
 share/httpd/manual/mod/quickreference.html.en
 share/httpd/manual/mod/quickreference.html.es
-share/httpd/manual/mod/quickreference.html.ja.euc-jp
+share/httpd/manual/mod/quickreference.html.ja.utf8
 share/httpd/manual/mod/quickreference.html.ko.euc-kr
 share/httpd/manual/mod/quickreference.html.ru.koi8-r
+share/httpd/manual/mod/quickreference.html.tr.utf8
 share/httpd/manual/mod/worker.html
 share/httpd/manual/mod/worker.html.de
 share/httpd/manual/mod/worker.html.en
-share/httpd/manual/mod/worker.html.ja.euc-jp
+share/httpd/manual/mod/worker.html.ja.utf8
 share/httpd/manual/mpm.html
 share/httpd/manual/mpm.html.de
 share/httpd/manual/mpm.html.en
 share/httpd/manual/mpm.html.es
 share/httpd/manual/mpm.html.fr
-share/httpd/manual/mpm.html.ja.euc-jp
+share/httpd/manual/mpm.html.ja.utf8
 share/httpd/manual/mpm.html.ko.euc-kr
+share/httpd/manual/mpm.html.tr.utf8
 share/httpd/manual/new_features_2_0.html
 share/httpd/manual/new_features_2_0.html.de
 share/httpd/manual/new_features_2_0.html.en
 share/httpd/manual/new_features_2_0.html.fr
-share/httpd/manual/new_features_2_0.html.ja.euc-jp
+share/httpd/manual/new_features_2_0.html.ja.utf8
 share/httpd/manual/new_features_2_0.html.ko.euc-kr
 share/httpd/manual/new_features_2_0.html.pt-br
 share/httpd/manual/new_features_2_0.html.ru.koi8-r
@@ -907,6 +924,7 @@ share/httpd/manual/programs/index.html.en
 share/httpd/manual/programs/index.html.es
 share/httpd/manual/programs/index.html.ko.euc-kr
 share/httpd/manual/programs/index.html.ru.koi8-r
+share/httpd/manual/programs/index.html.tr.utf8
 share/httpd/manual/programs/logresolve.html
 share/httpd/manual/programs/logresolve.html.en
 share/httpd/manual/programs/logresolve.html.ko.euc-kr
@@ -921,6 +939,8 @@ share/httpd/manual/programs/suexec.html.en
 share/httpd/manual/programs/suexec.html.ko.euc-kr
 share/httpd/manual/rewrite/index.html
 share/httpd/manual/rewrite/index.html.en
+share/httpd/manual/rewrite/rewrite_flags.html
+share/httpd/manual/rewrite/rewrite_flags.html.en
 share/httpd/manual/rewrite/rewrite_guide.html
 share/httpd/manual/rewrite/rewrite_guide.html.en
 share/httpd/manual/rewrite/rewrite_guide_advanced.html
@@ -932,21 +952,23 @@ share/httpd/manual/rewrite/rewrite_tech.html.en
 share/httpd/manual/sections.html
 share/httpd/manual/sections.html.en
 share/httpd/manual/sections.html.fr
-share/httpd/manual/sections.html.ja.euc-jp
+share/httpd/manual/sections.html.ja.utf8
 share/httpd/manual/sections.html.ko.euc-kr
+share/httpd/manual/sections.html.tr.utf8
 share/httpd/manual/server-wide.html
 share/httpd/manual/server-wide.html.en
-share/httpd/manual/server-wide.html.ja.euc-jp
+share/httpd/manual/server-wide.html.ja.utf8
 share/httpd/manual/server-wide.html.ko.euc-kr
 share/httpd/manual/sitemap.html
 share/httpd/manual/sitemap.html.de
 share/httpd/manual/sitemap.html.en
 share/httpd/manual/sitemap.html.es
-share/httpd/manual/sitemap.html.ja.euc-jp
+share/httpd/manual/sitemap.html.ja.utf8
 share/httpd/manual/sitemap.html.ko.euc-kr
+share/httpd/manual/sitemap.html.tr.utf8
 share/httpd/manual/ssl/index.html
 share/httpd/manual/ssl/index.html.en
-share/httpd/manual/ssl/index.html.ja.euc-jp
+share/httpd/manual/ssl/index.html.ja.utf8
 share/httpd/manual/ssl/ssl_compat.html
 share/httpd/manual/ssl/ssl_compat.html.en
 share/httpd/manual/ssl/ssl_faq.html
@@ -955,14 +977,15 @@ share/httpd/manual/ssl/ssl_howto.html
 share/httpd/manual/ssl/ssl_howto.html.en
 share/httpd/manual/ssl/ssl_intro.html
 share/httpd/manual/ssl/ssl_intro.html.en
-share/httpd/manual/ssl/ssl_intro.html.ja.euc-jp
+share/httpd/manual/ssl/ssl_intro.html.ja.utf8
 share/httpd/manual/stopping.html
 share/httpd/manual/stopping.html.de
 share/httpd/manual/stopping.html.en
 share/httpd/manual/stopping.html.es
 share/httpd/manual/stopping.html.fr
-share/httpd/manual/stopping.html.ja.euc-jp
+share/httpd/manual/stopping.html.ja.utf8
 share/httpd/manual/stopping.html.ko.euc-kr
+share/httpd/manual/stopping.html.tr.utf8
 share/httpd/manual/style/build.properties
 share/httpd/manual/style/common.dtd
 share/httpd/manual/style/css/manual-chm.css
@@ -974,59 +997,21 @@ share/httpd/manual/style/css/manual.css
 share/httpd/manual/style/faq.dtd
 share/httpd/manual/style/lang.dtd
 share/httpd/manual/style/latex/atbeginend.sty
-share/httpd/manual/style/latex/common.xsl
-share/httpd/manual/style/latex/directiveindex.xsl
-share/httpd/manual/style/latex/faq.xsl
-share/httpd/manual/style/latex/html.xsl
-share/httpd/manual/style/latex/latex.xsl
-share/httpd/manual/style/latex/manualpage.xsl
-share/httpd/manual/style/latex/moduleindex.xsl
-share/httpd/manual/style/latex/quickreference.xsl
-share/httpd/manual/style/latex/synopsis.xsl
-share/httpd/manual/style/manual.de.xsl
-share/httpd/manual/style/manual.en.xsl
-share/httpd/manual/style/manual.es.xsl
-share/httpd/manual/style/manual.fr.xsl
-share/httpd/manual/style/manual.ja.xsl
-share/httpd/manual/style/manual.ko.xsl
-share/httpd/manual/style/manual.pt-br.xsl
-share/httpd/manual/style/manual.ru.xsl
 share/httpd/manual/style/manualpage.dtd
 share/httpd/manual/style/modulesynopsis.dtd
 share/httpd/manual/style/sitemap.dtd
 share/httpd/manual/style/version.ent
-share/httpd/manual/style/xsl/common.xsl
-share/httpd/manual/style/xsl/convmap.xsl
-share/httpd/manual/style/xsl/directiveindex.xsl
-share/httpd/manual/style/xsl/faq.xsl
-share/httpd/manual/style/xsl/hhc.xsl
-share/httpd/manual/style/xsl/hhp.xsl
-share/httpd/manual/style/xsl/indexpage.xsl
-share/httpd/manual/style/xsl/language.xsl
-share/httpd/manual/style/xsl/maf.xsl
-share/httpd/manual/style/xsl/manualpage.xsl
-share/httpd/manual/style/xsl/moduleindex.xsl
-share/httpd/manual/style/xsl/nroff.xsl
-share/httpd/manual/style/xsl/quickreference.xsl
-share/httpd/manual/style/xsl/sitemap.xsl
-share/httpd/manual/style/xsl/synopsis.xsl
-share/httpd/manual/style/xsl/typemap.xsl
-share/httpd/manual/style/xsl/util/modtrans.xsl
 share/httpd/manual/suexec.html
 share/httpd/manual/suexec.html.en
-share/httpd/manual/suexec.html.ja.euc-jp
+share/httpd/manual/suexec.html.ja.utf8
 share/httpd/manual/suexec.html.ko.euc-kr
 share/httpd/manual/upgrading.html
 share/httpd/manual/upgrading.html.de
 share/httpd/manual/upgrading.html.en
 share/httpd/manual/upgrading.html.fr
-share/httpd/manual/upgrading.html.ja.euc-jp
-share/httpd/manual/upgrading.html.ko.euc-kr
-share/httpd/manual/upgrading.html.pt-br
-share/httpd/manual/upgrading.html.ru.koi8-r
 share/httpd/manual/urlmapping.html
 share/httpd/manual/urlmapping.html.en
-share/httpd/manual/urlmapping.html.ja.euc-jp
+share/httpd/manual/urlmapping.html.ja.utf8
 share/httpd/manual/urlmapping.html.ko.euc-kr
 share/httpd/manual/vhosts/details.html
 share/httpd/manual/vhosts/details.html.en
@@ -1035,25 +1020,27 @@ share/httpd/manual/vhosts/details.html.ko.euc-kr
 share/httpd/manual/vhosts/examples.html
 share/httpd/manual/vhosts/examples.html.en
 share/httpd/manual/vhosts/examples.html.fr
-share/httpd/manual/vhosts/examples.html.ja.euc-jp
+share/httpd/manual/vhosts/examples.html.ja.utf8
 share/httpd/manual/vhosts/examples.html.ko.euc-kr
 share/httpd/manual/vhosts/fd-limits.html
 share/httpd/manual/vhosts/fd-limits.html.en
 share/httpd/manual/vhosts/fd-limits.html.fr
-share/httpd/manual/vhosts/fd-limits.html.ja.euc-jp
+share/httpd/manual/vhosts/fd-limits.html.ja.utf8
 share/httpd/manual/vhosts/fd-limits.html.ko.euc-kr
 share/httpd/manual/vhosts/index.html
 share/httpd/manual/vhosts/index.html.de
 share/httpd/manual/vhosts/index.html.en
 share/httpd/manual/vhosts/index.html.fr
-share/httpd/manual/vhosts/index.html.ja.euc-jp
+share/httpd/manual/vhosts/index.html.ja.utf8
 share/httpd/manual/vhosts/index.html.ko.euc-kr
 share/httpd/manual/vhosts/index.html.ru.koi8-r
+share/httpd/manual/vhosts/index.html.tr.utf8
 share/httpd/manual/vhosts/ip-based.html
 share/httpd/manual/vhosts/ip-based.html.en
 share/httpd/manual/vhosts/ip-based.html.fr
-share/httpd/manual/vhosts/ip-based.html.ja.euc-jp
+share/httpd/manual/vhosts/ip-based.html.ja.utf8
 share/httpd/manual/vhosts/ip-based.html.ko.euc-kr
+share/httpd/manual/vhosts/ip-based.html.tr.utf8
 share/httpd/manual/vhosts/mass.html
 share/httpd/manual/vhosts/mass.html.en
 share/httpd/manual/vhosts/mass.html.ko.euc-kr
@@ -1061,8 +1048,9 @@ share/httpd/manual/vhosts/name-based.html
 share/httpd/manual/vhosts/name-based.html.de
 share/httpd/manual/vhosts/name-based.html.en
 share/httpd/manual/vhosts/name-based.html.fr
-share/httpd/manual/vhosts/name-based.html.ja.euc-jp
+share/httpd/manual/vhosts/name-based.html.ja.utf8
 share/httpd/manual/vhosts/name-based.html.ko.euc-kr
+share/httpd/manual/vhosts/name-based.html.tr.utf8
 @unexec ${RMDIR} %D/libexec/cgi-bin 2>/dev/null || ${TRUE}
 @dirrm share/httpd/manual/vhosts
 @dirrm share/httpd/manual/style/xsl/util
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index 6f00955fb91..af174f2d0b3 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.10 2008/06/12 14:12:19 tron Exp $
+$NetBSD: distinfo,v 1.11 2008/06/18 21:38:01 tron Exp $
 
-SHA1 (httpd-2.2.8.tar.bz2) = 5074904435d3d942ce2dc96c44b07294b8eaca77
-RMD160 (httpd-2.2.8.tar.bz2) = 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57
-Size (httpd-2.2.8.tar.bz2) = 4799055 bytes
-SHA1 (patch-aa) = ae5b34058fc6455cfa9e3d52a50829155ce2eb11
-SHA1 (patch-ab) = 55f4dac616fbe47fea7be0aecd1b7be679b9b0e7
+SHA1 (httpd-2.2.9.tar.bz2) = 71715d81e7a5ace4499803df7369c78b85251083
+RMD160 (httpd-2.2.9.tar.bz2) = 8fd62ae78271aa0ded6ba2f5bfeea8c63b79060a
+Size (httpd-2.2.9.tar.bz2) = 4943462 bytes
+SHA1 (patch-aa) = 40f5f687a1217b8d6684dc610d3d4c430f635cbf
 SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
 SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13
 SHA1 (patch-ae) = 86b307d6eefef232b6223afc3f69e64be40bd913
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)
diff --git a/www/apache22/patches/patch-ab b/www/apache22/patches/patch-ab
deleted file mode 100644
index 0904bad2503..00000000000
--- a/www/apache22/patches/patch-ab
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2008/06/12 14:12:19 tron Exp $
-
-Patch for CVE-2008-2364, taken from here:
-
-http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?r1=666154&r2=666153&pathrev=666154
-
---- modules/proxy/mod_proxy_http.c.orig	2007-12-08 14:01:47.000000000 +0000
-+++ modules/proxy/mod_proxy_http.c	2008-06-12 14:44:10.000000000 +0100
-@@ -1309,6 +1309,16 @@
-     return rv;
- }
- 
-+/*
-+ * Limit the number of interim respones we sent back to the client. Otherwise
-+ * we suffer from a memory build up. Besides there is NO sense in sending back
-+ * an unlimited number of interim responses to the client. Thus if we cross
-+ * this limit send back a 502 (Bad Gateway).
-+ */
-+#ifndef AP_MAX_INTERIM_RESPONSES
-+#define AP_MAX_INTERIM_RESPONSES 10
-+#endif
-+
- static
- apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
-                                             proxy_conn_rec *backend,
-@@ -1323,8 +1333,8 @@
-     apr_bucket *e;
-     apr_bucket_brigade *bb, *tmp_bb;
-     int len, backasswards;
--    int interim_response; /* non-zero whilst interim 1xx responses
--                           * are being read. */
-+    int interim_response = 0; /* non-zero whilst interim 1xx responses
-+                               * are being read. */
-     int pread_len = 0;
-     apr_table_t *save_table;
-     int backend_broke = 0;
-@@ -1339,6 +1349,7 @@
-      */
- 
-     rp = ap_proxy_make_fake_req(origin, r);
-+    ap_proxy_pre_http_request(origin, rp);
-     /* In case anyone needs to know, this is a fake request that is really a
-      * response.
-      */
-@@ -1469,7 +1480,6 @@
-             if ((buf = apr_table_get(r->headers_out, "Content-Type"))) {
-                 ap_set_content_type(r, apr_pstrdup(p, buf));
-             }
--            ap_proxy_pre_http_request(origin,rp);
- 
-             /* Clear hop-by-hop headers */
-             for (i=0; hop_by_hop_hdrs[i]; ++i) {
-@@ -1518,7 +1528,12 @@
-             backend->close += 1;
-         }
- 
--        interim_response = ap_is_HTTP_INFO(r->status);
-+        if (ap_is_HTTP_INFO(r->status)) {
-+            interim_response++;
-+        }
-+        else {
-+            interim_response = 0;
-+        }
-         if (interim_response) {
-             /* RFC2616 tells us to forward this.
-              *
-@@ -1711,7 +1726,15 @@
- 
-             apr_brigade_cleanup(bb);
-         }
--    } while (interim_response);
-+    } while (interim_response && (interim_response < AP_MAX_INTERIM_RESPONSES));
-+
-+    /* See define of AP_MAX_INTERIM_RESPONSES for why */
-+    if (interim_response >= AP_MAX_INTERIM_RESPONSES) {
-+        return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-+                             apr_psprintf(p, 
-+                             "Too many (%d) interim responses from origin server",
-+                             interim_response));
-+    }
- 
-     /* If our connection with the client is to be aborted, return DONE. */
-     if (c->aborted || backend_broke) {