From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 21 Aug 2018 05:59:53 +0000 (+0000)
Subject: - mysqlnd requires hash now
X-Git-Tag: auto/th/php71-7.1.21-2~1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=2845c0a441708e169c90e614931e2b78906034f0;p=packages%2Fphp.git

- mysqlnd requires hash now
---

diff --git a/dep-tests.sh b/dep-tests.sh
index 18ea66c..3d1a398 100755
--- a/dep-tests.sh
+++ b/dep-tests.sh
@@ -7,8 +7,9 @@ dep_spl="pcre simplexml"
 dep_session="spl $dep_spl"
 dep_filter='pcre'
 dep_eaccelerator='session'
-dep_mysql="$with_mysqlnd"
-dep_mysqli="$dep_spl spl $with_mysqlnd"
+dep_mysqlnd='hash'
+dep_mysql="$dep_mysqlnd $with_mysqlnd"
+dep_mysqli="$dep_spl spl $dep_mysqlnd $with_mysqlnd"
 dep_pdo="$dep_spl spl"
 dep_pdo_sqlite="$dep_pdo pdo"
 dep_pdo_pgsql="$dep_pdo pdo"
@@ -16,7 +17,7 @@ dep_pdo_oci="$dep_pdo pdo"
 dep_pdo_odbc="$dep_pdo pdo"
 dep_pdo_firebird="$dep_pdo pdo"
 dep_pdo_dblib="$dep_pdo pdo"
-dep_pdo_mysql="$dep_pdo pdo $with_mysqlnd"
+dep_pdo_mysql="$dep_pdo pdo $dep_mysqlnd $with_mysqlnd"
 dep_simplexml="$dep_spl spl"
 dep_imap="pcre"
 dep_phar="$dep_spl spl hash"
diff --git a/php.spec b/php.spec
index 0036c64..425c2b2 100644
--- a/php.spec
+++ b/php.spec
@@ -2480,6 +2480,8 @@ generate_inifiles() {
 		[ "$mod" = "spl" ] && conf="SPL.ini"
 		# session needs to be loaded before php-pecl-http, php-pecl-memcache, php-pecl-session_mysql
 		[ "$mod" = "session" ] && conf="Session.ini"
+		# hash needs to be loaded before mysqlnd
+		[ "$mod" = "hash" ] && conf="Hash.ini"
 		# mysqlnd needs to be loaded before mysqli,pdo_mysqli
 		[ "$mod" = "mysqlnd" ] && conf="MySQLND.ini"
 		echo "+ $conf"
@@ -3126,7 +3128,7 @@ fi
 %files hash
 %defattr(644,root,root,755)
 %doc ext/hash/{CREDITS,README}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/hash.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/Hash.ini
 %attr(755,root,root) %{php_extensiondir}/hash.so
 %endif