[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/

[Matthias Maier]

commit:     08d720a1c7dfa5d87c02d6321245a3d3e502fbe2
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Nov 19 12:53:11 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 17:05:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08d720a1

sys-process/criu: remove unused patch

Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/6235

 sys-process/criu/files/criu-2.8-sysmacros.patch | 98 -------------------------
 1 file changed, 98 deletions(-)

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 68bba802f4e..00000000000
--- 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
-

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/

[Patrice Clement]

commit:     e8b4d478a8d7acbf48101683a785a3ec0836b3a7
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Feb 14 07:12:17 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 14:27:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b4d478

sys-process/criu: remove unused patch.

Closes: https://github.com/gentoo/gentoo/pull/7178

 .../criu/files/criu-2.12.1-glibc-2.26.patch        | 49 ----------------------
 1 file changed, 49 deletions(-)

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 d378cc88cff..00000000000
--- 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
-