From a959f7b802839526543b3834fd6e3a6ef531f898 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 27 Sep 2016 02:23:34 -0400 Subject: [PATCH] radare2: Update from 0.10.5 to 0.10.6 --- packages/radare2/build.sh | 2 +- packages/radare2/debug_native.c.patch | 12 ------------ packages/radare2/linux_debug.c.patch | 12 ------------ packages/radare2/mk-termux-host.mk.patch | 14 -------------- packages/radare2/sdb-make.patch | 13 ------------- 5 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 packages/radare2/debug_native.c.patch delete mode 100644 packages/radare2/linux_debug.c.patch delete mode 100644 packages/radare2/mk-termux-host.mk.patch delete mode 100644 packages/radare2/sdb-make.patch diff --git a/packages/radare2/build.sh b/packages/radare2/build.sh index 12b06648a..371c7e6c6 100644 --- a/packages/radare2/build.sh +++ b/packages/radare2/build.sh @@ -1,6 +1,6 @@ TERMUX_PKG_HOMEPAGE=http://rada.re TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor" -TERMUX_PKG_VERSION=0.10.5 +TERMUX_PKG_VERSION=0.10.6 TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_FOLDERNAME="radare2-$TERMUX_PKG_VERSION" TERMUX_PKG_BUILD_IN_SRC="yes" diff --git a/packages/radare2/debug_native.c.patch b/packages/radare2/debug_native.c.patch deleted file mode 100644 index daaa8cd28..000000000 --- a/packages/radare2/debug_native.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../radare2-0.10.5/libr/debug/p/debug_native.c ./libr/debug/p/debug_native.c ---- ../radare2-0.10.5/libr/debug/p/debug_native.c 2016-08-16 19:28:34.000000000 -0400 -+++ ./libr/debug/p/debug_native.c 2016-09-16 17:37:57.879695115 -0400 -@@ -75,7 +75,7 @@ - # define WIFCONTINUED(s) ((s) == 0xffff) - # endif - # endif --#if __x86_64__ -+#if __x86_64__ && !defined(__ANDROID__) - #include "native/linux/linux_coredump.h" - #endif - #else // OS diff --git a/packages/radare2/linux_debug.c.patch b/packages/radare2/linux_debug.c.patch deleted file mode 100644 index ae4da5d31..000000000 --- a/packages/radare2/linux_debug.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../radare2-0.10.5/libr/debug/p/native/linux/linux_debug.c ./libr/debug/p/native/linux/linux_debug.c ---- ../radare2-0.10.5/libr/debug/p/native/linux/linux_debug.c 2016-08-16 19:28:34.000000000 -0400 -+++ ./libr/debug/p/native/linux/linux_debug.c 2016-09-16 17:53:45.280118204 -0400 -@@ -426,7 +426,7 @@ - if (ret1 != 0) return false; - if (sizeof(fpregs) < size) size = sizeof(fpregs); - memcpy (buf, &fpregs, size); -- return sizeof(fpregs) -+ return sizeof(fpregs); - #endif // !__ANDROID__ - #elif __i386__ - #if !__ANDROID__ diff --git a/packages/radare2/mk-termux-host.mk.patch b/packages/radare2/mk-termux-host.mk.patch deleted file mode 100644 index a3d835ced..000000000 --- a/packages/radare2/mk-termux-host.mk.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u -r ../radare2-0.10.5/mk/termux-host.mk ./mk/termux-host.mk ---- ../radare2-0.10.5/mk/termux-host.mk 2016-08-16 19:28:34.000000000 -0400 -+++ ./mk/termux-host.mk 2016-09-16 16:58:13.067871972 -0400 -@@ -2,10 +2,7 @@ - #CC=gcc -fPIC -fPIE - #RANLIB=ndk-ranlib - USERCC=gcc -fPIC -fPIE --ARCH=arm - --RANLIB=aarch64-linux-android-ranlib --AR=aarch64-linux-android-ar - CC_AR=${AR} -r ${LIBAR} - - ONELIB=0 diff --git a/packages/radare2/sdb-make.patch b/packages/radare2/sdb-make.patch deleted file mode 100644 index 4c481523d..000000000 --- a/packages/radare2/sdb-make.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/shlr/Makefile b/shlr/Makefile -index 384ed78..d3bdab1 100644 ---- a/shlr/Makefile -+++ b/shlr/Makefile -@@ -103,7 +103,7 @@ ${SDB_TARGETS}: - @echo - $(MAKE) -C sdb clean - $(MAKE) -C sdb src/sdb_version.h -- $(MAKE) -C sdb/src CC=${HOST_CC} CFLAGS='${HOST_CFLAGS} -fPIC' bin -+ $(MAKE) -C sdb/src CC=${HOST_CC} LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} -fPIC' bin - cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/src/.sdb${BUILD_EXT_EXE} - @echo - @echo ">>>>>>>>>>>>>>>>"