From owner-dev-commits-ports-main@freebsd.org Tue Aug 10 12:24:21 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D30AA668318; Tue, 10 Aug 2021 12:24:21 +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 4GkXFK5VyYz4VX3; Tue, 10 Aug 2021 12:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A13321BA8C; Tue, 10 Aug 2021 12:24:21 +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 17ACOL30097764; Tue, 10 Aug 2021 12:24:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17ACOLMA097763; Tue, 10 Aug 2021 12:24:21 GMT (envelope-from git) Date: Tue, 10 Aug 2021 12:24:21 GMT Message-Id: <202108101224.17ACOLMA097763@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: 5d9097286ed4 - main - sysutils/fluent-bit: update to 1.8.3 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: 5d9097286ed40469707a44e1112b1572745d30a4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2021 12:24:21 -0000 The branch main has been updated by girgen: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d9097286ed40469707a44e1112b1572745d30a4 commit 5d9097286ed40469707a44e1112b1572745d30a4 Author: Palle Girgensohn AuthorDate: 2021-08-09 20:47:24 +0000 Commit: Palle Girgensohn CommitDate: 2021-08-10 12:24:16 +0000 sysutils/fluent-bit: update to 1.8.3 --- sysutils/fluent-bit/Makefile | 2 +- sysutils/fluent-bit/distinfo | 6 ++--- .../files/patch-lib__luajit__src__Makefile | 15 +++++++++++ .../patch-lib__mbedtls-2.24.0__library__md5.c | 12 --------- .../files/patch-lib_monkey_deps_flb__libco_ppc.c | 22 --------------- .../patch-lib_monkey_deps_flb__libco_settings.h | 11 -------- sysutils/fluent-bit/pkg-plist | 31 ++++++++++++++++++++++ 7 files changed, 50 insertions(+), 49 deletions(-) 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 @@ -2,7 +2,7 @@ PORTNAME= fluent-bit DISTVERSIONPREFIX= v -DISTVERSION= 1.7.9 +DISTVERSION= 1.8.3 CATEGORIES= sysutils MAINTAINER= girgen@FreeBSD.org 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 @@ -32,6 +32,7 @@ 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 @@ -72,6 +73,7 @@ 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 @@ -97,5 +99,34 @@ 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