CVS commit: pkgsrc/devel/radare2

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon May 15 19:05:33 UTC 2023

Modified Files:
        pkgsrc/devel/radare2: Makefile distinfo
Added Files:
        pkgsrc/devel/radare2/patches:
            patch-libr_debug_p_native_bsd_bsd__debug.c
            patch-libr_debug_p_native_reg.c

Log Message:
radare: do the minimum to make this build on NetBSD/macppc.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/radare2/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/radare2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/radare2/patches/patch-libr_debug_p_native_bsd_bsd__debug.c \
    pkgsrc/devel/radare2/patches/patch-libr_debug_p_native_reg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/radare2/Makefile
diff -u pkgsrc/devel/radare2/Makefile:1.41 pkgsrc/devel/radare2/Makefile:1.42
--- pkgsrc/devel/radare2/Makefile:1.41  Wed Apr 19 08:08:19 2023
+++ pkgsrc/devel/radare2/Makefile       Mon May 15 19:05:33 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2023/04/19 08:08:19 adam Exp $
+# $NetBSD: Makefile,v 1.42 2023/05/15 19:05:33 he Exp $
 
 DISTNAME=      radare2-5.8.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=radareorg/}
 DISTFILES=     ${DEFAULT_DISTFILES}

Index: pkgsrc/devel/radare2/distinfo
diff -u pkgsrc/devel/radare2/distinfo:1.19 pkgsrc/devel/radare2/distinfo:1.20
--- pkgsrc/devel/radare2/distinfo:1.19  Sat Jan 28 01:28:42 2023
+++ pkgsrc/devel/radare2/distinfo       Mon May 15 19:05:33 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2023/01/28 01:28:42 khorben Exp $
+$NetBSD: distinfo,v 1.20 2023/05/15 19:05:33 he Exp $
 
 BLAKE2s (radare2-5.8.2.tar.gz) = 1320604100492648c98d18f445c972456c7cc7e4fe0c884077d377f2ccaaa605
 SHA512 (radare2-5.8.2.tar.gz) = a3b768cade2f0bba7b252331010cddda952882db32ade7e3e16fb6c766265b574672a0f093b070bca5ac48b67c263b87a66c08064601d6e1961c0ff4dd0abc22
@@ -9,6 +9,8 @@ Size (vector35-arch-arm64-55d73c6bbb9444
 BLAKE2s (vector35-arch-armv7-f270a6cc99644cb8e76055b6fa632b25abd26024.tar.gz) = a9e85ccf1cfd0ed8bf014494f9dc7239369b29f4447beaf08f95392d7f5ccc8c
 SHA512 (vector35-arch-armv7-f270a6cc99644cb8e76055b6fa632b25abd26024.tar.gz) = 
40c048b29856f48300d4539bc7bda38e6ceae1e8d4d9d131c4a7546b6e26b2fb96309c483b67e2c2290b06cea5fc52a7beb30557d54e89296e7734cc1ab06d10
 Size (vector35-arch-armv7-f270a6cc99644cb8e76055b6fa632b25abd26024.tar.gz) = 255278 bytes
+SHA1 (patch-libr_debug_p_native_bsd_bsd__debug.c) = f70fbb92b17b03e5436973709c60155f7eb5d405
+SHA1 (patch-libr_debug_p_native_reg.c) = f719d576e3ff2e1b5d99374d5720a05855c1597b
 SHA1 (patch-libr_io_p_shm.mk) = e5778f859039228e5eaa42fe613f57f55d38fd57
 SHA1 (patch-shlr-sdb-src-Makefile) = 414260d6010873f04ca8e614438fd674af0543d2
 SHA1 (patch-shlr_qjs_src_cutils.h) = f36e586889dd18ee4354c1a1bcbad52c95951eda

Added files:

Index: pkgsrc/devel/radare2/patches/patch-libr_debug_p_native_bsd_bsd__debug.c
diff -u /dev/null pkgsrc/devel/radare2/patches/patch-libr_debug_p_native_bsd_bsd__debug.c:1.1
--- /dev/null   Mon May 15 19:05:33 2023
+++ pkgsrc/devel/radare2/patches/patch-libr_debug_p_native_bsd_bsd__debug.c     Mon May 15 19:05:33 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-libr_debug_p_native_bsd_bsd__debug.c,v 1.1 2023/05/15 19:05:33 he Exp $
+
+Not all archs have PT_SETDBREGS, so conditionalize.
+
+--- ./libr/debug/p/native/bsd/bsd_debug.c.orig 2023-01-23 10:53:42.000000000 +0000
++++ ./libr/debug/p/native/bsd/bsd_debug.c
+@@ -112,8 +112,10 @@ int bsd_reg_write(RDebug *dbg, int type,
+                       break;
+               case R_REG_TYPE_DRX:
+ #if __KFBSD__ || __NetBSD__
++#ifdef PT_SETDBREGS
+                       r = ptrace (PT_SETDBREGS, dbg->pid, (caddr_t)buf, sizeof (struct dbreg));
+ #endif
++#endif
+                       break;
+               case R_REG_TYPE_FPU:
+                       r = ptrace (PT_SETFPREGS, dbg->pid, (caddr_t)buf, sizeof (struct fpreg));
Index: pkgsrc/devel/radare2/patches/patch-libr_debug_p_native_reg.c
diff -u /dev/null pkgsrc/devel/radare2/patches/patch-libr_debug_p_native_reg.c:1.1
--- /dev/null   Mon May 15 19:05:33 2023
+++ pkgsrc/devel/radare2/patches/patch-libr_debug_p_native_reg.c        Mon May 15 19:05:33 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-libr_debug_p_native_reg.c,v 1.1 2023/05/15 19:05:33 he Exp $
+
+Use kfbsd-ppc.h on NetBSD/powerpc as well.
+
+--- libr/debug/p/native/reg.c.orig     2023-01-23 10:53:42.000000000 +0000
++++ libr/debug/p/native/reg.c
+@@ -27,6 +27,8 @@ static char *r_debug_native_reg_profile(
+ #include "reg/netbsd-x86.h"
+ #elif __x86_64__
+ #include "reg/netbsd-x64.h"
++#elif __powerpc__
++#include "reg/kfbsd-ppc.h"
+ #else
+ #error "Unsupported BSD architecture"
+ #endif