From ffc0db5222cede2d892c106634b4fe7f21ea94e9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Jan 2023 09:29:59 +0100 Subject: update to 8.2.2RC1 --- failed.txt | 2 +- php82.spec | 9 +++++---- upstream.patch | 22 ---------------------- 3 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 upstream.patch diff --git a/failed.txt b/failed.txt index b5e6fd4..ae614ec 100644 --- a/failed.txt +++ b/failed.txt @@ -1,4 +1,4 @@ -===== 8.2.1 (2023-01-05) +===== 8.2.2RC1 (2023-01-19) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log diff --git a/php82.spec b/php82.spec index ee56537..4bdd8ec 100644 --- a/php82.spec +++ b/php82.spec @@ -107,8 +107,8 @@ %bcond_without libgd %bcond_with zip -%global upver 8.2.1 -#global rcver RC1 +%global upver 8.2.2 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: php @@ -174,7 +174,6 @@ Patch47: php-8.1.0-phpinfo.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) -Patch100: upstream.patch # Security fixes (200+) @@ -1181,7 +1180,6 @@ in pure PHP. %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 # security patches @@ -2178,6 +2176,9 @@ fi %changelog +* Wed Jan 18 2023 Remi Collet - 8.2.2~RC1-1 +- update to 8.2.2RC1 + * Wed Jan 4 2023 Remi Collet - 8.2.1-1 - Update to 8.2.1 - http://www.php.net/releases/8_2_1.php diff --git a/upstream.patch b/upstream.patch deleted file mode 100644 index ffd13b6..0000000 --- a/upstream.patch +++ /dev/null @@ -1,22 +0,0 @@ -From bfa56cf62bfdb07afa93c63ec263ce24a591261d Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 20 Dec 2022 15:24:15 +0100 -Subject: [PATCH] Fix #10133 set variables_order en ensure $ENV is set - ---- - Zend/tests/traits/constant_016.phpt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Zend/tests/traits/constant_016.phpt b/Zend/tests/traits/constant_016.phpt -index 9cb2b29bcc09..0754c1571637 100644 ---- a/Zend/tests/traits/constant_016.phpt -+++ b/Zend/tests/traits/constant_016.phpt -@@ -2,6 +2,8 @@ - Compatibility of values of same name trait constants is checked after their constant expressions are evaluated - --ENV-- - ENSURE_CONSTANT_IS_DEFINED_AT_RUNTIME=1 -+--INI-- -+variables_order=EGPCS - --FILE-- -