From 740a14090dec83951484a2705d7ffc7555ebb768 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Sep 2024 15:31:00 +0200 Subject: update to 8.4.0beta5 drop oci8, pdo_oci8, pspell and imap extensions disable ZTS build --- php84.spec | 601 ++++--------------------------------------------------------- 1 file changed, 34 insertions(+), 567 deletions(-) (limited to 'php84.spec') diff --git a/php84.spec b/php84.spec index 5bb03d5..302b913 100644 --- a/php84.spec +++ b/php84.spec @@ -8,19 +8,18 @@ # Please preserve changelog entries # # API/ABI check -%global apiver 20230831 -%global zendver 20230831 -%global pdover 20170320 +%global apiver 20230901 +%global zendver 20230901 +%global pdover 20240423 # Extension version %global fileinfover 1.0.5 -%global oci8ver 3.3.0 %global zipver 1.22.3 # Adds -z now to the linker flags %global _hardened_build 1 # version used for php embedded library soname -%global embed_version 8.3 +%global embed_version 8.4 %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock) @@ -46,53 +45,23 @@ # arch detection heuristic used by bindir/mysql_config. %global mysql_config %{_libdir}/mysql/mysql_config -# Optional Oracle extensions; pass "--with oci8" etc to rpmbuild. -%bcond_with oci8 - -%bcond_without imap - -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -# switch to bundled library using --without libpcre %bcond_without libpcre -%else -# switch to system library using --with libpcre -%bcond_with libpcre -%endif -# Using qdbm from "remi" for now, see https://bugzilla.redhat.com/2017308 -%if 0%{?fedora} >= 33 || 0%{?rhel} >= 8 %bcond_without qdbm -%else -%bcond_with qdbm -%endif -%if 0%{?fedora} >= 33 || 0%{?rhel} >= 8 -# switch to bundled library using --without libxcrypt %bcond_without libxcrypt -%else -# switch to system library using --with libxcrypt -%bcond_with libxcrypt -%endif # Build firebird extensions, you can disable using --without firebird %bcond_without firebird # Build ZTS extension or only NTS using --without zts -%ifarch x86_64 -%bcond_without zts -%else %bcond_with zts -%endif # Debug build, using --with debug %bcond_with debug -# build with system tzdata (2021 required) -%if 0%{?fedora} >= 33 || 0%{?rhel} >= 7 +# build with system tzdata %bcond_without tzdata -%else -%bcond_with tzdata -%endif # /usr/sbin/a# build with libiodbc instead of unixODBC %bcond_with iodbc @@ -108,25 +77,12 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) -# httpd 2.4.10 with httpd-filesystem and sethandler support -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 -%global with_httpd2410 1 -%else -%global with_httpd2410 0 -%endif -# nginx 1.6 with nginx-filesystem -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 -%global with_nginx 1 -%else -%global with_nginx 0 -%endif - %bcond_without dtrace %bcond_without libgd %bcond_with zip -%global upver 8.3.12 -%global rcver RC1 +%global upver 8.4.0 +%global rcver beta5 # TODO set PHP_EXTRA_VERSION for EOL version Summary: PHP scripting language for creating dynamic web sites @@ -151,9 +107,7 @@ Source4: php-fpm.conf Source5: php-fpm-www.conf Source6: php-fpm.service Source7: php-fpm.logrotate -Source8: php-fpm.sysconfig Source9: php.modconf -Source11: php.conf2 Source12: php-fpm.wants Source13: nginx-fpm.conf Source14: nginx-php.conf @@ -163,40 +117,34 @@ Source21: https://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz.asc # Configuration files for some extensions Source50: 10-opcache.ini Source51: opcache-default.blacklist -Source52: 20-oci8.ini Source53: 20-ffi.ini # Build fixes -Patch1: php-7.4.0-httpd.patch -Patch5: php-7.2.0-includedir.patch -Patch6: php-8.0.0-embed.patch -Patch8: php-8.1.0-libdb.patch -# RHEL backports -Patch10: php-8.2.0-curl.patch +Patch1: php-8.4.0-httpd.patch +Patch5: php-8.4.0-includedir.patch +Patch6: php-8.4.0-embed.patch +Patch8: php-8.4.0-libdb.patch # Functional changes # Use system nikic/php-parser Patch41: php-8.3.3-parser.patch # use system tzdata -Patch42: php-8.3.11-systzdata-v24.patch +Patch42: php-8.4.0-systzdata-v24.patch # See http://bugs.php.net/53436 # + display PHP version backported from 8.4 -Patch43: php-7.4.0-phpize.patch +Patch43: php-8.4.0-phpize.patch # Use -lldap_r for OpenLDAP -Patch45: php-7.4.0-ldap_r.patch +Patch45: php-8.4.0-ldap_r.patch # Ignore unsupported "threads" option on password_hash Patch46: php-8.0.7-argon2.patch # drop "Configure command" from phpinfo output # and only use gcc (instead of full version) -Patch47: php-8.1.0-phpinfo.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 -# Fix libidobc headers path -Patch49: php-8.2.0-iodbc.patch # RC Patch -Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) @@ -213,14 +161,10 @@ BuildRequires: bzip2-devel BuildRequires: pkgconfig(libcurl) >= 7.29.0 BuildRequires: httpd-devel >= 2.0.46-1 BuildRequires: pam-devel -%if %{with_httpd2410} # to ensure we are using httpd with filesystem feature (see #1081453) BuildRequires: httpd-filesystem -%endif -%if %{with_nginx} # to ensure we are using nginx with filesystem feature (see #1142298) BuildRequires: nginx-filesystem -%endif BuildRequires: %{?dtsprefix}libstdc++-devel # no pkgconfig to avoid compat-openssl10 BuildRequires: openssl-devel >= 1.0.2 @@ -259,12 +203,6 @@ BuildRequires: /bin/ps BuildRequires: tzdata %endif -%if 0%{?rhel} == 7 -Obsoletes: php53, php53u, php54, php54w, php55u, php55w, php56u, php56w, mod_php70u, php70w, mod_php71u, mod_php71w, mod_php72u, mod_php72w -Obsoletes: mod_php73, mod_php73w -Obsoletes: mod_php74, mod_php74w -Obsoletes: mod_php80 -%endif %if %{with zts} Obsoletes: php-zts < 5.3.7 Provides: php-zts = %{version}-%{release} @@ -275,14 +213,9 @@ Requires: httpd-mmn = %{_httpd_mmn} Provides: mod_php = %{version}-%{release} Requires: php-common%{?_isa} = %{version}-%{release} # To ensure correct /var/lib/php/session ownership: -%if %{with_httpd2410} Requires(pre): httpd-filesystem -%else -Requires(pre): httpd -%endif # php engine for Apache httpd webserver Provides: php(httpd) -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 # For backwards-compatibility, require php-cli for the time being: Recommends: php-cli%{?_isa} = %{version}-%{release} # httpd have threaded MPM by default @@ -293,12 +226,6 @@ Recommends: php-opcache%{?_isa} = %{version}-%{release} Recommends: php-pdo%{?_isa} = %{version}-%{release} Recommends: php-sodium%{?_isa} = %{version}-%{release} Recommends: php-xml%{?_isa} = %{version}-%{release} -%else -# For backwards-compatibility, require php-cli for the time being: -Requires: php-cli%{?_isa} = %{version}-%{release} -# For ARGON2 password -Requires: php-sodium%{?_isa} = %{version}-%{release} -%endif %description @@ -320,13 +247,6 @@ Requires: php-common%{?_isa} = %{version}-%{release} Provides: php-cgi = %{version}-%{release}, php-cgi%{?_isa} = %{version}-%{release} Provides: php-pcntl, php-pcntl%{?_isa} Provides: php-readline, php-readline%{?_isa} -%if 0%{?rhel} == 7 -Obsoletes: php53-cli, php53u-cli, php54-cli, php54w-cli, php55u-cli, php55w-cli, php56u-cli, php56w-cli -Obsoletes: php70u-cli, php70w-cli, php71u-cli, php71w-cli, php72u-cli, php72w-cli -Obsoletes: php73-cli, php73w-cli -Obsoletes: php74-cli, php74w-cli -Obsoletes: php80-cli -%endif %description cli The php-cli package contains the command-line interface @@ -336,12 +256,7 @@ executing PHP scripts, /usr/bin/php, and the CGI interface. %package dbg Summary: The interactive PHP debugger Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} == 7 -Obsoletes: php56u-dbg, php56w-phpdbg, php70u-dbg, php70w-phpdbg, php71u-dbg, php71w-phpdbg, php72u-dbg, php72w-phpdbg -Obsoletes: php73-dbg, php73w-phpdbg -Obsoletes: php74-dbg, php74w-phpdbg -Obsoletes: php80-dbg -%endif + %description dbg The php-dbg package contains the interactive PHP debugger. @@ -357,7 +272,6 @@ Requires: php-common%{?_isa} = %{version}-%{release} # is not valid. We can use %%post because this particular %%triggerun script # should fire just after this package is installed. Requires(post): systemd-sysv -%if %{with_httpd2410} # To ensure correct /var/lib/php/session ownership: Requires(pre): httpd-filesystem # For php.conf in /etc/httpd/conf.d @@ -365,21 +279,9 @@ Requires(pre): httpd-filesystem Requires: httpd-filesystem >= 2.4.10 # php engine for Apache httpd webserver Provides: php(httpd) -%else -Requires(pre): /usr/sbin/useradd -%endif -%if %{with_nginx} # for /etc/nginx ownership # Temporarily not mandatory to allow nginx for nginx repo Recommends: nginx-filesystem -%endif -%if 0%{?rhel} == 7 -Obsoletes: php53-fpm, php53u-fpm, php54-fpm, php54w-fpm, php55u-fpm, php55w-fpm, php56u-fpm, php56w-fpm -Obsoletes: php70u-fpm, php70w-fpm, php71u-fpm, php71w-fpm, php72u-fpm, php72w-fpm -Obsoletes: php73-fpm, php73w-fpm -Obsoletes: php74-fpm, php74w-fpm -Obsoletes: php80-fpm -%endif %description fpm PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI @@ -390,13 +292,6 @@ any size, especially busier sites. %package litespeed Summary: LiteSpeed Web Server PHP support Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} == 7 -Obsoletes: php53-litespeed, php53u-litespeed, php54-litespeed, php54w-litespeed, php55u-litespeed, php55w-litespeed, php56u-litespeed, php56w-litespeed -Obsoletes: php70u-litespeed, php70w-litespeed, php71u-litespeed, php71w-litespeed, php72u-litespeed, php72w-litespeed -Obsoletes: php73-litespeed, php73w-litespeed -Obsoletes: php74-litespeed, php74w-litespeed -Obsoletes: php80-litespeed -%endif %description litespeed The php-litespeed package provides the %{_bindir}/lsphp command @@ -461,25 +356,6 @@ Obsoletes: php-pecl-Fileinfo < 1.0.5 Provides: php-pecl-Fileinfo = %{fileinfover}, php-pecl-Fileinfo%{?_isa} = %{fileinfover} Provides: php-pecl(Fileinfo) = %{fileinfover}, php-pecl(Fileinfo)%{?_isa} = %{fileinfover} Obsoletes: php-mhash < 5.3.0 -%if 0%{?rhel} == 7 -Obsoletes: php53-mhash, php53u-mhash -Obsoletes: php53-common, php53u-common, php54-common, php54w-common, php55u-common, php55w-common, php56u-common, php56w-common -Obsoletes: php70u-common, php70w-common, php71u-common, php71w-common, php72u-common, php72w-common -Obsoletes: php73-common, php73w-common -Obsoletes: php74-common, php74w-common -Obsoletes: php80-common -# Json -Obsoletes: php53-json, php53u-json, php54-json, php54w-json, php55u-json, php55w-json, php56u-json, php56w-json -Obsoletes: php55u-pecl-jsonc, php56u-pecl-jsonc -Obsoletes: php70u-json, php70w-json, php71u-json, php71w-json, php72u-json, php72w-json -Obsoletes: php73-json, php73w-json -Obsoletes: php74-json, php74w-json -# Xmlrpc -Obsoletes: php53-xmlrpc, php53u-xmlrpc, php54-xmlrpc, php54w-xmlrpc, php55u-xmlrpc, php55w-xmlrpc, php56u-xmlrpc, php56w-xmlrpc -Obsoletes: php70u-xmlrpc, php70w-xmlrpc, php71u-xmlrpc, php71w-xmlrpc, php72u-xmlrpc, php72w-xmlrpc -Obsoletes: php73-xmlrpc, php73w-xmlrpc -Obsoletes: php74-xmlrpc, php74w-xmlrpc -%endif %description common The php-common package contains files used by both the php @@ -509,17 +385,7 @@ Obsoletes: php-pecl-jsonc-devel < %{version} Provides: php-zts-devel = %{version}-%{release} Provides: php-zts-devel%{?_isa} = %{version}-%{release} %endif -%if 0%{?rhel} == 7 -Obsoletes: php53-devel, php53u-devel, php54-devel, php54w-devel, php55u-devel, php55w-devel, php56u-devel, php56w-devel -Obsoletes: php55u-pecl-jsonc-devel, php56u-pecl-jsonc-devel -Obsoletes: php70u-devel, php70w-devel, php71u-devel, php71w-devel, php72u-devel, php72w-devel -Obsoletes: php73-devel, php73w-devel -Obsoletes: php74-devel, php74w-devel -Obsoletes: php80-devel -%endif -%if 0%{?fedora} || 0%{?rhel} >= 8 Recommends: php-nikic-php-parser5 >= 5.0.0 -%endif %description devel The php-devel package contains the files needed for building PHP @@ -536,13 +402,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} == 7 -Obsoletes: php55u-opcache, php55w-opcache, php56u-opcache, php56w-opcache -Obsoletes: php70u-opcache, php70w-opcache, php71u-opcache, php71w-opcache, php72u-opcache, php72w-opcache -Obsoletes: php73-opcache, php73w-opcache -Obsoletes: php74-opcache, php74w-opcache -Obsoletes: php80-opcache -%endif %description opcache The Zend OPcache provides faster PHP execution through opcode caching and @@ -551,30 +410,6 @@ 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. -%if %{with imap} -%package imap -Summary: A module for PHP applications that use IMAP -# All files licensed under PHP version 3.01 -License: PHP-3.01 -Requires: php-common%{?_isa} = %{version}-%{release} -BuildRequires: pkgconfig(krb5) -BuildRequires: pkgconfig(krb5-gssapi) -BuildRequires: openssl-devel >= 1.0.2 -BuildRequires: libc-client-devel -%if 0%{?rhel} == 7 -Obsoletes: php53-imap, php53u-imap, php54-imap, php54w-imap, php55u-imap, php55w-imap, php56u-imap, php56w-imap -Obsoletes: php70u-imap, php70w-imap, php71u-imap, php71w-imap, php72u-imap, php72w-imap -Obsoletes: php73-imap, php73w-imap -Obsoletes: php74-imap, php74w-imap -Obsoletes: php80-imap -%endif - -%description imap -The php-imap module will add IMAP (Internet Message Access Protocol) -support to PHP. IMAP is a protocol for retrieving and uploading e-mail -messages on mail servers. PHP is an HTML-embedded scripting language. -%endif - %package ldap Summary: A module for PHP applications that use LDAP # All files licensed under PHP version 3.01 @@ -583,13 +418,6 @@ Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: pkgconfig(libsasl2) BuildRequires: openldap-devel BuildRequires: openssl-devel >= 1.0.2 -%if 0%{?rhel} == 7 -Obsoletes: php53-ldap, php53u-ldap, php54-ldap, php54w-ldap, php55u-ldap, php55w-ldap, php56u-ldap, php56w-ldap -Obsoletes: php70u-ldap, php70w-ldap, php71u-ldap, php71w-ldap, php72u-ldap, php72w-ldap -Obsoletes: php73-ldap, php73w-ldap -Obsoletes: php74-ldap, php74w-ldap -Obsoletes: php80-ldap -%endif %description ldap The php-ldap adds Lightweight Directory Access Protocol (LDAP) @@ -607,13 +435,6 @@ Provides: php-pdo-abi = %{pdover}-%{__isa_bits} Provides: php(pdo-abi) = %{pdover}-%{__isa_bits} Provides: php-sqlite3, php-sqlite3%{?_isa} Provides: php-pdo_sqlite, php-pdo_sqlite%{?_isa} -%if 0%{?rhel} == 7 -Obsoletes: php53-pdo, php53u-pdo, php54-pdo, php54w-pdo, php55u-pdo, php55w-pdo, php56u-pdo, php56w-pdo -Obsoletes: php70u-pdo, php70w-pdo, php71u-pdo, php71w-pdo, php72u-pdo, php72w-pdo -Obsoletes: php73-pdo, php73w-pdo -Obsoletes: php74-pdo, php74w-pdo -Obsoletes: php80-pdo -%endif %description pdo The php-pdo package contains a dynamic shared object that will add @@ -631,15 +452,6 @@ Provides: php-mysqli = %{version}-%{release} Provides: php-mysqli%{?_isa} = %{version}-%{release} Provides: php-pdo_mysql, php-pdo_mysql%{?_isa} Obsoletes: php-mysql < %{version}-%{release} -%if 0%{?rhel} == 7 -Obsoletes: php53-mysqlnd, php53u-mysqlnd, php54-mysqlnd, php54w-mysqlnd, php55u-mysqlnd, php55w-mysqlnd, php56u-mysqlnd, php56w-mysqlnd -Obsoletes: php70u-mysqlnd, php70w-mysqlnd, php71u-mysqlnd, php71w-mysqlnd, php72u-mysqlnd, php72w-mysqlnd -Obsoletes: php73-mysqlnd, php73w-mysqlnd -Obsoletes: php74-mysqlnd, php74w-mysqlnd -Obsoletes: php80-mysqlnd -Obsoletes: php53-mysql, php53u-mysql, php54-mysql, php54w-mysql, php55u-mysql, php55w-mysql, php56u-mysql, php56w-mysql -Obsoletes: php70u-mysql, php70w-mysql, php71u-mysql, php71w-mysql, php72u-mysql, php72w-mysql -%endif %description mysqlnd The php-mysqlnd package contains a dynamic shared object that will add @@ -660,13 +472,6 @@ Provides: php-pdo_pgsql, php-pdo_pgsql%{?_isa} BuildRequires: krb5-devel BuildRequires: openssl-devel >= 1.0.2 BuildRequires: postgresql-devel -%if 0%{?rhel} == 7 -Obsoletes: php53-pgsql, php53u-pgsql, php54-pgsql, php54w-pgsql, php55u-pgsql, php55w-pgsql, php56u-pgsql, php56w-pgsql -Obsoletes: php70u-pgsql, php70w-pgsql, php71u-pgsql, php71w-pgsql, php72u-pgsql, php72w-pgsql -Obsoletes: php73-pgsql, php73w-pgsql -Obsoletes: php74-pgsql, php74w-pgsql -Obsoletes: php80-pgsql -%endif %description pgsql The php-pgsql package add PostgreSQL database support to PHP. @@ -686,13 +491,6 @@ Provides: php-shmop, php-shmop%{?_isa} Provides: php-sysvsem, php-sysvsem%{?_isa} Provides: php-sysvshm, php-sysvshm%{?_isa} Provides: php-sysvmsg, php-sysvmsg%{?_isa} -%if 0%{?rhel} == 7 -Obsoletes: php53-process, php53u-process, php54-process, php54w-process, php55u-process, php55w-process, php56u-process, php56w-process -Obsoletes: php70u-process, php70w-process, php71u-process, php71w-process, php72u-process, php72w-process -Obsoletes: php73-process, php73w-process -Obsoletes: php74-process, php74w-process -Obsoletes: php80-process -%endif %description process The php-process package contains dynamic shared objects which add @@ -712,13 +510,6 @@ BuildRequires: pkgconfig(libiodbc) %else BuildRequires: pkgconfig(odbc) %endif -%if 0%{?rhel} == 7 -Obsoletes: php53-odbc, php53u-odbc, php54-odbc, php54w-odbc, php55u-odbc, php55w-odbc, php56u-odbc, php56w-odbc -Obsoletes: php70u-odbc, php70w-odbc, php71u-odbc, php71w-odbc, php72u-odbc, php72w-odbc -Obsoletes: php73-odbc, php73w-odbc -Obsoletes: php74-odbc, php74w-odbc -Obsoletes: php80-odbc -%endif %description odbc The php-odbc package contains a dynamic shared object that will add @@ -738,13 +529,6 @@ Summary: A module for PHP applications that use the SOAP protocol License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: pkgconfig(libxml-2.0) -%if 0%{?rhel} == 7 -Obsoletes: php53-soap, php53u-soap, php54-soap, php54w-soap, php55u-soap, php55w-soap, php56u-soap, php56w-soap -Obsoletes: php70u-soap, php70w-soap, php71u-soap, php71w-soap, php72u-soap, php72w-soap -Obsoletes: php73-soap, php73w-soap -Obsoletes: php74-soap, php74w-soap -Obsoletes: php80-soap -%endif %description soap The php-soap package contains a dynamic shared object that will add @@ -759,76 +543,18 @@ BuildRequires: firebird-devel Requires: php-pdo%{?_isa} = %{version}-%{release} Provides: php_database Provides: php-pdo_firebird, php-pdo_firebird%{?_isa} -%if 0%{?rhel} == 7 -Obsoletes: php53-interbase, php53u-interbase, php54-interbase, php54w-interbase, php55u-interbase, php55w-interbase, php56u-interbase, php56w-interbase -Obsoletes: php70u-interbase, php70w-interbase, php71u-interbase, php71w-interbase, php72u-interbase, php72w-interbase -Obsoletes: php73-interbase, php73w-interbase -Obsoletes: php74-pdo-firebird, php74w-pdo-firebird -Obsoletes: php80-pdo-firebird -%endif %description pdo-firebird The php-pdo-firebird package contains the PDO driver for Interbase/Firebird databases. %endif -%if %{with oci8} -%package oci8 -Summary: A module for PHP applications that use OCI8 databases -# All files licensed under PHP version 3.01 -License: PHP-3.01 -%ifarch aarch64 -BuildRequires: oracle-instantclient%{oraclever}-devel -# Should requires libclntsh.so.19.1()(aarch-64), but it's not provided by Oracle RPM. -Requires: libclntsh.so.%{oraclelib} -AutoReq: 0 -%else -BuildRequires: (oracle-instantclient-devel >= %{oraclever} with oracle-instantclient-devel < %{oraclemax}) -%endif -Requires: php-pdo%{?_isa} = %{version}-%{release} -Provides: php_database -Provides: php-pdo_oci -Provides: php-pdo_oci%{?_isa} -Obsoletes: php-pecl-oci8 <= %{oci8ver} -Conflicts: php-pecl-oci8 > %{oci8ver} -Provides: php-pecl(oci8) = %{oci8ver} -Provides: php-pecl(oci8)%{?_isa} = %{oci8ver} -%if 0%{?rhel} == 7 -Obsoletes: php53-oci8, php53u-oci8, php54-oci8, php54w-oci8, php55u-oci8, php55w-oci8, php56u-oci8, php56w-oci8 -Obsoletes: php70u-oci8, php70w-oci8, php71u-oci8, php71w-oci8, php72u-oci8, php72w-oci8 -Obsoletes: php73-oci8, php73w-oci8 -Obsoletes: php74-oci8, php74w-oci8 -Obsoletes: php80-oci8 -%endif - -%description oci8 -The php-oci8 packages provides the OCI8 extension version %{oci8ver} -and the PDO driver to access Oracle Database. - -The extension is linked with Oracle client libraries %{oraclever} -(Oracle Instant Client). For details, see Oracle's note -"Oracle Client / Server Interoperability Support" (ID 207303.1). - -You must install libclntsh.so.%{oraclelib} to use this package, -provided by Oracle Instant Client RPM available from Oracle on: -https://www.oracle.com/database/technologies/instant-client/downloads.html - -Documentation is at http://php.net/oci8 and http://php.net/pdo_oci -%endif - %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 Requires: php-common%{?_isa} = %{version}-%{release}, net-snmp BuildRequires: net-snmp-devel -%if 0%{?rhel} == 7 -Obsoletes: php53-snmp, php53u-snmp, php54-snmp, php54w-snmp, php55u-snmp, php55w-snmp, php56u-snmp, php56w-snmp -Obsoletes: php70u-snmp, php70w-snmp, php71u-snmp, php71w-snmp, php72u-snmp, php72w-snmp -Obsoletes: php73-snmp, php73w-snmp -Obsoletes: php74-snmp, php74w-snmp -Obsoletes: php80-snmp -%endif %description snmp The php-snmp package contains a dynamic shared object that will add @@ -850,13 +576,6 @@ Provides: php-xsl, php-xsl%{?_isa} BuildRequires: pkgconfig(libxslt) >= 1.1 BuildRequires: pkgconfig(libexslt) BuildRequires: pkgconfig(libxml-2.0) >= 2.7.6 -%if 0%{?rhel} == 7 -Obsoletes: php53-xml, php53u-xml, php54-xml, php54w-xml, php55u-xml, php55w-xml, php56u-xml, php56w-xml -Obsoletes: php70u-xml, php70w-xml, php71u-xml, php71w-xml, php72u-xml, php72w-xml -Obsoletes: php73-xml, php73w-xml -Obsoletes: php74-xml, php74w-xml -Obsoletes: php80-xml -%endif %description xml The php-xml package contains dynamic shared objects which add support @@ -877,13 +596,6 @@ BuildRequires: oniguruma-devel %endif Provides: bundled(libmbfl) = 1.3.2 Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} == 7 -Obsoletes: php53-mbstring, php53u-mbstring, php54-mbstring, php54w-mbstring, php55u-mbstring, php55w-mbstring, php56u-mbstring, php56w-mbstring -Obsoletes: php70u-mbstring, php70w-mbstring, php71u-mbstring, php71w-mbstring, php72u-mbstring, php72w-mbstring -Obsoletes: php73-mbstring, php73w-mbstring -Obsoletes: php74-mbstring, php74w-mbstring -Obsoletes: php80-mbstring -%endif %description mbstring The php-mbstring package contains a dynamic shared object that will add @@ -912,13 +624,6 @@ BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libavif) Provides: bundled(gd) = 2.0.35 %endif -%if 0%{?rhel} == 7 -Obsoletes: php53-gd, php53u-gd, php54-gd, php54w-gd, php55u-gd, php55w-gd, php56u-gd, php56w-gd -Obsoletes: php70u-gd, php70w-gd, php71u-gd, php71w-gd, php72u-gd, php72w-gd -Obsoletes: php73-gd, php73w-gd -Obsoletes: php74-gd, php74w-gd -Obsoletes: php80-gd -%endif %description gd The php-gd package contains a dynamic shared object that will add @@ -930,13 +635,6 @@ Summary: A module for PHP applications for using the bcmath library # libbcmath is licensed under LGPLv2+ License: PHP-3.01 AND LGPL-2.1-or-later Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} == 7 -Obsoletes: php53-bcmath, php53u-bcmath, php54-bcmath, php54w-bcmath, php55u-bcmath, php55w-bcmath, php56u-bcmath, php56w-bcmath -Obsoletes: php70u-bcmath, php70w-bcmath, php71u-bcmath, php71w-bcmath, php72u-bcmath, php72w-bcmath -Obsoletes: php73-bcmath, php73w-bcmath -Obsoletes: php74-bcmath, php74w-bcmath -Obsoletes: php80-bcmath -%endif Provides: bundled(libbcmath) %description bcmath @@ -949,13 +647,6 @@ Summary: A module for PHP applications for using the GNU MP library License: PHP-3.01 BuildRequires: gmp-devel Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} == 7 -Obsoletes: php53-gmp, php53u-gmp, php54-gmp, php54w-gmp, php55u-gmp, php55w-gmp, php56u-gmp, php56w-gmp -Obsoletes: php70u-gmp, php70w-gmp, php71u-gmp, php71w-gmp, php72u-gmp, php72w-gmp -Obsoletes: php73-gmp, php73w-gmp -Obsoletes: php74-gmp, php74w-gmp -Obsoletes: php80-gmp -%endif %description gmp These functions allow you to work with arbitrary-length integers @@ -972,13 +663,6 @@ BuildRequires: lmdb-devel BuildRequires: qdbm-devel %endif Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} == 7 -Obsoletes: php53-dba, php53u-dba, php54-dba, php54w-dba, php55u-dba, php55w-dba, php56u-dba, php56w-dba -Obsoletes: php70u-dba, php70w-dba, php71u-dba, php71w-dba, php72u-dba, php72w-dba -Obsoletes: php73-dba, php73w-dba -Obsoletes: php74-dba, php74w-dba -Obsoletes: php80-dba -%endif %description dba The php-dba package contains a dynamic shared object that will add @@ -990,13 +674,6 @@ Summary: Standard PHP module provides tidy library support License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: libtidy-devel -%if 0%{?rhel} == 7 -Obsoletes: php53-tidy, php53u-tidy, php54-tidy, php54w-tidy, php55u-tidy, php55w-tidy, php56u-tidy, php56w-tidy -Obsoletes: php70u-tidy, php70w-tidy, php71u-tidy, php71w-tidy, php72u-tidy, php72w-tidy -Obsoletes: php73-tidy, php73w-tidy -Obsoletes: php74-tidy, php74w-tidy -Obsoletes: php80-tidy -%endif %description tidy The php-tidy package contains a dynamic shared object that will add @@ -1010,13 +687,6 @@ Requires: php-pdo%{?_isa} = %{version}-%{release} BuildRequires: freetds-devel >= 0.91 Provides: php-pdo_dblib, php-pdo_dblib%{?_isa} Obsoletes: php-mssql < %{version}-%{release} -%if 0%{?rhel} == 7 -Obsoletes: php53-mssql, php53u-mssql, php54-mssql, php54w-mssql, php55u-mssql, php55w-mssql, php56u-mssql, php56w-mssql -Obsoletes: php70u-pdo-dblib, php70w-pdo_dblib, php71u-pdo-dblib, php71w-pdo_dblib, php72u-pdo-dblib, php72w-pdo_dblib -Obsoletes: php73-pdo-dblib, php73w-pdo_dblib -Obsoletes: php74-pdo-dblib, php74w-pdo_dblib -Obsoletes: php80-pdo-dblib -%endif %description pdo-dblib The php-pdo-dblib package contains a dynamic shared object @@ -1029,36 +699,11 @@ Requires: php-common%{?_isa} = %{version}-%{release} # doing a real -devel package for just the .so symlink is a bit overkill Provides: php-embedded-devel = %{version}-%{release} Provides: php-embedded-devel%{?_isa} = %{version}-%{release} -%if 0%{?rhel} == 7 -Obsoletes: php53-embedded, php53u-embedded, php54-embedded, php54w-embedded, php55u-embedded, php55w-embedded, php56u-embedded, php56w-embedded -Obsoletes: php70u-embedded, php70w-embedded, php71u-embedded, php71w-embedded, php72u-embedded, php72w-embedded -Obsoletes: php73-embedded, php73w-embedded -Obsoletes: php74-embedded, php74w-embedded -Obsoletes: php80-embedded -%endif %description embedded The php-embedded package contains a library which can be embedded into applications to provide PHP scripting language support. -%package pspell -Summary: A module for PHP applications for using pspell interfaces -# All files licensed under PHP version 3.01 -License: PHP-3.01 -Requires: php-common%{?_isa} = %{version}-%{release} -BuildRequires: aspell-devel >= 0.50.0 -%if 0%{?rhel} == 7 -Obsoletes: php53-pspell, php53u-pspell, php54-pspell, php54w-pspell, php55u-pspell, php55w-pspell, php56u-pspell, php56w-pspell -Obsoletes: php70u-pspell, php70w-pspell, php71u-pspell, php71w-pspell, php72u-pspell, php72w-pspell -Obsoletes: php73-pspell, php73w-pspell -Obsoletes: php74-pspell, php74w-pspell -Obsoletes: php80-pspell -%endif - -%description pspell -The php-pspell package contains a dynamic shared object that will add -support for using the pspell library to PHP. - %package intl Summary: Internationalization extension for PHP applications # All files licensed under PHP version 3.01 @@ -1067,13 +712,6 @@ Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: pkgconfig(icu-i18n) >= 74 BuildRequires: pkgconfig(icu-io) >= 74 BuildRequires: pkgconfig(icu-uc) >= 74 -%if 0%{?rhel} == 7 -Obsoletes: php53-intl, php53u-intl, php54-intl, php54w-intl, php55u-intl, php55w-intl, php56u-intl, php56w-intl -Obsoletes: php70u-intl, php70w-intl, php71u-intl, php71w-intl, php72u-intl, php72w-intl -Obsoletes: php73-intl, php73w-intl -Obsoletes: php74-intl, php74w-intl -Obsoletes: php80-intl -%endif %description intl The php-intl package contains a dynamic shared object that will add @@ -1085,13 +723,6 @@ Summary: Enchant spelling extension for PHP applications License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: pkgconfig(enchant-2) -%if 0%{?rhel} == 7 -Obsoletes: php53-enchant, php53u-enchant, php54-enchant, php54w-enchant, php55u-enchant, php55w-enchant, php56u-enchant, php56w-enchant -Obsoletes: php70u-enchant, php70w-enchant, php71u-enchant, php71w-enchant, php72u-enchant, php72w-enchant -Obsoletes: php73-enchant, php73w-enchant -Obsoletes: php74-enchant, php74w-enchant -Obsoletes: php80-enchant -%endif %description enchant The php-enchant package contains a dynamic shared object that will add @@ -1108,13 +739,6 @@ Provides: php-pecl(zip) = %{zipver} Provides: php-pecl(zip)%{?_isa} = %{zipver} Provides: php-pecl-zip = %{zipver} Provides: php-pecl-zip%{?_isa} = %{zipver} -%if 0%{?rhel} == 7 -Obsoletes: php53-zip, php53u-zip, php54-zip, php54w-zip, php55u-zip, php55w-zip, php56u-zip, php56w-zip -Obsoletes: php70u-zip, php70w-zip, php71u-zip, php71w-zip, php72u-zip, php72w-zip -Obsoletes: php73-zip, php73w-zip -Obsoletes: php74-zip, php74w-zip -Obsoletes: php80-zip -%endif BuildRequires: pkgconfig(libzip) >= 0.11 %description zip @@ -1133,12 +757,6 @@ Requires: php-common%{?_isa} = %{version}-%{release} Obsoletes: php-pecl-libsodium2 < 3 Provides: php-pecl(libsodium) = %{version} Provides: php-pecl(libsodium)%{?_isa} = %{version} -%if 0%{?rhel} == 7 -Obsoletes: php72u-sodium, php72w-sodium -Obsoletes: php73-sodium, php73w-sodium -Obsoletes: php74-sodium, php74w-sodium -Obsoletes: php80-sodium -%endif %description sodium The php-sodium package provides a simple, @@ -1152,10 +770,6 @@ License: PHP-3.01 BuildRequires: pkgconfig(libffi) Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} == 7 -Obsoletes: php74-ffi, php74w-ffi -Obsoletes: php80-ffi -%endif %description ffi FFI is one of the features that made Python and LuaJIT very useful for fast @@ -1171,9 +785,6 @@ in pure PHP. %if %{with lsws} : With Litespeed SAPI %endif -%if %{with oci8} -: With Oracle extensions -%endif %if %{with firebird} : With pdo_firebird extension %endif @@ -1211,9 +822,6 @@ in pure PHP. %patch -P5 -p1 -b .includedir %patch -P6 -p1 -b .embed %patch -P8 -p1 -b .libdb -%if 0%{?rhel} == 7 -%patch -P10 -p1 -b .curltls -%endif %patch -P41 -p1 -b .syslib %if %{with tzdata} @@ -1224,9 +832,6 @@ in pure PHP. %patch -P46 -p1 -b .argon2 %patch -P47 -p1 -b .phpinfo %patch -P48 -p1 -b .ec-param -%patch -P49 -p1 -b .iodbc - -%patch -P91 -p1 -b .remi-oci8 # upstream patches @@ -1321,13 +926,6 @@ if test "x${vpdo}" != "x%{pdover}"; then fi # Check for some extension version -ver=$(sed -n '/#define PHP_OCI8_VERSION /{s/.* "//;s/".*$//;p}' ext/oci8/php_oci8.h) -if test "$ver" != "%{oci8ver}"; then - : Error: Upstream OCI8 version is now ${ver}, expecting %{oci8ver}. - : Update the oci8ver macro and rebuild. - exit 1 -fi - ver=$(sed -n '/#define PHP_ZIP_VERSION /{s/.* "//;s/".*$//;p}' ext/zip/php_zip.h) if test "$ver" != "%{zipver}"; then : Error: Upstream ZIP version is now ${ver}, expecting %{zipver}. @@ -1351,7 +949,7 @@ find . -name \*.[ch] -exec chmod 644 {} \; chmod 644 README.* # Some extensions have their own configuration file -cp %{SOURCE50} %{SOURCE51} %{SOURCE52} %{SOURCE53} . +cp %{SOURCE50} %{SOURCE51} %{SOURCE53} . # Regenerated bison files # to force, rm Zend/zend_{language,ini}_parser.[ch] @@ -1436,6 +1034,9 @@ ln -sf ../configure --with-exec-dir=%{_bindir} \ --without-gdbm \ --with-openssl \ +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 + --with-openssl-argon2 \ +%endif --with-system-ciphers \ %if %{with libpcre} --with-external-pcre \ @@ -1445,7 +1046,6 @@ ln -sf ../configure %endif --with-zlib \ --with-layout=GNU \ - --with-kerberos \ --with-libxml \ %if %{with tzdata} --with-system-tzdata \ @@ -1478,9 +1078,6 @@ build --libdir=%{_libdir}/php \ --enable-opcache-file \ --with-capstone \ --enable-phpdbg --enable-phpdbg-readline \ -%if %{with imap} - --with-imap=shared --with-imap-ssl \ -%endif --enable-mbstring=shared \ --enable-mbregex \ --enable-gd=shared \ @@ -1512,10 +1109,6 @@ build --libdir=%{_libdir}/php \ --enable-mysqlnd=shared \ --with-mysqli=shared,mysqlnd \ --with-mysql-sock=%{mysql_sock} \ -%if %{with oci8} - --with-oci8=shared,instantclient,%{_prefix}/lib/oracle/%{oracledir}/client64/lib,%{oraclever} \ - --with-pdo-oci=shared,instantclient,%{_prefix}/lib/oracle/%{oracledir}/client64/lib,%{oraclever} \ -%endif %if %{with firebird} --with-pdo-firebird=shared \ %endif @@ -1530,11 +1123,11 @@ build --libdir=%{_libdir}/php \ --with-curl=shared \ --enable-pdo=shared \ %if %{with iodbc} - --with-iodbc=shared,%{_prefix} \ - --with-pdo-odbc=shared,iodbc,%{_prefix} \ + --with-iodbc=shared \ + --with-pdo-odbc=shared,iodbc \ %else - --with-unixODBC=shared,%{_prefix} \ - --with-pdo-odbc=shared,unixODBC,%{_prefix} \ + --with-unixODBC=shared \ + --with-pdo-odbc=shared,unixODBC \ %endif --with-pdo-mysql=shared,mysqlnd \ --with-pdo-pgsql=shared,%{_prefix} \ @@ -1546,7 +1139,6 @@ build --libdir=%{_libdir}/php \ %endif --without-readline \ --with-libedit \ - --with-pspell=shared \ --enable-phar=shared \ --with-tidy=shared,%{_prefix} \ --enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \ @@ -1567,7 +1159,6 @@ without_shared="--disable-gd \ --disable-xmlreader --disable-xmlwriter \ --without-sodium \ --without-sqlite3 --disable-phar --disable-fileinfo \ - --without-pspell \ --without-curl --disable-posix --disable-xml \ --disable-simplexml --disable-exif --without-gettext \ --without-iconv --disable-ftp --without-bz2 --disable-ctype \ @@ -1621,9 +1212,6 @@ build --includedir=%{_includedir}/php-zts \ --enable-opcache \ --enable-opcache-file \ --with-capstone \ -%if %{with imap} - --with-imap=shared --with-imap-ssl \ -%endif --enable-mbstring=shared \ --enable-mbregex \ --enable-gd=shared \ @@ -1656,10 +1244,6 @@ build --includedir=%{_includedir}/php-zts \ --with-mysqli=shared,mysqlnd \ --with-mysql-sock=%{mysql_sock} \ --enable-mysqlnd-threading \ -%if %{with oci8} - --with-oci8=shared,instantclient,%{_prefix}/lib/oracle/%{oracledir}/client64/lib,%{oraclever} \ - --with-pdo-oci=shared,instantclient,%{_prefix}/lib/oracle/%{oracledir}/client64/lib,%{oraclever} \ -%endif %if %{with firebird} --with-pdo-firebird=shared \ %endif @@ -1674,11 +1258,11 @@ build --includedir=%{_includedir}/php-zts \ --with-curl=shared \ --enable-pdo=shared \ %if %{with iodbc} - --with-iodbc=shared,%{_prefix} \ - --with-pdo-odbc=shared,iodbc,%{_prefix} \ + --with-iodbc=shared \ + --with-pdo-odbc=shared,iodbc \ %else - --with-unixODBC=shared,%{_prefix} \ - --with-pdo-odbc=shared,unixODBC,%{_prefix} \ + --with-unixODBC=shared \ + --with-pdo-odbc=shared,unixODBC \ %endif --with-pdo-mysql=shared,mysqlnd \ --with-pdo-pgsql=shared,%{_prefix} \ @@ -1690,7 +1274,6 @@ build --includedir=%{_includedir}/php-zts \ %endif --without-readline \ --with-libedit \ - --with-pspell=shared \ --enable-phar=shared \ --with-tidy=shared,%{_prefix} \ --enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \ @@ -1780,21 +1363,6 @@ install -m 755 build-apache/libs/libphp.so $RPM_BUILD_ROOT%{_httpd_moddir}/libph install -D -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_httpd_modconfdir}/20-php.conf install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_confdir}/php.conf -%if %{with_httpd2410} -cat %{SOURCE11} >>$RPM_BUILD_ROOT%{_httpd_confdir}/php.conf -%else -mkdir _fpmdoc -cat %{SOURCE1} %{SOURCE11} >_fpmdoc/httpd-php.conf -cat << 'EOF' >_fpmdoc/README -To use FPM with Apache HTTP server: -- copy the httpd-php.conf to %{_httpd_confdir}/php.conf - -To use FPM with NGINX web server: -- copy the nginx-fpm.conf to %{_sysconfdir}/nginx/conf.d/php-fpm.conf -- copy the nginx-php.conf to %{_sysconfdir}/nginx/default.d/php.conf -EOF -%endif - install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d %if %{with zts} install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d @@ -1803,11 +1371,9 @@ install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/wsdlcache install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/opcache -%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/peclxml install -m 755 -d $RPM_BUILD_ROOT%{_docdir}/pecl install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/tests/pecl -%endif %if %{with lsws} install -m 755 build-apache/sapi/litespeed/php $RPM_BUILD_ROOT%{_bindir}/lsphp @@ -1826,47 +1392,18 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf.default . install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/php-fpm -# Environment file -%if 0%{?fedora} < 26 && 0%{?rhel} < 8 -install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig -install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm -%endif - install -m 755 -d $RPM_BUILD_ROOT/run/php-fpm # install systemd unit files and scripts for handling server startup # this folder requires systemd >= 204 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/php-fpm.service.d install -Dm 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/php-fpm.service -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/httpd.service.d/php-fpm.conf install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/nginx.service.d/php-fpm.conf -%endif - -%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 -sed -e '/EnvironmentFile/d' -i $RPM_BUILD_ROOT%{_unitdir}/php-fpm.service -%endif -%if %{with_nginx} # Nginx configuration install -D -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/php-fpm.conf install -D -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/default.d/php.conf -# Switch to UDS -# FPM -sed -e 's@127.0.0.1:9000@/run/php-fpm/www.sock@' \ - -e 's@^;listen.acl_users@listen.acl_users@' \ - -i $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf -# Nginx -sed -e 's@127.0.0.1:9000@unix:/run/php-fpm/www.sock@' \ - -i $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/php-fpm.conf -# Apache -sed -e 's@proxy:fcgi://127.0.0.1:9000@proxy:unix:/run/php-fpm/www.sock|fcgi://localhost@' \ - -i $RPM_BUILD_ROOT%{_httpd_confdir}/php.conf -%else -install -D -m 644 %{SOURCE13} _fpmdoc/nginx-fpm.conf -install -D -m 644 %{SOURCE14} _fpmdoc/nginx-php.conf -%endif - TESTCMD="$RPM_BUILD_ROOT%{_bindir}/php --no-php-ini" # Ensure all provided extensions are really there for mod in core date filter hash json libxml openssl pcntl pcre readline reflection session spl standard zlib @@ -1878,9 +1415,6 @@ TESTCMD="$TESTCMD --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/php/modules" # Generate files lists and stub .ini files for each subpackage for mod in pgsql odbc ldap snmp \ -%if %{with imap} - imap \ -%endif mysqlnd mysqli \ mbstring gd dom xsl soap bcmath dba \ simplexml bz2 calendar ctype exif ftp gettext gmp iconv \ @@ -1892,13 +1426,10 @@ for mod in pgsql odbc ldap snmp \ sqlite3 \ enchant phar fileinfo intl \ ffi \ - tidy pspell curl \ + tidy curl \ sodium \ posix shmop sysvshm sysvsem sysvmsg xml \ pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite pdo_dblib \ -%if %{with oci8} - oci8 pdo_oci \ -%endif %if %{with firebird} pdo_firebird \ %endif @@ -1961,9 +1492,6 @@ cat files.mysqli \ # Split out the PDO modules cat files.pdo_pgsql >> files.pgsql cat files.pdo_odbc >> files.odbc -%if %{with oci8} -cat files.pdo_oci >> files.oci8 -%endif # sysv* and posix in packaged in php-process cat files.shmop files.sysv* files.posix > files.process @@ -1996,9 +1524,6 @@ sed -e "s/@PHP_APIVER@/%{apiver}-%{__isa_bits}/" \ -e "/zts/d" \ %endif < %{SOURCE3} > macros.php -%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 -echo '%%pecl_xmldir %%{_localstatedir}/lib/php/peclxml' >>macros.php -%endif install -m 644 -D macros.php \ $RPM_BUILD_ROOT%{macrosdir}/macros.php @@ -2023,60 +1548,17 @@ echo -e "You should consider upgrading to a supported release.\n" %endif -%if ! %{with_httpd2410} -%pre fpm -# Add the "apache" user as we don't require httpd -getent group apache >/dev/null || \ - groupadd -g 48 -r apache -getent passwd apache >/dev/null || \ - useradd -r -u 48 -g apache -s /sbin/nologin \ - -d %{_httpd_contentdir} -c "Apache" apache -exit 0 -%endif - %post fpm %systemd_post php-fpm.service %preun fpm %systemd_preun php-fpm.service -%if 0%{?fedora} < 27 && 0%{?rhel} < 8 -%postun fpm -%systemd_postun_with_restart php-fpm.service -%endif - -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 # Raised by new pool installation or new extension installation %transfiletriggerin fpm -- %{_sysconfdir}/php-fpm.d %{_sysconfdir}/php.d systemctl try-restart php-fpm.service >/dev/null 2>&1 || : -%endif - -# Handle upgrading from SysV initscript to native systemd unit. -# We can tell if a SysV version of php-fpm was previously installed by -# checking to see if the initscript is present. -%triggerun fpm -- php-fpm -%if 0%{?fedora} >= 15 -if [ -f /etc/rc.d/init.d/php-fpm ]; then - # Save the current service runlevel info - # User must manually run systemd-sysv-convert --apply php-fpm - # to migrate them to systemd targets - /usr/bin/systemd-sysv-convert --save php-fpm >/dev/null 2>&1 || : - - # Run these because the SysV package being removed won't do them - /sbin/chkconfig --del php-fpm >/dev/null 2>&1 || : - /bin/systemctl try-restart php-fpm.service >/dev/null 2>&1 || : -fi -%endif - - -%if 0%{?fedora} < 28 && 0%{?rhel} < 8 -%post embedded -p /sbin/ldconfig -%postun embedded -p /sbin/ldconfig -%endif -%{!?_licensedir:%global license %%doc} - %files %{_httpd_moddir}/libphp.so %attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session @@ -2101,12 +1583,10 @@ fi %dir %{_libdir}/php-zts/modules %endif %dir %{_localstatedir}/lib/php -%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 %dir %{_localstatedir}/lib/php/peclxml %dir %{_docdir}/pecl %dir %{_datadir}/tests %dir %{_datadir}/tests/pecl -%endif %dir %{_datadir}/php %files cli @@ -2142,26 +1622,15 @@ fi %attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session %attr(0770,root,apache) %dir %{_localstatedir}/lib/php/wsdlcache %attr(0770,root,apache) %dir %{_localstatedir}/lib/php/opcache -%if %{with_httpd2410} %config(noreplace) %{_httpd_confdir}/php.conf -%else -%doc _fpmdoc/* -%endif %config(noreplace) %{_sysconfdir}/php-fpm.conf %config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf %config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm -%if 0%{?fedora} < 26 && 0%{?rhel} < 8 -%config(noreplace) %{_sysconfdir}/sysconfig/php-fpm -%endif -%if %{with_nginx} %config(noreplace) %{_sysconfdir}/nginx/conf.d/php-fpm.conf %config(noreplace) %{_sysconfdir}/nginx/default.d/php.conf -%endif %{_unitdir}/php-fpm.service -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 %config(noreplace) %{_sysconfdir}/systemd/system/httpd.service.d/php-fpm.conf %config(noreplace) %{_sysconfdir}/systemd/system/nginx.service.d/php-fpm.conf -%endif %dir %{_sysconfdir}/systemd/system/php-fpm.service.d %dir %ghost /run/php-fpm %{_sbindir}/php-fpm @@ -2197,9 +1666,6 @@ fi %files pgsql -f files.pgsql %files odbc -f files.odbc -%if %{with imap} -%files imap -f files.imap -%endif %files ldap -f files.ldap %files snmp -f files.snmp %files xml -f files.xml @@ -2214,7 +1680,6 @@ fi %files pdo -f files.pdo %files tidy -f files.tidy %files pdo-dblib -f files.pdo_dblib -%files pspell -f files.pspell %files intl -f files.intl %files process -f files.process %if %{with firebird} @@ -2227,9 +1692,6 @@ fi %if %{with zts} %config(noreplace) %{_sysconfdir}/php-zts.d/opcache-default.blacklist %endif -%if %{with oci8} -%files oci8 -f files.oci8 -%endif %if %{with zip} %files zip -f files.zip %endif @@ -2239,6 +1701,11 @@ fi %changelog +* Mon Sep 23 2024 Remi Collet - 8.4.0~beta5-1 +- update to 8.4.0beta5 +- drop oci8, pdo_oci8, pspell and imap extensions +- disable ZTS build + * Tue Sep 10 2024 Remi Collet - 8.3.12~RC1-1 - update to 8.3.12RC1 - use ICU 74.2 -- cgit