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 2F8B0138335 for ; Wed, 16 Jan 2019 12:02:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21727E0D05; Wed, 16 Jan 2019 12:02:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 DECD2E0D05 for ; Wed, 16 Jan 2019 12:02:51 +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 BDA52335CEF for ; Wed, 16 Jan 2019 12:02:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0530B515 for ; Wed, 16 Jan 2019 12:02:49 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1547640159.64ef1ea0da5b2f6698afdfd2c2204fa1b40f7e12.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/, app-emulation/virtualbox/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch app-emulation/virtualbox/virtualbox-6.0.0.ebuild app-emulation/virtualbox/virtualbox-6.0.2.ebuild X-VCS-Directories: app-emulation/virtualbox/files/ app-emulation/virtualbox/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 64ef1ea0da5b2f6698afdfd2c2204fa1b40f7e12 X-VCS-Branch: master Date: Wed, 16 Jan 2019 12:02:49 +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: 06c902f2-a04b-4490-9b15-6dccc3a5c2cf X-Archives-Hash: 788635d59b3a531df53a31f91857a8e1 commit: 64ef1ea0da5b2f6698afdfd2c2204fa1b40f7e12 Author: Lars Wendler gentoo org> AuthorDate: Wed Jan 16 12:01:30 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Jan 16 12:02:39 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ef1ea0 app-emulation/virtualbox: Fixed build against dev-libs/libressl. Closes: https://bugs.gentoo.org/673800 Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> .../files/virtualbox-6.0.0-libressl.patch | 24 ++++++++++++++++++++++ app-emulation/virtualbox/virtualbox-6.0.0.ebuild | 3 ++- app-emulation/virtualbox/virtualbox-6.0.2.ebuild | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch b/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch new file mode 100644 index 00000000000..a79ae1ddf68 --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/673800 + +diff --git a/src/VBox/Runtime/common/crypto/ssl-openssl.cpp b/src/VBox/Runtime/common/crypto/ssl-openssl.cpp +index e6d58b75..b2422983 100644 +--- a/src/VBox/Runtime/common/crypto/ssl-openssl.cpp ++++ b/src/VBox/Runtime/common/crypto/ssl-openssl.cpp +@@ -271,7 +271,7 @@ RTDECL(int) RTCrSslCreateSessionForNativeSocket(RTCRSSL hSsl, RTHCINTPTR hNative + pSession->pBio = BIO_new_socket(hNativeSocket, BIO_NOCLOSE); + if (pSession->pBio) + { +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)) || LIBRESSL_VERSION_NUMBER >= 0x2070000f + BIO_up_ref(pSession->pBio); /* our reference. */ + # endif + SSL_set_bio(pSession->pSsl, pSession->pBio, pSession->pBio); +@@ -319,7 +319,7 @@ static int rtCrSslSessionDestroy(RTCRSSLSESSIONINT *pThis) + ASMAtomicWriteU32(&pThis->u32Magic, ~RTCRSSLSESSIONINT_MAGIC); + SSL_free(pThis->pSsl); + pThis->pSsl = NULL; +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)) || LIBRESSL_VERSION_NUMBER >= 0x2070000f + BIO_free(pThis->pBio); + # endif + pThis->pBio = NULL; diff --git a/app-emulation/virtualbox/virtualbox-6.0.0.ebuild b/app-emulation/virtualbox/virtualbox-6.0.0.ebuild index 09faed602e0..6cd4dce30fe 100644 --- a/app-emulation/virtualbox/virtualbox-6.0.0.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -195,6 +195,7 @@ src_prepare() { fi eapply "${WORKDIR}/patches" + eapply "${FILESDIR}"/${PN}-6.0.0-libressl.patch #673800 eapply_user } diff --git a/app-emulation/virtualbox/virtualbox-6.0.2.ebuild b/app-emulation/virtualbox/virtualbox-6.0.2.ebuild index 77317e5778d..699ab42ad4c 100644 --- a/app-emulation/virtualbox/virtualbox-6.0.2.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.0.2.ebuild @@ -199,6 +199,7 @@ src_prepare() { rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die eapply "${WORKDIR}/patches" + eapply "${FILESDIR}"/${PN}-6.0.0-libressl.patch #673800 eapply_user }