gentoo resync : 30.05.2020

3 files changed, 134 insertions, 1 deletions

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 94140c772321..1d80ac7f0c1b 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -9,8 +9,10 @@ AUX criu-3.12-automagic-libbsd.patch 457 BLAKE2B bd16c9e84ba67d0968371844c7b8121
 AUX criu-3.12-gcc-10.patch 2059 BLAKE2B 6a541cc5350297b082bfb8d0535dee7e266b1d87a19b8e06ecaebdd00fd69eab0c318d4928e42dda0a0b95791125b67fe1507e2cb16055910bc58dcc155e7087 SHA512 69153aefa50ef8dc45e0bded4b6a3e4bcabc8fef6e37fd2f77fae4b1b75b98ad236d00f297b9df5010aed34ef6e811affcf812b4fc1bb167c6ca0dd9ace5ef88
 DIST criu-3.11.tar.bz2 809858 BLAKE2B 873502887a66ab5c9017b55d55ec2b391d0576e4c97f391bcd896041ac4f12f55ba40e9a9190e2a9cc802aa3c3280d68d26e9440507a5201194cbe6b1ff3661e SHA512 d201ca54b20512a4ad890c5081bbee5d1621e65bdf0a672a7a9b74a67cfdb8d451e566c32502eb8ed53c83826f8d5976a77ec451bdf667d89f8fa77c82663d1a
 DIST criu-3.12.tar.bz2 820168 BLAKE2B ea1c6ebb9d2c9fc1d8f42647e122527b48b95a6d61e32b6c093ab7ffc4d26934111dd66cedbb1b044b9a193db18df43f0941e10f197b68279be8818fdcc716ca SHA512 bb810d42da6e6dfa47a6675f258ef528a5be02eec663dc85e73532f9a291a8594f1642b0df2fbb4683c9555cb62af23597603ae0007e1b3be79d7ad7b77a60f0
+DIST criu-3.14.tar.bz2 881407 BLAKE2B 418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b SHA512 97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb88883be398911cc2c995310b17cc6
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
 EBUILD criu-3.11.ebuild 2900 BLAKE2B b8589a947a4672aaf53f341ddf590910c5e29eba5cec10da0a4a49e8fee7f2dfbe874790e0cd6531bb6fea9c04df36c0884384491e6fcca5805dee7243351ac7 SHA512 b60f26c2fd42745681c4cebb90a7345d2dc8653ffb9a346830b220361a676200813efa3ab1fa7f86a9509badd187811b7c60450185a6531e09be69f9e26e5518
 EBUILD criu-3.12.ebuild 2908 BLAKE2B e2302e92541f7877fe7dacf4f6cfb6b900b1fc470a63c6146ac82b3510bcff8bc77459bd4ca00be0aba98d4b9543121ec3e62a88d219cec58ceecaf7be16b241 SHA512 ad077cf2ce8f40e7a35042dd4468677ec1e301c2ef472ce6158810408ba3b4c44352cd27e4f7941d86d7c5fb1b66fdc507a1ad173b5d050045be4d3a255c2bea
+EBUILD criu-3.14.ebuild 2957 BLAKE2B a913fec1a7ac4fe57e484eb37868cf67b4c99d5997e55de71d4bd906491d9fa35270f6908aeae6513f7994dffdc67a904f73e9830dfd6248a56b655f64f32696 SHA512 7055dc0d816bd299c0be849b83024916225100b57d09fe9b0014b87dbcd9de7f06cb03e81cdbb9c3cd4f9be35400baf05c63d824d77e6f07604096e605b86f69
 EBUILD criu-3.6.ebuild 2530 BLAKE2B fa1a972b8f6c15296ac8bf9519e2e4e0758fd2aad6582014b84ec72b12384385c80f0b9477301f333745ab8d1833c7521d77fa6218b1f7a3de7a4f90cdd3886b SHA512 979baf7eca6befc56c951f063ec8775d35401136f4783009829229698ae9ed8b598737f8869c016fd5a266985df4be15048ea7e8aed550160f5281348954ed73
-MISC metadata.xml 379 BLAKE2B dab824549f773238cce7faf9e016b1b49c6215902f8d59c6518067874b80a4eb922c5e57e2db1815b1d761ab299c93b269b8f6628d3fc8e83ccf85c66e26f530 SHA512 d0dfe8190ed96ba069d4e932fa599752803a9560d62425cd1275cec6c309b88ce14218d7be0ff6e841c052228a421070abc9ffd5a66cb9dd59dbb80e920b95df
+MISC metadata.xml 489 BLAKE2B b147e18ffae358f6ea0c3ca2cc8addaa039d77fc845092758a258943852daa0bc674f9f2a5a94ba7094d2e6c65a179271304e2b0b4a01f1cff6d4ac20696dce8 SHA512 aebc8636c880916beff94bb80e4a9fda5eef6ef935c9e0305bbcab038e26e69a5947640e05d74978a034ca5b36d5096e177d9485c036314eaada010f16f144d4
diff --git a/sys-process/criu/criu-3.14.ebuild b/sys-process/criu/criu-3.14.ebuild
new file mode 100644
index 000000000000..9ffb3cc47e98
--- /dev/null
+++ b/sys-process/criu/criu-3.14.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit toolchain-funcs linux-info flag-o-matic python-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="https://criu.org/"
+SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="doc python selinux setproctitle static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/protobuf-c
+	dev-libs/libnl:3
+	net-libs/libnet:1.1
+	sys-libs/libcap
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)"
+RDEPEND="${RDEPEND}
+	python? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/ipaddr[${PYTHON_USEDEP}]
+	)"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
+	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN
+	~NETFILTER_XT_MARK"
+
+# root access required for tests
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+	"${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch
+)
+
+criu_arch() {
+	# criu infers the arch from $(uname -m).  We never want this to happen.
+	case ${ARCH} in
+		amd64) echo "x86";;
+		arm64) echo "aarch64";;
+		*)     echo "${ARCH}";;
+	esac
+}
+
+src_prepare() {
+	default
+
+	if ! use selinux; then
+		sed \
+			-e 's:libselinux:no_libselinux:g' \
+			-i Makefile.config || die
+	fi
+
+	use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
+}
+
+src_configure() {
+	# Gold linker generates invalid object file when used with criu's custom
+	# linker script.  Use the bfd linker instead. See https://crbug.com/839665#c3
+	tc-ld-disable-gold
+}
+
+src_compile() {
+	local target="all $(usex doc 'docs' '')"
+	RAW_LDFLAGS="$(raw-ldflags)" emake \
+		HOSTCC="$(tc-getBUILD_CC)" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		ARCH="$(criu_arch)" \
+		V=1 WERROR=0 DEBUG=0 \
+		SETPROCTITLE=$(usex setproctitle) \
+		PYCRIU=$(usex python) \
+		${target}
+}
+
+src_test() {
+	# root privileges are required to dump all necessary info
+	if [[ ${EUID} -eq 0 ]] ; then
+		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
+	fi
+}
+
+install_crit() {
+	"${EPYTHON}" scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" || die
+	python_optimize
+}
+
+src_install() {
+	emake \
+		ARCH="$(criu_arch)" \
+		PREFIX="${EPREFIX}"/usr \
+		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		V=1 WERROR=0 DEBUG=0 \
+		install
+
+	use doc && dodoc CREDITS README.md
+
+	if use python ; then
+		python_foreach_impl install_crit
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+}
diff --git a/sys-process/criu/metadata.xml b/sys-process/criu/metadata.xml
index cba283f8ff96..fe7c191b4395 100644
--- a/sys-process/criu/metadata.xml
+++ b/sys-process/criu/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>virtualization@gentoo.org</email>
 		<name>Gentoo Virtualization Project</name>