From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 41731138334 for ; Thu, 17 Oct 2019 18:34:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DD0BE0801; Thu, 17 Oct 2019 18:34:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4141AE0801 for ; Thu, 17 Oct 2019 18:34:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE90434BF8F for ; Thu, 17 Oct 2019 18:34:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 426A92A5 for ; Thu, 17 Oct 2019 18:34:42 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1571337263.5bda8618c55ed07f5652107d7b76ddc88454ee06.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20018_all_mysql-8.0.18-fix-libressl-support.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 5bda8618c55ed07f5652107d7b76ddc88454ee06 X-VCS-Branch: master Date: Thu, 17 Oct 2019 18:34:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a02059e8-cd93-46f0-8688-29e000063410 X-Archives-Hash: 6e0e72674c6073b1a2cc7309ad05adb2 commit: 5bda8618c55ed07f5652107d7b76ddc88454ee06 Author: Brian Evans gentoo org> AuthorDate: Thu Oct 17 18:34:23 2019 +0000 Commit: Brian Evans gentoo org> CommitDate: Thu Oct 17 18:34:23 2019 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=5bda8618 Fix 8.0.18 libressl patch Signed-off-by: Brian Evans gentoo.org> 20018_all_mysql-8.0.18-fix-libressl-support.patch | 31 +++++++++++++++++------ 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/20018_all_mysql-8.0.18-fix-libressl-support.patch b/20018_all_mysql-8.0.18-fix-libressl-support.patch index f6dc74f..e7e1a79 100644 --- a/20018_all_mysql-8.0.18-fix-libressl-support.patch +++ b/20018_all_mysql-8.0.18-fix-libressl-support.patch @@ -250,9 +250,24 @@ diff -aurN a/vio/viossl.cc b/vio/viossl.cc DBUG_PRINT("info", (" %d: %s\n", c->id, c->name)); #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ DBUG_PRINT("info", +diff -aurN a/include/violite.h b/include/violite.h +--- a/include/violite.h 2019-09-20 04:30:51.000000000 -0400 ++++ b/include/violite.h 2019-10-17 14:31:39.045842844 -0400 +@@ -269,9 +269,11 @@ + + long process_tls_version(const char *tls_version); + ++#ifndef LIBRESSL_VERSION_NUMBER + int set_fips_mode(const uint fips_mode, char *err_string); + + uint get_fips_mode(); ++#endif + + struct st_VioSSLFd *new_VioSSLAcceptorFd( + const char *key_file, const char *cert_file, const char *ca_file, diff -aurN a/vio/viosslfactories.cc b/vio/viosslfactories.cc ---- a/vio/viosslfactories.cc 2019-09-20 04:30:51.000000000 -0400 -+++ b/vio/viosslfactories.cc 2019-10-15 12:34:15.145676646 -0400 +--- a/vio/viosslfactories.cc 2019-10-17 14:27:32.672896538 -0400 ++++ b/vio/viosslfactories.cc 2019-10-17 14:27:47.776954552 -0400 @@ -420,6 +420,7 @@ } } @@ -261,11 +276,11 @@ diff -aurN a/vio/viosslfactories.cc b/vio/viosslfactories.cc /** Set fips mode in openssl library, When we set fips mode ON/STRICT, it will perform following operations: -@@ -466,6 +467,7 @@ - EXIT: - return rc; - } +@@ -473,6 +474,7 @@ + @returns openssl current fips mode + */ + uint get_fips_mode() { return FIPS_mode(); } +#endif - /** - Get fips mode from openssl library, + long process_tls_version(const char *tls_version) { + const char *separator = ",";