From nobody Sat Mar 05 10:20:20 2022 X-Original-To: dev-commits-ports-all@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 7DA4019FBD42; Sat, 5 Mar 2022 10:20:20 +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 4K9ghh37Vhz3jWv; Sat, 5 Mar 2022 10:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646475620; 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=WYmQV3+MMDiSFUGaTpDG/ZhU38+w9CUXFkVH8+XTyQE=; b=htj3T6rLtmVtCAYGVxXmuvu3H9OVQAJbFP6QIOM2Gnv5HC5LKsXW5cyixxDeEnU0uz5Cn8 ZCbfNtK+wdLTrdCSEsERrisTtmc04iIqg9Q2Q6L6bbuZ+2GKqg4zGMDG0Q8Q9xMwWX/3+y ZWxMB1LKb79Avv0WAk/wmDAmYwoiKezQWzrTwvO/IccdYv1d6Tj5DuZgTtpHTm2QiebeSM OlG/pOL5pYqmCa2e3SFqSb3KsqfihE+36MIxi7r4Q+aH8Ph/o5RQRrvEmBDkMTT/hEVSSG IwAm0VpUv5GHfWcSLO379bXHYbURE6Yp/PldatEBZmJTF0usMSgfHgsLFLh73w== 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 4B7E21DF67; Sat, 5 Mar 2022 10:20:20 +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 225AKKA4046911; Sat, 5 Mar 2022 10:20:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 225AKK1B046907; Sat, 5 Mar 2022 10:20:20 GMT (envelope-from git) Date: Sat, 5 Mar 2022 10:20:20 GMT Message-Id: <202203051020.225AKK1B046907@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 8db2be1cbddd - main - databases/mysql80-*: Fix build with LibreSSL List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8db2be1cbddd845d908ac64890cc9a4dbfcc8cdd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646475620; 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=WYmQV3+MMDiSFUGaTpDG/ZhU38+w9CUXFkVH8+XTyQE=; b=PhD6JsUgkmlG17/iJnqmOQme2Ut/9mQEkseBBu5GOnJj8TA61gLmo7fkhKncY2cmMGDXmj DFZ56p4GEFfauFPZBb0qpPfivgX7nE6z675Yq5oMp8i/qK/ctleMcDAaacDxJlxr6gTUjJ 0TiAeoFwTT/U7PwhyWGFWVhegY1xXUIwNUJwDIzJQfAle0QP6Xiyo8oDwFcB+20OSxBc44 ZEppRTWMFyOtSCSMaITCJ13+U21wzpNsru4cbS7IcBVc1TbKksAjiTlLjxPypUwrazalzD q4L93IzqfBJZWjyB3HWdC8fK6HmoEuwj2BJc+0zACOfBi9fiMyqf/0b4IU9BTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646475620; a=rsa-sha256; cv=none; b=PeT2M/PD5t6Y8TDKmzsk1NSq4Pqc79/7ZEJh90KKeu47MBmbJpYJduKD4ID4O8k58PhASi tB4TulppivoKLNoU/osvyI7DiLDAPimDfy09PnKpRnqMaTaOFZgX/KpuyWFy987BUquXvL HWOe+SzHIHnr7oBRbk+iBnEKZsCT5Og93oKHCMQvyTo4nGDVLSbIwO/fSK+KbLWyEuGTkt aElkOFquD/xHol8H5Ur6i5DqDEnXSEc19EWKjhEWXPuF+EeYUTh55kkhN9JsRL196ZFlps MtIzF/tgR0KhnNnow7hqiPdCvBED8ApDXGV8jVrob+oFaqxaSB2+3PuyEqSaow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=8db2be1cbddd845d908ac64890cc9a4dbfcc8cdd commit 8db2be1cbddd845d908ac64890cc9a4dbfcc8cdd Author: Jochen Neumeister AuthorDate: 2022-03-05 10:18:19 +0000 Commit: Jochen Neumeister CommitDate: 2022-03-05 10:20:14 +0000 databases/mysql80-*: Fix build with LibreSSL PR: 261164 Sponsored by: Netzkommune GmbH --- ...ork_xcom__network__provider__ssl_native__lib.cc | 20 +++++++++++++ .../files/patch-vio_viosslfactories.cc | 33 ++++++++++++++++------ 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/databases/mysql80-server/files/patch-plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_network_xcom__network__provider__ssl_native__lib.cc b/databases/mysql80-server/files/patch-plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_network_xcom__network__provider__ssl_native__lib.cc new file mode 100644 index 000000000000..bb1eb42d99aa --- /dev/null +++ b/databases/mysql80-server/files/patch-plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_network_xcom__network__provider__ssl_native__lib.cc @@ -0,0 +1,20 @@ +--- plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc.orig 2022-02-20 15:21:13.279471000 -0800 ++++ plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc 2022-02-20 15:22:02.451078000 -0800 +@@ -318,6 +318,7 @@ + + #define OPENSSL_ERROR_LENGTH 512 + static int configure_ssl_fips_mode(const int fips_mode) { ++#ifndef LIBRESSL_VERSION_NUMBER + int rc = -1; + int fips_mode_old = -1; + char err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; +@@ -338,6 +339,9 @@ + } + EXIT: + return rc; ++# else ++ return -1; ++# endif + } + + static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file, diff --git a/databases/mysql80-server/files/patch-vio_viosslfactories.cc b/databases/mysql80-server/files/patch-vio_viosslfactories.cc index 06cc1f909f4f..2e0fb5d55fe6 100644 --- a/databases/mysql80-server/files/patch-vio_viosslfactories.cc +++ b/databases/mysql80-server/files/patch-vio_viosslfactories.cc @@ -1,5 +1,5 @@ ---- vio/viosslfactories.cc.orig 2021-12-17 16:07:27 UTC -+++ vio/viosslfactories.cc +--- vio/viosslfactories.cc.orig 2021-12-17 08:07:27.000000000 -0800 ++++ vio/viosslfactories.cc 2022-02-20 11:48:11.223957000 -0800 @@ -40,6 +40,7 @@ #include "vio/vio_priv.h" @@ -8,7 +8,7 @@ #if OPENSSL_VERSION_NUMBER < 0x10002000L #include -@@ -472,6 +473,7 @@ void ssl_start() { +@@ -472,6 +473,7 @@ } } @@ -16,7 +16,7 @@ /** Set fips mode in openssl library, When we set fips mode ON/STRICT, it will perform following operations: -@@ -525,6 +527,7 @@ EXIT: +@@ -525,6 +527,7 @@ @returns openssl current fips mode */ uint get_fips_mode() { return FIPS_mode(); } @@ -24,7 +24,24 @@ /** Toggle FIPS mode, to see whether it is available with the current SSL library. -@@ -545,7 +548,7 @@ long process_tls_version(const char *tls_version) { +@@ -532,6 +535,7 @@ + @retval non-zero: FIPS is supported. + */ + int test_ssl_fips_mode(char *err_string) { ++#ifndef LIBRESSL_VERSION_NUMBER + int ret = FIPS_mode_set(FIPS_mode() == 0 ? 1 : 0); + unsigned long err = (ret == 0) ? ERR_get_error() : 0; + +@@ -539,13 +543,16 @@ + ERR_error_string_n(err, err_string, OPENSSL_ERROR_LENGTH - 1); + } + return ret; ++#else ++ return 0; ++#endif + } + + long process_tls_version(const char *tls_version) { const char *separator = ","; char *token, *lasts = nullptr; @@ -33,7 +50,7 @@ const char *tls_version_name_list[] = {"TLSv1.2", "TLSv1.3"}; const char ctx_flag_default[] = "TLSv1.2,TLSv1.3"; const long tls_ctx_list[] = {SSL_OP_NO_TLSv1_2, SSL_OP_NO_TLSv1_3}; -@@ -623,7 +626,7 @@ static struct st_VioSSLFd *new_VioSSLFd( +@@ -623,7 +630,7 @@ ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) & (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 @@ -42,7 +59,7 @@ | SSL_OP_NO_TLSv1_3 #endif /* HAVE_TLSv13 */ | SSL_OP_NO_TICKET); -@@ -632,7 +635,7 @@ static struct st_VioSSLFd *new_VioSSLFd( +@@ -632,7 +639,7 @@ return nullptr; if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ? @@ -51,7 +68,7 @@ TLS_client_method() : TLS_server_method() #else /* HAVE_TLSv13 */ -@@ -647,7 +650,7 @@ static struct st_VioSSLFd *new_VioSSLFd( +@@ -647,7 +654,7 @@ return nullptr; }