From nobody Thu Aug 22 23:27:28 2024 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 4WqfW45k9Vz5TqtC; Thu, 22 Aug 2024 23:27:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WqfW43WQPz4ny6; Thu, 22 Aug 2024 23:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724369248; 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=kZmOK8CBPQpnBNyMWX42u275RTZcP2PIPQuFjpeEm2k=; b=AFPvLY1gk1sSIzJJ9Kn7MLmVsc+4zSPT7YRT4EkGrvC/o0Qv/Im5rq3GKI1j+zwYt/ro7A 6ps1hP7nEAuODCXO/Jzg+Y7yoAWHeKAhZLeE9+ydXRWMLu81/iOajnpZKnL1QA/+aGZeoi Lx5qJRKIhgJsdLvupCfQ32uvmk/5r2nUYTohGHDAAH0A5JRoUvNO6dscQ86YXUNYxGXn4r hhlanPEBQ1052c3udNvOp3i14PbFUOuRuW+hEDKMZwwNnIv4DxtyGWv9k1n4+DR5px2fdn XX1enU7J3w6Xv16uNvGj5vjEhSCjeutRvxem08uQ82MFqbH1rtbueitfgxqmkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724369248; a=rsa-sha256; cv=none; b=G4P1CSb41Z3R3ANH+ETffwju1Ia5YtfDbx9ob2116ihgpfKCd4dG4L7WWmi0Lqb6b+8H3d dxgGBAxjehWGR9mcyEFdTw5Va2YFvUurlYqpdFkzqifDBZ2MD+M6OeqxgMBJjxALrCQjEz RntUZs15oQfMmOM7jywHPIO9W8SXNXrU0uhXtUE99rfSRTG04gn2Lhey6JUkNdp9961J6Z cZUN8Vngnb/Kc9ViEbKUbHX2HFB+FnG8FKoW63HUz3rXMDCZ+4Q0xJw61R4oGYblMaK2Mt MX1MI/EXUliu+dgVpyc+4wtQW9mt9aFhUrUBU06codkik0wmkaqZ159bWRv/GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724369248; 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=kZmOK8CBPQpnBNyMWX42u275RTZcP2PIPQuFjpeEm2k=; b=w50PdyEvqSOZnTzFdPY5OaYqNe4iqufhrfB3kFi2k4MC5EAAsf0NfX8tl0KD0q3a+L1T2d anzjMN8pZtHuaJRTx4ealqK9O0GhjwFpbwbAgHmOzTMiMQf619v0/dsNh7JDIkh7gW+UEo N9h7prO9nVJ1R0JYiwKH1wPRJIZKaPLdrZBsOCc+X9N0LDb+oY0Nmqztf5tMl+MiMj2EgA +cPZbxk5E0Vi1Ea7me+Q23vKOBQ2lA8GXRXaE4haH3OpmvcynEEc+GVuLLMC/tTEPEo444 nOuYJtrPqdNJVQnNsWsQzLl3JOcsKr/Bw1CODK+nxdiLJlPOE7lD/6ThhqJ2Zw== 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 4WqfW430QyzngJ; Thu, 22 Aug 2024 23:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47MNRS6D024647; Thu, 22 Aug 2024 23:27:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47MNRS84024644; Thu, 22 Aug 2024 23:27:28 GMT (envelope-from git) Date: Thu, 22 Aug 2024 23:27:28 GMT Message-Id: <202408222327.47MNRS84024644@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: fc0a0b37b12c - main - sysutils/fluent-bit: Add option LUA_FILTER 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc0a0b37b12c8abd83ba0f7ca2153d1419fbb86d Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc0a0b37b12c8abd83ba0f7ca2153d1419fbb86d commit fc0a0b37b12c8abd83ba0f7ca2153d1419fbb86d Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-07-25 12:52:29 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-08-22 23:27:12 +0000 sysutils/fluent-bit: Add option LUA_FILTER From https://docs.fluentbit.io/manual/pipeline/filters/lua: > The Lua filter allows you to modify the incoming records (even split > one record into multiple records) using custom Lua scripts. The option depends on luajit-devel, because at least version 2.1.0 is required: https://github.com/fluent/fluent-bit/pull/7286/files. Keep the option disabled for now. We may consider enabling it by default in the future to match what upstream does: https://docs.fluentbit.io/manual/installation/sources/build-and-install. Also, add a small do-test target for the new option. PR: 252296 Approved by: portmgr (maintainer timeout) Sponsored by: trivago N.V. Sponsored by: Klara, Inc. --- sysutils/fluent-bit/Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile index 0d7cfb932a72..66b9d143b872 100644 --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -20,12 +20,18 @@ GH_ACCOUNT= fluent USE_RC_SUBR= ${PORTNAME} CMAKE_ARGS= -DFLB_DEBUG=Off \ - -DFLB_LUAJIT=Off \ -DFLB_TRACE=Off LDFLAGS+= -lexecinfo -OPTIONS_DEFINE= PGSQL SSL +OPTIONS_DEFINE= LUA_FILTER PGSQL SSL OPTIONS_DEFAULT= SSL +LUA_FILTER_DESC= Support for modifying incoming records using Lua scripts + +LUA_FILTER_USES= luajit:luajit-devel pkgconfig +LUA_FILTER_CMAKE_ON= -DFLB_FILTER_LUA=On \ + -DFLB_LUAJIT=On \ + -DFLB_PREFER_SYSTEM_LIB_LUAJIT=On +LUA_FILTER_CMAKE_OFF= -DFLB_LUAJIT=Off PGSQL_USES= pgsql PGSQL_CMAKE_ON= -DFLB_OUT_PGSQL=On @@ -46,4 +52,7 @@ post-install: ${MV} ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/parsers.conf ${STAGEDIR}${ETCDIR}/parsers.conf.sample +do-test-LUA_FILTER-on: + ${STAGEDIR}${PREFIX}/bin/fluent-bit --help 2>/dev/null | grep -w -q lua + .include