From ee8dd7e4ff51360889bbc0e6825a48217d83d0dd Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Sun, 31 Oct 2021 08:45:35 +0800 Subject: [PATCH] devel/pecl-swoole: update to 4.8.1. --- devel/pecl-swoole/Makefile | 2 +- devel/pecl-swoole/distinfo | 6 +- .../patch-ext-src_php__swoole__private.h | 4 +- .../patch-ext-src_swoole__admin__server.cc | 55 +++++++++++++++++++ 4 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 devel/pecl-swoole/files/patch-ext-src_swoole__admin__server.cc diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile index 4e9fcf3e24ab6..2d10b9bd9e709 100644 --- a/devel/pecl-swoole/Makefile +++ b/devel/pecl-swoole/Makefile @@ -1,7 +1,7 @@ # Created by: vanilla@ PORTNAME= swoole -PORTVERSION= 4.8.0 +PORTVERSION= 4.8.1 CATEGORIES= devel net MAINTAINER= vanilla@FreeBSD.org diff --git a/devel/pecl-swoole/distinfo b/devel/pecl-swoole/distinfo index f49d0d04da487..d1c2cf81ba578 100644 --- a/devel/pecl-swoole/distinfo +++ b/devel/pecl-swoole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634372087 -SHA256 (PECL/swoole-4.8.0.tgz) = ca69644725a18ae8e1e4780a9f7228a73161e379319024711a8dc75029a95b44 -SIZE (PECL/swoole-4.8.0.tgz) = 1698813 +TIMESTAMP = 1635598373 +SHA256 (PECL/swoole-4.8.1.tgz) = fe3699431cfe62c57eeb9af3ddd30d4232fdec454f8b95920c244f13564b8609 +SIZE (PECL/swoole-4.8.1.tgz) = 1835815 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 index c67c8b8473dde..2d9fc4523cc76 100644 --- a/devel/pecl-swoole/files/patch-ext-src_php__swoole__private.h +++ b/devel/pecl-swoole/files/patch-ext-src_php__swoole__private.h @@ -1,6 +1,6 @@ ---- ext-src/php_swoole_private.h.orig 2021-07-16 07:18:11 UTC +--- ext-src/php_swoole_private.h.orig 2021-10-29 10:11:22 UTC +++ ext-src/php_swoole_private.h -@@ -890,7 +890,7 @@ static sw_inline zend_bool sw_zend_is_callable_at_fram +@@ -891,7 +891,7 @@ static sw_inline zend_bool sw_zend_is_callable_at_fram char **error) { zend_string *name; zend_bool ret; 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 new file mode 100644 index 0000000000000..54ce8721745e8 --- /dev/null +++ b/devel/pecl-swoole/files/patch-ext-src_swoole__admin__server.cc @@ -0,0 +1,55 @@ +--- 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