Merge pull request #2459 from flatcar/containerd-1.6.18-main

Upgrade Containerd in main from 1.6.16 to 1.6.18
This commit is contained in:
Dongsu Park 2023-02-17 15:24:55 +01:00 committed by GitHub
commit ee4862a9c5
6 changed files with 5 additions and 3 deletions

View File

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

View File

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

View File

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

View File

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

View File

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