summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-07-08 15:31:48 +0200
committerRemi Collet <remi@php.net>2025-07-08 15:31:48 +0200
commitca734bce7fb2c46bcfb256ec0cc99a60f22612bf (patch)
tree1fc7766e5f4b3bba4c4e613274dbdd29f4582d7b
parent0a179ccabbb6978e2e077ad0bcca080ffdf16e0e (diff)
add patch for test suite with PHP 8.5 fromHEADmaster
https://github.com/m6w6/ext-http/pull/148
-rw-r--r--0001-ignore-deprecated.patch33
-rw-r--r--php-pecl-http.spec8
2 files changed, 40 insertions, 1 deletions
diff --git a/0001-ignore-deprecated.patch b/0001-ignore-deprecated.patch
new file mode 100644
index 0000000..5f3b5d5
--- /dev/null
+++ b/0001-ignore-deprecated.patch
@@ -0,0 +1,33 @@
+From fd752f8aab924b4edf834e57fdcbe34375b2e975 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 8 Jul 2025 15:27:59 +0200
+Subject: [PATCH] ignore deprecated
+
+---
+ tests/skipif.inc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/skipif.inc b/tests/skipif.inc
+index 76c3bd7..53a2753 100644
+--- a/tests/skipif.inc
++++ b/tests/skipif.inc
+@@ -8,14 +8,14 @@ function _ext($ext) {
+ }
+
+ function utf8locale() {
+- $locale = setlocale(LC_CTYPE, null);
++ $locale = @setlocale(LC_CTYPE, null);
+ if (stristr($locale, "utf") && substr($locale, -1) === "8") {
+ return true;
+ }
+ if (stristr(setlocale(LC_CTYPE, "C.UTF-8"), "utf")) {
+ return true;
+ }
+- $locale = setlocale(LC_CTYPE, null);
++ $locale = @setlocale(LC_CTYPE, null);
+ if (stristr($locale, "utf") && substr($locale, -1) === "8") {
+ return true;
+ }
+--
+2.50.0
+
diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index 62f8724..468d518 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -37,7 +37,7 @@
Name: %{?scl_prefix}php-pecl-http
Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz
Summary: Extended HTTP support
@@ -48,6 +48,7 @@ URL: https://pecl.php.net/package/pecl_http
Source1: %{proj_name}.ini
Patch0: 0001-fix-incompatible-pointer-type.patch
+Patch1: 0001-ignore-deprecated.patch
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
@@ -119,6 +120,7 @@ sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
cd %{sources}
%patch -P0 -p1
+%patch -P1 -p1
extver=$(sed -n '/#define PHP_PECL_HTTP_VERSION/{s/.* "//;s/".*$//;p}' php_http.h)
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -276,6 +278,10 @@ TEST_PHP_ARGS="-n $modules -d extension=$PWD/../NTS/modules/%{pecl_name}.so" \
%changelog
+* Tue Jul 8 2025 Remi Collet <remi@fedoraproject.org> - 4.2.6-4
+- add patch for test suite with PHP 8.5 from
+ https://github.com/m6w6/ext-http/pull/148
+
* Thu Jan 23 2025 Remi Collet <remi@fedoraproject.org> - 4.2.6-3
- fix incompatible pointer type FTBFS #2341063
using patch from https://github.com/m6w6/ext-http/pull/143