From nobody Thu Jan 26 11:50:38 2023 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 4P2fCz1PV7z3bYBB; Thu, 26 Jan 2023 11:50:39 +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 4P2fCz0x0Yz4MP6; Thu, 26 Jan 2023 11:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674733839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EbM/RMdpx1OR9jdodzCSb6v6dGENClgieBGqXQcsYA=; b=CdE/4wJv06dAnPnGniVt52T+KGFsqIHSJ0oUFU3gf5YGrpgeDe9GiW81HqJzaRO5TnqYWR rCJOea2UwGqKI3K7HB7qzgIuKdKtpxAnYAHBUB6s/Asuep6Psdo0BfXX20PclBnGljwA9G iSCZmhHM7rBaNqq8nVNiXEH2uFRZ7q6Vj4WQFJoWae5a2xNJPWoLBFz3TK0SV0l+HvFyio Gz2Y0sRgSip11JYJE9T8vV91DHM7m6k0vo1IDalufGLo/xDrpy3Asezy8zVTujNwfuG42u 5ZaSgeHtvblDaeWZ/QD9d++MxLTB/pH8CizuPXiwxfFCqD9mCAem778mOLZdhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674733839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EbM/RMdpx1OR9jdodzCSb6v6dGENClgieBGqXQcsYA=; b=lSTN8b/F/gE2ae5WQAihUHXXvHaJD+voZNdxY7ixvQwCanQPnyFiurcKAtfuTCgWdlsV1+ yFRNUpQlCnV+TzjDu5uTYROU8+KI9aWYUsFmgagBBQ6CgDO5HlmqbKEUAXVvPF6c7BZkg1 i+CdB6xECYUqsHJWxb8vABTLmBq85qzSQ+M7EilmHW8qjSjFxPOCl2yFaOEFTkCP+K8Fza WSoWVXGica9R0t82NN9L76yqm2V5I+YhsF3kANcxnoyR0ReKqMQJqaoU+6Ex0GThgfKU+f 99WqCc2OdAyx7SHFlcgwEO5WrUJnaLmUXBbltWdED2hBgQXBGTLlO8o1bNiQ6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674733839; a=rsa-sha256; cv=none; b=r9TDvK8lVyzwXHr5GZ/E65qvg6h7w39atNkUnkBKtGUx/zL2GyEG+srh2uMWESt+bKMuuB el3jlxnF2D0LzDVkEMJ2EdsEDRYPGSv308U+EjmD2XeK1NWdoU/ieG7xJqoicomsu9pwhP OMje/UnUKncsWu/b1QAKmp9dsgdh8E90mq76Mk8CWeO78rVBqyEX2Kh3kZxrGOOPu7SIda XGPE17TxYrY6DZCWfbjkE+EW0L1J92XnqaIpwSb3K5PAizYJVHyPmS3uaF7NzbXUsgeTk+ PGnM9Qnq0pCIgSJJDK3toeDt/d3HxQKLvrw7rNz3HEU9YjCYZ1HQUUfGD2BL4A== 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 4P2fCz00HFzT2s; Thu, 26 Jan 2023 11:50:38 +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 30QBoc2a028114; Thu, 26 Jan 2023 11:50:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QBocMd028113; Thu, 26 Jan 2023 11:50:38 GMT (envelope-from git) Date: Thu, 26 Jan 2023 11:50:38 GMT Message-Id: <202301261150.30QBocMd028113@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: d3cbf71e4b1d - main - devel/pecl-swoole: update to 5.0.1 [1], and add two options (BROLTI/PGSQL) [2] 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: d3cbf71e4b1da279dad24d030de63b2d2b5d6a3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3cbf71e4b1da279dad24d030de63b2d2b5d6a3e commit d3cbf71e4b1da279dad24d030de63b2d2b5d6a3e Author: Vanilla I. Shu AuthorDate: 2023-01-26 11:48:58 +0000 Commit: Vanilla I. Shu CommitDate: 2023-01-26 11:48:58 +0000 devel/pecl-swoole: update to 5.0.1 [1], and add two options (BROLTI/PGSQL) [2] PR: 268978 Reported by: avkarenow at o2.pl [1] --- devel/pecl-swoole/Makefile | 9 ++-- devel/pecl-swoole/distinfo | 6 +-- .../files/patch-ext-src_php__swoole__private.h | 11 ----- .../files/patch-ext-src_swoole__admin__server.cc | 55 ---------------------- .../pecl-swoole/files/patch-src_server_manager.cc | 14 ------ devel/pecl-swoole/files/patch-src_server_master.cc | 36 -------------- 6 files changed, 9 insertions(+), 122 deletions(-) diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile index 8fdfa6bb6d55..5e310454c2d4 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,11 +11,10 @@ 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 -OPTIONS_DEFINE= CARES CURL HTTP2 JSON SOCKETS +OPTIONS_DEFINE= BROTLI CARES CURL HTTP2 JSON PGSQL SOCKETS CARES_LIB_DEPENDS= libcares.so:dns/c-ares CARES_CONFIGURE_ON= --enable-cares HTTP2_CONFIGURE_ON= --enable-http2 \ @@ -28,5 +27,9 @@ CURL_CONFIGURE_ON= --enable-swoole-curl CURL_USE= PHP=curl JSON_CONFIGURE_ON= --enable-swoole-json JSON_USE= PHP=json:build +PGSQL_CONFIGURE_ON= --enable-swoole-pgsql +PGSQL_USES= pgsql +BROTLI_CONFIGURE_ON= --enable-brotli +BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli .include diff --git a/devel/pecl-swoole/distinfo b/devel/pecl-swoole/distinfo index 33d1f6bfc07b..55b20d1ccd72 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 f47c6e5e84d0..000000000000 --- 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 54ce8721745e..000000000000 --- 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 86ce44d49ce1..000000000000 --- 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 36de9891106b..000000000000 --- 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);