summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt2
-rw-r--r--php-8.4.22-systzdata-v24.patch (renamed from php-8.4.0-systzdata-v24.patch)20
-rw-r--r--php.spec9
3 files changed, 17 insertions, 14 deletions
diff --git a/failed.txt b/failed.txt
index 2224fb9..30e3734 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.4.21 (2026-05-07)
+===== 8.4.22RC1 (2026-05-21)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
diff --git a/php-8.4.0-systzdata-v24.patch b/php-8.4.22-systzdata-v24.patch
index 6176a8b..ce8e5b1 100644
--- a/php-8.4.0-systzdata-v24.patch
+++ b/php-8.4.22-systzdata-v24.patch
@@ -37,9 +37,9 @@ r1: initial revision
diff -up ./ext/date/config0.m4.systzdata ./ext/date/config0.m4
---- ./ext/date/config0.m4.systzdata 2024-07-03 16:21:20.240786848 +0200
-+++ ./ext/date/config0.m4 2024-07-03 16:25:14.838995464 +0200
-@@ -8,6 +8,18 @@
+--- ./ext/date/config0.m4.systzdata 2026-05-19 17:02:38.000000000 +0200
++++ ./ext/date/config0.m4 2026-05-20 07:34:14.360175792 +0200
+@@ -8,6 +8,18 @@ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fal
[PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,
[-Werror])
@@ -56,11 +56,11 @@ diff -up ./ext/date/config0.m4.systzdata ./ext/date/config0.m4
+fi
+
PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
- timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
- lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
+
+ AX_CHECK_COMPILE_FLAG([-fwrapv],
diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
---- ./ext/date/lib/parse_tz.c.systzdata 2024-07-02 15:43:13.000000000 +0200
-+++ ./ext/date/lib/parse_tz.c 2024-07-03 16:21:20.240786848 +0200
+--- ./ext/date/lib/parse_tz.c.systzdata 2026-05-19 17:02:38.000000000 +0200
++++ ./ext/date/lib/parse_tz.c 2026-05-20 07:33:10.301120979 +0200
@@ -26,9 +26,33 @@
#include "timelib.h"
#include "timelib_private.h"
@@ -726,9 +726,9 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
tmp = NULL;
diff -up ./ext/date/php_date.c.systzdata ./ext/date/php_date.c
---- ./ext/date/php_date.c.systzdata 2024-07-02 15:43:13.000000000 +0200
-+++ ./ext/date/php_date.c 2024-07-03 16:21:20.240786848 +0200
-@@ -487,7 +487,11 @@ PHP_MINFO_FUNCTION(date)
+--- ./ext/date/php_date.c.systzdata 2026-05-19 17:02:38.000000000 +0200
++++ ./ext/date/php_date.c 2026-05-20 07:33:10.301467311 +0200
+@@ -483,7 +483,11 @@ PHP_MINFO_FUNCTION(date)
php_info_print_table_row(2, "date/time support", "enabled");
php_info_print_table_row(2, "timelib version", TIMELIB_ASCII_VERSION);
php_info_print_table_row(2, "\"Olson\" Timezone Database Version", tzdb->version);
diff --git a/php.spec b/php.spec
index a292696..fdfa0cc 100644
--- a/php.spec
+++ b/php.spec
@@ -93,8 +93,8 @@
#global gh_date 20230605
%global gh_owner php
%global gh_project php-src
-%global upver 8.4.21
-#global rcver RC1
+%global upver 8.4.22
+%global rcver RC1
# TODO set PHP_EXTRA_VERSION for EOL version
Summary: PHP scripting language for creating dynamic web sites
@@ -143,7 +143,7 @@ Patch8: php-8.4.0-libdb.patch
# Use system nikic/php-parser
Patch41: php-8.3.3-parser.patch
# use system tzdata
-Patch43: php-8.4.0-systzdata-v24.patch
+Patch43: php-8.4.22-systzdata-v24.patch
# See http://bugs.php.net/53436
# + display PHP version backported from 8.4
Patch44: php-8.4.0-phpize.patch
@@ -1671,6 +1671,9 @@ fi
%changelog
+* Wed May 20 2026 Remi Collet <remi@remirepo.net> - 8.4.22~RC1-1
+- update to 8.4.22RC1
+
* Wed May 6 2026 Remi Collet <remi@remirepo.net> - 8.4.21-1
- Update to 8.4.21 - http://www.php.net/releases/8_4_21.php