summaryrefslogtreecommitdiff
path: root/app-emulation/containerd
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-22 20:28:19 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-22 20:28:19 +0000
commitabaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
treeeca3dd248b73b92013cba00a0fcc1edf2696e19a /app-emulation/containerd
parent24fd814c326e282c4321965c31f341dad77e270d (diff)
gentoo resync : 22.01.2021
Diffstat (limited to 'app-emulation/containerd')
-rw-r--r--app-emulation/containerd/Manifest8
-rw-r--r--app-emulation/containerd/containerd-1.3.7.ebuild2
-rw-r--r--app-emulation/containerd/containerd-1.3.9.ebuild2
-rw-r--r--app-emulation/containerd/containerd-1.4.3-r2.ebuild (renamed from app-emulation/containerd/containerd-1.4.3-r1.ebuild)12
4 files changed, 13 insertions, 11 deletions
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index e363e2a80df9..9dbc093ed110 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,8 +1,8 @@
AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
-DIST containerd-1.4.3.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
-EBUILD containerd-1.3.7.ebuild 1974 BLAKE2B 40e9d21e8bfc04de4931748ce962897a62353faaaf400b1f66ac625b24cd1f0aa8ed74ed808b3c5e97ebc0f4649126f9b9d806974a1103772f91537e89ec03f5 SHA512 6fe127a926c668b3c47ab90b82f56335125084dacfc75bc75a7af3d63adb8b7ade4fa5baaf437a80ef55f3383834e25d320106ca02ca3af106fbfdf92c54e8fe
-EBUILD containerd-1.3.9.ebuild 1941 BLAKE2B 4902047b9a87daf7aa960d4472fb7c0483515a8aea5cdba86970a408dd43b805cc0ca7cf69d45fea51fa47dfe5a4157016145293a083750d35af411db10e7fea SHA512 8bcecd9396a51ba28eb4a1008362e05f6bce203edeb97ab4b52f89f22bc5be67e8bbe05c8a27a330048feaab616c9660cdc91982d5de5bf90c2c56d27fdc976d
-EBUILD containerd-1.4.3-r1.ebuild 1944 BLAKE2B 6c9f2b9ed1dc0078dd1fc12663e49978c2b6e1bc2f4ba7c15e4683b76ccdda35fe872074ffe511b23a32d88c86bb7b6e1f77565f0ef35fb953e3723daf4d9e43 SHA512 9906b9736c8a6c545c8d23187939a849a6f94492e4b1e7b6350c6176c50bacb2d37265cbe586a92333a3dd3b7812a1629f7c955432173568713da44cd4f61dee
+DIST containerd-1.4.3.gh.tar.gz 6180754 BLAKE2B 41dfedf18dcdfe942013ca4a036235b39e3ce98c89fa64a99c05693183b26c071cec613566234de709df943da6ebd62e6a29b918b30233b9660519c4970c0f0c SHA512 0bb64ebc8afc87781fbdb21b7c8362e3cd9a3afe88c053905e9c6859788f0801187aa6abb79dc1d293dd92f74d320ff4a2293a6abb00914781a487a869e68a80
+EBUILD containerd-1.3.7.ebuild 1976 BLAKE2B e3559d3d0377c627707d8556c3ddad741d7987df808c35df00f9971659a2d09f6332961a2d77eb7eea1d5df6a7a0304148244b652af7fa8805397c1f7c657b68 SHA512 f37f918409e9f5b0316e3cba207a773ccf0fc8317cf12fdc91732d6825848eceb8c03886ad652789aa6f88e9478aefe831536f0ecfcd9adc278f2dd11c9b6a3c
+EBUILD containerd-1.3.9.ebuild 1943 BLAKE2B 638d7118f30791a508d0647e2a122e53f513b70513749f10458701bc3971ee48d76134166b1b5405f382c26783f3aef8151a45ed8d3e1da2605de10b6a5b7631 SHA512 73d59882125d5782c6a8bf6bafd87331267d1e2281cf04231f67bb1ed91b2153b11fe8e916176eea89794484481e811e83ef7b4af471c655d016cf8cc290a857
+EBUILD containerd-1.4.3-r2.ebuild 2044 BLAKE2B 05a9dcd98dc56b87a41425eaa57e866f61ecf99f74d770db9c0637a75f9e90ae43920504358e9896b1eaf51c20621522ff754580cb1be271ca680b1bb7d2d77b SHA512 d32677001130132dc4399bf913d6d34216ecc328e85a906e704b61ddf81d264d6ebff6c0c28012511bc4f26a85ed47958bdd3736228d52f13413bf4199729c3a
MISC metadata.xml 1073 BLAKE2B 5f1a667e9b8812a71e24318d51353b010f9a3662c608627c68cdd13431a6d8380b51b8b8619b2a98fd9dece381a391f18a35458156ef7743b10825aee4c58e8f SHA512 46e110750ad8da48d741b612c8c1f030d493636c0255f1944134660eddb5693488c1093df47252d09589bf90565d525819a82a0594ce8f727165f1a822acb537
diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild b/app-emulation/containerd/containerd-1.3.7.ebuild
index b6ed4b2e74c2..ab62a3500dbd 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -62,7 +62,7 @@ src_compile() {
myemakeargs=(
BUILDTAGS="${options[*]}"
DESTDIR="${ED}"
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '')
+ LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
)
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild b/app-emulation/containerd/containerd-1.3.9.ebuild
index 7c664edf94cd..bf487739cac6 100644
--- a/app-emulation/containerd/containerd-1.3.9.ebuild
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@@ -62,7 +62,7 @@ src_compile() {
myemakeargs=(
BUILDTAGS="${options[*]}"
DESTDIR="${ED}"
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '')
+ LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
)
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
diff --git a/app-emulation/containerd/containerd-1.4.3-r1.ebuild b/app-emulation/containerd/containerd-1.4.3-r2.ebuild
index d8b675092ae4..90dd18565d1c 100644
--- a/app-emulation/containerd/containerd-1.4.3-r1.ebuild
+++ b/app-emulation/containerd/containerd-1.4.3-r2.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# update on bump, look for https://github.com/docker\
# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/containerd.installer
-CONTAINERD_COMMIT="ea765ab"
+CONTAINERD_COMMIT="269548fa27e0089a8b8278fc4fc781d7f65a939b"
EGO_PN="github.com/containerd/${PN}"
inherit golang-vcs-snapshot toolchain-funcs
DESCRIPTION="A daemon to control runC"
HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
+# NOTE: Drop '.gh' on bump, it's there because of bug #764791
+SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
@@ -62,7 +63,7 @@ src_compile() {
myemakeargs=(
BUILDTAGS="${options[*]}"
DESTDIR="${ED}"
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '')
+ LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
)
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
@@ -78,7 +79,8 @@ src_install() {
# we already installed manpages, remove markdown source
# before installing docs directory
- rm -rf docs/man || die
+ rm -r docs/man || die
+
local DOCS=( README.md PLUGINS.md docs/. )
einstalldocs
}