From nobody Sun Oct 02 03:44:57 2022 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 4Mg8x55PZ7z4dnTC; Sun, 2 Oct 2022 03:44:57 +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 4Mg8x54v06z40Xl; Sun, 2 Oct 2022 03:44:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664682297; 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=L/A8vggngdnT6nNL6mp6UhfJfd5WQr80uTPgWvSZYFE=; b=F8jflLxxWPw/xDIkLC1Hoj0mdxF2yAU/QdijUAvZWvYxq7qrVMvOAa2/sLNXZITE6+vCRD /sbg1JyHwuVBO920CwbmdMM7gS/DjZBMKppU6yogkCuC7bq5eMcbHfmOsexPMUed5QB/mt V/9prPdjnVzN5nCbTQP4458R1DqCBHqpvxsRH0qVvsP8Kln/f220e7QsYe3szlpDwOFqnG vIWHlasGWd36qOQ26gXm5mnc0d2Tmk0YaDzJSVdEgEYWFJzLScvaBYobsPGWHKSzZk2eDJ WP3nhv4qsVFjf2xSGbPaAFXRiESUzq20yTYua/niM7J41685P+poe38Ub4Wx8g== 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 4Mg8x53xlPzkyW; Sun, 2 Oct 2022 03:44:57 +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 2923iv8W007941; Sun, 2 Oct 2022 03:44:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2923ivUN007940; Sun, 2 Oct 2022 03:44:57 GMT (envelope-from git) Date: Sun, 2 Oct 2022 03:44:57 GMT Message-Id: <202210020344.2923ivUN007940@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: 8205a77b96b7 - main - devel/pecl-swoole: update to 4.8.12, also fix error with SWOOLE_PROCESS. 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: 8205a77b96b7a543a8306b1a5f37ac6ae1ef1103 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664682297; 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=L/A8vggngdnT6nNL6mp6UhfJfd5WQr80uTPgWvSZYFE=; b=iv4NU8iZ43dbVDuyA1T4pnLgUcUkaOOAvt/gkzU/hQtpirr+9T9E1Eltsms2/lJNUomliy 7U4/4mT5xLcyFylFjSOiPfnQCtTJSZtkuOu26z/8Qrq95G7yHhO3/Kga1Op09dcDP5Ql/A YpGul0uLSbYmj7GZEjgvtT4JlDIv0OH+3ReARzUbcKnwhViQErzn7pv2HsUdoeGLGp8EHn XLKVZcxHXmrIMzGEih5arsHXf3RPdCiN/w3bojCz1GYyygmYwa3g7YbckD86n5XMFJOIH6 J+gXmyoZU97cC7e4Pe3JD1EQOQmB3JGdtNiKuTbsM+z4ZPej6njIOa4MfcmxeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664682297; a=rsa-sha256; cv=none; b=A3qwOXMm6ctBswp8qUISX6wwfSS0G28qP9cs7U9+x5ZlI+gkH1uoeD+/0VSnIcyadmb3G4 4uHEyguVYICiVbdAuGLZazHxpKOymFdG+eP7ZmBo/d4co2Skz2qivFbE5rJHFAiDzJURAU Qw3/ptR+9pDOnZI2DF+z/rCqsEPluukrG9e1MzaeONMEjaR4uZokiAqBukgdl3q5wrrzrd L+fGzwcL6tNeDgcGHdeUJdY0XyNS1Q34R4caJ0koVPacaqamGPXHWpyMeHh5JEThlY2ywe vGnT52uYDWNGGBflLTGvmz26TQAv0i+waMvdmzgW5K+2lBFL9acs4whVziJeDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=8205a77b96b7a543a8306b1a5f37ac6ae1ef1103 commit 8205a77b96b7a543a8306b1a5f37ac6ae1ef1103 Author: Vanilla I. Shu AuthorDate: 2022-10-02 03:43:40 +0000 Commit: Vanilla I. Shu CommitDate: 2022-10-02 03:44:46 +0000 devel/pecl-swoole: update to 4.8.12, also fix error with SWOOLE_PROCESS. PR: 266555 Reported by: Ricardo Sette --- devel/pecl-swoole/Makefile | 2 +- devel/pecl-swoole/distinfo | 6 ++-- .../files/patch-ext-src_php__swoole__private.h | 4 +-- .../pecl-swoole/files/patch-src_server_manager.cc | 14 +++++++++ devel/pecl-swoole/files/patch-src_server_master.cc | 36 ++++++++++++++++++++++ 5 files changed, 56 insertions(+), 6 deletions(-) diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile index a71d738055a9..8fdfa6bb6d55 100644 --- a/devel/pecl-swoole/Makefile +++ b/devel/pecl-swoole/Makefile @@ -1,5 +1,5 @@ PORTNAME= swoole -PORTVERSION= 4.8.11 +PORTVERSION= 4.8.12 CATEGORIES= devel net MAINTAINER= vanilla@FreeBSD.org diff --git a/devel/pecl-swoole/distinfo b/devel/pecl-swoole/distinfo index 78e8e1b0bb49..33d1f6bfc07b 100644 --- a/devel/pecl-swoole/distinfo +++ b/devel/pecl-swoole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657667124 -SHA256 (PECL/swoole-4.8.11.tgz) = 307ddd7909e24c8edd7f650d7caeefd6a90fe49c721b0de3f5a7407990430f67 -SIZE (PECL/swoole-4.8.11.tgz) = 1855159 +TIMESTAMP = 1664681702 +SHA256 (PECL/swoole-4.8.12.tgz) = 0a0b844992d26c974957749ada86a9ff7a88daa512b7255db4fc41afa062f4a4 +SIZE (PECL/swoole-4.8.12.tgz) = 2097350 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 2d9fc4523cc7..f47c6e5e84d0 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-10-29 10:11:22 UTC +--- ext-src/php_swoole_private.h.orig 2022-07-12 01:57:52 UTC +++ ext-src/php_swoole_private.h -@@ -891,7 +891,7 @@ static sw_inline zend_bool sw_zend_is_callable_at_fram +@@ -905,7 +905,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-src_server_manager.cc b/devel/pecl-swoole/files/patch-src_server_manager.cc new file mode 100644 index 000000000000..86ce44d49ce1 --- /dev/null +++ b/devel/pecl-swoole/files/patch-src_server_manager.cc @@ -0,0 +1,14 @@ +--- 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 new file mode 100644 index 000000000000..36de9891106b --- /dev/null +++ b/devel/pecl-swoole/files/patch-src_server_master.cc @@ -0,0 +1,36 @@ +--- 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);