gentoo resync : 29.12.2022

3 files changed, 8 insertions, 69 deletions

diff --git a/app-containers/crun/Manifest b/app-containers/crun/Manifest
index d4885d6623e4..3f579a39c4f6 100644
--- a/app-containers/crun/Manifest
+++ b/app-containers/crun/Manifest
@@ -1,7 +1,5 @@
-DIST crun-1.3.tar.xz 831108 BLAKE2B 37e8d0ba764ae77c870c68ea9cd93f1ea1c751eb2b6aa84481f81b22ec2eb5d9e518d4808bd1bca545c57d18c5c491372694009d6498652cce45fda8864e5835 SHA512 3b58ee65a41bc85ec31147053f00e9c2a2e5ee9a72381a65c19480cc24d80cad7c9f6e1a47b3e020facf0603c54e4d2640db187c5e66a7deb8b1ead7bc111ee6
-DIST crun-1.4.2.tar.xz 873636 BLAKE2B f8b3546b7c4aeb7077af8cf9e7ec0059259143da80a6a0d020dc9d702e03008b2b1c2a6a5cdd555b625abc1f2ed5a55786525919eda15dc241d1b8f2334e8689 SHA512 f97eedf84a61cc3753f528b75b24f95131e871f734c8e770b9bdc4e1d33668162e6bdc0c4676c0164900bc987490d3dbd0060c27046091f012ad178ef42fbdbf
 DIST crun-1.4.4.tar.xz 877892 BLAKE2B 57e48c0a229db3f54212177cef3fdb3f59b4bb1d1cc865da956f026a35837d839489bd126f880d7a9ceb18f5cffbf0e32ac9ae59a4cd39c34e3aff5b32c0559a SHA512 1756dccf6509457a5dc114d43c4f4e99258a20c3437dfe06016d080989c5d3035f5735d62d18ab537b660ec36de04df369a2582745baf4ab680af367a19830fd
-EBUILD crun-1.3.ebuild 1374 BLAKE2B 0b7c999382540caac2742ea72226824ecde615e40a2154a83f2e18ec6c8091e4109969519ca731f66cd539ccf3c0bed23b2277cf8b3488ccbd6b84e43b45a17b SHA512 2e74bbde388306980b1681c3735ce41dbe699dc618987d79167aa93efefd89978859cc53825bcebe6504d0bcb7100bb9fe1cf747fb1fbe8cf2623664e710acc9
-EBUILD crun-1.4.2.ebuild 1513 BLAKE2B 431aec7bd18867e22d81467384cc7c386c3fff02df9edd6b3a3e310d0493821ca592e8730296d2a1419f53eddc50fdbe678c7fb0322a4d1ef285be9193a62477 SHA512 3f23080558ecb746ae18c45a44eefff7f7d247f6af3c6bbd1ac273c07dbb086ced5729d548c6cbc51f552ceecc0f5207664f92432f4ff66bfb0bcb46678b8b96
+DIST crun-1.4.5.tar.xz 879044 BLAKE2B c80cae28c23140086682493a7dddb40640491e3ea827f0a7376d9be12570111d056022f50b8d7c574ca07790753d20de2314db5b89463994c4fffbc7576c372d SHA512 9f288279615fdf587018c465047fc8793daae280ab864bf9046994983239129d50f2eb89cac9b092e5cdc49a10f3523ab403a3f0e7451f7536b79f651a355153
 EBUILD crun-1.4.4.ebuild 1624 BLAKE2B cad4388c81fbf098a279b2d02c1dd845cf9b0862c8b20010b6fc5ea6a8c1aa86cc1b33169259e2923c9f95f8b08c25a3d653cd1a60ed71a40b63ee847a6bfcb1 SHA512 595d09e8af3760fcdeb02f1b0db7bac58d3c6726cf9ddb0dd08629789271acfd08f4b54eaa3c2e05d68c09db65c3fd453b95f56e9f6c78ecb1ffab18e04d78ae
+EBUILD crun-1.4.5.ebuild 1627 BLAKE2B bf870b4685a7eba8959ad6de46e2d953d188beda27651f4ade170bf362c820cfdbd57f754df9313c7999bea9579074891e71386deeeb13a09db8c8524162b46c SHA512 bcdd158fa0ebec2660cba1f860ccf9cfc16375931d6beab3f15826a88ce77685ebe16e37e1d0c6d554b5fe20b82403079e93db60f79e1e9f7fd2f7b576971190
 MISC metadata.xml 1300 BLAKE2B a0ae27420fca097e4e7b5e983de3b76fef43bf13887bd5fe903da14e20c2f0ebd2fc273dae74e32e28c2768b5f8d6e5e6c8b4c9f07ca6d47e41902621173a167 SHA512 1699a89a01de32b580bc74bc747430ef7b1a6284b2f459b4041b22de0efbebda45778803deb512a61806ed8e2998b141caefb7830acafc68d42ce4343b193dd6
diff --git a/app-containers/crun/crun-1.3.ebuild b/app-containers/crun/crun-1.3.ebuild
deleted file mode 100644
index 0ad076a2251c..000000000000
--- a/app-containers/crun/crun-1.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit python-any-r1
-
-DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
-HOMEPAGE="https://github.com/containers/crun"
-SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
-IUSE="+bpf +caps criu +seccomp systemd static-libs"
-
-DEPEND="
-	dev-libs/yajl:=
-	sys-kernel/linux-headers
-	caps? ( sys-libs/libcap )
-	criu? ( >=sys-process/criu-3.15 )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-# the crun test suite is comprehensive to the extent that tests will fail
-# within a sandbox environment, due to the nature of the privileges
-# required to create linux "containers".
-RESTRICT="test"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable bpf)
-		$(use_enable caps)
-		$(use_enable criu)
-		$(use_enable seccomp)
-		$(use_enable systemd)
-		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C libocispec
-	emake crun
-}
-
-src_install() {
-	emake "DESTDIR=${D}" install-exec
-	doman crun.1
-	einstalldocs
-}
diff --git a/app-containers/crun/crun-1.4.2.ebuild b/app-containers/crun/crun-1.4.5.ebuild
index 3320edf85e4d..7beee3b50821 100644
--- a/app-containers/crun/crun-1.4.2.ebuild
+++ b/app-containers/crun/crun-1.4.5.ebuild
@@ -13,8 +13,8 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="+bpf +caps criu +seccomp systemd static-libs"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+IUSE="+bpf +caps criu +seccomp selinux systemd static-libs"
 
 DEPEND="
 	dev-libs/yajl:=
@@ -24,7 +24,8 @@ DEPEND="
 	seccomp? ( sys-libs/libseccomp )
 	systemd? ( sys-apps/systemd:= )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-container )"
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
@@ -45,8 +46,8 @@ src_configure() {
 		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
 	)
 
-	# Bashism workaround for https://github.com/containers/crun/pull/880
-	# Drop once fixed in a release.
+	# Need https://github.com/containers/libocispec/pull/107 to be merged & land in
+	# a crun release that syncs up w/ latest version, then can drop CONFIG_SHELL
 	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
 }