From nobody Tue Mar 26 07:57:13 2024 X-Original-To: dev-commits-ports-branches@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 4V3hwT6dphz5F4hQ; Tue, 26 Mar 2024 07:57:13 +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 4V3hwT6Bg2z46LH; Tue, 26 Mar 2024 07:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711439833; 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=BEbiTtULf+1UMeIDStLf+NsogLLYngTrLMcfKjucW4A=; b=dC/VCGylWx15zixukD87LgBTz/lqtFkmiRTyYc9jhjfzpoAktraujwe0ok7fUTnBvs6upW 3QRgjgbqpOzrKUdZtVBEYTDs+xP2EpDUIzaP4Wo3OhIOVTr1WGVlc+Cqw7w9rY+GdfFf2p mgsbthYhNCv+lpb9ikOdkx0pXqc5XmVePjmOiv1/RFZkYAj8bwoV56UqJ82uXjJUuMlJTq oqZVJNVKpnNYy1iho2uekaEk1nreqSGET414EIoHlzRnyGTnou8O01ZFBnZzj0Vbtsycly +3v52lxWubFDX3aWGo4AxrIvHs9dH6DEIEl7pgqPBNsPybNdDRqTAN9IwExR3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711439833; a=rsa-sha256; cv=none; b=PlLdUJ81W92NTkSQD6CDccreK//WfPG9L1QHPdpOvHEYJXqTUusFfFqDLC1YSRs7gDONsE cXqGft1E8wYiF1LbFa9GMxCVra5R4QDAtb2SrNR54nLhRrupGXQZ/2dnugEPyMYWnoC/4T hLpPkFIhMvLkSfhufE5SUD/i4bIH6QNaZBGL+05ldpsTBz891u9PF7AYFIypd1g5Cxzjc9 KJr/p+kFEA6F8Im2Akehy6iZ6zj5jJVra48y/9vjnn+E6zbnMDsOopJUTb4FJtsgdVR5tT +//QIR0/7WD2F9j1R5k1gh/G50ilet6hMuykL2PyG8lOwJ39RUV0WU4OtOfiew== 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=1711439833; 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=BEbiTtULf+1UMeIDStLf+NsogLLYngTrLMcfKjucW4A=; b=EoYRQp04AgzqNitFPb5lc+LVEEgAAnXstU4Lss5OXpOmJ/O6KIPsg2HybzXz/BHhGT2D3U pFlb65TQhQeQD4eF/JXOf56RftCRGE7Uaf96BeNFlSG9tLTNL+ipqPG4k/JvkJ+wnOqOC3 qtM5gd741tm3xXlPlPTHTUyDqX0pxWtCpBZzEPqCeMhMwk2nDUhkWH6tH5/zwq+x4xKaBp QosflcbttwGrs0qiMv4deGslOgC3RLMaGbSqm7kHue6tJ7n87E83vTSsuhj3yw61U1HKr6 VtHs03+PPr4s1SHGeoGpfb27yHHmZzfUcQE/0t6C4FUbBprjyv/HL2ePbg6u3A== 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 4V3hwT5nG5zrtW; Tue, 26 Mar 2024 07:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42Q7vD2Y006239; Tue, 26 Mar 2024 07:57:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42Q7vDq5006236; Tue, 26 Mar 2024 07:57:13 GMT (envelope-from git) Date: Tue, 26 Mar 2024 07:57:13 GMT Message-Id: <202403260757.42Q7vDq5006236@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 53331c0d8209 - 2024Q1 - security/trivy: include templates List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 53331c0d82099be48e3ecf18e46555881d2fe1b1 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=53331c0d82099be48e3ecf18e46555881d2fe1b1 commit 53331c0d82099be48e3ecf18e46555881d2fe1b1 Author: Matthias Fechner AuthorDate: 2024-03-09 08:12:31 +0000 Commit: Matthias Fechner CommitDate: 2024-03-26 07:56:35 +0000 security/trivy: include templates These templates can be used to integrate trivy into gitlab pipelines. But it seems that gitlab does support the full parsing not in the community edition of gitlab. (cherry picked from commit 9e6fcaf3eaa2e2f5a8036bcdfde6bd18810d72dd) --- security/trivy/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/security/trivy/Makefile b/security/trivy/Makefile index 44282f9226e1..862dba088fd4 100644 --- a/security/trivy/Makefile +++ b/security/trivy/Makefile @@ -1,5 +1,6 @@ PORTNAME= trivy DISTVERSION= 0.49.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= security @@ -21,6 +22,14 @@ GO_BUILDFLAGS= -ldflags=" \ PLIST_FILES= bin/${PORTNAME} +post-install: + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/contrib/*.tpl ${STAGEDIR}${DATADIR}/ + ${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \ + ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ + ${SED} -E -e '/sample$$/ s#^#@sample #; \ + s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST} + cat ${TMPPLIST} .include