From 83475d174c35417699dc4a0b1dfb8de5b5fdc339 Mon Sep 17 00:00:00 2001 From: blshkv Date: Sun, 15 Oct 2017 10:55:29 +0800 Subject: [PATCH] radare2: v2.0.1 with few upstream bugs fixed --- dev-libs/radare2-bindings/Manifest | 2 +- ...0.ebuild => radare2-bindings-2.0.0.ebuild} | 5 +- dev-util/radare2/Manifest | 5 +- .../files/radare2-2.0.1_issue176.patch | 25 ++++++++ dev-util/radare2/radare2-1.2.1.ebuild | 45 -------------- dev-util/radare2/radare2-1.3.0.ebuild | 44 -------------- dev-util/radare2/radare2-1.4.0.ebuild | 44 -------------- dev-util/radare2/radare2-1.5.0.ebuild | 45 -------------- dev-util/radare2/radare2-2.0.1-r1.ebuild | 60 +++++++++++++++++++ .../base/package.accept_keywords/dev-libs | 4 +- .../base/package.accept_keywords/dev-util | 2 +- profiles/pentoo/base/package.use/dev-util | 2 + 12 files changed, 95 insertions(+), 188 deletions(-) rename dev-libs/radare2-bindings/{radare2-bindings-1.5.0.ebuild => radare2-bindings-2.0.0.ebuild} (93%) create mode 100644 dev-util/radare2/files/radare2-2.0.1_issue176.patch delete mode 100644 dev-util/radare2/radare2-1.2.1.ebuild delete mode 100644 dev-util/radare2/radare2-1.3.0.ebuild delete mode 100644 dev-util/radare2/radare2-1.4.0.ebuild delete mode 100644 dev-util/radare2/radare2-1.5.0.ebuild create mode 100644 dev-util/radare2/radare2-2.0.1-r1.ebuild diff --git a/dev-libs/radare2-bindings/Manifest b/dev-libs/radare2-bindings/Manifest index d99a9c98a..9dcea5ab1 100644 --- a/dev-libs/radare2-bindings/Manifest +++ b/dev-libs/radare2-bindings/Manifest @@ -1,2 +1,2 @@ -DIST radare2-bindings-1.5.0.tar.gz 1176535 SHA256 466ec7c80f849b0a0460943bdf0a4ae0f1195f7e0cd6173a350c0e25b370a262 SHA512 0d1ee1645e41b7383980d59c495ad8122f50eba669da4bfa314f34ca28cf70b11472a8511fb427c7fccddf51e14c994a2fd2da0c8adbab6ee62fb8b128046074 WHIRLPOOL 6acded3bed2af0468541f6297053fc23a30976c958a40a9e00b26b852303558f93ed910e19f50014782f93afd21653cc876c463c567d0b4740b0b373b709f1f7 DIST radare2-bindings-1.6.0.tar.gz 1197753 SHA256 abc320c4f5353f15d96a40329349253f140f0921074f0d0dbee6b3cb9f0067b8 SHA512 4e5c8b80df838dd9ee778f4e5828dc2b45495570e21f08f0a1763e210c2a5f4ba8c481d97be610541ffa93dfff227701acc5725f93a37c2c2926f55490686f13 WHIRLPOOL 0e7c5b543536cc8e08796f812952bf1723c3a5cf8550e86745a6b61032a7c72672de39f6c6e61b0f3dd39a2e84cce827f1ea035d38478cac26f8e8137afc9d76 +DIST radare2-bindings-2.0.0.tar.gz 1216502 SHA256 d3a4d697de06d664649dd1fb3f090a079351b89c9112ba317d79187730cf9850 SHA512 ff21b18fa058dab5f92652838aaad278083e04cb5857a4d9aaab1b10201b6750a7bd4d598db8cd43f0d35d58fb4ad684f7e1fb8a2e28c881c30ccaee662e3de1 WHIRLPOOL 1ed6f8ecffb7688ba7d880b6521a32658b6f51eed883b6c080c6ba5b5dd118a5591c883e0b0f5b9c6e61394cf6bb27c3e70f5b3dd79bda17da171c1bac7cd5bf diff --git a/dev-libs/radare2-bindings/radare2-bindings-1.5.0.ebuild b/dev-libs/radare2-bindings/radare2-bindings-2.0.0.ebuild similarity index 93% rename from dev-libs/radare2-bindings/radare2-bindings-1.5.0.ebuild rename to dev-libs/radare2-bindings/radare2-bindings-2.0.0.ebuild index 42aa5e726..430c541ff 100644 --- a/dev-libs/radare2-bindings/radare2-bindings-1.5.0.ebuild +++ b/dev-libs/radare2-bindings/radare2-bindings-2.0.0.ebuild @@ -29,13 +29,14 @@ RDEPEND=" " DEPEND="${RDEPEND} - ~dev-util/radare2-${PV} + =dev-util/radare2-2.0* virtual/pkgconfig - dev-util/valabind + >=dev-util/valabind-1.3.0 dev-lang/swig" src_prepare(){ epatch "${FILESDIR}/01_use_python_2.7.patch" +# epatch "${FILESDIR}/1.6.0-lua.patch" eapply_user } diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest index 37cb74f46..7d2716c99 100644 --- a/dev-util/radare2/Manifest +++ b/dev-util/radare2/Manifest @@ -1,5 +1,2 @@ -DIST radare2-1.2.1.tar.gz 8463288 SHA256 8e15959b85707f4b5c6d1244eeae7faa4d8f39a7c7f9345c0aa869b56dec49e6 SHA512 6598bd820226810dcbf0c8ae430463ebd6525995ca0ba223ec85fa06e42f6d58a05a2ddf66fe11bfcc03b5b205fabb30fed5c69afcd66e295cd76b18931c58b4 WHIRLPOOL de8af8a449ffa3d3793a0ecc01afcb00fc341b1a6eda5a85b62d71c4a47bb2075d099f3f8b15d76d04f4465e43e478386c950f217dbffb3be5aaeb07e4fa82a8 -DIST radare2-1.3.0.tar.gz 8517265 SHA256 adf9bbfb36b5cff986e8218455d75d7410e41e2fb4a380b99d1bcf6d36dce222 SHA512 ef410f8c5c0b931dab452c50b694313f26898a5f36c8286d18f56889e056658331cee87097a0e3028b8f53f25ec9c4354f6c78a41365a74d5bc67a38a6510174 WHIRLPOOL d3d5877814893308c0aa344740ef857d5814ec465d1f7deee73e226f4e1609ed9a75b3395c92fc382815464d1ceac3409bf09aade9f0f2f74cda93d3b2937ed8 -DIST radare2-1.4.0.tar.gz 8719644 SHA256 bf6e9ad94fd5828d3936563b8b13218433fbf44231cacfdf37a7312ae2b3e93e SHA512 5d022759e53f762094e237a29780d63dc4f39601ceacb22f58206bbb83a38a8938ea2321e49426b03421dcb0f6493a96f18905f8bf81025293f9c1a8087a4a0a WHIRLPOOL a86f5389d4905b970b22cd79b217d71a37a980b780b53078e5bcaf623d66e24999fb77a9d9b527986f5e9193b72f6b158e8dbefbed4d2557bdd9f0abffc88199 -DIST radare2-1.5.0.tar.gz 5514657 SHA256 c6b465cb2f36a206d5e9380c0bcbb4c05ed5cb7995e554703206e0bbdc9c74a1 SHA512 d12f448e13dba4507704143216fead40bcee88b59c006f7bc46778a6f423abf4b2b856df4348a4ccaa422e72d9a21ae18add691ceaf5b06936aec214871f7d88 WHIRLPOOL 3c3515c21c7095ff08900f747db2e2c02e3b880ffcfcc8e3b42e216ba2f0291a49e6afde391d3841c3e4a2ee29d2301eeb63513694288f30ce629a9a4254248d DIST radare2-1.6.0.tar.gz 5752191 SHA256 759d1c65dcd69d1189fc73e427c568ec234a7ca1958c19f5001c255dd31a3787 SHA512 6e1485c4edaa007790c07a8cfe190c4ea3e4df843620e2575587478e60f1be3dacaa0c545c84e135a51d9f7aff61c27f712c0ffa6038b556d347151f2a3cd2bb WHIRLPOOL 6a35b3b58bc5ec248de53ca3970c4791a8d837b330109f832ccd12d0660537ca0fa62101b806dc29f1123bd48d4139bd7ef1856f5fdbd31afe67daea384f1872 +DIST radare2-2.0.1.tar.gz 6001927 SHA256 d8f7e1ab96028fc8bd62d4f92fbbe8bbf48c6cda8112e6eaec93bf5ffbbbd1dd SHA512 1a8db3c71895fd9ccf284e7d0747770a5490872c5ee7f8e6d1c3a2590d2b344873bfc11b5f686bd08caa441bb787b2ec86aae9e83bf61e296f6a233d3ba35207 WHIRLPOOL 276f5628482a56eba3596a04f42a5fa60ed267ed09efea1adef1305cb3313d6ff59b0821ad05b5421620caa3e902f0839c61c619156f5bc1e1966d33261d1e3e diff --git a/dev-util/radare2/files/radare2-2.0.1_issue176.patch b/dev-util/radare2/files/radare2-2.0.1_issue176.patch new file mode 100644 index 000000000..e3505f7df --- /dev/null +++ b/dev-util/radare2/files/radare2-2.0.1_issue176.patch @@ -0,0 +1,25 @@ +diff -urN radare2-2.0.1.orig/libr/include/r_util/r_big.h radare2-2.0.1/libr/include/r_util/r_big.h +--- radare2-2.0.1.orig/libr/include/r_util/r_big.h 2017-10-13 00:28:33.000000000 +0800 ++++ radare2-2.0.1/libr/include/r_util/r_big.h 2017-10-15 10:10:14.078912464 +0800 +@@ -1,16 +1,16 @@ + #ifndef R_BIG_H + #define R_BIG_H ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + #if HAVE_LIB_GMP + #define RNumBig mpz_t + #elif HAVE_LIB_SSL + #define RNumBig BIGNUM + #else + #define R_BIG_SIZE 10000 +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- + typedef struct r_num_big_t { + char dgts[R_BIG_SIZE]; + int sign, last; diff --git a/dev-util/radare2/radare2-1.2.1.ebuild b/dev-util/radare2/radare2-1.2.1.ebuild deleted file mode 100644 index 4723caf38..000000000 --- a/dev-util/radare2/radare2-1.2.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit eutils - -DESCRIPTION="Advanced command line hexadecimal editor and more" -HOMEPAGE="http://www.radare.org" -SRC_URI="http://cloud.radare.org/get/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+syscapstone ssl" - -RDEPEND="syscapstone? ( >=dev-libs/capstone-4.0_alpha4:= ) - ssl? ( dev-libs/openssl:0= ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.9-nogit.patch -) - -src_configure() { - econf \ - $(use_with ssl openssl) \ - $(use_with syscapstone) -} - -src_install() { - # a workaround for unstable $(INSTALL) call, bug #574866 - local d - for d in doc/*; do - if [[ -d $d ]]; then - rm -rfv "$d" || die "failed to delete '$d'" - fi - done - - default -} diff --git a/dev-util/radare2/radare2-1.3.0.ebuild b/dev-util/radare2/radare2-1.3.0.ebuild deleted file mode 100644 index e1669d729..000000000 --- a/dev-util/radare2/radare2-1.3.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="Advanced command line hexadecimal editor and more" -HOMEPAGE="http://www.radare.org" -SRC_URI="http://cloud.radare.org/get/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+syscapstone ssl" - -RDEPEND="syscapstone? ( >=dev-libs/capstone-4.0_alpha4:= ) - ssl? ( dev-libs/openssl:0= ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.9-nogit.patch -) - -src_configure() { - econf \ - $(use_with ssl openssl) \ - $(use_with syscapstone) -} - -src_install() { - # a workaround for unstable $(INSTALL) call, bug #574866 - local d - for d in doc/*; do - if [[ -d $d ]]; then - rm -rfv "$d" || die "failed to delete '$d'" - fi - done - - default -} diff --git a/dev-util/radare2/radare2-1.4.0.ebuild b/dev-util/radare2/radare2-1.4.0.ebuild deleted file mode 100644 index e1669d729..000000000 --- a/dev-util/radare2/radare2-1.4.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="Advanced command line hexadecimal editor and more" -HOMEPAGE="http://www.radare.org" -SRC_URI="http://cloud.radare.org/get/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+syscapstone ssl" - -RDEPEND="syscapstone? ( >=dev-libs/capstone-4.0_alpha4:= ) - ssl? ( dev-libs/openssl:0= ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.9-nogit.patch -) - -src_configure() { - econf \ - $(use_with ssl openssl) \ - $(use_with syscapstone) -} - -src_install() { - # a workaround for unstable $(INSTALL) call, bug #574866 - local d - for d in doc/*; do - if [[ -d $d ]]; then - rm -rfv "$d" || die "failed to delete '$d'" - fi - done - - default -} diff --git a/dev-util/radare2/radare2-1.5.0.ebuild b/dev-util/radare2/radare2-1.5.0.ebuild deleted file mode 100644 index 2dd5b0388..000000000 --- a/dev-util/radare2/radare2-1.5.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="Advanced command line hexadecimal editor and more" -HOMEPAGE="http://www.radare.org" -#SRC_URI="http://cloud.radare.org/get/${PV}/${P}.tar.gz" -SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+syscapstone ssl" - -RDEPEND="syscapstone? ( >=dev-libs/capstone-4.0_alpha4:= ) - ssl? ( dev-libs/openssl:0= ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.9-nogit.patch -) - -src_configure() { - econf \ - $(use_with ssl openssl) \ - $(use_with syscapstone) -} - -src_install() { - # a workaround for unstable $(INSTALL) call, bug #574866 - local d - for d in doc/*; do - if [[ -d $d ]]; then - rm -rfv "$d" || die "failed to delete '$d'" - fi - done - - default -} diff --git a/dev-util/radare2/radare2-2.0.1-r1.ebuild b/dev-util/radare2/radare2-2.0.1-r1.ebuild new file mode 100644 index 000000000..04e3823cf --- /dev/null +++ b/dev-util/radare2/radare2-2.0.1-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils + +DESCRIPTION="unix-like reverse engineering framework and commandline tools" +HOMEPAGE="http://www.radare.org" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/radare/radare2" +else + SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~arm ~arm64" + PATCHES=( "${FILESDIR}"/${PN}-0.9.9-nogit.patch ) +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="ssl +system-capstone zsh-completion" + +RDEPEND=" + ssl? ( dev-libs/openssl:0= ) + system-capstone? ( dev-libs/capstone:0= ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +src_prepare() { + epatch "${FILESDIR}"/${P}_issue176.patch + #https://github.com/radare/radare2/issues/8688 + sed -i -e '/ln -fs "${PWD}\/sys/d' Makefile + eapply_user +} + +src_configure() { + econf \ + $(use_with ssl openssl) \ + $(use_with system-capstone syscapstone) +} + +src_install() { + default + + if use zsh-completion; then + insinto /usr/share/zsh/site-functions + doins doc/zsh/_* + fi + + # a workaround for unstable $(INSTALL) call, bug #574866 + local d + for d in doc/*; do + if [[ -d $d ]]; then + rm -rfv "$d" || die "failed to delete '$d'" + fi + done +} diff --git a/profiles/pentoo/base/package.accept_keywords/dev-libs b/profiles/pentoo/base/package.accept_keywords/dev-libs index 91a52e6c3..94322f7c5 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-libs +++ b/profiles/pentoo/base/package.accept_keywords/dev-libs @@ -5,8 +5,8 @@ dev-libs/msgpack ~dev-libs/libtecla-1.6.3 ~dev-libs/distorm64-3.3.4 -#bokken -=dev-libs/radare2-bindings-1.6* +#required by bokken +=dev-libs/radare2-bindings-2.0* ~dev-libs/libguytools2-2.0.1 diff --git a/profiles/pentoo/base/package.accept_keywords/dev-util b/profiles/pentoo/base/package.accept_keywords/dev-util index 181ebca94..9cda28e74 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-util +++ b/profiles/pentoo/base/package.accept_keywords/dev-util @@ -16,7 +16,7 @@ dev-util/intel-ocl-sdk ~dev-util/bokken-1.8 ~dev-util/pyew-2.0 =dev-util/valabind-1.4* -=dev-util/radare2-1.6* +=dev-util/radare2-2.0* #virtualbox ~dev-util/kbuild-0.1.9998_pre20131130 diff --git a/profiles/pentoo/base/package.use/dev-util b/profiles/pentoo/base/package.use/dev-util index 991b6dec9..c45b57e51 100644 --- a/profiles/pentoo/base/package.use/dev-util +++ b/profiles/pentoo/base/package.use/dev-util @@ -2,3 +2,5 @@ dev-util/nvidia-cuda-sdk opencl -doc -examples #do not build old kwallet dev-vcs/subversion -kwallet + +dev-util/radare2 system-capstone syscapstone