rpms/php
7
0
Fork 0
Code Issues Pull Requests Releases Activity

rebase to 8.2.25

Browse Source 
Resolves: RHEL-66166
This commit is contained in:
Remi Collet 2024-11-12 13:59:37 +01:00
parent 1590c3d26a
commit 8bcd9a14ff
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitignore vendored
View File

@ -6,11 +6,10 @@ php-7.1*.xz
php-7.2*.xz php-7.2*.xz
php-7.3*.xz php-7.3*.xz
php-7.4*.xz* php-7.4*.xz*
/php-8.0.13.tar.xz /php-8.0.*.tar.xz*
/php-8.0.13.tar.xz.asc /php-8.1.*.tar.xz*
/php-8.0.20.tar.xz /php-8.3.*.tar.xz*
/php-8.0.20.tar.xz.asc
/php-8.0.27.tar.xz
/php-8.0.27.tar.xz.asc
/php-8.2.13.tar.xz /php-8.2.13.tar.xz
/php-8.2.13.tar.xz.asc /php-8.2.13.tar.xz.asc
/php-8.2.25.tar.xz
/php-8.2.25.tar.xz.asc

8
php-8.1.0-systzdata-v24.patch → php-8.2.23-systzdata-v24.patch
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

6
php-8.1.0-phpinfo.patch → php-8.2.25-phpinfo.patch
View File

@ -9,7 +9,7 @@ Replace full GCC name by gcc in php -v output
diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c
--- ./ext/standard/info.c.phpinfo 2020-07-21 10:49:31.000000000 +0200 --- ./ext/standard/info.c.phpinfo 2020-07-21 10:49:31.000000000 +0200
+++ ./ext/standard/info.c 2020-07-21 11:41:56.295633523 +0200 +++ ./ext/standard/info.c 2020-07-21 11:41:56.295633523 +0200
@@ -805,9 +805,6 @@ PHPAPI ZEND_COLD void php_print_info(int @@ -834,9 +834,6 @@ PHPAPI ZEND_COLD void php_print_info(int
#ifdef PHP_BUILD_ARCH #ifdef PHP_BUILD_ARCH
php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH); php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
#endif #endif
@ -25,7 +25,7 @@ diff -up ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/stand
@@ -17,7 +17,6 @@ PHP Version => %s @@ -17,7 +17,6 @@ PHP Version => %s
System => %s System => %s
Build Date => %s%a Build Date => %r(.+?)%r
-Configure Command => %s -Configure Command => %s
Server API => Command Line Interface Server API => Command Line Interface
Virtual Directory Support => %s Virtual Directory Support => %s
@ -33,7 +33,7 @@ diff -up ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/stand
diff -up ./sapi/cli/php_cli.c.phpinfo ./sapi/cli/php_cli.c diff -up ./sapi/cli/php_cli.c.phpinfo ./sapi/cli/php_cli.c
--- ./sapi/cli/php_cli.c.phpinfo 2020-07-21 11:43:38.812475300 +0200 --- ./sapi/cli/php_cli.c.phpinfo 2020-07-21 11:43:38.812475300 +0200
+++ ./sapi/cli/php_cli.c 2020-07-21 11:43:45.783464540 +0200 +++ ./sapi/cli/php_cli.c 2020-07-21 11:43:45.783464540 +0200
@@ -645,7 +645,7 @@ static int do_cli(int argc, char **argv) @@ -644,7 +644,7 @@ static int do_cli(int argc, char **argv)
"NTS" "NTS"
#endif #endif
#ifdef PHP_BUILD_COMPILER #ifdef PHP_BUILD_COMPILER

10
php.spec
View File

@ -64,8 +64,7 @@
%bcond_without modphp %bcond_without modphp
%bcond_without db4 %bcond_without db4
%global upver 8.2.13 %global upver 8.2.25
#global rcver RC1
Summary: PHP scripting language for creating dynamic web sites Summary: PHP scripting language for creating dynamic web sites
Name: php Name: php
@ -111,14 +110,14 @@ Patch8: php-8.1.0-libdb.patch
# Use system nikic/php-parser # Use system nikic/php-parser
Patch41: php-8.2.0-parser.patch Patch41: php-8.2.0-parser.patch
# use system tzdata # use system tzdata
Patch42: php-8.1.0-systzdata-v24.patch Patch42: php-8.2.23-systzdata-v24.patch
# See http://bugs.php.net/53436 # See http://bugs.php.net/53436
Patch43: php-7.4.0-phpize.patch Patch43: php-7.4.0-phpize.patch
# Use -lldap_r for OpenLDAP # Use -lldap_r for OpenLDAP
Patch45: php-7.4.0-ldap_r.patch Patch45: php-7.4.0-ldap_r.patch
# drop "Configure command" from phpinfo output # drop "Configure command" from phpinfo output
# and only use gcc (instead of full version) # and only use gcc (instead of full version)
Patch47: php-8.1.0-phpinfo.patch Patch47: php-8.2.25-phpinfo.patch
# Upstream fixes (100+) # Upstream fixes (100+)
@ -1537,6 +1536,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%changelog %changelog
* Tue Nov 12 2024 Remi Collet <rcollet@redhat.com> - 8.2.25-1
- rebase to 8.2.25 RHEL-66166
* Mon Nov 27 2023 Remi Collet <rcollet@redhat.com> - 8.2.13-1 * Mon Nov 27 2023 Remi Collet <rcollet@redhat.com> - 8.2.13-1
- rebase to 8.2.13 RHEL-14705 - rebase to 8.2.13 RHEL-14705
- add %%__phpize and %%__phpconfig macros - add %%__phpize and %%__phpconfig macros

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (php-8.2.13.tar.xz) = 8031e33d148c5acbfbb3ed00d7a266813c8919db86ba260ba65e1837d6db8d0bd66d8ddef66884466dd3fe51ece7882b03f8d8db6ff4383f80a68b7beafc03af SHA512 (php-8.2.25.tar.xz) = 47a4a6ea8e77c4e5965c385a016755e8b6700acc8e3fa728b0596efcf72dc9bb39a1c68a10733c4106fdad1f037d1582fd42856778a3d3224a9b15b9665bc360
SHA512 (php-8.2.13.tar.xz.asc) = 0e4e665ba134222e342f2c5d2456ebf6f2d06e82a513c5d9ab02f720581d0eb4f537757d4fc3c86d941d9d0140546c1f37334feff6b4e8d6fd37878346c9e66c SHA512 (php-8.2.25.tar.xz.asc) = 0760b40366484c19cf10a2d8f79f36c5bed3222b5d8f60d9263dab30a47cfb25edfce69c19f6d179d3a167579b0a979a101c3c63646aca997e36852fc09061ba