| 1 |
commit: bbb3a88f631af182c6410486d45b174c903980d4 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 22 14:15:18 2014 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 22 14:15:18 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=bbb3a88f |
| 7 |
|
| 8 |
sys-apps/sandbox: remove linux/ptrace.h because of redefinition |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.8-r1 |
| 11 |
RepoMan-Options: --force |
| 12 |
Manifest-Sign-Key: 0xF52D4BBA |
| 13 |
|
| 14 |
--- |
| 15 |
sys-apps/sandbox/files/sandbox-2.6-musl.patch | 27 +++++++++++++++++----- |
| 16 |
...dbox-2.6-r99.ebuild => sandbox-2.6-r999.ebuild} | 0 |
| 17 |
2 files changed, 21 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/sandbox/files/sandbox-2.6-musl.patch b/sys-apps/sandbox/files/sandbox-2.6-musl.patch |
| 20 |
index e7acc52..ee288d7 100644 |
| 21 |
--- a/sys-apps/sandbox/files/sandbox-2.6-musl.patch |
| 22 |
+++ b/sys-apps/sandbox/files/sandbox-2.6-musl.patch |
| 23 |
@@ -1,6 +1,21 @@ |
| 24 |
-diff -ur a/sandbox-2.6/libsandbox/trace.c b/sandbox-2.6/libsandbox/trace.c |
| 25 |
---- a/sandbox-2.6/libsandbox/trace.c |
| 26 |
-+++ b/sandbox-2.6/libsandbox/trace.c |
| 27 |
+diff -Naur sandbox-2.6.orig/headers.h sandbox-2.6/headers.h |
| 28 |
+--- sandbox-2.6.orig/headers.h 2012-07-03 18:27:44.000000000 +0000 |
| 29 |
++++ sandbox-2.6/headers.h 2014-05-22 13:57:55.225002786 +0000 |
| 30 |
+@@ -133,9 +133,11 @@ |
| 31 |
+ #ifdef HAVE_ASM_PTRACE_H |
| 32 |
+ # include <asm/ptrace.h> |
| 33 |
+ #endif |
| 34 |
++/* |
| 35 |
+ #ifdef HAVE_LINUX_PTRACE_H |
| 36 |
+ # include <linux/ptrace.h> |
| 37 |
+ #endif |
| 38 |
++*/ |
| 39 |
+ #undef FU_ia64_fpreg |
| 40 |
+ #undef FU_pt_all_user_regs |
| 41 |
+ |
| 42 |
+diff -Naur sandbox-2.6.orig/libsandbox/trace.c sandbox-2.6/libsandbox/trace.c |
| 43 |
+--- sandbox-2.6.orig/libsandbox/trace.c 2014-05-22 13:58:25.215002800 +0000 |
| 44 |
++++ sandbox-2.6/libsandbox/trace.c 2014-05-22 13:57:26.515002772 +0000 |
| 45 |
@@ -9,7 +9,7 @@ |
| 46 |
#include "wrappers.h" |
| 47 |
#include "sb_nr.h" |
| 48 |
@@ -19,9 +34,9 @@ diff -ur a/sandbox-2.6/libsandbox/trace.c b/sandbox-2.6/libsandbox/trace.c |
| 49 |
{ |
| 50 |
long ret; |
| 51 |
try_again: |
| 52 |
-diff -ur a/sandbox-2.6/scripts/gen_symbol_header.awk b/sandbox-2.6/scripts/gen_symbol_header.awk |
| 53 |
---- a/sandbox-2.6/scripts/gen_symbol_header.awk |
| 54 |
-+++ b/sandbox-2.6/scripts/gen_symbol_header.awk |
| 55 |
+diff -Naur sandbox-2.6.orig/scripts/gen_symbol_header.awk sandbox-2.6/scripts/gen_symbol_header.awk |
| 56 |
+--- sandbox-2.6.orig/scripts/gen_symbol_header.awk 2014-05-22 13:58:25.235002800 +0000 |
| 57 |
++++ sandbox-2.6/scripts/gen_symbol_header.awk 2014-05-22 13:57:26.520002772 +0000 |
| 58 |
@@ -161,7 +161,7 @@ |
| 59 |
else |
| 60 |
printf("symbol_version(%s, %s, %s);\n", |
| 61 |
|
| 62 |
diff --git a/sys-apps/sandbox/sandbox-2.6-r99.ebuild b/sys-apps/sandbox/sandbox-2.6-r999.ebuild |
| 63 |
similarity index 100% |
| 64 |
rename from sys-apps/sandbox/sandbox-2.6-r99.ebuild |
| 65 |
rename to sys-apps/sandbox/sandbox-2.6-r999.ebuild |
Archives