Skip to content

Commit 5c84289

Browse files
Merge pull request #24377 from TomSweeneyRedHat/dev/tsweeney/v4.9-rhel-cve-2024-9676
[v4.9-rhel] Bump to Buildah v1.33.11, Fix CVE-2024-9676
2 parents 732838a + 759e8a2 commit 5c84289

File tree

10 files changed

+97
-38
lines changed

10 files changed

+97
-38
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ require (
1111
github.com/checkpoint-restore/go-criu/v7 v7.0.0
1212
github.com/containernetworking/cni v1.1.2
1313
github.com/containernetworking/plugins v1.3.0
14-
github.com/containers/buildah v1.33.10
14+
github.com/containers/buildah v1.33.11
1515
github.com/containers/common v0.57.7
1616
github.com/containers/conmon v2.0.20+incompatible
1717
github.com/containers/gvisor-tap-vsock v0.7.2
1818
github.com/containers/image/v5 v5.29.5
1919
github.com/containers/libhvee v0.5.0
2020
github.com/containers/ocicrypt v1.1.10
2121
github.com/containers/psgo v1.8.0
22-
github.com/containers/storage v1.51.1
22+
github.com/containers/storage v1.51.2
2323
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09
2424
github.com/coreos/stream-metadata-go v0.4.4
2525
github.com/crc-org/vfkit v0.1.2-0.20231030102423-f3c783d34420

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHV
258258
github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8=
259259
github.com/containernetworking/plugins v1.3.0 h1:QVNXMT6XloyMUoO2wUOqWTC1hWFV62Q6mVDp5H1HnjM=
260260
github.com/containernetworking/plugins v1.3.0/go.mod h1:Pc2wcedTQQCVuROOOaLBPPxrEXqqXBFt3cZ+/yVg6l0=
261-
github.com/containers/buildah v1.33.10 h1:I2nVGxBXLva12ZQyRL2AOURbuMiy948HQwV4n0jLP7Y=
262-
github.com/containers/buildah v1.33.10/go.mod h1:/18oVHu3NIAm10tEaJMsH2K4e1+krBFqsCywD/kZjto=
261+
github.com/containers/buildah v1.33.11 h1:WhEw4xD251utfeb3Huijb/yiTY62tqh8IzchcbnQ2rA=
262+
github.com/containers/buildah v1.33.11/go.mod h1:MtL+0XpZL5csljQDshjeQfvjzyTV0hgZsSoExmO3eu8=
263263
github.com/containers/common v0.57.7 h1:xA6/dXNbScnaytcFNQKTFGn6VDxwvDlCngJtfdGAf7g=
264264
github.com/containers/common v0.57.7/go.mod h1:GRtgIWNPc8zmo/vcA7VoZfLWpgQRH01/kzQbeNZH8WQ=
265265
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
@@ -282,8 +282,8 @@ github.com/containers/ocicrypt v1.1.10/go.mod h1:YfzSSr06PTHQwSTUKqDSjish9BeW1E4
282282
github.com/containers/psgo v1.8.0 h1:2loGekmGAxM9ir5OsXWEfGwFxorMPYnc6gEDsGFQvhY=
283283
github.com/containers/psgo v1.8.0/go.mod h1:T8ZxnX3Ur4RvnhxFJ7t8xJ1F48RhiZB4rSrOaR/qGHc=
284284
github.com/containers/storage v1.43.0/go.mod h1:uZ147thiIFGdVTjMmIw19knttQnUCl3y9zjreHrg11s=
285-
github.com/containers/storage v1.51.1 h1:XMjFbFIgQ/I7DOhKeTOmnThz3UX1ZvkwxksYexHXRTM=
286-
github.com/containers/storage v1.51.1/go.mod h1:ybl8a3j1PPtpyaEi/5A6TOFs+5TrEyObeKJzVtkUlfc=
285+
github.com/containers/storage v1.51.2 h1:Xw8p1AG1A+Nh6dCsb1UOB3YKF5uzlCkI3uAP4fsFup4=
286+
github.com/containers/storage v1.51.2/go.mod h1:ybl8a3j1PPtpyaEi/5A6TOFs+5TrEyObeKJzVtkUlfc=
287287
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
288288
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
289289
github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=

vendor/github.com/containers/buildah/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/buildah/changelog.txt

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/buildah/define/types.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/storage/.cirrus.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/storage/VERSION

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/storage/userns.go

Lines changed: 65 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/storage/userns_unsupported.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ github.com/containernetworking/cni/pkg/version
147147
# github.com/containernetworking/plugins v1.3.0
148148
## explicit; go 1.20
149149
github.com/containernetworking/plugins/pkg/ns
150-
# github.com/containers/buildah v1.33.10
150+
# github.com/containers/buildah v1.33.11
151151
## explicit; go 1.20
152152
github.com/containers/buildah
153153
github.com/containers/buildah/bind
@@ -353,7 +353,7 @@ github.com/containers/psgo/internal/dev
353353
github.com/containers/psgo/internal/host
354354
github.com/containers/psgo/internal/proc
355355
github.com/containers/psgo/internal/process
356-
# github.com/containers/storage v1.51.1
356+
# github.com/containers/storage v1.51.2
357357
## explicit; go 1.19
358358
github.com/containers/storage
359359
github.com/containers/storage/drivers

0 commit comments

Comments
 (0)