- rel 28; openssl 1.0.0 fix

Changed files:
    php4-openssl.patch -> 1.1
    php4.spec -> 1.656

diff --git a/php4-openssl.patch b/php4-openssl.patch
new file mode 100644 (file)
index 0000000..0171cd6
--- /dev/null
+++ b/php4-openssl.patch
@@ -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;
+       

diff --git a/php4.spec b/php4.spec
index aa58cc4fd13884be91fac75a3f6d7e6e41bebc97..7416d44a343bc0167b5b5dd2b7eae1b0f0607aa6 100644 (file)
--- a/php4.spec
+++ b/php4.spec
@@ -72,7 +72,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
@@ -124,6 +124,7 @@ Patch25:    %{name}-no_pear_install.patch
 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
@@ -1596,7 +1597,7 @@ cp php.ini-dist php.ini
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
-
+%patch29 -p1
 %patch30 -p1
 %patch31 -p1
 %patch33 -p1