Update to 5.1.8.

PR:		213683
Differential Revision:	https://reviews.freebsd.org/D8292

7 files changed, 13 insertions, 68 deletions

diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 5c603b207a68..457e220520dc 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.1.6
-PORTREVISION=	1
+PORTVERSION=	5.1.8
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX?=	-additions
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index 7c54f28d795b..c769f7cc6604 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473714391
-SHA256 (VirtualBox-5.1.6.tar.bz2) = 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911
-SIZE (VirtualBox-5.1.6.tar.bz2) = 114669517
+TIMESTAMP = 1477249150
+SHA256 (VirtualBox-5.1.8.tar.bz2) = e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933
+SIZE (VirtualBox-5.1.8.tar.bz2) = 114688166
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index 3da01d395b77..3197d767df4d 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.1.6
+PORTVERSION=	5.1.8
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX=	-kmod
diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
index 7c54f28d795b..c769f7cc6604 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473714391
-SHA256 (VirtualBox-5.1.6.tar.bz2) = 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911
-SIZE (VirtualBox-5.1.6.tar.bz2) = 114669517
+TIMESTAMP = 1477249150
+SHA256 (VirtualBox-5.1.8.tar.bz2) = e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933
+SIZE (VirtualBox-5.1.8.tar.bz2) = 114688166
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index 95a07bfad3c0..b2cdd2bb3590 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1473714391
-SHA256 (VirtualBox-5.1.6.tar.bz2) = 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911
-SIZE (VirtualBox-5.1.6.tar.bz2) = 114669517
-SHA256 (VBoxGuestAdditions_5.1.6.iso) = cbcf9b9b1000e09911b3d20e1efe529aef8a945cf130f6abffc14a39522cc1ed
-SIZE (VBoxGuestAdditions_5.1.6.iso) = 59258880
+TIMESTAMP = 1477249150
+SHA256 (VirtualBox-5.1.8.tar.bz2) = e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933
+SIZE (VirtualBox-5.1.8.tar.bz2) = 114688166
+SHA256 (VBoxGuestAdditions_5.1.8.iso) = 347fd39df6ddee8079ad41fbc038e2fb64952a40255d75292e8e49a0a0cbf657
+SIZE (VBoxGuestAdditions_5.1.8.iso) = 59314176
diff --git a/emulators/virtualbox-ose/files/patch-Config.kmk b/emulators/virtualbox-ose/files/patch-Config.kmk
index cf2280c3b434..772760609e9f 100644
--- a/emulators/virtualbox-ose/files/patch-Config.kmk
+++ b/emulators/virtualbox-ose/files/patch-Config.kmk
@@ -75,15 +75,6 @@
    VBOX_WITH_DOCS=
    VBOX_WITH_DOCS_PACKING=
   endif
-@@ -2562,7 +2558,7 @@ $(PATH_OUT)/DynamicConfig.kmk: \
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-delete-non-virtual-dtor    ?= $(call VBOX_GCC_CHECK_CXX,-Wno-delete-non-virtual-dtor,)'
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-int-to-pointer-cast        ?= $(call VBOX_GCC_CHECK_CC,-Wno-int-to-pointer-cast,)'
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-invalid-offsetof           ?= $(call VBOX_GCC_CHECK_CXX,-Wno-invalid-offsetof,)'
--if $(KBUILD_TARGET) != "darwin" || !defined(VBOX_WITH_NEW_XCODE) ## @todo somthing goes entirely sideways with the detection. clang doesn't know the option, but only complains when we use it in webservices/Makefile.kmk!
-+if ($(KBUILD_TARGET) != "darwin" || !defined(VBOX_WITH_NEW_XCODE)) && $(KBUILD_TARGET) != "freebsd" ## @todo somthing goes entirely sideways with the detection. clang doesn't know the option, but only complains when we use it in webservices/Makefile.kmk!
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-literal-suffix             ?= $(call VBOX_GCC_CHECK_CXX,-Wno-literal-suffix,)'
- else
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-literal-suffix             ?='
 @@ -4247,7 +4243,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS              =
  	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
  	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_crypto_digest-builtin.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_crypto_digest-builtin.cpp
deleted file mode 100644
index 2872176f2bdf..000000000000
--- a/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_crypto_digest-builtin.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/VBox/Runtime/common/crypto/digest-builtin.cpp.orig	2016-08-16 20:00:25 UTC
-+++ src/VBox/Runtime/common/crypto/digest-builtin.cpp
-@@ -561,7 +561,7 @@ static PCRTCRDIGESTDESC const g_apDigest
-  * 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)
- {
-@@ -597,7 +597,7 @@ static DECLCALLBACK(int) rtCrDigestOsslE
-     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);
-@@ -616,7 +616,7 @@ static DECLCALLBACK(int) rtCrDigestOsslE
- 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);
-@@ -661,13 +661,13 @@ static RTCRDIGESTDESC const g_rtCrDigest
-     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