jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4635 from pullmoll/vbox

Browse source 
virtualbox-ose: update to 5.1.2
This commit is contained in:
Jürgen Buchmüller 2016-08-17 09:22:35 +02:00 committed by GitHub
commit 5200f6eec4
2 changed files with 52 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
srcpkgs/virtualbox-ose/patches/009-libressl-compat.patch Normal file
View file

@ -0,0 +1,45 @@
--- src/VBox/Runtime/common/crypto/digest-builtin.cpp 2016-07-21 18:28:35.000000000 +0200
+++ src/VBox/Runtime/common/crypto/digest-builtin.cpp 2016-08-17 04:32:47.564725297 +0200
@@ -552,7 +552,7 @@
* OpenSSL EVP.
*/
-# if OPENSSL_VERSION_NUMBER >= 0x10100000
+# if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER)
/** @impl_interface_method{RTCRDIGESTDESC::pfnNew} */
static DECLCALLBACK(void*) rtCrDigestOsslEvp_New(void)
{
@@ -588,7 +588,7 @@
if (fReInit)
{
pEvpType = EVP_MD_CTX_md(pThis);
-# if OPENSSL_VERSION_NUMBER >= 0x10100000
+# if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER)
EVP_MD_CTX_reset(pThis);
# else
EVP_MD_CTX_cleanup(pThis);
@@ -607,7 +607,7 @@
static DECLCALLBACK(void) rtCrDigestOsslEvp_Delete(void *pvState)
{
EVP_MD_CTX *pThis = (EVP_MD_CTX *)pvState;
-# if OPENSSL_VERSION_NUMBER >= 0x10100000
+# if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER)
EVP_MD_CTX_reset(pThis);
# else
EVP_MD_CTX_cleanup(pThis);
@@ -652,13 +652,13 @@
NULL,
RTDIGESTTYPE_UNKNOWN,
EVP_MAX_MD_SIZE,
-# if OPENSSL_VERSION_NUMBER >= 0x10100000
+# if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER)
0,
# else
sizeof(EVP_MD_CTX),
# endif
0,
-# if OPENSSL_VERSION_NUMBER >= 0x10100000
+# if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER)
rtCrDigestOsslEvp_New,
rtCrDigestOsslEvp_Free,
# else

14
srcpkgs/virtualbox-ose/template
View file

@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
version=5.0.24
version=5.1.2
revision=1
wrksrc="VirtualBox-${version}"
short_desc="General-purpose full virtualizer for x86 hardware"
@ -8,18 +8,18 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://virtualbox.org"
license="GPL-2, CDDL"
distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2"
checksum=9134b04ca21ca23534e2300aab5ab7ff60d21b56bfd2e21504316bfee73afa87
checksum=03c92e3000d4b905d5b18a6abed757998125a37e5efa7864e62eae2baeabe010
nopie=yes
lib32disabled=yes
only_for_archs="i686 x86_64"
hostmakedepends="perl pkg-config dev86 yasm acpica-utils"
hostmakedepends="perl pkg-config dev86 yasm acpica-utils qt5-tools"
makedepends="libressl-devel libcurl-devel libpng-devel libvpx-devel
alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel
libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel
pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel
device-mapper-devel docbook-xsl gsoap-devel"
alsa-lib-devel pulseaudio-devel SDL-devel qt5-devel qt5-x11extras-devel
libXcursor-devel libXinerama-devel libXcomposite-devel libIDL-devel
libglib-devel pam-devel python-devel libxslt-devel libcap-devel
xorg-server-devel device-mapper-devel docbook-xsl gsoap-devel"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
makedepends+=" gcc-c++-multilib"