Date: Tue, 13 Dec 2022 17:46:00 GMT From: Felix Palmen <zirias@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 613e9baa1d1b - main - databases/mysql80-server: Fix build with libressl Message-ID: <202212131746.2BDHk0YB007434@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=613e9baa1d1bebe6d4b6ed2a57d2e696c256cc65 commit 613e9baa1d1bebe6d4b6ed2a57d2e696c256cc65 Author: Felix Palmen <zirias@FreeBSD.org> AuthorDate: 2022-12-11 13:50:47 +0000 Commit: Felix Palmen <zirias@FreeBSD.org> CommitDate: 2022-12-13 17:45:30 +0000 databases/mysql80-server: Fix build with libressl PR: 267672 Approved by: joneum (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D37673 --- .../mysql80-server/files/patch-mysys_my__kdf.cc | 20 ++++++++++++++++++++ ...ch-router_src_harness_src_tls__server__context.cc | 12 ++++++++++++ 2 files changed, 32 insertions(+) diff --git a/databases/mysql80-server/files/patch-mysys_my__kdf.cc b/databases/mysql80-server/files/patch-mysys_my__kdf.cc new file mode 100644 index 000000000000..e4b12bfc09a0 --- /dev/null +++ b/databases/mysql80-server/files/patch-mysys_my__kdf.cc @@ -0,0 +1,20 @@ +--- mysys/my_kdf.cc.orig 2022-12-11 13:12:02 UTC ++++ mysys/my_kdf.cc +@@ -56,7 +56,7 @@ int create_kdf_key(const unsigned char *key, const uns + std::unique_ptr<Key_derivation_function> kdf_function; + + if (kdf_name == "hkdf") { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + kdf_function = std::make_unique<Key_hkdf_function>(kdf_options); + #else + return 1; +@@ -71,7 +71,7 @@ int create_kdf_key(const unsigned char *key, const uns + return kdf_function->derive_key(key, key_length, rkey, rkey_size); + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + Key_hkdf_function::Key_hkdf_function(vector<string> *kdf_options) { + kdf_options_ = {kdf_options}; + } diff --git a/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc b/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc new file mode 100644 index 000000000000..267814803231 --- /dev/null +++ b/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc @@ -0,0 +1,12 @@ +--- router/src/harness/src/tls_server_context.cc.orig 2022-12-11 13:24:16 UTC ++++ router/src/harness/src/tls_server_context.cc +@@ -272,7 +272,8 @@ stdx::expected<void, std::error_code> set_auto_dh_para + #if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(3, 0, 0) + SSL_CTX_set_dh_auto(ssl_ctx, 1); + #else +-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) ++#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) \ ++ && !defined(LIBRESSL_VERSION_NUMBER) + OsslUniquePtr<DH> dh_storage(DH_get_2048_256()); + #else + /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212131746.2BDHk0YB007434>