Changes 2.0.64:

* SECURITY: CVE-2010-1452 (cve.mitre.org)
  mod_dav: Fix Handling of requests without a path segment.
* SECURITY: CVE-2009-1891 (cve.mitre.org)
  Fix a potential Denial-of-Service attack against mod_deflate or other
  modules, by forcing the server to consume CPU time in compressing a
  large file after a client disconnects.
* SECURITY: CVE-2009-3095 (cve.mitre.org)
  mod_proxy_ftp: sanity check authn credentials.
* SECURITY: CVE-2009-3094 (cve.mitre.org)
  mod_proxy_ftp: NULL pointer dereference on error paths.
* SECURITY: CVE-2009-3555 (cve.mitre.org)
  mod_ssl: Comprehensive fix of the TLS renegotiation prefix injection
  attack when compiled against OpenSSL version 0.9.8m or later. Introduces
  the 'SSLInsecureRenegotiation' directive to reopen this vulnerability
  and offer unsafe legacy renegotiation with clients which do not yet
  support the new secure renegotiation protocol, RFC 5746.
* SECURITY: CVE-2009-3555 (cve.mitre.org)
  mod_ssl: A partial fix for the TLS renegotiation prefix injection attack
  for OpenSSL versions prior to 0.9.8l; reject any client-initiated
  renegotiations. Forcibly disable keepalive for the connection if there
  is any buffered data readable. Any configuration which requires
  renegotiation for per-directory/location access control is still
  vulnerable, unless using openssl 0.9.8l or later.
* SECURITY: CVE-2010-0434 (cve.mitre.org)
  Ensure each subrequest has a shallow copy of headers_in so that the
  parent request headers are not corrupted.  Elimiates a problematic
  optimization in the case of no request body.
* SECURITY: CVE-2008-2364 (cve.mitre.org)
  mod_proxy_http: Better handling of excessive interim responses
  from origin server to prevent potential denial of service and high
  memory usage.
* SECURITY: CVE-2010-0425 (cve.mitre.org)
  mod_isapi: Do not unload an isapi .dll module until the request
  processing is completed, avoiding orphaned callback pointers.
* SECURITY: CVE-2008-2939 (cve.mitre.org)
  mod_proxy_ftp: Prevent XSS attacks when using wildcards in the path of
  the FTP URL. Discovered by Marc Bevand of Rapid7.
* Fix recursive ErrorDocument handling.
* mod_ssl: Do not do overlapping memcpy.
* Add Set-Cookie and Set-Cookie2 to the list of headers allowed to pass
  through on a 304 response.
* apxs: Fix -A and -a options to ignore whitespace in httpd.conf

12 files changed, 183 insertions, 223 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index adbc96f59ee..a9ca4c40063 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.133 2010/03/18 12:47:56 joerg Exp $
+# $NetBSD: Makefile,v 1.134 2010/11/01 18:03:04 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
 PKGNAME=	apache-${APACHE_VERSION}
-PKGREVISION=	7
 CATEGORIES=	www
 
 HOMEPAGE=	http://httpd.apache.org/
diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common
index 2eb7b047950..b844fc1186e 100644
--- a/www/apache2/Makefile.common
+++ b/www/apache2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2008/06/22 23:01:19 he Exp $
+# $NetBSD: Makefile.common,v 1.27 2010/11/01 18:03:04 adam Exp $
 
 # used by devel/apr0/Makefile
 
@@ -6,8 +6,8 @@ DISTNAME=		httpd-${APACHE_VERSION}
 EXTRACT_SUFX=		.tar.bz2
 # When updating this version be sure to update the checksum and remove
 # any PKGREVISION for devel/apr also.
-APACHE_VERSION=		2.0.63
-APR_VERSION=		0.9.17
+APACHE_VERSION=		2.0.64
+APR_VERSION=		0.9.19
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/} \
 			http://www.NetBSD.org/images/logos/
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index a1369bd6fac..bc45f8caf2b 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2009/06/14 22:00:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.39 2010/11/01 18:03:04 adam Exp $
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
 include/httpd/ap_config_auto.h
@@ -380,25 +380,29 @@ share/httpd/manual/bind.html
 share/httpd/manual/bind.html.en
 share/httpd/manual/bind.html.es
 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/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/content-negotiation.html.tr.utf8
 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.fr
-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/custom-error.html.tr.utf8
 share/httpd/manual/developer/API.html
 share/httpd/manual/developer/API.html.en
 share/httpd/manual/developer/debugging.html
@@ -413,7 +417,7 @@ 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
@@ -422,75 +426,86 @@ share/httpd/manual/dns-caveats.html
 share/httpd/manual/dns-caveats.html.en
 share/httpd/manual/dns-caveats.html.es
 share/httpd/manual/dns-caveats.html.fr
-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/dns-caveats.html.tr.utf8
 share/httpd/manual/dso.html
 share/httpd/manual/dso.html.en
 share/httpd/manual/dso.html.es
 share/httpd/manual/dso.html.fr
-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/dso.html.tr.utf8
 share/httpd/manual/env.html
 share/httpd/manual/env.html.en
 share/httpd/manual/env.html.es
 share/httpd/manual/env.html.fr
-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/env.html.tr.utf8
 share/httpd/manual/faq/all_in_one.html
 share/httpd/manual/faq/all_in_one.html.en
 share/httpd/manual/faq/all_in_one.html.ko.euc-kr
+share/httpd/manual/faq/all_in_one.html.tr.utf8
 share/httpd/manual/faq/error.html
 share/httpd/manual/faq/error.html.en
 share/httpd/manual/faq/error.html.ko.euc-kr
+share/httpd/manual/faq/error.html.tr.utf8
 share/httpd/manual/faq/index.html
 share/httpd/manual/faq/index.html.en
 share/httpd/manual/faq/index.html.ko.euc-kr
+share/httpd/manual/faq/index.html.tr.utf8
 share/httpd/manual/faq/support.html
 share/httpd/manual/faq/support.html.en
 share/httpd/manual/faq/support.html.ko.euc-kr
+share/httpd/manual/faq/support.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/filter.html.ru.koi8-r
+share/httpd/manual/filter.html.tr.utf8
 share/httpd/manual/glossary.html
 share/httpd/manual/glossary.html.de
 share/httpd/manual/glossary.html.en
 share/httpd/manual/glossary.html.es
 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/handler.html.tr.utf8
 share/httpd/manual/howto/auth.html
 share/httpd/manual/howto/auth.html.en
 share/httpd/manual/howto/auth.html.es
-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/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/public_html.html.tr.utf8
 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/custom_errordocs.gif
@@ -521,30 +536,34 @@ 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.ru.koi8-r
+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.ja.euc-jp
+share/httpd/manual/install.html.ja.utf8
 share/httpd/manual/install.html.ko.euc-kr
 share/httpd/manual/install.html.ru.koi8-r
+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.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.es
-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/logs.html.tr.utf8
 share/httpd/manual/misc/custom_errordocs.html
 share/httpd/manual/misc/custom_errordocs.html.en
 share/httpd/manual/misc/descriptors.html
@@ -553,11 +572,13 @@ share/httpd/manual/misc/fin_wait_2.html
 share/httpd/manual/misc/fin_wait_2.html.en
 share/httpd/manual/misc/index.html
 share/httpd/manual/misc/index.html.en
+share/httpd/manual/misc/index.html.tr.utf8
 share/httpd/manual/misc/known_client_problems.html
 share/httpd/manual/misc/known_client_problems.html.en
 share/httpd/manual/misc/perf-tuning.html
 share/httpd/manual/misc/perf-tuning.html.en
 share/httpd/manual/misc/perf-tuning.html.ko.euc-kr
+share/httpd/manual/misc/perf-tuning.html.tr.utf8
 share/httpd/manual/misc/relevant_standards.html
 share/httpd/manual/misc/relevant_standards.html.en
 share/httpd/manual/misc/relevant_standards.html.ko.euc-kr
@@ -567,6 +588,7 @@ share/httpd/manual/misc/rewriteguide.html.ko.euc-kr
 share/httpd/manual/misc/security_tips.html
 share/httpd/manual/misc/security_tips.html.en
 share/httpd/manual/misc/security_tips.html.ko.euc-kr
+share/httpd/manual/misc/security_tips.html.tr.utf8
 share/httpd/manual/misc/tutorials.html
 share/httpd/manual/misc/tutorials.html.en
 share/httpd/manual/mod/beos.html
@@ -578,25 +600,29 @@ 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.es
-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.es
-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/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/leader.html
 share/httpd/manual/mod/leader.html.de
 share/httpd/manual/mod/leader.html.en
@@ -604,22 +630,23 @@ share/httpd/manual/mod/leader.html.es
 share/httpd/manual/mod/leader.html.ko.euc-kr
 share/httpd/manual/mod/mod_access.html
 share/httpd/manual/mod/mod_access.html.en
-share/httpd/manual/mod/mod_access.html.ja.euc-jp
+share/httpd/manual/mod/mod_access.html.ja.utf8
 share/httpd/manual/mod/mod_actions.html
 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_alias.html.tr.utf8
 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.html
 share/httpd/manual/mod/mod_auth.html.en
-share/httpd/manual/mod/mod_auth.html.ja.euc-jp
+share/httpd/manual/mod/mod_auth.html.ja.utf8
 share/httpd/manual/mod/mod_auth_anon.html
 share/httpd/manual/mod/mod_auth_anon.html.en
 share/httpd/manual/mod/mod_auth_dbm.html
@@ -631,8 +658,9 @@ share/httpd/manual/mod/mod_auth_ldap.html
 share/httpd/manual/mod/mod_auth_ldap.html.en
 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_autoindex.html.tr.utf8
 share/httpd/manual/mod/mod_cache.html
 share/httpd/manual/mod/mod_cache.html.en
 share/httpd/manual/mod/mod_cache.html.ko.euc-kr
@@ -641,31 +669,32 @@ 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_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_dir.html.tr.utf8
 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.ko.euc-kr
@@ -673,18 +702,19 @@ share/httpd/manual/mod/mod_dumpio.html
 share/httpd/manual/mod/mod_dumpio.html.en
 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_env.html.tr.utf8
 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
@@ -700,10 +730,10 @@ share/httpd/manual/mod/mod_imap.html.en
 share/httpd/manual/mod/mod_imap.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
@@ -712,26 +742,29 @@ 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_config.html.tr.utf8
 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.tr.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_logio.html.tr.utf8
 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
@@ -746,58 +779,66 @@ 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_setenvif.html.tr.utf8
 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_so.html.tr.utf8
 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_status.html.tr.utf8
 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_suexec.html.tr.utf8
 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_userdir.html.tr.utf8
 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/mod_vhost_alias.html.tr.utf8
 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.es
-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.es
-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/perchild.html
@@ -806,36 +847,41 @@ 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.es
-share/httpd/manual/mod/prefork.html.ja.euc-jp
+share/httpd/manual/mod/prefork.html.ja.utf8
+share/httpd/manual/mod/prefork.html.tr.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/threadpool.html
 share/httpd/manual/mod/threadpool.html.en
 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.es
-share/httpd/manual/mod/worker.html.ja.euc-jp
+share/httpd/manual/mod/worker.html.ja.utf8
+share/httpd/manual/mod/worker.html.tr.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.ja.euc-jp
+share/httpd/manual/mpm.html.ja.utf8
 share/httpd/manual/mpm.html.ko.euc-kr
 share/httpd/manual/mpm.html.ru.koi8-r
+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.es
 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.ru.koi8-r
+share/httpd/manual/new_features_2_0.html.tr.utf8
 share/httpd/manual/platform/ebcdic.html
 share/httpd/manual/platform/ebcdic.html.en
 share/httpd/manual/platform/ebcdic.html.ko.euc-kr
@@ -857,48 +903,63 @@ share/httpd/manual/platform/windows.html.ko.euc-kr
 share/httpd/manual/programs/ab.html
 share/httpd/manual/programs/ab.html.en
 share/httpd/manual/programs/ab.html.ko.euc-kr
+share/httpd/manual/programs/ab.html.tr.utf8
 share/httpd/manual/programs/apachectl.html
 share/httpd/manual/programs/apachectl.html.en
 share/httpd/manual/programs/apachectl.html.ko.euc-kr
+share/httpd/manual/programs/apachectl.html.tr.utf8
 share/httpd/manual/programs/apxs.html
 share/httpd/manual/programs/apxs.html.en
 share/httpd/manual/programs/apxs.html.ko.euc-kr
+share/httpd/manual/programs/apxs.html.tr.utf8
 share/httpd/manual/programs/configure.html
 share/httpd/manual/programs/configure.html.en
 share/httpd/manual/programs/configure.html.ko.euc-kr
+share/httpd/manual/programs/configure.html.tr.utf8
 share/httpd/manual/programs/dbmmanage.html
 share/httpd/manual/programs/dbmmanage.html.en
 share/httpd/manual/programs/dbmmanage.html.ko.euc-kr
+share/httpd/manual/programs/dbmmanage.html.tr.utf8
 share/httpd/manual/programs/htdbm.html
 share/httpd/manual/programs/htdbm.html.en
+share/httpd/manual/programs/htdbm.html.tr.utf8
 share/httpd/manual/programs/htdigest.html
 share/httpd/manual/programs/htdigest.html.en
 share/httpd/manual/programs/htdigest.html.ko.euc-kr
+share/httpd/manual/programs/htdigest.html.tr.utf8
 share/httpd/manual/programs/htpasswd.html
 share/httpd/manual/programs/htpasswd.html.en
 share/httpd/manual/programs/htpasswd.html.ko.euc-kr
+share/httpd/manual/programs/htpasswd.html.tr.utf8
 share/httpd/manual/programs/httpd.html
 share/httpd/manual/programs/httpd.html.en
 share/httpd/manual/programs/httpd.html.ko.euc-kr
+share/httpd/manual/programs/httpd.html.tr.utf8
 share/httpd/manual/programs/index.html
 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
+share/httpd/manual/programs/logresolve.html.tr.utf8
 share/httpd/manual/programs/other.html
 share/httpd/manual/programs/other.html.en
 share/httpd/manual/programs/other.html.ko.euc-kr
+share/httpd/manual/programs/other.html.tr.utf8
 share/httpd/manual/programs/rotatelogs.html
 share/httpd/manual/programs/rotatelogs.html.en
 share/httpd/manual/programs/rotatelogs.html.ko.euc-kr
+share/httpd/manual/programs/rotatelogs.html.tr.utf8
 share/httpd/manual/programs/suexec.html
 share/httpd/manual/programs/suexec.html.en
 share/httpd/manual/programs/suexec.html.ko.euc-kr
+share/httpd/manual/programs/suexec.html.tr.utf8
 share/httpd/manual/rewrite/index.html
 share/httpd/manual/rewrite/index.html.en
+share/httpd/manual/rewrite/index.html.tr.utf8
 share/httpd/manual/rewrite/rewrite_guide.html
 share/httpd/manual/rewrite/rewrite_guide.html.en
 share/httpd/manual/rewrite/rewrite_guide_advanced.html
@@ -910,22 +971,26 @@ share/httpd/manual/rewrite/rewrite_tech.html.en
 share/httpd/manual/sections.html
 share/httpd/manual/sections.html.en
 share/httpd/manual/sections.html.es
-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.es
-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/server-wide.html.tr.utf8
 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/index.html.tr.utf8
 share/httpd/manual/ssl/ssl_compat.html
 share/httpd/manual/ssl/ssl_compat.html.en
 share/httpd/manual/ssl/ssl_faq.html
@@ -934,14 +999,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.ja.euc-jp
+share/httpd/manual/stopping.html.ja.utf8
 share/httpd/manual/stopping.html.ko.euc-kr
 share/httpd/manual/stopping.html.ru.koi8-r
+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
@@ -953,85 +1019,63 @@ 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.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/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/suexec.html.tr.utf8
 share/httpd/manual/upgrading.html
 share/httpd/manual/upgrading.html.de
 share/httpd/manual/upgrading.html.en
 share/httpd/manual/upgrading.html.es
 share/httpd/manual/upgrading.html.fr
-share/httpd/manual/upgrading.html.ja.euc-jp
+share/httpd/manual/upgrading.html.ja.utf8
 share/httpd/manual/upgrading.html.ko.euc-kr
 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/urlmapping.html.tr.utf8
 share/httpd/manual/vhosts/details.html
 share/httpd/manual/vhosts/details.html.en
 share/httpd/manual/vhosts/details.html.ko.euc-kr
+share/httpd/manual/vhosts/details.html.tr.utf8
 share/httpd/manual/vhosts/examples.html
 share/httpd/manual/vhosts/examples.html.en
 share/httpd/manual/vhosts/examples.html.ko.euc-kr
+share/httpd/manual/vhosts/examples.html.tr.utf8
 share/httpd/manual/vhosts/fd-limits.html
 share/httpd/manual/vhosts/fd-limits.html.en
-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/fd-limits.html.tr.utf8
 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.es
-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.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
+share/httpd/manual/vhosts/mass.html.tr.utf8
 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.es
-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
 @pkgdir share/httpd/manual/style/lang
+@pkgdir share/httpd/manual/style/xsl/util
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk
index 744628cdb0d..8cd6636fd96 100644
--- a/www/apache2/buildlink3.mk
+++ b/www/apache2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2010/01/17 12:02:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2010/11/01 18:03:04 adam Exp $
 
 BUILDLINK_TREE+=	apache
 
@@ -9,16 +9,16 @@ BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.51<2.2
 BUILDLINK_ABI_DEPENDS.apache+=	apache>=2.0.63nb6
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache2
 BUILDLINK_DEPMETHOD.apache?=	build
-.  if defined(APACHE_MODULE)
+.if defined(APACHE_MODULE)
 BUILDLINK_DEPMETHOD.apache+=	full
-.  endif
+.endif
 USE_TOOLS+=	perl			# for "apxs"
 CONFIGURE_ENV+=	APR_LIBTOOL=${LIBTOOL:Q}	# make apxs use the libtool we specify
 MAKE_ENV+=	APR_LIBTOOL=${LIBTOOL:Q}
 APXS?=		${BUILDLINK_PREFIX.apache}/sbin/apxs
-.  if defined(GNU_CONFIGURE)
+.if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS+=	--with-apxs2=${APXS:Q}
-.  endif
+.endif
 
 .include "../../devel/apr0/buildlink3.mk"
 .endif # APACHE_BUILDLINK3_MK
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index bbe408edb97..2b2869c4119 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,20 +1,18 @@
-$NetBSD: distinfo,v 1.56 2009/11/27 13:28:11 joerg Exp $
+$NetBSD: distinfo,v 1.57 2010/11/01 18:03:04 adam Exp $
 
-SHA1 (httpd-2.0.63.tar.bz2) = 20e2b64944e38e96491af788a37cb709d2c5b755
-RMD160 (httpd-2.0.63.tar.bz2) = f6a7de59860f627ac40b245fcf742fb07e1b4870
-Size (httpd-2.0.63.tar.bz2) = 4587670 bytes
+SHA1 (httpd-2.0.64.tar.bz2) = eeabe0fb428d9f11ce00559ff163740c6ceabf1c
+RMD160 (httpd-2.0.64.tar.bz2) = 6a4bfe4dfc4119a70cabbec2e0865dc2f12e8ec4
+Size (httpd-2.0.64.tar.bz2) = 4954766 bytes
 SHA1 (patch-aa) = bff1ef591f5361e7169ff9005dcf86437b9dac23
-SHA1 (patch-ab) = 387892276efd49fd081a187c1123de26fb6486ba
-SHA1 (patch-ac) = a8196a399d81f97333347dd7234d9eae2bd038ea
+SHA1 (patch-ab) = 32c47bd5087269f530b7d52d6a1a719a50ae7260
+SHA1 (patch-ac) = 7854294ae9c7fdcf7d6c9f5f2bee526952e583e3
 SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13
-SHA1 (patch-ae) = dda7fbd2561486b15b8436c47ccf1d4f9afa5df0
+SHA1 (patch-ae) = 26bea7ea9498437fa2436710849cbb00a4159442
 SHA1 (patch-af) = 8400ae084e31026e9d8143a0246aa3e65166f380
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
-SHA1 (patch-ah) = 98ddcd204363d62bdb0ba78065d24ee893bea568
+SHA1 (patch-ah) = 241e9083a82d465d2a1a5a116b11512ef1226f1a
 SHA1 (patch-ai) = 4dc88c15b0525a5aabc80d5c2a0720cd260629de
 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
 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/options.mk b/www/apache2/options.mk
index 0726f306c94..6d4e3305d1d 100644
--- a/www/apache2/options.mk
+++ b/www/apache2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:13 jlam Exp $
+# $NetBSD: options.mk,v 1.9 2010/11/01 18:03:04 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.apache
 PKG_SUPPORTED_OPTIONS=	suexec
@@ -19,7 +19,7 @@ APACHE_SUEXEC_CONFIGURE_ARGS+=						\
 	--with-suexec-caller=${APACHE_USER}				\
 	--with-suexec-safepath='${APACHE_SUEXEC_PATH:Q}'		\
 	--with-suexec-docroot=${APACHE_SUEXEC_DOCROOT:Q}		\
-	--with-suexec-logfile=${APACHE_SUEXEC_LOGFILE:Q}
+	--with-suexec-logfile=${APACHE_SUEXEC_LOGFILE}
 
 APACHE_MODULES+=	suexec
 CONFIGURE_ARGS+=	${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
diff --git a/www/apache2/patches/patch-ab b/www/apache2/patches/patch-ab
index c1ddd75544b..1c76fab3c98 100644
--- a/www/apache2/patches/patch-ab
+++ b/www/apache2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2005/04/25 09:13:14 adam Exp $
+$NetBSD: patch-ab,v 1.7 2010/11/01 18:03:04 adam Exp $
 
---- server/mpm_common.c.orig	2005-03-30 09:42:15.000000000 +0000
+--- server/mpm_common.c.orig	2007-07-14 17:03:18.000000000 +0000
 +++ server/mpm_common.c
-@@ -420,7 +420,7 @@ AP_DECLARE(gid_t) ap_gname2id(const char
+@@ -425,7 +425,7 @@ AP_DECLARE(gid_t) ap_gname2id(const char
  #ifndef HAVE_INITGROUPS
  int initgroups(const char *name, gid_t basegid)
  {
diff --git a/www/apache2/patches/patch-ac b/www/apache2/patches/patch-ac
index feb36cc3c37..65be10df3cc 100644
--- a/www/apache2/patches/patch-ac
+++ b/www/apache2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2009/11/27 13:28:11 joerg Exp $
+$NetBSD: patch-ac,v 1.8 2010/11/01 18:03:04 adam Exp $
 
---- configure.orig	2008-01-10 17:49:36.000000000 +0100
+--- configure.orig	2010-10-14 18:00:29.000000000 +0000
 +++ configure
-@@ -5253,7 +5253,7 @@ case $host in
+@@ -5384,7 +5384,7 @@ case $host in
                LTCFLAGS="-prefer-non-pic -static"
                ;;
            *)
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.7 2009/11/27 13:28:11 joerg Exp $
                SHLTCFLAGS=""
                LTCFLAGS=""
                ;;
-@@ -18939,7 +18939,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -18868,7 +18868,6 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  
diff --git a/www/apache2/patches/patch-ae b/www/apache2/patches/patch-ae
index d3892f7feac..a4621af7c10 100644
--- a/www/apache2/patches/patch-ae
+++ b/www/apache2/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.9 2009/09/04 18:55:34 wiz Exp $
+$NetBSD: patch-ae,v 1.10 2010/11/01 18:03:04 adam Exp $
 
---- modules/ssl/ssl_engine_init.c.orig	2007-12-28 15:07:53.000000000 +0000
+--- modules/ssl/ssl_engine_init.c.orig	2010-09-28 15:59:13.000000000 +0000
 +++ modules/ssl/ssl_engine_init.c
-@@ -531,7 +531,7 @@ static void ssl_init_ctx_verify(server_r
+@@ -535,7 +535,7 @@ static void ssl_init_ctx_verify(server_r
              ssl_die();
          }
  
diff --git a/www/apache2/patches/patch-ah b/www/apache2/patches/patch-ah
index 3d2437780c0..e6ccb184e62 100644
--- a/www/apache2/patches/patch-ah
+++ b/www/apache2/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.10 2009/09/04 18:55:34 wiz Exp $
+$NetBSD: patch-ah,v 1.11 2010/11/01 18:03:04 adam Exp $
 
---- modules/ssl/ssl_engine_kernel.c.orig	2007-05-08 23:08:47.000000000 +0000
+--- modules/ssl/ssl_engine_kernel.c.orig	2010-09-28 15:59:13.000000000 +0000
 +++ modules/ssl/ssl_engine_kernel.c
-@@ -550,7 +550,7 @@ int ssl_hook_Access(request_rec *r)
+@@ -573,7 +573,7 @@ int ssl_hook_Access(request_rec *r)
                   * sk_X509_shift-ed the peer cert out of the chain.
                   * we put it back here for the purpose of quick_renegotiation.
                   */
diff --git a/www/apache2/patches/patch-ap b/www/apache2/patches/patch-ap
deleted file mode 100644
index 7f24ab37ea6..00000000000
--- a/www/apache2/patches/patch-ap
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-ap,v 1.5 2008/06/20 13:28:08 he Exp $
-
-This is directly from
-http://www.apache.org/dist/httpd/patches/apply_to_2.0.63/CVE-2008-2364-patch-2.0.txt
-and as the name indicates a security-related patch.
-
-Index: modules/proxy/proxy_http.c
-===================================================================
---- modules/proxy/proxy_http.c	(revision 666240)
-+++ modules/proxy/proxy_http.c	(working copy)
-@@ -1290,6 +1290,16 @@
-     return 1;
- }
- 
-+/*
-+ * 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_http_conn_t *p_conn,
-@@ -1322,7 +1332,7 @@
-      */
-     rp->proxyreq = PROXYREQ_RESPONSE;
- 
--    while (received_continue) {
-+    while (received_continue && (received_continue <= AP_MAX_INTERIM_RESPONSES)) {
-         apr_brigade_cleanup(bb);
- 
-         len = ap_getline(buffer, sizeof(buffer), rp, 0);
-@@ -1440,7 +1450,9 @@
-             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);
-+            if (!ap_is_HTTP_INFO(r->status)) {
-+                ap_proxy_pre_http_request(origin, rp);
-+            }
- 
-             /* handle Via header in response */
-             if (conf->viaopt != via_off && conf->viaopt != via_block) {
-@@ -1486,6 +1498,7 @@
-         if ( r->status != HTTP_CONTINUE ) {
-             received_continue = 0;
-         } else {
-+            received_continue++;
-             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
-                          "proxy: HTTP: received 100 CONTINUE");
-         }
-@@ -1622,6 +1635,14 @@
-         }
-     }
- 
-+    /* See define of AP_MAX_INTERIM_RESPONSES for why */
-+    if (received_continue > AP_MAX_INTERIM_RESPONSES) {
-+        return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-+                             apr_psprintf(p, 
-+                             "Too many (%d) interim responses from origin server",
-+                             received_continue));
-+    }
-+
-     if ( conf->error_override ) {
-         /* the code above this checks for 'OK' which is what the hook expects */
-         if ( r->status == HTTP_OK )
diff --git a/www/apache2/patches/patch-aq b/www/apache2/patches/patch-aq
deleted file mode 100644
index 8555fc0a3cc..00000000000
--- a/www/apache2/patches/patch-aq
+++ /dev/null
@@ -1,11 +0,0 @@
-$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));