diff --git a/0001-Remove-PCRE-detection-fix-5625.patch b/0001-Remove-PCRE-detection-fix-5625.patch deleted file mode 100644 index 4ab703efaf3f6acdbfe8bb9d1699ae92e52280bc..0000000000000000000000000000000000000000 --- a/0001-Remove-PCRE-detection-fix-5625.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 88a7b74be6b654bb8445bf8cd719d8e5aec341e7 Mon Sep 17 00:00:00 2001 -From: matyhtf -Date: Mon, 23 Dec 2024 16:11:50 +0800 -Subject: [PATCH 1/2] Remove PCRE detection, fix #5625 - ---- - config.m4 | 1 - - ext-src/php_swoole.cc | 5 ----- - 2 files changed, 6 deletions(-) - -diff --git a/config.m4 b/config.m4 -index 701eaa569..63a3f2307 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -373,7 +373,6 @@ if test "$PHP_SWOOLE" != "no"; then - AC_CHECK_LIB(pthread, pthread_mutexattr_setpshared, AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_SETPSHARED, 1, [have pthread_mutexattr_setpshared])) - AC_CHECK_LIB(pthread, pthread_mutexattr_setrobust, AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_SETROBUST, 1, [have pthread_mutexattr_setrobust])) - AC_CHECK_LIB(pthread, pthread_mutex_consistent, AC_DEFINE(HAVE_PTHREAD_MUTEX_CONSISTENT, 1, [have pthread_mutex_consistent])) -- AC_CHECK_LIB(pcre, pcre_compile, AC_DEFINE(HAVE_PCRE, 1, [have pcre])) - - if test "$PHP_SWOOLE_DEV" = "yes"; then - AX_CHECK_COMPILE_FLAG(-Wbool-conversion, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wbool-conversion") -diff --git a/ext-src/php_swoole.cc b/ext-src/php_swoole.cc -index 1653abcf4..9315f70f5 100644 ---- a/ext-src/php_swoole.cc -+++ b/ext-src/php_swoole.cc -@@ -23,9 +23,7 @@ BEGIN_EXTERN_C() - #include "zend_exceptions.h" - #include "zend_extensions.h" - --#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) - #include "ext/pcre/php_pcre.h" --#endif - #include "ext/json/php_json.h" - - #include "stubs/php_swoole_arginfo.h" -@@ -914,9 +912,6 @@ PHP_MINFO_FUNCTION(swoole) { - #ifdef SW_USE_CURL - php_info_print_table_row(2, "curl-native", "enabled"); - #endif --#ifdef HAVE_PCRE -- php_info_print_table_row(2, "pcre", "enabled"); --#endif - #ifdef SW_USE_CARES - php_info_print_table_row(2, "c-ares", ares_version(nullptr)); - #endif --- -2.43.5 - diff --git a/swoole.spec b/swoole.spec index d2a2c54d094f19d4b8ea39a5c2f62cb40a9eb87e..8520035e455eddee48fd6256d4fef26ab5977f69 100644 --- a/swoole.spec +++ b/swoole.spec @@ -1,13 +1,12 @@ %global ini_name 40-swoole.ini Name: swoole -Version: 6.0.0 -Release: 2 +Version: 6.0.1 +Release: 1 Summary: Event-driven asynchronous and concurrent networking engine with high performance for PHP License: Apache-2.0 URL: https://www.swoole.com/ Source0: https://github.com/swoole/swoole-src/archive/refs/tags/v%{version}.tar.gz -Patch6001: 0001-Remove-PCRE-detection-fix-5625.patch BuildRequires: (php(language) >= 8.1 with php(language) < 8.5) BuildRequires: php-cli >= 8.1 BuildRequires: php-devel @@ -86,6 +85,9 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} %{_includedir}/php/ext/swoole %changelog +* Fri Mar 07 2025 Funda Wang - 6.0.1-1 +- update to version 6.0.1 + * Thu Dec 26 2024 Funda Wang - 6.0.0-2 - do not detect pcre diff --git a/v6.0.0.tar.gz b/v6.0.0.tar.gz deleted file mode 100644 index 98cfc6a9ffca7224b93dfbe4b62ec248f1b1018d..0000000000000000000000000000000000000000 Binary files a/v6.0.0.tar.gz and /dev/null differ diff --git a/v6.0.1.tar.gz b/v6.0.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4c7e617ecdd6c7bcffa01ad8932b0672b431ad0e Binary files /dev/null and b/v6.0.1.tar.gz differ