Attachment 231154 Details for Bug 261331 – 0001-devel-boost-libs-fix-consumer-builds-for-libressl

[patch] 0001-devel-boost-libs-fix-consumer-builds-for-libressl

0001-devel-boost-libs-fix-consumer-builds-for-libressl.patch (text/plain), 4.29 KB, created by Felix Palmen on 2022-01-19 11:45:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Palmen

Created: 2022-01-19 11:45:53 UTC

Size: 4.29 KB

patch

obsolete

>From b8a70103b8868d57fa6bc57eae228562fe652ef3 Mon Sep 17 00:00:00 2001
>From: Felix Palmen <felix@palmen-it.de>
>Date: Sat, 15 Jan 2022 15:54:02 +0100
>Subject: [PATCH] devel/boost-libs: fix consumer builds for libressl
>
>---
> devel/boost-libs/Makefile                     |  2 +-
> .../patch-boost_asio_ssl_impl_context.ipp     | 72 +++++++++++++++++++
> 2 files changed, 73 insertions(+), 1 deletion(-)
> create mode 100644 devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp
>
>diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile
>index b56236229037..8e395834597f 100644
>--- a/devel/boost-libs/Makefile
>+++ b/devel/boost-libs/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Alexander Churanov <churanov.port.maintainer@gmail.com>
> 
> PORTNAME=	boost-libs
>-PORTREVISION=	6
>+PORTREVISION=	7
> 
> COMMENT=	Free portable C++ libraries (without Boost.Python)
> 
>diff --git a/devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp b/devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp
>new file mode 100644
>index 000000000000..f632320e8f3f
>--- /dev/null
>+++ b/devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp
>@@ -0,0 +1,72 @@
>+--- boost/asio/ssl/impl/context.ipp.orig	2022-01-15 14:52:31 UTC
>++++ boost/asio/ssl/impl/context.ipp
>+@@ -387,8 +387,7 @@ context::~context()
>+ {
>+   if (handle_)
>+   {
>+-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+     || defined(BOOST_ASIO_USE_WOLFSSL)
>+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+ #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>+@@ -400,8 +399,7 @@ context::~context()
>+         static_cast<detail::password_callback_base*>(
>+             cb_userdata);
>+       delete callback;
>+-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+     || defined(BOOST_ASIO_USE_WOLFSSL)
>+       ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0);
>+ #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
>+@@ -739,8 +737,7 @@ BOOST_ASIO_SYNC_OP_VOID context::use_certificate_chain
>+   bio_cleanup bio = { make_buffer_bio(chain) };
>+   if (bio.p)
>+   {
>+-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+     || defined(BOOST_ASIO_USE_WOLFSSL)
>+     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
>+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+@@ -768,8 +765,7 @@ BOOST_ASIO_SYNC_OP_VOID context::use_certificate_chain
>+       BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
>+     }
>+ 
>+-#if ((OPENSSL_VERSION_NUMBER >= 0x10002000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) \
>+     || defined(BOOST_ASIO_USE_WOLFSSL)
>+     ::SSL_CTX_clear_chain_certs(handle_);
>+ #else
>+@@ -847,8 +843,7 @@ BOOST_ASIO_SYNC_OP_VOID context::use_private_key(
>+ {
>+   ::ERR_clear_error();
>+ 
>+-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+     || defined(BOOST_ASIO_USE_WOLFSSL)
>+     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
>+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+@@ -916,8 +911,7 @@ BOOST_ASIO_SYNC_OP_VOID context::use_rsa_private_key(
>+ {
>+   ::ERR_clear_error();
>+ 
>+-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+     || defined(BOOST_ASIO_USE_WOLFSSL)
>+     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
>+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+@@ -1157,8 +1151,7 @@ int context::verify_callback_function(int preverified,
>+ BOOST_ASIO_SYNC_OP_VOID context::do_set_password_callback(
>+     detail::password_callback_base* callback, boost::system::error_code& ec)
>+ {
>+-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
>++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
>+     || defined(BOOST_ASIO_USE_WOLFSSL)
>+   void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
>+   ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback);
>-- 
>2.34.1
>

Actions: View | Diff

Attachments on bug 261331: 231154