From 8c417f16dc08303619cc733c18e5275549223f83 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Sep 2025 09:44:57 +0200 Subject: update to 8.5.0RC1 bump ABI/API numbers to 20240925 drop opcache subpackage, extension is build statically add lexbor and uri extension (always static) move /usr/share/fpm/status.html to /usr/share/php/fpm/status.html --- php85.spec | 251 +++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 138 insertions(+), 113 deletions(-) (limited to 'php85.spec') diff --git a/php85.spec b/php85.spec index 9d86885..fe61977 100644 --- a/php85.spec +++ b/php85.spec @@ -8,8 +8,8 @@ # Please preserve changelog entries # # API/ABI check -%global apiver 20240924 -%global zendver 20240924 +%global apiver 20250925 +%global zendver 20250925 %global pdover 20240423 # Extension version %global fileinfover 1.0.5 @@ -19,7 +19,7 @@ %global _hardened_build 1 # version used for php embedded library soname -%global embed_version 8.4 +%global embed_version 8.5 %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock) @@ -64,6 +64,13 @@ %else %bcond_with openssl32 %endif +%if 0%{?fedora} >= 44 +# liburiparser version 0.9.9 required +%bcond_without liburiparser +%else +# use bundled library instead +%bcond_with liburiparser +%endif # /usr/sbin/apsx with httpd < 2.4 and defined as /usr/bin/apxs with httpd >= 2.4 %{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}} @@ -80,8 +87,8 @@ %bcond_without libgd %bcond_with zip -%global upver 8.4.13 -#global rcver RC1 +%global upver 8.5.0 +%global rcver RC1 # TODO set PHP_EXTRA_VERSION for EOL version Summary: PHP scripting language for creating dynamic web sites @@ -121,19 +128,19 @@ Source53: 20-ffi.ini # Build fixes Patch1: php-8.4.0-httpd.patch Patch5: php-8.4.0-includedir.patch -Patch6: php-8.4.6-embed.patch +Patch6: php-8.5.0-embed.patch Patch8: php-8.4.0-libdb.patch # Functional changes # Use system nikic/php-parser -Patch41: php-8.3.3-parser.patch +Patch41: php-8.5.0-parser.patch # use system tzdata -Patch42: php-8.4.0-systzdata-v24.patch +Patch42: php-8.5.0-systzdata-v24.patch # See http://bugs.php.net/53436 # + display PHP version backported from 8.4 Patch43: php-8.4.0-phpize.patch # Use -lldap_r for OpenLDAP -Patch45: php-8.4.0-ldap_r.patch +Patch45: php-8.5.0-ldap_r.patch # Ignore unsupported "threads" option on password_hash Patch46: php-8.0.7-argon2.patch # drop "Configure command" from phpinfo output @@ -141,7 +148,7 @@ Patch46: php-8.0.7-argon2.patch Patch47: php-8.4.0-phpinfo.patch # Always warn about missing curve_name # Both Fedora and RHEL do not support arbitrary EC parameters -Patch48: php-8.3.0-openssl-ec-param.patch +Patch48: php-8.5.0-openssl-ec-param.patch # RC Patch @@ -180,6 +187,7 @@ BuildRequires: pkgconfig(libpcre2-8) >= 10.30 %else Provides: bundled(pcre2) = 10.40 %endif +BuildRequires: pkgconfig(capstone) >= 3.0 %if %{with libxcrypt} BuildRequires: pkgconfig(libxcrypt) %endif @@ -198,6 +206,11 @@ BuildRequires: %{?dtsprefix}systemtap-sdt-devel BuildRequires: %{?dtsprefix}systemtap-sdt-dtrace %endif %endif +%if %{with liburiparser} +BuildRequires: pkgconfig(liburiparser) >= 0.9.9 +%else +Provides: bundled(liburiparser) = 0.9.9 +%endif #BuildRequires: bison #BuildRequires: re2c >= 1.0.3 # used for tests @@ -225,15 +238,15 @@ Recommends: php-cli%{?_isa} = %{version}-%{release} Recommends: php-fpm%{?_isa} = %{version}-%{release} # as "php" is now mostly a meta-package, commonly used extensions Recommends: php-mbstring%{?_isa} = %{version}-%{release} -Recommends: php-opcache%{?_isa} = %{version}-%{release} Recommends: php-pdo%{?_isa} = %{version}-%{release} Recommends: php-sodium%{?_isa} = %{version}-%{release} Recommends: php-xml%{?_isa} = %{version}-%{release} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4 < %{version}-%{release} -Provides: php8.4 = %{version}-%{release} -Provides: php8.4%{?_isa} = %{version}-%{release} +Obsoletes: php8.5 < %{version}-%{release} +Provides: php8.5 = %{version}-%{release} +Provides: php8.5%{?_isa} = %{version}-%{release} %endif @@ -258,8 +271,9 @@ Provides: php-pcntl, php-pcntl%{?_isa} Provides: php-readline, php-readline%{?_isa} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-cli < %{version}-%{release} -Provides: php8.4-cli = %{version}-%{release} -Provides: php8.4-cli%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-cli < %{version}-%{release} +Provides: php8.5-cli = %{version}-%{release} +Provides: php8.5-cli%{?_isa} = %{version}-%{release} %endif %description cli @@ -272,8 +286,9 @@ Summary: The interactive PHP debugger Requires: php-common%{?_isa} = %{version}-%{release} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-dbg < %{version}-%{release} -Provides: php8.4-dbg = %{version}-%{release} -Provides: php8.4-dbg%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-dbg < %{version}-%{release} +Provides: php8.5-dbg = %{version}-%{release} +Provides: php8.5-dbg%{?_isa} = %{version}-%{release} %endif %description dbg @@ -303,8 +318,9 @@ Provides: php(httpd) Recommends: nginx-filesystem %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-fpm < %{version}-%{release} -Provides: php8.4-fpm = %{version}-%{release} -Provides: php8.4-fpm%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-fpm < %{version}-%{release} +Provides: php8.5-fpm = %{version}-%{release} +Provides: php8.5-fpm%{?_isa} = %{version}-%{release} %endif %description fpm @@ -318,8 +334,9 @@ Summary: LiteSpeed Web Server PHP support Requires: php-common%{?_isa} = %{version}-%{release} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-litespeed < %{version}-%{release} -Provides: php8.4-litespeed = %{version}-%{release} -Provides: php8.4-litespeed%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-litespeed < %{version}-%{release} +Provides: php8.5-litespeed = %{version}-%{release} +Provides: php8.5-litespeed%{?_isa} = %{version}-%{release} %endif %description litespeed @@ -361,6 +378,7 @@ Provides: php-filter, php-filter%{?_isa} Provides: php-ftp, php-ftp%{?_isa} Provides: php-gettext, php-gettext%{?_isa} Provides: php-hash, php-hash%{?_isa} +Provides: php-lexbor, php-lexbor%{?_isa} Provides: php-mhash = %{version}, php-mhash%{?_isa} = %{version} Provides: php-iconv, php-iconv%{?_isa} Obsoletes: php-json < 8 @@ -368,6 +386,8 @@ Obsoletes: php-pecl-json < 8 Obsoletes: php-pecl-jsonc < 8 Provides: php-json = %{upver}, php-json%{?_isa} = %{upver} Provides: php-libxml, php-libxml%{?_isa} +Obsoletes: php-opcache < 8.5.0 +Provides: php-opcache = %{upver}, php-opcache%{?_isa} = %{upver} Provides: php-openssl, php-openssl%{?_isa} Provides: php-phar, php-phar%{?_isa} Provides: php-pcre, php-pcre%{?_isa} @@ -378,6 +398,7 @@ Provides: php-sockets, php-sockets%{?_isa} Provides: php-spl, php-spl%{?_isa} Provides: php-standard = %{version}, php-standard%{?_isa} = %{version} Provides: php-tokenizer, php-tokenizer%{?_isa} +Provides: php-uri, php-uri%{?_isa} Provides: php-zlib, php-zlib%{?_isa} Obsoletes: php-pecl-phar < 1.2.4 @@ -387,8 +408,9 @@ Provides: php-pecl(Fileinfo) = %{fileinfover}, php-pecl(Fileinfo)%{?_isa} = %{f Obsoletes: php-mhash < 5.3.0 %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-common < %{version}-%{release} -Provides: php8.4-common = %{version}-%{release} -Provides: php8.4-common%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-common < %{version}-%{release} +Provides: php8.5-common = %{version}-%{release} +Provides: php8.5-common%{?_isa} = %{version}-%{release} %endif %description common @@ -419,11 +441,13 @@ Obsoletes: php-pecl-jsonc-devel < %{version} Provides: php-zts-devel = %{version}-%{release} Provides: php-zts-devel%{?_isa} = %{version}-%{release} %endif -Recommends: php-nikic-php-parser5 >= 5.0.0 +Recommends: php-nikic-php-parser5 >= 5.6.1 +Conflicts: php-nikic-php-parser5 < 5.6.1 %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-devel < %{version}-%{release} -Provides: php8.4-devel = %{version}-%{release} -Provides: php8.4-devel%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-devel < %{version}-%{release} +Provides: php8.5-devel = %{version}-%{release} +Provides: php8.5-devel%{?_isa} = %{version}-%{release} %endif %description devel @@ -431,29 +455,6 @@ The php-devel package contains the files needed for building PHP extensions. If you need to compile your own PHP extensions, you will need to install this package. -%package opcache -Summary: The Zend OPcache -License: PHP-3.01 -BuildRequires: pkgconfig(capstone) >= 3.0 -Requires: php-common%{?_isa} = %{version}-%{release} -Obsoletes: php-pecl-zendopcache < 7.0.6 -Provides: php-pecl-zendopcache = %{version} -Provides: php-pecl-zendopcache%{?_isa} = %{version} -Provides: php-pecl(opcache) = %{version} -Provides: php-pecl(opcache)%{?_isa} = %{version} -%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" -Obsoletes: php8.4-opcache < %{version}-%{release} -Provides: php8.4-opcache = %{version}-%{release} -Provides: php8.4-opcache%{?_isa} = %{version}-%{release} -%endif - -%description opcache -The Zend OPcache provides faster PHP execution through opcode caching and -optimization. It improves PHP performance by storing precompiled script -bytecode in the shared memory. This eliminates the stages of reading code from -the disk and compiling it on future access. In addition, it applies a few -bytecode optimization patterns that make code execution faster. - %package ldap Summary: A module for PHP applications that use LDAP # All files licensed under PHP version 3.01 @@ -464,8 +465,9 @@ BuildRequires: openldap-devel BuildRequires: openssl-devel >= 1.0.2 %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-ldap < %{version}-%{release} -Provides: php8.4-ldap = %{version}-%{release} -Provides: php8.4-ldap%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-ldap < %{version}-%{release} +Provides: php8.5-ldap = %{version}-%{release} +Provides: php8.5-ldap%{?_isa} = %{version}-%{release} %endif %description ldap @@ -486,8 +488,9 @@ Provides: php-sqlite3, php-sqlite3%{?_isa} Provides: php-pdo_sqlite, php-pdo_sqlite%{?_isa} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-pdo < %{version}-%{release} -Provides: php8.4-pdo = %{version}-%{release} -Provides: php8.4-pdo%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-pdo < %{version}-%{release} +Provides: php8.5-pdo = %{version}-%{release} +Provides: php8.5-pdo%{?_isa} = %{version}-%{release} %endif %description pdo @@ -508,8 +511,9 @@ Provides: php-pdo_mysql, php-pdo_mysql%{?_isa} Obsoletes: php-mysql < %{version}-%{release} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-mysqlnd < %{version}-%{release} -Provides: php8.4-mysqlnd = %{version}-%{release} -Provides: php8.4-mysqlnd%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-mysqlnd < %{version}-%{release} +Provides: php8.5-mysqlnd = %{version}-%{release} +Provides: php8.5-mysqlnd%{?_isa} = %{version}-%{release} %endif %description mysqlnd @@ -533,8 +537,9 @@ BuildRequires: openssl-devel >= 1.0.2 BuildRequires: postgresql-devel %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-pgsql < %{version}-%{release} -Provides: php8.4-pgsql = %{version}-%{release} -Provides: php8.4-pgsql%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-pgsql < %{version}-%{release} +Provides: php8.5-pgsql = %{version}-%{release} +Provides: php8.5-pgsql%{?_isa} = %{version}-%{release} %endif %description pgsql @@ -557,8 +562,9 @@ Provides: php-sysvshm, php-sysvshm%{?_isa} Provides: php-sysvmsg, php-sysvmsg%{?_isa} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-process < %{version}-%{release} -Provides: php8.4-process = %{version}-%{release} -Provides: php8.4-process%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-process < %{version}-%{release} +Provides: php8.5-process = %{version}-%{release} +Provides: php8.5-process%{?_isa} = %{version}-%{release} %endif %description process @@ -581,8 +587,9 @@ BuildRequires: pkgconfig(odbc) %endif %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-odbc < %{version}-%{release} -Provides: php8.4-odbc = %{version}-%{release} -Provides: php8.4-odbc%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-odbc < %{version}-%{release} +Provides: php8.5-odbc = %{version}-%{release} +Provides: php8.5-odbc%{?_isa} = %{version}-%{release} %endif %description odbc @@ -605,8 +612,9 @@ Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: pkgconfig(libxml-2.0) %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-soap < %{version}-%{release} -Provides: php8.4-soap = %{version}-%{release} -Provides: php8.4-soap%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-soap < %{version}-%{release} +Provides: php8.5-soap = %{version}-%{release} +Provides: php8.5-soap%{?_isa} = %{version}-%{release} %endif %description soap @@ -624,8 +632,9 @@ Provides: php_database Provides: php-pdo_firebird, php-pdo_firebird%{?_isa} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-pdo-firebird < %{version}-%{release} -Provides: php8.4-pdo-firebird = %{version}-%{release} -Provides: php8.4-pdo-firebird%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-pdo-firebird < %{version}-%{release} +Provides: php8.5-pdo-firebird = %{version}-%{release} +Provides: php8.5-pdo-firebird%{?_isa} = %{version}-%{release} %endif %description pdo-firebird @@ -641,8 +650,9 @@ Requires: php-common%{?_isa} = %{version}-%{release}, net-snmp BuildRequires: net-snmp-devel %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-snmp < %{version}-%{release} -Provides: php8.4-snmp = %{version}-%{release} -Provides: php8.4-snmp%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-snmp < %{version}-%{release} +Provides: php8.5-snmp = %{version}-%{release} +Provides: php8.5-snmp%{?_isa} = %{version}-%{release} %endif %description snmp @@ -667,8 +677,9 @@ BuildRequires: pkgconfig(libexslt) BuildRequires: pkgconfig(libxml-2.0) >= 2.7.6 %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-xml < %{version}-%{release} -Provides: php8.4-xml = %{version}-%{release} -Provides: php8.4-xml%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-xml < %{version}-%{release} +Provides: php8.5-xml = %{version}-%{release} +Provides: php8.5-xml%{?_isa} = %{version}-%{release} %endif %description xml @@ -692,8 +703,9 @@ Provides: bundled(libmbfl) = 1.3.2 Requires: php-common%{?_isa} = %{version}-%{release} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-mbstring < %{version}-%{release} -Provides: php8.4-mbstring = %{version}-%{release} -Provides: php8.4-mbstring%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-mbstring < %{version}-%{release} +Provides: php8.5-mbstring = %{version}-%{release} +Provides: php8.5-mbstring%{?_isa} = %{version}-%{release} %endif %description mbstring @@ -729,8 +741,9 @@ Provides: bundled(gd) = 2.0.35 %endif %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-gd < %{version}-%{release} -Provides: php8.4-gd = %{version}-%{release} -Provides: php8.4-gd%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-gd < %{version}-%{release} +Provides: php8.5-gd = %{version}-%{release} +Provides: php8.5-gd%{?_isa} = %{version}-%{release} %endif %description gd @@ -746,8 +759,9 @@ Requires: php-common%{?_isa} = %{version}-%{release} Provides: bundled(libbcmath) %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-bcmath < %{version}-%{release} -Provides: php8.4-bcmath = %{version}-%{release} -Provides: php8.4-bcmath%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-bcmath < %{version}-%{release} +Provides: php8.5-bcmath = %{version}-%{release} +Provides: php8.5-bcmath%{?_isa} = %{version}-%{release} %endif %description bcmath @@ -762,8 +776,9 @@ BuildRequires: gmp-devel Requires: php-common%{?_isa} = %{version}-%{release} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-gmp < %{version}-%{release} -Provides: php8.4-gmp = %{version}-%{release} -Provides: php8.4-gmp%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-gmp < %{version}-%{release} +Provides: php8.5-gmp = %{version}-%{release} +Provides: php8.5-gmp%{?_isa} = %{version}-%{release} %endif %description gmp @@ -783,8 +798,9 @@ BuildRequires: qdbm-devel Requires: php-common%{?_isa} = %{version}-%{release} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-dba < %{version}-%{release} -Provides: php8.4-dba = %{version}-%{release} -Provides: php8.4-dba%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-dba < %{version}-%{release} +Provides: php8.5-dba = %{version}-%{release} +Provides: php8.5-dba%{?_isa} = %{version}-%{release} %endif %description dba @@ -799,8 +815,9 @@ Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: libtidy-devel %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-tidy < %{version}-%{release} -Provides: php8.4-tidy = %{version}-%{release} -Provides: php8.4-tidy%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-tidy < %{version}-%{release} +Provides: php8.5-tidy = %{version}-%{release} +Provides: php8.5-tidy%{?_isa} = %{version}-%{release} %endif %description tidy @@ -817,8 +834,9 @@ Provides: php-pdo_dblib, php-pdo_dblib%{?_isa} Obsoletes: php-mssql < %{version}-%{release} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-pdo-dblib < %{version}-%{release} -Provides: php8.4-pdo-dblib = %{version}-%{release} -Provides: php8.4-pdo-dblib%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-pdo-dblib < %{version}-%{release} +Provides: php8.5-pdo-dblib = %{version}-%{release} +Provides: php8.5-pdo-dblib%{?_isa} = %{version}-%{release} %endif %description pdo-dblib @@ -834,8 +852,9 @@ Provides: php-embedded-devel = %{version}-%{release} Provides: php-embedded-devel%{?_isa} = %{version}-%{release} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-embedded < %{version}-%{release} -Provides: php8.4-embedded = %{version}-%{release} -Provides: php8.4-embedded%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-embedded < %{version}-%{release} +Provides: php8.5-embedded = %{version}-%{release} +Provides: php8.5-embedded%{?_isa} = %{version}-%{release} %endif %description embedded @@ -852,8 +871,9 @@ BuildRequires: pkgconfig(icu-io) >= 74 BuildRequires: pkgconfig(icu-uc) >= 74 %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-intl < %{version}-%{release} -Provides: php8.4-intl = %{version}-%{release} -Provides: php8.4-intl%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-intl < %{version}-%{release} +Provides: php8.5-intl = %{version}-%{release} +Provides: php8.5-intl%{?_isa} = %{version}-%{release} %endif %description intl @@ -868,8 +888,9 @@ Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: pkgconfig(enchant-2) %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-enchant < %{version}-%{release} -Provides: php8.4-enchant = %{version}-%{release} -Provides: php8.4-enchant%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-enchant < %{version}-%{release} +Provides: php8.5-enchant = %{version}-%{release} +Provides: php8.5-enchant%{?_isa} = %{version}-%{release} %endif %description enchant @@ -907,8 +928,9 @@ Provides: php-pecl(libsodium) = %{version} Provides: php-pecl(libsodium)%{?_isa} = %{version} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-sodium < %{version}-%{release} -Provides: php8.4-sodium = %{version}-%{release} -Provides: php8.4-sodium%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-sodium < %{version}-%{release} +Provides: php8.5-sodium = %{version}-%{release} +Provides: php8.5-sodium%{?_isa} = %{version}-%{release} %endif %description sodium @@ -925,8 +947,9 @@ BuildRequires: pkgconfig(libffi) Requires: php-common%{?_isa} = %{version}-%{release} %if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" Obsoletes: php8.4-ffi < %{version}-%{release} -Provides: php8.4-ffi = %{version}-%{release} -Provides: php8.4-ffi%{?_isa} = %{version}-%{release} +Obsoletes: php8.5-ffi < %{version}-%{release} +Provides: php8.5-ffi = %{version}-%{release} +Provides: php8.5-ffi%{?_isa} = %{version}-%{release} %endif %description ffi @@ -1038,16 +1061,13 @@ rm ext/date/tests/bug73837.phpt rm ext/standard/tests/file/file_get_contents_error001.phpt # fails sometime rm ext/sockets/tests/mcast_ipv?_recv.phpt -# cause stack exhausion -rm Zend/tests/bug54268.phpt -rm Zend/tests/bug68412.phpt # slow and erratic result rm sapi/cli/tests/upload_2G.phpt -# tar issue -rm ext/zlib/tests/004-mb.phpt # Both Fedora and RHEL do not support arbitrary EC parameters # https://bugzilla.redhat.com/2223953 rm ext/openssl/tests/ecc_custom_params.phpt +# Failing when build with PHP installed +rm ext/opcache/tests/zzz_basic_logging.phpt # avoid issue when 2 builds run simultaneously (keep 64321 for the SCL) %ifarch x86_64 @@ -1194,6 +1214,7 @@ ln -sf ../configure --without-pear \ --with-exec-dir=%{_bindir} \ --without-gdbm \ + --enable-opcache-file \ --with-openssl \ %if %{with openssl32} --with-openssl-argon2 \ @@ -1204,6 +1225,9 @@ ln -sf ../configure %endif %if %{with libxcrypt} --with-external-libcrypt \ +%endif +%if %{with liburiparser} + --with-external-uriparser \ %endif --with-zlib \ --with-layout=GNU \ @@ -1234,8 +1258,6 @@ make %{?_smp_mflags} pushd build-cgi build --enable-pcntl \ - --enable-opcache \ - --enable-opcache-file \ --with-capstone \ --enable-phpdbg --enable-phpdbg-readline \ --enable-mbstring=shared \ @@ -1315,7 +1337,6 @@ without_shared="--disable-gd \ --disable-dom --disable-dba --without-unixODBC \ --without-mysqli \ --disable-pdo \ - --disable-opcache \ --disable-phpdbg \ --without-ffi \ --disable-xmlreader --disable-xmlwriter \ @@ -1358,9 +1379,6 @@ build --includedir=%{_includedir}/php-zts \ --program-prefix=zts- \ --disable-cgi \ --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \ - --enable-pcntl \ - --enable-opcache \ - --enable-opcache-file \ --with-capstone \ --enable-mbstring=shared \ --enable-mbregex \ @@ -1587,8 +1605,7 @@ for mod in pgsql odbc ldap snmp \ do case $mod in opcache) - # Zend extensions - TESTCMD="$TESTCMD --define zend_extension=$mod" + # static extension ini=10-${mod}.ini;; pdo_*|mysqli|xmlreader) # Extensions with dependencies on 20-* @@ -1658,6 +1675,7 @@ cat files.curl files.phar files.fileinfo \ files.tokenizer > files.common # The default Zend OPcache blacklist file +rm files.opcache install -m 644 %{SOURCE51} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/opcache-default.blacklist %if %{with zts} install -m 644 %{SOURCE51} $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/opcache-default.blacklist @@ -1724,6 +1742,11 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %license timelib_LICENSE %doc php.ini-* %config(noreplace) %{_sysconfdir}/php.ini +%config(noreplace) %{_sysconfdir}/php.d/10-opcache.ini +%config(noreplace) %{_sysconfdir}/php.d/opcache-default.blacklist +%if %{with zts} +%config(noreplace) %{_sysconfdir}/php-zts.d/opcache-default.blacklist +%endif %dir %{_sysconfdir}/php.d %dir %{_libdir}/php %dir %{_libdir}/php/modules @@ -1788,8 +1811,8 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : # log owned by apache for log %attr(770,apache,root) %dir %{_localstatedir}/log/php-fpm %{_mandir}/man8/php-fpm.8* -%dir %{_datadir}/fpm -%{_datadir}/fpm/status.html +%dir %{_datadir}/php/fpm +%{_datadir}/php/fpm/status.html %if %{with lsws} %files litespeed @@ -1837,11 +1860,6 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %endif %files enchant -f files.enchant %files mysqlnd -f files.mysqlnd -%files opcache -f files.opcache -%config(noreplace) %{_sysconfdir}/php.d/opcache-default.blacklist -%if %{with zts} -%config(noreplace) %{_sysconfdir}/php-zts.d/opcache-default.blacklist -%endif %if %{with zip} %files zip -f files.zip %endif @@ -1851,6 +1869,13 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %changelog +* Wed Sep 24 2025 Remi Collet - 8.5.0~RC1-1 +- update to 8.5.0RC1 +- bump ABI/API numbers to 20240925 +- drop opcache subpackage, extension is build statically +- add lexbor and uri extension (always static) +- move /usr/share/fpm/status.html to /usr/share/php/fpm/status.html + * Wed Sep 24 2025 Remi Collet - 8.4.13-1 - Update to 8.4.13 - http://www.php.net/releases/8_4_13.php -- cgit