From owner-svn-ports-head@freebsd.org Tue Nov 17 09:50:17 2020 Return-Path: Delivered-To: svn-ports-head@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 EA8BF2D65C4; Tue, 17 Nov 2020 09:50:17 +0000 (UTC) (envelope-from girgen@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cb1QK6HRLz3vtH; Tue, 17 Nov 2020 09:50:17 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CAC081DEA1; Tue, 17 Nov 2020 09:50:17 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AH9oH16037335; Tue, 17 Nov 2020 09:50:17 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AH9oHWZ037331; Tue, 17 Nov 2020 09:50:17 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <202011170950.0AH9oHWZ037331@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Tue, 17 Nov 2020 09:50:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555545 - in head/sysutils/fluent-bit: . files X-SVN-Group: ports-head X-SVN-Commit-Author: girgen X-SVN-Commit-Paths: in head/sysutils/fluent-bit: . files X-SVN-Commit-Revision: 555545 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2020 09:50:18 -0000 Author: girgen Date: Tue Nov 17 09:50:16 2020 New Revision: 555545 URL: https://svnweb.freebsd.org/changeset/ports/555545 Log: Fix SIGSEGV fault on FreeBSD 12+ PR: 250825 Submitted by: Artyom Davidov Added: head/sysutils/fluent-bit/files/patch-lib_flb__libco_settings.h (contents, props changed) head/sysutils/fluent-bit/files/patch-lib_monkey_deps_flb__libco_settings.h (contents, props changed) head/sysutils/fluent-bit/files/patch-src_flb__scheduler.c (contents, props changed) Modified: head/sysutils/fluent-bit/Makefile Modified: head/sysutils/fluent-bit/Makefile ============================================================================== --- head/sysutils/fluent-bit/Makefile Tue Nov 17 09:48:35 2020 (r555544) +++ head/sysutils/fluent-bit/Makefile Tue Nov 17 09:50:16 2020 (r555545) @@ -4,6 +4,7 @@ PORTNAME= fluent-bit DISTVERSIONPREFIX= v DISTVERSION= 1.6.4 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= girgen@FreeBSD.org @@ -11,7 +12,7 @@ COMMENT= Fast and lightweight data forwarder LICENSE= APACHE20 -USE_GITHUB= yes +USE_GITHUB= yes GH_ACCOUNT= fluent BROKEN_mips= fails to build: conflicting types for 'restrict' Added: head/sysutils/fluent-bit/files/patch-lib_flb__libco_settings.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fluent-bit/files/patch-lib_flb__libco_settings.h Tue Nov 17 09:50:16 2020 (r555545) @@ -0,0 +1,11 @@ +--- lib/flb_libco/settings.h.orig 2020-11-16 20:38:14 UTC ++++ lib/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 Added: head/sysutils/fluent-bit/files/patch-lib_monkey_deps_flb__libco_settings.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fluent-bit/files/patch-lib_monkey_deps_flb__libco_settings.h Tue Nov 17 09:50:16 2020 (r555545) @@ -0,0 +1,11 @@ +--- 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 Added: head/sysutils/fluent-bit/files/patch-src_flb__scheduler.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fluent-bit/files/patch-src_flb__scheduler.c Tue Nov 17 09:50:16 2020 (r555545) @@ -0,0 +1,11 @@ +--- src/flb_scheduler.c.orig 2020-11-16 20:32:16 UTC ++++ src/flb_scheduler.c +@@ -44,7 +44,7 @@ static inline int consume_byte(flb_pipef + + /* We need to consume the byte */ + ret = flb_pipe_r(fd, &val, sizeof(val)); +-#ifdef __APPLE__ ++#if defined(__APPLE__) || __FreeBSD__ >= 12 + if (ret < 0) { + #else + if (ret <= 0) {