development/radare2: Updated for version 1.6.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

5 files changed, 33 insertions, 36 deletions

diff --git a/development/radare2/anal_mips_cs.c.patch b/development/radare2/anal_mips_cs.c.patch
new file mode 100644
index 000000000000..8f639728f44a
--- /dev/null
+++ b/development/radare2/anal_mips_cs.c.patch
@@ -0,0 +1,11 @@
+--- libr/anal/p/anal_mips_cs.c	2017-07-11 09:54:22.000000000 -0600
++++ libr/anal/p/anal_mips_cs.c.new	2017-07-17 02:54:34.091225475 -0600
+@@ -596,7 +596,7 @@
+ 			mode |= CS_MODE_MIPS3;
+ 		} else if (!strcmp (anal->cpu, "v2")) {
+ #if CS_API_MAJOR > 3
+-			mode |= CS_MODE_MIPS2;
++			mode |= CS_MODE_MIPS32;
+ #endif
+ 		}
+ 	}
diff --git a/development/radare2/asm_mips_cs.c.patch b/development/radare2/asm_mips_cs.c.patch
new file mode 100644
index 000000000000..bf3d46ec8355
--- /dev/null
+++ b/development/radare2/asm_mips_cs.c.patch
@@ -0,0 +1,11 @@
+--- libr/asm/p/asm_mips_cs.c	2017-07-11 09:54:22.000000000 -0600
++++ libr/asm/p/asm_mips_cs.c.new	2017-07-17 03:01:49.521082563 -0600
+@@ -25,7 +25,7 @@
+ 			mode |= CS_MODE_MIPS3;
+ 		} else if (!strcmp (a->cpu, "v2")) {
+ #if CS_API_MAJOR > 3
+-			mode |= CS_MODE_MIPS2;
++			mode |= CS_MODE_MIPS32;
+ #endif
+ 		}
+ 	}
diff --git a/development/radare2/fix-makefile.patch b/development/radare2/fix-makefile.patch
deleted file mode 100644
index bfb1772e7379..000000000000
--- a/development/radare2/fix-makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- radare2-0.10.5/shlr/Makefile.orig	2016-09-02 18:49:28.154542799 +0700
-+++ radare2-0.10.5/shlr/Makefile	2016-09-02 18:53:09.710545379 +0700
-@@ -219,8 +219,9 @@
- 	rm -rf capstone
- 	mv capstone-$(CS_VER) capstone
- ifeq ($(CS_PATCHES),1)
-+        echo "no capstone installed"
- 	#cd capstone ; for PATCH in ../capstone-patches/* ; do patch -tp1 < $$PATCH ; done
--	cd capstone ; for PATCH in ../capstone-patches/* ; do patch -p1 < $$PATCH ; done
-+	#cd capstone ; for PATCH in ../capstone-patches/* ; do patch -p1 < $$PATCH ; done
- endif
- 	mkdir -p capstone/include/capstone
- 	cp -rf capstone/include/*.h capstone/include/capstone
-@@ -234,9 +235,10 @@
- capstone-sync:
- 	"$(SHELL)" capstone.sh "${CS_URL}" "${CS_BRA}" "${CS_TIP}" "${CS_REV}"
- ifeq ($(CS_PATCHES),1)
--	-cd capstone ; $(GIT) reset --hard
-+	#-cd capstone ; $(GIT) reset --hard
- 	#cd capstone ; for PATCH in ../capstone-patches/* ; do patch -tp1 < $$PATCH ; done
--	cd capstone ; for PATCH in ../capstone-patches/* ; do patch -p1 < $$PATCH ; done
-+	#cd capstone ; for PATCH in ../capstone-patches/* ; do patch -p1 < $$PATCH ; done
-+	echo "no capstone installed"
- endif
- 
- .PHONY: capstone
diff --git a/development/radare2/radare2.SlackBuild b/development/radare2/radare2.SlackBuild
index db34462eddb8..2dbe8f682ac6 100644
--- a/development/radare2/radare2.SlackBuild
+++ b/development/radare2/radare2.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=radare2
-VERSION=${VERSION:-0.10.5}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $TMP/$PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,8 +70,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix applied patches
-patch -p1 < $CWD/fix-makefile.patch
+patch -p0 --verbose < $CWD/anal_mips_cs.c.patch
+patch -p0 --verbose < $CWD/asm_mips_cs.c.patch
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -81,7 +81,8 @@ CFLAGS="$SLKCFLAGS" \
     --localstatedir=/var \
     --mandir=/usr/man \
     --with-openssl \
-    --build=$ARCH-slackware-linux
+    --with-syszip \
+    --with-syscapstone
 
 make
 make install DESTDIR=$PKG
@@ -93,7 +94,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING* README.md TODO.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING* README.md DEVELOPERS.md CONTRIBUTING.md AUTHORS.md $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/radare2/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 rm -rf $PKG/usr/share/doc
diff --git a/development/radare2/radare2.info b/development/radare2/radare2.info
index e1d6882a2e46..500c3114a825 100644
--- a/development/radare2/radare2.info
+++ b/development/radare2/radare2.info
@@ -1,10 +1,10 @@
 PRGNAM="radare2"
-VERSION="0.10.5"
+VERSION="1.6.0"
 HOMEPAGE="http://radare.org/"
-DOWNLOAD="http://radare.org/get/radare2-0.10.5.tar.xz"
-MD5SUM="ad031f7490a63c03516839cd686af624"
+DOWNLOAD="https://github.com/radare/radare2/archive/1.6.0/radare2/radare2-1.6.0.tar.gz"
+MD5SUM="614b48427e49764f3b8303d4efa3257f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="capstone"
 MAINTAINER="Fernando Lopez Jr."
 EMAIL="fernando.lopezjr@gmail.com"