Merge pull request #1758 from flatcar-linux/containerd-1.6.2-main

Upgrade Containerd in main from 1.6.1 to 1.6.2
This commit is contained in:
Dongsu Park 2022-04-01 09:11:22 +02:00 committed by GitHub
commit 7ea2183789
6 changed files with 5 additions and 3 deletions

View File

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

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="281f7249530329fc17e57e8d448f252a38f5d234" CONTAINERD_COMMIT="b30221197bbf818a48ec3f20f5e72a739f84ebeb"
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.13 ~app-emulation/docker-20.10.13
~app-emulation/docker-cli-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-proxy-0.8.0_p20210525
~app-emulation/docker-runc-1.1.0 ~app-emulation/docker-runc-1.1.0
=dev-libs/libltdl-2.4.6 =dev-libs/libltdl-2.4.6

View File

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

View File

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