diff options
| author | Remi Collet <remi@remirepo.net> | 2021-10-26 08:50:53 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2021-10-26 08:50:53 +0200 |
| commit | a8d6a450c1391b355d3aa69ae1d9f44d0af3e09f (patch) | |
| tree | aa225dfd68cfd3e472200ccd381b2617fed3156a /php.spec | |
| parent | 84e4ecdc86a09f41f385823dc27129d3980c0234 (diff) | |
add patch for OpenSSL 3.0 on F36 and EL9
Diffstat (limited to 'php.spec')
| -rw-r--r-- | php.spec | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -82,6 +82,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 @@ -113,7 +114,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}} -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 @@ -177,8 +178,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 @@ -953,7 +956,11 @@ 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 -%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 @@ -1834,6 +1841,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 |