gentoo resync : 20.03.2022

5 files changed, 17 insertions, 114 deletions

diff --git a/app-containers/crun/Manifest b/app-containers/crun/Manifest
index fa91c6afb760..8628f984d70f 100644
--- a/app-containers/crun/Manifest
+++ b/app-containers/crun/Manifest
@@ -1,8 +1,5 @@
-AUX libcrun-linkage.patch 1155 BLAKE2B b815ada4c90e61ac36e878ba0072f2dc3944e8f82d827e47cc8907fce0931e2134af690261cf75e193fbcb47b4822955d26f3e9950b674c5fafde85f25700032 SHA512 2a1936f3ac3a45cc2fcef61d097c86c78e94ee71ff15dc68d6037bf6be174a6bff725c04ccefff805c9059db3e4db1285c785658b7f6cf4b610739f11e82cfed
-DIST crun-0.19.1.tar.gz 1870594 BLAKE2B 1780a2936ff39ec80836c4c9ae072e2fc30703a31a79786337290c62dd433b5a35dcfa953be370703d1baab3de93fdb376c99ab76dff1470883c61726c313144 SHA512 f93f79d1d63d6749bcf92d48542d9555f3ad47657c959c7c06701861d7a5a4171969f00f6dff3878286970a48aba3314c25e35c005463e606533b0ff7843d994
-DIST crun-1.2.tar.gz 1879836 BLAKE2B 45370e3206a13c963d694f338dc0a00de24253025d31ec893353905235b239b8e7f626ddd4ee0cc32da2b3f5676b42f59f3214a1eb9c3af4612483cd6fd14693 SHA512 5cadaf0eb0e9bcf53726e7f6ffb664c8327f0f4e7cdbf75ae8a0cd4759f7c8a8a2611df65ca1436a50d7af5d37505aac861d7db4d46a93c3832362228cb37cbc
 DIST crun-1.3.tar.gz 1889283 BLAKE2B d7e7f676ca5db8322b9da2110c9a9e8eb11b13b5e9f1432ccc6ef12bf6ae7db3a28e3227fac86091589a215394ec577e91ccbffec532dabf44be746cb8a5d404 SHA512 9600bdacf5fd2defa542230b6e134920eb80e9d4c49598167b9d58887719765c174f1ac8559c0092dc1b5435274124e0b29c3d0830df86d1cfd690d67c746016
-EBUILD crun-0.19.1-r1.ebuild 1511 BLAKE2B 56dc3607cfccf765c0be5357df9d51f43ad397359f82ce600eeefd39ee03cae12f96a44bcaf22c5f41a538991e577e2f1ff8cc44adf5e711ae869f5cd47e8fc5 SHA512 314589e661a047094b5eac396ec5c982d6b9f2bc25d63fb43e53a6420a4ccc2568fffc476d1a8777dca6bbf2511de16e37e52c28d29b67e9171381db74710857
-EBUILD crun-1.2.ebuild 1371 BLAKE2B 4bd901a57f19df424118c9243327b5e19c7d1d9b88d32501a60f35cf2e641320b9759ebd77e4bd701f3c211f4931a7cdd01cbb3241aeb680cfe180189eb7269f SHA512 b6eb3ed73f098cd1d7bcbe370af90e76c610763caaddf27b70bac1dbf4dd9b02c3f0529685ba992ee3011b5d5c5288cc1fe69706b80808c38df781be8ae43771
-EBUILD crun-1.3.ebuild 1377 BLAKE2B 5475c023a96897a4bb929240ddaee95ea62d3cbd5f31c54a3879a96e2512b8255e86b340ef837323fe3176391b76d78f34e4adb50e80ef3b85f19108965416d3 SHA512 c7478145a0ecd544d640ee2008fcae23f1c4a27099040c00f415af26815c6f070dc1c764b674fe93e89a0e7dd3716a8ecd74e1b0cb3e7787fff43bd146317ca4
+DIST crun-1.4.2.tar.gz 1956517 BLAKE2B c5db3396902c33568c3f9a490c57f8781703018f228f07bb17b1ccaa5c2ab903eda76e50d46fa3be10e440e6a0c3f791744f05d7677c71e2510673077d0acbef SHA512 cc7b57ed945cb36a36cf2ceab57349f836a07164ef31e0cec8bbddc4451a5757e2a0b92bc553b8994a236d7869cfdf229a5dd5e5a0d7f139f8c2a8df5c151d3a
+EBUILD crun-1.3.ebuild 1375 BLAKE2B 5d482d2f524737847ee191578c9567590673dd0288e76d068e6da2ddc5114d3efc557b511cc9cdbe85e26ed5bb74cd087a8c1dc1d7fb41c07d1300231a31dbb8 SHA512 dcbc837b95422547b4fa4464a28a40e91f36e17729baa83ce49b9ad7985dc76ee06596fbba27e210320cf523b8ee769c9b71cb4da0c04a3eebb8e70c1df73b82
+EBUILD crun-1.4.2.ebuild 1513 BLAKE2B 9a6858626d135a21d3fd967027e5bf44a1de361c4be1d2ba5766bf35d24d6d1c7d64f1979614ea66ed30231d410f5705f02a81b4e3434650ebd1f8059c61f6ae SHA512 7d168190fd1a775b85f13d9c136d246325f6526b0b61b57cd594e80262b6f128ecafdbafdceb0c84fb3586da7ae75788f7448950927b9ea643dce96458c77734
 MISC metadata.xml 1300 BLAKE2B a0ae27420fca097e4e7b5e983de3b76fef43bf13887bd5fe903da14e20c2f0ebd2fc273dae74e32e28c2768b5f8d6e5e6c8b4c9f07ca6d47e41902621173a167 SHA512 1699a89a01de32b580bc74bc747430ef7b1a6284b2f459b4041b22de0efbebda45778803deb512a61806ed8e2998b141caefb7830acafc68d42ce4343b193dd6
diff --git a/app-containers/crun/crun-0.19.1-r1.ebuild b/app-containers/crun/crun-0.19.1-r1.ebuild
deleted file mode 100644
index 0590fee263af..000000000000
--- a/app-containers/crun/crun-0.19.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools 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.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64"
-IUSE="+bpf +caps criu +seccomp systemd static-libs"
-
-DEPEND="
-	sys-kernel/linux-headers
-	>=dev-libs/yajl-2.0.0
-	caps? ( sys-libs/libcap )
-	criu? ( >=sys-process/criu-3.15 )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-"
-
-# 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"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}/libcrun-linkage.patch" )
-
-src_prepare() {
-	default
-
-	# for libcrun-linkage.patch
-	eautoreconf
-}
-
-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.3.ebuild b/app-containers/crun/crun-1.3.ebuild
index 5de80d420e29..927cc63d4181 100644
--- a/app-containers/crun/crun-1.3.ebuild
+++ b/app-containers/crun/crun-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ppc64"
 IUSE="+bpf +caps criu +seccomp systemd static-libs"
 
 DEPEND="
diff --git a/app-containers/crun/crun-1.2.ebuild b/app-containers/crun/crun-1.4.2.ebuild
index 0fef6a729b1c..7c6b28ed5bef 100644
--- a/app-containers/crun/crun-1.2.ebuild
+++ b/app-containers/crun/crun-1.4.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools python-any-r1
+inherit python-any-r1
 
 DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
 HOMEPAGE="https://github.com/containers/crun"
@@ -17,15 +17,18 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 IUSE="+bpf +caps criu +seccomp systemd static-libs"
 
 DEPEND="
+	dev-libs/yajl:=
 	sys-kernel/linux-headers
-	>=dev-libs/yajl-2.0.0
 	caps? ( sys-libs/libcap )
 	criu? ( >=sys-process/criu-3.15 )
 	seccomp? ( sys-libs/libseccomp )
 	systemd? ( sys-apps/systemd:= )
 "
 RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
+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
@@ -42,7 +45,9 @@ src_configure() {
 		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
 	)
 
-	econf "${myeconfargs[@]}"
+	# Bashism workaround for https://github.com/containers/crun/pull/880
+	# Drop once fixed in a release.
+	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/app-containers/crun/files/libcrun-linkage.patch b/app-containers/crun/files/libcrun-linkage.patch
deleted file mode 100644
index 72156ac931c8..000000000000
--- a/app-containers/crun/files/libcrun-linkage.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7cfdf094071fcff038bab573c1eeee599fa17b16 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Mon, 2 Aug 2021 03:53:25 -0700
-Subject: [PATCH] Makefile.am: link libcrun to $(FOUND_LIBS)
-
-otherwise libcrun consumers fail at runtime with
-symbol lookup errors
-
-Closes: https://github.com/containers/crun/issues/711
-Issue: https://github.com/containers/crun/issues/340
-Downstream-bug: https://bugs.gentoo.org/717750
-Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 150e933a..7e5a4406 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -46,7 +46,7 @@ libocispec/libocispec.la:
- 
- libcrun_la_SOURCES = $(libcrun_SOURCES)
- libcrun_la_CFLAGS = -I $(abs_top_builddir)/libocispec/src -I $(abs_top_srcdir)/libocispec/src -fvisibility=hidden
--libcrun_la_LIBADD = libocispec/libocispec.la $(maybe_libyajl.la)
-+libcrun_la_LIBADD = libocispec/libocispec.la $(FOUND_LIBS) $(maybe_libyajl.la)
- libcrun_la_LDFLAGS = -Wl,--version-script=$(abs_top_srcdir)/libcrun.lds
- 
- # build a version with all the symbols visible for testing