From nobody Mon Apr 17 10:44:55 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0Nwm1Kf8z45jXf; Mon, 17 Apr 2023 10:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0Nwl3Sc7z46R8; Mon, 17 Apr 2023 10:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681728295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IhnfXZfnSPQyApZx1KD8hIUxG/je+/qF2f65fLXrjSg=; b=jioiJoYJ7Vev1/lTRgWz/vvLlrW5oLdwwiO5kX8Fbd90EjbM+iAUSF80UWHIhvLZRkJ/ql MVkFwiXhQczolVazpVDjjG0jQBx5bUKRBsNqH46n8ZFWJ4A2Y69DAk7cNzirnUE/v7drUB 95NfGF4MIwrwxELHLbuZKSdXdpODBK6TSBA8Izmgcge8OahC6Nn7+NKbDgQ1Z5tEollDve WCfQg4IVci5ezqWb3bbquNIKHoQKOrvC1EBZcoMoVg7FwYEu7kdZULxVyDRJqOy/0oDx/0 Fd7KcVLP3DwjaVobiKQ+rpqaJR04fExETQ6TQT0RY5OWwy2TvKG044/s32vhDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681728295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IhnfXZfnSPQyApZx1KD8hIUxG/je+/qF2f65fLXrjSg=; b=QNfY0+rwLCo2AFnTOQo+pty9W7ObCKh4ulj3xN1ypkHMiEbyJbNP95UDdcQiAONCtVcUhh KSnNJGAiBGZvBWxb1+S5MBWshlwyrS3LVWHXtpQRxNmJyBO84g6tZ7iir2bqt1FsLGuQiw M8p8o5fkMCzxFcwl0JmJoKJwuq6wmZSb6a2zOJu1OWaK1mqjIOEiclMZiF8n+6/iv3ELJE I2u7Ry/kK7kfnlULgsP8o05WG6PkZlG5H7EAVujZV2FmBRlKZ3D8LH9LzKZsijn1l7quPs JT8Q3X78/QrGowdQ7EB/POV8nWRPiJCBrIeHWX0M0fUOLs3SDowM6X6ICw1Q5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681728295; a=rsa-sha256; cv=none; b=pT1Z7iy/9ICQY8uxVp1gzxgwsYolLEfyoWZrSVOU9aUWxdHoHlFBcQdSXN5ZlVolIuZOY0 zhzVwTRdNUur7UyhOcs7tIm359pncgmyc1qPDGrlbbVLI5nuHi0NFmwNjDvwJSp9mCn1lc Xs+oOiK2TwgRZhycLee7/YfhfrXYVOieyH4UODpPKU+KYeC0iR09r7J1yHUG3+kzrVQXvL /0Arww269IgwKtY+f51AcgggaiSuigdrYN8IP1lXddCLNEM+gwHwJOJ/2lILCs5qOJducT GAh1DjUiI29todzh+xnC3AgRQfMj1ZrHBhG1ZZaBaoGOuw3RwHFrgUvMQZhdaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0Nwl2YwfzR9J; Mon, 17 Apr 2023 10:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HAitrE074833; Mon, 17 Apr 2023 10:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HAitfJ074832; Mon, 17 Apr 2023 10:44:55 GMT (envelope-from git) Date: Mon, 17 Apr 2023 10:44:55 GMT Message-Id: <202304171044.33HAitfJ074832@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 6c9469b584ae - main - databases/galera26: Fix build with LibreSSL List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c9469b584ae0b4d96fd0a7700d6d3451168b8d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=6c9469b584ae0b4d96fd0a7700d6d3451168b8d1 commit 6c9469b584ae0b4d96fd0a7700d6d3451168b8d1 Author: Bernard Spil AuthorDate: 2023-04-17 10:42:49 +0000 Commit: Bernard Spil CommitDate: 2023-04-17 10:42:49 +0000 databases/galera26: Fix build with LibreSSL * None of the LibreSSL versions (35+) in ports require patching https://github.com/codership/galera/pull/640 PR: 264180 --- .../files/patch-asio_asio_ssl_impl_context.ipp | 143 +++++++++++++++++++++ ...ch-galerautils_src_gu__asio__stream__engine.cpp | 11 -- 2 files changed, 143 insertions(+), 11 deletions(-) diff --git a/databases/galera26/files/patch-asio_asio_ssl_impl_context.ipp b/databases/galera26/files/patch-asio_asio_ssl_impl_context.ipp new file mode 100644 index 000000000000..8e9c85ca711e --- /dev/null +++ b/databases/galera26/files/patch-asio_asio_ssl_impl_context.ipp @@ -0,0 +1,143 @@ +--- asio/asio/ssl/impl/context.ipp.orig 2023-02-03 12:20:21 UTC ++++ asio/asio/ssl/impl/context.ipp +@@ -87,7 +87,7 @@ context::context(context::method m) + #endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(OPENSSL_NO_SSL2) + + // SSL v3. +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) + case context::sslv3: + handle_ = ::SSL_CTX_new(::TLS_method()); + if (handle_) +@@ -132,7 +132,7 @@ context::context(context::method m) + #endif // defined(OPENSSL_NO_SSL3) + + // TLS v1.0. +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) + case context::tlsv1: + handle_ = ::SSL_CTX_new(::TLS_method()); + if (handle_) +@@ -177,7 +177,7 @@ context::context(context::method m) + #endif // defined(SSL_TXT_TLSV1) + + // TLS v1.1. +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) + case context::tlsv11: + handle_ = ::SSL_CTX_new(::TLS_method()); + if (handle_) +@@ -222,7 +222,7 @@ context::context(context::method m) + #endif // defined(SSL_TXT_TLSV1_1) + + // TLS v1.2. +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) + case context::tlsv12: + handle_ = ::SSL_CTX_new(::TLS_method()); + if (handle_) +@@ -267,8 +267,7 @@ context::context(context::method m) + #endif // defined(SSL_TXT_TLSV1_2) + + // TLS v1.3. +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) \ +- && !defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) + case context::tlsv13: + handle_ = ::SSL_CTX_new(::TLS_method()); + if (handle_) +@@ -294,7 +293,6 @@ context::context(context::method m) + } + break; + #else // (OPENSSL_VERSION_NUMBER >= 0x10101000L) +- // && !defined(LIBRESSL_VERSION_NUMBER) + case context::tlsv13: + case context::tlsv13_client: + case context::tlsv13_server: +@@ -302,7 +300,6 @@ context::context(context::method m) + asio::error::invalid_argument, "context"); + break; + #endif // (OPENSSL_VERSION_NUMBER >= 0x10101000L) +- // && !defined(LIBRESSL_VERSION_NUMBER) + + // Any supported SSL/TLS version. + case context::sslv23: +@@ -316,7 +313,7 @@ context::context(context::method m) + break; + + // Any supported TLS version. +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) + case context::tls: + handle_ = ::SSL_CTX_new(::TLS_method()); + if (handle_) +@@ -386,8 +383,7 @@ context::~context() + { + if (handle_) + { +-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ +- && !defined(LIBRESSL_VERSION_NUMBER)) \ ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \ + || defined(ASIO_USE_WOLFSSL) + void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); + #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) +@@ -399,8 +395,7 @@ context::~context() + static_cast( + cb_userdata); + delete callback; +-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ +- && !defined(LIBRESSL_VERSION_NUMBER)) \ ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \ + || defined(ASIO_USE_WOLFSSL) + ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0); + #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) +@@ -738,8 +733,7 @@ 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(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_); +@@ -767,8 +761,7 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain( + ASIO_SYNC_OP_VOID_RETURN(ec); + } + +-#if ((OPENSSL_VERSION_NUMBER >= 0x10002000L) \ +- && !defined(LIBRESSL_VERSION_NUMBER)) \ ++#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) \ + || defined(ASIO_USE_WOLFSSL) + ::SSL_CTX_clear_chain_certs(handle_); + #else +@@ -846,8 +839,7 @@ 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(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_); +@@ -915,8 +907,7 @@ 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(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_); +@@ -1156,8 +1147,7 @@ int context::verify_callback_function(int preverified, + ASIO_SYNC_OP_VOID context::do_set_password_callback( + detail::password_callback_base* callback, asio::error_code& ec) + { +-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ +- && !defined(LIBRESSL_VERSION_NUMBER)) \ ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \ + || defined(ASIO_USE_WOLFSSL) + void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); + ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback); diff --git a/databases/galera26/files/patch-galerautils_src_gu__asio__stream__engine.cpp b/databases/galera26/files/patch-galerautils_src_gu__asio__stream__engine.cpp deleted file mode 100644 index 6185cf594e4b..000000000000 --- a/databases/galera26/files/patch-galerautils_src_gu__asio__stream__engine.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- galerautils/src/gu_asio_stream_engine.cpp.orig 2021-11-15 21:09:11 UTC -+++ galerautils/src/gu_asio_stream_engine.cpp -@@ -100,7 +100,7 @@ class AsioTcpStreamEngine : public gu::AsioStreamEngin - - #include - --#if OPENSSL_VERSION_NUMBER >= 0x1010100fL -+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) - #define HAVE_READ_EX - #define HAVE_WRITE_EX - #endif