summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt6
-rw-r--r--php-upstream.patch43
-rw-r--r--php.spec10
3 files changed, 54 insertions, 5 deletions
diff --git a/failed.txt b/failed.txt
index f2a7585..fe43cdd 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/scl83el7x/build.log:Tests failed : 1
/var/lib/mock/scl83el8a/build.log:Tests failed : 0
/var/lib/mock/scl83el8x/build.log:Tests failed : 0
-/var/lib/mock/scl83el9a/build.log:Tests failed : 1
-/var/lib/mock/scl83el9x/build.log:Tests failed : 1
+/var/lib/mock/scl83el9a/build.log:Tests failed : 3
+/var/lib/mock/scl83el9x/build.log:Tests failed : 3
/var/lib/mock/scl83fc37x/build.log:Tests failed : 1
/var/lib/mock/scl83fc38x/build.log:Tests failed : 2
/var/lib/mock/scl83fc39a/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/php.spec b/php.spec
index d327179..2508356 100644
--- a/php.spec
+++ b/php.spec
@@ -129,8 +129,8 @@
#global gh_date 20230605
%global gh_owner php
%global gh_project php-src
-%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
@@ -203,6 +203,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+)
@@ -989,6 +991,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch -P91 -p1 -b .remi-oci8
# upstream patches
+%patch -P100 -p1 -R -b .revert
# security patches
@@ -1874,6 +1877,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