rebase to 8.3.12

Resolves: RHEL-55273
This commit is contained in:
Remi Collet 2024-10-01 16:08:12 +02:00
parent f1fef42a13
commit 866a53c1ba
4 changed files with 15 additions and 9 deletions

2
.gitignore vendored
View File

@ -11,3 +11,5 @@ TODO
/php-8.3.7.tar.xz.asc /php-8.3.7.tar.xz.asc
/php-8.3.10.tar.xz /php-8.3.10.tar.xz
/php-8.3.10.tar.xz.asc /php-8.3.10.tar.xz.asc
/php-8.3.12.tar.xz
/php-8.3.12.tar.xz.asc

View File

@ -40,7 +40,7 @@ diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
index 6b803bf33e..53c3cdb3f4 100644 index 6b803bf33e..53c3cdb3f4 100644
--- a/ext/date/config0.m4 --- a/ext/date/config0.m4
+++ b/ext/date/config0.m4 +++ b/ext/date/config0.m4
@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h]) @@ -4,6 +4,19 @@
dnl Check for strtoll, atoll dnl Check for strtoll, atoll
AC_CHECK_FUNCS(strtoll atoll) AC_CHECK_FUNCS(strtoll atoll)
@ -57,9 +57,9 @@ index 6b803bf33e..53c3cdb3f4 100644
+ fi + fi
+fi +fi
+ +
PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,
lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" [-Werror])
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index c7f93580d7..ec196a98b6 100644 index c7f93580d7..ec196a98b6 100644
--- a/ext/date/lib/parse_tz.c --- a/ext/date/lib/parse_tz.c

View File

@ -63,7 +63,7 @@
%bcond_with imap %bcond_with imap
%bcond_without lmdb %bcond_without lmdb
%global upver 8.3.10 %global upver 8.3.12
Summary: PHP scripting language for creating dynamic web sites Summary: PHP scripting language for creating dynamic web sites
Name: php Name: php
@ -109,7 +109,7 @@ Patch8: php-8.1.0-libdb.patch
# Use system nikic/php-parser # Use system nikic/php-parser
Patch41: php-8.3.3-parser.patch Patch41: php-8.3.3-parser.patch
# use system tzdata # use system tzdata
Patch42: php-8.3.0-systzdata-v24.patch Patch42: php-8.3.11-systzdata-v24.patch
# See http://bugs.php.net/53436 # See http://bugs.php.net/53436
# + display PHP version backported from 8.4 # + display PHP version backported from 8.4
Patch43: php-7.4.0-phpize.patch Patch43: php-7.4.0-phpize.patch
@ -918,7 +918,7 @@ build --libdir=%{_libdir}/php \
--enable-pcntl \ --enable-pcntl \
--enable-opcache \ --enable-opcache \
--with-capstone \ --with-capstone \
--enable-phpdbg \ --enable-phpdbg --enable-phpdbg-readline \
%if %{with imap} %if %{with imap}
--with-imap=shared --with-imap-ssl \ --with-imap=shared --with-imap-ssl \
%endif %endif
@ -1553,6 +1553,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%changelog %changelog
* Tue Oct 1 2024 Remi Collet <rcollet@redhat.com> - 8.3.12-1
- rebase to 8.3.12
- enable command history in phpdbg
* Tue Aug 6 2024 Remi Collet <rcollet@redhat.com> - 8.3.10-1 * Tue Aug 6 2024 Remi Collet <rcollet@redhat.com> - 8.3.10-1
- rebase to 8.3.10 - rebase to 8.3.10

View File

@ -1,2 +1,2 @@
SHA512 (php-8.3.10.tar.xz) = 99dc53cef802304dba455b7e1e54183e780fa21a58ec044ee5eac34d24fc9e5a1390447c18a3ef0035ef3dc531fc817016b47edab5b2e90af1233a73b59517be SHA512 (php-8.3.12.tar.xz) = 2c4b440fa52950c75934559e977f39a179d1ad9edf8a17fe1b9ff89b58fbcafffb1bc1d59b6df46a9631554f0255c9271d906238c59287c799d195459be3e6a3
SHA512 (php-8.3.10.tar.xz.asc) = 8a1efe056ec44e77e24576ec58217263b102b742b216a0876c7094a9c5b843fed42ccb62d633b94818ec2b66242cb6560fc4072c05ab35e69a6b92ae9b42936a SHA512 (php-8.3.12.tar.xz.asc) = c9b72a7d6dca695f3498aa720a4fbf18771e3b6132e432f4c8fc764a15bdb2b9d5db97f8b6064f1291f7e1ec1a59c3ddec3d79c8a1bbfe68d7bf29f666998f47