gentoo resync : 15.02.2018

4 files changed, 21 insertions, 156 deletions

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 4f689183b254..ad6532279d1e 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -8,14 +8,11 @@ AUX 2.3/criu-2.3-no-git.patch 651 BLAKE2B 76d7bd15f67789a72cd0d58c854da5601cfdc4
 AUX 2.4/criu-2.4-makefile.patch 2497 BLAKE2B c9ea525b59aba01f6418ede5cd68fe02878da1962b9748689c1637e8a1733b9027507d0e382ec226ddf47e2d392d3a467855732137ff7ed3763513b4421e98a1 SHA512 3bb9963907b92d791e54ad57fde2474b77ac4bcd26e7eff67ff098feacd6c0255c560a3d364031e0a4051b9a8c943b9401afb271cfee1d91e58e116a02f3d979
 AUX 2.5/criu-2.5-automagic-libbsd.patch 516 BLAKE2B d7d1f929dade8247b1d4999aab073cc27cb2f0e3823c589e2313df5d1bd55162e3c3a7cc6eadfe0929fe8e51a774017acbb4b1f1582c7f72221d1c3f354aaa60 SHA512 01f1a6ac36c8c40b2f0d4cecafb2783d7bf7be51af042710615aa79318ef7914cef063b437428c4c2c8b2dd02434abbec7affd3983b4da74aabe429b1ce947b6
 AUX 2.9/criu-2.9-makefile.patch 2504 BLAKE2B 854a693730bf674ea9b18298d527f61e17e2e357db81662c863b4a51b4dd73bbe4acb99d3546c96b55ed81c201c6d53203e3a7c80be8752cdf8c46221a24b628 SHA512 8d0919c1fb7f2672e44f8366eb3df70dae9d687224170b43688365af9be4a974d169c78f84dc2525d32b24188749c992b8b716df840af0ebdace2eaa61eb2366
-AUX criu-2.12.1-glibc-2.26.patch 1838 BLAKE2B b44c1347a6dc984ca417e348cf61e0abbd0eb18bc9de32dffbbc032aa54864a3c2168440dd47dbd47eda59b10c1071f1e6979e7df462966a66f81578235388e1 SHA512 bd16e6aa787d50e9e9d73c102d2bedeb5550cf6cbbe8bb75a0202660b80407c96b8f59b844902f405c59dcc3ff7baa0531218f654fe6790e64889f4221e3d8b4
 AUX criu-2.8-automagic-libbsd.patch 511 BLAKE2B afcda80c50a2ea0a74f3578c56b2dcfe1bbb3ff17dc88bb0ea7da16fa8db21e1adb5e2f85479459d079991f7d9f2b443881d9a8d07cae1b1b541ac5a691f37ac SHA512 d43280f988965dc6c7932767a896fa252234aefee99b85651d2d3ea0ffac7dd3fce60c067d9eb7c847ad941cb20eca68a118f77246d56831d083ba01aa8f037a
-DIST criu-2.12.1.tar.bz2 646855 BLAKE2B b3bb7fd7b9006dd60346639c0d86954fa083de3af8950810a642447dd2f0043fdd8c6df96cd2f5e55788c002dd2c0530f7379fb17a5e798dbdacc14227cd5ae7 SHA512 7a168bc20665ed3ca9931e6f2fa6d58b87faee38eee30dcdda8dad041ffd90ea7e1bad17d4dcf5c5d8de563eacc64ecbd579b7f4b959a654182a688e94024ba2
 DIST criu-2.5.tar.bz2 605226 BLAKE2B c4086b9822b119a648bda4f6cc831eba5b7e3fba5af41f8f0b1c00dac7d4aff88a71e81569c4559fd98113e76eba0653c67684f443c1c803c453209367a4c875 SHA512 ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
-DIST criu-3.4.tar.bz2 701680 BLAKE2B 16cd6bde7f356322b979c14823d6f22ffc64a3104ca185c7407a97d7af9dc7a83bb538c86e7a93bb7d99c6a01eba309435d4e1e80033a90bf386d235871fca34 SHA512 71fc700d19b46381873b2d0fa90e7fa253b00beb5e4e6065bbf510766acbcc14b35d58fa8073801112f897d2320b7decca1115fb6853d5fe64f3c52aa40a9f32
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
-EBUILD criu-2.12.1-r1.ebuild 2419 BLAKE2B 962796151a06a2a4e8bd18c3986dc56f126457b97cd915960e5924f7338c580ed9aad0a078e1381ab0c327632eefde2d540e45691314cb1af49c88583a1e4c66 SHA512 653b81f9f0b668414ab5bbb89af492d0fa5bace24d99ff0d1f82e6aff1badef02fbfcb6506328bb7c462aaecb5dd4b3e839b707b4c4e21083e23b0f81e5bdf23
+DIST criu-3.7.tar.bz2 749499 BLAKE2B 41222983183910b8a039a69e1a425993703e4f461c1cc0e64e92f877aff571d56c7f32cdae7848ef1633a15cac9e7b746f8c84a71f3607f7fc22959964820258 SHA512 8feb9e2579c04b67a7fe9631bb662504a7eb78550c3951cbe29252d87d9258fd6994533f6e60b0017b6a6e21bbdd5e7cd7e8a255be53b77b57efacec4e50140f
 EBUILD criu-2.5-r1.ebuild 2400 BLAKE2B d69f86d8cbe441515adaa45f60f394193c4cf0d66a138762b9cf2a9e3687c2b283e293f3ddfec06606421c8c57dd4d07abf0ed9372b9a3739a25e137432551e8 SHA512 2f6511dad5b89065430ed58786c4b12f539cdf0222c655eff5c9635ab83e4fc7bee4dc2f28dd8be5423078c6fb6f00beffb20a388962aaa99f16c06475cb8610
-EBUILD criu-3.4-r1.ebuild 2331 BLAKE2B 3555508c91ed9ff280d30cafdc1de4fbe91032e796cfc9cc065eb09a19545adc67fcd55be08288809f37b9d1c4ec94b4d4d125e90a8bf50c72c2ff0b41c26636 SHA512 72be29b80857de3110970182e2684452afb0a7fb8e6f14d952d2da1b64509945ae5ba0c853fdcafdd743fca3c7a5d28a98a5da09b802f82dccdcb0c9740f1a3a
 EBUILD criu-3.6.ebuild 2595 BLAKE2B a834b690e575a9b1cd6dc1d3d8109037cd9ef8942c6f3d4096c479201a0b9c2fe3d5e3714b2d8a4a448e377938d19dd5c3f4dd2dd3e75b810d68752a94ffc208 SHA512 464aabd062cca613fc10f6976c7a798404f3d6d79d9f9aa7d9c3d849ffa128c66404a14cb75cb8bfa5eb17595b04e62f1a6954cc35db8a4df9cc8de7e0663183
+EBUILD criu-3.7.ebuild 2595 BLAKE2B 2d4ea71cb432008f122fc9e46c60a533e9f5fdaa4dc224834024967741a28fe348b5b19b30e8b3da411cf86a9cb9926522d5ed80c1eaa50bcac5a1ddea903901 SHA512 1fcffccf0221bade98f452dcad0c9f611336d7d365d12be07d150943d74f1154497eaee8812a30cbbfbb984be43b8acc5e95ef4d06361e3b13b4fe26b9cba901
 MISC metadata.xml 480 BLAKE2B 55ce3f89b53789b3ed3e9a19fd4dbf3184941572269b3ef489c3cbbef8bac8a3aac58ea84887ac0c99919797e74c289ffaa617fc8370f936c9c34c27b976ace1 SHA512 0a108eed5d8cdb1818b9c497377b3a83b282354c9402f1ee6473df4eca6ab75f508b3faba55a88007ca225238ac0c00fa1c0d845fdd4c98556f1c03b6f33a764
diff --git a/sys-process/criu/criu-3.4-r1.ebuild b/sys-process/criu/criu-3.4-r1.ebuild
deleted file mode 100644
index 37f7bdf70e91..000000000000
--- a/sys-process/criu/criu-3.4-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="http://criu.org/"
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="python setproctitle"
-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} )
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto"
-RDEPEND="${RDEPEND}
-	python? (
-		|| (
-			dev-python/protobuf-python[${PYTHON_USEDEP}]
-			dev-libs/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"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
-	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.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_compile() {
-	RAW_LDFLAGS="$(raw-ldflags)" emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		ARCH="$(criu_arch)" \
-		V=1 WERROR=0 DEBUG=0 \
-		SETPROCTITLE=$(usex setproctitle) \
-		PYCRIU=$(usex python) \
-		all docs
-}
-
-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() {
-	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
-}
-
-src_install() {
-	emake \
-		ARCH="$(criu_arch)" \
-		PREFIX="${EPREFIX}"/usr \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc CREDITS README.md
-
-	if use python ; then
-		cd lib
-		python_foreach_impl install_crit
-	fi
-}
diff --git a/sys-process/criu/criu-2.12.1-r1.ebuild b/sys-process/criu/criu-3.7.ebuild
index bf72562e14c7..34cf3149abcb 100644
--- a/sys-process/criu/criu-2.12.1-r1.ebuild
+++ b/sys-process/criu/criu-3.7.ebuild
@@ -14,14 +14,17 @@ SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="python setproctitle"
+IUSE="python selinux setproctitle static-libs"
+
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/protobuf-c
+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}
 	app-text/asciidoc
@@ -45,8 +48,6 @@ PATCHES=(
 	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
 	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
 	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-aarch64.patch
-	"${FILESDIR}"/${PN}-2.12.1-glibc-2.26.patch
 )
 
 criu_arch() {
@@ -58,6 +59,16 @@ criu_arch() {
 	esac
 }
 
+src_prepare() {
+	default
+
+	if ! use selinux; then
+		sed \
+			-e 's:libselinux:no_libselinux:g' \
+			-i Makefile.config || die
+	fi
+}
+
 src_compile() {
 	RAW_LDFLAGS="$(raw-ldflags)" emake \
 		CC="$(tc-getCC)" \
@@ -97,4 +108,8 @@ src_install() {
 		cd lib
 		python_foreach_impl install_crit
 	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -delete || die
+	fi
 }
diff --git a/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch b/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch
deleted file mode 100644
index d378cc88cff9..000000000000
--- a/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d77d8cc402e597bb38edfb4e81db89fd7d96d0b6 Mon Sep 17 00:00:00 2001
-From: Adrian Reber <areber@redhat.com>
-Date: Thu, 29 Jun 2017 14:19:32 +0000
-Subject: [PATCH] fix building with newer glibc
-
-Newer glibc releases have removed SIGUNUSED from bits/signum.h which
-breaks building criu on those systems:
-
-https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8082d91e1c449e0cb137468b731004a5e605c8c6
-
-SIGSYS returns the same value as SIGUNUSED and testing has shown
-that criu still successfully completes zdtm with this patch.
-
-Signed-off-by: Adrian Reber <areber@redhat.com>
-Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>
-Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
----
- criu/cr-restore.c            | 1 -
- test/zdtm/static/pthread01.c | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/criu/cr-restore.c b/criu/cr-restore.c
-index e8fb4adf..6ba50f18 100644
---- a/criu/cr-restore.c
-+++ b/criu/cr-restore.c
-@@ -880,7 +880,6 @@ static void zombie_prepare_signals(void)
- 		(1 << SIGPOLL)	|\
- 		(1 << SIGIO)	|\
- 		(1 << SIGSYS)	|\
--		(1 << SIGUNUSED)|\
- 		(1 << SIGSTKFLT)|\
- 		(1 << SIGPWR)	 \
- 	)
-diff --git a/test/zdtm/static/pthread01.c b/test/zdtm/static/pthread01.c
-index 52f849c0..2520fcfe 100644
---- a/test/zdtm/static/pthread01.c
-+++ b/test/zdtm/static/pthread01.c
-@@ -43,7 +43,7 @@ static char *decode_signal(const sigset_t *s, char *buf)
- 	COLLECT(SIGTERM); COLLECT(SIGSTKFLT); COLLECT(SIGCHLD); COLLECT(SIGCONT); COLLECT(SIGSTOP);
- 	COLLECT(SIGTSTP); COLLECT(SIGTTIN); COLLECT(SIGTTOU); COLLECT(SIGURG); COLLECT(SIGXCPU);
- 	COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO);
--	COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED);
-+	COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS);
- #undef COLLECT
- 
- 	return buf;
--- 
-2.14.1
-