From 47ae5cd8089ae278e3d8ac6c971fe7d9fee0c1c6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Apr 2022 12:20:08 +0200 Subject: update to 8.0.19RC1 --- failed.txt | 2 +- php-8.0.0-parser.patch | 16 ---------------- php-8.0.19-parser.patch | 16 ++++++++++++++++ php80.spec | 11 +++++++---- 4 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 php-8.0.0-parser.patch create mode 100644 php-8.0.19-parser.patch diff --git a/failed.txt b/failed.txt index a4654ca..2138793 100644 --- a/failed.txt +++ b/failed.txt @@ -1,4 +1,4 @@ -===== 8.0.18 (2022-04-13) +===== 8.0.19RC1 (2022-04-28) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log diff --git a/php-8.0.0-parser.patch b/php-8.0.0-parser.patch deleted file mode 100644 index f5da3b5..0000000 --- a/php-8.0.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 -@@ -1075,6 +1075,12 @@ function initPhpParser() { - } - - $isInitialized = true; -+ -+ if (file_exists('/usr/share/php/PhpParser4/autoload.php')) { -+ require_once '/usr/share/php/PhpParser4/autoload.php'; -+ return; -+ } -+ - $version = "4.9.0"; - $phpParserDir = __DIR__ . "/PHP-Parser-$version"; - if (!is_dir($phpParserDir)) { diff --git a/php-8.0.19-parser.patch b/php-8.0.19-parser.patch new file mode 100644 index 0000000..8a28e4d --- /dev/null +++ b/php-8.0.19-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 +@@ -1075,6 +1075,12 @@ function initPhpParser() { + } + + $isInitialized = true; ++ ++ if (file_exists('/usr/share/php/PhpParser4/autoload.php')) { ++ require_once '/usr/share/php/PhpParser4/autoload.php'; ++ return; ++ } ++ + $version = "4.13.0"; + $phpParserDir = __DIR__ . "/PHP-Parser-$version"; + if (!is_dir($phpParserDir)) { diff --git a/php80.spec b/php80.spec index bbd2cb2..cef8cbe 100644 --- a/php80.spec +++ b/php80.spec @@ -100,8 +100,8 @@ %bcond_without libgd %bcond_with zip -%global upver 8.0.18 -#global rcver RC1 +%global upver 8.0.19 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: php @@ -151,7 +151,7 @@ Patch10: php-7.0.7-curl.patch # Functional changes # Use system nikic/php-parser -Patch41: php-8.0.0-parser.patch +Patch41: php-8.0.19-parser.patch # use system tzdata Patch42: php-8.0.10-systzdata-v21.patch # See http://bugs.php.net/53436 @@ -481,7 +481,7 @@ Obsoletes: php74-devel, php74w-devel Obsoletes: php80-devel %endif %if 0%{?fedora} || 0%{?rhel} >= 8 -Recommends: php-nikic-php-parser4 >= 4.3.0 +Recommends: php-nikic-php-parser4 >= 4.13.0 %endif %description devel @@ -2180,6 +2180,9 @@ fi %changelog +* Tue Apr 26 2022 Remi Collet - 8.0.19~RC1-1 +- update to 8.0.19RC1 + * Wed Apr 13 2022 Remi Collet - 8.0.18-1 - Update to 8.0.18 - http://www.php.net/releases/8_0_18.php -- cgit