From nobody Sun Oct 01 05:02:27 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 4RysQX0n55z4wJK9; Sun, 1 Oct 2023 05:02:28 +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 4RysQW75QHz3G1v; Sun, 1 Oct 2023 05:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696136548; 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=d3JqMkfqhO4IVNJSYfPPBolgAnpr1HxeSqj1wiOtWaE=; b=USl+GMWH2BTrofswejcpAD4fQhao8c23bYqwQMi8KtE9LL/o8Dzk8bmGq4Ut6z/vyNU+zz MQ2hUUNRuJedRGuRxGsKP+6E5Ju7MM9O9y871BSO3CqjbMJDGGAUwVY93Vo8TTGbk4QZ14 ArkTsliFDWKUW3Y93tEw6rHy1HvqLn/4gDiWOAX9UOLie0paw0HP9Txe8qOgop8PvL1ZCt wOWucI7zjrnfR6GeqfM1ORiAwsVtEZdoyGwxpY4dNWFcxwjXCBwqSgqsInTlLONOv2GwwL Qdn2fBYQrMpouLnSrFhq1rcwkdFozuVjT7OIgs9757D5eC1gXQFrXZjQXx+oUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696136548; a=rsa-sha256; cv=none; b=UgrR9htiD16OJSz+38YVP57EBPaTLWSFlj5I1nrQdNhy9VvaVcAXP+exImBlDyfnzjOE62 tmUViqHQPUspzoYU84gzE1ZGlvA+EIsh/PZGvnELhS7qXw2ZMQgCk6E2fdRQU0oJNQ/HFb jGhiNPZW6lGy1Dl5A9paqB+tGtiaEyLMv2nMdANnWMnONvKLyaUSDb3jHPdm7K8aA0CM5l B08k48tcUSk690z5GkP65NTL988xlP0hTSyW9PjG7h63c4wv+PMnzCvjvB+Pdt7YMYkji+ tE/E/tor6mqF+FJhldPeFiAXLcs0LBNdW/um6A359Olf9b9IrpHLcr0ftXQFwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696136548; 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=d3JqMkfqhO4IVNJSYfPPBolgAnpr1HxeSqj1wiOtWaE=; b=A73jdGZbADxK9ti03scl9RstGv6uKLPkfiS8Xzour45MI8WyPFoHYhZUfxn7o0Hyfh3l3w /HABVXHcvZgQb06oxkLEY4Pw+K5tQ4Y+wvDqOEDgTAGcX8ZBPSbtb0GSfDZeclKcvmA8Hb JHUKZhj9VdhytI+9eq1+0pYtOEgurbJstDCDcoibrWMIAM/6cr2Acc30U1ulv0m9QVc//o B4MQYpxXXi5JSnjYAQrbtsAiEuXsiFI0rvcpmr/WwDOrO0MMSefTigep33lSOL11iUVg7F KAB/Dg9nTqNpJyfHCSwq2oEfgMxiLUBcelLeysS3aHMUuOeHCFt52qKM6xOsNw== 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 4RysQW68Trz22v; Sun, 1 Oct 2023 05:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39152R7p059839; Sun, 1 Oct 2023 05:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39152R3J059836; Sun, 1 Oct 2023 05:02:27 GMT (envelope-from git) Date: Sun, 1 Oct 2023 05:02:27 GMT Message-Id: <202310010502.39152R3J059836@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: 8567d88e758e - main - devel/pecl-swoole: update to 5.1.0, also add php83 support. 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: 8567d88e758e2c202f954eefcc6a82039ebff248 Auto-Submitted: auto-generated The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=8567d88e758e2c202f954eefcc6a82039ebff248 commit 8567d88e758e2c202f954eefcc6a82039ebff248 Author: Vanilla I. Shu AuthorDate: 2023-10-01 05:01:45 +0000 Commit: Vanilla I. Shu CommitDate: 2023-10-01 05:02:20 +0000 devel/pecl-swoole: update to 5.1.0, also add php83 support. --- devel/pecl-swoole/Makefile | 4 ++-- devel/pecl-swoole/distinfo | 6 +++--- devel/pecl-swoole/files/patch-config.m4 | 4 ++-- devel/pecl-swoole/files/patch-include_swoole__async.h | 13 +++++++++++++ devel/pecl-swoole/files/patch-src_coroutine_system.cc | 12 ++++++++++++ 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile index 539baec7ec56..d7355b311bcd 100644 --- a/devel/pecl-swoole/Makefile +++ b/devel/pecl-swoole/Makefile @@ -1,5 +1,5 @@ PORTNAME= swoole -PORTVERSION= 5.0.3 +PORTVERSION= 5.1.0 CATEGORIES= devel net MAINTAINER= vanilla@FreeBSD.org @@ -10,7 +10,6 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c11 localbase:ldflags php:build,pecl ssl -IGNORE_WITH_PHP= 83 CONFIGURE_ARGS+= --enable-mysqlnd @@ -29,6 +28,7 @@ JSON_CONFIGURE_ON= --enable-swoole-json JSON_USES= php:build PGSQL_CONFIGURE_ON= --enable-swoole-pgsql PGSQL_USES= pgsql +PGSQL_USE= PHP=pdo:build BROTLI_CONFIGURE_ON= --enable-brotli BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli diff --git a/devel/pecl-swoole/distinfo b/devel/pecl-swoole/distinfo index 13ecf9dde989..6d0c0fc6b72e 100644 --- a/devel/pecl-swoole/distinfo +++ b/devel/pecl-swoole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684622878 -SHA256 (PECL/swoole-5.0.3.tgz) = 6c51e11199214921e07ab1b9f0e67781c96f7b8e06afb4225f05d1dc79832ead -SIZE (PECL/swoole-5.0.3.tgz) = 2066852 +TIMESTAMP = 1696125285 +SHA256 (PECL/swoole-5.1.0.tgz) = a95effad6f5c7acf24ce0635cec646caccbb56f19e42a2643ccbfb46d82a92ee +SIZE (PECL/swoole-5.1.0.tgz) = 2199005 diff --git a/devel/pecl-swoole/files/patch-config.m4 b/devel/pecl-swoole/files/patch-config.m4 index dfdcd4f5c616..aede679ba8a8 100644 --- a/devel/pecl-swoole/files/patch-config.m4 +++ b/devel/pecl-swoole/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2021-07-16 07:18:11 UTC +--- config.m4.orig 2023-09-29 09:24:26 UTC +++ config.m4 -@@ -340,7 +340,7 @@ if test "$PHP_SWOOLE" != "no"; then +@@ -369,7 +369,7 @@ if test "$PHP_SWOOLE" != "no"; then AC_CHECK_LIB(c, poll, AC_DEFINE(HAVE_POLL, 1, [have poll])) AC_CHECK_LIB(c, sendfile, AC_DEFINE(HAVE_SENDFILE, 1, [have sendfile])) AC_CHECK_LIB(c, kqueue, AC_DEFINE(HAVE_KQUEUE, 1, [have kqueue])) diff --git a/devel/pecl-swoole/files/patch-include_swoole__async.h b/devel/pecl-swoole/files/patch-include_swoole__async.h new file mode 100644 index 000000000000..641b5f3381fd --- /dev/null +++ b/devel/pecl-swoole/files/patch-include_swoole__async.h @@ -0,0 +1,13 @@ +--- include/swoole_async.h.orig 2023-10-01 04:44:15 UTC ++++ include/swoole_async.h +@@ -23,6 +23,10 @@ + #include + #include + ++#ifdef __FreeBSD__ ++#include ++#endif ++ + #ifndef O_DIRECT + #define O_DIRECT 040000 + #endif diff --git a/devel/pecl-swoole/files/patch-src_coroutine_system.cc b/devel/pecl-swoole/files/patch-src_coroutine_system.cc new file mode 100644 index 000000000000..95b124ebe059 --- /dev/null +++ b/devel/pecl-swoole/files/patch-src_coroutine_system.cc @@ -0,0 +1,12 @@ +--- src/coroutine/system.cc.orig 2023-10-01 03:15:13 UTC ++++ src/coroutine/system.cc +@@ -711,7 +711,8 @@ std::shared_ptr async_lock(void *resource) + "resource(%p) has already been bound to another coroutine#%ld, " + "%s of the same resource in coroutine#%ld at the same time is not allowed", + resource, +- *iter, ++ iter->second, ++ iter->first, + Coroutine::get_current_cid()); + return nullptr; + }