Update "apache22" package to version 2.2.13. Changes since 2.2.12:

- mod_ssl, ab: improve compatibility with OpenSSL 1.0.0 betas.  Report
  warnings compiling mod_ssl against OpenSSL to the httpd developers.
  [Guenter Knauf]
- mod_cgid: Do not add an empty argument when calling the CGI script.
  Bug 46380 [Ruediger Pluem]
- Fix potential segfaults with use of the legacy ap_rputs() etc
  interfaces, in cases where an output filter fails.  Bug 36780.
  [Joe Orton]

5 files changed, 6 insertions, 70 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index b4a507e6073..f54633f6d33 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2009/08/06 07:07:23 tron Exp $
+# $NetBSD: Makefile,v 1.49 2009/08/10 11:45:08 tron Exp $
 
-DISTNAME=	httpd-2.2.12
+DISTNAME=	httpd-2.2.13
 PKGNAME=	${DISTNAME:S/httpd/apache/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index d5b4b5fb1a9..a628ebc2a03 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2009/08/06 08:21:44 tron Exp $
+$NetBSD: distinfo,v 1.24 2009/08/10 11:45:08 tron Exp $
 
-SHA1 (httpd-2.2.12.tar.bz2) = 76e243a5b7dc9896e83bdfac1aa98bbfdc85aeae
-RMD160 (httpd-2.2.12.tar.bz2) = 4c8e781e5e60a7a332383a798fe0ddc1adffc914
-Size (httpd-2.2.12.tar.bz2) = 5140433 bytes
+SHA1 (httpd-2.2.13.tar.bz2) = 44d85da1b8e6c579d4514cfefbea00b284717b69
+RMD160 (httpd-2.2.13.tar.bz2) = 4a6a2247cc118175a9a36f1e14344ee71da24627
+Size (httpd-2.2.13.tar.bz2) = 5300199 bytes
 SHA1 (patch-aa) = 40f5f687a1217b8d6684dc610d3d4c430f635cbf
 SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
 SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13
@@ -14,7 +14,4 @@ SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
 SHA1 (patch-aq) = 27a0093fc75dcafc673abc25e9ebe80167f52ac1
 SHA1 (patch-as) = 7880eae75b702563bff8bca833ca81fb3dc4444c
 SHA1 (patch-au) = d4c623bb953ac45cb4c8d95fc1d3c2788452d9a1
-SHA1 (patch-av) = faf8fe2c72c7830daa407907b8161b56300afeaf
 SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4
-SHA1 (patch-ba) = c6ec284b27721bf7081afa261146c38e2c2d0063
-SHA1 (patch-bb) = 23c0b0436de72bdf70deeca1d5e243a6180e6b55
diff --git a/www/apache22/patches/patch-av b/www/apache22/patches/patch-av
deleted file mode 100644
index e3309c7bb7b..00000000000
--- a/www/apache22/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.2 2009/01/25 09:59:51 tron Exp $
-
---- modules/generators/mod_cgid.c.orig	2008-08-15 18:08:05.000000000 -0400
-+++ modules/generators/mod_cgid.c
-@@ -203,7 +203,7 @@ static char **create_argv(apr_pool_t *p,
-     char *w;
-     int idx = 0;
- 
--    if (ap_strchr_c(args, '=')) {
-+    if (!(*args) || ap_strchr_c(args, '=')) {
-         numwords = 0;
-     }
-     else {
diff --git a/www/apache22/patches/patch-ba b/www/apache22/patches/patch-ba
deleted file mode 100644
index 77128f8a7b3..00000000000
--- a/www/apache22/patches/patch-ba
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ba,v 1.4 2009/08/06 08:21:44 tron Exp $
-
-Fix build problems with newer versions of OpenSSL.
-
---- modules/ssl/ssl_engine_init.c.orig	2009-08-05 09:37:09.000000000 +0200
-+++ modules/ssl/ssl_engine_init.c
-@@ -573,7 +573,7 @@ static void ssl_init_ctx_verify(server_r
-             ssl_die();
-         }
- 
--        SSL_CTX_set_client_CA_list(ctx, (STACK *)ca_list);
-+        SSL_CTX_set_client_CA_list(ctx, ca_list);
-     }
- 
-     /*
diff --git a/www/apache22/patches/patch-bb b/www/apache22/patches/patch-bb
deleted file mode 100644
index fe6bc36361b..00000000000
--- a/www/apache22/patches/patch-bb
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2009/08/06 08:21:44 tron Exp $
-
-Fix build problems with newer versions of OpenSSL.
-
---- modules/ssl/ssl_util_ssl.c.orig	2009-08-05 09:33:37.000000000 +0200
-+++ modules/ssl/ssl_util_ssl.c
-@@ -294,7 +294,7 @@ BOOL SSL_X509_isSGC(X509 *cert)
- #ifdef HAVE_SSL_X509V3_EXT_d2i
-     X509_EXTENSION *ext;
-     int ext_nid;
--    STACK *sk;
-+    STACK_OF(SSL_CIPHER) *sk;
-     BOOL is_sgc;
-     int idx;
-     int i;
-@@ -303,7 +303,7 @@ BOOL SSL_X509_isSGC(X509 *cert)
-     idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
-     if (idx >= 0) {
-         ext = X509_get_ext(cert, idx);
--        if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) {
-+        if ((sk = X509V3_EXT_d2i(ext)) != NULL) {
-             for (i = 0; i < sk_num(sk); i++) {
-                 ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i));
-                 if (ext_nid == NID_ms_sgc || ext_nid == NID_ns_sgc) {
-@@ -467,7 +467,7 @@ int SSL_CTX_use_certificate_chain(
-     X509 *x509;
-     unsigned long err;
-     int n;
--    STACK *extra_certs;
-+    STACK_OF(X509) *extra_certs;
- 
-     if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
-         return -1;