summaryrefslogtreecommitdiff
path: root/app-containers/containerd
diff options
context:
space:
mode:
Diffstat (limited to 'app-containers/containerd')
-rw-r--r--app-containers/containerd/Manifest7
-rw-r--r--app-containers/containerd/containerd-1.5.11.ebuild (renamed from app-containers/containerd/containerd-1.5.9.ebuild)6
-rw-r--r--app-containers/containerd/containerd-1.6.2.ebuild85
3 files changed, 93 insertions, 5 deletions
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index 2461e54c9524..b48ad0799eee 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -1,8 +1,11 @@
AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078 SHA512 16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
DIST containerd-1.4.12.tar.gz 6408402 BLAKE2B 559164a9d8680edea52040690da8e9b45777a39e471b1a7cc56ff4cf207cee7c83dc73969a8868db5d531f6e4e27cc7a975f073ffcf7f9c2768858b1a4001ddf SHA512 52dc4b0344eb4c6a6f1cc5690ff0c70ee052ef05c02300ed4a806458c40bb1970c26b374b0733b2c30a05c04a731d62a7c4206b1d768075d51c202912efd32b1
-DIST containerd-1.5.9.tar.gz 7695248 BLAKE2B 1bbd755cadee9022671e6340a194c7190b7249001b56128cb6a94982d83c01dc9292e08ab591728fa223523d7488bed63d055ce0b552196cf4d1c7dfb41928b5 SHA512 13d5b8bcfd811b1abf67008d1c664962f315cd45d885adaa88847bcc4f1c5d743dccd62bc34fe77348ca18a4f8841ce7a8a022cccb275b19b59017b3fbf1054b
+DIST containerd-1.5.11.tar.gz 7494477 BLAKE2B 2415e85694e5f4410c8cee7be08d1d304adfcdb95c4078f7a92c710a5a11a29ae011daa70fcfa72c2fabf5b48b7cac962b39121f18bb027931ef77214e86b1aa SHA512 6348f4ae7f9b473aac7d5e7325ca4539345d09f01b95383cec28f09d5e5b0b831e25fe305c3a15050f1e1959948ee8dcad788a1d6dd4780cf3077132d5617ef8
+DIST containerd-1.6.2-deps.tar.xz 99095488 BLAKE2B a8ab5b2a506cb90cbadba9461d2737b1ac0bea672681e3f940d1dc76fdd2885d1ab287129a2aaa2fab64d19ba049eb7ecdffbafa6b08772430b94428a775a042 SHA512 2a96405c28a6ebaeae523ef36b4721f493332953880bfb7cecc4571b325557f2566141a62c0eb5c981045d498dd18ad18f8e7adfd9d5f17218a5d5d65760b855
+DIST containerd-1.6.2.tar.gz 8617797 BLAKE2B aaf16dbbd071f4eab45bc94cc50643b33665b5c4a4155ef007b7a974e04660235b69e12d99e78c24b27c09d45c0eb6e9be3d688b41592a54497a0a4e5f577c86 SHA512 3ff280ae0cf5a45b0c21a42290c94bad30d46bf8a5bbcef1024e3c67fde3345a31b23a88cdbb6025d526c93e2a0899e9b341c9b8ccbba381983de3d8a39b1046
EBUILD containerd-1.4.11.ebuild 1937 BLAKE2B 28d77a75c41972622bd514aebcd0771c3528fa0076834c97f83a7008b258b64785902b6a41d424599022e834a316e4366d89e5108b8d43f017c8769604efc6ee SHA512 e2799565ca0698c214f3a29adbdcdf001af3b7c39e7780838e8a8e7f9b155334a1f7e4ee7d0af61bb9650c2a6a135fa5bfdca1014f7947915b37f86c9aa2dca8
EBUILD containerd-1.4.12.ebuild 1937 BLAKE2B 4177d3ab1f97f30217835d21421f6ad8c6dab38198e6559efdef57e9f8bef77e0a6719b2dc1182216bbb5b9bda1ef3484f9709bc0ca615edcf8f262fd1e1a856 SHA512 3f3dba551539a584a6d64b1a48e1a3cc892d0e060b734428e5d7c4d9f94e189b8c102f3e637ee07321f8ff637f9db7b93d4a61d87f4fcb6a7b1c47eaaf48ad3c
-EBUILD containerd-1.5.9.ebuild 1908 BLAKE2B 440423215435cd878e6b31d2d965147a9cee14c1f09a7a1bc4774d147f1d049c597760979c99a77ba521daf4c3dad5aea854ad9d12007ad9669fa76e6c1af12b SHA512 8c36a4a6069ddc7c4d8563c7c621cc7089113694562c6fbad3c38a65ab3412210cf2ee3fd43111b421afd01d10d26ca50300ba7ade6313db8950b9ee34fbc781
+EBUILD containerd-1.5.11.ebuild 1906 BLAKE2B 235c2eb59257362b5bd90e5e089102ce567e3e13e13c94a5365727cff3e4d92efa7332614f120c798d40a65b38623618eef8cbe65c5cdd9588e8555e696758a3 SHA512 0e5dfe10c35d9d7b25110e4f51153bd0ea231b3ebdb10401af84114c5a76e2187ef1df62fccee168d235ad8a03cc8aec9031680e5699e7da6fe6545f32dea5f9
+EBUILD containerd-1.6.2.ebuild 1975 BLAKE2B 3ebbd30a63d3e4fc89491332ac27e0441a611d275746b5fe9dd0ba627ac57af9bf6d71d6ed2b1fbc7bbfa1bedc16fc329cbd9264eee14bd8803c313185b4930c SHA512 49e8aff2be3f9196047f7e502033048de00ea1a4dc8e53b033e0014d22a57755b0156ea21df7efdf307a26344ded7cd2bd1a6f439abce9dbf47b35eb9cb6d80e
MISC metadata.xml 1144 BLAKE2B 960f8dd81a1e56c0d381355da41a845c2e9c12db0c8c546da1593a0499e4929b37610dff83943c388f8edc5878b9824e47ddac02ba129176a916054400e10e90 SHA512 904a5a11d7729ea6021aaf1b1d91ae3f7609c08b8c191d9f4c35c62914b0acf1ee45f3f7e0416711225809f129da4b4c76c934e6207026b69b0096f431820982
diff --git a/app-containers/containerd/containerd-1.5.9.ebuild b/app-containers/containerd/containerd-1.5.11.ebuild
index 8c3ca72bdc9c..0b8298363875 100644
--- a/app-containers/containerd/containerd-1.5.9.ebuild
+++ b/app-containers/containerd/containerd-1.5.11.ebuild
@@ -1,8 +1,8 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-GIT_REVISION=1407cab509ff0d96baa4f0eb6ff9980270e6e620
+EAPI=8
+GIT_REVISION=3df54a852345ae127d1fa3092b95168e4a88e2f8
inherit go-module systemd
DESCRIPTION="A daemon to control runC"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
DEPEND="
diff --git a/app-containers/containerd/containerd-1.6.2.ebuild b/app-containers/containerd/containerd-1.6.2.ebuild
new file mode 100644
index 000000000000..eef31e9b8f79
--- /dev/null
+++ b/app-containers/containerd/containerd-1.6.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GIT_REVISION=de8046a5501db9e0e478e1c10cbcfb21af4c6b2d
+inherit go-module systemd
+
+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"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+ btrfs? ( sys-fs/btrfs-progs )
+ seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+ ${DEPEND}
+ ~app-containers/runc-1.1.0
+"
+
+BDEPEND="
+ dev-go/go-md2man
+ virtual/pkgconfig
+"
+
+# tests require root or docker
+# upstream does not recommend stripping binary
+RESTRICT+=" strip test"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s/-s -w//" \
+ Makefile || die
+ sed -i \
+ -e "s:/usr/local:/usr:" \
+ containerd.service || 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[*]}"
+ LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+ REVISION="${GIT_REVISION}"
+ VERSION=v${PV}
+ )
+
+ # race condition in man target https://bugs.gentoo.org/765100
+ # we need to explicitly specify GOFLAGS for "go run" to use vendor source
+ emake "${myemakeargs[@]}" man -j1 #nowarn
+ emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+ dobin bin/*
+ doman man/*
+ newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+ systemd_dounit containerd.service
+ keepdir /var/lib/containerd
+
+ # we already installed manpages, remove markdown source
+ # before installing docs directory
+ rm -r docs/man || die
+
+ local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
+ einstalldocs
+}