[69620] trunk/dports/lang/php4

[ryandesign at macports.org]

Revision: 69620
          http://trac.macports.org/changeset/69620
Author:   ryandesign at macports.org
Date:     2010-07-10 23:44:13 -0700 (Sat, 10 Jul 2010)
Log Message:
-----------
php4: fix build failure with openssl 1.0.0a; see #25622

Modified Paths:
--------------
    trunk/dports/lang/php4/Portfile

Added Paths:
-----------
    trunk/dports/lang/php4/files/patch-ext-openssl-openssl.c.diff

Modified: trunk/dports/lang/php4/Portfile
===================================================================
--- trunk/dports/lang/php4/Portfile	2010-07-11 03:00:23 UTC (rev 69619)
+++ trunk/dports/lang/php4/Portfile	2010-07-11 06:44:13 UTC (rev 69620)
@@ -53,6 +53,7 @@
 # Use -p1 to accommodate the Suhosin patch
 patch.pre_args          -p1
 patchfiles \
+    patch-ext-openssl-openssl.c.diff \
     patch-ext-standard-string.c.diff \
     patch-scripts-php-config.in.diff
 

Added: trunk/dports/lang/php4/files/patch-ext-openssl-openssl.c.diff
===================================================================
--- trunk/dports/lang/php4/files/patch-ext-openssl-openssl.c.diff	                        (rev 0)
+++ trunk/dports/lang/php4/files/patch-ext-openssl-openssl.c.diff	2010-07-11 06:44:13 UTC (rev 69620)
@@ -0,0 +1,31 @@
+http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php4/php4-openssl.patch?rev=1.1;content-type=text%2Fplain
+--- php-4.4.9/ext/openssl/openssl.c.org	2010-04-11 08:09:20.114283832 +0200
++++ php-4.4.9/ext/openssl/openssl.c	2010-04-11 08:08:40.851370731 +0200
+@@ -179,8 +179,13 @@
+ static char default_ssl_conf_filename[MAXPATHLEN];
+ 
+ struct php_x509_request {
++#if OPENSSL_VERSION_NUMBER >= 0x10000002L                                                                                                                    
++	LHASH_OF(CONF_VALUE) * global_config;   /* Global SSL config */                                                                                          
++	LHASH_OF(CONF_VALUE) * req_config;      /* SSL config for this request */
++#else
+ 	LHASH * global_config;	/* Global SSL config */
+ 	LHASH * req_config;		/* SSL config for this request */
++#endif
+ 	const EVP_MD * md_alg;
+ 	const EVP_MD * digest;
+ 	char	* section_name,
+@@ -340,7 +345,12 @@
+ 		const char * section_label,
+ 		const char * config_filename,
+ 		const char * section,
+-		LHASH * config TSRMLS_DC)
++#if OPENSSL_VERSION_NUMBER >= 0x10000002L
++		LHASH_OF(CONF_VALUE) * config TSRMLS_DC
++#else
++		LHASH * config TSRMLS_DC
++#endif
++		)
+ {
+ 	X509V3_CTX ctx;
+ 	
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100710/2f456182/attachment.html>