From 56dcfde1f814117b9bb8bd722b031b55943cfd2c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Dec 2025 09:57:21 +0100 Subject: Update to 8.2.30 - http://www.php.net/releases/8_2_30.php --- failed.txt | 6 +++--- php-7.4.33-bash53.patch | 26 ++++++++++++++++++++++++++ php-8.2.0-curl.patch | 23 ----------------------- php.spec | 17 +++++++++-------- 4 files changed, 38 insertions(+), 34 deletions(-) create mode 100644 php-7.4.33-bash53.patch delete mode 100644 php-8.2.0-curl.patch diff --git a/failed.txt b/failed.txt index 76492a7..e4664fb 100644 --- a/failed.txt +++ b/failed.txt @@ -1,4 +1,4 @@ -===== 8.2.29 (2025-07-03) +===== 8.2.30 (2025-12-18) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log @@ -8,12 +8,12 @@ $ grep -ar 'Tests failed' /var/lib/mock/*/build.log /var/lib/mock/scl82el9x/build.log:Tests failed : 0 /var/lib/mock/scl82el10a/build.log:Tests failed : 0 /var/lib/mock/scl82el10x/build.log:Tests failed : 0 -/var/lib/mock/scl82fc40a/build.log:Tests failed : 0 -/var/lib/mock/scl82fc40x/build.log:Tests failed : 0 /var/lib/mock/scl82fc41a/build.log:Tests failed : 0 /var/lib/mock/scl82fc41x/build.log:Tests failed : 0 /var/lib/mock/scl82fc42a/build.log:Tests failed : 0 /var/lib/mock/scl82fc42x/build.log:Tests failed : 0 +/var/lib/mock/scl82fc43a/build.log:Tests failed : 0 +/var/lib/mock/scl82fc43x/build.log:Tests failed : 0 (1) proc_open give erratic test results :( diff --git a/php-7.4.33-bash53.patch b/php-7.4.33-bash53.patch new file mode 100644 index 0000000..0b09e2a --- /dev/null +++ b/php-7.4.33-bash53.patch @@ -0,0 +1,26 @@ +From 98d2b923243d406b3d26f0770ac02f917729b948 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 4 Sep 2025 09:01:49 +0200 +Subject: [PATCH] Fix GH-19681 PHP_EXPAND_PATH broken with bash 5.3.0 + +--- + build/php.m4 | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/build/php.m4 b/build/php.m4 +index 142ddf08fd98b..e5ead0f4c44af 100644 +--- a/build/php.m4 ++++ b/build/php.m4 +@@ -64,7 +64,11 @@ AC_DEFUN([PHP_EXPAND_PATH],[ + changequote({,}) + ep_dir=`echo $1|$SED 's%/*[^/][^/]*/*$%%'` + changequote([,]) +- ep_realdir=`(cd "$ep_dir" && pwd)` ++ if test -z $ep_dir ; then ++ ep_realdir=`(pwd)` ++ else ++ ep_realdir=`(cd "$ep_dir" && pwd)` ++ fi + $2="$ep_realdir"/`basename "$1"` + fi + ]) diff --git a/php-8.2.0-curl.patch b/php-8.2.0-curl.patch deleted file mode 100644 index e581310..0000000 --- a/php-8.2.0-curl.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up ./ext/curl/curl_arginfo.h.bck ./ext/curl/curl_arginfo.h ---- ./ext/curl/curl_arginfo.h.bck 2022-09-01 09:46:21.410502957 +0200 -+++ ./ext/curl/curl_arginfo.h 2022-09-01 09:47:16.020506046 +0200 -@@ -723,13 +723,16 @@ static void register_curl_symbols(int mo - #if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */ - REGISTER_LONG_CONSTANT("CURLOPT_LOGIN_OPTIONS", CURLOPT_LOGIN_OPTIONS, CONST_PERSISTENT); - #endif --#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */ -+/* Available since 7.19.0 (in upstream curl 7.34) -+ backported in RHEL-7 curl-7.29.0-16.el7 rhbz#1012136 -+ backported in RHEL-6 curl-7.19.7-43.el6 rhbz#1036789 */ -+#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.34.0 */ - REGISTER_LONG_CONSTANT("CURL_SSLVERSION_TLSv1_0", CURL_SSLVERSION_TLSv1_0, CONST_PERSISTENT); - #endif --#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */ -+#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.34.0 */ - REGISTER_LONG_CONSTANT("CURL_SSLVERSION_TLSv1_1", CURL_SSLVERSION_TLSv1_1, CONST_PERSISTENT); - #endif --#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */ -+#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.34.0 */ - REGISTER_LONG_CONSTANT("CURL_SSLVERSION_TLSv1_2", CURL_SSLVERSION_TLSv1_2, CONST_PERSISTENT); - #endif - #if LIBCURL_VERSION_NUM >= 0x072400 /* Available since 7.36.0 */ diff --git a/php.spec b/php.spec index 1261262..afabfcb 100644 --- a/php.spec +++ b/php.spec @@ -49,7 +49,7 @@ %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock) -%global oraclever 23.8 +%global oraclever 23.9 %global oraclemax 24 %global oraclelib 23.1 %global oracledir 23 @@ -128,13 +128,13 @@ #global gh_date 20220530 %global gh_owner php %global gh_project php-src -%global upver 8.2.29 +%global upver 8.2.30 #global rcver RC1 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 @@ -175,8 +175,8 @@ Patch1: php-7.4.0-httpd.patch Patch5: php-7.2.0-includedir.patch Patch6: php-8.0.0-embed.patch Patch8: php-8.1.0-libdb.patch -# RHEL backports -Patch10: php-8.2.0-curl.patch +# Fix for bash 5.3 (Fedora 43) +Patch13: php-7.4.33-bash53.patch # Functional changes # Use system nikic/php-parser @@ -968,9 +968,7 @@ in pure PHP. %patch -P5 -p1 -b .includedir %patch -P6 -p1 -b .embed %patch -P8 -p1 -b .libdb -%if 0%{?rhel} == 7 -%patch -P10 -p1 -b .curltls -%endif +%patch -P13 -p1 -b .bash53 %patch -P41 -p1 -b .syslib %if %{with tzdata} @@ -1867,6 +1865,9 @@ fi %changelog +* Wed Dec 17 2025 Remi Collet - 8.2.30-1 +- Update to 8.2.30 - http://www.php.net/releases/8_2_30.php + * Thu Aug 28 2025 Remi Collet - 8.2.29-2 - rebuild using gd3php on EL-10 -- cgit