From cd92953b5ab540f7df0a98163a95f757ae33a526 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 27 Sep 2023 07:35:18 +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 +-----------------------
 php81.spec               |  7 +++++--
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/failed.txt b/failed.txt
index 9b52b15..ebc6792 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,12 +1,15 @@
-===== 8.1.24RC1 (2023-09-14)
+===== 8.1.24 (2023-09-28)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
 /var/lib/mock/el7x81/build.log:Tests failed   :    0
+/var/lib/mock/el8a81/build.log:Tests failed   :    0
 /var/lib/mock/el8x81/build.log:Tests failed   :    0
+/var/lib/mock/el9a81/build.log:Tests failed   :    0
 /var/lib/mock/el9x81/build.log:Tests failed   :    0
 /var/lib/mock/fc37x81/build.log:Tests failed  :    0
 /var/lib/mock/fc38x81/build.log:Tests failed  :    2
+/var/lib/mock/fc39a81/build.log:Tests failed  :    2
 /var/lib/mock/fc39x81/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/php81.spec b/php81.spec
index 17e1988..9a41d94 100644
--- a/php81.spec
+++ b/php81.spec
@@ -121,12 +121,12 @@
 %bcond_with            zip
 
 %global upver          8.1.24
-%global rcver          RC1
+#global rcver          RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-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
@@ -2199,6 +2199,9 @@ fi
 
 
 %changelog
+* Wed Sep 27 2023 Remi Collet <remi@remirepo.net> - 8.1.24-1
+- Update to 8.1.24 - http://www.php.net/releases/8_1_24.php
+
 * Thu Sep 21 2023 Remi Collet <remi@remirepo.net> - 8.1.24~RC1-2
 - use oracle client library version 19.19 on aarch64
 - use official Oracle Instant Client RPM
-- 
cgit