5 files changed, 130 insertions, 0 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 910580b6c1a4..45f15ef611cc 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/cni-plugins/Manifest b/app-containers/cni-plugins/Manifest
index 3458dd1baf84..5c65e4fe82af 100644
--- a/app-containers/cni-plugins/Manifest
+++ b/app-containers/cni-plugins/Manifest
@@ -1,6 +1,8 @@
 AUX cni-dhcp.initd 376 BLAKE2B 5fe40f28773ffbb12416b40e3813578d28787e9ee26ec4a62b2d3e834920f43fedd0bc985bb412c9576c438367429c835b6099f78f017932b6cdff9341e3f356 SHA512 3475f7c6966b9afac6be52c705286b235a59847748aad5c602162589d4ee1193acffc5965c9130c311e318d06f62a3930d5eb1a70b118a63270f4241f8c4fce8
 DIST cni-plugins-1.3.0.tar.gz 3684138 BLAKE2B c5599f1d8ac3bffb802877ae8c49024a9dea1940923316e534397a8dc7e467f6fe3ceef514a41522611a8f06c4f4ba0788105081e68a4712e2eefade33226c7b SHA512 87e186b3cd64f66280f5b2293dcdd1fc22cb8f51a248124fb622adc48a893348419ba4c29c4769dede4d9e60f2e9fea5d4198f10badb4ecd20a1551e0b344e10
 DIST cni-plugins-1.5.1.tar.gz 3808203 BLAKE2B 481e6c3e929d9169c643596ba48e008151aef10ff670cac9fa00294a3fe98bc5d7c9ee9f83394becb4c127290abb3b082c4124d332b32c8d97f44fcb01b7e3cf SHA512 d2e01958dd8328407164cb6be9d962321742dae7011ce7cd7b2342f5e4b4bbcd992d8249c53d3d81250a60c27f049969bbf329a75440524f52c1f1466b6e7132
+DIST cni-plugins-1.6.1.tar.gz 3940454 BLAKE2B eaeb9d48645efe680f259c3b6d295134459a79a8890cb8645dd4e0e32215decb44f6f72d8b8f575daedc34f0a55a517e213f505639c0a203b0479ca1067b5e38 SHA512 62b4e2c5c4bf6a9b21880e7b145547bec153f591926419d9960345cc7fb7d499ae44b0236928bbfeb46e383f38018d7504e58da1dd8a6ad39ef4ae3122b3be56
 EBUILD cni-plugins-1.3.0.ebuild 1117 BLAKE2B fba4b611635729b3d1f3a4f61c07133eb99ff0ee74a41d3d0e4f3780a2f04dbe6fde798a444a0166112ece47cd38ae37b2aa19cd464e2cf4585c982744bfd6cf SHA512 7cee0e96bce7bb98ff28453725027bc81352d1d0b2dbc2fd7bb6959a8d8a027b149e85955b83a234bb5e865d64386b8e0c5ac01e8f374132670ed49cbd5abd4f
 EBUILD cni-plugins-1.5.1.ebuild 1119 BLAKE2B 7ad07da26f08d90af8d424a1f41bd95578f8a83436ea26728b7c0061e8846524d8c1fdd7684b07ba949d4318233ceefd41ba868c667be5d385a439530bcd748b SHA512 ae8f72f9c447d393209676d2ee21743b3602fa933a73f3dca0de5d6dfefa6c956563bb385f051fc9be335b46d0297ab908e58b485916c95d9814bb4add7958e2
+EBUILD cni-plugins-1.6.1.ebuild 1119 BLAKE2B 7ad07da26f08d90af8d424a1f41bd95578f8a83436ea26728b7c0061e8846524d8c1fdd7684b07ba949d4318233ceefd41ba868c667be5d385a439530bcd748b SHA512 ae8f72f9c447d393209676d2ee21743b3602fa933a73f3dca0de5d6dfefa6c956563bb385f051fc9be335b46d0297ab908e58b485916c95d9814bb4add7958e2
 MISC metadata.xml 351 BLAKE2B 3565fe13764f828aed1288724a2939be57e523e0d0a9ccf3c091715e6f1e102155a7fa28191a3c87d669d51a0fa087a89587d83fe6c4747d5d9b31da11c1578c SHA512 6cfe3058d20387245c2f4823c7629d464115783e3c9ed1e45769d6e13f2f35f94656c66c0b1572f8eb229e6bf43510dbc35d117d6a3379e15b5b6ababc077856
diff --git a/app-containers/cni-plugins/cni-plugins-1.6.1.ebuild b/app-containers/cni-plugins/cni-plugins-1.6.1.ebuild
new file mode 100644
index 000000000000..719d96ec6129
--- /dev/null
+++ b/app-containers/cni-plugins/cni-plugins-1.6.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module linux-info systemd
+
+DESCRIPTION="Standard networking plugins for container networking"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="hardened"
+
+RDEPEND="net-firewall/iptables"
+
+CONFIG_CHECK="~BRIDGE_VLAN_FILTERING ~NETFILTER_XT_MATCH_COMMENT
+	~NETFILTER_XT_MATCH_MULTIPORT"
+
+S="${WORKDIR}/plugins-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+	systemd_dounit plugins/ipam/dhcp/systemd/cni-dhcp.{service,socket}
+	newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
+}
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index 780646a3d8d4..5fad70837ba5 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -13,5 +13,6 @@ EBUILD containerd-1.7.21.ebuild 2022 BLAKE2B aeb92d5514daca7ccca74f5b5a7fc7d0bc7
 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
+EBUILD containerd-2.0.0-r1.ebuild 2030 BLAKE2B f10ec799e3834c40608ee0d2bd3daaedca88fc4467ccd8b95093bf33b8acc6f33275348899beb1d4b5cce1e94da33b25dd1e4b892879aec3a01fc5f0d9bb4e50 SHA512 326ce0123977ca3a3892b8a49a395e64d945ea36f39fff9114855040690cfa2280a3191e0e8dfab28cc82ea10365749c2fc2f732a709db60a75cd5bf51208a15
 EBUILD containerd-2.0.0.ebuild 2021 BLAKE2B b4a80a24a5eb0d90c8c89ee5f9104de363a77d8031968f595faf6fddc426a7b73eeb9e89a6b381eb3c4b09c20c991c60228c79f22c3a6f80261456d944e43940 SHA512 1d6bb45bc502c62c18a24af6981ffbe6c4086502c6e7d24495b278bd241b6dee1dc5ee3dc3857da1a5ed8ebe2226a52b48c7ff521b55462605de297cb38e29d6
 MISC metadata.xml 981 BLAKE2B 78f44dd46331f9159931ff289a5adfdc177cb5e0c1d12cf717fad4f227b15ae40f479f40554dc4855009342cb7d699aaa543a0fbcc962789fe100a1cc9b350c5 SHA512 a171a3fcd67d8b410148d3e99477ea69be7e84ba2a2d24739343bfde29b88f8f799530c3b1107829ebd52eb847b4f5c25e4d4701ea9a2bc196c761b0768906d1
diff --git a/app-containers/containerd/containerd-2.0.0-r1.ebuild b/app-containers/containerd/containerd-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..41fa3c68f10e
--- /dev/null
+++ b/app-containers/containerd/containerd-2.0.0-r1.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 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
+}