import UBI php-8.2.25-1.module+el8.10.0+22478+9eb07224

.gitignore

@@ -1 +1 @@
-SOURCES/php-8.2.13.tar.xz
+SOURCES/php-8.2.25.tar.xz

.php.metadata

@@ -1 +1 @@
-425be7c55d66618ab9db1af779371fbab28f7320 SOURCES/php-8.2.13.tar.xz
+39d38455c9060697fb2dd2e0b99e96b1a7608fb6 SOURCES/php-8.2.25.tar.xz

SOURCES/php-8.2.13.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE5gkT5N8gmQfY4w2WZZqXyc8qeVoFAmVcf0UACgkQZZqXyc8q
-eVraYQ/8DoEepPVWkOMydjySwwhocfkT3RXXagAmNwqF5LKqgUr8iaXyAMZIBrsM
-aIcPLsW6VbfjjZeqSPatZ7mLmHWEzRvW1JM1guqvKIxhtnFrmsRq9jWCvGZJGiWa
-SkzpVcjTZQ/NMtWb+gN0K67W+IPFdB/8B/CgcpG+2Z5MmQFoZ4+KjNuxCf+hVAN0
-+TYTEUXozuz5gQH3IwJ2lze4TbdYzBqYQjdz/ruSJwv3Cp1iW2TuCYIfwl1WNE5T
-TMFg7uoGrw9VQuYySwqFic1FgcKHWTwHsUIxFXI/kxwpF9AKladLEW0PvuMLXJYz
-r3iFLhd7TXij24mIbJm9znj464xvVZmM8Lq8owEC2jozFeDEoXQ+9YVW80GrowO0
-ZpvBUL4nT3xuem4s2LzB+ynnMLvA/agg7f+13W+cmWrRYFHcVuLwoSiJyZjy1SD5
-bo0ery8Ck4nFUldAQRHYMm6LLiEePpXZQnZwSrLTcVamJxJhMmWVH+JUoPhGXB5G
-35kC6NZ2WiS/09Kdgo4R2DY5isyziCctnMFYailgePZtx1GhQYBmyRfUhnBDgO6q
-HTe9ZFjl61BVtmvuoiCxyUvwYabNiGeVYL0ySY6oTDkiL9QyxJiDAngkXbn8jT5z
-c3fQGPigrIihR3iQJiyI94BeX4Q+YPntgU2W6VVL7Sh8DU5HFb0=
-=Z0yq
------END PGP SIGNATURE-----

SOURCES/php-8.2.23-systzdata-v24.patch

@@ -40,7 +40,7 @@ diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
 index 6b803bf33e..53c3cdb3f4 100644
 --- a/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
  AC_CHECK_FUNCS(strtoll atoll)
  
@@ -57,9 +57,9 @@ index 6b803bf33e..53c3cdb3f4 100644
 +   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
 index c7f93580d7..ec196a98b6 100644
 --- a/ext/date/lib/parse_tz.c

SOURCES/php-8.2.25-phpinfo.patch

@@ -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
 --- ./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
-@@ -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
  		php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
  #endif
@@ -25,7 +25,7 @@ diff -up ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/stand
 @@ -17,7 +17,6 @@ PHP Version => %s
  
  System => %s
- Build Date => %s%a
+ Build Date => %r(.+?)%r
 -Configure Command => %s
  Server API => Command Line Interface
  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
 --- ./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
-@@ -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"
  #endif
  #ifdef PHP_BUILD_COMPILER

SOURCES/php-8.2.25.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE5gkT5N8gmQfY4w2WZZqXyc8qeVoFAmcXxOsACgkQZZqXyc8q
+eVptDw/+J6heZjQl8p5tQOF0MNLdO7uqBTrByhJ9NxUI7kRAXylMnbAN1SiezpB+
+SIBmho6vOc6bikgiWX2oIQ167sEGSMKAz7uFnx4Piu0UeDgU1YE8Xu0W78WUGaFu
+Af3qI9PFigLcqEm0mh+24feunh7CdH4Sw43BdnAUCFNe66fXm+PVQn2R8UHAPQvb
+BVc2yEn6ndD3NTkklJ5WtqCimOuBs8oktM/PUI5+O96933N4abtescq/em4KMUEM
+d1vqEMNHWaIBHDsRDl2GVCMHN/SyD6htspD50OnpV32+KZB/vM9SKh1jcUca7qaR
+n7iW9Hd92TM6pYdeNmTCnLEKj6xdbhv1Qkpmpqp1jCv4iIpFV0RDpX17lZGkeh7Z
+OtEkS7mOlmHMa+dRRisPFwN4EK+m8O+VkchDr/OkUaM+4DA47UmxkLDViMgKRuc2
+bmIxK9pCwZNJmchRyqW1B7Gl1CvNYbHVNqwXvd07XMJsl6OSKBv2GrQ3eVdiiNHU
+YKGs1dMhWO/9r6hYLfuB5s7VfMXpZ6h701zwJQpwirHbUfxuwt4g0g/+uJtprx31
+tOcFbJ4EJ3f7ZLV2cFGR7f6P2JNPKBTjDih6ldJg/ens3yXM8UePb761zj9uS6Za
+edyg4pqB1yzw+ZgUa8WJnQMwvoENL+UsdfEyjIEEVa9feC9b+5E=
+=4BIp
+-----END PGP SIGNATURE-----

SPECS/php.spec

@@ -64,8 +64,7 @@
 %bcond_without   modphp
 %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
 Name: php
@@ -111,14 +110,14 @@ Patch8: php-8.1.0-libdb.patch
 # Use system nikic/php-parser
 Patch41: php-8.2.0-parser.patch
 # 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
 Patch43: php-7.4.0-phpize.patch
 # Use -lldap_r for OpenLDAP
 Patch45: php-7.4.0-ldap_r.patch
 # drop "Configure command" from phpinfo output
 # 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+)
 
@@ -1537,6 +1536,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %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
 - rebase to 8.2.13 RHEL-14705
 - add %%__phpize and %%__phpconfig macros