summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--6013.patch46
-rw-r--r--PHPINFO4
-rw-r--r--REFLECTION6
-rw-r--r--composer.json44
-rw-r--r--php-pecl-swoole6.spec12
5 files changed, 47 insertions, 65 deletions
diff --git a/6013.patch b/6013.patch
deleted file mode 100644
index 6ee45b4..0000000
--- a/6013.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 06c7656c218c284bbb793a18a54ef221f125335c Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 27 Feb 2026 10:29:56 +0100
-Subject: [PATCH] Fix #6004 drop broken conditionals, PHP_VERSION_ID not
- defined
-
----
- thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp | 2 --
- thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp | 3 ---
- 2 files changed, 5 deletions(-)
-
-diff --git a/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp b/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp
-index 2c07099252..715963eec1 100644
---- a/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp
-+++ b/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp
-@@ -18,7 +18,6 @@
- #include <firebird/Interface.h>
- #include <cstring>
-
--#if PHP_VERSION_ID < 80500
- /* Returns the client version. 0 bytes are minor version, 1 bytes are major version. */
- extern "C" unsigned fb_get_client_version(void)
- {
-@@ -90,4 +89,3 @@ extern "C" ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_T
- }
-
- #endif
--#endif
-diff --git a/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp b/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp
-index 1398b42260..715963eec1 100644
---- a/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp
-+++ b/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp
-@@ -18,8 +18,6 @@
- #include <firebird/Interface.h>
- #include <cstring>
-
--#if PHP_VERSION_ID >= 80500
--
- /* Returns the client version. 0 bytes are minor version, 1 bytes are major version. */
- extern "C" unsigned fb_get_client_version(void)
- {
-@@ -91,4 +89,3 @@ extern "C" ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_T
- }
-
- #endif
--#endif
diff --git a/PHPINFO b/PHPINFO
index 67664ee..b5a2b91 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,8 +3,8 @@ swoole
Swoole => enabled
Author => Swoole Team <team@swoole.com>
-Version => 6.2.0RC1
-Built => Feb 27 2026 00:00:00
+Version => 6.2.0RC2
+Built => Mar 3 2026 00:00:00
host byte order => little endian
coroutine => enabled with boost asm context
trace_log => enabled
diff --git a/REFLECTION b/REFLECTION
index 978338d..4c2179d 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #120 swoole version 6.2.0RC1 ] {
+Extension [ <persistent> extension #120 swoole version 6.2.0RC2 ] {
- Dependencies {
Dependency [ json (Required) ]
@@ -42,12 +42,12 @@ Extension [ <persistent> extension #120 swoole version 6.2.0RC1 ] {
}
- Constants [418] {
- Constant [ <persistent> string SWOOLE_VERSION ] { 6.2.0RC1 }
+ Constant [ <persistent> string SWOOLE_VERSION ] { 6.2.0RC2 }
Constant [ <persistent> int SWOOLE_VERSION_ID ] { 60200 }
Constant [ <persistent> int SWOOLE_MAJOR_VERSION ] { 6 }
Constant [ <persistent> int SWOOLE_MINOR_VERSION ] { 2 }
Constant [ <persistent> int SWOOLE_RELEASE_VERSION ] { 0 }
- Constant [ <persistent> string SWOOLE_EXTRA_VERSION ] { RC1 }
+ Constant [ <persistent> string SWOOLE_EXTRA_VERSION ] { RC2 }
Constant [ <persistent> bool SWOOLE_DEBUG ] { }
Constant [ <persistent> bool SWOOLE_HAVE_COMPRESSION ] { 1 }
Constant [ <persistent> bool SWOOLE_HAVE_ZLIB ] { 1 }
diff --git a/composer.json b/composer.json
index b242145..f301f3d 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,16 @@
"license": "Apache-2.0",
"description": "Swoole is an event-driven, asynchronous, coroutine-based concurrency library with high performance for PHP.",
"require": {
- "php": ">=8.1 <8.5"
+ "php": ">=8.2 <8.6",
+ "ext-pdo": "*"
+ },
+ "suggest": {
+ "ext-pdo_mysql": "PDO_MYSQL is required for Swoole to work with MySQL",
+ "ext-pdo_pgsql": "PDO_PGSQL is required for Swoole to work with PostgreSQL",
+ "ext-curl": "CURL is required for Swoole to work with HTTP",
+ "ext-sockets": "Sockets is required for Swoole to work with Socket",
+ "ext-openssl": "OpenSSL is required for Swoole to work with HTTPS",
+ "ext-posix": "*"
},
"php-ext": {
"extension-name": "swoole",
@@ -14,12 +23,8 @@
"description": "Enable sockets support"
},
{
- "name": "enable-openssl",
- "description": "Enable openssl support"
- },
- {
"name": "with-openssl-dir",
- "description": "Include OpenSSL support (requires OpenSSL >= 1.0.2)",
+ "description": "Specify openssl installation directory (requires OpenSSL 1.1.0 or later)?",
"needs-value": true
},
{
@@ -40,7 +45,7 @@
},
{
"name": "with-brotli-dir",
- "description": "Include Brotli support",
+ "description": "Specify brotli installation directory?",
"needs-value": true
},
{
@@ -62,6 +67,11 @@
"description": "Enable Sqlite database support"
},
{
+ "name": "with-swoole-firebird",
+ "description": "Enable Firebird database support",
+ "needs-value": true
+ },
+ {
"name": "enable-swoole-thread",
"description": "Enable swoole thread support (need php zts support)"
},
@@ -70,8 +80,26 @@
"description": "Enable iouring for file async support"
},
{
+ "name": "with-liburing-dir",
+ "description": "Specify liburing installation directory (requires liburing 2.8 or later)",
+ "needs-value": true
+ },
+ {
+ "name": "enable-uring-socket",
+ "description": "Enable iouring for http coroutine server support"
+ },
+ {
+ "name": "with-swoole-ssh2",
+ "description": "Enable async ssh2 client support",
+ "needs-value": true
+ },
+ {
+ "name": "enable-swoole-ftp",
+ "description": "Enable async ssh2 client support"
+ },
+ {
"name": "enable-zstd",
- "description": "Enable zstd support"
+ "description": "Enable zstd support (requires zstd 1.4.0 or later)"
}
]
}
diff --git a/php-pecl-swoole6.spec b/php-pecl-swoole6.spec
index f00a2f9..0350178 100644
--- a/php-pecl-swoole6.spec
+++ b/php-pecl-swoole6.spec
@@ -55,14 +55,14 @@
%bcond_with ftp
%global upstream_version 6.2.0
-%global upstream_prever RC1
+%global upstream_prever RC2
%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever}
%global _configure ../%{sources}/configure
Summary: PHP's asynchronous concurrent distributed networking framework
Name: %{?scl_prefix}php-pecl-%{pecl_name}6
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 2%{?dist}
+Release: 1%{?dist}
# Extension is Apache-2.0
# BSD-3-Clause: Hiredis
# MIT: nlohmann/json, nghttp2, llhttp
@@ -70,8 +70,6 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT
URL: https://pecl.php.net/package/%{pecl_name}
Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
-Patch0: 6013.patch
-
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?dtsprefix}gcc-c++
@@ -210,8 +208,6 @@ sed \
cd %{sources}
-%patch -P0 -p1
-
cp -p thirdparty/hiredis/COPYING hiredis-COPYING
%if %{with nghttpd2}
rm -r thirdparty/nghttp2
@@ -411,6 +407,10 @@ cd ../ZTS
%changelog
+* Tue Mar 3 2026 Remi Collet <remi@remirepo.net> - 6.2.0~RC2-1
+- update to 6.2.0RC2
+- drop patch merged upstream
+
* Fri Feb 27 2026 Remi Collet <remi@remirepo.net> - 6.2.0~RC1-2
- enable firebird using patch from
https://github.com/swoole/swoole-src/pull/6013
generated by cgit (git 2.34.1) at 2026-03-03 23:01:25 +0000