aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Buchholz Göktürk <tomalok@gmail.com>2021-10-05 01:05:17 +0000
committerAndy Postnikov <apostnikov@gmail.com>2021-10-05 13:18:46 +0000
commitfce398a49cbdbfd58bb79643aa9958ca263ea3bf (patch)
tree4837b54714af18ba5a6bf2c491a95a37f2b424fd
parentd2f38582a0641d16594290028ed6454f7d598015 (diff)
downloadaports-fce398a49cbdbfd58bb79643aa9958ca263ea3bf.tar.gz
aports-fce398a49cbdbfd58bb79643aa9958ca263ea3bf.tar.bz2
aports-fce398a49cbdbfd58bb79643aa9958ca263ea3bf.tar.xz
community/containerd: security update to 1.5.7
Fixes CVE-2021-41103. For more information, see https://github.com/containerd/containerd/releases/tag/v1.5.7
-rw-r--r--community/containerd/APKBUILD32
1 files changed, 16 insertions, 16 deletions
diff --git a/community/containerd/APKBUILD b/community/containerd/APKBUILD
index 011f0a56d2..8d909759d0 100644
--- a/community/containerd/APKBUILD
+++ b/community/containerd/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Jake Buchholz <tomalok@gmail.com>
-# Maintainer: Jake Buchholz <tomalok@gmail.com>
+# Contributor: Jake Buchholz Göktürk <tomalok@gmail.com>
+# Maintainer: Jake Buchholz Göktürk <tomalok@gmail.com>
pkgname=containerd
# NOTE: containerd's Makefile tries to get REVISION from git, but we're building from a tarball.
-_commit=a62e1d690afa2b9b1d43f8ece3ff4483
-pkgver=1.5.4
-pkgrel=1
+_commit=8686ededfc90076914c5238eb96c883ea093a8ba
+pkgver=1.5.7
+pkgrel=0
pkgdesc="An open and reliable container runtime"
url="https://containerd.io"
arch="all"
@@ -16,7 +16,7 @@ makedepends="btrfs-progs-dev go go-md2man libseccomp-dev"
subpackages="
$pkgname-doc
$pkgname-stress
- $pkgname-openrc:openrc:noarch
+ $pkgname-openrc
"
source="containerd-$pkgver.tar.gz::https://github.com/containerd/containerd/archive/v$pkgver.tar.gz
containerd.confd
@@ -25,6 +25,8 @@ source="containerd-$pkgver.tar.gz::https://github.com/containerd/containerd/arch
builddir="$srcdir/src/github.com/containerd/containerd"
# secfixes:
+# 1.5.7-r0:
+# - CVE-2021-41103
# 1.5.4-r0:
# - CVE-2021-32760
# 1.4.4-r0:
@@ -77,20 +79,18 @@ check() {
package() {
install -d "$pkgdir"/usr/bin/
install -Dsm755 "$builddir"/bin/* "$pkgdir"/usr/bin/
+
+ install -Dm755 "$srcdir"/$pkgname.initd \
+ "$pkgdir"/etc/init.d/$pkgname
+ install -Dm755 "$srcdir"/$pkgname.confd \
+ "$pkgdir"/etc/conf.d/$pkgname
+
install -d "$pkgdir"/usr/share/man/man5/
install -Dm644 "$builddir"/man/*.5 "$pkgdir"/usr/share/man/man5/
install -d "$pkgdir"/usr/share/man/man8/
install -Dm644 "$builddir"/man/*.8 "$pkgdir"/usr/share/man/man8/
install -d "$pkgdir"/etc/containerd/
- "$pkgdir"/bin/containerd config default | sed "s|/opt/cni/bin|/usr/libexec/cni|g" > "$pkgdir"/etc/containerd/config.toml
-}
-
-openrc() {
- pkgdesc="OpenRC init scripts for standalone containerd"
- depends="$pkgname"
-
- install -Dm755 "$srcdir"/containerd.initd "$subpkgdir"/etc/init.d/containerd
- install -Dm644 "$srcdir"/containerd.confd "$subpkgdir"/etc/conf.d/containerd
+ "$pkgdir"/usr/bin/containerd config default | sed "s|/opt/cni/bin|/usr/libexec/cni|g" > "$pkgdir"/etc/containerd/config.toml
}
stress() {
@@ -99,7 +99,7 @@ stress() {
}
sha512sums="
-91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1 containerd-1.5.4.tar.gz
+ce0d9d355b4a6142569690a9fcde8cd07de20b5788098f1184a728106a60dd11a437c87499a97af0c147b14372c2bca4daa823ea470f10b5e1b8a1e34ba530b0 containerd-1.5.7.tar.gz
21a9888b684913138ec4a342b0b69e40e9c773ecd329c4e2401a807365586468cb19035583a4fc8b0f86138f5ee4c7fb911c75495263e4b43d2886ea11e0e271 containerd.confd
2818cb9e062a6b75c5e2ad6a076eb26edc9fd9b70356b37f9306d082dc360a2d7bd802531afd8e73998cc0fdaa6ad34cd7a0a1d67bd98ee1bb7f30bab16d6084 containerd.initd
"