gentoo auto-resync : 20:12:2024 - 06:30:59

2 files changed, 92 insertions, 0 deletions

diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index 5fad70837ba5..c0e341ac22e6 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -7,6 +7,7 @@ DIST containerd-1.7.22.tar.gz 10189969 BLAKE2B b1fac9764a8bac0b883849786bd20c9a8
 DIST containerd-1.7.23.tar.gz 10192816 BLAKE2B 592e3a1992a637879f1669a660991f811db6f3d11a788c9809277b3fb9639d8b89445cbbca1de16ed45703e8506c8850d9ce68b64d1213817732d008a1847ea6 SHA512 4cb003a6ef2f9fe856665c3b7099e13b23cf07c77ed9a9ed50988d74de1933e3fe9463ae123635230f25cde38cd8a487133b11e20d829a79517c4d7fbe2ce012
 DIST containerd-1.7.24.tar.gz 10196410 BLAKE2B be5238208170f63e7328627a4407da3eefa2c03051c95228bc26dac04560c564330ae118e1b01fcbd22983073b9fe25161f1da7698449507cd8222f41ff59eba SHA512 eba2d562f336ffac981b67d2574c5951774f4c6a70ad1cc8aabb59204d1c8e9aa5b3be50c048bf04a018be1335b7ec8e47b73013de2e19805c978587b53bc85e
 DIST containerd-2.0.0.tar.gz 10420188 BLAKE2B 4a75c845cabf3e0213a7cd312febc0c45b127b5b70caa5b6843e669b554e4fa65112585f3b16382180539527144d2371f02bc791cb01415eb60ad01d17f0065a SHA512 b1a89c4c53db2c69757bc40d90d585e2662ab4fffb28acb904f9710b281a9f22273ecdbab49250b229bf95b29cf1a33a352afb81967db7580ae209a83c5fb2ea
+DIST containerd-2.0.1.tar.gz 10423945 BLAKE2B 7f77678557bf649c71475d3ff08a57579b8959ef19a5f8fc1c27b8e8eacea01572d44d3f6dff1f53b72c1b7cf153413a5152391a78b0d5bd624a4c5267381144 SHA512 7875eee0fb274545acb4d62f5bca808105580177db6007e59164fd57830ea3e8ab646b8e227027016bf8dd4816341d38a620bfef48bb0fd83de006b1a91826b7
 EBUILD containerd-1.7.15.ebuild 1976 BLAKE2B 038a302335d730a6b0c8b6caeb0672beabd7ef48d2a24ec3a317be6d15b41e00551cd95594d575b68fcec6f28757980f91ffbe41cb975bc220168e4963cacf48 SHA512 1fde07b64582f154e76728dd307b4fff449c368ab50c92f68750540ed4805aa383edf400aed1ea8fdc2e52f9a10b61efeddad9ed8f2412b205dfc443c53e771d
 EBUILD containerd-1.7.19.ebuild 1979 BLAKE2B 03d3bf66fc47d66746d96b00d83fc52912beff1e286bb7bbaefddcbeb2f6e6279cf0a51ac4d55d56be80dccc9b62183052e951f5f03e7584cfcb1f2172b72c82 SHA512 a4100422feedc666778ec6e284c1cb9f84704305b281c76ed2a9c012f92cbfa598d2ffac62d1fac57a9280f9d50606b6207e7bf9473d607e9bb58d894e904620
 EBUILD containerd-1.7.21.ebuild 2022 BLAKE2B aeb92d5514daca7ccca74f5b5a7fc7d0bc75e3de1aa705ebc09b4fd038ad3f9059807862abfb5850988c60b3f4999eb4bcb4cd9d9366ec6f640e233b548ccb2b SHA512 da76549087389711ca3af88b162ff1c95f225ee60bd3150b8565b4d65aadbaf9ea86f002d0ec332500ed48ea26cf90643b2b685297c709ade8f476d85dad0ca5
@@ -15,4 +16,5 @@ EBUILD containerd-1.7.23.ebuild 2022 BLAKE2B 6d9195dff277519a734b1959a304fe01d6e
 EBUILD containerd-1.7.24.ebuild 2021 BLAKE2B 8d1f30c5e2d88874e63aaf2452c1f594379587506f0dd5c4cad2531f4ced6f9a341ee0a4800c68b828b133312637767f6d2aab5f52dbc46a7c391448c6b3d50e SHA512 668630c48fbe40f7c658a3170d45ac0242bfda54aeef324db896e1c769f5891503368533ca630af0afd7217040f00edd9bfc27e30636bc625666c9e5bb8219d6
 EBUILD containerd-2.0.0-r1.ebuild 2030 BLAKE2B f10ec799e3834c40608ee0d2bd3daaedca88fc4467ccd8b95093bf33b8acc6f33275348899beb1d4b5cce1e94da33b25dd1e4b892879aec3a01fc5f0d9bb4e50 SHA512 326ce0123977ca3a3892b8a49a395e64d945ea36f39fff9114855040690cfa2280a3191e0e8dfab28cc82ea10365749c2fc2f732a709db60a75cd5bf51208a15
 EBUILD containerd-2.0.0.ebuild 2021 BLAKE2B b4a80a24a5eb0d90c8c89ee5f9104de363a77d8031968f595faf6fddc426a7b73eeb9e89a6b381eb3c4b09c20c991c60228c79f22c3a6f80261456d944e43940 SHA512 1d6bb45bc502c62c18a24af6981ffbe6c4086502c6e7d24495b278bd241b6dee1dc5ee3dc3857da1a5ed8ebe2226a52b48c7ff521b55462605de297cb38e29d6
+EBUILD containerd-2.0.1.ebuild 2030 BLAKE2B cfd9cd409b2ad20f890534b37fcac556a68d586fc4bd5e2740697d98a3c92c3407a569a5431ba674e52a553b5730d4673ad82f120ae74af01b42093353dbf05a SHA512 4a857cec9b3683fbd7dc657830d7375d20ce1ed8bd3c5b987fc964f0db928afe957fb7ed7bcc43ccef8798b2c0b60661d6bd3129361bd29e3b23d0c9d92fc883
 MISC metadata.xml 981 BLAKE2B 78f44dd46331f9159931ff289a5adfdc177cb5e0c1d12cf717fad4f227b15ae40f479f40554dc4855009342cb7d699aaa543a0fbcc962789fe100a1cc9b350c5 SHA512 a171a3fcd67d8b410148d3e99477ea69be7e84ba2a2d24739343bfde29b88f8f799530c3b1107829ebd52eb847b4f5c25e4d4701ea9a2bc196c761b0768906d1
diff --git a/app-containers/containerd/containerd-2.0.1.ebuild b/app-containers/containerd/containerd-2.0.1.ebuild
new file mode 100644
index 000000000000..b375d170ea25
--- /dev/null
+++ b/app-containers/containerd/containerd-2.0.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+GIT_REVISION=88aa2f531d6c2922003cc7929e51daf1c14caa0a
+
+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 ~riscv ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+COMMON_DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+DEPEND="
+${COMMON_DEPEND}
+"
+
+# recommended minimum version of runc is found in script/setup/runc-version
+RDEPEND="
+	${COMMON_DEPEND}
+	>=app-containers/runc-1.2.1[apparmor?,seccomp?]
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+# tests require root or docker
+RESTRICT+="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s/-s -w//" \
+		-e "s/-mod=readonly//" \
+		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() {
+	rm bin/gen-manpages || die
+	dobin bin/*
+	doman man/*
+	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
+	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
+}