[packages/php/PHP_8_1] up to 8.1.33 (fixes CVE-2025-1735 CVE-2025-6491 CVE-2025-1220)

[atler]

commit 622c082e36f7d0654b0b5afd3bd2f1b391c4e748
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Jul 3 20:08:24 2025 +0200

    up to 8.1.33 (fixes CVE-2025-1735 CVE-2025-6491 CVE-2025-1220)

 icu74.patch | 74 -------------------------------------------------------------
 php.spec    |  6 ++---
 2 files changed, 2 insertions(+), 78 deletions(-)
---
diff --git a/php.spec b/php.spec
index e4da079..90ad548 100644
--- a/php.spec
+++ b/php.spec
@@ -148,7 +148,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.1.32
+Version:	8.1.33
 Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
@@ -157,7 +157,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:	685eda239895545d75c124be537d34e4
+# Source0-md5:	36cd5b20659667cbddd171c6238dd64b
 Source1:	opcache.ini
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
@@ -205,7 +205,6 @@ Patch67:	mysql-lib-ver-mismatch.patch
 # https://bugs.php.net/bug.php?id=68344
 Patch68:	php-mysql-ssl-context.patch
 Patch71:	libdb-info.patch
-Patch72:	icu74.patch
 URL:		https://www.php.net/
 %{?with_pdo_firebird:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -1904,7 +1903,6 @@ cp -p php.ini-production php.ini
 %patch -P67 -p1 -b .mysql-lib-ver-mismatch
 #%%patch -P68 -p1 DROP or update to 7.0 APIs
 %patch -P71 -p1 -b .libdb-info
-%patch -P72 -p1
 
 sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \
       ext/ext_skel.php \
diff --git a/icu74.patch b/icu74.patch
deleted file mode 100644
index 01f5e88..0000000
--- a/icu74.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From cc46a4e6b5a413bab3e264c1dcaaf7052f54fbc4 Mon Sep 17 00:00:00 2001
-From: David Carlier <devnexen at gmail.com>
-Date: Sat, 17 Feb 2024 21:38:21 +0000
-Subject: [PATCH] ext/intl: level up c++ runtime std for icu 74 and onwards.
-
-to align with what is required to build icu 74 itself.
-
-Close GH-14002
----
- NEWS               |  3 +++
- ext/intl/config.m4 | 11 ++++++++++-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
-index dd687bcd97de3..48f5147ca7bbf 100644
---- a/ext/intl/config.m4
-+++ b/ext/intl/config.m4
-@@ -80,7 +80,16 @@ if test "$PHP_INTL" != "no"; then
-     breakiterator/codepointiterator_methods.cpp"
- 
-   PHP_REQUIRE_CXX()
--  PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
-+
-+  AC_MSG_CHECKING([if intl requires -std=gnu++17])
-+  AS_IF([test "$PKG_CONFIG icu-uc --atleast-version=74"],[
-+    AC_MSG_RESULT([yes])
-+    PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX)
-+  ],[
-+    AC_MSG_RESULT([no])
-+    PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
-+  ])
-+
-   PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS"
-   case $host_alias in
-   *cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L"
-From 4e21a26db24cfeb0c8a3ba43dba2d7d5599d2ee5 Mon Sep 17 00:00:00 2001
-From: Calvin Buckley <calvin at cmpct.info>
-Date: Fri, 10 May 2024 14:20:17 -0300
-Subject: [PATCH] Fix check for newer versions of ICU (#14186)
-
-* Fix check for newer versions of ICU
-
-The previous test would always trigger, even if the version of ICU
-installed didn't require C++17. This was because it incorrectly used
-the `test` program, which broke the build on systems without a C++17
-compiler.
-
-Tested with macOS 14 and i 7.2.
-
-* Fix broken ICU version check for definition
-
-Same as the previous fix for C++17.
-
----------
-
-Co-authored-by: Peter Kokot <peterkokot at gmail.com>
----
- build/php.m4       | 5 ++---
- ext/intl/config.m4 | 2 +-
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
-index 48f5147ca7bbf..78396dc416926 100644
---- a/ext/intl/config.m4
-+++ b/ext/intl/config.m4
-@@ -82,7 +82,7 @@ if test "$PHP_INTL" != "no"; then
-   PHP_REQUIRE_CXX()
- 
-   AC_MSG_CHECKING([if intl requires -std=gnu++17])
--  AS_IF([test "$PKG_CONFIG icu-uc --atleast-version=74"],[
-+  AS_IF([$PKG_CONFIG icu-uc --atleast-version=74],[
-     AC_MSG_RESULT([yes])
-     PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX)
-   ],[
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/622c082e36f7d0654b0b5afd3bd2f1b391c4e748