From: Bartosz Świątek <shadzik@tld-linux.org>
Date: Thu, 10 Jul 2025 07:28:26 +0000 (+0200)
Subject: - Up to 8.4.10
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=b57c17ee13948907c8f3a299e7263d4ce5185cde;p=packages%2Fphp.git

- Up to 8.4.10
---

diff --git a/php-shared.patch b/php-shared.patch
index 9845297..b82b078 100644
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -128,17 +128,6 @@
  	$(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/php.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
@@ -160,3 +149,14 @@
  	$(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])
diff --git a/php.spec b/php.spec
index 7830320..de912d6 100644
--- a/php.spec
+++ b/php.spec
@@ -113,7 +113,7 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	8.4.7
+Version:	8.4.10
 Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
@@ -122,7 +122,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	d781a4e08fa8903919ca28b1e2419393
+# Source0-md5:	b73a7c365a7e75905745528d218cf128
 Source1:	opcache.ini
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
@@ -253,7 +253,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		jsonver		%{version}
 %define		pharver		%{version}
 %define		sqlite3ver	%{version}
-%define		zipver		1.22.5
+%define		zipver		1.22.6
 %define		phpdbgver	%{version}
 %define		sodiumver	%{version}