| 1 |
commit: 64ef1ea0da5b2f6698afdfd2c2204fa1b40f7e12 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 16 12:01:30 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 16 12:02:39 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ef1ea0 |
| 7 |
|
| 8 |
app-emulation/virtualbox: Fixed build against dev-libs/libressl. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/673800 |
| 11 |
Package-Manager: Portage-2.3.56, Repoman-2.3.12 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/virtualbox-6.0.0-libressl.patch | 24 ++++++++++++++++++++++ |
| 15 |
app-emulation/virtualbox/virtualbox-6.0.0.ebuild | 3 ++- |
| 16 |
app-emulation/virtualbox/virtualbox-6.0.2.ebuild | 1 + |
| 17 |
3 files changed, 27 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch b/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..a79ae1ddf68 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch |
| 24 |
@@ -0,0 +1,24 @@ |
| 25 |
+https://bugs.gentoo.org/673800 |
| 26 |
+ |
| 27 |
+diff --git a/src/VBox/Runtime/common/crypto/ssl-openssl.cpp b/src/VBox/Runtime/common/crypto/ssl-openssl.cpp |
| 28 |
+index e6d58b75..b2422983 100644 |
| 29 |
+--- a/src/VBox/Runtime/common/crypto/ssl-openssl.cpp |
| 30 |
++++ b/src/VBox/Runtime/common/crypto/ssl-openssl.cpp |
| 31 |
+@@ -271,7 +271,7 @@ RTDECL(int) RTCrSslCreateSessionForNativeSocket(RTCRSSL hSsl, RTHCINTPTR hNative |
| 32 |
+ pSession->pBio = BIO_new_socket(hNativeSocket, BIO_NOCLOSE); |
| 33 |
+ if (pSession->pBio) |
| 34 |
+ { |
| 35 |
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000 |
| 36 |
++# if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)) || LIBRESSL_VERSION_NUMBER >= 0x2070000f |
| 37 |
+ BIO_up_ref(pSession->pBio); /* our reference. */ |
| 38 |
+ # endif |
| 39 |
+ SSL_set_bio(pSession->pSsl, pSession->pBio, pSession->pBio); |
| 40 |
+@@ -319,7 +319,7 @@ static int rtCrSslSessionDestroy(RTCRSSLSESSIONINT *pThis) |
| 41 |
+ ASMAtomicWriteU32(&pThis->u32Magic, ~RTCRSSLSESSIONINT_MAGIC); |
| 42 |
+ SSL_free(pThis->pSsl); |
| 43 |
+ pThis->pSsl = NULL; |
| 44 |
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000 |
| 45 |
++# if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)) || LIBRESSL_VERSION_NUMBER >= 0x2070000f |
| 46 |
+ BIO_free(pThis->pBio); |
| 47 |
+ # endif |
| 48 |
+ pThis->pBio = NULL; |
| 49 |
|
| 50 |
diff --git a/app-emulation/virtualbox/virtualbox-6.0.0.ebuild b/app-emulation/virtualbox/virtualbox-6.0.0.ebuild |
| 51 |
index 09faed602e0..6cd4dce30fe 100644 |
| 52 |
--- a/app-emulation/virtualbox/virtualbox-6.0.0.ebuild |
| 53 |
+++ b/app-emulation/virtualbox/virtualbox-6.0.0.ebuild |
| 54 |
@@ -1,4 +1,4 @@ |
| 55 |
-# Copyright 1999-2018 Gentoo Authors |
| 56 |
+# Copyright 1999-2019 Gentoo Authors |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
|
| 59 |
EAPI=6 |
| 60 |
@@ -195,6 +195,7 @@ src_prepare() { |
| 61 |
fi |
| 62 |
|
| 63 |
eapply "${WORKDIR}/patches" |
| 64 |
+ eapply "${FILESDIR}"/${PN}-6.0.0-libressl.patch #673800 |
| 65 |
|
| 66 |
eapply_user |
| 67 |
} |
| 68 |
|
| 69 |
diff --git a/app-emulation/virtualbox/virtualbox-6.0.2.ebuild b/app-emulation/virtualbox/virtualbox-6.0.2.ebuild |
| 70 |
index 77317e5778d..699ab42ad4c 100644 |
| 71 |
--- a/app-emulation/virtualbox/virtualbox-6.0.2.ebuild |
| 72 |
+++ b/app-emulation/virtualbox/virtualbox-6.0.2.ebuild |
| 73 |
@@ -199,6 +199,7 @@ src_prepare() { |
| 74 |
|
| 75 |
rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die |
| 76 |
eapply "${WORKDIR}/patches" |
| 77 |
+ eapply "${FILESDIR}"/${PN}-6.0.0-libressl.patch #673800 |
| 78 |
|
| 79 |
eapply_user |
| 80 |
} |
Archives