summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-06-03 08:16:00 +0200
committerRemi Collet <remi@php.net>2022-06-03 08:16:00 +0200
commit4505a1b3450bb0e94c9311cb3ca6cbf7e0be5d5c (patch)
tree321ae662bbe4fb624593c42dbefd19a28395cf8b
parent9bce90d24a994980b9e3142b1028772308fe8300 (diff)
add upstream patch to initialize pcre before mbstring
-rw-r--r--php-mbstring.patch33
-rw-r--r--php.spec7
2 files changed, 39 insertions, 1 deletions
diff --git a/php-mbstring.patch b/php-mbstring.patch
new file mode 100644
index 0000000..7da512b
--- /dev/null
+++ b/php-mbstring.patch
@@ -0,0 +1,33 @@
+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/php.spec b/php.spec
index 5559900..a7c50ea 100644
--- a/php.spec
+++ b/php.spec
@@ -129,7 +129,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 1%{?dist}
+Release: 2%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -192,6 +192,7 @@ Patch47: php-8.1.0-phpinfo.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
+Patch100: php-mbstring.patch
# Security fixes (200+)
@@ -965,6 +966,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch91 -p1 -b .remi-oci8
# upstream patches
+%patch100 -p1 -b .up
# security patches
@@ -1840,6 +1842,9 @@ fi
%changelog
+* Fri Jun 3 2022 Remi Collet <remi@remirepo.net> - 8.1.7~RC1-2
+- add upstream patch to initialize pcre before mbstring
+
* Wed May 25 2022 Remi Collet <remi@remirepo.net> - 8.1.7~RC1-1
- update to 8.1.7RC1