git: 30da0a017216 - main - security/osv-scanner: Update to 1.8.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 21 Jul 2024 17:13:26 UTC
The branch main has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=30da0a017216d43a32055450efdc0a759d62aeed commit 30da0a017216d43a32055450efdc0a759d62aeed Author: Pierre Pronchery <pierre@freebsdfoundation.org> AuthorDate: 2024-07-21 17:09:41 +0000 Commit: Lewis Cook <lcook@FreeBSD.org> 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")