diff options
| -rw-r--r-- | php-8.0.7-argon2.patch | 15 | ||||
| -rw-r--r-- | php.spec | 11 |
2 files changed, 24 insertions, 2 deletions
diff --git a/php-8.0.7-argon2.patch b/php-8.0.7-argon2.patch new file mode 100644 index 0000000..88018de --- /dev/null +++ b/php-8.0.7-argon2.patch @@ -0,0 +1,15 @@ +diff --git a/ext/sodium/sodium_pwhash.c b/ext/sodium/sodium_pwhash.c +index e58a9514cc..86cc06cd91 100644 +--- a/ext/sodium/sodium_pwhash.c ++++ b/ext/sodium/sodium_pwhash.c +@@ -62,10 +62,6 @@ static inline int get_options(zend_array *options, size_t *memlimit, size_t *ops + return FAILURE; + } + } +- if ((opt = zend_hash_str_find(options, "threads", strlen("threads"))) && (zval_get_long(opt) != 1)) { +- zend_value_error("A thread value other than 1 is not supported by this implementation"); +- return FAILURE; +- } + return SUCCESS; + } + @@ -93,9 +93,9 @@ %global with_httpd2410 0 %endif -%global gh_commit 953143d8503cd0e861f02d7262f2304dbb58ec5c +%global gh_commit b76a9dbcf979574dbff6b92ccb80e8f252ce46db %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 20210604 +%global gh_date 20210608 %global gh_owner php %global gh_project php-src %global upver 8.1.0 @@ -157,6 +157,8 @@ Patch42: php-8.1.0-systzdata-v20.patch Patch43: php-7.4.0-phpize.patch # Use -lldap_r for OpenLDAP Patch45: php-7.4.0-ldap_r.patch +# Ignore unsupported "threads" option on password_hash +Patch46: php-8.0.7-argon2.patch # drop "Configure command" from phpinfo output # and only use gcc (instead of full version) Patch47: php-8.1.0-phpinfo.patch @@ -926,6 +928,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %patch45 -p1 -b .ldap_r %endif +%patch46 -p1 -b .argon2 %patch47 -p1 -b .phpinfo %patch91 -p1 -b .remi-oci8 @@ -1804,6 +1807,10 @@ fi %changelog +* Tue Jun 8 2021 Remi Collet <remi@remirepo.net> - 8.1.0~DEV.20210608-1 +- new build +- ignore unsupported "threads" options in password_hash + * Fri Jun 4 2021 Remi Collet <remi@remirepo.net> - 8.1.0~DEV.20210604-1 - update to 8.1.0-dev |