From 1fd211a58011b0cc7b925bcb0284ffa6254ba357 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 Jan 2026 06:56:10 +0100 Subject: Update to 8.5.2 - http://www.php.net/releases/8_5_2.php --- failed.txt | 20 +++++++++----------- php85.spec | 9 +++++---- upstream.patch | 49 ------------------------------------------------- 3 files changed, 14 insertions(+), 64 deletions(-) delete mode 100644 upstream.patch diff --git a/failed.txt b/failed.txt index 59166f2..dab2fa0 100644 --- a/failed.txt +++ b/failed.txt @@ -1,23 +1,21 @@ -===== 8.5.2RC1 (2026-01-01) +===== 8.5.2 (2026-01-15) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log -/var/lib/mock/el8a85/build.log:Tests failed : 1 -/var/lib/mock/el8x85/build.log:Tests failed : 1 -/var/lib/mock/el9a85/build.log:Tests failed : 1 -/var/lib/mock/el9x85/build.log:Tests failed : 1 -/var/lib/mock/el10a85/build.log:Tests failed : 1 -/var/lib/mock/el10x85/build.log:Tests failed : 1 -/var/lib/mock/fc41a85/build.log:Tests failed : 1 -/var/lib/mock/fc41x85/build.log:Tests failed : 1 +/var/lib/mock/el8a85/build.log:Tests failed : 0 +/var/lib/mock/el8x85/build.log:Tests failed : 0 +/var/lib/mock/el9a85/build.log:Tests failed : 0 +/var/lib/mock/el9x85/build.log:Tests failed : 0 +/var/lib/mock/el10a85/build.log:Tests failed : 0 +/var/lib/mock/el10x85/build.log:Tests failed : 0 +/var/lib/mock/fc41a85/build.log:Tests failed : 0 +/var/lib/mock/fc41x85/build.log:Tests failed : 0 /var/lib/mock/fc42a85/build.log:Tests failed : 0 /var/lib/mock/fc42x85/build.log:Tests failed : 0 /var/lib/mock/fc43a85/build.log:Tests failed : 0 /var/lib/mock/fc43x85/build.log:Tests failed : 0 -all: - 3 GH-20582 (Heap Buffer Overflow in iptcembed) [ext/standard/tests/image/gh20582.phpt] 1 proc_open give erratic test results :( diff --git a/php85.spec b/php85.spec index e67ecc6..8c1d326 100644 --- a/php85.spec +++ b/php85.spec @@ -90,13 +90,13 @@ %bcond_with zip %global upver 8.5.2 -%global rcver RC1 +#global rcver RC1 # TODO set PHP_EXTRA_VERSION for EOL version Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 2%{?dist} +Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -155,7 +155,6 @@ Patch48: php-8.5.0-openssl-ec-param.patch # RC Patch # Upstream fixes (100+) -Patch100: upstream.patch # Security fixes (200+) @@ -1019,7 +1018,6 @@ in pure PHP. %patch -P48 -p1 -b .ec-param # upstream patches -%patch -P100 -p1 -b .liburiparser # security patches @@ -1873,6 +1871,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %changelog +* Wed Jan 14 2026 Remi Collet - 8.5.2-1 +- Update to 8.5.2 - http://www.php.net/releases/8_5_2.php + * Mon Jan 5 2026 Remi Collet - 8.5.2~RC1-2 - Fedora: use system liburiparser diff --git a/upstream.patch b/upstream.patch deleted file mode 100644 index 42d968e..0000000 --- a/upstream.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9b089edcbdda19e283c34c0619b17a29a2202fa3 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 1 Jan 2026 08:17:29 +0100 -Subject: [PATCH] Fix missing liburiparser linker option - ---- - ext/uri/config.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/uri/config.m4 b/ext/uri/config.m4 -index 390d8eb223cb9..dda586b752aa1 100644 ---- a/ext/uri/config.m4 -+++ b/ext/uri/config.m4 -@@ -34,7 +34,7 @@ if test "$PHP_EXTERNAL_URIPARSER" = "no"; then - URI_CFLAGS="-DURI_STATIC_BUILD" - else - PKG_CHECK_MODULES([LIBURIPARSER], [liburiparser >= 1.0.0]) -- PHP_EVAL_LIBLINE([$LIBURIPARSER_LIBS], [URI_SHARED_LIBADD]) -+ PHP_EVAL_LIBLINE([$LIBURIPARSER_LIBS]) - PHP_EVAL_INCLINE([$LIBURIPARSER_CFLAGS]) - fi - -From bd484ed65f85cdced12deb65638af2caaa7b0b33 Mon Sep 17 00:00:00 2001 -From: Calvin Buckley -Date: Wed, 31 Dec 2025 13:04:09 -0400 -Subject: [PATCH] Fix skipif for mkfifo usage in gh20582.phpt (#20804) - -Makes it like ext/standard/tests/file/filetype_variation.phpt; it's not -just Windows that can have a missing posix_mkfifo, but also a minimal -build, like the ones suggested that RMs test with (using --disable-all). ---- - ext/standard/tests/image/gh20582.phpt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/ext/standard/tests/image/gh20582.phpt b/ext/standard/tests/image/gh20582.phpt -index 63561534b2fd0..499f70e372603 100644 ---- a/ext/standard/tests/image/gh20582.phpt -+++ b/ext/standard/tests/image/gh20582.phpt -@@ -5,7 +5,9 @@ Nikita Sveshnikov (Positive Technologies) - ndossche - --SKIPIF-- - - --FILE-- -