git: 06a612945b36 - main - security/osv-scanner: Fix patch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 19 Jul 2025 06:14:10 UTC
The branch main has been updated by dutra:
URL: https://cgit.FreeBSD.org/ports/commit/?id=06a612945b36eb741871a8239d0a91816f5a659d
commit 06a612945b36eb741871a8239d0a91816f5a659d
Author: Gabriel M. Dutra <dutra@FreeBSD.org>
AuthorDate: 2025-07-19 06:11:31 +0000
Commit: Gabriel M. Dutra <dutra@FreeBSD.org>
CommitDate: 2025-07-19 06:11:31 +0000
security/osv-scanner: Fix patch
Remove CONFLICTS_INSTALL and add GO_SUFFIX in the patch.
---
security/osv-scanner/Makefile | 3 +--
security/osv-scanner/files/patch-internal_sourceanalysis_go.go | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/security/osv-scanner/Makefile b/security/osv-scanner/Makefile
index c94f8a1fe4b8..5848bced8ba3 100644
--- a/security/osv-scanner/Makefile
+++ b/security/osv-scanner/Makefile
@@ -1,6 +1,7 @@
PORTNAME= osv-scanner
DISTVERSIONPREFIX= v
DISTVERSION= 2.1.0
+PORTREVISION= 1
CATEGORIES= security
MAINTAINER= dutra@FreeBSD.org
@@ -12,8 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= go:1.24,modules,run
-CONFLICTS_INSTALL= osv-scanner
-
_BUILD_VERSION= ${DISTVERSION}
_BUILD_COMMIT= 9267fda
_BUILD_DATE= $$(date +%Y-%m-%d)
diff --git a/security/osv-scanner/files/patch-internal_sourceanalysis_go.go b/security/osv-scanner/files/patch-internal_sourceanalysis_go.go
index 05d4a3d256c3..04a027230126 100644
--- a/security/osv-scanner/files/patch-internal_sourceanalysis_go.go
+++ b/security/osv-scanner/files/patch-internal_sourceanalysis_go.go
@@ -5,7 +5,7 @@
func goAnalysis(pkgs []models.PackageVulns, source models.SourceInfo) {
- cmd := exec.Command("go", "version")
-+ cmd := exec.Command("go124", "version")
++ cmd := exec.Command("go%%GO_SUFFIX%%", "version")
_, err := cmd.Output()
if err != nil {
slog.Info("Skipping call analysis on Go code since Go is not installed.")