diff options
| author | Gabriel M. Dutra <dutra@FreeBSD.org> | 2025-07-19 03:11:31 -0300 |
|---|---|---|
| committer | Gabriel M. Dutra <dutra@FreeBSD.org> | 2025-07-19 03:11:31 -0300 |
| commit | 06a612945b36eb741871a8239d0a91816f5a659d (patch) | |
| tree | 26d5431470fbdd4f71dd760ee17e73e46c2d94ba | |
| parent | security/osv-scanner: Update to 2.1.0 (diff) | |
security/osv-scanner: Fix patch
Remove CONFLICTS_INSTALL and add GO_SUFFIX in the patch.
| -rw-r--r-- | security/osv-scanner/Makefile | 3 | ||||
| -rw-r--r-- | 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.") |