diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile index 69789775bf0f..50f4c27e8d97 100644 --- a/devel/pecl-swoole/Makefile +++ b/devel/pecl-swoole/Makefile @@ -1,28 +1,28 @@ # Created by: vanilla@ PORTNAME= swoole -PORTVERSION= 4.6.5 +PORTVERSION= 4.6.6 CATEGORIES= devel net MAINTAINER= vanilla@FreeBSD.org COMMENT= Asynchronous, concurrent, and distributed networking framework LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c11 localbase:ldflags php:pecl ssl USE_PHP= hash:build pcre CONFIGURE_ARGS+= --enable-mysqlnd OPTIONS_DEFINE= HTTP2 SOCKETS JSON CURL HTTP2_CONFIGURE_ON= --enable-http2 --enable-openssl SOCKETS_USE= PHP=sockets:build SOCKETS_DESC= Use native php sockets extension SOCKETS_CONFIGURE_ON= --enable-sockets CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_ON= --enable-swoole-curl JSON_CONFIGURE_ON= --enable-swoole-json JSON_USE= PHP=json:build .include diff --git a/devel/pecl-swoole/distinfo b/devel/pecl-swoole/distinfo index de7d778fc028..81d13bd7ee07 100644 --- a/devel/pecl-swoole/distinfo +++ b/devel/pecl-swoole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618043747 -SHA256 (PECL/swoole-4.6.5.tgz) = 1fb0c02220a06b08185f74adf50653d3f2dc2c4aacef01c5c8a5ef2169e117a7 -SIZE (PECL/swoole-4.6.5.tgz) = 1642233 +TIMESTAMP = 1619156627 +SHA256 (PECL/swoole-4.6.6.tgz) = 75ac779852c8a692945fc20892b45ed6143cb20198e52d2448445fe39bd21541 +SIZE (PECL/swoole-4.6.6.tgz) = 1643261 diff --git a/devel/pecl-swoole/files/patch-config.m4 b/devel/pecl-swoole/files/patch-config.m4 index 1e7cba9deedb..2688d067148d 100644 --- a/devel/pecl-swoole/files/patch-config.m4 +++ b/devel/pecl-swoole/files/patch-config.m4 @@ -1,11 +1,11 @@ ---- config.m4.orig 2021-02-09 10:27:52 UTC +--- config.m4.orig 2021-04-22 09:33:36 UTC +++ config.m4 -@@ -294,7 +294,7 @@ if test "$PHP_SWOOLE" != "no"; then +@@ -337,7 +337,7 @@ if test "$PHP_SWOOLE" != "no"; then AC_CHECK_LIB(c, poll, AC_DEFINE(HAVE_POLL, 1, [have poll])) AC_CHECK_LIB(c, sendfile, AC_DEFINE(HAVE_SENDFILE, 1, [have sendfile])) AC_CHECK_LIB(c, kqueue, AC_DEFINE(HAVE_KQUEUE, 1, [have kqueue])) - AC_CHECK_LIB(c, backtrace, AC_DEFINE(HAVE_EXECINFO, 1, [have execinfo])) + AC_CHECK_LIB(execinfo, backtrace, AC_DEFINE(HAVE_EXECINFO, 1, [have execinfo])) AC_CHECK_LIB(c, daemon, AC_DEFINE(HAVE_DAEMON, 1, [have daemon])) AC_CHECK_LIB(c, mkostemp, AC_DEFINE(HAVE_MKOSTEMP, 1, [have mkostemp])) AC_CHECK_LIB(c, inotify_init, AC_DEFINE(HAVE_INOTIFY, 1, [have inotify])) diff --git a/devel/pecl-swoole/files/patch-ext-src_php__swoole.h b/devel/pecl-swoole/files/patch-ext-src_php__swoole__private.h similarity index 60% rename from devel/pecl-swoole/files/patch-ext-src_php__swoole.h rename to devel/pecl-swoole/files/patch-ext-src_php__swoole__private.h index bc8975af8edc..5adb5764f752 100644 --- a/devel/pecl-swoole/files/patch-ext-src_php__swoole.h +++ b/devel/pecl-swoole/files/patch-ext-src_php__swoole__private.h @@ -1,11 +1,11 @@ ---- ext-src/php_swoole.h.orig 2021-02-09 10:27:52 UTC -+++ ext-src/php_swoole.h -@@ -948,7 +948,7 @@ static sw_inline zend_bool sw_zend_is_callable_at_fram - { +--- ext-src/php_swoole_private.h.orig 2021-04-23 05:47:52 UTC ++++ ext-src/php_swoole_private.h +@@ -894,7 +894,7 @@ static sw_inline zend_bool sw_zend_is_callable_at_fram + char **error) { zend_string *name; zend_bool ret; -#if PHP_VERSION_ID < 80000 +#if PHP_VERSION_ID < 80001 ret = zend_is_callable_ex(zcallable, zobject ? Z_OBJ_P(zobject) : NULL, check_flags, &name, fci_cache, error); #else ret = zend_is_callable_at_frame(zcallable, zobject ? Z_OBJ_P(zobject) : NULL, frame, check_flags, fci_cache, error);