From efa59bb21618021d2726aed339bf448aa055fc4e Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@FreeBSD.org>
Date: Wed, 28 Jan 2026 14:19:47 +0100
Subject: [PATCH] sysutils/fluent-bit: Improve RC script and fix issues

* Document 'fluent_bit_group' variable
* Install PID file with mode 0600 instead of 0755
* Reuse ${name}
* Pass '-t {name}' to daemon(8)
* Remove self-created PID file

PR:		292782
MFH:		2026Q1
Approved by:	girgen (maintainer)
---
 sysutils/fluent-bit/Makefile            |  2 +-
 sysutils/fluent-bit/files/fluent-bit.in | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile
index a1ddc8129f62..f282c64e9678 100644
--- a/sysutils/fluent-bit/Makefile
+++ b/sysutils/fluent-bit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fluent-bit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	girgen@FreeBSD.org
diff --git a/sysutils/fluent-bit/files/fluent-bit.in b/sysutils/fluent-bit/files/fluent-bit.in
index bbfa2d56efaa..d7c1979b3600 100644
--- a/sysutils/fluent-bit/files/fluent-bit.in
+++ b/sysutils/fluent-bit/files/fluent-bit.in
@@ -13,6 +13,7 @@
 #				Default: %%ETCDIR%%/fluent-bit.conf
 # fluent_bit_flags (str):	Extra flags passed to fluent-bit
 # fluent_bit_user (str):	Default run as user nobody
+# fluent_bit_group (str):	Default run as group nogroup
 
 . /etc/rc.subr
 
@@ -28,16 +29,22 @@ load_rc_config $name
 pidfile=/var/run/${name}.pid
 procname="%%PREFIX%%/bin/fluent-bit"
 command="/usr/sbin/daemon"
-command_args="-H -p ${pidfile} -o /var/log/${name}/${name}.log ${procname} --quiet --config ${fluent_bit_config} ${fluent_bit_flags}"
+command_args="-H -p ${pidfile} -o /var/log/${name}/${name}.log -t ${name} ${procname} --quiet --config ${fluent_bit_config} ${fluent_bit_flags}"
 
-start_precmd=fluent_bit_startprecmd
+start_precmd="${name}_startprecmd"
+stop_postcmd="${name}_stoppostcmd"
 
 fluent_bit_startprecmd()
 {
 	install -o ${fluent_bit_user} -g ${fluent_bit_group} -d /var/log/${name}
 	if [ ! -e ${pidfile} ]; then
-		install -o ${fluent_bit_user} -g ${fluent_bit_group} /dev/null ${pidfile};
+		install -m 0600 -o ${fluent_bit_user} -g ${fluent_bit_group} /dev/null ${pidfile}
 	fi
 }
 
+fluent_bit_stoppostcmd()
+{
+	rm -f ${pidfile}
+}
+
 run_rc_command "$1"