From 87aa6ea898475e157d5446cb4c7cfa3d9ddc511b Mon Sep 17 00:00:00 2001
From: Mohd Husaam Mehdi <husaam.mehdi@iopsys.eu>
Date: Thu, 10 Jul 2025 14:53:55 +0530
Subject: [PATCH] fluent-bit: bump version and adjust patch accordingly

---
 fluent-bit/Makefile                    |  4 ++--
 fluent-bit/patches/0005-kmsg_log.patch | 32 +++-----------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/fluent-bit/Makefile b/fluent-bit/Makefile
index 1590518b1..fa0724089 100644
--- a/fluent-bit/Makefile
+++ b/fluent-bit/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fluent-bit
-PKG_VERSION:=4.0.2
+PKG_VERSION:=4.0.4
 PKG_RELEASE:=$(AUTORELEASE)
 
 LOCAL_DEV:=0
@@ -13,7 +13,7 @@ ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL_FILE:=v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit/archive/refs/tags/
-PKG_HASH:=aa0577ba7251081c8d5398b2a905b5b0585bb657ca13b39a5e12931437516f08
+PKG_HASH:=591037d249d9058e69d83e94a47cb507fa423f0c7d4df202229a01da4996407b
 endif
 
 PKG_LICENSE:=Apache-2.0
diff --git a/fluent-bit/patches/0005-kmsg_log.patch b/fluent-bit/patches/0005-kmsg_log.patch
index 605ca992c..ca56a7318 100644
--- a/fluent-bit/patches/0005-kmsg_log.patch
+++ b/fluent-bit/patches/0005-kmsg_log.patch
@@ -1,34 +1,8 @@
 diff --git a/plugins/in_kmsg/in_kmsg.c b/plugins/in_kmsg/in_kmsg.c
-index 9bafd1b60..9524cf194 100644
+index cd5c4cd17..9524cf194 100644
 --- a/plugins/in_kmsg/in_kmsg.c
 +++ b/plugins/in_kmsg/in_kmsg.c
-@@ -36,6 +36,7 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <inttypes.h>
-+#include <time.h>
- 
- #include "in_kmsg.h"
- 
-@@ -143,7 +144,7 @@ static inline int process_line(const char *line,
-     }
-     p++;
- 
--    val = strtol(p, &end, 10);
-+    val = strtoul(p, &end, 10);
-     if ((errno == ERANGE && (val == INT_MAX || val == INT_MIN))
-         || (errno != 0 && val == 0)) {
-         goto fail;
-@@ -153,7 +154,7 @@ static inline int process_line(const char *line,
-     p = ++end;
- 
-     /* Timestamp */
--    val = strtol(p, &end, 10);
-+    val = strtoul(p, &end, 10);
-     if ((errno == ERANGE && (val == INT_MAX || val == INT_MIN))
-         || (errno != 0 && val == 0)) {
-         goto fail;
-@@ -164,6 +165,15 @@ static inline int process_line(const char *line,
+@@ -165,6 +165,15 @@ static inline int process_line(const char *line,
  
      flb_time_set(&ts, ctx->boot_time.tv_sec + tv.tv_sec, tv.tv_usec * 1000);
  
@@ -44,7 +18,7 @@ index 9bafd1b60..9524cf194 100644
      /* Now process the human readable message */
      p = strchr(p, ';');
      if (!p) {
-@@ -197,7 +207,10 @@ static inline int process_line(const char *line,
+@@ -198,7 +207,10 @@ static inline int process_line(const char *line,
                  FLB_LOG_EVENT_UINT64_VALUE(tv.tv_usec),
  
                  FLB_LOG_EVENT_CSTRING_VALUE("msg"),