From e16507950cbbb30e855a5b287a9495bdb117cadc Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 31 Jan 2024 08:14:17 +0100
Subject: update to 8.3.3RC1
---
failed.txt | 2 +-
php-8.3.0-parser.patch | 16 ----------------
php-8.3.3-parser.patch | 16 ++++++++++++++++
php.spec | 11 +++++++----
4 files changed, 24 insertions(+), 21 deletions(-)
delete mode 100644 php-8.3.0-parser.patch
create mode 100644 php-8.3.3-parser.patch
diff --git a/failed.txt b/failed.txt
index cfee814..2e12baf 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.3.2 (2024-01-18)
+===== 8.3.3RC1 (2024-02-01)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
diff --git a/php-8.3.0-parser.patch b/php-8.3.0-parser.patch
deleted file mode 100644
index 27ff2f1..0000000
--- a/php-8.3.0-parser.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
---- ./build/gen_stub.php.syslib 2020-06-25 08:11:51.782046813 +0200
-+++ ./build/gen_stub.php 2020-06-25 08:13:11.188860368 +0200
-@@ -3265,6 +3265,12 @@ function initPhpParser() {
- }
-
- $isInitialized = true;
-+
-+ if (file_exists('/usr/share/php/PhpParser5/autoload.php')) {
-+ require_once '/usr/share/php/PhpParser5/autoload.php';
-+ return;
-+ }
-+
- $version = "5.0.0alpha3";
- $phpParserDir = __DIR__ . "/PHP-Parser-$version";
- if (!is_dir($phpParserDir)) {
diff --git a/php-8.3.3-parser.patch b/php-8.3.3-parser.patch
new file mode 100644
index 0000000..49f7d5e
--- /dev/null
+++ b/php-8.3.3-parser.patch
@@ -0,0 +1,16 @@
+diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
+--- ./build/gen_stub.php.syslib 2020-06-25 08:11:51.782046813 +0200
++++ ./build/gen_stub.php 2020-06-25 08:13:11.188860368 +0200
+@@ -3265,6 +3265,12 @@ function initPhpParser() {
+ }
+
+ $isInitialized = true;
++
++ if (file_exists('/usr/share/php/PhpParser5/autoload.php')) {
++ require_once '/usr/share/php/PhpParser5/autoload.php';
++ return;
++ }
++
+ $version = "5.0.0";
+ $phpParserDir = __DIR__ . "/PHP-Parser-$version";
+ if (!is_dir($phpParserDir)) {
diff --git a/php.spec b/php.spec
index bc414ec..8ffbfb0 100644
--- a/php.spec
+++ b/php.spec
@@ -129,8 +129,8 @@
#global gh_date 20230605
%global gh_owner php
%global gh_project php-src
-%global upver 8.3.2
-#global rcver RC1
+%global upver 8.3.3
+%global rcver RC1
# TODO set PHP_EXTRA_VERSION for EOL version
Summary: PHP scripting language for creating dynamic web sites
@@ -182,7 +182,7 @@ Patch10: php-8.2.0-curl.patch
# Functional changes
# Use system nikic/php-parser
-Patch41: php-8.3.0-parser.patch
+Patch41: php-8.3.3-parser.patch
# use system tzdata
Patch43: php-8.3.0-systzdata-v24.patch
# See http://bugs.php.net/53436
@@ -453,7 +453,7 @@ Requires: pcre2-devel%{?_isa} >= 10.30
%endif
Requires: zlib-devel%{?_isa}
%if 0%{?fedora} || 0%{?rhel} >= 8
-Recommends: php-nikic-php-parser5 >= 5.0.0~alpha3
+Recommends: php-nikic-php-parser5 >= 5.0.0
%endif
%description devel
@@ -1874,6 +1874,9 @@ fi
%changelog
+* Wed Jan 31 2024 Remi Collet <remi@remirepo.net> - 8.3.2~RC1-1
+- update to 8.3.3RC1
+
* Tue Jan 16 2024 Remi Collet <remi@remirepo.net> - 8.3.2-1
- Update to 8.3.2 - http://www.php.net/releases/8_3_2.php
--
cgit