gentoo auto-resync : 25:09:2024 - 01:25:44

5 files changed, 171 insertions, 0 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 347aa51a8f5f..09dd3e67ffc2 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index bc05577394b6..e681d9e99db4 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -3,7 +3,9 @@ AUX containerd.initd 794 BLAKE2B 88a1976615e4e9d67c10ed3748aadd74ae13ef4cf004bb5
 DIST containerd-1.7.15.tar.gz 10071827 BLAKE2B 91de9b7d777d53ecdab4af5bbb0d4ccbe755e4cf0fb7bc99a7bb15c66e0e11ad30aa2af685e0e8b0df80dbeef451704fa056a04b460d92adceebd290977febfc SHA512 84a94c7658a431cfd7a5321ac262d966f4291337ddff14211951b0d2025cd3af25a48175794d2b3a630ffc25ba03047579163546a4758a2fb5d1898cd233854f
 DIST containerd-1.7.19.tar.gz 10157428 BLAKE2B 3f51d63d4280a11ffe308c3e65df2fefdd91f543169501cf361bb8c6d5085b6b606cc3425508246ce872c86a475e2d195dd2473fee89a47548cfdfbd810307c2 SHA512 cb58bf5148381f9f0eba096e159592f294f887c5b17f8aaf6de8fed80c515abf4f08c849bbbd266dd85ede09fe709bf7d15a61a749f1136456329c47508dbe34
 DIST containerd-1.7.21.tar.gz 10188737 BLAKE2B 0a3eef5bd97b4249963d6e6b80652e2abef0ac7ece726d15efc3b1d364b3525ac7602afecfde3d376bdbec7d5ca39636e09dd8d2a96c420012ef4232afc2a6dd SHA512 fba998c8d7f2907b3e5fb09c3947c3272661ec33379c611c5110ca0151812adcd70ff6b837e97a5d4228d685902276eeb98cd82bb4c46149686e169e81943c75
+DIST containerd-1.7.22.tar.gz 10189969 BLAKE2B b1fac9764a8bac0b883849786bd20c9a8e64d764186c6362978faec5ba360636caccc6c1a7c51c6781aa51f96a4e713968d1e86b54b6fe2fa9e3dfcc07727e64 SHA512 9572f2b0f49365cc3888999a0c0b7d29694922f0cbefb33e1fbbfc71781cde402537da3a23e36fd3a600a1d819bcef9acbeee423df2699fa9e3f07cfde7f9128
 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
 MISC metadata.xml 981 BLAKE2B 78f44dd46331f9159931ff289a5adfdc177cb5e0c1d12cf717fad4f227b15ae40f479f40554dc4855009342cb7d699aaa543a0fbcc962789fe100a1cc9b350c5 SHA512 a171a3fcd67d8b410148d3e99477ea69be7e84ba2a2d24739343bfde29b88f8f799530c3b1107829ebd52eb847b4f5c25e4d4701ea9a2bc196c761b0768906d1
diff --git a/app-containers/containerd/containerd-1.7.22.ebuild b/app-containers/containerd/containerd-1.7.22.ebuild
new file mode 100644
index 000000000000..1399f6ef7ba4
--- /dev/null
+++ b/app-containers/containerd/containerd-1.7.22.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=b2ce781edcbd6cb758f172ecab61c79d607cc41d
+
+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.1.14[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
+}
diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest
index 58277ab41aa2..e89372c1d6a8 100644
--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@@ -1,5 +1,7 @@
 DIST runc-1.1.12.tar.gz 2522196 BLAKE2B 14fe8d5f82d5b4d7f6b4bb9111c5d258e74f6a44aeb51fc87c69104e95b9bf24a3d503f4cc5dedb40d542fbd4b6e27273f456bda4fcf3bc298eb93ae292d9663 SHA512 92e8ac54a77d7ebcc76b5a9cc08d9a064211f12e9d26f064070cc203a5afb11c3af28d8f556f297513f797a2933d50bf10a8f22e307724041d66aa8c5ca1d9d3
 DIST runc-1.1.13.tar.gz 2532849 BLAKE2B f3d3171ffce2bb833bfb5cc21d0dc034fd7e38c47ee098cc1fc75c06fd4dfae21dfe25c2e69a1ca93b29d36e8799727ea41725eee8aca3a059c14dab6c8a435f SHA512 644bf9e6359bf49bbdec667c0f7c69ded78c7eacfc2d1b730d52fdcf7348571c6406b8e5790811fe3662a458c878e4225c3559885f0d95f8905273e7e40e55ad
+DIST runc-1.1.14.tar.gz 2543890 BLAKE2B 3eede8cd7d04d2a3826cfc7caae032744551799e8262d28e989d3d5c66ca3969ce8dede064ebd37361a00eb276fa7c9961180dd9fc9b0d53535421ecc99acb39 SHA512 bdefbf34cf57485c6b961babc8294d0e6b2e003eb836b8e99c49ef4d00acf11f30a46ad0bcd399ee9346610419591daf1eecb3b6b127962357d629bf5f252e22
 EBUILD runc-1.1.12.ebuild 1833 BLAKE2B 6815357831f57776945cb6c7d8e8e0a7735aacfa35ee4329ad5e8a8c165f788812c7a347b6933fd05e29b063dab3e886fa3e37f57d2e66f0d46401a65c620b8a SHA512 eb290a626e95d3cfc5ecc308aa63891e19f6d6e5092aa3704cdc174d7ed917dd8c53f86dc13a6ec9ddfcbf04a5c826fc1e6cc10ffe20c431209dadd9fcc427b0
 EBUILD runc-1.1.13.ebuild 1779 BLAKE2B e96b0bea4e8b2f0890c3a9dbbac809787e1d78022bfa34ba85bf528bd253a3acbbf4985ddb745a64018d159e02a9b8ee98f4e2907f25cfc372e3b8284ecaddd9 SHA512 e509e11e78246b47e3af3b5d5b0a4acddcd1ec31a632f7920cea8f1859194d2dada536a46543607250a770caed9a89a20eef7ec78f95848a896ccbadc0403268
+EBUILD runc-1.1.14.ebuild 1779 BLAKE2B fbcdf8db2d3ee3a18f322e618f607fcac9203be3ac693616b9cdde34a3ed013305ca3cbe66406212d18cd56cacfc19461998307ef43f3626a1a4e93408ab5600 SHA512 ac8877b61958badbb560f36c3e61798a9452fb72dbd26975ea3e161f865c1c1a945c4f81fff4be763d1d05aa2282d09d627c1e469a62f0a64a1dfe8ae6992b29
 MISC metadata.xml 647 BLAKE2B 67dce497b4fa65db5146f9e017ec00795ad4ef5d63058d4c20bfc730f17e2fabfcd82b403bd06330f9a68ef2e344198514930493eeadef69eb2ee8a618e5e0fc SHA512 970d9753c81eb387a06fc24be8bfb3b056e9e7cbf568f99511bdcfd35f6a8cdfe21ea0103ea36b8fba7be733016493663c3a38452b05225de35af7e1c5b359dc
diff --git a/app-containers/runc/runc-1.1.14.ebuild b/app-containers/runc/runc-1.1.14.ebuild
new file mode 100644
index 000000000000..e9d447700b12
--- /dev/null
+++ b/app-containers/runc/runc-1.1.14.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module linux-info
+
+# update on bump, look for commit ID on release tag.
+# https://github.com/opencontainers/runc
+RUNC_COMMIT=2c9f5602f0ba3d9da1c2596322dfc4e156844890
+CONFIG_CHECK="~USER_NS"
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="https://github.com/opencontainers/runc/"
+MY_PV="${PV/_/-}"
+SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="Apache-2.0 BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor hardened +kmem +seccomp selinux test"
+
+DEPEND="seccomp? ( sys-libs/libseccomp )"
+
+RDEPEND="
+	${DEPEND}
+	!app-emulation/docker-runc
+	apparmor? ( sys-libs/libapparmor )
+	selinux? ( sec-policy/selinux-container )
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	test? ( "${RDEPEND}" )
+"
+
+# tests need busybox binary, and portage namespace
+# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
+# majority of tests pass
+RESTRICT+=" test"
+
+src_compile() {
+	# Taken from app-containers/docker-1.7.0-r1
+	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
+	CGO_LDFLAGS+=" $(usex hardened '-fno-PIC ' '')
+		-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# build up optional flags
+	local options=(
+		$(usev apparmor)
+		$(usev seccomp)
+		$(usex kmem '' 'nokmem')
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		COMMIT="${RUNC_COMMIT}"
+	)
+
+	emake "${myemakeargs[@]}" runc man
+}
+
+src_install() {
+	myemakeargs+=(
+		PREFIX="${ED}/usr"
+		BINDIR="${ED}/usr/bin"
+		MANDIR="${ED}/usr/share/man"
+	)
+	emake "${myemakeargs[@]}" install install-man install-bash
+
+	local DOCS=( README.md PRINCIPLES.md docs/. )
+	einstalldocs
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" localunittest
+}