From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1075488-garchives=archives.gentoo.org@lists.gentoo.org> 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 00173138334 for <garchives@archives.gentoo.org>; Sun, 3 Mar 2019 18:44:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11691E0874; Sun, 3 Mar 2019 18:44:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 DE33DE0874 for <gentoo-commits@lists.gentoo.org>; Sun, 3 Mar 2019 18:44:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C54EE335C78 for <gentoo-commits@lists.gentoo.org>; Sun, 3 Mar 2019 18:44:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6ED6154F for <gentoo-commits@lists.gentoo.org>; Sun, 3 Mar 2019 18:44:30 +0000 (UTC) From: "Thomas Deutschmann" <whissi@gentoo.org> 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" <whissi@gentoo.org> Message-ID: <1551638574.c08bdd10a1c9d7e81532ecd9a1e5cb646c9cf0d1.whissi@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20018_all_mysql-5.7.23-fix-libressl-support.patch 20018_all_mysql-5.7.25-fix-libressl-support.patch X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: c08bdd10a1c9d7e81532ecd9a1e5cb646c9cf0d1 X-VCS-Branch: master Date: Sun, 3 Mar 2019 18:44:30 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c0b0a7ec-a09c-4c5a-a033-35ec1e95edca X-Archives-Hash: 5885d15b8ab4c9b7e2adba67c6521e9a commit: c08bdd10a1c9d7e81532ecd9a1e5cb646c9cf0d1 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sun Mar 3 18:37:18 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sun Mar 3 18:42:54 2019 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=c08bdd10 Replace mysql LibreSSL patch Bug: https://bugs.gentoo.org/678682 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> ...pport.patch => 20018_all_mysql-5.7.25-fix-libressl-support.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/20018_all_mysql-5.7.23-fix-libressl-support.patch b/20018_all_mysql-5.7.25-fix-libressl-support.patch similarity index 98% rename from 20018_all_mysql-5.7.23-fix-libressl-support.patch rename to 20018_all_mysql-5.7.25-fix-libressl-support.patch index 6e4bd50..63eda07 100644 --- a/20018_all_mysql-5.7.23-fix-libressl-support.patch +++ b/20018_all_mysql-5.7.25-fix-libressl-support.patch @@ -10,7 +10,7 @@ https://bugs.gentoo.org/668894 m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL); -#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L +#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL) EVP_MD_CTX_cleanup(md_context); #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ EVP_MD_CTX_reset(md_context); @@ -22,7 +22,7 @@ https://bugs.gentoo.org/668894 #ifndef HAVE_YASSL -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090000fL) CRYPTO_malloc_init(); #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ OPENSSL_malloc_init(); @@ -60,4 +60,4 @@ https://bugs.gentoo.org/668894 -#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ } return(dh); - } + } \ No newline at end of file