radare2: Update from 2.0.1 to 2.1.0

diff --git a/packages/radare2/build.sh b/packages/radare2/build.sh
index 8e801a0c90f5f196010f1ae393fe39d74acc550f..59f2bfede75b8046b7f15bba1c9cfcf892e7e736 100644 (file)
--- a/packages/radare2/build.sh
+++ b/packages/radare2/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://rada.re
 TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"
 TERMUX_PKG_HOMEPAGE=https://rada.re
 TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"

-TERMUX_PKG_VERSION=2.0.1
-TERMUX_PKG_SHA256=d8f7e1ab96028fc8bd62d4f92fbbe8bbf48c6cda8112e6eaec93bf5ffbbbd1dd
+TERMUX_PKG_VERSION=2.1.0
+TERMUX_PKG_SHA256=cf34e6260fafb543edb919ed0b80b57b431817e91b624843fc1b82aa4bbf5f7a

 TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-compiler=termux-host"
 TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-compiler=termux-host"

diff --git a/packages/radare2/fix-hardcoded-paths.patch b/packages/radare2/fix-hardcoded-paths.patch
index ca11180bb17c50c8298c26679f4423480e8d08ca..d286807fd5c13605f07a81049ab0caef356f09e6 100644 (file)
--- a/packages/radare2/fix-hardcoded-paths.patch
+++ b/packages/radare2/fix-hardcoded-paths.patch
@@ -65,15 +65,3 @@ diff -uNr radare2-2.0.0/libr/include/r_magic.h radare2-2.0.0.mod/libr/include/r_
  #endif
  
  #define R_MAGIC_PATH R2_PREFIX "/share/radare2/" R2_VERSION "/magic"
  #endif
  
  #define R_MAGIC_PATH R2_PREFIX "/share/radare2/" R2_VERSION "/magic"

-diff -uNr radare2-2.0.0/libr/util/file.c radare2-2.0.0.mod/libr/util/file.c
---- radare2-2.0.0/libr/util/file.c     2017-10-09 18:05:53.000000000 +0300
-+++ radare2-2.0.0.mod/libr/util/file.c 2017-10-11 16:23:00.731073820 +0300
-@@ -912,7 +912,7 @@
-               }
-       }
- #elif __ANDROID__
--      char *path = strdup ("/data/data/org.radare.radare2installer/radare2/tmp");
-+      char *path = strdup ("@TERMUX_PREFIX@/tmp");
- #else
-       char *path = r_sys_getenv ("TMPDIR");
-       if (path && !*path) {

diff --git a/packages/radare2/libr-util-file.c.patch b/packages/radare2/libr-util-file.c.patch
new file mode 100644 (file)
index 0000000..11c2484
--- /dev/null
+++ b/packages/radare2/libr-util-file.c.patch
@@ -0,0 +1,12 @@
+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