From 7eaff6c31b22e5345e03702148ef52866c8ba283 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 11 Jan 2017 14:05:41 +0300 Subject: 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 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 dev-util/radare2/files/radare2-1.1.0-openssl-1.1.0c.patch (limited to 'dev-util/radare2/files') 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 000000000000..28e2f55126f8 --- /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 < 0x1010000fL + if (!SSL_library_init ()) { + r_socket_free (s); + return NULL; + } + SSL_load_error_strings (); ++#endif + } + #endif + return s; -- cgit v1.2.3-65-gdbad