Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Jan 2025 22:56:50 GMT
From:      Palle Girgensohn <girgen@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 83d8d3bd7aca - main - sysutils/fluent-bit: Upgrade to 3.2.4
Message-ID:  <202501062256.506Muo6i049876@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by girgen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=83d8d3bd7aca28814c400828d5d4738294297325

commit 83d8d3bd7aca28814c400828d5d4738294297325
Author:     Palle Girgensohn <girgen@FreeBSD.org>
AuthorDate: 2025-01-06 21:52:26 +0000
Commit:     Palle Girgensohn <girgen@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501062256.506Muo6i049876>