summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-12-12 15:15:53 +0100
committerRemi Collet <remi@php.net>2023-12-12 15:15:53 +0100
commit35f7aae912e76042e995d974e55983bcad6dd119 (patch)
tree8a053b5b1260c7b81c2dc7865f316bf62c3311a2
parent834d34eee897a08c2d640d70ea9e8517c835c496 (diff)
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
-rw-r--r--failed.txt9
-rw-r--r--php.spec22
2 files changed, 21 insertions, 10 deletions
diff --git a/failed.txt b/failed.txt
index 0646da7..7a4a2c0 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,16 +1,19 @@
-===== 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/scl80el7x/build.log:Tests failed : 0
+/var/lib/mock/scl80el8a/build.log:Tests failed : 0
/var/lib/mock/scl80el8x/build.log:Tests failed : 0
-/var/lib/mock/scl80el9x/build.log:Tests failed : 0
+/var/lib/mock/scl80el9a/build.log:Tests failed : 2
+/var/lib/mock/scl80el9x/build.log:Tests failed : 2
/var/lib/mock/scl80fc37x/build.log:Tests failed : 0
/var/lib/mock/scl80fc38x/build.log:Tests failed : 2
+/var/lib/mock/scl80fc39a/build.log:Tests failed : 2
/var/lib/mock/scl80fc39x/build.log:Tests failed : 2
-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/php.spec b/php.spec
index c0d72cd..75c87b7 100644
--- a/php.spec
+++ b/php.spec
@@ -54,7 +54,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
@@ -126,7 +126,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-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
@@ -165,7 +165,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
@@ -828,9 +830,9 @@ Summary: Internationalization extension for PHP applications
# All files licensed under PHP version 3.01
License: PHP
Requires: %{?scl_prefix}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
%description intl
The %{?scl_prefix}php-intl package contains a dynamic shared object that will add
@@ -958,7 +960,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
@@ -1863,6 +1866,11 @@ fi
%changelog
+* Tue Dec 12 2023 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 8.0.30-2
- use oracle client library version 21.11 on x86_64, 19.19 on aarch64
- use official Oracle Instant Client RPM