From a4bc53aa215d5a5a83c718ef68fc172a15d160d5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 15 Jun 2021 17:03:18 +0200
Subject: update to 8.0.8RC1 ignore unsupported "threads" option on
 password_hash

---
 failed.txt             |  2 +-
 php-8.0.7-argon2.patch | 15 +++++++++++++++
 php.spec               | 13 ++++++++++---
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 php-8.0.7-argon2.patch

diff --git a/failed.txt b/failed.txt
index 134b81c..f6b53f7 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.0.7 (2021-06-03)
+===== 8.0.8RC1 (2021-06-17)
 
 $ grep -ar 'Tests failed' /var/lib/mock/scl80*/build.log
 
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;
+ }
+ 
diff --git a/php.spec b/php.spec
index d9a2aa5..5f09896 100644
--- a/php.spec
+++ b/php.spec
@@ -98,9 +98,9 @@
 #global gh_date      20200615
 %global gh_owner     php
 %global gh_project   php-src
-%global upver        8.0.7
-#global rcver        RC1
-#global lower        RC1
+%global upver        8.0.8
+%global rcver        RC1
+%global lower        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
@@ -159,6 +159,8 @@ Patch42: php-8.0.0-systzdata-v19.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.0.0-phpinfo.patch
@@ -929,6 +931,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
@@ -1807,6 +1810,10 @@ fi
 
 
 %changelog
+* Tue Jun 15 2021 Remi Collet <remi@remirepo.net> - 8.0.8~RC1-1
+- update to 8.0.8RC1
+- ignore unsupported "threads" option on password_hash
+
 * Wed Jun  2 2021 Remi Collet <remi@remirepo.net> - 8.0.7-1
 - Update to 8.0.7 - http://www.php.net/releases/8_0_7.php
 
-- 
cgit