gentoo auto-resync : 10:12:2024 - 02:01:16

2 files changed, 92 insertions, 0 deletions

diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index 08c895460410..5bc37e007479 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -5,9 +5,11 @@ DIST containerd-1.7.19.tar.gz 10157428 BLAKE2B 3f51d63d4280a11ffe308c3e65df2fefd
 DIST containerd-1.7.21.tar.gz 10188737 BLAKE2B 0a3eef5bd97b4249963d6e6b80652e2abef0ac7ece726d15efc3b1d364b3525ac7602afecfde3d376bdbec7d5ca39636e09dd8d2a96c420012ef4232afc2a6dd SHA512 fba998c8d7f2907b3e5fb09c3947c3272661ec33379c611c5110ca0151812adcd70ff6b837e97a5d4228d685902276eeb98cd82bb4c46149686e169e81943c75
 DIST containerd-1.7.22.tar.gz 10189969 BLAKE2B b1fac9764a8bac0b883849786bd20c9a8e64d764186c6362978faec5ba360636caccc6c1a7c51c6781aa51f96a4e713968d1e86b54b6fe2fa9e3dfcc07727e64 SHA512 9572f2b0f49365cc3888999a0c0b7d29694922f0cbefb33e1fbbfc71781cde402537da3a23e36fd3a600a1d819bcef9acbeee423df2699fa9e3f07cfde7f9128
 DIST containerd-1.7.23.tar.gz 10192816 BLAKE2B 592e3a1992a637879f1669a660991f811db6f3d11a788c9809277b3fb9639d8b89445cbbca1de16ed45703e8506c8850d9ce68b64d1213817732d008a1847ea6 SHA512 4cb003a6ef2f9fe856665c3b7099e13b23cf07c77ed9a9ed50988d74de1933e3fe9463ae123635230f25cde38cd8a487133b11e20d829a79517c4d7fbe2ce012
+DIST containerd-1.7.24.tar.gz 10196410 BLAKE2B be5238208170f63e7328627a4407da3eefa2c03051c95228bc26dac04560c564330ae118e1b01fcbd22983073b9fe25161f1da7698449507cd8222f41ff59eba SHA512 eba2d562f336ffac981b67d2574c5951774f4c6a70ad1cc8aabb59204d1c8e9aa5b3be50c048bf04a018be1335b7ec8e47b73013de2e19805c978587b53bc85e
 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
 EBUILD containerd-1.7.22.ebuild 2022 BLAKE2B 309b1522fb887aa0979aceb63837a8a7c78520ad9b17b4a0f3480ecea3b86ff377e04addf559c36da17a51d5aa38edfc09c5cbc1c293c91b7178f854791a6089 SHA512 518e4cf035e52e5828de714a5eeeae6afd122ba1bf1b9820984e9583ee0428d6de905a7aa67d9c9636ccad1ca6984bedb74ecb52ba65175291c55d43bc89af81
 EBUILD containerd-1.7.23.ebuild 2022 BLAKE2B 6d9195dff277519a734b1959a304fe01d6e3025f3b56c86431a03904d5ea5d6de310589d248d60480c0b8be19a74d63f10af9d07a57e75dadcaff04553523415 SHA512 45cd2cdb4d8332fa7079dfb73f2bf5c4e533e2cf8099420481e01a9ffc767c5ac456fb495f090f1c838b11aa537f442460f18c74002af375ae82e2d860eb4636
+EBUILD containerd-1.7.24.ebuild 2021 BLAKE2B 8d1f30c5e2d88874e63aaf2452c1f594379587506f0dd5c4cad2531f4ced6f9a341ee0a4800c68b828b133312637767f6d2aab5f52dbc46a7c391448c6b3d50e SHA512 668630c48fbe40f7c658a3170d45ac0242bfda54aeef324db896e1c769f5891503368533ca630af0afd7217040f00edd9bfc27e30636bc625666c9e5bb8219d6
 MISC metadata.xml 981 BLAKE2B 78f44dd46331f9159931ff289a5adfdc177cb5e0c1d12cf717fad4f227b15ae40f479f40554dc4855009342cb7d699aaa543a0fbcc962789fe100a1cc9b350c5 SHA512 a171a3fcd67d8b410148d3e99477ea69be7e84ba2a2d24739343bfde29b88f8f799530c3b1107829ebd52eb847b4f5c25e4d4701ea9a2bc196c761b0768906d1
diff --git a/app-containers/containerd/containerd-1.7.24.ebuild b/app-containers/containerd/containerd-1.7.24.ebuild
new file mode 100644
index 000000000000..7e9f508cd288
--- /dev/null
+++ b/app-containers/containerd/containerd-1.7.24.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=88bf19b2105c8b17560993bee28a01ddc2f97182
+
+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 version of runc is found in script/setup/runc-version
+RDEPEND="
+	${COMMON_DEPEND}
+	~app-containers/runc-1.2.2[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
+}