From ca3875e14b8624b834d467dfc64ec41a74273f06 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 1 Aug 2019 13:50:57 +0300 Subject: [PATCH] mysqlnd-ssl.patch applied upstream - https://github.com/php/php-src/pull/4455 - https://github.com/php/php-src/commit/4b03e102c58f56cbf5f794f21face56abd662e90 --- mysqlnd-ssl.patch | 24 ------------------------ php.spec | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 mysqlnd-ssl.patch diff --git a/mysqlnd-ssl.patch b/mysqlnd-ssl.patch deleted file mode 100644 index 3157280..0000000 --- a/mysqlnd-ssl.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 35a05fd..e797ae8 100644 --- a/php.spec +++ b/php.spec @@ -215,7 +215,6 @@ Patch66: php-db.patch Patch67: mysql-lib-ver-mismatch.patch # https://bugs.php.net/bug.php?id=68344 Patch68: php-mysql-ssl-context.patch -Patch70: mysqlnd-ssl.patch Patch71: libdb-info.patch URL: http://php.net/ %{?with_pdo_firebird:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}} @@ -1930,7 +1929,6 @@ cp -p php.ini-production php.ini %patch66 -p1 %patch67 -p1 #%patch68 -p1 DROP or update to 7.0 APIs -%patch70 -p1 %patch71 -p1 %{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 -- 2.44.0