From 49c6b33285dea306c0d0756e65275186ff9c50a4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 6 Dec 2023 10:27:08 +0100
Subject: update to 8.3.1RC1

---
 failed.txt         |  6 +++---
 php-upstream.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
 php83.spec         | 10 ++++++++--
 3 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 php-upstream.patch

diff --git a/failed.txt b/failed.txt
index d04f240..58a86d1 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,12 +1,12 @@
-===== 8.3.0 (2023-11-23)
+===== 8.3.1RC1 (2023-12-07)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
 /var/lib/mock/el7x83/build.log:Tests failed   :    1
 /var/lib/mock/el8a83/build.log:Tests failed   :    0
 /var/lib/mock/el8x83/build.log:Tests failed   :    0
-/var/lib/mock/el9a83/build.log:Tests failed   :    1
-/var/lib/mock/el9x83/build.log:Tests failed   :    1
+/var/lib/mock/el9a83/build.log:Tests failed   :    3
+/var/lib/mock/el9x83/build.log:Tests failed   :    3
 /var/lib/mock/fc37x83/build.log:Tests failed  :    1
 /var/lib/mock/fc38x83/build.log:Tests failed  :    2
 /var/lib/mock/fc39a83/build.log:Tests failed  :    2
diff --git a/php-upstream.patch b/php-upstream.patch
new file mode 100644
index 0000000..24227a8
--- /dev/null
+++ b/php-upstream.patch
@@ -0,0 +1,43 @@
+Revert unwanted API changes from
+
+
+From 78f5ea1eba7c1247d375d5dd40f34d9076d5e1fd Mon Sep 17 00:00:00 2001
+From: Eric Mann <ericmann@php.net>
+Date: Tue, 5 Dec 2023 07:48:07 -0800
+Subject: [PATCH] Update versions for PHP 8.3.1RC1
+
+---
+ NEWS                   | 2 +-
+ Zend/zend.h            | 2 +-
+ Zend/zend_extensions.h | 2 +-
+ Zend/zend_modules.h    | 2 +-
+ configure.ac           | 2 +-
+ main/php_version.h     | 4 ++--
+ 6 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
+index 461358abd2bc9..5b9be6b765f72 100644
+--- a/Zend/zend_extensions.h
++++ b/Zend/zend_extensions.h
+@@ -44,7 +44,7 @@ You can use the following macro to check the extension API version for compatibi
+ 
+ /* The first number is the engine version and the rest is the date (YYYYMMDD).
+  * This way engine 2/3 API no. is always greater than engine 1 API no..  */
+-#define ZEND_EXTENSION_API_NO	420230831
++#define ZEND_EXTENSION_API_NO	420231207
+ 
+ typedef struct _zend_extension_version_info {
+ 	int zend_extension_api_no;
+diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
+index 09661e6a2b862..8ec86db4ad915 100644
+--- a/Zend/zend_modules.h
++++ b/Zend/zend_modules.h
+@@ -31,7 +31,7 @@
+ #define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module
+ #define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module
+ 
+-#define ZEND_MODULE_API_NO 20230831
++#define ZEND_MODULE_API_NO 20231207
+ #ifdef ZTS
+ #define USING_ZTS 1
+ #else
diff --git a/php83.spec b/php83.spec
index ea3eff6..ec69cc6 100644
--- a/php83.spec
+++ b/php83.spec
@@ -120,8 +120,8 @@
 %bcond_without         libgd
 %bcond_with            zip
 
-%global upver          8.3.0
-#global rcver          RC6
+%global upver          8.3.1
+%global rcver          RC1
 # TODO set PHP_EXTRA_VERSION for EOL version
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -192,6 +192,8 @@ Patch48: php-8.3.0-openssl-ec-param.patch
 Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
+# revert unwanted API change
+Patch100: php-upstream.patch
 
 # Security fixes (200+)
 
@@ -1212,6 +1214,7 @@ in pure PHP.
 %patch -P91 -p1 -b .remi-oci8
 
 # upstream patches
+%patch -P100 -p1 -R -b .revert
 
 # security patches
 
@@ -2212,6 +2215,9 @@ fi
 
 
 %changelog
+* Wed Dec  6 2023 Remi Collet <remi@remirepo.net> - 8.3.1~RC1-1
+- update to 8.3.1RC1
+
 * Wed Nov 22 2023 Remi Collet <remi@remirepo.net> - 8.3.0-1
 - Update to 8.3.0 GA - http://www.php.net/releases/8_3_0.php
 
-- 
cgit