From 07fdc3ba78ff6ca5e648d541e075451672f87f16 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 21 Jun 2022 19:30:00 +0200
Subject: update to 8.1.8RC1

---
 failed.txt         |  2 +-
 php-mbstring.patch | 33 ---------------------------------
 php81.spec         | 14 ++++++++------
 3 files changed, 9 insertions(+), 40 deletions(-)
 delete mode 100644 php-mbstring.patch

diff --git a/failed.txt b/failed.txt
index a6ac64d..491f803 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.1.7 (2022-06-09)
+===== 8.1.8RC1 (2022-06-23)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/php-mbstring.patch b/php-mbstring.patch
deleted file mode 100644
index 7da512b..0000000
--- a/php-mbstring.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2eb2f9d74f22bf35a4915ec95afc53a47ebf1af9 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 2 Jun 2022 08:05:22 +0200
-Subject: [PATCH] Fix GH-8685 mbstring requires pcre
-
----
- ext/mbstring/mbstring.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
-index 48f22a682a19..4a4088aed3fb 100644
---- a/ext/mbstring/mbstring.c
-+++ b/ext/mbstring/mbstring.c
-@@ -161,9 +161,18 @@ static const php_mb_nls_ident_list php_mb_default_identify_list[] = {
- 
- /* }}} */
- 
-+/* {{{ mbstring_deps[] */
-+static const zend_module_dep mbstring_deps[] = {
-+	ZEND_MOD_REQUIRED("pcre")
-+	ZEND_MOD_END
-+};
-+/* }}} */
-+
- /* {{{ zend_module_entry mbstring_module_entry */
- zend_module_entry mbstring_module_entry = {
--	STANDARD_MODULE_HEADER,
-+	STANDARD_MODULE_HEADER_EX,
-+	NULL,
-+	mbstring_deps,
- 	"mbstring",
- 	ext_functions,
- 	PHP_MINIT(mbstring),
diff --git a/php81.spec b/php81.spec
index c4492b2..a5fd442 100644
--- a/php81.spec
+++ b/php81.spec
@@ -107,9 +107,9 @@
 %bcond_without         libgd
 %bcond_with            zip
 
-%global upver          8.1.7
-#global rcver          RC1
-#global lower          RC1
+%global upver          8.1.8
+%global rcver          RC1
+%global lower          RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -175,7 +175,6 @@ Patch47: php-8.1.0-phpinfo.patch
 Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
-Patch100: php-mbstring.patch
 
 # Security fixes (200+)
 
@@ -327,7 +326,6 @@ Summary: PHP FastCGI Process Manager
 BuildRequires: libacl-devel
 BuildRequires: pkgconfig(libsystemd) >= 209
 Requires: php-common%{?_isa} = %{version}-%{release}
-Requires(pre): /usr/sbin/useradd
 %{?systemd_requires}
 # This is actually needed for the %%triggerun script but Requires(triggerun)
 # is not valid.  We can use %%post because this particular %%triggerun script
@@ -341,6 +339,8 @@ Requires(pre): httpd-filesystem
 Requires: httpd-filesystem >= 2.4.10
 # php engine for Apache httpd webserver
 Provides: php(httpd)
+%else
+Requires(pre): /usr/sbin/useradd
 %endif
 %if %{with_nginx}
 # for /etc/nginx ownership
@@ -1183,7 +1183,6 @@ in pure PHP.
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
-%patch100 -p1 -b .up
 
 # security patches
 
@@ -2174,6 +2173,9 @@ fi
 
 
 %changelog
+* Tue Jun 21 2022 Remi Collet <remi@remirepo.net> - 8.1.8~RC1-1
+- update to 8.1.8RC1
+
 * Wed Jun  8 2022 Remi Collet <remi@remirepo.net> - 8.1.7-1
 - Update to 8.1.7 - http://www.php.net/releases/8_1_7.php
 
-- 
cgit