From 7218e1b46bceac05841e90472501742d905fb3fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Mar 2021 21:55:15 +0000 Subject: gentoo resync : 12.03.2021 --- app-emulation/containerd/Manifest | 4 +- .../containerd/containerd-1.4.3-r2.ebuild | 86 ---------------------- app-emulation/containerd/containerd-1.4.4.ebuild | 82 +++++++++++++++++++++ 3 files changed, 84 insertions(+), 88 deletions(-) delete mode 100644 app-emulation/containerd/containerd-1.4.3-r2.ebuild create mode 100644 app-emulation/containerd/containerd-1.4.4.ebuild (limited to 'app-emulation/containerd') diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index 9dbc093ed110..37b0189f9fc9 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.gh.tar.gz 6180754 BLAKE2B 41dfedf18dcdfe942013ca4a036235b39e3ce98c89fa64a99c05693183b26c071cec613566234de709df943da6ebd62e6a29b918b30233b9660519c4970c0f0c SHA512 0bb64ebc8afc87781fbdb21b7c8362e3cd9a3afe88c053905e9c6859788f0801187aa6abb79dc1d293dd92f74d320ff4a2293a6abb00914781a487a869e68a80 +DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e SHA512 f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070 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 +EBUILD containerd-1.4.4.ebuild 1808 BLAKE2B db720b3a72567f865f95556be8ce88cf6e6d60824bca69e026d34d834ef3d70362e1c89e45142aa108613befb2266dd862602135015bae622db01f5faec5f2b5 SHA512 46711ea589aeec237f18a23045f31694c7b852930c235c1becca695f4b05792a64acfc5a77808248cf714922f665004349e0acf3010d3259a30c6ee89558262e MISC metadata.xml 1073 BLAKE2B 5f1a667e9b8812a71e24318d51353b010f9a3662c608627c68cdd13431a6d8380b51b8b8619b2a98fd9dece381a391f18a35458156ef7743b10825aee4c58e8f SHA512 46e110750ad8da48d741b612c8c1f030d493636c0255f1944134660eddb5693488c1093df47252d09589bf90565d525819a82a0594ce8f727165f1a822acb537 diff --git a/app-emulation/containerd/containerd-1.4.3-r2.ebuild b/app-emulation/containerd/containerd-1.4.3-r2.ebuild deleted file mode 100644 index 90dd18565d1c..000000000000 --- a/app-emulation/containerd/containerd-1.4.3-r2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# 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//components/engine/hack/dockerfile/install/containerd.installer -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/" -# 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" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test" - -DEPEND=" - btrfs? ( sys-fs/btrfs-progs ) - seccomp? ( sys-libs/libseccomp ) -" - -RDEPEND=" - ${DEPEND} - ~app-emulation/runc-1.0.0_rc92 -" - -BDEPEND=" - dev-go/go-md2man - virtual/pkgconfig - test? ( "${RDEPEND}" ) -" - -# tests require root or docker -# upstream does not recommend stripping binary -RESTRICT+=" strip test" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -src_prepare() { - default - sed -i -e "s/git describe --match.*$/echo ${PV})/"\ - -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\ - -e "s/-s -w//" \ - Makefile || die -} - -src_compile() { - local options=( - $(usev apparmor) - $(usex btrfs "" "no_btrfs") - $(usex cri "" "no_cri") - $(usex device-mapper "" "no_devmapper") - $(usev seccomp) - $(usev selinux) - ) - - myemakeargs=( - BUILDTAGS="${options[*]}" - DESTDIR="${ED}" - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" - ) - - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - export GOFLAGS="-v -x -mod=vendor" - emake "${myemakeargs[@]}" all man -} - -src_install() { - dobin bin/* - doman man/* - newinitd "${FILESDIR}"/${PN}.initd "${PN}" - keepdir /var/lib/containerd - - # we already installed manpages, remove markdown source - # before installing docs directory - rm -r docs/man || die - - local DOCS=( README.md PLUGINS.md docs/. ) - einstalldocs -} diff --git a/app-emulation/containerd/containerd-1.4.4.ebuild b/app-emulation/containerd/containerd-1.4.4.ebuild new file mode 100644 index 000000000000..fc5462fead93 --- /dev/null +++ b/app-emulation/containerd/containerd-1.4.4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CONTAINERD_COMMIT=05f951a3781f4f2c1911b05e61c160e9c30eaa8e +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/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test" + +DEPEND=" + btrfs? ( sys-fs/btrfs-progs ) + seccomp? ( sys-libs/libseccomp ) +" + +RDEPEND=" + ${DEPEND} + ~app-emulation/runc-1.0.0_rc92 +" + +BDEPEND=" + dev-go/go-md2man + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +# tests require root or docker +# upstream does not recommend stripping binary +RESTRICT+=" strip test" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +src_prepare() { + default + sed -i -e "s/git describe --match.*$/echo ${PV})/"\ + -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\ + -e "s/-s -w//" \ + Makefile || die +} + +src_compile() { + local options=( + $(usev apparmor) + $(usex btrfs "" "no_btrfs") + $(usex cri "" "no_cri") + $(usex device-mapper "" "no_devmapper") + $(usev seccomp) + $(usev selinux) + ) + + myemakeargs=( + BUILDTAGS="${options[*]}" + DESTDIR="${ED}" + LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" + ) + + export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor + export GOFLAGS="-v -x -mod=vendor" + emake "${myemakeargs[@]}" all man +} + +src_install() { + dobin bin/* + doman man/* + newinitd "${FILESDIR}"/${PN}.initd "${PN}" + keepdir /var/lib/containerd + + # we already installed manpages, remove markdown source + # before installing docs directory + rm -r docs/man || die + + local DOCS=( README.md PLUGINS.md docs/. ) + einstalldocs +} -- cgit v1.2.3