openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-22 01:44:32 +04:00
Code Issues Packages Projects Releases Wiki Activity

fluent-bit: update to 4.1.0

Browse Source 
- Remove obsolete patch

Build system: aarch64
Build-tested: mediatek/filogic
Run-tested: mediatek/filogic

Signed-off-by: Biao Zhu <zhumouren0623@qq.com>
This commit is contained in:
Biao Zhu
2025-09-27 11:12:00 +08:00
committed by Hannu Nyman
parent 598504d895
commit 2cea4de176
2 changed files with 2 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/fluent-bit/Makefile
View File

@@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fluent-bit PKG_NAME:=fluent-bit
PKG_VERSION:=4.0.9 PKG_VERSION:=4.1.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git
PKG_SOURCE_VERSION=v$(PKG_VERSION) PKG_SOURCE_VERSION=v$(PKG_VERSION)
PKG_MIRROR_HASH:=3826f4d1c37a9aee45db5f4e13f0779e5ab23638993009b24b524ec7be05096f PKG_MIRROR_HASH:=37c8e452cb2b492eb364bad350ebe2675e413e1bf83e8ca3e4607ade1084fb71
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE

54
admin/fluent-bit/patches/100-tls-replace-NPN-with-ALPN-for-client-connections.patch
View File

@@ -1,54 +0,0 @@
From 1d8ae53900e27a28fa31adb7f71f235ce919bafc Mon Sep 17 00:00:00 2001
From: Biao Zhu <zhumouren0623@qq.com>
Date: Tue, 2 Sep 2025 23:45:31 +0800
Subject: [PATCH] tls: replace NPN with ALPN for client connections
Signed-off-by: Biao Zhu <zhumouren0623@qq.com>
---
src/tls/openssl.c | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
--- a/src/tls/openssl.c
+++ b/src/tls/openssl.c
@@ -198,21 +198,6 @@ static int tls_context_server_alpn_selec
return result;
}
-static int tls_context_client_alpn_select_callback(SSL *ssl,
- unsigned char **out,
- unsigned char *outlen,
- const unsigned char *in,
- unsigned int inlen,
- void *arg)
-{
- return tls_context_server_alpn_select_callback(ssl,
- (const unsigned char **) out,
- outlen,
- in,
- inlen,
- arg);
-}
-
int tls_context_alpn_set(void *ctx_backend, const char *alpn)
{
size_t wire_format_alpn_index;
@@ -283,10 +268,15 @@ int tls_context_alpn_set(void *ctx_backe
ctx);
}
else {
- SSL_CTX_set_next_proto_select_cb(
- ctx->ctx,
- tls_context_client_alpn_select_callback,
- ctx);
+ if (ctx->alpn == NULL) {
+ return -1;
+ }
+ if (SSL_CTX_set_alpn_protos(
+ ctx->ctx,
+ (const unsigned char *) &ctx->alpn[1],
+ (unsigned int) ctx->alpn[0]) != 0) {
+ return -1;
+ }
}
}