diff options
| author | Remi Collet <remi@remirepo.net> | 2021-10-26 08:52:26 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2021-10-26 08:52:26 +0200 |
| commit | f79d12de4e575c0fb81443e0411c0c38f86bdca8 (patch) | |
| tree | 9623a6d5de72909e35b307bc86573d76d47c596c /php80.spec | |
| parent | 338b58603cd68ff95785ef95f4ddbd0c39b03f3b (diff) | |
add patch for OpenSSL 3.0 on F36 and EL9
Diffstat (limited to 'php80.spec')
| -rw-r--r-- | php80.spec | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -48,6 +48,7 @@ %bcond_with libpcre %endif +# TODO change when 8.5 released (libxcrypt 4.1.1-6) %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 # switch to bundled library using --without libxcrypt %bcond_without libxcrypt @@ -99,7 +100,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -161,8 +162,10 @@ Patch48: php-8.0.10-snmp-sha.patch # switch phar to use sha256 signature by default, from 8.1 # implement openssl_256 and openssl_512 for phar signatures, from 8.1 Patch49: php-8.0.10-phar-sha.patch -# use system libxcrypt -Patch50: php-8.0.12-crypt.patch +# compatibility with OpenSSL 3.0, from 8.1 +Patch50: php-8.0.10-openssl3.patch +# use system libxcrypt, from 8.1 +Patch51: php-8.0.12-crypt.patch # RC Patch Patch91: php-7.2.0-oci8conf.patch @@ -1173,7 +1176,11 @@ in pure PHP. %patch47 -p1 -b .phpinfo %patch48 -p1 -b .sha %patch49 -p1 -b .pharsha -%patch50 -p1 -b .libxcrypt +%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 +%patch50 -p1 -b .openssl3 +rm ext/openssl/tests/p12_with_extra_certs.p12 +%endif +%patch51 -p1 -b .libxcrypt %patch91 -p1 -b .remi-oci8 @@ -2168,6 +2175,9 @@ fi %changelog +* Tue Oct 26 2021 Remi Collet <remi@remirepo.net> - 8.0.12-2 +- add patch for OpenSSL 3.0 on F36 and EL9 + * Tue Oct 19 2021 Remi Collet <remi@remirepo.net> - 8.0.12-1 - Update to 8.0.12 - http://www.php.net/releases/8_0_12.php |