From 70038a76672f01bc17c5429d91618fc91477eab0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Thu, 24 Mar 2022 08:51:13 +0000 Subject: [PATCH 1/2] app-emulation: Upgrade Containerd 1.6.1 to 1.6.2 --- .../coreos-overlay/app-emulation/containerd/Manifest | 2 +- .../{containerd-1.6.1.ebuild => containerd-1.6.2.ebuild} | 0 .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 2 +- .../changelog/updates/2022-03-24-containerd-1.6.2-update.md | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-1.6.1.ebuild => containerd-1.6.2.ebuild} (100%) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-03-24-containerd-1.6.2-update.md diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest index aadd9b9f7b..d5a1488e1b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest @@ -1 +1 @@ -DIST containerd-1.6.1.tar.gz 8914779 BLAKE2B c581e97afc66cad041416345a3340f3aacb992b9394e8ef2270ce30cbd932f637a3531fa59319dd4d2e01e78bc0049ca2e3fc4d9dbd1eab4089c28ac1f452a5e SHA512 8678b4b1002320caabbc1c3977efbb1589caf6ade992493919fa48e18497a46a4a55c07a5178875da49e007fa6a80e5d27f1b6d1b40d4e769beef83499094fe9 +DIST containerd-1.6.2.tar.gz 8617797 BLAKE2B aaf16dbbd071f4eab45bc94cc50643b33665b5c4a4155ef007b7a974e04660235b69e12d99e78c24b27c09d45c0eb6e9be3d688b41592a54497a0a4e5f577c86 SHA512 3ff280ae0cf5a45b0c21a42290c94bad30d46bf8a5bbcef1024e3c67fde3345a31b23a88cdbb6025d526c93e2a0899e9b341c9b8ccbba381983de3d8a39b1046 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index 776dd9a69a..7c3123967d 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then else MY_PV="${PV/_rc/-rc.}" EGIT_COMMIT="v${MY_PV}" - CONTAINERD_COMMIT="281f7249530329fc17e57e8d448f252a38f5d234" + CONTAINERD_COMMIT="b30221197bbf818a48ec3f20f5e72a739f84ebeb" SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" inherit vcs-snapshot diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild index 625de5fb81..348004a8b7 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild @@ -13,7 +13,7 @@ KEYWORDS="amd64 arm64" RDEPEND=" ~app-emulation/docker-20.10.13 ~app-emulation/docker-cli-20.10.13 - ~app-emulation/containerd-1.6.1 + ~app-emulation/containerd-1.6.2 ~app-emulation/docker-proxy-0.8.0_p20210525 ~app-emulation/docker-runc-1.1.0 =dev-libs/libltdl-2.4.6 diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-03-24-containerd-1.6.2-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-03-24-containerd-1.6.2-update.md new file mode 100644 index 0000000000..61b30a92ec --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-03-24-containerd-1.6.2-update.md @@ -0,0 +1 @@ +- containerd ([1.6.2](https://github.com/containerd/containerd/releases/tag/v1.6.2)) From b5be30abe4e2cba4315d3f35a25b2fc5dee383a2 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 1 Apr 2022 09:07:58 +0200 Subject: [PATCH 2/2] changelog/security: add changelog for containerd 1.6.2 --- .../changelog/security/2022-03-24-containerd-1.6.2.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/security/2022-03-24-containerd-1.6.2.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-03-24-containerd-1.6.2.md b/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-03-24-containerd-1.6.2.md new file mode 100644 index 0000000000..72ec0a4252 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-03-24-containerd-1.6.2.md @@ -0,0 +1 @@ +- containerd ([CVE-2022-24769](https://nvd.nist.gov/vuln/detail/CVE-2022-24769))