From be67aca55a031d3d135186af9e108bb34e3b8d4e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Jun 2022 16:04:37 +0200 Subject: update to 8.0.21RC1 --- php.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'php.spec') diff --git a/php.spec b/php.spec index 43bcc78..9543a61 100644 --- a/php.spec +++ b/php.spec @@ -114,8 +114,8 @@ #global gh_date 20200615 %global gh_owner php %global gh_project php-src -%global upver 8.0.20 -#global rcver RC1 +%global upver 8.0.21 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php @@ -185,7 +185,7 @@ Patch48: php-8.0.10-snmp-sha.patch # implement openssl_256 and openssl_512 for phar signatures, from 8.1 Patch49: php-8.0.10-phar-sha.patch # compatibility with OpenSSL 3.0, from 8.1 -Patch50: php-8.0.10-openssl3.patch +Patch50: php-8.0.21-openssl3.patch # use system libxcrypt, from 8.1 Patch51: php-8.0.13-crypt.patch @@ -193,7 +193,6 @@ Patch51: php-8.0.13-crypt.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) -Patch100: php-mbstring.patch # Security fixes (200+) @@ -320,7 +319,6 @@ The %{?scl_prefix}php-dbg package contains the interactive PHP debugger. Summary: PHP FastCGI Process Manager BuildRequires: libacl-devel BuildRequires: pkgconfig(libsystemd) >= 209 -Requires(pre): %{_root_sbindir}/useradd Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} %{?systemd_requires} # This is actually needed for the %%triggerun script but Requires(triggerun) @@ -333,6 +331,8 @@ Requires(pre): httpd-filesystem # For php.conf in /etc/httpd/conf.d # and version 2.4.10 for proxy support in SetHandler Requires: httpd-filesystem >= 2.4.10 +%else +Requires(pre): %{_root_sbindir}/useradd %endif %description fpm @@ -961,7 +961,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch47 -p1 -b .phpinfo %patch48 -p1 -b .sha %patch49 -p1 -b .pharsha -%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 +%if 0%{?fedora} >= 36|| 0%{?rhel} >= 9 %patch50 -p1 -b .openssl3 rm ext/openssl/tests/p12_with_extra_certs.p12 %endif @@ -970,7 +970,6 @@ rm ext/openssl/tests/p12_with_extra_certs.p12 %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .up # security patches @@ -1848,6 +1847,9 @@ fi %changelog +* Tue Jun 21 2022 Remi Collet - 8.0.21~RC1-1 +- update to 8.0.21RC1 + * Wed Jun 8 2022 Remi Collet - 8.0.20-1 - Update to 8.0.20 - http://www.php.net/releases/8_0_20.php -- cgit