summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt8
-rw-r--r--php.spec20
2 files changed, 10 insertions, 18 deletions
diff --git a/failed.txt b/failed.txt
index f79dd4b..9490ffd 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.3.18RC1 (2025-02-27)
+===== 8.3.18 (2025-03-13)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
@@ -12,10 +12,12 @@ $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
/var/lib/mock/scl83fc40x/build.log:Tests failed : 0
/var/lib/mock/scl83fc41a/build.log:Tests failed : 0
/var/lib/mock/scl83fc41x/build.log:Tests failed : 0
-/var/lib/mock/scl83fc42a/build.log:Tests failed : 0
-/var/lib/mock/scl83fc42x/build.log:Tests failed : 0
+/var/lib/mock/scl83fc42a/build.log:Tests failed : 1
+/var/lib/mock/scl83fc42x/build.log:Tests failed : 1
+fc42:
+ 2 Bug #75457 (heap-use-after-free in php7.0.25) [ext/pcre/tests/bug75457.phpt]
(1) proc_open give erratic test results :(
diff --git a/php.spec b/php.spec
index 38319cb..a858779 100644
--- a/php.spec
+++ b/php.spec
@@ -49,17 +49,10 @@
%global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
-%ifarch aarch64
-%global oraclever 19.25
-%global oraclemax 20
-%global oraclelib 19.1
-%global oracledir 19.25
-%else
%global oraclever 23.7
%global oraclemax 24
%global oraclelib 23.1
%global oracledir 23
-%endif
# Build for LiteSpeed Web Server (LSAPI), you can disable using --without tests
%bcond_without lsws
@@ -138,7 +131,7 @@
%global gh_owner php
%global gh_project php-src
%global upver 8.3.18
-%global rcver RC1
+#global rcver RC1
# TODO set PHP_EXTRA_VERSION for EOL version
Summary: PHP scripting language for creating dynamic web sites
@@ -663,14 +656,7 @@ License.
Summary: A module for PHP applications that use OCI8 databases
# All files licensed under PHP version 3.01
License: PHP-3.01
-%ifarch aarch64
-BuildRequires: oracle-instantclient%{oraclever}-devel
-# Should requires libclntsh.so.19.1()(aarch-64), but it's not provided by Oracle RPM.
-Requires: libclntsh.so.%{oraclelib}
-AutoReq: 0
-%else
BuildRequires: (oracle-instantclient-devel >= %{oraclever} with oracle-instantclient-devel < %{oraclemax})
-%endif
Requires: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
Provides: %{?scl_prefix}php_database
Provides: %{?scl_prefix}php-pdo_oci
@@ -1899,6 +1885,10 @@ fi
%changelog
+* Wed Mar 12 2025 Remi Collet <remi@remirepo.net> - 8.3.18-1
+- Update to 8.3.18 - http://www.php.net/releases/8_3_18.php
+- use oracle client library version 23.7 on arm64
+
* Wed Feb 26 2025 Remi Collet <remi@remirepo.net> - 8.3.18~RC1-1
- update to 8.3.18RC1