radare2: Update from 0.10.6 to 1.0.2

diff --git a/packages/radare2/build.sh b/packages/radare2/build.sh
index 371c7e6c6dbaf9a994067348f3e38f435fc35b84..191331b2f5fa64e48550eb4a885c35876e892111 100644 (file)
--- a/packages/radare2/build.sh
+++ b/packages/radare2/build.sh
@@ -1,7 +1,8 @@
 TERMUX_PKG_HOMEPAGE=http://rada.re
 TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"
 TERMUX_PKG_HOMEPAGE=http://rada.re
 TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"

-TERMUX_PKG_VERSION=0.10.6
+TERMUX_PKG_VERSION=1.0.2

 TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz

+TERMUX_PKG_SHA256=58693bc93d07f8e4678bf96e149f736a29194869c6d08e8ed2696e953ecf1098

 TERMUX_PKG_FOLDERNAME="radare2-$TERMUX_PKG_VERSION"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-compiler=termux-host"
 TERMUX_PKG_FOLDERNAME="radare2-$TERMUX_PKG_VERSION"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-compiler=termux-host"


@@ -11,4 +12,7 @@ termux_step_pre_configure() {
        # radare2 build will put it's own -I flags after ours, which causes
        # problems due to name clashes (binutils header files).
        unset CPPFLAGS
        # radare2 build will put it's own -I flags after ours, which causes
        # problems due to name clashes (binutils header files).
        unset CPPFLAGS

+
+       # Remove old libs which may mess with new build:
+       rm -f $TERMUX_PREFIX/lib/libr_*

 }
 }

diff --git a/packages/radare2/paths.patch b/packages/radare2/paths.patch
index f49492cdbb23376a87ab3e0f8d0dd213d7d38280..39b95e67539e38bc42c203e5ac05748ce209cdc0 100644 (file)
--- a/packages/radare2/paths.patch
+++ b/packages/radare2/paths.patch
@@ -1,36 +1,36 @@
-diff -u -r ../radare2-0.10.5/libr/core/config.c ./libr/core/config.c
---- ../radare2-0.10.5/libr/core/config.c       2016-08-16 19:28:34.000000000 -0400
-+++ ./libr/core/config.c       2016-09-16 08:20:42.072720023 -0400
-@@ -1656,9 +1656,7 @@
+diff -u -r ../radare2-1.0/libr/core/config.c ./libr/core/config.c
+--- ../radare2-1.0/libr/core/config.c  2016-11-08 21:10:46.000000000 -0500
++++ ./libr/core/config.c       2016-11-10 07:40:51.899121470 -0500
+@@ -1835,9 +1835,7 @@

  #endif
        SETCB("dir.source", "", &cb_dirsrc, "Path to find source files");
        SETPREF("dir.types", "/usr/include", "Default path to look for cparse type files");
 -#if __ANDROID__
  #endif
        SETCB("dir.source", "", &cb_dirsrc, "Path to find source files");
        SETPREF("dir.types", "/usr/include", "Default path to look for cparse type files");
 -#if __ANDROID__

--      SETPREF("dir.projects", "/data/data/org.radare2.installer/radare2/projects", "Default path for projects");
+-      SETPREF("dir.projects", "/data/data/org.radare.radare2installer/radare2/projects", "Default path for projects");

 -#elif __WINDOWS__
 +#if __WINDOWS__
        SETPREF("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects");
  #else
        SETPREF("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects");
 -#elif __WINDOWS__
 +#if __WINDOWS__
        SETPREF("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects");
  #else
        SETPREF("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects");

-@@ -1778,9 +1776,7 @@
+@@ -1970,9 +1968,7 @@

        SETI("http.maxsize", 0, "Maximum file size for upload");
        SETPREF("http.bind", "localhost", "Server address");
        SETPREF("http.homeroot", "~/.config/radare2/www", "http home root directory");
 -#if __ANDROID__
        SETI("http.maxsize", 0, "Maximum file size for upload");
        SETPREF("http.bind", "localhost", "Server address");
        SETPREF("http.homeroot", "~/.config/radare2/www", "http home root directory");
 -#if __ANDROID__

--      SETPREF("http.root", "/data/data/org.radare2.installer/www", "http root directory");
+-      SETPREF("http.root", "/data/data/org.radare.radare2installer/www", "http root directory");

 -#elif __WINDOWS__
 +#if __WINDOWS__
        SETPREF("http.root", "www", "http root directory");
  #else
        SETPREF("http.root", R2_WWWROOT, "http root directory");
 -#elif __WINDOWS__
 +#if __WINDOWS__
        SETPREF("http.root", "www", "http root directory");
  #else
        SETPREF("http.root", R2_WWWROOT, "http root directory");

-diff -u -r ../radare2-0.10.5/libr/util/file.c ./libr/util/file.c
---- ../radare2-0.10.5/libr/util/file.c 2016-08-16 19:28:34.000000000 -0400
-+++ ./libr/util/file.c 2016-09-16 08:18:35.302578773 -0400
-@@ -770,7 +770,7 @@
-       char *path = r_sys_getenv ("TEMP");
-       if (!path) path = strdup ("C:\\WINDOWS\\Temp\\");
+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\\");
+       }

  #elif __ANDROID__
  #elif __ANDROID__

--      char *path = strdup ("/data/data/org.radare2.installer/radare2/tmp");
+-      char *path = strdup ("/data/data/org.radare.radare2installer/radare2/tmp");

 +      char *path = strdup ("@TERMUX_PREFIX@/tmp");
  #else
        char *path = r_sys_getenv ("TMPDIR");
 +      char *path = strdup ("@TERMUX_PREFIX@/tmp");
  #else
        char *path = r_sys_getenv ("TMPDIR");