D25496.id73804.diff
No OneTemporary
Actions

Size

85 KB

Referenced Files

None

Subscribers

None

D25496.id73804.diff
View Options

	Index: emulators/virtualbox-ose-additions/Makefile
	===================================================================
	--- emulators/virtualbox-ose-additions/Makefile
	+++ emulators/virtualbox-ose-additions/Makefile
	@@ -2,8 +2,8 @@
	# $FreeBSD$

	PORTNAME= virtualbox-ose
	-PORTVERSION= 5.2.34
	-PORTREVISION= 2
	+PORTVERSION= 5.2.42
	+#PORTREVISION= 2
	CATEGORIES= emulators
	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
	PKGNAMESUFFIX?= -additions
	Index: emulators/virtualbox-ose-additions/distinfo
	===================================================================
	--- emulators/virtualbox-ose-additions/distinfo
	+++ emulators/virtualbox-ose-additions/distinfo
	@@ -1,3 +1,3 @@
	-TIMESTAMP = 1571257463
	-SHA256 (VirtualBox-5.2.34.tar.bz2) = 9abff37330bba46b97aa836bc886397ba9cfb06cb75be5d60ac31f5ae9c2f2e1
	-SIZE (VirtualBox-5.2.34.tar.bz2) = 118268064
	+TIMESTAMP = 1593163972
	+SHA256 (VirtualBox-5.2.42.tar.bz2) = e5bee2e34f349aac115ee93974febfe3213ad5e94045fa36b9f04b5f8caa3720
	+SIZE (VirtualBox-5.2.42.tar.bz2) = 124013981
	Index: emulators/virtualbox-ose-kmod/Makefile
	===================================================================
	--- emulators/virtualbox-ose-kmod/Makefile
	+++ emulators/virtualbox-ose-kmod/Makefile
	@@ -2,7 +2,7 @@
	# $FreeBSD$

	PORTNAME= virtualbox-ose
	-PORTVERSION= 5.2.34
	+PORTVERSION= 5.2.42
	CATEGORIES= emulators
	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
	PKGNAMESUFFIX= -kmod
	Index: emulators/virtualbox-ose-kmod/distinfo
	===================================================================
	--- emulators/virtualbox-ose-kmod/distinfo
	+++ emulators/virtualbox-ose-kmod/distinfo
	@@ -1,3 +1,3 @@
	-TIMESTAMP = 1571257293
	-SHA256 (VirtualBox-5.2.34.tar.bz2) = 9abff37330bba46b97aa836bc886397ba9cfb06cb75be5d60ac31f5ae9c2f2e1
	-SIZE (VirtualBox-5.2.34.tar.bz2) = 118268064
	+TIMESTAMP = 1571257463
	+SHA256 (VirtualBox-5.2.42.tar.bz2) = e5bee2e34f349aac115ee93974febfe3213ad5e94045fa36b9f04b5f8caa3720
	+SIZE (VirtualBox-5.2.42.tar.bz2) = 124013981
	Index: emulators/virtualbox-ose/Makefile
	===================================================================
	--- emulators/virtualbox-ose/Makefile
	+++ emulators/virtualbox-ose/Makefile
	@@ -2,8 +2,8 @@
	# $FreeBSD$

	PORTNAME= virtualbox-ose
	-PORTVERSION= 5.2.34
	-PORTREVISION= 4
	+PORTVERSION= 5.2.42
	+# PORTREVISION= 4
	CATEGORIES= emulators
	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
	@@ -141,12 +141,12 @@
	.endif

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

	.if ${PORT_OPTIONS:MQT5}
	@@ -278,7 +278,9 @@
	${WRKSRC}/src/VBox/Main/webservice/vboxweb.cpp
	.endif
	@${REINPLACE_CMD} -e 's\| -finline-limit=8000\|\|' \
	- -e 's\| -mpreferred-stack-boundary=2\|\|' ${WRKSRC}/Config.kmk
	+ -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
	Index: emulators/virtualbox-ose/distinfo
	===================================================================
	--- emulators/virtualbox-ose/distinfo
	+++ emulators/virtualbox-ose/distinfo
	@@ -1,5 +1,5 @@
	TIMESTAMP = 1571257463
	-SHA256 (VirtualBox-5.2.34.tar.bz2) = 9abff37330bba46b97aa836bc886397ba9cfb06cb75be5d60ac31f5ae9c2f2e1
	-SIZE (VirtualBox-5.2.34.tar.bz2) = 118268064
	-SHA256 (VBoxGuestAdditions_5.2.34.iso) = d1b63891abca37fd78f5c8af1764e10e5754b1eecabd1fcfe7599c29a93ba007
	-SIZE (VBoxGuestAdditions_5.2.34.iso) = 49661952
	+SHA256 (VirtualBox-5.2.42.tar.bz2) = e5bee2e34f349aac115ee93974febfe3213ad5e94045fa36b9f04b5f8caa3720
	+SIZE (VirtualBox-5.2.42.tar.bz2) = 124013981
	+SHA256 (VBoxGuestAdditions_5.2.42.iso) = ff784417295e48e3cee80a596faf05e3b0976e1b94d3b88427939912b0c1fc45
	+SIZE (VBoxGuestAdditions_5.2.42.iso) = 49833984
	Index: emulators/virtualbox-ose/files/patch-Config.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-Config.kmk
	+++ emulators/virtualbox-ose/files/patch-Config.kmk
	@@ -1,4 +1,4 @@
	---- Config.kmk.orig 2019-10-10 18:06:26 UTC
	+--- Config.kmk.orig 2020-05-13 19:36:41 UTC
	+++ Config.kmk
	@@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)
	# Enable OSS audio support.
	@@ -74,7 +74,15 @@
	# branding
	VBOX_BRAND_LICENSE_HTML := $(PATH_ROOT)/doc/License-gpl-2.0.html
	VBOX_BRAND_LICENSE_RTF := $(PATH_ROOT)/doc/License-gpl-2.0.rtf
	-@@ -2538,6 +2534,10 @@ ifeq ($(KBUILD_HOST),win) ## @todo can drop this now,
	+@@ -1810,6 +1806,7 @@ ifndef VBOX_BLD_PYTHON
	+ else
	+ VBOX_BLD_PYTHON := $(firstword $(which python2.7$(HOSTSUFF_EXE)) $(which python2.6$(HOSTSUFF_EXE)) \
	+ $(which python$(HOSTSUFF_EXE)) $(which python3$(HOSTSUFF_EXE)) \
	++ $(which %%PYTHON_VERSION%%) \
	+ python-not-found)
	+ endif
	+ endif
	+@@ -2550,6 +2547,10 @@ ifeq ($(KBUILD_HOST),win) ## @todo can drop this now,
	# This isn't important (yet) on windows, so cook the result until
	# cygwin is feeling better.
	VBOX_GCC_VERSION := $(int-add $(int-mul 10000, 3), $(int-mul 100, 3), 3)
	@@ -85,7 +93,7 @@
	else
	# This is kind of bad, the returned string needs to be re-evaluated before use.
	# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
	-@@ -4158,6 +4154,7 @@ ifdef VBOX_WITH_RAW_MODE
	+@@ -4218,6 +4219,7 @@ ifdef VBOX_WITH_RAW_MODE
	TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC32_TOOL)
	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)
	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)
	@@ -93,7 +101,7 @@
	ifeq ($(KBUILD_TARGET),solaris)
	TEMPLATE_VBoxRc_LDFLAGS = -r
	else
	-@@ -4299,6 +4296,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
	+@@ -4359,6 +4361,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
	TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
	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)
	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)
	@@ -101,7 +109,7 @@
	TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
	TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
	ifeq ($(KBUILD_TARGET),solaris)
	-@@ -4623,7 +4621,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \
	+@@ -4683,7 +4686,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \
	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
	-nostdinc -std=c99
	@@ -110,7 +118,7 @@
	TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
	-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \
	-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef
	-@@ -4656,7 +4654,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
	+@@ -4716,7 +4719,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
	\| xargs -J% objcopy % $(out)

	## Strip debug info (comment out if debugging or something).
	@@ -119,7 +127,7 @@
	endef
	else # x86
	TOOL_FREEBSDKMODLD_LINK_SYSMOD_OUTPUT = $(outbase).kld
	-@@ -4670,7 +4668,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
	+@@ -4730,7 +4733,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
	\| xargs -J% objcopy % $(outbase).kld

	# Link the final .ko (a shared object).
	@@ -128,7 +136,7 @@
	endef
	endif # x86

	-@@ -4956,10 +4954,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \
	+@@ -5016,10 +5019,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \
	TEMPLATE_VBOXR3EXE_CFLAGS += -fno-pic
	TEMPLATE_VBOXR3EXE_CXXFLAGS += -fno-pic
	TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic
	@@ -148,7 +156,7 @@
	/usr/include \
	/usr/X11R6/include \
	/usr/local/include
	-@@ -5250,7 +5256,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
	+@@ -5310,7 +5321,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain
	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE)
	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)
	@@ -157,7 +165,7 @@
	# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)
	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
	-@@ -5777,10 +5783,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI
	+@@ -5837,10 +5848,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI
	else ifeq ($(KBUILD_TARGET),haiku)
	TEMPLATE_VBOXMAINEXE_TOOL = GXX3
	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) network stdc++ supc++
	@@ -177,7 +185,7 @@
	/usr/include \
	/usr/X11R6/include \
	/usr/local/include
	-@@ -6319,13 +6333,10 @@ ifdef VBOX_WITH_QTGUI
	+@@ -6382,13 +6401,10 @@ ifdef VBOX_WITH_QTGUI
	TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
	$(VBOX_LIBPATH_X11)
	ifeq ($(KBUILD_TARGET),freebsd)
	@@ -192,7 +200,7 @@
	/usr/local/lib
	endif
	ifeq ($(KBUILD_TARGET),solaris)
	-@@ -6548,12 +6559,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \
	+@@ -6617,12 +6633,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \
	TEMPLATE_VBoxBldProg_TOOL = GXX3
	TEMPLATE_VBoxBldProg_LIBS = pthread
	TEMPLATE_VBoxBldProg_INCS += \
	@@ -205,7 +213,7 @@
	/usr/local/lib
	else ifeq ($(KBUILD_HOST),netbsd)
	TEMPLATE_VBoxBldProg_TOOL = GXX3
	-@@ -6954,6 +6961,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \
	+@@ -7023,6 +7035,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \
	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
	TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed
	Index: emulators/virtualbox-ose/files/patch-configure
	===================================================================
	--- emulators/virtualbox-ose/files/patch-configure
	+++ emulators/virtualbox-ose/files/patch-configure
	@@ -1,4 +1,4 @@
	---- configure.orig 2018-07-16 14:56:48 UTC
	+--- configure.orig 2020-05-13 19:36:41 UTC
	+++ configure
	@@ -138,10 +138,14 @@ CXX_FLAGS=""
	if [ "$OS" = "freebsd" ]; then
	@@ -15,7 +15,7 @@
	else
	INCCURL=""
	LIBCURL="-lcurl"
	-@@ -436,6 +440,9 @@ check_gcc()
	+@@ -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
	@@ -24,8 +24,8 @@
	+ # 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" $ \
	-@@ -1204,7 +1211,7 @@ extern "C" int main(void)
	+ -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
	@@ -34,7 +34,7 @@
	test_execute
	fi
	}
	-@@ -1504,8 +1511,7 @@ EOF
	+@@ -1508,8 +1515,7 @@ EOF
	if [ $? -eq 0 ]; then
	echo "(Qt5 from pkg-config)" >> $LOG
	FLGQT5=`pkg-config Qt5Core --cflags`
	@@ -44,7 +44,7 @@
	INCQT5=`strip_I "$FLGQT5"`
	LIBDIR5=`pkg-config Qt5Core --variable=libdir`
	LIBQT5=`pkg-config Qt5Core --libs`
	-@@ -1644,7 +1650,7 @@ check_libopus()
	+@@ -1648,7 +1654,7 @@ check_libopus()
	fi
	cat > $ODIR.tmp_src.cc << EOF
	#include <cstdio>
	@@ -53,7 +53,7 @@
	extern "C" int main(void)
	{
	OpusEncoder *test;
	-@@ -1976,8 +1982,8 @@ EOF
	+@@ -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
	@@ -64,7 +64,7 @@
	if [ $? -eq 0 ]; then
	found=1
	break
	-@@ -2449,7 +2455,7 @@ for option in "$@"; do
	+@@ -2453,7 +2459,7 @@ for option in "$@"; do
	--with-openssl-dir=*)
	OPENSSLDIR=`echo $option \| cut -d'=' -f2`
	INCCRYPTO="-I${OPENSSLDIR}/include"
	@@ -73,7 +73,7 @@
	;;
	--with-ow-dir=*)
	WATCOM=`echo $option \| cut -d'=' -f2`
	-@@ -2763,7 +2769,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
	+@@ -2767,7 +2773,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
	check_ssl
	check_curl
	[ $WITH_LIBVPX -eq 1 ] && check_vpx
	@@ -82,7 +82,7 @@
	[ "$OS" != "darwin" ] && check_z
	[ "$OS" != "darwin" ] && check_png
	[ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
	-@@ -2784,13 +2790,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
	+@@ -2788,13 +2794,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
	[ $WITH_PYTHON -eq 1 ] && check_python
	[ $WITH_JAVA -eq 1 ] && check_java

	@@ -104,7 +104,7 @@
	fi
	fi

	-@@ -2806,14 +2819,6 @@ if [ "$OS" = "linux" ]; then
	+@@ -2810,14 +2823,6 @@ if [ "$OS" = "linux" ]; then
	cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
	fi
	if [ $ONLY_ADDITIONS -eq 0 ]; then
	Index: emulators/virtualbox-ose/files/patch-include-VBox-vmm-cpumctx.h
	===================================================================
	--- emulators/virtualbox-ose/files/patch-include-VBox-vmm-cpumctx.h
	+++ emulators/virtualbox-ose/files/patch-include-VBox-vmm-cpumctx.h
	@@ -1,6 +1,6 @@
	---- include/VBox/vmm/cpumctx.h.orig 2015-03-12 18:53:45.762704000 -0400
	-+++ include/VBox/vmm/cpumctx.h 2015-03-12 18:56:23.765105000 -0400
	-@@ -84,7 +84,7 @@
	+--- include/VBox/vmm/cpumctx.h.orig 2020-05-13 19:36:46 UTC
	++++ include/VBox/vmm/cpumctx.h
	+@@ -88,7 +88,7 @@ AssertCompileSize(CPUMSELREG, 24);
	# define CPUMSELREG_ARE_HIDDEN_PARTS_VALID(a_pVCpu, a_pSelReg) \
	( ((a_pSelReg)->fFlags & CPUMSELREG_FLAGS_VALID) \
	&& ( (a_pSelReg)->ValidSel == (a_pSelReg)->Sel \
	Index: emulators/virtualbox-ose/files/patch-include-iprt-x86.h
	===================================================================
	--- emulators/virtualbox-ose/files/patch-include-iprt-x86.h
	+++ emulators/virtualbox-ose/files/patch-include-iprt-x86.h
	@@ -1,5 +1,5 @@
	---- include/iprt/x86.h.orig 2014-02-25 11:59:50.000000000 -0500
	-+++ include/iprt/x86.h 2014-03-11 16:46:08.000000000 -0400
	+--- include/iprt/x86.h.orig 2020-05-13 19:36:52 UTC
	++++ include/iprt/x86.h
	@@ -35,6 +35,16 @@
	# pragma D depends_on library vbox-types.d
	#endif
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
	@@ -1,6 +1,6 @@
	---- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2017-10-18 07:06:43 UTC
	+--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2020-05-13 19:37:01 UTC
	+++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c
	-@@ -93,8 +93,6 @@ struct VBoxGuestDeviceState
	+@@ -102,8 +102,6 @@ struct VBoxGuestDeviceState
	struct resource *pIrqRes;
	/** Pointer to the IRQ handler. */
	void *pfnIrqHandler;
	@@ -9,7 +9,7 @@
	};


	-@@ -104,8 +102,7 @@ struct VBoxGuestDeviceState
	+@@ -113,8 +111,7 @@ struct VBoxGuestDeviceState
	/*
	* Character device file handlers.
	*/
	@@ -19,7 +19,7 @@
	static d_ioctl_t vgdrvFreeBSDIOCtl;
	static int vgdrvFreeBSDIOCtlSlow(PVBOXGUESTSESSION pSession, u_long ulCmd, caddr_t pvData, struct thread *pTd);
	static d_write_t vgdrvFreeBSDWrite;
	-@@ -136,8 +133,7 @@ static struct cdevsw g_vgdrvFreeBSDCh
	+@@ -145,8 +142,7 @@ static struct cdevsw g_vgdrvFreeBSDChrDevSW =
	{
	.d_version = D_VERSION,
	.d_flags = D_TRACKCLOSE \| D_NEEDMINOR,
	@@ -29,7 +29,7 @@
	.d_ioctl = vgdrvFreeBSDIOCtl,
	.d_read = vgdrvFreeBSDRead,
	.d_write = vgdrvFreeBSDWrite,
	-@@ -145,81 +141,28 @@ static struct cdevsw g_vgdrvFreeBSDCh
	+@@ -154,81 +150,28 @@ static struct cdevsw g_vgdrvFreeBSDChrDevSW =
	.d_name = "vboxguest"
	};

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

	/*
	@@ -150,7 +150,7 @@
	}

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

	/**
	@@ -184,20 +184,21 @@
	* I/O control request.
	*
	* @returns depends...
	-@@ -292,7 +201,11 @@ static int vgdrvFreeBSDClose(struct cdev
	+@@ -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.
	-@@ -488,12 +401,14 @@ int VBOXCALL VBoxGuestIDC(void *pvSessio
	+ */
	+@@ -497,12 +410,14 @@ int VBOXCALL VBoxGuestIDC(void *pvSession, uintptr_t u

	static int vgdrvFreeBSDPoll(struct cdev pDev, int fEvents, struct thread td)
	{
	@@ -215,19 +216,20 @@
	Log(("vgdrvFreeBSDPoll: no state data for %s\n", devtoname(pDev)));
	return (fEvents & (POLLHUP\|POLLIN\|POLLRDNORM\|POLLOUT\|POLLWRNORM));
	}
	-@@ -534,10 +449,7 @@ static int vgdrvFreeBSDDetach(device_t p
	+@@ -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);

	-@@ -689,18 +601,21 @@ static int vgdrvFreeBSDAttach(device_t p
	+ if (pState->pVMMDevMemRes)
	+@@ -698,18 +610,21 @@ static int vgdrvFreeBSDAttach(device_t pDevice)
	if (RT_SUCCESS(rc))
	{
	/*
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile
	@@ -1,6 +1,6 @@
	---- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2017-10-18 07:06:43 UTC
	+--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2020-05-13 19:37:01 UTC
	+++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile
	-@@ -70,6 +70,7 @@ SRCS += \
	+@@ -80,6 +80,7 @@ SRCS += \
	handletable.c \
	handletablectx.c \
	once.c \
	@@ -8,7 +8,7 @@
	thread.c

	.PATH: ${.CURDIR}/common/string
	-@@ -128,6 +129,7 @@ SRCS += \
	+@@ -139,6 +140,7 @@ SRCS += \

	.PATH: ${.CURDIR}/r0drv
	SRCS += \
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest
	@@ -1,6 +1,6 @@
	---- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2017-10-18 07:06:43 UTC
	+--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2020-05-13 19:37:01 UTC
	+++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest
	-@@ -99,6 +99,7 @@ FILES_VBOXGUEST_NOBIN=" \
	+@@ -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 \
	@@ -8,7 +8,7 @@
	${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 \
	-@@ -160,6 +161,7 @@ FILES_VBOXGUEST_NOBIN=" \
	+@@ -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 \
	@@ -16,7 +16,7 @@
	${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 \
	-@@ -186,6 +188,7 @@ FILES_VBOXGUEST_NOBIN=" \
	+@@ -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 \
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports.py
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports.py
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports.py
	@@ -1,5 +1,5 @@
	---- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py.orig 2014-12-19 16:58:04.474417000 -0500
	-+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py 2014-11-21 10:16:35.000000000 -0500
	+--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py.orig 2020-06-26 09:52:40 UTC
	++++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py
	@@ -0,0 +1,95 @@
	+# Copyright (c) 2001, Stanford University
	+# All rights reserved.
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports_dri.py
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports_dri.py
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports_dri.py
	@@ -1,5 +1,5 @@
	---- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py.orig 2014-12-19 16:58:04.474417000 -0500
	-+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py 2014-11-21 10:16:35.000000000 -0500
	+--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py.orig 2020-06-26 09:53:28 UTC
	++++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py
	@@ -0,0 +1,95 @@
	+# Copyright (c) 2001, Stanford University
	+# All rights reserved.
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_glxapi_exports.py
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_glxapi_exports.py
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_glxapi_exports.py
	@@ -1,5 +1,5 @@
	---- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py.orig 2014-12-19 16:58:04.474417000 -0500
	-+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py 2014-11-21 10:16:35.000000000 -0500
	+--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py.orig 2020-06-26 09:53:39 UTC
	++++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py
	@@ -0,0 +1,104 @@
	+"""
	+Copyright (C) 2009-2012 Oracle Corporation
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk
	@@ -1,6 +1,6 @@
	---- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2016-07-18 11:50:43 UTC
	+--- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2020-05-13 19:37:03 UTC
	+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk
	-@@ -47,9 +47,7 @@ endif
	+@@ -50,9 +50,7 @@ endif
	if1of ($(KBUILD_TARGET), linux solaris freebsd)
	#VBoxOGL_DRI = 1
	DLLS += VBoxEGL
	@@ -11,7 +11,7 @@

	# Only Solaris right now needs C stubs because I can't figure out how to
	# generate the GOT based relocation ASM yet.
	-@@ -184,10 +182,12 @@ VBoxOGL_CLEAN.linux += \
	+@@ -188,10 +186,12 @@ VBoxOGL_CLEAN.linux += \
	$(VBOX_PATH_CROGL_GENFILES)/linux_exports.c
	VBoxOGL_CLEAN.solaris += \
	$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c
	@@ -25,7 +25,7 @@
	ifdef VBoxOGL_DRI
	VBoxOGL_CLEAN += \
	$(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
	-@@ -200,6 +200,8 @@ if1of ($(KBUILD_TARGET), linux solaris)
	+@@ -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
	@@ -34,7 +34,7 @@
	endif
	endif
	VBoxOGL_LIBS = \
	-@@ -229,6 +231,8 @@ if1of ($(KBUILD_TARGET), linux solaris f
	+@@ -244,6 +246,8 @@ if1of ($(KBUILD_TARGET), linux solaris freebsd)
	else
	VBoxOGL_SONAME.linux = libGL.so.1
	VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain
	@@ -43,7 +43,7 @@
	endif
	endif
	ifdef VBOX_WITH_CRHGSMI
	-@@ -237,7 +241,7 @@ endif
	+@@ -252,7 +256,7 @@ endif
	ifdef VBOX_WITH_WDDM
	VBoxOGL_DEFS.win += VBOX_WITH_WDDM
	endif
	@@ -52,7 +52,7 @@
	VBoxOGL_LDFLAGS += -Wl,-z,nodelete
	endif
	ifdef VBOX_WITH_WDDM
	-@@ -395,6 +399,16 @@ $(VBOX_PATH_CROGL_GENFILES)/solaris_expo
	+@@ -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) $<
	@@ -69,9 +69,9 @@

	else
	$(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \
	-@@ -712,6 +726,7 @@ VBoxEGL_SOURCES = egl.c
	- VBoxEGL_INCS = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7
	- VBoxEGL_LIBS = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
	+@@ -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

	Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
	@@ -1,6 +1,6 @@
	---- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2015-02-12 11:08:13.000000000 -0500
	-+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient 2015-02-12 14:38:40.689104000 -0500
	-@@ -28,9 +28,9 @@
	+--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2020-05-13 19:37:09 UTC
	++++ src/VBox/Additions/x11/Installer/98vboxadd-xclient
	+@@ -30,10 +30,10 @@ elif test -z "${SSH_CONNECTION}"; then
	# This script can also be triggered by a connection over SSH, which is not
	# what we had in mind, so we do not start VBoxClient in that case. We do
	# not use "exit" here as this script is "source"d, not executed.
	@@ -14,4 +14,5 @@
	+ /usr/local/bin/VBoxClient --display
	+ /usr/local/bin/VBoxClient --seamless
	+ /usr/local/bin/VBoxClient --draganddrop
	+ /usr/bin/VBoxClient --vmsvga-x11 # In case VMSVGA emulation is enabled
	fi
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop
	@@ -1,6 +1,6 @@
	---- src/VBox/Additions/x11/Installer/vboxclient.desktop.orig 2009-06-12 12:34:57.000000000 +0000
	-+++ src/VBox/Additions/x11/Installer/vboxclient.desktop 2011-01-13 22:07:37.000000000 +0000
	-@@ -8,6 +8,6 @@
	+--- src/VBox/Additions/x11/Installer/vboxclient.desktop.orig 2020-05-13 19:37:09 UTC
	++++ src/VBox/Additions/x11/Installer/vboxclient.desktop
	+@@ -8,6 +8,6 @@ Comment[C]=VirtualBox User Session Services
	Comment=VirtualBox User Session Services
	Comment[it]=Servizi di sessione utente di VirtualBox
	Comment[pl]=Usługi sesji użytkownika VirtualBox
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h
	@@ -1,6 +1,6 @@
	---- src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h.orig 2015-03-02 10:09:19.000000000 -0500
	-+++ src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h 2015-03-02 19:42:56.808020000 -0500
	-@@ -241,6 +241,9 @@
	+--- src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h.orig 2020-05-13 19:42:23 UTC
	++++ src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h
	+@@ -245,6 +245,9 @@ struct mbuf {
	#define M_FRAG 0x00000800 /* packet is a fragment of a larger packet */
	#define M_FIRSTFRAG 0x00001000 /* packet is first fragment */
	#define M_LASTFRAG 0x00002000 /* packet is last fragment */
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk
	@@ -1,6 +1,6 @@
	---- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2013-11-29 14:23:32.000000000 -0500
	-+++ src/VBox/Devices/PC/ipxe/Makefile.kmk 2013-12-13 15:06:45.000000000 -0500
	-@@ -35,7 +35,7 @@
	+--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2020-05-13 19:42:27 UTC
	++++ src/VBox/Devices/PC/ipxe/Makefile.kmk
	+@@ -35,7 +35,7 @@ iPxeBiosBin_SOURCES = $(iPxeBiosBin_0_OUTDIR)/iPxeBio
	iPxeBiosBin_CLEAN = \
	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \

	Index: emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile
	+++ emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile
	@@ -1,6 +1,6 @@
	---- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2016-07-18 11:56:20 UTC
	+--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2020-05-13 19:43:53 UTC
	+++ src/VBox/HostDrivers/Support/freebsd/Makefile
	-@@ -81,6 +81,7 @@ SRCS += \
	+@@ -82,6 +82,7 @@ SRCS += \
	assert.c \
	handletable.c \
	handletablectx.c \
	@@ -8,7 +8,7 @@
	once.c \
	term.c \
	thread.c
	-@@ -92,13 +93,14 @@ SRCS += \
	+@@ -94,13 +95,14 @@ SRCS += \
	RTStrCopy.c \
	RTStrCopyEx.c \
	RTStrCopyP.c \
	Index: emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv
	+++ emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv
	@@ -1,6 +1,6 @@
	---- src/VBox/HostDrivers/Support/freebsd/files_vboxdrv.orig 2016-07-18 11:56:20 UTC
	+--- src/VBox/HostDrivers/Support/freebsd/files_vboxdrv.orig 2020-05-13 19:43:53 UTC
	+++ src/VBox/HostDrivers/Support/freebsd/files_vboxdrv
	-@@ -116,6 +116,7 @@ FILES_VBOXDRV_NOBIN=" \
	+@@ -118,6 +118,7 @@ FILES_VBOXDRV_NOBIN=" \
	${PATH_ROOT}/src/VBox/Runtime/common/misc/handletable.cpp=>common/misc/handletable.c \
	${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 \
	@@ -8,7 +8,7 @@
	${PATH_ROOT}/src/VBox/Runtime/common/misc/once.cpp=>common/misc/once.c \
	${PATH_ROOT}/src/VBox/Runtime/common/misc/term.cpp=>common/misc/term.c \
	${PATH_ROOT}/src/VBox/Runtime/common/misc/thread.cpp=>common/misc/thread.c \
	-@@ -124,13 +125,14 @@ FILES_VBOXDRV_NOBIN=" \
	+@@ -127,13 +128,14 @@ FILES_VBOXDRV_NOBIN=" \
	${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopyEx.cpp=>common/string/RTStrCopyEx.c \
	${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrNCmp.cpp=>common/string/RTStrNCmp.c \
	${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrNLen.cpp=>common/string/RTStrNLen.c \
	Index: emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk
	+++ emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk
	@@ -1,9 +1,9 @@
	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 2013-04-12 03:38:10.000000000 -0700
	-+++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2013-06-11 21:24:05.000000000 -0700
	-@@ -143,12 +143,15 @@
	+--- 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 -- $@
	@@ -14,12 +14,12 @@
	+ ifndef VBOX_WITH_HARDENING
	+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@
	+ ${QUIET}$(MV) -f $@.tmp $@
	-+ endif
	+ endif
	+-
	+ ifndef VBOX_WITH_NETFLT_VIMAGE
	+ $(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@
	+ ${QUIET}$(MV) -f $@.tmp $@
	- endif
	--
	++ endif
	endif # freebsd

	include $(FILE_KBUILD_SUB_FOOTER)
	Index: emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c
	+++ emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c
	@@ -1,6 +1,6 @@
	---- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2014-09-09 15:54:30.000000000 -0400
	-+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2014-09-30 15:36:06.000000000 -0400
	-@@ -234,7 +234,11 @@
	+--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2020-05-13 19:43:54 UTC
	++++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c
	+@@ -235,7 +235,11 @@ static void VBoxNetAdpFreeBSDNetstart(struct ifnet *if
	ifp->if_drv_flags \|= IFF_DRV_OACTIVE;
	while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
	{
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Installer-Makefile.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Installer-Makefile.kmk
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Installer-Makefile.kmk
	@@ -1,6 +1,6 @@
	---- src/VBox/Installer/Makefile.kmk.orig 2009-10-05 14:31:40.000000000 +0200
	-+++ src/VBox/Installer/Makefile.kmk 2009-10-05 14:32:09.000000000 +0200
	-@@ -38,10 +38,12 @@
	+--- src/VBox/Installer/Makefile.kmk.orig 2020-05-13 19:44:01 UTC
	++++ src/VBox/Installer/Makefile.kmk
	+@@ -41,9 +41,11 @@ ifndef VBOX_ONLY_SDK
	if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_HOST)" == "win"
	include $(PATH_SUB_CURRENT)/win/Makefile.kmk
	endif
	@@ -8,8 +8,7 @@
	if "$(KBUILD_TARGET)" == "freebsd" && "$(KBUILD_HOST)" == "freebsd"
	include $(PATH_SUB_CURRENT)/freebsd/Makefile.kmk
	endif
	- endif
	+endif
	+ endif

	include $(PATH_SUB_CURRENT)/common/Makefile.kmk
	-
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop
	@@ -1,6 +1,6 @@
	---- src/VBox/Installer/freebsd/virtualbox.desktop.orig 2010-10-07 10:42:04.000000000 +0200
	-+++ src/VBox/Installer/freebsd/virtualbox.desktop 2010-10-07 10:43:20.000000000 +0200
	-@@ -7,7 +7,6 @@
	+--- src/VBox/Installer/freebsd/virtualbox.desktop.orig 2020-05-13 19:44:01 UTC
	++++ src/VBox/Installer/freebsd/virtualbox.desktop
	+@@ -7,7 +7,6 @@ GenericName=Virtual Machine
	Type=Application
	Exec=VirtualBox
	TryExec=VirtualBox
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp
	@@ -1,6 +1,6 @@
	---- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2015-04-01 12:15:14.000000000 -0400
	-+++ src/VBox/Main/src-server/VirtualBoxImpl.cpp 2015-04-07 12:25:59.226583000 -0400
	-@@ -2172,7 +2172,7 @@
	+--- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2020-05-13 19:44:10 UTC
	++++ src/VBox/Main/src-server/VirtualBoxImpl.cpp
	+@@ -2251,7 +2251,7 @@ int VirtualBox::i_encryptSettingBytes(const uint8_t *a
	if (aCiphertextSize < 32)
	return VERR_INVALID_PARAMETER;

	Index: emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp
	@@ -1,6 +1,6 @@
	---- src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp.orig 2015-04-14 15:41:25.000000000 -0400
	-+++ src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp 2015-04-14 18:25:23.156536000 -0400
	-@@ -251,8 +251,9 @@
	+--- src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp.orig 2020-05-13 19:44:10 UTC
	++++ src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp
	+@@ -253,8 +253,9 @@ static int getDVDInfoFromCAM(DriveInfoList *pList, boo
	PeriphMatchPattern.pattern.periph_pattern.path_id = paMatches[i].result.device_result.path_id;
	PeriphMatchPattern.pattern.periph_pattern.target_id = paMatches[i].result.device_result.target_id;
	PeriphMatchPattern.pattern.periph_pattern.target_lun = paMatches[i].result.device_result.target_lun;
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk
	@@ -1,6 +1,6 @@
	---- src/VBox/Main/webservice/Makefile.kmk.orig 2015-10-15 13:59:24 UTC
	+--- src/VBox/Main/webservice/Makefile.kmk.orig 2020-05-13 19:44:11 UTC
	+++ src/VBox/Main/webservice/Makefile.kmk
	-@@ -159,7 +159,6 @@ VBOX_PATH_IDL := $(abspa
	+@@ -158,7 +158,6 @@ VBOX_PATH_IDL := $(abspath $(PATH_SUB_
	RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)

	PATH_TARGET_SOAPDEMOXML := $(VBOXWEB_OUT_DIR)/demo_soapxml
	@@ -8,7 +8,7 @@
	PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
	PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest

	-@@ -515,8 +514,6 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) \|
	+@@ -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 \
	@@ -17,7 +17,7 @@
	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file

	-@@ -695,17 +692,14 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
	+@@ -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 $@
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk
	@@ -1,7 +1,7 @@
	---- src/VBox/Runtime/Makefile.kmk.orig 2014-07-15 13:25:15.000000000 -0400
	-+++ src/VBox/Runtime/Makefile.kmk 2014-07-16 17:15:58.000000000 -0400
	-@@ -146,6 +146,11 @@
	- IPRT_BLDCFG_TYPE=\"$(KBUILD_TYPE)\"
	+--- src/VBox/Runtime/Makefile.kmk.orig 2020-05-13 19:44:16 UTC
	++++ src/VBox/Runtime/Makefile.kmk
	+@@ -173,6 +173,11 @@ $(IPRT_OUT_DIR)/oiddb.h.ts +\| $(IPRT_OUT_DIR)/oiddb.h:
	+

	#
	+# Set the defines that utf8-posix.cpp needs. It's used by several targets.
	Index: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h
	+++ emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h
	@@ -7,9 +7,9 @@
	what tvtohz does.

	Submitted by: Andriy Gapon <avg@FreeBSD.org>
	---- src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h.orig 2012-12-19 19:27:29.000000000 +0100
	-+++ src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h 2012-12-20 12:07:48.941861966 +0100
	-@@ -82,6 +82,8 @@
	+--- src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h.orig 2020-05-13 19:44:32 UTC
	++++ src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h
	+@@ -82,6 +82,8 @@ DECLINLINE(uint32_t) rtR0SemBsdWaitUpdateTimeout(PRTR0
	uint64_t cTicks = ASMMultU64ByU32DivByU32(uTimeout, hz, UINT32_C(1000000000));
	if (cTicks >= INT_MAX)
	return RTSEMWAIT_FLAGS_INDEFINITE;
	Index: emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk
	+++ emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk
	@@ -1,6 +1,6 @@
	---- src/recompiler/Makefile.kmk.orig 2013-11-29 14:25:09.000000000 -0500
	-+++ src/recompiler/Makefile.kmk 2013-12-13 14:23:11.000000000 -0500
	-@@ -41,6 +41,7 @@
	+--- src/recompiler/Makefile.kmk.orig 2020-05-13 19:46:49 UTC
	++++ src/recompiler/Makefile.kmk
	+@@ -41,6 +41,7 @@ endif
	#
	ifneq ($(KBUILD_TARGET),win)
	VBoxRemPrimary_TEMPLATE = VBOXR3NP
	Index: emulators/virtualbox-ose/files/patch-src-recompiler-Sun-testmath.c
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src-recompiler-Sun-testmath.c
	+++ emulators/virtualbox-ose/files/patch-src-recompiler-Sun-testmath.c
	@@ -1,6 +1,6 @@
	---- src/recompiler/Sun/testmath.c.orig 2011-01-14 21:15:07.000000000 +0100
	-+++ src/recompiler/Sun/testmath.c 2011-08-05 13:54:49.000000000 +0200
	-@@ -261,8 +261,6 @@
	+--- src/recompiler/Sun/testmath.c.orig 2020-05-13 19:46:49 UTC
	++++ src/recompiler/Sun/testmath.c
	+@@ -273,8 +273,6 @@ extern int testmath(void)
	#endif
	set_cw(0x27f);

	@@ -9,14 +9,14 @@
	CHECK(remainderl(1.0L, 1.0L), 0.0);
	CHECK(remainderl(1.0L, 1.5L), -0.5);
	CHECK(remainderl(42.0L, 34.25L), 7.75);
	-@@ -315,10 +313,6 @@
	+@@ -341,10 +339,6 @@ extern int testmath(void)
	+
	CHECK(tanl(0.0L), 0.0);
	CHECK(tanl(0.7853981633974483096156608458198757L), 1.0);
	-
	+-
	- CHECK(powl(0.0, 0.0), 1.0);
	- CHECK(powl(2.0, 2.0), 4.0);
	- CHECK(powl(3.0, 3.0), 27.0);
	--
	+
	return cErrors;
	}
	-
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_pam_pam__vbox.cpp
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_pam_pam__vbox.cpp
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_pam_pam__vbox.cpp
	@@ -1,6 +1,6 @@
	---- src/VBox/Additions/common/pam/pam_vbox.cpp.orig 2016-07-18 11:50:44 UTC
	+--- src/VBox/Additions/common/pam/pam_vbox.cpp.orig 2020-05-13 19:37:05 UTC
	+++ src/VBox/Additions/common/pam/pam_vbox.cpp
	-@@ -105,7 +105,7 @@ static void pam_vbox_writesyslog(char *p
	+@@ -105,7 +105,7 @@ static void pam_vbox_writesyslog(char *pszBuf)
	openlog("pam_vbox", LOG_PID, LOG_AUTHPRIV);
	syslog(LOG_ERR, "%s", pszBuf);
	closelog();
	@@ -9,7 +9,7 @@
	syslog(LOG_ERR, "pam_vbox: %s\n", pszBuf);
	#endif
	}
	-@@ -180,7 +180,7 @@ static int vbox_set_msg(pam_handle_t *hP
	+@@ -184,7 +184,7 @@ static int vbox_set_msg(pam_handle_t *hPAM, int iStyle

	pam_message msg;
	msg.msg_style = iStyle;
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_Makefile
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_Makefile
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_Makefile
	@@ -1,6 +1,6 @@
	---- src/VBox/Additions/freebsd/Makefile.orig 2017-04-28 16:59:22.000000000 +0200
	-+++ src/VBox/Additions/freebsd/Makefile 2017-07-13 00:04:11.766870597 +0200
	-@@ -31,6 +31,14 @@
	+--- src/VBox/Additions/freebsd/Makefile.orig 2020-05-13 19:37:06 UTC
	++++ src/VBox/Additions/freebsd/Makefile
	+@@ -30,6 +30,14 @@ all:
	cp vboxvfs/vboxvfs.ko .; \
	fi; \
	fi
	@@ -15,7 +15,7 @@


	install:
	-@@ -38,13 +46,19 @@
	+@@ -37,13 +45,19 @@ install:
	@if [ -d vboxvfs ]; then \
	$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvfs install; \
	fi
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_Makefile.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_Makefile.kmk
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_Makefile.kmk
	@@ -1,6 +1,6 @@
	---- src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk.orig 2017-04-28 16:59:22.000000000 +0200
	-+++ src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk 2017-07-13 00:52:49.020669620 +0200
	-@@ -33,32 +33,36 @@
	+--- src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk.orig 2020-05-13 19:37:06 UTC
	++++ src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
	+@@ -33,32 +33,36 @@ vboxvfs_INCS = \
	$(vboxvfs_0_OUTDIR)
	vboxvfs_SOURCES = \
	vboxvfs_vfsops.c \
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__prov.c
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__prov.c
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__prov.c
	@@ -1,5 +1,5 @@
	---- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c.orig 1970-01-01 01:00:00.000000000 +0100
	-+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c 2017-07-12 19:24:26.109029000 +0200
	+--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c.orig 2020-06-26 09:59:35 UTC
	++++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c
	@@ -0,0 +1,1020 @@
	+/*
	+ * Copyright (C) 2008-2016 Oracle Corporation
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
	@@ -1,6 +1,6 @@
	---- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig 2017-04-28 16:59:22.000000000 +0200
	-+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c 2017-07-12 19:24:26.109029000 +0200
	-@@ -1,10 +1,5 @@
	+--- 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.
	@@ -9,8 +9,6 @@
	/*
	* 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.
	@@ -38,20 +36,26 @@
	+#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, "");
	-+#include "vboxvfs.h"
	++static sfp_connection_t *sfprov = NULL;

	-/* global connection to the host service. */
	-static VBGLSFCLIENT g_vboxSFClient;
	-+#define VFSMP2SFGLOBINFO(mp) ((struct sf_glob_info *)mp->mnt_data)
	++static int vboxfs_version = VBOXVFS_VERSION;
	++u_int vboxvfs_debug = 1;

	-static vfs_init_t vboxvfs_init;
	-static vfs_uninit_t vboxvfs_uninit;
	@@ -61,7 +65,10 @@
	-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,
	@@ -72,19 +79,6 @@
	- .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;
	@@ -141,17 +135,9 @@
	{
	- 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;

	-- ma = mount_argf(ma, "uid", "%d", args.uid);
	-- ma = mount_argf(ma, "gid", "%d", args.gid);
	-- ma = mount_arg(ma, "from", args.name, -1);
	+- printf("%s: Enter\n", __FUNCTION__);
	+ if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) {
	+ /*
	+ * When a new tmpfs node is created for fully
	@@ -169,17 +155,24 @@
	+ */
	+ 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:
	@@ -190,15 +183,12 @@
	+ 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;
	@@ -219,33 +209,8 @@
	- 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;
	+- printf("%s: Enter\n", __FUNCTION__);
	+#ifdef INVARIANTS
	+ TMPFS_NODE_LOCK(node);
	+ MPASS(node->sf_vnode == NULL);
	@@ -255,47 +220,49 @@
	+ if (node->sf_path)
	+ free(node->sf_path, M_VBOXVFS);

	-- cbShFlShareName = offsetof (SHFLSTRING, String.utf8) + cbShare + 1;
	-- pShFlShareName = RTMemAllocZ(cbShFlShareName);
	-- if (!pShFlShareName)
	-- return VERR_NO_MEMORY;
	+- if (mp->mnt_flag & (MNT_UPDATE \| MNT_ROOTFS))
	+- return EOPNOTSUPP;
	+ uma_zfree(vboxfs->sf_node_pool, node);
	+}

	-- pShFlShareName->u16Length = cbShare;
	-- pShFlShareName->u16Size = cbShare + 1;
	-- memcpy (pShFlShareName->String.utf8, pszShare, cbShare + 1);
	+- 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 = VbglR0SfMapFolder (&g_vboxSFClient, pShFlShareName, &pShFlGlobalInfo->map);
	-- RTMemFree(pShFlShareName);
	+- 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);

	-- if (RT_FAILURE (rc))
	-- {
	-- RTMemFree(pShFlGlobalInfo);
	-- printf("VbglR0SfMapFolder failed rc=%d\n", rc);
	-- return EPROTO;
	-- }
	+- rc = vfs_getopt(mp->mnt_optnew, "uid", (void **)&uid, &cbOption);
	+- if ((rc != ENOENT) && (rc \|\| cbOption != sizeof(uid)))
	+- return EINVAL;
	+ return (kernel_mount(ma, flags));
	+}

	-- pShFlGlobalInfo->uid = uid;
	-- pShFlGlobalInfo->gid = gid;
	+- pShFlGlobalInfo = RTMemAllocZ(sizeof(struct sf_glob_info));
	+- if (!pShFlGlobalInfo)
	+- return ENOMEM;
	+static const char *vboxfs_opts[] = {
	+ "fstype",
	+ "fspath",
	@@ -308,7 +275,10 @@
	+ NULL
	+};

	-- mp->mnt_data = pShFlGlobalInfo;
	+- 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) { \
	@@ -328,66 +298,69 @@
	+ } \
	+} while (0)

	-- /** @todo root vnode. */
	+- 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;

	-- vfs_getnewfsid(mp);
	-- vfs_mountedfrom(mp, pszShare);
	+- rc = VbglR0SfMapFolder (&g_vboxSFClient, pShFlShareName, &pShFlGlobalInfo->map);
	+- RTMemFree(pShFlShareName);
	+ node->sf_vnode = NULL;
	+ node->sf_vpstate = 0;

	-- printf("%s: Leave rc=0\n", __FUNCTION__);
	+- if (RT_FAILURE (rc))
	+- {
	+- RTMemFree(pShFlGlobalInfo);
	+- printf("VbglR0SfMapFolder failed rc=%d\n", rc);
	+- return EPROTO;
	+- }
	+ return (0);
	+}

	-- 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;
	- }
	++}

	--static int vboxvfs_unmount(struct mount mp, int mntflags, struct thread td)
	+- 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;

	-- rc = VbglR0SfUnmapFolder(&g_vboxSFClient, &pShFlGlobalInfo->map);
	-- if (RT_FAILURE(rc))
	-- printf("Failed to unmap shared folder\n");
	+- /** @todo root vnode. */
	+ mtx_init(&node->sf_interlock, "tmpfs node interlock", NULL, MTX_DEF);

	-- if (mntflags & MNT_FORCE)
	-- flags \|= FORCECLOSE;
	+- vfs_getnewfsid(mp);
	+- vfs_mountedfrom(mp, pszShare);
	+ return (0);
	+}

	-- /* There is 1 extra root vnode reference (vnode_root). */
	-- rc = vflush(mp, 1, flags, td);
	-- if (rc)
	-- return rc;
	+- printf("%s: Leave rc=0\n", __FUNCTION__);
	+static void
	+vboxfs_node_fini(void *mem, int size)
	+{
	+ struct vboxfs_node node = (struct vboxfs_node )mem;

	+- return 0;
	+ mtx_destroy(&node->sf_interlock);
	-+}
	+ }

	-- RTMemFree(pShFlGlobalInfo);
	-- mp->mnt_data = NULL;
	+-static int vboxvfs_unmount(struct mount mp, int mntflags, struct thread td)
	+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;
	@@ -399,27 +372,38 @@
	+ 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;
	@@ -427,7 +411,8 @@
	+ 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)
	@@ -480,8 +465,7 @@
	+#endif
	+ MNT_IUNLOCK(mp);
	+ vfs_mountedfrom(mp, share_name);
	-
	-- return 0;
	++
	+ return (0);
	}

	@@ -502,81 +486,78 @@
	+ 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);
	-+}
	+ }

	-- vn_lock(vp, flags \| LK_RETRY, td);
	-- *vpp = vp;
	+-static int vboxvfs_quotactl(struct mount mp, int cmd, uid_t uid, void arg, struct thread *td)
	+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;
	}

	--static int vboxvfs_quotactl(struct mount mp, int cmd, uid_t uid, void arg, struct thread *td)
	+-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)
	{
	-- return EOPNOTSUPP;
	+- int rc;
	+ return (EOPNOTSUPP);
	- }
	++}

	--int vboxvfs_init(struct vfsconf *vfsp)
	+- /* 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))
	@@ -585,16 +566,7 @@
	- VbglR0SfTerm();
	- return ENXIO;
	- }
	-+ sfprov = sfprov_connect(SFPROV_VERSION);
	-+ if (sfprov == NULL) {
	-+ printf("%s: couldn't connect to sf provider", __func__);
	-+ return (ENODEV);
	-+ }
	-+
	-+ error = sfprov_set_show_symlinks();
	-+ if (error != 0)
	-+ printf("%s: host unable to show symlinks, error=%d\n",
	-+ __func__, error);
	++ DROP_GIANT();

	- rc = VbglR0SfSetUtf8(&g_vboxSFClient);
	- if (RT_FAILURE (rc))
	@@ -604,9 +576,18 @@
	- 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);
	+
	- return 0;
	+ PICKUP_GIANT();
	+ return (0);
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk
	@@ -1,6 +1,6 @@
	---- src/VBox/Debugger/Makefile.kmk.orig 2017-10-18 07:09:03 UTC
	+--- src/VBox/Debugger/Makefile.kmk.orig 2020-05-13 19:39:41 UTC
	+++ src/VBox/Debugger/Makefile.kmk
	-@@ -109,6 +109,7 @@ VBoxDbg_SOURCES = \
	+@@ -113,6 +113,7 @@ VBoxDbg_SOURCES = \
	VBoxDbgBase.cpp \
	VBoxDbgConsole.cpp \
	VBoxDbgStatsQt.cpp
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp
	@@ -1,6 +1,6 @@
	---- src/VBox/Devices/Audio/DrvHostALSAAudio.cpp.orig 2017-10-18 07:09:04 UTC
	+--- src/VBox/Devices/Audio/DrvHostALSAAudio.cpp.orig 2020-05-13 19:39:41 UTC
	+++ src/VBox/Devices/Audio/DrvHostALSAAudio.cpp
	-@@ -1231,6 +1231,7 @@ static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PP
	+@@ -819,6 +819,7 @@ static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PP
	continue;
	}

	@@ -8,7 +8,7 @@
	case -ESTRPIPE:
	{
	/* Stream was suspended and waiting for a recovery. */
	-@@ -1244,6 +1245,7 @@ static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PP
	+@@ -832,6 +833,7 @@ static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PP
	LogFlowFunc(("Resumed suspended output stream\n"));
	continue;
	}
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl
	+++ /dev/null
	@@ -1,96 +0,0 @@
	---- src/VBox/Devices/PC/vbox-cpuhotplug.dsl.orig 2019-10-10 18:34:15 UTC
	-+++ src/VBox/Devices/PC/vbox-cpuhotplug.dsl
	-@@ -44,11 +44,11 @@ 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") \
	-- Name (_UID, sckuid) \
	-+ Name (_UID, id) \
	- \
	- <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
	- }
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VBoxManage_VBoxManageHelp.cpp
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VBoxManage_VBoxManageHelp.cpp
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VBoxManage_VBoxManageHelp.cpp
	@@ -1,6 +1,6 @@
	---- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig 2016-08-16 19:59:52 UTC
	+--- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig 2020-05-13 19:43:27 UTC
	+++ src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
	-@@ -797,7 +797,7 @@ void printUsage(USAGECATEGORY fCategory,
	+@@ -622,7 +622,7 @@ void printUsage(USAGECATEGORY fCategory, uint32_t fSub
	RTStrmPrintf(pStrm, "\|dsound");
	#endif
	}
	@@ -9,10 +9,11 @@
	{
	RTStrmPrintf(pStrm, ""
	#ifdef VBOX_WITH_AUDIO_OSS
	-@@ -811,22 +811,6 @@ void printUsage(USAGECATEGORY fCategory,
	+@@ -635,22 +635,6 @@ void printUsage(USAGECATEGORY fCategory, uint32_t fSub
	+ "\|pulse"
	#endif
	);
	- }
	+- }
	- if (fFreeBSD)
	- {
	-#ifdef VBOX_WITH_AUDIO_OSS
	@@ -28,7 +29,6 @@
	-#ifdef VBOX_WITH_AUDIO_PULSE
	- RTStrmPrintf(pStrm, "\|pulse");
	-#endif
	-- }
	+ }
	if (fDarwin)
	{
	- RTStrmPrintf(pStrm, "\|coreaudio");
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk
	@@ -1,6 +1,6 @@
	---- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig 2017-10-18 07:12:20 UTC
	+--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig 2020-05-13 19:43:28 UTC
	+++ src/VBox/Frontends/VirtualBox/Makefile.kmk
	-@@ -895,6 +895,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) \|\| defined(VBOX_GUI
	+@@ -897,6 +897,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) \|\| defined(VBOX_GUI
	VirtualBox_SOURCES += \
	src/VBoxFBOverlay.cpp \
	src/VBoxGLSupportInfo.cpp
	@@ -8,7 +8,7 @@
	endif

	#
	-@@ -1217,6 +1218,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL)
	+@@ -1220,6 +1221,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL)
	VBoxOGL2D_SOURCES = \
	src/VBoxGLSupportInfo.cpp
	VBoxOGL2D_INCS = include
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_src_globals_UIImageTools.cpp
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_src_globals_UIImageTools.cpp
	+++ /dev/null
	@@ -1,10 +0,0 @@
	---- src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp.orig 2020-05-18 14:44:12 UTC
	-+++ src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
	-@@ -24,6 +24,7 @@
	-
	- /* Qt includes */
	- # include <QPainter>
	-+# include <QPainterPath>
	-
	- #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
	-
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIMenuToolBar.cpp
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIMenuToolBar.cpp
	+++ /dev/null
	@@ -1,10 +0,0 @@
	---- src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp.orig 2020-05-18 15:10:10 UTC
	-+++ src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
	-@@ -23,6 +23,7 @@
	- # include <QApplication>
	- # include <QHBoxLayout>
	- # include <QPainter>
	-+# include <QPainterPath>
	- # include <QStyle>
	- # include <QToolButton>
	-
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp
	+++ /dev/null
	@@ -1,10 +0,0 @@
	---- src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp.orig 2020-05-18 15:15:26 UTC
	-+++ src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
	-@@ -28,6 +28,7 @@
	- # include <QToolButton>
	- # include <QStateMachine>
	- # include <QPainter>
	-+# include <QPainterPath>
	- # include <QWindow>
	- # ifdef VBOX_WS_X11
	- # include <QWindowStateChangeEvent>
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIPopupBox.h
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIPopupBox.h
	+++ /dev/null
	@@ -1,10 +0,0 @@
	---- src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h.orig 2020-05-18 14:53:03 UTC
	-+++ src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
	-@@ -20,6 +20,7 @@
	-
	- /* Global includes: */
	- #include <QIcon>
	-+#include <QPainterPath>
	- #include <QWidget>
	-
	- /* Forward declarations: */
	Index: emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_SUPDrvInternal.h
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_SUPDrvInternal.h
	+++ emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_SUPDrvInternal.h
	@@ -1,6 +1,6 @@
	---- src/VBox/HostDrivers/Support/SUPDrvInternal.h.orig 2016-07-18 11:56:19 UTC
	+--- src/VBox/HostDrivers/Support/SUPDrvInternal.h.orig 2020-05-13 19:43:52 UTC
	+++ src/VBox/HostDrivers/Support/SUPDrvInternal.h
	-@@ -235,7 +235,7 @@
	+@@ -208,7 +208,7 @@
	# define SUPDRV_WITHOUT_MSR_PROBER
	#endif

	Index: emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_freebsd_SUPDrv-freebsd.c
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_freebsd_SUPDrv-freebsd.c
	+++ emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_freebsd_SUPDrv-freebsd.c
	@@ -1,4 +1,4 @@
	---- src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c.orig 2018-10-15 14:30:57 UTC
	+--- src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c.orig 2020-05-13 19:43:53 UTC
	+++ src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c
	@@ -46,6 +46,7 @@
	#include <sys/uio.h>
	@@ -170,7 +170,7 @@
	}


	-@@ -616,11 +682,25 @@ int VBOXCALL supdrvOSMsrProberModify(RTCPUID idCpu,
	+@@ -625,11 +691,25 @@ int VBOXCALL supdrvOSMsrProberModify(RTCPUID idCpu,
	#endif /* SUPDRV_WITH_MSR_PROBER */


	@@ -196,7 +196,7 @@

	va_start(va, pszFormat);
	cch = RTStrPrintfV(szMsg, sizeof(szMsg), pszFormat, va);
	-@@ -628,12 +708,19 @@ SUPR0DECL(int) SUPR0Printf(const char *pszFormat, ...)
	+@@ -637,12 +717,19 @@ SUPR0DECL(int) SUPR0Printf(const char *pszFormat, ...)

	printf("%s", szMsg);

	Index: emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk
	+++ emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk
	@@ -1,6 +1,6 @@
	---- src/VBox/HostServices/SharedOpenGL/Makefile.kmk.orig 2017-10-18 07:12:48 UTC
	+--- src/VBox/HostServices/SharedOpenGL/Makefile.kmk.orig 2020-05-13 19:43:59 UTC
	+++ src/VBox/HostServices/SharedOpenGL/Makefile.kmk
	-@@ -436,6 +436,7 @@ if ( defined(VBOX_WITH_QTGUI) \
	+@@ -335,6 +335,7 @@ if ( defined(VBOX_WITH_QTGUI) \
	$(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \
	$(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,)
	ifdef VBOX_WITH_VIDEOHWACCEL
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Main_Makefile.kmk
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Main_Makefile.kmk
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Main_Makefile.kmk
	@@ -1,6 +1,6 @@
	---- src/VBox/Main/Makefile.kmk.orig 2017-03-08 17:20:11 UTC
	+--- src/VBox/Main/Makefile.kmk.orig 2020-05-13 19:44:04 UTC
	+++ src/VBox/Main/Makefile.kmk
	-@@ -445,6 +445,7 @@ VBoxSVC_SOURCES.os2 = \
	+@@ -526,6 +526,7 @@ VBoxSVC_SOURCES.os2 = \

	VBoxSVC_SOURCES.freebsd = \
	src-server/freebsd/HostHardwareFreeBSD.cpp \
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Main_include_USBProxyBackend.h
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Main_include_USBProxyBackend.h
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Main_include_USBProxyBackend.h
	@@ -1,6 +1,6 @@
	---- src/VBox/Main/include/USBProxyBackend.h.orig 2017-01-17 07:27:19 UTC
	+--- src/VBox/Main/include/USBProxyBackend.h.orig 2020-05-13 19:44:06 UTC
	+++ src/VBox/Main/include/USBProxyBackend.h
	-@@ -359,13 +359,10 @@ public:
	+@@ -365,13 +365,10 @@ class USBProxyBackendFreeBSD : public USBProxyBackend
	virtual int releaseDevice(HostUSBDevice *aDevice);

	protected:
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp
	@@ -1,6 +1,6 @@
	---- src/VBox/Main/src-client/ConsoleImpl2.cpp.orig 2017-10-18 07:12:56 UTC
	+--- src/VBox/Main/src-client/ConsoleImpl2.cpp.orig 2020-05-13 19:44:07 UTC
	+++ src/VBox/Main/src-client/ConsoleImpl2.cpp
	-@@ -5206,7 +5206,7 @@ int Console::i_configNetwork(const char *pszDevice,
	+@@ -5265,7 +5265,7 @@ int Console::i_configNetwork(const char *pszDevice,
	{
	switch (hrc)
	{
	@@ -9,7 +9,7 @@
	return VMSetError(VMR3GetVM(mpUVM), VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_(
	"Failed to open '/dev/net/tun' for read/write access. Please check the "
	"permissions of that node. Either run 'chmod 0666 /dev/net/tun' or "
	-@@ -5408,7 +5408,7 @@ int Console::i_configNetwork(const char *pszDevice,
	+@@ -5467,7 +5467,7 @@ int Console::i_configNetwork(const char *pszDevice,
	{
	switch (hrc)
	{
	Index: emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_HostImpl.cpp
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_HostImpl.cpp
	+++ emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_HostImpl.cpp
	@@ -1,6 +1,6 @@
	---- src/VBox/Main/src-server/HostImpl.cpp.orig 2017-03-08 17:20:14 UTC
	+--- src/VBox/Main/src-server/HostImpl.cpp.orig 2020-05-13 19:44:09 UTC
	+++ src/VBox/Main/src-server/HostImpl.cpp
	-@@ -293,7 +293,7 @@ HRESULT Host::init(VirtualBox *aParent)
	+@@ -284,7 +284,7 @@ HRESULT Host::init(VirtualBox *aParent)

	#if defined(RT_OS_WINDOWS)
	m->pHostPowerService = new HostPowerServiceWin(m->pParent);
	Index: emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp
	+++ emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp
	@@ -1,5 +1,5 @@
	---- src/VBox/VMM/VMMR0/GVMMR0.cpp.orig 2018-01-15 14:56:33.000000000 +0000
	-+++ src/VBox/VMM/VMMR0/GVMMR0.cpp 2018-01-17 01:13:24.832105000 +0000
	+--- src/VBox/VMM/VMMR0/GVMMR0.cpp.orig 2020-05-13 19:44:47 UTC
	++++ src/VBox/VMM/VMMR0/GVMMR0.cpp
	@@ -1243,7 +1243,7 @@ static void gvmmR0CleanupVM(PGVM pGVM)

	GMMR0CleanupVM(pGVM);
	Index: emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_nsprpub_pr_src_pthreads_ptsynch.c
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_nsprpub_pr_src_pthreads_ptsynch.c
	+++ emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_nsprpub_pr_src_pthreads_ptsynch.c
	@@ -1,4 +1,4 @@
	---- src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c.orig
	+--- src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c.orig 2020-05-13 19:46:23 UTC
	+++ src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c
	@@ -49,6 +49,9 @@
	#include <string.h>
	@@ -10,7 +10,7 @@

	static pthread_mutexattr_t _pt_mattr;
	static pthread_condattr_t _pt_cvar_attr;
	-@@ -798,7 +801,8 @@
	+@@ -798,7 +801,8 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphore(const char *
	* From the semctl(2) man page in glibc 2.0
	*/
	#if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \
	Index: emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_xpcom_io_nsLocalFileUnix.h
	===================================================================
	--- emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_xpcom_io_nsLocalFileUnix.h
	+++ emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_xpcom_io_nsLocalFileUnix.h
	@@ -1,5 +1,5 @@
	---- src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h.orig 2017-03-08 17:21:24.000000000 +0000
	-+++ src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h 2017-03-08 22:53:39.572250000 +0000
	+--- src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h.orig 2020-05-13 19:46:34 UTC
	++++ src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h
	@@ -72,14 +72,6 @@
	#define STATFS statfs
	#endif

File Metadata

Mime Type: text/plain
Expires: Thu, Nov 27, 11:59 PM (2 h, 36 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 26266919
Default Alt Text: D25496.id73804.diff (85 KB)

D25496.id73804.diffNo OneTemporaryActions

D25496.id73804.diffView Options

File Metadata

Event Timeline

D25496.id73804.diff
No OneTemporary
Actions

D25496.id73804.diff
View Options