Update to 8.0.21 - http://www.php.net/releases/8_0_21.php
This commit is contained in:
parent
4e5f41a0fb
commit
05f6d7eaae
2
.gitignore
vendored
2
.gitignore
vendored
@ -19,3 +19,5 @@ php-8.1.*.xz.asc
|
|||||||
/php-8.0.19.tar.xz.asc
|
/php-8.0.19.tar.xz.asc
|
||||||
/php-8.0.20.tar.xz
|
/php-8.0.20.tar.xz
|
||||||
/php-8.0.20.tar.xz.asc
|
/php-8.0.20.tar.xz.asc
|
||||||
|
/php-8.0.21.tar.xz
|
||||||
|
/php-8.0.21.tar.xz.asc
|
||||||
|
@ -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),
|
|
7
php.spec
7
php.spec
@ -64,7 +64,7 @@
|
|||||||
%bcond_with imap
|
%bcond_with imap
|
||||||
%bcond_without lmdb
|
%bcond_without lmdb
|
||||||
|
|
||||||
%global upver 8.0.20
|
%global upver 8.0.21
|
||||||
#global rcver RC1
|
#global rcver RC1
|
||||||
|
|
||||||
Summary: PHP scripting language for creating dynamic web sites
|
Summary: PHP scripting language for creating dynamic web sites
|
||||||
@ -129,7 +129,6 @@ Patch49: php-8.0.10-phar-sha.patch
|
|||||||
Patch51: php-8.0.13-crypt.patch
|
Patch51: php-8.0.13-crypt.patch
|
||||||
|
|
||||||
# Upstream fixes (100+)
|
# Upstream fixes (100+)
|
||||||
Patch100: php-mbstring.patch
|
|
||||||
|
|
||||||
# Security fixes (200+)
|
# Security fixes (200+)
|
||||||
|
|
||||||
@ -733,7 +732,6 @@ in pure PHP.
|
|||||||
%patch51 -p1 -b .libxcrypt
|
%patch51 -p1 -b .libxcrypt
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch100 -p1 -b .up
|
|
||||||
|
|
||||||
# security patches
|
# security patches
|
||||||
|
|
||||||
@ -1550,6 +1548,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 5 2022 Remi Collet <remi@remirepo.net> - 8.0.21-1
|
||||||
|
- Update to 8.0.21 - http://www.php.net/releases/8_0_21.php
|
||||||
|
|
||||||
* Wed Jun 8 2022 Remi Collet <remi@remirepo.net> - 8.0.20-1
|
* Wed Jun 8 2022 Remi Collet <remi@remirepo.net> - 8.0.20-1
|
||||||
- Update to 8.0.20 - http://www.php.net/releases/8_0_20.php
|
- Update to 8.0.20 - http://www.php.net/releases/8_0_20.php
|
||||||
- add upstream patch to initialize pcre before mbstring
|
- add upstream patch to initialize pcre before mbstring
|
||||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (php-8.0.20.tar.xz) = 24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
|
SHA512 (php-8.0.21.tar.xz) = 7af7f4252243ff1a816eb08bafcf26b831278785f61a26e40d6dc3ac0f3e6e5647cdb1b29bdaa925a7be0b6780f40502881454c3b8f4b2670a23760f2fbb37f8
|
||||||
SHA512 (php-8.0.20.tar.xz.asc) = 59cb79f14b36c4aa0b18caff0f7028bb2fb88c07bc188534b78124ef6a73c941bce651ae52a58571159ad406b961c45049503c0cb378a9eadd168250fb7dbc04
|
SHA512 (php-8.0.21.tar.xz.asc) = 0c965c6590d06e7d58325a50bf0de9dbbeb51c3ed10cb81bc1070a467160bde21becd04eb67574ae9e15070f88477cd8ee54fdc2a1c8c5cc5c20d678a42d5b46
|
||||||
|
Loading…
Reference in New Issue
Block a user