From 4f0dd682f9a2280dd7fab669fed769f1c4a39daf Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Fri, 9 Dec 2022 08:22:42 +0000 Subject: [PATCH 1/2] app-emulation: Upgrade Containerd 1.6.10 to 1.6.12 --- .../coreos-overlay/app-emulation/containerd/Manifest | 2 +- .../{containerd-1.6.10.ebuild => containerd-1.6.12.ebuild} | 0 .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 2 +- .../changelog/updates/2022-12-09-containerd-1.6.12-update.md | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-1.6.10.ebuild => containerd-1.6.12.ebuild} (100%) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-12-09-containerd-1.6.12-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 d68fb2e8e1..8d7281691f 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.10.tar.gz 8695591 BLAKE2B aa4b3afccab316c6356e94dd02370b7bee468075c425ff3759fc69fe3f807ee17b1ed386b36483c26322e0e8533b8b693d5dbbbe5971c1824d8662d488a3f577 SHA512 02312a8d127b523944e9583433ec87cdc1fc30988b107a8d83438985a010b06c57e93017adb4fcf9db6ec80c1e28327101d7496d63d3832ea9cbfe54d17e3a6c +DIST containerd-1.6.12.tar.gz 8698307 BLAKE2B bb91be84d18cd6bcec1287fc6e6fa0d3e8a24116598597cc0b321f2f53b54db356f548c70dee33f1e06b0e964fab144c41dd0d4bfe7fec8f5713d84130ee00d2 SHA512 adec6b28bfeea591af8204341dbdf1477f878be28c318745cacdf1b8de2831e3b4d832ad2026fbd9800d6452b5eb186bd94fe78d4dfed163b1cb32e9a92f38fa diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.12.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.10.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.12.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 1689a9d9fb..0d149c2fac 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="218b3a2d331ebf2d00bf201f07094eef89084570" + CONTAINERD_COMMIT="36ae9ea499e67e0aea79989e9478e307a1e45bee" 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 1fc807bf0b..dcbbfa806a 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.21 ~app-emulation/docker-cli-20.10.21 - ~app-emulation/containerd-1.6.10 + ~app-emulation/containerd-1.6.12 ~app-emulation/docker-proxy-0.8.0_p20210525 ~app-emulation/docker-runc-1.1.4 =dev-libs/libltdl-2.4.7 diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-12-09-containerd-1.6.12-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-12-09-containerd-1.6.12-update.md new file mode 100644 index 0000000000..e67d60bb3b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-12-09-containerd-1.6.12-update.md @@ -0,0 +1 @@ +- containerd ([1.6.12](https://github.com/containerd/containerd/releases/tag/v1.6.12)) From 94ee295e6eac6d7b714194fa51740d76fbf8f72f Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 9 Dec 2022 13:13:17 +0100 Subject: [PATCH 2/2] changelog: add security changelog for containerd 1.6.12 --- .../changelog/security/2022-12-09-containerd-1.6.12.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/security/2022-12-09-containerd-1.6.12.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-12-09-containerd-1.6.12.md b/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-12-09-containerd-1.6.12.md new file mode 100644 index 0000000000..8672ea4b2f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-12-09-containerd-1.6.12.md @@ -0,0 +1 @@ +- containerd ([CVE-2022-23471](https://nvd.nist.gov/vuln/detail/CVE-2022-23471))