From nobody Mon Nov 07 08:00:14 2022 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 4N5Nv22x6yz4hHyL; Mon, 7 Nov 2022 08:00:14 +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 4N5Nv22NsQz3klk; Mon, 7 Nov 2022 08:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667808014; 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=gjpvlgHVU9tXyvHQ9FSGvxNZA85+UV8DR3PACf7QzEg=; b=utkMnq2JWHWfnZXMdWHO3CWloPWwU1E9cf/gMv8PZBW2qpuJjkulK5EfGl4qmv0F4tYNBa aNG/9lnZSLrawEMpTUU+bd9JEdcxsBQAJnPKBFq1q758SAPqzC+9dTJMUq6xUAS5JCWmG7 hCVvFyBCfgmOP+aYgE4AkjVlTIATFkPzSvi2qr+GkipE14mJqwUv+O9XJJGjj3zlLSk9Mf BBlmxhLYJbm401Y1SNyuKGhUA6mtUUbXvpkUFY0UkOT7IE2z37jDClId7DUw5UayJpuEwE lr1D+H5kOpznTJwJo1Qd/ympxQxVM0XooEtnqy/Bj8CWqSODu0tDsrJPx4uDkQ== 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 4N5Nv21Th6ztDD; Mon, 7 Nov 2022 08:00:14 +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 2A780E94002662; Mon, 7 Nov 2022 08:00:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A780EIV002655; Mon, 7 Nov 2022 08:00:14 GMT (envelope-from git) Date: Mon, 7 Nov 2022 08:00:14 GMT Message-Id: <202211070800.2A780EIV002655@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 5bdf39df0e56 - main - databases/mysql57-server: Fix build w/ libressl3.5 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: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bdf39df0e56f804860af475db15291b04bb25d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667808014; 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=gjpvlgHVU9tXyvHQ9FSGvxNZA85+UV8DR3PACf7QzEg=; b=JbVcK6W1WWCzLCtc7NNpr2I4A++e/LifDFVBkDTtv5zb/8jF2lgI2k+X4TwHfxy8rVHujG T/qBpN8f6coY1BlJpG3GsUFj9EvGJwJVnKrpK33xkVa61HwTmZP7Gp3UAFeUP0KKnyIBym 3i1swWCo5z/Edf817DvgazB//ZJd8cokaYt+YlZsslnAA5Trt4TwnAKTZHnoGaIX8dWQ4f bD1EaRyOlgVBInqqglm1MzcG4bCmaHAI8cRcZT9+o/Sc0WxxkV+IbR3LugBBu8w9CxAeby F4R02G8WV4MLIqZOsUm4fYKX77ZRWFy8DYrwxrFEHOTEjCfInmsZDpCkUcOeXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667808014; a=rsa-sha256; cv=none; b=TWzrvNGUIUHrDRxjWkG6p+dpCXhzSgWVLvh1tFW0wLHjPC1aONoygqPLHDXKubjyAfw0Cf kUfKHF57LRTgKPCcQe28IyXzrDj3GaXxy28i8Mo2Ci2WcPce8erExo9UBioXr/A0yjY8MF F2/IzJAV+FS6p1uBAL0A8/gSL4m0i1n4WYJ2IZ+BfNRNU4jCwiq54HD5hunOlC8EjFSa6u UbTYEjltkr5OjqHAs6HxJbRQSBQKO5emX/jB68zhU3OkIc/xDR1gOe7hi1dZFQqIv5TFY0 MRkzkJPIT+TdeTvHEsmpW3crRgUoCB11SFkYZ/KGlOo76LDW2oVwl20MLnytqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=5bdf39df0e56f804860af475db15291b04bb25d9 commit 5bdf39df0e56f804860af475db15291b04bb25d9 Author: Felix Palmen AuthorDate: 2022-10-18 10:54:28 +0000 Commit: Felix Palmen CommitDate: 2022-11-07 07:56:58 +0000 databases/mysql57-server: Fix build w/ libressl3.5 Approved by: joneum (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D37056 --- .../files/patch-mysys__ssl_my__kdf.cc | 20 +++++++ .../files/patch-mysys__ssl_my__kdf.h | 11 ++++ .../files/patch-vio_viosslfactories.c | 62 ---------------------- 3 files changed, 31 insertions(+), 62 deletions(-) diff --git a/databases/mysql57-server/files/patch-mysys__ssl_my__kdf.cc b/databases/mysql57-server/files/patch-mysys__ssl_my__kdf.cc new file mode 100644 index 000000000000..1c8527d5c9cc --- /dev/null +++ b/databases/mysql57-server/files/patch-mysys__ssl_my__kdf.cc @@ -0,0 +1,20 @@ +--- mysys_ssl/my_kdf.cc.orig 2022-11-04 07:47:44 UTC ++++ mysys_ssl/my_kdf.cc +@@ -59,7 +59,7 @@ int create_kdf_key(const unsigned char *key, const uns + Key_derivation_function *kdf_function = NULL; + + if (kdf_name == "hkdf") { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + kdf_function = new Key_hkdf_function(kdf_options); + #else + return 1; +@@ -87,7 +87,7 @@ Key_derivation_function::Key_derivation_function() { + options_valid_ = false; + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + Key_hkdf_function::Key_hkdf_function(vector *kdf_options) { + kdf_options_ = kdf_options; + } diff --git a/databases/mysql57-server/files/patch-mysys__ssl_my__kdf.h b/databases/mysql57-server/files/patch-mysys__ssl_my__kdf.h new file mode 100644 index 000000000000..deb0d98baa4c --- /dev/null +++ b/databases/mysql57-server/files/patch-mysys__ssl_my__kdf.h @@ -0,0 +1,11 @@ +--- mysys_ssl/my_kdf.h.orig 2022-11-04 07:47:17 UTC ++++ mysys_ssl/my_kdf.h +@@ -61,7 +61,7 @@ class Key_derivation_function { + bool options_valid_; + }; + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + + /** Class to implement KDF method hkdf. */ + class Key_hkdf_function : public Key_derivation_function { diff --git a/databases/mysql57-server/files/patch-vio_viosslfactories.c b/databases/mysql57-server/files/patch-vio_viosslfactories.c deleted file mode 100644 index 00c32ea9dca3..000000000000 --- a/databases/mysql57-server/files/patch-vio_viosslfactories.c +++ /dev/null @@ -1,62 +0,0 @@ ---- vio/viosslfactories.c -+++ vio/viosslfactories.c -@@ -123,21 +123,19 @@ static DH *get_dh2048(void) - DH *dh; - if ((dh=DH_new())) - { -- BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); -- BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); -- if (!p || !g --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -- || !DH_set0_pqg(dh, p, NULL, g) --#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ -- ) { -- /* DH_free() will free 'p' and 'g' at once. */ -+ BIGNUM *p = BN_bin2bn(dh2048_p,sizeof(dh2048_p), NULL); -+ BIGNUM *g = BN_bin2bn(dh2048_g,sizeof(dh2048_g), NULL); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+ dh->p=p; -+ dh->g=g; -+ if (! dh->p || ! dh->g) -+#else -+ if (!DH_set0_pqg(dh, p, NULL, g)) -+#endif -+ { - DH_free(dh); -- return NULL; -+ dh = NULL; - } --#if OPENSSL_VERSION_NUMBER < 0x10100000L -- dh->p= p; -- dh->g= g; --#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - } - return(dh); - } -@@ -503,7 +501,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi - struct st_VioSSLFd *ssl_fd; - /* MySQL 5.7 supports TLS up to v1.2, explicitly disable TLSv1.3. */ - long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 --#ifdef HAVE_TLSv13 -+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) - | SSL_OP_NO_TLSv1_3 - #endif /* HAVE_TLSv13 */ - ; -@@ -536,7 +534,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi - SSL_OP_NO_TLSv1 | - SSL_OP_NO_TLSv1_1 - | SSL_OP_NO_TLSv1_2 --#ifdef HAVE_TLSv13 -+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) - | SSL_OP_NO_TLSv1_3 - #endif /* HAVE_TLSv13 */ - | SSL_OP_NO_TICKET -@@ -559,7 +557,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi - - SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options); - --#ifdef HAVE_TLSv13 -+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) - /* - MySQL 5.7 doesn't support TLSv1.3 - set empty TLSv1.3 ciphersuites. - */