From 2815257c87ebe77ca2b30a1f1bfd6c19cedc0246 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Sun, 23 Jun 2024 23:53:16 +0200
Subject: [PATCH] testing/fluent-bit: upgrade to 3.0.7

---
 testing/fluent-bit/APKBUILD           |  8 +++-----
 testing/fluent-bit/xsi-strerror.patch | 15 ---------------
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 testing/fluent-bit/xsi-strerror.patch

diff --git a/testing/fluent-bit/APKBUILD b/testing/fluent-bit/APKBUILD
index 3f1472507d7..769b2afb3a5 100644
--- a/testing/fluent-bit/APKBUILD
+++ b/testing/fluent-bit/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: wener <wenermail@gmail.com>
 # Maintainer: wener <wenermail@gmail.com>
 pkgname=fluent-bit
-pkgver=2.1.10
+pkgver=3.0.7
 pkgrel=0
 pkgdesc="Fast and Lightweight Log processor and forwarder"
 url="https://fluentbit.io/"
@@ -30,7 +30,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/fluent/fluent-bit/archive/v$
 	fluent-bit.initd
 	chunkio-static-lib-fts.patch
 	exclude-luajit.patch
-	xsi-strerror.patch
 	"
 # enable check when this solved - https://github.com/fluent/fluent-bit/issues/2464#issuecomment-673280055
 options="!check"
@@ -40,7 +39,7 @@ build() {
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
 	# default CORE_STACK_SIZE=((3 * PTHREAD_STACK_MIN) / 2)=3072 is invalid
-	# based on https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/configuration-file
+	# based on https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/classic-mode/configuration-file
 	# set default to 24576
 	cmake -B build \
 		-DCMAKE_INSTALL_PREFIX=/usr \
@@ -68,9 +67,8 @@ package() {
 }
 
 sha512sums="
-55caefa81cdeaf293b727829383c6eaa75bc2f8b8c61ebe15e1478c66033921fde6e50c39fc8c39a7d2d93d03892f709daf4d1b6caacf586133de5268de10299  fluent-bit-2.1.10.tar.gz
+ad556044077523312c7ca0c7a150b42183c4de556a0fc686eaa1221bfd7512a130116e0ecd8a35e13afb471ef98891e310403a43f0e7ffc77d4310b92be5cd61  fluent-bit-3.0.7.tar.gz
 e17c8b7d09b524855167baf3a3766c5420181370cdd1d21133e7c18d7316b224a6c0aa240be26d3d0443d91247a82759161f7ad12f142b4b84924da5694a61e6  fluent-bit.initd
 6bd7d8b4da93a17f29b6ea1e0286ea226d0e376024284741110936779b3229bd8d6cd03ffbdc5d3b4842294e7f32a888de0dd16b0851b65d91b062ca58530ea0  chunkio-static-lib-fts.patch
 e3308a8377fb8ba496415b7a31e9e022e5aa9965d27a0c33ea5166a29049b72cb364bbcdf9d8611ef3407b0968f9bd4adff12cdb39728bbebd382710e5bc75d0  exclude-luajit.patch
-d61f30344af997f126486fa5b34cd3fbfe88bfc9aea394a8c60d0206f4db8db998eadf637a3a581b89512411c1e7980c414e236e455d5e2b889d20a556ee6577  xsi-strerror.patch
 "
diff --git a/testing/fluent-bit/xsi-strerror.patch b/testing/fluent-bit/xsi-strerror.patch
deleted file mode 100644
index 527de20992a..00000000000
--- a/testing/fluent-bit/xsi-strerror.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/flb_network.c
-+++ b/src/flb_network.c
-@@ -523,9 +523,10 @@
-             }
- 
-             /* Connection is broken, not much to do here */
--            str = strerror_r(error, so_error_buf, sizeof(so_error_buf));
-+            /* XXX: XSI */
-+            int _err = strerror_r(error, so_error_buf, sizeof(so_error_buf));
-             flb_error("[net] TCP connection failed: %s:%i (%s)",
--                      u->tcp_host, u->tcp_port, str);
-+                      u->tcp_host, u->tcp_port, so_error_buf);
-             return -1;
-         }
-     }