From 879fd198a6b37c38aae7de0826f90c6a9c8fc620 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 11 Jan 2020 21:19:48 +0100 Subject: [PATCH 1/2] radare: update to 4.1.1. git is used to fetch a specific tag of tree-sitter --- srcpkgs/radare2/patches/01_i686-fix.patch | 117 ---------------------- srcpkgs/radare2/patches/02_i686-fix.patch | 27 ----- srcpkgs/radare2/patches/musl-debug.patch | 42 ++++++++ srcpkgs/radare2/template | 6 +- 4 files changed, 45 insertions(+), 147 deletions(-) delete mode 100644 srcpkgs/radare2/patches/01_i686-fix.patch delete mode 100644 srcpkgs/radare2/patches/02_i686-fix.patch create mode 100644 srcpkgs/radare2/patches/musl-debug.patch diff --git a/srcpkgs/radare2/patches/01_i686-fix.patch b/srcpkgs/radare2/patches/01_i686-fix.patch deleted file mode 100644 index 4dbe34d847b..00000000000 --- a/srcpkgs/radare2/patches/01_i686-fix.patch +++ /dev/null @@ -1,117 +0,0 @@ -From f639c3b6a17a57c9a0fa1790811eff27dd124b59 Mon Sep 17 00:00:00 2001 -From: radare -Date: Wed, 30 Oct 2019 13:04:25 +0100 -Subject: [PATCH] Fix build for 32bit Linux systems ##build (#15384) - ---- - libr/debug/p/native/linux/linux_debug.c | 88 ++++++++++++------------- - 1 file changed, 43 insertions(+), 45 deletions(-) - -diff --git a/libr/debug/p/native/linux/linux_debug.c b/libr/debug/p/native/linux/linux_debug.c -index ebdac31873..be131eb16f 100644 ---- libr/debug/p/native/linux/linux_debug.c -+++ libr/debug/p/native/linux/linux_debug.c -@@ -716,11 +716,10 @@ RList *linux_thread_list(int pid, RList *list) { - r_cons_printf ("foo = 0x%04lx \n", (fpregs).foo);\ - r_cons_printf ("fos = 0x%04lx ", (fpregs).fos) - --void print_fpu (void *f){ --#if __x86_64__ || __i386__ -+static void print_fpu(void *f){ -+#if __x86_64__ - int i,j; - struct user_fpregs_struct fpregs = *(struct user_fpregs_struct *)f; --#if __x86_64__ - #if __ANDROID__ - PRINT_FPU (fpregs); - for (i = 0;i < 8; i++) { -@@ -761,48 +760,47 @@ void print_fpu (void *f){ - } - #endif // __ANDROID__ - #elif __i386__ -- if (!r) { --#if !__ANDROID__ -- struct user_fpxregs_struct fpxregs = *(struct user_fpxregs_struct*)f; -- r_cons_printf ("---- x86-32 ----\n"); -- r_cons_printf ("cwd = 0x%04x ; control ", fpxregs.cwd); -- r_cons_printf ("swd = 0x%04x ; status\n", fpxregs.swd); -- r_cons_printf ("twd = 0x%04x ", fpxregs.twd); -- r_cons_printf ("fop = 0x%04x\n", fpxregs.fop); -- r_cons_printf ("fip = 0x%08x\n", (ut32)fpxregs.fip); -- r_cons_printf ("fcs = 0x%08x\n", (ut32)fpxregs.fcs); -- r_cons_printf ("foo = 0x%08x\n", (ut32)fpxregs.foo); -- r_cons_printf ("fos = 0x%08x\n", (ut32)fpxregs.fos); -- r_cons_printf ("mxcsr = 0x%08x\n", (ut32)fpxregs.mxcsr); -- for(i = 0; i < 8; i++) { -- ut32 *a = (ut32*)(&fpxregs.xmm_space); -- ut64 *b = (ut64 *)(&fpxregs.st_space[i * 4]); -- ut32 *c = (ut32*)&fpxregs.st_space; -- float *f = (float *)&fpxregs.st_space; -- a = a + (i * 4); -- c = c + (i * 4); -- f = f + (i * 4); -- r_cons_printf ("xmm%d = %08x %08x %08x %08x ", i, (int)a[0], -- (int)a[1], (int)a[2], (int)a[3] ); -- r_cons_printf ("st%d = %0.3lg (0x%016"PFMT64x") | %0.3f (0x%08x) | "\ -- "%0.3f (0x%08x)\n", i, -- (double)*((double*)(&fpxregs.st_space[i*4])), b[0], -- f[0], c[0], f[1], c[1]); -- } --#endif // !__ANDROID__ -- } else { -- r_cons_printf ("---- x86-32-noxmm ----\n"); -- PRINT_FPU_NOXMM (fpregs); -- for(i = 0; i < 8; i++) { -- ut64 *b = (ut64 *)(&fpregs.st_space[i*4]); -- double *d = (double*)b; -- ut32 *c = (ut32*)&fpregs.st_space; -- float *f = (float *)&fpregs.st_space; -- c = c + (i * 4); -- f = f + (i * 4); -- r_cons_printf ("st%d = %0.3lg (0x%016"PFMT64x") | %0.3f (0x%08x) | "\ -- "%0.3f (0x%08x)\n", i, d[0], b[0], f[0], c[0], f[1], c[1]); -- } -+ int i,j; -+#if __ANDROID__ -+ struct user_fpxregs_struct fpxregs = *(struct user_fpxregs_struct*)f; -+ r_cons_printf ("---- x86-32 ----\n"); -+ r_cons_printf ("cwd = 0x%04x ; control ", fpxregs.cwd); -+ r_cons_printf ("swd = 0x%04x ; status\n", fpxregs.swd); -+ r_cons_printf ("twd = 0x%04x ", fpxregs.twd); -+ r_cons_printf ("fop = 0x%04x\n", fpxregs.fop); -+ r_cons_printf ("fip = 0x%08x\n", (ut32)fpxregs.fip); -+ r_cons_printf ("fcs = 0x%08x\n", (ut32)fpxregs.fcs); -+ r_cons_printf ("foo = 0x%08x\n", (ut32)fpxregs.foo); -+ r_cons_printf ("fos = 0x%08x\n", (ut32)fpxregs.fos); -+ r_cons_printf ("mxcsr = 0x%08x\n", (ut32)fpxregs.mxcsr); -+ for(i = 0; i < 8; i++) { -+ ut32 *a = (ut32*)(&fpxregs.xmm_space); -+ ut64 *b = (ut64 *)(&fpxregs.st_space[i * 4]); -+ ut32 *c = (ut32*)&fpxregs.st_space; -+ float *f = (float *)&fpxregs.st_space; -+ a = a + (i * 4); -+ c = c + (i * 4); -+ f = f + (i * 4); -+ r_cons_printf ("xmm%d = %08x %08x %08x %08x ", i, (int)a[0], -+ (int)a[1], (int)a[2], (int)a[3] ); -+ r_cons_printf ("st%d = %0.3lg (0x%016"PFMT64x") | %0.3f (0x%08x) | "\ -+ "%0.3f (0x%08x)\n", i, -+ (double)*((double*)(&fpxregs.st_space[i*4])), b[0], -+ f[0], c[0], f[1], c[1]); -+ } -+#else -+ struct user_fpregs_struct fpregs = *(struct user_fpregs_struct *)f; -+ r_cons_printf ("---- x86-32-noxmm ----\n"); -+ PRINT_FPU_NOXMM (fpregs); -+ for(i = 0; i < 8; i++) { -+ ut64 *b = (ut64 *)(&fpregs.st_space[i*4]); -+ double *d = (double*)b; -+ ut32 *c = (ut32*)&fpregs.st_space; -+ float *f = (float *)&fpregs.st_space; -+ c = c + (i * 4); -+ f = f + (i * 4); -+ r_cons_printf ("st%d = %0.3lg (0x%016"PFMT64x") | %0.3f (0x%08x) | "\ -+ "%0.3f (0x%08x)\n", i, d[0], b[0], f[0], c[0], f[1], c[1]); - } - #endif - #else diff --git a/srcpkgs/radare2/patches/02_i686-fix.patch b/srcpkgs/radare2/patches/02_i686-fix.patch deleted file mode 100644 index 680439df9d3..00000000000 --- a/srcpkgs/radare2/patches/02_i686-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- libr/debug/p/native/linux/linux_debug.c.orig 2019-10-31 21:39:54.233871286 +0100 -+++ libr/debug/p/native/linux/linux_debug.c 2019-10-31 21:40:30.488558728 +0100 -@@ -874,13 +874,13 @@ - struct user_fpxregs_struct fpxregs; - ret1 = r_debug_ptrace (dbg, PTRACE_GETFPXREGS, pid, NULL, &fpxregs); - if (ret1 == 0) { -- if (showfpu) print_fpu ((void *)&fpxregs, ret1); -+ if (showfpu) print_fpu ((void *)&fpxregs); - if (sizeof(fpxregs) < size) size = sizeof(fpxregs); - memcpy (buf, &fpxregs, size); - return sizeof(fpxregs); - } else { - ret1 = r_debug_ptrace (dbg, PTRACE_GETFPREGS, pid, NULL, &fpregs); -- if (showfpu) print_fpu ((void *)&fpregs, ret1); -+ if (showfpu) print_fpu ((void *)&fpregs); - if (ret1 != 0) return false; - if (sizeof(fpregs) < size) size = sizeof(fpregs); - memcpy (buf, &fpregs, size); -@@ -888,7 +888,7 @@ - } - #else - ret1 = r_debug_ptrace (dbg, PTRACE_GETFPREGS, pid, NULL, &fpregs); -- if (showfpu) print_fpu ((void *)&fpregs, 1); -+ if (showfpu) print_fpu ((void *)&fpregs); - if (ret1 != 0) return false; - if (sizeof (fpregs) < size) size = sizeof(fpregs); - memcpy (buf, &fpregs, size); diff --git a/srcpkgs/radare2/patches/musl-debug.patch b/srcpkgs/radare2/patches/musl-debug.patch new file mode 100644 index 00000000000..83dada16b6b --- /dev/null +++ b/srcpkgs/radare2/patches/musl-debug.patch @@ -0,0 +1,42 @@ +backported from master + +From 0e34303648430dfcb3f0b9947233d897883e1484 Mon Sep 17 00:00:00 2001 +From: pancake +Date: Fri, 10 Jan 2020 03:50:30 +0100 +Subject: [PATCH] Third fix attepmt for musl builds + +--- libr/debug/p/native/linux/linux_debug.c 2019-12-20 13:22:09.000000000 +0100 ++++ libr/debug/p/native/linux/linux_debug.c 2020-01-11 21:23:23.359825810 +0100 +@@ -18,6 +18,12 @@ + #include + #include + ++#ifdef __GLIBC__ ++#define HAVE_YMM 1 ++#else ++#define HAVE_YMM 0 ++#endif ++ + char *linux_reg_profile (RDebug *dbg) { + #if __arm__ + #include "reg/linux-arm.h" +@@ -40,7 +46,9 @@ + #endif + } else { + #include "reg/linux-x64.h" +-#include ++#if HAVE_YMM ++# include ++#endif + } + #elif __powerpc__ + if (dbg->bits & R_SYS_BITS_32) { +@@ -1043,7 +1051,7 @@ + break; + case R_REG_TYPE_YMM: + { +-#if __x86_64__ ++#if HAVE_YMM && __x86_64__ + ut32 ymm_space[128]; // full ymm registers + struct _xstate xstate; + struct iovec iov; diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template index 2d3e19ce189..d11eff6c4d6 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,15 +1,15 @@ # Template file for 'radare2' # cutter needs to be bumped when radare2 is updated pkgname=radare2 -version=4.0.0 +version=4.1.1 revision=1 build_style=gnu-configure configure_args="--with-syscapstone" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config git" makedepends="capstone-devel" short_desc="Advanced command line debugger and hexadecimal editor" maintainer="Johannes " license="LGPL-3.0-only" homepage="http://www.radare.org" distfiles="https://github.com/radare/radare2/archive/${version}.tar.gz" -checksum=7621e38558917dc4b469acf2aa33d7cab6414420a0a1d205c55b9c96423e9cee +checksum=b62472601cdd20356b838d6f91738159e30ac1d7b4d0c0cb158575b1ef969e69 From 2ee678a129a1beea9075769927b8c3adbdfe44d7 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 11 Jan 2020 21:39:27 +0100 Subject: [PATCH 2/2] cutter: update to 1.10.0. --- srcpkgs/cutter/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template index c6a8687266f..027fac67c27 100644 --- a/srcpkgs/cutter/template +++ b/srcpkgs/cutter/template @@ -1,7 +1,7 @@ # Template file for 'cutter' pkgname=cutter -version=1.9.0 -revision=4 +version=1.10.0 +revision=1 build_wrksrc=src build_style=qmake hostmakedepends="pkg-config qt5-declarative-devel qt5-location-devel @@ -13,4 +13,4 @@ maintainer="johannes " license="GPL-3.0-only" homepage="https://github.com/radareorg/cutter" distfiles="https://github.com/radareorg/${pkgname}/archive/v${version}.tar.gz" -checksum=798aa696970030dfef2a1ecf2a058982089ac58db9b2ce008de5757b7fc20d84 +checksum=3a121638e056a05059aa3792943af1696f4e035661d01c179e45cb9baf00245a