From 10c7828e35c6a59ff06532109144fb88bb5c5c95 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 30 Mar 2023 08:24:03 +0200
Subject: update to 8.1.18RC1
---
10756.patch | 21 ---------------------
php.spec | 12 +++++-------
2 files changed, 5 insertions(+), 28 deletions(-)
delete mode 100644 10756.patch
diff --git a/10756.patch b/10756.patch
deleted file mode 100644
index b980bf7..0000000
--- a/10756.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 9f0022064677d180742642f264096a46c09269d3 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 3 Mar 2023 11:12:13 +0100
-Subject: [PATCH] remove assert raising strange behavior with GCC 10
-
----
- ext/reflection/php_reflection.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
-index 9a9685e7292e..42fec082c173 100644
---- a/ext/reflection/php_reflection.c
-+++ b/ext/reflection/php_reflection.c
-@@ -1748,7 +1748,6 @@ ZEND_METHOD(ReflectionFunctionAbstract, getClosureUsedVariables)
-
- zend_op *opline = ops->opcodes + ops->num_args;
- if (ops->fn_flags & ZEND_ACC_VARIADIC) {
-- ZEND_ASSERT(opline->opcode == ZEND_RECV_VARIADIC);
- opline++;
- }
-
diff --git a/php.spec b/php.spec
index 6748c47..7f71eb5 100644
--- a/php.spec
+++ b/php.spec
@@ -122,8 +122,8 @@
#global gh_date 20210809
%global gh_owner php
%global gh_project php-src
-%global upver 8.1.17
-#global rcver RC1
+%global upver 8.1.18
+%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
@@ -199,8 +199,6 @@ Patch91: php-7.2.0-oci8conf.patch
Patch300: php-7.4.0-datetests.patch
# WIP
-# https://github.com/php/php-src/pull/10756
-Patch400: 10756.patch
BuildRequires: gnupg2
BuildRequires: bzip2-devel
@@ -980,9 +978,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch300 -p1 -b .datetests
# WIP patch
-%if 0%{?rhel} == 7
-%patch400 -p1 -b .pr10756
-%endif
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE ZEND_LICENSE
@@ -1858,6 +1853,9 @@ fi
%changelog
+* Thu Mar 30 2023 Remi Collet <remi@remirepo.net> - 8.1.18~RC1-1
+- update to 8.1.18RC1
+
* Wed Mar 15 2023 Remi Collet <remi@remirepo.net> - 8.1.17-1
- Update to 8.1.17 - http://www.php.net/releases/8_1_17.php
--
cgit