From cd5823fbbbffbe39420b7d77a622fc9084996a4d Mon Sep 17 00:00:00 2001 From: tomsweeneyredhat Date: Fri, 2 Feb 2024 11:43:39 -0500 Subject: [PATCH] [v4.9] Bump to c/common v0.57.4, buildkit v0.12.5, c/buidah v1.33.5 As the title says. The common bump fixes a timezone issue for OCP. Buildkit bump fixes a number of CVEs including but probably not limited to: CVE-2024-23651, CVE-2024-23652, and CVE-2024-23653 [NO NEW TESTS NEEDED] Signed-off-by: tomsweeneyredhat --- go.mod | 6 +++--- go.sum | 12 ++++++------ .../github.com/containers/buildah/CHANGELOG.md | 4 ++++ .../github.com/containers/buildah/changelog.txt | 4 ++++ .../containers/buildah/define/types.go | 2 +- .../buildah/internal/mkcw/embed/entrypoint.gz | Bin 405 -> 405 bytes .../containers/common/version/version.go | 2 +- vendor/modules.txt | 6 +++--- 8 files changed, 22 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index a1d8d34d67..7657ed83e6 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( github.com/checkpoint-restore/go-criu/v7 v7.0.0 github.com/containernetworking/cni v1.1.2 github.com/containernetworking/plugins v1.3.0 - github.com/containers/buildah v1.33.4 - github.com/containers/common v0.57.3 + github.com/containers/buildah v1.33.5 + github.com/containers/common v0.57.4 github.com/containers/conmon v2.0.20+incompatible github.com/containers/gvisor-tap-vsock v0.7.2 github.com/containers/image/v5 v5.29.2 @@ -160,7 +160,7 @@ require ( github.com/miekg/pkcs11 v1.1.1 // indirect github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/moby/buildkit v0.12.3 // indirect + github.com/moby/buildkit v0.12.5 // indirect github.com/moby/patternmatcher v0.6.0 // indirect github.com/moby/sys/mountinfo v0.7.1 // indirect github.com/moby/sys/sequential v0.5.0 // indirect diff --git a/go.sum b/go.sum index 097a6a5801..acd4ccf3b5 100644 --- a/go.sum +++ b/go.sum @@ -254,10 +254,10 @@ github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHV github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= github.com/containernetworking/plugins v1.3.0 h1:QVNXMT6XloyMUoO2wUOqWTC1hWFV62Q6mVDp5H1HnjM= github.com/containernetworking/plugins v1.3.0/go.mod h1:Pc2wcedTQQCVuROOOaLBPPxrEXqqXBFt3cZ+/yVg6l0= -github.com/containers/buildah v1.33.4 h1:/bDy0j7oSEVs8JcnLrw8dnULR3sJptUwd18ct6sGpHE= -github.com/containers/buildah v1.33.4/go.mod h1:ky0YuDFagXa0KSEaCWMdeSSt0ywJhBffQxUIrC3H63o= -github.com/containers/common v0.57.3 h1:g4NqE/4iqunqgp7htfJLPKAFKf1PAXkv2I65a7+lQJI= -github.com/containers/common v0.57.3/go.mod h1:o3L3CyOI9yr+JC8l4dZgvqTxcjs3qdKmkek00uchgvw= +github.com/containers/buildah v1.33.5 h1:BGzGAbK6B5VLOQlqX0V8DrteMbKGh6Q8ntHTahGqGMY= +github.com/containers/buildah v1.33.5/go.mod h1:w3paMzMa5/3uaNSi2xq4hsQDTH9aFkoBmrHyPQ8Ixjo= +github.com/containers/common v0.57.4 h1:kmfBad92kUjP5X44BPpOwMe+eZQqaKETfS+ASeL0g+g= +github.com/containers/common v0.57.4/go.mod h1:o3L3CyOI9yr+JC8l4dZgvqTxcjs3qdKmkek00uchgvw= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= github.com/containers/gvisor-tap-vsock v0.7.2 h1:6CyU5D85C0/DciRRd7W0bPljK4FAS+DPrrHEQMHfZKY= @@ -782,8 +782,8 @@ github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= -github.com/moby/buildkit v0.12.3 h1:cFaPVnyC0PwAP5xHHfzdU5v9rgQrCi6HnGSg3WuFKp4= -github.com/moby/buildkit v0.12.3/go.mod h1:adB4y0SxxX8trnrY+oEulb48ODLqPO6pKMF0ppGcCoI= +github.com/moby/buildkit v0.12.5 h1:RNHH1l3HDhYyZafr5EgstEu8aGNCwyfvMtrQDtjH9T0= +github.com/moby/buildkit v0.12.5/go.mod h1:YGwjA2loqyiYfZeEo8FtI7z4x5XponAaIWsWcSjWwso= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= diff --git a/vendor/github.com/containers/buildah/CHANGELOG.md b/vendor/github.com/containers/buildah/CHANGELOG.md index d9452fb69b..4958128575 100644 --- a/vendor/github.com/containers/buildah/CHANGELOG.md +++ b/vendor/github.com/containers/buildah/CHANGELOG.md @@ -2,6 +2,10 @@ # Changelog +## v1.33.5 (2024-02-01) + + Bump c/common to v0.57.4, moby/buildkit v0.5.12 + ## v1.33.4 (2024-01-30) Bump c/image to v5.29.2 and c/common to v0.57.3 diff --git a/vendor/github.com/containers/buildah/changelog.txt b/vendor/github.com/containers/buildah/changelog.txt index 986037dac1..96e4dbb180 100644 --- a/vendor/github.com/containers/buildah/changelog.txt +++ b/vendor/github.com/containers/buildah/changelog.txt @@ -1,3 +1,7 @@ +-Changelog for v1.33.5 (2024-02-01) + + * Bump c/common to v0.57.4, moby/buildkit v0.5.12 + -Changelog for v1.33.4 (2024-01-30) * Bump c/image to v5.29.2 and c/common to v0.57.3 diff --git a/vendor/github.com/containers/buildah/define/types.go b/vendor/github.com/containers/buildah/define/types.go index fe896a9a62..5d0032aaee 100644 --- a/vendor/github.com/containers/buildah/define/types.go +++ b/vendor/github.com/containers/buildah/define/types.go @@ -29,7 +29,7 @@ const ( // identify working containers. Package = "buildah" // Version for the Package. Also used by .packit.sh for Packit builds. - Version = "1.33.4" + Version = "1.33.5" // DefaultRuntime if containers.conf fails. DefaultRuntime = "runc" diff --git a/vendor/github.com/containers/buildah/internal/mkcw/embed/entrypoint.gz b/vendor/github.com/containers/buildah/internal/mkcw/embed/entrypoint.gz index ffd4872eec2090a9b17d99da932265b0895c96ed..0e0035189c1f8bbc39be7fad922d9c438b743449 100644 GIT binary patch delta 16 XcmbQrJe8SUzMF%CRcg;h_C7`cA=(5K delta 16 XcmbQrJe8SUzMF&N|GAwT+4~p)EZGIW diff --git a/vendor/github.com/containers/common/version/version.go b/vendor/github.com/containers/common/version/version.go index e731a39e3d..19ba92c0f0 100644 --- a/vendor/github.com/containers/common/version/version.go +++ b/vendor/github.com/containers/common/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.57.3" +const Version = "0.57.4" diff --git a/vendor/modules.txt b/vendor/modules.txt index 900b8c0045..cf159a299f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -138,7 +138,7 @@ github.com/containernetworking/cni/pkg/version # github.com/containernetworking/plugins v1.3.0 ## explicit; go 1.20 github.com/containernetworking/plugins/pkg/ns -# github.com/containers/buildah v1.33.4 +# github.com/containers/buildah v1.33.5 ## explicit; go 1.20 github.com/containers/buildah github.com/containers/buildah/bind @@ -167,7 +167,7 @@ github.com/containers/buildah/pkg/sshagent github.com/containers/buildah/pkg/util github.com/containers/buildah/pkg/volumes github.com/containers/buildah/util -# github.com/containers/common v0.57.3 +# github.com/containers/common v0.57.4 ## explicit; go 1.18 github.com/containers/common/internal/attributedstring github.com/containers/common/libimage @@ -773,7 +773,7 @@ github.com/mistifyio/go-zfs/v3 # github.com/mitchellh/mapstructure v1.5.0 ## explicit; go 1.14 github.com/mitchellh/mapstructure -# github.com/moby/buildkit v0.12.3 +# github.com/moby/buildkit v0.12.5 ## explicit; go 1.20 github.com/moby/buildkit/frontend/dockerfile/command github.com/moby/buildkit/frontend/dockerfile/parser