From nobody Mon Mar 21 13:39:19 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 003551A15F96; Mon, 21 Mar 2022 13:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KMbLv6WTYz4Yst; Mon, 21 Mar 2022 13:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647869959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LX1mFO8A2JKf4gh6CiV1IUMs0zCzqJae5nKgSzQ4nL0=; b=RFzQYlYK24u4Jdb1mvxyZKC3Xr4Lc5ImeLeal72c4inoSvypPd9ebiHAU+C4WAchAID8uE 2LLPEnbsshmuCeUO0iFzjvBXK/BSbJvqyBRv9DxMZs8yWEUw2TCvecaP76kpTxeinGg4gz lhis7b9jwCiFSjW1gT4PuGYBsdZ/HgzGcTof9JTqfS/v/eJ6Bzkitci8Y6VUsqLAQz2B1K YJbOkAgVLH0eGqZqMQrZ+v18skpl4QvlFvJ56Af9h0YCq+yzS0jFYvlvOATZp//6WZqtLN xyl0lICCs+cd7mGHwcI90hnErVGWaTX5QIUAfKhEh8iBPvg482YwB2Ix9gMWPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BB80B1C502; Mon, 21 Mar 2022 13:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22LDdJ2l030051; Mon, 21 Mar 2022 13:39:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22LDdJ3q030050; Mon, 21 Mar 2022 13:39:19 GMT (envelope-from git) Date: Mon, 21 Mar 2022 13:39:19 GMT Message-Id: <202203211339.22LDdJ3q030050@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Palle Girgensohn Subject: git: 69e501de68c7 - main - sysutils/fluent-bit: Upgrade to 1.9.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: girgen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69e501de68c763fc9b4f798f59612b58b26fcc9b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647869959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LX1mFO8A2JKf4gh6CiV1IUMs0zCzqJae5nKgSzQ4nL0=; b=pqOht7PGad5B2nf3mp/agZ9skRTIITm6qHLFdgg4DwtpNKAWcrkVU4DjaNQW72aVPE74pV G6ZLsKfhcJ3d4N3+wYgvFOCKJREK9gdwpDK4QwbyiW7MsCwrcv5N8hSOtvCZcON92P1t/R qqnuuh48YpirhJ02ob7mVBU9+TRtTFPBzaxHe/2dYOF1OzI+CUTiUVB9ozdD/3IxhR1Jzx DaYn7J2a2Yk7rZuHeSZkhDgxOTrIPPXlijgc2hKYGV7KaI3Txweomfw2ussCeAha5jqM8v 8JkiuF2Uq5KJ2w/69WKwkkWg72/WhfavM91jmwcDuzCntmxOUHFbJZd1N0xdtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647869959; a=rsa-sha256; cv=none; b=PGSw/CPeSMxjlpnwws+uTb3+V+IUnds/Ir2/aB2x+VUepKTbqOLmvBjVNk9PmfQct34vhf 8xcf38oWfixTzu+Sf3TTX9VZ1IjsYW8RO5I0A/5lodwJWsPyu9r9Bu/dtpQAPFw2M0wHLp oANandbRy7RSGkuejBFqQ6vqw0HZrdKuKQsxdyKp0F86osIESKcGGzNk+b7oOWt9HiVvhr xx8Oj9GfwQmTO+ncktUYfD8GKncJJPNv02JYQUPUFpURLDJhcrSLvFun879MS9HCqTgaJX oeCMBi5iQU9lvu4N3aoVtcgyenpH3SZ87NXCAs2yEAKg34LIUF/6znM1H35RjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by girgen: URL: https://cgit.FreeBSD.org/ports/commit/?id=69e501de68c763fc9b4f798f59612b58b26fcc9b commit 69e501de68c763fc9b4f798f59612b58b26fcc9b Author: Palle Girgensohn AuthorDate: 2022-03-21 10:49:08 +0000 Commit: Palle Girgensohn CommitDate: 2022-03-21 13:39:14 +0000 sysutils/fluent-bit: Upgrade to 1.9.0 Release notes: https://fluentbit.io/announcements/v1.9.0/ This fixes some outstandning problems that had required local FreeBSD patches. - coro_stack_size was wrong - problems building with aarch64 - involuntary install of MS Windows config file --- sysutils/fluent-bit/Makefile | 2 +- sysutils/fluent-bit/distinfo | 6 +++--- .../files/patch-include__fluent-bit__flb_coro.h | 11 ----------- sysutils/fluent-bit/files/patch-lib_flb__libco_aarch64.c | 15 --------------- sysutils/fluent-bit/files/patch-src__CMakeLists.txt | 16 ---------------- sysutils/fluent-bit/pkg-plist | 16 +++++++++++++--- 6 files changed, 17 insertions(+), 49 deletions(-) diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile index a37a67fc1f41..946ba13ed028 100644 --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -2,7 +2,7 @@ PORTNAME= fluent-bit DISTVERSIONPREFIX= v -DISTVERSION= 1.8.13 +DISTVERSION= 1.9.0 CATEGORIES= sysutils MAINTAINER= girgen@FreeBSD.org diff --git a/sysutils/fluent-bit/distinfo b/sysutils/fluent-bit/distinfo index 997f58eecdff..5cd161347a21 100644 --- a/sysutils/fluent-bit/distinfo +++ b/sysutils/fluent-bit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646260751 -SHA256 (fluent-fluent-bit-v1.8.13_GH0.tar.gz) = 0328f61a5dce6f9cb16faa92d96f0a862cdb5644ff0855892ecc2f2228f7ea7b -SIZE (fluent-fluent-bit-v1.8.13_GH0.tar.gz) = 14963014 +TIMESTAMP = 1647854587 +SHA256 (fluent-fluent-bit-v1.9.0_GH0.tar.gz) = ea6f8d8ea68c63ee1eee1059f6d48947209b9f38a40f29fcfdc2188ec6cdc999 +SIZE (fluent-fluent-bit-v1.9.0_GH0.tar.gz) = 15312145 diff --git a/sysutils/fluent-bit/files/patch-include__fluent-bit__flb_coro.h b/sysutils/fluent-bit/files/patch-include__fluent-bit__flb_coro.h deleted file mode 100644 index 7d0b2f0548fc..000000000000 --- a/sysutils/fluent-bit/files/patch-include__fluent-bit__flb_coro.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/fluent-bit/flb_coro.h.orig 2021-09-02 23:11:40.144014000 +0200 -+++ include/fluent-bit/flb_coro.h 2021-09-02 23:12:34.983243000 +0200 -@@ -65,7 +65,7 @@ - #ifdef FLB_CORO_STACK_SIZE - #define FLB_CORO_STACK_SIZE FLB_CORO_STACK_SIZE - #else --#define FLB_CORO_STACK_SIZE ((3 * PTHREAD_STACK_MIN) / 2) -+#define FLB_CORO_STACK_SIZE ((6 * PTHREAD_STACK_MIN) / 2) - #endif - - #define FLB_CORO_DATA(coro) (((char *) coro) + sizeof(struct flb_coro)) diff --git a/sysutils/fluent-bit/files/patch-lib_flb__libco_aarch64.c b/sysutils/fluent-bit/files/patch-lib_flb__libco_aarch64.c deleted file mode 100644 index dcd740c74ca4..000000000000 --- a/sysutils/fluent-bit/files/patch-lib_flb__libco_aarch64.c +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/flb_libco/aarch64.c.orig 2019-08-21 20:51:37 UTC -+++ lib/flb_libco/aarch64.c -@@ -12,7 +12,11 @@ - #include - #include - --#ifndef IOS -+#if defined(IOS) -+#elif defined(__FreeBSD__) -+#include -+#define HAVE_POSIX_MEMALIGN 1 -+#else - #include - #endif - diff --git a/sysutils/fluent-bit/files/patch-src__CMakeLists.txt b/sysutils/fluent-bit/files/patch-src__CMakeLists.txt deleted file mode 100644 index 388c7b353f68..000000000000 --- a/sysutils/fluent-bit/files/patch-src__CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 5ebf218b5dc6..c84ebccb0b86 100644 --- a/sysutils/fluent-bit/pkg-plist +++ b/sysutils/fluent-bit/pkg-plist @@ -9,18 +9,26 @@ 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_bucket_queue.h include/fluent-bit/flb_callback.h include/fluent-bit/flb_compat.h include/fluent-bit/flb_config.h +include/fluent-bit/flb_config_format.h include/fluent-bit/flb_config_map.h include/fluent-bit/flb_coro.h +include/fluent-bit/flb_custom.h +include/fluent-bit/flb_custom_plugin.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_engine_macros.h include/fluent-bit/flb_env.h include/fluent-bit/flb_error.h +include/fluent-bit/flb_event.h +include/fluent-bit/flb_event_loop.h +include/fluent-bit/flb_file.h include/fluent-bit/flb_filter.h include/fluent-bit/flb_filter_plugin.h include/fluent-bit/flb_fstore.h @@ -35,14 +43,17 @@ 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_input_thread.h include/fluent-bit/flb_intermediate_metric.h include/fluent-bit/flb_io.h include/fluent-bit/flb_jsmn.h +include/fluent-bit/flb_kafka.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_lua.h include/fluent-bit/flb_luajit.h include/fluent-bit/flb_macros.h include/fluent-bit/flb_mem.h @@ -50,6 +61,7 @@ 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_net_dns.h include/fluent-bit/flb_network.h include/fluent-bit/flb_oauth2.h include/fluent-bit/flb_output.h @@ -89,6 +101,7 @@ 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_typecast.h include/fluent-bit/flb_unescape.h include/fluent-bit/flb_upstream.h include/fluent-bit/flb_upstream_conn.h @@ -100,9 +113,6 @@ 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