From nobody Sat Mar 09 08:13:48 2024 X-Original-To: dev-commits-ports-main@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 4TsG5S3ssVz5D8xZ; Sat, 9 Mar 2024 08:13:48 +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 4TsG5S3LYhz49Ch; Sat, 9 Mar 2024 08:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709972028; 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=TO74LZ4OfVHJmtzqFuOm4GiG5SQ1CrERUXvd/CYZM2Y=; b=qkEarrZge3Twi/aEDCK9ORUyalcMapw0XaNw+mJkjUTUdZ0DgSA+9ufMnYIseXVJcbJrdj u9y5Yn3RgavYZlVZI+lBExFmqzPJVfRpsqKH2lsQG/4F8tHFAvWaWsDADAtvKykdMorwkO qLwGuFq9FQia0IcU61DtBgIWcAaIqyKfMDePS3BxyZA4tm1d2s0k18nRR1S4NNafJmSzPU kCEEbDoEl+APfxLzJBkZrEw7I9eCRahyxFM2K8RN2o2hdxReTOVxxXPsE4JHwi0igNd5Js R8C47v3Tt2u5iRCFDIaqms0L9hM9yKdNX38W8QTPrk0NVlIxo+GMVBsnbnfsBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709972028; a=rsa-sha256; cv=none; b=vdHNaYsccBr/HglycQbxsn1RWf2q5M/gYNQL6plxoPTod1Cp30SIr/cvqEVgu2VaA7pSAu V4elYsiVYsCWB5N8KdEahfM90aOhqEZHpn0IlymkU47TE49Tsgtk+DewYFPSA2f249s7xA kH5Zpw4zFXsSm5ARvqSvbWLjjhcLzsLlgb59dmAlAQcGS0BWNjsAefpbiXpr550Jj13ByS x3KAudh+AUkZVwcyq23Dv23cXrznbtIPl6FBBukc30ofL/2cUKqTmgol7anhUO2iDNOOrO vqFxkSQQFkgEjyLIr461TNhulDBBOM5R9pejgB5PvPnL0x0ZS45vzmeT6k9GUw== 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=1709972028; 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=TO74LZ4OfVHJmtzqFuOm4GiG5SQ1CrERUXvd/CYZM2Y=; b=SNn3jaNNrP6Bhq7FDZEER5bwhjY3dZaji+L4oz+BRZT6ELaPl1B62Zr+pgLufGroxGOZv6 FuGKAWU5H/lyIb4TYTrtfJ7Edn4k+BHS9qfIlr/TvvZkDYtSSeNA5U6ZIyorbnRLmOHi3d yX2Ra0Vd5Jnbh7TrXzbfh5RIirpeIPeoISsiunn3q+a9wmmVWPVVUXtuOX1+TvzZtszX4Z BNq670fTiWF0by+qvCo8s0XrvZdsf6awJYH2V/67p6+sw7STVu5D9Ij8/XJyrY4tox8bL9 RDFIrftQ0g5G32ZMLvtdVZRdyZrJ3DEJT02uLojfaTxZA1Pfgl6mcHQMmjvKzg== 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 4TsG5S2y58ztmf; Sat, 9 Mar 2024 08:13:48 +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 4298Dmn2093237; Sat, 9 Mar 2024 08:13:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4298DmKj093234; Sat, 9 Mar 2024 08:13:48 GMT (envelope-from git) Date: Sat, 9 Mar 2024 08:13:48 GMT Message-Id: <202403090813.4298DmKj093234@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 9e6fcaf3eaa2 - main - security/trivy: include templates List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 9e6fcaf3eaa2e2f5a8036bcdfde6bd18810d72dd Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e6fcaf3eaa2e2f5a8036bcdfde6bd18810d72dd commit 9e6fcaf3eaa2e2f5a8036bcdfde6bd18810d72dd Author: Matthias Fechner AuthorDate: 2024-03-09 08:12:31 +0000 Commit: Matthias Fechner CommitDate: 2024-03-09 08:13:37 +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. --- 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