Pullup ticket 2282 - requested by tron

security update for apache22

- pkgsrc/www/apache22/Makefile				1.24 via patch
- pkgsrc/www/apache22/Makefile.common			1.7
- pkgsrc/www/apache22/PLIST				1.4
- pkgsrc/www/apache22/distinfo				1.9
- pkgsrc/www/apache22/patches/patch-ab			removed

   Module Name:		pkgsrc
   Committed By:	xtraeme
   Date:		Mon Jan 21 15:07:11 UTC 2008

   Modified Files:
	   pkgsrc/www/apache22: Makefile Makefile.common PLIST distinfo
   Removed Files:
	   pkgsrc/www/apache22/patches: patch-ab

   Log Message:
   Update to 2.2.8, please check http://www.apache.org/dist/httpd/CHANGES_2.2.8
   for the list of changes.

5 files changed, 21 insertions, 66 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 083146a5abe..dc0617fb031 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/12/04 12:08:45 abs Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2008/01/29 14:24:36 ghen Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	apache-${APACHE_VERSION}
-PKGREVISION=	2
 CATEGORIES=	www
 
 HOMEPAGE=	http://httpd.apache.org/
diff --git a/www/apache22/Makefile.common b/www/apache22/Makefile.common
index 63db1bf98cb..4b11f4e8382 100644
--- a/www/apache22/Makefile.common
+++ b/www/apache22/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.6 2007/09/08 11:02:07 tron Exp $
+# $NetBSD: Makefile.common,v 1.6.4.1 2008/01/29 14:24:36 ghen Exp $
 
 DISTNAME=		httpd-${APACHE_VERSION}
 EXTRACT_SUFX=		.tar.bz2
 # When updating this version be sure to update the checksum.
-APACHE_VERSION=		2.2.6
+APACHE_VERSION=		2.2.8
 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 220ca96f609..bce2b5e5977 100644
--- a/www/apache22/PLIST
+++ b/www/apache22/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/09/10 20:36:40 tron Exp $
+@comment $NetBSD: PLIST,v 1.3.4.1 2008/01/29 14:24:36 ghen Exp $
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
 include/httpd/ap_config_auto.h
@@ -359,13 +359,16 @@ share/httpd/manual/bind.html.ja.euc-jp
 share/httpd/manual/bind.html.ko.euc-kr
 share/httpd/manual/caching.html
 share/httpd/manual/caching.html.en
+share/httpd/manual/caching.html.fr
 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.ko.euc-kr
 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.ko.euc-kr
 share/httpd/manual/convenience.map
@@ -417,6 +420,7 @@ 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.fr
 share/httpd/manual/glossary.html.ko.euc-kr
 share/httpd/manual/handler.html
 share/httpd/manual/handler.html.en
@@ -499,8 +503,8 @@ share/httpd/manual/install.html.ko.euc-kr
 share/httpd/manual/invoking.html
 share/httpd/manual/invoking.html.de
 share/httpd/manual/invoking.html.en
-share/httpd/manual/invoking.html.fr
 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.ko.euc-kr
 share/httpd/manual/invoking.html.ru.koi8-r
@@ -513,6 +517,8 @@ share/httpd/manual/logs.html.ko.euc-kr
 share/httpd/manual/misc/index.html
 share/httpd/manual/misc/index.html.en
 share/httpd/manual/misc/index.html.ko.euc-kr
+share/httpd/manual/misc/password_encryptions.html
+share/httpd/manual/misc/password_encryptions.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
@@ -774,6 +780,8 @@ 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.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
@@ -828,8 +836,8 @@ share/httpd/manual/mod/worker.html.ja.euc-jp
 share/httpd/manual/mpm.html
 share/httpd/manual/mpm.html.de
 share/httpd/manual/mpm.html.en
-share/httpd/manual/mpm.html.fr
 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.ko.euc-kr
 share/httpd/manual/new_features_2_0.html
@@ -923,6 +931,7 @@ share/httpd/manual/rewrite/rewrite_tech.html
 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.ko.euc-kr
 share/httpd/manual/server-wide.html
@@ -948,10 +957,10 @@ 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/stopping.html
-share/httpd/manual/stopping.html.fr
 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.ko.euc-kr
 share/httpd/manual/style/build.properties
@@ -1010,6 +1019,7 @@ 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
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index c3220b809f7..2e7b66838b9 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.8 2007/12/04 12:08:45 abs Exp $
+$NetBSD: distinfo,v 1.8.2.1 2008/01/29 14:24:36 ghen Exp $
 
-SHA1 (httpd-2.2.6.tar.bz2) = e6ef926ecd1f9a412af8c266239f0a6f58c63854
-RMD160 (httpd-2.2.6.tar.bz2) = 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f
-Size (httpd-2.2.6.tar.bz2) = 4717066 bytes
+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) = 7045de8ace1c13f537029931947048624c929dbe
 SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
 SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13
 SHA1 (patch-ae) = 86b307d6eefef232b6223afc3f69e64be40bd913
diff --git a/www/apache22/patches/patch-ab b/www/apache22/patches/patch-ab
deleted file mode 100644
index 04390375023..00000000000
--- a/www/apache22/patches/patch-ab
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2007/12/04 12:08:45 abs Exp $
-
-# apache SVN revision 574884 to fix garbage characters in Server header
-# http://issues.apache.org/bugzilla/show_bug.cgi?id=43334
-
---- modules/ssl/ssl_engine_vars.c.orig	2007-08-28 14:40:01.000000000 +0100
-+++ modules/ssl/ssl_engine_vars.c
-@@ -49,7 +49,7 @@ static char *ssl_var_lookup_ssl_cert_PEM
- static char *ssl_var_lookup_ssl_cert_verify(apr_pool_t *p, conn_rec *c);
- static char *ssl_var_lookup_ssl_cipher(apr_pool_t *p, conn_rec *c, char *var);
- static void  ssl_var_lookup_ssl_cipher_bits(SSL *ssl, int *usekeysize, int *algkeysize);
--static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var);
-+static char *ssl_var_lookup_ssl_version(apr_pool_t *pp, apr_pool_t *p, char *var);
- static char *ssl_var_lookup_ssl_compress_meth(SSL *ssl);
- 
- static int ssl_is_https(conn_rec *c)
-@@ -190,7 +190,7 @@ char *ssl_var_lookup(apr_pool_t *p, serv
-      */
-     if (result == NULL) {
-         if (strlen(var) > 12 && strcEQn(var, "SSL_VERSION_", 12))
--            result = ssl_var_lookup_ssl_version(p, var+12);
-+            result = ssl_var_lookup_ssl_version(s->process->pool, p, var+12);
-         else if (strcEQ(var, "SERVER_SOFTWARE"))
-             result = ap_get_server_banner();
-         else if (strcEQ(var, "API_VERSION")) {
-@@ -262,7 +262,8 @@ static char *ssl_var_lookup_ssl(apr_pool
- 
-     ssl = sslconn->ssl;
-     if (strlen(var) > 8 && strcEQn(var, "VERSION_", 8)) {
--        result = ssl_var_lookup_ssl_version(p, var+8);
-+        result = ssl_var_lookup_ssl_version(c->base_server->process->pool,
-+                                            p, var+8);
-     }
-     else if (ssl != NULL && strcEQ(var, "PROTOCOL")) {
-         result = (char *)SSL_get_version(ssl);
-@@ -633,7 +634,7 @@ static void ssl_var_lookup_ssl_cipher_bi
-     return;
- }
- 
--static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var)
-+static char *ssl_var_lookup_ssl_version(apr_pool_t *pp, apr_pool_t *p, char *var)
- {
-     static char interface[] = "mod_ssl/" MOD_SSL_VERSION;
-     static char library_interface[] = SSL_LIBRARY_TEXT;
-@@ -642,7 +643,7 @@ static char *ssl_var_lookup_ssl_version(
-   
-     if (!library) {
-         char *cp, *cp2;
--        library = apr_pstrdup(p, SSL_LIBRARY_DYNTEXT);
-+        library = apr_pstrdup(pp, SSL_LIBRARY_DYNTEXT);
-         if ((cp = strchr(library, ' ')) != NULL) {
-             *cp = '/';
-             if ((cp2 = strchr(cp, ' ')) != NULL)