From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 98DCD1382C5 for ; Mon, 12 Apr 2021 23:06:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA8D2E0AD6; Mon, 12 Apr 2021 23:06:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 88AA1E0AD6 for ; Mon, 12 Apr 2021 23:06:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11CB9335CD8 for ; Mon, 12 Apr 2021 23:06:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 095EE59C for ; Mon, 12 Apr 2021 23:06:50 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1618268717.e0bdceebac52482046dc9291ecc1bbdbbdb55f48.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/, dev-util/radare2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/radare2/Manifest dev-util/radare2/files/radare2-5.2.0-ssl-build.patch dev-util/radare2/radare2-5.2.0.ebuild X-VCS-Directories: dev-util/radare2/ dev-util/radare2/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: e0bdceebac52482046dc9291ecc1bbdbbdb55f48 X-VCS-Branch: master Date: Mon, 12 Apr 2021 23:06:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b09ace8a-a057-4d22-9282-6a294e0437b8 X-Archives-Hash: 70bdb0fae555776f082e2d41c9840421 commit: e0bdceebac52482046dc9291ecc1bbdbbdb55f48 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Apr 12 23:04:21 2021 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Apr 12 23:05:17 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0bdceeb dev-util/radare2: bump up to 5.2.0 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich gentoo.org> dev-util/radare2/Manifest | 1 + .../radare2/files/radare2-5.2.0-ssl-build.patch | 54 +++++++++++++++ dev-util/radare2/radare2-5.2.0.ebuild | 80 ++++++++++++++++++++++ 3 files changed, 135 insertions(+) diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest index ad15617c38f..f17fb782b4a 100644 --- a/dev-util/radare2/Manifest +++ b/dev-util/radare2/Manifest @@ -1,2 +1,3 @@ DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899 DIST radare2-5.1.1.tar.gz 7920840 BLAKE2B c6109453d3da6a08f8169bfdc610614f2aee2d6ef13a975ed89e5337c79ad1a8340a08df1ba9d08cbb0db7b61db8c0357a4878e7b948a988c08b895c24ec366b SHA512 b6728bb59788804f5442d5eec8141f62c3b51f589955589b310733b3aeb28beedb969af540649f454dad96710231df384e389d8b4a1d55627d8370e4d3da454f +DIST radare2-5.2.0.tar.gz 8254980 BLAKE2B 51335b5560ea9085a7cb6ae998657d62353ad65e10f715ca25ec34cde75d48cd06d8312a898de71096138365d3ea13de45e6e48b2c0f06cea7d593cca43a0ef9 SHA512 664ea6df65c1ea8d13a80d281c3dbbcae16fb308826b9276e68d63f26f239f4a5c0d59abcf9325c299894ad4ebf1098b964aa3cad0bbe58b6c96cbd6e7b25952 diff --git a/dev-util/radare2/files/radare2-5.2.0-ssl-build.patch b/dev-util/radare2/files/radare2-5.2.0-ssl-build.patch new file mode 100644 index 00000000000..8701adb6266 --- /dev/null +++ b/dev-util/radare2/files/radare2-5.2.0-ssl-build.patch @@ -0,0 +1,54 @@ +From 7273429e4ba85318f0da2ae03ecc154834aaa73b Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 12 Apr 2021 23:48:09 +0100 +Subject: [PATCH] state.c: fix --with-openssl build + +Build failure happens at: + +``` +$ ./configure --with-openssl && make +.... +state.c: In function 'r_hash_do_hmac_sha256': +state.c:155:19: error: 'r_SHA256_BLOCK_LENGTH' undeclared (first use in this function); did you mean 'SHA256_BLOCK_LENGTH'? + 155 | ut8 bskey[r_SHA256_BLOCK_LENGTH]; // block-sized key + | ^~~~~~~~~~~~~~~~~~~~~ + | SHA256_BLOCK_LENGTH +``` + +The change defines r2_.* aliases for openssl implementation. +--- + libr/hash/state.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/libr/hash/state.c b/libr/hash/state.c +index 6f3ae6b4c..93adafc81 100644 +--- a/libr/hash/state.c ++++ b/libr/hash/state.c +@@ -7,6 +7,24 @@ + #include + #include + #include ++ ++# define r_SHA256_BLOCK_LENGTH SHA256_BLOCK_LENGTH ++ ++# define r_SHA1_Init SHA1_Init ++# define r_SHA1_Update SHA1_Update ++# define r_SHA1_Final SHA1_Final ++ ++# define r_SHA256_Init SHA256_Init ++# define r_SHA256_Update SHA256_Update ++# define r_SHA256_Final SHA256_Final ++ ++# define r_SHA384_Init SHA384_Init ++# define r_SHA384_Update SHA384_Update ++# define r_SHA384_Final SHA384_Final ++ ++# define r_SHA512_Init SHA512_Init ++# define r_SHA512_Update SHA512_Update ++# define r_SHA512_Final SHA512_Final + #else + #include "md4.h" + #include "md5.h" +-- +2.31.1 + diff --git a/dev-util/radare2/radare2-5.2.0.ebuild b/dev-util/radare2/radare2-5.2.0.ebuild new file mode 100644 index 00000000000..21ead643e77 --- /dev/null +++ b/dev-util/radare2/radare2-5.2.0.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 toolchain-funcs + +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/radareorg/radare2" +else + SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="ssl libressl" + +RDEPEND=" + dev-libs/libzip + dev-libs/xxhash + sys-apps/file + sys-libs/zlib + dev-libs/capstone:0= + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=("${FILESDIR}"/${P}-ssl-build.patch) + +src_prepare() { + # Fix hardcoded docdir for fortunes + sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \ + libr/include/r_userconf.h.acr + default +} + +src_configure() { + # Ideally these should be set by ./configure + tc-export CC AR LD OBJCOPY RANLIB + export HOST_CC=${CC} + + econf \ + --without-libuv \ + --with-syscapstone \ + --with-sysmagic \ + --with-sysxxhash \ + --with-syszip \ + $(use_with ssl openssl) +} + +src_install() { + default + + insinto /usr/share/zsh/site-functions + doins doc/zsh/_* + + newbashcomp doc/bash_autocompletion.sh "${PN}" + bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2 + + # 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 + + # These are not really docs. radare assumes + # uncompressed files: bug #761250 + docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips} +}