Hi,
Here's an update for radare2 along with an update cutter.
Testing and OKs welcome.
--
jasper
Index: devel/radare2/main/Makefile
===================================================================
RCS file: /cvs/ports/devel/radare2/main/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- devel/radare2/main/Makefile 11 Apr 2020 18:51:44 -0000 1.19
+++ devel/radare2/main/Makefile 14 May 2020 18:20:11 -0000
@@ -2,7 +2,7 @@
COMMENT = libre and portable reverse engineering framework
-V = 4.3.1
+V = 4.4.0
SUBST_VARS += V
GH_PROJECT = radare2
@@ -12,7 +12,7 @@ GH_TAGNAME = ${V}
# the extra distfiles so as not to invoke clone_3rd_repo.sh during build:
# grep -E '^(TS|SHELLPARSER)_TIP' ${WRKSRC}/shlr/Makefile
TREESITTER_COMMIT = f049ba35
-SHELLPARSER_COMMIT = 1a49d280
+SHELLPARSER_COMMIT = 36130421
MASTER_SITES0 =
https://github.com/tree-sitter/tree-sitter/archive/
MASTER_SITES1 =
https://github.com/ret2libc/radare2-shell-parser/archive/
@@ -21,7 +21,7 @@ DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
shellparser-{}${SHELLPARSER_COMMIT}.tar.gz:1
# In radare, all libs have the same version
-LIBV = 7.1 # 4.3.1
+LIBV = 8.0 # 4.4.0
.for _lib in r_anal r_asm r_bin r_bp r_config r_cons r_core \
r_crypto r_debug r_egg r_flag r_fs r_hash r_io r_lang \
r_main r_magic r_parse r_reg r_search r_socket \
Index: devel/radare2/main/distinfo
===================================================================
RCS file: /cvs/ports/devel/radare2/main/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- devel/radare2/main/distinfo 11 Apr 2020 18:51:44 -0000 1.11
+++ devel/radare2/main/distinfo 14 May 2020 18:20:11 -0000
@@ -1,6 +1,6 @@
-SHA256 (radare2-4.3.1.tar.gz) = Sry5yd/yTqtE1k05LhFa53SrGtkNBPLJg9ltfX+Udqo=
-SHA256 (shellparser-1a49d280.tar.gz) =
5ps8mQGp9hJ98UnvWsV9sVeMeLdJweNekbnSI2gLhVg=
+SHA256 (radare2-4.4.0.tar.gz) = QBq4nzn35w4DM29okNxP31La5PYSAeTNih++WkuetFE=
+SHA256 (shellparser-36130421.tar.gz) =
d7XBFF3PKxid+N2LH3KBhxhQLiZN5g/fEFrADu2k9M4=
SHA256 (treesitter-f049ba35.tar.gz) =
ELsKFSJPgLOcYhejlEE8/oVX6SEsnleURgF6NptHX48=
-SIZE (radare2-4.3.1.tar.gz) = 8113591
-SIZE (shellparser-1a49d280.tar.gz) = 63802
+SIZE (radare2-4.4.0.tar.gz) = 8135544
+SIZE (shellparser-36130421.tar.gz) = 50265
SIZE (treesitter-f049ba35.tar.gz) = 461019
Index: devel/radare2/main/patches/patch-libr_Makefile
===================================================================
RCS file: /cvs/ports/devel/radare2/main/patches/patch-libr_Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-libr_Makefile
--- devel/radare2/main/patches/patch-libr_Makefile 30 Dec 2019 13:20:18
-0000 1.7
+++ devel/radare2/main/patches/patch-libr_Makefile 14 May 2020 18:20:11
-0000
@@ -5,7 +5,7 @@ Remove library symlinks
Index: libr/Makefile
--- libr/Makefile.orig
+++ libr/Makefile
-@@ -213,7 +213,6 @@ install: install-includes install-pkgconfig
+@@ -218,7 +218,6 @@ install: install-includes install-pkgconfig
echo " ${DESTDIR}${LIBDIR}/$(call
libpath-to-name-version,$(lib),${LIBVERSION})"; \
rm -f "${DESTDIR}${LIBDIR}/$(call
libpath-to-name-version,$(lib),${LIBVERSION})"; \
${INSTALL_LIB} "$(lib)" "${DESTDIR}${LIBDIR}/$(call
libpath-to-name-version,$(lib),${LIBVERSION})"; \
Index: devel/radare2/main/patches/patch-libr_io_p_io_ptrace_c
===================================================================
RCS file: devel/radare2/main/patches/patch-libr_io_p_io_ptrace_c
diff -N devel/radare2/main/patches/patch-libr_io_p_io_ptrace_c
--- devel/radare2/main/patches/patch-libr_io_p_io_ptrace_c 11 Apr 2020
18:51:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,69 +0,0 @@
-$OpenBSD: patch-libr_io_p_io_ptrace_c,v 1.1 2020/04/11 18:51:44 jasper Exp $
-
-Fix debugger:
-https://github.com/radareorg/radare2/issues/16432
-
-Index: libr/io/p/io_ptrace.c
---- libr/io/p/io_ptrace.c.orig
-+++ libr/io/p/io_ptrace.c
-@@ -178,14 +178,18 @@ static bool __plugin_open(RIO *io, const char *file, b
- return false;
- }
-
--static inline bool is_pid_already_attached (RIO *io, int pid, void *data) {
-+static inline bool is_pid_already_attached(RIO *io, int pid) {
- #if defined(__linux__)
-- siginfo_t *sig = (siginfo_t *)data;
-- return -1 != r_io_ptrace (io, PTRACE_GETSIGINFO, pid, NULL, sig);
-+ siginfo_t sig = { 0 };
-+ return r_io_ptrace (io, PTRACE_GETSIGINFO, pid, NULL, &sig) != -1;
- #elif defined(__FreeBSD__)
-- struct ptrace_lwpinfo *info = (struct ptrace_lwpinfo *)data;
-- int len = (int)sizeof (*info);
-- return -1 != r_io_ptrace (io, PT_LWPINFO, pid, info, len);
-+ struct ptrace_lwpinfo info = { 0 };
-+ int len = (int)sizeof (info);
-+ return r_io_ptrace (io, PT_LWPINFO, pid, &info, len) != -1;
-+#elif __OpenBSD__
-+ ptrace_state_t state = { 0 };
-+ int len = (int)sizeof (state);
-+ return r_io_ptrace (io, PT_GET_PROCESS_STATE, pid, &state, len) != -1;
- #else
- return false;
- #endif
-@@ -194,13 +198,6 @@ static inline bool is_pid_already_attached (RIO *io, i
- static RIODesc *__open(RIO *io, const char *file, int rw, int mode) {
- RIODesc *desc = NULL;
- int ret = -1;
--#if defined(__linux__)
-- siginfo_t sig = { 0 };
--#elif defined(__FreeBSD__)
-- struct ptrace_lwpinfo sig = { 0 };
--#else
-- int sig = 0;
--#endif
-
- if (!__plugin_open (io, file, 0)) {
- return NULL;
-@@ -210,7 +207,7 @@ static RIODesc *__open(RIO *io, const char *file, int
-
- // Safely check if the PID has already been attached to avoid printing
errors
- // and attempt attaching on failure
-- if (!is_pid_already_attached(io, pid, &sig)) {
-+ if (!is_pid_already_attached (io, pid)) {
- ret = r_io_ptrace (io, PTRACE_ATTACH, pid, 0, 0);
- if (ret == -1) {
- #ifdef __ANDROID__
-@@ -225,9 +222,11 @@ static RIODesc *__open(RIO *io, const char *file, int
- perror ("ptrace: Cannot attach");
- eprintf ("ERRNO: %d (EINVAL)\n", errno);
- break;
-+ default:
-+ break;
- }
--#endif
- return NULL;
-+#endif
- } else if (__waitpid (pid)) {
- ret = pid;
- } else {
Index: devel/radare2/main/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/radare2/main/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- devel/radare2/main/pkg/PLIST 11 Apr 2020 18:51:44 -0000 1.14
+++ devel/radare2/main/pkg/PLIST 14 May 2020 18:20:12 -0000
@@ -3,6 +3,7 @@ bin/r2
@bin bin/r2agent
bin/r2p
bin/r2pm
+@bin bin/r2r
@bin bin/rabin2
@bin bin/radare2
@bin bin/radiff2
@@ -220,6 +221,7 @@ lib/radare2/last
@man man/man1/r2.1
@man man/man1/r2agent.1
@man man/man1/r2pm.1
+@man man/man1/r2r.1
@man man/man1/rabin2.1
@man man/man1/radare2.1
@man man/man1/radiff2.1
Index: devel/cutter/Makefile
===================================================================
RCS file: /cvs/ports/devel/cutter/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- devel/cutter/Makefile 11 Apr 2020 19:35:14 -0000 1.2
+++ devel/cutter/Makefile 14 May 2020 18:20:12 -0000
@@ -4,8 +4,7 @@ COMMENT = RE platform powered by radare2
GH_ACCOUNT = radareorg
GH_PROJECT = cutter
-GH_TAGNAME = v1.10.2
-REVISION = 0
+GH_TAGNAME = v1.10.3
CATEGORIES = devel
Index: devel/cutter/distinfo
===================================================================
RCS file: /cvs/ports/devel/cutter/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- devel/cutter/distinfo 11 Apr 2020 18:58:04 -0000 1.1.1.1
+++ devel/cutter/distinfo 14 May 2020 18:20:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (cutter-1.10.2.tar.gz) = uav6jYIjQZGcJ14W9CIQen7lvE1yLcQSXXKYcv//bNo=
-SIZE (cutter-1.10.2.tar.gz) = 1852443
+SHA256 (cutter-1.10.3.tar.gz) = Ls48fOMft7Xk86KSbPjFnJfKhK6MUm1ZPYlv3dCF+YE=
+SIZE (cutter-1.10.3.tar.gz) = 1866223
