Pullup ticket #4081 - requested by ryoon

www/apache24: security update

Revisions pulled up:
- www/apache24/Makefile                                         1.15 via patch
- www/apache24/PLIST                                            1.9
- www/apache24/distinfo                                         1.7
- www/apache24/patches/patch-ad                                 1.2
- www/apache24/patches/patch-ag                                 1.2
- www/apache24/patches/patch-modules_ssl_ssl__private.h         1.3

---
   Module Name:	pkgsrc
   Committed By:	ryoon
   Date:		Mon Feb 25 21:16:38 UTC 2013

   Modified Files:
   	pkgsrc/www/apache24: Makefile PLIST distinfo
   	pkgsrc/www/apache24/patches: patch-ad patch-ag
   	    patch-modules_ssl_ssl__private.h

   Log Message:
   Update to 2.4.4

   Changelog:
   Fix the following security bugs.
       SECURITY: CVE-2012-3499 (cve.mitre.org) Various XSS flaws due to unescaped hostnames and URIs HTML output in mod_info, mod_status, mod_imagemap, mod_ldap, and mod_proxy_ftp.
       SECURITY: CVE-2012-4558 (cve.mitre.org) XSS in mod_proxy_balancer manager interface.

6 files changed, 103 insertions, 22 deletions

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index efc2ee91cfb..b7dd0ebeecb 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2012/12/16 01:52:37 obache Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2013/02/27 09:37:43 tron Exp $
 
-DISTNAME=	httpd-2.4.3
+DISTNAME=	httpd-2.4.4
 PKGNAME=	${DISTNAME:S/httpd/apache/}
-PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
 		http://archive.apache.org/dist/httpd/ \
diff --git a/www/apache24/PLIST b/www/apache24/PLIST
index 43b76389435..50494a2cd5e 100644
--- a/www/apache24/PLIST
+++ b/www/apache24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2012/08/26 12:37:34 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.8.4.1 2013/02/27 09:37:43 tron Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -24,6 +24,7 @@ include/httpd/ap_release.h
 include/httpd/ap_slotmem.h
 include/httpd/ap_socache.h
 include/httpd/apache_noprobes.h
+include/httpd/cache_common.h
 include/httpd/heartbeat.h
 include/httpd/http_config.h
 include/httpd/http_connection.h
@@ -51,6 +52,7 @@ include/httpd/mod_ssl.h
 include/httpd/mod_status.h
 include/httpd/mod_unixd.h
 include/httpd/mod_watchdog.h
+include/httpd/mod_xml2enc.h
 include/httpd/mpm_common.h
 include/httpd/os.h
 include/httpd/scoreboard.h
@@ -171,6 +173,8 @@ lib/httpd/mod_version.so
 lib/httpd/mod_vhost_alias.so
 lib/httpd/mod_watchdog.so
 libexec/cgi-bin/printenv
+libexec/cgi-bin/printenv.vbs
+libexec/cgi-bin/printenv.wsf
 libexec/cgi-bin/test-cgi
 man/man1/ab.1
 man/man1/apxs.1
@@ -254,9 +258,9 @@ share/httpd/icons/alert.red.gif
 share/httpd/icons/alert.red.png
 share/httpd/icons/apache_pb.gif
 share/httpd/icons/apache_pb.png
+share/httpd/icons/apache_pb.svg
 share/httpd/icons/apache_pb2.gif
 share/httpd/icons/apache_pb2.png
-share/httpd/icons/apache_pb2_ani.gif
 share/httpd/icons/back.gif
 share/httpd/icons/back.png
 share/httpd/icons/ball.gray.gif
@@ -596,6 +600,7 @@ share/httpd/manual/handler.html.tr.utf8
 share/httpd/manual/handler.html.zh-cn
 share/httpd/manual/howto/access.html
 share/httpd/manual/howto/access.html.en
+share/httpd/manual/howto/access.html.fr
 share/httpd/manual/howto/auth.html
 share/httpd/manual/howto/auth.html.en
 share/httpd/manual/howto/auth.html.fr
@@ -615,6 +620,7 @@ 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.fr
 share/httpd/manual/howto/index.html.ja.utf8
 share/httpd/manual/howto/index.html.ko.euc-kr
 share/httpd/manual/howto/index.html.zh-cn
@@ -712,6 +718,7 @@ share/httpd/manual/misc/index.html.tr.utf8
 share/httpd/manual/misc/index.html.zh-cn
 share/httpd/manual/misc/password_encryptions.html
 share/httpd/manual/misc/password_encryptions.html.en
+share/httpd/manual/misc/password_encryptions.html.fr
 share/httpd/manual/misc/perf-tuning.html
 share/httpd/manual/misc/perf-tuning.html.en
 share/httpd/manual/misc/perf-tuning.html.fr
@@ -719,6 +726,7 @@ 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.fr
 share/httpd/manual/misc/relevant_standards.html.ko.euc-kr
 share/httpd/manual/misc/security_tips.html
 share/httpd/manual/misc/security_tips.html.en
@@ -734,6 +742,7 @@ 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.fr
 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
@@ -741,6 +750,7 @@ 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.fr
 share/httpd/manual/mod/directives.html.ja.utf8
 share/httpd/manual/mod/directives.html.ko.euc-kr
 share/httpd/manual/mod/directives.html.tr.utf8
@@ -775,6 +785,7 @@ share/httpd/manual/mod/mod_alias.html.ko.euc-kr
 share/httpd/manual/mod/mod_alias.html.tr.utf8
 share/httpd/manual/mod/mod_allowmethods.html
 share/httpd/manual/mod/mod_allowmethods.html.en
+share/httpd/manual/mod/mod_allowmethods.html.fr
 share/httpd/manual/mod/mod_asis.html
 share/httpd/manual/mod/mod_asis.html.en
 share/httpd/manual/mod/mod_asis.html.fr
@@ -791,8 +802,10 @@ share/httpd/manual/mod/mod_auth_digest.html.fr
 share/httpd/manual/mod/mod_auth_digest.html.ko.euc-kr
 share/httpd/manual/mod/mod_auth_form.html
 share/httpd/manual/mod/mod_auth_form.html.en
+share/httpd/manual/mod/mod_auth_form.html.fr
 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.fr
 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_core.html
@@ -800,8 +813,10 @@ share/httpd/manual/mod/mod_authn_core.html.en
 share/httpd/manual/mod/mod_authn_core.html.fr
 share/httpd/manual/mod/mod_authn_dbd.html
 share/httpd/manual/mod/mod_authn_dbd.html.en
+share/httpd/manual/mod/mod_authn_dbd.html.fr
 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.fr
 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_file.html
@@ -811,18 +826,23 @@ 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_authn_socache.html
 share/httpd/manual/mod/mod_authn_socache.html.en
+share/httpd/manual/mod/mod_authn_socache.html.fr
 share/httpd/manual/mod/mod_authnz_ldap.html
 share/httpd/manual/mod/mod_authnz_ldap.html.en
 share/httpd/manual/mod/mod_authnz_ldap.html.fr
 share/httpd/manual/mod/mod_authz_core.html
 share/httpd/manual/mod/mod_authz_core.html.en
+share/httpd/manual/mod/mod_authz_core.html.fr
 share/httpd/manual/mod/mod_authz_dbd.html
 share/httpd/manual/mod/mod_authz_dbd.html.en
+share/httpd/manual/mod/mod_authz_dbd.html.fr
 share/httpd/manual/mod/mod_authz_dbm.html
 share/httpd/manual/mod/mod_authz_dbm.html.en
+share/httpd/manual/mod/mod_authz_dbm.html.fr
 share/httpd/manual/mod/mod_authz_dbm.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.fr
 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
@@ -859,33 +879,42 @@ share/httpd/manual/mod/mod_cache_disk.html.ja.utf8
 share/httpd/manual/mod/mod_cache_disk.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.fr
 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.fr
 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.fr
 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.fr
 share/httpd/manual/mod/mod_charset_lite.html.ko.euc-kr
 share/httpd/manual/mod/mod_data.html
 share/httpd/manual/mod/mod_data.html.en
+share/httpd/manual/mod/mod_data.html.fr
 share/httpd/manual/mod/mod_dav.html
 share/httpd/manual/mod/mod_dav.html.en
+share/httpd/manual/mod/mod_dav.html.fr
 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.fr
 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.fr
 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_dbd.html.fr
 share/httpd/manual/mod/mod_deflate.html
 share/httpd/manual/mod/mod_deflate.html.en
 share/httpd/manual/mod/mod_deflate.html.fr
@@ -893,6 +922,7 @@ share/httpd/manual/mod/mod_deflate.html.ja.utf8
 share/httpd/manual/mod/mod_deflate.html.ko.euc-kr
 share/httpd/manual/mod/mod_dialup.html
 share/httpd/manual/mod/mod_dialup.html.en
+share/httpd/manual/mod/mod_dialup.html.fr
 share/httpd/manual/mod/mod_dir.html
 share/httpd/manual/mod/mod_dir.html.en
 share/httpd/manual/mod/mod_dir.html.fr
@@ -916,6 +946,7 @@ 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.fr
 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
@@ -924,13 +955,16 @@ 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.fr
 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
+share/httpd/manual/mod/mod_file_cache.html.fr
 share/httpd/manual/mod/mod_file_cache.html.ko.euc-kr
 share/httpd/manual/mod/mod_filter.html
 share/httpd/manual/mod/mod_filter.html.en
+share/httpd/manual/mod/mod_filter.html.fr
 share/httpd/manual/mod/mod_headers.html
 share/httpd/manual/mod/mod_headers.html.en
 share/httpd/manual/mod/mod_headers.html.fr
@@ -958,15 +992,20 @@ 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
+share/httpd/manual/mod/mod_isapi.html.fr
 share/httpd/manual/mod/mod_isapi.html.ko.euc-kr
 share/httpd/manual/mod/mod_lbmethod_bybusyness.html
 share/httpd/manual/mod/mod_lbmethod_bybusyness.html.en
+share/httpd/manual/mod/mod_lbmethod_bybusyness.html.fr
 share/httpd/manual/mod/mod_lbmethod_byrequests.html
 share/httpd/manual/mod/mod_lbmethod_byrequests.html.en
+share/httpd/manual/mod/mod_lbmethod_byrequests.html.fr
 share/httpd/manual/mod/mod_lbmethod_bytraffic.html
 share/httpd/manual/mod/mod_lbmethod_bytraffic.html.en
+share/httpd/manual/mod/mod_lbmethod_bytraffic.html.fr
 share/httpd/manual/mod/mod_lbmethod_heartbeat.html
 share/httpd/manual/mod/mod_lbmethod_heartbeat.html.en
+share/httpd/manual/mod/mod_lbmethod_heartbeat.html.fr
 share/httpd/manual/mod/mod_ldap.html
 share/httpd/manual/mod/mod_ldap.html.en
 share/httpd/manual/mod/mod_ldap.html.fr
@@ -984,6 +1023,7 @@ share/httpd/manual/mod/mod_log_forensic.html.ja.utf8
 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.fr
 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
@@ -1001,30 +1041,38 @@ share/httpd/manual/mod/mod_negotiation.html.fr
 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_nw_ssl.html.fr
 share/httpd/manual/mod/mod_privileges.html
 share/httpd/manual/mod/mod_privileges.html.en
+share/httpd/manual/mod/mod_privileges.html.fr
 share/httpd/manual/mod/mod_proxy.html
 share/httpd/manual/mod/mod_proxy.html.en
 share/httpd/manual/mod/mod_proxy.html.fr
 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.fr
 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.fr
 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.fr
 share/httpd/manual/mod/mod_proxy_connect.html.ja.utf8
 share/httpd/manual/mod/mod_proxy_express.html
 share/httpd/manual/mod/mod_proxy_express.html.en
+share/httpd/manual/mod/mod_proxy_express.html.fr
 share/httpd/manual/mod/mod_proxy_fcgi.html
 share/httpd/manual/mod/mod_proxy_fcgi.html.en
 share/httpd/manual/mod/mod_proxy_fcgi.html.fr
 share/httpd/manual/mod/mod_proxy_fdpass.html
 share/httpd/manual/mod/mod_proxy_fdpass.html.en
+share/httpd/manual/mod/mod_proxy_fdpass.html.fr
 share/httpd/manual/mod/mod_proxy_ftp.html
 share/httpd/manual/mod/mod_proxy_ftp.html.en
+share/httpd/manual/mod/mod_proxy_ftp.html.fr
 share/httpd/manual/mod/mod_proxy_html.html
 share/httpd/manual/mod/mod_proxy_html.html.en
 share/httpd/manual/mod/mod_proxy_html.html.fr
@@ -1033,10 +1081,13 @@ share/httpd/manual/mod/mod_proxy_http.html.en
 share/httpd/manual/mod/mod_proxy_http.html.fr
 share/httpd/manual/mod/mod_proxy_scgi.html
 share/httpd/manual/mod/mod_proxy_scgi.html.en
+share/httpd/manual/mod/mod_proxy_scgi.html.fr
 share/httpd/manual/mod/mod_ratelimit.html
 share/httpd/manual/mod/mod_ratelimit.html.en
+share/httpd/manual/mod/mod_ratelimit.html.fr
 share/httpd/manual/mod/mod_reflector.html
 share/httpd/manual/mod/mod_reflector.html.en
+share/httpd/manual/mod/mod_reflector.html.fr
 share/httpd/manual/mod/mod_remoteip.html
 share/httpd/manual/mod/mod_remoteip.html.en
 share/httpd/manual/mod/mod_remoteip.html.fr
@@ -1044,6 +1095,7 @@ share/httpd/manual/mod/mod_reqtimeout.html
 share/httpd/manual/mod/mod_reqtimeout.html.en
 share/httpd/manual/mod/mod_request.html
 share/httpd/manual/mod/mod_request.html.en
+share/httpd/manual/mod/mod_request.html.fr
 share/httpd/manual/mod/mod_request.html.tr.utf8
 share/httpd/manual/mod/mod_rewrite.html
 share/httpd/manual/mod/mod_rewrite.html.en
@@ -1086,10 +1138,12 @@ share/httpd/manual/mod/mod_socache_shmcb.html
 share/httpd/manual/mod/mod_socache_shmcb.html.en
 share/httpd/manual/mod/mod_speling.html
 share/httpd/manual/mod/mod_speling.html.en
+share/httpd/manual/mod/mod_speling.html.fr
 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_ssl.html.fr
 share/httpd/manual/mod/mod_status.html
 share/httpd/manual/mod/mod_status.html.en
 share/httpd/manual/mod/mod_status.html.fr
@@ -1098,6 +1152,7 @@ share/httpd/manual/mod/mod_status.html.ko.euc-kr
 share/httpd/manual/mod/mod_status.html.tr.utf8
 share/httpd/manual/mod/mod_substitute.html
 share/httpd/manual/mod/mod_substitute.html.en
+share/httpd/manual/mod/mod_substitute.html.fr
 share/httpd/manual/mod/mod_suexec.html
 share/httpd/manual/mod/mod_suexec.html.en
 share/httpd/manual/mod/mod_suexec.html.ja.utf8
@@ -1129,6 +1184,7 @@ share/httpd/manual/mod/mod_watchdog.html
 share/httpd/manual/mod/mod_watchdog.html.en
 share/httpd/manual/mod/mod_xml2enc.html
 share/httpd/manual/mod/mod_xml2enc.html.en
+share/httpd/manual/mod/mod_xml2enc.html.fr
 share/httpd/manual/mod/module-dict.html
 share/httpd/manual/mod/module-dict.html.en
 share/httpd/manual/mod/module-dict.html.ja.utf8
@@ -1137,6 +1193,7 @@ 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.fr
 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
@@ -1147,9 +1204,11 @@ share/httpd/manual/mod/mpm_winnt.html.en
 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/mpmt_os2.html.fr
 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.fr
 share/httpd/manual/mod/prefork.html.ja.utf8
 share/httpd/manual/mod/prefork.html.tr.utf8
 share/httpd/manual/mod/quickreference.html
@@ -1163,6 +1222,7 @@ share/httpd/manual/mod/quickreference.html.zh-cn
 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.fr
 share/httpd/manual/mod/worker.html.ja.utf8
 share/httpd/manual/mod/worker.html.tr.utf8
 share/httpd/manual/mpm.html
@@ -1216,52 +1276,65 @@ share/httpd/manual/platform/windows.html.en
 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.fr
 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.fr
 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.fr
 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.fr
 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.fr
 share/httpd/manual/programs/dbmmanage.html.ko.euc-kr
 share/httpd/manual/programs/dbmmanage.html.tr.utf8
 share/httpd/manual/programs/fcgistarter.html
 share/httpd/manual/programs/fcgistarter.html.en
+share/httpd/manual/programs/fcgistarter.html.fr
 share/httpd/manual/programs/fcgistarter.html.tr.utf8
 share/httpd/manual/programs/htcacheclean.html
 share/httpd/manual/programs/htcacheclean.html.en
+share/httpd/manual/programs/htcacheclean.html.fr
 share/httpd/manual/programs/htcacheclean.html.ko.euc-kr
 share/httpd/manual/programs/htcacheclean.html.tr.utf8
 share/httpd/manual/programs/htdbm.html
 share/httpd/manual/programs/htdbm.html.en
+share/httpd/manual/programs/htdbm.html.fr
 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.fr
 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.fr
 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.fr
 share/httpd/manual/programs/httpd.html.ko.euc-kr
 share/httpd/manual/programs/httpd.html.tr.utf8
 share/httpd/manual/programs/httxt2dbm.html
 share/httpd/manual/programs/httxt2dbm.html.en
+share/httpd/manual/programs/httxt2dbm.html.fr
 share/httpd/manual/programs/httxt2dbm.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.fr
 share/httpd/manual/programs/index.html.ko.euc-kr
 share/httpd/manual/programs/index.html.tr.utf8
 share/httpd/manual/programs/index.html.zh-cn
@@ -1269,14 +1342,17 @@ share/httpd/manual/programs/log_server_status.html
 share/httpd/manual/programs/log_server_status.html.en
 share/httpd/manual/programs/logresolve.html
 share/httpd/manual/programs/logresolve.html.en
+share/httpd/manual/programs/logresolve.html.fr
 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.fr
 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.fr
 share/httpd/manual/programs/rotatelogs.html.ko.euc-kr
 share/httpd/manual/programs/rotatelogs.html.tr.utf8
 share/httpd/manual/programs/split-logfile.html
@@ -1310,17 +1386,19 @@ share/httpd/manual/rewrite/intro.html.en
 share/httpd/manual/rewrite/intro.html.fr
 share/httpd/manual/rewrite/proxy.html
 share/httpd/manual/rewrite/proxy.html.en
+share/httpd/manual/rewrite/proxy.html.fr
 share/httpd/manual/rewrite/remapping.html
 share/httpd/manual/rewrite/remapping.html.en
-share/httpd/manual/rewrite/rewrite_guide.html.fr
-share/httpd/manual/rewrite/rewrite_guide_advanced.html.fr
+share/httpd/manual/rewrite/remapping.html.fr
 share/httpd/manual/rewrite/rewritemap.html
 share/httpd/manual/rewrite/rewritemap.html.en
+share/httpd/manual/rewrite/rewritemap.html.fr
 share/httpd/manual/rewrite/tech.html
 share/httpd/manual/rewrite/tech.html.en
 share/httpd/manual/rewrite/tech.html.fr
 share/httpd/manual/rewrite/vhosts.html
 share/httpd/manual/rewrite/vhosts.html.en
+share/httpd/manual/rewrite/vhosts.html.fr
 share/httpd/manual/sections.html
 share/httpd/manual/sections.html.en
 share/httpd/manual/sections.html.fr
@@ -1344,6 +1422,7 @@ share/httpd/manual/sitemap.html.tr.utf8
 share/httpd/manual/sitemap.html.zh-cn
 share/httpd/manual/socache.html
 share/httpd/manual/socache.html.en
+share/httpd/manual/socache.html.fr
 share/httpd/manual/ssl/index.html
 share/httpd/manual/ssl/index.html.en
 share/httpd/manual/ssl/index.html.fr
diff --git a/www/apache24/distinfo b/www/apache24/distinfo
index 9b8a698f422..c85fe145978 100644
--- a/www/apache24/distinfo
+++ b/www/apache24/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.6 2012/08/26 12:37:34 ryoon Exp $
+$NetBSD: distinfo,v 1.6.4.1 2013/02/27 09:37:43 tron Exp $
 
-SHA1 (httpd-2.4.3.tar.bz2) = 0ef1281bb758add937efe61c345287be2f27f662
-RMD160 (httpd-2.4.3.tar.bz2) = 56f18ab27b3a8f27207144fa6d51fd6cdfff473e
-Size (httpd-2.4.3.tar.bz2) = 4559279 bytes
+SHA1 (httpd-2.4.4.tar.bz2) = 0c5ab7f876aa10fbe8bfab2c34f8dd3dc76db16c
+RMD160 (httpd-2.4.4.tar.bz2) = 2e22389d9dc9ad98d6b6727c25b8fdca4f7868f6
+Size (httpd-2.4.4.tar.bz2) = 4780289 bytes
 SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839
 SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324
 SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d
-SHA1 (patch-ad) = 4c812b94af32e8493e0b17793a2d065003d32cc6
+SHA1 (patch-ad) = 4ba4a9c812951f533fa316e5dbf17eaab5494157
 SHA1 (patch-ae) = 5bd3bf54e792bf8a2916d7e1b49b1702b02c6903
-SHA1 (patch-ag) = 62a40901debb421dac7954362d4934297c54c0c6
+SHA1 (patch-ag) = 50c7f0fab1cb90ac573f1c47f2d37f9c2a6247e1
 SHA1 (patch-ai) = 867ac81fd14b1bd6af048ec57390d915956e9568
 SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911
 SHA1 (patch-am) = f14b260ffad2c7e8d26e5b614d4aeaf8506e195b
 SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df
-SHA1 (patch-modules_ssl_ssl__private.h) = 7629d447c4030493e1cc3352da448c310962d45e
+SHA1 (patch-modules_ssl_ssl__private.h) = 7751a99a794957cbea19ff8d1a3e83bf8f276604
 SHA1 (patch-server_core__filters.c) = 331672c9a65691229518f31dcdae64382b392287
diff --git a/www/apache24/patches/patch-ad b/www/apache24/patches/patch-ad
index d454f06266b..ede88fcb943 100644
--- a/www/apache24/patches/patch-ad
+++ b/www/apache24/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+$NetBSD: patch-ad,v 1.1.1.1.6.1 2013/02/27 09:37:43 tron Exp $
 
---- config.layout.orig	2012-02-02 12:05:28.000000000 +0000
+--- config.layout.orig	2012-04-17 14:01:41.000000000 +0000
 +++ config.layout
-@@ -347,3 +347,26 @@
+@@ -347,6 +347,29 @@
      proxycachedir: ${localstatedir}/proxy
  </Layout>
  
@@ -29,3 +29,6 @@ $NetBSD: patch-ad,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
 +    proxycachedir: ${localstatedir}/db/httpd/proxy
 +</Layout>
 +
+ # FHS layout
+ <Layout Slackware-FHS>
+     prefix:          /usr
diff --git a/www/apache24/patches/patch-ag b/www/apache24/patches/patch-ag
index 3a2bd780c36..f2a52d6bc3c 100644
--- a/www/apache24/patches/patch-ag
+++ b/www/apache24/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+$NetBSD: patch-ag,v 1.1.1.1.6.1 2013/02/27 09:37:43 tron Exp $
 
---- support/Makefile.in.orig	2011-12-20 14:57:46.000000000 +0000
+--- support/Makefile.in.orig	2012-12-11 10:37:25.000000000 +0000
 +++ support/Makefile.in
 @@ -31,9 +31,11 @@ install:
  	done
@@ -13,4 +13,4 @@ $NetBSD: patch-ag,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
 +	    fi ; \
  	fi
  
- htpasswd_OBJECTS = htpasswd.lo
+ htpasswd.lo: passwd_common.h
diff --git a/www/apache24/patches/patch-modules_ssl_ssl__private.h b/www/apache24/patches/patch-modules_ssl_ssl__private.h
index 1774e0c1db4..a5c1e90da36 100644
--- a/www/apache24/patches/patch-modules_ssl_ssl__private.h
+++ b/www/apache24/patches/patch-modules_ssl_ssl__private.h
@@ -1,11 +1,11 @@
-$NetBSD: patch-modules_ssl_ssl__private.h,v 1.2 2012/07/05 13:11:24 ryoon Exp $
+$NetBSD: patch-modules_ssl_ssl__private.h,v 1.2.6.1 2013/02/27 09:37:43 tron Exp $
 
 Exclude OpenSSL shipped with NetBSD current and 6.0.
 It is pre-beta snapshot of 1.0.1.
 
 https://issues.apache.org/bugzilla/show_bug.cgi?id=53512
 
---- modules/ssl/ssl_private.h.orig	2012-04-03 12:37:57.000000000 +0000
+--- modules/ssl/ssl_private.h.orig	2012-12-11 09:55:03.000000000 +0000
 +++ modules/ssl/ssl_private.h
 @@ -83,7 +83,7 @@