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 5BEC7138334 for ; Wed, 17 Oct 2018 12:24:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 378EFE0898; Wed, 17 Oct 2018 12:24:13 +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 054D8E0898 for ; Wed, 17 Oct 2018 12:24:12 +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 A142B335CCF for ; Wed, 17 Oct 2018 12:24:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E96542C for ; Wed, 17 Oct 2018 12:24:08 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1539779022.cfe842ed9596ea5bdd8e76636033116cc77cd213.whissi@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20018_all_percona-server-5.7.23-fix-libressl-support.patch X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: cfe842ed9596ea5bdd8e76636033116cc77cd213 X-VCS-Branch: master Date: Wed, 17 Oct 2018 12:24:08 +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-Archives-Salt: 979ffc0c-54a5-43cb-aad7-58e392973013 X-Archives-Hash: 3f5323048037211e398a4027a883d889 commit: cfe842ed9596ea5bdd8e76636033116cc77cd213 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Oct 17 12:23:42 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Oct 17 12:23:42 2018 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=cfe842ed Update 20018_all_percona-server-5.7.23-fix-libressl-support.patch Bug: https://bugs.gentoo.org/668818 Signed-off-by: Thomas Deutschmann gentoo.org> 20018_all_percona-server-5.7.23-fix-libressl-support.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/20018_all_percona-server-5.7.23-fix-libressl-support.patch b/20018_all_percona-server-5.7.23-fix-libressl-support.patch index a30dbc1..72d7a06 100644 --- a/20018_all_percona-server-5.7.23-fix-libressl-support.patch +++ b/20018_all_percona-server-5.7.23-fix-libressl-support.patch @@ -1,6 +1,19 @@ https://bugs.gentoo.org/662826 https://bugs.gentoo.org/668832 +https://bugs.gentoo.org/668818 +--- a/mysys_ssl/my_crypt.cc ++++ b/mysys_ssl/my_crypt.cc +@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX() + MyEncryptionCTX::~MyEncryptionCTX() + { + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + EVP_CIPHER_CTX_cleanup(ctx); + delete ctx; + ERR_remove_thread_state(0); --- a/sql/auth/sha2_password_common.cc +++ b/sql/auth/sha2_password_common.cc @@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest,