testing/radare2: upgrade to 2.6.0

4 files changed, 115 insertions, 4 deletions

diff --git a/testing/radare2/0001-fix-for-build-with-syscapstone.patch b/testing/radare2/0001-fix-for-build-with-syscapstone.patch
new file mode 100644
index 0000000000..04bbaed49d
--- /dev/null
+++ b/testing/radare2/0001-fix-for-build-with-syscapstone.patch
@@ -0,0 +1,37 @@
+From 032a5cacd98d86414dffee61265a567df10c48e2 Mon Sep 17 00:00:00 2001
+From: cc <longlene@gmail.com>
+Date: Tue, 22 May 2018 12:52:12 +0800
+Subject: [PATCH 1/3] fix for build with syscapstone
+
+---
+ libr/Makefile | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/libr/Makefile b/libr/Makefile
+index 05cb40fec..0b39b48c0 100644
+--- a/libr/Makefile
++++ b/libr/Makefile
+@@ -84,13 +84,18 @@ E+=../shlr/bochs/lib/libbochs.${EXT_AR}
+ #E+=../shlr/sdb/src/libsdb.${EXT_AR}
+ #endif
+ 
++ifeq ($(USE_CAPSTONE),1)
++E+=$(CAPSTONE_LDFLAGS)
++else
++E+=../shlr/capstone/libcapstone.${EXT_AR}
++endif
++
+ libr.${EXT_SO}: .libr
+ 	$(CC) -fvisibility=hidden $(MLFLAGS) -shared -dynamiclib -o libr.${EXT_SO}  \
+ 		.libr/*.o \
+ 		../shlr/gdb/lib/libgdbr.${EXT_AR} ../shlr/java/libr_java.${EXT_AR} \
+ 		../shlr/zip/librz.${EXT_AR} \
+-		../shlr/libr_shlr.${EXT_AR} $(E)\
+-		../shlr/capstone/libcapstone.${EXT_AR}
++		../shlr/libr_shlr.${EXT_AR} $(E)
+ 
+ else
+ 
+-- 
+2.17.1
+
diff --git a/testing/radare2/0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch b/testing/radare2/0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch
new file mode 100644
index 0000000000..63c2e4ddde
--- /dev/null
+++ b/testing/radare2/0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch
@@ -0,0 +1,38 @@
+From dcb863e18f619137c3fe040f632adccb13d07a09 Mon Sep 17 00:00:00 2001
+From: Levente Polyak <levente@leventepolyak.net>
+Date: Wed, 23 May 2018 11:13:26 +0200
+Subject: [PATCH 2/3] libc: respect zip/deps.mk for zlib/libzip (#10163)
+
+Additionally respect standard caller {C,CPP,LD}FLAGS plus the
+deps.mk relaed LINK
+---
+ libr/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libr/Makefile b/libr/Makefile
+index 0b39b48c0..0d0257708 100644
+--- a/libr/Makefile
++++ b/libr/Makefile
+@@ -3,6 +3,7 @@ include config.mk
+ include ../config-user.mk
+ include ../mk/platform.mk
+ include ../mk/${COMPILER}.mk
++include ${SHLR}/zip/deps.mk
+ 
+ DESTDIR:=$(DESTDIR)
+ PREFIX?=${PWD}/../prefix
+@@ -91,10 +92,9 @@ E+=../shlr/capstone/libcapstone.${EXT_AR}
+ endif
+ 
+ libr.${EXT_SO}: .libr
+-	$(CC) -fvisibility=hidden $(MLFLAGS) -shared -dynamiclib -o libr.${EXT_SO}  \
++	$(CC) -fvisibility=hidden $(MLFLAGS) ${LINK} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -shared -dynamiclib -o libr.${EXT_SO}  \
+ 		.libr/*.o \
+ 		../shlr/gdb/lib/libgdbr.${EXT_AR} ../shlr/java/libr_java.${EXT_AR} \
+-		../shlr/zip/librz.${EXT_AR} \
+ 		../shlr/libr_shlr.${EXT_AR} $(E)
+ 
+ else
+-- 
+2.17.1
+
diff --git a/testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch b/testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch
new file mode 100644
index 0000000000..a4d5562d19
--- /dev/null
+++ b/testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch
@@ -0,0 +1,30 @@
+From ff045066c141efc56697ea0ca0a29f8960267bd3 Mon Sep 17 00:00:00 2001
+From: Levente Polyak <levente@leventepolyak.net>
+Date: Wed, 30 May 2018 16:57:45 +0200
+Subject: [PATCH 3/3] make: don't dist .${LIBVERSION} into /usr/lib (#10164)
+
+Not exlucidng ^libr.{so,dynlin}$ doesn't do any good and will purely
+result in distributing a .${LIBVERSION} into $DESTDIR
+f.e. /usr/lib/.2.6.0
+
+Introduced by: 8bab02
+---
+ libr/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libr/Makefile b/libr/Makefile
+index 0d0257708..7e75a3a1e 100644
+--- a/libr/Makefile
++++ b/libr/Makefile
+@@ -171,7 +171,7 @@ install: install-includes install-pkgconfig
+ 	# TODO :Use INSTALL_DATA_DIR instead of mkdir
+ 	# libraries
+ 	@${INSTALL_DIR} "${DESTDIR}${LIBDIR}"
+-	@$(foreach lib,$(shell find * -type f -iname "*.${EXT_SO}" | grep -v '(lib|parse)/t/' | grep lib | grep -v /bin/ | grep -v /p/), \
++	@$(foreach lib,$(shell find * -type f -iname "*.${EXT_SO}" | grep -vE '^libr\.${EXT_SO}$$' | grep -v '(lib|parse)/t/' | grep lib | grep -v /bin/ | grep -v /p/), \
+ 	  echo " ${DESTDIR}${LIBDIR}/$(call libpath-to-name-version,$(lib),${LIBVERSION})"; \
+ 	  rm -f "${DESTDIR}${LIBDIR}/$(call libpath-to-name-version,$(lib),${LIBVERSION})"; \
+ 	  ${INSTALL_LIB} "$(lib)" "${DESTDIR}${LIBDIR}/$(call libpath-to-name-version,$(lib),${LIBVERSION})"; \
+-- 
+2.17.1
+
diff --git a/testing/radare2/APKBUILD b/testing/radare2/APKBUILD
index 756a7b4e10..738d583085 100644
--- a/testing/radare2/APKBUILD
+++ b/testing/radare2/APKBUILD
@@ -4,8 +4,8 @@
 # Contributor: Jose-Luis Rivas <ghostbar@riseup.net>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=radare2
-pkgver=2.3.0
-pkgrel=1
+pkgver=2.6.0
+pkgrel=0
 pkgdesc="An opensource, crossplatform reverse engineering framework"
 url="http://www.radare.org"
 arch="all !aarch64"
@@ -16,7 +16,10 @@ depends_dev=""
 makedepends="$depends_dev libzip-dev libressl-dev capstone-dev linux-headers"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg $pkgname-libs"
-source="$pkgname-$pkgver.tar.gz::https://github.com/radare/$pkgname/archive/${pkgver}.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/radare/$pkgname/archive/${pkgver}.tar.gz
+	0001-fix-for-build-with-syscapstone.patch
+	0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch
+	0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch"
 builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
@@ -41,4 +44,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4b52ae3678c5bbba1d173f95715807469e88603067faf4f1058606a4235050ec07aebdb6408e24c0c031b9554b4ca095bf77fc2791a9efa498dfff49200b3b1d  radare2-2.3.0.tar.gz"
+sha512sums="44e7d0c10e17b40d4d71af851cf462c159b03b3242dfccd786bd54d3cf9f92441084f26694166dd1385e84c00626f45dbe09d1fe713595721723c468ac47b01b  radare2-2.6.0.tar.gz
+3d7500e805d14cbe12b856a57c2d6efb37c968210f1bfc6bfea4517a9234b02fc0e924c6c9fd9475d05b18a998abaed642cc5714b996f9d02c07d74e81f17c10  0001-fix-for-build-with-syscapstone.patch
+2f91f1718784ad77449596e828847d215556b2409a4c83f2d8d895c6b1d41f8b94f25d9450d15b595d008e8587c1eb687a0a8d8b4777a4a9b64411a0f6549c9d  0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch
+d7ee63b301a6191eb0504b50ee19e3aaadd3fdd08389c9d043dcade8c0115bc862464899c1e0607f860f21e5e890cdd416362cbc4b098e149ecdba765e8f4548  0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch"