fluent-bit: update to 3.1.9

Add patch from Alpine to fix compilation with GCC14.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
pull/25300/head
Rosen Penev 2024-10-31 13:59:53 -07:00 committed by Hannu Nyman
parent ca503cc405
commit 625c55f04a
2 changed files with 32 additions and 2 deletions

View File

@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fluent-bit
PKG_VERSION:=3.1.3
PKG_VERSION:=3.1.9
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git
PKG_SOURCE_VERSION=v$(PKG_VERSION)
PKG_MIRROR_HASH:=85b861693a9ed597e4e55e30330dd2fb96daa997eb71424a55ccc28de92eef78
PKG_MIRROR_HASH:=cb81f94e4d4b1cb88dee06f9534efbb7fdc92a24d950cab7ccbd1a01d89bf908
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE

View File

@ -0,0 +1,30 @@
Fix -Wint-conversion error with gcc 14 due to musl using POSIX strerror_r.
```
/home/build/aports/testing/fluent-bit/src/fluent-bit-3.1.9/src/flb_network.c: In function 'net_connect_async':
/home/build/aports/testing/fluent-bit/src/fluent-bit-3.1.9/src/flb_network.c:566:17: error: assignment to 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
566 | str = strerror_r(error, so_error_buf, sizeof(so_error_buf));
```
--- a/src/flb_network.c
+++ b/src/flb_network.c
@@ -551,9 +551,6 @@ static int net_connect_async(int fd,
}
/* Connection is broken, not much to do here */
-#if ((defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || \
- (defined(_XOPEN_SOURCE) || _XOPEN_SOURCE - 0L >= 600L)) && \
- (!defined(_GNU_SOURCE))
ret = strerror_r(error, so_error_buf, sizeof(so_error_buf));
if (ret == 0) {
str = so_error_buf;
@@ -562,9 +559,6 @@ static int net_connect_async(int fd,
flb_errno();
return -1;
}
-#else
- str = strerror_r(error, so_error_buf, sizeof(so_error_buf));
-#endif
flb_error("[net] TCP connection failed: %s:%i (%s)",
u->tcp_host, u->tcp_port, str);
return -1;