From nobody Sun Jul 21 17:13:26 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 4WRqkG5p92z5RqwF; Sun, 21 Jul 2024 17:13:26 +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 4WRqkG5B7Yz4sZL; Sun, 21 Jul 2024 17:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721582006; 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=MFuyNsI2J4p5zrT6DnCf/VarIsxQuVWYPOrWbK9HwB8=; b=jsoid8A1L1+RRYb2bVAKD13/gnE+LNKZj6C5AGI2ISxSyRIHuTebNLudCuoKzXwnIl6Td/ xJ7XXGc2v9E3Y/7IO4o/uISPyC876ZStqtx/hh82zzzSUASVBqnjXxWYaaFm0LoCCdM4KN eyXZbgJfGCbge0jaX6hQnueOHZiQI9PF6YnAY1adQvhggh3jRsMRWK77xZsWDE1xCxRtYp 6hfzKYoFHXVA9cLd0yu5RvSUGiJMFs6QkHsV00CiBR5vfSIvLgynrmbeh8xvVvkHQrRlxs 1R35VHX/ssy8zVgKO05CNjE+/myqcn0wJLlPoU1a6j4R60/PbYggsqhOaSpbfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721582006; a=rsa-sha256; cv=none; b=dhnxyU1LGIHEVfx6Z76uv4QfvUDEjZYMXP1ZnV0cZXrc8ON/+W55dT02CINsBU1iaWzKL0 4fl6nlnUVKVgdxKErG0s8HIEVjggpgEc4udUiD38eIA6K05m8t7xbiLh/12vUVEPVDsR8G 0yVtFtcGPoBIdo0F47dWQdVKOKNWhlOkBYDpGltAKfKV4ue+QKsXvalhB9edPR6PuKndS2 5rfq3hOY/JO3ge7hhFnHqujrHguqIiwQidXAStk50uSWv/UNCSMf2Ud3ZibkEpxvVOVon8 73hqPE7z8LtSpP2v+dIQt1kn6U4fqOX1DyBExbbI5KS5WxDfmvjqUQjbPq5d5A== 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=1721582006; 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=MFuyNsI2J4p5zrT6DnCf/VarIsxQuVWYPOrWbK9HwB8=; b=eX/RwAf9WIxjFM+f+m9zAfPkmaciPE5aAIu6/+V8WvaI6oEOTBmqdNkvTgP6SFtPb7J4pL HKVCVOVbChpjqcl1Ki9eBTgIXKbC1boyRUDvA32sp8KppGRsVPJZYOU2Bqhj3gLflWhiSe A6GUiNDlCIZvgmeGR6BG8Vu1JAiBVaFRgrPg9WHGPDBJf/x2SfxhqlvaaJzrC9tvt6crzw UE9LVaHTVnKPfcmP4HlkJ3TbT+5xBHmQN2fWQq+AvrpE6DfDnjHRTjVyU4ItVuh3uJ4ct3 mxGhaf1kURSg/PQvIriwh5mchq4dghd5ADmbR+s+nuIG6MSIG6LY2TiOPn/ehQ== 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 4WRqkG4nXdz17qG; Sun, 21 Jul 2024 17:13:26 +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 46LHDQpW030005; Sun, 21 Jul 2024 17:13:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46LHDQ8a030002; Sun, 21 Jul 2024 17:13:26 GMT (envelope-from git) Date: Sun, 21 Jul 2024 17:13:26 GMT Message-Id: <202407211713.46LHDQ8a030002@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lewis Cook Subject: git: 30da0a017216 - main - security/osv-scanner: Update to 1.8.2 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: lcook X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30da0a017216d43a32055450efdc0a759d62aeed Auto-Submitted: auto-generated The branch main has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=30da0a017216d43a32055450efdc0a759d62aeed commit 30da0a017216d43a32055450efdc0a759d62aeed Author: Pierre Pronchery AuthorDate: 2024-07-21 17:09:41 +0000 Commit: Lewis Cook CommitDate: 2024-07-21 17:12:45 +0000 security/osv-scanner: Update to 1.8.2 Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-ports/pull/282 --- security/osv-scanner/Makefile | 9 ++++++--- security/osv-scanner/distinfo | 10 +++++----- .../osv-scanner/files/patch-internal_sourceanalysis_go.go | 11 +++++++++++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/security/osv-scanner/Makefile b/security/osv-scanner/Makefile index 5c50c57a6687..df7a3d165816 100644 --- a/security/osv-scanner/Makefile +++ b/security/osv-scanner/Makefile @@ -1,7 +1,6 @@ PORTNAME= osv-scanner DISTVERSIONPREFIX= v -DISTVERSION= 1.7.1 -PORTREVISION= 4 +DISTVERSION= 1.8.2 CATEGORIES= security MAINTAINER= lcook@FreeBSD.org @@ -14,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:1.21,modules _BUILD_VERSION= ${DISTVERSION} -_BUILD_COMMIT= 43dda7a +_BUILD_COMMIT= 1ea785e _BUILD_DATE= $$(date +%Y-%m-%d) GO_MODULE= github.com/google/${PORTNAME} @@ -30,6 +29,10 @@ PLIST_FILES= ${GO_TARGET:C/.\/cmd/bin/} OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} -e 's,%%GO_SUFFIX%%,${GO_SUFFIX},' \ + ${WRKSRC}/internal/sourceanalysis/go.go + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \ diff --git a/security/osv-scanner/distinfo b/security/osv-scanner/distinfo index 921de97a6548..6698c23af27f 100644 --- a/security/osv-scanner/distinfo +++ b/security/osv-scanner/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1712438042 -SHA256 (go/security_osv-scanner/osv-scanner-v1.7.1/v1.7.1.mod) = df7aa5bea0f40ac2e6bc31e19db8246217bd168f106e0e559f30f51e7331a27a -SIZE (go/security_osv-scanner/osv-scanner-v1.7.1/v1.7.1.mod) = 5059 -SHA256 (go/security_osv-scanner/osv-scanner-v1.7.1/v1.7.1.zip) = c621713f2bb76a5cca3235bb2266ce7d6377f2c9bf7569bf551fa2e69987b443 -SIZE (go/security_osv-scanner/osv-scanner-v1.7.1/v1.7.1.zip) = 3958644 +TIMESTAMP = 1720621608 +SHA256 (go/security_osv-scanner/osv-scanner-v1.8.2/v1.8.2.mod) = b330a09097662dda308c1d00070863cec5bab7ad766b431132204e62bcfbd4d0 +SIZE (go/security_osv-scanner/osv-scanner-v1.8.2/v1.8.2.mod) = 5340 +SHA256 (go/security_osv-scanner/osv-scanner-v1.8.2/v1.8.2.zip) = 3f2258a6e28d170b6e59415af5d21a42b3be63dbc9cdf38bc28b080e2a072c37 +SIZE (go/security_osv-scanner/osv-scanner-v1.8.2/v1.8.2.zip) = 6873207 diff --git a/security/osv-scanner/files/patch-internal_sourceanalysis_go.go b/security/osv-scanner/files/patch-internal_sourceanalysis_go.go new file mode 100644 index 000000000000..963201cbdd44 --- /dev/null +++ b/security/osv-scanner/files/patch-internal_sourceanalysis_go.go @@ -0,0 +1,11 @@ +--- internal/sourceanalysis/go.go.orig 2024-06-21 19:21:07.662367000 +0200 ++++ internal/sourceanalysis/go.go 2024-06-21 19:21:27.715630000 +0200 +@@ -18,7 +18,7 @@ + ) + + func goAnalysis(r reporter.Reporter, pkgs []models.PackageVulns, source models.SourceInfo) { +- cmd := exec.Command("go", "version") ++ cmd := exec.Command("go%%GO_SUFFIX%%", "version") + _, err := cmd.Output() + if err != nil { + r.Infof("Skipping call analysis on Go code since Go is not installed.\n")