Accepting request 1328029 from devel:languages:php

remove a patch, which breaks phar.phar [bsc#1256905]

OBS-URL: https://build.opensuse.org/request/show/1328029
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/php8?expand=0&rev=100

php-8.3.11.tar.xz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iHUEABYIAB0WIQTCjZN1dWA+tKu3JYYcB3ncXAqd5AUCZs4m5wAKCRAcB3ncXAqd
-5GEcAQDijVOhXPZKRA3CPaut9JwOysoNgX9/A5zLeMGgTwUMIwEAwGig+o0XKonL
-Ay0PrGtv7SLU3ZUXKGIfo/E2jCDlUgE=
-=1Ytt
------END PGP SIGNATURE-----

php-8.3.8.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEESx/A2d+SMhztn2FdvsVV4ioUNVMFAmZfK+4ACgkQvsVV4ioU
-NVNKGRAAp1I9pjv04n7OkvUyeIxCJ0Ou1GcoDTqoy30LpVrWswU1VkKBwb1Sr2Dj
-5efWKylCZZ9+9IzJJVGxG6hAPlFer9JMSuO+FZXjLnvAAgDJy64L2eOadjsg0u9+
-xKv2molW0arG25P3P8xRpXKisRy0JJpxNhTSUiXUUL/Gy0zW9Uc/6wrKPF5c3LQF
-i7UzpMuqaxOuXznwQaWhkcIk7GNDhZJAW5SsX6FFkxctbDXAICCfiFN1WPgfiG15
-ZYLexBZKGzufnH0T6b7o/pylFWhlVSt59B55witdimZciE8QCNKnmqCGafhYda/J
-UZAOb9X2MJjvBMRQLI6jpCoV8XAY5Jo7F5QkaZmnECydGj9XDADWYlVG4XLP0p34
-htcDB6odzURZDLxKYD97KRRL+bycj161Bh3WW7tRD9OIoNvtkgHg2ko531APUccl
-x1FFFkB9Trm9b/+y95EuCMN80BQXjd4Q6pQHaTo33UAlY182VfhewfWRB9OsLezn
-LXGZ9m4jC18AKnyrpLMPJuDUZjrorXOBjqQp0be8TlNhuXNbVgV+/WG/8+KChr7Y
-GBupFNkBpYHQsmQTZNuSJMqVzcxPFc1k4pp2SGvscVMPoqdgw9dRFsK6s40KbQ7g
-dXT8aLjWoYFAmE3bD7PJtWsnB3b/ghat6CuNGjLK9mp4V82Mv7Y=
-=aLaa
------END PGP SIGNATURE-----

php-8.3.9.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf4d7b8ea60a356064f88485278bd6f941a230ec16f0fc401574ce1445ad6c77
-size 12470616

php-8.3.9.tar.xz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iHUEABYIAB0WIQTCjZN1dWA+tKu3JYYcB3ncXAqd5AUCZoQK9wAKCRAcB3ncXAqd
-5H8jAP9WEpSWbki9sfUQLT8qe3isaIKefFiXBQt0m4drCMgjVwEAvKf1mtCm3P91
-ATaVsdSJ04qGIvfhWOmZbqk/Ejg+1Qo=
-=vE3W
------END PGP SIGNATURE-----

php-8.4.17.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa
+size 13670792

php-8.4.17.tar.xz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYKAB0WIQSdf5mgy48FyKaVjWJWqXr3YAo5pgUCaWaERAAKCRBWqXr3YAo5
+prxcAP9z/3HjeI9EHFbHjQ2PVK5iRPq17u5FLe6WymQKCkLpYgEA2R9HJmWVRjaV
+ND2gKyWhPt3WwCKQgN/FupiJMxJMIwk=
+=BRQZ
+-----END PGP SIGNATURE-----

php-ar-flags.patch

@@ -1,13 +1,13 @@
-Index: php-8.3.8/configure.ac
+Index: php-8.4.1/configure.ac
 ===================================================================
---- php-8.3.8.orig/configure.ac
+--- php-8.4.1.orig/configure.ac
-+++ php-8.3.8/configure.ac
++++ php-8.4.1/configure.ac
-@@ -1660,7 +1660,7 @@ PHP_CONFIGURE_PART(Configuring libtool)
+@@ -1560,7 +1560,7 @@ PHP_CONFIGURE_PART([Configuring libtool]
  
- dnl Silence warning: `ar: 'u' modifier ignored since 'D' is the default`
+ dnl Silence warning: "ar: 'u' modifier ignored since 'D' is the default".
  dnl See https://github.com/php/php-src/pull/3017
--AC_SUBST(AR_FLAGS, [cr])
+-AC_SUBST([AR_FLAGS], [cr])
-+AC_SUBST(AR_FLAGS, [Dcr])
++AC_SUBST([AR_FLAGS], [Dcr])
  
  dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by
  dnl PHP_REQUIRE_CXX). Otherwise AC_PROG_LIBTOOL fails if there is no working C++

php-build-reproducible-phar.patch

@@ -16,11 +16,11 @@ Signed-off-by: Arjen de Korte <build+github@de-korte.org>
  ext/phar/zip.c           |  2 +-
  6 files changed, 18 insertions(+), 5 deletions(-)
 
-Index: php-8.3.8/ext/phar/phar.c
+Index: php-8.4.17/ext/phar/phar.c
 ===================================================================
---- php-8.3.8.orig/ext/phar/phar.c
+--- php-8.4.17.orig/ext/phar/phar.c
-+++ php-8.3.8/ext/phar/phar.c
++++ php-8.4.17/ext/phar/phar.c
-@@ -2996,7 +2996,7 @@ int phar_flush(phar_archive_data *phar,
+@@ -2942,7 +2942,7 @@ int phar_flush_ex(phar_archive_data *pha
  			4: metadata-len
  			+: metadata
  		*/
@@ -29,12 +29,12 @@ Index: php-8.3.8/ext/phar/phar.c
  		phar_set_32(entry_buffer, entry->uncompressed_filesize);
  		phar_set_32(entry_buffer+4, mytime);
  		phar_set_32(entry_buffer+8, entry->compressed_filesize);
-Index: php-8.3.8/ext/phar/phar_internal.h
+Index: php-8.4.17/ext/phar/phar_internal.h
 ===================================================================
---- php-8.3.8.orig/ext/phar/phar_internal.h
+--- php-8.4.17.orig/ext/phar/phar_internal.h
-+++ php-8.3.8/ext/phar/phar_internal.h
++++ php-8.4.17/ext/phar/phar_internal.h
-@@ -427,6 +427,21 @@ static inline enum phar_fp_type phar_get
+@@ -316,6 +316,21 @@ static inline php_stream *phar_get_pharf
- 	return PHAR_G(cached_fp)[entry->phar->phar_pos].manifest[entry->manifest_pos].fp_type;
+ 	return PHAR_G(cached_fp)[phar->phar_pos].fp;
  }
  
 +static inline time_t source_date_epoch_time(time_t *tloc)
@@ -52,28 +52,28 @@ Index: php-8.3.8/ext/phar/phar_internal.h
 +	return ts;
 +}
 +
- static inline zend_off_t phar_get_fp_offset(phar_entry_info *entry)
+ static inline enum phar_fp_type phar_get_fp_type(const phar_entry_info *entry)
  {
  	if (!entry->is_persistent) {
-Index: php-8.3.8/ext/phar/stream.c
+Index: php-8.4.17/ext/phar/stream.c
 ===================================================================
---- php-8.3.8.orig/ext/phar/stream.c
+--- php-8.4.17.orig/ext/phar/stream.c
-+++ php-8.3.8/ext/phar/stream.c
++++ php-8.4.17/ext/phar/stream.c
-@@ -474,7 +474,7 @@ static int phar_stream_flush(php_stream
+@@ -473,7 +473,7 @@ static int phar_stream_flush(php_stream
  	phar_entry_data *data = (phar_entry_data *) stream->abstract;
  
  	if (data->internal_file->is_modified) {
 -		data->internal_file->timestamp = time(0);
 +		data->internal_file->timestamp = source_date_epoch_time(0);
- 		ret = phar_flush(data->phar, 0, 0, 0, &error);
+ 		ret = phar_flush(data->phar, &error);
  		if (error) {
  			php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS, "%s", error);
-Index: php-8.3.8/ext/phar/tar.c
+Index: php-8.4.17/ext/phar/tar.c
 ===================================================================
---- php-8.3.8.orig/ext/phar/tar.c
+--- php-8.4.17.orig/ext/phar/tar.c
-+++ php-8.3.8/ext/phar/tar.c
++++ php-8.4.17/ext/phar/tar.c
-@@ -965,7 +965,7 @@ int phar_tar_flush(phar_archive_data *ph
+@@ -972,7 +972,7 @@ int phar_tar_flush(phar_archive_data *ph
- 	char halt_stub[] = "__HALT_COMPILER();";
+ 	char *buf, *signature, sigbuf[8];
  
  	entry.flags = PHAR_ENT_PERM_DEF_FILE;
 -	entry.timestamp = time(NULL);
@@ -81,11 +81,11 @@ Index: php-8.3.8/ext/phar/tar.c
  	entry.is_modified = 1;
  	entry.is_crc_checked = 1;
  	entry.is_tar = 1;
-Index: php-8.3.8/ext/phar/util.c
+Index: php-8.4.17/ext/phar/util.c
 ===================================================================
---- php-8.3.8.orig/ext/phar/util.c
+--- php-8.4.17.orig/ext/phar/util.c
-+++ php-8.3.8/ext/phar/util.c
++++ php-8.4.17/ext/phar/util.c
-@@ -584,7 +584,7 @@ phar_entry_data *phar_get_or_create_entr
+@@ -701,7 +701,7 @@ phar_entry_data *phar_get_or_create_entr
  
  	phar_add_virtual_dirs(phar, path, path_len);
  	etemp.is_modified = 1;
@@ -94,16 +94,16 @@ Index: php-8.3.8/ext/phar/util.c
  	etemp.is_crc_checked = 1;
  	etemp.phar = phar;
  	etemp.filename = estrndup(path, path_len);
-Index: php-8.3.8/ext/phar/zip.c
+Index: php-8.4.17/ext/phar/zip.c
 ===================================================================
---- php-8.3.8.orig/ext/phar/zip.c
+--- php-8.4.17.orig/ext/phar/zip.c
-+++ php-8.3.8/ext/phar/zip.c
++++ php-8.4.17/ext/phar/zip.c
-@@ -1236,7 +1236,7 @@ int phar_zip_flush(phar_archive_data *ph
+@@ -1251,7 +1251,7 @@ int phar_zip_flush(phar_archive_data *ph
  
  	pass.error = &temperr;
  	entry.flags = PHAR_ENT_PERM_DEF_FILE;
 -	entry.timestamp = time(NULL);
 +	entry.timestamp = source_date_epoch_time(NULL);
  	entry.is_modified = 1;
- 	entry.is_zip = 1;
+ 	entry.is_zip = true;
  	entry.phar = phar;

php-date-regenerate-lexers.patch

@@ -1,20 +1,20 @@
-Index: php-8.2.7/ext/date/config0.m4
+Index: php-8.4.1/ext/date/config0.m4
 ===================================================================
---- php-8.2.7.orig/ext/date/config0.m4
+--- php-8.4.1.orig/ext/date/config0.m4
-+++ php-8.2.7/ext/date/config0.m4
++++ php-8.4.1/ext/date/config0.m4
-@@ -23,6 +23,8 @@ timelib_sources="lib/astro.c lib/dow.c l
+@@ -30,6 +30,8 @@ PHP_NEW_EXTENSION([date],
- 
+   [no],,
- PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)
+   [$PHP_DATE_CFLAGS])
  
 +PHP_ADD_MAKEFILE_FRAGMENT()
 +
- PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1)
+ PHP_ADD_BUILD_DIR([$ext_builddir/lib], [1])
  PHP_ADD_INCLUDE([$ext_builddir/lib])
  PHP_ADD_INCLUDE([$ext_srcdir/lib])
-Index: php-8.2.7/ext/date/Makefile.frag
+Index: php-8.4.1/ext/date/Makefile.frag
 ===================================================================
 --- /dev/null
-+++ php-8.2.7/ext/date/Makefile.frag
++++ php-8.4.1/ext/date/Makefile.frag
 @@ -0,0 +1,6 @@
 +$(srcdir)/lib/parse_date.c: $(srcdir)/lib/parse_date.re
 +	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) -b --no-generation-date -o ext/date/lib/parse_date.c ext/date/lib/parse_date.re)

php-ini.patch

@@ -1,8 +1,8 @@
-Index: php-8.3.0/php.ini-production
+Index: php-8.4.1/php.ini-production
 ===================================================================
---- php-8.3.0.orig/php.ini-production
+--- php-8.4.1.orig/php.ini-production
-+++ php-8.3.0/php.ini-production
++++ php-8.4.1/php.ini-production
-@@ -752,7 +752,7 @@ default_charset = "UTF-8"
+@@ -738,7 +738,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -11,7 +11,7 @@ Index: php-8.3.0/php.ini-production
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -986,7 +986,7 @@ cli_server.color = On
+@@ -963,7 +963,7 @@ cli_server.color = On
  [Date]
  ; Defines the default timezone used by the date functions
  ; https://php.net/date.timezone
@@ -20,7 +20,7 @@ Index: php-8.3.0/php.ini-production
  
  ; https://php.net/date.default-latitude
  ;date.default_latitude = 31.7667
-@@ -1179,7 +1179,7 @@ mysqli.max_persistent = -1
+@@ -1149,7 +1149,7 @@ mysqli.max_persistent = -1
  
  ; Allow or prevent persistent links.
  ; https://php.net/mysqli.allow-persistent
@@ -29,10 +29,10 @@ Index: php-8.3.0/php.ini-production
  
  ; Maximum number of links.  -1 means no limit.
  ; https://php.net/mysqli.max-links
-Index: php-8.3.0/sapi/fpm/www.conf.in
+Index: php-8.4.1/sapi/fpm/www.conf.in
 ===================================================================
---- php-8.3.0.orig/sapi/fpm/www.conf.in
+--- php-8.4.1.orig/sapi/fpm/www.conf.in
-+++ php-8.3.0/sapi/fpm/www.conf.in
++++ php-8.4.1/sapi/fpm/www.conf.in
 @@ -27,6 +27,8 @@
  ;                 If the group is not set, the user's group is used.
  user = @php_fpm_user@

php-php-config.patch

@@ -2,16 +2,16 @@
  scripts/php-config.in |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: php-8.0.0/scripts/php-config.in
+Index: php-8.4.1/scripts/php-config.in
 ===================================================================
---- php-8.0.0.orig/scripts/php-config.in	2020-11-24 18:04:03.000000000 +0100
+--- php-8.4.1.orig/scripts/php-config.in
-+++ php-8.0.0/scripts/php-config.in	2021-01-07 10:13:28.462563114 +0100
++++ php-8.4.1/scripts/php-config.in
 @@ -6,7 +6,7 @@ datarootdir="@datarootdir@"
  exec_prefix="@exec_prefix@"
  version="@PHP_VERSION@"
  vernum="@PHP_VERSION_ID@"
 -include_dir="@includedir@/php"
 +include_dir="@includedir@/php8"
+ lib_dir="@orig_libdir@"
  includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
  ldflags="@PHP_LDFLAGS@"
- libs="@EXTRA_LIBS@"

php-phpize.patch

@@ -3,10 +3,10 @@
  scripts/phpize.in     |    4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-Index: php-8.0.0/scripts/Makefile.frag
+Index: php-8.4.1/scripts/Makefile.frag
 ===================================================================
---- php-8.0.0.orig/scripts/Makefile.frag	2020-11-24 18:04:03.000000000 +0100
+--- php-8.4.1.orig/scripts/Makefile.frag
-+++ php-8.0.0/scripts/Makefile.frag	2021-01-07 10:13:16.914490379 +0100
++++ php-8.4.1/scripts/Makefile.frag
 @@ -2,8 +2,8 @@
  # Build environment install
  #
@@ -18,10 +18,10 @@ Index: php-8.0.0/scripts/Makefile.frag
  
  BUILD_FILES = \
  	scripts/phpize.m4 \
-Index: php-8.0.0/scripts/phpize.in
+Index: php-8.4.1/scripts/phpize.in
 ===================================================================
---- php-8.0.0.orig/scripts/phpize.in	2020-11-24 18:04:03.000000000 +0100
+--- php-8.4.1.orig/scripts/phpize.in
-+++ php-8.0.0/scripts/phpize.in	2021-01-07 10:13:16.914490379 +0100
++++ php-8.4.1/scripts/phpize.in
 @@ -4,8 +4,8 @@
  prefix='@prefix@'
  datarootdir='@datarootdir@'

php-sort-filelist-phar.patch

@@ -1,13 +0,0 @@
-Index: php-8.2.8/ext/phar/Makefile.frag
-===================================================================
---- php-8.2.8.orig/ext/phar/Makefile.frag
-+++ php-8.2.8/ext/phar/Makefile.frag
-@@ -46,7 +46,7 @@ $(builddir)/phar.phar: $(builddir)/phar.
- 	if [ "$(TEST_PHP_EXECUTABLE_RES)" != 1 ]; then \
- 		rm -f $(builddir)/phar.phar; \
- 		rm -f $(srcdir)/phar.phar; \
--		$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)"  $(srcdir)/phar/; \
-+		$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)"  -l 9  $(srcdir)/phar/*.inc; \
- 		chmod +x $(builddir)/phar.phar; \
- 	else \
- 		echo "Skipping phar.phar generating during cross compilation"; \

php-systzdata-v24.patch

@@ -36,13 +36,13 @@ r2: add filesystem trawl to set up name alias index
 r1: initial revision
 
 
-Index: php-8.3.11/ext/date/config0.m4
+Index: php-8.4.1/ext/date/config0.m4
 ===================================================================
---- php-8.3.11.orig/ext/date/config0.m4
+--- php-8.4.1.orig/ext/date/config0.m4
-+++ php-8.3.11/ext/date/config0.m4
++++ php-8.4.1/ext/date/config0.m4
 @@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
  dnl Check for strtoll, atoll
- AC_CHECK_FUNCS(strtoll atoll)
+ AC_CHECK_FUNCS([strtoll atoll])
  
 +PHP_ARG_WITH(system-tzdata, for use of system timezone data,
 +[  --with-system-tzdata[=DIR]      to specify use of system timezone data],
@@ -60,10 +60,10 @@ Index: php-8.3.11/ext/date/config0.m4
  AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
    [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,
    [-Werror])
-Index: php-8.3.11/ext/date/lib/parse_tz.c
+Index: php-8.4.1/ext/date/lib/parse_tz.c
 ===================================================================
---- php-8.3.11.orig/ext/date/lib/parse_tz.c
+--- php-8.4.1.orig/ext/date/lib/parse_tz.c
-+++ php-8.3.11/ext/date/lib/parse_tz.c
++++ php-8.4.1/ext/date/lib/parse_tz.c
 @@ -26,9 +26,33 @@
  #include "timelib.h"
  #include "timelib_private.h"
@@ -728,11 +728,11 @@ Index: php-8.3.11/ext/date/lib/parse_tz.c
  	} else {
  		*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
  		tmp = NULL;
-Index: php-8.3.11/ext/date/php_date.c
+Index: php-8.4.1/ext/date/php_date.c
 ===================================================================
---- php-8.3.11.orig/ext/date/php_date.c
+--- php-8.4.1.orig/ext/date/php_date.c
-+++ php-8.3.11/ext/date/php_date.c
++++ php-8.4.1/ext/date/php_date.c
-@@ -490,7 +490,11 @@ PHP_MINFO_FUNCTION(date)
+@@ -489,7 +489,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);

php8.keyring

@@ -1,97 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mDMEYHHgIBYJKwYBBAHaRw8BAQdAOm0RDYTmM6omlqoTx6Wy65agVJ4q8EPGczNn
-YOrHyo20HUpha3ViIFplbGVua2EgPGJ1a2thQHBocC5uZXQ+iJMEExYIADsCGwMF
-CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTCjZN1dWA+tKu3JYYcB3ncXAqd5AUC
-YHHi+QIZAQAKCRAcB3ncXAqd5MZdAP0eAbdHgjHqKYol3QaXRhErAvvLHPSEXN5c
-AImF3zIICgD+NJZZMQDXd1OOKDt+YLiIqIq2ibRhOP5mZryPCGkq9QG0J0pha3Vi
-IFplbGVua2EgPGpha3ViLm9wZW5zc2xAZ21haWwuY29tPoiQBBMWCAA4FiEEwo2T
-dXVgPrSrtyWGHAd53FwKneQFAmBx4owCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgEC
-F4AACgkQHAd53FwKneS0NwEAt0IRpoCN/JNwg1TIseybpmC65nSzYVyX10xe4Ji5
-0dcBAI6TYA+47z6F4IVRg2c8Vtg1xktot7b/tKn6hgdv59sLtCdKYWt1YiBaZWxl
-bmthIDxqYWt1Yi56ZWxlbmthQGdtYWlsLmNvbT6IkAQTFggAOBYhBMKNk3V1YD60
-q7clhhwHedxcCp3kBQJgceAgAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJ
-EBwHedxcCp3k+3MBAKuK15XyHw+sdFATFuW9vN+lXqHnYid2jRzQUoh5wG/FAQDc
-BXQgXRfe72XRoxY4AE3E4onGMfzW3kbDKDVF7o4zDrg4BGBx4CASCisGAQQBl1UB
-BQEBB0Bm2FjWsSDUwL5nbAhtl+rwnGLKbWiVYrwHQocgKFj6GwMBCAeIeAQYFggA
-IBYhBMKNk3V1YD60q7clhhwHedxcCp3kBQJgceAgAhsMAAoJEBwHedxcCp3k8ZwA
-/jLRHUBKIeRAxeGJhoqJRr2oTxrP887FuX9/ikSX21bcAQD90AB2fu6dpAkOFyZz
-X9UdE7QxtBhHVWRx3DRr4P/cDrgzBGBx4KcWCSsGAQQB2kcPAQEHQEDgLoxnsU3i
-jAnPZwAbShiRcxeQ/gXkqufbQlVJy/BfiPUEGBYIACYWIQTCjZN1dWA+tKu3JYYc
-B3ncXAqd5AUCYHHgpwIbAgUJAeEzgACBCRAcB3ncXAqd5HYgBBkWCAAdFiEEK92x
-XVRjS6mw6oyiCpxkP6el608FAmBx4KcACgkQCpxkP6el608JUgEA7NU04gu368gu
-lSeGbGcjAERgJmFcxHjyEoqb7eCR+9UBALhy3Q6VSio081TBhtg9M82QL0NoxlkZ
-NYg3TjzR5U4Mg9YA/1tG8HmWUqv5dE901v18ErGVKo8di06VqJT4jE8BRNLcAQCI
-PkJjNZFtt73kqNgwA/L2JPF2T6YJWYSPOtmQMrCnCw==
-=e6EH
------END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-wpxdIIyaoaS8NSuPIrV1g4SUXYs=
-=fB6k
------END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-
 mQINBFg4q4YBEAD50HOLDAVpW88rUHnX/TYTCLpqmHMKXPjuf1l3ZEkY3PXF6wqm
 qaWWMPeWJFsik3cMebtLQzsgXHl4xDUBQhOOtdfax2ZKBHQmoUknw2dKkqdkVLh8
 Xpu8tw00SmcTiAFVCA2+HOqQ+Drq9NUpnMeJpJZiZu84eZbJBEzgabi0s4jf67NH
@@ -263,3 +171,69 @@ qNeNbaksJpMcSXunKitg4ZOOmGMfzqdUQDCThyyEQkAo5dIpqM2dFNK+I/J/8QqX
 ovhBoCTlBaU=
 =Hyro
 -----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+uiQPA0QDZA==
+=67ZA
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZiANXBYJKwYBBAHaRw8BAQdARP8nnoCEXdWhbte9/J1LeQZVMQ3vPM7ADToq
+ZGNvXDe0JkNhbHZpbiBCdWNrbGV5IChQSFApIDxjYWx2aW5iQHBocC5uZXQ+iJME
+ExYKADsWIQSdf5mgy48FyKaVjWJWqXr3YAo5pgUCZiANXAIbAwULCQgHAgIiAgYV
+CgkICwIEFgIDAQIeBwIXgAAKCRBWqXr3YAo5ppvGAP9TWg8OSAuIZqsBwxd62k01
+YbG08JClqfB8/aPeoEqPcQEA++VwjC5BppelKywM6CtYtxR0tM+zt3OjjKlN400A
+wga4OARmIA1cEgorBgEEAZdVAQUBAQdA+SOq91v3irC1wiZR9kesStsulsJ+liFC
+01oLuT9OhwEDAQgHiHgEGBYKACAWIQSdf5mgy48FyKaVjWJWqXr3YAo5pgUCZiAN
+XAIbDAAKCRBWqXr3YAo5pkbYAP9oqokC5fA5yWPdi3fXGEl4K66tkebIOa5Pbm23
+Hng4PwEAplx8F6SVD7tfszojqJDf5W4w4q0F0wknPSCLjCuldAQ=
+=anm6
+-----END PGP PUBLIC KEY BLOCK-----
+

php8.spec

@@ -1,7 +1,8 @@
 #
 # spec file for package php8
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2026 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,8 +41,8 @@
 %define psuffix %{nil}
 %endif
 
-%global apiver            20230831
+%global apiver            20240924
-%global zendver           20230831
+%global zendver           20240924
 %define extension_dir     %{_libdir}/%{php_name}/extensions
 %define php_sysconf       %{_sysconfdir}/%{php_name}
 
@@ -57,7 +58,7 @@
 %bcond_without	sodium
 
 Name:           %{pprefix}%{php_name}%{psuffix}
-Version:        8.3.11
+Version:        8.4.17
 Release:        0
 Summary:        Interpreter for the PHP scripting language version 8
 License:        MIT AND PHP-3.01
@@ -89,8 +90,6 @@ Patch3:         php-ini.patch
 Patch4:         php-systzdata-v24.patch
 # adjust upstream systemd unit to SUSE needs
 Patch5:         php-systemd-unit.patch
-# PATCH-FEATURE-OPENSUSE use ordered input files for reproducible /usr/bin/phar.phar
-Patch6:         php-sort-filelist-phar.patch
 ## Bugfix patches
 # should be upstreamed, will do later
 Patch22:        php-date-regenerate-lexers.patch
@@ -116,7 +115,11 @@ BuildRequires:  net-snmp-devel
 BuildRequires:  openldap2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  postfix
+%if 0%{suse_version} >= 1600
 BuildRequires:  postgresql-devel
+%else
+BuildRequires:  postgresql17-devel
+%endif
 BuildRequires:  re2c
 BuildRequires:  tcpd-devel
 BuildRequires:  update-alternatives
@@ -168,6 +171,8 @@ BuildRequires:  php-fpm = %{version}
 %if "%{flavor}" == ""
 Requires:       php-sapi = %{version}
 Requires:       timezone
+Requires:       group(www)
+Requires:       user(wwwrun)
 Recommends:     php-ctype = %{version}
 Recommends:     php-dom = %{version}
 Recommends:     php-iconv = %{version}
@@ -203,8 +208,10 @@ Provides:       php-spl = %{version}
 Provides:       php-xml = %{version}
 Provides:       zend = %{zendver}
 # conflicts other php major versions with and should replace it
-Conflicts:      php < %{version}
+Obsoletes:      php < %{version}
-Conflicts:      php72
+Obsoletes:      php7
+Obsoletes:      php72
+Obsoletes:      php74
 # mcrypt was removed in php 7.2
 Obsoletes:      php7-mcrypt
 # json is now integral part of core, cannot be disabled
@@ -227,7 +234,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-cli = %{version}
 Provides:       php-sapi = %{version}
-Conflicts:      php-cli < %{version}
+Obsoletes:      php7-cli
 
 %description cli
 PHP is a server-side HTML embedded scripting language designed
@@ -251,7 +258,7 @@ Requires:       php = %{version}
 Requires:       pkgconfig(libpcre2-8) >= 10.30
 Requires:       pkgconfig(libxml-2.0) >= 2.9.0
 Provides:       php-devel = %{version}
-Conflicts:      php-devel < %{version}
+Obsoletes:      php7-devel
 
 %description devel
 PHP is a server-side HTML embedded scripting language designed
@@ -281,6 +288,7 @@ Requires(post): %{_sbindir}/a2enmod
 Requires(preun): %{_sbindir}/a2enmod
 Provides:       mod_php_any = %{version}
 Provides:       php-sapi = %{version}
+Obsoletes:      apache2-mod_php7
 Obsoletes:      mod_php_any < %{version}
 
 %description
@@ -302,7 +310,7 @@ Requires:       php = %{version}
 Provides:       php-cgi = %{version}
 Provides:       php-fastcgi = %{version}
 Provides:       php-sapi = %{version}
-Conflicts:      php-fastcgi < %{version}
+Obsoletes:      php7-fastcgi
 
 %description
 PHP is a server-side, cross-platform HTML embedded scripting language.
@@ -318,11 +326,9 @@ Group:          Development/Libraries/PHP
 BuildRequires:  php = %{version}
 BuildRequires:  pkgconfig(libsystemd) >= 209
 Requires:       php = %{version}
-Requires:       group(www)
-Requires:       user(wwwrun)
 Provides:       php-fpm = %{version}
 Provides:       php-sapi = %{version}
-Conflicts:      php-fpm < %{version}
+Obsoletes:      php7-fpm
 %{?systemd_ordering}
 
 %description
@@ -371,6 +377,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-bcmath = %{version}
 Obsoletes:      php-bcmath < %{version}
+Obsoletes:      php7-bcmath
 
 %description bcmath
 Binary Calculator which supports numbers of any size and precision,
@@ -382,6 +389,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-bz2 = %{version}
 Obsoletes:      php-bz2 < %{version}
+Obsoletes:      php7-bz2
 
 %description bz2
 PHP functions to read and write bzip2 (.bz2) compressed files.
@@ -392,6 +400,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-calendar = %{version}
 Obsoletes:      php-calendar < %{version}
+Obsoletes:      php7-calendar
 
 %description calendar
 PHP functions for converting between different calendar formats.
@@ -402,6 +411,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-ctype = %{version}
 Obsoletes:      php-ctype < %{version}
+Obsoletes:      php7-ctype
 
 %description ctype
 PHP functions for checking whether a character or string falls into a
@@ -413,6 +423,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-curl = %{version}
 Obsoletes:      php-curl < %{version}
+Obsoletes:      php7-curl
 
 %description curl
 PHP interface to libcurl that allows you to connect to and communicate
@@ -425,6 +436,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-dba = %{version}
 Obsoletes:      php-dba < %{version}
+Obsoletes:      php7-dba
 
 %description dba
 This is a general abstraction layer for several file-based databases.
@@ -439,6 +451,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-dom = %{version}
 Obsoletes:      php-dom < %{version}
+Obsoletes:      php7-dom
 
 %description dom
 This module adds Document Object Model (DOM) support.
@@ -451,6 +464,7 @@ Provides:       php-enchant = %{version}
 Obsoletes:      php-enchant < %{version}
 # Obsolete pspell plugin as enchant is favored solution (goodbye aspell)
 Obsoletes:      php7-pspell
+Obsoletes:      php7-enchant
 
 %description enchant
 Enchant is the PHP binding for the Enchant library. Enchant steps in
@@ -466,6 +480,7 @@ Requires:       php = %{version}
 Requires:       php-mbstring = %{version}
 Provides:       php-exif = %{version}
 Obsoletes:      php-exif < %{version}
+Obsoletes:      php7-exif
 
 %description exif
 PHP functions for extracting EXIF (Exchangable Image File Format;
@@ -477,6 +492,7 @@ Summary:        Main interface to C code and data
 Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-ffi = %{version}
+Obsoletes:      php7-ffi
 
 %description ffi
 This extension allows the loading of shared libraries (.DLL or .so),
@@ -490,6 +506,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-fileinfo = %{version}
 Obsoletes:      php-fileinfo < %{version}
+Obsoletes:      php7-fileinfo
 
 %description fileinfo
 The functions in this module try to guess the content type and
@@ -503,6 +520,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-ftp = %{version}
 Obsoletes:      php-ftp < %{version}
+Obsoletes:      php7-ftp
 
 %description ftp
 PHP functions for access to file servers speaking the File Transfer
@@ -514,6 +532,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-gd = %{version}
 Obsoletes:      php-gd < %{version}
+Obsoletes:      php7-gd
 
 %description gd
 PHP functions to create and manipulate image files in a variety of
@@ -526,6 +545,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-gettext = %{version}
 Obsoletes:      php-gettext < %{version}
+Obsoletes:      php7-gettext
 
 %description gettext
 PHP functions that implement a Native Language Support (NLS) API which
@@ -537,6 +557,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-gmp = %{version}
 Obsoletes:      php-gmp < %{version}
+Obsoletes:      php7-gmp
 
 %description gmp
 PHP functions for work with arbitrary-length integers using the GNU MP
@@ -548,6 +569,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-iconv = %{version}
 Obsoletes:      php-iconv < %{version}
+Obsoletes:      php7-iconv
 
 %description iconv
 This module contains an interface to iconv character set conversion
@@ -562,6 +584,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-intl = %{version}
 Obsoletes:      php-intl < %{version}
+Obsoletes:      php7-intl
 
 %description intl
 The internationalization (intl) extension is a wrapper for the ICU
@@ -575,6 +598,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-ldap = %{version}
 Obsoletes:      php-ldap < %{version}
+Obsoletes:      php7-ldap
 
 %description ldap
 PHP interface to the Lightweight Directory Access Protocol (LDAP).
@@ -585,6 +609,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-mbstring = %{version}
 Obsoletes:      php-mbstring < %{version}
+Obsoletes:      php7-mbstring
 
 %description mbstring
 mbstring provides multibyte specific string functions that help
@@ -603,6 +628,7 @@ Provides:       php-mysqli = %{version}
 Provides:       php-pdo_mysql = %{version}
 Provides:       php_any_db = %{version}
 Obsoletes:      php-mysql < %{version}
+Obsoletes:      php7-mysql
 
 %description mysql
 PHP functions for access to MySQL database servers.
@@ -616,6 +642,7 @@ Requires:       php-pdo = %{version}
 Provides:       php-firebird = %{version}
 Provides:       php_any_db = %{version}
 Obsoletes:      php-firebird < %{version}
+Obsoletes:      php7-firebird
 
 %description firebird
 PHP functions for access to firebird database servers.
@@ -629,6 +656,7 @@ Requires:       php-pdo = %{version}
 Provides:       php-odbc = %{version}
 Provides:       php-pdo_odbc = %{version}
 Obsoletes:      php-odbc < %{version}
+Obsoletes:      php7-odbc
 
 %description odbc
 This module adds Open Database Connectivity (ODBC) support.
@@ -639,6 +667,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-opcache = %{version}
 Obsoletes:      php-opcache < %{version}
+Obsoletes:      php7-opcache
 
 %description opcache
 OPcache improves PHP performance by storing precompiled script
@@ -651,6 +680,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-openssl = %{version}
 Obsoletes:      php-openssl < %{version}
+Obsoletes:      php7-openssl
 
 %description openssl
 This extension binds functions of OpenSSL library for symmetric and
@@ -664,6 +694,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-pcntl = %{version}
 Obsoletes:      php-pcntl < %{version}
+Obsoletes:      php7-pcntl
 
 %description pcntl
 Process Control support in PHP implements the Unix style of process
@@ -676,7 +707,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Requires:       php-zlib = %{version}
 Provides:       php-phar = %{version}
-Conflicts:      php-phar < %{version}
+Obsoletes:      php7-phar
 
 %description phar
 The phar extension provides a way to put entire PHP applications into
@@ -695,6 +726,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-pdo = %{version}
 Obsoletes:      php-pdo < %{version}
+Obsoletes:      php7-pdo
 
 %description pdo
 The PHP Data Objects (PDO) extension defines an interface for
@@ -717,6 +749,7 @@ Provides:       php-pdo_pgsql = %{version}
 Provides:       php-pgsql = %{version}
 Provides:       php_any_db = %{version}
 Obsoletes:      php-pgsql < %{version}
+Obsoletes:      php7-pgsql
 
 %description pgsql
 PHP functions for access to PostgreSQL database servers. It includes
@@ -728,6 +761,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-posix = %{version}
 Obsoletes:      php-posix < %{version}
+Obsoletes:      php7-posix
 
 %description posix
 This module contains an interface to those functions defined in the
@@ -740,6 +774,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-readline = %{version}
 Obsoletes:      php-readline < %{version}
+Obsoletes:      php7-readline
 
 %description readline
 PHP interface to libedit, which provides editable command line as well
@@ -751,6 +786,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-shmop = %{version}
 Obsoletes:      php-shmop < %{version}
+Obsoletes:      php7-shmop
 
 %description shmop
 An extension created as an alternative to the sysvmsg module.
@@ -761,6 +797,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-snmp = %{version}
 Obsoletes:      php-snmp < %{version}
+Obsoletes:      php7-snmp
 
 %description snmp
 The SNMP extension provides a toolset for managing remote devices via
@@ -777,6 +814,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-soap = %{version}
 Obsoletes:      php-soap < %{version}
+Obsoletes:      php7-soap
 
 %description soap
 This module provides SOAP support.
@@ -790,6 +828,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-sockets = %{version}
 Obsoletes:      php-sockets < %{version}
+Obsoletes:      php7-sockets
 
 %description sockets
 The socket extension implements a low-level interface to the socket
@@ -803,6 +842,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-sodium = %{version}
 Obsoletes:      php-sodium < %{version}
+Obsoletes:      php7-sodium
 
 %description sodium
 PHP binding to libsodium software library for encryption, decryption,
@@ -817,6 +857,7 @@ Requires:       php-pdo = %{version}
 Provides:       php-pdo_sqlite = %{version}
 Provides:       php-sqlite = %{version}
 Obsoletes:      php-sqlite < %{version}
+Obsoletes:      php7-sqlite
 
 %description sqlite
 This is an extension for the SQLite Embeddable SQL Database Engine.
@@ -839,6 +880,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-sysvmsg = %{version}
 Obsoletes:      php-sysvmsg < %{version}
+Obsoletes:      php7-sysvmsg
 
 %description sysvmsg
 This module provides System V Message Queue support.
@@ -849,6 +891,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-sysvsem = %{version}
 Obsoletes:      php-sysvsem < %{version}
+Obsoletes:      php7-sysvsem
 
 %description sysvsem
 PHP interface for System V semaphores.
@@ -859,6 +902,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-sysvshm = %{version}
 Obsoletes:      php-sysvshm < %{version}
+Obsoletes:      php7-sysvshm
 
 %description sysvshm
 PHP interface for System V shared memory.
@@ -869,6 +913,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-tidy = %{version}
 Obsoletes:      php-tidy < %{version}
+Obsoletes:      php7-tidy
 
 %description tidy
 Tidy is an extension based on Libtidy (http://tidy.sourceforge.net) and allows
@@ -882,6 +927,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-tokenizer = %{version}
 Obsoletes:      php-tokenizer < %{version}
+Obsoletes:      php7-tokenizer
 
 %description tokenizer
 The tokenizer functions provide an interface to the PHP tokenizer
@@ -896,6 +942,7 @@ Requires:       php = %{version}
 Requires:       php-dom = %{version}
 Provides:       php-xsl = %{version}
 Obsoletes:      php-xsl < %{version}
+Obsoletes:      php7-xsl
 
 %description xsl
 PHP's XSL extension implements the XSL (Extensible Stylesheet
@@ -909,6 +956,7 @@ Requires:       php = %{version}
 Requires:       php-dom = %{version}
 Provides:       php-xmlreader = %{version}
 Obsoletes:      php-xmlreader < %{version}
+Obsoletes:      php7-xmlreader
 
 %description xmlreader
 The XMLReader extension is an XML Pull parser. The reader acts as a
@@ -921,6 +969,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-xmlwriter = %{version}
 Obsoletes:      php-xmlwriter < %{version}
+Obsoletes:      php7-xmlwriter
 
 %description xmlwriter
 XMLWriter wraps the libxml xmlWriter API. Represents a writer that
@@ -933,6 +982,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-zip = %{version}
 Obsoletes:      php-zip < %{version}
+Obsoletes:      php7-zip
 
 %description zip
 This extension allows to transparently read or write ZIP compressed
@@ -944,6 +994,7 @@ Group:          Development/Libraries/PHP
 Requires:       php = %{version}
 Provides:       php-zlib = %{version}
 Obsoletes:      php-zlib < %{version}
+Obsoletes:      php7-zlib
 
 %description zlib
 This module enables to transparently read and write gzip (.gz)
@@ -1185,13 +1236,13 @@ Build cli \
     --disable-cgi
 %endif
 
+%if "%{flavor}" == "test"
 %check
 %if %{with asan}
 # no need for ASAN build
 exit 0
 %endif
 
-%if "%{flavor}" == "test"
 # Run tests, using the CLI SAPI
 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 LANG=POSIX LC_ALL=POSIX
 unset TZ
@@ -1428,6 +1479,8 @@ fi
 %dir %{php_sysconf}/fastcgi
 %{_bindir}/php-cgi
 %{_mandir}/man1/php-cgi.1%{?ext_man}
+%dir %{apache_serverroot}
+%dir %{apache_serverroot}/cgi-bin
 %{apache_serverroot}/cgi-bin/php
 %endif