Add patches provided by Adam Ciarcinski to fix build with recent versions

of OpenSSL (e.g. the version in NetBSD-current).

3 files changed, 51 insertions, 1 deletions

diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index bbf200f170e..d5b4b5fb1a9 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2009/08/06 07:07:23 tron Exp $
+$NetBSD: distinfo,v 1.23 2009/08/06 08:21:44 tron Exp $
 
 SHA1 (httpd-2.2.12.tar.bz2) = 76e243a5b7dc9896e83bdfac1aa98bbfdc85aeae
 RMD160 (httpd-2.2.12.tar.bz2) = 4c8e781e5e60a7a332383a798fe0ddc1adffc914
@@ -16,3 +16,5 @@ 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-ba b/www/apache22/patches/patch-ba
new file mode 100644
index 00000000000..77128f8a7b3
--- /dev/null
+++ b/www/apache22/patches/patch-ba
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..fe6bc36361b
--- /dev/null
+++ b/www/apache22/patches/patch-bb
@@ -0,0 +1,33 @@
+$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;