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 <[email protected]> -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 <[email protected]> -Reviewed-by: Dmitry Safonov <[email protected]> -Signed-off-by: Andrei Vagin <[email protected]> ---- - 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 -
