Attachment 177343 Details for Bug 214793 – fix compilation of software using libressl and boost asio

[patch] fix compilation of software using libressl and boost asio

devel_boost-libs.patch (text/plain), 2.96 KB, created by Matthew Rezny on 2016-11-23 20:11:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2016-11-23 20:11:20 UTC

Size: 2.96 KB

patch

obsolete

>Index: devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp
>===================================================================
>--- devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp	(nonexistent)
>+++ devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp	(working copy)
>@@ -0,0 +1,50 @@
>+# Ticket #12575 fix compilation of software using libressl and boost asio
>+# https://svn.boost.org/trac/boost/ticket/12575
>+#
>+--- boost/asio/ssl/impl/context.ipp.orig	2016-10-07 01:25:28.483581932 +0200
>++++ boost/asio/ssl/impl/context.ipp	2016-10-28 12:13:36.448622035 +0200
>+@@ -228,7 +228,7 @@
>+ {
>+   if (handle_)
>+   {
>+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
>+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+ #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>+     void* cb_userdata = handle_->default_passwd_callback_userdata;
>+@@ -578,7 +578,7 @@
>+   bio_cleanup bio = { make_buffer_bio(chain) };
>+   if (bio.p)
>+   {
>+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
>+     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
>+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+ #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>+@@ -682,7 +682,7 @@
>+ {
>+   ::ERR_clear_error();
>+ 
>+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
>+     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
>+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+ #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>+@@ -749,7 +749,7 @@
>+ {
>+   ::ERR_clear_error();
>+ 
>+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
>+     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
>+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+ #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>+@@ -988,7 +988,7 @@
>+ boost::system::error_code context::do_set_password_callback(
>+     detail::password_callback_base* callback, boost::system::error_code& ec)
>+ {
>+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
>+   void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+   ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback);
>+ #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>
>Property changes on: devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 214793: 177343