summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-01-18 09:29:21 +0100
committerRemi Collet <remi@php.net>2023-01-18 09:29:21 +0100
commit54d8390fd508ebe5ea9526753b1787f4d994662a (patch)
tree2a6de62ee178bab102734175dbf0546b0748c065
parentc884a0526916e8069b733b8a8eb93a3b8c41a672 (diff)
update to 8.2.2RC1HEADmaster
-rw-r--r--failed.txt2
-rw-r--r--php.spec9
-rw-r--r--upstream.patch22
3 files changed, 6 insertions, 27 deletions
diff --git a/failed.txt b/failed.txt
index 852d5d5..745b07a 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/php.spec b/php.spec
index 9ed6458..e6ef5be 100644
--- a/php.spec
+++ b/php.spec
@@ -122,8 +122,8 @@
#global gh_date 20220530
%global gh_owner php
%global gh_project php-src
-%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: %{?scl_prefix}php
@@ -191,7 +191,6 @@ Patch47: php-8.1.0-phpinfo.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
-Patch100: upstream.patch
# Security fixes (200+)
@@ -968,7 +967,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1
# security patches
@@ -1849,6 +1847,9 @@ fi
%changelog
+* Wed Jan 18 2023 Remi Collet <remi@remirepo.net> - 8.2.2~RC1-1
+- update to 8.2.2RC1
+
* Wed Jan 4 2023 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net>
-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--
- <?php
-