From: Elan Ruusamäe <glen@delfi.ee>
Date: Wed, 8 Oct 2014 17:23:21 +0000 (+0300)
Subject: mysqlnd link fix
X-Git-Tag: auto/th/php56-5.6.1-3~1^2~1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=882aa90071ec5d35ffdc94b7442da9406b904136;p=packages%2Fphp.git

mysqlnd link fix
---

diff --git a/mysqlnd-ssl.patch b/mysqlnd-ssl.patch
new file mode 100644
index 0000000..3157280
--- /dev/null
+++ b/mysqlnd-ssl.patch
@@ -0,0 +1,24 @@
+link mysqlnd.so with openssl if enabled
+
+--- php-5.6.1/ext/mysqlnd/config9.m4~	2014-10-01 12:17:38.000000000 +0300
++++ php-5.6.1/ext/mysqlnd/config9.m4	2014-10-07 20:19:44.653070295 +0300
+@@ -34,10 +34,17 @@
+   test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
+ 
+   if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then
+-    AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
+-    AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
++    AC_CHECK_LIB(ssl, DSA_get_default_method, [
++      AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later])
++      PHP_ADD_EXTENSION_DEP(mysqlnd, ssl)
++    ])
++    AC_CHECK_LIB(crypto, X509_free, [
++      AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later])
++      PHP_ADD_EXTENSION_DEP(mysqlnd, crypto)
++    ])
+ 
+     PHP_SETUP_OPENSSL(MYSQLND_SHARED_LIBADD, [AC_DEFINE(MYSQLND_HAVE_SSL,1,[Enable mysqlnd code that uses OpenSSL directly])])
++
+   fi
+ 
+   mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
diff --git a/php.spec b/php.spec
index 3bbc153..0387c4e 100644
--- a/php.spec
+++ b/php.spec
@@ -216,6 +216,7 @@ Patch65:	system-libzip.patch
 Patch66:	php-db.patch
 Patch67:	mysql-lib-ver-mismatch.patch
 Patch69:	fpm-conf-split.patch
+Patch70:	mysqlnd-ssl.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -2054,6 +2055,7 @@ cp -p php.ini-production php.ini
 %patch66 -p1
 %patch67 -p1
 %patch69 -p1
+%patch70 -p1
 
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4