Attachment #216565 for bug #244212




# $FreeBSD$

PORTNAME=	virtualbox-ose
PORTVERSION=	5.2.44
PORTREVISION=	4
CATEGORIES=	emulators
MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}

.endif

.if ${PORT_OPTIONS:MPYTHON}
USES+=		python
USE_PYTHON=	distutils noegginfo noflavors
PYDISTUTILS_PKGNAME=	vboxapi
PYDISTUTILS_PKGVERSION=	1.0
.else
USES+=		python:build
.endif

.if ${PORT_OPTIONS:MQT5}

		${WRKSRC}/src/VBox/Main/webservice/vboxweb.cpp
.endif
	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
	    -e 's| -mpreferred-stack-boundary=2||' \
	    -e 's|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' \
		${WRKSRC}/Config.kmk
	@${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk \
	    ${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk
	@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk

	    ${STAGEDIR}${DATADIR}/sdk/bindings/webservice/
.endif

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/virtualbox/*.so \
		${STAGEDIR}${PREFIX}/lib/virtualbox/components/*.so

.include <bsd.port.post.mk>

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1571257463	1	TIMESTAMP = 1594897148
2	SHA256 (VirtualBox-5.2.34.tar.bz2) = 9abff37330bba46b97aa836bc886397ba9cfb06cb75be5d60ac31f5ae9c2f2e1	2	SHA256 (VirtualBox-5.2.44.tar.bz2) = ad83b11cfae2734f7d6f619dd2f8bdada7d33492cd7682fab98cb4053122295e
3	SIZE (VirtualBox-5.2.34.tar.bz2) = 118268064	3	SIZE (VirtualBox-5.2.44.tar.bz2) = 124016934
4	SHA256 (VBoxGuestAdditions_5.2.34.iso) = d1b63891abca37fd78f5c8af1764e10e5754b1eecabd1fcfe7599c29a93ba007	4	SHA256 (VBoxGuestAdditions_5.2.44.iso) = 9883ee443a309f4ffa1d5dee2833f9e35ced598686c36d159f410e5edbac1ca4
5	SIZE (VBoxGuestAdditions_5.2.34.iso) = 49661952	5	SIZE (VBoxGuestAdditions_5.2.44.iso) = 49829888

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-Config.kmk (-13 / +21 lines)
1	--- Config.kmk.orig 2019-10-10 18:06:26 UTC	1	--- Config.kmk.orig 2020-05-13 19:36:41 UTC
2	+++ Config.kmk	2	+++ Config.kmk
3	@@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)	3	@@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)
4	# Enable OSS audio support.	4	# Enable OSS audio support.
Lines 74-80 Link Here
74	# branding	74	# branding
75	VBOX_BRAND_LICENSE_HTML := $(PATH_ROOT)/doc/License-gpl-2.0.html	75	VBOX_BRAND_LICENSE_HTML := $(PATH_ROOT)/doc/License-gpl-2.0.html
76	VBOX_BRAND_LICENSE_RTF := $(PATH_ROOT)/doc/License-gpl-2.0.rtf	76	VBOX_BRAND_LICENSE_RTF := $(PATH_ROOT)/doc/License-gpl-2.0.rtf
77	@@ -2538,6 +2534,10 @@ ifeq ($(KBUILD_HOST),win) ## @todo can drop this now,	77	@@ -1810,6 +1806,7 @@ ifndef VBOX_BLD_PYTHON
		78	else
		79	VBOX_BLD_PYTHON := $(firstword $(which python2.7$(HOSTSUFF_EXE)) $(which python2.6$(HOSTSUFF_EXE)) \
		80	$(which python$(HOSTSUFF_EXE)) $(which python3$(HOSTSUFF_EXE)) \
		81	+ $(which %%PYTHON_VERSION%%) \
		82	python-not-found)
		83	endif
		84	endif
		85	@@ -2550,6 +2547,10 @@ ifeq ($(KBUILD_HOST),win) ## @todo can drop this now,
78	# This isn't important (yet) on windows, so cook the result until	86	# This isn't important (yet) on windows, so cook the result until
79	# cygwin is feeling better.	87	# cygwin is feeling better.
80	VBOX_GCC_VERSION := $(int-add $(int-mul 10000, 3), $(int-mul 100, 3), 3)	88	VBOX_GCC_VERSION := $(int-add $(int-mul 10000, 3), $(int-mul 100, 3), 3)
Lines 85-91 Link Here
85	else	93	else
86	# This is kind of bad, the returned string needs to be re-evaluated before use.	94	# This is kind of bad, the returned string needs to be re-evaluated before use.
87	# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).	95	# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
88	@@ -4158,6 +4154,7 @@ ifdef VBOX_WITH_RAW_MODE	96	@@ -4218,6 +4219,7 @@ ifdef VBOX_WITH_RAW_MODE
89	TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC32_TOOL)	97	TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC32_TOOL)
90	TEMPLATE_VBoxRc_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)	98	TEMPLATE_VBoxRc_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
91	TEMPLATE_VBoxRc_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)	99	TEMPLATE_VBoxRc_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
Lines 93-99 Link Here
93	ifeq ($(KBUILD_TARGET),solaris)	101	ifeq ($(KBUILD_TARGET),solaris)
94	TEMPLATE_VBoxRc_LDFLAGS = -r	102	TEMPLATE_VBoxRc_LDFLAGS = -r
95	else	103	else
96	@@ -4299,6 +4296,7 @@ ifeq ($(VBOX_LDR_FMT),elf)	104	@@ -4359,6 +4361,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
97	TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)	105	TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
98	TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)	106	TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
99	TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)	107	TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
Lines 101-107 Link Here
101	TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding	109	TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
102	TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables	110	TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
103	ifeq ($(KBUILD_TARGET),solaris)	111	ifeq ($(KBUILD_TARGET),solaris)
104	@@ -4623,7 +4621,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \	112	@@ -4683,7 +4686,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \
105	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \	113	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
106	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \	114	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
107	-nostdinc -std=c99	115	-nostdinc -std=c99
Lines 110-116 Link Here
110	TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \	118	TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
111	-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \	119	-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \
112	-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef	120	-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef
113	@@ -4656,7 +4654,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS	121	@@ -4716,7 +4719,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
114	\| xargs -J% objcopy % $(out)	122	\| xargs -J% objcopy % $(out)
115		123
116	## Strip debug info (comment out if debugging or something).	124	## Strip debug info (comment out if debugging or something).
Lines 119-125 Link Here
119	endef	127	endef
120	else # x86	128	else # x86
121	TOOL_FREEBSDKMODLD_LINK_SYSMOD_OUTPUT = $(outbase).kld	129	TOOL_FREEBSDKMODLD_LINK_SYSMOD_OUTPUT = $(outbase).kld
122	@@ -4670,7 +4668,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS	130	@@ -4730,7 +4733,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
123	\| xargs -J% objcopy % $(outbase).kld	131	\| xargs -J% objcopy % $(outbase).kld
124		132
125	# Link the final .ko (a shared object).	133	# Link the final .ko (a shared object).
Lines 128-134 Link Here
128	endef	136	endef
129	endif # x86	137	endif # x86
130		138
131	@@ -4956,10 +4954,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \	139	@@ -5016,10 +5019,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \
132	TEMPLATE_VBOXR3EXE_CFLAGS += -fno-pic	140	TEMPLATE_VBOXR3EXE_CFLAGS += -fno-pic
133	TEMPLATE_VBOXR3EXE_CXXFLAGS += -fno-pic	141	TEMPLATE_VBOXR3EXE_CXXFLAGS += -fno-pic
134	TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic	142	TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic
Lines 148-154 Link Here
148	/usr/include \	156	/usr/include \
149	/usr/X11R6/include \	157	/usr/X11R6/include \
150	/usr/local/include	158	/usr/local/include
151	@@ -5250,7 +5256,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!	159	@@ -5310,7 +5321,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
152	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain	160	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain
153	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE)	161	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE)
154	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)	162	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)
Lines 157-163 Link Here
157	# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)	165	# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)
158	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))	166	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
159	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))	167	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
160	@@ -5777,10 +5783,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI	168	@@ -5837,10 +5848,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI
161	else ifeq ($(KBUILD_TARGET),haiku)	169	else ifeq ($(KBUILD_TARGET),haiku)
162	TEMPLATE_VBOXMAINEXE_TOOL = GXX3	170	TEMPLATE_VBOXMAINEXE_TOOL = GXX3
163	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) network stdc++ supc++	171	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) network stdc++ supc++
Lines 177-183 Link Here
177	/usr/include \	185	/usr/include \
178	/usr/X11R6/include \	186	/usr/X11R6/include \
179	/usr/local/include	187	/usr/local/include
180	@@ -6319,13 +6333,10 @@ ifdef VBOX_WITH_QTGUI	188	@@ -6382,13 +6401,10 @@ ifdef VBOX_WITH_QTGUI
181	TEMPLATE_VBOXQTGUIEXE_LIBPATH += \	189	TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
182	$(VBOX_LIBPATH_X11)	190	$(VBOX_LIBPATH_X11)
183	ifeq ($(KBUILD_TARGET),freebsd)	191	ifeq ($(KBUILD_TARGET),freebsd)
Lines 192-198 Link Here
192	/usr/local/lib	200	/usr/local/lib
193	endif	201	endif
194	ifeq ($(KBUILD_TARGET),solaris)	202	ifeq ($(KBUILD_TARGET),solaris)
195	@@ -6548,12 +6559,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \	203	@@ -6617,12 +6633,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \
196	TEMPLATE_VBoxBldProg_TOOL = GXX3	204	TEMPLATE_VBoxBldProg_TOOL = GXX3
197	TEMPLATE_VBoxBldProg_LIBS = pthread	205	TEMPLATE_VBoxBldProg_LIBS = pthread
198	TEMPLATE_VBoxBldProg_INCS += \	206	TEMPLATE_VBoxBldProg_INCS += \
Lines 205-211 Link Here
205	/usr/local/lib	213	/usr/local/lib
206	else ifeq ($(KBUILD_HOST),netbsd)	214	else ifeq ($(KBUILD_HOST),netbsd)
207	TEMPLATE_VBoxBldProg_TOOL = GXX3	215	TEMPLATE_VBoxBldProg_TOOL = GXX3
208	@@ -6954,6 +6961,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \	216	@@ -7023,6 +7035,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \
209	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \	217	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
210	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)	218	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
211	TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed	219	TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed




--- configure.orig	2020-05-13 19:36:41 UTC
+++ configure
@@ -138,10 +138,14 @@ CXX_FLAGS=""
 if [ "$OS" = "freebsd" ]; then

 else
   INCCURL=""
   LIBCURL="-lcurl"
@@ -441,6 +445,9 @@ check_gcc()
       elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "$OS" = "darwin" ]; then
         log_success "found version $cc_ver"
       # gcc-4.0 is allowed for Darwin only

+      # gcc-4.2 is allowed for FreeBSD only
       elif [ $cc_maj -lt 4 \
              -o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \
              -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS"  = "darwin" \) ]; then
@@ -1208,7 +1215,7 @@ extern "C" int main(void)
 #endif
 }
 EOF

     test_execute
   fi
 }
@@ -1508,8 +1515,7 @@ EOF
         if [ $? -eq 0 ]; then
           echo "(Qt5 from pkg-config)" >> $LOG
           FLGQT5=`pkg-config Qt5Core --cflags`

           INCQT5=`strip_I "$FLGQT5"`
           LIBDIR5=`pkg-config Qt5Core --variable=libdir`
           LIBQT5=`pkg-config Qt5Core --libs`
@@ -1648,7 +1654,7 @@ check_libopus()
       fi
       cat > $ODIR.tmp_src.cc << EOF
 #include <cstdio>

 extern "C" int main(void)
 {
   OpusEncoder *test;
@@ -1980,8 +1986,8 @@ EOF
         echo "compiling the following source file:" >> $LOG
         cat $ODIR.tmp_src.cc >> $LOG
         echo "using the following command line:" >> $LOG

         if [ $? -eq 0 ]; then
           found=1
           break
@@ -2453,7 +2459,7 @@ for option in "$@"; do
     --with-openssl-dir=*)
       OPENSSLDIR=`echo $option | cut -d'=' -f2`
       INCCRYPTO="-I${OPENSSLDIR}/include"

       ;;
     --with-ow-dir=*)
       WATCOM=`echo $option | cut -d'=' -f2`
@@ -2767,7 +2773,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
   check_ssl
   check_curl
   [ $WITH_LIBVPX -eq 1 ] && check_vpx

  [ "$OS" != "darwin"  ] && check_z
   [ "$OS" != "darwin"  ] && check_png
   [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
@@ -2788,13 +2794,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
   [ $WITH_PYTHON -eq 1 ] && check_python
   [ $WITH_JAVA   -eq 1 ] && check_java
 

  fi
 fi
 
@@ -2810,14 +2823,6 @@ if [ "$OS" = "linux" ]; then
     cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
   fi
   if [ $ONLY_ADDITIONS -eq 0 ]; then

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-include-VBox-vmm-cpumctx.h (-3 / +3 lines)
1	--- include/VBox/vmm/cpumctx.h.orig 2015-03-12 18:53:45.762704000 -0400	1	--- include/VBox/vmm/cpumctx.h.orig 2020-05-13 19:36:46 UTC
2	+++ include/VBox/vmm/cpumctx.h 2015-03-12 18:56:23.765105000 -0400	2	+++ include/VBox/vmm/cpumctx.h
3	@@ -84,7 +84,7 @@	3	@@ -88,7 +88,7 @@ AssertCompileSize(CPUMSELREG, 24);
4	# define CPUMSELREG_ARE_HIDDEN_PARTS_VALID(a_pVCpu, a_pSelReg) \	4	# define CPUMSELREG_ARE_HIDDEN_PARTS_VALID(a_pVCpu, a_pSelReg) \
5	( ((a_pSelReg)->fFlags & CPUMSELREG_FLAGS_VALID) \	5	( ((a_pSelReg)->fFlags & CPUMSELREG_FLAGS_VALID) \
6	&& ( (a_pSelReg)->ValidSel == (a_pSelReg)->Sel \	6	&& ( (a_pSelReg)->ValidSel == (a_pSelReg)->Sel \

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/files/patch-include-iprt-x86.h (-2 / +2 lines)
1	--- include/iprt/x86.h.orig 2014-02-25 11:59:50.000000000 -0500	1	--- include/iprt/x86.h.orig 2020-05-13 19:36:52 UTC
2	+++ include/iprt/x86.h 2014-03-11 16:46:08.000000000 -0400	2	+++ include/iprt/x86.h
3	@@ -35,6 +35,16 @@	3	@@ -35,6 +35,16 @@
4	# pragma D depends_on library vbox-types.d	4	# pragma D depends_on library vbox-types.d
5	#endif	5	#endif




--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig	2020-05-13 19:37:01 UTC
+++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c
@@ -102,8 +102,6 @@ struct VBoxGuestDeviceState
     struct resource   *pIrqRes;
     /** Pointer to the IRQ handler. */
     void              *pfnIrqHandler;

 };
 
 
@@ -113,8 +111,7 @@ struct VBoxGuestDeviceState
 /*
  * Character device file handlers.
  */

 static d_ioctl_t  vgdrvFreeBSDIOCtl;
 static int        vgdrvFreeBSDIOCtlSlow(PVBOXGUESTSESSION pSession, u_long ulCmd, caddr_t pvData, struct thread *pTd);
 static d_write_t  vgdrvFreeBSDWrite;
@@ -145,8 +142,7 @@ static struct cdevsw    g_vgdrvFreeBSDChrDevSW =
 {
     .d_version =        D_VERSION,
     .d_flags =          D_TRACKCLOSE | D_NEEDMINOR,

     .d_ioctl =          vgdrvFreeBSDIOCtl,
     .d_read =           vgdrvFreeBSDRead,
     .d_write =          vgdrvFreeBSDWrite,
@@ -154,81 +150,28 @@ static struct cdevsw    g_vgdrvFreeBSDChrDevSW =
     .d_name =           "vboxguest"
 };
 

 {
     int                 rc;
     PVBOXGUESTSESSION   pSession;
@@ -236,25 +179,18 @@ static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOp
     LogFlow(("vgdrvFreeBSDOpen:\n"));
 
     /*

     }
 
     LogRel(("vgdrvFreeBSDOpen: failed. rc=%d\n", rc));
@@ -262,33 +198,6 @@ static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOp
 }
 
 /**

  * I/O control request.
  *
  * @returns depends...
@@ -301,8 +210,12 @@ static int vgdrvFreeBSDClose(struct cdev *pDev, int fF
 static int vgdrvFreeBSDIOCtl(struct cdev *pDev, u_long ulCmd, caddr_t pvData, int fFile, struct thread *pTd)
 {
     PVBOXGUESTSESSION pSession;
-    devfs_get_cdevpriv((void **)&pSession);
+    int rc;
 
+    rc = devfs_get_cdevpriv((void **)&pSession);
+    if (rc)
+        return rc;
+
     /*
      * Deal with the fast ioctl path first.
      */
@@ -497,12 +410,14 @@ int VBOXCALL VBoxGuestIDC(void *pvSession, uintptr_t u
 
 static int vgdrvFreeBSDPoll(struct cdev *pDev, int fEvents, struct thread *td)
 {

         Log(("vgdrvFreeBSDPoll: no state data for %s\n", devtoname(pDev)));
         return (fEvents & (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM));
     }
@@ -543,11 +458,8 @@ static int vgdrvFreeBSDDetach(device_t pDevice)
     /*
      * Reverse what we did in vgdrvFreeBSDAttach.
      */
-    if (g_vgdrvFreeBSDEHTag != NULL)
-        EVENTHANDLER_DEREGISTER(dev_clone, g_vgdrvFreeBSDEHTag);
-
-    clone_cleanup(&g_pvgdrvFreeBSDClones);
+    destroy_dev(g_pDev);
 
-    clone_cleanup(&g_pvgdrvFreeBSDClones);
-
     vgdrvFreeBSDRemoveIRQ(pDevice, pState);
 
     if (pState->pVMMDevMemRes)
@@ -698,18 +610,21 @@ static int vgdrvFreeBSDAttach(device_t pDevice)
                 if (RT_SUCCESS(rc))
                 {
                     /*

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile (-3 / +3 lines)
1	--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2017-10-18 07:06:43 UTC	1	--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2020-05-13 19:37:01 UTC
2	+++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile	2	+++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile
3	@@ -70,6 +70,7 @@ SRCS += \	3	@@ -80,6 +80,7 @@ SRCS += \
4	handletable.c \	4	handletable.c \
5	handletablectx.c \	5	handletablectx.c \
6	once.c \	6	once.c \
Lines 8-14 Link Here
8	thread.c	8	thread.c
9		9
10	.PATH: ${.CURDIR}/common/string	10	.PATH: ${.CURDIR}/common/string
11	@@ -128,6 +129,7 @@ SRCS += \	11	@@ -139,6 +140,7 @@ SRCS += \
12		12
13	.PATH: ${.CURDIR}/r0drv	13	.PATH: ${.CURDIR}/r0drv
14	SRCS += \	14	SRCS += \




--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig	2020-05-13 19:37:01 UTC
+++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest
@@ -109,6 +109,7 @@ FILES_VBOXGUEST_NOBIN=" \
     ${PATH_ROOT}/src/VBox/Runtime/common/misc/handletable.h=>common/misc/handletable.h \
     ${PATH_ROOT}/src/VBox/Runtime/common/misc/handletablectx.cpp=>common/misc/handletablectx.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/misc/once.cpp=>common/misc/once.c \

     ${PATH_ROOT}/src/VBox/Runtime/common/misc/thread.cpp=>common/misc/thread.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp=>common/misc/RTAssertMsg1Weak.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp=>common/misc/RTAssertMsg2.c \
@@ -171,6 +172,7 @@ FILES_VBOXGUEST_NOBIN=" \
     ${PATH_ROOT}/src/VBox/Runtime/generic/errvars-generic.cpp=>generic/errvars-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/generic/timer-generic.cpp=>generic/timer-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/generic/mppresent-generic.cpp=>generic/mppresent-generic.c \

     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/initterm-r0drv.cpp=>r0drv/initterm-r0drv.c \
@@ -197,6 +199,7 @@ FILES_VBOXGUEST_NOBIN=" \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h=>r0drv/freebsd/sleepqueue-r0drv-freebsd.h \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c=>r0drv/generic/semspinmutex-r0drv-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp=>r0drv/generic/mpnotification-r0drv-generic.c \

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports.py (-2 / +2 lines)
1	--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py.orig 2014-12-19 16:58:04.474417000 -0500	1	--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py.orig 2020-06-26 09:52:40 UTC
2	+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py 2014-11-21 10:16:35.000000000 -0500	2	+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py
3	@@ -0,0 +1,95 @@	3	@@ -0,0 +1,95 @@
4	+# Copyright (c) 2001, Stanford University	4	+# Copyright (c) 2001, Stanford University
5	+# All rights reserved.	5	+# All rights reserved.

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports_dri.py (-2 / +2 lines)
1	--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py.orig 2014-12-19 16:58:04.474417000 -0500	1	--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py.orig 2020-06-26 09:53:28 UTC
2	+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py 2014-11-21 10:16:35.000000000 -0500	2	+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py
3	@@ -0,0 +1,95 @@	3	@@ -0,0 +1,95 @@
4	+# Copyright (c) 2001, Stanford University	4	+# Copyright (c) 2001, Stanford University
5	+# All rights reserved.	5	+# All rights reserved.

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_glxapi_exports.py (-2 / +2 lines)
1	--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py.orig 2014-12-19 16:58:04.474417000 -0500	1	--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py.orig 2020-06-26 09:53:39 UTC
2	+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py 2014-11-21 10:16:35.000000000 -0500	2	+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py
3	@@ -0,0 +1,104 @@	3	@@ -0,0 +1,104 @@
4	+"""	4	+"""
5	+Copyright (C) 2009-2012 Oracle Corporation	5	+Copyright (C) 2009-2012 Oracle Corporation




--- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig	2020-05-13 19:37:03 UTC
+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk
@@ -50,9 +50,7 @@ endif
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  #VBoxOGL_DRI = 1
  DLLS += VBoxEGL

 
  # Only Solaris right now needs C stubs because I can't figure out how to
  # generate the GOT based relocation ASM yet.
@@ -188,10 +186,12 @@ VBoxOGL_CLEAN.linux        += \
 	$(VBOX_PATH_CROGL_GENFILES)/linux_exports.c
 VBoxOGL_CLEAN.solaris        += \
 	$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c

  ifdef VBoxOGL_DRI
   VBoxOGL_CLEAN   += \
  	$(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
@@ -204,6 +204,8 @@ if1of ($(KBUILD_TARGET), linux solaris)
  	$(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm
   VBoxOGL_CLEAN.solaris   += \
  	$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm

  endif
 endif
 VBoxOGL_LIBS = \
@@ -244,6 +246,8 @@ if1of ($(KBUILD_TARGET), linux solaris freebsd)
  else
   VBoxOGL_SONAME.linux = libGL.so.1
   VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain

  endif
 endif
 ifdef VBOX_WITH_CRHGSMI
@@ -252,7 +256,7 @@ endif
 ifdef VBOX_WITH_WDDM
 VBoxOGL_DEFS.win   += VBOX_WITH_WDDM
 endif

 VBoxOGL_LDFLAGS += -Wl,-z,nodelete
 endif
 ifdef VBOX_WITH_WDDM
@@ -418,6 +422,16 @@ $(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm: \
 $(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm: $(PATH_SUB_CURRENT)/SunOS_i386_glxapi_exports.py | $$(dir $$@)
 	$(call MSG_GENERATE,python,$@,$<)
 	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<

 
    else
 $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \
@@ -656,6 +670,7 @@ ifndef VBOX_USE_SYSTEM_GL_HEADERS
 endif
 VBoxEGL_LIBS           = $(VBOX_LIB_OGL) # $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
 VBoxEGL_SONAME.linux   = libEGL.so.1
+VBoxEGL_SONAME.freebsd = libEGL.so.1
 

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient (-3 / +4 lines)
1	--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2015-02-12 11:08:13.000000000 -0500	1	--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2020-05-13 19:37:09 UTC
2	+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient 2015-02-12 14:38:40.689104000 -0500	2	+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient
3	@@ -28,9 +28,9 @@	3	@@ -30,10 +30,10 @@ elif test -z "${SSH_CONNECTION}"; then
4	# This script can also be triggered by a connection over SSH, which is not	4	# This script can also be triggered by a connection over SSH, which is not
5	# what we had in mind, so we do not start VBoxClient in that case. We do	5	# what we had in mind, so we do not start VBoxClient in that case. We do
6	# not use "exit" here as this script is "source"d, not executed.	6	# not use "exit" here as this script is "source"d, not executed.
Lines 14-17 Link Here
14	+ /usr/local/bin/VBoxClient --display	14	+ /usr/local/bin/VBoxClient --display
15	+ /usr/local/bin/VBoxClient --seamless	15	+ /usr/local/bin/VBoxClient --seamless
16	+ /usr/local/bin/VBoxClient --draganddrop	16	+ /usr/local/bin/VBoxClient --draganddrop
		17	/usr/bin/VBoxClient --vmsvga-x11 # In case VMSVGA emulation is enabled
17	fi	18	fi

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop (-3 / +3 lines)
1	--- src/VBox/Additions/x11/Installer/vboxclient.desktop.orig 2009-06-12 12:34:57.000000000 +0000	1	--- src/VBox/Additions/x11/Installer/vboxclient.desktop.orig 2020-05-13 19:37:09 UTC
2	+++ src/VBox/Additions/x11/Installer/vboxclient.desktop 2011-01-13 22:07:37.000000000 +0000	2	+++ src/VBox/Additions/x11/Installer/vboxclient.desktop
3	@@ -8,6 +8,6 @@	3	@@ -8,6 +8,6 @@ Comment[C]=VirtualBox User Session Services
4	Comment=VirtualBox User Session Services	4	Comment=VirtualBox User Session Services
5	Comment[it]=Servizi di sessione utente di VirtualBox	5	Comment[it]=Servizi di sessione utente di VirtualBox
6	Comment[pl]=Usługi sesji użytkownika VirtualBox	6	Comment[pl]=Usługi sesji użytkownika VirtualBox

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h (-3 / +3 lines)
1	--- src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h.orig 2015-03-02 10:09:19.000000000 -0500	1	--- src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h.orig 2020-05-13 19:42:23 UTC
2	+++ src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h 2015-03-02 19:42:56.808020000 -0500	2	+++ src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h
3	@@ -241,6 +241,9 @@	3	@@ -245,6 +245,9 @@ struct mbuf {
4	#define M_FRAG 0x00000800 /* packet is a fragment of a larger packet */	4	#define M_FRAG 0x00000800 /* packet is a fragment of a larger packet */
5	#define M_FIRSTFRAG 0x00001000 /* packet is first fragment */	5	#define M_FIRSTFRAG 0x00001000 /* packet is first fragment */
6	#define M_LASTFRAG 0x00002000 /* packet is last fragment */	6	#define M_LASTFRAG 0x00002000 /* packet is last fragment */

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk (-3 / +3 lines)
1	--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2013-11-29 14:23:32.000000000 -0500	1	--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2020-05-13 19:42:27 UTC
2	+++ src/VBox/Devices/PC/ipxe/Makefile.kmk 2013-12-13 15:06:45.000000000 -0500	2	+++ src/VBox/Devices/PC/ipxe/Makefile.kmk
3	@@ -35,7 +35,7 @@	3	@@ -35,7 +35,7 @@ iPxeBiosBin_SOURCES = $(iPxeBiosBin_0_OUTDIR)/iPxeBio
4	iPxeBiosBin_CLEAN = \	4	iPxeBiosBin_CLEAN = \
5	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \	5	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
6		6

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile (-3 / +3 lines)
1	--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2016-07-18 11:56:20 UTC	1	--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2020-05-13 19:43:53 UTC
2	+++ src/VBox/HostDrivers/Support/freebsd/Makefile	2	+++ src/VBox/HostDrivers/Support/freebsd/Makefile
3	@@ -81,6 +81,7 @@ SRCS += \	3	@@ -82,6 +82,7 @@ SRCS += \
4	assert.c \	4	assert.c \
5	handletable.c \	5	handletable.c \
6	handletablectx.c \	6	handletablectx.c \
Lines 8-14 Link Here
8	once.c \	8	once.c \
9	term.c \	9	term.c \
10	thread.c	10	thread.c
11	@@ -92,13 +93,14 @@ SRCS += \	11	@@ -94,13 +95,14 @@ SRCS += \
12	RTStrCopy.c \	12	RTStrCopy.c \
13	RTStrCopyEx.c \	13	RTStrCopyEx.c \
14	RTStrCopyP.c \	14	RTStrCopyP.c \




Fix kmod panic when VIMAGE is disabled in the kernel and port

Submitted by:	Gleb Kurtsou <gleb@freebsd.org>
--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig	2020-05-13 19:43:54 UTC
+++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
@@ -203,12 +203,15 @@ $$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \
 		$$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
 		| $$(dir $$@)
 	$(QUIET)$(RM) -f -- $@

+ ifndef VBOX_WITH_HARDENING
+	$(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@
+	${QUIET}$(MV) -f $@.tmp $@
  endif
-
+ ifndef VBOX_WITH_NETFLT_VIMAGE
+	$(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@
+	${QUIET}$(MV) -f $@.tmp $@
+ endif
-
 endif # freebsd
 
 include $(FILE_KBUILD_SUB_FOOTER)

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c (-3 / +3 lines)
1	--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2014-09-09 15:54:30.000000000 -0400	1	--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2020-05-13 19:43:54 UTC
2	+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2014-09-30 15:36:06.000000000 -0400	2	+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c
3	@@ -234,7 +234,11 @@	3	@@ -235,7 +235,11 @@ static void VBoxNetAdpFreeBSDNetstart(struct ifnet *if
4	ifp->if_drv_flags \|= IFF_DRV_OACTIVE;	4	ifp->if_drv_flags \|= IFF_DRV_OACTIVE;
5	while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))	5	while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
6	{	6	{

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Installer-Makefile.kmk (-5 / +4 lines)
1	--- src/VBox/Installer/Makefile.kmk.orig 2009-10-05 14:31:40.000000000 +0200	1	--- src/VBox/Installer/Makefile.kmk.orig 2020-05-13 19:44:01 UTC
2	+++ src/VBox/Installer/Makefile.kmk 2009-10-05 14:32:09.000000000 +0200	2	+++ src/VBox/Installer/Makefile.kmk
3	@@ -38,10 +38,12 @@	3	@@ -41,9 +41,11 @@ ifndef VBOX_ONLY_SDK
4	if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_HOST)" == "win"	4	if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_HOST)" == "win"
5	include $(PATH_SUB_CURRENT)/win/Makefile.kmk	5	include $(PATH_SUB_CURRENT)/win/Makefile.kmk
6	endif	6	endif
Lines 8-15 Link Here
8	if "$(KBUILD_TARGET)" == "freebsd" && "$(KBUILD_HOST)" == "freebsd"	8	if "$(KBUILD_TARGET)" == "freebsd" && "$(KBUILD_HOST)" == "freebsd"
9	include $(PATH_SUB_CURRENT)/freebsd/Makefile.kmk	9	include $(PATH_SUB_CURRENT)/freebsd/Makefile.kmk
10	endif	10	endif
		11	+endif
11	endif	12	endif
12	+endif
13		13
14	include $(PATH_SUB_CURRENT)/common/Makefile.kmk	14	include $(PATH_SUB_CURRENT)/common/Makefile.kmk
15

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop (-3 / +3 lines)
1	--- src/VBox/Installer/freebsd/virtualbox.desktop.orig 2010-10-07 10:42:04.000000000 +0200	1	--- src/VBox/Installer/freebsd/virtualbox.desktop.orig 2020-05-13 19:44:01 UTC
2	+++ src/VBox/Installer/freebsd/virtualbox.desktop 2010-10-07 10:43:20.000000000 +0200	2	+++ src/VBox/Installer/freebsd/virtualbox.desktop
3	@@ -7,7 +7,6 @@	3	@@ -7,7 +7,6 @@ GenericName=Virtual Machine
4	Type=Application	4	Type=Application
5	Exec=VirtualBox	5	Exec=VirtualBox
6	TryExec=VirtualBox	6	TryExec=VirtualBox

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp (-3 / +3 lines)
1	--- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2015-04-01 12:15:14.000000000 -0400	1	--- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2020-05-13 19:44:10 UTC
2	+++ src/VBox/Main/src-server/VirtualBoxImpl.cpp 2015-04-07 12:25:59.226583000 -0400	2	+++ src/VBox/Main/src-server/VirtualBoxImpl.cpp
3	@@ -2172,7 +2172,7 @@	3	@@ -2251,7 +2251,7 @@ int VirtualBox::i_encryptSettingBytes(const uint8_t *a
4	if (aCiphertextSize < 32)	4	if (aCiphertextSize < 32)
5	return VERR_INVALID_PARAMETER;	5	return VERR_INVALID_PARAMETER;
6		6

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp (-3 / +3 lines)
1	--- src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp.orig 2015-04-14 15:41:25.000000000 -0400	1	--- src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp.orig 2020-05-13 19:44:10 UTC
2	+++ src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp 2015-04-14 18:25:23.156536000 -0400	2	+++ src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp
3	@@ -251,8 +251,9 @@	3	@@ -253,8 +253,9 @@ static int getDVDInfoFromCAM(DriveInfoList *pList, boo
4	PeriphMatchPattern.pattern.periph_pattern.path_id = paMatches[i].result.device_result.path_id;	4	PeriphMatchPattern.pattern.periph_pattern.path_id = paMatches[i].result.device_result.path_id;
5	PeriphMatchPattern.pattern.periph_pattern.target_id = paMatches[i].result.device_result.target_id;	5	PeriphMatchPattern.pattern.periph_pattern.target_id = paMatches[i].result.device_result.target_id;
6	PeriphMatchPattern.pattern.periph_pattern.target_lun = paMatches[i].result.device_result.target_lun;	6	PeriphMatchPattern.pattern.periph_pattern.target_lun = paMatches[i].result.device_result.target_lun;




--- src/VBox/Main/webservice/Makefile.kmk.orig	2020-05-13 19:44:11 UTC
+++ src/VBox/Main/webservice/Makefile.kmk
@@ -158,7 +158,6 @@ VBOX_PATH_IDL                 := $(abspath $(PATH_SUB_
 RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
 
 PATH_TARGET_SOAPDEMOXML       := $(VBOXWEB_OUT_DIR)/demo_soapxml

 PATH_TARGET_SOAPDEMONSMAPS    := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
 PATH_TARGET_WEBTEST           := $(VBOXWEB_OUT_DIR)/webtest
 
@@ -553,8 +552,6 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) | $$(dir $$@)
 	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
 	$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
 	$(PATH_TARGET_SOAPDEMOXML)/dummy_file \

 	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
 	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
 
@@ -774,17 +771,14 @@ endif
 # any more. Ignoring the exit code is the simple solution, accepting the error.
 $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@)
 	$(RM) -f $@

Lines 1-8 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk (-4 / +4 lines)
1	--- src/VBox/Runtime/Makefile.kmk.orig 2014-07-15 13:25:15.000000000 -0400	1	--- src/VBox/Runtime/Makefile.kmk.orig 2020-05-13 19:44:16 UTC
2	+++ src/VBox/Runtime/Makefile.kmk 2014-07-16 17:15:58.000000000 -0400	2	+++ src/VBox/Runtime/Makefile.kmk
3	@@ -146,6 +146,11 @@	3	@@ -173,6 +173,11 @@ $(IPRT_OUT_DIR)/oiddb.h.ts +\| $(IPRT_OUT_DIR)/oiddb.h:
4	IPRT_BLDCFG_TYPE=\"$(KBUILD_TYPE)\"
5		4
		5
6	#	6	#
7	+# Set the defines that utf8-posix.cpp needs. It's used by several targets.	7	+# Set the defines that utf8-posix.cpp needs. It's used by several targets.
8	+#	8	+#

Lines 7-15 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h (-3 / +3 lines)
7	what tvtohz does.	7	what tvtohz does.
8		8
9	Submitted by: Andriy Gapon <avg@FreeBSD.org>	9	Submitted by: Andriy Gapon <avg@FreeBSD.org>
10	--- src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h.orig 2012-12-19 19:27:29.000000000 +0100	10	--- src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h.orig 2020-05-13 19:44:32 UTC
11	+++ src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h 2012-12-20 12:07:48.941861966 +0100	11	+++ src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h
12	@@ -82,6 +82,8 @@	12	@@ -82,6 +82,8 @@ DECLINLINE(uint32_t) rtR0SemBsdWaitUpdateTimeout(PRTR0
13	uint64_t cTicks = ASMMultU64ByU32DivByU32(uTimeout, hz, UINT32_C(1000000000));	13	uint64_t cTicks = ASMMultU64ByU32DivByU32(uTimeout, hz, UINT32_C(1000000000));
14	if (cTicks >= INT_MAX)	14	if (cTicks >= INT_MAX)
15	return RTSEMWAIT_FLAGS_INDEFINITE;	15	return RTSEMWAIT_FLAGS_INDEFINITE;

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk (-3 / +3 lines)
1	--- src/recompiler/Makefile.kmk.orig 2013-11-29 14:25:09.000000000 -0500	1	--- src/recompiler/Makefile.kmk.orig 2020-05-13 19:46:49 UTC
2	+++ src/recompiler/Makefile.kmk 2013-12-13 14:23:11.000000000 -0500	2	+++ src/recompiler/Makefile.kmk
3	@@ -41,6 +41,7 @@	3	@@ -41,6 +41,7 @@ endif
4	#	4	#
5	ifneq ($(KBUILD_TARGET),win)	5	ifneq ($(KBUILD_TARGET),win)
6	VBoxRemPrimary_TEMPLATE = VBOXR3NP	6	VBoxRemPrimary_TEMPLATE = VBOXR3NP

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-recompiler-Sun-testmath.c (-7 / +7 lines)
1	--- src/recompiler/Sun/testmath.c.orig 2011-01-14 21:15:07.000000000 +0100	1	--- src/recompiler/Sun/testmath.c.orig 2020-05-13 19:46:49 UTC
2	+++ src/recompiler/Sun/testmath.c 2011-08-05 13:54:49.000000000 +0200	2	+++ src/recompiler/Sun/testmath.c
3	@@ -261,8 +261,6 @@	3	@@ -273,8 +273,6 @@ extern int testmath(void)
4	#endif	4	#endif
5	set_cw(0x27f);	5	set_cw(0x27f);
6		6
Lines 9-22 Link Here
9	CHECK(remainderl(1.0L, 1.0L), 0.0);	9	CHECK(remainderl(1.0L, 1.0L), 0.0);
10	CHECK(remainderl(1.0L, 1.5L), -0.5);	10	CHECK(remainderl(1.0L, 1.5L), -0.5);
11	CHECK(remainderl(42.0L, 34.25L), 7.75);	11	CHECK(remainderl(42.0L, 34.25L), 7.75);
12	@@ -315,10 +313,6 @@	12	@@ -341,10 +339,6 @@ extern int testmath(void)
		13
13	CHECK(tanl(0.0L), 0.0);	14	CHECK(tanl(0.0L), 0.0);
14	CHECK(tanl(0.7853981633974483096156608458198757L), 1.0);	15	CHECK(tanl(0.7853981633974483096156608458198757L), 1.0);
15		16	-
16	- CHECK(powl(0.0, 0.0), 1.0);	17	- CHECK(powl(0.0, 0.0), 1.0);
17	- CHECK(powl(2.0, 2.0), 4.0);	18	- CHECK(powl(2.0, 2.0), 4.0);
18	- CHECK(powl(3.0, 3.0), 27.0);	19	- CHECK(powl(3.0, 3.0), 27.0);
19	-	20
20	return cErrors;	21	return cErrors;
21	}	22	}
22

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_pam_pam__vbox.cpp (-3 / +3 lines)
1	--- src/VBox/Additions/common/pam/pam_vbox.cpp.orig 2016-07-18 11:50:44 UTC	1	--- src/VBox/Additions/common/pam/pam_vbox.cpp.orig 2020-05-13 19:37:05 UTC
2	+++ src/VBox/Additions/common/pam/pam_vbox.cpp	2	+++ src/VBox/Additions/common/pam/pam_vbox.cpp
3	@@ -105,7 +105,7 @@ static void pam_vbox_writesyslog(char *p	3	@@ -105,7 +105,7 @@ static void pam_vbox_writesyslog(char *pszBuf)
4	openlog("pam_vbox", LOG_PID, LOG_AUTHPRIV);	4	openlog("pam_vbox", LOG_PID, LOG_AUTHPRIV);
5	syslog(LOG_ERR, "%s", pszBuf);	5	syslog(LOG_ERR, "%s", pszBuf);
6	closelog();	6	closelog();
Lines 9-15 Link Here
9	syslog(LOG_ERR, "pam_vbox: %s\n", pszBuf);	9	syslog(LOG_ERR, "pam_vbox: %s\n", pszBuf);
10	#endif	10	#endif
11	}	11	}
12	@@ -180,7 +180,7 @@ static int vbox_set_msg(pam_handle_t *hP	12	@@ -184,7 +184,7 @@ static int vbox_set_msg(pam_handle_t *hPAM, int iStyle
13		13
14	pam_message msg;	14	pam_message msg;
15	msg.msg_style = iStyle;	15	msg.msg_style = iStyle;

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_Makefile (-4 / +4 lines)
1	--- src/VBox/Additions/freebsd/Makefile.orig 2017-04-28 16:59:22.000000000 +0200	1	--- src/VBox/Additions/freebsd/Makefile.orig 2020-05-13 19:37:06 UTC
2	+++ src/VBox/Additions/freebsd/Makefile 2017-07-13 00:04:11.766870597 +0200	2	+++ src/VBox/Additions/freebsd/Makefile
3	@@ -31,6 +31,14 @@	3	@@ -30,6 +30,14 @@ all:
4	cp vboxvfs/vboxvfs.ko .; \	4	cp vboxvfs/vboxvfs.ko .; \
5	fi; \	5	fi; \
6	fi	6	fi
Lines 15-21 Link Here
15		15
16		16
17	install:	17	install:
18	@@ -38,13 +46,19 @@	18	@@ -37,13 +45,19 @@ install:
19	@if [ -d vboxvfs ]; then \	19	@if [ -d vboxvfs ]; then \
20	$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvfs install; \	20	$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvfs install; \
21	fi	21	fi

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_Makefile.kmk (-3 / +3 lines)
1	--- src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk.orig 2017-04-28 16:59:22.000000000 +0200	1	--- src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk.orig 2020-05-13 19:37:06 UTC
2	+++ src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk 2017-07-13 00:52:49.020669620 +0200	2	+++ src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
3	@@ -33,32 +33,36 @@	3	@@ -33,32 +33,36 @@ vboxvfs_INCS = \
4	$(vboxvfs_0_OUTDIR)	4	$(vboxvfs_0_OUTDIR)
5	vboxvfs_SOURCES = \	5	vboxvfs_SOURCES = \
6	vboxvfs_vfsops.c \	6	vboxvfs_vfsops.c \

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__prov.c (-2 / +2 lines)
1	--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c.orig 1970-01-01 01:00:00.000000000 +0100	1	--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c.orig 2020-06-26 09:59:35 UTC
2	+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c 2017-07-12 19:24:26.109029000 +0200	2	+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c
3	@@ -0,0 +1,1020 @@	3	@@ -0,0 +1,1020 @@
4	+/*	4	+/*
5	+ * Copyright (C) 2008-2016 Oracle Corporation	5	+ * Copyright (C) 2008-2016 Oracle Corporation




--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig	2020-05-13 19:37:06 UTC
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c
@@ -1,8 +1,3 @@
-/* $Id: vboxvfs_vfsops.c $ */
-/** @file
- * Description.

 /*
  * Copyright (C) 2008-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -14,245 +9,479 @@
  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.

+#include <sys/sbuf.h>
 
-#include <iprt/mem.h>
-
-#define VFSMP2SFGLOBINFO(mp) ((struct sf_glob_info *)mp->mnt_data)
-
-static int vboxvfs_version = VBOXVFS_VERSION;
+#include <geom/geom.h>
+#include <geom/geom_vfs.h>
 
+#include "vboxvfs.h"
+
 #define VFSMP2SFGLOBINFO(mp) ((struct sf_glob_info *)mp->mnt_data)
 
-static int vboxvfs_version = VBOXVFS_VERSION;
+#ifdef MALLOC_DECLARE
+MALLOC_DEFINE(M_VBOXVFS, "vboxvfs", "VBOX VFS");
+#endif
 
-SYSCTL_NODE(_vfs, OID_AUTO, vboxvfs, CTLFLAG_RW, 0, "VirtualBox shared filesystem");
-SYSCTL_INT(_vfs_vboxvfs, OID_AUTO, version, CTLFLAG_RD, &vboxvfs_version, 0, "");
+static sfp_connection_t *sfprov = NULL;
 
-/* global connection to the host service. */
-static VBGLSFCLIENT g_vboxSFClient;
+static int vboxfs_version = VBOXVFS_VERSION;
+u_int vboxvfs_debug = 1;
 
-static vfs_init_t       vboxvfs_init;
-static vfs_uninit_t     vboxvfs_uninit;

-static vfs_quotactl_t   vboxvfs_quotactl;
-static vfs_statfs_t     vboxvfs_statfs;
-static vfs_unmount_t    vboxvfs_unmount;
+SYSCTL_NODE(_vfs, OID_AUTO, vboxfs, CTLFLAG_RW, 0, "VirtualBox shared filesystem");
+SYSCTL_INT(_vfs_vboxfs, OID_AUTO, version, CTLFLAG_RD, &vboxfs_version, 0, "");
+SYSCTL_UINT(_vfs_vboxfs, OID_AUTO, debug, CTLFLAG_RW, &vboxvfs_debug, 0, "Debug level");
 
-static struct vfsops vboxvfs_vfsops = {
-    .vfs_init     =    vboxvfs_init,
-    .vfs_cmount   =    vboxvfs_cmount,

-    .vfs_sync     =    vfs_stdsync,
-    .vfs_uninit   =    vboxvfs_uninit,
-    .vfs_unmount  =    vboxvfs_unmount,
+#ifdef MALLOC_DECLARE
+MALLOC_DEFINE(M_VBOXVFS, "vboxvfs", "VBOX VFS");
+#endif
+
+static sfp_connection_t *sfprov = NULL;
+
+static int vboxfs_version = VBOXVFS_VERSION;
+u_int vboxvfs_debug = 1;
+
+SYSCTL_NODE(_vfs, OID_AUTO, vboxfs, CTLFLAG_RW, 0, "VirtualBox shared filesystem");
+SYSCTL_INT(_vfs_vboxfs, OID_AUTO, version, CTLFLAG_RD, &vboxfs_version, 0, "");
+SYSCTL_UINT(_vfs_vboxfs, OID_AUTO, debug, CTLFLAG_RW, &vboxvfs_debug, 0, "Debug level");
+
+static vfs_init_t	vboxfs_init;
+static vfs_uninit_t	vboxfs_uninit;
+static vfs_cmount_t	vboxfs_cmount;

 {
-    struct vboxvfs_mount_info args;
-    int rc = 0;
-
-    printf("%s: Enter\n", __FUNCTION__);
-
-    rc = copyin(data, &args, sizeof(struct vboxvfs_mount_info));
-    if (rc)
-        return rc;
+	struct vboxfs_node *nnode;
 
-    printf("%s: Enter\n", __FUNCTION__);
-    ma = mount_argf(ma, "gid", "%d", args.gid);
-    ma = mount_arg(ma, "from", args.name, -1);
+	if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) {
+		/*
+		 * When a new tmpfs node is created for fully

+		 */
+		return (EBUSY);
+	}
 
-    rc = copyin(data, &args, sizeof(struct vboxvfs_mount_info));
-    if (rc)
-        return rc;
+	nnode = (struct vboxfs_node *)uma_zalloc_arg(
+				vsfmp->sf_node_pool, vsfmp, M_WAITOK);
 
-    ma = mount_argf(ma, "uid", "%d", args.uid);
-    ma = mount_argf(ma, "gid", "%d", args.gid);
-    ma = mount_arg(ma, "from", args.name, -1);
+	/* Generic initialization. */
+	nnode->sf_type = type;
+	nnode->sf_ino = vsfmp->sf_ino++;

+	nnode->sf_path = strdup(fullpath, M_VBOXVFS);
+	nnode->sf_parent = parent;
+	nnode->vboxfsmp = vsfmp;
 
-    rc = kernel_mount(ma, flags);
+	/* Type-specific initialization. */
+	switch (nnode->sf_type) {
+	case VBLK:

+	case VLNK:
+	case VREG:
+		break;
 
-    printf("%s: Leave rc=%d\n", __FUNCTION__, rc);
+	default:
+		panic("vboxfs_alloc_node: type %p %d", nnode, (int)nnode->sf_type);
+	}
 
-    rc = kernel_mount(ma, flags);
-
-    printf("%s: Leave rc=%d\n", __FUNCTION__, rc);
-
-    return rc;
+	*node = nnode;
+	return 0;

-    struct sf_glob_info *pShFlGlobalInfo;
-    SHFLSTRING *pShFlShareName = NULL;
-    int cbShFlShareName;
 
-    printf("%s: Enter\n", __FUNCTION__);
-
-    if (mp->mnt_flag & (MNT_UPDATE | MNT_ROOTFS))
-        return EOPNOTSUPP;
-
-    if (vfs_filteropt(mp->mnt_optnew, vboxvfs_opts))
-    {
-        vfs_mount_error(mp, "%s", "Invalid option");
-        return EINVAL;
-    }
-
-    rc = vfs_getopt(mp->mnt_optnew, "from", (void **)&pszShare, &cbShare);
-    if (rc || pszShare[cbShare-1] != '\0' || cbShare > 0xfffe)
-        return EINVAL;
-
-    rc = vfs_getopt(mp->mnt_optnew, "gid", (void **)&gid, &cbOption);
-    if ((rc != ENOENT) && (rc || cbOption != sizeof(gid)))
-        return EINVAL;
-
-    rc = vfs_getopt(mp->mnt_optnew, "uid", (void **)&uid, &cbOption);
-    if ((rc != ENOENT) && (rc || cbOption != sizeof(uid)))
-        return EINVAL;
 
-    pShFlGlobalInfo = RTMemAllocZ(sizeof(struct sf_glob_info));
-    if (!pShFlGlobalInfo)
-        return ENOMEM;
+#ifdef INVARIANTS
+	TMPFS_NODE_LOCK(node);
+	MPASS(node->sf_vnode == NULL);

+	if (node->sf_path)
+		free(node->sf_path, M_VBOXVFS);
 
-    if (mp->mnt_flag & (MNT_UPDATE | MNT_ROOTFS))
-        return EOPNOTSUPP;
-    if (!pShFlShareName)
-        return VERR_NO_MEMORY;
+	uma_zfree(vboxfs->sf_node_pool, node);
+}
 
-    if (vfs_filteropt(mp->mnt_optnew, vboxvfs_opts))
-    {
-        vfs_mount_error(mp, "%s", "Invalid option");
-        return EINVAL;
-    }
+static int
+vboxfs_cmount(struct mntarg *ma, void *data, uint64_t flags)
+{

+	struct vboxfs_mount_info args;
+	int error = 0;
 
-    rc = vfs_getopt(mp->mnt_optnew, "from", (void **)&pszShare, &cbShare);
-    if (rc || pszShare[cbShare-1] != '\0' || cbShare > 0xfffe)
-        return EINVAL;
+	if (data == NULL)
+		return (EINVAL);
+	error = copyin(data, &args, sizeof(struct vboxfs_mount_info));
+	if (error)
+		return (error);
 
-    rc = vfs_getopt(mp->mnt_optnew, "gid", (void **)&gid, &cbOption);
-    if ((rc != ENOENT) && (rc || cbOption != sizeof(gid)))
-        return EINVAL;
+  	ma = mount_argf(ma, "uid", "%d", args.uid);
+	ma = mount_argf(ma, "gid", "%d", args.gid);
+	ma = mount_argf(ma, "file_mode", "%d", args.fmode);

+	ma = mount_argf(ma, "dir_mode", "%d", args.dmode);
+	ma = mount_arg(ma, "from", args.name, -1);
 
-    rc = vfs_getopt(mp->mnt_optnew, "uid", (void **)&uid, &cbOption);
-    if ((rc != ENOENT) && (rc || cbOption != sizeof(uid)))
-        return EINVAL;
-        printf("VbglR0SfMapFolder failed rc=%d\n", rc);
-        return EPROTO;
-    }
+	return (kernel_mount(ma, flags));
+}
 
-    pShFlGlobalInfo = RTMemAllocZ(sizeof(struct sf_glob_info));
-    if (!pShFlGlobalInfo)
-        return ENOMEM;
+static const char *vboxfs_opts[] = {
+	"fstype",
+	"fspath",

+	NULL
+};
 
-    cbShFlShareName = offsetof (SHFLSTRING, String.utf8) + cbShare + 1;
-    pShFlShareName  = RTMemAllocZ(cbShFlShareName);
-    if (!pShFlShareName)
-        return VERR_NO_MEMORY;
+#define	VBOX_INTOPT(optname, val, base) do {				\
+	char *ep, *optarg = NULL;					\
+	if (vfs_getopt(opts, optname, (void **)&optarg, NULL) == 0) {	\

+	}								\
+} while (0)
 
-    pShFlShareName->u16Length = cbShare;
-    pShFlShareName->u16Size   = cbShare + 1;
-    memcpy (pShFlShareName->String.utf8, pszShare, cbShare + 1);
+static int
+vboxfs_node_ctor(void *mem, int size, void *arg, int flags)
+{
+	struct vboxfs_node *node = (struct vboxfs_node *)mem;
 
-    rc = VbglR0SfMapFolder (&g_vboxSFClient, pShFlShareName, &pShFlGlobalInfo->map);
-    RTMemFree(pShFlShareName);
+	node->sf_vnode = NULL;
+	node->sf_vpstate = 0;
 
-    if (RT_FAILURE (rc))
-    {
-        RTMemFree(pShFlGlobalInfo);
-        printf("VbglR0SfMapFolder failed rc=%d\n", rc);
-        return EPROTO;
-    }
+	return (0);
+}
 
-    pShFlGlobalInfo->uid = uid;
-    pShFlGlobalInfo->gid = gid;
+static void
+vboxfs_node_dtor(void *mem, int size, void *arg)
+{
+	struct vboxfs_node *node = (struct vboxfs_node *)mem;
+	node->sf_type = VNON;
+}
 
-    mp->mnt_data = pShFlGlobalInfo;
+static int
+vboxfs_node_init(void *mem, int size, int flags)
+{
-    struct sf_glob_info *pShFlGlobalInfo = VFSMP2SFGLOBINFO(mp);
-    int rc;
-    int flags = 0;
+	struct vboxfs_node *node = (struct vboxfs_node *)mem;
+	node->sf_ino = 0;
 
-    /** @todo root vnode. */
-    if (RT_FAILURE(rc))
-        printf("Failed to unmap shared folder\n");
+	mtx_init(&node->sf_interlock, "tmpfs node interlock", NULL, MTX_DEF);
 
-    vfs_getnewfsid(mp);
-    vfs_mountedfrom(mp, pszShare);
+	return (0);
+}
 
-    printf("%s: Leave rc=0\n", __FUNCTION__);
-    rc = vflush(mp, 1, flags, td);
-    if (rc)
-        return rc;
+static void
+vboxfs_node_fini(void *mem, int size)
+{
+	struct vboxfs_node *node = (struct vboxfs_node *)mem;
 
-    return 0;
+	mtx_destroy(&node->sf_interlock);
 }
 
-static int vboxvfs_unmount(struct mount *mp, int mntflags, struct thread *td)
-    mp->mnt_data = NULL;
+static int
+vboxfs_mount(struct mount *mp)
 {
-    struct sf_glob_info *pShFlGlobalInfo = VFSMP2SFGLOBINFO(mp);
-    int rc;
-    int flags = 0;
+	struct vboxfs_mnt *vboxfsmp = NULL;
+	struct vfsoptlist *opts = mp->mnt_optnew;
+	sfp_mount_t *handle = NULL;

+	uid_t uid = 0;
+	gid_t gid = 0;
+	struct vboxfs_node *root;
 
-    rc = VbglR0SfUnmapFolder(&g_vboxSFClient, &pShFlGlobalInfo->map);
-    if (RT_FAILURE(rc))
-        printf("Failed to unmap shared folder\n");
+	if (mp->mnt_flag & (MNT_UPDATE | MNT_ROOTFS))
+		return (EOPNOTSUPP);
 
-    if (mntflags & MNT_FORCE)
-        flags |= FORCECLOSE;
+	if (vfs_filteropt(opts, vboxfs_opts)) {
+		vfs_mount_error(mp, "%s", "Invalid option");
+		return (EINVAL);
+	}
 
-    /* There is 1 extra root vnode reference (vnode_root). */
-    rc = vflush(mp, 1, flags, td);
-    if (rc)
-        return rc;
+	VBOX_INTOPT("uid", uid, 10);
+	VBOX_INTOPT("gid", gid, 10);
+	VBOX_INTOPT("file_mode", file_mode, 8);
+	VBOX_INTOPT("dir_mode", dir_mode, 8);
+	VBOX_INTOPT("ro", readonly, 10);
 
+	error = vfs_getopt(opts, "from", (void **)&share_name, &share_len);
+	if (error != 0 || share_len == 0) {
+		vfs_mount_error(mp, "Invalid from");
+		return (EINVAL);
+	}
 
-    RTMemFree(pShFlGlobalInfo);
-    mp->mnt_data = NULL;
+	vboxfsmp = malloc(sizeof(struct vboxfs_mnt), M_VBOXVFS, M_WAITOK | M_ZERO);
+	vboxfsmp->sf_uid = uid;
+	vboxfsmp->sf_gid = gid;

+	vboxfsmp->sf_dmode = dir_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
+	vboxfsmp->sf_ino = 3;
+	vboxfsmp->sf_stat_ttl = 200;
 
-    return 0;
+	/* Invoke Hypervisor mount interface before proceeding */
+	error = sfprov_mount(share_name, &handle);
+	if (error)

+#endif
+	MNT_IUNLOCK(mp);
+	vfs_mountedfrom(mp, share_name);
+
-    return 0;
+	return (0);
 }
 

+	struct thread *td;
+	int error;
+	int flags;
 
-    printf("%s: Enter\n", __FUNCTION__);
+	vboxfsmp = VFSTOVBOXFS(mp);
+	td = curthread;
+	flags = 0;
+	if (mntflags & MNT_FORCE)
+		flags |= FORCECLOSE;
 
-    vp = pShFlGlobalInfo->vnode_root;
-    VREF(vp);
+	error = vflush(mp, 0, flags, td);
+	if (error)
+		return (error);
 
-    vn_lock(vp, flags | LK_RETRY, td);
-    *vpp = vp;
+	/* Invoke Hypervisor unmount interface before proceeding */
+	error = sfprov_unmount(vboxfsmp->sf_handle);
+	if (error != 0) {
+		/* TBD anything here? */
+	}
 
-    printf("%s: Leave\n", __FUNCTION__);
+	uma_zdestroy(vboxfsmp->sf_node_pool);
 
-    return rc;
+	free(vboxfsmp, M_VBOXVFS);
+	MNT_ILOCK(mp);
+	mp->mnt_data = NULL;
+	mp->mnt_flag &= ~MNT_LOCAL;
+	MNT_IUNLOCK(mp);
+
-    printf("%s: Enter\n", __FUNCTION__);
-
-    vp = pShFlGlobalInfo->vnode_root;
-    VREF(vp);
+	return (0);
 }
 
-static int vboxvfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg, struct thread *td)
-    *vpp = vp;
+static int
+vboxfs_root(struct mount *mp, int flags, struct vnode **vpp)
 {
-    return EOPNOTSUPP;
+	int error;
+	error = vboxfs_alloc_vp(mp, VFSTOVBOXFS(mp)->sf_root, flags, vpp);
+
-    printf("%s: Leave\n", __FUNCTION__);
+	if (!error)
+		(*vpp)->v_vflag |= VV_ROOT;
+
-    return rc;
+	return error;
 }
 
-int vboxvfs_init(struct vfsconf *vfsp)
+/*
+ * Do operation associated with quotas, not supported
+ */

+static int
+vboxfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg)
 {
-    int rc;
+	return (EOPNOTSUPP);
+}
 
-    /* Initialize the R0 guest library. */
-    rc = VbglR0SfInit();
-    if (RT_FAILURE(rc))
-        return ENXIO;
+/*
+ * Initialize the filesystem globals.
+ */
+static int
+vboxfs_init(struct vfsconf *vfsp)
+{
-    int rc;
+	int error;
 
-    /* Initialize the R0 guest library. */
-    rc = VbglR0SfInit();
-    if (RT_FAILURE(rc))
-        return ENXIO;
+	DROP_GIANT();
 
-    /* Connect to the host service. */
-    rc = VbglR0SfConnect(&g_vboxSFClient);
-    if (RT_FAILURE(rc))

-        VbglR0SfTerm();
-        return ENXIO;
-    }
+	DROP_GIANT();
 
-    rc = VbglR0SfSetUtf8(&g_vboxSFClient);
-    if (RT_FAILURE (rc))
-    {
-        printf("VbglR0SfSetUtf8 failed, rc=%d\n", rc);
-        VbglR0SfDisconnect(&g_vboxSFClient);
-        VbglR0SfTerm();
-        return EPROTO;
-    }
+	sfprov = sfprov_connect(SFPROV_VERSION);
+	if (sfprov == NULL) {
+		printf("%s: couldn't connect to sf provider", __func__);
+		return (ENODEV);
+	}
 
-    printf("Successfully loaded shared folder module\n");
+	error = sfprov_set_show_symlinks();
+	if (error != 0)
+		printf("%s: host unable to show symlinks, error=%d\n",
+		    __func__, error);
 
-    rc = VbglR0SfSetUtf8(&g_vboxSFClient);
-    if (RT_FAILURE (rc))
-    {
-        printf("VbglR0SfSetUtf8 failed, rc=%d\n", rc);
-        VbglR0SfDisconnect(&g_vboxSFClient);
-        VbglR0SfTerm();
-        return EPROTO;
-    }
-
-    printf("Successfully loaded shared folder module\n");
-
-    return 0;
+	PICKUP_GIANT();
+	return (0);

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk (-2 / +2 lines)
1	--- src/VBox/Debugger/Makefile.kmk.orig 2017-10-18 07:09:03 UTC	1	--- src/VBox/Debugger/Makefile.kmk.orig 2020-05-13 19:39:41 UTC
2	+++ src/VBox/Debugger/Makefile.kmk	2	+++ src/VBox/Debugger/Makefile.kmk
3	@@ -109,6 +109,7 @@ VBoxDbg_SOURCES = \	3	@@ -113,6 +113,7 @@ VBoxDbg_SOURCES = \
4	VBoxDbgBase.cpp \	4	VBoxDbgBase.cpp \
5	VBoxDbgConsole.cpp \	5	VBoxDbgConsole.cpp \
6	VBoxDbgStatsQt.cpp	6	VBoxDbgStatsQt.cpp

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp (-3 / +3 lines)
1	--- src/VBox/Devices/Audio/DrvHostALSAAudio.cpp.orig 2017-10-18 07:09:04 UTC	1	--- src/VBox/Devices/Audio/DrvHostALSAAudio.cpp.orig 2020-05-13 19:39:41 UTC
2	+++ src/VBox/Devices/Audio/DrvHostALSAAudio.cpp	2	+++ src/VBox/Devices/Audio/DrvHostALSAAudio.cpp
3	@@ -1231,6 +1231,7 @@ static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PP	3	@@ -819,6 +819,7 @@ static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PP
4	continue;	4	continue;
5	}	5	}
6		6
Lines 8-14 Link Here
8	case -ESTRPIPE:	8	case -ESTRPIPE:
9	{	9	{
10	/* Stream was suspended and waiting for a recovery. */	10	/* Stream was suspended and waiting for a recovery. */
11	@@ -1244,6 +1245,7 @@ static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PP	11	@@ -832,6 +833,7 @@ static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PP
12	LogFlowFunc(("Resumed suspended output stream\n"));	12	LogFlowFunc(("Resumed suspended output stream\n"));
13	continue;	13	continue;
14	}	14	}




--- src/VBox/Devices/PC/vbox-cpuhotplug.dsl.orig	2020-07-09 16:55:56 UTC
+++ src/VBox/Devices/PC/vbox-cpuhotplug.dsl
@@ -48,7 +48,7 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VB
     Scope (\_SB)
     {
 
-#define GENERATE_CPU_OBJECT(id, sck, sckuid, cpu, cpuuid)<NL>              \
+#define GENERATE_CPU_OBJECT(id, sck, cpu)<NL>                              \
     Device (sck)                                                           \
     {                                                                      \
         Name (_HID, "ACPI0004")                                            \

                                                                            \
         <NL>                                                               \
         Processor (cpu, /* Name */                                         \
@@ -58,7 +58,7 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VB
                    )                                                       \
         {                                                                  \
             Name (_HID, "ACPI0007")                                        \
-            Name (_UID, cpuuid)                                            \
+            Name (_UID, id)                                                \
             Name (_PXM, 0x00)                                              \
             <NL>                                                           \
             Method(_MAT, 0, Serialized)                                    \
@@ -95,38 +95,38 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VB
         }                                                                  \
     }                                                                      \
 
-        GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0, "SCK0-CPU0")
-        GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1, "SCK1-CPU0")
-        GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2, "SCK2-CPU0")
-        GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3, "SCK3-CPU0")
-        GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4, "SCK4-CPU0")
-        GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5, "SCK5-CPU0")
-        GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6, "SCK6-CPU0")
-        GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7, "SCK7-CPU0")
-        GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8, "SCK8-CPU0")
-        GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9, "SCK9-CPU0")
-        GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA, "SCKA-CPU0")
-        GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB, "SCKB-CPU0")
-        GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC, "SCKC-CPU0")
-        GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD, "SCKD-CPU0")
-        GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE, "SCKE-CPU0")
-        GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF, "SCKF-CPU0")
-        GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG, "SCKG-CPU0")
-        GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH, "SCKH-CPU0")
-        GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI, "SCKI-CPU0")
-        GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ, "SCKJ-CPU0")
-        GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK, "SCKK-CPU0")
-        GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL, "SCKL-CPU0")
-        GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM, "SCKM-CPU0")
-        GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN, "SCKN-CPU0")
-        GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO, "SCKO-CPU0")
-        GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP, "SCKP-CPU0")
-        GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ, "SCKQ-CPU0")
-        GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR, "SCKR-CPU0")
-        GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS, "SCKS-CPU0")
-        GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT, "SCKT-CPU0")
-        GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU, "SCKU-CPU0")
-        GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV, "SCKV-CPU0")
+        GENERATE_CPU_OBJECT(0x00, SCK0, CPU0)
+        GENERATE_CPU_OBJECT(0x01, SCK1, CPU1)
+        GENERATE_CPU_OBJECT(0x02, SCK2, CPU2)
+        GENERATE_CPU_OBJECT(0x03, SCK3, CPU3)
+        GENERATE_CPU_OBJECT(0x04, SCK4, CPU4)
+        GENERATE_CPU_OBJECT(0x05, SCK5, CPU5)
+        GENERATE_CPU_OBJECT(0x06, SCK6, CPU6)
+        GENERATE_CPU_OBJECT(0x07, SCK7, CPU7)
+        GENERATE_CPU_OBJECT(0x08, SCK8, CPU8)
+        GENERATE_CPU_OBJECT(0x09, SCK9, CPU9)
+        GENERATE_CPU_OBJECT(0x0a, SCKA, CPUA)
+        GENERATE_CPU_OBJECT(0x0b, SCKB, CPUB)
+        GENERATE_CPU_OBJECT(0x0c, SCKC, CPUC)
+        GENERATE_CPU_OBJECT(0x0d, SCKD, CPUD)
+        GENERATE_CPU_OBJECT(0x0e, SCKE, CPUE)
+        GENERATE_CPU_OBJECT(0x0f, SCKF, CPUF)
+        GENERATE_CPU_OBJECT(0x10, SCKG, CPUG)
+        GENERATE_CPU_OBJECT(0x11, SCKH, CPUH)
+        GENERATE_CPU_OBJECT(0x12, SCKI, CPUI)
+        GENERATE_CPU_OBJECT(0x13, SCKJ, CPUJ)
+        GENERATE_CPU_OBJECT(0x14, SCKK, CPUK)
+        GENERATE_CPU_OBJECT(0x15, SCKL, CPUL)
+        GENERATE_CPU_OBJECT(0x16, SCKM, CPUM)
+        GENERATE_CPU_OBJECT(0x17, SCKN, CPUN)
+        GENERATE_CPU_OBJECT(0x18, SCKO, CPUO)
+        GENERATE_CPU_OBJECT(0x19, SCKP, CPUP)
+        GENERATE_CPU_OBJECT(0x1a, SCKQ, CPUQ)
+        GENERATE_CPU_OBJECT(0x1b, SCKR, CPUR)
+        GENERATE_CPU_OBJECT(0x1c, SCKS, CPUS)
+        GENERATE_CPU_OBJECT(0x1d, SCKT, CPUT)
+        GENERATE_CPU_OBJECT(0x1e, SCKU, CPUU)
+        GENERATE_CPU_OBJECT(0x1f, SCKV, CPUV)
 
 #undef GENERATE_CPU_OBJECT
     }




--- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig	2020-05-13 19:43:27 UTC
+++ src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
@@ -622,7 +622,7 @@ void printUsage(USAGECATEGORY fCategory, uint32_t fSub
             RTStrmPrintf(pStrm, "|dsound");
 #endif
         }

         {
             RTStrmPrintf(pStrm, ""
 #ifdef VBOX_WITH_AUDIO_OSS
@@ -635,22 +635,6 @@ void printUsage(USAGECATEGORY fCategory, uint32_t fSub
                                 "|pulse"
 #endif
                         );
-        }
-        if (fFreeBSD)
-        {
-#ifdef VBOX_WITH_AUDIO_OSS

-#ifdef VBOX_WITH_AUDIO_PULSE
-            RTStrmPrintf(pStrm, "|pulse");
-#endif
         }
         if (fDarwin)
         {
             RTStrmPrintf(pStrm, "|coreaudio");

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk (-3 / +3 lines)
1	--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig 2017-10-18 07:12:20 UTC	1	--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig 2020-05-13 19:43:28 UTC
2	+++ src/VBox/Frontends/VirtualBox/Makefile.kmk	2	+++ src/VBox/Frontends/VirtualBox/Makefile.kmk
3	@@ -895,6 +895,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) \|\| defined(VBOX_GUI	3	@@ -897,6 +897,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) \|\| defined(VBOX_GUI
4	VirtualBox_SOURCES += \	4	VirtualBox_SOURCES += \
5	src/VBoxFBOverlay.cpp \	5	src/VBoxFBOverlay.cpp \
6	src/VBoxGLSupportInfo.cpp	6	src/VBoxGLSupportInfo.cpp
Lines 8-14 Link Here
8	endif	8	endif
9		9
10	#	10	#
11	@@ -1217,6 +1218,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL)	11	@@ -1220,6 +1221,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL)
12	VBoxOGL2D_SOURCES = \	12	VBoxOGL2D_SOURCES = \
13	src/VBoxGLSupportInfo.cpp	13	src/VBoxGLSupportInfo.cpp
14	VBoxOGL2D_INCS = include	14	VBoxOGL2D_INCS = include

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_SUPDrvInternal.h (-2 / +2 lines)
1	--- src/VBox/HostDrivers/Support/SUPDrvInternal.h.orig 2016-07-18 11:56:19 UTC	1	--- src/VBox/HostDrivers/Support/SUPDrvInternal.h.orig 2020-05-13 19:43:52 UTC
2	+++ src/VBox/HostDrivers/Support/SUPDrvInternal.h	2	+++ src/VBox/HostDrivers/Support/SUPDrvInternal.h
3	@@ -235,7 +235,7 @@	3	@@ -208,7 +208,7 @@
4	# define SUPDRV_WITHOUT_MSR_PROBER	4	# define SUPDRV_WITHOUT_MSR_PROBER
5	#endif	5	#endif
6		6

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_freebsd_SUPDrv-freebsd.c (-3 / +3 lines)
1	--- src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c.orig 2018-10-15 14:30:57 UTC	1	--- src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c.orig 2020-05-13 19:43:53 UTC
2	+++ src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c	2	+++ src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c
3	@@ -46,6 +46,7 @@	3	@@ -46,6 +46,7 @@
4	#include <sys/uio.h>	4	#include <sys/uio.h>
Lines 170-176 Link Here
170	}	170	}
171		171
172		172
173	@@ -616,11 +682,25 @@ int VBOXCALL supdrvOSMsrProberModify(RTCPUID idCpu,	173	@@ -625,11 +691,25 @@ int VBOXCALL supdrvOSMsrProberModify(RTCPUID idCpu,
174	#endif /* SUPDRV_WITH_MSR_PROBER */	174	#endif /* SUPDRV_WITH_MSR_PROBER */
175		175
176		176
Lines 196-202 Link Here
196		196
197	va_start(va, pszFormat);	197	va_start(va, pszFormat);
198	cch = RTStrPrintfV(szMsg, sizeof(szMsg), pszFormat, va);	198	cch = RTStrPrintfV(szMsg, sizeof(szMsg), pszFormat, va);
199	@@ -628,12 +708,19 @@ SUPR0DECL(int) SUPR0Printf(const char *pszFormat, ...)	199	@@ -637,12 +717,19 @@ SUPR0DECL(int) SUPR0Printf(const char *pszFormat, ...)
200		200
201	printf("%s", szMsg);	201	printf("%s", szMsg);
202		202

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk (-2 / +2 lines)
1	--- src/VBox/HostServices/SharedOpenGL/Makefile.kmk.orig 2017-10-18 07:12:48 UTC	1	--- src/VBox/HostServices/SharedOpenGL/Makefile.kmk.orig 2020-05-13 19:43:59 UTC
2	+++ src/VBox/HostServices/SharedOpenGL/Makefile.kmk	2	+++ src/VBox/HostServices/SharedOpenGL/Makefile.kmk
3	@@ -436,6 +436,7 @@ if ( defined(VBOX_WITH_QTGUI) \	3	@@ -335,6 +335,7 @@ if ( defined(VBOX_WITH_QTGUI) \
4	$(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \	4	$(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \
5	$(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,)	5	$(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,)
6	ifdef VBOX_WITH_VIDEOHWACCEL	6	ifdef VBOX_WITH_VIDEOHWACCEL

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_Makefile.kmk (-2 / +2 lines)
1	--- src/VBox/Main/Makefile.kmk.orig 2017-03-08 17:20:11 UTC	1	--- src/VBox/Main/Makefile.kmk.orig 2020-05-13 19:44:04 UTC
2	+++ src/VBox/Main/Makefile.kmk	2	+++ src/VBox/Main/Makefile.kmk
3	@@ -445,6 +445,7 @@ VBoxSVC_SOURCES.os2 = \	3	@@ -526,6 +526,7 @@ VBoxSVC_SOURCES.os2 = \
4		4
5	VBoxSVC_SOURCES.freebsd = \	5	VBoxSVC_SOURCES.freebsd = \
6	src-server/freebsd/HostHardwareFreeBSD.cpp \	6	src-server/freebsd/HostHardwareFreeBSD.cpp \

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_include_USBProxyBackend.h (-2 / +2 lines)
1	--- src/VBox/Main/include/USBProxyBackend.h.orig 2017-01-17 07:27:19 UTC	1	--- src/VBox/Main/include/USBProxyBackend.h.orig 2020-05-13 19:44:06 UTC
2	+++ src/VBox/Main/include/USBProxyBackend.h	2	+++ src/VBox/Main/include/USBProxyBackend.h
3	@@ -359,13 +359,10 @@ public:	3	@@ -365,13 +365,10 @@ class USBProxyBackendFreeBSD : public USBProxyBackend
4	virtual int releaseDevice(HostUSBDevice *aDevice);	4	virtual int releaseDevice(HostUSBDevice *aDevice);
5		5
6	protected:	6	protected:

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp (-3 / +3 lines)
1	--- src/VBox/Main/src-client/ConsoleImpl2.cpp.orig 2017-10-18 07:12:56 UTC	1	--- src/VBox/Main/src-client/ConsoleImpl2.cpp.orig 2020-05-13 19:44:07 UTC
2	+++ src/VBox/Main/src-client/ConsoleImpl2.cpp	2	+++ src/VBox/Main/src-client/ConsoleImpl2.cpp
3	@@ -5206,7 +5206,7 @@ int Console::i_configNetwork(const char *pszDevice,	3	@@ -5265,7 +5265,7 @@ int Console::i_configNetwork(const char *pszDevice,
4	{	4	{
5	switch (hrc)	5	switch (hrc)
6	{	6	{
Lines 9-15 Link Here
9	return VMSetError(VMR3GetVM(mpUVM), VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_(	9	return VMSetError(VMR3GetVM(mpUVM), VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_(
10	"Failed to open '/dev/net/tun' for read/write access. Please check the "	10	"Failed to open '/dev/net/tun' for read/write access. Please check the "
11	"permissions of that node. Either run 'chmod 0666 /dev/net/tun' or "	11	"permissions of that node. Either run 'chmod 0666 /dev/net/tun' or "
12	@@ -5408,7 +5408,7 @@ int Console::i_configNetwork(const char *pszDevice,	12	@@ -5467,7 +5467,7 @@ int Console::i_configNetwork(const char *pszDevice,
13	{	13	{
14	switch (hrc)	14	switch (hrc)
15	{	15	{

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_HostImpl.cpp (-2 / +2 lines)
1	--- src/VBox/Main/src-server/HostImpl.cpp.orig 2017-03-08 17:20:14 UTC	1	--- src/VBox/Main/src-server/HostImpl.cpp.orig 2020-05-13 19:44:09 UTC
2	+++ src/VBox/Main/src-server/HostImpl.cpp	2	+++ src/VBox/Main/src-server/HostImpl.cpp
3	@@ -293,7 +293,7 @@ HRESULT Host::init(VirtualBox *aParent)	3	@@ -284,7 +284,7 @@ HRESULT Host::init(VirtualBox *aParent)
4		4
5	#if defined(RT_OS_WINDOWS)	5	#if defined(RT_OS_WINDOWS)
6	m->pHostPowerService = new HostPowerServiceWin(m->pParent);	6	m->pHostPowerService = new HostPowerServiceWin(m->pParent);

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp (-2 / +2 lines)
1	--- src/VBox/VMM/VMMR0/GVMMR0.cpp.orig 2018-01-15 14:56:33.000000000 +0000	1	--- src/VBox/VMM/VMMR0/GVMMR0.cpp.orig 2020-05-13 19:44:47 UTC
2	+++ src/VBox/VMM/VMMR0/GVMMR0.cpp 2018-01-17 01:13:24.832105000 +0000	2	+++ src/VBox/VMM/VMMR0/GVMMR0.cpp
3	@@ -1243,7 +1243,7 @@ static void gvmmR0CleanupVM(PGVM pGVM)	3	@@ -1243,7 +1243,7 @@ static void gvmmR0CleanupVM(PGVM pGVM)
4		4
5	GMMR0CleanupVM(pGVM);	5	GMMR0CleanupVM(pGVM);

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_nsprpub_pr_src_pthreads_ptsynch.c (-2 / +2 lines)
1	--- src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c.orig	1	--- src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c.orig 2020-05-13 19:46:23 UTC
2	+++ src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c	2	+++ src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c
3	@@ -49,6 +49,9 @@	3	@@ -49,6 +49,9 @@
4	#include <string.h>	4	#include <string.h>
Lines 10-16 Link Here
10		10
11	static pthread_mutexattr_t _pt_mattr;	11	static pthread_mutexattr_t _pt_mattr;
12	static pthread_condattr_t _pt_cvar_attr;	12	static pthread_condattr_t _pt_cvar_attr;
13	@@ -798,7 +801,8 @@	13	@@ -798,7 +801,8 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphore(const char *
14	* From the semctl(2) man page in glibc 2.0	14	* From the semctl(2) man page in glibc 2.0
15	*/	15	*/
16	#if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \	16	#if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_xpcom_io_nsLocalFileUnix.h (-2 / +2 lines)
1	--- src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h.orig 2017-03-08 17:21:24.000000000 +0000	1	--- src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h.orig 2020-05-13 19:46:34 UTC
2	+++ src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h 2017-03-08 22:53:39.572250000 +0000	2	+++ src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h
3	@@ -72,14 +72,6 @@	3	@@ -72,14 +72,6 @@
4	#define STATFS statfs	4	#define STATFS statfs
5	#endif	5	#endif

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.2.34	5	PORTVERSION= 5.2.44
6	PORTREVISION= 2
7	CATEGORIES= emulators	6	CATEGORIES= emulators
8	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/	7	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
9	PKGNAMESUFFIX?= -additions	8	PKGNAMESUFFIX?= -additions

Lines 1-3 Link Here

(-)emulators/virtualbox-ose-additions/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1571257463	1	TIMESTAMP = 1594821235
2	SHA256 (VirtualBox-5.2.34.tar.bz2) = 9abff37330bba46b97aa836bc886397ba9cfb06cb75be5d60ac31f5ae9c2f2e1	2	SHA256 (VirtualBox-5.2.44.tar.bz2) = ad83b11cfae2734f7d6f619dd2f8bdada7d33492cd7682fab98cb4053122295e
3	SIZE (VirtualBox-5.2.34.tar.bz2) = 118268064	3	SIZE (VirtualBox-5.2.44.tar.bz2) = 124016934

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.2.34	5	PORTVERSION= 5.2.44
6	CATEGORIES= emulators	6	CATEGORIES= emulators
7	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/	7	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
8	PKGNAMESUFFIX= -kmod	8	PKGNAMESUFFIX= -kmod

Lines 1-3 Link Here

(-)emulators/virtualbox-ose-kmod/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1571257293	1	TIMESTAMP = 1594821147
2	SHA256 (VirtualBox-5.2.34.tar.bz2) = 9abff37330bba46b97aa836bc886397ba9cfb06cb75be5d60ac31f5ae9c2f2e1	2	SHA256 (VirtualBox-5.2.44.tar.bz2) = ad83b11cfae2734f7d6f619dd2f8bdada7d33492cd7682fab98cb4053122295e
3	SIZE (VirtualBox-5.2.34.tar.bz2) = 118268064	3	SIZE (VirtualBox-5.2.44.tar.bz2) = 124016934




  * Do not forget port variants (linux-f10-libxml2, libxml2, etc.)
-->
<vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
  <vuln vid="1e7b316b-c6a8-11ea-a7d5-001999f8d30b">
    <topic>VirtualBox -- Multiple vulnerabilities</topic>
    <affects>
      <package>
	<name>virtualbox-ose</name>
	<range><ge>5.2</ge><lt>5.2.44</lt></range>
	<range><ge>6.0</ge><lt>6.0.24</lt></range>
	<range><ge>6.1</ge><lt>6.1.12</lt></range>
      </package>
    </affects>
    <description>
      <body xmlns="http://www.w3.org/1999/xhtml">
	<p>Oracle reports:</p>
	<blockquote cite="https://www.oracle.com/security-alerts/cpujul2020.html">
	  <p>Vulnerabilities in VirtualBox core can allow users
	  with logon access to the infrastructure where Oracle VM
	  VirtualBox executes to compromise Oracle VM VirtualBox.
	  Successful attacks of these vulnerabilities can result
	  in unauthorized access to critical data, access to all
	  Oracle VM VirtualBox accessible data, unauthorized ability
	  to cause a hang or frequently repeatable crash (complete
	  DOS) or takeover of Oracle VM VirtualBox.</p>
	</blockquote>
      </body>
    </description>
    <references>
      <url>https://www.oracle.com/security-alerts/cpujul2020.html</url>
      <cvename>CVE-2020-14628</cvename>
      <cvename>CVE-2020-14629</cvename>
      <cvename>CVE-2020-14646</cvename>
      <cvename>CVE-2020-14647</cvename>
      <cvename>CVE-2020-14648</cvename>
      <cvename>CVE-2020-14649</cvename>
      <cvename>CVE-2020-14650</cvename>
      <cvename>CVE-2020-14673</cvename>
      <cvename>CVE-2020-14674</cvename>
      <cvename>CVE-2020-14675</cvename>
      <cvename>CVE-2020-14676</cvename>
      <cvename>CVE-2020-14677</cvename>
      <cvename>CVE-2020-14694</cvename>
      <cvename>CVE-2020-14695</cvename>
      <cvename>CVE-2020-14698</cvename>
      <cvename>CVE-2020-14699</cvename>
      <cvename>CVE-2020-14700</cvename>
      <cvename>CVE-2020-14703</cvename>
      <cvename>CVE-2020-14704</cvename>
      <cvename>CVE-2020-14707</cvename>
      <cvename>CVE-2020-14711</cvename>
      <cvename>CVE-2020-14712</cvename>
      <cvename>CVE-2020-14713</cvename>
      <cvename>CVE-2020-14714</cvename>
      <cvename>CVE-2020-14715</cvename>
    </references>
    <dates>
      <discovery>2020-07-14</discovery>
      <entry>2020-07-17</entry>
    </dates>
  </vuln>

  <vuln vid="f7a02651-c798-11ea-81d6-6805cabe6ebb">
    <topic>clamav -- multiple vulnerabilities</topic>
    <affects>

Return to bug 244212

Lines 2-9 Link Here

(-)emulators/virtualbox-ose/Makefile (-5 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= virtualbox-ose	4	PORTNAME= virtualbox-ose
5	PORTVERSION= 5.2.34	5	PORTVERSION= 5.2.44
6	PORTREVISION= 4
7	CATEGORIES= emulators	6	CATEGORIES= emulators
8	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/	7	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
9	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}	8	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
Lines 141-152 Link Here
141	.endif	140	.endif
142		141
143	.if ${PORT_OPTIONS:MPYTHON}	142	.if ${PORT_OPTIONS:MPYTHON}
144	USES+= python:2.7	143	USES+= python
145	USE_PYTHON= distutils noegginfo noflavors	144	USE_PYTHON= distutils noegginfo noflavors
146	PYDISTUTILS_PKGNAME= vboxapi	145	PYDISTUTILS_PKGNAME= vboxapi
147	PYDISTUTILS_PKGVERSION= 1.0	146	PYDISTUTILS_PKGVERSION= 1.0
148	.else	147	.else
149	USES+= python:2.7,build	148	USES+= python:build
150	.endif	149	.endif
151		150
152	.if ${PORT_OPTIONS:MQT5}	151	.if ${PORT_OPTIONS:MQT5}
Lines 278-284 Link Here
278	${WRKSRC}/src/VBox/Main/webservice/vboxweb.cpp	277	${WRKSRC}/src/VBox/Main/webservice/vboxweb.cpp
279	.endif	278	.endif
280	@${REINPLACE_CMD} -e 's\| -finline-limit=8000\|\|' \	279	@${REINPLACE_CMD} -e 's\| -finline-limit=8000\|\|' \
281	-e 's\| -mpreferred-stack-boundary=2\|\|' ${WRKSRC}/Config.kmk	280	-e 's\| -mpreferred-stack-boundary=2\|\|' \
		281	-e 's\|%%PYTHON_VERSION%%\|${PYTHON_VERSION}\|' \
		282	${WRKSRC}/Config.kmk
282	@${REINPLACE_CMD} -e 's\| -fpermissive\|\|' ${WRKSRC}/Config.kmk \	283	@${REINPLACE_CMD} -e 's\| -fpermissive\|\|' ${WRKSRC}/Config.kmk \
283	${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk	284	${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk
284	@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk	285	@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk
Lines 399-402 Link Here
399	${STAGEDIR}${DATADIR}/sdk/bindings/webservice/	400	${STAGEDIR}${DATADIR}/sdk/bindings/webservice/
400	.endif	401	.endif
401		402
		403	post-install:
		404	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/virtualbox/*.so \
		405	${STAGEDIR}${PREFIX}/lib/virtualbox/components/*.so
		406
402	.include <bsd.port.post.mk>	407	.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-configure (-11 / +11 lines)
1	--- configure.orig 2018-07-16 14:56:48 UTC	1	--- configure.orig 2020-05-13 19:36:41 UTC
2	+++ configure	2	+++ configure
3	@@ -138,10 +138,14 @@ CXX_FLAGS=""	3	@@ -138,10 +138,14 @@ CXX_FLAGS=""
4	if [ "$OS" = "freebsd" ]; then	4	if [ "$OS" = "freebsd" ]; then
Lines 15-21 Link Here
15	else	15	else
16	INCCURL=""	16	INCCURL=""
17	LIBCURL="-lcurl"	17	LIBCURL="-lcurl"
18	@@ -436,6 +440,9 @@ check_gcc()	18	@@ -441,6 +445,9 @@ check_gcc()
19	elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "$OS" = "darwin" ]; then	19	elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "$OS" = "darwin" ]; then
20	log_success "found version $cc_ver"	20	log_success "found version $cc_ver"
21	# gcc-4.0 is allowed for Darwin only	21	# gcc-4.0 is allowed for Darwin only
Lines 24-31 Link Here
24	+ # gcc-4.2 is allowed for FreeBSD only	24	+ # gcc-4.2 is allowed for FreeBSD only
25	elif [ $cc_maj -lt 4 \	25	elif [ $cc_maj -lt 4 \
26	-o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \	26	-o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \
27	-o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) \	27	-o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) ]; then
28	@@ -1204,7 +1211,7 @@ extern "C" int main(void)	28	@@ -1208,7 +1215,7 @@ extern "C" int main(void)
29	#endif	29	#endif
30	}	30	}
31	EOF	31	EOF
Lines 34-40 Link Here
34	test_execute	34	test_execute
35	fi	35	fi
36	}	36	}
37	@@ -1504,8 +1511,7 @@ EOF	37	@@ -1508,8 +1515,7 @@ EOF
38	if [ $? -eq 0 ]; then	38	if [ $? -eq 0 ]; then
39	echo "(Qt5 from pkg-config)" >> $LOG	39	echo "(Qt5 from pkg-config)" >> $LOG
40	FLGQT5=`pkg-config Qt5Core --cflags`	40	FLGQT5=`pkg-config Qt5Core --cflags`
Lines 44-50 Link Here
44	INCQT5=`strip_I "$FLGQT5"`	44	INCQT5=`strip_I "$FLGQT5"`
45	LIBDIR5=`pkg-config Qt5Core --variable=libdir`	45	LIBDIR5=`pkg-config Qt5Core --variable=libdir`
46	LIBQT5=`pkg-config Qt5Core --libs`	46	LIBQT5=`pkg-config Qt5Core --libs`
47	@@ -1644,7 +1650,7 @@ check_libopus()	47	@@ -1648,7 +1654,7 @@ check_libopus()
48	fi	48	fi
49	cat > $ODIR.tmp_src.cc << EOF	49	cat > $ODIR.tmp_src.cc << EOF
50	#include <cstdio>	50	#include <cstdio>
Lines 53-59 Link Here
53	extern "C" int main(void)	53	extern "C" int main(void)
54	{	54	{
55	OpusEncoder *test;	55	OpusEncoder *test;
56	@@ -1976,8 +1982,8 @@ EOF	56	@@ -1980,8 +1986,8 @@ EOF
57	echo "compiling the following source file:" >> $LOG	57	echo "compiling the following source file:" >> $LOG
58	cat $ODIR.tmp_src.cc >> $LOG	58	cat $ODIR.tmp_src.cc >> $LOG
59	echo "using the following command line:" >> $LOG	59	echo "using the following command line:" >> $LOG
Lines 64-70 Link Here
64	if [ $? -eq 0 ]; then	64	if [ $? -eq 0 ]; then
65	found=1	65	found=1
66	break	66	break
67	@@ -2449,7 +2455,7 @@ for option in "$@"; do	67	@@ -2453,7 +2459,7 @@ for option in "$@"; do
68	--with-openssl-dir=*)	68	--with-openssl-dir=*)
69	OPENSSLDIR=`echo $option \| cut -d'=' -f2`	69	OPENSSLDIR=`echo $option \| cut -d'=' -f2`
70	INCCRYPTO="-I${OPENSSLDIR}/include"	70	INCCRYPTO="-I${OPENSSLDIR}/include"
Lines 73-79 Link Here
73	;;	73	;;
74	--with-ow-dir=*)	74	--with-ow-dir=*)
75	WATCOM=`echo $option \| cut -d'=' -f2`	75	WATCOM=`echo $option \| cut -d'=' -f2`
76	@@ -2763,7 +2769,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then	76	@@ -2767,7 +2773,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
77	check_ssl	77	check_ssl
78	check_curl	78	check_curl
79	[ $WITH_LIBVPX -eq 1 ] && check_vpx	79	[ $WITH_LIBVPX -eq 1 ] && check_vpx
Lines 82-88 Link Here
82	[ "$OS" != "darwin" ] && check_z	82	[ "$OS" != "darwin" ] && check_z
83	[ "$OS" != "darwin" ] && check_png	83	[ "$OS" != "darwin" ] && check_png
84	[ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam	84	[ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
85	@@ -2784,13 +2790,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then	85	@@ -2788,13 +2794,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
86	[ $WITH_PYTHON -eq 1 ] && check_python	86	[ $WITH_PYTHON -eq 1 ] && check_python
87	[ $WITH_JAVA -eq 1 ] && check_java	87	[ $WITH_JAVA -eq 1 ] && check_java
88		88
Lines 104-110 Link Here
104	fi	104	fi
105	fi	105	fi
106		106
107	@@ -2806,14 +2819,6 @@ if [ "$OS" = "linux" ]; then	107	@@ -2810,14 +2823,6 @@ if [ "$OS" = "linux" ]; then
108	cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"	108	cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
109	fi	109	fi
110	if [ $ONLY_ADDITIONS -eq 0 ]; then	110	if [ $ONLY_ADDITIONS -eq 0 ]; then

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk (-10 / +10 lines)
1	--- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2016-07-18 11:50:43 UTC	1	--- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2020-05-13 19:37:03 UTC
2	+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk	2	+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk
3	@@ -47,9 +47,7 @@ endif	3	@@ -50,9 +50,7 @@ endif
4	if1of ($(KBUILD_TARGET), linux solaris freebsd)	4	if1of ($(KBUILD_TARGET), linux solaris freebsd)
5	#VBoxOGL_DRI = 1	5	#VBoxOGL_DRI = 1
6	DLLS += VBoxEGL	6	DLLS += VBoxEGL
Lines 11-17 Link Here
11		11
12	# Only Solaris right now needs C stubs because I can't figure out how to	12	# Only Solaris right now needs C stubs because I can't figure out how to
13	# generate the GOT based relocation ASM yet.	13	# generate the GOT based relocation ASM yet.
14	@@ -184,10 +182,12 @@ VBoxOGL_CLEAN.linux += \	14	@@ -188,10 +186,12 @@ VBoxOGL_CLEAN.linux += \
15	$(VBOX_PATH_CROGL_GENFILES)/linux_exports.c	15	$(VBOX_PATH_CROGL_GENFILES)/linux_exports.c
16	VBoxOGL_CLEAN.solaris += \	16	VBoxOGL_CLEAN.solaris += \
17	$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c	17	$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c
Lines 25-31 Link Here
25	ifdef VBoxOGL_DRI	25	ifdef VBoxOGL_DRI
26	VBoxOGL_CLEAN += \	26	VBoxOGL_CLEAN += \
27	$(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \	27	$(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
28	@@ -200,6 +200,8 @@ if1of ($(KBUILD_TARGET), linux solaris)	28	@@ -204,6 +204,8 @@ if1of ($(KBUILD_TARGET), linux solaris)
29	$(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm	29	$(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm
30	VBoxOGL_CLEAN.solaris += \	30	VBoxOGL_CLEAN.solaris += \
31	$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm	31	$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm
Lines 34-40 Link Here
34	endif	34	endif
35	endif	35	endif
36	VBoxOGL_LIBS = \	36	VBoxOGL_LIBS = \
37	@@ -229,6 +231,8 @@ if1of ($(KBUILD_TARGET), linux solaris f	37	@@ -244,6 +246,8 @@ if1of ($(KBUILD_TARGET), linux solaris freebsd)
38	else	38	else
39	VBoxOGL_SONAME.linux = libGL.so.1	39	VBoxOGL_SONAME.linux = libGL.so.1
40	VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain	40	VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain
Lines 43-49 Link Here
43	endif	43	endif
44	endif	44	endif
45	ifdef VBOX_WITH_CRHGSMI	45	ifdef VBOX_WITH_CRHGSMI
46	@@ -237,7 +241,7 @@ endif	46	@@ -252,7 +256,7 @@ endif
47	ifdef VBOX_WITH_WDDM	47	ifdef VBOX_WITH_WDDM
48	VBoxOGL_DEFS.win += VBOX_WITH_WDDM	48	VBoxOGL_DEFS.win += VBOX_WITH_WDDM
49	endif	49	endif
Lines 52-58 Link Here
52	VBoxOGL_LDFLAGS += -Wl,-z,nodelete	52	VBoxOGL_LDFLAGS += -Wl,-z,nodelete
53	endif	53	endif
54	ifdef VBOX_WITH_WDDM	54	ifdef VBOX_WITH_WDDM
55	@@ -395,6 +399,16 @@ $(VBOX_PATH_CROGL_GENFILES)/solaris_expo	55	@@ -418,6 +422,16 @@ $(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm: \
56	$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm: $(PATH_SUB_CURRENT)/SunOS_i386_glxapi_exports.py \| $$(dir $$@)	56	$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm: $(PATH_SUB_CURRENT)/SunOS_i386_glxapi_exports.py \| $$(dir $$@)
57	$(call MSG_GENERATE,python,$@,$<)	57	$(call MSG_GENERATE,python,$@,$<)
58	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<	58	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
Lines 69-77 Link Here
69		69
70	else	70	else
71	$(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \	71	$(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \
72	@@ -712,6 +726,7 @@ VBoxEGL_SOURCES = egl.c	72	@@ -656,6 +670,7 @@ ifndef VBOX_USE_SYSTEM_GL_HEADERS
73	VBoxEGL_INCS = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7	73	endif
74	VBoxEGL_LIBS = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED)	74	VBoxEGL_LIBS = $(VBOX_LIB_OGL) # $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
75	VBoxEGL_SONAME.linux = libEGL.so.1	75	VBoxEGL_SONAME.linux = libEGL.so.1
76	+VBoxEGL_SONAME.freebsd = libEGL.so.1	76	+VBoxEGL_SONAME.freebsd = libEGL.so.1
77		77

Lines 1-9 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk (-6 / +6 lines)
1	Fix kmod panic when VIMAGE is disabled in the kernel and port	1	Fix kmod panic when VIMAGE is disabled in the kernel and port
2		2
3	Submitted by: Gleb Kurtsou <gleb@freebsd.org>	3	Submitted by: Gleb Kurtsou <gleb@freebsd.org>
4	--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig 2013-04-12 03:38:10.000000000 -0700	4	--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig 2020-05-13 19:43:54 UTC
5	+++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2013-06-11 21:24:05.000000000 -0700	5	+++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
6	@@ -143,12 +143,15 @@	6	@@ -203,12 +203,15 @@ $$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \
7	$$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \	7	$$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
8	\| $$(dir $$@)	8	\| $$(dir $$@)
9	$(QUIET)$(RM) -f -- $@	9	$(QUIET)$(RM) -f -- $@
Lines 14-25 Link Here
14	+ ifndef VBOX_WITH_HARDENING	14	+ ifndef VBOX_WITH_HARDENING
15	+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@	15	+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@
16	+ ${QUIET}$(MV) -f $@.tmp $@	16	+ ${QUIET}$(MV) -f $@.tmp $@
17	+ endif	17	endif
		18	-
18	+ ifndef VBOX_WITH_NETFLT_VIMAGE	19	+ ifndef VBOX_WITH_NETFLT_VIMAGE
19	+ $(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@	20	+ $(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@
20	+ ${QUIET}$(MV) -f $@.tmp $@	21	+ ${QUIET}$(MV) -f $@.tmp $@
21	endif	22	+ endif
22	-
23	endif # freebsd	23	endif # freebsd
24		24
25	include $(FILE_KBUILD_SUB_FOOTER)	25	include $(FILE_KBUILD_SUB_FOOTER)

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk (-4 / +4 lines)
1	--- src/VBox/Main/webservice/Makefile.kmk.orig 2015-10-15 13:59:24 UTC	1	--- src/VBox/Main/webservice/Makefile.kmk.orig 2020-05-13 19:44:11 UTC
2	+++ src/VBox/Main/webservice/Makefile.kmk	2	+++ src/VBox/Main/webservice/Makefile.kmk
3	@@ -159,7 +159,6 @@ VBOX_PATH_IDL := $(abspa	3	@@ -158,7 +158,6 @@ VBOX_PATH_IDL := $(abspath $(PATH_SUB_
4	RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)	4	RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
5		5
6	PATH_TARGET_SOAPDEMOXML := $(VBOXWEB_OUT_DIR)/demo_soapxml	6	PATH_TARGET_SOAPDEMOXML := $(VBOXWEB_OUT_DIR)/demo_soapxml
Lines 8-14 Link Here
8	PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps	8	PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
9	PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest	9	PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest
10		10
11	@@ -515,8 +514,6 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) \|	11	@@ -553,8 +552,6 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) \| $$(dir $$@)
12	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \	12	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
13	$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \	13	$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
14	$(PATH_TARGET_SOAPDEMOXML)/dummy_file \	14	$(PATH_TARGET_SOAPDEMOXML)/dummy_file \
Lines 17-23 Link Here
17	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \	17	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
18	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file	18	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
19		19
20	@@ -695,17 +692,14 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts	20	@@ -774,17 +771,14 @@ endif
21	# any more. Ignoring the exit code is the simple solution, accepting the error.	21	# any more. Ignoring the exit code is the simple solution, accepting the error.
22	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \| $$(dir $$@)	22	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \| $$(dir $$@)
23	$(RM) -f $@	23	$(RM) -f $@

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl (-87 / +2 lines)
1	--- src/VBox/Devices/PC/vbox-cpuhotplug.dsl.orig 2019-10-10 18:34:15 UTC	1	--- src/VBox/Devices/PC/vbox-cpuhotplug.dsl.orig 2020-07-09 16:55:56 UTC
2	+++ src/VBox/Devices/PC/vbox-cpuhotplug.dsl	2	+++ src/VBox/Devices/PC/vbox-cpuhotplug.dsl
3	@@ -44,11 +44,11 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VB	3	@@ -48,7 +48,7 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VB
4	Scope (\_SB)
5	{
6
7	-#define GENERATE_CPU_OBJECT(id, sck, sckuid, cpu, cpuuid)<NL> \
8	+#define GENERATE_CPU_OBJECT(id, sck, cpu)<NL> \
9	Device (sck) \	4	Device (sck) \
10	{ \	5	{ \
11	Name (_HID, "ACPI0004") \	6	Name (_HID, "ACPI0004") \
Lines 14-96 Link Here
14	\	9	\
15	<NL> \	10	<NL> \
16	Processor (cpu, /* Name */ \	11	Processor (cpu, /* Name */ \
17	@@ -58,7 +58,7 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VB
18	) \
19	{ \
20	Name (_HID, "ACPI0007") \
21	- Name (_UID, cpuuid) \
22	+ Name (_UID, id) \
23	Name (_PXM, 0x00) \
24	<NL> \
25	Method(_MAT, 0, Serialized) \
26	@@ -95,38 +95,38 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VB
27	} \
28	} \
29
30	- GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0, "SCK0-CPU0")
31	- GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1, "SCK1-CPU0")
32	- GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2, "SCK2-CPU0")
33	- GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3, "SCK3-CPU0")
34	- GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4, "SCK4-CPU0")
35	- GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5, "SCK5-CPU0")
36	- GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6, "SCK6-CPU0")
37	- GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7, "SCK7-CPU0")
38	- GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8, "SCK8-CPU0")
39	- GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9, "SCK9-CPU0")
40	- GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA, "SCKA-CPU0")
41	- GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB, "SCKB-CPU0")
42	- GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC, "SCKC-CPU0")
43	- GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD, "SCKD-CPU0")
44	- GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE, "SCKE-CPU0")
45	- GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF, "SCKF-CPU0")
46	- GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG, "SCKG-CPU0")
47	- GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH, "SCKH-CPU0")
48	- GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI, "SCKI-CPU0")
49	- GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ, "SCKJ-CPU0")
50	- GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK, "SCKK-CPU0")
51	- GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL, "SCKL-CPU0")
52	- GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM, "SCKM-CPU0")
53	- GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN, "SCKN-CPU0")
54	- GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO, "SCKO-CPU0")
55	- GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP, "SCKP-CPU0")
56	- GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ, "SCKQ-CPU0")
57	- GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR, "SCKR-CPU0")
58	- GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS, "SCKS-CPU0")
59	- GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT, "SCKT-CPU0")
60	- GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU, "SCKU-CPU0")
61	- GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV, "SCKV-CPU0")
62	+ GENERATE_CPU_OBJECT(0x00, SCK0, CPU0)
63	+ GENERATE_CPU_OBJECT(0x01, SCK1, CPU1)
64	+ GENERATE_CPU_OBJECT(0x02, SCK2, CPU2)
65	+ GENERATE_CPU_OBJECT(0x03, SCK3, CPU3)
66	+ GENERATE_CPU_OBJECT(0x04, SCK4, CPU4)
67	+ GENERATE_CPU_OBJECT(0x05, SCK5, CPU5)
68	+ GENERATE_CPU_OBJECT(0x06, SCK6, CPU6)
69	+ GENERATE_CPU_OBJECT(0x07, SCK7, CPU7)
70	+ GENERATE_CPU_OBJECT(0x08, SCK8, CPU8)
71	+ GENERATE_CPU_OBJECT(0x09, SCK9, CPU9)
72	+ GENERATE_CPU_OBJECT(0x0a, SCKA, CPUA)
73	+ GENERATE_CPU_OBJECT(0x0b, SCKB, CPUB)
74	+ GENERATE_CPU_OBJECT(0x0c, SCKC, CPUC)
75	+ GENERATE_CPU_OBJECT(0x0d, SCKD, CPUD)
76	+ GENERATE_CPU_OBJECT(0x0e, SCKE, CPUE)
77	+ GENERATE_CPU_OBJECT(0x0f, SCKF, CPUF)
78	+ GENERATE_CPU_OBJECT(0x10, SCKG, CPUG)
79	+ GENERATE_CPU_OBJECT(0x11, SCKH, CPUH)
80	+ GENERATE_CPU_OBJECT(0x12, SCKI, CPUI)
81	+ GENERATE_CPU_OBJECT(0x13, SCKJ, CPUJ)
82	+ GENERATE_CPU_OBJECT(0x14, SCKK, CPUK)
83	+ GENERATE_CPU_OBJECT(0x15, SCKL, CPUL)
84	+ GENERATE_CPU_OBJECT(0x16, SCKM, CPUM)
85	+ GENERATE_CPU_OBJECT(0x17, SCKN, CPUN)
86	+ GENERATE_CPU_OBJECT(0x18, SCKO, CPUO)
87	+ GENERATE_CPU_OBJECT(0x19, SCKP, CPUP)
88	+ GENERATE_CPU_OBJECT(0x1a, SCKQ, CPUQ)
89	+ GENERATE_CPU_OBJECT(0x1b, SCKR, CPUR)
90	+ GENERATE_CPU_OBJECT(0x1c, SCKS, CPUS)
91	+ GENERATE_CPU_OBJECT(0x1d, SCKT, CPUT)
92	+ GENERATE_CPU_OBJECT(0x1e, SCKU, CPUU)
93	+ GENERATE_CPU_OBJECT(0x1f, SCKV, CPUV)
94
95	#undef GENERATE_CPU_OBJECT
96	}

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VBoxManage_VBoxManageHelp.cpp (-6 / +6 lines)
1	--- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig 2016-08-16 19:59:52 UTC	1	--- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig 2020-05-13 19:43:27 UTC
2	+++ src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	2	+++ src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
3	@@ -797,7 +797,7 @@ void printUsage(USAGECATEGORY fCategory,	3	@@ -622,7 +622,7 @@ void printUsage(USAGECATEGORY fCategory, uint32_t fSub
4	RTStrmPrintf(pStrm, "\|dsound");	4	RTStrmPrintf(pStrm, "\|dsound");
5	#endif	5	#endif
6	}	6	}
Lines 9-18 Link Here
9	{	9	{
10	RTStrmPrintf(pStrm, ""	10	RTStrmPrintf(pStrm, ""
11	#ifdef VBOX_WITH_AUDIO_OSS	11	#ifdef VBOX_WITH_AUDIO_OSS
12	@@ -811,22 +811,6 @@ void printUsage(USAGECATEGORY fCategory,	12	@@ -635,22 +635,6 @@ void printUsage(USAGECATEGORY fCategory, uint32_t fSub
		13	"\|pulse"
13	#endif	14	#endif
14	);	15	);
15	}	16	- }
16	- if (fFreeBSD)	17	- if (fFreeBSD)
17	- {	18	- {
18	-#ifdef VBOX_WITH_AUDIO_OSS	19	-#ifdef VBOX_WITH_AUDIO_OSS
Lines 28-34 Link Here
28	-#ifdef VBOX_WITH_AUDIO_PULSE	29	-#ifdef VBOX_WITH_AUDIO_PULSE
29	- RTStrmPrintf(pStrm, "\|pulse");	30	- RTStrmPrintf(pStrm, "\|pulse");
30	-#endif	31	-#endif
31	- }	32	}
32	if (fDarwin)	33	if (fDarwin)
33	{	34	{
34	RTStrmPrintf(pStrm, "\|coreaudio");

Lines 58-63 Link Here

(-)security/vuxml/vuln.xml (+59 lines)
58	* Do not forget port variants (linux-f10-libxml2, libxml2, etc.)	58	* Do not forget port variants (linux-f10-libxml2, libxml2, etc.)
59	-->	59	-->
60	<vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">	60	<vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
		61	<vuln vid="1e7b316b-c6a8-11ea-a7d5-001999f8d30b">
		62	<topic>VirtualBox -- Multiple vulnerabilities</topic>
		63	<affects>
		64	<package>
		65	<name>virtualbox-ose</name>
		66	<range><ge>5.2</ge><lt>5.2.44</lt></range>
		67	<range><ge>6.0</ge><lt>6.0.24</lt></range>
		68	<range><ge>6.1</ge><lt>6.1.12</lt></range>
		69	</package>
		70	</affects>
		71	<description>
		72	<body xmlns="http://www.w3.org/1999/xhtml">
		73	<p>Oracle reports:</p>
		74	<blockquote cite="https://www.oracle.com/security-alerts/cpujul2020.html">
		75	<p>Vulnerabilities in VirtualBox core can allow users
		76	with logon access to the infrastructure where Oracle VM
		77	VirtualBox executes to compromise Oracle VM VirtualBox.
		78	Successful attacks of these vulnerabilities can result
		79	in unauthorized access to critical data, access to all
		80	Oracle VM VirtualBox accessible data, unauthorized ability
		81	to cause a hang or frequently repeatable crash (complete
		82	DOS) or takeover of Oracle VM VirtualBox.</p>
		83	</blockquote>
		84	</body>
		85	</description>
		86	<references>
		87	<url>https://www.oracle.com/security-alerts/cpujul2020.html</url>
		88	<cvename>CVE-2020-14628</cvename>
		89	<cvename>CVE-2020-14629</cvename>
		90	<cvename>CVE-2020-14646</cvename>
		91	<cvename>CVE-2020-14647</cvename>
		92	<cvename>CVE-2020-14648</cvename>
		93	<cvename>CVE-2020-14649</cvename>
		94	<cvename>CVE-2020-14650</cvename>
		95	<cvename>CVE-2020-14673</cvename>
		96	<cvename>CVE-2020-14674</cvename>
		97	<cvename>CVE-2020-14675</cvename>
		98	<cvename>CVE-2020-14676</cvename>
		99	<cvename>CVE-2020-14677</cvename>
		100	<cvename>CVE-2020-14694</cvename>
		101	<cvename>CVE-2020-14695</cvename>
		102	<cvename>CVE-2020-14698</cvename>
		103	<cvename>CVE-2020-14699</cvename>
		104	<cvename>CVE-2020-14700</cvename>
		105	<cvename>CVE-2020-14703</cvename>
		106	<cvename>CVE-2020-14704</cvename>
		107	<cvename>CVE-2020-14707</cvename>
		108	<cvename>CVE-2020-14711</cvename>
		109	<cvename>CVE-2020-14712</cvename>
		110	<cvename>CVE-2020-14713</cvename>
		111	<cvename>CVE-2020-14714</cvename>
		112	<cvename>CVE-2020-14715</cvename>
		113	</references>
		114	<dates>
		115	<discovery>2020-07-14</discovery>
		116	<entry>2020-07-17</entry>
		117	</dates>
		118	</vuln>
		119
61	<vuln vid="f7a02651-c798-11ea-81d6-6805cabe6ebb">	120	<vuln vid="f7a02651-c798-11ea-81d6-6805cabe6ebb">
62	<topic>clamav -- multiple vulnerabilities</topic>	121	<topic>clamav -- multiple vulnerabilities</topic>
63	<affects>	122	<affects>