[76559] trunk/dports/www/apache20

[ryandesign at macports.org]

Revision: 76559
          http://trac.macports.org/changeset/76559
Author:   ryandesign at macports.org
Date:     2011-02-27 22:51:40 -0800 (Sun, 27 Feb 2011)
Log Message:
-----------
apache20: fix build with openssl 1.0.0; see #25621

Modified Paths:
--------------
    trunk/dports/www/apache20/Portfile

Added Paths:
-----------
    trunk/dports/www/apache20/files/patch-openssl-1.0.0.diff

Modified: trunk/dports/www/apache20/Portfile
===================================================================
--- trunk/dports/www/apache20/Portfile	2011-02-28 06:46:30 UTC (rev 76558)
+++ trunk/dports/www/apache20/Portfile	2011-02-28 06:51:40 UTC (rev 76559)
@@ -68,7 +68,8 @@
 		 port:openssl \
 	 	 port:pcre
 
-patchfiles       patch-httpd-std.conf.in
+patchfiles       patch-httpd-std.conf.in \
+                 patch-openssl-1.0.0.diff
 
 platform darwin {
 	post-patch {

Added: trunk/dports/www/apache20/files/patch-openssl-1.0.0.diff
===================================================================
--- trunk/dports/www/apache20/files/patch-openssl-1.0.0.diff	                        (rev 0)
+++ trunk/dports/www/apache20/files/patch-openssl-1.0.0.diff	2011-02-28 06:51:40 UTC (rev 76559)
@@ -0,0 +1,40 @@
+--- modules/ssl/ssl_engine_init.c.orig	2007-12-29 00:07:53.000000000 +0900
++++ modules/ssl/ssl_engine_init.c	2010-05-01 22:17:22.000000000 +0900
+@@ -531,7 +531,7 @@
+             ssl_die();
+         }
+
+-        SSL_CTX_set_client_CA_list(ctx, (STACK *)ca_list);
++        SSL_CTX_set_client_CA_list(ctx, ca_list);
+     }
+
+     /*
+--- modules/ssl/ssl_util_ssl.c.orig	2006-07-12 16:40:55.000000000 +0900
++++ modules/ssl/ssl_util_ssl.c	2010-05-01 22:20:18.000000000 +0900
+@@ -291,7 +291,7 @@
+ #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;
+@@ -300,7 +300,7 @@
+     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) {
+@@ -466,7 +466,7 @@
+     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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110227/db95570e/attachment-0001.html>