From fe107c0d04fcd83f1716f4de838ee05725e1d9c0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 Sep 2023 07:27:41 +0200 Subject: Update to 8.1.24 - http://www.php.net/releases/8_1_24.php --- failed.txt | 5 ++++- php-7.2.0-oci8conf.patch | 24 +----------------------- php.spec | 7 +++++-- 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/failed.txt b/failed.txt index 0bb2b51..f0ea797 100644 --- a/failed.txt +++ b/failed.txt @@ -1,12 +1,15 @@ -===== 8.1.24RC1 (2023-09-14) +===== 8.1.24 (2023-09-27) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log /var/lib/mock/scl81el7x/build.log:Tests failed : 0 +/var/lib/mock/scl81el8a/build.log:Tests failed : 0 /var/lib/mock/scl81el8x/build.log:Tests failed : 0 +/var/lib/mock/scl81el9a/build.log:Tests failed : 0 /var/lib/mock/scl81el9x/build.log:Tests failed : 0 /var/lib/mock/scl81fc37x/build.log:Tests failed : 0 /var/lib/mock/scl81fc38x/build.log:Tests failed : 2 +/var/lib/mock/scl81fc39a/build.log:Tests failed : 2 /var/lib/mock/scl81fc39x/build.log:Tests failed : 2 diff --git a/php-7.2.0-oci8conf.patch b/php-7.2.0-oci8conf.patch index 0ad16a1..d026575 100644 --- a/php-7.2.0-oci8conf.patch +++ b/php-7.2.0-oci8conf.patch @@ -10,26 +10,4 @@ diff -up ./ext/ldap/php_ldap.h.remi-oci8 ./ext/ldap/php_ldap.h extern zend_module_entry ldap_module_entry; #define ldap_module_ptr &ldap_module_entry -diff -up ./ext/oci8/config.m4.remi-oci8 ./ext/oci8/config.m4 ---- ./ext/oci8/config.m4.remi-oci8 2017-06-20 15:45:39.000000000 +0200 -+++ ./ext/oci8/config.m4 2017-06-20 16:55:01.640203868 +0200 -@@ -372,6 +372,7 @@ if test "$PHP_OCI8" != "no"; then - - dnl Header directory for Instant Client SDK RPM install - OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib[/]*$!/usr/include/oracle/\1/client\2!'` -+ OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/\(lib64\|lib\)/oracle/\(.*\)/\(client64\|client\)/lib[/]*$!/usr/include/oracle/\2/\3!'` - - dnl Header directory for Instant Client SDK zip file install - OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include -diff -up ./ext/pdo_oci/config.m4.remi-oci8 ./ext/pdo_oci/config.m4 ---- ./ext/pdo_oci/config.m4.remi-oci8 2017-06-20 16:55:01.640203868 +0200 -+++ ./ext/pdo_oci/config.m4 2017-06-20 17:16:03.053538358 +0200 -@@ -93,7 +93,7 @@ if test "$PHP_PDO_OCI" != "no"; then - - AC_MSG_CHECKING([for oci.h]) - dnl Header directory for Instant Client SDK RPM install -- OCISDKRPMINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/lib/oracle/\(.*\)/\('${PDO_OCI_CLIENT_DIR}'\)/lib[/]*$!\1/include/oracle/\2/\3!'` -+ OCISDKRPMINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/\(lib64\|lib\)/oracle/\(.*\)/\('${PDO_OCI_CLIENT_DIR}'\)/lib[/]*$!\1/include/oracle/\3/\4!'` - - dnl Header directory for manual installation - OCISDKMANINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/lib[/]*$!\1/include!'` + diff --git a/php.spec b/php.spec index d16d372..98dff66 100644 --- a/php.spec +++ b/php.spec @@ -130,12 +130,12 @@ %global gh_owner php %global gh_project php-src %global upver 8.1.24 -%global rcver RC1 +#global rcver RC1 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: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -1862,6 +1862,9 @@ fi %changelog +* Wed Sep 27 2023 Remi Collet - 8.1.24-1 +- Update to 8.1.24 - http://www.php.net/releases/8_1_24.php + * Thu Sep 21 2023 Remi Collet - 8.1.24~RC1-2 - use oracle client library version 19.19 on aarch64 - use official Oracle Instant Client RPM -- cgit