summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--0001-fix-cpu-affinity-check.patch24
-rw-r--r--PHPINFO11
-rw-r--r--REFLECTION47
-rw-r--r--php-pecl-swoole5.spec23
4 files changed, 73 insertions, 32 deletions
diff --git a/0001-fix-cpu-affinity-check.patch b/0001-fix-cpu-affinity-check.patch
new file mode 100644
index 0000000..f4ea94d
--- /dev/null
+++ b/0001-fix-cpu-affinity-check.patch
@@ -0,0 +1,24 @@
+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 11efdde..7ba886f 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,8 +3,8 @@ swoole
Swoole => enabled
Author => Swoole Team <team@swoole.com>
-Version => 5.1.6
-Built => Nov 28 2024 00:00:00
+Version => 5.1.7
+Built => Feb 16 2025 00:00:00
coroutine => enabled with boost asm context
trace_log => enabled
epoll => enabled
@@ -14,14 +14,15 @@ cpu_affinity => enabled
spinlock => enabled
rwlock => enabled
sockets => enabled
-openssl => OpenSSL 3.1.4 24 Oct 2023
+openssl => OpenSSL 3.2.2 4 Jun 2024
dtls => enabled
http2 => enabled
json => enabled
curl-native => enabled
+curl-version => 8.9.1
pcre => enabled
-c-ares => 1.28.1
-zlib => 1.2.13
+c-ares => 1.34.4
+zlib => 1.3.1.zlib-ng
brotli => E16781312/D16781312
mutex_timedlock => enabled
pthread_barrier => enabled
diff --git a/REFLECTION b/REFLECTION
index 3ceec55..38ec79f 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
+Extension [ <persistent> extension #108 swoole version 5.1.7 ] {
- Dependencies {
Dependency [ json (Required) ]
@@ -33,11 +33,11 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
}
- Constants [422] {
- Constant [ string SWOOLE_VERSION ] { 5.1.6 }
- Constant [ int SWOOLE_VERSION_ID ] { 50106 }
+ Constant [ string SWOOLE_VERSION ] { 5.1.7 }
+ Constant [ int SWOOLE_VERSION_ID ] { 50107 }
Constant [ int SWOOLE_MAJOR_VERSION ] { 5 }
Constant [ int SWOOLE_MINOR_VERSION ] { 1 }
- Constant [ int SWOOLE_RELEASE_VERSION ] { 6 }
+ Constant [ int SWOOLE_RELEASE_VERSION ] { 7 }
Constant [ string SWOOLE_EXTRA_VERSION ] { }
Constant [ bool SWOOLE_DEBUG ] { }
Constant [ bool SWOOLE_HAVE_COMPRESSION ] { 1 }
@@ -2328,7 +2328,7 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Parameters [1] {
Parameter #0 [ <optional> int $flags = SORT_REGULAR ]
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayIterator> public method ksort ] {
@@ -2336,7 +2336,7 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Parameters [1] {
Parameter #0 [ <optional> int $flags = SORT_REGULAR ]
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayIterator> public method uasort ] {
@@ -2344,7 +2344,7 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Parameters [1] {
Parameter #0 [ <required> callable $callback ]
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayIterator> public method uksort ] {
@@ -2352,21 +2352,21 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Parameters [1] {
Parameter #0 [ <required> callable $callback ]
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayIterator> public method natsort ] {
- Parameters [0] {
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayIterator> public method natcasesort ] {
- Parameters [0] {
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayIterator, prototype Serializable> public method unserialize ] {
@@ -2902,7 +2902,7 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Parameters [1] {
Parameter #0 [ <optional> int $flags = SORT_REGULAR ]
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayIterator> public method ksort ] {
@@ -2910,7 +2910,7 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Parameters [1] {
Parameter #0 [ <optional> int $flags = SORT_REGULAR ]
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayIterator> public method uasort ] {
@@ -2918,7 +2918,7 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Parameters [1] {
Parameter #0 [ <required> callable $callback ]
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayIterator> public method uksort ] {
@@ -2926,21 +2926,21 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Parameters [1] {
Parameter #0 [ <required> callable $callback ]
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayIterator> public method natsort ] {
- Parameters [0] {
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayIterator> public method natcasesort ] {
- Parameters [0] {
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayIterator, prototype Serializable> public method unserialize ] {
@@ -3126,7 +3126,7 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Parameters [1] {
Parameter #0 [ <optional> int $flags = SORT_REGULAR ]
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayObject> public method ksort ] {
@@ -3134,7 +3134,7 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Parameters [1] {
Parameter #0 [ <optional> int $flags = SORT_REGULAR ]
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayObject> public method uasort ] {
@@ -3142,7 +3142,7 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Parameters [1] {
Parameter #0 [ <required> callable $callback ]
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayObject> public method uksort ] {
@@ -3150,21 +3150,21 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Parameters [1] {
Parameter #0 [ <required> callable $callback ]
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayObject> public method natsort ] {
- Parameters [0] {
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayObject> public method natcasesort ] {
- Parameters [0] {
}
- - Tentative return [ bool ]
+ - Tentative return [ true ]
}
Method [ <internal:SPL, inherits ArrayObject, prototype Serializable> public method unserialize ] {
@@ -5211,8 +5211,9 @@ Extension [ <persistent> extension #127 swoole version 5.1.6 ] {
- Static methods [0] {
}
- - Properties [8] {
+ - Properties [9] {
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 c583538..a903998 100644
--- a/php-pecl-swoole5.spec
+++ b/php-pecl-swoole5.spec
@@ -1,8 +1,8 @@
# remirepo spec file for php-pecl-swoole5
#
-# Copyright (c) 2013-2024 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
# Please, preserve the changelog entries
#
@@ -39,7 +39,7 @@
%bcond_without curl
%bcond_without nghttpd2
-%global upstream_version 5.1.6
+%global upstream_version 5.1.7
#global upstream_prever RC2
%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever}
%global _configure ../%{sources}/configure
@@ -55,6 +55,9 @@ 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++
@@ -127,6 +130,8 @@ Conflicts: %{?scl_prefix}php-pecl-%{pecl_name}4 < 5
%endif
# Only one extension can be installed (same symbols)
Conflicts: %{?scl_prefix}php-pecl-openswoole
+Conflicts: %{?scl_prefix}php-pecl-openswoole22
+Conflicts: %{?scl_prefix}php-pecl-openswoole25
%description
@@ -180,6 +185,8 @@ 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
@@ -246,6 +253,9 @@ peclbuild() {
--with-libdir=%{_lib} \
--with-php-config=$1
+# See https://bugzilla.redhat.com/show_bug.cgi?id=2345743
+sed -e 's:-Wl,-rpath,/usr/usr/lib64 -L/usr/usr/lib64::' -i Makefile
+
%make_build
}
@@ -344,6 +354,11 @@ cd ../ZTS
%changelog
+* 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
+- fix cpu affinity check using patch from v6
+
* Thu Nov 28 2024 Remi Collet <remi@remirepo.net> - 5.1.6-1
- update to 5.1.6
generated by cgit (git 2.34.1) at 2025-02-21 10:50:23 +0000