diff options
| -rw-r--r-- | 0001-fix-cpu-affinity-check.patch | 24 | ||||
| -rw-r--r-- | PHPINFO | 8 | ||||
| -rw-r--r-- | REFLECTION | 74 | ||||
| -rw-r--r-- | php-pecl-swoole6.spec | 33 |
4 files changed, 82 insertions, 57 deletions
diff --git a/0001-fix-cpu-affinity-check.patch b/0001-fix-cpu-affinity-check.patch deleted file mode 100644 index 58c4370..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 -@@ -183,6 +183,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 - @@ -3,8 +3,8 @@ swoole Swoole => enabled Author => Swoole Team <team@swoole.com> -Version => 6.0.0 -Built => Dec 16 2024 00:00:00 +Version => 6.0.1 +Built => Feb 14 2025 00:00:00 coroutine => enabled with boost asm context trace_log => enabled epoll => enabled @@ -19,8 +19,8 @@ dtls => enabled http2 => enabled json => enabled curl-native => enabled -pcre => enabled -c-ares => 1.33.0 +curl-version => 8.9.1 +c-ares => 1.34.4 zlib => 1.3.1.zlib-ng brotli => E16781312/D16781312 zstd => 1.5.6 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #129 swoole version 6.0.0 ] { +Extension [ <persistent> extension #108 swoole version 6.0.1 ] { - Dependencies { Dependency [ json (Required) ] @@ -29,12 +29,12 @@ Extension [ <persistent> extension #129 swoole version 6.0.0 ] { } } - - Constants [400] { - Constant [ string SWOOLE_VERSION ] { 6.0.0 } - Constant [ int SWOOLE_VERSION_ID ] { 60000 } + - Constants [399] { + Constant [ string SWOOLE_VERSION ] { 6.0.1 } + Constant [ int SWOOLE_VERSION_ID ] { 60001 } Constant [ int SWOOLE_MAJOR_VERSION ] { 6 } Constant [ int SWOOLE_MINOR_VERSION ] { 0 } - Constant [ int SWOOLE_RELEASE_VERSION ] { 0 } + Constant [ int SWOOLE_RELEASE_VERSION ] { 1 } Constant [ string SWOOLE_EXTRA_VERSION ] { } Constant [ bool SWOOLE_DEBUG ] { } Constant [ bool SWOOLE_HAVE_COMPRESSION ] { 1 } @@ -269,7 +269,6 @@ Extension [ <persistent> extension #129 swoole version 6.0.0 ] { Constant [ int SWOOLE_MUTEX ] { 3 } Constant [ int SWOOLE_RWLOCK ] { 1 } Constant [ int SWOOLE_SPINLOCK ] { 5 } - Constant [ int SWOOLE_COROLOCK ] { 6 } Constant [ int SWOOLE_MSGQUEUE_ORIENT ] { 1 } Constant [ int SWOOLE_MSGQUEUE_BALANCE ] { 2 } Constant [ int SWOOLE_TIMER_MIN_MS ] { 1 } @@ -1044,7 +1043,7 @@ Extension [ <persistent> extension #129 swoole version 6.0.0 ] { } } - - Classes [51] { + - Classes [52] { Class [ <internal:swoole> class Swoole\Exception extends Exception implements Throwable, Stringable ] { - Constants [0] { @@ -1501,7 +1500,7 @@ Extension [ <persistent> extension #129 swoole version 6.0.0 ] { Property [ public $errCode = 0 ] } - - Methods [9] { + - Methods [8] { Method [ <internal:swoole, ctor> public method __construct ] { - Parameters [1] { @@ -1557,13 +1556,6 @@ Extension [ <persistent> extension #129 swoole version 6.0.0 ] { } - Return [ bool ] } - - Method [ <internal:swoole> public method destroy ] { - - - Parameters [0] { - } - - Return [ void ] - } } } @@ -3481,6 +3473,58 @@ Extension [ <persistent> extension #129 swoole version 6.0.0 ] { } } + Class [ <internal:swoole> class Swoole\Coroutine\Lock ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [1] { + Property [ public $errCode = 0 ] + } + + - Methods [5] { + Method [ <internal:swoole, ctor> public method __construct ] { + + - Parameters [1] { + Parameter #0 [ <optional> bool $shared = false ] + } + } + + Method [ <internal:swoole> public method __destruct ] { + + - Parameters [0] { + } + } + + Method [ <internal:swoole> public method lock ] { + + - Parameters [0] { + } + - Return [ bool ] + } + + Method [ <internal:swoole> public method trylock ] { + + - Parameters [0] { + } + - Return [ bool ] + } + + Method [ <internal:swoole> public method unlock ] { + + - Parameters [0] { + } + - Return [ bool ] + } + } + } + Class [ <internal:swoole> class Swoole\Coroutine\Channel ] { - Constants [0] { diff --git a/php-pecl-swoole6.spec b/php-pecl-swoole6.spec index ecb7155..448d643 100644 --- a/php-pecl-swoole6.spec +++ b/php-pecl-swoole6.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-swoole6 # -# SPDX-FileCopyrightText: Copyright 2013-2024 Remi Collet +# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # @@ -14,6 +14,8 @@ %endif %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global pie_vend swoole +%global pie_proj swoole %global pecl_name swoole # After 20-sockets, 20-json and 20-mysqlnd %global ini_name 40-%{pecl_name}.ini @@ -46,17 +48,15 @@ %bcond_without curl %bcond_without nghttpd2 -%global upstream_version 6.0.0 +%global upstream_version 6.0.1 #global upstream_prever RC1 %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 -# Without prever, See https://github.com/swoole/swoole-src/issues/5531 -#Version: %%{upstream_version}%%{?upstream_prever:~%%{upstream_prever}} -Version: %{upstream_version} -Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} # Extension is Apache-2.0 # BSD-3-Clause: Hiredis # MIT: nlohmann/json, nghttp2 @@ -64,8 +64,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: 0001-fix-cpu-affinity-check.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ @@ -122,10 +120,10 @@ 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-pie(%{pie_vend}/%{pie_proj}) = %{version} %if 0%{?fedora} >= 42 || 0%{?rhel} >= 10 || "%{php_version}" >= "8.4" Obsoletes: %{?scl_prefix}php-pecl-%{pecl_name} < 6 @@ -150,6 +148,7 @@ Conflicts: %{?scl_prefix}php-pecl-%{pecl_name}5 < 6 # 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 @@ -203,8 +202,6 @@ rm -r thirdparty/nghttp2 cp -p thirdparty/nghttp2/COPYING nghttp2-COPYING %endif -%patch -P0 -p1 -b .affinity - # 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 @@ -279,6 +276,9 @@ peclbuild() { --with-libdir=%{_lib} \ --with-php-config=$* +# 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 } @@ -378,6 +378,11 @@ cd ../ZTS %changelog +* Fri Feb 14 2025 Remi Collet <remi@remirepo.net> - 6.0.1-1 +- update to 6.0.1 +- drop patch merged upstream +- provide php-pie(swoole/swoole) + * Mon Dec 16 2024 Remi Collet <remi@remirepo.net> - 6.0.0-5 - update to 6.0.0 GA - enable zstd support |