--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: php8.4@packages.debian.org
Control: affects -1 + src:php8.4
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Please unblock package php8.4
Hey,
[ Reason ]
Please unblock php8.4, as we want the next Debian stable
to be as closest to upstream release as possible.
(Explain what the reason for the unblock request is.)
[ Impact ]
PHP packaging follows the upstream releases for security updates,
so lagging behind actually makes the next security update more
"loaded". Also there's the reputation problem. PHP is a prominent
package, and we want the Debian stable to be released with latest
PHP 8.4 if possible (the next update will be in a month).
[ Tests ]
There's a whole upstream test suite that is run during the build.
[ Risks ]
There's always a risk with PHP, but we are taking that leap of
faith already by using upstream patch releases to fix the security
issues instead of cherry-picking individual patches.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
It's actually not a debdiff, but git diff on debian/ directory.
unblock php8.4/8.4.8-1
-----BEGIN PGP SIGNATURE-----
iQKTBAEBCgB9FiEEw2Gx4wKVQ+vGJel9g3Kkd++uWcIFAmhG6/JfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEMz
NjFCMUUzMDI5NTQzRUJDNjI1RTk3RDgzNzJBNDc3RUZBRTU5QzIACgkQg3Kkd++u
WcKrUhAAlZ65IhaAG0Vo4negiTBZvrUsEtOFJfkzrmA+sKqm+e87FWNnhYfN3yA8
OF2aytH6ZgpuZPWpCOCui3+Y/EZSDvR4S2NBy37sColap6v0W4hMhJarzkuyh/3M
Zj64QwhFv6UT+k6kWqzGf7iWM7LR+G/tprV92W8V+T8LVkNdSlopMYBpASmd1ueV
KQkHz2us9FgrADwr81ySW1D3VR6Y9MB9ZkAIpoCtLgxZIFaCgqH42PXj14WwVmlG
AO/3hVTthwoQANN9Z2tZrjuHbHAKJgXu+yMO8xoXnEAbuv58zVtBmSCXclkwkVg0
4X4+qpuU9mcobf+83Hx027cSIV05BqAYDmWV2XmFR8nfgpFoPTXB3rL+tS+8uyIt
paGf0iu06ZzvNR8mN3filLNo0fCqJQZ1pvTR8g6Z96Di6S+nCz75Zrut6advf+nQ
K0eoaqI2COLHdPzXMMK0QkeyHgxqJ2Si74ExvZJew76ngkbjtV3/yVaXmQgYI/uX
1keV+wLHOk6/H+K1Hc4KF4bdeg4zCHiHNeolQsqeiaZToJzFw2U44/Odfb5ZKLUP
I1rN20Ot1T4icMJmMDnC0ocG36mPqs+z6noJNAiv5ULBBpRxMnR/eTfo2MqibiK9
8zKbz4mfTKM5JF0qE/wSj3Z2PiBSuasSdvXMYNRSzlD7El9P86k=
=GiEo
-----END PGP SIGNATURE-----
diff --git a/debian/changelog b/debian/changelog
index a57c5341a..780f16bc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+php8.4 (8.4.8-1) unstable; urgency=medium
+
+ * Move setting ICU_CXXFLAGS to the right place in d/rules
+ * Use ICU >= 75 version to determine the need for C++11 or C++17
+ * New upstream version 8.4.8
+
+ -- Ondřej Surý <ondrej@debian.org> Sat, 07 Jun 2025 16:22:04 +0200
+
+php8.4 (8.4.7-1) unstable; urgency=medium
+
+ * New upstream version 8.4.7
+
+ -- Ondřej Surý <ondrej@debian.org> Fri, 09 May 2025 08:06:27 +0200
+
php8.4 (8.4.6-2) unstable; urgency=medium
* Remove libxmltok1-dev from Build-Depends (Closes: #871826)
diff --git a/debian/patches/0001-libtool_fixes.patch b/debian/patches/0001-libtool_fixes.patch
index 21e2844b2..71252536c 100644
--- a/debian/patches/0001-libtool_fixes.patch
+++ b/debian/patches/0001-libtool_fixes.patch
@@ -7,7 +7,7 @@ Subject: libtool_fixes
1 file changed, 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 8e04a17..8562295 100644
+index 282759b..f7e85e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1573,8 +1573,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [
diff --git a/debian/patches/0002-debian_quirks.patch b/debian/patches/0002-debian_quirks.patch
index 374f9c102..fec808b55 100644
--- a/debian/patches/0002-debian_quirks.patch
+++ b/debian/patches/0002-debian_quirks.patch
@@ -13,7 +13,7 @@ Subject: debian_quirks
7 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 8562295..d53d931 100644
+index f7e85e4..f61b672 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1130,7 +1130,7 @@ AS_VAR_IF([PHP_CLI], [no], [with_pear=no])
diff --git a/debian/patches/0004-extension_api.patch b/debian/patches/0004-extension_api.patch
index 5f8fae42c..cd8aac530 100644
--- a/debian/patches/0004-extension_api.patch
+++ b/debian/patches/0004-extension_api.patch
@@ -8,7 +8,7 @@ Subject: extension_api
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index d53d931..b16de87 100644
+index f61b672..21fdc73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1327,12 +1327,14 @@ ZEND_MODULE_API_NO=$($EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modu
diff --git a/debian/patches/0016-php-5.3.3-macropen.patch b/debian/patches/0016-php-5.3.3-macropen.patch
index b1e49721f..0f5c46b07 100644
--- a/debian/patches/0016-php-5.3.3-macropen.patch
+++ b/debian/patches/0016-php-5.3.3-macropen.patch
@@ -9,10 +9,10 @@ Subject: php-5.3.3-macropen
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
-index 2205b13..62f8dd1 100644
+index 7982e42..c4b988c 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
-@@ -923,7 +923,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
+@@ -917,7 +917,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
}
}
diff --git a/debian/patches/0020-Use-system-timezone.patch b/debian/patches/0020-Use-system-timezone.patch
index 344a638f4..e81279921 100644
--- a/debian/patches/0020-Use-system-timezone.patch
+++ b/debian/patches/0020-Use-system-timezone.patch
@@ -14,7 +14,7 @@ To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezon
1 file changed, 17 insertions(+)
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
-index 4093f7a..36ae454 100644
+index 834db1e..a29f42c 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -566,6 +566,23 @@ static const char* guess_timezone(const timelib_tzdb *tzdb)
diff --git a/debian/patches/0023-php-5.4.9-fixheader.patch b/debian/patches/0023-php-5.4.9-fixheader.patch
index 9109af019..4e9c76532 100644
--- a/debian/patches/0023-php-5.4.9-fixheader.patch
+++ b/debian/patches/0023-php-5.4.9-fixheader.patch
@@ -8,7 +8,7 @@ Make generated php_config.h constant across rebuilds.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index b16de87..fce07af 100644
+index 21fdc73..b40a531 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1398,8 +1398,8 @@ EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
diff --git a/debian/patches/0028-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch b/debian/patches/0028-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch
index 96de6497f..fc1fa6fe9 100644
--- a/debian/patches/0028-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch
+++ b/debian/patches/0028-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch
@@ -7,7 +7,7 @@ Subject: Really expand $libdir/$datadir into @EXPANDED_LIBDIR/DATADIR@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index fce07af..6a858f1 100644
+index b40a531..d49689a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1358,9 +1358,9 @@ EXPANDED_LOCALSTATEDIR=$(eval echo $localstatedir)
diff --git a/debian/patches/0037-Lower-the-OpenSSL-requirement-to-1.0.1.patch b/debian/patches/0037-Lower-the-OpenSSL-requirement-to-1.0.1.patch
index 8ac414a25..9462c6e06 100644
--- a/debian/patches/0037-Lower-the-OpenSSL-requirement-to-1.0.1.patch
+++ b/debian/patches/0037-Lower-the-OpenSSL-requirement-to-1.0.1.patch
@@ -37,7 +37,7 @@ index 70ecb0a..62a92aa 100644
PHP_ARG_WITH([system-ciphers],
[whether to use system default cipher list instead of hardcoded value],
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
-index be68216..75e03d4 100644
+index de4f20c..18d3937 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -96,7 +96,7 @@
@@ -79,7 +79,7 @@ index 134081f..f4ded12 100644
#elif OPENSSL_VERSION_NUMBER < 0x30200000L
#define PHP_OPENSSL_API_VERSION 0x30000
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
-index eb7ab93..911ccbc 100644
+index d4f162b..44e84db 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -33,8 +33,11 @@
diff --git a/debian/patches/0038-Override-result-of-AC_PROG_LN_S-to-fix-FTBFS-on-ppc6.patch b/debian/patches/0038-Override-result-of-AC_PROG_LN_S-to-fix-FTBFS-on-ppc6.patch
index c7238f64b..f8206012e 100644
--- a/debian/patches/0038-Override-result-of-AC_PROG_LN_S-to-fix-FTBFS-on-ppc6.patch
+++ b/debian/patches/0038-Override-result-of-AC_PROG_LN_S-to-fix-FTBFS-on-ppc6.patch
@@ -7,7 +7,7 @@ Subject: Override result of AC_PROG_LN_S to fix FTBFS on ppc64el
1 file changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 6a858f1..82f97d6a 100644
+index d49689a..1f6b2f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,6 +122,11 @@ AC_PROG_CPP
diff --git a/debian/patches/0046-Add-enable-rtld-deepbind-configure-flag.patch b/debian/patches/0046-Add-enable-rtld-deepbind-configure-flag.patch
index 2d0a00ffd..04adb6c45 100644
--- a/debian/patches/0046-Add-enable-rtld-deepbind-configure-flag.patch
+++ b/debian/patches/0046-Add-enable-rtld-deepbind-configure-flag.patch
@@ -21,7 +21,7 @@ index e419540..44d4daf 100644
# else
# define DL_LOAD(libname) dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL)
diff --git a/configure.ac b/configure.ac
-index 82f97d6a..ab85b07 100644
+index 1f6b2f3..e8f277f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -867,6 +867,23 @@ AS_VAR_IF([PHP_RTLD_NOW], [yes],
diff --git a/debian/rules b/debian/rules
index 82bc10cf5..992e990fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,14 @@ PHP_MAJOR_VERSION := $(shell echo $(PHP_DFSG_VERSION) | awk -F. '{print $$1}'
PHP_MINOR_VERSION := $(shell echo $(PHP_DFSG_VERSION) | awk -F. '{print $$2}')
PHP_RELEASE_VERSION := $(shell echo $(PHP_DFSG_VERSION) | awk -F. '{print $$3}')
+ICU_VERSION := $(shell dpkg -s libicu-dev | sed -ne 's/^Version: \(.*\)$$/\1/p')
+
+ifeq ($(shell dpkg --compare-versions $(ICU_VERSION) ge 75;echo $$?),0)
+export ICU_CXXFLAGS := -std=c++17
+else
+export ICU_CXXFLAGS := -std=c++11
+endif
+
# Enable ZTS build if $(DEB_SOURCE) ends with -zts
ZTS=$(shell echo $(DEB_SOURCE) | sed 's/php$(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION)//')
ifeq ($(ZTS),-zts)
--- End Message ---