packages: php4/php4.spec, php4/php4-openssl.patch (NEW) - rel 28; openssl 1...

[arekm]

Author: arekm                        Date: Sun Apr 11 06:16:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 28; openssl 1.0.0 fix

---- Files affected:
packages/php4:
   php4.spec (1.655 -> 1.656) , php4-openssl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php4/php4.spec
diff -u packages/php4/php4.spec:1.655 packages/php4/php4.spec:1.656
--- packages/php4/php4.spec:1.655	Sun Apr 11 07:55:44 2010
+++ packages/php4/php4.spec	Sun Apr 11 08:16:43 2010
@@ -73,7 +73,7 @@
 %undefine	with_msession
 %endif
 
-%define		rel 27
+%define		rel 28
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -125,6 +125,7 @@
 Patch26:	%{name}-zlib.patch
 Patch27:	%{name}-db-shared.patch
 Patch28:	%{name}-sybase-fix.patch
+Patch29:	%{name}-openssl.patch
 Patch30:	%{name}-mnogosearch-fix.patch
 Patch31:	%{name}-stupidapache_version.patch
 Patch33:	%{name}-uint32_t.patch
@@ -1597,7 +1598,7 @@
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
-
+%patch29 -p1
 %patch30 -p1
 %patch31 -p1
 %patch33 -p1
@@ -3173,6 +3174,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.656  2010/04/11 06:16:43  arekm
+- rel 28; openssl 1.0.0 fix
+
 Revision 1.655  2010/04/11 05:55:44  arekm
 - release 27
 

================================================================
Index: packages/php4/php4-openssl.patch
diff -u /dev/null packages/php4/php4-openssl.patch:1.1
--- /dev/null	Sun Apr 11 08:16:49 2010
+++ packages/php4/php4-openssl.patch	Sun Apr 11 08:16:43 2010
@@ -0,0 +1,30 @@
+--- 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;
+ 	
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php4/php4.spec?r1=1.655&r2=1.656&f=u