From nobody Sun Oct 31 00:47:45 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CD5DB183B6BD; Sun, 31 Oct 2021 00:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hhcvj5MKvz3HkQ; Sun, 31 Oct 2021 00:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9992A14073; Sun, 31 Oct 2021 00:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19V0ljYV087819; Sun, 31 Oct 2021 00:47:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0ljil087818; Sun, 31 Oct 2021 00:47:45 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:47:45 GMT Message-Id: <202110310047.19V0ljil087818@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Vanilla I. Shu" Subject: git: ee8dd7e4ff51 - main - devel/pecl-swoole: update to 4.8.1. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vanilla X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee8dd7e4ff51360889bbc0e6825a48217d83d0dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee8dd7e4ff51360889bbc0e6825a48217d83d0dd commit ee8dd7e4ff51360889bbc0e6825a48217d83d0dd Author: Vanilla I. Shu AuthorDate: 2021-10-31 00:45:35 +0000 Commit: Vanilla I. Shu CommitDate: 2021-10-31 00:47:38 +0000 devel/pecl-swoole: update to 4.8.1. --- devel/pecl-swoole/Makefile | 2 +- devel/pecl-swoole/distinfo | 6 +-- .../files/patch-ext-src_php__swoole__private.h | 4 +- .../files/patch-ext-src_swoole__admin__server.cc | 55 ++++++++++++++++++++++ 4 files changed, 61 insertions(+), 6 deletions(-) diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile index 4e9fcf3e24ab..2d10b9bd9e70 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 f49d0d04da48..d1c2cf81ba57 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 c67c8b8473dd..2d9fc4523cc7 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 000000000000..54ce8721745e --- /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