diff --git a/php-8.5.0.tar.xz b/php-8.5.1.tar.xz similarity index 32% rename from php-8.5.0.tar.xz rename to php-8.5.1.tar.xz index d00e5d85d7d8a49189f049bd874122eb8198a6be..1a3fa26ede144a80efe0a065b89c95695ab19358 100644 --- a/php-8.5.0.tar.xz +++ b/php-8.5.1.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e -size 14314552 +oid sha256:3f5bf99ce81201f526d25e288eddb2cfa111d068950d1e9a869530054ff98815 +size 14326700 diff --git a/php-bug20528.patch b/php-bug20528.patch deleted file mode 100644 index f8a790a48acd583e6b672d653e0072402cf45bd3..0000000000000000000000000000000000000000 --- a/php-bug20528.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 9d71c1e0b60cd152a47528dbe514efc443fce920 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 20 Nov 2025 02:58:45 +0100 -Subject: [PATCH] Fix GH-20528: Regression breaks mysql connexion using an IPv6 - address enclosed in square brackets - ---- - ext/mysqli/tests/mysqli_connect_port.phpt | 31 +++++++++++++++++++++++ - ext/mysqlnd/mysqlnd_connection.c | 17 ++++++++++--- - 2 files changed, 45 insertions(+), 3 deletions(-) - create mode 100644 ext/mysqli/tests/mysqli_connect_port.phpt - -diff --git a/ext/mysqli/tests/mysqli_connect_port.phpt b/ext/mysqli/tests/mysqli_connect_port.phpt -new file mode 100644 -index 0000000000000..cb7fd1d8d1628 ---- /dev/null -+++ b/ext/mysqli/tests/mysqli_connect_port.phpt -@@ -0,0 +1,31 @@ -+--TEST-- -+mysqli_connect() with port in host -+--EXTENSIONS-- -+mysqli -+--SKIPIF-- -+ -+--FILE-- -+ -+Done -+--EXPECTF-- -+Done -diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c -index d8e7304e9665f..8268034e8b798 100644 ---- a/ext/mysqlnd/mysqlnd_connection.c -+++ b/ext/mysqlnd/mysqlnd_connection.c -@@ -553,13 +553,24 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_scheme)(MYSQLND_CONN_DATA * conn, MYSQLND_ - port = 3306; - } - -- /* ipv6 addresses are in the format [address]:port */ - if (hostname.s[0] != '[' && mysqlnd_fast_is_ipv6_address(hostname.s)) { -+ /* IPv6 without square brackets so without port */ - transport.l = mnd_sprintf(&transport.s, 0, "tcp://[%s]:%u", hostname.s, port); - } else { -- /* Not ipv6, but could already contain a port number, in which case we should not add an extra port. -+ char *p; -+ -+ /* IPv6 addresses are in the format [address]:port */ -+ if (hostname.s[0] == '[') { /* IPv6 */ -+ p = strchr(hostname.s, ']'); -+ if (p && p[1] != ':') { -+ p = NULL; -+ } -+ } else { /* IPv4 or name */ -+ p = strchr(hostname.s, ':'); -+ } -+ /* Could already contain a port number, in which case we should not add an extra port. - * See GH-8978. In a port doubling scenario, the first port would be used so we do the same to keep BC. */ -- if (strchr(hostname.s, ':')) { -+ if (p) { - /* TODO: Ideally we should be able to get rid of this workaround in the future. */ - transport.l = mnd_sprintf(&transport.s, 0, "tcp://%s", hostname.s); - } else { diff --git a/php.spec b/php.spec index 8f3a3e55d80d4f916eb37b899d8fe8aab7124ef9..952b8a76909e8b51aebbfbcaef93a2931882992d 100644 --- a/php.spec +++ b/php.spec @@ -61,12 +61,12 @@ %bcond_without libgd %bcond_with zip -%global upver 8.5.0 +%global upver 8.5.1 Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver} -Release: 3 +Release: 1 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -128,7 +128,6 @@ Patch47: php-8.4.0-phpinfo.patch # RC Patch # Upstream fixes (100+) -Patch100: php-bug20528.patch # Security fixes (200+) @@ -1614,6 +1613,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %{_fileattrsdir}/composer.attr %changelog +* Wed Dec 17 2025 Funda Wang - 8.5.1-1 +- update to 8.5.1 + * Sun Nov 30 2025 Funda Wang - 8.5.0-3 - add phpapi.attr for generating php(api) dependency automatically