From nobody Mon Jan 6 22:56:50 2025 X-Original-To: dev-commits-ports-all@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 4YRqLX08nQz5kMVM; Mon, 06 Jan 2025 22:56:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YRqLV6zQZz4r5h; Mon, 6 Jan 2025 22:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736204211; 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=NeBS4pN+TRo490ukvLdSnZoWKkmmKIBeWP3PfjP2T9E=; b=xeB9F6KaAcgR+YbvlXioOivBpIsXeZjJ1B04LiJdypnp8AD/INcPNKlKRC70HejB3NbiGM jZU1BI9/txJFfc+AK6lZr6qmhebAulpmKUFtD8oOaOleiuHr6FC6+QgmCAwOWvRpOH9UpN PSCnbDBxzNVEd05EwYYoCII6yq2mL5Boqo4FNVDszEhPetnYMM33ywwqtuir6uRZRhT/Y8 RLSVZj+RrLqfjMeIk6oHpDyVMvPZ0SxMhfLYyIkz5+yH3lftk4BP8+WS5efISmNi8Xvihl xxPLSDaNbv1FG3He074sLWKNDECaMBl2F20shp0NrV/JJJXXIDcQzEqOdmHGkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736204211; 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=NeBS4pN+TRo490ukvLdSnZoWKkmmKIBeWP3PfjP2T9E=; b=TXYCHRrmd7MZpa99ylTYZ4q1AFrRYLaUjXXVxXwZlX40YRAP+zlA1jip4HDav3doQhWM4X 4epr/pOiiUPgmJ4JJpbBw8fVde/MsB9h8E4L46D2Z6QVL12ZnA9dweE1oux1WcJxq6R3mw OBeRJu57r2zfcILxcE38Q1qp6SbTp7RKFQFwEkPYwF4PngHUxFpkBSje+j+9EyG6OjCmK/ EhyzgM0QboENSET8C24X+6JE5tQ1BRmF7855v3b7SxjXpv15TJZErs/mflusp76+fFefJ6 9ib/AzMJoy9GduzI/7vqk2ctni77dBEVVbyqdwHbd31geTsdkx2xKPtGE5q6xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736204211; a=rsa-sha256; cv=none; b=HVhgU4OUqtN6brsYNRIjXjmMp4Od5euy5eVE/jjwzQwJhsykrtowZXkOEeWZpflM9xOPw9 qrdxUTxCkf4CZ5MZxXcj7LfXHd8h95Ns8vfXXGp/rS/XFdw2su+NJrDQXDSw6F+6UrOYS3 XREuLL0UBuRtSA2JOWx6tTSWDuONlLVMSWH7r49a5GRs/ESi+kfajCjE6lu4jwfgHICN+T EATbaGxmdf9Yst3roVnGpZY2btDlpcUnosZFuWMATCP/qYdGogdQP5faQzJGgylvFVaBe4 ltxGNJujgSTdVEkPW/1Au0ijOfhg/72F4ayb3L1qLfs4bOfkWOkU/1iwCBG6qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YRqLV6L7Nzksd; Mon, 06 Jan 2025 22:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 506MuoSX049879; Mon, 6 Jan 2025 22:56:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 506Muo6i049876; Mon, 6 Jan 2025 22:56:50 GMT (envelope-from git) Date: Mon, 6 Jan 2025 22:56:50 GMT Message-Id: <202501062256.506Muo6i049876@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Palle Girgensohn Subject: git: 83d8d3bd7aca - main - sysutils/fluent-bit: Upgrade to 3.2.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: girgen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83d8d3bd7aca28814c400828d5d4738294297325 Auto-Submitted: auto-generated The branch main has been updated by girgen: URL: https://cgit.FreeBSD.org/ports/commit/?id=83d8d3bd7aca28814c400828d5d4738294297325 commit 83d8d3bd7aca28814c400828d5d4738294297325 Author: Palle Girgensohn AuthorDate: 2025-01-06 21:52:26 +0000 Commit: Palle Girgensohn CommitDate: 2025-01-06 22:56:37 +0000 sysutils/fluent-bit: Upgrade to 3.2.4 Hard code the coro stack size to something that is expected. Documentation states that 24576 is default [1] but FreeBSD has a PTHREAD_MIN_SIZE of only 4 * 512, so the coro stack size is just too small for some use cases [2]. [1] https://docs.fluentbit.io/manual/administration/configuring-fluent-bit PR: 283299 (reported by Antti Rasinen) |2] Release notes: https://github.com/fluent/fluent-bit/releases/tag/v3.2.4 --- sysutils/fluent-bit/Makefile | 2 +- sysutils/fluent-bit/distinfo | 6 +++--- sysutils/fluent-bit/files/patch-include__flb_coro.h | 14 ++++++++++++++ sysutils/fluent-bit/pkg-plist | 1 + 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile index 44e5720b06d0..2668b54334f4 100644 --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -1,6 +1,6 @@ PORTNAME= fluent-bit DISTVERSIONPREFIX= v -DISTVERSION= 3.2.3 +DISTVERSION= 3.2.4 CATEGORIES= sysutils MAINTAINER= girgen@FreeBSD.org diff --git a/sysutils/fluent-bit/distinfo b/sysutils/fluent-bit/distinfo index ffff5334f4cf..8d9deb0588fb 100644 --- a/sysutils/fluent-bit/distinfo +++ b/sysutils/fluent-bit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734733314 -SHA256 (fluent-fluent-bit-v3.2.3_GH0.tar.gz) = 6a533d7f0f488d5fb707fead07f3ad147b300fb87cbd7b8ec461cc1de3607d80 -SIZE (fluent-fluent-bit-v3.2.3_GH0.tar.gz) = 28775279 +TIMESTAMP = 1736172749 +SHA256 (fluent-fluent-bit-v3.2.4_GH0.tar.gz) = 1e758df0dec0be3e33f903da1fbcc0f87bd266098147d511ca8d162cbb657576 +SIZE (fluent-fluent-bit-v3.2.4_GH0.tar.gz) = 28781866 diff --git a/sysutils/fluent-bit/files/patch-include__flb_coro.h b/sysutils/fluent-bit/files/patch-include__flb_coro.h new file mode 100644 index 000000000000..10e241bc153a --- /dev/null +++ b/sysutils/fluent-bit/files/patch-include__flb_coro.h @@ -0,0 +1,14 @@ +--- include/fluent-bit/flb_coro.h.orig 2024-12-30 22:32:11.000000000 +0100 ++++ include/fluent-bit/flb_coro.h 2025-01-06 23:50:52.035541000 +0100 +@@ -68,7 +68,11 @@ + #define STACK_FACTOR 2 /* Use 24KiB for coro stacks */ + #endif + #else ++#ifdef FLB_SYSTEM_FREEBSD ++#define FLB_CORO_STACK_SIZE 24576 /* FreeBSD's PTHREAD_STACK_MIN is just 2048 */ ++#else + #define STACK_FACTOR 1 ++#endif + #endif + + #ifdef FLB_CORO_STACK_SIZE diff --git a/sysutils/fluent-bit/pkg-plist b/sysutils/fluent-bit/pkg-plist index f08ec220f37b..d915c7bbc1ce 100644 --- a/sysutils/fluent-bit/pkg-plist +++ b/sysutils/fluent-bit/pkg-plist @@ -21,6 +21,7 @@ include/fluent-bit/flb_cfl_record_accessor.h include/fluent-bit/flb_chunk_trace.h include/fluent-bit/flb_compat.h include/fluent-bit/flb_compression.h +include/fluent-bit/flb_conditionals.h include/fluent-bit/flb_config.h include/fluent-bit/flb_config_format.h include/fluent-bit/flb_config_map.h