Merge pull request #2324 from flatcar/containerd-1.6.12-main

Upgrade Containerd in main from 1.6.10 to 1.6.12
This commit is contained in:
Dongsu Park 2022-12-09 14:48:17 +01:00 committed by GitHub
commit 5da320fd37
6 changed files with 5 additions and 3 deletions

View File

@ -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

View File

@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
else else
MY_PV="${PV/_rc/-rc.}" MY_PV="${PV/_rc/-rc.}"
EGIT_COMMIT="v${MY_PV}" EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="218b3a2d331ebf2d00bf201f07094eef89084570" CONTAINERD_COMMIT="36ae9ea499e67e0aea79989e9478e307a1e45bee"
SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
inherit vcs-snapshot inherit vcs-snapshot

View File

@ -13,7 +13,7 @@ KEYWORDS="amd64 arm64"
RDEPEND=" RDEPEND="
~app-emulation/docker-20.10.21 ~app-emulation/docker-20.10.21
~app-emulation/docker-cli-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-proxy-0.8.0_p20210525
~app-emulation/docker-runc-1.1.4 ~app-emulation/docker-runc-1.1.4
=dev-libs/libltdl-2.4.7 =dev-libs/libltdl-2.4.7

View File

@ -0,0 +1 @@
- containerd ([CVE-2022-23471](https://nvd.nist.gov/vuln/detail/CVE-2022-23471))

View File

@ -0,0 +1 @@
- containerd ([1.6.12](https://github.com/containerd/containerd/releases/tag/v1.6.12))