From 1f601dfd6f315d69e13a934aca81c135c36dd0e4 Mon Sep 17 00:00:00 2001 From: Johannes Date: Tue, 16 Oct 2018 15:01:22 +0200 Subject: [PATCH] radare2: update to 3.0.0. --- srcpkgs/radare2/patches/ptrace.patch | 66 ++++++++++++++++++++++++++++ srcpkgs/radare2/template | 4 +- 2 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/radare2/patches/ptrace.patch diff --git a/srcpkgs/radare2/patches/ptrace.patch b/srcpkgs/radare2/patches/ptrace.patch new file mode 100644 index 00000000000..1e583be5062 --- /dev/null +++ b/srcpkgs/radare2/patches/ptrace.patch @@ -0,0 +1,66 @@ +--- libr/include/r_io.h.orig 2018-10-16 12:16:27.291564958 +0200 ++++ libr/include/r_io.h 2018-10-16 12:34:33.867642425 +0200 +@@ -26,7 +26,7 @@ + #include + #endif + +-#if defined(__APPLE__) || __sun || __FreeBSD__ || __OpenBSD__ ++#ifndef __GLIBC__ + typedef int r_ptrace_request_t; + typedef int r_ptrace_data_t; + #else + + +--- shlr/ptrace-wrap/include/ptrace_wrap.h.orig 2018-10-18 12:55:38.018615324 +0200 ++++ shlr/ptrace-wrap/include/ptrace_wrap.h 2018-10-18 12:57:01.590996880 +0200 +@@ -22,6 +22,12 @@ + #include + #include + ++#ifdef __GLIBC__ ++typedef enum __ptrace_request __ptrace_request; ++#else ++typedef int __ptrace_request; ++#endif ++ + typedef enum { + PTRACE_WRAP_REQUEST_TYPE_STOP, + PTRACE_WRAP_REQUEST_TYPE_PTRACE, +@@ -32,7 +38,7 @@ + ptrace_wrap_request_type type; + union { + struct { +- enum __ptrace_request request; ++ __ptrace_request request; + pid_t pid; + void *addr; + void *data; +@@ -59,7 +65,7 @@ + + int ptrace_wrap_instance_start(ptrace_wrap_instance *inst); + void ptrace_wrap_instance_stop(ptrace_wrap_instance *inst); +-long ptrace_wrap(ptrace_wrap_instance *inst, enum __ptrace_request request, pid_t pid, void *addr, void *data); ++long ptrace_wrap(ptrace_wrap_instance *inst, __ptrace_request request, pid_t pid, void *addr, void *data); + pid_t ptrace_wrap_fork(ptrace_wrap_instance *inst, void (*child_callback)(void *), void *child_callback_user); + + #endif //PTRACE_WRAP_H + + +--- shlr/ptrace-wrap/src/ptrace_wrap.c.orig 2018-10-18 04:45:01.740833116 +0200 ++++ shlr/ptrace-wrap/src/ptrace_wrap.c 2018-10-18 04:45:15.476897266 +0200 +@@ -92,7 +92,7 @@ + return NULL; + } + +-long ptrace_wrap(ptrace_wrap_instance *inst, enum __ptrace_request request, pid_t pid, void *addr, void *data) { ++long ptrace_wrap(ptrace_wrap_instance *inst, __ptrace_request request, pid_t pid, void *addr, void *data) { + int _errno = 0; + inst->request.type = PTRACE_WRAP_REQUEST_TYPE_PTRACE; + inst->request.ptrace.request = request; +@@ -116,4 +116,4 @@ + sem_wait (&inst->result_sem); + errno = _errno; + return inst->fork_result; +-} +\ No newline at end of file ++} diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template index 6577883782f..914243f2a42 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,6 +1,6 @@ # Template file for 'radare2' pkgname=radare2 -version=2.9.0 +version=3.0.0 revision=1 build_style=gnu-configure configure_args="--with-syscapstone" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="LGPL-3.0-only" homepage="http://www.radare.org" distfiles="https://github.com/radare/radare2/archive/${version}.tar.gz" -checksum=423ced52355daeaa12a6abbd6735f93c1eb19af728ecb359a6074f49abacc8a2 +checksum=fb5db40c6ac143c7257c9f4044851c647eac8942d07421837335f9c520fed447