From aae9ed5f30db3099a06168a3de211cec7a4cf4b4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Apr 2026 08:10:52 +0200 Subject: update to 8.4.21RC1 --- failed.txt | 30 +++++++++++++----------------- php84.spec | 17 ++++++++++++++--- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/failed.txt b/failed.txt index f0364ea..2f58a92 100644 --- a/failed.txt +++ b/failed.txt @@ -1,25 +1,21 @@ -===== 8.4.20 (2026-04-09) +===== 8.4.21RC1 (2026-04-23) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log -/var/lib/mock/el8a84/build.log:Tests failed : 3 -/var/lib/mock/el8x84/build.log:Tests failed : 3 -/var/lib/mock/el9a84/build.log:Tests failed : 3 -/var/lib/mock/el9x84/build.log:Tests failed : 3 -/var/lib/mock/el10a84/build.log:Tests failed : 3 -/var/lib/mock/el10x84/build.log:Tests failed : 3 -/var/lib/mock/fc42a84/build.log:Tests failed : 3 -/var/lib/mock/fc42x84/build.log:Tests failed : 3 -/var/lib/mock/fc43a84/build.log:Tests failed : 3 -/var/lib/mock/fc43x84/build.log:Tests failed : 3 -/var/lib/mock/fc44a84/build.log:Tests failed : 3 -/var/lib/mock/fc44x84/build.log:Tests failed : 3 +/var/lib/mock/el8a84/build.log:Tests failed : 0 +/var/lib/mock/el8x84/build.log:Tests failed : 0 +/var/lib/mock/el9a84/build.log:Tests failed : 0 +/var/lib/mock/el9x84/build.log:Tests failed : 0 +/var/lib/mock/el10a84/build.log:Tests failed : 0 +/var/lib/mock/el10x84/build.log:Tests failed : 0 +/var/lib/mock/fc42a84/build.log:Tests failed : 0 +/var/lib/mock/fc42x84/build.log:Tests failed : 0 +/var/lib/mock/fc43a84/build.log:Tests failed : 0 +/var/lib/mock/fc43x84/build.log:Tests failed : 0 +/var/lib/mock/fc44a84/build.log:Tests failed : 0 +/var/lib/mock/fc44x84/build.log:Tests failed : 0 -all - 2 Bug #74796: TLS encryption fails behind HTTP proxy [ext/openssl/tests/bug74796.phpt] - 2 sni_server [ext/openssl/tests/sni_server.phpt] - 2 sni_server with separate pk and cert [ext/openssl/tests/sni_server_key_cert.phpt] 1 proc_open give erratic test results :( diff --git a/php84.spec b/php84.spec index e1a9d8e..4d18ed0 100644 --- a/php84.spec +++ b/php84.spec @@ -80,8 +80,8 @@ %bcond_without libgd %bcond_with zip -%global upver 8.4.20 -#global rcver RC1 +%global upver 8.4.21 +%global rcver RC1 # TODO set PHP_EXTRA_VERSION for EOL version Summary: PHP scripting language for creating dynamic web sites @@ -664,7 +664,8 @@ Provides: php-xmlreader, php-xmlreader%{?_isa} Provides: php-xmlwriter, php-xmlwriter%{?_isa} Provides: php-xsl, php-xsl%{?_isa} # See ext/dom/lexbor/patches/README.md -Provides: bundled(lexbor) = 2.5.0 +%global lexborver 2.7.0 +Provides: bundled(lexbor) = %{lexborver} BuildRequires: pkgconfig(libxslt) >= 1.1 BuildRequires: pkgconfig(libexslt) BuildRequires: pkgconfig(libxml-2.0) >= 2.7.6 @@ -1090,6 +1091,13 @@ if test "x${vpdo}" != "x%{pdover}"; then exit 1 fi +vlexbor=`sed -n '/Lexbor version/{s/.* is //;s/\.$//;p}' ext/dom/lexbor/patches/README.md` +if test "x${vlexbor}" != "x%{lexborver}"; then + : Error: Upstream Lexbor version is now ${vlexbor}, expecting %{lexborver}. + : Update the lexborver macro and rebuild. + exit 1 +fi + # Check for some extension version ver=$(sed -n '/#define PHP_ZIP_VERSION /{s/.* "//;s/".*$//;p}' ext/zip/php_zip.h) if test "$ver" != "%{zipver}"; then @@ -1856,6 +1864,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %changelog +* Wed Apr 22 2026 Remi Collet - 8.4.21~RC1-1 +- update to 8.4.21RC1 + * Wed Apr 8 2026 Remi Collet - 8.4.20-1 - Update to 8.4.20 - http://www.php.net/releases/8_4_20.php -- cgit