Date: Mon, 23 Oct 2017 16:49:38 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452715 - in head/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-kmod virtualbox-ose-nox11 virtualbox-ose/files Message-ID: <201710231649.v9NGncRG049021@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Mon Oct 23 16:49:37 2017 New Revision: 452715 URL: https://svnweb.freebsd.org/changeset/ports/452715 Log: Update to 5.2.0. Added: head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Storage_DrvHostBase-freebsd.cpp (contents, props changed) head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp (contents, props changed) head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_NetIf-freebsd.cpp (contents, props changed) Deleted: head/emulators/virtualbox-ose/files/patch-c++11-qt5 head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuestLib-Makefile.kmk head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-vbox.dsl head/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_USBProxyBackendFreeBSD.cpp Modified: head/emulators/virtualbox-ose-additions/Makefile head/emulators/virtualbox-ose-additions/distinfo head/emulators/virtualbox-ose-kmod/Makefile head/emulators/virtualbox-ose-kmod/distinfo head/emulators/virtualbox-ose-nox11/Makefile head/emulators/virtualbox-ose/Makefile head/emulators/virtualbox-ose/distinfo head/emulators/virtualbox-ose/files/patch-Config.kmk head/emulators/virtualbox-ose/files/patch-configure head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp head/emulators/virtualbox-ose/files/patch-src_VBox_Main_include_HostPower.h head/emulators/virtualbox-ose/pkg-plist Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose-additions/Makefile Mon Oct 23 16:49:37 2017 (r452715) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.1.30 +PORTVERSION= 5.2.0 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX?= -additions @@ -15,7 +15,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= yasm:devel/yasm \ - kmk:devel/kBuild + kmk:devel/kBuild \ + xsltproc:textproc/libxslt CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox @@ -23,7 +24,7 @@ CPE_PRODUCT= vm_virtualbox PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} USE_RC_SUBR= vboxguest vboxservice -USES= compiler:features cpe iconv kmod python:build tar:bzip2 +USES= compiler:c++11-lang cpe iconv kmod python:build tar:bzip2 ONLY_FOR_ARCHS= i386 amd64 MAKE_JOBS_UNSAFE= yes @@ -142,15 +143,11 @@ post-patch: ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \ ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ -e 's| -fno-merge-constants||' \ -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk -.if ${COMPILER_FEATURES:Mlibc++} - @${ECHO} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk -.endif - @${ECHO} 'VBOX_GCC_Wno-unused-parameter = -Wno-unused-parameter' >> \ - ${WRKSRC}/LocalConfig.kmk .endif @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Config.kmk ${WRKSRC}/configure \ Modified: head/emulators/virtualbox-ose-additions/distinfo ============================================================================== --- head/emulators/virtualbox-ose-additions/distinfo Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose-additions/distinfo Mon Oct 23 16:49:37 2017 (r452715) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508180714 -SHA256 (VirtualBox-5.1.30.tar.bz2) = 6059b0986c9cdacc533177867634a76331ceccdcd46dddd111a50d1c42846d0b -SIZE (VirtualBox-5.1.30.tar.bz2) = 116510730 +TIMESTAMP = 1508350098 +SHA256 (VirtualBox-5.2.0.tar.bz2) = 26fc73aee2df18142e4129beed1175fbd7eed69a9b6b150bcff7d9b92f4ade54 +SIZE (VirtualBox-5.2.0.tar.bz2) = 117789406 Modified: head/emulators/virtualbox-ose-kmod/Makefile ============================================================================== --- head/emulators/virtualbox-ose-kmod/Makefile Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose-kmod/Makefile Mon Oct 23 16:49:37 2017 (r452715) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.1.30 +PORTVERSION= 5.2.0 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -kmod Modified: head/emulators/virtualbox-ose-kmod/distinfo ============================================================================== --- head/emulators/virtualbox-ose-kmod/distinfo Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose-kmod/distinfo Mon Oct 23 16:49:37 2017 (r452715) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508180714 -SHA256 (VirtualBox-5.1.30.tar.bz2) = 6059b0986c9cdacc533177867634a76331ceccdcd46dddd111a50d1c42846d0b -SIZE (VirtualBox-5.1.30.tar.bz2) = 116510730 +TIMESTAMP = 1508350098 +SHA256 (VirtualBox-5.2.0.tar.bz2) = 26fc73aee2df18142e4129beed1175fbd7eed69a9b6b150bcff7d9b92f4ade54 +SIZE (VirtualBox-5.2.0.tar.bz2) = 117789406 Modified: head/emulators/virtualbox-ose-nox11/Makefile ============================================================================== --- head/emulators/virtualbox-ose-nox11/Makefile Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose-nox11/Makefile Mon Oct 23 16:49:37 2017 (r452715) @@ -3,7 +3,7 @@ PKGNAMESUFFIX= -nox11 OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO -OPTIONS_EXCLUDE+= QT4 QT5 VPX X11 +OPTIONS_EXCLUDE+= QT5 VPX X11 MASTERDIR= ${.CURDIR}/../virtualbox-ose Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose/Makefile Mon Oct 23 16:49:37 2017 (r452715) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.1.30 +PORTVERSION= 5.2.0 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} @@ -30,7 +30,7 @@ CPE_PRODUCT= vm_virtualbox WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} ONLY_FOR_ARCHS= i386 amd64 -USES= compiler cpe iconv pkgconfig ssl tar:bzip2 +USES= compiler:c++11-lang cpe iconv pkgconfig ssl tar:bzip2 USE_GNOME= libidl libxml2 HAS_CONFIGURE= yes @@ -56,16 +56,13 @@ VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNet VBoxSVC VBoxXPCOMIPCD OPTIONS_DEFINE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO \ - PYTHON R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11 + PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11 OPTIONS_DEFAULT= DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11 -OPTIONS_RADIO= GUI -OPTIONS_RADIO_GUI= QT4 QT5 OPTIONS_SUB= yes DEBUG_DESC= Debug symbols, additional logs and assertions GUESTADDITIONS_DESC= Build with Guest Additions MANUAL_DESC= Build with user manual -QT4_DESC= Build with QT4 Frontend QT5_DESC= Build with QT5 Frontend R0LOGGING_DESC= Enable R0 logging UDPTUNNEL_DESC= Build with UDP tunnel support @@ -118,7 +115,7 @@ CONFLICTS_INSTALL+= virtualbox-ose-[0-9]* _ELF32!= kldstat -q -m elf32 && echo yes || echo no .endif -.if ${PORT_OPTIONS:MNLS} && empty(PORT_OPTIONS:MQT[45]) +.if ${PORT_OPTIONS:MNLS} && empty(PORT_OPTIONS:MQT5) BROKEN= NLS support requires QT frontend. Run 'make config' again! .endif @@ -158,32 +155,19 @@ PYDISTUTILS_PKGVERSION= 1.0 USES+= python:build .endif -.if ${PORT_OPTIONS:MQT[45]} +.if ${PORT_OPTIONS:MQT5} +CONFIGURE_ARGS+= --enable-qt5 PLIST_SUB+= QT="" QT_NONSTANDARD= yes USE_GL= gl +USE_QT5= buildtools_build core dbus gui linguist_build opengl +USE_QT5+= printsupport widgets x11extras USE_XORG= xcb INSTALLS_ICONS= yes VBOX_PROGS+= VirtualBox VBOX_UTILS+= VBoxTestOGL VBOX_WITH_QT= 1 -.if ${PORT_OPTIONS:MQT4} -EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp \ - ${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp \ - ${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_settings_global_UIGlobalSettingsNetworkDetailsHost.cpp \ - ${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp \ - ${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.h -CONFIGURE_ARGS+= --enable-qt4 -USE_QT4= corelib gui linguist_build moc_build network opengl -USE_QT4+= rcc_build uic_build -WARNING= "Qt4 support has been deprecated by the upstream.\ - This option may be removed in the future without notice." .else -CONFIGURE_ARGS+= --enable-qt5 -USE_QT5= buildtools_build core dbus gui linguist_build opengl -USE_QT5+= printsupport widgets x11extras -.endif -.else CONFIGURE_ARGS+= --disable-qt PLIST_SUB+= QT="@comment " .endif @@ -286,9 +270,6 @@ post-patch: ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_VALIDATIONKIT =' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk -.if empty(PORT_OPTIONS:MQT5) - @${ECHO} 'VBOX_WITH_QTGUI_V5 =' >> ${WRKSRC}/LocalConfig.kmk -.endif .if ${PORT_OPTIONS:MR0LOGGING} @${ECHO} 'VBOX_WITH_R0_LOGGING = 1' >> ${WRKSRC}/LocalConfig.kmk .endif @@ -303,14 +284,13 @@ post-patch: ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \ ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk .endif .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk @${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk \ ${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk - @${ECHO} 'VBOX_GCC_Wno-unused-parameter = -Wno-unused-parameter' >> \ - ${WRKSRC}/LocalConfig.kmk @${ECHO} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk @${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \ ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \ @@ -403,7 +383,7 @@ do-install: ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python .endif -.if ${PORT_OPTIONS:MQT[45]} +.if ${PORT_OPTIONS:MQT5} ${INSTALL_DATA} \ ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/VBox.png Modified: head/emulators/virtualbox-ose/distinfo ============================================================================== --- head/emulators/virtualbox-ose/distinfo Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose/distinfo Mon Oct 23 16:49:37 2017 (r452715) @@ -1,5 +1,5 @@ -TIMESTAMP = 1508180714 -SHA256 (VirtualBox-5.1.30.tar.bz2) = 6059b0986c9cdacc533177867634a76331ceccdcd46dddd111a50d1c42846d0b -SIZE (VirtualBox-5.1.30.tar.bz2) = 116510730 -SHA256 (VBoxGuestAdditions_5.1.30.iso) = 631ca8e8d513acf43a75de56a71a31aaffb5624864c57d10346ba657d991ec1e -SIZE (VBoxGuestAdditions_5.1.30.iso) = 59494400 +TIMESTAMP = 1508350098 +SHA256 (VirtualBox-5.2.0.tar.bz2) = 26fc73aee2df18142e4129beed1175fbd7eed69a9b6b150bcff7d9b92f4ade54 +SIZE (VirtualBox-5.2.0.tar.bz2) = 117789406 +SHA256 (VBoxGuestAdditions_5.2.0.iso) = 841678a04a1800de26e76bbb7a0f8f7f48fe903deede77a67394b93bf2f2cde4 +SIZE (VBoxGuestAdditions_5.2.0.iso) = 60325888 Modified: head/emulators/virtualbox-ose/files/patch-Config.kmk ============================================================================== --- head/emulators/virtualbox-ose/files/patch-Config.kmk Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose/files/patch-Config.kmk Mon Oct 23 16:49:37 2017 (r452715) @@ -1,15 +1,6 @@ ---- Config.kmk.orig 2016-08-16 19:55:20 UTC +--- Config.kmk.orig 2017-10-18 07:06:30 UTC +++ Config.kmk -@@ -348,7 +348,7 @@ VBOX_WITH_DOCS = 1 - # Include documentation in the package - VBOX_WITH_DOCS_PACKING = 1 - # Include CHM when building docs (unset in LocalConfig.kmk to suppress CHM) --ifn1of ($(KBUILD_TARGET), linux) -+ifn1of ($(KBUILD_TARGET), freebsd linux) - VBOX_WITH_DOCS_CHM = 1 - endif - # By default only include translations in documentation-only builds -@@ -431,11 +431,11 @@ ifn1of ($(KBUILD_TARGET), win darwin) +@@ -424,11 +424,11 @@ ifn1of ($(KBUILD_TARGET), win darwin) # Enable OSS audio support. VBOX_WITH_AUDIO_OSS = 1 endif @@ -23,7 +14,7 @@ # Enable PulseAudio audio support. VBOX_WITH_AUDIO_PULSE = 1 endif -@@ -446,11 +446,11 @@ endif +@@ -440,11 +440,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1 # Enable PCI passthrough support. VBOX_WITH_PCI_PASSTHROUGH = 1 # Enable statically linked dbus support. @@ -37,25 +28,16 @@ VBOX_WITH_PAM = 1 endif # Enable internal networking. -@@ -591,7 +591,7 @@ VBOX_WITH_WEBSERVICES = 1 - VBOX_WITH_WEBSERVICES_SSL = 1 - # The Qt GUI. - VBOX_WITH_QTGUI = 1 --if1of ($(KBUILD_TARGET), linux win solaris) -+if1of ($(KBUILD_TARGET), freebsd linux win solaris) - VBOX_WITH_QTGUI_V5 = 1 # r=bird: s/VBOX_WITH_QTGUI_V5/VBOX_WITH_QT5/g - our we released version 5.0 of the VirtualBox GUI last year, remember? - else if "$(KBUILD_TARGET)" == "darwin" && $(KBUILD_HOST_VERSION_MAJOR) >= 13 # (OS X 10.9 Mavericks) - VBOX_WITH_QTGUI_V5 = 1 -@@ -651,7 +651,7 @@ VBOX_WITH_VDITOOL = +@@ -648,7 +648,7 @@ VBOX_WITH_TESTCASES = 1 + VBOX_WITH_VDITOOL = # Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled VBOX_WITH_VBOX_IMG = - # Enables the VPX module for VM video capturing -if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64) +if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64) - VBOX_WITH_VPX = 1 - endif - # Enable shared folders -@@ -961,10 +961,6 @@ ifeq ($(KBUILD_TARGET),darwin) + # Enables the video capturing support. + VBOX_WITH_VIDEOREC = 1 + # Enable VPX (VP8 / VP9 codec), used for video capturing. +@@ -978,10 +978,6 @@ ifeq ($(KBUILD_TARGET),darwin) VBOX_WITH_VBOXSDL= endif @@ -66,7 +48,7 @@ ifeq ($(KBUILD_TARGET),haiku) # Don't bother with SDL ttf for now. VBOX_WITH_SECURELABEL= -@@ -1123,7 +1119,7 @@ ifdef VBOX_OSE +@@ -1141,7 +1137,7 @@ ifdef VBOX_OSE VBOX_WITH_KCHMVIEWER= VBOX_WITH_PLUGIN_CRYPT= VBOX_WITH_DRAG_AND_DROP_PROMISES= @@ -75,7 +57,7 @@ VBOX_WITH_DOCS= VBOX_WITH_DOCS_PACKING= endif -@@ -4247,7 +4243,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = +@@ -4360,7 +4356,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 @@ -84,7 +66,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \ -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \ -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef -@@ -4574,12 +4570,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS += +@@ -4689,12 +4685,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic TEMPLATE_VBOXR3EXE_TOOL = GXX3 TEMPLATE_VBOXR3EXE_LIBS = pthread TEMPLATE_VBOXR3EXE_INCS += \ @@ -97,7 +79,7 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),netbsd) TEMPLATE_VBOXR3EXE_TOOL = GXX3 -@@ -4869,7 +4861,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! +@@ -4984,7 +4976,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE) TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE) @@ -106,7 +88,7 @@ # We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH) TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) -@@ -5362,12 +5354,8 @@ TEMPLATE_VBOXMAINEXE_LIBS +@@ -5515,12 +5507,8 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI TEMPLATE_VBOXMAINEXE_TOOL = GXX3 TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) TEMPLATE_VBOXMAINEXE_INCS += \ @@ -119,16 +101,7 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),netbsd) TEMPLATE_VBOXMAINEXE_TOOL = GXX3 -@@ -5716,7 +5704,7 @@ ifdef VBOX_WITH_QTGUI - else - VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))) - endif -- else if1of ($(KBUILD_TARGET), linux solaris) -+ else if1of ($(KBUILD_TARGET), freebsd linux solaris) - ifndef VBOX_WITH_QTGUI_V5 - VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*))) - else -@@ -5914,12 +5902,8 @@ ifdef VBOX_WITH_QTGUI +@@ -6054,12 +6042,8 @@ ifdef VBOX_WITH_QTGUI $(VBOX_LIBPATH_X11) ifeq ($(KBUILD_TARGET),freebsd) TEMPLATE_VBOXQTGUIEXE_INCS += \ @@ -141,7 +114,7 @@ /usr/local/lib endif ifeq ($(KBUILD_TARGET),solaris) -@@ -6144,12 +6128,8 @@ TEMPLATE_VBoxBldProg_LIBPATH +@@ -6282,12 +6266,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \ TEMPLATE_VBoxBldProg_TOOL = GXX3 TEMPLATE_VBoxBldProg_LIBS = pthread TEMPLATE_VBoxBldProg_INCS += \ @@ -154,7 +127,7 @@ /usr/local/lib else ifeq ($(KBUILD_HOST),netbsd) TEMPLATE_VBoxBldProg_TOOL = GXX3 -@@ -6543,6 +6523,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darw +@@ -6707,6 +6687,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 Modified: head/emulators/virtualbox-ose/files/patch-configure ============================================================================== --- head/emulators/virtualbox-ose/files/patch-configure Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose/files/patch-configure Mon Oct 23 16:49:37 2017 (r452715) @@ -1,6 +1,6 @@ ---- configure.orig 2017-03-08 17:15:08 UTC +--- configure.orig 2017-10-18 07:06:30 UTC +++ configure -@@ -140,10 +140,14 @@ CXX_FLAGS="" +@@ -139,10 +139,14 @@ CXX_FLAGS="" if [ "$OS" = "freebsd" ]; then INCCURL="-I/usr/local/include" LIBCURL="-L/usr/local/lib -lcurl" @@ -15,7 +15,7 @@ else INCCURL="" LIBCURL="-lcurl" -@@ -441,6 +445,9 @@ check_gcc() +@@ -437,6 +441,9 @@ check_gcc() elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "$OS" = "darwin" ]; then log_success "found version $cc_ver" # gcc-4.0 is allowed for Darwin only @@ -25,7 +25,7 @@ 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" \) \ -@@ -1224,7 +1231,7 @@ extern "C" int main(void) +@@ -1233,7 +1240,7 @@ extern "C" int main(void) #endif } EOF @@ -34,7 +34,7 @@ test_execute fi } -@@ -1694,8 +1701,7 @@ EOF +@@ -1533,8 +1540,7 @@ EOF if [ $? -eq 0 ]; then echo "(Qt5 from pkg-config)" >> $LOG FLGQT5=`pkg-config Qt5Core --cflags` @@ -44,7 +44,7 @@ INCQT5=`strip_I "$FLGQT5"` LIBDIR5=`pkg-config Qt5Core --variable=libdir` LIBQT5=`pkg-config Qt5Core --libs` -@@ -2151,8 +2157,8 @@ EOF +@@ -1994,8 +2000,8 @@ EOF echo "compiling the following source file:" >> $LOG cat $ODIR.tmp_src.cc >> $LOG echo "using the following command line:" >> $LOG @@ -55,7 +55,7 @@ if [ $? -eq 0 ]; then found=1 break -@@ -2628,7 +2634,7 @@ for option in "$@"; do +@@ -2468,7 +2474,7 @@ for option in "$@"; do --with-openssl-dir=*) OPENSSLDIR=`echo $option | cut -d'=' -f2` INCCRYPTO="-I${OPENSSLDIR}/include" @@ -64,7 +64,7 @@ ;; --with-ow-dir=*) WATCOM=`echo $option | cut -d'=' -f2` -@@ -2969,13 +2975,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then +@@ -2803,13 +2809,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then [ $WITH_PYTHON -eq 1 ] && check_python [ $WITH_JAVA -eq 1 ] && check_java @@ -86,7 +86,7 @@ fi fi -@@ -2992,14 +3005,6 @@ if [ "$OS" = "linux" ]; then +@@ -2826,14 +2839,6 @@ if [ "$OS" = "linux" ]; then cnf_append "VBOX_WITH_ADDITION_DRIVERS" "" fi if [ $ONLY_ADDITIONS -eq 0 ]; then Modified: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c ============================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c Mon Oct 23 16:49:37 2017 (r452715) @@ -1,6 +1,6 @@ ---- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2015-11-10 17:00:16 UTC +--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2017-10-18 07:06:43 UTC +++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c -@@ -92,8 +92,6 @@ struct VBoxGuestDeviceState +@@ -93,8 +93,6 @@ struct VBoxGuestDeviceState struct resource *pIrqRes; /** Pointer to the IRQ handler. */ void *pfnIrqHandler; @@ -9,7 +9,7 @@ }; -@@ -103,8 +101,7 @@ struct VBoxGuestDeviceState +@@ -104,8 +102,7 @@ struct VBoxGuestDeviceState /* * Character device file handlers. */ @@ -17,9 +17,9 @@ -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; - static d_read_t vgdrvFreeBSDRead; -@@ -134,8 +131,7 @@ static struct cdevsw g_vgdrvFreeBSDCh +@@ -136,8 +133,7 @@ static struct cdevsw g_vgdrvFreeBSDCh { .d_version = D_VERSION, .d_flags = D_TRACKCLOSE | D_NEEDMINOR, @@ -29,7 +29,7 @@ .d_ioctl = vgdrvFreeBSDIOCtl, .d_read = vgdrvFreeBSDRead, .d_write = vgdrvFreeBSDWrite, -@@ -143,81 +139,28 @@ static struct cdevsw g_vgdrvFreeBSDCh +@@ -145,81 +141,28 @@ static struct cdevsw g_vgdrvFreeBSDCh .d_name = "vboxguest" }; @@ -118,7 +118,7 @@ { int rc; PVBOXGUESTSESSION pSession; -@@ -225,25 +168,18 @@ static int vgdrvFreeBSDOpen(struct cdev +@@ -227,25 +170,18 @@ static int vgdrvFreeBSDOpen(struct cdev LogFlow(("vgdrvFreeBSDOpen:\n")); /* @@ -136,7 +136,7 @@ - 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((DEVICE_NAME ":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); @@ -150,7 +150,7 @@ } LogRel(("vgdrvFreeBSDOpen: failed. rc=%d\n", rc)); -@@ -251,47 +187,17 @@ static int vgdrvFreeBSDOpen(struct cdev +@@ -253,33 +189,6 @@ static int vgdrvFreeBSDOpen(struct cdev } /** @@ -179,101 +179,26 @@ - return 0; -} - +- -/** - * IOCTL handler + * 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) { -- LogFlow(("vgdrvFreeBSDIOCtl\n")); -- -- int rc = 0; -+ int rc; -+ PVBOXGUESTSESSION pSession; - -- /* -- * Validate the input. -- */ -- PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pDev->si_drv1; -- if (RT_UNLIKELY(!VALID_PTR(pSession))) -- return EINVAL; + PVBOXGUESTSESSION pSession; +- devfs_get_cdevpriv((void **)&pSession); ++ int rc; ++ + rc = devfs_get_cdevpriv((void **)&pSession); + if (rc) + return rc; /* - * Validate the request wrapper. -@@ -308,43 +214,46 @@ static int vgdrvFreeBSDIOCtl(struct cdev - Log(("vgdrvFreeBSDIOCtl: bad magic %#x; pArg=%p Cmd=%lu.\n", ReqWrap->u32Magic, pvData, ulCmd)); - return EINVAL; - } -- if (RT_UNLIKELY( ReqWrap->cbData == 0 -- || ReqWrap->cbData > _1M*16)) -+ if (RT_UNLIKELY(ReqWrap->cbData > _1M*16)) - { - printf("vgdrvFreeBSDIOCtl: bad size %#x; pArg=%p Cmd=%lu.\n", ReqWrap->cbData, pvData, ulCmd); - return EINVAL; - } + * Deal with the fast ioctl path first. +@@ -488,12 +401,14 @@ int VBOXCALL VBoxGuestIDC(void *pvSessio - /* -- * Read the request. -+ * Read the request payload if any; requests like VBOXGUEST_IOCTL_CANCEL_ALL_WAITEVENTS have no data payload. - */ -- void *pvBuf = RTMemTmpAlloc(ReqWrap->cbData); -- if (RT_UNLIKELY(!pvBuf)) -+ void *pvBuf = NULL; -+ if (RT_LIKELY(ReqWrap->cbData > 0)) - { -- Log(("vgdrvFreeBSDIOCtl: RTMemTmpAlloc failed to alloc %d bytes.\n", ReqWrap->cbData)); -- return ENOMEM; -- } -+ pvBuf = RTMemTmpAlloc(ReqWrap->cbData); -+ if (RT_UNLIKELY(!pvBuf)) -+ { -+ Log((DEVICE_NAME ":vgdrvFreeBSDIOCtl: RTMemTmpAlloc failed to alloc %d bytes.\n", ReqWrap->cbData)); -+ return ENOMEM; -+ } - -- rc = copyin((void *)(uintptr_t)ReqWrap->pvDataR3, pvBuf, ReqWrap->cbData); -- if (RT_UNLIKELY(rc)) -- { -- RTMemTmpFree(pvBuf); -- Log(("vgdrvFreeBSDIOCtl: copyin failed; pvBuf=%p pArg=%p Cmd=%lu. rc=%d\n", pvBuf, pvData, ulCmd, rc)); -- return EFAULT; -- } -- if (RT_UNLIKELY( ReqWrap->cbData != 0 -- && !VALID_PTR(pvBuf))) -- { -- RTMemTmpFree(pvBuf); -- Log(("vgdrvFreeBSDIOCtl: pvBuf invalid pointer %p\n", pvBuf)); -- return EINVAL; -+ rc = copyin((void *)(uintptr_t)ReqWrap->pvDataR3, pvBuf, ReqWrap->cbData); -+ if (RT_UNLIKELY(rc)) -+ { -+ RTMemTmpFree(pvBuf); -+ Log(("vgdrvFreeBSDIOCtl: copyin failed; pvBuf=%p pArg=%p Cmd=%lu. rc=%d\n", pvBuf, pvData, ulCmd, rc)); -+ return EFAULT; -+ } -+ if (RT_UNLIKELY( ReqWrap->cbData != 0 -+ && !VALID_PTR(pvBuf))) -+ { -+ RTMemTmpFree(pvBuf); -+ Log(("vgdrvFreeBSDIOCtl: pvBuf invalid pointer %p\n", pvBuf)); -+ return EINVAL; -+ } - } - Log(("vgdrvFreeBSDIOCtl: pSession=%p pid=%d.\n", pSession, (int)RTProcSelf())); - - /* - * Process the IOCtl. - */ -- size_t cbDataReturned; -+ size_t cbDataReturned = 0; - rc = VGDrvCommonIoCtl(ulCmd, &g_DevExt, pSession, pvBuf, ReqWrap->cbData, &cbDataReturned); - if (RT_SUCCESS(rc)) - { -@@ -375,12 +284,14 @@ static int vgdrvFreeBSDIOCtl(struct cdev - static int vgdrvFreeBSDPoll(struct cdev *pDev, int fEvents, struct thread *td) { - int fEventsProcessed; @@ -290,7 +215,7 @@ Log(("vgdrvFreeBSDPoll: no state data for %s\n", devtoname(pDev))); return (fEvents & (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM)); } -@@ -421,10 +332,7 @@ static int vgdrvFreeBSDDetach(device_t p +@@ -534,10 +449,7 @@ static int vgdrvFreeBSDDetach(device_t p /* * Reverse what we did in vgdrvFreeBSDAttach. */ @@ -302,7 +227,7 @@ vgdrvFreeBSDRemoveIRQ(pDevice, pState); -@@ -576,18 +484,21 @@ static int vgdrvFreeBSDAttach(device_t p +@@ -689,18 +601,21 @@ static int vgdrvFreeBSDAttach(device_t p if (RT_SUCCESS(rc)) { /* Modified: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile ============================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile Mon Oct 23 16:49:37 2017 (r452715) @@ -1,6 +1,6 @@ ---- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2016-08-16 19:55:31 UTC +--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2017-10-18 07:06:43 UTC +++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile -@@ -71,6 +71,7 @@ SRCS += \ +@@ -70,6 +70,7 @@ SRCS += \ handletable.c \ handletablectx.c \ once.c \ @@ -8,21 +8,11 @@ thread.c .PATH: ${.CURDIR}/common/string -@@ -129,6 +130,7 @@ SRCS += \ +@@ -128,6 +129,7 @@ SRCS += \ + .PATH: ${.CURDIR}/r0drv SRCS += \ - alloc-r0drv.c \ + alloc-ef-r0drv.c \ + alloc-r0drv.c \ initterm-r0drv.c \ memobj-r0drv.c \ - powernotification-r0drv.c -@@ -149,8 +151,7 @@ SRCS += \ - spinlock-r0drv-freebsd.c \ - thread-r0drv-freebsd.c \ - thread2-r0drv-freebsd.c \ -- time-r0drv-freebsd.c \ -- timer-r0drv-freebsd.c -+ time-r0drv-freebsd.c - - .PATH: ${.CURDIR}/r0drv/generic - SRCS += \ Modified: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest ============================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest Mon Oct 23 16:49:37 2017 (r452715) @@ -1,6 +1,6 @@ ---- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2016-08-16 19:55:31 UTC +--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2017-10-18 07:06:43 UTC +++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest -@@ -102,6 +102,7 @@ FILES_VBOXGUEST_NOBIN=" \ +@@ -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 \ @@ -8,15 +8,7 @@ ${PATH_ROOT}/src/VBox/Runtime/common/misc/thread.cpp=>common/misc/thread.c \ ${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp=>common/misc/RTAssertMsg1Weak.c \ ${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp=>common/misc/RTAssertMsg2.c \ -@@ -139,6 +140,7 @@ FILES_VBOXGUEST_NOBIN=" \ - ${PATH_ROOT}/src/VBox/Runtime/include/internal/iprt.h=>include/internal/iprt.h \ - ${PATH_ROOT}/src/VBox/Runtime/include/internal/lockvalidator.h=>include/internal/lockvalidator.h \ - ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \ -+ ${PATH_ROOT}/src/VBox/Runtime/include/internal/mem.h=>include/internal/mem.h \ - ${PATH_ROOT}/src/VBox/Runtime/include/internal/memobj.h=>include/internal/memobj.h \ - ${PATH_ROOT}/src/VBox/Runtime/include/internal/string.h=>include/internal/string.h \ - ${PATH_ROOT}/src/VBox/Runtime/include/internal/thread.h=>include/internal/thread.h \ -@@ -161,6 +163,7 @@ FILES_VBOXGUEST_NOBIN=" \ +@@ -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 \ @@ -24,7 +16,7 @@ ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \ ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \ ${PATH_ROOT}/src/VBox/Runtime/r0drv/initterm-r0drv.cpp=>r0drv/initterm-r0drv.c \ -@@ -186,6 +189,7 @@ FILES_VBOXGUEST_NOBIN=" \ +@@ -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 \ Modified: head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h ============================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h Mon Oct 23 16:49:37 2017 (r452715) @@ -1,6 +1,6 @@ ---- src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h.orig 2017-04-28 16:59:22.000000000 +0200 -+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h 2017-07-13 01:05:04.399618524 +0200 -@@ -1,10 +1,5 @@ +--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h.orig 2017-10-18 07:06:47 UTC ++++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h +@@ -1,8 +1,3 @@ -/* $Id: vboxvfs.h $ */ -/** @file - * Description. @@ -9,9 +9,7 @@ /* * Copyright (C) 2010-2016 Oracle Corporation * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; -@@ -21,72 +16,418 @@ +@@ -21,72 +16,416 @@ #define VBOXVFS_VFSNAME "vboxvfs" #define VBOXVFS_VERSION 1 @@ -24,11 +22,18 @@ +#define VFSTOVBOXFS(mp) ((struct vboxfs_mnt *)((mp)->mnt_data)) +#define VP_TO_VBOXFS_NODE(vp) ((struct vboxfs_node *)(vp)->v_data) +#define VBOXTOV(np) ((struct vnode *)(np)->n_vnode) -+ + +-struct vboxvfs_mount_info { +- char name[MAX_HOST_NAME]; +- char nls_name[MAX_NLS_NAME]; +- int uid; +- int gid; +- int ttl; +-}; +#define ROOTDIR_INO 1 +#define THEFILE_INO 2 +#define THEFILE_NAME "thefile" -+ + +#define VBOXFS_NODE_LOCK(node) mtx_lock(&(node)->sf_interlock) +#define VBOXFS_NODE_UNLOCK(node) mtx_unlock(&(node)->sf_interlock) +#define VBOXFS_NODE_MTX(node) (&(node)->sf_interlock) @@ -53,21 +58,14 @@ +#define VBOXFS_ASSERT_LOCKED(node) (void)0 +#define VBOXFS_ASSERT_ELOCKED(node) (void)0 +#endif - --struct vboxvfs_mount_info { -- char name[MAX_HOST_NAME]; -- char nls_name[MAX_NLS_NAME]; -- int uid; -- int gid; -- int ttl; --}; ++ +#define VBOXFS_VNODE_ALLOCATING 1 +#define VBOXFS_VNODE_WANT 2 +#define VBOXFS_VNODE_DOOMED 4 +#define VBOXFS_VNODE_WRECLAIM 8 + +MALLOC_DECLARE(M_VBOXVFS); - ++ #ifdef _KERNEL +#ifndef FREEBSD_STYLE +#include "../../../../../include/iprt/nocrt/limits.h" @@ -112,9 +110,8 @@ +#include "../../../../../include/iprt/time.h" +#include "../../../../../include/iprt/types.h" +#include "../../../../../include/iprt/uni.h" -+ -+#include "../../common/VBoxGuestLib/SysHlp.h" -+ + +-#include <VBox/VBoxGuestLibSharedFolders.h> +#else + +#include "iprt/nocrt/limits.h" @@ -161,12 +158,22 @@ +#include "common/VBoxGuestLib/SysHlp.h" + +#endif /* !FREEBSD_STYLE */ - --#include <VBox/VBoxGuestLibSharedFolders.h> ++ #include <sys/mount.h> #include <sys/vnode.h> +#include <sys/_timespec.h> -+ + +-struct vboxvfsmount { +- uid_t uid; +- gid_t gid; +- mode_t file_mode; +- mode_t dir_mode; +- struct mount *mp; +- struct ucred *owner; +- u_int flags; +- long nextino; +- int caseopt; +- int didrele; +#if defined(RT_OS_FREEBSD) && defined(_KERNEL) +# undef PVM /** XXX: For not conflict with PVM in sys/priority.h */ +#endif @@ -185,8 +192,9 @@ + */ +struct sfp_mount { + VBGLSFMAP map; -+}; -+ + }; + +-/* structs - stolen from the linux shared module code */ +/* + * Mount / Unmount a shared folder. + * @@ -278,18 +286,7 @@ + sffs_stat_t sf_stat; /* cached file attrs for this node */ + uint64_t sf_stat_time; /* last-modified time of sf_stat */ + sffs_dirents_t *sf_dir_list; /* list of entries for this directory */ - --struct vboxvfsmount { -- uid_t uid; -- gid_t gid; -- mode_t file_mode; -- mode_t dir_mode; -- struct mount *mp; -- struct ucred *owner; -- u_int flags; -- long nextino; -- int caseopt; -- int didrele; ++ + /* interlock to protect sf_vpstate */ + struct mtx sf_interlock; +}; @@ -304,9 +301,8 @@ + int fmode; /* mode for regular files if != 0xffffffff */ + int dmask; /* umask applied to directories */ + int fmask; /* umask applied to regular files */ - }; - --/* structs - stolen from the linux shared module code */ ++}; ++ struct sf_glob_info { - VBGLSFMAP map; -/* struct nls_table *nls;*/ Modified: head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp ============================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp Mon Oct 23 16:49:37 2017 (r452715) @@ -1,18 +1,18 @@ ---- src/VBox/Devices/Audio/DrvHostALSAAudio.cpp.orig 2016-07-18 11:52:55 UTC +--- src/VBox/Devices/Audio/DrvHostALSAAudio.cpp.orig 2017-10-18 07:09:04 UTC +++ src/VBox/Devices/Audio/DrvHostALSAAudio.cpp -@@ -982,6 +982,7 @@ static DECLCALLBACK(int) drvHostALSAAudi - continue; - } +@@ -1231,6 +1231,7 @@ static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PP + continue; + } +#if EPIPE != ESTRPIPE - case -ESTRPIPE: - { - /* Stream was suspended and waiting for a recovery. */ -@@ -995,6 +996,7 @@ static DECLCALLBACK(int) drvHostALSAAudi - LogFlowFunc(("Resumed suspended output stream\n")); - continue; - } + case -ESTRPIPE: + { + /* Stream was suspended and waiting for a recovery. */ +@@ -1244,6 +1245,7 @@ static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PP + LogFlowFunc(("Resumed suspended output stream\n")); + continue; + } +#endif - default: - LogFlowFunc(("Failed to write %RI32 output frames, rc=%Rrc\n", + default: + LogFlowFunc(("Failed to write %RU32 bytes, error unknown\n", cbToWrite)); Added: head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Storage_DrvHostBase-freebsd.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Storage_DrvHostBase-freebsd.cpp Mon Oct 23 16:49:37 2017 (r452715) @@ -0,0 +1,10 @@ +--- src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp.orig 2017-10-18 07:11:48 UTC ++++ src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp +@@ -24,6 +24,7 @@ + #include <cam/scsi/scsi_message.h> + #include <cam/scsi/scsi_pass.h> + #include <VBox/scsi.h> ++#include <iprt/file.h> + #include <iprt/log.h> + + /** Maximum buffer size supported by the CAM subsystem. */ Modified: head/emulators/virtualbox-ose/files/patch-src_VBox_Main_include_HostPower.h ============================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Main_include_HostPower.h Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Main_include_HostPower.h Mon Oct 23 16:49:37 2017 (r452715) @@ -1,4 +1,4 @@ ---- src/VBox/Main/include/HostPower.h.orig 2017-03-08 17:20:12 UTC +--- src/VBox/Main/include/HostPower.h.orig 2017-10-18 07:12:54 UTC +++ src/VBox/Main/include/HostPower.h @@ -28,7 +28,7 @@ @@ -9,12 +9,12 @@ # include <VBox/dbus.h> #endif -@@ -63,7 +63,7 @@ private: - HWND mHwnd; +@@ -64,7 +64,7 @@ class HostPowerServiceWin : public HostPowerService (p RTTHREAD mThread; }; --#elif defined(RT_OS_LINUX) -+#elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) + # endif +-# if defined(RT_OS_LINUX) || defined(DOXYGEN_RUNNING) ++# if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(DOXYGEN_RUNNING) /** * The Linux hosted Power Service. */ Added: head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp Mon Oct 23 16:49:37 2017 (r452715) @@ -0,0 +1,20 @@ +--- 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 " Added: head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_NetIf-freebsd.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_NetIf-freebsd.cpp Mon Oct 23 16:49:37 2017 (r452715) @@ -0,0 +1,19 @@ +--- 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(); Modified: head/emulators/virtualbox-ose/pkg-plist ============================================================================== --- head/emulators/virtualbox-ose/pkg-plist Mon Oct 23 15:09:04 2017 (r452714) +++ head/emulators/virtualbox-ose/pkg-plist Mon Oct 23 16:49:37 2017 (r452715) @@ -545,10 +545,10 @@ lib/virtualbox/components/VirtualBox_XPCOM.xpt %%NLS%%%%DATADIR%%/nls/VirtualBox_en.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_es.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_eu.qm -%%NLS%%%%DATADIR%%/nls/VirtualBox_fa_IR.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_fa.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_fi.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_fr.qm -%%NLS%%%%DATADIR%%/nls/VirtualBox_gl_ES.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_gl.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_he.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_hu.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_id.qm @@ -582,10 +582,10 @@ lib/virtualbox/components/VirtualBox_XPCOM.xpt %%NLS%%%%DATADIR%%/nls/qt_en.qm %%NLS%%%%DATADIR%%/nls/qt_es.qm %%NLS%%%%DATADIR%%/nls/qt_eu.qm -%%NLS%%%%DATADIR%%/nls/qt_fa_IR.qm +%%NLS%%%%DATADIR%%/nls/qt_fa.qm %%NLS%%%%DATADIR%%/nls/qt_fi.qm %%NLS%%%%DATADIR%%/nls/qt_fr.qm -%%NLS%%%%DATADIR%%/nls/qt_gl_ES.qm +%%NLS%%%%DATADIR%%/nls/qt_gl.qm %%NLS%%%%DATADIR%%/nls/qt_he.qm %%NLS%%%%DATADIR%%/nls/qt_hu.qm *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710231649.v9NGncRG049021>