Update to 8.5.2 - http://www.php.net/releases/8_5_2.phpHEADmaster

3 files changed, 14 insertions, 64 deletions

diff --git a/failed.txt b/failed.txt
index e18ac6e..a778513 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/scl83el8a/build.log:Tests failed     :    1
-/var/lib/mock/scl83el8x/build.log:Tests failed     :    1
-/var/lib/mock/scl83el9a/build.log:Tests failed     :    1
-/var/lib/mock/scl83el9x/build.log:Tests failed     :    1
-/var/lib/mock/scl83el10a/build.log:Tests failed    :    1
-/var/lib/mock/scl83el10x/build.log:Tests failed    :    1
-/var/lib/mock/scl83fc41a/build.log:Tests failed    :    1
-/var/lib/mock/scl83fc41x/build.log:Tests failed    :    1
+/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/scl83fc41a/build.log:Tests failed    :    0
+/var/lib/mock/scl83fc41x/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
 
 
-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/php.spec b/php.spec
index 725bcfc..a479595 100644
--- a/php.spec
+++ b/php.spec
@@ -103,13 +103,13 @@
 %global gh_owner     php
 %global gh_project   php-src
 %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:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-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
@@ -170,7 +170,6 @@ Patch48: php-8.5.0-openssl-ec-param.patch
 # RC Patch
 
 # Upstream fixes (100+)
-Patch100: upstream.patch
 
 # Security fixes (200+)
 
@@ -871,7 +870,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch -P48 -p1 -b .ec-param
 
 # upstream patches
-%patch -P100 -p1 -b .liburiparser
 
 # security patches
 
@@ -1660,6 +1658,9 @@ fi
 
 
 %changelog
+* Wed Jan 14 2026 Remi Collet <remi@remirepo.net> - 8.5.2-1
+- Update to 8.5.2 - http://www.php.net/releases/8_5_2.php
+
 * Mon Jan  5 2026 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net>
-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 <calvinb@php.net>
-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--
- <?php
--if (PHP_OS_FAMILY === "Windows") die("skip Only for platforms with FIFO pipes");
-+if (!function_exists("posix_mkfifo")) {
-+    die("skip no posix_mkfifo()");
-+}
- ?>
- --FILE--
- <?php