Attachment #176031 for bug #213683

View | Details | Raw Unified | Return to bug 213683
Collapse All | Expand All

Lines 2-9 Link Here

(-)emulators/virtualbox-ose/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= virtualbox-ose	4	PORTNAME= virtualbox-ose
5	PORTVERSION= 5.1.6	5	PORTVERSION= 5.1.8
6	PORTREVISION= 1
7	CATEGORIES= emulators	6	CATEGORIES= emulators
8	MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/	7	MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
9	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}	8	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1473714391	1	TIMESTAMP = 1477023920
2	SHA256 (VirtualBox-5.1.6.tar.bz2) = 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911	2	SHA256 (VirtualBox-5.1.8.tar.bz2) = e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933
3	SIZE (VirtualBox-5.1.6.tar.bz2) = 114669517	3	SIZE (VirtualBox-5.1.8.tar.bz2) = 114688166
4	SHA256 (VBoxGuestAdditions_5.1.6.iso) = cbcf9b9b1000e09911b3d20e1efe529aef8a945cf130f6abffc14a39522cc1ed
5	SIZE (VBoxGuestAdditions_5.1.6.iso) = 59258880




   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) \




--- 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

Lines 2-9 Link Here

(-)emulators/virtualbox-ose-additions/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= virtualbox-ose	4	PORTNAME= virtualbox-ose
5	PORTVERSION= 5.1.6	5	PORTVERSION= 5.1.8
6	PORTREVISION= 1
7	CATEGORIES= emulators	6	CATEGORIES= emulators
8	MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/	7	MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
9	PKGNAMESUFFIX?= -additions	8	PKGNAMESUFFIX?= -additions

Lines 1-3 Link Here

(-)emulators/virtualbox-ose-additions/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1473714391	1	TIMESTAMP = 1477024287
2	SHA256 (VirtualBox-5.1.6.tar.bz2) = 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911	2	SHA256 (VirtualBox-5.1.8.tar.bz2) = e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933
3	SIZE (VirtualBox-5.1.6.tar.bz2) = 114669517	3	SIZE (VirtualBox-5.1.8.tar.bz2) = 114688166

Lines 2-8 Link Here

(-)emulators/virtualbox-ose-kmod/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= virtualbox-ose	4	PORTNAME= virtualbox-ose
5	PORTVERSION= 5.1.6	5	PORTVERSION= 5.1.8
6	CATEGORIES= emulators	6	CATEGORIES= emulators
7	MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/	7	MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
8	PKGNAMESUFFIX= -kmod	8	PKGNAMESUFFIX= -kmod

Lines 1-3 Link Here

(-)emulators/virtualbox-ose-kmod/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1473714391	1	TIMESTAMP = 1477024307
2	SHA256 (VirtualBox-5.1.6.tar.bz2) = 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911	2	SHA256 (VirtualBox-5.1.8.tar.bz2) = e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933
3	SIZE (VirtualBox-5.1.6.tar.bz2) = 114669517	3	SIZE (VirtualBox-5.1.8.tar.bz2) = 114688166

Return to bug 213683

Lines 75-89 Link Here

(-)emulators/virtualbox-ose/files/patch-Config.kmk (-9 lines)
75	VBOX_WITH_DOCS=	75	VBOX_WITH_DOCS=
76	VBOX_WITH_DOCS_PACKING=	76	VBOX_WITH_DOCS_PACKING=
77	endif	77	endif
78	@@ -2562,7 +2558,7 @@ $(PATH_OUT)/DynamicConfig.kmk: \
79	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-delete-non-virtual-dtor ?= $(call VBOX_GCC_CHECK_CXX,-Wno-delete-non-virtual-dtor,)'
80	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-int-to-pointer-cast ?= $(call VBOX_GCC_CHECK_CC,-Wno-int-to-pointer-cast,)'
81	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-invalid-offsetof ?= $(call VBOX_GCC_CHECK_CXX,-Wno-invalid-offsetof,)'
82	-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!
83	+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!
84	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-literal-suffix ?= $(call VBOX_GCC_CHECK_CXX,-Wno-literal-suffix,)'
85	else
86	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-literal-suffix ?='
87	@@ -4247,7 +4243,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS =	78	@@ -4247,7 +4243,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS =
88	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \	79	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
89	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \	80	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \

Lines 1-45 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_crypto_digest-builtin.cpp (-45 lines)
1	--- src/VBox/Runtime/common/crypto/digest-builtin.cpp.orig 2016-08-16 20:00:25 UTC
2	+++ src/VBox/Runtime/common/crypto/digest-builtin.cpp
3	@@ -561,7 +561,7 @@ static PCRTCRDIGESTDESC const g_apDigest
4	* OpenSSL EVP.
5	*/
6
7	-# if OPENSSL_VERSION_NUMBER >= 0x10100000
8	+# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
9	/** @impl_interface_method{RTCRDIGESTDESC::pfnNew} */
10	static DECLCALLBACK(void*) rtCrDigestOsslEvp_New(void)
11	{
12	@@ -597,7 +597,7 @@ static DECLCALLBACK(int) rtCrDigestOsslE
13	if (fReInit)
14	{
15	pEvpType = EVP_MD_CTX_md(pThis);
16	-# if OPENSSL_VERSION_NUMBER >= 0x10100000
17	+# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
18	EVP_MD_CTX_reset(pThis);
19	# else
20	EVP_MD_CTX_cleanup(pThis);
21	@@ -616,7 +616,7 @@ static DECLCALLBACK(int) rtCrDigestOsslE
22	static DECLCALLBACK(void) rtCrDigestOsslEvp_Delete(void *pvState)
23	{
24	EVP_MD_CTX pThis = (EVP_MD_CTX )pvState;
25	-# if OPENSSL_VERSION_NUMBER >= 0x10100000
26	+# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
27	EVP_MD_CTX_reset(pThis);
28	# else
29	EVP_MD_CTX_cleanup(pThis);
30	@@ -661,13 +661,13 @@ static RTCRDIGESTDESC const g_rtCrDigest
31	NULL,
32	RTDIGESTTYPE_UNKNOWN,
33	EVP_MAX_MD_SIZE,
34	-# if OPENSSL_VERSION_NUMBER >= 0x10100000
35	+# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
36	0,
37	# else
38	sizeof(EVP_MD_CTX),
39	# endif
40	0,
41	-# if OPENSSL_VERSION_NUMBER >= 0x10100000
42	+# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
43	rtCrDigestOsslEvp_New,
44	rtCrDigestOsslEvp_Free,
45	# else