git: 358122b22e3b - main - sysutils/fluent-bit: update to 2.1.7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 06 Aug 2023 19:37:35 UTC
The branch main has been updated by girgen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=358122b22e3bb467e77f2e9edd7edb38254e8eeb
commit 358122b22e3bb467e77f2e9edd7edb38254e8eeb
Author: Palle Girgensohn <girgen@FreeBSD.org>
AuthorDate: 2023-07-19 20:35:43 +0000
Commit: Palle Girgensohn <girgen@FreeBSD.org>
CommitDate: 2023-08-06 19:37:29 +0000
sysutils/fluent-bit: update to 2.1.7
Release notes: https://github.com/fluent/fluent-bit/releases/tag/v2.1.7
---
sysutils/fluent-bit/Makefile | 2 +-
sysutils/fluent-bit/distinfo | 6 +-
.../files/patch-lib__wasm_micro_runtime_WAMR | 366 ---------------------
sysutils/fluent-bit/pkg-plist | 3 +
4 files changed, 7 insertions(+), 370 deletions(-)
diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile
index f911503e8460..c81aafa7aeff 100644
--- a/sysutils/fluent-bit/Makefile
+++ b/sysutils/fluent-bit/Makefile
@@ -1,6 +1,6 @@
PORTNAME= fluent-bit
DISTVERSIONPREFIX= v
-DISTVERSION= 2.1.6
+DISTVERSION= 2.1.7
CATEGORIES= sysutils
MAINTAINER= girgen@FreeBSD.org
diff --git a/sysutils/fluent-bit/distinfo b/sysutils/fluent-bit/distinfo
index 87b0ccbaa4fc..6c9fafc3d142 100644
--- a/sysutils/fluent-bit/distinfo
+++ b/sysutils/fluent-bit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688391139
-SHA256 (fluent-fluent-bit-v2.1.6_GH0.tar.gz) = 4019e874670628ee0813fef7ecc92fc9050b1e42a74bc34ec0ba2c1e7efdb236
-SIZE (fluent-fluent-bit-v2.1.6_GH0.tar.gz) = 23571459
+TIMESTAMP = 1689798930
+SHA256 (fluent-fluent-bit-v2.1.7_GH0.tar.gz) = ed80291d660be19f8458d81796c7d3f7e8735eb48ec393467a0c9deca2e9abc3
+SIZE (fluent-fluent-bit-v2.1.7_GH0.tar.gz) = 23796418
diff --git a/sysutils/fluent-bit/files/patch-lib__wasm_micro_runtime_WAMR b/sysutils/fluent-bit/files/patch-lib__wasm_micro_runtime_WAMR
deleted file mode 100644
index 7e4528d1e571..000000000000
--- a/sysutils/fluent-bit/files/patch-lib__wasm_micro_runtime_WAMR
+++ /dev/null
@@ -1,366 +0,0 @@
---- lib/wasm-micro-runtime-WAMR-1.1.1/core/shared/platform/freebsd/platform_internal.h.orig 2023-02-06 17:50:39.755820000 +0100
-+++ lib/wasm-micro-runtime-WAMR-1.1.1/core/shared/platform/freebsd/platform_internal.h 2023-02-06 17:50:39.756565000 +0100
-@@ -0,0 +1,108 @@
-+/*
-+ * Copyright (C) 2019 Intel Corporation. All rights reserved.
-+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+ */
-+
-+#ifndef _PLATFORM_INTERNAL_H
-+#define _PLATFORM_INTERNAL_H
-+
-+#include <inttypes.h>
-+#include <stdbool.h>
-+#include <assert.h>
-+#include <time.h>
-+#include <string.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <math.h>
-+#include <stdarg.h>
-+#include <ctype.h>
-+#include <pthread.h>
-+#include <signal.h>
-+#include <semaphore.h>
-+#include <limits.h>
-+#include <dirent.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <poll.h>
-+#include <sched.h>
-+#include <errno.h>
-+#include <netinet/in.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <sys/stat.h>
-+#include <sys/mman.h>
-+#include <sys/time.h>
-+#include <sys/uio.h>
-+#include <sys/ioctl.h>
-+#include <sys/socket.h>
-+#include <sys/resource.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#ifndef BH_PLATFORM_FREEBSD
-+#define BH_PLATFORM_FREEBSD
-+#endif
-+
-+#define BH_HAS_DLFCN 1
-+
-+/* Stack size of applet threads's native part. */
-+#define BH_APPLET_PRESERVED_STACK_SIZE (32 * 1024)
-+
-+/* Default thread priority */
-+#define BH_THREAD_DEFAULT_PRIORITY 0
-+
-+typedef pthread_t korp_tid;
-+typedef pthread_mutex_t korp_mutex;
-+typedef pthread_cond_t korp_cond;
-+typedef pthread_t korp_thread;
-+typedef sem_t korp_sem;
-+
-+#define OS_THREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-+
-+#define os_thread_local_attribute __thread
-+
-+#define bh_socket_t int
-+
-+#if WASM_DISABLE_HW_BOUND_CHECK == 0
-+#if defined(BUILD_TARGET_X86_64) || defined(BUILD_TARGET_AMD_64) \
-+ || defined(BUILD_TARGET_AARCH64) || defined(BUILD_TARGET_RISCV64_LP64D) \
-+ || defined(BUILD_TARGET_RISCV64_LP64)
-+
-+#include <setjmp.h>
-+
-+#define OS_ENABLE_HW_BOUND_CHECK
-+
-+typedef jmp_buf korp_jmpbuf;
-+
-+#define os_setjmp setjmp
-+#define os_longjmp longjmp
-+#define os_alloca alloca
-+
-+#define os_getpagesize getpagesize
-+
-+typedef void (*os_signal_handler)(void *sig_addr);
-+
-+int
-+os_thread_signal_init(os_signal_handler handler);
-+
-+void
-+os_thread_signal_destroy();
-+
-+bool
-+os_thread_signal_inited();
-+
-+void
-+os_signal_unmask();
-+
-+void
-+os_sigreturn();
-+#endif /* end of BUILD_TARGET_X86_64/AMD_64/AARCH64/RISCV64 */
-+#endif /* end of WASM_DISABLE_HW_BOUND_CHECK */
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* end of _PLATFORM_INTERNAL_H */
---- lib/wasm-micro-runtime-WAMR-1.1.1/core/shared/platform/freebsd/shared_platform.cmake.orig 2023-02-06 17:50:39.756698000 +0100
-+++ lib/wasm-micro-runtime-WAMR-1.1.1/core/shared/platform/freebsd/shared_platform.cmake 2023-02-06 17:50:39.756932000 +0100
-@@ -0,0 +1,18 @@
-+# Copyright (C) 2019 Intel Corporation. All rights reserved.
-+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+
-+set (PLATFORM_SHARED_DIR ${CMAKE_CURRENT_LIST_DIR})
-+
-+add_definitions(-DBH_PLATFORM_FREEBSD)
-+
-+include_directories(${PLATFORM_SHARED_DIR})
-+include_directories(${PLATFORM_SHARED_DIR}/../include)
-+
-+include (${CMAKE_CURRENT_LIST_DIR}/../common/posix/platform_api_posix.cmake)
-+
-+file (GLOB_RECURSE source_all ${PLATFORM_SHARED_DIR}/*.c)
-+
-+set (PLATFORM_SHARED_SOURCE ${source_all} ${PLATFORM_COMMON_POSIX_SOURCE})
-+
-+file (GLOB header ${PLATFORM_SHARED_DIR}/../include/*.h)
-+LIST (APPEND RUNTIME_LIB_HEADER_LIST ${header})
---- lib/wasm-micro-runtime-WAMR-1.1.1/core/shared/platform/freebsd/platform_init.c.orig 2023-02-06 17:50:39.755166000 +0100
-+++ lib/wasm-micro-runtime-WAMR-1.1.1/core/shared/platform/freebsd/platform_init.c 2023-02-06 17:50:39.755673000 +0100
-@@ -0,0 +1,43 @@
-+/*
-+ * Copyright (C) 2019 Intel Corporation. All rights reserved.
-+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+ */
-+
-+#include "platform_api_vmcore.h"
-+
-+int
-+bh_platform_init()
-+{
-+ return 0;
-+}
-+
-+void
-+bh_platform_destroy()
-+{}
-+
-+int
-+os_printf(const char *format, ...)
-+{
-+ int ret = 0;
-+ va_list ap;
-+
-+ va_start(ap, format);
-+#ifndef BH_VPRINTF
-+ ret += vprintf(format, ap);
-+#else
-+ ret += BH_VPRINTF(format, ap);
-+#endif
-+ va_end(ap);
-+
-+ return ret;
-+}
-+
-+int
-+os_vprintf(const char *format, va_list ap)
-+{
-+#ifndef BH_VPRINTF
-+ return vprintf(format, ap);
-+#else
-+ return BH_VPRINTF(format, ap);
-+#endif
-+}
---- lib/wasm-micro-runtime-WAMR-1.1.1/product-mini/platforms/freebsd/main.c.orig 2023-02-06 17:50:39.759486000 +0100
-+++ lib/wasm-micro-runtime-WAMR-1.1.1/product-mini/platforms/freebsd/main.c 2023-02-06 17:50:39.759658000 +0100
-@@ -0,0 +1,6 @@
-+/*
-+ * Copyright (C) 2019 Intel Corporation. All rights reserved.
-+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+ */
-+
-+#include "../posix/main.c"
---- lib/wasm-micro-runtime-WAMR-1.1.1/product-mini/platforms/freebsd/CMakeLists.txt.orig 2023-02-06 17:50:39.757869000 +0100
-+++ lib/wasm-micro-runtime-WAMR-1.1.1/product-mini/platforms/freebsd/CMakeLists.txt 2023-02-06 17:50:39.758741000 +0100
-@@ -0,0 +1,132 @@
-+# Copyright (C) 2019 Intel Corporation. All rights reserved.
-+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+
-+cmake_minimum_required (VERSION 2.9)
-+
-+project (iwasm)
-+
-+set (WAMR_BUILD_PLATFORM "freebsd")
-+
-+# Reset default linker flags
-+set (CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
-+set (CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
-+
-+# Set WAMR_BUILD_TARGET, currently values supported:
-+# "X86_64", "AMD_64", "X86_32", "AARCH64[sub]", "ARM[sub]", "THUMB[sub]",
-+# "MIPS", "XTENSA", "RISCV64[sub]", "RISCV32[sub]"
-+if (NOT DEFINED WAMR_BUILD_TARGET)
-+ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)")
-+ set (WAMR_BUILD_TARGET "AARCH64")
-+ elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
-+ set (WAMR_BUILD_TARGET "RISCV64")
-+ elseif (CMAKE_SIZEOF_VOID_P EQUAL 8)
-+ # Build as X86_64 by default in 64-bit platform
-+ set (WAMR_BUILD_TARGET "X86_64")
-+ elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
-+ # Build as X86_32 by default in 32-bit platform
-+ set (WAMR_BUILD_TARGET "X86_32")
-+ else ()
-+ message(SEND_ERROR "Unsupported build target platform!")
-+ endif ()
-+endif ()
-+
-+if (NOT CMAKE_BUILD_TYPE)
-+ set(CMAKE_BUILD_TYPE Release)
-+endif ()
-+
-+set(CMAKE_CXX_STANDARD 14)
-+
-+if (NOT DEFINED WAMR_BUILD_INTERP)
-+ # Enable Interpreter by default
-+ set (WAMR_BUILD_INTERP 1)
-+endif ()
-+
-+if (NOT DEFINED WAMR_BUILD_AOT)
-+ # Enable AOT by default.
-+ set (WAMR_BUILD_AOT 1)
-+endif ()
-+
-+if (NOT DEFINED WAMR_BUILD_JIT)
-+ # Disable JIT by default.
-+ set (WAMR_BUILD_JIT 0)
-+endif ()
-+
-+if (NOT DEFINED WAMR_BUILD_FAST_JIT)
-+ # Disable Fast JIT by default
-+ set (WAMR_BUILD_FAST_JIT 0)
-+endif ()
-+
-+if (NOT DEFINED WAMR_BUILD_LIBC_BUILTIN)
-+ # Enable libc builtin support by default
-+ set (WAMR_BUILD_LIBC_BUILTIN 1)
-+endif ()
-+
-+if (NOT DEFINED WAMR_BUILD_LIBC_WASI)
-+ # Enable libc wasi support by default
-+ set (WAMR_BUILD_LIBC_WASI 1)
-+endif ()
-+
-+if (NOT DEFINED WAMR_BUILD_FAST_INTERP)
-+ # Enable fast interpreter
-+ set (WAMR_BUILD_FAST_INTERP 1)
-+endif ()
-+
-+if (NOT DEFINED WAMR_BUILD_MULTI_MODULE)
-+ # Disable multiple module by default
-+ set (WAMR_BUILD_MULTI_MODULE 0)
-+endif ()
-+
-+if (NOT DEFINED WAMR_BUILD_LIB_PTHREAD)
-+ # Disable pthread library by default
-+ set (WAMR_BUILD_LIB_PTHREAD 0)
-+endif ()
-+
-+if (NOT DEFINED WAMR_BUILD_MINI_LOADER)
-+ # Disable wasm mini loader by default
-+ set (WAMR_BUILD_MINI_LOADER 0)
-+endif ()
-+
-+if (NOT DEFINED WAMR_BUILD_SIMD)
-+ # Enable SIMD by default
-+ set (WAMR_BUILD_SIMD 1)
-+endif ()
-+
-+if (NOT DEFINED WAMR_BUILD_DEBUG_INTERP)
-+ # Disable Debug feature by default
-+ set (WAMR_BUILD_DEBUG_INTERP 0)
-+endif ()
-+
-+if (WAMR_BUILD_DEBUG_INTERP EQUAL 1)
-+ set (WAMR_BUILD_FAST_INTERP 0)
-+ set (WAMR_BUILD_MINI_LOADER 0)
-+ set (WAMR_BUILD_SIMD 0)
-+endif ()
-+
-+set (WAMR_DISABLE_HW_BOUND_CHECK 1)
-+
-+set (CMAKE_SHARED_LINKER_FLAGS "-Wl")
-+set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
-+
-+set (CMAKE_MACOSX_RPATH True)
-+
-+set (WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-+
-+include (${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake)
-+add_library(vmlib ${WAMR_RUNTIME_LIB_SOURCE})
-+
-+include (${SHARED_DIR}/utils/uncommon/shared_uncommon.cmake)
-+
-+add_executable (iwasm main.c ${UNCOMMON_SHARED_SOURCE})
-+
-+install (TARGETS iwasm DESTINATION bin)
-+
-+target_link_libraries (iwasm vmlib ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl -lpthread)
-+
-+add_library (libiwasm SHARED ${WAMR_RUNTIME_LIB_SOURCE})
-+
-+install (TARGETS libiwasm DESTINATION lib)
-+
-+set_target_properties (libiwasm PROPERTIES OUTPUT_NAME iwasm)
-+
-+target_link_libraries (libiwasm ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl -lpthread)
-+
---- lib/wasm-micro-runtime-WAMR-1.1.1/product-mini/platforms/freebsd/build_llvm.sh.orig 2023-02-06 17:50:39.759198000 +0100
-+++ lib/wasm-micro-runtime-WAMR-1.1.1/product-mini/platforms/freebsd/build_llvm.sh 2023-02-06 17:50:39.759370000 +0100
-@@ -0,0 +1,6 @@
-+#!/bin/sh
-+
-+# Copyright (C) 2020 Intel Corporation. All rights reserved.
-+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+
-+/usr/bin/env python3 ../../../build-scripts/build_llvm.py "$@"
---- lib/wasm-micro-runtime-WAMR-1.1.1/product-mini/platforms/freebsd/build_jit.sh.orig 2023-02-06 17:50:39.758868000 +0100
-+++ lib/wasm-micro-runtime-WAMR-1.1.1/product-mini/platforms/freebsd/build_jit.sh 2023-02-06 17:50:39.759076000 +0100
-@@ -0,0 +1,11 @@
-+#!/bin/sh
-+
-+# Copyright (C) 2019 Intel Corporation. All rights reserved.
-+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+
-+rm -fr build && mkdir build
-+cd build
-+cmake .. -DWAMR_BUILD_JIT=1
-+nproc=$(sysctl -n hw.ncpu)
-+make -j ${nproc}
-+cd ..
---- lib/wasm-micro-runtime-WAMR-1.1.1/doc/build_wamr.md.orig 2023-02-01 18:09:22.000000000 +0100
-+++ lib/wasm-micro-runtime-WAMR-1.1.1/doc/build_wamr.md 2023-02-06 17:50:39.757713000 +0100
-@@ -610,3 +610,18 @@
- libvmlib.a ) and an executable binary (*iwasm*) and copy *iwasm* to
- *build_out*. All original generated files are still under
- *product-mini/platforms/linux/build*.
-+
-+FreeBSD
-+-------------------------
-+First, install the dependent packages:
-+```shell
-+sudo pkg install gcc cmake wget
-+```
-+
-+Then you can run the following commands to build iwasm with default configurations:
-+```shell
-+cd product-mini/platforms/freebsd
-+mkdir build && cd build
-+cmake ..
-+make
-+```
diff --git a/sysutils/fluent-bit/pkg-plist b/sysutils/fluent-bit/pkg-plist
index 35593e874422..5d5a743f29d8 100644
--- a/sysutils/fluent-bit/pkg-plist
+++ b/sysutils/fluent-bit/pkg-plist
@@ -3,6 +3,9 @@ bin/fluent-bit
@sample %%ETCDIR%%/parsers.conf.sample
%%ETCDIR%%/plugins.conf
include/fluent-bit.h
+include/fluent-bit/config_format/flb_cf.h
+include/fluent-bit/config_format/flb_cf_fluentbit.h
+include/fluent-bit/config_format/flb_cf_yaml.h
include/fluent-bit/flb_api.h
include/fluent-bit/flb_avro.h
include/fluent-bit/flb_aws_credentials.h