[pkgsrc/trunk]: pkgsrc/lang/php5 * Add a patch to fix build problem with Open...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/813f6449adcb
branches:  trunk
changeset: 397396:813f6449adcb
user:      taca <taca%pkgsrc.org@localhost>
date:      Tue Aug 11 14:41:23 2009 +0000

description:
* Add a patch to fix build problem with OpenSSL 1.0.0 and later.
  The patch is provided by Sverre Froyen <sverre at viewmark.com> and
  I confirmed its contents.
* Remove checksum for patch-ad which had been removed.

diffstat:

 lang/php5/distinfo         |   4 ++--
 lang/php5/patches/patch-ax |  30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diffs (56 lines):

diff -r fb671865c5a3 -r 813f6449adcb lang/php5/distinfo
--- a/lang/php5/distinfo        Tue Aug 11 14:38:27 2009 +0000
+++ b/lang/php5/distinfo        Tue Aug 11 14:41:23 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2009/07/07 21:57:28 jdolecek Exp $
+$NetBSD: distinfo,v 1.65 2009/08/11 14:41:23 taca Exp $
 
 SHA1 (php-5.2.10/php-5.2.10.tar.bz2) = 9a287e2791d28928fb1ee1a1167290c5005feccd
 RMD160 (php-5.2.10/php-5.2.10.tar.bz2) = 9a9ec823eda9d6b3c085967e7a71f776071fc78f
@@ -7,7 +7,6 @@
 RMD160 (php-5.2.10/suhosin-patch-5.2.10-0.9.7.patch.gz) = 18df1686a48d652f581591115b51461e9dacf5a4
 Size (php-5.2.10/suhosin-patch-5.2.10-0.9.7.patch.gz) = 23072 bytes
 SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20
-SHA1 (patch-ad) = b324c33b1e70adee5b89dcecdd7690dcadcc18ec
 SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e
 SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587
 SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc
@@ -17,3 +16,4 @@
 SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df
 SHA1 (patch-ar) = 2d74ec926cc00bfbb67d16210af78c33ad9ac38d
 SHA1 (patch-as) = f7ce5caffe2acdd1f8e9fc8ae6c7ba1d8c6a25c1
+SHA1 (patch-ax) = faee56533644ef84c1e001e37d5d399259047d71
diff -r fb671865c5a3 -r 813f6449adcb lang/php5/patches/patch-ax
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php5/patches/patch-ax        Tue Aug 11 14:41:23 2009 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ax,v 1.1 2009/08/11 14:41:23 taca Exp $
+
+--- ext/openssl/openssl.c.orig 2009-04-20 19:00:41.000000000 +0900
++++ ext/openssl/openssl.c
+@@ -227,8 +227,13 @@ inline static int php_openssl_safe_mode_
+ static char default_ssl_conf_filename[MAXPATHLEN];
+ 
+ struct php_x509_request { /* {{{ */
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++      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,
+@@ -410,7 +415,11 @@ static inline int php_openssl_config_che
+               const char * section_label,
+               const char * config_filename,
+               const char * section,
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++              LHASH_OF(CONF_VALUE) * config TSRMLS_DC
++#else
+               LHASH * config TSRMLS_DC
++#endif
+               ) /* {{{ */
+ {
+       X509V3_CTX ctx;