radare2: fix path to file '/etc/magic'

diff --git a/packages/radare2/build.sh b/packages/radare2/build.sh
index 9dcdbef829b50f81d475b679a9ec104e586ba468..b44463225cf16408f184ba27cd1f9af2dea6ba8d 100644 (file)
--- a/packages/radare2/build.sh
+++ b/packages/radare2/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://rada.re
 TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"
 TERMUX_PKG_VERSION=1.6.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=759d1c65dcd69d1189fc73e427c568ec234a7ca1958c19f5001c255dd31a3787
 TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_FOLDERNAME="radare2-$TERMUX_PKG_VERSION"

diff --git a/packages/radare2/paths.patch b/packages/radare2/paths.patch
index 2eb4c810ed21724d4c60b7fa07e7822082921a35..66e60a0e127cbcce71b09d41498e8545bb2522b2 100644 (file)
--- a/packages/radare2/paths.patch
+++ b/packages/radare2/paths.patch
@@ -1,8 +1,20 @@
-diff -u -r ../radare2-1.0/libr/util/file.c ./libr/util/file.c
---- ../radare2-1.0/libr/util/file.c    2016-11-08 21:10:46.000000000 -0500
-+++ ./libr/util/file.c 2016-11-10 07:42:18.409808792 -0500
-@@ -808,7 +808,7 @@
-               path = strdup ("C:\\WINDOWS\\Temp\\");
+diff -uNr radare2-1.6.0/libr/include/r_magic.h radare2-1.6.0.mod/libr/include/r_magic.h
+--- radare2-1.6.0/libr/include/r_magic.h       2017-07-11 18:54:22.000000000 +0300
++++ radare2-1.6.0.mod/libr/include/r_magic.h   2017-09-12 12:34:00.112989113 +0300
+@@ -12,7 +12,7 @@
+ R_LIB_VERSION_HEADER(r_magic);
+ 
+ #ifndef MAGICFILE
+-#define MAGICFILE "/etc/magic"
++#define MAGICFILE "@TERMUX_PREFIX@/etc/magic"
+ #endif
+ 
+ #define R_MAGIC_PATH R2_PREFIX "/share/radare2/" R2_VERSION "/magic"
+diff -uNr radare2-1.6.0/libr/util/file.c radare2-1.6.0.mod/libr/util/file.c
+--- radare2-1.6.0/libr/util/file.c     2017-07-11 18:54:22.000000000 +0300
++++ radare2-1.6.0.mod/libr/util/file.c 2017-09-12 12:34:06.732989109 +0300
+@@ -874,7 +874,7 @@
+               path = strdup (tmpdir);
        }
  #elif __ANDROID__
 -      char *path = strdup ("/data/data/org.radare.radare2installer/radare2/tmp");