From 3d4c9ea71b5298747fc05c5ec1f2d6132d00c29a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 8 Jun 2021 10:22:59 +0200
Subject: new build ignore unsupported "threads" options in password_hash

---
 php.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 14cff68..5443ba2 100644
--- a/php.spec
+++ b/php.spec
@@ -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
 
-- 
cgit