Skip to content

Commit 7867d73

Browse files
crazy-maxcrazy-max
authored
Merge pull request #94 from crazy-max/bump-syft
vendor: bump github.com/anchore/syft from 0.98.0 to 0.105.0
2 parents 5574669 + b244e37 commit 7867d73

File tree

1,276 files changed

+2770033
-1948097
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,276 files changed

+2770033
-1948097
lines changed

‎examples/amazonlinux/.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build/

‎examples/amazonlinux/Dockerfile

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# syntax=docker/dockerfile:1
2+
3+
# Copyright 2024 buildkit-syft-scanner authors
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
FROM amazonlinux:2 AS base
18+
ARG BUILDKIT_SBOM_SCAN_STAGE=true
19+
RUN yum install -y findutils
20+
COPY <<EOF /empty
21+
EOF
22+
23+
FROM scratch
24+
COPY --from=0 /empty /

‎examples/amazonlinux/checks/sbom-base.spdx.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"_type": "https://in-toto.io/Statement/v0.1",
3+
"predicateType": "https://spdx.dev/Document",
4+
"subject": [
5+
{
6+
"name": "empty",
7+
"digest": {
8+
"sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
9+
}
10+
}
11+
],
12+
"predicate": {
13+
"SPDXID": "SPDXRef-DOCUMENT",
14+
"name": "sbom-base",
15+
"packages": [
16+
{
17+
"SPDXID": "=package",
18+
"name": "findutils"
19+
}
20+
],
21+
"files": [
22+
{
23+
"SPDXID": "=filename",
24+
"fileName": "/usr/bin/xargs"
25+
}
26+
],
27+
"relationships": [
28+
{
29+
"spdxElementId": "==package",
30+
"relationshipType": "CONTAINS",
31+
"relatedSpdxElement": "==filename"
32+
}
33+
]
34+
}
35+
}

‎examples/amazonlinux/checks/sbom.spdx.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"_type": "https://in-toto.io/Statement/v0.1",
3+
"predicateType": "https://spdx.dev/Document",
4+
"predicate": {
5+
"SPDXID": "SPDXRef-DOCUMENT",
6+
"name": "sbom"
7+
}
8+
}

‎go.mod

Lines changed: 52 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,43 @@ go 1.21.0
44

55
require (
66
github.com/anchore/go-logger v0.0.0-20230725134548-c21dafa1ec5a
7-
github.com/anchore/stereoscope v0.0.0-20231117203853-3610f4ef3e83
8-
github.com/anchore/syft v0.98.0
7+
github.com/anchore/stereoscope v0.0.2-0.20240208195325-681f6715b0e3
8+
github.com/anchore/syft v0.105.0
99
github.com/in-toto/in-toto-golang v0.9.0
1010
github.com/pkg/errors v0.9.1
1111
github.com/sirupsen/logrus v1.9.3
12-
modernc.org/sqlite v1.27.0
12+
modernc.org/sqlite v1.29.1
1313
)
1414

1515
require (
1616
dario.cat/mergo v1.0.0 // indirect
1717
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
1818
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
19-
github.com/CycloneDX/cyclonedx-go v0.7.2 // indirect
20-
github.com/DataDog/zstd v1.4.5 // indirect
19+
github.com/CycloneDX/cyclonedx-go v0.8.0 // indirect
20+
github.com/DataDog/zstd v1.5.5 // indirect
21+
github.com/Masterminds/goutils v1.1.1 // indirect
2122
github.com/Masterminds/semver v1.5.0 // indirect
23+
github.com/Masterminds/semver/v3 v3.2.0 // indirect
24+
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
2225
github.com/Microsoft/go-winio v0.6.1 // indirect
23-
github.com/Microsoft/hcsshim v0.11.1 // indirect
26+
github.com/Microsoft/hcsshim v0.11.4 // indirect
2427
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
2528
github.com/acobaugh/osrelease v0.1.0 // indirect
2629
github.com/adrg/xdg v0.4.0 // indirect
27-
github.com/anchore/clio v0.0.0-20231016125544-c98a83e1c7fc // indirect
28-
github.com/anchore/fangs v0.0.0-20231103141714-84c94dc43a2e // indirect
30+
github.com/anchore/clio v0.0.0-20240209204744-cb94e40a4f65 // indirect
31+
github.com/anchore/fangs v0.0.0-20231201140849-5075d28d6d8b // indirect
2932
github.com/anchore/go-macholibre v0.0.0-20220308212642-53e6d0aaf6fb // indirect
3033
github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 // indirect
31-
github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501 // indirect
34+
github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b // indirect
35+
github.com/anchore/packageurl-go v0.1.1-0.20240202171727-877e1747d426 // indirect
3236
github.com/andybalholm/brotli v1.0.4 // indirect
3337
github.com/aquasecurity/go-pep440-version v0.0.0-20210121094942-22b2f8951d46 // indirect
3438
github.com/aquasecurity/go-version v0.0.0-20210121072130-637058cfe492 // indirect
3539
github.com/becheran/wildmatch-go v1.0.0 // indirect
3640
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
37-
github.com/cloudflare/circl v1.3.3 // indirect
41+
github.com/cloudflare/circl v1.3.7 // indirect
3842
github.com/containerd/cgroups v1.1.0 // indirect
39-
github.com/containerd/containerd v1.7.8 // indirect
43+
github.com/containerd/containerd v1.7.11 // indirect
4044
github.com/containerd/continuity v0.4.2 // indirect
4145
github.com/containerd/fifo v1.1.0 // indirect
4246
github.com/containerd/log v0.1.0 // indirect
@@ -48,7 +52,7 @@ require (
4852
github.com/distribution/reference v0.5.0 // indirect
4953
github.com/docker/cli v24.0.0+incompatible // indirect
5054
github.com/docker/distribution v2.8.3+incompatible // indirect
51-
github.com/docker/docker v24.0.7+incompatible // indirect
55+
github.com/docker/docker v25.0.3+incompatible // indirect
5256
github.com/docker/docker-credential-helpers v0.7.0 // indirect
5357
github.com/docker/go-connections v0.4.0 // indirect
5458
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
@@ -59,55 +63,63 @@ require (
5963
github.com/emirpasic/gods v1.18.1 // indirect
6064
github.com/facebookincubator/nvdtools v0.1.5 // indirect
6165
github.com/felixge/fgprof v0.9.3 // indirect
66+
github.com/felixge/httpsnoop v1.0.3 // indirect
6267
github.com/fsnotify/fsnotify v1.6.0 // indirect
6368
github.com/gabriel-vasile/mimetype v1.4.0 // indirect
6469
github.com/github/go-spdx/v2 v2.2.0 // indirect
6570
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
6671
github.com/go-git/go-billy/v5 v5.5.0 // indirect
67-
github.com/go-git/go-git/v5 v5.10.1 // indirect
68-
github.com/go-logr/logr v1.2.3 // indirect
72+
github.com/go-git/go-git/v5 v5.11.0 // indirect
73+
github.com/go-logr/logr v1.2.4 // indirect
6974
github.com/go-logr/stdr v1.2.2 // indirect
7075
github.com/go-restruct/restruct v1.2.0-alpha // indirect
7176
github.com/gogo/protobuf v1.3.2 // indirect
7277
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7378
github.com/golang/protobuf v1.5.3 // indirect
7479
github.com/golang/snappy v0.0.4 // indirect
7580
github.com/google/go-cmp v0.6.0 // indirect
76-
github.com/google/go-containerregistry v0.16.1 // indirect
81+
github.com/google/go-containerregistry v0.19.0 // indirect
7782
github.com/google/licensecheck v0.3.1 // indirect
7883
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect
79-
github.com/google/uuid v1.4.0 // indirect
84+
github.com/google/uuid v1.6.0 // indirect
8085
github.com/gookit/color v1.5.4 // indirect
8186
github.com/hashicorp/errwrap v1.1.0 // indirect
8287
github.com/hashicorp/go-multierror v1.1.1 // indirect
88+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
8389
github.com/hashicorp/hcl v1.0.0 // indirect
90+
github.com/huandu/xstrings v1.3.3 // indirect
8491
github.com/iancoleman/strcase v0.3.0 // indirect
92+
github.com/imdario/mergo v0.3.15 // indirect
8593
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8694
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
8795
github.com/jinzhu/copier v0.4.0 // indirect
8896
github.com/kastenhq/goversion v0.0.0-20230811215019-93b2f8823953 // indirect
89-
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
9097
github.com/kevinburke/ssh_config v1.2.0 // indirect
91-
github.com/klauspost/compress v1.17.0 // indirect
98+
github.com/klauspost/compress v1.17.4 // indirect
9299
github.com/klauspost/pgzip v1.2.5 // indirect
93100
github.com/knqyf263/go-rpmdb v0.0.0-20230301153543-ba94b245509b // indirect
94101
github.com/magiconair/properties v1.8.7 // indirect
95102
github.com/mattn/go-colorable v0.1.13 // indirect
96103
github.com/mattn/go-isatty v0.0.18 // indirect
104+
github.com/mattn/go-runewidth v0.0.15 // indirect
97105
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
98106
github.com/mholt/archiver/v3 v3.5.1 // indirect
99107
github.com/microsoft/go-rustaudit v0.0.0-20220730194248-4b17361d90a5 // indirect
108+
github.com/mitchellh/copystructure v1.2.0 // indirect
100109
github.com/mitchellh/go-homedir v1.1.0 // indirect
101110
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
102111
github.com/mitchellh/mapstructure v1.5.0 // indirect
112+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
103113
github.com/moby/locker v1.0.1 // indirect
104114
github.com/moby/sys/mountinfo v0.6.2 // indirect
105115
github.com/moby/sys/sequential v0.5.0 // indirect
106116
github.com/moby/sys/signal v0.7.0 // indirect
117+
github.com/ncruces/go-strftime v0.1.9 // indirect
107118
github.com/nwaples/rardecode v1.1.0 // indirect
119+
github.com/olekukonko/tablewriter v0.0.5 // indirect
108120
github.com/opencontainers/go-digest v1.0.0 // indirect
109121
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
110-
github.com/opencontainers/runc v1.1.5 // indirect
122+
github.com/opencontainers/runc v1.1.12 // indirect
111123
github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect
112124
github.com/opencontainers/selinux v1.11.0 // indirect
113125
github.com/pborman/indent v1.2.1 // indirect
@@ -117,15 +129,17 @@ require (
117129
github.com/pjbgf/sha1cd v0.3.0 // indirect
118130
github.com/pkg/profile v1.7.0 // indirect
119131
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
120-
github.com/saferwall/pe v1.4.7 // indirect
132+
github.com/rivo/uniseg v0.4.6 // indirect
133+
github.com/saferwall/pe v1.5.2 // indirect
121134
github.com/sagikazarmark/locafero v0.3.0 // indirect
122135
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
123136
github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
124-
github.com/sassoftware/go-rpmutils v0.2.0 // indirect
137+
github.com/sassoftware/go-rpmutils v0.3.0 // indirect
125138
github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e // indirect
126139
github.com/secure-systems-lab/go-securesystemslib v0.6.0 // indirect
127140
github.com/sergi/go-diff v1.3.1 // indirect
128141
github.com/shibumi/go-pathspec v1.3.0 // indirect
142+
github.com/shopspring/decimal v1.2.0 // indirect
129143
github.com/skeema/knownhosts v1.2.1 // indirect
130144
github.com/sourcegraph/conc v0.3.0 // indirect
131145
github.com/spdx/tools-golang v0.5.3 // indirect
@@ -138,7 +152,7 @@ require (
138152
github.com/sylabs/sif/v2 v2.11.5 // indirect
139153
github.com/sylabs/squashfs v0.6.1 // indirect
140154
github.com/therootcompany/xz v1.0.1 // indirect
141-
github.com/ulikunitz/xz v0.5.10 // indirect
155+
github.com/ulikunitz/xz v0.5.11 // indirect
142156
github.com/vbatts/go-mtree v0.5.3 // indirect
143157
github.com/vbatts/tar-split v0.11.3 // indirect
144158
github.com/vifraa/gopom v1.0.0 // indirect
@@ -149,20 +163,21 @@ require (
149163
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
150164
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
151165
go.opencensus.io v0.24.0 // indirect
152-
go.opentelemetry.io/otel v1.14.0 // indirect
153-
go.opentelemetry.io/otel/trace v1.14.0 // indirect
166+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
167+
go.opentelemetry.io/otel v1.19.0 // indirect
168+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
169+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
154170
go.uber.org/atomic v1.9.0 // indirect
155-
go.uber.org/goleak v1.2.0 // indirect
156171
go.uber.org/multierr v1.9.0 // indirect
157-
golang.org/x/crypto v0.16.0 // indirect
158-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
159-
golang.org/x/mod v0.14.0 // indirect
160-
golang.org/x/net v0.19.0 // indirect
161-
golang.org/x/sync v0.5.0 // indirect
162-
golang.org/x/sys v0.15.0 // indirect
163-
golang.org/x/term v0.15.0 // indirect
172+
golang.org/x/crypto v0.19.0 // indirect
173+
golang.org/x/exp v0.0.0-20231108232855-2478ac86f678 // indirect
174+
golang.org/x/mod v0.15.0 // indirect
175+
golang.org/x/net v0.21.0 // indirect
176+
golang.org/x/sync v0.6.0 // indirect
177+
golang.org/x/sys v0.17.0 // indirect
178+
golang.org/x/term v0.17.0 // indirect
164179
golang.org/x/text v0.14.0 // indirect
165-
golang.org/x/tools v0.13.0 // indirect
180+
golang.org/x/tools v0.17.0 // indirect
166181
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
167182
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
168183
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
@@ -172,13 +187,10 @@ require (
172187
gopkg.in/warnings.v0 v0.1.2 // indirect
173188
gopkg.in/yaml.v3 v3.0.1 // indirect
174189
gotest.tools/v3 v3.1.0 // indirect
175-
lukechampine.com/uint128 v1.2.0 // indirect
176-
modernc.org/cc/v3 v3.40.0 // indirect
177-
modernc.org/ccgo/v3 v3.16.13 // indirect
178-
modernc.org/libc v1.29.0 // indirect
190+
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
191+
modernc.org/libc v1.41.0 // indirect
179192
modernc.org/mathutil v1.6.0 // indirect
180193
modernc.org/memory v1.7.2 // indirect
181-
modernc.org/opt v0.1.3 // indirect
182-
modernc.org/strutil v1.1.3 // indirect
183-
modernc.org/token v1.0.1 // indirect
194+
modernc.org/strutil v1.2.0 // indirect
195+
modernc.org/token v1.1.0 // indirect
184196
)

0 commit comments

Comments
 (0)