Build fixes for openssl-1.0.

4 files changed, 43 insertions, 1 deletions

diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 7b218b0cb82..4cfbf475ddc 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2008/08/09 20:33:38 kefren Exp $
+$NetBSD: distinfo,v 1.55 2009/09/04 18:55:33 wiz Exp $
 
 SHA1 (httpd-2.0.63.tar.bz2) = 20e2b64944e38e96491af788a37cb709d2c5b755
 RMD160 (httpd-2.0.63.tar.bz2) = f6a7de59860f627ac40b245fcf742fb07e1b4870
@@ -7,7 +7,10 @@ SHA1 (patch-aa) = bff1ef591f5361e7169ff9005dcf86437b9dac23
 SHA1 (patch-ab) = 387892276efd49fd081a187c1123de26fb6486ba
 SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
 SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13
+SHA1 (patch-ae) = dda7fbd2561486b15b8436c47ccf1d4f9afa5df0
+SHA1 (patch-af) = 8400ae084e31026e9d8143a0246aa3e65166f380
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
+SHA1 (patch-ah) = 98ddcd204363d62bdb0ba78065d24ee893bea568
 SHA1 (patch-ai) = 4dc88c15b0525a5aabc80d5c2a0720cd260629de
 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
 SHA1 (patch-al) = 9af7b6c56177d971e135f0a00b3ab9ded5d1b6dd
diff --git a/www/apache2/patches/patch-ae b/www/apache2/patches/patch-ae
new file mode 100644
index 00000000000..d3892f7feac
--- /dev/null
+++ b/www/apache2/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.9 2009/09/04 18:55:34 wiz Exp $
+
+--- modules/ssl/ssl_engine_init.c.orig	2007-12-28 15:07:53.000000000 +0000
++++ modules/ssl/ssl_engine_init.c
+@@ -531,7 +531,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, (STACK_OF(X509_NAME) *)ca_list);
+     }
+ 
+     /*
diff --git a/www/apache2/patches/patch-af b/www/apache2/patches/patch-af
new file mode 100644
index 00000000000..a8ffe98bdf3
--- /dev/null
+++ b/www/apache2/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.8 2009/09/04 18:55:34 wiz Exp $
+
+--- modules/ssl/ssl_util_ssl.c.orig	2006-07-12 07:40:55.000000000 +0000
++++ modules/ssl/ssl_util_ssl.c
+@@ -466,7 +466,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;
diff --git a/www/apache2/patches/patch-ah b/www/apache2/patches/patch-ah
new file mode 100644
index 00000000000..3d2437780c0
--- /dev/null
+++ b/www/apache2/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.10 2009/09/04 18:55:34 wiz Exp $
+
+--- modules/ssl/ssl_engine_kernel.c.orig	2007-05-08 23:08:47.000000000 +0000
++++ modules/ssl/ssl_engine_kernel.c
+@@ -550,7 +550,7 @@ int ssl_hook_Access(request_rec *r)
+                  * sk_X509_shift-ed the peer cert out of the chain.
+                  * we put it back here for the purpose of quick_renegotiation.
+                  */
+-                cert_stack = sk_new_null();
++                cert_stack = sk_X509_new_null();
+                 sk_X509_push(cert_stack, MODSSL_PCHAR_CAST cert);
+             }
+