From 70bfaff439510d57ba83611dd9828e95011b534d Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 20 Jul 2021 10:40:54 +0200 Subject: [PATCH] app-emulation/containerd: update to 1.5.4 Update app-emulation/containerd to 1.5.4, mainly to address CVE-2021-32760. --- .../coreos-overlay/app-emulation/containerd/Manifest | 2 +- .../{containerd-1.5.3.ebuild => containerd-1.5.4.ebuild} | 0 .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../coreos-overlay/app-torcx/docker/docker-19.03.ebuild | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-1.5.3.ebuild => containerd-1.5.4.ebuild} (100%) 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 0e51c2f3e4..ffef59598d 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,2 +1,2 @@ DIST containerd-0.2.6.tar.gz 1020572 BLAKE2B b235acc5badd3c3d87f72910c11e6adfd73e2cb7aa5273ab0ed9e6642aff8980d9b2a74875b4a69db36eaf67350124ef8629b0f460bdbe2d16d1ab834ba1e2cc SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6 -DIST containerd-1.5.3.tar.gz 7674357 BLAKE2B e48e133786dede13197f1763d2b6c5dd30ef71ebfde637631cc75d853c80ca71f938133e51d83fe28517dd15d3c2cda1572b629f108560cef59dd2f254b360fc SHA512 38054e6851b288023452ff8b00b7fa8d621c28e6ea1e82428b7449346d7112ee7a55c238e658cf30e1d6eb7f3dc8480a863e17bdb355234d9798226636f7e872 +DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5 SHA512 91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.5.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.5.4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.5.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.5.4.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 ba1068cd8a..b7195f79be 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="064765b559584b2a184099254f93d3a31be69d02" + CONTAINERD_COMMIT="69a4a55aa42353c71aae40e5bb27a412d8e3149b" 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-19.03.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild index b93c30f36e..28996bcacb 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild @@ -12,7 +12,7 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" ~app-emulation/docker-19.03.15 - ~app-emulation/containerd-1.5.3 + ~app-emulation/containerd-1.5.4 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0 =dev-libs/libltdl-2.4.6