diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile index 4f9b47dbead4..a37a67fc1f41 100644 --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -1,55 +1,55 @@ # Created by: Palle Girgensohn PORTNAME= fluent-bit DISTVERSIONPREFIX= v -DISTVERSION= 1.8.12 +DISTVERSION= 1.8.13 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' 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 ${ARCH:Mpowerpc64*} || ${ARCH:Mriscv64*} CMAKE_ARGS+= -DFLB_LUAJIT:BOOL=OFF .elif ${ARCH} == powerpc LDFLAGS+= -latomic 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 ce8c4a8e7729..997f58eecdff 100644 --- a/sysutils/fluent-bit/distinfo +++ b/sysutils/fluent-bit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643325742 -SHA256 (fluent-fluent-bit-v1.8.12_GH0.tar.gz) = 50f2a4e9eb6c2a2df58b78ef562e23c1ef9871c389c7bd0320f6b381d2b491c8 -SIZE (fluent-fluent-bit-v1.8.12_GH0.tar.gz) = 14958593 +TIMESTAMP = 1646260751 +SHA256 (fluent-fluent-bit-v1.8.13_GH0.tar.gz) = 0328f61a5dce6f9cb16faa92d96f0a862cdb5644ff0855892ecc2f2228f7ea7b +SIZE (fluent-fluent-bit-v1.8.13_GH0.tar.gz) = 14963014 diff --git a/sysutils/fluent-bit/files/patch-src__CMakeLists.txt b/sysutils/fluent-bit/files/patch-src__CMakeLists.txt new file mode 100644 index 000000000000..388c7b353f68 --- /dev/null +++ b/sysutils/fluent-bit/files/patch-src__CMakeLists.txt @@ -0,0 +1,16 @@ +--- src/CMakeLists.txt.orig 2022-03-03 16:38:35.169382000 +0100 ++++ src/CMakeLists.txt 2022-03-03 16:39:15.979282000 +0100 +@@ -466,11 +466,13 @@ + COMPONENT binary + RENAME "${FLB_OUT_NAME}.conf") + ++ if(FLB_SYSTEM_WINDOWS) + install(FILES + "${PROJECT_SOURCE_DIR}/conf/fluent-bit-win32.conf" + DESTINATION ${FLB_INSTALL_CONFDIR} + COMPONENT binary + RENAME "${FLB_OUT_NAME}-win32.conf") ++ endif() + + install(FILES + "${PROJECT_SOURCE_DIR}/conf/parsers.conf" diff --git a/sysutils/fluent-bit/pkg-plist b/sysutils/fluent-bit/pkg-plist index 3ba25183f131..5ebf218b5dc6 100644 --- a/sysutils/fluent-bit/pkg-plist +++ b/sysutils/fluent-bit/pkg-plist @@ -1,135 +1,136 @@ 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_base64.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/flb_custom.h include/fluent-bit/flb_custom_plugin.h include/fluent-bit/flb_net_dns.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