[pkgsrc/trunk]: pkgsrc/www/apache22 Update "apache22" package to version 2.2.9.

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c71e40c5eb5
branches:  trunk
changeset: 543450:5c71e40c5eb5
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Jun 18 21:38:00 2008 +0000

description:
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.

diffstat:

 www/apache22/Makefile         |    7 +-
 www/apache22/Makefile.common  |    4 +-
 www/apache22/PLIST            |  254 ++++++++++++++++++++---------------------
 www/apache22/distinfo         |   11 +-
 www/apache22/patches/patch-aa |   18 +-
 www/apache22/patches/patch-ab |   83 -------------
 6 files changed, 141 insertions(+), 236 deletions(-)

diffs (truncated from 933 to 300 lines):

diff -r e975d53ec569 -r 5c71e40c5eb5 www/apache22/Makefile
--- a/www/apache22/Makefile     Wed Jun 18 21:37:31 2008 +0000
+++ b/www/apache22/Makefile     Wed Jun 18 21:38:00 2008 +0000
@@ -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_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 @@
                ${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 -r e975d53ec569 -r 5c71e40c5eb5 www/apache22/Makefile.common
--- a/www/apache22/Makefile.common      Wed Jun 18 21:37:31 2008 +0000
+++ b/www/apache22/Makefile.common      Wed Jun 18 21:38:00 2008 +0000
@@ -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 -r e975d53ec569 -r 5c71e40c5eb5 www/apache22/PLIST
--- a/www/apache22/PLIST        Wed Jun 18 21:37:31 2008 +0000
+++ b/www/apache22/PLIST        Wed Jun 18 21:38:00 2008 +0000
@@ -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/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.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.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.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.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.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/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.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