Attachment #209927 for bug #234878

Lines 3-12 Link Here

(-)devel/kBuild/Makefile (-6 / +7 lines)
3		3
4	PORTNAME= kBuild	4	PORTNAME= kBuild
5	DISTVERSION= ${KBUILD_VERSION}	5	DISTVERSION= ${KBUILD_VERSION}
6	PORTREVISION= 13	6	PORTREVISION= 14
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= LOCAL/jkim	8	MASTER_SITES= LOCAL/jkim
9	DISTNAME= ${PORTNAME}-${DISTVERSION}r3127-src	9	DISTNAME= ${PORTNAME}-${DISTVERSION}r${KBUILD_SVN_REV}-src
10		10
11	MAINTAINER= vbox@FreeBSD.org	11	MAINTAINER= vbox@FreeBSD.org
12	COMMENT= Makefile framework	12	COMMENT= Makefile framework
Lines 29-34 KBUILD_ENV= AUTORECONF=${AUTORECONF} \ Link Here
29	AUTOPOINT=true \	29	AUTOPOINT=true \
30	CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \	30	CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
31	LDFLAGS="${LDFLAGS}" MAKE="${MAKE_CMD}"	31	LDFLAGS="${LDFLAGS}" MAKE="${MAKE_CMD}"
		32	KBUILD_SVN_URL= https://www.virtualbox.org/svn/kbuild-mirror/trunk
		33	KBUILD_SVN_REV= 3301
32	KBUILD_TARGET= ${OPSYS:tl}	34	KBUILD_TARGET= ${OPSYS:tl}
33		35
34	KBUILD_BINS= kDepIDB kDepObj kDepPre kObjCache kmk kmk_append kmk_ash \	36	KBUILD_BINS= kDepIDB kDepObj kDepPre kObjCache kmk kmk_append kmk_ash \
Lines 42-53 PORTDOCS= QuickReference-kmk.html \ Link Here
42	ENV=	44	ENV=
43	.export ENV	45	.export ENV
44		46
45	OPTIONS_DEFINE= DOCS GCC	47	OPTIONS_DEFINE= DOCS
46	OPTIONS_DEFAULT=GCC
47	GCC_DESC= Build with GCC (should almost always be enabled)
48	GCC_USE= GCC=yes
49		48
50	post-patch:	49	post-patch:
		50	@${ECHO_CMD} 'KBUILD_SVN_URL := ${KBUILD_SVN_URL}' > ${WRKSRC}/SvnInfo.kmk
		51	@${ECHO_CMD} 'KBUILD_SVN_REV := ${KBUILD_SVN_REV}' >> ${WRKSRC}/SvnInfo.kmk
51	@${REINPLACE_CMD} 's\|gcc\|${CC}\|g' ${WRKSRC}/kBuild/tools/*.kmk	52	@${REINPLACE_CMD} 's\|gcc\|${CC}\|g' ${WRKSRC}/kBuild/tools/*.kmk
52		53
53	do-build:	54	do-build:

Lines 1-3 Link Here

(-)devel/kBuild/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1511906864	1	TIMESTAMP = 1575421238
2	SHA256 (kBuild-0.1.9998r3127-src.tar.xz) = b98fced9ba0ddae5a080463db43003b8f963d04da3bd588c86025cbf6dda7c61	2	SHA256 (kBuild-0.1.9998r3301-src.tar.xz) = e02550adb4939d47fdfd3b9ccd5602b80f59bd38b9a84865a6f3c91ffd1f4450
3	SIZE (kBuild-0.1.9998r3127-src.tar.xz) = 2144704	3	SIZE (kBuild-0.1.9998r3301-src.tar.xz) = 2291292

Lines 1-3 Link Here

(-)devel/kBuild/pkg-help (-3 lines)
1	The only time that the GCC option can be disabled (to build with clang
2	instead) is if you're building ONLY emulators/virtualbox-ose-additions,
3	without X11, and only on amd64/i386.




# $FreeBSD$

PORTNAME=	virtualbox-ose
PORTVERSION=	6.1.0
CATEGORIES=	emulators
MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
EXTRACT_ONLY=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX}



BUILD_DEPENDS=	yasm:devel/yasm \
		xsltproc:textproc/libxslt \
		kBuild>=0.1.9998_14:devel/kBuild \
		gtar:archivers/gtar
LIB_DEPENDS=	libpng.so:graphics/png \
		libxslt.so:textproc/libxslt \

			virtualbox-ose-legacy-[0-9]* \
			virtualbox-ose-lite-[0-9]*

LDFLAGS=	-lpthread

VBOXUSER?=	vboxusers
VBOXWSUSER?=	vboxusers
VBOXGROUP?=	vboxusers

GROUPS=		${VBOXGROUP}
VBOX_DIR=	${PREFIX}/${VBOX_DIR_REL}
VBOX_DIR_REL=	lib/virtualbox
VBOX_LINKS=	VBoxVRDP vbox-img
VBOX_PROGS=	VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \
		VBoxManage
VBOX_UTILS=	VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
		VBoxSVC VBoxXPCOMIPCD vbox-img

OPTIONS_DEFINE=	ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS OPUS PULSEAUDIO \
		PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
OPTIONS_DEFAULT=	DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
OPTIONS_SUB=	yes

GUESTADDITIONS_DESC=	Build with Guest Additions
MANUAL_DESC=	Build with user manual
NLS_DESC=	Native language support (requires QT5)
OPUS_DESC=	Use libvpx for audio recording (requires VPX)
QT5_DESC=	Build with QT5 frontend (requires X11)
R0LOGGING_DESC=	Enable R0 logging (requires DEBUG)
UDPTUNNEL_DESC=	Build with UDP tunnel support

MANUAL_BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml
MANUAL_CONFIGURE_OFF=	--disable-docs
NLS_IMPLIES=		QT5
OPUS_CONFIGURE_OFF=	--disable-libopus
OPUS_LIB_DEPENDS=	libopus.so:audio/opus
OPUS_IMPLIES=		VPX
PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
PYTHON_CONFIGURE_OFF=	--disable-python

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

USE_QT+=	printsupport widgets x11extras
USE_XORG=	xcb
INSTALLS_ICONS=	yes
VBOX_PROGS+=	VirtualBox VirtualBoxVM
VBOX_UTILS+=	VBoxTestOGL
VBOX_WITH_QT=	1
.else

CXX=		${LOCALBASE}/bin/clang++${VBOX_LLVM_VER}
VBOX_LLVM_VER?=	70
.endif
PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-Config.kmk \
		${PATCHDIR}/extrapatch-src_VBox_Devices_PC_ipxe_Makefile.kmk
		${PATCHDIR}/extrapatch-src-recompiler-Makefile.kmk
.endif

.if ${PYTHON_MAJOR_VER} >= 3

	    ${WRKSRC}/LocalConfig.kmk
	@${ECHO_CMD} 'VBOX_WITH_RUNPATH = ${VBOX_DIR}' >> \
	    ${WRKSRC}/LocalConfig.kmk
	@${ECHO_CMD} 'VBOX_WITH_VBOX_IMG = ${VBOX_DIR}' >> \
	    ${WRKSRC}/LocalConfig.kmk
	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \
	    ${WRKSRC}/LocalConfig.kmk
	@${ECHO_CMD} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk

	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
	    ${WRKSRC}/LocalConfig.kmk
.endif
.if empty(PORT_OPTIONS:MX11)
	@${ECHO} 'VBOX_WITH_VMSVGA3D =' >> ${WRKSRC}/LocalConfig.kmk
.endif
.if ${COMPILER_TYPE} == clang
	@${REINPLACE_CMD} -e 's| -mno-align-long-strings||' \
	    ${WRKSRC}/Config.kmk
	@${REINPLACE_CMD} -e 's|-mpreferred-stack-boundary=2 ||' \
	    ${WRKSRC}/Config.kmk \
	    ${WRKSRC}/src/VBox/Devices/PC/ipxe/Makefile.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
	@${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \
	    ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
	    ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
.endif
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure \


	${MKDIR} ${STAGEDIR}${VBOX_DIR}
	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \
	    "*.fd *.r0 *.so components" ${STAGEDIR}${VBOX_DIR}
.if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
.endif

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1571257463	1	TIMESTAMP = 1576163196
2	SHA256 (VirtualBox-5.2.34.tar.bz2) = 9abff37330bba46b97aa836bc886397ba9cfb06cb75be5d60ac31f5ae9c2f2e1	2	SHA256 (VirtualBox-6.1.0.tar.bz2) = 49005ed94454f893fc3955e1e2b9607e85c300235cb983b39d1df2cfcf29f039
3	SIZE (VirtualBox-5.2.34.tar.bz2) = 118268064	3	SIZE (VirtualBox-6.1.0.tar.bz2) = 165322453
4	SHA256 (VBoxGuestAdditions_5.2.34.iso) = d1b63891abca37fd78f5c8af1764e10e5754b1eecabd1fcfe7599c29a93ba007	4	SHA256 (VBoxGuestAdditions_6.1.0.iso) = 00ac2e01c18a5bd629919032eb69c6d0d13e6cc5d9b432fe00df520c1acd8dfe
5	SIZE (VBoxGuestAdditions_5.2.34.iso) = 49661952	5	SIZE (VBoxGuestAdditions_6.1.0.iso) = 59516928




--- Config.kmk.orig	2019-11-21 16:51:26 UTC
+++ Config.kmk
@@ -4291,6 +4291,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)
+ TEMPLATE_VBoxRc_CXXFLAGS.freebsd    = -fno-builtin
   if $(VBOX_GCC32_VERSION_CC) < 30400
    TEMPLATE_VBoxRc_DEFS             += RT_WITHOUT_PRAGMA_ONCE
   endif
@@ -4438,6 +4439,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)
+TEMPLATE_VBoxR0_CXXFLAGS.freebsd    = -fno-builtin
 TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
 TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
 TEMPLATE_VBoxR0_CXXFLAGS.freebsd    = -ffreestanding
@@ -4860,7 +4862,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
 		| xargs -J% objcopy % $(out)
 
 ## Strip debug info (comment out if debugging or something).

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk (-11 lines)
1	--- src/VBox/Additions/x11/VBoxClient/Makefile.kmk.orig 2013-11-29 14:20:43.000000000 -0500
2	+++ src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2013-12-16 14:03:08.000000000 -0500
3	@@ -50,7 +50,7 @@
4	# Xtst
5	# These are static replacements for gcc-specific parts of libstdc++
6	VBoxClient_LIBS += \
7	- supc++ \
8	+ cxxrt \
9	gcc_eh
10	ifdef VBOX_X11_SEAMLESS_GUEST
11	VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk (-11 lines)
1	--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2013-11-29 14:23:32.000000000 -0500
2	+++ src/VBox/Devices/PC/ipxe/Makefile.kmk 2013-12-13 15:06:45.000000000 -0500
3	@@ -35,7 +35,7 @@
4	iPxeBiosBin_CLEAN = \
5	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
6
7	-if1of ($(KBUILD_TARGET), darwin os2 solaris win)
8	+if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win)
9	$$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) \| $$(dir $$@)
10	$(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
11	$(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile (-11 lines)
1	--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2012-10-18 16:23:16.000000000 +0200
2	+++ src/VBox/HostDrivers/Support/freebsd/Makefile 2012-10-20 08:13:07.301179212 +0200
3	@@ -27,7 +27,7 @@
4
5	KMOD = vboxdrv
6
7	-CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS
8	+CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DDEBUG
9
10	.if (${MACHINE_ARCH} == "i386")
11	CFLAGS += -DRT_ARCH_X86

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src-recompiler-Makefile.kmk (-10 lines)
1	--- src/recompiler/Makefile.kmk.orig 2013-11-29 14:25:09.000000000 -0500
2	+++ src/recompiler/Makefile.kmk 2013-12-13 14:23:11.000000000 -0500
3	@@ -41,6 +41,7 @@
4	#
5	ifneq ($(KBUILD_TARGET),win)
6	VBoxRemPrimary_TEMPLATE = VBOXR3NP
7	+ VBoxRemPrimary_TOOL.freebsd = VBoxGccFreeBSD
8	# workaround the regparm bug in gcc <= 3.3
9	VBoxRemPrimary_DEFS = $(if $(VBOX_GCC_BUGGY_REGPARM),GCC_WITH_BUGGY_REGPARM,)
10	else

Line 0 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_ipxe_Makefile.kmk (+11 lines)
	1	--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2019-11-21 17:00:10 UTC
	2	+++ src/VBox/Devices/PC/ipxe/Makefile.kmk
	3	@@ -35,7 +35,7 @@ iPxeBiosBin_SOURCES = $(iPxeBiosBin_0_OUTDIR)/iPxeBio
	4	iPxeBiosBin_CLEAN = \
	5	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
	6
	7	-if1of ($(KBUILD_TARGET), darwin os2 solaris win)
	8	+if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win)
	9	$$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) \| $$(dir $$@)
	10	$(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
	11	$(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp (-11 lines)
1	--- src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp.orig 2017-01-17 07:26:50 UTC
2	+++ src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp
3	@@ -143,7 +143,7 @@ void UIDownloaderAdditions::handleVerifi
4	{
5	const QString strFileName = strRecord.section(" *", 1);
6	const QString strDownloadedSumm = strRecord.section(" *", 0, 0);
7	- if (strFileName == source().fileName())
8	+ if (strFileName == QFileInfo(source().toString()).fileName())
9	{
10	/* Calc the SHA-256 on the bytes, creating a string: */
11	uint8_t abHash[RTSHA256_HASH_SIZE];

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp (-11 lines)
1	--- src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp.orig 2017-01-17 07:26:50 UTC
2	+++ src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp
3	@@ -127,7 +127,7 @@ void UIDownloaderExtensionPack::handleVe
4	{
5	const QString strFileName = strRecord.section(" *", 1);
6	const QString strDownloadedSumm = strRecord.section(" *", 0, 0);
7	- if (strFileName == source().fileName())
8	+ if (strFileName == QFileInfo(source().toString()).fileName())
9	{
10	/* Calc the SHA-256 on the bytes, creating a string: */
11	uint8_t abHash[RTSHA256_HASH_SIZE];

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_settings_global_UIGlobalSettingsNetworkDetailsHost.cpp (-10 lines)
1	--- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp.orig 2017-03-08 17:19:57 UTC
2	+++ src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp
3	@@ -243,6 +243,6 @@ QString UIGlobalSettingsNetworkDetailsHo
4	address.prepend(QString::number(uPart));
5	uAddress = uAddress >> 8;
6	}
7	- return address.join('.');
8	+ return address.join(".");
9	}
10

Line 0 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src_VBox_HostDrivers_Support_freebsd_Makefile (+11 lines)
	1	--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2019-11-21 17:02:00 UTC
	2	+++ src/VBox/HostDrivers/Support/freebsd/Makefile
	3	@@ -26,7 +26,7 @@
	4
	5	KMOD = vboxdrv
	6
	7	-CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS
	8	+CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DDEBUG
	9
	10	.if (${MACHINE_ARCH} == "i386")
	11	CFLAGS += -DRT_ARCH_X86




--- Config.kmk.orig	2019-11-21 16:51:26 UTC
+++ Config.kmk
@@ -465,11 +465,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)
  # Enable OSS audio support.
  VBOX_WITH_AUDIO_OSS = 1
 endif

  # Enable PulseAudio audio support.
  VBOX_WITH_AUDIO_PULSE = 1
 endif
@@ -484,11 +484,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1
 # Enable PCI passthrough support.
 VBOX_WITH_PCI_PASSTHROUGH = 1
 # Enable statically linked dbus support.

  VBOX_WITH_PAM = 1
 endif
 # Enable internal networking.
@@ -496,7 +496,7 @@ VBOX_WITH_INTERNAL_NETWORKING = 1
 # Enable vmsvga (svga2) graphics device variant, 2D part
 VBOX_WITH_VMSVGA = 1
 # Enable vmsvga (svga2) graphics device variant, 3D part
-if1of ($(KBUILD_TARGET), darwin linux win)
+if1of ($(KBUILD_TARGET), darwin freebsd linux win)
  VBOX_WITH_VMSVGA3D = 1
 endif
 # Enable the generic 3D settings support if at least one 3D capable solution is enabled
@@ -641,7 +641,7 @@ VBOX_WITH_MAIN_USB_ID_DATABASE = 1
 #endif
 # Set this to prefix all C symbols in XPCOM, to avoid dynamic linking problems
 # caused by our XPCOM library polluting the symbol namespace for system libs.
-if1of ($(KBUILD_TARGET), linux solaris)
+if1of ($(KBUILD_TARGET), freebsd linux solaris)
  VBOX_WITH_XPCOM_NAMESPACE_CLEANUP = 1
 endif
 # The webservices api.
@@ -1062,10 +1062,6 @@ ifeq ($(KBUILD_TARGET),darwin)
  VBOX_WITH_VBOXSDL=
 endif
 

 ifeq ($(KBUILD_TARGET),haiku)
  # Don't bother with SDL ttf for now.
  VBOX_WITH_SECURELABEL=
@@ -1228,7 +1224,7 @@ ifdef VBOX_OSE
  VBOX_WITH_KCHMVIEWER=
  VBOX_WITH_PLUGIN_CRYPT=
  VBOX_WITH_DRAG_AND_DROP_PROMISES=

   VBOX_WITH_DOCS=
   VBOX_WITH_DOCS_PACKING=
  endif
@@ -4874,7 +4870,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
  ifn1of ($(KBUILD_TARGET), darwin linux solaris win)
   VBOX_WITH_INSTALLER=
  endif
- if1of ($(KBUILD_TARGET), win)
+ # if1of ($(KBUILD_TARGET), win)
   # Undefine codec libraries which are not needed.
   VBOX_WITH_LIBVPX=
   VBOX_WITH_LIBOPUS=
   # Disable video recording (with audio support).
   VBOX_WITH_VIDEOREC=
   VBOX_WITH_AUDIO_VIDEOREC=
- endif
+ # endif
  # 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
@@ -4575,7 +4571,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
-TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
+TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
 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
@@ -4622,7 +4618,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
 		| xargs -J% objcopy % $(outbase).kld
 
 # Link the final .ko (a shared object).

 endef
  endif # x86
 
@@ -5184,10 +5180,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH            += \
 TEMPLATE_VBOXR3EXE_CFLAGS             += -fno-pic
 TEMPLATE_VBOXR3EXE_CXXFLAGS           += -fno-pic
 TEMPLATE_VBOXR3EXE_LDFLAGS            += -fno-pic

 	/usr/include \
 	/usr/X11R6/include \
 	/usr/local/include
@@ -5219,6 +5223,7 @@ TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile   = $(TEMPLATE_VB
   TEMPLATE_VBOXR3EXE_LDFLAGS          += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
  endif
  ifdef VBOX_WITH_ORIGIN
+  TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd  += $(VBOX_GCC_ORIGIN_OPT)
   TEMPLATE_VBOXR3EXE_LDFLAGS.linux    += $(VBOX_GCC_ORIGIN_OPT)
  endif
 endif
@@ -5358,7 +5363,7 @@ ifeq ($(KBUILD_TARGET),win)
  	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
  	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \
  	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/oldnames.lib
-else ifn1of ($(KBUILD_TARGET), darwin linux solaris)
+else ifn1of ($(KBUILD_TARGET), darwin freebsd linux solaris)
  # The gcc guys sans darwin, linux and solaris (don't depend on statically compiled system libs there)
  TEMPLATE_VBOXR3STATIC_CFLAGS          = $(TEMPLATE_VBOXR3EXE_CFLAGS) -static
  TEMPLATE_VBOXR3STATIC_CXXFLAGS        = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -static
@@ -5406,8 +5411,10 @@ else
  TEMPLATE_VBoxR3Static_LIBS        += \
  	$(PATH_STAGE_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \
  	$(SDK_VBOX_ZLIB_LIBS)
- if1of ($(KBUILD_TARGET),darwin freebsd)
+ ifeq ($(KBUILD_TARGET),darwin)
   TEMPLATE_VBoxR3Static_LIBS       += iconv
+ else ifeq ($(KBUILD_TARGET),freebsd)
+  TEMPLATE_VBoxR3Static_LIBS       += crypt iconv
  else ifeq ($(KBUILD_TARGET),solaris)
   TEMPLATE_VBoxR3Static_LIBS       += kstat
  endif
@@ -5503,6 +5510,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
 else ifn1of ($(KBUILD_TARGET), os2 solaris)
  # 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.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd))
  TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
 endif
 
@@ -5530,6 +5538,7 @@ TEMPLATE_VBoxR3HardenedTstDll_INST = $(INST_TESTCASE)
  TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.win = $(TEMPLATE_VBoxR3TstDll_LDFLAGS.win) -IntegrityCheck
 ifn1of ($(KBUILD_TARGET), win os2)
  TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS       = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3TstDll_LDFLAGS))
+ TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3TstDll_LDFLAGS.freebsd))
  TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3TstDll_LDFLAGS.linux))
 endif
 
@@ -5552,6 +5561,7 @@ ifndef VBOX_WITH_HARDENING
   TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
  endif
  ifdef VBOX_WITH_ORIGIN
+  TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS.freebsd += $(VBOX_GCC_ORIGIN_OPT)
   TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)
  endif
 endif
@@ -6078,10 +6088,18 @@ TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTI
  else ifeq ($(KBUILD_TARGET),haiku)
 TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
 TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME) network stdc++ supc++

 	/usr/include \
 	/usr/X11R6/include \
 	/usr/local/include
@@ -6113,6 +6131,7 @@ TEMPLATE_VBOXMAINEXE_LDFLAGS            += '$(VBOX_GCC
 TEMPLATE_VBOXMAINEXE_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
  endif
  ifdef VBOX_WITH_ORIGIN
+TEMPLATE_VBOXMAINEXE_LDFLAGS.freebsd    += $(VBOX_GCC_ORIGIN_OPT)
 TEMPLATE_VBOXMAINEXE_LDFLAGS.linux      += $(VBOX_GCC_ORIGIN_OPT)
  endif
 
@@ -6670,13 +6689,10 @@ ifdef VBOX_WITH_QTGUI
    TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
 	$(VBOX_LIBPATH_X11)
    ifeq ($(KBUILD_TARGET),freebsd)

 	/usr/local/lib
    endif
    ifeq ($(KBUILD_TARGET),solaris)
@@ -6917,10 +6933,17 @@ TEMPLATE_VBoxBldProg_TOOL                = GXX3
 TEMPLATE_VBoxBldProg_LIBS                = network iconv
 TEMPLATE_VBoxBldProg_LIBPATH            += \
 	/boot/common/lib
- else if1of ($(KBUILD_HOST), freebsd openbsd)
+ else ifeq ($(KBUILD_HOST),freebsd)
 TEMPLATE_VBoxBldProg_TOOL                = GXX3
 TEMPLATE_VBoxBldProg_LIBS                = pthread
 TEMPLATE_VBoxBldProg_INCS               += \
+	/usr/local/include
+TEMPLATE_VBoxBldProg_LIBPATH            += \
+	/usr/local/lib
+ else ifeq ($(KBUILD_HOST),openbsd)
+TEMPLATE_VBoxBldProg_TOOL                = GXX3
+TEMPLATE_VBoxBldProg_LIBS                = pthread
+TEMPLATE_VBoxBldProg_INCS               += \
 	/usr/include \
 	/usr/X11R6/include \
 	/usr/local/include
@@ -6969,6 +6992,7 @@ TEMPLATE_VBoxAdvBldProg_LIBS.darwin = \
 	$(TEMPLATE_VBoxBldProg_LIBS.darwin)
 TEMPLATE_VBoxAdvBldProg_LIBS.freebsd = \
 	$(TEMPLATE_VBoxAdvBldProg_LIBS) \
+	crypt \
 	iconv \
 	rt \
 	$(TEMPLATE_VBoxBldProg_LIBS.freebsd)
@@ -7044,6 +7068,7 @@ else # the gcc guys
  # Do not inherit sanitizer flags from VBOXR3EXE in guest executables.  Deal with them separately.
  TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.debug = $(NO_SUCH_VARIABLE)
  TEMPLATE_VBOXGUESTR3EXE_CFLAGS.debug = $(NO_SUCH_VARIABLE)
+ TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd))
  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.debug = $(NO_SUCH_VARIABLE)
  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS  = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
@@ -7067,6 +7092,7 @@ TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux    = \
 	$(VBOX_GCC_fno-stack-protector)
 TEMPLATE_VBOXGUESTR3EXE_CFLAGS.linux      = $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux)
 # The GNU_HASH ELF tag is not supported by older systems.
+TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.freebsd    += $(VBOX_LD_hash_style_sysv)
 TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux      += $(VBOX_LD_hash_style_sysv)
 
 #
@@ -7079,6 +7105,9 @@ TEMPLATE_NewVBoxGuestR3Exe_LIBS     = \
 	$(VBOX_LIB_VBGL_R3) \
 	$(VBOX_LIB_IPRT_GUEST_R3) \
 	$(TEMPLATE_VBOXGUESTR3EXE_LIBS)
+ifeq ($(KBUILD_TARGET),freebsd)
+TEMPLATE_NewVBoxGuestR3Exe_LIBS += crypt
+endif
 ifeq ($(KBUILD_TARGET),solaris)
 TEMPLATE_NewVBoxGuestR3Exe_LIBS += contract
 endif
@@ -7274,6 +7303,7 @@ TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE)      =
 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
 # The GNU_HASH ELF tag is not supported by older glibc dynamic linkers.
+TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.freebsd = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv))
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv))
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE)   = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS          = -r
@@ -7383,6 +7413,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




--- configure.orig	2019-11-21 16:51:26 UTC
+++ configure
@@ -138,10 +138,14 @@ CXX_FLAGS=""
 if [ "$OS" = "freebsd" ]; then

 else
   INCCURL=""
   LIBCURL="-lcurl"
@@ -1221,7 +1225,7 @@ extern "C" int main(void)
       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
+      elif [ $cc_maj -eq 4 -a $cc_min -eq 2 -a "$OS" = "freebsd" ]; then
+        log_success "found version $cc_ver"
+      # 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)
 #endif
 }
 EOF

     test_execute
   fi
 }
@@ -1527,8 +1531,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`
@@ -1667,7 +1670,7 @@ check_libopus()
       fi
       cat > $ODIR.tmp_src.cc << EOF
 #include <cstdio>

 extern "C" int main(void)
 {
   OpusEncoder *test;
@@ -1999,8 +2002,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
@@ -2476,7 +2479,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`
@@ -2840,14 +2843,6 @@ if [ "$OS" = "linux" ]; then
   check_ssl
   check_curl
   [ $WITH_LIBVPX -eq 1 ] && check_vpx
-  check_libopus
+  [ $OSE -eq 0 -a "$OS" != "win" ] && check_libopus
  [ "$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
   [ $WITH_PYTHON -eq 1 ] && check_python
   [ $WITH_JAVA   -eq 1 ] && check_java
 
-  # PulseAudio
   if [ "$OS" = "linux" -o "$OS" = "freebsd" -o "$OS" = "netbsd" ]; then
+    if [ $WITH_ALSA -eq 1 ]; then
+      check_alsa
+    else
+      cnf_append "VBOX_WITH_AUDIO_ALSA" ""
+    fi
     if [ $WITH_PULSE -eq 1 ]; then
       check_pulse
     elif [ $WITH_PULSE -eq 0 ]; then
       cnf_append "VBOX_WITH_AUDIO_PULSE" ""
     fi
+    if [ $WITH_DBUS -eq 0 ]; then
+      cnf_append "VBOX_WITH_DBUS" ""
+    fi
  fi
 fi
 
@@ -2806,14 +2819,6 @@ if [ "$OS" = "linux" ]; then
     cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
   fi
   if [ $ONLY_ADDITIONS -eq 0 ]; then

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-include-VBox-vmm-cpumctx.h (-11 lines)
1	--- include/VBox/vmm/cpumctx.h.orig 2015-03-12 18:53:45.762704000 -0400
2	+++ include/VBox/vmm/cpumctx.h 2015-03-12 18:56:23.765105000 -0400
3	@@ -84,7 +84,7 @@
4	# define CPUMSELREG_ARE_HIDDEN_PARTS_VALID(a_pVCpu, a_pSelReg) \
5	( ((a_pSelReg)->fFlags & CPUMSELREG_FLAGS_VALID) \
6	&& ( (a_pSelReg)->ValidSel == (a_pSelReg)->Sel \
7	- \|\| ( (a_pVCpu) /!= NULL/ \
8	+ \|\| ( ((a_pVCpu) != NULL) \
9	&& (a_pSelReg)->ValidSel == ((a_pSelReg)->Sel & X86_SEL_MASK_OFF_RPL) \
10	&& ((a_pSelReg)->Sel & X86_SEL_RPL) == 1 \
11	&& ((a_pSelReg)->ValidSel & X86_SEL_RPL) == 0 \




--- 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
@@ -35,6 +35,16 @@
 # pragma D depends_on library vbox-types.d
 #endif
 
+/* Workaround for FreeBSD machine/specialreg.h defining MSRs */
+#ifdef RT_OS_FREEBSD
+# undef MSR_P5_MC_ADDR
+# undef MSR_P5_MC_TYPE
+# undef MSR_IA32_PLATFORM_ID
+# undef MSR_BBL_CR_CTL3
+# undef MSR_IA32_MISC_ENABLE
+# undef MSR_IA32_FEATURE_CONTROL
+#endif
+
 /* Workaround for Solaris sys/regset.h defining CS, DS */
 #ifdef RT_OS_SOLARIS
 # undef CS

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-include_VBox_VBoxGL2D.h (-7 / +2 lines)
1	Fix build with Qt5 5.13, which defined GLsizeiptr already.	1	--- include/VBox/VBoxGL2D.h.orig 2019-11-21 16:51:31 UTC
2
3	Obtained from:
4	https://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg436220.html
5
6	--- include/VBox/VBoxGL2D.h.orig 2019-09-29 14:31:16 UTC
7	+++ include/VBox/VBoxGL2D.h	2	+++ include/VBox/VBoxGL2D.h
8	@@ -107,7 +107,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM3I)(GLint	3	@@ -111,7 +111,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM3I)(GLint
9	typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM4I)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3);	4	typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM4I)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
10		5
11	/* GL_ARB_pixel_buffer_object*/	6	/* GL_ARB_pixel_buffer_object*/




--- include/VBox/com/array.h.orig	2019-11-21 16:51:32 UTC
+++ include/VBox/com/array.h
@@ -171,7 +171,7 @@
 
 #include "VBox/com/defs.h"
 

 /** @def VBOX_WITH_TYPE_TRAITS
  * Type traits are a C++ 11 feature, so not available everywhere (yet).
  * Only GCC 4.6 or newer and MSVC++ 16.0 (Visual Studio 2010) or newer.
@@ -940,12 +940,12 @@ class SafeArray : public Traits (public)
      */
     T &operator[] (size_t aIdx)
     {
-        AssertReturn(m.arr != NULL,  *((T *)NULL));
-        AssertReturn(aIdx < size(), *((T *)NULL));
+        AssertReturn(m.arr != NULL,  *((T *)1));
+        AssertReturn(aIdx < size(), *((T *)1));
 #ifdef VBOX_WITH_XPCOM
         return m.arr[aIdx];
 #else
-        AssertReturn(m.raw != NULL,  *((T *)NULL));
+        AssertReturn(m.raw != NULL,  *((T *)1));
         return m.raw[aIdx];
 #endif
     }
@@ -960,7 +960,7 @@ class SafeArray : public Traits (public)
 #ifdef VBOX_WITH_XPCOM
         return m.arr[aIdx];
 #else
-        AssertReturn(m.raw != NULL,  *((T *)NULL));
+        AssertReturn(m.raw != NULL,  *((T *)1));
         return m.raw[aIdx];
 #endif
     }




--- include/iprt/assertcompile.h.orig	2018-01-15 14:49:42 UTC
+++ include/iprt/assertcompile.h
@@ -104,7 +104,11 @@ RT_C_DECLS_END
  * @param   expr    Expression which should be true.
  */
 #ifdef RTASSERT_HAVE_STATIC_ASSERT
-# define AssertCompile(expr)    static_assert(!!(expr), #expr)
+#  ifdef __cplusplus
+#    define AssertCompile(expr) static_assert(!!(expr), #expr)
+#  else
+#    define AssertCompile(expr) _Static_assert(!!(expr), #expr)
+#  endif
 #else
 # define AssertCompile(expr)    AssertCompileNS(expr)
 #endif




--- include/iprt/cdefs.h.orig	2018-10-15 14:24:52 UTC
+++ include/iprt/cdefs.h
@@ -2611,28 +2611,28 @@
 
 /** @def RT_BYTE1
  * Gets the first byte of something. */
-#define RT_BYTE1(a)                             ( (a)         & 0xff )
+#define RT_BYTE1(a)                             ( (uint8_t)((a)         & 0xff) )
 /** @def RT_BYTE2
  * Gets the second byte of something. */
-#define RT_BYTE2(a)                             ( ((a) >>  8) & 0xff )
+#define RT_BYTE2(a)                             ( (uint8_t)(((a) >>  8) & 0xff) )
 /** @def RT_BYTE3
  * Gets the second byte of something. */
-#define RT_BYTE3(a)                             ( ((a) >> 16) & 0xff )
+#define RT_BYTE3(a)                             ( (uint8_t)(((a) >> 16) & 0xff) )
 /** @def RT_BYTE4
  * Gets the fourth byte of something. */
-#define RT_BYTE4(a)                             ( ((a) >> 24) & 0xff )
+#define RT_BYTE4(a)                             ( (uint8_t)(((a) >> 24) & 0xff) )
 /** @def RT_BYTE5
  * Gets the fifth byte of something. */
-#define RT_BYTE5(a)                             ( ((a) >> 32) & 0xff )
+#define RT_BYTE5(a)                             ( (uint8_t)(((a) >> 32) & 0xff) )
 /** @def RT_BYTE6
  * Gets the sixth byte of something. */
-#define RT_BYTE6(a)                             ( ((a) >> 40) & 0xff )
+#define RT_BYTE6(a)                             ( (uint8_t)(((a) >> 40) & 0xff) )
 /** @def RT_BYTE7
  * Gets the seventh byte of something. */
-#define RT_BYTE7(a)                             ( ((a) >> 48) & 0xff )
+#define RT_BYTE7(a)                             ( (uint8_t)(((a) >> 48) & 0xff) )
 /** @def RT_BYTE8
  * Gets the eight byte of something. */
-#define RT_BYTE8(a)                             ( ((a) >> 56) & 0xff )
+#define RT_BYTE8(a)                             ( (uint8_t)(((a) >> 56) & 0xff) )
 
 
 /** @def RT_LODWORD

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-include_iprt_string.h (-2 / +2 lines)
1	--- include/iprt/string.h.orig 2018-06-29 13:08:03 UTC	1	--- include/iprt/string.h.orig 2019-11-21 16:51:44 UTC
2	+++ include/iprt/string.h	2	+++ include/iprt/string.h
3	@@ -43,6 +43,11 @@	3	@@ -46,6 +46,11 @@
4	#elif defined(RT_OS_FREEBSD) && defined(_KERNEL)	4	#elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
5	RT_C_DECLS_BEGIN	5	RT_C_DECLS_BEGIN
6	# include <sys/libkern.h>	6	# include <sys/libkern.h>




--- include/iprt/types.h.orig	2018-05-09 16:32:07 UTC
+++ include/iprt/types.h
@@ -56,22 +56,9 @@ RT_C_DECLS_END
 #  include <sys/types.h>
 
 # elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
-    /*
-     * Kludge for the FreeBSD kernel:
-     *  stddef.h and sys/types.h have slightly different offsetof definitions
-     *  when compiling in kernel mode. This is just to make GCC shut up.
-     */
-#  ifndef _STDDEF_H_
-#   undef offsetof
-#  endif
+
 #  include <sys/stddef.h>
-#  ifndef _SYS_TYPES_H_
-#   undef offsetof
-#  endif
 #  include <sys/types.h>
-#  ifndef offsetof
-#   error "offsetof is not defined!"
-#  endif
 
 # elif defined(RT_OS_FREEBSD) && HC_ARCH_BITS == 64 && defined(RT_ARCH_X86)
     /*




--- include/iprt/x86.h.orig	2019-11-21 16:51:45 UTC
+++ include/iprt/x86.h
@@ -38,6 +38,16 @@
 # pragma D depends_on library vbox-types.d
 #endif
 
+/* Workaround for FreeBSD machine/specialreg.h defining MSRs */
+#ifdef RT_OS_FREEBSD
+# undef MSR_P5_MC_ADDR
+# undef MSR_P5_MC_TYPE
+# undef MSR_IA32_PLATFORM_ID
+# undef MSR_BBL_CR_CTL3
+# undef MSR_IA32_MISC_ENABLE
+# undef MSR_IA32_FEATURE_CONTROL
+#endif
+
 /* Workaround for Solaris sys/regset.h defining CS, DS */
 #ifdef RT_OS_SOLARIS
 # undef CS




--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig	2017-10-18 07:06:43 UTC
+++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c
@@ -93,8 +93,6 @@ struct VBoxGuestDeviceState
     struct resource   *pIrqRes;
     /** Pointer to the IRQ handler. */
     void              *pfnIrqHandler;
-    /** VMMDev version */
-    uint32_t           u32Version;
 };
 
 
@@ -104,8 +102,7 @@ struct VBoxGuestDeviceState
 /*
  * Character device file handlers.
  */
-static d_fdopen_t vgdrvFreeBSDOpen;
-static d_close_t  vgdrvFreeBSDClose;
+static d_open_t   vgdrvFreeBSDOpen;
 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
 {
     .d_version =        D_VERSION,
     .d_flags =          D_TRACKCLOSE | D_NEEDMINOR,
-    .d_fdopen =         vgdrvFreeBSDOpen,
-    .d_close =          vgdrvFreeBSDClose,
+    .d_open =           vgdrvFreeBSDOpen,
     .d_ioctl =          vgdrvFreeBSDIOCtl,
     .d_read =           vgdrvFreeBSDRead,
     .d_write =          vgdrvFreeBSDWrite,
@@ -145,81 +141,28 @@ static struct cdevsw    g_vgdrvFreeBSDCh
     .d_name =           "vboxguest"
 };
 
+/** Device structure. */
+static struct cdev         *g_pDev;
+
 /** Device extention & session data association structure. */
 static VBOXGUESTDEVEXT      g_DevExt;
 
-/** List of cloned device. Managed by the kernel. */
-static struct clonedevs    *g_pvgdrvFreeBSDClones;
-/** The dev_clone event handler tag. */
-static eventhandler_tag     g_vgdrvFreeBSDEHTag;
 /** Reference counter */
 static volatile uint32_t    cUsers;
 /** selinfo structure used for polling. */
 static struct selinfo       g_SelInfo;
 
-/**
- * DEVFS event handler.
- */
-static void vgdrvFreeBSDClone(void *pvArg, struct ucred *pCred, char *pszName, int cchName, struct cdev **ppDev)
+static void vgdrvFreeBSDDtr(void *pSession)
 {
-    int iUnit;
-    int rc;
-
-    Log(("vgdrvFreeBSDClone: pszName=%s ppDev=%p\n", pszName, ppDev));
-
-    /*
-     * One device node per user, si_drv1 points to the session.
-     * /dev/vboxguest<N> where N = {0...255}.
-     */
-    if (!ppDev)
-        return;
-    if (strcmp(pszName, "vboxguest") == 0)
-        iUnit =  -1;
-    else if (dev_stdclone(pszName, NULL, "vboxguest", &iUnit) != 1)
-        return;
-    if (iUnit >= 256)
-    {
-        Log(("vgdrvFreeBSDClone: iUnit=%d >= 256 - rejected\n", iUnit));
-        return;
-    }
-
-    Log(("vgdrvFreeBSDClone: pszName=%s iUnit=%d\n", pszName, iUnit));
-
-    rc = clone_create(&g_pvgdrvFreeBSDClones, &g_vgdrvFreeBSDChrDevSW, &iUnit, ppDev, 0);
-    Log(("vgdrvFreeBSDClone: clone_create -> %d; iUnit=%d\n", rc, iUnit));
-    if (rc)
-    {
-        *ppDev = make_dev(&g_vgdrvFreeBSDChrDevSW,
-                          iUnit,
-                          UID_ROOT,
-                          GID_WHEEL,
-                          0664,
-                          "vboxguest%d", iUnit);
-        if (*ppDev)
-        {
-            dev_ref(*ppDev);
-            (*ppDev)->si_flags |= SI_CHEAPCLONE;
-            Log(("vgdrvFreeBSDClone: Created *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n",
-                     *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2));
-            (*ppDev)->si_drv1 = (*ppDev)->si_drv2 = NULL;
-        }
-        else
-            Log(("vgdrvFreeBSDClone: make_dev iUnit=%d failed\n", iUnit));
-    }
-    else
-        Log(("vgdrvFreeBSDClone: Existing *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n",
-             *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2));
+    VGDrvCommonCloseSession(&g_DevExt, pSession);
+    ASMAtomicDecU32(&cUsers);
 }
 
 /**
  * File open handler
  *
  */
-#if __FreeBSD_version >= 700000
-static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOpen, struct thread *pTd, struct file *pFd)
-#else
-static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOpen, struct thread *pTd)
-#endif
+static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOpen, int DevType, struct thread *pTd)
 {
     int                 rc;
     PVBOXGUESTSESSION   pSession;
@@ -227,25 +170,18 @@ static int vgdrvFreeBSDOpen(struct cdev 
     LogFlow(("vgdrvFreeBSDOpen:\n"));
 
     /*
-     * Try grab it (we don't grab the giant, remember).
-     */
-    if (!ASMAtomicCmpXchgPtr(&pDev->si_drv1, (void *)0x42, NULL))
-        return EBUSY;
-
-    /*
      * Create a new session.
      */
     rc = VGDrvCommonCreateUserSession(&g_DevExt, &pSession);
     if (RT_SUCCESS(rc))
     {
-        if (ASMAtomicCmpXchgPtr(&pDev->si_drv1, pSession, (void *)0x42))
-        {
-            Log(("vgdrvFreeBSDOpen: success - g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, (int)RTProcSelf()));
+        Log(("vgdrvFreeBSDOpen: success - g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, (int)RTProcSelf()));
+        rc = devfs_set_cdevpriv(pSession, vgdrvFreeBSDDtr);
+        if (rc)
+            VGDrvCommonCloseSession(&g_DevExt, pSession);
+        else
             ASMAtomicIncU32(&cUsers);
-            return 0;
-        }
-
-        VGDrvCommonCloseSession(&g_DevExt, pSession);
+        return rc;
     }
 
     LogRel(("vgdrvFreeBSDOpen: failed. rc=%d\n", rc));
@@ -253,33 +189,6 @@ static int vgdrvFreeBSDOpen(struct cdev 
 }
 
 /**
- * File close handler
- *
- */
-static int vgdrvFreeBSDClose(struct cdev *pDev, int fFile, int DevType, struct thread *pTd)
-{
-    PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pDev->si_drv1;
-    Log(("vgdrvFreeBSDClose: fFile=%#x pSession=%p\n", fFile, pSession));
-
-    /*
-     * Close the session if it's still hanging on to the device...
-     */
-    if (VALID_PTR(pSession))
-    {
-        VGDrvCommonCloseSession(&g_DevExt, pSession);
-        if (!ASMAtomicCmpXchgPtr(&pDev->si_drv1, NULL, pSession))
-            Log(("vgdrvFreeBSDClose: si_drv1=%p expected %p!\n", pDev->si_drv1, pSession));
-        ASMAtomicDecU32(&cUsers);
-        /* Don't use destroy_dev here because it may sleep resulting in a hanging user process. */
-        destroy_dev_sched(pDev);
-    }
-    else
-        Log(("vgdrvFreeBSDClose: si_drv1=%p!\n", pSession));
-    return 0;
-}
-
-
-/**
  * I/O control request.
  *
  * @returns depends...
@@ -292,7 +201,11 @@ static int vgdrvFreeBSDClose(struct cdev
 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
 
 static int vgdrvFreeBSDPoll(struct cdev *pDev, int fEvents, struct thread *td)
 {
-    int fEventsProcessed;
+    PVBOXGUESTSESSION pSession;
+    int fEventsProcessed, rc;
 
     LogFlow(("vgdrvFreeBSDPoll: fEvents=%d\n", fEvents));
 
-    PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pDev->si_drv1;
-    if (RT_UNLIKELY(!VALID_PTR(pSession))) {
+    rc = devfs_get_cdevpriv((void **)&pSession);
+    if (rc)
+    {
         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
     /*
      * Reverse what we did in vgdrvFreeBSDAttach.
      */
-    if (g_vgdrvFreeBSDEHTag != NULL)
-        EVENTHANDLER_DEREGISTER(dev_clone, g_vgdrvFreeBSDEHTag);
-
-    clone_cleanup(&g_pvgdrvFreeBSDClones);
+    destroy_dev(g_pDev);
 
     vgdrvFreeBSDRemoveIRQ(pDevice, pState);
 
@@ -689,18 +601,21 @@ static int vgdrvFreeBSDAttach(device_t p
                 if (RT_SUCCESS(rc))
                 {
                     /*
-                     * Configure device cloning.
+                     * Configure device.
                      */
-                    clone_setup(&g_pvgdrvFreeBSDClones);
-                    g_vgdrvFreeBSDEHTag = EVENTHANDLER_REGISTER(dev_clone, vgdrvFreeBSDClone, 0, 1000);
-                    if (g_vgdrvFreeBSDEHTag)
+                    g_pDev = make_dev(&g_vgdrvFreeBSDChrDevSW,
+                                      0,
+                                      UID_ROOT,
+                                      GID_WHEEL,
+                                      0664,
+                                      "vboxguest");
+                    if (g_pDev)
                     {
                         printf(DEVICE_NAME ": loaded successfully\n");
                         return 0;
                     }
 
-                    printf(DEVICE_NAME ": EVENTHANDLER_REGISTER(dev_clone,,,) failed\n");
-                    clone_cleanup(&g_pvgdrvFreeBSDClones);
+                    printf(DEVICE_NAME ": make_dev failed\n");
                     vgdrvFreeBSDRemoveIRQ(pDevice, pState);
                 }
                 else




--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig	2017-10-18 07:06:43 UTC
+++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile
@@ -70,6 +70,7 @@ SRCS += \
 	handletable.c \
 	handletablectx.c \
 	once.c \
+	term.c \
 	thread.c
 
 .PATH:	${.CURDIR}/common/string
@@ -128,6 +129,7 @@ SRCS += \
 
 .PATH:	${.CURDIR}/r0drv
 SRCS += \
+	alloc-ef-r0drv.c \
 	alloc-r0drv.c \
 	initterm-r0drv.c \
 	memobj-r0drv.c \




--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig	2017-10-18 07:06:43 UTC
+++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest
@@ -99,6 +99,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/term.cpp=>common/misc/term.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 \
@@ -160,6 +161,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-ef-r0drv.cpp=>r0drv/alloc-ef-r0drv.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 \
@@ -186,6 +188,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 \
+    ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/threadctxhooks-r0drv-generic.cpp=>r0drv/generic/threadctxhooks-r0drv-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp=>r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/memobj-r0drv.cpp=>r0drv/memobj-r0drv.c \
     ${PATH_ROOT}/src/VBox/Runtime/VBox/log-vbox.cpp=>VBox/log-vbox.c \




--- 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
@@ -0,0 +1,95 @@
+# Copyright (c) 2001, Stanford University
+# All rights reserved.
+#
+# See the file LICENSE.txt for information on redistributing this software.
+
+
+import sys
+
+import apiutil
+
+
+def GenerateEntrypoints():
+
+    #apiutil.CopyrightC()
+
+    # Get sorted list of dispatched functions.
+    # The order is very important - it must match cr_opcodes.h
+    # and spu_dispatch_table.h
+    print '%include "iprt/asmdefs.mac"'
+    print ""
+    print "%ifdef RT_ARCH_AMD64"
+    print "extern glim"
+    print "%else ; X86"
+    print "extern glim"
+    print "%endif"
+    print ""
+
+    keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
+
+    for index in range(len(keys)):
+        func_name = keys[index]
+        if apiutil.Category(func_name) == "Chromium":
+            continue
+        if apiutil.Category(func_name) == "VBox":
+            continue
+
+        print "BEGINPROC_EXPORTED gl%s" % func_name
+        print "%ifdef RT_ARCH_AMD64"
+        print "\tmov \trax, qword glim+%d" % (8*index)
+        print "\tjmp \t[rax]"
+        print "%else ; X86"
+        print "\tmov \teax, dword glim+%d" % (4*index)
+        print "\tjmp \t[eax]"
+        print "%endif"
+        print "ENDPROC gl%s" % func_name
+        print ""
+
+
+    print ';'
+    print '; Aliases'
+    print ';'
+
+    # Now loop over all the functions and take care of any aliases
+    allkeys = apiutil.GetAllFunctions(sys.argv[1]+"/APIspec.txt")
+    for func_name in allkeys:
+        if "omit" in apiutil.ChromiumProps(func_name):
+            continue
+
+        if func_name in keys:
+            # we already processed this function earlier
+            continue
+
+        # alias is the function we're aliasing
+        alias = apiutil.Alias(func_name)
+        if alias:
+            # this dict lookup should never fail (raise an exception)!
+            index = keys.index(alias)
+            print "BEGINPROC_EXPORTED gl%s" % func_name
+            print "%ifdef RT_ARCH_AMD64"
+            print "\tmov \trax, qword glim+%d" % (8*index)
+            print "\tjmp \t[rax]"
+            print "%else ; X86"
+            print "\tmov \teax, dword glim+%d" % (4*index)
+            print "\tjmp \t[eax]"
+            print "%endif"
+            print "ENDPROC gl%s" % func_name
+            print ""
+
+
+    print ';'
+    print '; No-op stubs'
+    print ';'
+
+    # Now generate no-op stub functions
+    for func_name in allkeys:
+        if "stub" in apiutil.ChromiumProps(func_name):
+            print "BEGINPROC_EXPORTED gl%s" % func_name
+            print "\tleave"
+            print "\tret"
+            print "ENDPROC gl%s" % func_name
+            print ""
+
+
+GenerateEntrypoints()
+




--- 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
@@ -0,0 +1,95 @@
+# Copyright (c) 2001, Stanford University
+# All rights reserved.
+#
+# See the file LICENSE.txt for information on redistributing this software.
+
+
+import sys
+
+import apiutil
+
+
+def GenerateEntrypoints():
+
+    #apiutil.CopyrightC()
+
+    # Get sorted list of dispatched functions.
+    # The order is very important - it must match cr_opcodes.h
+    # and spu_dispatch_table.h
+    print '%include "iprt/asmdefs.mac"'
+    print ""
+    print "%ifdef RT_ARCH_AMD64"
+    print "extern glim"
+    print "%else ; X86"
+    print "extern glim"
+    print "%endif"
+    print ""
+
+    keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
+
+    for index in range(len(keys)):
+        func_name = keys[index]
+        if apiutil.Category(func_name) == "Chromium":
+            continue
+        if apiutil.Category(func_name) == "VBox":
+            continue
+
+        print "BEGINPROC_EXPORTED cr_gl%s" % func_name
+        print "%ifdef RT_ARCH_AMD64"
+        print "\tmov \trax, qword glim+%d" % (8*index)
+        print "\tjmp \t[rax]"
+        print "%else ; X86"
+        print "\tmov \teax, dword glim+%d" % (4*index)
+        print "\tjmp \t[eax]"
+        print "%endif"
+        print "ENDPROC cr_gl%s" % func_name
+        print ""
+
+
+    print ';'
+    print '; Aliases'
+    print ';'
+
+    # Now loop over all the functions and take care of any aliases
+    allkeys = apiutil.GetAllFunctions(sys.argv[1]+"/APIspec.txt")
+    for func_name in allkeys:
+        if "omit" in apiutil.ChromiumProps(func_name):
+            continue
+
+        if func_name in keys:
+            # we already processed this function earlier
+            continue
+
+        # alias is the function we're aliasing
+        alias = apiutil.Alias(func_name)
+        if alias:
+            # this dict lookup should never fail (raise an exception)!
+            index = keys.index(alias)
+            print "BEGINPROC_EXPORTED cr_gl%s" % func_name
+            print "%ifdef RT_ARCH_AMD64"
+            print "\tmov \trax, qword glim+%d" % (8*index)
+            print "\tjmp \t[rax]"
+            print "%else ; X86"
+            print "\tmov \teax, dword glim+%d" % (4*index)
+            print "\tjmp \t[eax]"
+            print "%endif"
+            print "ENDPROC cr_gl%s" % func_name
+            print ""
+
+
+    print ';'
+    print '; No-op stubs'
+    print ';'
+
+    # Now generate no-op stub functions
+    for func_name in allkeys:
+        if "stub" in apiutil.ChromiumProps(func_name):
+            print "BEGINPROC_EXPORTED cr_gl%s" % func_name
+            print "\tleave"
+            print "\tret"
+            print "ENDPROC cr_gl%s" % func_name
+            print ""
+
+
+GenerateEntrypoints()
+




--- 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
@@ -0,0 +1,104 @@
+"""
+Copyright (C) 2009-2012 Oracle Corporation
+
+This file is part of VirtualBox Open Source Edition (OSE), as
+available from http://www.virtualbox.org. This file is free software;
+you can redistribute it and/or modify it under the terms of the GNU
+General Public License (GPL) as published by the Free Software
+Foundation, in version 2 as it comes in the "COPYING" file of the
+VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+"""
+
+import sys
+
+#Note, this should match the fakedri_glxfuncsList.h order
+glx_functions = [
+"CopyContext",
+"UseXFont",
+#"GetDriverConfig",
+"GetProcAddress",
+"QueryExtension",
+"IsDirect",
+"DestroyGLXPbufferSGIX",
+"QueryGLXPbufferSGIX",
+"CreateGLXPixmap",
+"CreateGLXPixmapWithConfigSGIX",
+"QueryContext",
+"CreateContextWithConfigSGIX",
+"SwapBuffers",
+"CreateNewContext",
+"SelectEventSGIX",
+"GetCurrentDrawable",
+"ChooseFBConfig",
+"WaitGL",
+"GetFBConfigs",
+"CreatePixmap",
+"GetSelectedEventSGIX",
+"GetCurrentReadDrawable",
+"GetCurrentDisplay",
+"QueryServerString",
+"CreateWindow",
+"SelectEvent",
+"GetVisualFromFBConfigSGIX",
+"GetFBConfigFromVisualSGIX",
+"QueryDrawable",
+"CreateContext",
+"GetConfig",
+"CreateGLXPbufferSGIX",
+"CreatePbuffer",
+"ChooseFBConfigSGIX",
+"WaitX",
+"GetVisualFromFBConfig",
+#"GetScreenDriver",
+"GetFBConfigAttrib",
+"GetCurrentContext",
+"GetClientString",
+"DestroyPixmap",
+"MakeCurrent",
+"DestroyContext",
+"GetProcAddressARB",
+"GetSelectedEvent",
+"DestroyPbuffer",
+"DestroyWindow",
+"DestroyGLXPixmap",
+"QueryVersion",
+"ChooseVisual",
+"MakeContextCurrent",
+"QueryExtensionsString",
+"GetFBConfigAttribSGIX",
+"FreeMemoryMESA",
+"QueryContextInfoEXT",
+"ImportContextEXT",
+"GetContextIDEXT",
+"MakeCurrentReadSGI",
+"AllocateMemoryMESA",
+"GetMemoryOffsetMESA",
+"CreateGLXPixmapMESA",
+"GetCurrentDisplayEXT",
+"FreeContextEXT"
+];
+
+print '%include "iprt/asmdefs.mac"'
+print ""
+print "%ifdef RT_ARCH_AMD64"
+print "extern glxim"
+print "%else ; X86"
+print "extern glxim"
+print "%endif"
+print ""
+
+for index in range(len(glx_functions)):
+    func_name = glx_functions[index]
+
+    print "BEGINPROC_EXPORTED vbox_glX%s" % func_name
+    print "%ifdef RT_ARCH_AMD64"
+    print "\tmov \trax, qword glxim+%d" % (8*index)
+    print "\tjmp \t[rax]"
+    print "%else ; X86"
+    print "\tmov \teax, dword glxim+%d" % (4*index)
+    print "\tjmp \t[eax]"
+    print "%endif"
+    print "ENDPROC vbox_glX%s" % func_name
+    print ""
+




--- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig	2016-07-18 11:50:43 UTC
+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk
@@ -47,9 +47,7 @@ endif
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  #VBoxOGL_DRI = 1
  DLLS += VBoxEGL
- ifn1of ($(KBUILD_TARGET),linux solaris)   # No DRI on Solaris yet
-  VBoxOGL_FAKEDRI = 1
- endif
+ #VBoxOGL_FAKEDRI = 1
 
  # 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        += \
 	$(VBOX_PATH_CROGL_GENFILES)/linux_exports.c
 VBoxOGL_CLEAN.solaris        += \
 	$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c
+VBoxOGL_CLEAN.freebsd  += \
+	$(VBOX_PATH_CROGL_GENFILES)/freebsd_exports.c
 VBoxOGL_CLEAN.win      = \
 	$(VBOX_PATH_CROGL_GENFILES)/windows_exports.asm \
 	$(VBOX_PATH_CROGL_GENFILES)/cropengl.def
-if1of ($(KBUILD_TARGET), linux solaris)
+if1of ($(KBUILD_TARGET), linux solaris freebsd)
  ifdef VBoxOGL_DRI
   VBoxOGL_CLEAN   += \
  	$(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
@@ -200,6 +200,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
+  VBoxOGL_CLEAN.freebsd += \
+ 	$(VBOX_PATH_CROGL_GENFILES)/freebsd_glxapi_exports.asm
  endif
 endif
 VBoxOGL_LIBS = \
@@ -229,6 +231,8 @@ if1of ($(KBUILD_TARGET), linux solaris f
  else
   VBoxOGL_SONAME.linux = libGL.so.1
   VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain
+  VBoxOGL_SONAME.freebsd = libGL.so.1
+  VBoxOGL_LDFLAGS.freebsd += -Wl,-e,LibMain
  endif
 endif
 ifdef VBOX_WITH_CRHGSMI
@@ -237,7 +241,7 @@ endif
 ifdef VBOX_WITH_WDDM
 VBoxOGL_DEFS.win   += VBOX_WITH_WDDM
 endif
-if1of ($(KBUILD_TARGET), linux)
+if1of ($(KBUILD_TARGET), linux freebsd)
 VBoxOGL_LDFLAGS += -Wl,-z,nodelete
 endif
 ifdef VBOX_WITH_WDDM
@@ -395,6 +399,16 @@ $(VBOX_PATH_CROGL_GENFILES)/solaris_expo
 $(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 ifeq ($(KBUILD_TARGET),freebsd)
+$(VBOX_PATH_CROGL_GENFILES)/freebsd_exports_dri.asm: \
+		$(PATH_SUB_CURRENT)/FreeBSD_i386_exports_dri.py \
+		$(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
+		| $$(dir $$@)
+	$(call MSG_GENERATE,python,$@,$<)
+	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
+$(VBOX_PATH_CROGL_GENFILES)/freebsd_glxapi_exports.asm: $(PATH_SUB_CURRENT)/FreeBSD_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: \
@@ -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)
 VBoxEGL_SONAME.linux   = libEGL.so.1
+VBoxEGL_SONAME.freebsd = libEGL.so.1
 
 include $(FILE_KBUILD_SUB_FOOTER)
 




--- 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 @@
    # 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.
-  /usr/bin/VBoxClient --clipboard
-  /usr/bin/VBoxClient --checkhostversion
-  /usr/bin/VBoxClient --display
-  /usr/bin/VBoxClient --seamless
-  /usr/bin/VBoxClient --draganddrop
+  /usr/local/bin/VBoxClient --clipboard
+  /usr/local/bin/VBoxClient --checkhostversion
+  /usr/local/bin/VBoxClient --display
+  /usr/local/bin/VBoxClient --seamless
+  /usr/local/bin/VBoxClient --draganddrop
 fi

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop (-10 lines)
1	--- src/VBox/Additions/x11/Installer/vboxclient.desktop.orig 2009-06-12 12:34:57.000000000 +0000
2	+++ src/VBox/Additions/x11/Installer/vboxclient.desktop 2011-01-13 22:07:37.000000000 +0000
3	@@ -8,6 +8,6 @@
4	Comment=VirtualBox User Session Services
5	Comment[it]=Servizi di sessione utente di VirtualBox
6	Comment[pl]=Usługi sesji użytkownika VirtualBox
7	-Exec=/usr/bin/VBoxClient-all
8	+Exec=/usr/local/bin/VBoxClient-all
9	X-GNOME-Autostart-enabled=true
10	X-KDE-autostart-after=panel




--- 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 @@
 #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 */
+#ifdef M_SKIP_FIREWALL
+#undef M_SKIP_FIREWALL
+#endif
 #define	M_SKIP_FIREWALL	0x00004000 /* skip firewall processing */
 #define	M_FREELIST	0x00008000 /* mbuf is on the free list */
 #define	M_VLANTAG	0x00010000 /* ether_vtag is valid */




--- src/VBox/GuestHost/OpenGL/Makefile.kmk.orig	2019-07-12 08:49:27 UTC
+++ src/VBox/GuestHost/OpenGL/Makefile.kmk
@@ -94,7 +94,7 @@ VBoxOGLcrutil_DEFS.win    += CR_DEBUG_BACKDOOR_ENABLE
 VBoxOGLcrutil_INCS.win    += $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm
 VBoxOGLcrutil_LIBS.win    += $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB)
 endif
-if1of ($(KBUILD_TARGET), linux)
+if1of ($(KBUILD_TARGET), linux freebsd)
 VBoxOGLcrutil_LDFLAGS += -Wl,-z,nodelete
 endif
 
@@ -140,7 +140,7 @@ VBoxOGLhostcrutil_TEMPLATE = VBOXCROGLR3HOSTLIB
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
  VBoxOGLhostcrutil_INSTTYPE.win = both
 endif
-if1of ($(KBUILD_TARGET), linux)
+if1of ($(KBUILD_TARGET), linux freebsd)
 VBoxOGLhostcrutil_LDFLAGS = $(NO_SUCH_VARIABLE)
 endif
 VBoxOGLhostcrutil_LIBS.win =  \




--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig	2016-07-18 11:56:20 UTC
+++ src/VBox/HostDrivers/Support/freebsd/Makefile
@@ -81,6 +81,7 @@ SRCS += \
 	assert.c \
 	handletable.c \
 	handletablectx.c \
+	handletablesimple.c \
 	once.c \
 	term.c \
 	thread.c
@@ -92,13 +93,14 @@ SRCS += \
 	RTStrCopy.c \
 	RTStrCopyEx.c \
 	RTStrCopyP.c \
+	memchr.c \
 	strformat.c \
 	strformatrt.c \
 	strformattype.c \
+	stringalloc.c \
 	strprintf.c \
 	strtonum.c \
-	memchr.c \
-	stringalloc.c
+	utf-8.c
 
 .PATH:	${.CURDIR}/common/rand
 SRCS += \




--- src/VBox/HostDrivers/Support/freebsd/files_vboxdrv.orig	2016-07-18 11:56:20 UTC
+++ src/VBox/HostDrivers/Support/freebsd/files_vboxdrv
@@ -116,6 +116,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 \
+    ${PATH_ROOT}/src/VBox/Runtime/common/misc/handletablesimple.cpp=>common/misc/handletablesimple.c \
     ${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=" \
     ${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 \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/memchr.cpp=>common/string/memchr.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformat.cpp=>common/string/strformat.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformatrt.cpp=>common/string/strformatrt.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformattype.cpp=>common/string/strformattype.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/stringalloc.cpp=>common/string/stringalloc.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strprintf.cpp=>common/string/strprintf.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strtonum.cpp=>common/string/strtonum.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/string/memchr.cpp=>common/string/memchr.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/string/stringalloc.cpp=>common/string/stringalloc.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/utf-8.cpp=>common/string/utf-8.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/rand/rand.cpp=>common/rand/rand.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/rand/randadv.cpp=>common/rand/randadv.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/rand/randparkmiller.cpp=>common/rand/randparkmiller.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	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 @@
 		$$(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 $@ $<
- else
 	$(QUIET)$(CP) -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)




--- 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 @@
     ifp->if_drv_flags |= IFF_DRV_OACTIVE;
     while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
     {
+#if __FreeBSD_version >= 1100036
+        if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+#else
         ifp->if_opackets++;
+#endif
         IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
         BPF_MTAP(ifp, m);
         m_freem(m);




--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c.orig	2018-10-15 14:30:58 UTC
+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
@@ -52,6 +52,7 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/ethernet.h>
+#include <net/if_vlan_var.h>
 
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
@@ -73,6 +74,7 @@
 
 #define VBOXNETFLT_OS_SPECFIC 1
 #include "../VBoxNetFltInternal.h"
+#include "freebsd/the-freebsd-kernel.h"
 
 static int vboxnetflt_modevent(struct module *, int, void *);
 static ng_constructor_t    ng_vboxnetflt_constructor;
@@ -370,7 +372,11 @@ static int ng_vboxnetflt_rcvdata(hook_p hook, item_p i
         mtx_lock_spin(&pThis->u.s.inq.ifq_mtx);
         _IF_ENQUEUE(&pThis->u.s.inq, m);
         mtx_unlock_spin(&pThis->u.s.inq.ifq_mtx);
+#if __FreeBSD_version >= 1100100
+        taskqueue_enqueue(taskqueue_fast, &pThis->u.s.tskin);
+#else
         taskqueue_enqueue_fast(taskqueue_fast, &pThis->u.s.tskin);
+#endif
     }
     /*
      * Handle mbufs on the outgoing hook, frames going to the interface
@@ -388,7 +394,11 @@ static int ng_vboxnetflt_rcvdata(hook_p hook, item_p i
         mtx_lock_spin(&pThis->u.s.outq.ifq_mtx);
         _IF_ENQUEUE(&pThis->u.s.outq, m);
         mtx_unlock_spin(&pThis->u.s.outq.ifq_mtx);
+#if __FreeBSD_version >= 1100100
+        taskqueue_enqueue(taskqueue_fast, &pThis->u.s.tskout);
+#else
         taskqueue_enqueue_fast(taskqueue_fast, &pThis->u.s.tskout);
+#endif
     }
     else
     {
@@ -428,6 +438,8 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
     struct ifnet *ifp = pThis->u.s.ifp;
     unsigned int cSegs = 0;
     bool fDropIt = false, fActive;
+    bool is_vl_tagged = false;
+    uint16_t vl_tag;
     PINTNETSG pSG;
 
     VBOXCURVNET_SET(ifp->if_vnet);
@@ -440,6 +452,19 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
         if (m == NULL)
             break;
 
+        /* Prepend a VLAN header for consumption by the virtual switch */
+        if (m->m_flags & M_VLANTAG) {
+            vl_tag = m->m_pkthdr.ether_vtag;
+            is_vl_tagged = true;
+
+            m = ether_vlanencap(m, m->m_pkthdr.ether_vtag);
+            if (m == NULL) {
+                printf("vboxflt: unable to prepend VLAN header\n");
+                break;
+            }
+            m->m_flags &= ~M_VLANTAG;
+        }
+
         for (m0 = m; m0 != NULL; m0 = m0->m_next)
             if (m0->m_len > 0)
                 cSegs++;
@@ -454,6 +479,27 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
         vboxNetFltFreeBSDMBufToSG(pThis, m, pSG, cSegs, 0);
         fDropIt = pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, NULL /* pvIf */, pSG, INTNETTRUNKDIR_WIRE);
         RTMemTmpFree(pSG);
+
+        /* Restore the VLAN flags before re-injecting the packet */
+        if (is_vl_tagged && !fDropIt) {
+            struct ether_vlan_header *vl_hdr;
+
+            /* This shouldn't fail, as the header was just prepended */
+            if (m->m_len < sizeof(*vl_hdr) && (m = m_pullup(m, sizeof(*vl_hdr))) == NULL) {
+                printf("vboxflt: unable to pullup VLAN header\n");
+                m_freem(m);
+                break;
+            }
+
+            /* Copy the MAC dhost/shost over the 802.1q field */
+            vl_hdr = mtod(m, struct ether_vlan_header *);
+            bcopy((char *)vl_hdr, (char *)vl_hdr + ETHER_VLAN_ENCAP_LEN, ETHER_HDR_LEN - ETHER_TYPE_LEN);
+            m_adj(m, ETHER_VLAN_ENCAP_LEN);
+
+            m->m_pkthdr.ether_vtag = vl_tag;
+            m->m_flags |= M_VLANTAG;
+        }
+
         if (fDropIt)
             m_freem(m);
         else
@@ -513,6 +559,7 @@ static void vboxNetFltFreeBSDoutput(void *arg, int pen
  */
 int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();
     NOREF(pvIfData);
 
     void (*input_f)(struct ifnet *, struct mbuf *);
@@ -529,10 +576,16 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
     {
         m = vboxNetFltFreeBSDSGMBufFromSG(pThis, pSG);
         if (m == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return VERR_NO_MEMORY;
+        }
         m = m_pullup(m, ETHER_HDR_LEN);
         if (m == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return VERR_NO_MEMORY;
+        }
 
         m->m_flags |= M_PKTHDR;
         ether_output_frame(ifp, m);
@@ -542,10 +595,16 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
     {
         m = vboxNetFltFreeBSDSGMBufFromSG(pThis, pSG);
         if (m == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return VERR_NO_MEMORY;
+        }
         m = m_pullup(m, ETHER_HDR_LEN);
         if (m == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return VERR_NO_MEMORY;
+        }
         /*
          * Delivering packets to the host will be captured by the
          * input hook. Tag the packet with a mbuf tag so that we
@@ -556,6 +615,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
         if (mtag == NULL)
         {
             m_freem(m);
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return VERR_NO_MEMORY;
         }
 
@@ -566,6 +626,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
         ifp->if_input(ifp, m);
     }
     VBOXCURVNET_RESTORE();
+    IPRT_FREEBSD_RESTORE_EFL_AC();
     return VINF_SUCCESS;
 }
 
@@ -578,6 +639,7 @@ static bool vboxNetFltFreeBsdIsPromiscuous(PVBOXNETFLT
 
 int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();
     char nam[NG_NODESIZ];
     struct ifnet *ifp;
     node_p node;
@@ -586,7 +648,10 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
     NOREF(pvContext);
     ifp = ifunit(pThis->szName);
     if (ifp == NULL)
+    {
+        IPRT_FREEBSD_RESTORE_EFL_AC();
         return VERR_INTNET_FLT_IF_NOT_FOUND;
+    }
 
     /* Create a new netgraph node for this instance */
     if (ng_make_node_common(&ng_vboxnetflt_typestruct, &node) != 0)
@@ -630,12 +695,14 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
         vboxNetFltRelease(pThis, true /*fBusy*/);
     }
     VBOXCURVNET_RESTORE();
+    IPRT_FREEBSD_RESTORE_EFL_AC();
 
     return VINF_SUCCESS;
 }
 
 bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThis)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();
     struct ifnet *ifp, *ifp0;
 
     ifp = ASMAtomicUoReadPtrT(&pThis->u.s.ifp, struct ifnet *);
@@ -652,6 +719,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThi
         pThis->u.s.node = NULL;
     }
     VBOXCURVNET_RESTORE();
+    IPRT_FREEBSD_RESTORE_EFL_AC();
 
     if (ifp0 != NULL)
     {
@@ -664,6 +732,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThi
 
 void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();
 
     taskqueue_drain(taskqueue_fast, &pThis->u.s.tskin);
     taskqueue_drain(taskqueue_fast, &pThis->u.s.tskout);
@@ -676,6 +745,7 @@ void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
         ng_rmnode_self(pThis->u.s.node);
     VBOXCURVNET_RESTORE();
     pThis->u.s.node = NULL;
+    IPRT_FREEBSD_RESTORE_EFL_AC();
 }
 
 int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
@@ -689,6 +759,7 @@ int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
 
 void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();
     struct ifnet *ifp;
     struct ifreq ifreq;
     int error;
@@ -722,7 +793,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_CONNECT,
             sizeof(struct ngm_connect), M_NOWAIT);
         if (msg == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return;
+        }
         con = (struct ngm_connect *)msg->data;
         snprintf(con->path, NG_PATHSIZ, "vboxnetflt_%s:", ifp->if_xname);
         strlcpy(con->ourhook, "lower", NG_HOOKSIZ);
@@ -736,7 +810,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_CONNECT,
             sizeof(struct ngm_connect), M_NOWAIT);
         if (msg == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return;
+        }
         con = (struct ngm_connect *)msg->data;
         snprintf(con->path, NG_PATHSIZ, "vboxnetflt_%s:",
             ifp->if_xname);
@@ -759,7 +836,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_RMHOOK,
             sizeof(struct ngm_rmhook), M_NOWAIT);
         if (msg == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return;
+        }
         rm = (struct ngm_rmhook *)msg->data;
         strlcpy(rm->ourhook, "input", NG_HOOKSIZ);
         NG_SEND_MSG_PATH(error, node, msg, path, 0);
@@ -770,12 +850,16 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_RMHOOK,
             sizeof(struct ngm_rmhook), M_NOWAIT);
         if (msg == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return;
+        }
         rm = (struct ngm_rmhook *)msg->data;
         strlcpy(rm->ourhook, "output", NG_HOOKSIZ);
         NG_SEND_MSG_PATH(error, node, msg, path, 0);
     }
     VBOXCURVNET_RESTORE();
+    IPRT_FREEBSD_RESTORE_EFL_AC();
 }
 
 int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-files_vboxnetflt (-10 lines)
1	--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt.orig 2018-10-15 14:30:58 UTC
2	+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt
3	@@ -61,6 +61,7 @@ VBOX_VBOXNETFLT_SOURCES=" \
4	${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
5	${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
6	${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
7	+ ${PATH_ROOT}/include/iprt/x86.h=>include/iprt/x86.h \
8	${PATH_ROOT}/include/iprt/nocrt/limits.h=>include/iprt/nocrt/limits.h \
9	${PATH_ROOT}/include/VBox/cdefs.h=>include/VBox/cdefs.h \
10	${PATH_ROOT}/include/VBox/err.h=>include/VBox/err.h \




--- 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 @@
  if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_HOST)" == "win"
   include $(PATH_SUB_CURRENT)/win/Makefile.kmk
  endif
+if 0
  if "$(KBUILD_TARGET)" == "freebsd" && "$(KBUILD_HOST)" == "freebsd"
   include $(PATH_SUB_CURRENT)/freebsd/Makefile.kmk
  endif
 endif
+endif
 
 include $(PATH_SUB_CURRENT)/common/Makefile.kmk
 




--- src/VBox/Installer/freebsd/VBox.sh.orig	2016-08-27 05:10:34 UTC
+++ src/VBox/Installer/freebsd/VBox.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# Oracle VM VirtualBox startup script, FreeBSD hosts.
+#
+# Copyright (C) 2006-2012 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+CONFIG="/usr/local/etc/vbox/vbox.cfg"
+
+test -r "${CONFIG}" &&
+    . "${CONFIG}"
+test -z "${INSTALL_DIR}" &&
+    if test -d /usr/local/lib/virtualbox &&
+        test -f /usr/local/lib/virtualbox/VBoxRT.so; then
+        INSTALL_DIR=/usr/local/lib/virtualbox
+    else
+        echo "Could not find VirtualBox installation. Please reinstall."
+        exit 1
+    fi
+
+# workaround for the KDE dialog problem
+KDE_FORK_SLAVES=1; export KDE_FORK_SLAVES
+
+APP=`basename $0`
+case "$APP" in
+    VirtualBox|virtualbox)
+        exec "$INSTALL_DIR/VirtualBox" "$@"
+        ;;
+    VBoxManage|vboxmanage)
+        exec "$INSTALL_DIR/VBoxManage" "$@"
+        ;;
+    VBoxSDL|vboxsdl)
+        exec "$INSTALL_DIR/VBoxSDL" "$@"
+        ;;
+    VBoxVRDP|VBoxHeadless|vboxheadless)
+        exec "$INSTALL_DIR/VBoxHeadless" "$@"
+        ;;
+    VBoxAutostart|vboxautostart)
+        exec "$INSTALL_DIR/VBoxAutostart" "$@"
+        ;;
+    VBoxBalloonCtrl|vboxballoonctrl)
+        exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
+        ;;
+    VBoxBugReport|vboxbugreport)
+        exec "$INSTALL_DIR/VBoxBugReport" "$@"
+        ;;
+    vboxwebsrv)
+        exec "$INSTALL_DIR/vboxwebsrv" "$@"
+        ;;
+    *)
+        echo "Unknown application - $APP"
+        exit 1
+        ;;
+esac
+exit 0

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop (-10 lines)
1	--- src/VBox/Installer/freebsd/virtualbox.desktop.orig 2010-10-07 10:42:04.000000000 +0200
2	+++ src/VBox/Installer/freebsd/virtualbox.desktop 2010-10-07 10:43:20.000000000 +0200
3	@@ -7,7 +7,6 @@
4	Type=Application
5	Exec=VirtualBox
6	TryExec=VirtualBox
7	-DocPath=file://$VBOX_DOC_PATH/UserManual.pdf
8	Icon=VBox
9	Categories=Emulator;System;
10	Comment=Run several virtual systems on a single host computer

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp (-11 lines)
1	--- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2015-04-01 12:15:14.000000000 -0400
2	+++ src/VBox/Main/src-server/VirtualBoxImpl.cpp 2015-04-07 12:25:59.226583000 -0400
3	@@ -2172,7 +2172,7 @@
4	if (aCiphertextSize < 32)
5	return VERR_INVALID_PARAMETER;
6
7	- AssertCompile(sizeof(m->SettingsCipherKey) >= 32);
8	+ // AssertCompile(sizeof(m->SettingsCipherKey) >= 32);
9
10	/* store the first 8 bytes of the cipherkey for verification */
11	for (i = 0, j = 0; i < 8; i++, j++)




--- 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 @@
                         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;
-                        PeriphMatchPattern.pattern.periph_pattern.flags      = PERIPH_MATCH_PATH | PERIPH_MATCH_TARGET |
-                                                                               PERIPH_MATCH_LUN;
+                        PeriphMatchPattern.pattern.periph_pattern.flags      = static_cast<periph_pattern_flags>
+                                                                               (PERIPH_MATCH_PATH | PERIPH_MATCH_TARGET |
+                                                                               PERIPH_MATCH_LUN);
                         PeriphCCB.cdm.num_patterns    = 1;
                         PeriphCCB.cdm.pattern_buf_len = sizeof(struct dev_match_result);
                         PeriphCCB.cdm.patterns        = &PeriphMatchPattern;




--- src/VBox/Main/webservice/Makefile.kmk.orig	2015-10-15 13:59:24 UTC
+++ src/VBox/Main/webservice/Makefile.kmk
@@ -159,7 +159,6 @@ VBOX_PATH_IDL                 := $(abspa
 RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
 
 PATH_TARGET_SOAPDEMOXML       := $(VBOXWEB_OUT_DIR)/demo_soapxml
-PATH_TARGET_SOAPDEMOHEADERS   := $(VBOXWEB_OUT_DIR)/demo_headers
 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) | 
 	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
 	$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
 	$(PATH_TARGET_SOAPDEMOXML)/dummy_file \
-	$(wildcard $(PATH_TARGET_SOAPDEMOHEADERS)/*) \
-	$(PATH_TARGET_SOAPDEMOHEADERS)/dummy_file \
 	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
 	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
 
@@ -695,17 +692,14 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
 # 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 $@
-	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS)
+	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMONSMAPS)
 ifdef VBOX_GSOAP_VERBOSE
 	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml $(PATH_TARGET_SOAPDEMOXML)/
 endif
-	-$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/soapvbox*.h $(PATH_TARGET_SOAPDEMOHEADERS)/
 	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)/
 	$(APPEND) $@ done
 
-$(PATH_TARGET_SOAPDEMONSMAPS) \
-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingProxy.h \
-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingObject.h: $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
+$(PATH_TARGET_SOAPDEMONSMAPS): $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
 
 # soapcpp2 -2: generate SOAP 1.2 calls
 # soapcpp2 -S: server-side code only




--- 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)\"
 
 #
+# Set the defines that utf8-posix.cpp needs. It's used by several targets.
+#
+r3/posix/utf8-posix.cpp_DEFS.freebsd = $(VBOX_ICONV_DEFS)
+
+#
 # Unicode Specification reader used to regenerate unidata-*.cpp.
 #
 uniread_TEMPLATE = VBoxBldProg




Without this patch any waits for periods shorter than a single tick return
immediately leading to a lot of unnecessary spinning. For example, I observe that
my guest's idle loop does a lot of sleeps with periods slightly shorter than 1 ms
(1/hz), e.g. 900us.  All that waiting turns into pure spinning and VirtualBox eats
100% of a core.
The patch improves the situation significantly. Also, it (approximately) follows
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 @@
     uint64_t cTicks = ASMMultU64ByU32DivByU32(uTimeout, hz, UINT32_C(1000000000));
     if (cTicks >= INT_MAX)
         return RTSEMWAIT_FLAGS_INDEFINITE;
+    else if (cTicks == 0 && uTimeout > 0)
+        pWait->iTimeout     = 1;
     else
         pWait->iTimeout     = (int)cTicks;
 #endif

Lines 1-22 Link Here

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




--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig	2019-11-21 16:54:06 UTC
+++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c
@@ -45,6 +45,7 @@
 #include <sys/uio.h>
 #include <sys/bus.h>
 #include <sys/poll.h>
+#include <sys/proc.h>
 #include <sys/selinfo.h>
 #include <sys/queue.h>
 #include <sys/lock.h>
@@ -61,6 +62,7 @@
 #include <VBox/version.h>
 #include <VBox/log.h>
 #include <iprt/assert.h>
+#include <iprt/err.h>
 #include <iprt/initterm.h>
 #include <iprt/process.h>
 #include <iprt/string.h>
@@ -102,8 +104,6 @@ struct VBoxGuestDeviceState
     struct resource   *pIrqRes;
     /** Pointer to the IRQ handler. */
     void              *pfnIrqHandler;
-    /** VMMDev version */
-    uint32_t           u32Version;
 };
 
 
@@ -113,8 +113,7 @@ struct VBoxGuestDeviceState
 /*
  * Character device file handlers.
  */
-static d_fdopen_t vgdrvFreeBSDOpen;
-static d_close_t  vgdrvFreeBSDClose;
+static d_open_t   vgdrvFreeBSDOpen;
 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 +144,7 @@ static struct cdevsw    g_vgdrvFreeBSDChrDevSW =
 {
     .d_version =        D_VERSION,
     .d_flags =          D_TRACKCLOSE | D_NEEDMINOR,
-    .d_fdopen =         vgdrvFreeBSDOpen,
-    .d_close =          vgdrvFreeBSDClose,
+    .d_open =           vgdrvFreeBSDOpen,
     .d_ioctl =          vgdrvFreeBSDIOCtl,
     .d_read =           vgdrvFreeBSDRead,
     .d_write =          vgdrvFreeBSDWrite,
@@ -154,81 +152,28 @@ static struct cdevsw    g_vgdrvFreeBSDChrDevSW =
     .d_name =           "vboxguest"
 };
 
+/** Device structure. */
+static struct cdev         *g_pDev;
+
 /** Device extention & session data association structure. */
 static VBOXGUESTDEVEXT      g_DevExt;
 
-/** List of cloned device. Managed by the kernel. */
-static struct clonedevs    *g_pvgdrvFreeBSDClones;
-/** The dev_clone event handler tag. */
-static eventhandler_tag     g_vgdrvFreeBSDEHTag;
 /** Reference counter */
 static volatile uint32_t    cUsers;
 /** selinfo structure used for polling. */
 static struct selinfo       g_SelInfo;
 
-/**
- * DEVFS event handler.
- */
-static void vgdrvFreeBSDClone(void *pvArg, struct ucred *pCred, char *pszName, int cchName, struct cdev **ppDev)
+static void vgdrvFreeBSDDtr(void *pSession)
 {
-    int iUnit;
-    int rc;
-
-    Log(("vgdrvFreeBSDClone: pszName=%s ppDev=%p\n", pszName, ppDev));
-
-    /*
-     * One device node per user, si_drv1 points to the session.
-     * /dev/vboxguest<N> where N = {0...255}.
-     */
-    if (!ppDev)
-        return;
-    if (strcmp(pszName, "vboxguest") == 0)
-        iUnit =  -1;
-    else if (dev_stdclone(pszName, NULL, "vboxguest", &iUnit) != 1)
-        return;
-    if (iUnit >= 256)
-    {
-        Log(("vgdrvFreeBSDClone: iUnit=%d >= 256 - rejected\n", iUnit));
-        return;
-    }
-
-    Log(("vgdrvFreeBSDClone: pszName=%s iUnit=%d\n", pszName, iUnit));
-
-    rc = clone_create(&g_pvgdrvFreeBSDClones, &g_vgdrvFreeBSDChrDevSW, &iUnit, ppDev, 0);
-    Log(("vgdrvFreeBSDClone: clone_create -> %d; iUnit=%d\n", rc, iUnit));
-    if (rc)
-    {
-        *ppDev = make_dev(&g_vgdrvFreeBSDChrDevSW,
-                          iUnit,
-                          UID_ROOT,
-                          GID_WHEEL,
-                          0664,
-                          "vboxguest%d", iUnit);
-        if (*ppDev)
-        {
-            dev_ref(*ppDev);
-            (*ppDev)->si_flags |= SI_CHEAPCLONE;
-            Log(("vgdrvFreeBSDClone: Created *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n",
-                     *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2));
-            (*ppDev)->si_drv1 = (*ppDev)->si_drv2 = NULL;
-        }
-        else
-            Log(("vgdrvFreeBSDClone: make_dev iUnit=%d failed\n", iUnit));
-    }
-    else
-        Log(("vgdrvFreeBSDClone: Existing *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n",
-             *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2));
+    VGDrvCommonCloseSession(&g_DevExt, pSession);
+    ASMAtomicDecU32(&cUsers);
 }
 
 /**
  * File open handler
  *
  */
-#if __FreeBSD_version >= 700000
-static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOpen, struct thread *pTd, struct file *pFd)
-#else
-static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOpen, struct thread *pTd)
-#endif
+static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOpen, int DevType, struct thread *pTd)
 {
     int                 rc;
     PVBOXGUESTSESSION   pSession;
@@ -240,12 +185,6 @@ static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOp
     LogFlow(("vgdrvFreeBSDOpen:\n"));
 
     /*
-     * Try grab it (we don't grab the giant, remember).
-     */
-    if (!ASMAtomicCmpXchgPtr(&pDev->si_drv1, (void *)0x42, NULL))
-        return EBUSY;
-
-    /*
      * Create a new session.
      */
     fRequestor = VMMDEV_REQUESTOR_USERMODE | VMMDEV_REQUESTOR_TRUST_NOT_GIVEN;
@@ -262,14 +201,13 @@ static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOp
     rc = VGDrvCommonCreateUserSession(&g_DevExt, fRequestor, &pSession);
     if (RT_SUCCESS(rc))
     {
-        if (ASMAtomicCmpXchgPtr(&pDev->si_drv1, pSession, (void *)0x42))
-        {
-            Log(("vgdrvFreeBSDOpen: success - g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, (int)RTProcSelf()));
+        Log(("vgdrvFreeBSDOpen: success - g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, (int)RTProcSelf()));
+        rc = devfs_set_cdevpriv(pSession, vgdrvFreeBSDDtr);
+        if (rc)
+            VGDrvCommonCloseSession(&g_DevExt, pSession);
+        else
             ASMAtomicIncU32(&cUsers);
-            return 0;
-        }
-
-        VGDrvCommonCloseSession(&g_DevExt, pSession);
+        return rc;
     }
 
     LogRel(("vgdrvFreeBSDOpen: failed. rc=%d\n", rc));
@@ -277,33 +215,6 @@ static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOp
 }
 
 /**
- * File close handler
- *
- */
-static int vgdrvFreeBSDClose(struct cdev *pDev, int fFile, int DevType, struct thread *pTd)
-{
-    PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pDev->si_drv1;
-    Log(("vgdrvFreeBSDClose: fFile=%#x pSession=%p\n", fFile, pSession));
-
-    /*
-     * Close the session if it's still hanging on to the device...
-     */
-    if (VALID_PTR(pSession))
-    {
-        VGDrvCommonCloseSession(&g_DevExt, pSession);
-        if (!ASMAtomicCmpXchgPtr(&pDev->si_drv1, NULL, pSession))
-            Log(("vgdrvFreeBSDClose: si_drv1=%p expected %p!\n", pDev->si_drv1, pSession));
-        ASMAtomicDecU32(&cUsers);
-        /* Don't use destroy_dev here because it may sleep resulting in a hanging user process. */
-        destroy_dev_sched(pDev);
-    }
-    else
-        Log(("vgdrvFreeBSDClose: si_drv1=%p!\n", pSession));
-    return 0;
-}
-
-
-/**
  * I/O control request.
  *
  * @returns depends...
@@ -316,8 +227,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.
      */
@@ -512,12 +427,14 @@ int VBOXCALL VBoxGuestIDC(void *pvSession, uintptr_t u
 
 static int vgdrvFreeBSDPoll(struct cdev *pDev, int fEvents, struct thread *td)
 {
-    int fEventsProcessed;
+    PVBOXGUESTSESSION pSession;
+    int fEventsProcessed, rc;
 
     LogFlow(("vgdrvFreeBSDPoll: fEvents=%d\n", fEvents));
 
-    PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pDev->si_drv1;
-    if (RT_UNLIKELY(!VALID_PTR(pSession))) {
+    rc = devfs_get_cdevpriv((void **)&pSession);
+    if (rc)
+    {
         Log(("vgdrvFreeBSDPoll: no state data for %s\n", devtoname(pDev)));
         return (fEvents & (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM));
     }
@@ -558,11 +475,8 @@ static int vgdrvFreeBSDDetach(device_t pDevice)
     /*
      * Reverse what we did in vgdrvFreeBSDAttach.
      */
-    if (g_vgdrvFreeBSDEHTag != NULL)
-        EVENTHANDLER_DEREGISTER(dev_clone, g_vgdrvFreeBSDEHTag);
+    destroy_dev(g_pDev);
 
-    clone_cleanup(&g_pvgdrvFreeBSDClones);
-
     vgdrvFreeBSDRemoveIRQ(pDevice, pState);
 
     if (pState->pVMMDevMemRes)
@@ -727,18 +641,21 @@ static int vgdrvFreeBSDAttach(device_t pDevice)
                     VGDrvCommonProcessOptionsFromHost(&g_DevExt);
 
                     /*
-                     * Configure device cloning.
+                     * Configure device.
                      */
-                    clone_setup(&g_pvgdrvFreeBSDClones);
-                    g_vgdrvFreeBSDEHTag = EVENTHANDLER_REGISTER(dev_clone, vgdrvFreeBSDClone, 0, 1000);
-                    if (g_vgdrvFreeBSDEHTag)
+                    g_pDev = make_dev(&g_vgdrvFreeBSDChrDevSW,
+                                      0,
+                                      UID_ROOT,
+                                      GID_WHEEL,
+                                      0664,
+                                      "vboxguest");
+                    if (g_pDev)
                     {
                         printf(DEVICE_NAME ": loaded successfully\n");
                         return 0;
                     }
 
-                    printf(DEVICE_NAME ": EVENTHANDLER_REGISTER(dev_clone,,,) failed\n");
-                    clone_cleanup(&g_pvgdrvFreeBSDClones);
+                    printf(DEVICE_NAME ": make_dev failed\n");
                     vgdrvFreeBSDRemoveIRQ(pDevice, pState);
                 }
                 else




--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig	2019-11-21 16:54:06 UTC
+++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile
@@ -25,7 +25,7 @@
 #
 KMOD = vboxguest
 
-CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBGL_VBOXGUEST -DVBOX_WITH_HGCM -DVBOX_WITH_64_BITS_GUESTS
+CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_GUEST -DIN_GUEST_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBGL_VBOXGUEST -DVBOX_WITH_HGCM -DVBOX_WITH_64_BITS_GUESTS
 
 .if (${MACHINE_ARCH} == "i386")
  CFLAGS += -DRT_ARCH_X86
@@ -80,6 +80,7 @@ SRCS += \
 	handletable.c \
 	handletablectx.c \
 	once.c \
+	term.c \
 	thread.c
 
 .PATH:	${.CURDIR}/common/string
@@ -147,6 +148,7 @@ SRCS += \
 
 .PATH:	${.CURDIR}/r0drv
 SRCS += \
+	alloc-ef-r0drv.c \
 	alloc-r0drv.c \
 	initterm-r0drv.c \
 	memobj-r0drv.c \




--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig	2019-11-21 16:54:06 UTC
+++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest
@@ -63,6 +63,7 @@ FILES_VBOXGUEST_NOBIN=" \
     ${PATH_ROOT}/include/iprt/time.h=>include/iprt/time.h \
     ${PATH_ROOT}/include/iprt/timer.h=>include/iprt/timer.h \
     ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
+    ${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
     ${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
     ${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
     ${PATH_ROOT}/include/iprt/crc.h=>include/iprt/crc.h \
@@ -111,6 +112,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/term.cpp=>common/misc/term.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 \
@@ -181,6 +183,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-ef-r0drv.cpp=>r0drv/alloc-ef-r0drv.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 \
@@ -207,6 +210,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 \
+    ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/threadctxhooks-r0drv-generic.cpp=>r0drv/generic/threadctxhooks-r0drv-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp=>r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/memobj-r0drv.cpp=>r0drv/memobj-r0drv.c \
     ${PATH_ROOT}/src/VBox/Runtime/VBox/log-vbox.cpp=>VBox/log-vbox.c \




--- src/VBox/Additions/common/VBoxService/Makefile.kmk.orig	2019-11-21 16:54:08 UTC
+++ src/VBox/Additions/common/VBoxService/Makefile.kmk
@@ -172,6 +172,10 @@ VBoxService_LIBS         += \
 	$(VBOX_LIB_IPRT_GUEST_R3) \
 	$(VBOX_LIB_VBGL_R3) \
 	$(VBOX_LIB_IPRT_GUEST_R3)       # (The joy of unix linkers.)
+if1of ($(KBUILD_TARGET), freebsd)
+ VBoxService_LIBS        += \
+	crypt
+endif
 ifdef VBOX_WITH_DBUS
  if1of ($(KBUILD_TARGET), linux solaris) # FreeBSD?
 VBoxService_LIBS         += \




--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig	2019-11-21 16:54:09 UTC
+++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp
@@ -67,8 +67,8 @@
 # include <net/if.h>
 # include <pwd.h> /* getpwuid */
 # include <unistd.h>

 # endif
 # ifdef RT_OS_OS2
 #  include <net/if_dl.h>
@@ -528,7 +528,7 @@ static void vgsvcVMInfoWriteFixedProperties(void)
 }
 
 

 /*
  * Simple wrapper to work around compiler-specific va_list madness.
  */
@@ -555,12 +555,6 @@ static int vgsvcVMInfoWriteUsers(void)
 #ifdef RT_OS_WINDOWS
     rc = VGSvcVMInfoWinWriteUsers(&g_VMInfoPropCache, &pszUserList, &cUsersInList);
 
-#elif defined(RT_OS_FREEBSD)
-    /** @todo FreeBSD: Port logged on user info retrieval.

 #elif defined(RT_OS_HAIKU)
     /** @todo Haiku: Port logged on user info retrieval. */
     rc = VERR_NOT_IMPLEMENTED;
@@ -586,7 +580,7 @@ static int vgsvcVMInfoWriteUsers(void)
     while (   (ut_user = getutxent())
            && RT_SUCCESS(rc))
     {

         VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32)\n", ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid);
 # else
         VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32, session: %RU32)\n",
@@ -621,7 +615,7 @@ static int vgsvcVMInfoWriteUsers(void)
     }
 
 # ifdef VBOX_WITH_DBUS

     DBusError dbErr;
     DBusConnection *pConnection = NULL;
     int rc2 = RTDBusLoadLib();
@@ -830,7 +824,7 @@ static int vgsvcVMInfoWriteUsers(void)
     if (   fHaveLibDbus
         && dbus_error_is_set(&dbErr))
         dbus_error_free(&dbErr);

 # endif /* VBOX_WITH_DBUS */
 
     /** @todo Fedora/others: Handle systemd-loginctl. */
@@ -867,7 +861,7 @@ static int vgsvcVMInfoWriteUsers(void)
     RTMemFree(papszUsers);
 
     endutxent(); /* Close utmpx file. */

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_crOpenGL_stub.h (-11 lines)
1	--- src/VBox/Additions/common/crOpenGL/stub.h.orig 2016-07-18 11:50:44 UTC
2	+++ src/VBox/Additions/common/crOpenGL/stub.h
3	@@ -47,7 +47,7 @@
4	#include <X11/extensions/Xfixes.h>
5	#endif
6
7	-#if defined(WINDOWS) \|\| defined(Linux) \|\| defined(SunOS)
8	+#if defined(WINDOWS) \|\| defined(Linux) \|\| defined(FreeBSD) \|\| defined(SunOS)
9	# define CR_NEWWINTRACK
10	#endif
11

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 2019-11-21 16:54:09 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	@@ -104,7 +104,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	@@ -183,7 +183,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 2019-11-21 16:54:10 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




--- src/VBox/Additions/freebsd/Makefile.kmk.orig	2019-11-21 16:54:10 UTC
+++ src/VBox/Additions/freebsd/Makefile.kmk
@@ -23,8 +23,9 @@ $(error "The FreeBSD guest additions installer can onl
 endif

 
 #
 # Globals
@@ -66,11 +67,13 @@ VBOX_FBSD_ADD_STRIP_BIN = \
 	vboxvideo_drv_14.so \
 	vboxvideo_drv_15.so \
 	vboxvideo_drv_16.so \
-	vboxvideo_drv_17.so
+	vboxvideo_drv_17.so \
+	$(if $(VBOX_WITH_PAM),pam_vbox.so,) \
+	VBoxOGL.so \
+	mount_vboxvfs
 
 VBOX_FBSD_ADD_MODULES = \

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_mount__vboxvfs_Makefile.kmk (-1 / +1 lines)
1	--- src/VBox/Additions/freebsd/mount_vboxvfs/Makefile.kmk.orig 2018-11-29 19:03:21 UTC	1	--- src/VBox/Additions/freebsd/mount_vboxvfs/Makefile.kmk.orig 2019-12-04 01:14:22 UTC
2	+++ src/VBox/Additions/freebsd/mount_vboxvfs/Makefile.kmk	2	+++ src/VBox/Additions/freebsd/mount_vboxvfs/Makefile.kmk
3	@@ -0,0 +1,23 @@	3	@@ -0,0 +1,23 @@
4	+# $Id: Makefile.kmk $	4	+# $Id: Makefile.kmk $

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_mount__vboxvfs_mount__vboxvfs.8 (-2 / +2 lines)
1	--- src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.8.orig 1970-01-01 01:00:00.000000000 +0100	1	--- src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.8.orig 2019-12-03 22:06:34 UTC
2	+++ src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.8 2017-07-12 19:24:26.106029000 +0200	2	+++ src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.8
3	@@ -0,0 +1,53 @@	3	@@ -0,0 +1,53 @@
4	+.\"	4	+.\"
5	+.\" Copyright (c) 1992, 1993, 1994	5	+.\" Copyright (c) 1992, 1993, 1994

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_mount__vboxvfs_mount__vboxvfs.c (-2 / +2 lines)
1	--- src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.c.orig 1970-01-01 01:00:00.000000000 +0100	1	--- src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.c.orig 2019-12-03 22:06:50 UTC
2	+++ src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.c 2017-07-12 19:24:26.106029000 +0200	2	+++ src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.c
3	@@ -0,0 +1,168 @@	3	@@ -0,0 +1,168 @@
4	+/*	4	+/*
5	+* Copyright (c) 1992, 1993, 1994	5	+* Copyright (c) 1992, 1993, 1994

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 2019-11-21 16:54:10 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 \




--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h.orig	2019-11-21 16:54:10 UTC
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h
@@ -1,8 +1,3 @@
-/* $Id: vboxvfs.h $ */

- */
-
 /*
  * Copyright (C) 2010-2019 Oracle Corporation
  *
@@ -24,72 +19,371 @@
 #define VBOXVFS_VFSNAME "vboxvfs"
 #define VBOXVFS_VERSION 1
 

+#include "../../../../../include/iprt/err.h"
+#include "../../../../../include/iprt/fs.h"
+#include "../../../../../include/iprt/log.h"
+#include "../../../../../include/iprt/mangling.h"
+#include "../../../../../include/iprt/mem.h"
+#include "../../../../../include/iprt/param.h"
+#include "../../../../../include/iprt/path.h"

+#include "../../../../../include/iprt/time.h"
+#include "../../../../../include/iprt/types.h"
+#include "../../../../../include/iprt/uni.h"
+#include "../../../../../include/iprt/nocrt/limits.h"
+#include "../../../../../include/iprt/alloc.h"
+#include "../../../../../include/iprt/asm.h"
+#include "../../../../../include/iprt/asm-amd64-x86.h"
+#include "../../../../../include/iprt/asm-math.h"
+#include "../../../../../include/iprt/assert.h"
+#include "../../../../../include/iprt/cdefs.h"
+#include "../../../../../include/iprt/err.h"
+#include "../../../../../include/iprt/fs.h"
+#include "../../../../../include/iprt/log.h"
+#include "../../../../../include/iprt/mangling.h"
+#include "../../../../../include/iprt/mem.h"
+#include "../../../../../include/iprt/param.h"
+#include "../../../../../include/iprt/path.h"
+#include "../../../../../include/iprt/semaphore.h"
+#include "../../../../../include/iprt/stdarg.h"
+#include "../../../../../include/iprt/stdint.h"
+#include "../../../../../include/iprt/string.h"
+#include "../../../../../include/iprt/time.h"
+#include "../../../../../include/iprt/types.h"
+#include "../../../../../include/iprt/uni.h"
 
-#include <VBox/VBoxGuestLibSharedFolders.h>
+#else

+#include "iprt/time.h"
+#include "iprt/types.h"
+#include "iprt/uni.h"
+#include "iprt/nocrt/limits.h"
+#include "iprt/alloc.h"
+#include "iprt/asm.h"
+#include "iprt/asm-amd64-x86.h"
+#include "iprt/asm-math.h"
+#include "iprt/assert.h"
+#include "iprt/cdefs.h"
+#include "iprt/err.h"
+#include "iprt/fs.h"
+#include "iprt/log.h"
+#include "iprt/mem.h"
+#include "iprt/param.h"
+#include "iprt/path.h"
+#include "iprt/semaphore.h"
+#include "iprt/stdarg.h"
+#include "iprt/stdint.h"
+#include "iprt/string.h"
+#include "iprt/time.h"
+#include "iprt/types.h"
+#include "iprt/uni.h"
+
+#include "common/VBoxGuestLib/SysHlp.h"
+

+
 #endif  /* KERNEL */
 
 #endif /* !GA_INCLUDED_SRC_freebsd_vboxvfs_vboxvfs_h */
-

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 2019-12-03 22:07:39 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	2019-11-21 16:54:10 UTC
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c
@@ -1,8 +1,3 @@
-/* $Id: vboxvfs_vfsops.c $ */
-/** @file
- * Description.

- */
-
 /*
  * Copyright (C) 2008-2019 Oracle Corporation
  *
@@ -14,245 +9,478 @@
  * 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)

+
+	MNT_ILOCK(mp);
+	mp->mnt_data = vboxfsmp;
+	bzero(&mp->mnt_stat.f_fsid, sizeof(&mp->mnt_stat.f_fsid));
+	/* f_fsid is int32_t but serial is uint32_t, convert */
+	memcpy(&mp->mnt_stat.f_fsid, &fsinfo.serial, sizeof(mp->mnt_stat.f_fsid));
+	mp->mnt_flag |= MNT_LOCAL;

+#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-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c (-2 / +2 lines)
1	--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig 2019-10-10 18:06:51 UTC	1	--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig 2019-12-10 17:45:29 UTC
2	+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c	2	+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c
3	@@ -1,10 +1,6 @@	3	@@ -1,10 +1,6 @@
4	-/* $Id: vboxvfs_vnops.c $ */	4	-/* $Id: vboxvfs_vnops.c $ */
Lines 7-13 Link Here
7	- */	7	- */
8	-	8	-
9	/*	9	/*
10	* Copyright (C) 2008-2017 Oracle Corporation	10	* Copyright (C) 2008-2019 Oracle Corporation
11	+ * Copyright (C) 2017 Mahdi Mokhtari	11	+ * Copyright (C) 2017 Mahdi Mokhtari
12	*	12	*
13	* This file is part of VirtualBox Open Source Edition (OSE), as	13	* This file is part of VirtualBox Open Source Edition (OSE), as




--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig	2019-11-21 16:54:14 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.
-  /usr/bin/VBoxClient --clipboard
-  /usr/bin/VBoxClient --checkhostversion
-  /usr/bin/VBoxClient --display
-  /usr/bin/VBoxClient --seamless
-  /usr/bin/VBoxClient --draganddrop
-  /usr/bin/VBoxClient --vmsvga-x11  # In case VMSVGA emulation is enabled
+  /usr/local/bin/VBoxClient --clipboard
+  /usr/local/bin/VBoxClient --checkhostversion
+  /usr/local/bin/VBoxClient --display
+  /usr/local/bin/VBoxClient --seamless
+  /usr/local/bin/VBoxClient --draganddrop
+  /usr/local/bin/VBoxClient --vmsvga-x11  # In case VMSVGA emulation is enabled
 fi

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_Installer_vboxclient.desktop (+10 lines)
	1	--- src/VBox/Additions/x11/Installer/vboxclient.desktop.orig 2019-11-21 16:54:14 UTC
	2	+++ src/VBox/Additions/x11/Installer/vboxclient.desktop
	3	@@ -8,6 +8,6 @@ Comment[C]=VirtualBox User Session Services
	4	Comment=VirtualBox User Session Services
	5	Comment[it]=Servizi di sessione utente di VirtualBox
	6	Comment[pl]=Usługi sesji użytkownika VirtualBox
	7	-Exec=/usr/bin/VBoxClient-all
	8	+Exec=/usr/local/bin/VBoxClient-all
	9	X-GNOME-Autostart-enabled=true
	10	X-KDE-autostart-after=panel

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxmouse_Makefile.kmk (-1 / +1 lines)
1	--- src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig 2019-01-25 18:24:30 UTC	1	--- src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig 2019-11-21 16:54:15 UTC
2	+++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2	+++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk
3	@@ -227,10 +227,22 @@ endif # neq ($(KBUILD_TARGET),linux)	3	@@ -227,10 +227,22 @@ endif # neq ($(KBUILD_TARGET),linux)
4		4

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk (-1 / +1 lines)
1	--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2019-01-25 18:24:30 UTC	1	--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2019-11-21 16:54:15 UTC
2	+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2	+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk
3	@@ -406,9 +406,10 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS	3	@@ -406,9 +406,10 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
4	vboxvideo_drv_system_INCS += \	4	vboxvideo_drv_system_INCS += \

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 2019-11-21 16:57:02 UTC
2	+++ src/VBox/Debugger/Makefile.kmk	2	+++ src/VBox/Debugger/Makefile.kmk
3	@@ -109,6 +109,7 @@ VBoxDbg_SOURCES = \	3	@@ -110,6 +110,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 2019-11-21 16:57:02 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/Graphics/DevVGA-SVGA3d-glLdr.cpp.orig	2019-11-21 16:59:41 UTC
+++ src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.cpp
@@ -186,7 +186,7 @@ int glLdrInit(PPDMDEVINS pDevIns)
     pfn_wglDeleteContext = 0;
     pfn_wglMakeCurrent = 0;
     pfn_wglShareLists = 0;
-#elif defined(RT_OS_LINUX)
+#elif defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
     pfn_XConfigureWindow = 0;
     pfn_XCloseDisplay = 0;
     pfn_XCreateColormap = 0;
@@ -276,7 +276,7 @@ int glLdrInit(PPDMDEVINS pDevIns)
     GLGETPROC_(wglDeleteContext, "");
     GLGETPROC_(wglMakeCurrent, "");
     GLGETPROC_(wglShareLists, "");
-#elif defined(RT_OS_LINUX)
+#elif defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
     X11GETPROC_(XConfigureWindow);
     X11GETPROC_(XCloseDisplay);
     X11GETPROC_(XCreateColormap);
@@ -357,7 +357,7 @@ int glLdrInit(PPDMDEVINS pDevIns)
     GLGETPROC_(glVertexPointer, "");
     GLGETPROC_(glViewport, "");
 
-#ifdef RT_OS_LINUX
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
     XInitThreads();
 #endif
     return VINF_SUCCESS;

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-glLdr.h (+11 lines)
	1	--- src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.h.orig 2019-11-21 16:59:41 UTC
	2	+++ src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.h
	3	@@ -317,7 +317,7 @@ GLPFN BOOL (WINAPI *pfn_wglMakeCurrent)(HDC, HGLRC);
	4	GLPFN BOOL (WINAPI *pfn_wglShareLists)(HGLRC, HGLRC);
	5	#define wglShareLists pfn_wglShareLists
	6
	7	-#elif defined(RT_OS_LINUX)
	8	+#elif defined(RT_OS_FREEBSD) \|\| defined(RT_OS_LINUX)
	9	/*
	10	* GLX
	11	*/




--- src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp.orig	2019-11-21 16:59:41 UTC
+++ src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
@@ -1175,7 +1175,7 @@ int vmsvga3dTerminate(PVGASTATE pThis)
     RTSemEventDestroy(pState->WndRequestSem);
 #elif defined(RT_OS_DARWIN)
 
-#elif defined(RT_OS_LINUX)
+#elif defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
     /* signal to the thread that it is supposed to exit */
     pState->bTerminate = true;
     /* wait for it to terminate */
@@ -3004,7 +3004,7 @@ int vmsvga3dGenerateMipmaps(PVGASTATE pThis, uint32_t 
 }
 
 
-#ifdef RT_OS_LINUX
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
 /**
  * X11 event handling thread.
  *
@@ -3034,7 +3034,7 @@ DECLCALLBACK(int) vmsvga3dXEventThread(RTTHREAD hThrea
     }
     return VINF_SUCCESS;
 }
-#endif // RT_OS_LINUX
+#endif // RT_OS_FREEBSD || RT_OS_LINUX
 
 
 /**
@@ -3369,7 +3369,7 @@ static int vmsvga3dContextDestroyOgl(PVGASTATE pThis, 
     AssertRC(rc);
 #elif defined(RT_OS_DARWIN)
     vmsvga3dCocoaDestroyViewAndContext(pContext->cocoaView, pContext->cocoaContext);
-#elif defined(RT_OS_LINUX)
+#elif defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
     glXMakeCurrent(pState->display, None, NULL);
     glXDestroyContext(pState->display, pContext->glxContext);
     XDestroyWindow(pState->display, pContext->window);




--- src/VBox/Devices/Makefile.kmk.orig	2019-11-21 17:00:01 UTC
+++ src/VBox/Devices/Makefile.kmk
@@ -112,6 +112,7 @@ if !defined(VBOX_ONLY_EXTPACKS)
   VBoxDDU_LDFLAGS.darwin += -framework IOKit
  endif
 
+ VBoxDDU_LDFLAGS.freebsd  = $(VBOX_GCC_NO_UNDEFINED)
  VBoxDDU_LDFLAGS.linux    = $(VBOX_GCC_NO_UNDEFINED)
  $(call VBOX_SET_VER_INFO_DLL,VBoxDDU,VirtualBox VMM Devices and Drivers Utilities)
 
@@ -241,6 +242,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBU
  	-framework Carbon \
  	-framework DiskArbitration \
  	-framework SystemConfiguration
+ VBoxDD_LDFLAGS.freebsd  = $(VBOX_GCC_NO_UNDEFINED)
  VBoxDD_LDFLAGS.linux    = $(VBOX_GCC_NO_UNDEFINED)
 
  # --- Tracing bits. ---
@@ -283,7 +285,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBU
   VBoxDD_SOURCES        += Graphics/DevVGA-SVGA.cpp
  endif
  ifdef VBOX_WITH_VMSVGA3D
-  if1of ($(KBUILD_TARGET), linux win)
+  if1of ($(KBUILD_TARGET), freebsd linux win)
 # Dynamically load 3D library (opengl32, libGL).
 # This is a temporary solution. In future the 3D backend will be in a separate library.
 VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
@@ -324,6 +326,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
    VBoxDD_SOURCES       += \
    	Graphics/DevVGA-SVGA3d-glLdr.cpp
    else
+   VBoxDD_LIBS.freebsd  += X11 GL
    VBoxDD_LIBS.linux    += X11 GL
    VBoxDD_LIBS.win      += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
    endif
@@ -1516,6 +1519,8 @@ if defined(VBOX_WITH_VMSVGA3D) && !defined(VBOX_ONLY_E
  VBoxSVGA3D_INCS = $(VBOX_GRAPHICS_INCS)
  VBoxSVGA3D_INCS.win    := \
  	Graphics/shaderlib/libWineStub/include
+ VBoxSVGA3D_INCS.freebsd := \
+ 	Graphics/shaderlib/wine/include
  VBoxSVGA3D_INCS.linux  := \
  	Graphics/shaderlib/wine/include
  VBoxSVGA3D_INCS.darwin := \




--- src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h.orig	2019-11-21 17:00:06 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 */
+#ifdef M_SKIP_FIREWALL
+#undef M_SKIP_FIREWALL
+#endif
 #define	M_SKIP_FIREWALL	0x00004000 /* skip firewall processing */
 #define	M_FREELIST	0x00008000 /* mbuf is on the free list */
 #define	M_VLANTAG	0x00010000 /* ether_vtag is valid */




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

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Devices_Storage_DrvHostBase-freebsd.cpp (-10 lines)
1	--- src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp.orig 2017-10-18 07:11:48 UTC
2	+++ src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp
3	@@ -24,6 +24,7 @@
4	#include <cam/scsi/scsi_message.h>
5	#include <cam/scsi/scsi_pass.h>
6	#include <VBox/scsi.h>
7	+#include <iprt/file.h>
8	#include <iprt/log.h>
9
10	/** Maximum buffer size supported by the CAM subsystem. */




--- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig	2019-11-21 17:01:16 UTC
+++ src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
@@ -641,7 +641,7 @@ void printUsage(USAGECATEGORY enmCommand, uint64_t fSu
                      "                                             file <file>|\n"
                      "                                             <devicename>]\n"
                      "                            [--uarttype<1-N> 16450|16550A|16750]\n"
-#if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
                      "                            [--lpt<1-N> off|<I/O base> <IRQ>]\n"
                      "                            [--lptmode<1-N> <devicename>]\n"
 #endif
@@ -656,7 +656,7 @@ void printUsage(USAGECATEGORY enmCommand, uint64_t fSu
             RTStrmPrintf(pStrm, "|dsound");
 #endif
         }

         {
             RTStrmPrintf(pStrm, ""
 #ifdef VBOX_WITH_AUDIO_OSS
@@ -669,22 +669,6 @@ void printUsage(USAGECATEGORY enmCommand, uint64_t fSu
                                 "|pulse"
 #endif
                         );
-        }
-        if (fFreeBSD)
-        {
-#ifdef VBOX_WITH_AUDIO_OSS

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




--- src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp.orig	2019-11-21 17:01:17 UTC
+++ src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
@@ -153,7 +153,7 @@ enum
     MODIFYVM_UARTMODE,
     MODIFYVM_UARTTYPE,
     MODIFYVM_UART,
-#if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
     MODIFYVM_LPTMODE,
     MODIFYVM_LPT,
 #endif
@@ -348,7 +348,7 @@ static const RTGETOPTDEF g_aModifyVMOptions[] =
     { "--uartmode",                 MODIFYVM_UARTMODE,                  RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--uarttype",                 MODIFYVM_UARTTYPE,                  RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--uart",                     MODIFYVM_UART,                      RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
-#if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
     { "--lptmode",                  MODIFYVM_LPTMODE,                   RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--lpt",                      MODIFYVM_LPT,                       RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
 #endif
@@ -2269,7 +2269,7 @@ RTEXITCODE handleModifyVM(HandlerArg *a)
                 break;
             }
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
             case MODIFYVM_LPTMODE:
             {
                 ComPtr<IParallelPort> lpt;




--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig	2019-11-21 17:01:17 UTC
+++ src/VBox/Frontends/VirtualBox/Makefile.kmk
@@ -1154,6 +1154,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI
 	src/VBox2DHelpers.cpp \
 	src/VBoxFBOverlay.cpp \
 	src/VBoxGLSupportInfo.cpp
+ VirtualBox_CXXFLAGS.freebsd += -std=c++11
 endif
 
 
@@ -1824,6 +1825,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL)
   VBoxOGL2D_SOURCES = \
 	src/VBoxGLSupportInfo.cpp
   VBoxOGL2D_INCS = include

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_GuestHost_OpenGL_include_chromium.h (-11 lines)
1	--- src/VBox/GuestHost/OpenGL/include/chromium.h.orig 2018-05-09 16:38:12 UTC
2	+++ src/VBox/GuestHost/OpenGL/include/chromium.h
3	@@ -63,7 +63,7 @@
4	#include <GL/gl.h>
5	/* Quick fix so as not to update the version of glext.h we provide. */
6	#ifdef GL_GLEXT_PROTOTYPES
7	-# if defined(RT_OS_LINUX) \|\| defined(RT_OS_SOLARIS)
8	+# if defined(RT_OS_FREEBSD) \|\| defined(RT_OS_LINUX) \|\| defined(RT_OS_SOLARIS)
9	GLAPI void APIENTRY glBindFramebuffer (GLenum, GLuint);
10	GLAPI void APIENTRY glBlitFramebuffer (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
11	GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum);

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_SUPDrv.cpp (-1 / +1 lines)
1	--- src/VBox/HostDrivers/Support/SUPDrv.cpp.orig 2018-10-15 14:30:56 UTC	1	--- src/VBox/HostDrivers/Support/SUPDrv.cpp.orig 2019-11-21 17:01:59 UTC
2	+++ src/VBox/HostDrivers/Support/SUPDrv.cpp	2	+++ src/VBox/HostDrivers/Support/SUPDrv.cpp
3	@@ -104,7 +104,7 @@	3	@@ -104,7 +104,7 @@
4	/** @def SUPDRV_CHECK_SMAP_CHECK	4	/** @def SUPDRV_CHECK_SMAP_CHECK

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 2019-11-21 17:01:59 UTC
2	+++ src/VBox/HostDrivers/Support/SUPDrvInternal.h	2	+++ src/VBox/HostDrivers/Support/SUPDrvInternal.h
3	@@ -235,7 +235,7 @@	3	@@ -211,7 +211,7 @@
4	# define SUPDRV_WITHOUT_MSR_PROBER	4	# define SUPDRV_WITHOUT_MSR_PROBER
5	#endif	5	#endif
6		6




--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig	2019-11-21 17:02:00 UTC
+++ src/VBox/HostDrivers/Support/freebsd/Makefile
@@ -82,6 +82,7 @@ SRCS += \
 	assert.c \
 	handletable.c \
 	handletablectx.c \
+	handletablesimple.c \
 	once.c \
 	term.c \
 	thread.c
@@ -94,14 +95,15 @@ SRCS += \
 	RTStrCopy.c \
 	RTStrCopyEx.c \
 	RTStrCopyP.c \
+	memchr.c \
 	strformat.c \
 	strformatnum.c \
 	strformatrt.c \
 	strformattype.c \
+	stringalloc.c \
 	strprintf.c \
 	strtonum.c \
-	memchr.c \
-	stringalloc.c
+	utf-8.c
 
 .PATH:	${.CURDIR}/common/rand
 SRCS += \




--- src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c.orig	2019-11-21 17:02:00 UTC
+++ src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c
@@ -46,6 +46,7 @@
 #include <sys/uio.h>

             /*
              * Configure character devices. Add symbolic links for compatibility.
              */
@@ -324,6 +341,45 @@ static int VBoxDrvFreeBSDIOCtl(struct cdev *pDev, u_lo
     PSUPDRVSESSION pSession;
     devfs_get_cdevpriv((void **)&pSession);
 
+#ifdef VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV
     /*
+     * Refuse all I/O control calls if we've ever detected EFLAGS.AC being cleared.
+     *
+     * This isn't a problem, as there is absolutely nothing in the kernel context that
+     * depend on user context triggering cleanups.  That would be pretty wild, right?
+     */
+    if (RT_UNLIKELY(g_VBoxDrvFreeBSDDevExt.cBadContextCalls > 0))
+    {
+        SUPR0Printf("VBoxDrvFreBSDIOCtl: EFLAGS.AC=0 detected %u times, refusing all I/O controls!\n", g_VBoxDrvFreeBSDDevExt.cBadContextCalls);
+        return ESPIPE;
+    }
+#endif
+
+    /*
      * Deal with the fast ioctl path first.
      */
     if (   (   ulCmd == SUP_IOCTL_FAST_DO_RAW_RUN
@@ -325,6 +356,45 @@ static int VBoxDrvFreeBSDIOCtl(struct cdev *pDev, u_lo
 
 
 /**
+ * Alternative Device I/O Control entry point on hosts with SMAP support.
+ *

  * Deal with the 'slow' I/O control requests.
  *
  * @returns 0 on success, appropriate errno on failure.
@@ -372,11 +428,10 @@ static int VBoxDrvFreeBSDIOCtlSlow(PSUPDRVSESSION pSes
          */
         SUPREQHDR Hdr;
         pvUser = *(void **)pvData;

         }
         if (RT_UNLIKELY((Hdr.fFlags & SUPREQHDR_FLAGS_MAGIC_MASK) != SUPREQHDR_FLAGS_MAGIC))
         {
@@ -401,13 +456,12 @@ static int VBoxDrvFreeBSDIOCtlSlow(PSUPDRVSESSION pSes
             OSDBGPRINT(("VBoxDrvFreeBSDIOCtlSlow: failed to allocate buffer of %d bytes; ulCmd=%#lx\n", cbReq, ulCmd));
             return ENOMEM;
         }

         }
         if (Hdr.cbIn < cbReq)
             RT_BZERO((uint8_t *)pHdr + Hdr.cbIn, cbReq - Hdr.cbIn);
@@ -435,9 +489,8 @@ static int VBoxDrvFreeBSDIOCtlSlow(PSUPDRVSESSION pSes
                 OSDBGPRINT(("VBoxDrvFreeBSDIOCtlSlow: too much output! %#x > %#x; uCmd=%#lx!\n", cbOut, cbReq, ulCmd));
                 cbOut = cbReq;
             }

 
             Log(("VBoxDrvFreeBSDIOCtlSlow: returns %d / %d ulCmd=%lx\n", 0, pHdr->rc, ulCmd));
 
@@ -540,8 +593,7 @@ bool VBOXCALL  supdrvOSGetForcedAsyncTscMode(PSUPDRVDE
 
 bool VBOXCALL  supdrvOSAreCpusOfflinedOnSuspend(void)
 {

 }
 
 
@@ -624,11 +676,25 @@ int VBOXCALL    supdrvOSMsrProberModify(RTCPUID idCpu,
 #endif /* SUPDRV_WITH_MSR_PROBER */
 
 

 
     va_start(va, pszFormat);
     cch = RTStrPrintfV(szMsg, sizeof(szMsg), pszFormat, va);
@@ -636,12 +702,19 @@ SUPR0DECL(int) SUPR0Printf(const char *pszFormat, ...)
 
     printf("%s", szMsg);
 




--- src/VBox/HostDrivers/Support/freebsd/files_vboxdrv.orig	2019-11-21 17:02:00 UTC
+++ src/VBox/HostDrivers/Support/freebsd/files_vboxdrv
@@ -119,6 +119,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 \
+    ${PATH_ROOT}/src/VBox/Runtime/common/misc/handletablesimple.cpp=>common/misc/handletablesimple.c \
     ${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 \
@@ -128,14 +129,15 @@ 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 \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/memchr.cpp=>common/string/memchr.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformat.cpp=>common/string/strformat.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformatnum.cpp=>common/string/strformatnum.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformatrt.cpp=>common/string/strformatrt.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformattype.cpp=>common/string/strformattype.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/stringalloc.cpp=>common/string/stringalloc.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strprintf.cpp=>common/string/strprintf.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strtonum.cpp=>common/string/strtonum.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/string/memchr.cpp=>common/string/memchr.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/string/stringalloc.cpp=>common/string/stringalloc.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/utf-8.cpp=>common/string/utf-8.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/rand/rand.cpp=>common/rand/rand.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/rand/randadv.cpp=>common/rand/randadv.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/rand/randparkmiller.cpp=>common/rand/randparkmiller.c \




--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig	2019-11-21 17:02:02 UTC
+++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
@@ -206,10 +206,14 @@ $$(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;VBOX_WITH_HARDENING;;g" --output $@ $<
- else
 	$(QUIET)$(CP) -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

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_VBoxNetAdp_freebsd_Makefile (+11 lines)
	1	--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile.orig 2019-11-21 17:02:02 UTC
	2	+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile
	3	@@ -26,7 +26,7 @@
	4
	5	KMOD = vboxnetadp
	6
	7	-CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVIMAGE
	8	+CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DVIMAGE -Iinclude -I. -Ir0drv -w
	9
	10	.if (${MACHINE_ARCH} == "i386")
	11	CFLAGS += -DRT_ARCH_X86

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_VBoxNetFlt_Makefile.kmk (+11 lines)
	1	--- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.orig 2019-11-21 17:02:02 UTC
	2	+++ src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
	3	@@ -565,7 +565,7 @@ $(PATH_OUT)/opt_netgraph.h:
	4	$(QUIET)$(RM) -f -- $@
	5	$(QUIET)$(CP) -f $< $@
	6	ifndef VBOX_WITH_HARDENING
	7	- $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@.tmp $@
	8	+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@
	9	${QUIET}$(MV) -f $@.tmp $@
	10	endif
	11	ifndef VBOX_WITH_NETFLT_VIMAGE

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_VBoxNetFlt_freebsd_Makefile (+11 lines)
	1	--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile.orig 2019-11-21 17:02:02 UTC
	2	+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile
	3	@@ -26,7 +26,7 @@
	4
	5	KMOD = vboxnetflt
	6
	7	-CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVIMAGE
	8	+CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DVIMAGE -Iinclude -I. -Ir0drv -w
	9
	10	.if (${MACHINE_ARCH} == "i386")
	11	CFLAGS += -DRT_ARCH_X86




--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c.orig	2019-11-21 17:02:02 UTC
+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
@@ -52,6 +52,7 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/ethernet.h>
+#include <net/if_vlan_var.h>
 
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
@@ -73,6 +74,7 @@
 
 #define VBOXNETFLT_OS_SPECFIC 1
 #include "../VBoxNetFltInternal.h"
+#include "freebsd/the-freebsd-kernel.h"
 
 static int vboxnetflt_modevent(struct module *, int, void *);
 static ng_constructor_t    ng_vboxnetflt_constructor;
@@ -436,6 +438,8 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
     struct ifnet *ifp = pThis->u.s.ifp;
     unsigned int cSegs = 0;
     bool fDropIt = false, fActive;
+    bool is_vl_tagged = false;
+    uint16_t vl_tag;
     PINTNETSG pSG;
 
     VBOXCURVNET_SET(ifp->if_vnet);
@@ -448,6 +452,19 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
         if (m == NULL)
             break;
 
+        /* Prepend a VLAN header for consumption by the virtual switch */
+        if (m->m_flags & M_VLANTAG) {
+            vl_tag = m->m_pkthdr.ether_vtag;
+            is_vl_tagged = true;
+
+            m = ether_vlanencap(m, m->m_pkthdr.ether_vtag);
+            if (m == NULL) {
+                printf("vboxflt: unable to prepend VLAN header\n");
+                break;
+            }
+            m->m_flags &= ~M_VLANTAG;
+        }
+
         for (m0 = m; m0 != NULL; m0 = m0->m_next)
             if (m0->m_len > 0)
                 cSegs++;
@@ -462,6 +479,27 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
         vboxNetFltFreeBSDMBufToSG(pThis, m, pSG, cSegs, 0);
         fDropIt = pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, NULL /* pvIf */, pSG, INTNETTRUNKDIR_WIRE);
         RTMemTmpFree(pSG);
+
+        /* Restore the VLAN flags before re-injecting the packet */
+        if (is_vl_tagged && !fDropIt) {
+            struct ether_vlan_header *vl_hdr;
+
+            /* This shouldn't fail, as the header was just prepended */
+            if (m->m_len < sizeof(*vl_hdr) && (m = m_pullup(m, sizeof(*vl_hdr))) == NULL) {
+                printf("vboxflt: unable to pullup VLAN header\n");
+                m_freem(m);
+                break;
+            }
+
+            /* Copy the MAC dhost/shost over the 802.1q field */
+            vl_hdr = mtod(m, struct ether_vlan_header *);
+            bcopy((char *)vl_hdr, (char *)vl_hdr + ETHER_VLAN_ENCAP_LEN, ETHER_HDR_LEN - ETHER_TYPE_LEN);
+            m_adj(m, ETHER_VLAN_ENCAP_LEN);
+
+            m->m_pkthdr.ether_vtag = vl_tag;
+            m->m_flags |= M_VLANTAG;
+        }
+
         if (fDropIt)
             m_freem(m);
         else
@@ -521,6 +559,7 @@ static void vboxNetFltFreeBSDoutput(void *arg, int pen
  */
 int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();
     NOREF(pvIfData);
 
     void (*input_f)(struct ifnet *, struct mbuf *);
@@ -537,10 +576,16 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
     {
         m = vboxNetFltFreeBSDSGMBufFromSG(pThis, pSG);
         if (m == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return VERR_NO_MEMORY;
+        }
         m = m_pullup(m, ETHER_HDR_LEN);
         if (m == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return VERR_NO_MEMORY;
+        }
 
         m->m_flags |= M_PKTHDR;
         ether_output_frame(ifp, m);
@@ -550,10 +595,16 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
     {
         m = vboxNetFltFreeBSDSGMBufFromSG(pThis, pSG);
         if (m == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return VERR_NO_MEMORY;
+        }
         m = m_pullup(m, ETHER_HDR_LEN);
         if (m == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return VERR_NO_MEMORY;
+        }
         /*
          * Delivering packets to the host will be captured by the
          * input hook. Tag the packet with a mbuf tag so that we
@@ -564,6 +615,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
         if (mtag == NULL)
         {
             m_freem(m);
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return VERR_NO_MEMORY;
         }
 
@@ -574,6 +626,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
         ifp->if_input(ifp, m);
     }
     VBOXCURVNET_RESTORE();
+    IPRT_FREEBSD_RESTORE_EFL_AC();
     return VINF_SUCCESS;
 }
 
@@ -586,6 +639,7 @@ static bool vboxNetFltFreeBsdIsPromiscuous(PVBOXNETFLT
 
 int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();
     char nam[NG_NODESIZ];
     struct ifnet *ifp;
     node_p node;
@@ -594,7 +648,10 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
     NOREF(pvContext);
     ifp = ifunit(pThis->szName);
     if (ifp == NULL)
+    {
+        IPRT_FREEBSD_RESTORE_EFL_AC();
         return VERR_INTNET_FLT_IF_NOT_FOUND;
+    }
 
     /* Create a new netgraph node for this instance */
     if (ng_make_node_common(&ng_vboxnetflt_typestruct, &node) != 0)
@@ -638,12 +695,14 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
         vboxNetFltRelease(pThis, true /*fBusy*/);
     }
     VBOXCURVNET_RESTORE();
+    IPRT_FREEBSD_RESTORE_EFL_AC();
 
     return VINF_SUCCESS;
 }
 
 bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThis)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();
     struct ifnet *ifp, *ifp0;
 
     ifp = ASMAtomicUoReadPtrT(&pThis->u.s.ifp, struct ifnet *);
@@ -660,6 +719,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThi
         pThis->u.s.node = NULL;
     }
     VBOXCURVNET_RESTORE();
+    IPRT_FREEBSD_RESTORE_EFL_AC();
 
     if (ifp0 != NULL)
     {
@@ -672,6 +732,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThi
 
 void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();
 
     taskqueue_drain(taskqueue_fast, &pThis->u.s.tskin);
     taskqueue_drain(taskqueue_fast, &pThis->u.s.tskout);
@@ -684,6 +745,7 @@ void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
         ng_rmnode_self(pThis->u.s.node);
     VBOXCURVNET_RESTORE();
     pThis->u.s.node = NULL;
+    IPRT_FREEBSD_RESTORE_EFL_AC();
 }
 
 int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
@@ -697,6 +759,7 @@ int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
 
 void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();
     struct ifnet *ifp;
     struct ifreq ifreq;
     int error;
@@ -730,7 +793,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_CONNECT,
             sizeof(struct ngm_connect), M_NOWAIT);
         if (msg == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return;
+        }
         con = (struct ngm_connect *)msg->data;
         snprintf(con->path, NG_PATHSIZ, "vboxnetflt_%s:", ifp->if_xname);
         strlcpy(con->ourhook, "lower", NG_HOOKSIZ);
@@ -744,7 +810,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_CONNECT,
             sizeof(struct ngm_connect), M_NOWAIT);
         if (msg == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return;
+        }
         con = (struct ngm_connect *)msg->data;
         snprintf(con->path, NG_PATHSIZ, "vboxnetflt_%s:",
             ifp->if_xname);
@@ -767,7 +836,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_RMHOOK,
             sizeof(struct ngm_rmhook), M_NOWAIT);
         if (msg == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return;
+        }
         rm = (struct ngm_rmhook *)msg->data;
         strlcpy(rm->ourhook, "input", NG_HOOKSIZ);
         NG_SEND_MSG_PATH(error, node, msg, path, 0);
@@ -778,12 +850,16 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_RMHOOK,
             sizeof(struct ngm_rmhook), M_NOWAIT);
         if (msg == NULL)
+        {
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return;
+        }
         rm = (struct ngm_rmhook *)msg->data;
         strlcpy(rm->ourhook, "output", NG_HOOKSIZ);
         NG_SEND_MSG_PATH(error, node, msg, path, 0);
     }
     VBOXCURVNET_RESTORE();
+    IPRT_FREEBSD_RESTORE_EFL_AC();
 }
 
 int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_VBoxNetFlt_freebsd_files__vboxnetflt (+10 lines)
	1	--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt.orig 2019-11-21 17:02:02 UTC
	2	+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt
	3	@@ -62,6 +62,7 @@ VBOX_VBOXNETFLT_SOURCES=" \
	4	${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
	5	${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
	6	${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
	7	+ ${PATH_ROOT}/include/iprt/x86.h=>include/iprt/x86.h \
	8	${PATH_ROOT}/include/iprt/nocrt/limits.h=>include/iprt/nocrt/limits.h \
	9	${PATH_ROOT}/include/VBox/cdefs.h=>include/VBox/cdefs.h \
	10	${PATH_ROOT}/include/VBox/err.h=>include/VBox/err.h \

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk (-10 lines)
1	--- src/VBox/HostServices/SharedOpenGL/Makefile.kmk.orig 2017-10-18 07:12:48 UTC
2	+++ src/VBox/HostServices/SharedOpenGL/Makefile.kmk
3	@@ -436,6 +436,7 @@ if ( defined(VBOX_WITH_QTGUI) \
4	$(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \
5	$(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,)
6	ifdef VBOX_WITH_VIDEOHWACCEL
7	+ VBoxTestOGL_CXXFLAGS.freebsd += -std=c++11
8	VBoxTestOGL_QT_MODULES += Core Gui OpenGL Widgets
9	VBoxTestOGL_LIBS.linux += xcb
10	VBoxTestOGL_LIBS.solaris += xcb




--- src/VBox/Installer/Makefile.kmk.orig	2019-11-21 17:02:08 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
+if 0
  if "$(KBUILD_TARGET)" == "freebsd" && "$(KBUILD_HOST)" == "freebsd"
   include $(PATH_SUB_CURRENT)/freebsd/Makefile.kmk
  endif
+endif
 endif
 
 include $(PATH_SUB_CURRENT)/common/Makefile.kmk




--- src/VBox/Installer/freebsd/VBox.sh.orig	2019-12-03 22:23:10 UTC
+++ src/VBox/Installer/freebsd/VBox.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+#
+# Oracle VM VirtualBox startup script, FreeBSD hosts.
+#
+# Copyright (C) 2006-2012 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+CONFIG="/usr/local/etc/vbox/vbox.cfg"
+
+test -r "${CONFIG}" &&
+    . "${CONFIG}"
+test -z "${INSTALL_DIR}" &&
+    if test -d /usr/local/lib/virtualbox &&
+        test -f /usr/local/lib/virtualbox/VBoxRT.so; then
+        INSTALL_DIR=/usr/local/lib/virtualbox
+    else
+        echo "Could not find VirtualBox installation. Please reinstall."
+        exit 1
+    fi
+
+# workaround for the KDE dialog problem
+KDE_FORK_SLAVES=1; export KDE_FORK_SLAVES
+
+APP=`basename $0`
+case "$APP" in
+    VirtualBox|virtualbox)
+        exec "$INSTALL_DIR/VirtualBox" "$@"
+        ;;
+    VirtualBoxVM|virtualboxvm)
+        exec "$INSTALL_DIR/VirtualBoxVM" "$@"
+        ;;
+    VBoxManage|vboxmanage)
+        exec "$INSTALL_DIR/VBoxManage" "$@"
+        ;;
+    VBoxSDL|vboxsdl)
+        exec "$INSTALL_DIR/VBoxSDL" "$@"
+        ;;
+    VBoxVRDP|VBoxHeadless|vboxheadless)
+        exec "$INSTALL_DIR/VBoxHeadless" "$@"
+        ;;
+    VBoxAutostart|vboxautostart)
+        exec "$INSTALL_DIR/VBoxAutostart" "$@"
+        ;;
+    VBoxBalloonCtrl|vboxballoonctrl)
+        exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
+        ;;
+    VBoxBugReport|vboxbugreport)
+        exec "$INSTALL_DIR/VBoxBugReport" "$@"
+        ;;
+    vbox-img)
+        exec "$INSTALL_DIR/vbox-img" "$@"
+        ;;
+    vboxwebsrv)
+        exec "$INSTALL_DIR/vboxwebsrv" "$@"
+        ;;
+    *)
+        echo "Unknown application - $APP"
+        exit 1
+        ;;
+esac
+exit 0

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Installer_freebsd_virtualbox.desktop (+10 lines)
	1	--- src/VBox/Installer/freebsd/virtualbox.desktop.orig 2019-11-21 17:02:08 UTC
	2	+++ src/VBox/Installer/freebsd/virtualbox.desktop
	3	@@ -7,7 +7,6 @@ GenericName=Virtual Machine
	4	Type=Application
	5	Exec=VirtualBox
	6	TryExec=VirtualBox
	7	-DocPath=file://$VBOX_DOC_PATH/UserManual.pdf
	8	Icon=VBox
	9	Categories=Emulator;System;
	10	Comment=Run several virtual systems on a single host computer

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 2019-11-21 17:02:12 UTC
2	+++ src/VBox/Main/Makefile.kmk	2	+++ src/VBox/Main/Makefile.kmk
3	@@ -445,6 +445,7 @@ VBoxSVC_SOURCES.os2 = \	3	@@ -640,6 +640,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_HostPower.h (-3 / +3 lines)
1	--- src/VBox/Main/include/HostPower.h.orig 2017-10-18 07:12:54 UTC	1	--- src/VBox/Main/include/HostPower.h.orig 2019-11-21 17:02:14 UTC
2	+++ src/VBox/Main/include/HostPower.h	2	+++ src/VBox/Main/include/HostPower.h
3	@@ -28,7 +28,7 @@	3	@@ -31,7 +31,7 @@
4		4
5	#include <vector>	5	#include <vector>
6		6
Lines 9-15 Link Here
9	# include <VBox/dbus.h>	9	# include <VBox/dbus.h>
10	#endif	10	#endif
11		11
12	@@ -64,7 +64,7 @@ class HostPowerServiceWin : public HostPowerService (p	12	@@ -67,7 +67,7 @@ class HostPowerServiceWin : public HostPowerService (p
13	RTTHREAD mThread;	13	RTTHREAD mThread;
14	};	14	};
15	# endif	15	# endif




--- src/VBox/Main/include/USBProxyBackend.h.orig	2017-01-17 07:27:19 UTC
+++ src/VBox/Main/include/USBProxyBackend.h
@@ -359,13 +359,10 @@ public:
     virtual int releaseDevice(HostUSBDevice *aDevice);
 
 protected:
-    int initUsbfs(void);
-    int initSysfs(void);
     virtual int wait(RTMSINTERVAL aMillies);
     virtual int interruptWait(void);
     virtual PUSBDEVICE getDevices(void);
-    int addDeviceToChain(PUSBDEVICE pDev, PUSBDEVICE *ppFirst, PUSBDEVICE **pppNext, int rc);
-    virtual void deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines, PUSBDEVICE aUSBDevice);
+    virtual bool isFakeUpdateRequired();
 
 private:
     RTSEMEVENT mNotifyEventSem;




--- src/VBox/Main/src-all/Global.cpp.orig	2019-11-21 17:02:16 UTC
+++ src/VBox/Main/src-all/Global.cpp
@@ -364,14 +364,15 @@ const Global::OSType Global::sOSTypes[] =
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
 
     { "BSD",     "BSD",               "FreeBSD",            "FreeBSD (32-bit)",
-      VBOXOSTYPE_FreeBSD,         VBOXOSHINT_NONE,
-      1024,  16,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+      VBOXOSTYPE_FreeBSD,         VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC,
+      1024,  16, 10 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
 
     { "BSD",     "BSD",               "FreeBSD_64",         "FreeBSD (64-bit)",
-      VBOXOSTYPE_FreeBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-      1024,  16, 16 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+      VBOXOSTYPE_FreeBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
+                                | VBOXOSHINT_X2APIC,
+      1024,  16, 10 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
 
     { "BSD",     "BSD",               "OpenBSD",            "OpenBSD (32-bit)",
       VBOXOSTYPE_OpenBSD,         VBOXOSHINT_HWVIRTEX,




--- src/VBox/Main/src-client/ConsoleImpl2.cpp.orig	2017-10-18 07:12:56 UTC
+++ src/VBox/Main/src-client/ConsoleImpl2.cpp
@@ -5206,7 +5206,7 @@ int Console::i_configNetwork(const char *pszDevice,
                 {
                     switch (hrc)
                     {
-                        case VERR_ACCESS_DENIED:
+                        case (HRESULT)VERR_ACCESS_DENIED:
                             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,
                     {
                         switch (hrc)
                         {
-                            case VERR_ACCESS_DENIED:
+                            case (HRESULT)VERR_ACCESS_DENIED:
                                 return VMSetError(VMR3GetVM(mpUVM), VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,  N_(
                                                 "Failed to open '/dev/%s' for read/write access.  Please check the "
                                                 "permissions of that node, and that the net.link.tap.user_open "

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 2019-11-21 17:02:19 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	@@ -286,7 +286,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);

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_VirtualBoxImpl.cpp (+11 lines)
	1	--- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2019-11-21 17:02:20 UTC
	2	+++ src/VBox/Main/src-server/VirtualBoxImpl.cpp
	3	@@ -2655,7 +2655,7 @@ int VirtualBox::i_encryptSettingBytes(const uint8_t *a
	4	if (aCiphertextSize < 32)
	5	return VERR_INVALID_PARAMETER;
	6
	7	- AssertCompile(sizeof(m->SettingsCipherKey) >= 32);
	8	+ // AssertCompile(sizeof(m->SettingsCipherKey) >= 32);
	9
	10	/* store the first 8 bytes of the cipherkey for verification */
	11	for (i = 0, j = 0; i < 8; i++, j++)




--- src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp.orig	2017-10-18 07:12:58 UTC
+++ src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp
@@ -43,6 +43,7 @@
 
 #include <net/if_dl.h>
 #include <netinet/in.h>
+#include <net80211/ieee80211_ioctl.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -311,7 +312,7 @@ int NetIfList(std::list <ComObjPtr<HostNetworkInterfac
             else
                 enmType = HostNetworkInterfaceType_HostOnly;
 
-            pNew->wireless = isWireless(pNew->szName);
+            pNew->fWireless = isWireless(pNew->szName);
 
             ComObjPtr<HostNetworkInterface> IfObj;
             IfObj.createObject();

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_PerformanceFreeBSD.cpp (-1 / +1 lines)
1	--- src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp.orig 2017-07-27 13:18:27 UTC	1	--- src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp.orig 2019-11-21 17:02:20 UTC
2	+++ src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp	2	+++ src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp
3	@@ -80,8 +80,10 @@ int CollectorFreeBSD::getHostMemoryUsage(ULONG *total,	3	@@ -80,8 +80,10 @@ int CollectorFreeBSD::getHostMemoryUsage(ULONG *total,
4	cbParameter = sizeof(cPagesMemInactive);	4	cbParameter = sizeof(cPagesMemInactive);




--- src/VBox/Main/webservice/Makefile.kmk.orig	2019-11-21 17:02:22 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_SOAPDEMOHEADERS   := $(VBOXWEB_OUT_DIR)/demo_headers
 PATH_TARGET_SOAPDEMONSMAPS    := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
 PATH_TARGET_WEBTEST           := $(VBOXWEB_OUT_DIR)/webtest
 
@@ -565,8 +564,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_SOAPDEMOHEADERS)/*) \
-	$(PATH_TARGET_SOAPDEMOHEADERS)/dummy_file \
 	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
 	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
 
@@ -786,17 +783,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 $@
-	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS)
+	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMONSMAPS)
 ifdef VBOX_GSOAP_VERBOSE
 	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml $(PATH_TARGET_SOAPDEMOXML)/
 endif
-	-$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/soapvbox*.h $(PATH_TARGET_SOAPDEMOHEADERS)/
 	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)/
 	$(APPEND) $@ done
 
-$(PATH_TARGET_SOAPDEMONSMAPS) \
-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingProxy.h \
-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingObject.h: $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
+$(PATH_TARGET_SOAPDEMONSMAPS): $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
 
 # soapcpp2 -2: generate SOAP 1.2 calls
 # soapcpp2 -S: server-side code only




--- src/VBox/Runtime/Makefile.kmk.orig	2019-11-21 17:02:28 UTC
+++ src/VBox/Runtime/Makefile.kmk
@@ -175,6 +175,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.
+#
+r3/posix/utf8-posix.cpp_DEFS.freebsd = $(VBOX_ICONV_DEFS)
+
+#
 # Unicode Specification reader used to regenerate unidata-*.cpp.
 #
 uniread_TEMPLATE = VBoxBldProg
@@ -2226,6 +2231,7 @@ endif
 VBoxRT_LIBS.darwin             = \
 	iconv
 VBoxRT_LIBS.freebsd            = \
+	crypt \
 	iconv \
 	rt
 VBoxRT_LIBS.haiku              = \
@@ -2369,6 +2375,7 @@ endif
 VBoxRT-x86_LIBS.darwin             = \
 	iconv
 VBoxRT-x86_LIBS.freebsd            = \
+	crypt \
 	iconv \
 	rt
 VBoxRT-x86_LIBS.haiku              = \

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_err_RTErrConvertFromErrno.cpp (-11 lines)
1	--- src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp.orig 2018-01-15 14:56:07 UTC
2	+++ src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp
3	@@ -302,7 +302,7 @@ RTDECL(int) RTErrConvertFromErrno(unsigned uNativeCod
4	case EILSEQ: return VERR_NO_TRANSLATION;
5	#endif
6	#ifdef ERESTART
7	- case ERESTART: return VERR_INTERRUPTED;/** @todo fix duplicate error?*/
8	+ case (unsigned)ERESTART: return VERR_INTERRUPTED;/** @todo fix duplicate error?*/
9	#endif
10	#ifdef ESTRPIPE
11	//case ESTRPIPE 86 /* Streams pipe error */




--- src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c.orig	2019-11-21 17:02:50 UTC
+++ src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c
@@ -79,6 +79,7 @@ MALLOC_DEFINE(M_IPRTCONT, "iprtcont", "IPRT - contiguo
 
 DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFlags, PRTMEMHDR *ppHdr)
 {

     size_t      cbAllocated = cb;
     PRTMEMHDR   pHdr        = NULL;
 
@@ -101,8 +102,10 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl
         cbAllocated = RT_ALIGN_Z(cb + sizeof(*pHdr), PAGE_SIZE);
 
         pVmObject = vm_object_allocate(OBJT_DEFAULT, cbAllocated >> PAGE_SHIFT);

 
         /* Addr contains a start address vm_map_find will start searching for suitable space at. */
 #if __FreeBSD_version >= 1000055
@@ -139,6 +142,8 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl
                                  fFlags & RTMEMHDR_FLAG_ZEROED ? M_NOWAIT | M_ZERO : M_NOWAIT);
     }
 

     if (RT_UNLIKELY(!pHdr))
         return VERR_NO_MEMORY;
 
@@ -154,6 +159,8 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl
 
 DECLHIDDEN(void) rtR0MemFree(PRTMEMHDR pHdr)
 {

     pHdr->u32Magic += 1;
 
 #ifdef RT_ARCH_AMD64
@@ -166,11 +173,14 @@ DECLHIDDEN(void) rtR0MemFree(PRTMEMHDR pHdr)
     else
 #endif
         free(pHdr, M_IPRTHEAP);

     void *pv;
 
     /*
@@ -195,6 +205,7 @@ RTR0DECL(void *) RTMemContAlloc(PRTCCPHYS pPhys, size_
         *pPhys = vtophys(pv);
         Assert(!(*pPhys & PAGE_OFFSET_MASK));
     }

     return pv;
 }
 
@@ -204,7 +215,9 @@ RTR0DECL(void) RTMemContFree(void *pv, size_t cb)
     if (pv)
     {
         AssertMsg(!((uintptr_t)pv & PAGE_OFFSET_MASK), ("pv=%p\n", pv));

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_assert-r0drv-freebsd.c (-3 / +3 lines)
1	--- src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c.orig 2018-10-15 14:31:31 UTC	1	--- src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c.orig 2019-11-21 17:02:50 UTC
2	+++ src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c	2	+++ src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c
3	@@ -44,15 +44,18 @@	3	@@ -69,15 +69,18 @@
4		4
5	DECLHIDDEN(void) rtR0AssertNativeMsg1(const char pszExpr, unsigned uLine, const char pszFile, const char *pszFunction)	5	DECLHIDDEN(void) rtR0AssertNativeMsg1(const char pszExpr, unsigned uLine, const char pszFile, const char *pszFunction)
6	{	6	{
Lines 19-25 Link Here
19	char szMsg[256];	19	char szMsg[256];
20		20
21	RTStrPrintfV(szMsg, sizeof(szMsg) - 1, pszFormat, va);	21	RTStrPrintfV(szMsg, sizeof(szMsg) - 1, pszFormat, va);
22	@@ -60,6 +63,7 @@ DECLHIDDEN(void) rtR0AssertNativeMsg2V(bool fInitial,	22	@@ -85,6 +88,7 @@ DECLHIDDEN(void) rtR0AssertNativeMsg2V(bool fInitial,
23	printf("%s", szMsg);	23	printf("%s", szMsg);
24		24
25	NOREF(fInitial);	25	NOREF(fInitial);




--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2019-11-21 17:02:50 UTC
+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
@@ -130,6 +130,7 @@ static vm_map_t rtR0MemObjFreeBSDGetMap(PRTR0MEMOBJINT
 
 DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
 {

     PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)pMem;
     int rc;
 
@@ -146,16 +147,15 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
 
         case RTR0MEMOBJTYPE_LOCK:
         {

             break;
         }
 
@@ -211,6 +211,7 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
             return VERR_INTERNAL_ERROR;
     }
 

     return VINF_SUCCESS;
 }
 
@@ -362,58 +363,77 @@ static int rtR0MemObjFreeBSDAllocHelper(PRTR0MEMOBJFRE
 #else
         VM_OBJECT_UNLOCK(pObject);
 #endif
-        if (pPages)
+        if (pPages || cTries >= 1)
             break;
+#if __FreeBSD_version >= 1100092
+        if (!vm_page_reclaim_contig(fFlags, cPages, 0, VmPhysAddrHigh, uAlignment, 0))
+             break;
+#elif __FreeBSD_version >= 1000015
         vm_pageout_grow_cache(cTries, 0, VmPhysAddrHigh);
+#else
+        vm_contig_grow_cache(cTries, 0, VmPhysAddrHigh);
+#endif
         cTries++;
     }
-
-    return pPages;
 #else
-    while (cTries <= 1)
+    while (1)
     {
         pPages = vm_phys_alloc_contig(cPages, 0, VmPhysAddrHigh, uAlignment, 0);
-        if (pPages)
+        if (pPages || cTries >= 1)
             break;
         vm_contig_grow_cache(cTries, 0, VmPhysAddrHigh);
         cTries++;
@@ -243,11 +249,8 @@ static vm_page_t rtR0MemObjFreeBSDContigPhysAllocHelpe
 
     if (!pPages)
         return pPages;
-#if __FreeBSD_version >= 1000030
-    VM_OBJECT_WLOCK(pObject);
-#else
+
     VM_OBJECT_LOCK(pObject);
-#endif
     for (vm_pindex_t iPage = 0; iPage < cPages; iPage++)
     {
         vm_page_t pPage = pPages + iPage;
@@ -259,13 +262,9 @@ static vm_page_t rtR0MemObjFreeBSDContigPhysAllocHelpe
             atomic_add_int(&cnt.v_wire_count, 1);
         }
     }
-#if __FreeBSD_version >= 1000030
-    VM_OBJECT_WUNLOCK(pObject);
-#else
     VM_OBJECT_UNLOCK(pObject);
 #endif
     return pPages;
-#endif
 }
 
 static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages,
@@ -292,16 +291,17 @@ static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_
 #else
             VM_OBJECT_LOCK(pObject);
 #endif
+
             while (iPage-- > 0)
             {
                 pPage = vm_page_lookup(pObject, iPage);
-#if __FreeBSD_version < 1000000
+#if __FreeBSD_version < 900000
                 vm_page_lock_queues();
 #endif
                 if (fWire)
                     vm_page_unwire(pPage, 0);
                 vm_page_free(pPage);
-#if __FreeBSD_version < 1000000
+#if __FreeBSD_version < 900000
                 vm_page_unlock_queues();
 #endif
             }
@@ -364,58 +364,77 @@ static int rtR0MemObjFreeBSDAllocHelper(PRTR0MEMOBJFRE
 }
 DECLHIDDEN(int) rtR0MemObjNativeAllocPage(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();

     return rc;
 }
 
@@ -423,6 +443,7 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB
                                            RTHCPHYS PhysHighest, size_t uAlignment,
                                            bool fContiguous, int rcNoMem)
 {

     uint32_t   cPages = atop(cb);
     vm_paddr_t VmPhysAddrHigh;
 
@@ -430,7 +451,10 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB
     PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD),
                                                                        enmType, NULL, cb);
     if (!pMemFreeBSD)

 
     pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, atop(cb));
 
@@ -460,6 +484,7 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB
         rtR0MemObjDelete(&pMemFreeBSD->Core);
     }
 

     return rc;
 }
 
@@ -479,17 +504,22 @@ DECLHIDDEN(int) rtR0MemObjNativeAllocPhysNC(PPRTR0MEMO
 DECLHIDDEN(int) rtR0MemObjNativeEnterPhys(PPRTR0MEMOBJINTERNAL ppMem, RTHCPHYS Phys, size_t cb, uint32_t uCachePolicy)
 {
     AssertReturn(uCachePolicy == RTMEM_CACHE_POLICY_DONT_CARE, VERR_NOT_SUPPORTED);

     return VINF_SUCCESS;
 }
 
@@ -501,6 +531,7 @@ static int rtR0MemObjNativeLockInMap(PPRTR0MEMOBJINTER
                                      vm_offset_t AddrStart, size_t cb, uint32_t fAccess,
                                      RTR0PROCESS R0Process, int fFlags)
 {

     int rc;
     NOREF(fAccess);
 
@@ -509,21 +540,28 @@ static int rtR0MemObjNativeLockInMap(PPRTR0MEMOBJINTER
     if (!pMemFreeBSD)
         return VERR_NO_MEMORY;
 

     return VERR_NO_MEMORY;/** @todo fix mach -> vbox error conversion for freebsd. */
 }
 
@@ -559,6 +597,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockKernel(PPRTR0MEMOB
  */
 static int rtR0MemObjNativeReserveInMap(PPRTR0MEMOBJINTERNAL ppMem, void *pvFixed, size_t cb, size_t uAlignment, RTR0PROCESS R0Process, vm_map_t pMap)
 {

     int rc;
 
     /*
@@ -616,11 +655,13 @@ static int rtR0MemObjNativeReserveInMap(PPRTR0MEMOBJIN
         pMemFreeBSD->Core.pv = (void *)MapAddress;
         pMemFreeBSD->Core.u.ResVirt.R0Process = R0Process;
         *ppMem = &pMemFreeBSD->Core;

     return rc;
 
 }
@@ -642,6 +683,8 @@ DECLHIDDEN(int) rtR0MemObjNativeReserveUser(PPRTR0MEMO
 DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, void *pvFixed, size_t uAlignment,
                                           unsigned fProt, size_t offSub, size_t cbSub)
 {

 //  AssertMsgReturn(!offSub && !cbSub, ("%#x %#x\n", offSub, cbSub), VERR_NOT_SUPPORTED);
     AssertMsgReturn(pvFixed == (void *)-1, ("%p\n", pvFixed), VERR_NOT_SUPPORTED);
 
@@ -698,6 +741,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJ
             Assert((vm_offset_t)pMemFreeBSD->Core.pv == Addr);
             pMemFreeBSD->Core.u.Mapping.R0Process = NIL_RTR0PROCESS;
             *ppMem = &pMemFreeBSD->Core;

             return VINF_SUCCESS;
         }
         rc = vm_map_remove(kernel_map, Addr, Addr + cbSub);
@@ -706,6 +750,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJ
     else
         vm_object_deallocate(pMemToMapFreeBSD->pObject);
 

     return VERR_NO_MEMORY;
 }
 
@@ -713,6 +758,8 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJ
 DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment,
                                         unsigned fProt, RTR0PROCESS R0Process, size_t offSub, size_t cbSub)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();
+

     /*
      * Check for unsupported stuff.
      */
@@ -788,6 +835,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJIN
     {
         /** @todo is this needed?. */
         PROC_LOCK(pProc);
-        AddrR3 = round_page((vm_offset_t)pProc->p_vmspace->vm_daddr + lim_max(pProc, RLIMIT_DATA));
+        AddrR3 = round_page((vm_offset_t)pProc->p_vmspace->vm_daddr +
+#if __FreeBSD_version >= 1100077
+                            lim_max_proc(pProc, RLIMIT_DATA));
+#else
+                            lim_max(pProc, RLIMIT_DATA));
+#endif
         PROC_UNLOCK(pProc);
     }
     else
@@ -793,6 +844,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJIN
             Assert((vm_offset_t)pMemFreeBSD->Core.pv == AddrR3);
             pMemFreeBSD->Core.u.Mapping.R0Process = R0Process;
             *ppMem = &pMemFreeBSD->Core;

             return VINF_SUCCESS;
         }
 
@@ -797,19 +845,25 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJIN
     else
         vm_object_deallocate(pMemToMapFreeBSD->pObject);
 

 
     if ((fProt & RTMEM_PROT_NONE) == RTMEM_PROT_NONE)
         ProtectionFlags = VM_PROT_NONE;
@@ -821,6 +875,7 @@ DECLHIDDEN(int) rtR0MemObjNativeProtect(PRTR0MEMOBJINT
         ProtectionFlags |= VM_PROT_EXECUTE;
 
     int krc = vm_map_protect(pVmMap, AddrStart, AddrEnd, ProtectionFlags, FALSE);

     if (krc == KERN_SUCCESS)
         return VINF_SUCCESS;
 
@@ -845,11 +900,19 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P
 
             vm_offset_t pb = (vm_offset_t)pMemFreeBSD->Core.pv + ptoa(iPage);
 

         }
 
         case RTR0MEMOBJTYPE_MAPPING:
@@ -858,11 +921,15 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P
 
             if (pMemFreeBSD->Core.u.Mapping.R0Process != NIL_RTR0PROCESS)
             {

             }
             return vtophys(pb);
         }
@@ -873,9 +940,11 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P
         case RTR0MEMOBJTYPE_PHYS_NC:
         {
             RTHCPHYS addr;
 
+            IPRT_FREEBSD_SAVE_EFL_AC();
 #if __FreeBSD_version >= 1000030
             VM_OBJECT_WLOCK(pMemFreeBSD->pObject);
             addr = VM_PAGE_TO_PHYS(vm_page_lookup(pMemFreeBSD->pObject, iPage));
             VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
 #else
             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
 #endif
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return addr;
         }

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_memuserkernel-r0drv-freebsd.c (-1 / +1 lines)
1	--- src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c.orig 2018-10-15 14:31:31 UTC	1	--- src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c.orig 2019-11-21 17:02:50 UTC
2	+++ src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c	2	+++ src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c
3	@@ -36,7 +36,9 @@	3	@@ -36,7 +36,9 @@
4		4




--- src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c.orig	2019-11-21 17:02:50 UTC
+++ src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c
@@ -147,7 +147,9 @@ RTDECL(RTCPUID) RTMpGetOnlineCount(void)
 #include <iprt/cpuset.h>
 #include "r0drv/mp-r0drv.h"
 
+#if __FreeBSD_version >= 700000 && __FreeBSD_version < 900000
+#define cpuset_t            cpumask_t
+#define all_cpus            (~(cpumask_t)0)
+#define CPU_CLR(n, p)       do { *(p) &= ~((cpumask_t)1 << (n)); } while (0)
+#define CPU_SETOF(n, p)     do { *(p) = (cpumask_t)1 << (n); } while (0)
+#endif
+#if __FreeBSD_version < 1200028
+#define smp_no_rendezvous_barrier   smp_no_rendevous_barrier
+#endif
 
 RTDECL(RTCPUID) RTMpCpuId(void)
 {
@@ -143,7 +152,9 @@ RTDECL(RTCPUID) RTMpGetOnlineCount(void)
 static void rtmpOnAllFreeBSDWrapper(void *pvArg)
 {
     PRTMPARGS pArgs = (PRTMPARGS)pvArg;

 }
 
 
@@ -159,7 +161,9 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void *p
     Args.pvUser2 = pvUser2;
     Args.idCpu = NIL_RTCPUID;
     Args.cHits = 0;
-    smp_rendezvous(NULL, rtmpOnAllFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
+    IPRT_FREEBSD_SAVE_EFL_AC();
     smp_rendezvous(NULL, rtmpOnAllFreeBSDWrapper, smp_no_rendezvous_barrier, &Args);
+    IPRT_FREEBSD_RESTORE_EFL_AC();
     return VINF_SUCCESS;
 }
 
@@ -175,7 +179,11 @@ static void rtmpOnOthersFreeBSDWrapper(void *pvArg)
     PRTMPARGS pArgs = (PRTMPARGS)pvArg;
     RTCPUID idCpu = curcpu;
     if (pArgs->idCpu != idCpu)

 }
 
 
@@ -196,6 +204,7 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
     /* Will panic if no rendezvousing cpus, so check up front. */
     if (RTMpGetOnlineCount() > 1)
     {
-#if __FreeBSD_version >= 900000
-        cpuset_t    Mask;
-#elif  __FreeBSD_version >= 700000
-        cpumask_t   Mask;
+#if __FreeBSD_version >= 700000
+        cpuset_t    Cpus;
 #endif
         RTMPARGS    Args;
 
@@ -192,17 +207,15 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
         Args.pvUser2 = pvUser2;
         Args.idCpu = RTMpCpuId();
         Args.cHits = 0;
+        IPRT_FREEBSD_SAVE_EFL_AC();
 #if __FreeBSD_version >= 700000
 # if __FreeBSD_version >= 900000
         Mask = all_cpus;
@@ -207,6 +216,7 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
-# else
-    Mask = ~(cpumask_t)curcpu;
-# endif
-        smp_rendezvous_cpus(Mask, NULL, rtmpOnOthersFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
+        Cpus = all_cpus;
+        CPU_CLR(curcpu, &Cpus);
+        smp_rendezvous_cpus(Cpus, NULL, rtmpOnOthersFreeBSDWrapper, smp_no_rendezvous_barrier, &Args);
 #else
         smp_rendezvous(NULL, rtmpOnOthersFreeBSDWrapper, NULL, &Args);
 #endif

     }
     return VINF_SUCCESS;
 }
@@ -224,8 +234,10 @@ static void rtmpOnSpecificFreeBSDWrapper(void *pvArg)
     RTCPUID     idCpu = curcpu;
     if (pArgs->idCpu == idCpu)
     {

     }
 }
 
@@ -248,6 +260,7 @@ RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKE
 RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
 {
-#if __FreeBSD_version >= 900000
-    cpuset_t    Mask;
-#elif  __FreeBSD_version >= 700000
-    cpumask_t   Mask;
+#if __FreeBSD_version >= 700000
+    cpuset_t    Cpus;
 #endif
     RTMPARGS    Args;
 
@@ -244,16 +257,14 @@ RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKE
     Args.pvUser2 = pvUser2;
     Args.idCpu = idCpu;
     Args.cHits = 0;
+    IPRT_FREEBSD_SAVE_EFL_AC();
 #if __FreeBSD_version >= 700000
 # if __FreeBSD_version >= 900000
     CPU_SETOF(idCpu, &Mask);
@@ -258,6 +271,7 @@ RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKE
-    Mask = (cpumask_t)1 << idCpu;
-# endif
-    smp_rendezvous_cpus(Mask, NULL, rtmpOnSpecificFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
+    CPU_SETOF(idCpu, &Cpus);
+    smp_rendezvous_cpus(Cpus, NULL, rtmpOnSpecificFreeBSDWrapper, smp_no_rendezvous_barrier, &Args);
 #else
     smp_rendezvous(NULL, rtmpOnSpecificFreeBSDWrapper, NULL, &Args);
 #endif

     return Args.cHits == 1
          ? VINF_SUCCESS
          : VERR_CPU_NOT_FOUND;
@@ -287,12 +301,14 @@ RTDECL(int) RTMpPokeCpu(RTCPUID idCpu)
 
 RTDECL(int) RTMpPokeCpu(RTCPUID idCpu)
 {
-#if __FreeBSD_version >= 900000
-    cpuset_t    Mask;
-#elif  __FreeBSD_version >= 700000
-    cpumask_t   Mask;
-#endif
+    cpuset_t    Cpus;
 
     /* Will panic if no rendezvousing cpus, so make sure the cpu is online. */
     if (!RTMpIsCpuOnline(idCpu))
         return VERR_CPU_NOT_FOUND;
 
-# if __FreeBSD_version >= 900000
-    CPU_SETOF(idCpu, &Mask);
-# else
-    Mask = (cpumask_t)1 << idCpu;
-# endif
-    smp_rendezvous_cpus(Mask, NULL, rtmpFreeBSDPokeCallback, smp_no_rendevous_barrier, NULL);
+    IPRT_FREEBSD_SAVE_EFL_AC();
 # if __FreeBSD_version >= 900000
     CPU_SETOF(idCpu, &Mask);
 # else
     Mask = (cpumask_t)1 << idCpu;
 # endif
     smp_rendezvous_cpus(Mask, NULL, rtmpFreeBSDPokeCallback, smp_no_rendezvous_barrier, NULL);
+    IPRT_FREEBSD_RESTORE_EFL_AC();
 
     return VINF_SUCCESS;




--- src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c.orig	2019-11-21 17:02:50 UTC
+++ src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c
@@ -102,7 +102,9 @@ RTDECL(int)  RTSemEventCreateEx(PRTSEMEVENT phEventSem
     Assert(!(fFlags & RTSEMEVENT_FLAGS_BOOTSTRAP_HACK) || (fFlags & RTSEMEVENT_FLAGS_NO_LOCK_VAL));
     AssertPtrReturn(phEventSem, VERR_INVALID_POINTER);
 

     if (!pThis)
         return VERR_NO_MEMORY;
 
@@ -153,10 +155,12 @@ RTDECL(int)  RTSemEventDestroy(RTSEMEVENT hEventSem)
     /*
      * Invalidate it and signal the object just in case.
      */

     return VINF_SUCCESS;
 }
 
@@ -174,9 +178,11 @@ RTDECL(int)  RTSemEventSignal(RTSEMEVENT hEventSem)
     /*
      * Signal the event object.
      */

     return VINF_SUCCESS;
 }
 
@@ -200,6 +206,7 @@ static int rtR0SemEventWait(PRTSEMEVENTINTERNAL pThis,
     AssertPtrReturn(pThis, VERR_INVALID_PARAMETER);
     AssertMsgReturn(pThis->u32Magic == RTSEMEVENT_MAGIC, ("%p u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_PARAMETER);
     AssertReturn(RTSEMWAIT_FLAGS_ARE_VALID(fFlags), VERR_INVALID_PARAMETER);

     rtR0SemEventBsdRetain(pThis);
 
     /*
@@ -249,6 +256,7 @@ static int rtR0SemEventWait(PRTSEMEVENTINTERNAL pThis,
     }
 
     rtR0SemEventBsdRelease(pThis);




--- src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c.orig	2019-11-21 17:02:50 UTC
+++ src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c
@@ -121,7 +121,9 @@ RTDECL(int)  RTSemEventMultiCreateEx(PRTSEMEVENTMULTI 
     PRTSEMEVENTMULTIINTERNAL pThis;
 
     AssertReturn(!(fFlags & ~RTSEMEVENTMULTI_FLAGS_NO_LOCK_VAL), VERR_INVALID_PARAMETER);

     if (pThis)
     {
         pThis->u32Magic     = RTSEMEVENTMULTI_MAGIC;
@@ -177,10 +179,12 @@ RTDECL(int)  RTSemEventMultiDestroy(RTSEMEVENTMULTI hE
     /*
      * Invalidate it and signal the object just in case.
      */

     return VINF_SUCCESS;
 }
 
@@ -189,6 +193,7 @@ RTDECL(int)  RTSemEventMultiSignal(RTSEMEVENTMULTI hEv
 {
     uint32_t fNew;
     uint32_t fOld;

 
     /*
      * Validate input.
@@ -215,12 +220,15 @@ RTDECL(int)  RTSemEventMultiSignal(RTSEMEVENTMULTI hEv
 
     rtR0SemBsdBroadcast(pThis);
     rtR0SemEventMultiBsdRelease(pThis);

     /*
      * Validate input.
      */
@@ -237,6 +245,7 @@ RTDECL(int)  RTSemEventMultiReset(RTSEMEVENTMULTI hEve
     ASMAtomicAndU32(&pThis->fStateAndGen, ~RTSEMEVENTMULTIBSD_STATE_MASK);
 
     rtR0SemEventMultiBsdRelease(pThis);

     return VINF_SUCCESS;
 }
 
@@ -253,6 +262,7 @@ RTDECL(int)  RTSemEventMultiReset(RTSEMEVENTMULTI hEve
 static int rtR0SemEventMultiBsdWait(PRTSEMEVENTMULTIINTERNAL pThis, uint32_t fFlags, uint64_t uTimeout,
                                     PCRTLOCKVALSRCPOS pSrcPos)
 {

     uint32_t    fOrgStateAndGen;
     int         rc;
 
@@ -312,6 +322,7 @@ static int rtR0SemEventMultiBsdWait(PRTSEMEVENTMULTIIN
     }
 
     rtR0SemEventMultiBsdRelease(pThis);




--- src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c.orig	2019-11-21 17:02:50 UTC
+++ src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c
@@ -87,6 +87,7 @@ RTDECL(int)  RTSemFastMutexCreate(PRTSEMFASTMUTEX phFa
 {
     AssertCompile(sizeof(RTSEMFASTMUTEXINTERNAL) > sizeof(void *));
     AssertPtrReturn(phFastMtx, VERR_INVALID_POINTER);

 
     PRTSEMFASTMUTEXINTERNAL pThis = (PRTSEMFASTMUTEXINTERNAL)RTMemAllocZ(sizeof(*pThis));
     if (pThis)
@@ -95,8 +96,10 @@ RTDECL(int)  RTSemFastMutexCreate(PRTSEMFASTMUTEX phFa
         sx_init_flags(&pThis->SxLock, "IPRT Fast Mutex Semaphore", SX_DUPOK);
 
         *phFastMtx = pThis;

     return VERR_NO_MEMORY;
 }
 
@@ -108,11 +111,13 @@ RTDECL(int)  RTSemFastMutexDestroy(RTSEMFASTMUTEX hFas
         return VINF_SUCCESS;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);

     return VINF_SUCCESS;
 }
 
@@ -122,8 +127,11 @@ RTDECL(int)  RTSemFastMutexRequest(RTSEMFASTMUTEX hFas
     PRTSEMFASTMUTEXINTERNAL pThis = hFastMtx;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);

     return VINF_SUCCESS;
 }
 
@@ -133,8 +141,11 @@ RTDECL(int)  RTSemFastMutexRelease(RTSEMFASTMUTEX hFas
     PRTSEMFASTMUTEXINTERNAL pThis = hFastMtx;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_semmutex-r0drv-freebsd.c (-1 / +1 lines)
1	--- src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c.orig 2018-10-15 14:31:31 UTC	1	--- src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c.orig 2019-11-21 17:02:50 UTC
2	+++ src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c	2	+++ src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c
3	@@ -62,6 +62,7 @@ RTDECL(int) RTSemMutexCreate(PRTSEMMUTEX phMutexSem)	3	@@ -62,6 +62,7 @@ RTDECL(int) RTSemMutexCreate(PRTSEMMUTEX phMutexSem)
4	{	4	{

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_sleepqueue-r0drv-freebsd.h (+11 lines)
	1	--- src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h.orig 2019-11-21 17:02:50 UTC
	2	+++ src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h
	3	@@ -84,6 +84,8 @@ DECLINLINE(uint32_t) rtR0SemBsdWaitUpdateTimeout(PRTR0
	4	uint64_t cTicks = ASMMultU64ByU32DivByU32(uTimeout, hz, UINT32_C(1000000000));
	5	if (cTicks >= INT_MAX)
	6	return RTSEMWAIT_FLAGS_INDEFINITE;
	7	+ else if (cTicks == 0 && uTimeout > 0)
	8	+ pWait->iTimeout = 1;
	9	else
	10	pWait->iTimeout = (int)cTicks;
	11	#endif




--- src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c.orig	2019-11-21 17:02:50 UTC
+++ src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c
@@ -107,7 +107,9 @@ RTDECL(int)  RTSpinlockCreate(PRTSPINLOCK pSpinlock, u
      * Allocate.
      */
     AssertCompile(sizeof(RTSPINLOCKINTERNAL) > sizeof(void *));

     if (!pThis)
         return VERR_NO_MEMORY;
 
@@ -141,7 +143,9 @@ RTDECL(int)  RTSpinlockDestroy(RTSPINLOCK Spinlock)
      * Make the lock invalid and release the memory.
      */
     ASMAtomicIncU32(&pThis->u32Magic);

     return VINF_SUCCESS;
 }
 
@@ -167,6 +171,7 @@ RTDECL(void) RTSpinlockAcquire(RTSPINLOCK Spinlock)
                 {
                     RT_ASSERT_PREEMPT_CPUID_SPIN_ACQUIRED(pThis);
                     pThis->fIntSaved = fIntSaved;




--- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig	2019-11-21 17:02:50 UTC
+++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h
@@ -88,6 +88,7 @@
 #include <sys/smp.h>
 #include <sys/sleepqueue.h>
 #include <sys/sx.h>

 #include <vm/vm.h>
 #include <vm/pmap.h>            /* for vtophys */
 #include <vm/vm_map.h>
@@ -98,7 +99,6 @@
 #include <vm/vm_phys.h>         /* vm_phys_alloc_* */
 #include <vm/vm_extern.h>       /* kmem_alloc_attr */
 #include <vm/vm_pageout.h>      /* vm_contig_grow_cache */

 #include <sys/resourcevar.h>
 #include <machine/cpu.h>
 
@@ -156,6 +156,24 @@
  */
 #if 0 /** @todo Not available yet. */
 # define USE_KMEM_ALLOC_PROT

+# define IPRT_FREEBSD_RESTORE_EFL_ONLY_AC_EX(f) do { } while (0)
 #endif
 
 #endif /* !IPRT_INCLUDED_SRC_r0drv_freebsd_the_freebsd_kernel_h */

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_thread-r0drv-freebsd.c (-1 / +1 lines)
1	--- src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c.orig 2018-10-15 14:31:31 UTC	1	--- src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c.orig 2019-11-21 17:02:50 UTC
2	+++ src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c	2	+++ src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c
3	@@ -49,7 +49,6 @@ RTDECL(RTNATIVETHREAD) RTThreadNativeSelf(void)	3	@@ -49,7 +49,6 @@ RTDECL(RTNATIVETHREAD) RTThreadNativeSelf(void)
4	static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMillies)	4	static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMillies)




--- src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c.orig	2019-11-21 17:02:50 UTC
+++ src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c
@@ -95,6 +95,8 @@ DECLHIDDEN(int) rtThreadNativeSetPriority(PRTTHREADINT
             return VERR_INVALID_PARAMETER;
     }
 

 #if __FreeBSD_version < 700000
     /* Do like they're doing in subr_ntoskrnl.c... */
     mtx_lock_spin(&sched_lock);
@@ -111,6 +113,7 @@ DECLHIDDEN(int) rtThreadNativeSetPriority(PRTTHREADINT
     thread_unlock(curthread);
 #endif
 

     return VINF_SUCCESS;
 }
 
@@ -160,6 +163,7 @@ static void rtThreadNativeMain(void *pvThreadInt)
 
 DECLHIDDEN(int) rtThreadNativeCreate(PRTTHREADINT pThreadInt, PRTNATIVETHREAD pNativeThread)
 {

     int rc;
     struct proc *pProc;
 
@@ -175,6 +179,7 @@ DECLHIDDEN(int) rtThreadNativeCreate(PRTTHREADINT pThr
     }
     else
         rc = RTErrConvertFromErrno(rc);

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_time-r0drv-freebsd.c (-3 / +3 lines)
1	--- src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c.orig 2016-07-18 11:56:55 UTC	1	--- src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c.orig 2019-11-21 17:02:50 UTC
2	+++ src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c	2	+++ src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c
3	@@ -40,16 +40,23 @@	3	@@ -65,16 +65,23 @@
4		4
5	RTDECL(uint64_t) RTTimeNanoTS(void)	5	RTDECL(uint64_t) RTTimeNanoTS(void)
6	{	6	{
Lines 29-35 Link Here
29	}	29	}
30		30
31		31
32	@@ -67,8 +74,7 @@ RTDECL(uint64_t) RTTimeSystemMilliTS(voi	32	@@ -92,8 +99,7 @@ RTDECL(uint64_t) RTTimeSystemMilliTS(void)
33		33
34	RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime)	34	RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime)
35	{	35	{




--- src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c.orig	2019-11-21 17:02:50 UTC
+++ src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c
@@ -117,6 +117,7 @@ static void rtTimerFreeBSDCallback(void *pvTimer);
 RTDECL(int) RTTimerCreateEx(PRTTIMER *ppTimer, uint64_t u64NanoInterval, uint32_t fFlags, PFNRTTIMER pfnTimer, void *pvUser)
 {
     *ppTimer = NULL;

 
     /*
      * Validate flags.
@@ -146,6 +147,7 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *ppTimer, uint64_
     callout_init(&pTimer->Callout, CALLOUT_MPSAFE);
 
     *ppTimer = pTimer;

     return VINF_SUCCESS;
 }
 
@@ -166,6 +168,8 @@ DECLINLINE(bool) rtTimerIsValid(PRTTIMER pTimer)
 
 RTDECL(int) RTTimerDestroy(PRTTIMER pTimer)
 {

     /* It's ok to pass NULL pointer. */
     if (pTimer == /*NIL_RTTIMER*/ NULL)
         return VINF_SUCCESS;
@@ -178,6 +182,8 @@ RTDECL(int) RTTimerDestroy(PRTTIMER pTimer)
     pTimer->u32Magic++;
     callout_stop(&pTimer->Callout);
     RTMemFree(pTimer);

     return VINF_SUCCESS;
 }
 
@@ -185,6 +191,7 @@ RTDECL(int) RTTimerDestroy(PRTTIMER pTimer)
 RTDECL(int) RTTimerStart(PRTTIMER pTimer, uint64_t u64First)
 {
     struct timeval tv;

 
     if (!rtTimerIsValid(pTimer))
         return VERR_INVALID_HANDLE;
@@ -208,12 +215,15 @@ RTDECL(int) RTTimerStart(PRTTIMER pTimer, uint64_t u64
     tv.tv_usec = (u64First % 1000000000) / 1000;
     callout_reset(&pTimer->Callout, tvtohz(&tv), rtTimerFreeBSDCallback, pTimer);
 

     if (!rtTimerIsValid(pTimer))
         return VERR_INVALID_HANDLE;
     if (pTimer->fSuspended)
@@ -225,6 +235,7 @@ RTDECL(int) RTTimerStop(PRTTIMER pTimer)
     pTimer->fSuspended = true;
     callout_stop(&pTimer->Callout);
 

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_freebsd_systemmem-freebsd.cpp (-1 / +1 lines)
1	--- src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp.orig 2017-07-27 13:18:46 UTC	1	--- src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp.orig 2019-11-21 17:02:54 UTC
2	+++ src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp	2	+++ src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp
3	@@ -65,7 +65,6 @@ RTDECL(int) RTSystemQueryAvailableRam(uint64_t *pcb)	3	@@ -65,7 +65,6 @@ RTDECL(int) RTSystemQueryAvailableRam(uint64_t *pcb)
4	u_int cPagesMemFree = 0;	4	u_int cPagesMemFree = 0;




--- src/VBox/Runtime/r3/posix/ldrNative-posix.cpp.orig	2019-11-21 17:02:57 UTC
+++ src/VBox/Runtime/r3/posix/ldrNative-posix.cpp
@@ -148,7 +148,7 @@ DECLHIDDEN(int) rtldrNativeLoadSystem(const char *pszF
      */
     if (!pszExt)
     {
-#if !defined(RT_OS_DARWIN) && !defined(RT_OS_OS2) && !defined(RT_OS_WINDOWS)
+#if !defined(RT_OS_DARWIN) && !defined(RT_OS_FREEBSD) && !defined(RT_OS_OS2) && !defined(RT_OS_WINDOWS)
         if (    (fFlags & RTLDRLOAD_FLAGS_SO_VER_BEGIN_MASK) >> RTLDRLOAD_FLAGS_SO_VER_BEGIN_SHIFT
              == (fFlags & RTLDRLOAD_FLAGS_SO_VER_END_MASK)   >> RTLDRLOAD_FLAGS_SO_VER_END_SHIFT)
 #endif
@@ -168,7 +168,7 @@ DECLHIDDEN(int) rtldrNativeLoadSystem(const char *pszF
 
     int rc = RTLdrLoadEx(pszTmp, phLdrMod, fFlags2, NULL);
 
-#if !defined(RT_OS_DARWIN) && !defined(RT_OS_OS2) && !defined(RT_OS_WINDOWS)
+#if !defined(RT_OS_DARWIN) && !defined(RT_OS_FREEBSD) && !defined(RT_OS_OS2) && !defined(RT_OS_WINDOWS)
     /*
      * If no version was given after the .so and do .so.MAJOR search according
      * to the range in the fFlags.




--- src/VBox/Runtime/r3/posix/process-creation-posix.cpp.orig	2019-11-21 17:02:57 UTC
+++ src/VBox/Runtime/r3/posix/process-creation-posix.cpp
@@ -33,7 +33,7 @@
 #ifdef RT_OS_LINUX
 # define IPRT_WITH_DYNAMIC_CRYPT_R
 #endif
-#if (defined(RT_OS_LINUX) || defined(RT_OS_OS2)) && !defined(_GNU_SOURCE)
+#if (defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(RT_OS_OS2)) && !defined(_GNU_SOURCE)
 # define _GNU_SOURCE
 #endif
 
@@ -64,7 +64,7 @@
 # include <shadow.h>
 #endif
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_OS2)
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(RT_OS_OS2)
 /* While Solaris has posix_spawn() of course we don't want to use it as
  * we need to have the child in a different process contract, no matter
  * whether it is started detached or not. */
@@ -97,6 +97,10 @@
 # include <iprt/asm.h>
 #endif
 
+#ifdef RT_OS_FREEBSD
+# include <sys/param.h>
+#endif
+
 #ifdef RT_OS_SOLARIS
 # include <limits.h>
 # include <sys/ctfs.h>
@@ -372,7 +376,7 @@ static int rtCheckCredentials(const char *pszUser, con
     if (pPwd->pw_passwd && *pPwd->pw_passwd)
 # endif
     {
-# if defined(RT_OS_LINUX) || defined(RT_OS_OS2)
+# if (defined(RT_OS_FREEBSD) && __FreeBSD_version >= 1200000) || defined(RT_OS_LINUX) || defined(RT_OS_OS2)
 #  ifdef IPRT_WITH_DYNAMIC_CRYPT_R
         size_t const       cbCryptData = RT_MAX(sizeof(struct crypt_data) * 2, _256K);
 #  else




--- src/VBox/Storage/testcase/Makefile.kmk.orig	2019-11-21 17:03:07 UTC
+++ src/VBox/Storage/testcase/Makefile.kmk
@@ -146,7 +146,7 @@ if defined(VBOX_WITH_TESTCASES) || defined(VBOX_WITH_V
    vbox-img_LIBS += xml2
   endif
  else ifeq ($(KBUILD_TARGET),freebsd)
-  vbox-img_LIBS += iconv
+  vbox-img_LIBS += crypt iconv
   ifdef SDK_VBOX_LIBXML2_LIBS
    vbox-img_LIBS += xml2 lzma
   endif
@@ -191,8 +191,10 @@ if    defined(VBOX_WITH_TESTCASES) && defined(VBOX_WIT
   ifdef SDK_VBOX_LIBXML2_LIBS
    vdkeystoremgr_LIBS += xml2
   endif
- else if1of ($(KBUILD_TARGET),darwin freebsd)
+ else ifeq ($(KBUILD_TARGET),darwin)
   vdkeystoremgr_LIBS += iconv
+ else ifeq ($(KBUILD_TARGET),freebsd)
+  vdkeystoremgr_LIBS += crypt iconv
  else ifeq ($(KBUILD_TARGET),win)
   vdkeystoremgr_SDKS.win = VBOX_NTDLL
  else ifeq ($(KBUILD_TARGET),solaris)

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp (-11 lines)
1	--- src/VBox/VMM/VMMR0/GVMMR0.cpp.orig 2018-01-15 14:56:33.000000000 +0000
2	+++ src/VBox/VMM/VMMR0/GVMMR0.cpp 2018-01-17 01:13:24.832105000 +0000
3	@@ -1243,7 +1243,7 @@ static void gvmmR0CleanupVM(PGVM pGVM)
4
5	GMMR0CleanupVM(pGVM);
6
7	- AssertCompile((uintptr_t)NIL_RTTHREADCTXHOOK == 0); /* Depends on zero initialized memory working for NIL at the moment. */
8	+ AssertCompile(NIL_RTTHREADCTXHOOK == (RTTHREADCTXHOOK)0); /* Depends on zero initialized memory working for NIL at the moment. */
9	for (VMCPUID idCpu = 0; idCpu < pGVM->cCpus; idCpu++)
10	{
11	/** @todo Can we busy wait here for all thread-context hooks to be

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_VMReq.cpp (-11 lines)
1	--- src/VBox/VMM/VMMR3/VMReq.cpp.orig 2018-01-15 14:56:37 UTC
2	+++ src/VBox/VMM/VMMR3/VMReq.cpp
3	@@ -669,7 +669,7 @@ VMMR3DECL(int) VMR3ReqAlloc(PUVM pUVM, PVMREQ *ppReq,
4	Assert(pReq->enmType == VMREQTYPE_INVALID);
5	Assert(pReq->enmState == VMREQSTATE_FREE);
6	Assert(pReq->pUVM == pUVM);
7	- ASMAtomicXchgSize(&pReq->pNext, NULL);
8	+ ASMAtomicXchgSize(&pReq->pNext, (uintptr_t)NULL);
9	pReq->enmState = VMREQSTATE_ALLOCATED;
10	pReq->iStatus = VERR_VM_REQUEST_STATUS_STILL_PENDING;
11	pReq->fFlags = VMREQFLAGS_VBOX_STATUS;




--- src/VBox/ValidationKit/Config.kmk.orig	2019-11-21 17:03:18 UTC
+++ src/VBox/ValidationKit/Config.kmk
@@ -50,6 +50,9 @@ ifn1of ($(KBUILD_TARGET), darwin solaris win)
  TEMPLATE_VBoxValidationKitR3Base_LDFLAGS         = $(filter-out -static, $(TEMPLATE_VBoxR3Static_LDFLAGS))
 endif
 TEMPLATE_VBoxValidationKitR3Base_LIBS = $(TEMPLATE_VBoxR3Static_LIBS)
+if1of ($(KBUILD_TARGET), freebsd)
+ TEMPLATE_VBoxValidationKitR3Base_LIBS += crypt
+endif
 if1of ($(KBUILD_TARGET), linux)
  TEMPLATE_VBoxValidationKitR3Base_LIBS += supc++
  TEMPLATE_VBoxValidationKitR3Base_LDTOOL = $(subst GXX,GCC,$(TEMPLATE_VBoxR3Static_TOOL))

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_Makefile.kmk (-2 / +2 lines)
1	--- src/libs/xpcom18a4/Makefile.kmk.orig 2019-01-25 18:32:58 UTC	1	--- src/libs/xpcom18a4/Makefile.kmk.orig 2019-11-21 17:03:58 UTC
2	+++ src/libs/xpcom18a4/Makefile.kmk	2	+++ src/libs/xpcom18a4/Makefile.kmk
3	@@ -980,6 +980,8 @@ VBoxXPCOM_LIBS = \	3	@@ -985,6 +985,8 @@ VBoxXPCOM_LIBS = \
4	$(VBox-xpcom-proxy_1_TARGET) \	4	$(VBox-xpcom-proxy_1_TARGET) \
5	$(VBox-xpcom-nspr_1_TARGET) \	5	$(VBox-xpcom-nspr_1_TARGET) \
6	$(VBoxXPCOMGlue_s_1_TARGET)	6	$(VBoxXPCOMGlue_s_1_TARGET)




--- src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c.orig	2019-11-21 17:04:13 UTC
+++ src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c
@@ -49,6 +49,9 @@
 #include <string.h>

 
 static pthread_mutexattr_t _pt_mattr;
 static pthread_condattr_t _pt_cvar_attr;
@@ -798,6 +801,7 @@ 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)) \
-    || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI)
+    || (defined(FREEBSD) && __FreeBSD_version < 1200059) \
     || defined(OPENBSD) || defined(BSDI)
 /* union semun is defined by including <sys/sem.h> */
 #else
 /* according to X/OPEN we have to define it ourselves */

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 2019-11-21 17:04:26 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




--- src/recompiler/Makefile.kmk.orig	2019-01-25 18:33:40 UTC
+++ src/recompiler/Makefile.kmk
@@ -63,6 +63,9 @@ else
  # Missing fpclassify. Is there a better define or flag for this?
  VBoxRemPrimary_DEFS.solaris  += __C99FEATURES__
 endif # win
+# XXX Work around a linker issue with GCC 8.x & LLD:
+# ld: error: translate.c:(.debug_loc+0xA40FD): has non-ABS relocation R_386_GOTOFF against symbol 'cpu_regs'
+VBoxRemPrimary_CFLAGS.freebsd.x86 += -g0
 VBoxRemPrimary_DEFS           += IN_REM_R3 REM_INCLUDE_CPU_H NEED_CPU_H
 #VBoxRemPrimary_DEFS           += REM_PHYS_ADDR_IN_TLB
 #VBoxRemPrimary_DEFS           += DEBUG_ALL_LOGGING DEBUG_DISAS DEBUG_PCALL CONFIG_DEBUG_EXEC DEBUG_FLUSH DEBUG_IOPORT DEBUG_SIGNAL DEBUG_TLB_CHECK DEBUG_TB_INVALIDATE DEBUG_TLB  # Enables huge amounts of debug logging.

Lines 6-11 bin/VBoxManage Link Here

(-)emulators/virtualbox-ose/pkg-plist (-10 / +9 lines)
6	%%X11%%bin/VBoxSDL	6	%%X11%%bin/VBoxSDL
7	bin/VBoxVRDP	7	bin/VBoxVRDP
8	%%QT%%bin/VirtualBox	8	%%QT%%bin/VirtualBox
		9	%%QT%%bin/VirtualBoxVM
		10	bin/vbox-img
9	bin/vboxautostart	11	bin/vboxautostart
10	bin/vboxballoonctrl	12	bin/vboxballoonctrl
11	bin/vboxbugreport	13	bin/vboxbugreport
Lines 14-19 bin/vboxmanage Link Here
14	%%X11%%bin/vboxsdl	16	%%X11%%bin/vboxsdl
15	%%WEBSERVICE%%bin/vboxwebsrv	17	%%WEBSERVICE%%bin/vboxwebsrv
16	%%QT%%bin/virtualbox	18	%%QT%%bin/virtualbox
		19	%%QT%%bin/virtualboxvm
17	include/virtualbox/VirtualBox_XPCOM.h	20	include/virtualbox/VirtualBox_XPCOM.h
18	include/virtualbox/ipcIClientObserver.h	21	include/virtualbox/ipcIClientObserver.h
19	include/virtualbox/ipcIDConnectService.h	22	include/virtualbox/ipcIDConnectService.h
Lines 369-374 include/virtualbox/xpcom/xptinfo.h Link Here
369	%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/policy.py	372	%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/policy.py
370	%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server%%PYTHON_PYCDIR%%policy%%PYTHON_PYCEXT%%	373	%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server%%PYTHON_PYCDIR%%policy%%PYTHON_PYCEXT%%
371	%%QT%%lib/virtualbox/DbgPlugInDiggers.so	374	%%QT%%lib/virtualbox/DbgPlugInDiggers.so
		375	%%QT%%lib/virtualbox/UICommon.so
372	lib/virtualbox/VBox.sh	376	lib/virtualbox/VBox.sh
373	lib/virtualbox/VBoxAuth.so	377	lib/virtualbox/VBoxAuth.so
374	lib/virtualbox/VBoxAuthSimple.so	378	lib/virtualbox/VBoxAuthSimple.so
Lines 378-389 lib/virtualbox/VBoxBugReport Link Here
378	lib/virtualbox/VBoxDD.so	382	lib/virtualbox/VBoxDD.so
379	lib/virtualbox/VBoxDD2.so	383	lib/virtualbox/VBoxDD2.so
380	lib/virtualbox/VBoxDDR0.r0	384	lib/virtualbox/VBoxDDR0.r0
381	lib/virtualbox/VBoxDDRC.rc
382	lib/virtualbox/VBoxDDU.so	385	lib/virtualbox/VBoxDDU.so
383	%%QT%%lib/virtualbox/VBoxDbg.so	386	%%QT%%lib/virtualbox/VBoxDbg.so
384	%%QT%%lib/virtualbox/VBoxDragAndDropSvc.so	387	%%QT%%lib/virtualbox/VBoxDragAndDropSvc.so
385	lib/virtualbox/VBoxEFI32.fd
386	lib/virtualbox/VBoxEFI64.fd
387	lib/virtualbox/VBoxExtPackHelperApp	388	lib/virtualbox/VBoxExtPackHelperApp
388	lib/virtualbox/VBoxGuestControlSvc.so	389	lib/virtualbox/VBoxGuestControlSvc.so
389	lib/virtualbox/VBoxGuestPropSvc.so	390	lib/virtualbox/VBoxGuestPropSvc.so
Lines 399-413 lib/virtualbox/VBoxNetDHCP.so Link Here
399	lib/virtualbox/VBoxNetNAT.so	400	lib/virtualbox/VBoxNetNAT.so
400	%%PYTHON%%lib/virtualbox/VBoxPython.so	401	%%PYTHON%%lib/virtualbox/VBoxPython.so
401	%%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so	402	%%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so
402	lib/virtualbox/VBoxREM.so
403	%%I386%%lib/virtualbox/VBoxREM32.so
404	%%I386%%lib/virtualbox/VBoxREM64.so
405	lib/virtualbox/VBoxRT.so	403	lib/virtualbox/VBoxRT.so
406	%%X11%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxSDL	404	%%X11%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxSDL
407	%%X11%%lib/virtualbox/VBoxSDL.so	405	%%X11%%lib/virtualbox/VBoxSDL.so
408	lib/virtualbox/VBoxSVC	406	lib/virtualbox/VBoxSVC
		407	%%X11%%lib/virtualbox/VBoxSVGA3D.so
409	%%X11%%lib/virtualbox/VBoxSharedClipboard.so	408	%%X11%%lib/virtualbox/VBoxSharedClipboard.so
410	%%X11%%lib/virtualbox/VBoxSharedCrOpenGL.so
411	lib/virtualbox/VBoxSharedFolders.so	409	lib/virtualbox/VBoxSharedFolders.so
412	%%QT%%lib/virtualbox/VBoxTestOGL	410	%%QT%%lib/virtualbox/VBoxTestOGL
413	lib/virtualbox/VBoxVMM.so	411	lib/virtualbox/VBoxVMM.so
Lines 416-425 lib/virtualbox/VBoxXPCOM.so Link Here
416	lib/virtualbox/VBoxXPCOMC.so	414	lib/virtualbox/VBoxXPCOMC.so
417	lib/virtualbox/VBoxXPCOMIPCD	415	lib/virtualbox/VBoxXPCOMIPCD
418	lib/virtualbox/VMMR0.r0	416	lib/virtualbox/VMMR0.r0
419	lib/virtualbox/VMMRC.rc	417	%%QT%%lib/virtualbox/VirtualBox
420	%%QT%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VirtualBox	418	%%QT%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VirtualBoxVM
421	%%QT%%lib/virtualbox/VirtualBox.so	419	%%QT%%lib/virtualbox/VirtualBoxVM.so
422	%%SDK%%lib/virtualbox/sdk	420	%%SDK%%lib/virtualbox/sdk
		421	lib/virtualbox/vbox-img
423	%%WEBSERVICE%%lib/virtualbox/vboxwebsrv	422	%%WEBSERVICE%%lib/virtualbox/vboxwebsrv
424	%%WEBSERVICE%%lib/virtualbox/webtest	423	%%WEBSERVICE%%lib/virtualbox/webtest
425	%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html	424	%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html




# $FreeBSD$

PORTNAME=	virtualbox-ose
PORTVERSION=	6.1.0
PORTREVISION=	1
CATEGORIES=	emulators
MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX?=	-additions
DISTNAME=	VirtualBox-${PORTVERSION}


			virtualbox-ose-lite-[0-9]* \
			virtualbox-ose-nox11-[0-9]*

OPTIONS_DEFINE=	DBUS DEBUG X11
OPTIONS_DEFAULT=	DBUS X11
OPTIONS_SUB=	yes

OPENGL_DESC=		3D pass-through support (requires X11)

DBUS_CONFIGURE_OFF=	--disable-dbus
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
DEBUG_CONFIGURE_ON=	--build-debug
DEBUG_VARS=		KMK_BUILDTYPE=debug
DEBUG_VARS_OFF=		KMK_BUILDTYPE=release
OPENGL_CONFIGURE_OFF=	--disable-opengl
OPENGL_IMPLIES=		X11
OPENGL_USE=		GL=gl,glu XORG=xcomposite,xdamage,xfixes
OPENGL_USES=		gl python:2.7,build xorg
X11_BUILD_DEPENDS=	${LOCALBASE}/include/xorg/compiler.h:x11-servers/xorg-server
X11_RUN_DEPENDS=	xrandr:x11/xrandr
X11_USE=		XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt

KMK_ARCH=	freebsd.${ARCH:S/i386/x86/}
KMK_CONFIG+=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys

.if ${PORT_OPTIONS:MOPENGL}
VBOX_LIBS=	VBoxEGL.so \
		VBoxOGL.so
.endif

.if ${PORT_OPTIONS:MX11}
.else
VBOX_WITH_X11=


.if ${COMPILER_TYPE} == clang
EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-Config.kmk
.if ${COMPILER_FEATURES:Mlibc++}
EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
.endif
.endif

post-patch:
	@${ECHO_CMD} 'VBOX_ONLY_ADDITIONS = 1' > ${WRKSRC}/LocalConfig.kmk

	    ${WRKSRC}/LocalConfig.kmk
	@${ECHO_CMD} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk
.if ${COMPILER_TYPE} == clang
	@${REINPLACE_CMD} -e 's| -mno-align-long-strings||' \
	    ${WRKSRC}/Config.kmk
	    -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk
.endif
	@${REINPLACE_CMD} -e 's|/usr/X11|${LOCALBASE}|g' \
	    ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/display.cpp

	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure \
	    ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
	    ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
	    ${WRKSRC}/src/VBox/Additions/common/crOpenGL/load.c \
	    ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
	    ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
	    ${WRKSRC}/src/VBox/Additions/x11/vboxmouse/Makefile.kmk \

	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
.endif

post-patch-OPENGL-on:
	@${ECHO_CMD} 'VBOX_USE_SYSTEM_GL_HEADERS = 1' >> ${WRKSRC}/LocalConfig.kmk

post-patch-X11-on:
	@${ECHO_CMD} 'VBOX_USE_SYSTEM_XORG_HEADERS = 1' >> \
	    ${WRKSRC}/LocalConfig.kmk

	${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_system.so \
	    ${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so

do-install-OPENGL-on:
	${INSTALL_DATA} ${FILESDIR}/vboxvideo.conf \
	    ${STAGEDIR}${PREFIX}/etc/libmap.d/
	${INSTALL_DATA} ${VBOX_LIBS:S|^|${VBOX_BIN}/|} \
	    ${STAGEDIR}${PREFIX}/lib/

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)emulators/virtualbox-ose-additions/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1571257463	1	TIMESTAMP = 1576163196
2	SHA256 (VirtualBox-5.2.34.tar.bz2) = 9abff37330bba46b97aa836bc886397ba9cfb06cb75be5d60ac31f5ae9c2f2e1	2	SHA256 (VirtualBox-6.1.0.tar.bz2) = 49005ed94454f893fc3955e1e2b9607e85c300235cb983b39d1df2cfcf29f039
3	SIZE (VirtualBox-5.2.34.tar.bz2) = 118268064	3	SIZE (VirtualBox-6.1.0.tar.bz2) = 165322453

Lines 1-9 Link Here

(-)emulators/virtualbox-ose-additions/pkg-plist (-3 lines)
1	%%X11%%bin/VBoxClient	1	%%X11%%bin/VBoxClient
2	%%X11%%bin/VBoxClient-all	2	%%X11%%bin/VBoxClient-all
3	%%OPENGL%%etc/libmap.d/vboxvideo.conf
4	%%X11%%etc/xdg/autostart/vboxclient.desktop	3	%%X11%%etc/xdg/autostart/vboxclient.desktop
5	%%OPENGL%%lib/VBoxEGL.so
6	%%OPENGL%%lib/VBoxOGL.so
7	lib/pam_vbox.so	4	lib/pam_vbox.so
8	%%X11%%lib/xorg/modules/drivers/vboxvideo_drv.so	5	%%X11%%lib/xorg/modules/drivers/vboxvideo_drv.so
9	%%X11%%lib/xorg/modules/input/vboxmouse_drv.so	6	%%X11%%lib/xorg/modules/input/vboxmouse_drv.so

Lines 2-10 Link Here

(-)emulators/virtualbox-ose-kmod/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= virtualbox-ose	4	PORTNAME= virtualbox-ose
5	PORTVERSION= 5.2.34	5	PORTVERSION= 6.1.0
6	CATEGORIES= emulators	6	CATEGORIES= emulators
7	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/	7	MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
8	PKGNAMESUFFIX= -kmod	8	PKGNAMESUFFIX= -kmod
9	DISTNAME= VirtualBox-${PORTVERSION}	9	DISTNAME= VirtualBox-${PORTVERSION}
10		10

Lines 1-3 Link Here

(-)emulators/virtualbox-ose-kmod/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1571257293	1	TIMESTAMP = 1576163196
2	SHA256 (VirtualBox-5.2.34.tar.bz2) = 9abff37330bba46b97aa836bc886397ba9cfb06cb75be5d60ac31f5ae9c2f2e1	2	SHA256 (VirtualBox-6.1.0.tar.bz2) = 49005ed94454f893fc3955e1e2b9607e85c300235cb983b39d1df2cfcf29f039
3	SIZE (VirtualBox-5.2.34.tar.bz2) = 118268064	3	SIZE (VirtualBox-6.1.0.tar.bz2) = 165322453

Lines 2-9 Link Here

(-)emulators/virtualbox-ose-nox11/Makefile (-2 / +2 lines)
2		2
3	PKGNAMESUFFIX= -nox11	3	PKGNAMESUFFIX= -nox11
4		4
5	OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO	5	OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS OPUS
6	OPTIONS_EXCLUDE+= QT5 VPX X11	6	OPTIONS_EXCLUDE+= PULSEAUDIO QT5 VPX X11
7		7
8	MASTERDIR= ${.CURDIR}/../virtualbox-ose	8	MASTERDIR= ${.CURDIR}/../virtualbox-ose
9		9

Lines 10-15 COMMENT= AJAX Web Interface for VirtualBox Link Here

(-)www/phpvirtualbox/Makefile (+2 lines)
10		10
11	LICENSE= GPLv3	11	LICENSE= GPLv3
12		12
		13	IGNORE= does not work with VirtualBox 6.0 or later
		14
13	USES= dos2unix php	15	USES= dos2unix php
14	USE_PHP= json session simplexml soap xml	16	USE_PHP= json session simplexml soap xml
15		17

Return to bug 234878

Lines 2-10 Link Here

(-)emulators/virtualbox-ose/Makefile (-21 / +25 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= virtualbox-ose	4	PORTNAME= virtualbox-ose
5	PORTVERSION= 5.2.34	5	PORTVERSION= 6.1.0
6	CATEGORIES= emulators	6	CATEGORIES= emulators
7	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/	7	MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
8	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}	8	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
9	EXTRACT_ONLY= VirtualBox-${PORTVERSION}${EXTRACT_SUFX}	9	EXTRACT_ONLY= VirtualBox-${PORTVERSION}${EXTRACT_SUFX}
10		10
Lines 16-22 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
16		16
17	BUILD_DEPENDS= yasm:devel/yasm \	17	BUILD_DEPENDS= yasm:devel/yasm \
18	xsltproc:textproc/libxslt \	18	xsltproc:textproc/libxslt \
19	kmk:devel/kBuild \	19	kBuild>=0.1.9998_14:devel/kBuild \
20	gtar:archivers/gtar	20	gtar:archivers/gtar
21	LIB_DEPENDS= libpng.so:graphics/png \	21	LIB_DEPENDS= libpng.so:graphics/png \
22	libxslt.so:textproc/libxslt \	22	libxslt.so:textproc/libxslt \
Lines 40-47 CONFLICTS_INSTALL= virtualbox-ose-additions-* \ Link Here
40	virtualbox-ose-legacy-[0-9]* \	40	virtualbox-ose-legacy-[0-9]* \
41	virtualbox-ose-lite-[0-9]*	41	virtualbox-ose-lite-[0-9]*
42		42
43	LDFLAGS= -lpthread
44
45	VBOXUSER?= vboxusers	43	VBOXUSER?= vboxusers
46	VBOXWSUSER?= vboxusers	44	VBOXWSUSER?= vboxusers
47	VBOXGROUP?= vboxusers	45	VBOXGROUP?= vboxusers
Lines 49-61 USERS= ${VBOXUSER} Link Here
49	GROUPS= ${VBOXGROUP}	47	GROUPS= ${VBOXGROUP}
50	VBOX_DIR= ${PREFIX}/${VBOX_DIR_REL}	48	VBOX_DIR= ${PREFIX}/${VBOX_DIR_REL}
51	VBOX_DIR_REL= lib/virtualbox	49	VBOX_DIR_REL= lib/virtualbox
52	VBOX_LINKS= VBoxVRDP	50	VBOX_LINKS= VBoxVRDP vbox-img
53	VBOX_PROGS= VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \	51	VBOX_PROGS= VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \
54	VBoxManage	52	VBoxManage
55	VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \	53	VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
56	VBoxSVC VBoxXPCOMIPCD	54	VBoxSVC VBoxXPCOMIPCD vbox-img
57		55
58	OPTIONS_DEFINE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO \	56	OPTIONS_DEFINE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS OPUS PULSEAUDIO \
59	PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11	57	PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
60	OPTIONS_DEFAULT= DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11	58	OPTIONS_DEFAULT= DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
61	OPTIONS_SUB= yes	59	OPTIONS_SUB= yes
Lines 64-69 DEBUG_DESC= Debug symbols, additional logs and ass Link Here
64	GUESTADDITIONS_DESC= Build with Guest Additions	62	GUESTADDITIONS_DESC= Build with Guest Additions
65	MANUAL_DESC= Build with user manual	63	MANUAL_DESC= Build with user manual
66	NLS_DESC= Native language support (requires QT5)	64	NLS_DESC= Native language support (requires QT5)
		65	OPUS_DESC= Use libvpx for audio recording (requires VPX)
67	QT5_DESC= Build with QT5 frontend (requires X11)	66	QT5_DESC= Build with QT5 frontend (requires X11)
68	R0LOGGING_DESC= Enable R0 logging (requires DEBUG)	67	R0LOGGING_DESC= Enable R0 logging (requires DEBUG)
69	UDPTUNNEL_DESC= Build with UDP tunnel support	68	UDPTUNNEL_DESC= Build with UDP tunnel support
Lines 80-85 DEBUG_CONFIGURE_ON= --build-debug Link Here
80	MANUAL_BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml	79	MANUAL_BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml
81	MANUAL_CONFIGURE_OFF= --disable-docs	80	MANUAL_CONFIGURE_OFF= --disable-docs
82	NLS_IMPLIES= QT5	81	NLS_IMPLIES= QT5
		82	OPUS_CONFIGURE_OFF= --disable-libopus
		83	OPUS_LIB_DEPENDS= libopus.so:audio/opus
		84	OPUS_IMPLIES= VPX
83	PULSEAUDIO_CONFIGURE_OFF= --disable-pulse	85	PULSEAUDIO_CONFIGURE_OFF= --disable-pulse
84	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	86	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
85	PYTHON_CONFIGURE_OFF= --disable-python	87	PYTHON_CONFIGURE_OFF= --disable-python
Lines 139-150 USE_TEX= dvipsk:build formats:build Link Here
139	.endif	141	.endif
140		142
141	.if ${PORT_OPTIONS:MPYTHON}	143	.if ${PORT_OPTIONS:MPYTHON}
142	USES+= python:2.7	144	USES+= python
143	USE_PYTHON= distutils noegginfo noflavors	145	USE_PYTHON= distutils noegginfo noflavors
144	PYDISTUTILS_PKGNAME= vboxapi	146	PYDISTUTILS_PKGNAME= vboxapi
145	PYDISTUTILS_PKGVERSION= 1.0	147	PYDISTUTILS_PKGVERSION= 1.0
146	.else	148	.else
147	USES+= python:2.7,build	149	USES+= python:build
148	.endif	150	.endif
149		151
150	.if ${PORT_OPTIONS:MQT5}	152	.if ${PORT_OPTIONS:MQT5}
Lines 156-162 USE_QT= buildtools_build core dbus gui linguistto Link Here
156	USE_QT+= printsupport widgets x11extras	158	USE_QT+= printsupport widgets x11extras
157	USE_XORG= xcb	159	USE_XORG= xcb
158	INSTALLS_ICONS= yes	160	INSTALLS_ICONS= yes
159	VBOX_PROGS+= VirtualBox	161	VBOX_PROGS+= VirtualBox VirtualBoxVM
160	VBOX_UTILS+= VBoxTestOGL	162	VBOX_UTILS+= VBoxTestOGL
161	VBOX_WITH_QT= 1	163	VBOX_WITH_QT= 1
162	.else	164	.else
Lines 208-217 CC= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER} Link Here
208	CXX= ${LOCALBASE}/bin/clang++${VBOX_LLVM_VER}	210	CXX= ${LOCALBASE}/bin/clang++${VBOX_LLVM_VER}
209	VBOX_LLVM_VER?= 70	211	VBOX_LLVM_VER?= 70
210	.endif	212	.endif
211	PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
212	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \	213	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \
213	${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk \	214	${PATCHDIR}/extrapatch-src_VBox_Devices_PC_ipxe_Makefile.kmk
214	${PATCHDIR}/extrapatch-src-recompiler-Makefile.kmk
215	.endif	215	.endif
216		216
217	.if ${PYTHON_MAJOR_VER} >= 3	217	.if ${PYTHON_MAJOR_VER} >= 3
Lines 250-255 post-patch: Link Here
250	${WRKSRC}/LocalConfig.kmk	250	${WRKSRC}/LocalConfig.kmk
251	@${ECHO_CMD} 'VBOX_WITH_RUNPATH = ${VBOX_DIR}' >> \	251	@${ECHO_CMD} 'VBOX_WITH_RUNPATH = ${VBOX_DIR}' >> \
252	${WRKSRC}/LocalConfig.kmk	252	${WRKSRC}/LocalConfig.kmk
		253	@${ECHO_CMD} 'VBOX_WITH_VBOX_IMG = ${VBOX_DIR}' >> \
		254	${WRKSRC}/LocalConfig.kmk
253	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \	255	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \
254	${WRKSRC}/LocalConfig.kmk	256	${WRKSRC}/LocalConfig.kmk
255	@${ECHO_CMD} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk	257	@${ECHO_CMD} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk
Lines 285-299 post-patch: Link Here
285	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \	287	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
286	${WRKSRC}/LocalConfig.kmk	288	${WRKSRC}/LocalConfig.kmk
287	.endif	289	.endif
		290	.if empty(PORT_OPTIONS:MX11)
		291	@${ECHO} 'VBOX_WITH_VMSVGA3D =' >> ${WRKSRC}/LocalConfig.kmk
		292	.endif
288	.if ${COMPILER_TYPE} == clang	293	.if ${COMPILER_TYPE} == clang
289	@${REINPLACE_CMD} -e 's\| -finline-limit=8000\|\|' \	294	@${REINPLACE_CMD} -e 's\| -mno-align-long-strings\|\|' \
290	-e 's\| -mpreferred-stack-boundary=2\|\|' ${WRKSRC}/Config.kmk	295	${WRKSRC}/Config.kmk
		296	@${REINPLACE_CMD} -e 's\|-mpreferred-stack-boundary=2 \|\|' \
		297	${WRKSRC}/Config.kmk \
		298	${WRKSRC}/src/VBox/Devices/PC/ipxe/Makefile.kmk
291	@${REINPLACE_CMD} -e 's\| -fpermissive\|\|' ${WRKSRC}/Config.kmk \	299	@${REINPLACE_CMD} -e 's\| -fpermissive\|\|' ${WRKSRC}/Config.kmk \
292	${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk	300	${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk
293	@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk
294	@${SED} -e 's\|GXX3\|VBoxGccFreeBSD\|g' \
295	${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
296	${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
297	.endif	301	.endif
298	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \	302	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \
299	${WRKSRC}/Config.kmk ${WRKSRC}/configure \	303	${WRKSRC}/Config.kmk ${WRKSRC}/configure \
Lines 337-343 do-install: Link Here
337		341
338	${MKDIR} ${STAGEDIR}${VBOX_DIR}	342	${MKDIR} ${STAGEDIR}${VBOX_DIR}
339	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \	343	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \
340	".fd .r0 .rc .so components" ${STAGEDIR}${VBOX_DIR}	344	".fd .r0 *.so components" ${STAGEDIR}${VBOX_DIR}
341	.if ${PORT_OPTIONS:MPYTHON} \|\| ${PORT_OPTIONS:MWEBSERVICE}	345	.if ${PORT_OPTIONS:MPYTHON} \|\| ${PORT_OPTIONS:MWEBSERVICE}
342	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}	346	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
343	.endif	347	.endif

Lines 1-22 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-Config.kmk (-10 / +10 lines)
1	--- Config.kmk.orig 2016-07-18 11:50:32 UTC	1	--- Config.kmk.orig 2019-11-21 16:51:26 UTC
2	+++ Config.kmk	2	+++ Config.kmk
3	@@ -3537,6 +3537,7 @@ ifdef VBOX_WITH_RAW_MODE	3	@@ -4291,6 +4291,7 @@ ifdef VBOX_WITH_RAW_MODE
4	TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC32_TOOL)	4	TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC32_TOOL)
5	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)	5	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)
6	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)	6	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)
7	+ TEMPLATE_VBoxRc_CXXFLAGS.freebsd = -fno-builtin	7	+ TEMPLATE_VBoxRc_CXXFLAGS.freebsd = -fno-builtin
8	ifeq ($(KBUILD_TARGET),solaris)	8	if $(VBOX_GCC32_VERSION_CC) < 30400
9	TEMPLATE_VBoxRc_LDFLAGS = -r	9	TEMPLATE_VBoxRc_DEFS += RT_WITHOUT_PRAGMA_ONCE
10	else	10	endif
11	@@ -3677,6 +3678,7 @@ ifeq ($(VBOX_LDR_FMT),elf)	11	@@ -4438,6 +4439,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
12	TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)	12	TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
13	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)	13	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)
14	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)	14	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)
15	+TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -fno-builtin	15	+TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -fno-builtin
16	TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding	16	TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
17	TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables	17	TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
18	ifeq ($(KBUILD_TARGET),solaris)	18	TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding
19	@@ -3945,7 +3947,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CM	19	@@ -4860,7 +4862,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
20	\| xargs -J% objcopy % $(out)	20	\| xargs -J% objcopy % $(out)
21		21
22	## Strip debug info (comment out if debugging or something).	22	## Strip debug info (comment out if debugging or something).

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-Config.kmk (-60 / +143 lines)
1	--- Config.kmk.orig 2019-05-13 13:12:00 UTC	1	--- Config.kmk.orig 2019-11-21 16:51:26 UTC
2	+++ Config.kmk	2	+++ Config.kmk
3	@@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)	3	@@ -465,11 +465,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)
4	# Enable OSS audio support.	4	# Enable OSS audio support.
5	VBOX_WITH_AUDIO_OSS = 1	5	VBOX_WITH_AUDIO_OSS = 1
6	endif	6	endif
Lines 14-20 Link Here
14	# Enable PulseAudio audio support.	14	# Enable PulseAudio audio support.
15	VBOX_WITH_AUDIO_PULSE = 1	15	VBOX_WITH_AUDIO_PULSE = 1
16	endif	16	endif
17	@@ -464,11 +464,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1	17	@@ -484,11 +484,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1
18	# Enable PCI passthrough support.	18	# Enable PCI passthrough support.
19	VBOX_WITH_PCI_PASSTHROUGH = 1	19	VBOX_WITH_PCI_PASSTHROUGH = 1
20	# Enable statically linked dbus support.	20	# Enable statically linked dbus support.
Lines 28-43 Link Here
28	VBOX_WITH_PAM = 1	28	VBOX_WITH_PAM = 1
29	endif	29	endif
30	# Enable internal networking.	30	# Enable internal networking.
31	@@ -664,7 +664,7 @@ VBOX_WITH_TESTCASES = 1	31	@@ -496,7 +496,7 @@ VBOX_WITH_INTERNAL_NETWORKING = 1
32	VBOX_WITH_VDITOOL =	32	# Enable vmsvga (svga2) graphics device variant, 2D part
33	# Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled	33	VBOX_WITH_VMSVGA = 1
34	VBOX_WITH_VBOX_IMG =	34	# Enable vmsvga (svga2) graphics device variant, 3D part
35	-if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)	35	-if1of ($(KBUILD_TARGET), darwin linux win)
36	+if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)	36	+if1of ($(KBUILD_TARGET), darwin freebsd linux win)
37	# Enables the video capturing support.	37	VBOX_WITH_VMSVGA3D = 1
38	VBOX_WITH_VIDEOREC = 1	38	endif
39	# Enable VPX (VP8 / VP9 codec), used for video capturing.	39	# Enable the generic 3D settings support if at least one 3D capable solution is enabled
40	@@ -992,10 +992,6 @@ ifeq ($(KBUILD_TARGET),darwin)	40	@@ -641,7 +641,7 @@ VBOX_WITH_MAIN_USB_ID_DATABASE = 1
		41	#endif
		42	# Set this to prefix all C symbols in XPCOM, to avoid dynamic linking problems
		43	# caused by our XPCOM library polluting the symbol namespace for system libs.
		44	-if1of ($(KBUILD_TARGET), linux solaris)
		45	+if1of ($(KBUILD_TARGET), freebsd linux solaris)
		46	VBOX_WITH_XPCOM_NAMESPACE_CLEANUP = 1
		47	endif
		48	# The webservices api.
		49	@@ -1062,10 +1062,6 @@ ifeq ($(KBUILD_TARGET),darwin)
41	VBOX_WITH_VBOXSDL=	50	VBOX_WITH_VBOXSDL=
42	endif	51	endif
43		52
Lines 48-54 Link Here
48	ifeq ($(KBUILD_TARGET),haiku)	57	ifeq ($(KBUILD_TARGET),haiku)
49	# Don't bother with SDL ttf for now.	58	# Don't bother with SDL ttf for now.
50	VBOX_WITH_SECURELABEL=	59	VBOX_WITH_SECURELABEL=
51	@@ -1155,7 +1151,7 @@ ifdef VBOX_OSE	60	@@ -1228,7 +1224,7 @@ ifdef VBOX_OSE
52	VBOX_WITH_KCHMVIEWER=	61	VBOX_WITH_KCHMVIEWER=
53	VBOX_WITH_PLUGIN_CRYPT=	62	VBOX_WITH_PLUGIN_CRYPT=
54	VBOX_WITH_DRAG_AND_DROP_PROMISES=	63	VBOX_WITH_DRAG_AND_DROP_PROMISES=
Lines 57-89 Link Here
57	VBOX_WITH_DOCS=	66	VBOX_WITH_DOCS=
58	VBOX_WITH_DOCS_PACKING=	67	VBOX_WITH_DOCS_PACKING=
59	endif	68	endif
60	@@ -1176,14 +1172,14 @@ ifdef VBOX_OSE	69	@@ -4874,7 +4870,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
61	ifn1of ($(KBUILD_TARGET), darwin linux solaris win)
62	VBOX_WITH_INSTALLER=
63	endif
64	- if1of ($(KBUILD_TARGET), win)
65	+ # if1of ($(KBUILD_TARGET), win)
66	# Undefine codec libraries which are not needed.
67	VBOX_WITH_LIBVPX=
68	VBOX_WITH_LIBOPUS=
69	# Disable video recording (with audio support).
70	VBOX_WITH_VIDEOREC=
71	VBOX_WITH_AUDIO_VIDEOREC=
72	- endif
73	+ # endif
74	# branding
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
77	@@ -4575,7 +4571,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \
78	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
79	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
80	-nostdinc -std=c99
81	-TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
82	+TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
83	TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
84	-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \
85	-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef
86	@@ -4622,7 +4618,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
87	\| xargs -J% objcopy % $(outbase).kld	70	\| xargs -J% objcopy % $(outbase).kld
88		71
89	# Link the final .ko (a shared object).	72	# Link the final .ko (a shared object).
Lines 92-98 Link Here
92	endef	75	endef
93	endif # x86	76	endif # x86
94		77
95	@@ -4908,10 +4904,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \	78	@@ -5184,10 +5180,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \
96	TEMPLATE_VBOXR3EXE_CFLAGS += -fno-pic	79	TEMPLATE_VBOXR3EXE_CFLAGS += -fno-pic
97	TEMPLATE_VBOXR3EXE_CXXFLAGS += -fno-pic	80	TEMPLATE_VBOXR3EXE_CXXFLAGS += -fno-pic
98	TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic	81	TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic
Lines 112-127 Link Here
112	/usr/include \	95	/usr/include \
113	/usr/X11R6/include \	96	/usr/X11R6/include \
114	/usr/local/include	97	/usr/local/include
115	@@ -5202,7 +5206,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!	98	@@ -5219,6 +5223,7 @@ TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile = $(TEMPLATE_VB
116	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain	99	TEMPLATE_VBOXR3EXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
117	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE)	100	endif
118	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)	101	ifdef VBOX_WITH_ORIGIN
119	-else ifn1of ($(KBUILD_TARGET), os2 solaris)	102	+ TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd += $(VBOX_GCC_ORIGIN_OPT)
120	+else ifn1of ($(KBUILD_TARGET), freebsd os2 solaris)	103	TEMPLATE_VBOXR3EXE_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)
		104	endif
		105	endif
		106	@@ -5358,7 +5363,7 @@ ifeq ($(KBUILD_TARGET),win)
		107	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
		108	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \
		109	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/oldnames.lib
		110	-else ifn1of ($(KBUILD_TARGET), darwin linux solaris)
		111	+else ifn1of ($(KBUILD_TARGET), darwin freebsd linux solaris)
		112	# The gcc guys sans darwin, linux and solaris (don't depend on statically compiled system libs there)
		113	TEMPLATE_VBOXR3STATIC_CFLAGS = $(TEMPLATE_VBOXR3EXE_CFLAGS) -static
		114	TEMPLATE_VBOXR3STATIC_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -static
		115	@@ -5406,8 +5411,10 @@ else
		116	TEMPLATE_VBoxR3Static_LIBS += \
		117	$(PATH_STAGE_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \
		118	$(SDK_VBOX_ZLIB_LIBS)
		119	- if1of ($(KBUILD_TARGET),darwin freebsd)
		120	+ ifeq ($(KBUILD_TARGET),darwin)
		121	TEMPLATE_VBoxR3Static_LIBS += iconv
		122	+ else ifeq ($(KBUILD_TARGET),freebsd)
		123	+ TEMPLATE_VBoxR3Static_LIBS += crypt iconv
		124	else ifeq ($(KBUILD_TARGET),solaris)
		125	TEMPLATE_VBoxR3Static_LIBS += kstat
		126	endif
		127	@@ -5503,6 +5510,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
		128	else ifn1of ($(KBUILD_TARGET), os2 solaris)
121	# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)	129	# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)
122	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))	130	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
		131	+ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd))
123	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))	132	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
124	@@ -5729,10 +5733,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI	133	endif
		134
		135	@@ -5530,6 +5538,7 @@ TEMPLATE_VBoxR3HardenedTstDll_INST = $(INST_TESTCASE)
		136	TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.win = $(TEMPLATE_VBoxR3TstDll_LDFLAGS.win) -IntegrityCheck
		137	ifn1of ($(KBUILD_TARGET), win os2)
		138	TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3TstDll_LDFLAGS))
		139	+ TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3TstDll_LDFLAGS.freebsd))
		140	TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3TstDll_LDFLAGS.linux))
		141	endif
		142
		143	@@ -5552,6 +5561,7 @@ ifndef VBOX_WITH_HARDENING
		144	TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
		145	endif
		146	ifdef VBOX_WITH_ORIGIN
		147	+ TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS.freebsd += $(VBOX_GCC_ORIGIN_OPT)
		148	TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)
		149	endif
		150	endif
		151	@@ -6078,10 +6088,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI
125	else ifeq ($(KBUILD_TARGET),haiku)	152	else ifeq ($(KBUILD_TARGET),haiku)
126	TEMPLATE_VBOXMAINEXE_TOOL = GXX3	153	TEMPLATE_VBOXMAINEXE_TOOL = GXX3
127	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) network stdc++ supc++	154	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) network stdc++ supc++
Lines 141-147 Link Here
141	/usr/include \	168	/usr/include \
142	/usr/X11R6/include \	169	/usr/X11R6/include \
143	/usr/local/include	170	/usr/local/include
144	@@ -6271,13 +6283,10 @@ ifdef VBOX_WITH_QTGUI	171	@@ -6113,6 +6131,7 @@ TEMPLATE_VBOXMAINEXE_LDFLAGS += '$(VBOX_GCC
		172	TEMPLATE_VBOXMAINEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
		173	endif
		174	ifdef VBOX_WITH_ORIGIN
		175	+TEMPLATE_VBOXMAINEXE_LDFLAGS.freebsd += $(VBOX_GCC_ORIGIN_OPT)
		176	TEMPLATE_VBOXMAINEXE_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)
		177	endif
		178
		179	@@ -6670,13 +6689,10 @@ ifdef VBOX_WITH_QTGUI
145	TEMPLATE_VBOXQTGUIEXE_LIBPATH += \	180	TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
146	$(VBOX_LIBPATH_X11)	181	$(VBOX_LIBPATH_X11)
147	ifeq ($(KBUILD_TARGET),freebsd)	182	ifeq ($(KBUILD_TARGET),freebsd)
Lines 156-175 Link Here
156	/usr/local/lib	191	/usr/local/lib
157	endif	192	endif
158	ifeq ($(KBUILD_TARGET),solaris)	193	ifeq ($(KBUILD_TARGET),solaris)
159	@@ -6500,12 +6509,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \	194	@@ -6917,10 +6933,17 @@ TEMPLATE_VBoxBldProg_TOOL = GXX3
		195	TEMPLATE_VBoxBldProg_LIBS = network iconv
		196	TEMPLATE_VBoxBldProg_LIBPATH += \
		197	/boot/common/lib
		198	- else if1of ($(KBUILD_HOST), freebsd openbsd)
		199	+ else ifeq ($(KBUILD_HOST),freebsd)
160	TEMPLATE_VBoxBldProg_TOOL = GXX3	200	TEMPLATE_VBoxBldProg_TOOL = GXX3
161	TEMPLATE_VBoxBldProg_LIBS = pthread	201	TEMPLATE_VBoxBldProg_LIBS = pthread
162	TEMPLATE_VBoxBldProg_INCS += \	202	TEMPLATE_VBoxBldProg_INCS += \
163	- /usr/include \	203	+ /usr/local/include
164	- /usr/X11R6/include \	204	+TEMPLATE_VBoxBldProg_LIBPATH += \
		205	+ /usr/local/lib
		206	+ else ifeq ($(KBUILD_HOST),openbsd)
		207	+TEMPLATE_VBoxBldProg_TOOL = GXX3
		208	+TEMPLATE_VBoxBldProg_LIBS = pthread
		209	+TEMPLATE_VBoxBldProg_INCS += \
		210	/usr/include \
		211	/usr/X11R6/include \
165	/usr/local/include	212	/usr/local/include
166	TEMPLATE_VBoxBldProg_LIBPATH += \	213	@@ -6969,6 +6992,7 @@ TEMPLATE_VBoxAdvBldProg_LIBS.darwin = \
167	- /usr/lib \	214	$(TEMPLATE_VBoxBldProg_LIBS.darwin)
168	- /usr/X11R6/lib \	215	TEMPLATE_VBoxAdvBldProg_LIBS.freebsd = \
169	/usr/local/lib	216	$(TEMPLATE_VBoxAdvBldProg_LIBS) \
170	else ifeq ($(KBUILD_HOST),netbsd)	217	+ crypt \
171	TEMPLATE_VBoxBldProg_TOOL = GXX3	218	iconv \
172	@@ -6906,6 +6911,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \	219	rt \
		220	$(TEMPLATE_VBoxBldProg_LIBS.freebsd)
		221	@@ -7044,6 +7068,7 @@ else # the gcc guys
		222	# Do not inherit sanitizer flags from VBOXR3EXE in guest executables. Deal with them separately.
		223	TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.debug = $(NO_SUCH_VARIABLE)
		224	TEMPLATE_VBOXGUESTR3EXE_CFLAGS.debug = $(NO_SUCH_VARIABLE)
		225	+ TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd))
		226	TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
		227	TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.debug = $(NO_SUCH_VARIABLE)
		228	TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
		229	@@ -7067,6 +7092,7 @@ TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux = \
		230	$(VBOX_GCC_fno-stack-protector)
		231	TEMPLATE_VBOXGUESTR3EXE_CFLAGS.linux = $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux)
		232	# The GNU_HASH ELF tag is not supported by older systems.
		233	+TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.freebsd += $(VBOX_LD_hash_style_sysv)
		234	TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux += $(VBOX_LD_hash_style_sysv)
		235
		236	#
		237	@@ -7079,6 +7105,9 @@ TEMPLATE_NewVBoxGuestR3Exe_LIBS = \
		238	$(VBOX_LIB_VBGL_R3) \
		239	$(VBOX_LIB_IPRT_GUEST_R3) \
		240	$(TEMPLATE_VBOXGUESTR3EXE_LIBS)
		241	+ifeq ($(KBUILD_TARGET),freebsd)
		242	+TEMPLATE_NewVBoxGuestR3Exe_LIBS += crypt
		243	+endif
		244	ifeq ($(KBUILD_TARGET),solaris)
		245	TEMPLATE_NewVBoxGuestR3Exe_LIBS += contract
		246	endif
		247	@@ -7274,6 +7303,7 @@ TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE) =
		248	TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
		249	TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
		250	# The GNU_HASH ELF tag is not supported by older glibc dynamic linkers.
		251	+TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.freebsd = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv))
		252	TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv))
		253	TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE)
		254	TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS = -r
		255	@@ -7383,6 +7413,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \
173	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \	256	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
174	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)	257	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
175	TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed	258	TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-configure (-48 / +7 lines)
1	--- configure.orig 2018-07-16 14:56:48 UTC	1	--- configure.orig 2019-11-21 16:51:26 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-31 Link Here
15	else	15	else
16	INCCURL=""	16	INCCURL=""
17	LIBCURL="-lcurl"	17	LIBCURL="-lcurl"
18	@@ -436,6 +440,9 @@ check_gcc()	18	@@ -1221,7 +1225,7 @@ extern "C" int main(void)
19	elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "$OS" = "darwin" ]; then
20	log_success "found version $cc_ver"
21	# gcc-4.0 is allowed for Darwin only
22	+ elif [ $cc_maj -eq 4 -a $cc_min -eq 2 -a "$OS" = "freebsd" ]; then
23	+ log_success "found version $cc_ver"
24	+ # gcc-4.2 is allowed for FreeBSD only
25	elif [ $cc_maj -lt 4 \
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" \) \
28	@@ -1204,7 +1211,7 @@ extern "C" int main(void)
29	#endif	19	#endif
30	}	20	}
31	EOF	21	EOF
Lines 34-40 Link Here
34	test_execute	24	test_execute
35	fi	25	fi
36	}	26	}
37	@@ -1504,8 +1511,7 @@ EOF	27	@@ -1527,8 +1531,7 @@ EOF
38	if [ $? -eq 0 ]; then	28	if [ $? -eq 0 ]; then
39	echo "(Qt5 from pkg-config)" >> $LOG	29	echo "(Qt5 from pkg-config)" >> $LOG
40	FLGQT5=`pkg-config Qt5Core --cflags`	30	FLGQT5=`pkg-config Qt5Core --cflags`
Lines 44-50 Link Here
44	INCQT5=`strip_I "$FLGQT5"`	34	INCQT5=`strip_I "$FLGQT5"`
45	LIBDIR5=`pkg-config Qt5Core --variable=libdir`	35	LIBDIR5=`pkg-config Qt5Core --variable=libdir`
46	LIBQT5=`pkg-config Qt5Core --libs`	36	LIBQT5=`pkg-config Qt5Core --libs`
47	@@ -1644,7 +1650,7 @@ check_libopus()	37	@@ -1667,7 +1670,7 @@ check_libopus()
48	fi	38	fi
49	cat > $ODIR.tmp_src.cc << EOF	39	cat > $ODIR.tmp_src.cc << EOF
50	#include <cstdio>	40	#include <cstdio>
Lines 53-59 Link Here
53	extern "C" int main(void)	43	extern "C" int main(void)
54	{	44	{
55	OpusEncoder *test;	45	OpusEncoder *test;
56	@@ -1976,8 +1982,8 @@ EOF	46	@@ -1999,8 +2002,8 @@ EOF
57	echo "compiling the following source file:" >> $LOG	47	echo "compiling the following source file:" >> $LOG
58	cat $ODIR.tmp_src.cc >> $LOG	48	cat $ODIR.tmp_src.cc >> $LOG
59	echo "using the following command line:" >> $LOG	49	echo "using the following command line:" >> $LOG
Lines 64-70 Link Here
64	if [ $? -eq 0 ]; then	54	if [ $? -eq 0 ]; then
65	found=1	55	found=1
66	break	56	break
67	@@ -2449,7 +2455,7 @@ for option in "$@"; do	57	@@ -2476,7 +2479,7 @@ for option in "$@"; do
68	--with-openssl-dir=*)	58	--with-openssl-dir=*)
69	OPENSSLDIR=`echo $option \| cut -d'=' -f2`	59	OPENSSLDIR=`echo $option \| cut -d'=' -f2`
70	INCCRYPTO="-I${OPENSSLDIR}/include"	60	INCCRYPTO="-I${OPENSSLDIR}/include"
Lines 73-110 Link Here
73	;;	63	;;
74	--with-ow-dir=*)	64	--with-ow-dir=*)
75	WATCOM=`echo $option \| cut -d'=' -f2`	65	WATCOM=`echo $option \| cut -d'=' -f2`
76	@@ -2763,7 +2769,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then	66	@@ -2840,14 +2843,6 @@ if [ "$OS" = "linux" ]; then
77	check_ssl
78	check_curl
79	[ $WITH_LIBVPX -eq 1 ] && check_vpx
80	- check_libopus
81	+ [ $OSE -eq 0 -a "$OS" != "win" ] && check_libopus
82	[ "$OS" != "darwin" ] && check_z
83	[ "$OS" != "darwin" ] && check_png
84	[ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
85	@@ -2784,13 +2790,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
86	[ $WITH_PYTHON -eq 1 ] && check_python
87	[ $WITH_JAVA -eq 1 ] && check_java
88
89	- # PulseAudio
90	if [ "$OS" = "linux" -o "$OS" = "freebsd" -o "$OS" = "netbsd" ]; then
91	+ if [ $WITH_ALSA -eq 1 ]; then
92	+ check_alsa
93	+ else
94	+ cnf_append "VBOX_WITH_AUDIO_ALSA" ""
95	+ fi
96	if [ $WITH_PULSE -eq 1 ]; then
97	check_pulse
98	elif [ $WITH_PULSE -eq 0 ]; then
99	cnf_append "VBOX_WITH_AUDIO_PULSE" ""
100	fi
101	+ if [ $WITH_DBUS -eq 0 ]; then
102	+ cnf_append "VBOX_WITH_DBUS" ""
103	+ fi
104	fi
105	fi
106
107	@@ -2806,14 +2819,6 @@ if [ "$OS" = "linux" ]; then
108	cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"	67	cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
109	fi	68	fi
110	if [ $ONLY_ADDITIONS -eq 0 ]; then	69	if [ $ONLY_ADDITIONS -eq 0 ]; then

Lines 1-19 Link Here

(-)emulators/virtualbox-ose/files/patch-include-iprt-x86.h (-19 lines)
1	--- include/iprt/x86.h.orig 2014-02-25 11:59:50.000000000 -0500
2	+++ include/iprt/x86.h 2014-03-11 16:46:08.000000000 -0400
3	@@ -35,6 +35,16 @@
4	# pragma D depends_on library vbox-types.d
5	#endif
6
7	+/* Workaround for FreeBSD machine/specialreg.h defining MSRs */
8	+#ifdef RT_OS_FREEBSD
9	+# undef MSR_P5_MC_ADDR
10	+# undef MSR_P5_MC_TYPE
11	+# undef MSR_IA32_PLATFORM_ID
12	+# undef MSR_BBL_CR_CTL3
13	+# undef MSR_IA32_MISC_ENABLE
14	+# undef MSR_IA32_FEATURE_CONTROL
15	+#endif
16	+
17	/* Workaround for Solaris sys/regset.h defining CS, DS */
18	#ifdef RT_OS_SOLARIS
19	# undef CS

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-include_VBox_com_array.h (-27 / +2 lines)
1	--- include/VBox/com/array.h.orig 2019-04-12 15:47:42 UTC	1	--- include/VBox/com/array.h.orig 2019-11-21 16:51:32 UTC
2	+++ include/VBox/com/array.h	2	+++ include/VBox/com/array.h
3	@@ -168,7 +168,7 @@	3	@@ -171,7 +171,7 @@
4		4
5	#include "VBox/com/defs.h"	5	#include "VBox/com/defs.h"
6		6
Lines 9-36 Link Here
9	/** @def VBOX_WITH_TYPE_TRAITS	9	/** @def VBOX_WITH_TYPE_TRAITS
10	* Type traits are a C++ 11 feature, so not available everywhere (yet).	10	* Type traits are a C++ 11 feature, so not available everywhere (yet).
11	* Only GCC 4.6 or newer and MSVC++ 16.0 (Visual Studio 2010) or newer.	11	* Only GCC 4.6 or newer and MSVC++ 16.0 (Visual Studio 2010) or newer.
12	@@ -940,12 +940,12 @@ class SafeArray : public Traits (public)
13	*/
14	T &operator[] (size_t aIdx)
15	{
16	- AssertReturn(m.arr != NULL, ((T )NULL));
17	- AssertReturn(aIdx < size(), ((T )NULL));
18	+ AssertReturn(m.arr != NULL, ((T )1));
19	+ AssertReturn(aIdx < size(), ((T )1));
20	#ifdef VBOX_WITH_XPCOM
21	return m.arr[aIdx];
22	#else
23	- AssertReturn(m.raw != NULL, ((T )NULL));
24	+ AssertReturn(m.raw != NULL, ((T )1));
25	return m.raw[aIdx];
26	#endif
27	}
28	@@ -960,7 +960,7 @@ class SafeArray : public Traits (public)
29	#ifdef VBOX_WITH_XPCOM
30	return m.arr[aIdx];
31	#else
32	- AssertReturn(m.raw != NULL, ((T )NULL));
33	+ AssertReturn(m.raw != NULL, ((T )1));
34	return m.raw[aIdx];
35	#endif
36	}

Lines 1-15 Link Here

(-)emulators/virtualbox-ose/files/patch-include_iprt_assertcompile.h (-15 lines)
1	--- include/iprt/assertcompile.h.orig 2018-01-15 14:49:42 UTC
2	+++ include/iprt/assertcompile.h
3	@@ -104,7 +104,11 @@ RT_C_DECLS_END
4	* @param expr Expression which should be true.
5	*/
6	#ifdef RTASSERT_HAVE_STATIC_ASSERT
7	-# define AssertCompile(expr) static_assert(!!(expr), #expr)
8	+# ifdef __cplusplus
9	+# define AssertCompile(expr) static_assert(!!(expr), #expr)
10	+# else
11	+# define AssertCompile(expr) _Static_assert(!!(expr), #expr)
12	+# endif
13	#else
14	# define AssertCompile(expr) AssertCompileNS(expr)
15	#endif

Lines 1-39 Link Here

(-)emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h (-39 lines)
1	--- include/iprt/cdefs.h.orig 2018-10-15 14:24:52 UTC
2	+++ include/iprt/cdefs.h
3	@@ -2611,28 +2611,28 @@
4
5	/** @def RT_BYTE1
6	* Gets the first byte of something. */
7	-#define RT_BYTE1(a) ( (a) & 0xff )
8	+#define RT_BYTE1(a) ( (uint8_t)((a) & 0xff) )
9	/** @def RT_BYTE2
10	* Gets the second byte of something. */
11	-#define RT_BYTE2(a) ( ((a) >> 8) & 0xff )
12	+#define RT_BYTE2(a) ( (uint8_t)(((a) >> 8) & 0xff) )
13	/** @def RT_BYTE3
14	* Gets the second byte of something. */
15	-#define RT_BYTE3(a) ( ((a) >> 16) & 0xff )
16	+#define RT_BYTE3(a) ( (uint8_t)(((a) >> 16) & 0xff) )
17	/** @def RT_BYTE4
18	* Gets the fourth byte of something. */
19	-#define RT_BYTE4(a) ( ((a) >> 24) & 0xff )
20	+#define RT_BYTE4(a) ( (uint8_t)(((a) >> 24) & 0xff) )
21	/** @def RT_BYTE5
22	* Gets the fifth byte of something. */
23	-#define RT_BYTE5(a) ( ((a) >> 32) & 0xff )
24	+#define RT_BYTE5(a) ( (uint8_t)(((a) >> 32) & 0xff) )
25	/** @def RT_BYTE6
26	* Gets the sixth byte of something. */
27	-#define RT_BYTE6(a) ( ((a) >> 40) & 0xff )
28	+#define RT_BYTE6(a) ( (uint8_t)(((a) >> 40) & 0xff) )
29	/** @def RT_BYTE7
30	* Gets the seventh byte of something. */
31	-#define RT_BYTE7(a) ( ((a) >> 48) & 0xff )
32	+#define RT_BYTE7(a) ( (uint8_t)(((a) >> 48) & 0xff) )
33	/** @def RT_BYTE8
34	* Gets the eight byte of something. */
35	-#define RT_BYTE8(a) ( ((a) >> 56) & 0xff )
36	+#define RT_BYTE8(a) ( (uint8_t)(((a) >> 56) & 0xff) )
37
38
39	/** @def RT_LODWORD

Lines 1-26 Link Here

(-)emulators/virtualbox-ose/files/patch-include_iprt_types.h (-26 lines)
1	--- include/iprt/types.h.orig 2018-05-09 16:32:07 UTC
2	+++ include/iprt/types.h
3	@@ -56,22 +56,9 @@ RT_C_DECLS_END
4	# include <sys/types.h>
5
6	# elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
7	- /*
8	- * Kludge for the FreeBSD kernel:
9	- * stddef.h and sys/types.h have slightly different offsetof definitions
10	- * when compiling in kernel mode. This is just to make GCC shut up.
11	- */
12	-# ifndef _STDDEF_H_
13	-# undef offsetof
14	-# endif
15	+
16	# include <sys/stddef.h>
17	-# ifndef _SYS_TYPES_H_
18	-# undef offsetof
19	-# endif
20	# include <sys/types.h>
21	-# ifndef offsetof
22	-# error "offsetof is not defined!"
23	-# endif
24
25	# elif defined(RT_OS_FREEBSD) && HC_ARCH_BITS == 64 && defined(RT_ARCH_X86)
26	/*

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-include_iprt_x86.h (+19 lines)
	1	--- include/iprt/x86.h.orig 2019-11-21 16:51:45 UTC
	2	+++ include/iprt/x86.h
	3	@@ -38,6 +38,16 @@
	4	# pragma D depends_on library vbox-types.d
	5	#endif
	6
	7	+/* Workaround for FreeBSD machine/specialreg.h defining MSRs */
	8	+#ifdef RT_OS_FREEBSD
	9	+# undef MSR_P5_MC_ADDR
	10	+# undef MSR_P5_MC_TYPE
	11	+# undef MSR_IA32_PLATFORM_ID
	12	+# undef MSR_BBL_CR_CTL3
	13	+# undef MSR_IA32_MISC_ENABLE
	14	+# undef MSR_IA32_FEATURE_CONTROL
	15	+#endif
	16	+
	17	/* Workaround for Solaris sys/regset.h defining CS, DS */
	18	#ifdef RT_OS_SOLARIS
	19	# undef CS

Lines 1-257 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c (-257 lines)
1	--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2017-10-18 07:06:43 UTC
2	+++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c
3	@@ -93,8 +93,6 @@ struct VBoxGuestDeviceState
4	struct resource *pIrqRes;
5	/** Pointer to the IRQ handler. */
6	void *pfnIrqHandler;
7	- /** VMMDev version */
8	- uint32_t u32Version;
9	};
10
11
12	@@ -104,8 +102,7 @@ struct VBoxGuestDeviceState
13	/*
14	* Character device file handlers.
15	*/
16	-static d_fdopen_t vgdrvFreeBSDOpen;
17	-static d_close_t vgdrvFreeBSDClose;
18	+static d_open_t vgdrvFreeBSDOpen;
19	static d_ioctl_t vgdrvFreeBSDIOCtl;
20	static int vgdrvFreeBSDIOCtlSlow(PVBOXGUESTSESSION pSession, u_long ulCmd, caddr_t pvData, struct thread *pTd);
21	static d_write_t vgdrvFreeBSDWrite;
22	@@ -136,8 +133,7 @@ static struct cdevsw g_vgdrvFreeBSDCh
23	{
24	.d_version = D_VERSION,
25	.d_flags = D_TRACKCLOSE \| D_NEEDMINOR,
26	- .d_fdopen = vgdrvFreeBSDOpen,
27	- .d_close = vgdrvFreeBSDClose,
28	+ .d_open = vgdrvFreeBSDOpen,
29	.d_ioctl = vgdrvFreeBSDIOCtl,
30	.d_read = vgdrvFreeBSDRead,
31	.d_write = vgdrvFreeBSDWrite,
32	@@ -145,81 +141,28 @@ static struct cdevsw g_vgdrvFreeBSDCh
33	.d_name = "vboxguest"
34	};
35
36	+/** Device structure. */
37	+static struct cdev *g_pDev;
38	+
39	/** Device extention & session data association structure. */
40	static VBOXGUESTDEVEXT g_DevExt;
41
42	-/** List of cloned device. Managed by the kernel. */
43	-static struct clonedevs *g_pvgdrvFreeBSDClones;
44	-/** The dev_clone event handler tag. */
45	-static eventhandler_tag g_vgdrvFreeBSDEHTag;
46	/** Reference counter */
47	static volatile uint32_t cUsers;
48	/** selinfo structure used for polling. */
49	static struct selinfo g_SelInfo;
50
51	-/**
52	- * DEVFS event handler.
53	- */
54	-static void vgdrvFreeBSDClone(void pvArg, struct ucred pCred, char pszName, int cchName, struct cdev *ppDev)
55	+static void vgdrvFreeBSDDtr(void *pSession)
56	{
57	- int iUnit;
58	- int rc;
59	-
60	- Log(("vgdrvFreeBSDClone: pszName=%s ppDev=%p\n", pszName, ppDev));
61	-
62	- /*
63	- * One device node per user, si_drv1 points to the session.
64	- * /dev/vboxguest<N> where N = {0...255}.
65	- */
66	- if (!ppDev)
67	- return;
68	- if (strcmp(pszName, "vboxguest") == 0)
69	- iUnit = -1;
70	- else if (dev_stdclone(pszName, NULL, "vboxguest", &iUnit) != 1)
71	- return;
72	- if (iUnit >= 256)
73	- {
74	- Log(("vgdrvFreeBSDClone: iUnit=%d >= 256 - rejected\n", iUnit));
75	- return;
76	- }
77	-
78	- Log(("vgdrvFreeBSDClone: pszName=%s iUnit=%d\n", pszName, iUnit));
79	-
80	- rc = clone_create(&g_pvgdrvFreeBSDClones, &g_vgdrvFreeBSDChrDevSW, &iUnit, ppDev, 0);
81	- Log(("vgdrvFreeBSDClone: clone_create -> %d; iUnit=%d\n", rc, iUnit));
82	- if (rc)
83	- {
84	- *ppDev = make_dev(&g_vgdrvFreeBSDChrDevSW,
85	- iUnit,
86	- UID_ROOT,
87	- GID_WHEEL,
88	- 0664,
89	- "vboxguest%d", iUnit);
90	- if (*ppDev)
91	- {
92	- dev_ref(*ppDev);
93	- (*ppDev)->si_flags \|= SI_CHEAPCLONE;
94	- Log(("vgdrvFreeBSDClone: Created *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n",
95	- ppDev, iUnit, (ppDev)->si_drv1, (*ppDev)->si_drv2));
96	- (ppDev)->si_drv1 = (ppDev)->si_drv2 = NULL;
97	- }
98	- else
99	- Log(("vgdrvFreeBSDClone: make_dev iUnit=%d failed\n", iUnit));
100	- }
101	- else
102	- Log(("vgdrvFreeBSDClone: Existing *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n",
103	- ppDev, iUnit, (ppDev)->si_drv1, (*ppDev)->si_drv2));
104	+ VGDrvCommonCloseSession(&g_DevExt, pSession);
105	+ ASMAtomicDecU32(&cUsers);
106	}
107
108	/**
109	* File open handler
110	*
111	*/
112	-#if __FreeBSD_version >= 700000
113	-static int vgdrvFreeBSDOpen(struct cdev pDev, int fOpen, struct thread pTd, struct file *pFd)
114	-#else
115	-static int vgdrvFreeBSDOpen(struct cdev pDev, int fOpen, struct thread pTd)
116	-#endif
117	+static int vgdrvFreeBSDOpen(struct cdev pDev, int fOpen, int DevType, struct thread pTd)
118	{
119	int rc;
120	PVBOXGUESTSESSION pSession;
121	@@ -227,25 +170,18 @@ static int vgdrvFreeBSDOpen(struct cdev
122	LogFlow(("vgdrvFreeBSDOpen:\n"));
123
124	/*
125	- * Try grab it (we don't grab the giant, remember).
126	- */
127	- if (!ASMAtomicCmpXchgPtr(&pDev->si_drv1, (void *)0x42, NULL))
128	- return EBUSY;
129	-
130	- /*
131	* Create a new session.
132	*/
133	rc = VGDrvCommonCreateUserSession(&g_DevExt, &pSession);
134	if (RT_SUCCESS(rc))
135	{
136	- if (ASMAtomicCmpXchgPtr(&pDev->si_drv1, pSession, (void *)0x42))
137	- {
138	- Log(("vgdrvFreeBSDOpen: success - g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, (int)RTProcSelf()));
139	+ Log(("vgdrvFreeBSDOpen: success - g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, (int)RTProcSelf()));
140	+ rc = devfs_set_cdevpriv(pSession, vgdrvFreeBSDDtr);
141	+ if (rc)
142	+ VGDrvCommonCloseSession(&g_DevExt, pSession);
143	+ else
144	ASMAtomicIncU32(&cUsers);
145	- return 0;
146	- }
147	-
148	- VGDrvCommonCloseSession(&g_DevExt, pSession);
149	+ return rc;
150	}
151
152	LogRel(("vgdrvFreeBSDOpen: failed. rc=%d\n", rc));
153	@@ -253,33 +189,6 @@ static int vgdrvFreeBSDOpen(struct cdev
154	}
155
156	/**
157	- * File close handler
158	- *
159	- */
160	-static int vgdrvFreeBSDClose(struct cdev pDev, int fFile, int DevType, struct thread pTd)
161	-{
162	- PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pDev->si_drv1;
163	- Log(("vgdrvFreeBSDClose: fFile=%#x pSession=%p\n", fFile, pSession));
164	-
165	- /*
166	- * Close the session if it's still hanging on to the device...
167	- */
168	- if (VALID_PTR(pSession))
169	- {
170	- VGDrvCommonCloseSession(&g_DevExt, pSession);
171	- if (!ASMAtomicCmpXchgPtr(&pDev->si_drv1, NULL, pSession))
172	- Log(("vgdrvFreeBSDClose: si_drv1=%p expected %p!\n", pDev->si_drv1, pSession));
173	- ASMAtomicDecU32(&cUsers);
174	- /* Don't use destroy_dev here because it may sleep resulting in a hanging user process. */
175	- destroy_dev_sched(pDev);
176	- }
177	- else
178	- Log(("vgdrvFreeBSDClose: si_drv1=%p!\n", pSession));
179	- return 0;
180	-}
181	-
182	-
183	-/**
184	* I/O control request.
185	*
186	* @returns depends...
187	@@ -292,7 +201,11 @@ static int vgdrvFreeBSDClose(struct cdev
188	static int vgdrvFreeBSDIOCtl(struct cdev pDev, u_long ulCmd, caddr_t pvData, int fFile, struct thread pTd)
189	{
190	PVBOXGUESTSESSION pSession;
191	- devfs_get_cdevpriv((void **)&pSession);
192	+ int rc;
193	+
194	+ rc = devfs_get_cdevpriv((void **)&pSession);
195	+ if (rc)
196	+ return rc;
197
198	/*
199	* Deal with the fast ioctl path first.
200	@@ -488,12 +401,14 @@ int VBOXCALL VBoxGuestIDC(void *pvSessio
201
202	static int vgdrvFreeBSDPoll(struct cdev pDev, int fEvents, struct thread td)
203	{
204	- int fEventsProcessed;
205	+ PVBOXGUESTSESSION pSession;
206	+ int fEventsProcessed, rc;
207
208	LogFlow(("vgdrvFreeBSDPoll: fEvents=%d\n", fEvents));
209
210	- PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pDev->si_drv1;
211	- if (RT_UNLIKELY(!VALID_PTR(pSession))) {
212	+ rc = devfs_get_cdevpriv((void **)&pSession);
213	+ if (rc)
214	+ {
215	Log(("vgdrvFreeBSDPoll: no state data for %s\n", devtoname(pDev)));
216	return (fEvents & (POLLHUP\|POLLIN\|POLLRDNORM\|POLLOUT\|POLLWRNORM));
217	}
218	@@ -534,10 +449,7 @@ static int vgdrvFreeBSDDetach(device_t p
219	/*
220	* Reverse what we did in vgdrvFreeBSDAttach.
221	*/
222	- if (g_vgdrvFreeBSDEHTag != NULL)
223	- EVENTHANDLER_DEREGISTER(dev_clone, g_vgdrvFreeBSDEHTag);
224	-
225	- clone_cleanup(&g_pvgdrvFreeBSDClones);
226	+ destroy_dev(g_pDev);
227
228	vgdrvFreeBSDRemoveIRQ(pDevice, pState);
229
230	@@ -689,18 +601,21 @@ static int vgdrvFreeBSDAttach(device_t p
231	if (RT_SUCCESS(rc))
232	{
233	/*
234	- * Configure device cloning.
235	+ * Configure device.
236	*/
237	- clone_setup(&g_pvgdrvFreeBSDClones);
238	- g_vgdrvFreeBSDEHTag = EVENTHANDLER_REGISTER(dev_clone, vgdrvFreeBSDClone, 0, 1000);
239	- if (g_vgdrvFreeBSDEHTag)
240	+ g_pDev = make_dev(&g_vgdrvFreeBSDChrDevSW,
241	+ 0,
242	+ UID_ROOT,
243	+ GID_WHEEL,
244	+ 0664,
245	+ "vboxguest");
246	+ if (g_pDev)
247	{
248	printf(DEVICE_NAME ": loaded successfully\n");
249	return 0;
250	}
251
252	- printf(DEVICE_NAME ": EVENTHANDLER_REGISTER(dev_clone,,,) failed\n");
253	- clone_cleanup(&g_pvgdrvFreeBSDClones);
254	+ printf(DEVICE_NAME ": make_dev failed\n");
255	vgdrvFreeBSDRemoveIRQ(pDevice, pState);
256	}
257	else

Lines 1-98 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports.py (-98 lines)
1	--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py.orig 2014-12-19 16:58:04.474417000 -0500
2	+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py 2014-11-21 10:16:35.000000000 -0500
3	@@ -0,0 +1,95 @@
4	+# Copyright (c) 2001, Stanford University
5	+# All rights reserved.
6	+#
7	+# See the file LICENSE.txt for information on redistributing this software.
8	+
9	+
10	+import sys
11	+
12	+import apiutil
13	+
14	+
15	+def GenerateEntrypoints():
16	+
17	+ #apiutil.CopyrightC()
18	+
19	+ # Get sorted list of dispatched functions.
20	+ # The order is very important - it must match cr_opcodes.h
21	+ # and spu_dispatch_table.h
22	+ print '%include "iprt/asmdefs.mac"'
23	+ print ""
24	+ print "%ifdef RT_ARCH_AMD64"
25	+ print "extern glim"
26	+ print "%else ; X86"
27	+ print "extern glim"
28	+ print "%endif"
29	+ print ""
30	+
31	+ keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
32	+
33	+ for index in range(len(keys)):
34	+ func_name = keys[index]
35	+ if apiutil.Category(func_name) == "Chromium":
36	+ continue
37	+ if apiutil.Category(func_name) == "VBox":
38	+ continue
39	+
40	+ print "BEGINPROC_EXPORTED gl%s" % func_name
41	+ print "%ifdef RT_ARCH_AMD64"
42	+ print "\tmov \trax, qword glim+%d" % (8*index)
43	+ print "\tjmp \t[rax]"
44	+ print "%else ; X86"
45	+ print "\tmov \teax, dword glim+%d" % (4*index)
46	+ print "\tjmp \t[eax]"
47	+ print "%endif"
48	+ print "ENDPROC gl%s" % func_name
49	+ print ""
50	+
51	+
52	+ print ';'
53	+ print '; Aliases'
54	+ print ';'
55	+
56	+ # Now loop over all the functions and take care of any aliases
57	+ allkeys = apiutil.GetAllFunctions(sys.argv[1]+"/APIspec.txt")
58	+ for func_name in allkeys:
59	+ if "omit" in apiutil.ChromiumProps(func_name):
60	+ continue
61	+
62	+ if func_name in keys:
63	+ # we already processed this function earlier
64	+ continue
65	+
66	+ # alias is the function we're aliasing
67	+ alias = apiutil.Alias(func_name)
68	+ if alias:
69	+ # this dict lookup should never fail (raise an exception)!
70	+ index = keys.index(alias)
71	+ print "BEGINPROC_EXPORTED gl%s" % func_name
72	+ print "%ifdef RT_ARCH_AMD64"
73	+ print "\tmov \trax, qword glim+%d" % (8*index)
74	+ print "\tjmp \t[rax]"
75	+ print "%else ; X86"
76	+ print "\tmov \teax, dword glim+%d" % (4*index)
77	+ print "\tjmp \t[eax]"
78	+ print "%endif"
79	+ print "ENDPROC gl%s" % func_name
80	+ print ""
81	+
82	+
83	+ print ';'
84	+ print '; No-op stubs'
85	+ print ';'
86	+
87	+ # Now generate no-op stub functions
88	+ for func_name in allkeys:
89	+ if "stub" in apiutil.ChromiumProps(func_name):
90	+ print "BEGINPROC_EXPORTED gl%s" % func_name
91	+ print "\tleave"
92	+ print "\tret"
93	+ print "ENDPROC gl%s" % func_name
94	+ print ""
95	+
96	+
97	+GenerateEntrypoints()
98	+

Lines 1-79 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk (-79 lines)
1	--- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2016-07-18 11:50:43 UTC
2	+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk
3	@@ -47,9 +47,7 @@ endif
4	if1of ($(KBUILD_TARGET), linux solaris freebsd)
5	#VBoxOGL_DRI = 1
6	DLLS += VBoxEGL
7	- ifn1of ($(KBUILD_TARGET),linux solaris) # No DRI on Solaris yet
8	- VBoxOGL_FAKEDRI = 1
9	- endif
10	+ #VBoxOGL_FAKEDRI = 1
11
12	# Only Solaris right now needs C stubs because I can't figure out how to
13	# generate the GOT based relocation ASM yet.
14	@@ -184,10 +182,12 @@ VBoxOGL_CLEAN.linux += \
15	$(VBOX_PATH_CROGL_GENFILES)/linux_exports.c
16	VBoxOGL_CLEAN.solaris += \
17	$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c
18	+VBoxOGL_CLEAN.freebsd += \
19	+ $(VBOX_PATH_CROGL_GENFILES)/freebsd_exports.c
20	VBoxOGL_CLEAN.win = \
21	$(VBOX_PATH_CROGL_GENFILES)/windows_exports.asm \
22	$(VBOX_PATH_CROGL_GENFILES)/cropengl.def
23	-if1of ($(KBUILD_TARGET), linux solaris)
24	+if1of ($(KBUILD_TARGET), linux solaris freebsd)
25	ifdef VBoxOGL_DRI
26	VBoxOGL_CLEAN += \
27	$(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
28	@@ -200,6 +200,8 @@ if1of ($(KBUILD_TARGET), linux solaris)
29	$(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm
30	VBoxOGL_CLEAN.solaris += \
31	$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm
32	+ VBoxOGL_CLEAN.freebsd += \
33	+ $(VBOX_PATH_CROGL_GENFILES)/freebsd_glxapi_exports.asm
34	endif
35	endif
36	VBoxOGL_LIBS = \
37	@@ -229,6 +231,8 @@ if1of ($(KBUILD_TARGET), linux solaris f
38	else
39	VBoxOGL_SONAME.linux = libGL.so.1
40	VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain
41	+ VBoxOGL_SONAME.freebsd = libGL.so.1
42	+ VBoxOGL_LDFLAGS.freebsd += -Wl,-e,LibMain
43	endif
44	endif
45	ifdef VBOX_WITH_CRHGSMI
46	@@ -237,7 +241,7 @@ endif
47	ifdef VBOX_WITH_WDDM
48	VBoxOGL_DEFS.win += VBOX_WITH_WDDM
49	endif
50	-if1of ($(KBUILD_TARGET), linux)
51	+if1of ($(KBUILD_TARGET), linux freebsd)
52	VBoxOGL_LDFLAGS += -Wl,-z,nodelete
53	endif
54	ifdef VBOX_WITH_WDDM
55	@@ -395,6 +399,16 @@ $(VBOX_PATH_CROGL_GENFILES)/solaris_expo
56	$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm: $(PATH_SUB_CURRENT)/SunOS_i386_glxapi_exports.py \| $$(dir $$@)
57	$(call MSG_GENERATE,python,$@,$<)
58	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
59	+ else ifeq ($(KBUILD_TARGET),freebsd)
60	+$(VBOX_PATH_CROGL_GENFILES)/freebsd_exports_dri.asm: \
61	+ $(PATH_SUB_CURRENT)/FreeBSD_i386_exports_dri.py \
62	+ $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
63	+ \| $$(dir $$@)
64	+ $(call MSG_GENERATE,python,$@,$<)
65	+ $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
66	+$(VBOX_PATH_CROGL_GENFILES)/freebsd_glxapi_exports.asm: $(PATH_SUB_CURRENT)/FreeBSD_i386_glxapi_exports.py \| $$(dir $$@)
67	+ $(call MSG_GENERATE,python,$@,$<)
68	+ $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
69
70	else
71	$(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \
72	@@ -712,6 +726,7 @@ VBoxEGL_SOURCES = egl.c
73	VBoxEGL_INCS = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7
74	VBoxEGL_LIBS = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
75	VBoxEGL_SONAME.linux = libEGL.so.1
76	+VBoxEGL_SONAME.freebsd = libEGL.so.1
77
78	include $(FILE_KBUILD_SUB_FOOTER)
79

Lines 1-17 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient (-17 lines)
1	--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2015-02-12 11:08:13.000000000 -0500
2	+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient 2015-02-12 14:38:40.689104000 -0500
3	@@ -28,9 +28,9 @@
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
6	# not use "exit" here as this script is "source"d, not executed.
7	- /usr/bin/VBoxClient --clipboard
8	- /usr/bin/VBoxClient --checkhostversion
9	- /usr/bin/VBoxClient --display
10	- /usr/bin/VBoxClient --seamless
11	- /usr/bin/VBoxClient --draganddrop
12	+ /usr/local/bin/VBoxClient --clipboard
13	+ /usr/local/bin/VBoxClient --checkhostversion
14	+ /usr/local/bin/VBoxClient --display
15	+ /usr/local/bin/VBoxClient --seamless
16	+ /usr/local/bin/VBoxClient --draganddrop
17	fi

Lines 1-12 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h (-12 lines)
1	--- src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h.orig 2015-03-02 10:09:19.000000000 -0500
2	+++ src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h 2015-03-02 19:42:56.808020000 -0500
3	@@ -241,6 +241,9 @@
4	#define M_FRAG 0x00000800 /* packet is a fragment of a larger packet */
5	#define M_FIRSTFRAG 0x00001000 /* packet is first fragment */
6	#define M_LASTFRAG 0x00002000 /* packet is last fragment */
7	+#ifdef M_SKIP_FIREWALL
8	+#undef M_SKIP_FIREWALL
9	+#endif
10	#define M_SKIP_FIREWALL 0x00004000 /* skip firewall processing */
11	#define M_FREELIST 0x00008000 /* mbuf is on the free list */
12	#define M_VLANTAG 0x00010000 /* ether_vtag is valid */

Lines 1-20 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-Makefile.kmk (-20 lines)
1	--- src/VBox/GuestHost/OpenGL/Makefile.kmk.orig 2019-07-12 08:49:27 UTC
2	+++ src/VBox/GuestHost/OpenGL/Makefile.kmk
3	@@ -94,7 +94,7 @@ VBoxOGLcrutil_DEFS.win += CR_DEBUG_BACKDOOR_ENABLE
4	VBoxOGLcrutil_INCS.win += $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm
5	VBoxOGLcrutil_LIBS.win += $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB)
6	endif
7	-if1of ($(KBUILD_TARGET), linux)
8	+if1of ($(KBUILD_TARGET), linux freebsd)
9	VBoxOGLcrutil_LDFLAGS += -Wl,-z,nodelete
10	endif
11
12	@@ -140,7 +140,7 @@ VBoxOGLhostcrutil_TEMPLATE = VBOXCROGLR3HOSTLIB
13	if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
14	VBoxOGLhostcrutil_INSTTYPE.win = both
15	endif
16	-if1of ($(KBUILD_TARGET), linux)
17	+if1of ($(KBUILD_TARGET), linux freebsd)
18	VBoxOGLhostcrutil_LDFLAGS = $(NO_SUCH_VARIABLE)
19	endif
20	VBoxOGLhostcrutil_LIBS.win = \

Lines 1-25 Link Here

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

Lines 1-15 Link Here

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

Lines 1-67 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh (-67 lines)
1	--- src/VBox/Installer/freebsd/VBox.sh.orig 2016-08-27 05:10:34 UTC
2	+++ src/VBox/Installer/freebsd/VBox.sh
3	@@ -0,0 +1,64 @@
4	+#!/bin/sh
5	+#
6	+# Oracle VM VirtualBox startup script, FreeBSD hosts.
7	+#
8	+# Copyright (C) 2006-2012 Oracle Corporation
9	+#
10	+# This file is part of VirtualBox Open Source Edition (OSE), as
11	+# available from http://www.virtualbox.org. This file is free software;
12	+# you can redistribute it and/or modify it under the terms of the GNU
13	+# General Public License (GPL) as published by the Free Software
14	+# Foundation, in version 2 as it comes in the "COPYING" file of the
15	+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
16	+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
17	+#
18	+
19	+PATH="/usr/bin:/bin:/usr/sbin:/sbin"
20	+CONFIG="/usr/local/etc/vbox/vbox.cfg"
21	+
22	+test -r "${CONFIG}" &&
23	+ . "${CONFIG}"
24	+test -z "${INSTALL_DIR}" &&
25	+ if test -d /usr/local/lib/virtualbox &&
26	+ test -f /usr/local/lib/virtualbox/VBoxRT.so; then
27	+ INSTALL_DIR=/usr/local/lib/virtualbox
28	+ else
29	+ echo "Could not find VirtualBox installation. Please reinstall."
30	+ exit 1
31	+ fi
32	+
33	+# workaround for the KDE dialog problem
34	+KDE_FORK_SLAVES=1; export KDE_FORK_SLAVES
35	+
36	+APP=`basename $0`
37	+case "$APP" in
38	+ VirtualBox\|virtualbox)
39	+ exec "$INSTALL_DIR/VirtualBox" "$@"
40	+ ;;
41	+ VBoxManage\|vboxmanage)
42	+ exec "$INSTALL_DIR/VBoxManage" "$@"
43	+ ;;
44	+ VBoxSDL\|vboxsdl)
45	+ exec "$INSTALL_DIR/VBoxSDL" "$@"
46	+ ;;
47	+ VBoxVRDP\|VBoxHeadless\|vboxheadless)
48	+ exec "$INSTALL_DIR/VBoxHeadless" "$@"
49	+ ;;
50	+ VBoxAutostart\|vboxautostart)
51	+ exec "$INSTALL_DIR/VBoxAutostart" "$@"
52	+ ;;
53	+ VBoxBalloonCtrl\|vboxballoonctrl)
54	+ exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
55	+ ;;
56	+ VBoxBugReport\|vboxbugreport)
57	+ exec "$INSTALL_DIR/VBoxBugReport" "$@"
58	+ ;;
59	+ vboxwebsrv)
60	+ exec "$INSTALL_DIR/vboxwebsrv" "$@"
61	+ ;;
62	+ *)
63	+ echo "Unknown application - $APP"
64	+ exit 1
65	+ ;;
66	+esac
67	+exit 0

Lines 1-14 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp (-14 lines)
1	--- src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp.orig 2015-04-14 15:41:25.000000000 -0400
2	+++ src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp 2015-04-14 18:25:23.156536000 -0400
3	@@ -251,8 +251,9 @@
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;
6	PeriphMatchPattern.pattern.periph_pattern.target_lun = paMatches[i].result.device_result.target_lun;
7	- PeriphMatchPattern.pattern.periph_pattern.flags = PERIPH_MATCH_PATH \| PERIPH_MATCH_TARGET \|
8	- PERIPH_MATCH_LUN;
9	+ PeriphMatchPattern.pattern.periph_pattern.flags = static_cast<periph_pattern_flags>
10	+ (PERIPH_MATCH_PATH \| PERIPH_MATCH_TARGET \|
11	+ PERIPH_MATCH_LUN);
12	PeriphCCB.cdm.num_patterns = 1;
13	PeriphCCB.cdm.pattern_buf_len = sizeof(struct dev_match_result);
14	PeriphCCB.cdm.patterns = &PeriphMatchPattern;

Lines 1-39 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk (-39 lines)
1	--- src/VBox/Main/webservice/Makefile.kmk.orig 2015-10-15 13:59:24 UTC
2	+++ src/VBox/Main/webservice/Makefile.kmk
3	@@ -159,7 +159,6 @@ VBOX_PATH_IDL := $(abspa
4	RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
5
6	PATH_TARGET_SOAPDEMOXML := $(VBOXWEB_OUT_DIR)/demo_soapxml
7	-PATH_TARGET_SOAPDEMOHEADERS := $(VBOXWEB_OUT_DIR)/demo_headers
8	PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
9	PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest
10
11	@@ -515,8 +514,6 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) \|
12	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
13	$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
14	$(PATH_TARGET_SOAPDEMOXML)/dummy_file \
15	- $(wildcard $(PATH_TARGET_SOAPDEMOHEADERS)/*) \
16	- $(PATH_TARGET_SOAPDEMOHEADERS)/dummy_file \
17	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
18	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
19
20	@@ -695,17 +692,14 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
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 $$@)
23	$(RM) -f $@
24	- $(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS)
25	+ $(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMONSMAPS)
26	ifdef VBOX_GSOAP_VERBOSE
27	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/.req.xml $(VBOXWEB_OUT_DIR)/.res.xml $(PATH_TARGET_SOAPDEMOXML)/
28	endif
29	- -$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/soapvbox*.h $(PATH_TARGET_SOAPDEMOHEADERS)/
30	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)/
31	$(APPEND) $@ done
32
33	-$(PATH_TARGET_SOAPDEMONSMAPS) \
34	-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingProxy.h \
35	-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingObject.h: $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
36	+$(PATH_TARGET_SOAPDEMONSMAPS): $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
37
38	# soapcpp2 -2: generate SOAP 1.2 calls
39	# soapcpp2 -S: server-side code only

Lines 1-14 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk (-14 lines)
1	--- src/VBox/Runtime/Makefile.kmk.orig 2014-07-15 13:25:15.000000000 -0400
2	+++ src/VBox/Runtime/Makefile.kmk 2014-07-16 17:15:58.000000000 -0400
3	@@ -146,6 +146,11 @@
4	IPRT_BLDCFG_TYPE=\"$(KBUILD_TYPE)\"
5
6	#
7	+# Set the defines that utf8-posix.cpp needs. It's used by several targets.
8	+#
9	+r3/posix/utf8-posix.cpp_DEFS.freebsd = $(VBOX_ICONV_DEFS)
10	+
11	+#
12	# Unicode Specification reader used to regenerate unidata-*.cpp.
13	#
14	uniread_TEMPLATE = VBoxBldProg

Lines 1-20 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h (-20 lines)
1	Without this patch any waits for periods shorter than a single tick return
2	immediately leading to a lot of unnecessary spinning. For example, I observe that
3	my guest's idle loop does a lot of sleeps with periods slightly shorter than 1 ms
4	(1/hz), e.g. 900us. All that waiting turns into pure spinning and VirtualBox eats
5	100% of a core.
6	The patch improves the situation significantly. Also, it (approximately) follows
7	what tvtohz does.
8
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
11	+++ src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h 2012-12-20 12:07:48.941861966 +0100
12	@@ -82,6 +82,8 @@
13	uint64_t cTicks = ASMMultU64ByU32DivByU32(uTimeout, hz, UINT32_C(1000000000));
14	if (cTicks >= INT_MAX)
15	return RTSEMWAIT_FLAGS_INDEFINITE;
16	+ else if (cTicks == 0 && uTimeout > 0)
17	+ pWait->iTimeout = 1;
18	else
19	pWait->iTimeout = (int)cTicks;
20	#endif

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_VBoxService_Makefile.kmk (+13 lines)
	1	--- src/VBox/Additions/common/VBoxService/Makefile.kmk.orig 2019-11-21 16:54:08 UTC
	2	+++ src/VBox/Additions/common/VBoxService/Makefile.kmk
	3	@@ -172,6 +172,10 @@ VBoxService_LIBS += \
	4	$(VBOX_LIB_IPRT_GUEST_R3) \
	5	$(VBOX_LIB_VBGL_R3) \
	6	$(VBOX_LIB_IPRT_GUEST_R3) # (The joy of unix linkers.)
	7	+if1of ($(KBUILD_TARGET), freebsd)
	8	+ VBoxService_LIBS += \
	9	+ crypt
	10	+endif
	11	ifdef VBOX_WITH_DBUS
	12	if1of ($(KBUILD_TARGET), linux solaris) # FreeBSD?
	13	VBoxService_LIBS += \

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Devices_Makefile.kmk (+44 lines)
	1	--- src/VBox/Devices/Makefile.kmk.orig 2019-11-21 17:00:01 UTC
	2	+++ src/VBox/Devices/Makefile.kmk
	3	@@ -112,6 +112,7 @@ if !defined(VBOX_ONLY_EXTPACKS)
	4	VBoxDDU_LDFLAGS.darwin += -framework IOKit
	5	endif
	6
	7	+ VBoxDDU_LDFLAGS.freebsd = $(VBOX_GCC_NO_UNDEFINED)
	8	VBoxDDU_LDFLAGS.linux = $(VBOX_GCC_NO_UNDEFINED)
	9	$(call VBOX_SET_VER_INFO_DLL,VBoxDDU,VirtualBox VMM Devices and Drivers Utilities)
	10
	11	@@ -241,6 +242,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBU
	12	-framework Carbon \
	13	-framework DiskArbitration \
	14	-framework SystemConfiguration
	15	+ VBoxDD_LDFLAGS.freebsd = $(VBOX_GCC_NO_UNDEFINED)
	16	VBoxDD_LDFLAGS.linux = $(VBOX_GCC_NO_UNDEFINED)
	17
	18	# --- Tracing bits. ---
	19	@@ -283,7 +285,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBU
	20	VBoxDD_SOURCES += Graphics/DevVGA-SVGA.cpp
	21	endif
	22	ifdef VBOX_WITH_VMSVGA3D
	23	- if1of ($(KBUILD_TARGET), linux win)
	24	+ if1of ($(KBUILD_TARGET), freebsd linux win)
	25	# Dynamically load 3D library (opengl32, libGL).
	26	# This is a temporary solution. In future the 3D backend will be in a separate library.
	27	VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
	28	@@ -324,6 +326,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
	29	VBoxDD_SOURCES += \
	30	Graphics/DevVGA-SVGA3d-glLdr.cpp
	31	else
	32	+ VBoxDD_LIBS.freebsd += X11 GL
	33	VBoxDD_LIBS.linux += X11 GL
	34	VBoxDD_LIBS.win += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
	35	endif
	36	@@ -1516,6 +1519,8 @@ if defined(VBOX_WITH_VMSVGA3D) && !defined(VBOX_ONLY_E
	37	VBoxSVGA3D_INCS = $(VBOX_GRAPHICS_INCS)
	38	VBoxSVGA3D_INCS.win := \
	39	Graphics/shaderlib/libWineStub/include
	40	+ VBoxSVGA3D_INCS.freebsd := \
	41	+ Graphics/shaderlib/wine/include
	42	VBoxSVGA3D_INCS.linux := \
	43	Graphics/shaderlib/wine/include
	44	VBoxSVGA3D_INCS.darwin := \

Lines 1-96 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl (-96 lines)
1	--- src/VBox/Devices/PC/vbox-cpuhotplug.dsl.orig 2019-10-10 18:34:15 UTC
2	+++ src/VBox/Devices/PC/vbox-cpuhotplug.dsl
3	@@ -44,11 +44,11 @@ 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) \
10	{ \
11	Name (_HID, "ACPI0004") \
12	- Name (_UID, sckuid) \
13	+ Name (_UID, id) \
14	\
15	<NL> \
16	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 / +15 lines)
1	--- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig 2016-08-16 19:59:52 UTC	1	--- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig 2019-11-21 17:01:16 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	@@ -641,7 +641,7 @@ void printUsage(USAGECATEGORY enmCommand, uint64_t fSu
		4	" file <file>\|\n"
		5	" <devicename>]\n"
		6	" [--uarttype<1-N> 16450\|16550A\|16750]\n"
		7	-#if defined(RT_OS_LINUX) \|\| defined(RT_OS_WINDOWS)
		8	+#if defined(RT_OS_FREEBSD) \|\| defined(RT_OS_LINUX) \|\| defined(RT_OS_WINDOWS)
		9	" [--lpt<1-N> off\|<I/O base> <IRQ>]\n"
		10	" [--lptmode<1-N> <devicename>]\n"
		11	#endif
		12	@@ -656,7 +656,7 @@ void printUsage(USAGECATEGORY enmCommand, uint64_t fSu
4	RTStrmPrintf(pStrm, "\|dsound");	13	RTStrmPrintf(pStrm, "\|dsound");
5	#endif	14	#endif
6	}	15	}
Lines 9-18 Link Here
9	{	18	{
10	RTStrmPrintf(pStrm, ""	19	RTStrmPrintf(pStrm, ""
11	#ifdef VBOX_WITH_AUDIO_OSS	20	#ifdef VBOX_WITH_AUDIO_OSS
12	@@ -811,22 +811,6 @@ void printUsage(USAGECATEGORY fCategory,	21	@@ -669,22 +669,6 @@ void printUsage(USAGECATEGORY enmCommand, uint64_t fSu
		22	"\|pulse"
13	#endif	23	#endif
14	);	24	);
15	}	25	- }
16	- if (fFreeBSD)	26	- if (fFreeBSD)
17	- {	27	- {
18	-#ifdef VBOX_WITH_AUDIO_OSS	28	-#ifdef VBOX_WITH_AUDIO_OSS
Lines 28-34 Link Here
28	-#ifdef VBOX_WITH_AUDIO_PULSE	38	-#ifdef VBOX_WITH_AUDIO_PULSE
29	- RTStrmPrintf(pStrm, "\|pulse");	39	- RTStrmPrintf(pStrm, "\|pulse");
30	-#endif	40	-#endif
31	- }	41	}
32	if (fDarwin)	42	if (fDarwin)
33	{	43	{
34	RTStrmPrintf(pStrm, "\|coreaudio");

Lines 1-14 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk (-5 / +5 lines)
1	--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig 2017-10-18 07:12:20 UTC	1	--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig 2019-11-21 17:01:17 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	@@ -1154,6 +1154,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) \|\| defined(VBOX_GUI
4	VirtualBox_SOURCES += \	4	src/VBox2DHelpers.cpp \
5	src/VBoxFBOverlay.cpp \	5	src/VBoxFBOverlay.cpp \
6	src/VBoxGLSupportInfo.cpp	6	src/VBoxGLSupportInfo.cpp
7	+ VirtualBox_CXXFLAGS.freebsd += -std=c++11	7	+ VirtualBox_CXXFLAGS.freebsd += -std=c++11
8	endif	8	endif
9		9
10	#	10
11	@@ -1217,6 +1218,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL)	11	@@ -1824,6 +1825,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

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Installer_Makefile.kmk (+14 lines)
	1	--- src/VBox/Installer/Makefile.kmk.orig 2019-11-21 17:02:08 UTC
	2	+++ src/VBox/Installer/Makefile.kmk
	3	@@ -41,9 +41,11 @@ ifndef VBOX_ONLY_SDK
	4	if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_HOST)" == "win"
	5	include $(PATH_SUB_CURRENT)/win/Makefile.kmk
	6	endif
	7	+if 0
	8	if "$(KBUILD_TARGET)" == "freebsd" && "$(KBUILD_HOST)" == "freebsd"
	9	include $(PATH_SUB_CURRENT)/freebsd/Makefile.kmk
	10	endif
	11	+endif
	12	endif
	13
	14	include $(PATH_SUB_CURRENT)/common/Makefile.kmk

Lines 1-17 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_include_USBProxyBackend.h (-17 lines)
1	--- src/VBox/Main/include/USBProxyBackend.h.orig 2017-01-17 07:27:19 UTC
2	+++ src/VBox/Main/include/USBProxyBackend.h
3	@@ -359,13 +359,10 @@ public:
4	virtual int releaseDevice(HostUSBDevice *aDevice);
5
6	protected:
7	- int initUsbfs(void);
8	- int initSysfs(void);
9	virtual int wait(RTMSINTERVAL aMillies);
10	virtual int interruptWait(void);
11	virtual PUSBDEVICE getDevices(void);
12	- int addDeviceToChain(PUSBDEVICE pDev, PUSBDEVICE ppFirst, PUSBDEVICE *pppNext, int rc);
13	- virtual void deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines, PUSBDEVICE aUSBDevice);
14	+ virtual bool isFakeUpdateRequired();
15
16	private:
17	RTSEMEVENT mNotifyEventSem;