From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 13 Jan 2026 20:08:15 +0000 (+0100)
Subject: - from PLD to keep patches in sync
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=7c9986597ca97b6d85843bc6178498643c1f2dc1;p=packages%2Fphp.git

- from PLD to keep patches in sync
---

diff --git a/php-shared.patch b/php-shared.patch
index 6d3d96c..3039e88 100644
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -83,6 +83,21 @@
  	$(BUILD_CLI)
  
  install-cli: $(SAPI_CLI_PATH)
+--- php-8.5.0alpha1/sapi/phpdbg/Makefile.frag~	2025-07-01 23:58:05.000000000 +0200
++++ php-8.5.0alpha1/sapi/phpdbg/Makefile.frag	2025-07-13 01:15:43.916508349 +0200
+@@ -2,10 +2,10 @@ phpdbg: $(SAPI_PHPDBG_PATH)
+ 
+ phpdbg-shared: $(SAPI_PHPDBG_SHARED_PATH)
+ 
+-$(SAPI_PHPDBG_SHARED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
++$(SAPI_PHPDBG_SHARED_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
+ 	$(BUILD_PHPDBG_SHARED)
+ 
+-$(SAPI_PHPDBG_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
++$(SAPI_PHPDBG_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
+ 	$(BUILD_PHPDBG)
+ 
+ %.c: %.y
 --- php-8.0.0beta4/sapi/phpdbg/config.m4~	2020-10-02 16:05:45.000000000 +0300
 +++ php-8.0.0beta4/sapi/phpdbg/config.m4	2020-10-02 17:29:48.820717591 +0300
 @@ -63,7 +63,7 @@
@@ -113,6 +128,17 @@
  	$(BUILD_LITESPEED)
  
  install-litespeed: $(SAPI_LITESPEED_PATH)
+--- php-8.4.1/sapi/litespeed/config.m4~	2024-11-20 10:48:35.000000000 +0100
++++ php-8.4.1/sapi/litespeed/config.m4	2024-11-22 09:58:29.276654616 +0100
+@@ -18,7 +18,7 @@ if test "$PHP_LITESPEED" != "no"; then
+       SAPI_LITESPEED_PATH=sapi/litespeed/lsphp.exe
+       BUILD_LITESPEED="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+     ], [
+-      BUILD_LITESPEED="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
++      BUILD_LITESPEED="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+     ])
+ 
+   PHP_SUBST([SAPI_LITESPEED_PATH])
 --- php-8.4.1/sapi/fpm/config.m4~	2024-11-20 10:48:35.000000000 +0100
 +++ php-8.4.1/sapi/fpm/config.m4	2024-11-22 09:59:28.119987949 +0100
 @@ -567,7 +567,7 @@ if test "$PHP_FPM" != "no"; then
@@ -134,29 +160,3 @@
  	$(BUILD_FPM)
  
  install-fpm: $(SAPI_FPM_PATH)
---- php-8.4.10/sapi/litespeed/config.m4.orig	2025-07-02 04:22:42.000000000 +0200
-+++ php-8.4.10/sapi/litespeed/config.m4		2025-07-10 09:22:35.343460732 +0200
-@@ -18,7 +18,7 @@
-       SAPI_LITESPEED_PATH=sapi/litespeed/lsphp.exe
-       BUILD_LITESPEED="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
-     ], [
--      BUILD_LITESPEED="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
-+      BUILD_LITESPEED="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
-     ])
- 
-   PHP_SUBST([SAPI_LITESPEED_PATH])
---- php-8.5.1/sapi/phpdbg/Makefile.frag.orig	2025-12-16 16:59:07.000000000 +0100
-+++ php-8.5.1/sapi/phpdbg/Makefile.frag	2026-01-08 12:34:27.663787981 +0100
-@@ -2,10 +2,10 @@
- 
- phpdbg-shared: $(SAPI_PHPDBG_SHARED_PATH)
- 
--$(SAPI_PHPDBG_SHARED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
-+$(SAPI_PHPDBG_SHARED_PATH): libphp_common.la $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
- 	$(BUILD_PHPDBG_SHARED)
- 
--$(SAPI_PHPDBG_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
-+$(SAPI_PHPDBG_PATH): libphp_common.la $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
- 	$(BUILD_PHPDBG)
- 
- %.c: %.y
diff --git a/php-systzdata.patch b/php-systzdata.patch
index 8de0522..92be266 100644
--- a/php-systzdata.patch
+++ b/php-systzdata.patch
@@ -36,6 +36,28 @@ r2: add filesystem trawl to set up name alias index
 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
+@@ -14,6 +14,18 @@ PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext
+ AX_CHECK_COMPILE_FLAG([-fwrapv],
+   [PHP_TIMELIB_CFLAGS="$PHP_TIMELIB_CFLAGS -fwrapv"])
+ 
++PHP_ARG_WITH(system-tzdata, for use of system timezone data,
++  [AS_HELP_STRING([--with-system-tzdata[=DIR]],[to specify use of system timezone data])], no, no)
++
++if test "$PHP_SYSTEM_TZDATA" != "no"; then
++   AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
++
++   if test "$PHP_SYSTEM_TZDATA" != "yes"; then
++      AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
++                         [Define for location of system timezone data])
++   fi
++fi
++
+ 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"
+ 
 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
@@ -718,24 +740,3 @@ diff -up ./ext/date/php_date.c.systzdata ./ext/date/php_date.c
  	php_info_print_table_row(2, "Default timezone", guess_timezone(tzdb));
  	php_info_print_table_end();
  
---- ./ext/date/config0.m4.orig	2025-12-16 16:59:07.000000000 +0100
-+++ ./ext/date/config0.m4	2026-01-08 13:06:06.386641612 +0100
-@@ -7,6 +7,18 @@
- AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
-   [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"])
- 
-+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
-+  [AS_HELP_STRING([--with-system-tzdata[=DIR]],[to specify use of system timezone data])], no, no)
-+
-+if test "$PHP_SYSTEM_TZDATA" != "no"; then
-+   AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
-+
-+   if test "$PHP_SYSTEM_TZDATA" != "yes"; then
-+      AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
-+                         [Define for location of system timezone data])
-+   fi
-+fi
-+
- PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -DHAVE_TIMELIB_CONFIG_H=1"
- PHP_TIMELIB_CFLAGS="$PHP_DATE_CFLAGS"
- PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
diff --git a/php-zlib-for-getimagesize.patch b/php-zlib-for-getimagesize.patch
index b4b49ac..50a0ed5 100644
--- a/php-zlib-for-getimagesize.patch
+++ b/php-zlib-for-getimagesize.patch
@@ -4,8 +4,8 @@ see also http://bugs.php.net/bug.php?id=29611
 
 upstream: https://github.com/php/php-src/pull/4681
 
---- php-8.5.1/ext/standard/image.c.orig	2025-12-16 16:59:07.000000000 +0100
-+++ php-8.5.1/ext/standard/image.c	2026-01-08 12:54:27.628722771 +0100
+--- php-8.2.0RC2/ext/standard/image.c~	2022-09-14 12:42:49.000000000 +0300
++++ php-8.2.0RC2/ext/standard/image.c	2022-09-29 01:20:02.719689289 +0300
 @@ -28,7 +28,7 @@
  #endif
  #include "php_image.h"
@@ -15,7 +15,7 @@ upstream: https://github.com/php/php-src/pull/4681
  #include "zlib.h"
  #endif
  
-@@ -154,7 +154,7 @@
+@@ -154,7 +154,7 @@ static unsigned long int php_swf_get_bit
  }
  /* }}} */
  
@@ -24,7 +24,7 @@ upstream: https://github.com/php/php-src/pull/4681
  /* {{{ php_handle_swc */
  static struct php_gfxinfo *php_handle_swc(php_stream * stream)
  {
-@@ -1503,7 +1503,7 @@
+@@ -1501,7 +1501,7 @@ static void php_getimagesize_from_stream
  			break;
  		case IMAGE_FILETYPE_SWC:
  			/* TODO: with the new php_image_register_handler() APIs, this restriction could be solved */
@@ -33,3 +33,4 @@ upstream: https://github.com/php/php-src/pull/4681
  			result = php_handle_swc(stream);
  #else
  			php_error_docref(NULL, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled");
+