gentoo resync : 16.04.2022

3 files changed, 3 insertions, 84 deletions

diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest
index 46112120cff2..2126ba206b32 100644
--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@@ -1,10 +1,8 @@
 AUX CVE-2021-43784.patch 3305 BLAKE2B c6e16dd2793d99c2513c3bc047c9ccbd9870c15908078895e9e436b437dac55854105ccb0edf48588294125958fc9285637f839b6804cce9a7269fb5f85f4360 SHA512 584bc4e5e88275fa2c300965882697ca6afb6e0987bc1a888d96febbc47e56b17f346c595fe6e3933a29c143c000d574a64475de8779e4f7ef2d724d7be43589
-DIST runc-1.0.2.tar.gz 2374156 BLAKE2B 526520adb7127e46e7258de75e66a15a5aac216a2a2fcb91f4d9c5da393892242c4d93c5f5483ab111bf29eed7d8f0c8c138ae83a22809d72802a981dcda0395 SHA512 434abd6d7ad2508c2272b627d8aeeb28ecd8461899bff463e7d2c7abbc0f0cbb2e0bafbfe81fc534fad506b1acb4bda3e05639ecd908bc9d0d2e9356f1e56e26
 DIST runc-1.0.3.tar.gz 2375241 BLAKE2B 0fb9368ab5442462001c15a67a71821133ad90d16cac5aac760e52b2477db69c0a5dd59df42601119b19ede508889796c994a24624f88ec6a1a29dad19e0bf33 SHA512 64a1894c2b4ed5a68b185e88548fc9fbbd01d8a9495feed59fb196aa06763d64cfb71ca6cbc09d1defa26a0d94ad58626296585741f23df2e290147ba6c4c26e
 DIST runc-1.1.0.tar.gz 2332427 BLAKE2B 3a194221d0bab813249e23c5f725255e453ce6843c2cb7e1a40a3c6fdd90a1a805c18ebadf56ee5d535f253025716aae6ab3f437140a3cc69e854e750e205e0c SHA512 542ea87c488fd120f2b77e53e2c197f09cd504fbe55dbe47008aaa5b0565aa300fc49f8cadc24ead796e45a4e95a30dfb08bfeefa58dc370145a218fd2869e41
 DIST runc-1.1.1.tar.gz 2332722 BLAKE2B d0abe624ddd17885bd25a5923e35ed760a7acaeb2ae7eefa18cdd28a2ecfc79a958d550eafac421b58865376620d7475338752df823e0f1b4a69be201fe4ea90 SHA512 baf622e7edae9b68d2fa255f02359d770489c7578be3c6379a5d939b4f1dfa697ec9eb4ef7dce252e64ee5225f76c06e45182a9b92b68a952e21e3f5f91450d0
-EBUILD runc-1.0.2-r1.ebuild 1841 BLAKE2B 8a4aa33bfe3ae59ee8681af70ef35eb0aaf87b12ce37e6d73dcb01561a911680b692afb5b89a9ed1618f9c2c5dd2388423d4f6e79fe14f4cd54b57a6264d5898 SHA512 8a0a701449cac7fa48dbb02af920a500e2a6f6595a2023ab80dbc5ac6c9effc01d78ea3c3a4b45cd82316e1e285c5b04dfcffd7f8b356e3ef687384dce985176
 EBUILD runc-1.0.3.ebuild 1793 BLAKE2B f92e4d3fe0fb2125fdf5a2d3ef4cc9418c6cfb1cf864c2dc6a757d48f44b8771e52da88685e8fb661ed56cb9be2d949263c84379015a41a4c10d6beca2ddabf1 SHA512 015b6982421ddc244c9d841eb7919d9e6f83d604286b1cfe6991b97f56faafd7731e363ea55b1e46cb62c99bfb90e8fa6ea89b40c45a31c8b7cf80d9c5b3371a
 EBUILD runc-1.1.0.ebuild 1795 BLAKE2B 0df960fc7c3bf58ac6d271d61838416e229a200d2a948aaf392d65fec701c4e5718dd924ade42ef85620e95c3fa291b54f8de3cfefe75ec52fdcf0a27d829570 SHA512 9fdfb92e462491d95e208eeef50c3bc09c8d560c86d5f254574b7facf5d59028ac9b1e780de6c2dab6f96ba99e804dcd9b3a3bcd95d0a49b98320d9615187db2
-EBUILD runc-1.1.1.ebuild 1795 BLAKE2B 8e0978d0be8c03a1a0eeb430e7c68d5307485adef27aa99cb22d0610446cbe78146b34e30cd91f0c3aa728b61396665039881e28dac9d5b8112db5fae55f6336 SHA512 22100534f7b367b5aa16dc6130aca2e830b7fdace3088a55d592ce36ff7ee9c0924ad54c4aba5a98cd6fb196bbc01631878fb7060c0d259bf41b1dc2b29ceeef
+EBUILD runc-1.1.1.ebuild 1846 BLAKE2B 3e7caa50bcd158e59043db753ec64aea99dfa26f6ecb693cda011606dc9649248e76e154efe13852b10c0f256accd78674f3eac12f4e259897820e567d35bcf8 SHA512 250d42b4f01bd6e610b7247a7b88d934f8b3765eec7e882cab9d3e0a7bb7eb6006a4ef018c8e3c15b462b1c5b58f767a7ab1dac57b510f23066d611aad93bd32
 MISC metadata.xml 822 BLAKE2B 2029743d60c9a6197e3db4ca27c3ee48bc86f624a50d7caa9bfb7f958383a1736d8817f2f977ac0e673229bd61f341a00f266dbce35dcd9633ecc27b182478d5 SHA512 f80b366f7fc8f4ff5bd46245aa80871748800a557440af3aa45bd1a508732cf634b6f21a3445135450eefbac91ab16f7b344c3f557af8ef69fdd8120ca6cf4e5
diff --git a/app-containers/runc/runc-1.0.2-r1.ebuild b/app-containers/runc/runc-1.0.2-r1.ebuild
deleted file mode 100644
index d31a90d65a0d..000000000000
--- a/app-containers/runc/runc-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module linux-info
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
-RUNC_COMMIT=52b36a2dd837e8462de8e01458bf02cf9eea47dd
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-PATCHES=( "${FILESDIR}/CVE-2021-43784.patch" )
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export 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
-}
diff --git a/app-containers/runc/runc-1.1.1.ebuild b/app-containers/runc/runc-1.1.1.ebuild
index 1f7972fd498f..655750e7d505 100644
--- a/app-containers/runc/runc-1.1.1.ebuild
+++ b/app-containers/runc/runc-1.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P
 LICENSE="Apache-2.0 BSD-2 BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp test"
+IUSE="apparmor hardened +kmem +seccomp selinux test"
 
 DEPEND="seccomp? ( sys-libs/libseccomp )"
 
@@ -25,6 +25,7 @@ RDEPEND="
 	${DEPEND}
 	!app-emulation/docker-runc
 	apparmor? ( sys-libs/libapparmor )
+	selinux? ( sec-policy/selinux-container )
 "
 
 BDEPEND="