diff options
| author | Remi Collet <remi@remirepo.net> | 2023-12-07 07:36:38 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-12-07 07:36:38 +0100 |
| commit | ba048679a5c6c1425cacb1dab4d9e1a4cc16b81b (patch) | |
| tree | 04ce116c399ead68e0a79c3668e59ef4c96f4e6e | |
| parent | 49c6b33285dea306c0d0756e65275186ff9c50a4 (diff) | |
update to 8.3.1RC3
| -rw-r--r-- | failed.txt | 2 | ||||
| -rw-r--r-- | php-upstream.patch | 43 | ||||
| -rw-r--r-- | php83.spec | 8 |
3 files changed, 5 insertions, 48 deletions
@@ -1,4 +1,4 @@ -===== 8.3.1RC1 (2023-12-07) +===== 8.3.1RC3 (2023-12-07) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log diff --git a/php-upstream.patch b/php-upstream.patch deleted file mode 100644 index 24227a8..0000000 --- a/php-upstream.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 @@ -121,7 +121,7 @@ %bcond_with zip %global upver 8.3.1 -%global rcver RC1 +%global rcver RC3 # TODO set PHP_EXTRA_VERSION for EOL version Summary: PHP scripting language for creating dynamic web sites @@ -192,8 +192,6 @@ 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+) @@ -1214,7 +1212,6 @@ in pure PHP. %patch -P91 -p1 -b .remi-oci8 # upstream patches -%patch -P100 -p1 -R -b .revert # security patches @@ -2215,6 +2212,9 @@ fi %changelog +* Thu Dec 7 2023 Remi Collet <remi@remirepo.net> - 8.3.1~RC3-1 +- update to 8.3.1RC3 + * Wed Dec 6 2023 Remi Collet <remi@remirepo.net> - 8.3.1~RC1-1 - update to 8.3.1RC1 |