diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile index 8561ee13448e..575626183d9b 100644 --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -1,59 +1,59 @@ # Created by: Palle Girgensohn PORTNAME= fluent-bit DISTVERSIONPREFIX= v -DISTVERSION= 1.7.9 +DISTVERSION= 1.8.3 CATEGORIES= sysutils MAINTAINER= girgen@FreeBSD.org COMMENT= Fast and lightweight data forwarder LICENSE= APACHE20 BROKEN_mips= fails to build: conflicting types for 'restrict' BROKEN_mips64= fails to build: conflicting types for 'restrict' BROKEN_riscv64= fails to build: No support for this architecture (yet) USE_GITHUB= yes GH_ACCOUNT= fluent USES= cmake:noninja gmake bison OPTIONS_DEFINE= SSL PGSQL OPTIONS_DEFAULT= SSL LDFLAGS= -lexecinfo CMAKE_ARGS= -DFLB_DEBUG=Off -DFLB_TRACE=Off SSL_USES= ssl SSL_CMAKE_ON= -DFLB_TLS=On SSL_CMAKE_OFF= -DFLB_TLS=Off EXAMPLES_CMAKE_ON= -DFLB_EXAMPLES=On EXAMPLES_CMAKE_OFF= -DFLB_EXAMPLES=Off PGSQL_USES= pgsql PGSQL_CMAKE_ON= -DFLB_OUT_PGSQL=On PGSQL_CMAKE_OFF= -DFLB_OUT_PGSQL=Off USE_RC_SUBR= ${PORTNAME} .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-lib_luajit__src__lj_prng.c .endif .if ${ARCH:Mpowerpc64*} CMAKE_ARGS+= -DFLB_LUAJIT:BOOL=OFF .elif ${ARCH} == powerpc USES+= compiler:gcc-c++11-lib .else USES+= compiler:c11 .endif post-install: ${MV} ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/parsers.conf ${STAGEDIR}${ETCDIR}/parsers.conf.sample .include diff --git a/sysutils/fluent-bit/distinfo b/sysutils/fluent-bit/distinfo index e135d92221ef..030562205c79 100644 --- a/sysutils/fluent-bit/distinfo +++ b/sysutils/fluent-bit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624098935 -SHA256 (fluent-fluent-bit-v1.7.9_GH0.tar.gz) = 6f1632c26ebf5e1463393656e262d9b36bbf10a454300ad8b3af5a6b2c66927f -SIZE (fluent-fluent-bit-v1.7.9_GH0.tar.gz) = 14298704 +TIMESTAMP = 1628541384 +SHA256 (fluent-fluent-bit-v1.8.3_GH0.tar.gz) = a46e0ad3e6b462a72236fbfd69841b55787c212554b5f7d30217d1eea217d7ca +SIZE (fluent-fluent-bit-v1.8.3_GH0.tar.gz) = 14815659 diff --git a/sysutils/fluent-bit/files/patch-lib__luajit__src__Makefile b/sysutils/fluent-bit/files/patch-lib__luajit__src__Makefile new file mode 100644 index 000000000000..f22ee9bdf593 --- /dev/null +++ b/sysutils/fluent-bit/files/patch-lib__luajit__src__Makefile @@ -0,0 +1,15 @@ +--- lib/luajit-2.1.0-1e66d0f/src/Makefile.orig 2021-08-10 08:16:04.406803000 +0200 ++++ lib/luajit-2.1.0-1e66d0f/src/Makefile 2021-08-10 08:16:22.458940000 +0200 +@@ -24,10 +24,10 @@ + # removing the '#' in front of them. Make sure you force a full recompile + # with "make clean", followed by "make" if you change any options. + # +-DEFAULT_CC = gcc ++#DEFAULT_CC = gcc + # + # LuaJIT builds as a native 32 or 64 bit binary by default. +-CC= $(DEFAULT_CC) ++#CC= $(DEFAULT_CC) + # + # Use this if you want to force a 32 bit build on a 64 bit multilib OS. + #CC= $(DEFAULT_CC) -m32 diff --git a/sysutils/fluent-bit/files/patch-lib__mbedtls-2.24.0__library__md5.c b/sysutils/fluent-bit/files/patch-lib__mbedtls-2.24.0__library__md5.c deleted file mode 100644 index 1e60c667600a..000000000000 --- a/sysutils/fluent-bit/files/patch-lib__mbedtls-2.24.0__library__md5.c +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/mbedtls-2.24.0/library/md5.c.orig 2021-06-23 09:56:17.365471000 +0200 -+++ lib/mbedtls-2.24.0/library/md5.c 2021-06-23 09:56:30.205899000 +0200 -@@ -422,8 +422,7 @@ - { "message digest" }, - { "abcdefghijklmnopqrstuvwxyz" }, - { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" }, -- { "12345678901234567890123456789012345678901234567890123456789012" -- "345678901234567890" } -+ { "12345678901234567890123456789012345678901234567890123456789012345678901234567890" } - }; - - static const size_t md5_test_buflen[7] = diff --git a/sysutils/fluent-bit/files/patch-lib_monkey_deps_flb__libco_ppc.c b/sysutils/fluent-bit/files/patch-lib_monkey_deps_flb__libco_ppc.c deleted file mode 100644 index 9d705682f7b6..000000000000 --- a/sysutils/fluent-bit/files/patch-lib_monkey_deps_flb__libco_ppc.c +++ /dev/null @@ -1,22 +0,0 @@ ---- lib/monkey/deps/flb_libco/ppc.c.orig 2021-03-08 11:12:53 UTC -+++ lib/monkey/deps/flb_libco/ppc.c -@@ -279,7 +279,9 @@ static uint32_t* co_create_(unsigned size, uintptr_t e - return t; - } - --cothread_t co_create(unsigned int size, void (*entry_)(void)) { -+cothread_t co_create(unsigned int size, void (*entry_)(void), -+ size_t *out_size) { -+ - uintptr_t entry = (uintptr_t)entry_; - uint32_t* t = 0; - -@@ -325,7 +327,7 @@ cothread_t co_create(unsigned int size, void (*entry_) - t[10] = (uint32_t)(sp >> shift >> shift); - t[11] = (uint32_t)sp; - } -- -+ *out_size = size; - return t; - } - diff --git a/sysutils/fluent-bit/files/patch-lib_monkey_deps_flb__libco_settings.h b/sysutils/fluent-bit/files/patch-lib_monkey_deps_flb__libco_settings.h deleted file mode 100644 index 8b811ed5162d..000000000000 --- a/sysutils/fluent-bit/files/patch-lib_monkey_deps_flb__libco_settings.h +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/monkey/deps/flb_libco/settings.h.orig 2020-11-16 20:40:21 UTC -+++ lib/monkey/deps/flb_libco/settings.h -@@ -42,6 +42,8 @@ - #define text_section __declspec(allocate(".text")) - #elif defined(__APPLE__) && defined(__MACH__) - #define text_section __attribute__((section("__TEXT,__text"))) -+#elif defined(__clang__) -+ #define text_section __attribute__((section(".text"))) - #else - #define text_section __attribute__((section(".text#"))) - #endif diff --git a/sysutils/fluent-bit/pkg-plist b/sysutils/fluent-bit/pkg-plist index e94d7447b6db..dcdb2258524d 100644 --- a/sysutils/fluent-bit/pkg-plist +++ b/sysutils/fluent-bit/pkg-plist @@ -1,101 +1,132 @@ bin/fluent-bit @sample %%ETCDIR%%/fluent-bit.conf.sample @sample %%ETCDIR%%/parsers.conf.sample %%ETCDIR%%/plugins.conf include/fluent-bit.h include/fluent-bit/flb_api.h include/fluent-bit/flb_avro.h include/fluent-bit/flb_aws_credentials.h include/fluent-bit/flb_aws_util.h include/fluent-bit/flb_bits.h include/fluent-bit/flb_callback.h include/fluent-bit/flb_compat.h include/fluent-bit/flb_config.h include/fluent-bit/flb_config_map.h include/fluent-bit/flb_coro.h include/fluent-bit/flb_dlfcn_win32.h include/fluent-bit/flb_dump.h include/fluent-bit/flb_endian.h include/fluent-bit/flb_engine.h include/fluent-bit/flb_engine_dispatch.h include/fluent-bit/flb_env.h include/fluent-bit/flb_error.h include/fluent-bit/flb_filter.h include/fluent-bit/flb_filter_plugin.h include/fluent-bit/flb_fstore.h include/fluent-bit/flb_gzip.h include/fluent-bit/flb_hash.h include/fluent-bit/flb_help.h include/fluent-bit/flb_http_client.h include/fluent-bit/flb_http_client_debug.h include/fluent-bit/flb_http_server.h include/fluent-bit/flb_info.h include/fluent-bit/flb_input.h include/fluent-bit/flb_input_chunk.h +include/fluent-bit/flb_input_metric.h include/fluent-bit/flb_input_plugin.h include/fluent-bit/flb_intermediate_metric.h include/fluent-bit/flb_io.h include/fluent-bit/flb_jsmn.h include/fluent-bit/flb_kernel.h include/fluent-bit/flb_kv.h include/fluent-bit/flb_langinfo.h include/fluent-bit/flb_lib.h include/fluent-bit/flb_log.h include/fluent-bit/flb_luajit.h include/fluent-bit/flb_macros.h include/fluent-bit/flb_mem.h include/fluent-bit/flb_meta.h include/fluent-bit/flb_metrics.h include/fluent-bit/flb_metrics_exporter.h include/fluent-bit/flb_mp.h include/fluent-bit/flb_network.h include/fluent-bit/flb_oauth2.h include/fluent-bit/flb_output.h include/fluent-bit/flb_output_plugin.h include/fluent-bit/flb_output_thread.h include/fluent-bit/flb_pack.h include/fluent-bit/flb_parser.h include/fluent-bit/flb_parser_decoder.h include/fluent-bit/flb_pipe.h include/fluent-bit/flb_plugin.h include/fluent-bit/flb_plugin_proxy.h include/fluent-bit/flb_pthread.h include/fluent-bit/flb_ra_key.h include/fluent-bit/flb_random.h include/fluent-bit/flb_record_accessor.h include/fluent-bit/flb_regex.h include/fluent-bit/flb_router.h include/fluent-bit/flb_routes_mask.h include/fluent-bit/flb_s3_local_buffer.h include/fluent-bit/flb_scheduler.h include/fluent-bit/flb_sds.h include/fluent-bit/flb_sha512.h include/fluent-bit/flb_signv4.h include/fluent-bit/flb_slist.h +include/fluent-bit/flb_snappy.h include/fluent-bit/flb_socket.h include/fluent-bit/flb_sosreport.h include/fluent-bit/flb_sqldb.h include/fluent-bit/flb_stacktrace.h include/fluent-bit/flb_storage.h include/fluent-bit/flb_str.h include/fluent-bit/flb_strptime.h include/fluent-bit/flb_task.h include/fluent-bit/flb_task_map.h include/fluent-bit/flb_thread_pool.h include/fluent-bit/flb_thread_storage.h include/fluent-bit/flb_time.h include/fluent-bit/flb_time_utils.h include/fluent-bit/flb_tls.h include/fluent-bit/flb_unescape.h include/fluent-bit/flb_upstream.h include/fluent-bit/flb_upstream_conn.h include/fluent-bit/flb_upstream_ha.h include/fluent-bit/flb_upstream_node.h include/fluent-bit/flb_upstream_queue.h include/fluent-bit/flb_uri.h include/fluent-bit/flb_utf8.h include/fluent-bit/flb_utils.h include/fluent-bit/flb_version.h include/fluent-bit/flb_worker.h +include/fluent-bit/tls/flb_tls.h +include/libco.h +include/monkey/mk_core.h +include/monkey/mk_core/mk_core_info.h +include/monkey/mk_core/mk_dep_unistd.h +include/monkey/mk_core/mk_dirent.h +include/monkey/mk_core/mk_event.h +include/monkey/mk_core/mk_event_epoll.h +include/monkey/mk_core/mk_event_kqueue.h +include/monkey/mk_core/mk_event_libevent.h +include/monkey/mk_core/mk_event_select.h +include/monkey/mk_core/mk_file.h +include/monkey/mk_core/mk_getopt.h +include/monkey/mk_core/mk_iov.h +include/monkey/mk_core/mk_limits.h +include/monkey/mk_core/mk_list.h +include/monkey/mk_core/mk_macros.h +include/monkey/mk_core/mk_memory.h +include/monkey/mk_core/mk_pipe.h +include/monkey/mk_core/mk_pthread.h +include/monkey/mk_core/mk_rconf.h +include/monkey/mk_core/mk_sleep.h +include/monkey/mk_core/mk_string.h +include/monkey/mk_core/mk_thread.h +include/monkey/mk_core/mk_thread_channel.h +include/monkey/mk_core/mk_uio.h +include/monkey/mk_core/mk_unistd.h +include/monkey/mk_core/mk_utils.h +include/settings.h lib/fluent-bit/libfluent-bit.so @comment libdata/pkgconfig/msgpack.pc