[gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/, dev-util/radare2/files/

2023-01-22 Thread John Helmert III 
commit: 309640e8da12494bdc227e238bdbd7435cb415f9
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Jan 23 03:38:19 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Jan 23 04:32:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=309640e8

dev-util/radare2: add 5.8.2

Unbundle capstone to avoid upstream requirement of capstone-5 patches
which are not shipped in Gentoo's capstone package.

Bug: https://bugs.gentoo.org/885395
Bug: https://bugs.gentoo.org/889026
Bug: https://bugs.gentoo.org/891805
Closes: https://github.com/gentoo/gentoo/pull/29223
Signed-off-by: John Helmert III  gentoo.org>

 dev-util/radare2/Manifest  |   5 +
 .../files/radare2-5.8.2-bundled-capstone.patch |  21 
 .../radare2/files/radare2-5.8.2-vector35.patch |  24 
 dev-util/radare2/radare2-5.8.2.ebuild  | 125 +
 4 files changed, 175 insertions(+)

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 8929834b2409..942e4cb4793e 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -7,5 +7,10 @@ DIST radare2-5.7.6.tar.gz 10071795 BLAKE2B 
e0bd54fcf4a56b34ec6f3b87ab6a20a8be235
 DIST radare2-5.7.8-vector35-arm64.tar.gz 1050960 BLAKE2B 
12faa86a4cdfd9cdc8e307c16d8f797ae3ee800b72e76c6ace84cb7cb5108198dbfbc9a00df6b70448628dc869c94bf8cf9794460d05be99e5a08ee5a3ed40de
 SHA512 
478f06c3fe09232152bbb63e500a440ca8546cc11fe59f9d489a25d327469b1869fe80b4e2e2cfad8a2b96261857cf74b6708628ac30ec8dabc5da05d04c1cfd
 DIST radare2-5.7.8-vector35-armv7.tar.gz 255288 BLAKE2B 
ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8
 SHA512 
e9eb6cee02265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
 DIST radare2-5.7.8.tar.gz 10324020 BLAKE2B 
628b0c146a8e797f34f43f8d76166fb8c5e945a45232c2e4d63b2c2ce89aef96a20349c519ceb62921bad75ce5faaa8ea51ab1dac79156e00eef8f9ef06f5a45
 SHA512 
7c819a052f5e4b3da72b945915fca92a747c52dc2e2fa8483a8c2d8e71479ce374efbbe2bc02b1b4af26db6a891b6e44cdbb9e062de2f13b22a258cceab561f6
+DIST radare2-5.8.2-capstone-4.0.2.tar.gz 3439542 BLAKE2B 
435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9
 SHA512 
7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
+DIST radare2-5.8.2-vector35-arm64.tar.gz 1021315 BLAKE2B 
8741de83cddda878536627c0ff6be1f7d4842cf0fefeae2895fe751e39768134f6048167d5aa265169bc22b229a8b66ce37f4ef4df3abc2b3e304dc1f1fe17d1
 SHA512 
9b0fcf9119304e90b3fbed5e0509a819a0a561953681f5e5f408b55db3b0c962dca59c48553cffef21a56772db7871a3987f0f7c07b5538fd4b7d1af005ccdb0
+DIST radare2-5.8.2-vector35-armv7.tar.gz 255278 BLAKE2B 
8b5191c48fad2e7602dc2f7053f9c9ea8cca8e9bc5d68a0cdb7ccff9ecc65c5d1ff6a434e28488dbd6fb71fc7482fce08a0a69c358e5c3d6c017ac1e4cee3b21
 SHA512 
40c048b29856f48300d4539bc7bda38e6ceae1e8d4d9d131c4a7546b6e26b2fb96309c483b67e2c2290b06cea5fc52a7beb30557d54e89296e7734cc1ab06d10
+DIST radare2-5.8.2.tar.gz 11017554 BLAKE2B 
712941ac5871f2201ba806dc7b68ae1825c8dbe896b11aaa6b086651ff28a6d3b7e54b55621e7cc143748d7760ea7007f4dc70232ef16dfe5523a0ab87f0f266
 SHA512 
3c09d89172ac9a5cee6e52294f10b144237acb31b3d470521a7c8650511a58d1732c73004f2dbb1e6e3c43829e3e310b89d6a8abd5f1fb4fdfd3fea8779a72ec
+DIST radare2-testbins-1f0ea409f2af83fc4d0b685855de9d3b0f9eee41.tar.gz 
125596301 BLAKE2B 
55b876b09150e780359e753d26143640d410c1c15ace2e29bc06d2163657af2089c5044847f107e20256875c7ea5e7cc72460010df0c662c9da933a0388a3f0e
 SHA512 
44662f0217871a51b856f66e876eb57b2006f6350e6bcfae6629b800197b6f30196caf2474d52881a398fd1d65c68364d870b7de692c9e9a2bd1fab493afe3d0
 DIST radare2-testbins-2fdb78f7f754b3aea90377588d45b774ccb41086.tar.gz 
120580683 BLAKE2B 
ba16206f3c44f43c36fbc3079e43d29cd5b6266f8bd31602d7ec218a2b14601173c9022be9329975bd28de948933deeecc052f56c2acd9d6dfeb5576049ec32f
 SHA512 
2c66c8f68df7c51a52a73b33e854b095a4f5435c60eab2a1456f366376aac0f7c39836699e09eae2918f31e75b7c6562994f0916f45de53ae6a480506da95dcb
 DIST radare2-testbins-602471f72caa60d6ece43c3fa483c43decf7052c.tar.gz 
124090448 BLAKE2B 
446f4b730095dc263f31bbd886b350fbf3cbde0cd3bc6f5ed0c5d65a90a66b4d97a7397798c0f6fb7596722d827a3805c6d4d810d06837cf46e8798cedb1fea4
 SHA512 
b490ec951813827bed940ca4fc772691f8e446ce14cf2f0cc7fe2027a481c91939e6212ce94237f71091c18ac8428c9a4a4f35fc58f41ba076c1da75835d0ff4

diff --git a/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch 
b/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch
new file mode 100644
index ..31de9b72bb37
--- /dev/null
+++ b/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch
@@ -0,0 +1,21 @@
+Need to unbundle capstone due to broken capstone-5 compatibility:
+
+https://github.com/radareorg/radare2/issues/21204
+https://bugs.gentoo.org/891805
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/, dev-util/radare2/files/

2022-04-25 Thread Joonas Niilola 
commit: 48627ba2203445afedb3eb0e99c24cf931896f1e
Author: David Roman  gmail  com>
AuthorDate: Fri Apr 22 10:45:36 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Apr 25 06:56:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48627ba2

dev-util/radare2: verbump to 5.6.8

Bug: https://bugs.gentoo.org/831057
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: David Roman  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25155
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-util/radare2/Manifest  |   3 +
 dev-util/radare2/files/CVE-2022-1437.patch |  72 +++
 dev-util/radare2/radare2-5.6.8.ebuild  | 109 +
 3 files changed, 184 insertions(+)

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 38f5a0afce87..37816a87aff6 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,4 +1,7 @@
 DIST radare2-5.5.4-vector35-arm64.tar.gz 1021299 BLAKE2B 
389bdc43e90ba71961e5d8afca495bd63b25d4c0dc9513c5e9cc0770f091199197dc1e4b8a9d4c57206acfd892a6b4ff9ba8b0f925e493f540956c64edfcd809
 SHA512 
7762cee60acc7605c2c127acab646c5c58c5736e6801058eec69c2da52901d0ecab85b0496d798be6403bedf27ffd4fe4e3a8d47c8802af1fe3805a4ac32ae26
 DIST radare2-5.5.4-vector35-armv7.tar.gz 255288 BLAKE2B 
ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8
 SHA512 
e9eb6cee02265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
 DIST radare2-5.5.4.tar.gz 9610424 BLAKE2B 
4e113d854a55597270663f9c18f1d71da21fa8e539a997773f30178e93de54d397f56103813ec2c60cfabdf2d811151ad7285fc479e1ee681687831030e18da2
 SHA512 
b64268a8fcfbd89455b991557c82bb24d5f42471f4424cd971c1143ff604720fb4c00216a7054d72df6bbbdace1b814a6c3538708926c229dd2f8476b7d325da
+DIST radare2-5.6.8-vector35-arm64.tar.gz 1021299 BLAKE2B 
389bdc43e90ba71961e5d8afca495bd63b25d4c0dc9513c5e9cc0770f091199197dc1e4b8a9d4c57206acfd892a6b4ff9ba8b0f925e493f540956c64edfcd809
 SHA512 
7762cee60acc7605c2c127acab646c5c58c5736e6801058eec69c2da52901d0ecab85b0496d798be6403bedf27ffd4fe4e3a8d47c8802af1fe3805a4ac32ae26
+DIST radare2-5.6.8-vector35-armv7.tar.gz 255288 BLAKE2B 
ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8
 SHA512 
e9eb6cee02265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
+DIST radare2-5.6.8.tar.gz 9627480 BLAKE2B 
4de904ee779b72f0a0e305170cdf62b3a4c3fdad768bb2c9a96a90b429c94c2bae1523439d5b869d2fefed89849fde1d996dd1de400fe47ea657bee3dd258fe1
 SHA512 
e29a3ff235f37bcde4ec6c1c97d1b9c521b57e93512ca40d71be9e88ac1c002f41af905865fdf4685ee94287425cff32500b5a111eec5594bdd7f32f05631910
 DIST radare2-testbins-a6d1a0331605b4a5db9aa9260386c850d484dc70.tar.gz 
118148516 BLAKE2B 
9b1a1861b4aea7db1cc364d16577a2b7afe082b0838178d307ed24704710edfa572533bab9b194d38c1b294e5a4fb522d1a93e92a1c577ca6622a16d94209bd5
 SHA512 
fab0d2295e92c4bd0ab4c2ba646951e41cc4c1f9915d501a27fbff21e82d5340d1a9255d998dcf0e209a57bb35fc714adcb31ed7adb58aa412f6202e69c6

diff --git a/dev-util/radare2/files/CVE-2022-1437.patch 
b/dev-util/radare2/files/CVE-2022-1437.patch
new file mode 100644
index ..16e67c5d3193
--- /dev/null
+++ b/dev-util/radare2/files/CVE-2022-1437.patch
@@ -0,0 +1,72 @@
+--- a/libr/bin/format/mach0/coresymbolication.c
 b/libr/bin/format/mach0/coresymbolication.c
+@@ -269,6 +269,9 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile 
*bf, RBuffer *buf, ut
+   for (i = 0; i < hdr->n_sections && cursor < end; i++) {
+   ut8 *sect_start = cursor;
+   RCoreSymCacheElementSection *sect = 
>sections[i];
++  if (cursor + (word_size * 4) > end) {
++  goto beach;
++  }
+   sect->vaddr = sect->paddr = r_read_ble (cursor, false, 
bits);
+   if (sect->vaddr < page_zero_size) {
+   sect->vaddr += page_zero_size;
+@@ -359,6 +362,10 @@ RCoreSymCacheElement 
*r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut
+   continue;
+   }
+   string_origin = relative_to_strings? b + 
start_of_strings : cursor;
++  if (!string_origin) {
++  cursor += R_CS_EL_SIZE_LSYM;
++  continue;
++  }
+   lsym->flc.file = str_dup_safe (b, string_origin + 
file_name_off, end);
+   if (!lsym->flc.file) {
+   cursor += R_CS_EL_SIZE_LSYM;
+--- a/libr/bin/p/bin_symbols.c
 b/libr/bin/p/bin_symbols.c
+@@ -353,28 +353,30 @@ static bool check_buffer(RBinFile

[gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/, dev-util/radare2/files/

2021-04-12 Thread Sergei Trofimovich 
commit: e0bdceebac52482046dc9291ecc1bbdbbdb55f48
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Apr 12 23:04:21 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Apr 12 23:05:17 2021 +
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 
0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046dab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1
 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 000..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_FinalSHA256_Final
++
++#  define r_SHA384_Init SHA384_Init
++#  define r_SHA384_Update   SHA384_Update
++#  define r_SHA384_FinalSHA384_Final
++
++#  define r_SHA512_Init SHA512_Init
++#  define r_SHA512_Update   SHA512_Update
++#  define r_SHA512_FinalSHA512_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 000..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} == * ]]; 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/"

[gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/, dev-util/radare2/files/

2019-06-22 Thread Sergei Trofimovich 
commit: 677a68abfac2720af13042540adbb5f43b6475c3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 22 08:21:01 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 22 08:21:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677a68ab

dev-util/radare2: fix double-free in cmd_mount.c, bug #688336

Reported-by: D'juan McDonald (domhnall)
Bug: https://bugs.gentoo.org/688336
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../radare2/files/radare2-3.5.1-mount-free.patch   | 22 
 dev-util/radare2/radare2-3.5.1-r1.ebuild   | 60 ++
 2 files changed, 82 insertions(+)

diff --git a/dev-util/radare2/files/radare2-3.5.1-mount-free.patch 
b/dev-util/radare2/files/radare2-3.5.1-mount-free.patch
new file mode 100644
index 000..ad27596fc12
--- /dev/null
+++ b/dev-util/radare2/files/radare2-3.5.1-mount-free.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/688336
+
+From 40453029179d230cf02ffed205f2d63e33981b8f Mon Sep 17 00:00:00 2001
+From: pancake 
+Date: Mon, 17 Jun 2019 11:34:49 +0200
+Subject: [PATCH] Fix #14334 - Double-free in ms command
+
+---
+ libr/core/cmd_mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libr/core/cmd_mount.c
 b/libr/core/cmd_mount.c
+@@ -471,7 +471,7 @@ static int cmd_mount(void *data, const char *_input) {
+   rli->completion.run_user = rli->user;
+   r_line_completion_set (>completion, ms_argc, 
ms_argv);
+   r_fs_shell_prompt (, core->fs, input);
+-  free (cwd);
++  R_FREE (cwd);
+   r_pvector_clear (>completion.args);
+   memcpy (>completion, , sizeof (c));
+   }

diff --git a/dev-util/radare2/radare2-3.5.1-r1.ebuild 
b/dev-util/radare2/radare2-3.5.1-r1.ebuild
new file mode 100644
index 000..781c3273fe4
--- /dev/null
+++ b/dev-util/radare2/radare2-3.5.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org;
+
+if [[ ${PV} == * ]]; 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 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+   dev-libs/capstone:0=
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5.1-mount-free.patch
+)
+
+src_configure() {
+   econf \
+   --without-libuv \
+   --with-syscapstone \
+   $(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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/, dev-util/radare2/files/

2017-01-11 Thread Sergei Trofimovich 
commit: 7eaff6c31b22e5345e03702148ef52866c8ba283
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Jan 11 11:05:41 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jan 11 11:05:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eaff6c3

dev-util/radare2: backport eroen's openssl-1.1.0c fix

Bug: https://bugs.gentoo.org/604576

Package-Manager: Portage-2.3.3_p18, Repoman-2.3.1_p11

 .../files/radare2-1.1.0-openssl-1.1.0c.patch   | 31 ++
 dev-util/radare2/radare2-1.1.0.ebuild  |  3 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/dev-util/radare2/files/radare2-1.1.0-openssl-1.1.0c.patch 
b/dev-util/radare2/files/radare2-1.1.0-openssl-1.1.0c.patch
new file mode 100644
index ..28e2f55
--- /dev/null
+++ b/dev-util/radare2/files/radare2-1.1.0-openssl-1.1.0c.patch
@@ -0,0 +1,31 @@
+commit ecd8cf26c2647a1f455595209fcf2d6bfb72240f
+Author: eroen 
+Date:   Tue Jan 3 23:45:07 2017 +0100
+
+Disable deprecated initialization for openssl 1.1.0 (#6423)
+
+Openssl 1.1.0 handles this initialization internally. Leaving the calls in
+place causes "undefined reference" errors if openssl was built with
+`--api=1.1.0`.
+
+X-Gentoo-Bug: 604576
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604576
+
+diff --git a/libr/socket/socket.c b/libr/socket/socket.c
+index 1e30120fb..1ba87e77e 100755
+--- a/libr/socket/socket.c
 b/libr/socket/socket.c
+@@ -116,11 +116,13 @@ R_API RSocket *r_socket_new (int is_ssl) {
+   s->sfd = NULL;
+   s->ctx = NULL;
+   s->bio = NULL;
++#if OPENSSL_VERSION_NUMBER < 0x101fL
+   if (!SSL_library_init ()) {
+   r_socket_free (s);
+   return NULL;
+   }
+   SSL_load_error_strings ();
++#endif
+   }
+ #endif
+   return s;

diff --git a/dev-util/radare2/radare2-1.1.0.ebuild 
b/dev-util/radare2/radare2-1.1.0.ebuild
index ed05b06..a7480ac 100644
--- a/dev-util/radare2/radare2-1.1.0.ebuild
+++ b/dev-util/radare2/radare2-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 "
 src_prepare() {
epatch "${FILESDIR}"/${PN}-0.9.9-nogit.patch
+   epatch "${FILESDIR}"/${P}-openssl-1.1.0c.patch
 }
 
 src_configure() {