Update to 8.6.0alpha1

license is now BSD-3-Clause
bump ABI/API to 20240926
build php-zip
use bundled liburiparser because of https://github.com/php/php-src/issues/22553

1 files changed, 76 insertions, 66 deletions

diff --git a/php.spec b/php.spec
index f415031..f96450d 100644
--- a/php.spec
+++ b/php.spec
@@ -23,15 +23,15 @@
 %endif
 
 # API/ABI check
-%global apiver      20250925
-%global zendver     20250925
+%global apiver      20250926
+%global zendver     20250926
 %global pdover      20240423
 
 # Adds -z now to the linker flags
 %global _hardened_build 1
 
 # version used for php embedded library soname
-%global embed_version 8.5
+%global embed_version 8.6
 
 # Ugly hack. Harcoded values to avoid relocation.
 %global _httpd_mmn         %(cat %{_root_includedir}/httpd/.mmn 2>/dev/null || echo 0)
@@ -59,7 +59,7 @@
 %global mysql_config %{_root_libdir}/mysql/mysql_config
 
 # Optional extensions; to enable: pass "--with xxx" etc to rpmbuild/mock.
-%bcond_with           zip
+%bcond_without        zip
 # Optional extensions; to disable: pass "--without xxx" etc to rpmbuild/mock.
 %if 0%{?rhel} >= 11
 %bcond_with           firebird
@@ -90,11 +90,12 @@
 
 %global liburiparser_minver 1.0.0
 %global liburiparser_bunver 1.0.2
-%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11
+%if 0%{?fedora} >= 99 || 0%{?rhel} >= 99
 # use system liburiparser when available
 %bcond_without       liburiparser
 %else
 # use bundled library instead
+# See https://github.com/php/php-src/issues/22553
 %bcond_with          liburiparser
 %endif
 
@@ -103,23 +104,23 @@
 #global gh_date      20250630
 %global gh_owner     php
 %global gh_project   php-src
-%global upver        8.5.8
-#global rcver        RC1
+%global upver        8.6.0
+%global rcver        alpha1
+%global rclow        alpha1
 # TODO set PHP_EXTRA_VERSION for EOL version
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
-Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
+Version: %{upver}%{?rcver:~%{rclow}}%{?gh_date:.%{gh_date}}
 Release: 1%{?dist}
-# All files licensed under PHP version 3.01, except
-# Zend is licensed under Zend
-# TSRM is licensed under BSD
+# All files licensed under BSD-3-Clause (PHP version 4), except
+# TSRM is licensed under BSD-2-Clause
 # main/snprintf.c, main/spprintf.c and main/rfc1867.c are ASL 1.0
 # ext/date/lib is MIT
 # Zend/zend_sort is NCSA
 # Zend/asm is Boost
 # lexbor is Apache-2.0
-License: PHP-3.01 AND Zend-2.0 AND BSD-2-Clause AND MIT AND Apache-1.0 AND Apache-2.0 AND NCSA AND BSL-1.0
+License: BSD-3-Clause AND BSD-2-Clause AND MIT AND Apache-1.0 AND Apache-2.0 AND NCSA AND BSL-1.0
 URL: http://www.php.net/
 
 %if 0%{?gh_date}
@@ -154,7 +155,7 @@ Patch8: php-8.4.0-libdb.patch
 # Use system nikic/php-parser
 Patch41: php-8.5.0-parser.patch
 # use system tzdata
-Patch43: php-8.5.0-systzdata-v24.patch
+Patch43: php-8.6.0-systzdata-v24.patch
 # See http://bugs.php.net/53436
 # + display PHP version backported from 8.4
 Patch44: php-8.4.0-phpize.patch
@@ -276,7 +277,7 @@ which adds support for the PHP language to system Apache HTTP Server.
 %package cli
 Summary: Command-line interface for PHP
 # sapi/cli/ps_title.c is PostgreSQL
-License:  PHP-3.01 AND Zend-2.0 AND BSD-2-Clause AND MIT AND Apache-1.0 AND Apache-2.0 AND NCSA AND BSL-1.0 AND PostgreSQL
+License:  BSD-3-Clause AND BSD-2-Clause AND MIT AND Apache-1.0 AND Apache-2.0 AND NCSA AND BSL-1.0 AND PostgreSQL
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php-cgi = %{version}-%{release}, %{?scl_prefix}php-cgi%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php-pcntl, %{?scl_prefix}php-pcntl%{?_isa}
@@ -342,10 +343,10 @@ into applications to provide PHP scripting language support.
 
 %package common
 Summary: Common files for PHP
-# All files licensed under PHP version 3.01, except
+# All files licensed under BSD-3-Clause, except
 # fileinfo is licensed under PHP version 3.0
 # regex, libmagic are licensed under BSD
-License: PHP-3.01 AND BSD-2-Clause
+License: BSD-3-Clause AND BSD-2-Clause
 
 %if %{with tzdata}
 Requires:  tzdata
@@ -432,8 +433,8 @@ need to install this package.
 
 %package ldap
 Summary: A module for PHP applications that use LDAP
-# All files licensed under PHP version 3.01
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: pkgconfig(libsasl2)
 BuildRequires: openldap-devel
@@ -447,8 +448,8 @@ language.
 
 %package pdo
 Summary: A database access abstraction module for PHP applications
-# All files licensed under PHP version 3.01
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 # ABI/API check - Arch specific
 Provides: %{?scl_prefix}php-pdo-abi = %{pdover}-%{__isa_bits}
@@ -466,8 +467,8 @@ databases.
 
 %package mysqlnd
 Summary: A module for PHP applications that use MySQL databases
-# All files licensed under PHP version 3.01
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php_database
 Provides: %{?scl_prefix}php-mysqli = %{version}-%{release}
@@ -485,8 +486,8 @@ This package use the MySQL Native Driver
 
 %package pgsql
 Summary: A PostgreSQL database module for PHP
-# All files licensed under PHP version 3.01
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php_database
 Provides: %{?scl_prefix}php-pdo_pgsql, %{?scl_prefix}php-pdo_pgsql%{?_isa}
@@ -504,8 +505,8 @@ php package.
 
 %package process
 Summary: Modules for PHP script using system process interfaces
-# All files licensed under PHP version 3.01
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php-posix, %{?scl_prefix}php-posix%{?_isa}
 Provides: %{?scl_prefix}php-shmop, %{?scl_prefix}php-shmop%{?_isa}
@@ -520,9 +521,8 @@ communication.
 
 %package odbc
 Summary: A module for PHP applications that use ODBC databases
-# All files licensed under PHP version 3.01, except
-# pdo_odbc is licensed under PHP version 3.0
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php_database
 Provides: %{?scl_prefix}php-pdo_odbc, %{?scl_prefix}php-pdo_odbc%{?_isa}
@@ -546,8 +546,8 @@ Package build using libiodbc (instead of unixODBC).
 
 %package soap
 Summary: A module for PHP applications that use the SOAP protocol
-# All files licensed under PHP version 3.01
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: pkgconfig(libxml-2.0)
 
@@ -558,8 +558,8 @@ support to PHP for using the SOAP web services protocol.
 %if %{with firebird}
 %package pdo-firebird
 Summary: PDO driver for Interbase/Firebird databases
-# All files licensed under PHP version 3.01
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 BuildRequires:  firebird-devel
 Requires: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php_database
@@ -582,8 +582,8 @@ License.
 
 %package snmp
 Summary: A module for PHP applications that query SNMP-managed devices
-# All files licensed under PHP version 3.01
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}, net-snmp
 BuildRequires: net-snmp-devel
 
@@ -595,8 +595,8 @@ will need to install this package and the php package.
 
 %package xml
 Summary: A module for PHP applications which use XML
-# All files licensed under PHP version 3.01
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php-dom, %{?scl_prefix}php-dom%{?_isa}
 Provides: %{?scl_prefix}php-domxml, %{?scl_prefix}php-domxml%{?_isa}
@@ -615,11 +615,11 @@ and performing XSL transformations on XML documents.
 
 %package mbstring
 Summary: A module for PHP applications which need multi-byte string handling
-# All files licensed under PHP version 3.01, except
+# All files licensed under BSD-3-Clause, except
 # libmbfl is licensed under LGPLv2
 # onigurama is licensed under BSD
 # ucgendat is licensed under OpenLDAP
-License: PHP-3.01 AND LGPL-2.1-only AND OLDAP-2.8
+License: BSD-3-Clause AND LGPL-2.1-only AND OLDAP-2.8
 %if 0%{?rhel}
 BuildRequires: oniguruma5php-devel
 %else
@@ -634,12 +634,12 @@ support for multi-byte string handling to PHP.
 
 %package gd
 Summary: A module for PHP applications for using the gd graphics library
-# All files licensed under PHP version 3.01
+# All files licensed under BSD-3-Clause
 %if %{with libgd}
-License: PHP-3.01
+License: BSD-3-Clause
 %else
 # bundled libgd is licensed under MIT
-License: PHP-3.01 and MIT
+License: BSD-3-Clause and MIT
 %endif
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 %if %{with libgd}
@@ -666,9 +666,9 @@ support for using the gd graphics library to PHP.
 
 %package bcmath
 Summary: A module for PHP applications for using the bcmath library
-# All files licensed under PHP version 3.01, except
+# All files licensed under BSD-3-Clause, except
 # libbcmath is licensed under LGPLv2+
-License:  PHP-3.01 AND LGPL-2.1-or-later
+License:  BSD-3-Clause AND LGPL-2.1-or-later
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 Provides: bundled(libbcmath)
 
@@ -678,8 +678,8 @@ support for using the bcmath library to PHP.
 
 %package gmp
 Summary: A module for PHP applications for using the GNU MP library
-# All files licensed under PHP version 3.01
-License: PHP-3.01
+# All files licensed under BSD-3-Clause
+License: BSD-3-Clause
 BuildRequires: gmp-devel
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 
@@ -689,8 +689,9 @@ using the GNU MP library.
 
 %package dba
 Summary: A database abstraction layer module for PHP applications
-# All files licensed under PHP version 3.01
-License: PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
+Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: libdb-devel
 BuildRequires: tokyocabinet-devel
 BuildRequires: lmdb-devel
@@ -707,8 +708,8 @@ support for using the DBA database abstraction layer to PHP.
 %if %{with tidy}
 %package tidy
 Summary: Standard PHP module provides tidy library support
-# All files licensed under PHP version 3.01
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: libtidy-devel
 
@@ -720,8 +721,8 @@ support for using the tidy library to PHP.
 %if %{with freetds}
 %package pdo-dblib
 Summary: PDO driver for Microsoft SQL Server and Sybase databases
-# All files licensed under PHP version 3.01
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 BuildRequires: freetds-devel
 Provides: %{?scl_prefix}php-pdo_dblib, %{?scl_prefix}php-pdo_dblib%{?_isa}
@@ -734,8 +735,8 @@ PHP to Microsoft SQL Server and Sybase databases through the FreeTDS library.
 
 %package intl
 Summary: Internationalization extension for PHP applications
-# All files licensed under PHP version 3.01
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: pkgconfig(icu-i18n) >= 74
 BuildRequires: pkgconfig(icu-io)   >= 74
@@ -748,8 +749,8 @@ support for using the ICU library to PHP.
 %if %{with enchant}
 %package enchant
 Summary: Enchant spelling extension for PHP applications
-# All files licensed under PHP version 3.0
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: pkgconfig(enchant-2)
 
@@ -761,10 +762,13 @@ support for using the enchant library to PHP.
 %if %{with zip}
 %package zip
 Summary: ZIP archive management extension for PHP
-# All files licensed under PHP version 3.0.1
-License:  PHP-3.01
-Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 BuildRequires: pkgconfig(libzip) >= 0.11
+Requires:  %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
+Obsoletes: %{?scl_prefix}php-pecl-zip         < 1.23
+Provides:  %{?scl_prefix}php-pecl-zip         = %{version}
+Provides:  %{?scl_prefix}php-pecl-zip%{?_isa} = %{version}
 
 %description zip
 The %{?scl_prefix}php-zip package provides an extension that will add
@@ -774,8 +778,8 @@ support for ZIP archive management to PHP.
 
 %package sodium
 Summary: Wrapper for the Sodium cryptographic library
-# All files licensed under PHP version 3.0.1
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 # Minimal is 1.0.8, 1.0.14 is needed for argon2 password
 BuildRequires:  pkgconfig(libsodium) >= 1.0.14
 
@@ -791,8 +795,8 @@ low-level PHP extension for the libsodium cryptographic library.
 
 %package ffi
 Summary: Foreign Function Interface
-# All files licensed under PHP version 3.0.1
-License:  PHP-3.01
+# All files licensed under BSD-3-Clause
+License:  BSD-3-Clause
 BuildRequires:  pkgconfig(libffi)
 
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
@@ -884,7 +888,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 # WIP patch
 
 # Prevent %%doc confusion over LICENSE files
-cp Zend/LICENSE ZEND_LICENSE
 cp Zend/asm/LICENSE BOOST_LICENSE
 cp TSRM/LICENSE TSRM_LICENSE
 cp sapi/fpm/LICENSE fpm_LICENSE
@@ -1080,7 +1083,7 @@ ln -sf ../configure
     --with-config-file-path=%{_sysconfdir} \
     --with-config-file-scan-dir=%{_sysconfdir}/php.d \
     --disable-debug \
-    --with-pic \
+    --enable-pic \
     --disable-rpath \
     --without-pear \
     --with-exec-dir=%{_bindir} \
@@ -1556,7 +1559,7 @@ fi
 
 %files common -f files.common
 %doc EXTENSIONS NEWS UPGRADING* README.REDIST.BINS *md docs
-%license LICENSE TSRM_LICENSE ZEND_LICENSE BOOST_LICENSE
+%license LICENSE TSRM_LICENSE BOOST_LICENSE
 %license libmagic_LICENSE
 %license timelib_LICENSE
 %license lexbor_LICENSE
@@ -1681,6 +1684,13 @@ fi
 
 
 %changelog
+* Thu Jul  2 2026 Remi Collet <remi@remirepo.net> - 8.6.0~alpha1-1
+- Update to 8.6.0alpha1
+- license is now BSD-3-Clause
+- bump ABI/API to 20240926
+- build php-zip
+- use bundled liburiparser because of https://github.com/php/php-src/issues/22553
+
 * Wed Jul  1 2026 Remi Collet <remi@remirepo.net> - 8.5.8-1
 - Update to 8.5.8 - http://www.php.net/releases/8_5_8.php