1 |
commit: 140fc469f0b30f0fa7ecb8911063d1534984678f |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 9 16:36:51 2019 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 9 16:38:03 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=140fc469 |
7 |
|
8 |
sys-apps/sandbox: remove check for asm/ptrace.h |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
12 |
|
13 |
sys-apps/sandbox/files/sandbox-2.14-musl.patch | 51 ++++++++++++++++++++++++++ |
14 |
sys-apps/sandbox/sandbox-2.14.ebuild | 2 +- |
15 |
sys-apps/sandbox/sandbox-2.15.ebuild | 2 +- |
16 |
sys-apps/sandbox/sandbox-2.17.ebuild | 2 +- |
17 |
4 files changed, 54 insertions(+), 3 deletions(-) |
18 |
|
19 |
diff --git a/sys-apps/sandbox/files/sandbox-2.14-musl.patch b/sys-apps/sandbox/files/sandbox-2.14-musl.patch |
20 |
new file mode 100644 |
21 |
index 0000000..bdc852d |
22 |
--- /dev/null |
23 |
+++ b/sys-apps/sandbox/files/sandbox-2.14-musl.patch |
24 |
@@ -0,0 +1,51 @@ |
25 |
+diff -Naur sandbox-2.14.orig/headers.h sandbox-2.14/headers.h |
26 |
+--- sandbox-2.14.orig/headers.h 2018-02-19 15:48:16.000000000 +0000 |
27 |
++++ sandbox-2.14/headers.h 2019-09-09 15:38:19.826000640 +0000 |
28 |
+@@ -148,12 +148,14 @@ |
29 |
+ # define ia64_fpreg FU_ia64_fpreg |
30 |
+ # define pt_all_user_regs FU_pt_all_user_regs |
31 |
+ #endif |
32 |
++/* |
33 |
+ #ifdef HAVE_ASM_PTRACE_H |
34 |
+ # include <asm/ptrace.h> |
35 |
+ #endif |
36 |
+ #ifdef HAVE_LINUX_PTRACE_H |
37 |
+ # include <linux/ptrace.h> |
38 |
+ #endif |
39 |
++*/ |
40 |
+ #undef FU_ia64_fpreg |
41 |
+ #undef FU_pt_all_user_regs |
42 |
+ |
43 |
+diff -Naur sandbox-2.14.orig/libsandbox/trace.c sandbox-2.14/libsandbox/trace.c |
44 |
+--- sandbox-2.14.orig/libsandbox/trace.c 2018-02-19 15:48:16.000000000 +0000 |
45 |
++++ sandbox-2.14/libsandbox/trace.c 2019-09-09 15:38:07.614344692 +0000 |
46 |
+@@ -10,7 +10,7 @@ |
47 |
+ #include "sb_nr.h" |
48 |
+ |
49 |
+ static long do_peekdata(long offset); |
50 |
+-static long _do_ptrace(enum __ptrace_request request, const char *srequest, void *addr, void *data); |
51 |
++static long _do_ptrace(int request, const char *srequest, void *addr, void *data); |
52 |
+ #define do_ptrace(request, addr, data) _do_ptrace(request, #request, addr, data) |
53 |
+ #define _trace_possible(data) true |
54 |
+ |
55 |
+@@ -44,7 +44,7 @@ |
56 |
+ _exit(status); |
57 |
+ } |
58 |
+ |
59 |
+-static long _do_ptrace(enum __ptrace_request request, const char *srequest, void *addr, void *data) |
60 |
++static long _do_ptrace(int request, const char *srequest, void *addr, void *data) |
61 |
+ { |
62 |
+ long ret; |
63 |
+ try_again: |
64 |
+diff -Naur sandbox-2.14.orig/scripts/gen_symbol_header.awk sandbox-2.14/scripts/gen_symbol_header.awk |
65 |
+--- sandbox-2.14.orig/scripts/gen_symbol_header.awk 2018-02-19 15:48:16.000000000 +0000 |
66 |
++++ sandbox-2.14/scripts/gen_symbol_header.awk 2019-09-09 15:38:07.614344692 +0000 |
67 |
+@@ -161,7 +161,7 @@ |
68 |
+ else |
69 |
+ printf("symbol_version(%s, %s, %s);\n", |
70 |
+ sym_real_name, sym_index, symbol_array[2]); |
71 |
+- } else { |
72 |
++ } else if (!(sym_index ~ 64)) { |
73 |
+ # For non-versioned libc's we use strong aliases |
74 |
+ printf("strong_alias(%s, %s);\n", sym_real_name, |
75 |
+ sym_index); |
76 |
|
77 |
diff --git a/sys-apps/sandbox/sandbox-2.14.ebuild b/sys-apps/sandbox/sandbox-2.14.ebuild |
78 |
index eeb4c75..998b8d0 100644 |
79 |
--- a/sys-apps/sandbox/sandbox-2.14.ebuild |
80 |
+++ b/sys-apps/sandbox/sandbox-2.14.ebuild |
81 |
@@ -26,7 +26,7 @@ sandbox_death_notice() { |
82 |
} |
83 |
|
84 |
src_prepare() { |
85 |
- eapply "${FILESDIR}"/${PN}-2.11-musl.patch |
86 |
+ eapply "${FILESDIR}"/${PN}-2.14-musl.patch |
87 |
eapply "${FILESDIR}"/${PN}-2.10-fix-visibility-musl.patch |
88 |
eapply_user |
89 |
} |
90 |
|
91 |
diff --git a/sys-apps/sandbox/sandbox-2.15.ebuild b/sys-apps/sandbox/sandbox-2.15.ebuild |
92 |
index eeb4c75..615412f 100644 |
93 |
--- a/sys-apps/sandbox/sandbox-2.15.ebuild |
94 |
+++ b/sys-apps/sandbox/sandbox-2.15.ebuild |
95 |
@@ -26,7 +26,7 @@ sandbox_death_notice() { |
96 |
} |
97 |
|
98 |
src_prepare() { |
99 |
- eapply "${FILESDIR}"/${PN}-2.11-musl.patch |
100 |
+ eapply "${FILESDIR}"/${PN}-2.15-musl.patch |
101 |
eapply "${FILESDIR}"/${PN}-2.10-fix-visibility-musl.patch |
102 |
eapply_user |
103 |
} |
104 |
|
105 |
diff --git a/sys-apps/sandbox/sandbox-2.17.ebuild b/sys-apps/sandbox/sandbox-2.17.ebuild |
106 |
index 3225b22..6455c6a 100644 |
107 |
--- a/sys-apps/sandbox/sandbox-2.17.ebuild |
108 |
+++ b/sys-apps/sandbox/sandbox-2.17.ebuild |
109 |
@@ -26,7 +26,7 @@ sandbox_death_notice() { |
110 |
} |
111 |
|
112 |
src_prepare() { |
113 |
- eapply "${FILESDIR}"/${PN}-2.11-musl.patch |
114 |
+ eapply "${FILESDIR}"/${PN}-2.14-musl.patch |
115 |
eapply "${FILESDIR}"/${PN}-2.10-fix-visibility-musl.patch |
116 |
eapply_user |
117 |
} |