summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt30
-rw-r--r--php.spec17
2 files changed, 27 insertions, 20 deletions
diff --git a/failed.txt b/failed.txt
index e14dba0..091c201 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/scl83el8a/build.log:Tests failed : 3
-/var/lib/mock/scl83el8x/build.log:Tests failed : 3
-/var/lib/mock/scl83el9a/build.log:Tests failed : 3
-/var/lib/mock/scl83el9x/build.log:Tests failed : 3
-/var/lib/mock/scl83el10a/build.log:Tests failed : 3
-/var/lib/mock/scl83el10x/build.log:Tests failed : 3
-/var/lib/mock/scl83fc42a/build.log:Tests failed : 3
-/var/lib/mock/scl83fc42x/build.log:Tests failed : 3
-/var/lib/mock/scl83fc43a/build.log:Tests failed : 3
-/var/lib/mock/scl83fc43x/build.log:Tests failed : 3
-/var/lib/mock/scl83fc44a/build.log:Tests failed : 3
-/var/lib/mock/scl83fc44x/build.log:Tests failed : 3
+/var/lib/mock/scl83el8a/build.log:Tests failed : 0
+/var/lib/mock/scl83el8x/build.log:Tests failed : 0
+/var/lib/mock/scl83el9a/build.log:Tests failed : 0
+/var/lib/mock/scl83el9x/build.log:Tests failed : 0
+/var/lib/mock/scl83el10a/build.log:Tests failed : 0
+/var/lib/mock/scl83el10x/build.log:Tests failed : 0
+/var/lib/mock/scl83fc42a/build.log:Tests failed : 0
+/var/lib/mock/scl83fc42x/build.log:Tests failed : 0
+/var/lib/mock/scl83fc43a/build.log:Tests failed : 0
+/var/lib/mock/scl83fc43x/build.log:Tests failed : 0
+/var/lib/mock/scl83fc44a/build.log:Tests failed : 0
+/var/lib/mock/scl83fc44x/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/php.spec b/php.spec
index ed58f41..562059b 100644
--- a/php.spec
+++ b/php.spec
@@ -93,8 +93,8 @@
#global gh_date 20230605
%global gh_owner php
%global gh_project php-src
-%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
@@ -599,7 +599,8 @@ Provides: %{?scl_prefix}php-xmlreader, %{?scl_prefix}php-xmlreader%{?_isa}
Provides: %{?scl_prefix}php-xmlwriter, %{?scl_prefix}php-xmlwriter%{?_isa}
Provides: %{?scl_prefix}php-xsl, %{?scl_prefix}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
@@ -954,6 +955,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
+
# https://bugs.php.net/63362 - Not needed but installed headers.
# Drop some Windows specific headers to avoid installation,
# before build to ensure they are really not needed.
@@ -1663,6 +1671,9 @@ fi
%changelog
+* Wed Apr 22 2026 Remi Collet <remi@remirepo.net> - 8.4.21~RC1-1
+- update to 8.4.21RC1
+
* Wed Apr 8 2026 Remi Collet <remi@remirepo.net> - 8.4.20-1
- Update to 8.4.20 - http://www.php.net/releases/8_4_20.php