From e31bc2214b858bf0ca4342908f6fba6186c71380 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Fri, 17 Feb 2023 08:23:03 +0000 Subject: [PATCH 1/2] app-emulation: Upgrade Containerd 1.6.16 to 1.6.18 --- .../coreos-overlay/app-emulation/containerd/Manifest | 2 +- .../{containerd-1.6.16.ebuild => containerd-1.6.18.ebuild} | 0 .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 2 +- .../changelog/updates/2023-02-17-containerd-1.6.18-update.md | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-1.6.16.ebuild => containerd-1.6.18.ebuild} (100%) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2023-02-17-containerd-1.6.18-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 dc63f1dfcc..7cf239b101 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.16.tar.gz 8699293 BLAKE2B ed56712ba3400c070a94b411ecff50f8c639bdbec3d55372e155dc0868e96e4285731dc5ce18deaf132696d03fc8067dbe0c41ce66ee3d675ee33f960a8ee4d3 SHA512 f10fd7d4ca1f089d0dc0044f192a8faed4c96ac589c58f969074eba299b85fca4361c74d5ef49532c34e297016ee8dab3734f315a22586fa1b8f2eb84f9f08d3 +DIST containerd-1.6.18.tar.gz 8705058 BLAKE2B 926ac90e9b76dc03b93fd8a242040a5a9bbb024a7e23344e9a528a586c1505702173c3cffa821c238798b17076a4db5ccb689bc23bff6e7d4bee49990d417427 SHA512 3a8d1a4f892d251fde7098f99c3dc620d7eb077d64e8f98fe82ec4dd8c88067a9a5e13e9ec6b38abdf624e67dbf53a1d24fe50f64065a742d2276becc789fdc8 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.16.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.18.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.16.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.6.18.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 a3d01b050a..9777f9af9e 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="92b3a9d6f1b3bcc6dc74875cfdea653fe39f09c2" + CONTAINERD_COMMIT="204e30211cba2e8cdb7ae617879898e51bbba8bc" 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 ed38a5bc7c..a7c67e5829 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.23 ~app-emulation/docker-cli-20.10.23 - ~app-emulation/containerd-1.6.16 + ~app-emulation/containerd-1.6.18 ~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/2023-02-17-containerd-1.6.18-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2023-02-17-containerd-1.6.18-update.md new file mode 100644 index 0000000000..cf2cc1f6ac --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2023-02-17-containerd-1.6.18-update.md @@ -0,0 +1 @@ +- containerd ([1.6.18](https://github.com/containerd/containerd/releases/tag/v1.6.18)) From cab3e7abf942e07e79dd82f415338d1b4242c127 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 17 Feb 2023 10:52:35 +0100 Subject: [PATCH 2/2] changelog: add changelog for containerd 1.6.18 --- .../changelog/security/2023-02-17-containerd-1.6.18.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/security/2023-02-17-containerd-1.6.18.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/security/2023-02-17-containerd-1.6.18.md b/sdk_container/src/third_party/coreos-overlay/changelog/security/2023-02-17-containerd-1.6.18.md new file mode 100644 index 0000000000..3564fd8e1c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/security/2023-02-17-containerd-1.6.18.md @@ -0,0 +1 @@ +- containerd ([CVE-2023-25153](https://nvd.nist.gov/vuln/detail/CVE-2023-25153), [CVE-2023-25173](https://nvd.nist.gov/vuln/detail/CVE-2023-25173))