Attachment 239496 Details for Bug 268978 – Update pecl-swoole to 5.0.1

[patch] Update pecl-swoole to 5.0.1

Update_pecl-swoole_to_5.0.1.patch (text/plain), 6.38 KB, created by avkarenow on 2023-01-16 00:06:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: avkarenow

Created: 2023-01-16 00:06:07 UTC

Size: 6.38 KB

patch

obsolete

>diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile
>index 8fdfa6b..b44c2e0 100644
>--- a/devel/pecl-swoole/Makefile
>+++ b/devel/pecl-swoole/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	swoole
>-PORTVERSION=	4.8.12
>+PORTVERSION=	5.0.1
> CATEGORIES=	devel net
> 
> MAINTAINER=	vanilla@FreeBSD.org
>@@ -11,7 +11,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> USES=		compiler:c11 localbase:ldflags php:pecl ssl
> USE_PHP=	hash:build pcre
>-IGNORE_WITH_PHP=	82
> 
> CONFIGURE_ARGS+=	--enable-mysqlnd
> 
>diff --git a/devel/pecl-swoole/distinfo b/devel/pecl-swoole/distinfo
>index 33d1f6b..55b20d1 100644
>--- a/devel/pecl-swoole/distinfo
>+++ b/devel/pecl-swoole/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1664681702
>-SHA256 (PECL/swoole-4.8.12.tgz) = 0a0b844992d26c974957749ada86a9ff7a88daa512b7255db4fc41afa062f4a4
>-SIZE (PECL/swoole-4.8.12.tgz) = 2097350
>+TIMESTAMP = 1673820190
>+SHA256 (PECL/swoole-5.0.1.tgz) = 6e73086b28ce447cdd895f1f36167b12befd48e10224b43169e35d2cf9de05ff
>+SIZE (PECL/swoole-5.0.1.tgz) = 2033972
>diff --git a/devel/pecl-swoole/files/patch-ext-src_php__swoole__private.h b/devel/pecl-swoole/files/patch-ext-src_php__swoole__private.h
>deleted file mode 100644
>index f47c6e5..0000000
>--- a/devel/pecl-swoole/files/patch-ext-src_php__swoole__private.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- ext-src/php_swoole_private.h.orig	2022-07-12 01:57:52 UTC
>-+++ ext-src/php_swoole_private.h
>-@@ -905,7 +905,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);
>diff --git a/devel/pecl-swoole/files/patch-ext-src_swoole__admin__server.cc b/devel/pecl-swoole/files/patch-ext-src_swoole__admin__server.cc
>deleted file mode 100644
>index 54ce872..0000000
>--- a/devel/pecl-swoole/files/patch-ext-src_swoole__admin__server.cc
>+++ /dev/null
>@@ -1,55 +0,0 @@
>---- ext-src/swoole_admin_server.cc.orig	2021-10-29 10:11:22 UTC
>-+++ ext-src/swoole_admin_server.cc
>-@@ -171,8 +171,44 @@ static json get_socket_info(int fd) {
>-         };
>-         return return_value.dump();
>-     }
>-+#if defined(__FreeBSD__)
>-     json jinfo{
>-         {"state", info.tcpi_state},
>-+        {"ca_state", info.__tcpi_ca_state},
>-+        {"retransmits", info.__tcpi_retransmits},
>-+        {"probes", info.__tcpi_probes},
>-+        {"backoff", info.__tcpi_backoff},
>-+        {"options", info.tcpi_options},
>-+        {"snd_wscale", uint8_t(info.tcpi_snd_wscale)},
>-+        {"rcv_wscale", uint8_t(info.tcpi_rcv_wscale)},
>-+        {"rto", info.tcpi_rto},
>-+        {"ato", info.__tcpi_ato},
>-+        {"snd_mss", info.tcpi_snd_mss},
>-+        {"rcv_mss", info.tcpi_rcv_mss},
>-+        {"unacked", info.__tcpi_unacked},
>-+        {"sacked", info.__tcpi_sacked},
>-+        {"lost", info.__tcpi_lost},
>-+        {"retrans", info.__tcpi_retrans},
>-+        {"fackets", info.__tcpi_fackets},
>-+        {"last_data_sent", info.__tcpi_last_data_sent},
>-+        {"last_ack_sent", info.__tcpi_last_ack_sent},
>-+        {"last_data_recv", info.tcpi_last_data_recv},
>-+        {"last_ack_recv", info.__tcpi_last_ack_recv},
>-+        {"pmtu", info.__tcpi_pmtu},
>-+        {"rcv_ssthresh", info.__tcpi_rcv_ssthresh},
>-+        {"rtt", info.tcpi_rtt},
>-+        {"rttvar", info.tcpi_rttvar},
>-+        {"snd_ssthresh", info.tcpi_snd_ssthresh},
>-+        {"snd_cwnd", info.tcpi_snd_cwnd},
>-+        {"advmss", info.__tcpi_advmss},
>-+        {"reordering", info.__tcpi_reordering},
>-+        {"rcv_rtt", info.__tcpi_rcv_rtt},
>-+        {"rcv_space", info.tcpi_rcv_space},
>-+        {"total_retrans", 0},
>-+    };
>-+#else
>-+    json jinfo{
>-+        {"state", info.tcpi_state},
>-         {"ca_state", info.tcpi_ca_state},
>-         {"retransmits", info.tcpi_retransmits},
>-         {"probes", info.tcpi_probes},
>-@@ -205,6 +241,7 @@ static json get_socket_info(int fd) {
>-         {"rcv_space", info.tcpi_rcv_space},
>-         {"total_retrans", info.tcpi_total_retrans},
>-     };
>-+#endif
>-     return jinfo;
>- }
>- #endif
>diff --git a/devel/pecl-swoole/files/patch-src_server_manager.cc b/devel/pecl-swoole/files/patch-src_server_manager.cc
>deleted file mode 100644
>index 86ce44d..0000000
>--- a/devel/pecl-swoole/files/patch-src_server_manager.cc
>+++ /dev/null
>@@ -1,14 +0,0 @@
>---- src/server/manager.cc.orig	2022-07-12 01:57:55 UTC
>-+++ src/server/manager.cc
>-@@ -247,7 +247,11 @@ void Manager::start(Server *_server) {
>- #endif
>- 
>- #ifdef HAVE_PTHREAD_BARRIER
>-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
>-+    SW_START_SLEEP;
>-+#else
>-     pthread_barrier_wait(&_server->gs->manager_barrier);
>-+#endif
>- #else
>-     SW_START_SLEEP;
>- #endif
>diff --git a/devel/pecl-swoole/files/patch-src_server_master.cc b/devel/pecl-swoole/files/patch-src_server_master.cc
>deleted file mode 100644
>index 36de989..0000000
>--- a/devel/pecl-swoole/files/patch-src_server_master.cc
>+++ /dev/null
>@@ -1,36 +0,0 @@
>---- src/server/master.cc.orig	2022-07-12 01:57:55 UTC
>-+++ src/server/master.cc
>-@@ -448,7 +448,11 @@ int Server::start_master_thread() {
>-     if (!single_thread) {
>-         pthread_barrier_wait(&reactor_thread_barrier);
>-     }
>-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
>-+    SW_START_SLEEP;
>-+#else
>-     pthread_barrier_wait(&gs->manager_barrier);
>-+#endif
>- #else
>-     SW_START_SLEEP;
>- #endif
>-@@ -850,8 +854,10 @@ int Server::create() {
>- #ifdef HAVE_PTHREAD_BARRIER
>-     if (is_process_mode()) {
>-         pthread_barrier_init(&reactor_thread_barrier, nullptr, reactor_num + 1);
>-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
>-         pthread_barrierattr_setpshared(&gs->manager_barrier_attr, PTHREAD_PROCESS_SHARED);
>-         pthread_barrier_init(&gs->manager_barrier, &gs->manager_barrier_attr, 2);
>-+#endif
>-     }
>- #endif
>- 
>-@@ -983,8 +989,10 @@ void Server::destroy() {
>- #ifdef HAVE_PTHREAD_BARRIER
>-     if (is_process_mode()) {
>-         pthread_barrier_destroy(&reactor_thread_barrier);
>-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
>-         pthread_barrier_destroy(&gs->manager_barrier);
>-         pthread_barrierattr_destroy(&gs->manager_barrier_attr);
>-+#endif
>-     }
>- #endif
>-     sw_shm_free(session_list);

Actions: View | Diff

Attachments on bug 268978: 239496