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

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 (file)
index 0000000..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 <eroen@users.noreply.github.com>
+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 < 0x1010000fL
+               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 ed05b063b1593bdf322e5d4b07411c8b2db13ba0..a7480ac46e88559db6692fd2c6254c868948ade6 100644 (file)
--- 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() {