Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Apr 2026 12:54:11 +0000
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 5c271354acbb - 2026Q2 - security/syft: fix fetch
Message-ID:  <69f350f3.27ce7.32593c5@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch 2026Q2 has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5c271354acbbc1a780a8f53fd117e0a6a47f4694

commit 5c271354acbbc1a780a8f53fd117e0a6a47f4694
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2026-04-29 19:21:55 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2026-04-30 12:54:06 +0000

    security/syft: fix fetch
    
    The port tries to fetch google.golang.org/genproto and its submodules
    in different versions for some reason.  This confuses our framework to
    the point where it cannot fetch the port.
    
    Fix the build by fetching the same (newer) version for both parent and
    child.  The versions are ~2 months apart, which should pose no problem.
    
    Also mark as only for aarch64, amd64 due to use of modernc.org/sqlite
    
    Approved by:    portmgr (build fix blanket)
    MFH:            2026Q2
    
    (cherry picked from commit c86a02ab3b84ac1e4a972e1217412a401d5692de)
---
 security/syft/Makefile | 7 ++++---
 security/syft/distinfo | 6 +-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/security/syft/Makefile b/security/syft/Makefile
index 6461f168759c..9b38beeace65 100644
--- a/security/syft/Makefile
+++ b/security/syft/Makefile
@@ -10,6 +10,9 @@ WWW=		https://github.com/anchore/syft
 
 LICENSE=	APACHE20
 
+ONLY_FOR_ARCHS= aarch64 amd64
+ONLY_FOR_ARCHS_REASON=  module modernc.org/sqlite only supported on aarch64 and amd64
+
 GO_WRKSRC=	${WRKSRC}
 
 USES=		go:modules,1.25
@@ -151,9 +154,7 @@ GH_TUPLE=	\
 		google:cel-spec:v0.24.0:google_cel_spec/vendor/cel.dev/expr \
 		google:go-cmp:v0.7.0:google_go_cmp/vendor/github.com/google/go-cmp \
 		google:go-containerregistry:v0.21.1:google_go_containerregistry/vendor/github.com/google/go-containerregistry \
-		google:go-genproto:9219d122eba9:google_go_genproto/vendor/google.golang.org/genproto \
-		google:go-genproto:95abcf5c77ba:google_go_genproto_1/vendor/google.golang.org/genproto/googleapis/api \
-		google:go-genproto:95abcf5c77ba:google_go_genproto_2/vendor/google.golang.org/genproto/googleapis/rpc \
+		google:go-genproto:95abcf5c77ba:google_go_genproto/vendor/google.golang.org/genproto \
 		google:licensecheck:v0.3.1:google_licensecheck/vendor/github.com/google/licensecheck \
 		google:pprof:a4b03ec1a45e:google_pprof/vendor/github.com/google/pprof \
 		google:s2a-go:v0.1.9:google_s2a_go/vendor/github.com/google/s2a-go \
diff --git a/security/syft/distinfo b/security/syft/distinfo
index 875f41bbed60..948a993d5b18 100644
--- a/security/syft/distinfo
+++ b/security/syft/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1773826900
+TIMESTAMP = 1777490120
 SHA256 (anchore-syft-v1.42.2_GH0.tar.gz) = 355dc28dd7de6a42226a4664372230994c730f69dbb5a3e76d3b9bd943cc7c37
 SIZE (anchore-syft-v1.42.2_GH0.tar.gz) = 6889426
 SHA256 (acarl005-stripansi-5a71ef0e047d_GH0.tar.gz) = 832ad7232c573cec3eece91af4cdf40d2d06bca94e026dd7d5add0f44f802f0f
@@ -257,10 +257,6 @@ SHA256 (google-go-cmp-v0.7.0_GH0.tar.gz) = c98f4f998ad8134b26816500b5c4c5cd63299
 SIZE (google-go-cmp-v0.7.0_GH0.tar.gz) = 105149
 SHA256 (google-go-containerregistry-v0.21.1_GH0.tar.gz) = 4fb8e2b4517cbd2324c0053eb368da51c730f6514a2b51abc37676b861f7955c
 SIZE (google-go-containerregistry-v0.21.1_GH0.tar.gz) = 4640706
-SHA256 (google-go-genproto-9219d122eba9_GH0.tar.gz) = 7437c020a141617d99b56cacd848e7567a573136b25836b3834c3eb95340851d
-SIZE (google-go-genproto-9219d122eba9_GH0.tar.gz) = 5914335
-SHA256 (google-go-genproto-95abcf5c77ba_GH0.tar.gz) = 57f109d99bba4136934a0900faee1e5a5ca3222d509135051c0cc3b5e2df74ba
-SIZE (google-go-genproto-95abcf5c77ba_GH0.tar.gz) = 5924636
 SHA256 (google-go-genproto-95abcf5c77ba_GH0.tar.gz) = 57f109d99bba4136934a0900faee1e5a5ca3222d509135051c0cc3b5e2df74ba
 SIZE (google-go-genproto-95abcf5c77ba_GH0.tar.gz) = 5924636
 SHA256 (google-licensecheck-v0.3.1_GH0.tar.gz) = 9f2bd0b68cee1f4bfb0cf3143575a2a78bd045a1493354e41d52da8c5a79cfb0


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f350f3.27ce7.32593c5>