commit: 140fc469f0b30f0fa7ecb8911063d1534984678f
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 9 16:36:51 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 9 16:38:03 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=140fc469
sys-apps/sandbox: remove check for asm/ptrace.h
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-apps/sandbox/files/sandbox-2.14-musl.patch | 51 ++++++++++++++++++++++++++
sys-apps/sandbox/sandbox-2.14.ebuild | 2 +-
sys-apps/sandbox/sandbox-2.15.ebuild | 2 +-
sys-apps/sandbox/sandbox-2.17.ebuild | 2 +-
4 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/sys-apps/sandbox/files/sandbox-2.14-musl.patch
b/sys-apps/sandbox/files/sandbox-2.14-musl.patch
new file mode 100644
index 0000000..bdc852d
--- /dev/null
+++ b/sys-apps/sandbox/files/sandbox-2.14-musl.patch
@@ -0,0 +1,51 @@
+diff -Naur sandbox-2.14.orig/headers.h sandbox-2.14/headers.h
+--- sandbox-2.14.orig/headers.h 2018-02-19 15:48:16.000000000 +0000
++++ sandbox-2.14/headers.h 2019-09-09 15:38:19.826000640 +0000
+@@ -148,12 +148,14 @@
+ # define ia64_fpreg FU_ia64_fpreg
+ # define pt_all_user_regs FU_pt_all_user_regs
+ #endif
++/*
+ #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.14.orig/libsandbox/trace.c sandbox-2.14/libsandbox/trace.c
+--- sandbox-2.14.orig/libsandbox/trace.c 2018-02-19 15:48:16.000000000
+0000
++++ sandbox-2.14/libsandbox/trace.c 2019-09-09 15:38:07.614344692 +0000
+@@ -10,7 +10,7 @@
+ #include "sb_nr.h"
+
+ static long do_peekdata(long offset);
+-static long _do_ptrace(enum __ptrace_request request, const char *srequest,
void *addr, void *data);
++static long _do_ptrace(int request, const char *srequest, void *addr, void
*data);
+ #define do_ptrace(request, addr, data) _do_ptrace(request, #request, addr,
data)
+ #define _trace_possible(data) true
+
+@@ -44,7 +44,7 @@
+ _exit(status);
+ }
+
+-static long _do_ptrace(enum __ptrace_request request, const char *srequest,
void *addr, void *data)
++static long _do_ptrace(int request, const char *srequest, void *addr, void
*data)
+ {
+ long ret;
+ try_again:
+diff -Naur sandbox-2.14.orig/scripts/gen_symbol_header.awk
sandbox-2.14/scripts/gen_symbol_header.awk
+--- sandbox-2.14.orig/scripts/gen_symbol_header.awk 2018-02-19
15:48:16.000000000 +0000
++++ sandbox-2.14/scripts/gen_symbol_header.awk 2019-09-09 15:38:07.614344692
+0000
+@@ -161,7 +161,7 @@
+ else
+ printf("symbol_version(%s, %s, %s);\n",
+ sym_real_name, sym_index,
symbol_array[2]);
+- } else {
++ } else if (!(sym_index ~ 64)) {
+ # For non-versioned libc's we use strong aliases
+ printf("strong_alias(%s, %s);\n", sym_real_name,
+ sym_index);
diff --git a/sys-apps/sandbox/sandbox-2.14.ebuild
b/sys-apps/sandbox/sandbox-2.14.ebuild
index eeb4c75..998b8d0 100644
--- a/sys-apps/sandbox/sandbox-2.14.ebuild
+++ b/sys-apps/sandbox/sandbox-2.14.ebuild
@@ -26,7 +26,7 @@ sandbox_death_notice() {
}
src_prepare() {
- eapply "${FILESDIR}"/${PN}-2.11-musl.patch
+ eapply "${FILESDIR}"/${PN}-2.14-musl.patch
eapply "${FILESDIR}"/${PN}-2.10-fix-visibility-musl.patch
eapply_user
}
diff --git a/sys-apps/sandbox/sandbox-2.15.ebuild
b/sys-apps/sandbox/sandbox-2.15.ebuild
index eeb4c75..615412f 100644
--- a/sys-apps/sandbox/sandbox-2.15.ebuild
+++ b/sys-apps/sandbox/sandbox-2.15.ebuild
@@ -26,7 +26,7 @@ sandbox_death_notice() {
}
src_prepare() {
- eapply "${FILESDIR}"/${PN}-2.11-musl.patch
+ eapply "${FILESDIR}"/${PN}-2.15-musl.patch
eapply "${FILESDIR}"/${PN}-2.10-fix-visibility-musl.patch
eapply_user
}
diff --git a/sys-apps/sandbox/sandbox-2.17.ebuild
b/sys-apps/sandbox/sandbox-2.17.ebuild
index 3225b22..6455c6a 100644
--- a/sys-apps/sandbox/sandbox-2.17.ebuild
+++ b/sys-apps/sandbox/sandbox-2.17.ebuild
@@ -26,7 +26,7 @@ sandbox_death_notice() {
}
src_prepare() {
- eapply "${FILESDIR}"/${PN}-2.11-musl.patch
+ eapply "${FILESDIR}"/${PN}-2.14-musl.patch
eapply "${FILESDIR}"/${PN}-2.10-fix-visibility-musl.patch
eapply_user
}
