gentoo resync : 15.12.2017

2 files changed, 0 insertions, 99 deletions

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 8e0849193bee..32ca9ea96b9d 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -10,7 +10,6 @@ AUX 2.5/criu-2.5-automagic-libbsd.patch 516 BLAKE2B d7d1f929dade8247b1d4999aab07
 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
-AUX criu-2.8-sysmacros.patch 2546 BLAKE2B fca44e53295a2cb69570299c2057888f22cc15c729c87fa2e97416943677a1267f1e395f9982cff6017518139527aa97405669e725d3d88bc37567c62981312f SHA512 7cfa5c74ff9ac0347477738084ecd622730007fe49132a9f05f019463d0f51b0208ef9b40daf5eb0741d177e0839b65c9f3eee4bab652feafa190b20ec8141b2
 DIST criu-2.10.tar.bz2 640205 BLAKE2B ba9d061096faf28b2986f3426af7dff272281149c983a881728b7bb09ee4e3e958414b634fb696976826ad67142139ef1abf8152504fc62e3ecaf434c2afd7d8 SHA512 6e59ff8a97297583b9f7d31492f0ac59e217fe6372253584db7f9409a4d890104feb9caac663b17d036c39eb79621be6000a7d5e814b65ce5d151e0a053d324b
 DIST criu-2.11.1.tar.bz2 644358 BLAKE2B aee7945055504706da520c9306cd0e0dec95f9beb704548b8ac1ab6ef38f363ece6da5f0bbcb98e4ac0f63e9000666774f7947eb4bfd863280cbd22b654f3dab SHA512 2f4a8d19bda1a73ac2f769c327af5aba5903d28547d46361e5124c9a81c76d0cd73c03180aefabdcb9511f0523f982ec99e2657b6ff46b92ac655ede9fdffd97
 DIST criu-2.11.tar.bz2 645048 BLAKE2B 81f145973fec2696b3359bebeb4ba1f5d56a6e14249cc840da04d89ae1cdb06db3ab314295e68d4d4ca8d53bf90f980aefd440f3518b9438ad491a6f7d64a366 SHA512 fba02203c95841909e3d7178b09dd6075fff1e9913ad12ac2aca43aef6e6565fc4f822a5a0dcb3cb146d15c57f0a9c17d6e645375aa3922f93108dfb2477f867
diff --git a/sys-process/criu/files/criu-2.8-sysmacros.patch b/sys-process/criu/files/criu-2.8-sysmacros.patch
deleted file mode 100644
index 68bba802f4e0..000000000000
--- a/sys-process/criu/files/criu-2.8-sysmacros.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-https://bugs.gentoo.org/580454
-https://github.com/xemul/criu/pull/257
-
-From 6913c0004eaa4fd11bf3efc8c37fb05108cf18ee Mon Sep 17 00:00:00 2001
-From: Yixun Lan <dlan@gentoo.org>
-Date: Wed, 7 Dec 2016 00:24:42 -0500
-Subject: [PATCH] include sys/sysmacros.h for minor/major/makedev funcs
-
-Since glibc is moving away from implicitly including sys/sysmacros.h
-all the time via sys/types.h, include the header directly in more
-places.  This seems to cover most makedev/major/minor usage.
-
-Signed-off-by: Yixun Lan <dlan@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- criu/file-lock.c           | 1 +
- criu/include/util.h        | 1 +
- criu/kerndat.c             | 1 +
- criu/proc_parse.c          | 1 +
- test/zdtm/lib/fs.h         | 1 +
- test/zdtm/static/console.c | 1 +
- 6 files changed, 6 insertions(+)
-
-diff --git a/criu/file-lock.c b/criu/file-lock.c
-index 1ab1e5886965..11d8a194937a 100644
---- a/criu/file-lock.c
-+++ b/criu/file-lock.c
-@@ -5,6 +5,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- 
- #include "cr_options.h"
- #include "imgset.h"
-diff --git a/criu/include/util.h b/criu/include/util.h
-index 8eaee33391c5..1aa40e863acb 100644
---- a/criu/include/util.h
-+++ b/criu/include/util.h
-@@ -10,6 +10,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/statfs.h>
-+#include <sys/sysmacros.h>
- #include <dirent.h>
- 
- #include "int.h"
-diff --git a/criu/kerndat.c b/criu/kerndat.c
-index f9675bd7ec1d..aeef1b7f6640 100644
---- a/criu/kerndat.c
-+++ b/criu/kerndat.c
-@@ -7,6 +7,7 @@
- #include <sys/mman.h>
- #include <errno.h>
- #include <sys/syscall.h>
-+#include <sys/sysmacros.h>
- 
- #include "int.h"
- #include "log.h"
-diff --git a/criu/proc_parse.c b/criu/proc_parse.c
-index 3f84cdaad99a..a86d31769ded 100644
---- a/criu/proc_parse.c
-+++ b/criu/proc_parse.c
-@@ -9,6 +9,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <linux/fs.h>
-+#include <sys/sysmacros.h>
- 
- #include "types.h"
- #include "common/list.h"
-diff --git a/test/zdtm/lib/fs.h b/test/zdtm/lib/fs.h
-index 972c49b4a068..972b15abad0c 100644
---- a/test/zdtm/lib/fs.h
-+++ b/test/zdtm/lib/fs.h
-@@ -6,6 +6,7 @@
- #endif
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- 
- #include <limits.h>
- 
-diff --git a/test/zdtm/static/console.c b/test/zdtm/static/console.c
-index a86b14639729..41246aea0298 100644
---- a/test/zdtm/static/console.c
-+++ b/test/zdtm/static/console.c
-@@ -8,6 +8,7 @@
- 
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- 
- #include "zdtmtst.h"
- 
--- 
-2.11.0.rc2
-