commit: bbb3a88f631af182c6410486d45b174c903980d4
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu May 22 14:15:18 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu May 22 14:15:18 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=bbb3a88f
sys-apps/sandbox: remove linux/ptrace.h because of redefinition
Package-Manager: portage-2.2.8-r1
RepoMan-Options: --force
Manifest-Sign-Key: 0xF52D4BBA
---
sys-apps/sandbox/files/sandbox-2.6-musl.patch | 27 +++++++++++++++++-----
...dbox-2.6-r99.ebuild => sandbox-2.6-r999.ebuild} | 0
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/sys-apps/sandbox/files/sandbox-2.6-musl.patch
b/sys-apps/sandbox/files/sandbox-2.6-musl.patch
index e7acc52..ee288d7 100644
--- a/sys-apps/sandbox/files/sandbox-2.6-musl.patch
+++ b/sys-apps/sandbox/files/sandbox-2.6-musl.patch
@@ -1,6 +1,21 @@
-diff -ur a/sandbox-2.6/libsandbox/trace.c b/sandbox-2.6/libsandbox/trace.c
---- a/sandbox-2.6/libsandbox/trace.c
-+++ b/sandbox-2.6/libsandbox/trace.c
+diff -Naur sandbox-2.6.orig/headers.h sandbox-2.6/headers.h
+--- sandbox-2.6.orig/headers.h 2012-07-03 18:27:44.000000000 +0000
++++ sandbox-2.6/headers.h 2014-05-22 13:57:55.225002786 +0000
+@@ -133,9 +133,11 @@
+ #ifdef HAVE_ASM_PTRACE_H
+ # include <asm/ptrace.h>
+ #endif
++/*
+ #ifdef HAVE_LINUX_PTRACE_H
+ # include <linux/ptrace.h>
+ #endif
++*/
+ #undef FU_ia64_fpreg
+ #undef FU_pt_all_user_regs
+
+diff -Naur sandbox-2.6.orig/libsandbox/trace.c sandbox-2.6/libsandbox/trace.c
+--- sandbox-2.6.orig/libsandbox/trace.c 2014-05-22 13:58:25.215002800
+0000
++++ sandbox-2.6/libsandbox/trace.c 2014-05-22 13:57:26.515002772 +0000
@@ -9,7 +9,7 @@
#include "wrappers.h"
#include "sb_nr.h"
@@ -19,9 +34,9 @@ diff -ur a/sandbox-2.6/libsandbox/trace.c
b/sandbox-2.6/libsandbox/trace.c
{
long ret;
try_again:
-diff -ur a/sandbox-2.6/scripts/gen_symbol_header.awk
b/sandbox-2.6/scripts/gen_symbol_header.awk
---- a/sandbox-2.6/scripts/gen_symbol_header.awk
-+++ b/sandbox-2.6/scripts/gen_symbol_header.awk
+diff -Naur sandbox-2.6.orig/scripts/gen_symbol_header.awk
sandbox-2.6/scripts/gen_symbol_header.awk
+--- sandbox-2.6.orig/scripts/gen_symbol_header.awk 2014-05-22
13:58:25.235002800 +0000
++++ sandbox-2.6/scripts/gen_symbol_header.awk 2014-05-22 13:57:26.520002772
+0000
@@ -161,7 +161,7 @@
else
printf("symbol_version(%s, %s, %s);\n",
diff --git a/sys-apps/sandbox/sandbox-2.6-r99.ebuild
b/sys-apps/sandbox/sandbox-2.6-r999.ebuild
similarity index 100%
rename from sys-apps/sandbox/sandbox-2.6-r99.ebuild
rename to sys-apps/sandbox/sandbox-2.6-r999.ebuild
