summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt16
-rw-r--r--php-7.4.33-bash53.patch26
-rw-r--r--php81.spec12
3 files changed, 44 insertions, 10 deletions
diff --git a/failed.txt b/failed.txt
index dc76ba8..51bc18f 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,23 +1,25 @@
-===== 8.1.33 (2025-07-03)
+===== 8.1.34 (2025-12-18)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
/var/lib/mock/el8a81/build.log:Tests failed : 0
/var/lib/mock/el8x81/build.log:Tests failed : 0
-/var/lib/mock/el9a81/build.log:Tests failed : 0
-/var/lib/mock/el9x81/build.log:Tests failed : 0
-/var/lib/mock/el10a81/build.log:Tests failed : 1
-/var/lib/mock/el10x81/build.log:Tests failed : 1
-/var/lib/mock/fc40a81/build.log:Tests failed : 1
-/var/lib/mock/fc40x81/build.log:Tests failed : 1
+/var/lib/mock/el9a81/build.log:Tests failed : 2
+/var/lib/mock/el9x81/build.log:Tests failed : 2
+/var/lib/mock/el10a81/build.log:Tests failed : 2
+/var/lib/mock/el10x81/build.log:Tests failed : 2
/var/lib/mock/fc41a81/build.log:Tests failed : 1
/var/lib/mock/fc41x81/build.log:Tests failed : 1
/var/lib/mock/fc42a81/build.log:Tests failed : 1
/var/lib/mock/fc42x81/build.log:Tests failed : 1
+/var/lib/mock/fc43a81/build.log:Tests failed : 2
+/var/lib/mock/fc43x81/build.log:Tests failed : 2
fc*, el10:
3 openssl_x509_parse() tests [ext/openssl/tests/openssl_x509_parse_basic.phpt]
+fc43, el9, el10:
+ 3 Bug #74341 (openssl_x509_parse fails to parse ASN.1 UTCTime without seconds) [ext/openssl/tests/bug74341.phpt]
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 <remi@remirepo.net>
+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/php81.spec b/php81.spec
index 9ea0613..0c28af4 100644
--- a/php81.spec
+++ b/php81.spec
@@ -24,7 +24,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
@@ -119,12 +119,12 @@
%bcond_without libgd
%bcond_with zip
-%global upver 8.1.33
+%global upver 8.1.34
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
@@ -163,6 +163,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
+# Fix for bash 5.3 (Fedora 43)
+Patch13: php-7.4.33-bash53.patch
# Functional changes
# Use system nikic/php-parser
@@ -1187,6 +1189,7 @@ in pure PHP.
%patch -P5 -p1 -b .includedir
%patch -P6 -p1 -b .embed
%patch -P8 -p1 -b .libdb
+%patch -P13 -p1 -b .bash53
%patch -P41 -p1 -b .syslib
%if %{with tzdata}
@@ -2198,6 +2201,9 @@ fi
%changelog
+* Wed Dec 17 2025 Remi Collet <remi@remirepo.net> - 8.1.34-1
+- Update to 8.1.34 - http://www.php.net/releases/8_1_34.php
+
* Thu Aug 28 2025 Remi Collet <remi@remirepo.net> - 8.1.33-2
- rebuild using gd3php on EL-10