Merge Official Source

Signed-off-by: Tianling Shen <[email protected]>

admin/fluent-bit/Makefile

@@ -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

admin/fluent-bit/patches/010-musl-strerror_r.patch

@@ -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;

admin/ipmitool/Makefile

@@ -8,16 +8,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ipmitool
-PKG_VERSION:=1.8.18
-PKG_RELEASE:=5
+PKG_VERSION:=1.8.19
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_HASH:=0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://codeberg.org/IPMITool/ipmitool
+PKG_SOURCE_VERSION:=IPMITOOL_$(subst .,_,$(PKG_VERSION))
+PKG_MIRROR_HASH:=a3f0d3510fc47cbfd752f58084a72a09d0d5b23113bd87bf78ee32e74adcb4bc
+
+PKG_MAINTAINER:=Alexander Couzens <[email protected]>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:ipmitool_project:ipmitool
 
+PKG_FIXUP=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ipmitool
@@ -26,17 +33,17 @@ define Package/ipmitool
   DEPENDS:=+libopenssl +libncurses +libreadline
   TITLE:=Command-line interface to IPMI-enabled devices
   URL:=https://github.com/ipmitool/ipmitool
-  MAINTAINER:=Alexander Couzens <[email protected]>
 endef
 
 define Package/ipmitool/Default/description
 	Command-line interface to IPMI-enabled devices
 endef
 
 define Package/ipmitool/install
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ipmitool $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ipmievd $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ipmitool $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ipmievd $(1)/usr/sbin/
 endef
 
 CONFIGURE_ARGS += \