1 |
commit: e8b4d478a8d7acbf48101683a785a3ec0836b3a7 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Feb 14 07:12:17 2018 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 15 14:27:15 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b4d478 |
7 |
|
8 |
sys-process/criu: remove unused patch. |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/7178 |
11 |
|
12 |
.../criu/files/criu-2.12.1-glibc-2.26.patch | 49 ---------------------- |
13 |
1 file changed, 49 deletions(-) |
14 |
|
15 |
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 |
16 |
deleted file mode 100644 |
17 |
index d378cc88cff..00000000000 |
18 |
--- a/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch |
19 |
+++ /dev/null |
20 |
@@ -1,49 +0,0 @@ |
21 |
-From d77d8cc402e597bb38edfb4e81db89fd7d96d0b6 Mon Sep 17 00:00:00 2001 |
22 |
-From: Adrian Reber <areber@××××××.com> |
23 |
-Date: Thu, 29 Jun 2017 14:19:32 +0000 |
24 |
-Subject: [PATCH] fix building with newer glibc |
25 |
- |
26 |
-Newer glibc releases have removed SIGUNUSED from bits/signum.h which |
27 |
-breaks building criu on those systems: |
28 |
- |
29 |
-https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8082d91e1c449e0cb137468b731004a5e605c8c6 |
30 |
- |
31 |
-SIGSYS returns the same value as SIGUNUSED and testing has shown |
32 |
-that criu still successfully completes zdtm with this patch. |
33 |
- |
34 |
-Signed-off-by: Adrian Reber <areber@××××××.com> |
35 |
-Reviewed-by: Dmitry Safonov <dsafonov@×××××××××.com> |
36 |
-Signed-off-by: Andrei Vagin <avagin@×××××××××.com> |
37 |
---- |
38 |
- criu/cr-restore.c | 1 - |
39 |
- test/zdtm/static/pthread01.c | 2 +- |
40 |
- 2 files changed, 1 insertion(+), 2 deletions(-) |
41 |
- |
42 |
-diff --git a/criu/cr-restore.c b/criu/cr-restore.c |
43 |
-index e8fb4adf..6ba50f18 100644 |
44 |
---- a/criu/cr-restore.c |
45 |
-+++ b/criu/cr-restore.c |
46 |
-@@ -880,7 +880,6 @@ static void zombie_prepare_signals(void) |
47 |
- (1 << SIGPOLL) |\ |
48 |
- (1 << SIGIO) |\ |
49 |
- (1 << SIGSYS) |\ |
50 |
-- (1 << SIGUNUSED)|\ |
51 |
- (1 << SIGSTKFLT)|\ |
52 |
- (1 << SIGPWR) \ |
53 |
- ) |
54 |
-diff --git a/test/zdtm/static/pthread01.c b/test/zdtm/static/pthread01.c |
55 |
-index 52f849c0..2520fcfe 100644 |
56 |
---- a/test/zdtm/static/pthread01.c |
57 |
-+++ b/test/zdtm/static/pthread01.c |
58 |
-@@ -43,7 +43,7 @@ static char *decode_signal(const sigset_t *s, char *buf) |
59 |
- COLLECT(SIGTERM); COLLECT(SIGSTKFLT); COLLECT(SIGCHLD); COLLECT(SIGCONT); COLLECT(SIGSTOP); |
60 |
- COLLECT(SIGTSTP); COLLECT(SIGTTIN); COLLECT(SIGTTOU); COLLECT(SIGURG); COLLECT(SIGXCPU); |
61 |
- COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO); |
62 |
-- COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED); |
63 |
-+ COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); |
64 |
- #undef COLLECT |
65 |
- |
66 |
- return buf; |
67 |
--- |
68 |
-2.14.1 |
69 |
- |