summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--0001-fix-cpu-affinity-check.patch24
-rw-r--r--PHPINFO8
-rw-r--r--REFLECTION14
-rw-r--r--php-pecl-swoole5.spec23
4 files changed, 24 insertions, 45 deletions
diff --git a/0001-fix-cpu-affinity-check.patch b/0001-fix-cpu-affinity-check.patch
deleted file mode 100644
index f4ea94d..0000000
--- a/0001-fix-cpu-affinity-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5630753cba195133a741d6f768143e40ff7454f6 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 16 Dec 2024 09:28:53 +0100
-Subject: [PATCH] fix cpu affinity check
-
----
- config.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config.m4 b/config.m4
-index ada2e983b..701eaa569 100644
---- a/config.m4
-+++ b/config.m4
-@@ -172,6 +172,7 @@ AC_DEFUN([AC_SWOOLE_CPU_AFFINITY],
- #include <sys/cpuset.h>
- typedef cpuset_t cpu_set_t;
- #else
-+ #define _GNU_SOURCE 1
- #include <sched.h>
- #endif
- ]], [[
---
-2.47.1
-
diff --git a/PHPINFO b/PHPINFO
index 7ba886f..d19881c 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,8 +3,8 @@ swoole
Swoole => enabled
Author => Swoole Team <team@swoole.com>
-Version => 5.1.7
-Built => Feb 16 2025 00:00:00
+Version => 5.1.8
+Built => Aug 4 2025 00:00:00
coroutine => enabled with boost asm context
trace_log => enabled
epoll => enabled
@@ -14,14 +14,14 @@ cpu_affinity => enabled
spinlock => enabled
rwlock => enabled
sockets => enabled
-openssl => OpenSSL 3.2.2 4 Jun 2024
+openssl => OpenSSL 3.2.4 11 Feb 2025
dtls => enabled
http2 => enabled
json => enabled
curl-native => enabled
curl-version => 8.9.1
pcre => enabled
-c-ares => 1.34.4
+c-ares => 1.34.5
zlib => 1.3.1.zlib-ng
brotli => E16781312/D16781312
mutex_timedlock => enabled
diff --git a/REFLECTION b/REFLECTION
index 38ec79f..701af8c 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #108 swoole version 5.1.7 ] {
+Extension [ <persistent> extension #115 swoole version 5.1.8 ] {
- Dependencies {
Dependency [ json (Required) ]
@@ -33,11 +33,11 @@ Extension [ <persistent> extension #108 swoole version 5.1.7 ] {
}
- Constants [422] {
- Constant [ string SWOOLE_VERSION ] { 5.1.7 }
- Constant [ int SWOOLE_VERSION_ID ] { 50107 }
+ Constant [ string SWOOLE_VERSION ] { 5.1.8 }
+ Constant [ int SWOOLE_VERSION_ID ] { 50108 }
Constant [ int SWOOLE_MAJOR_VERSION ] { 5 }
Constant [ int SWOOLE_MINOR_VERSION ] { 1 }
- Constant [ int SWOOLE_RELEASE_VERSION ] { 7 }
+ Constant [ int SWOOLE_RELEASE_VERSION ] { 8 }
Constant [ string SWOOLE_EXTRA_VERSION ] { }
Constant [ bool SWOOLE_DEBUG ] { }
Constant [ bool SWOOLE_HAVE_COMPRESSION ] { 1 }
@@ -4964,7 +4964,7 @@ Extension [ <persistent> extension #108 swoole version 5.1.7 ] {
- Static methods [0] {
}
- - Properties [10] {
+ - Properties [11] {
Property [ public $errCode = 0 ]
Property [ public $errMsg = '' ]
Property [ public $sock = -1 ]
@@ -4975,6 +4975,7 @@ Extension [ <persistent> extension #108 swoole version 5.1.7 ] {
Property [ public $host = NULL ]
Property [ public $port = 0 ]
Property [ public $ssl = false ]
+ Property [ public $serverLastStreamId = 0 ]
}
- Methods [13] {
@@ -5211,9 +5212,8 @@ Extension [ <persistent> extension #108 swoole version 5.1.7 ] {
- Static methods [0] {
}
- - Properties [9] {
+ - Properties [8] {
Property [ public $streamId = 0 ]
- Property [ public $serverLastStreamId = 0 ]
Property [ public $errCode = 0 ]
Property [ public $statusCode = 0 ]
Property [ public $pipeline = false ]
diff --git a/php-pecl-swoole5.spec b/php-pecl-swoole5.spec
index a903998..521da3f 100644
--- a/php-pecl-swoole5.spec
+++ b/php-pecl-swoole5.spec
@@ -13,6 +13,8 @@
%global _root_prefix %{_prefix}
%endif
+%global pie_vend swoole
+%global pie_proj swoole
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global pecl_name swoole
# After 20-sockets, 20-json and 20-mysqlnd
@@ -39,7 +41,7 @@
%bcond_without curl
%bcond_without nghttpd2
-%global upstream_version 5.1.7
+%global upstream_version 5.1.8
#global upstream_prever RC2
%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever}
%global _configure ../%{sources}/configure
@@ -55,9 +57,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
-# Backported from version 6
-Patch0: 0001-fix-cpu-affinity-check.patch
-
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?dtsprefix}gcc-c++
@@ -107,10 +106,12 @@ Requires: %{?scl_prefix}php-sockets%{?_isa}
Requires: %{?scl_prefix}php-mysqlnd%{?_isa}
Requires: %{?scl_prefix}php-pdo%{?_isa}
-Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
-Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
+Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
+Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
+Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version}
%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 || "%{php_version}" >= "8.2"
Obsoletes: %{?scl_prefix}php-pecl-%{pecl_name} < 5
@@ -185,8 +186,6 @@ rm -r thirdparty/nghttp2
cp -p thirdparty/nghttp2/COPYING nghttp2-COPYING
%endif
-%patch -P0 -p1
-
# Sanity check, really often broken
extver=$(sed -n '/#define SWOOLE_VERSION /{s/.* "//;s/".*$//;p}' include/swoole_version.h)
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -354,6 +353,10 @@ cd ../ZTS
%changelog
+* Mon Aug 4 2025 Remi Collet <remi@remirepo.net> - 5.1.8-1
+- update to 5.1.8
+- drop patch merged upstream
+
* Sun Feb 16 2025 Remi Collet <remi@remirepo.net> - 5.1.7-1
- update to 5.1.7
- re-license spec file to CECILL-2.1
generated by cgit (git 2.34.1) at 2025-09-03 17:44:36 +0000