From d27170ef3291f3f26ecab23c4f017ebe762ebe66 Mon Sep 17 00:00:00 2001
From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
Date: Sat, 21 Aug 2021 02:59:20 -0300
Subject: [PATCH] radare2: update to 5.4.0 (#7362)

patch is no longer needed thanks to https://github.com/radareorg/radare2/commit/d109d596f0bad86515895da5437a76342a14cd6c
---
 packages/radare2/build.sh               |  4 +--
 packages/radare2/fix-bin-sh-path.patch  | 46 ++++++++++++-------------
 packages/radare2/libr-util-file.c.patch | 12 -------
 3 files changed, 25 insertions(+), 37 deletions(-)
 delete mode 100644 packages/radare2/libr-util-file.c.patch

diff --git a/packages/radare2/build.sh b/packages/radare2/build.sh
index 0d147d75b..3eec7e801 100644
--- a/packages/radare2/build.sh
+++ b/packages/radare2/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://rada.re
 TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=5.3.1
+TERMUX_PKG_VERSION=5.4.0
 TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=f95cbbba27f427bc3da41e9296e632c4bba1c47d107a9c911e82a524c136c406
+TERMUX_PKG_SHA256=21ddae80a18d5ceef4bcd3a7cae1ba09d14b510d68ac9134681e1e9967123b23
 TERMUX_PKG_DEPENDS="libuv"
 TERMUX_PKG_BREAKS="radare2-dev"
 TERMUX_PKG_REPLACES="radare2-dev"
diff --git a/packages/radare2/fix-bin-sh-path.patch b/packages/radare2/fix-bin-sh-path.patch
index bde20accc..1386ab143 100644
--- a/packages/radare2/fix-bin-sh-path.patch
+++ b/packages/radare2/fix-bin-sh-path.patch
@@ -1,24 +1,24 @@
-diff -uNr radare2-5.2.1/libr/socket/run.c radare2-5.2.1.mod/libr/socket/run.c
---- radare2-5.2.1/libr/socket/run.c	2021-04-21 18:25:58.000000000 +0000
-+++ radare2-5.2.1.mod/libr/socket/run.c	2021-05-06 13:55:30.146405233 +0000
-@@ -1198,7 +1198,7 @@
- #if __UNIX__
- 			close(0);
- 			close(1);
--			exit (execl ("/bin/sh","/bin/sh", "-c", p->_system, NULL));
-+			exit (execl ("@TERMUX_PREFIX@/bin/sh","@TERMUX_PREFIX@/bin/sh", "-c", p->_system, NULL));
- #else
- 			exit (r_sys_cmd (p->_system));
+diff -Nuar -ruN radare2-5.4.0/libr/include/r_util/r_file.h radare2-5.4.0.mod/libr/include/r_util/r_file.h
+--- radare2-5.4.0/libr/include/r_util/r_file.h	2021-08-20 09:25:10.617372300 -0300
++++ radare2-5.4.0.mod/libr/include/r_util/r_file.h	2021-08-20 10:48:00.361368745 -0300
+@@ -8,7 +8,7 @@
+ #include <r_util/r_mem.h>
+ 
+ #ifndef SHELL_PATH
+-#define SHELL_PATH "/bin/sh"
++#define SHELL_PATH "@TERMUX_PREFIX@/bin/sh"
  #endif
-diff -uNr radare2-5.2.1/libr/util/file.c radare2-5.2.1.mod/libr/util/file.c
---- radare2-5.2.1/libr/util/file.c	2021-04-21 18:25:58.000000000 +0000
-+++ radare2-5.2.1.mod/libr/util/file.c	2021-05-06 13:55:11.138404943 +0000
-@@ -281,7 +281,7 @@
- 		bin_sh = r_file_path("sh");
- 		if (R_STR_ISEMPTY (bin_sh)) {
- 			free (bin_sh);
--			bin_sh = strdup ("/bin/sh");
-+			bin_sh = strdup ("@TERMUX_PREFIX@/bin/sh");
- 		}
- 	}
- 	return bin_sh;
+ 
+ #ifndef TERMUX_PREFIX
+diff -Nuar -ruN radare2-5.4.0/libr/socket/run.c radare2-5.4.0.mod/libr/socket/run.c
+--- radare2-5.4.0/libr/socket/run.c	2021-08-20 09:25:10.705372300 -0300
++++ radare2-5.4.0.mod/libr/socket/run.c	2021-08-20 10:46:52.221368794 -0300
+@@ -1211,7 +1211,7 @@
+ 				: r_file_path ("sh");
+ 			// Honor $SHELL ?
+ 			if (R_STR_ISNOTEMPTY (bin_sh)) {
+-				exit (execl (bin_sh, bin_sh, "-c", p->_system, NULL));
++				exit (execl ("@TERMUX_PREFIX@/bin/sh","@TERMUX_PREFIX@/bin/sh", "-c", p->_system, NULL));
+ 			} else {
+ 				exit (r_sys_cmd (p->_system));
+ 			}
diff --git a/packages/radare2/libr-util-file.c.patch b/packages/radare2/libr-util-file.c.patch
deleted file mode 100644
index 11c248409..000000000
--- a/packages/radare2/libr-util-file.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../radare2-2.1.0/libr/util/file.c ./libr/util/file.c
---- ../radare2-2.1.0/libr/util/file.c	2017-11-27 13:31:04.000000000 +0100
-+++ ./libr/util/file.c	2017-11-27 20:11:09.415987429 +0100
-@@ -986,7 +986,7 @@
- 	}
- 	if (!path) {
- #if __ANDROID__
--		path = strdup ("/data/data/org.radare.radare2installer/radare2/tmp");
-+		path = strdup ("@TERMUX_PREFIX@/tmp");
- #else
- 		path = strdup ("/tmp");
- #endif