From d7b52e6cc2bacf099f8d20247d4b5861f9a427d9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Dec 2023 15:16:05 +0100 Subject: use ICU 73.2 use oracle client library version 21.12 on x86_64, 19.19 on aarch64 add fixes for libxml 2.11 and 2.12 from 8.1 --- failed.txt | 9 ++++++--- php80.spec | 22 +++++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/failed.txt b/failed.txt index 6258c28..5a52f13 100644 --- a/failed.txt +++ b/failed.txt @@ -1,18 +1,21 @@ -===== 8.0.30 (2023-08-03) +===== 8.0.30-3 (2023-12-12) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log /var/lib/mock/el7x80/build.log:Tests failed : 0 +/var/lib/mock/el8a80/build.log:Tests failed : 0 /var/lib/mock/el8x80/build.log:Tests failed : 0 -/var/lib/mock/el9x80/build.log:Tests failed : 0 +/var/lib/mock/el9a80/build.log:Tests failed : 2 +/var/lib/mock/el9x80/build.log:Tests failed : 2 /var/lib/mock/fc37x80/build.log:Tests failed : 0 /var/lib/mock/fc38x80/build.log:Tests failed : 2 +/var/lib/mock/fc39a80/build.log:Tests failed : 2 /var/lib/mock/fc39x80/build.log:Tests failed : 2 el8x: 5 ext/standard/tests/strings/setlocale_variation2.phpt -fc38x, fc39x: +fc38, fc39, el9: 3 openssl_error_string() tests (OpenSSL >= 3.0) [ext/openssl/tests/openssl_error_string_basic_openssl3.phpt] 3 openssl_private_decrypt() tests [ext/openssl/tests/openssl_private_decrypt_basic.phpt] diff --git a/php80.spec b/php80.spec index 5517d68..e3e3e4f 100644 --- a/php80.spec +++ b/php80.spec @@ -29,7 +29,7 @@ %global oraclelib 19.1 %global oracledir 19.19 %else -%global oraclever 21.11 +%global oraclever 21.12 %global oraclelib 21.1 %global oracledir 21 %endif @@ -118,7 +118,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 2%{?dist} +Release: 3%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -155,7 +155,9 @@ Source53: 20-ffi.ini Patch1: php-7.4.0-httpd.patch Patch5: php-7.2.0-includedir.patch Patch6: php-8.0.0-embed.patch -Patch8: php-7.4.0-libdb.patch +Patch7: php-7.4.0-libdb.patch +# For libxml 2.12 from 8.1 +Patch8: php-8.0.30-libxml212.patch # get rid of deprecated functions from 8.1 Patch9: php-8.0.6-deprecated.patch # RHEL backports @@ -1038,9 +1040,9 @@ Summary: Internationalization extension for PHP applications # All files licensed under PHP version 3.01 License: PHP Requires: php-common%{?_isa} = %{version}-%{release} -BuildRequires: pkgconfig(icu-i18n) >= 72 -BuildRequires: pkgconfig(icu-io) >= 72 -BuildRequires: pkgconfig(icu-uc) >= 72 +BuildRequires: pkgconfig(icu-i18n) >= 73 +BuildRequires: pkgconfig(icu-io) >= 73 +BuildRequires: pkgconfig(icu-uc) >= 73 %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 @@ -1184,7 +1186,8 @@ in pure PHP. %patch -P1 -p1 -b .mpmcheck %patch -P5 -p1 -b .includedir %patch -P6 -p1 -b .embed -%patch -P8 -p1 -b .libdb +%patch -P7 -p1 -b .libdb +%patch -P8 -p1 -b .libxml212 %patch -P9 -p1 -b .deprecated %if 0%{?rhel} == 7 %patch -P10 -p1 -b .curltls @@ -2201,6 +2204,11 @@ fi %changelog +* Tue Dec 12 2023 Remi Collet - 8.0.30-3 +- use ICU 73.2 +- use oracle client library version 21.12 on x86_64, 19.19 on aarch64 +- add fixes for libxml 2.11 and 2.12 from 8.1 + * Thu Sep 21 2023 Remi Collet - 8.0.30-2 - use oracle client library version 21.11 on x86_64, 19.19 on aarch64 - use official Oracle Instant Client RPM -- cgit