Fedora: use system liburiparserHEADmaster

3 files changed, 61 insertions, 7 deletions

diff --git a/failed.txt b/failed.txt
index f0a31a2..e18ac6e 100644
--- a/failed.txt
+++ b/failed.txt
@@ -10,10 +10,10 @@ $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 /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/scl83fc42a/build.log:Tests failed    :    1
-/var/lib/mock/scl83fc42x/build.log:Tests failed    :    1
-/var/lib/mock/scl83fc43a/build.log:Tests failed    :    1
-/var/lib/mock/scl83fc43x/build.log:Tests failed    :    1
+/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:
diff --git a/php.spec b/php.spec
index 7e61839..725bcfc 100644
--- a/php.spec
+++ b/php.spec
@@ -89,8 +89,8 @@
 %endif
 
 %global liburiparser_ver 1.0.0
-%if 0
-# yse system liburiparser when available
+%if 0%{?fedora} >= 42
+# use system liburiparser when available
 %bcond_without       liburiparser
 %else
 # use bundled library instead
@@ -109,7 +109,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -170,6 +170,7 @@ Patch48: php-8.5.0-openssl-ec-param.patch
 # RC Patch
 
 # Upstream fixes (100+)
+Patch100: upstream.patch
 
 # Security fixes (200+)
 
@@ -870,6 +871,7 @@ 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
 
@@ -1658,6 +1660,9 @@ fi
 
 
 %changelog
+* Mon Jan  5 2026 Remi Collet <remi@remirepo.net> - 8.5.2~RC1-2
+- Fedora: use system liburiparser
+
 * Wed Dec 31 2025 Remi Collet <remi@remirepo.net> - 8.5.2~RC1-1
 - update to 8.5.2RC1
 
diff --git a/upstream.patch b/upstream.patch
new file mode 100644
index 0000000..42d968e
--- /dev/null
+++ b/upstream.patch
@@ -0,0 +1,49 @@
+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