[packages/php] up to 8.3.11

[atler]

commit 173157a0671b90aa84122311c83ae6eaa7bdc28a
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Aug 30 11:12:17 2024 +0200

    up to 8.3.11

 curl.patch          | 27 ---------------------------
 php-systzdata.patch |  6 +++---
 php.spec            |  8 +++-----
 3 files changed, 6 insertions(+), 35 deletions(-)
---
diff --git a/php.spec b/php.spec
index 943e2a8..85a78cc 100644
--- a/php.spec
+++ b/php.spec
@@ -142,7 +142,7 @@
 %define		ver_suffix	83
 %define		php_suffix	%{!?with_default_php:%{ver_suffix}}
 %define		subver		%{nil}
-%define		rel		2
+%define		rel		1
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -150,7 +150,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.3.10
+Version:	8.3.11
 Release:	%{rel}
 Epoch:		4
 # All files licensed under PHP version 3.01, except
@@ -159,7 +159,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	https://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	49f47bb78d521ad284ab8f15e91e6c76
+# Source0-md5:	7e86c630694f9da7475601aa5f7a2728
 #Source0:	https://downloads.php.net/~pierrick/php-%{version}%{subver}.tar.xz
 Source1:	opcache.ini
 Source2:	%{orgname}-mod_php.conf
@@ -182,7 +182,6 @@ Patch5:		openssl.patch
 # https://github.com/php/php-src/issues/9910
 Patch6:		opcache-nokill-perm.patch
 Patch7:		%{orgname}-sapi-ini-file.patch
-Patch8:		curl.patch
 
 Patch10:	%{orgname}-ini.patch
 Patch11:	embed.patch
@@ -1882,7 +1881,6 @@ cp -p php.ini-production php.ini
 #%patch5 -p1 resolved upstream?
 %patch6 -p1
 %patch7 -p1 -b .sapi-ini-file
-%patch8 -p1
 
 %patch10 -p1 -b .ini
 %patch14 -p1
diff --git a/curl.patch b/curl.patch
deleted file mode 100644
index 5261f3a..0000000
--- a/curl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit efd00b8ff05cb78ecb0351b96cce7780bcb72a2a
-Author: David Carlier <devnexen at gmail.com>
-Date:   Tue Jul 16 19:55:04 2024 +0100
-
-    ext/curl: curl_error using curl_easy_strerror if CURLOPT_ERRORBUFFER
-    
-    did not fill the error buffer.
-    
-    close GH-14984
-
-diff --git a/ext/curl/interface.c b/ext/curl/interface.c
-index 707f4e0a6f..4884ddc822 100644
---- a/ext/curl/interface.c
-+++ b/ext/curl/interface.c
-@@ -2764,7 +2764,11 @@ PHP_FUNCTION(curl_error)
- 
- 	if (ch->err.no) {
- 		ch->err.str[CURL_ERROR_SIZE] = 0;
--		RETURN_STRING(ch->err.str);
-+		if (strlen(ch->err.str) > 0) {
-+			RETURN_STRING(ch->err.str);
-+		} else {
-+			RETURN_STRING(curl_easy_strerror(ch->err.no));
-+		}
- 	} else {
- 		RETURN_EMPTY_STRING();
- 	}
diff --git a/php-systzdata.patch b/php-systzdata.patch
index fb69621..abc46de 100644
--- a/php-systzdata.patch
+++ b/php-systzdata.patch
@@ -52,9 +52,9 @@ diff -up php-8.0.0beta3/ext/date/config0.m4.systzdata php-8.0.0beta3/ext/date/co
 +   fi
 +fi
 +
- PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I at ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
- 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"
+ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
+   [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,
+   [-Werror])
 diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/date/lib/parse_tz.c
 --- php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata	2020-09-01 19:13:26.000000000 +0200
 +++ php-8.0.0beta3/ext/date/lib/parse_tz.c	2020-09-02 08:07:51.039979873 +0200
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/173157a0671b90aa84122311c83ae6eaa7bdc28a