From cc7593d7344987a0e0eece693ba8342ef235f2f9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Fri, 20 Dec 2024 08:07:01 +0000 Subject: [PATCH] app-containers/containerd: Update from 1.7.23 to 2.0.1 --- changelog/updates/2024-12-20-containerd-2.0.1-update.md | 1 + .../coreos-overlay/app-containers/containerd/Manifest | 2 +- .../{containerd-1.7.23.ebuild => containerd-2.0.1.ebuild} | 2 +- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changelog/updates/2024-12-20-containerd-2.0.1-update.md rename sdk_container/src/third_party/coreos-overlay/app-containers/containerd/{containerd-1.7.23.ebuild => containerd-2.0.1.ebuild} (97%) diff --git a/changelog/updates/2024-12-20-containerd-2.0.1-update.md b/changelog/updates/2024-12-20-containerd-2.0.1-update.md new file mode 100644 index 00000000000..7b133aec5ca --- /dev/null +++ b/changelog/updates/2024-12-20-containerd-2.0.1-update.md @@ -0,0 +1 @@ +- containerd ([2.0.1](https://github.com/containerd/containerd/releases/tag/v2.0.1)) diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest index f4c5c7b33d1..ddafff9cee4 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest @@ -1,4 +1,4 @@ DIST containerd-1.7.1.tar.gz 9682254 BLAKE2B f168070caf2b76f0be350a98f41bfdbfe6d78344d68821fb92a29f839a6e847d795e5b79436e36f985aa88028ff1c3f44f134cf6bd502ddac22453a457bd952b SHA512 e9b00ba8f4dd1b5b1088060d3822f684611d43b367ddfeb1bee1660140af85f31e9c9bfc600a67e8fc8645a625dc4e1919d9af7291bdeaa607bff7065a4fc945 DIST containerd-1.7.2.tar.gz 9688701 BLAKE2B d31cd0e96bb2675390cc63d06114e37d532b7c666b3ffc5b0087dfcef8de23559471f08bf8a52b164c5f645faf1b8102ab2ccdd8ec417a1c74336097f0c3a899 SHA512 c0d4c02991b7e9fc341c4ef3df2d93097f5854a51b99596ed95436a79f7a586820bb8bb7c17fc43b5f38d97ea942e59490fbbf6c9710391ef9caae3d34627bc5 -DIST containerd-1.7.23.tar.gz 10192816 BLAKE2B 592e3a1992a637879f1669a660991f811db6f3d11a788c9809277b3fb9639d8b89445cbbca1de16ed45703e8506c8850d9ce68b64d1213817732d008a1847ea6 SHA512 4cb003a6ef2f9fe856665c3b7099e13b23cf07c77ed9a9ed50988d74de1933e3fe9463ae123635230f25cde38cd8a487133b11e20d829a79517c4d7fbe2ce012 DIST containerd-1.7.6.tar.gz 9714550 BLAKE2B 863df1a8ab0f0fe6ec62893ed64824763c1b5230fe830fa268820ce0d6254c79e1ac62ab1261a74785b86b01dff83ea9109a899857fa47a48f2cf2eaf298fea8 SHA512 8b7e13c6ea544754ba7d53092d143f3fd2224b9bc874a33d8a00b781e719927f1b22ad5cd1e35b7b95e4890e630f4b92308549a970587ccdf9dbb8eb470e2703 +DIST containerd-2.0.1.tar.gz 10423945 BLAKE2B 7f77678557bf649c71475d3ff08a57579b8959ef19a5f8fc1c27b8e8eacea01572d44d3f6dff1f53b72c1b7cf153413a5152391a78b0d5bd624a4c5267381144 SHA512 7875eee0fb274545acb4d62f5bca808105580177db6007e59164fd57830ea3e8ab646b8e227027016bf8dd4816341d38a620bfef48bb0fd83de006b1a91826b7 diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-1.7.23.ebuild b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-2.0.1.ebuild similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-1.7.23.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-2.0.1.ebuild index 0ad8bec3073..60837265208 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-1.7.23.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/containerd-2.0.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 inherit go-module systemd -GIT_REVISION=9b2ad7760328148397346d10c7b2004271249db4 +GIT_REVISION=954dbda8895f0c2fc94e11feac730fc30b226e12 DESCRIPTION="A daemon to control runC" HOMEPAGE="https://containerd.io/" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index cdf5b5856f1..ea07a694ee4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -11,7 +11,7 @@ =app-containers/aardvark-dns-1.12.2-r1 ~amd64 ~arm64 # Handled by automation -=app-containers/containerd-1.7.23 ~amd64 ~arm64 # DO NOT EDIT THIS LINE. Added by containerd-apply-patch.sh on 2024-10-18 08:06:10 +=app-containers/containerd-2.0.1 ~amd64 ~arm64 # DO NOT EDIT THIS LINE. Added by containerd-apply-patch.sh on 2024-12-20 08:06:52 # Needed to address CVE-2024-9341. =app-containers/containers-common-0.60.4 ~amd64 ~arm64