From 0c9d4b0aac205e56d0118675242da2cf6ab4e62b Mon Sep 17 00:00:00 2001 Message-Id: <0c9d4b0aac205e56d0118675242da2cf6ab4e62b.1719350549.git.mdw@distorted.org.uk> From: Mark Wooding Date: Tue, 12 Sep 2017 12:36:36 +0300 Subject: [PATCH] radare2: fix path to file '/etc/magic' Organization: Straylight/Edgeware From: Leonid Plyushch --- packages/radare2/build.sh | 1 + packages/radare2/paths.patch | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/packages/radare2/build.sh b/packages/radare2/build.sh index 9dcdbef8..b4446322 100644 --- 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 2eb4c810..66e60a0e 100644 --- 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"); -- [mdw]