svn commit: r542552 - in branches/2020Q3/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-kmod virtualbox-ose/files
Guido Falsi
madpilot at FreeBSD.org
Sun Jul 19 09:21:58 UTC 2020
Author: madpilot
Date: Sun Jul 19 09:21:49 2020
New Revision: 542552
URL: https://svnweb.freebsd.org/changeset/ports/542552
Log:
MFH: r542551
- Update VirtualBox ports to 5.2.44
- Adapt and regenerate patches
- Reduce differences in patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl [1]
Patch based on one provided by Mario Lobo <lobo at bsd.com.br>.
Many thanks to people who provided ideas and suggetions in the
PR and review.
PR: 244212
Submitted by: Nikita Stepanov <nikitastepan0v at bk.ru>
Reviewed by: kevans [1]
Tested by: lwshu
Approved by: ports-secteam (joneum)
Security: 1e7b316b-c6a8-11ea-a7d5-001999f8d30b
Differential Revision: https://reviews.freebsd.org/D25496
Approved by: ports-secteam (joneum, via bugzilla PR)
Modified:
branches/2020Q3/emulators/virtualbox-ose-additions/Makefile
branches/2020Q3/emulators/virtualbox-ose-additions/distinfo
branches/2020Q3/emulators/virtualbox-ose-kmod/Makefile
branches/2020Q3/emulators/virtualbox-ose-kmod/distinfo
branches/2020Q3/emulators/virtualbox-ose/Makefile
branches/2020Q3/emulators/virtualbox-ose/distinfo
branches/2020Q3/emulators/virtualbox-ose/files/patch-Config.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-configure
branches/2020Q3/emulators/virtualbox-ose/files/patch-include-VBox-vmm-cpumctx.h
branches/2020Q3/emulators/virtualbox-ose/files/patch-include-iprt-x86.h
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports.py
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports_dri.py
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_glxapi_exports.py
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Installer-Makefile.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-src-recompiler-Sun-testmath.c
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_pam_pam__vbox.cpp
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_Makefile
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_Makefile.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__prov.c
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VBoxManage_VBoxManageHelp.cpp
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_SUPDrvInternal.h
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_freebsd_SUPDrv-freebsd.c
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Main_Makefile.kmk
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Main_include_USBProxyBackend.h
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_HostImpl.cpp
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_nsprpub_pr_src_pthreads_ptsynch.c
branches/2020Q3/emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_xpcom_io_nsLocalFileUnix.h
Directory Properties:
branches/2020Q3/ (props changed)
Modified: branches/2020Q3/emulators/virtualbox-ose-additions/Makefile
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose-additions/Makefile Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose-additions/Makefile Sun Jul 19 09:21:49 2020 (r542552)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= virtualbox-ose
-PORTVERSION= 5.2.34
-PORTREVISION= 2
+PORTVERSION= 5.2.44
CATEGORIES= emulators
MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX?= -additions
Modified: branches/2020Q3/emulators/virtualbox-ose-additions/distinfo
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose-additions/distinfo Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose-additions/distinfo Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571257463
-SHA256 (VirtualBox-5.2.34.tar.bz2) = 9abff37330bba46b97aa836bc886397ba9cfb06cb75be5d60ac31f5ae9c2f2e1
-SIZE (VirtualBox-5.2.34.tar.bz2) = 118268064
+TIMESTAMP = 1594821235
+SHA256 (VirtualBox-5.2.44.tar.bz2) = ad83b11cfae2734f7d6f619dd2f8bdada7d33492cd7682fab98cb4053122295e
+SIZE (VirtualBox-5.2.44.tar.bz2) = 124016934
Modified: branches/2020Q3/emulators/virtualbox-ose-kmod/Makefile
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose-kmod/Makefile Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose-kmod/Makefile Sun Jul 19 09:21:49 2020 (r542552)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= virtualbox-ose
-PORTVERSION= 5.2.34
+PORTVERSION= 5.2.44
CATEGORIES= emulators
MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX= -kmod
Modified: branches/2020Q3/emulators/virtualbox-ose-kmod/distinfo
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose-kmod/distinfo Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose-kmod/distinfo Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571257293
-SHA256 (VirtualBox-5.2.34.tar.bz2) = 9abff37330bba46b97aa836bc886397ba9cfb06cb75be5d60ac31f5ae9c2f2e1
-SIZE (VirtualBox-5.2.34.tar.bz2) = 118268064
+TIMESTAMP = 1594821147
+SHA256 (VirtualBox-5.2.44.tar.bz2) = ad83b11cfae2734f7d6f619dd2f8bdada7d33492cd7682fab98cb4053122295e
+SIZE (VirtualBox-5.2.44.tar.bz2) = 124016934
Modified: branches/2020Q3/emulators/virtualbox-ose/Makefile
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/Makefile Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/Makefile Sun Jul 19 09:21:49 2020 (r542552)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= virtualbox-ose
-PORTVERSION= 5.2.34
-PORTREVISION= 4
+PORTVERSION= 5.2.44
CATEGORIES= emulators
MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
@@ -141,12 +140,12 @@ USE_TEX= dvipsk:build formats:build
.endif
.if ${PORT_OPTIONS:MPYTHON}
-USES+= python:2.7
+USES+= python
USE_PYTHON= distutils noegginfo noflavors
PYDISTUTILS_PKGNAME= vboxapi
PYDISTUTILS_PKGVERSION= 1.0
.else
-USES+= python:2.7,build
+USES+= python:build
.endif
.if ${PORT_OPTIONS:MQT5}
@@ -278,7 +277,9 @@ post-patch:
${WRKSRC}/src/VBox/Main/webservice/vboxweb.cpp
.endif
@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
- -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk
+ -e 's| -mpreferred-stack-boundary=2||' \
+ -e 's|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' \
+ ${WRKSRC}/Config.kmk
@${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk \
${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk
@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk
@@ -398,5 +399,9 @@ do-install:
${INSTALL_DATA} ${KMK_BUILDDIR}/obj/webservice/vboxweb.wsdl \
${STAGEDIR}${DATADIR}/sdk/bindings/webservice/
.endif
+
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/virtualbox/*.so \
+ ${STAGEDIR}${PREFIX}/lib/virtualbox/components/*.so
.include <bsd.port.post.mk>
Modified: branches/2020Q3/emulators/virtualbox-ose/distinfo
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/distinfo Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/distinfo Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1571257463
-SHA256 (VirtualBox-5.2.34.tar.bz2) = 9abff37330bba46b97aa836bc886397ba9cfb06cb75be5d60ac31f5ae9c2f2e1
-SIZE (VirtualBox-5.2.34.tar.bz2) = 118268064
-SHA256 (VBoxGuestAdditions_5.2.34.iso) = d1b63891abca37fd78f5c8af1764e10e5754b1eecabd1fcfe7599c29a93ba007
-SIZE (VBoxGuestAdditions_5.2.34.iso) = 49661952
+TIMESTAMP = 1594897148
+SHA256 (VirtualBox-5.2.44.tar.bz2) = ad83b11cfae2734f7d6f619dd2f8bdada7d33492cd7682fab98cb4053122295e
+SIZE (VirtualBox-5.2.44.tar.bz2) = 124016934
+SHA256 (VBoxGuestAdditions_5.2.44.iso) = 9883ee443a309f4ffa1d5dee2833f9e35ced598686c36d159f410e5edbac1ca4
+SIZE (VBoxGuestAdditions_5.2.44.iso) = 49829888
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-Config.kmk
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-Config.kmk Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-Config.kmk Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,4 +1,4 @@
---- Config.kmk.orig 2019-10-10 18:06:26 UTC
+--- Config.kmk.orig 2020-05-13 19:36:41 UTC
+++ Config.kmk
@@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)
# Enable OSS audio support.
@@ -74,7 +74,15 @@
# branding
VBOX_BRAND_LICENSE_HTML := $(PATH_ROOT)/doc/License-gpl-2.0.html
VBOX_BRAND_LICENSE_RTF := $(PATH_ROOT)/doc/License-gpl-2.0.rtf
-@@ -2538,6 +2534,10 @@ ifeq ($(KBUILD_HOST),win) ## @todo can drop this now,
+@@ -1810,6 +1806,7 @@ ifndef VBOX_BLD_PYTHON
+ else
+ VBOX_BLD_PYTHON := $(firstword $(which python2.7$(HOSTSUFF_EXE)) $(which python2.6$(HOSTSUFF_EXE)) \
+ $(which python$(HOSTSUFF_EXE)) $(which python3$(HOSTSUFF_EXE)) \
++ $(which %%PYTHON_VERSION%%) \
+ python-not-found)
+ endif
+ endif
+@@ -2550,6 +2547,10 @@ ifeq ($(KBUILD_HOST),win) ## @todo can drop this now,
# This isn't important (yet) on windows, so cook the result until
# cygwin is feeling better.
VBOX_GCC_VERSION := $(int-add $(int-mul 10000, 3), $(int-mul 100, 3), 3)
@@ -85,7 +93,7 @@
else
# This is kind of bad, the returned string needs to be re-evaluated before use.
# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
-@@ -4158,6 +4154,7 @@ ifdef VBOX_WITH_RAW_MODE
+@@ -4218,6 +4219,7 @@ ifdef VBOX_WITH_RAW_MODE
TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC32_TOOL)
TEMPLATE_VBoxRc_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
TEMPLATE_VBoxRc_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
@@ -93,7 +101,7 @@
ifeq ($(KBUILD_TARGET),solaris)
TEMPLATE_VBoxRc_LDFLAGS = -r
else
-@@ -4299,6 +4296,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
+@@ -4359,6 +4361,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
@@ -101,7 +109,7 @@
TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
ifeq ($(KBUILD_TARGET),solaris)
-@@ -4623,7 +4621,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \
+@@ -4683,7 +4686,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \
-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
-nostdinc -std=c99
@@ -110,7 +118,7 @@
TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \
-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef
-@@ -4656,7 +4654,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
+@@ -4716,7 +4719,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
| xargs -J% objcopy % $(out)
## Strip debug info (comment out if debugging or something).
@@ -119,7 +127,7 @@
endef
else # x86
TOOL_FREEBSDKMODLD_LINK_SYSMOD_OUTPUT = $(outbase).kld
-@@ -4670,7 +4668,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
+@@ -4730,7 +4733,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
| xargs -J% objcopy % $(outbase).kld
# Link the final .ko (a shared object).
@@ -128,7 +136,7 @@
endef
endif # x86
-@@ -4956,10 +4954,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \
+@@ -5016,10 +5019,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \
TEMPLATE_VBOXR3EXE_CFLAGS += -fno-pic
TEMPLATE_VBOXR3EXE_CXXFLAGS += -fno-pic
TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic
@@ -148,7 +156,7 @@
/usr/include \
/usr/X11R6/include \
/usr/local/include
-@@ -5250,7 +5256,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
+@@ -5310,7 +5321,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain
TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE)
TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)
@@ -157,7 +165,7 @@
# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)
TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
-@@ -5777,10 +5783,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI
+@@ -5837,10 +5848,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI
else ifeq ($(KBUILD_TARGET),haiku)
TEMPLATE_VBOXMAINEXE_TOOL = GXX3
TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) network stdc++ supc++
@@ -177,7 +185,7 @@
/usr/include \
/usr/X11R6/include \
/usr/local/include
-@@ -6319,13 +6333,10 @@ ifdef VBOX_WITH_QTGUI
+@@ -6382,13 +6401,10 @@ ifdef VBOX_WITH_QTGUI
TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
$(VBOX_LIBPATH_X11)
ifeq ($(KBUILD_TARGET),freebsd)
@@ -192,7 +200,7 @@
/usr/local/lib
endif
ifeq ($(KBUILD_TARGET),solaris)
-@@ -6548,12 +6559,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \
+@@ -6617,12 +6633,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \
TEMPLATE_VBoxBldProg_TOOL = GXX3
TEMPLATE_VBoxBldProg_LIBS = pthread
TEMPLATE_VBoxBldProg_INCS += \
@@ -205,7 +213,7 @@
/usr/local/lib
else ifeq ($(KBUILD_HOST),netbsd)
TEMPLATE_VBoxBldProg_TOOL = GXX3
-@@ -6954,6 +6961,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \
+@@ -7023,6 +7035,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \
-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-configure
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-configure Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-configure Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,4 +1,4 @@
---- configure.orig 2018-07-16 14:56:48 UTC
+--- configure.orig 2020-05-13 19:36:41 UTC
+++ configure
@@ -138,10 +138,14 @@ CXX_FLAGS=""
if [ "$OS" = "freebsd" ]; then
@@ -15,7 +15,7 @@
else
INCCURL=""
LIBCURL="-lcurl"
-@@ -436,6 +440,9 @@ check_gcc()
+@@ -441,6 +445,9 @@ check_gcc()
elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "$OS" = "darwin" ]; then
log_success "found version $cc_ver"
# gcc-4.0 is allowed for Darwin only
@@ -24,8 +24,8 @@
+ # gcc-4.2 is allowed for FreeBSD only
elif [ $cc_maj -lt 4 \
-o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \
- -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) \
-@@ -1204,7 +1211,7 @@ extern "C" int main(void)
+ -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) ]; then
+@@ -1208,7 +1215,7 @@ extern "C" int main(void)
#endif
}
EOF
@@ -34,7 +34,7 @@
test_execute
fi
}
-@@ -1504,8 +1511,7 @@ EOF
+@@ -1508,8 +1515,7 @@ EOF
if [ $? -eq 0 ]; then
echo "(Qt5 from pkg-config)" >> $LOG
FLGQT5=`pkg-config Qt5Core --cflags`
@@ -44,7 +44,7 @@
INCQT5=`strip_I "$FLGQT5"`
LIBDIR5=`pkg-config Qt5Core --variable=libdir`
LIBQT5=`pkg-config Qt5Core --libs`
-@@ -1644,7 +1650,7 @@ check_libopus()
+@@ -1648,7 +1654,7 @@ check_libopus()
fi
cat > $ODIR.tmp_src.cc << EOF
#include <cstdio>
@@ -53,7 +53,7 @@
extern "C" int main(void)
{
OpusEncoder *test;
-@@ -1976,8 +1982,8 @@ EOF
+@@ -1980,8 +1986,8 @@ EOF
echo "compiling the following source file:" >> $LOG
cat $ODIR.tmp_src.cc >> $LOG
echo "using the following command line:" >> $LOG
@@ -64,7 +64,7 @@
if [ $? -eq 0 ]; then
found=1
break
-@@ -2449,7 +2455,7 @@ for option in "$@"; do
+@@ -2453,7 +2459,7 @@ for option in "$@"; do
--with-openssl-dir=*)
OPENSSLDIR=`echo $option | cut -d'=' -f2`
INCCRYPTO="-I${OPENSSLDIR}/include"
@@ -73,7 +73,7 @@
;;
--with-ow-dir=*)
WATCOM=`echo $option | cut -d'=' -f2`
-@@ -2763,7 +2769,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
+@@ -2767,7 +2773,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
check_ssl
check_curl
[ $WITH_LIBVPX -eq 1 ] && check_vpx
@@ -82,7 +82,7 @@
[ "$OS" != "darwin" ] && check_z
[ "$OS" != "darwin" ] && check_png
[ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
-@@ -2784,13 +2790,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
+@@ -2788,13 +2794,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
[ $WITH_PYTHON -eq 1 ] && check_python
[ $WITH_JAVA -eq 1 ] && check_java
@@ -104,7 +104,7 @@
fi
fi
-@@ -2806,14 +2819,6 @@ if [ "$OS" = "linux" ]; then
+@@ -2810,14 +2823,6 @@ if [ "$OS" = "linux" ]; then
cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
fi
if [ $ONLY_ADDITIONS -eq 0 ]; then
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-include-VBox-vmm-cpumctx.h
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-include-VBox-vmm-cpumctx.h Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-include-VBox-vmm-cpumctx.h Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- include/VBox/vmm/cpumctx.h.orig 2015-03-12 18:53:45.762704000 -0400
-+++ include/VBox/vmm/cpumctx.h 2015-03-12 18:56:23.765105000 -0400
-@@ -84,7 +84,7 @@
+--- include/VBox/vmm/cpumctx.h.orig 2020-05-13 19:36:46 UTC
++++ include/VBox/vmm/cpumctx.h
+@@ -88,7 +88,7 @@ AssertCompileSize(CPUMSELREG, 24);
# define CPUMSELREG_ARE_HIDDEN_PARTS_VALID(a_pVCpu, a_pSelReg) \
( ((a_pSelReg)->fFlags & CPUMSELREG_FLAGS_VALID) \
&& ( (a_pSelReg)->ValidSel == (a_pSelReg)->Sel \
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-include-iprt-x86.h
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-include-iprt-x86.h Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-include-iprt-x86.h Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,5 +1,5 @@
---- include/iprt/x86.h.orig 2014-02-25 11:59:50.000000000 -0500
-+++ include/iprt/x86.h 2014-03-11 16:46:08.000000000 -0400
+--- include/iprt/x86.h.orig 2020-05-13 19:36:52 UTC
++++ include/iprt/x86.h
@@ -35,6 +35,16 @@
# pragma D depends_on library vbox-types.d
#endif
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2017-10-18 07:06:43 UTC
+--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2020-05-13 19:37:01 UTC
+++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c
-@@ -93,8 +93,6 @@ struct VBoxGuestDeviceState
+@@ -102,8 +102,6 @@ struct VBoxGuestDeviceState
struct resource *pIrqRes;
/** Pointer to the IRQ handler. */
void *pfnIrqHandler;
@@ -9,7 +9,7 @@
};
-@@ -104,8 +102,7 @@ struct VBoxGuestDeviceState
+@@ -113,8 +111,7 @@ struct VBoxGuestDeviceState
/*
* Character device file handlers.
*/
@@ -19,7 +19,7 @@
static d_ioctl_t vgdrvFreeBSDIOCtl;
static int vgdrvFreeBSDIOCtlSlow(PVBOXGUESTSESSION pSession, u_long ulCmd, caddr_t pvData, struct thread *pTd);
static d_write_t vgdrvFreeBSDWrite;
-@@ -136,8 +133,7 @@ static struct cdevsw g_vgdrvFreeBSDCh
+@@ -145,8 +142,7 @@ static struct cdevsw g_vgdrvFreeBSDChrDevSW =
{
.d_version = D_VERSION,
.d_flags = D_TRACKCLOSE | D_NEEDMINOR,
@@ -29,7 +29,7 @@
.d_ioctl = vgdrvFreeBSDIOCtl,
.d_read = vgdrvFreeBSDRead,
.d_write = vgdrvFreeBSDWrite,
-@@ -145,81 +141,28 @@ static struct cdevsw g_vgdrvFreeBSDCh
+@@ -154,81 +150,28 @@ static struct cdevsw g_vgdrvFreeBSDChrDevSW =
.d_name = "vboxguest"
};
@@ -118,7 +118,7 @@
{
int rc;
PVBOXGUESTSESSION pSession;
-@@ -227,25 +170,18 @@ static int vgdrvFreeBSDOpen(struct cdev
+@@ -236,25 +179,18 @@ static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOp
LogFlow(("vgdrvFreeBSDOpen:\n"));
/*
@@ -150,7 +150,7 @@
}
LogRel(("vgdrvFreeBSDOpen: failed. rc=%d\n", rc));
-@@ -253,33 +189,6 @@ static int vgdrvFreeBSDOpen(struct cdev
+@@ -262,33 +198,6 @@ static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOp
}
/**
@@ -184,20 +184,21 @@
* I/O control request.
*
* @returns depends...
-@@ -292,7 +201,11 @@ static int vgdrvFreeBSDClose(struct cdev
+@@ -301,8 +210,12 @@ static int vgdrvFreeBSDClose(struct cdev *pDev, int fF
static int vgdrvFreeBSDIOCtl(struct cdev *pDev, u_long ulCmd, caddr_t pvData, int fFile, struct thread *pTd)
{
PVBOXGUESTSESSION pSession;
- devfs_get_cdevpriv((void **)&pSession);
+ int rc;
-+
+
+ rc = devfs_get_cdevpriv((void **)&pSession);
+ if (rc)
+ return rc;
-
++
/*
* Deal with the fast ioctl path first.
-@@ -488,12 +401,14 @@ int VBOXCALL VBoxGuestIDC(void *pvSessio
+ */
+@@ -497,12 +410,14 @@ int VBOXCALL VBoxGuestIDC(void *pvSession, uintptr_t u
static int vgdrvFreeBSDPoll(struct cdev *pDev, int fEvents, struct thread *td)
{
@@ -215,19 +216,20 @@
Log(("vgdrvFreeBSDPoll: no state data for %s\n", devtoname(pDev)));
return (fEvents & (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM));
}
-@@ -534,10 +449,7 @@ static int vgdrvFreeBSDDetach(device_t p
+@@ -543,11 +458,8 @@ static int vgdrvFreeBSDDetach(device_t pDevice)
/*
* Reverse what we did in vgdrvFreeBSDAttach.
*/
- if (g_vgdrvFreeBSDEHTag != NULL)
- EVENTHANDLER_DEREGISTER(dev_clone, g_vgdrvFreeBSDEHTag);
--
-- clone_cleanup(&g_pvgdrvFreeBSDClones);
+ destroy_dev(g_pDev);
+- clone_cleanup(&g_pvgdrvFreeBSDClones);
+-
vgdrvFreeBSDRemoveIRQ(pDevice, pState);
-@@ -689,18 +601,21 @@ static int vgdrvFreeBSDAttach(device_t p
+ if (pState->pVMMDevMemRes)
+@@ -698,18 +610,21 @@ static int vgdrvFreeBSDAttach(device_t pDevice)
if (RT_SUCCESS(rc))
{
/*
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2017-10-18 07:06:43 UTC
+--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2020-05-13 19:37:01 UTC
+++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile
-@@ -70,6 +70,7 @@ SRCS += \
+@@ -80,6 +80,7 @@ SRCS += \
handletable.c \
handletablectx.c \
once.c \
@@ -8,7 +8,7 @@
thread.c
.PATH: ${.CURDIR}/common/string
-@@ -128,6 +129,7 @@ SRCS += \
+@@ -139,6 +140,7 @@ SRCS += \
.PATH: ${.CURDIR}/r0drv
SRCS += \
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2017-10-18 07:06:43 UTC
+--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2020-05-13 19:37:01 UTC
+++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest
-@@ -99,6 +99,7 @@ FILES_VBOXGUEST_NOBIN=" \
+@@ -109,6 +109,7 @@ FILES_VBOXGUEST_NOBIN=" \
${PATH_ROOT}/src/VBox/Runtime/common/misc/handletable.h=>common/misc/handletable.h \
${PATH_ROOT}/src/VBox/Runtime/common/misc/handletablectx.cpp=>common/misc/handletablectx.c \
${PATH_ROOT}/src/VBox/Runtime/common/misc/once.cpp=>common/misc/once.c \
@@ -8,7 +8,7 @@
${PATH_ROOT}/src/VBox/Runtime/common/misc/thread.cpp=>common/misc/thread.c \
${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp=>common/misc/RTAssertMsg1Weak.c \
${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp=>common/misc/RTAssertMsg2.c \
-@@ -160,6 +161,7 @@ FILES_VBOXGUEST_NOBIN=" \
+@@ -171,6 +172,7 @@ FILES_VBOXGUEST_NOBIN=" \
${PATH_ROOT}/src/VBox/Runtime/generic/errvars-generic.cpp=>generic/errvars-generic.c \
${PATH_ROOT}/src/VBox/Runtime/generic/timer-generic.cpp=>generic/timer-generic.c \
${PATH_ROOT}/src/VBox/Runtime/generic/mppresent-generic.cpp=>generic/mppresent-generic.c \
@@ -16,7 +16,7 @@
${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \
${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \
${PATH_ROOT}/src/VBox/Runtime/r0drv/initterm-r0drv.cpp=>r0drv/initterm-r0drv.c \
-@@ -186,6 +188,7 @@ FILES_VBOXGUEST_NOBIN=" \
+@@ -197,6 +199,7 @@ FILES_VBOXGUEST_NOBIN=" \
${PATH_ROOT}/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h=>r0drv/freebsd/sleepqueue-r0drv-freebsd.h \
${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c=>r0drv/generic/semspinmutex-r0drv-generic.c \
${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp=>r0drv/generic/mpnotification-r0drv-generic.c \
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports.py
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports.py Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports.py Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,5 +1,5 @@
---- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py.orig 2014-12-19 16:58:04.474417000 -0500
-+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py 2014-11-21 10:16:35.000000000 -0500
+--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py.orig 2020-06-26 09:52:40 UTC
++++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py
@@ -0,0 +1,95 @@
+# Copyright (c) 2001, Stanford University
+# All rights reserved.
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports_dri.py
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports_dri.py Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports_dri.py Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,5 +1,5 @@
---- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py.orig 2014-12-19 16:58:04.474417000 -0500
-+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py 2014-11-21 10:16:35.000000000 -0500
+--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py.orig 2020-06-26 09:53:28 UTC
++++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py
@@ -0,0 +1,95 @@
+# Copyright (c) 2001, Stanford University
+# All rights reserved.
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_glxapi_exports.py
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_glxapi_exports.py Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_glxapi_exports.py Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,5 +1,5 @@
---- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py.orig 2014-12-19 16:58:04.474417000 -0500
-+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py 2014-11-21 10:16:35.000000000 -0500
+--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py.orig 2020-06-26 09:53:39 UTC
++++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py
@@ -0,0 +1,104 @@
+"""
+Copyright (C) 2009-2012 Oracle Corporation
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2016-07-18 11:50:43 UTC
+--- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2020-05-13 19:37:03 UTC
+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk
-@@ -47,9 +47,7 @@ endif
+@@ -50,9 +50,7 @@ endif
if1of ($(KBUILD_TARGET), linux solaris freebsd)
#VBoxOGL_DRI = 1
DLLS += VBoxEGL
@@ -11,7 +11,7 @@
# Only Solaris right now needs C stubs because I can't figure out how to
# generate the GOT based relocation ASM yet.
-@@ -184,10 +182,12 @@ VBoxOGL_CLEAN.linux += \
+@@ -188,10 +186,12 @@ VBoxOGL_CLEAN.linux += \
$(VBOX_PATH_CROGL_GENFILES)/linux_exports.c
VBoxOGL_CLEAN.solaris += \
$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c
@@ -25,7 +25,7 @@
ifdef VBoxOGL_DRI
VBoxOGL_CLEAN += \
$(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
-@@ -200,6 +200,8 @@ if1of ($(KBUILD_TARGET), linux solaris)
+@@ -204,6 +204,8 @@ if1of ($(KBUILD_TARGET), linux solaris)
$(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm
VBoxOGL_CLEAN.solaris += \
$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm
@@ -34,7 +34,7 @@
endif
endif
VBoxOGL_LIBS = \
-@@ -229,6 +231,8 @@ if1of ($(KBUILD_TARGET), linux solaris f
+@@ -244,6 +246,8 @@ if1of ($(KBUILD_TARGET), linux solaris freebsd)
else
VBoxOGL_SONAME.linux = libGL.so.1
VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain
@@ -43,7 +43,7 @@
endif
endif
ifdef VBOX_WITH_CRHGSMI
-@@ -237,7 +241,7 @@ endif
+@@ -252,7 +256,7 @@ endif
ifdef VBOX_WITH_WDDM
VBoxOGL_DEFS.win += VBOX_WITH_WDDM
endif
@@ -52,7 +52,7 @@
VBoxOGL_LDFLAGS += -Wl,-z,nodelete
endif
ifdef VBOX_WITH_WDDM
-@@ -395,6 +399,16 @@ $(VBOX_PATH_CROGL_GENFILES)/solaris_expo
+@@ -418,6 +422,16 @@ $(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm: \
$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm: $(PATH_SUB_CURRENT)/SunOS_i386_glxapi_exports.py | $$(dir $$@)
$(call MSG_GENERATE,python,$@,$<)
$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
@@ -69,9 +69,9 @@
else
$(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \
-@@ -712,6 +726,7 @@ VBoxEGL_SOURCES = egl.c
- VBoxEGL_INCS = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7
- VBoxEGL_LIBS = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
+@@ -656,6 +670,7 @@ ifndef VBOX_USE_SYSTEM_GL_HEADERS
+ endif
+ VBoxEGL_LIBS = $(VBOX_LIB_OGL) # $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
VBoxEGL_SONAME.linux = libEGL.so.1
+VBoxEGL_SONAME.freebsd = libEGL.so.1
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2015-02-12 11:08:13.000000000 -0500
-+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient 2015-02-12 14:38:40.689104000 -0500
-@@ -28,9 +28,9 @@
+--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2020-05-13 19:37:09 UTC
++++ src/VBox/Additions/x11/Installer/98vboxadd-xclient
+@@ -30,10 +30,10 @@ elif test -z "${SSH_CONNECTION}"; then
# This script can also be triggered by a connection over SSH, which is not
# what we had in mind, so we do not start VBoxClient in that case. We do
# not use "exit" here as this script is "source"d, not executed.
@@ -14,4 +14,5 @@
+ /usr/local/bin/VBoxClient --display
+ /usr/local/bin/VBoxClient --seamless
+ /usr/local/bin/VBoxClient --draganddrop
+ /usr/bin/VBoxClient --vmsvga-x11 # In case VMSVGA emulation is enabled
fi
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Additions/x11/Installer/vboxclient.desktop.orig 2009-06-12 12:34:57.000000000 +0000
-+++ src/VBox/Additions/x11/Installer/vboxclient.desktop 2011-01-13 22:07:37.000000000 +0000
-@@ -8,6 +8,6 @@
+--- src/VBox/Additions/x11/Installer/vboxclient.desktop.orig 2020-05-13 19:37:09 UTC
++++ src/VBox/Additions/x11/Installer/vboxclient.desktop
+@@ -8,6 +8,6 @@ Comment[C]=VirtualBox User Session Services
Comment=VirtualBox User Session Services
Comment[it]=Servizi di sessione utente di VirtualBox
Comment[pl]=Usługi sesji użytkownika VirtualBox
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h.orig 2015-03-02 10:09:19.000000000 -0500
-+++ src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h 2015-03-02 19:42:56.808020000 -0500
-@@ -241,6 +241,9 @@
+--- src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h.orig 2020-05-13 19:42:23 UTC
++++ src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h
+@@ -245,6 +245,9 @@ struct mbuf {
#define M_FRAG 0x00000800 /* packet is a fragment of a larger packet */
#define M_FIRSTFRAG 0x00001000 /* packet is first fragment */
#define M_LASTFRAG 0x00002000 /* packet is last fragment */
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2013-11-29 14:23:32.000000000 -0500
-+++ src/VBox/Devices/PC/ipxe/Makefile.kmk 2013-12-13 15:06:45.000000000 -0500
-@@ -35,7 +35,7 @@
+--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2020-05-13 19:42:27 UTC
++++ src/VBox/Devices/PC/ipxe/Makefile.kmk
+@@ -35,7 +35,7 @@ iPxeBiosBin_SOURCES = $(iPxeBiosBin_0_OUTDIR)/iPxeBio
iPxeBiosBin_CLEAN = \
$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2016-07-18 11:56:20 UTC
+--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2020-05-13 19:43:53 UTC
+++ src/VBox/HostDrivers/Support/freebsd/Makefile
-@@ -81,6 +81,7 @@ SRCS += \
+@@ -82,6 +82,7 @@ SRCS += \
assert.c \
handletable.c \
handletablectx.c \
@@ -8,7 +8,7 @@
once.c \
term.c \
thread.c
-@@ -92,13 +93,14 @@ SRCS += \
+@@ -94,13 +95,14 @@ SRCS += \
RTStrCopy.c \
RTStrCopyEx.c \
RTStrCopyP.c \
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/HostDrivers/Support/freebsd/files_vboxdrv.orig 2016-07-18 11:56:20 UTC
+--- src/VBox/HostDrivers/Support/freebsd/files_vboxdrv.orig 2020-05-13 19:43:53 UTC
+++ src/VBox/HostDrivers/Support/freebsd/files_vboxdrv
-@@ -116,6 +116,7 @@ FILES_VBOXDRV_NOBIN=" \
+@@ -118,6 +118,7 @@ FILES_VBOXDRV_NOBIN=" \
${PATH_ROOT}/src/VBox/Runtime/common/misc/handletable.cpp=>common/misc/handletable.c \
${PATH_ROOT}/src/VBox/Runtime/common/misc/handletable.h=>common/misc/handletable.h \
${PATH_ROOT}/src/VBox/Runtime/common/misc/handletablectx.cpp=>common/misc/handletablectx.c \
@@ -8,7 +8,7 @@
${PATH_ROOT}/src/VBox/Runtime/common/misc/once.cpp=>common/misc/once.c \
${PATH_ROOT}/src/VBox/Runtime/common/misc/term.cpp=>common/misc/term.c \
${PATH_ROOT}/src/VBox/Runtime/common/misc/thread.cpp=>common/misc/thread.c \
-@@ -124,13 +125,14 @@ FILES_VBOXDRV_NOBIN=" \
+@@ -127,13 +128,14 @@ FILES_VBOXDRV_NOBIN=" \
${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopyEx.cpp=>common/string/RTStrCopyEx.c \
${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrNCmp.cpp=>common/string/RTStrNCmp.c \
${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrNLen.cpp=>common/string/RTStrNLen.c \
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,9 +1,9 @@
Fix kmod panic when VIMAGE is disabled in the kernel and port
Submitted by: Gleb Kurtsou <gleb at freebsd.org>
---- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig 2013-04-12 03:38:10.000000000 -0700
-+++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2013-06-11 21:24:05.000000000 -0700
-@@ -143,12 +143,15 @@
+--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig 2020-05-13 19:43:54 UTC
++++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
+@@ -203,12 +203,15 @@ $$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \
$$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
| $$(dir $$@)
$(QUIET)$(RM) -f -- $@
@@ -14,12 +14,12 @@ Submitted by: Gleb Kurtsou <gleb at freebsd.org>
+ ifndef VBOX_WITH_HARDENING
+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@
+ ${QUIET}$(MV) -f $@.tmp $@
-+ endif
+ endif
+-
+ ifndef VBOX_WITH_NETFLT_VIMAGE
+ $(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@
+ ${QUIET}$(MV) -f $@.tmp $@
- endif
--
++ endif
endif # freebsd
include $(FILE_KBUILD_SUB_FOOTER)
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2014-09-09 15:54:30.000000000 -0400
-+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2014-09-30 15:36:06.000000000 -0400
-@@ -234,7 +234,11 @@
+--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2020-05-13 19:43:54 UTC
++++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c
+@@ -235,7 +235,11 @@ static void VBoxNetAdpFreeBSDNetstart(struct ifnet *if
ifp->if_drv_flags |= IFF_DRV_OACTIVE;
while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
{
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Installer-Makefile.kmk
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Installer-Makefile.kmk Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Installer-Makefile.kmk Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Installer/Makefile.kmk.orig 2009-10-05 14:31:40.000000000 +0200
-+++ src/VBox/Installer/Makefile.kmk 2009-10-05 14:32:09.000000000 +0200
-@@ -38,10 +38,12 @@
+--- src/VBox/Installer/Makefile.kmk.orig 2020-05-13 19:44:01 UTC
++++ src/VBox/Installer/Makefile.kmk
+@@ -41,9 +41,11 @@ ifndef VBOX_ONLY_SDK
if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_HOST)" == "win"
include $(PATH_SUB_CURRENT)/win/Makefile.kmk
endif
@@ -8,8 +8,7 @@
if "$(KBUILD_TARGET)" == "freebsd" && "$(KBUILD_HOST)" == "freebsd"
include $(PATH_SUB_CURRENT)/freebsd/Makefile.kmk
endif
- endif
+endif
+ endif
include $(PATH_SUB_CURRENT)/common/Makefile.kmk
-
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Installer/freebsd/virtualbox.desktop.orig 2010-10-07 10:42:04.000000000 +0200
-+++ src/VBox/Installer/freebsd/virtualbox.desktop 2010-10-07 10:43:20.000000000 +0200
-@@ -7,7 +7,6 @@
+--- src/VBox/Installer/freebsd/virtualbox.desktop.orig 2020-05-13 19:44:01 UTC
++++ src/VBox/Installer/freebsd/virtualbox.desktop
+@@ -7,7 +7,6 @@ GenericName=Virtual Machine
Type=Application
Exec=VirtualBox
TryExec=VirtualBox
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2015-04-01 12:15:14.000000000 -0400
-+++ src/VBox/Main/src-server/VirtualBoxImpl.cpp 2015-04-07 12:25:59.226583000 -0400
-@@ -2172,7 +2172,7 @@
+--- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2020-05-13 19:44:10 UTC
++++ src/VBox/Main/src-server/VirtualBoxImpl.cpp
+@@ -2251,7 +2251,7 @@ int VirtualBox::i_encryptSettingBytes(const uint8_t *a
if (aCiphertextSize < 32)
return VERR_INVALID_PARAMETER;
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp.orig 2015-04-14 15:41:25.000000000 -0400
-+++ src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp 2015-04-14 18:25:23.156536000 -0400
-@@ -251,8 +251,9 @@
+--- src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp.orig 2020-05-13 19:44:10 UTC
++++ src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp
+@@ -253,8 +253,9 @@ static int getDVDInfoFromCAM(DriveInfoList *pList, boo
PeriphMatchPattern.pattern.periph_pattern.path_id = paMatches[i].result.device_result.path_id;
PeriphMatchPattern.pattern.periph_pattern.target_id = paMatches[i].result.device_result.target_id;
PeriphMatchPattern.pattern.periph_pattern.target_lun = paMatches[i].result.device_result.target_lun;
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Main/webservice/Makefile.kmk.orig 2015-10-15 13:59:24 UTC
+--- src/VBox/Main/webservice/Makefile.kmk.orig 2020-05-13 19:44:11 UTC
+++ src/VBox/Main/webservice/Makefile.kmk
-@@ -159,7 +159,6 @@ VBOX_PATH_IDL := $(abspa
+@@ -158,7 +158,6 @@ VBOX_PATH_IDL := $(abspath $(PATH_SUB_
RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
PATH_TARGET_SOAPDEMOXML := $(VBOXWEB_OUT_DIR)/demo_soapxml
@@ -8,7 +8,7 @@
PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest
-@@ -515,8 +514,6 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) |
+@@ -553,8 +552,6 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) | $$(dir $$@)
$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
$(PATH_TARGET_SOAPDEMOXML)/dummy_file \
@@ -17,7 +17,7 @@
$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
-@@ -695,17 +692,14 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
+@@ -774,17 +771,14 @@ endif
# any more. Ignoring the exit code is the simple solution, accepting the error.
$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@)
$(RM) -f $@
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,7 +1,7 @@
---- src/VBox/Runtime/Makefile.kmk.orig 2014-07-15 13:25:15.000000000 -0400
-+++ src/VBox/Runtime/Makefile.kmk 2014-07-16 17:15:58.000000000 -0400
-@@ -146,6 +146,11 @@
- IPRT_BLDCFG_TYPE=\"$(KBUILD_TYPE)\"
+--- src/VBox/Runtime/Makefile.kmk.orig 2020-05-13 19:44:16 UTC
++++ src/VBox/Runtime/Makefile.kmk
+@@ -173,6 +173,11 @@ $(IPRT_OUT_DIR)/oiddb.h.ts +| $(IPRT_OUT_DIR)/oiddb.h:
+
#
+# Set the defines that utf8-posix.cpp needs. It's used by several targets.
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h Sun Jul 19 09:21:49 2020 (r542552)
@@ -7,9 +7,9 @@ The patch improves the situation significantly. Also,
what tvtohz does.
Submitted by: Andriy Gapon <avg at FreeBSD.org>
---- src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h.orig 2012-12-19 19:27:29.000000000 +0100
-+++ src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h 2012-12-20 12:07:48.941861966 +0100
-@@ -82,6 +82,8 @@
+--- src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h.orig 2020-05-13 19:44:32 UTC
++++ src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h
+@@ -82,6 +82,8 @@ DECLINLINE(uint32_t) rtR0SemBsdWaitUpdateTimeout(PRTR0
uint64_t cTicks = ASMMultU64ByU32DivByU32(uTimeout, hz, UINT32_C(1000000000));
if (cTicks >= INT_MAX)
return RTSEMWAIT_FLAGS_INDEFINITE;
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/recompiler/Makefile.kmk.orig 2013-11-29 14:25:09.000000000 -0500
-+++ src/recompiler/Makefile.kmk 2013-12-13 14:23:11.000000000 -0500
-@@ -41,6 +41,7 @@
+--- src/recompiler/Makefile.kmk.orig 2020-05-13 19:46:49 UTC
++++ src/recompiler/Makefile.kmk
+@@ -41,6 +41,7 @@ endif
#
ifneq ($(KBUILD_TARGET),win)
VBoxRemPrimary_TEMPLATE = VBOXR3NP
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src-recompiler-Sun-testmath.c
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src-recompiler-Sun-testmath.c Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src-recompiler-Sun-testmath.c Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/recompiler/Sun/testmath.c.orig 2011-01-14 21:15:07.000000000 +0100
-+++ src/recompiler/Sun/testmath.c 2011-08-05 13:54:49.000000000 +0200
-@@ -261,8 +261,6 @@
+--- src/recompiler/Sun/testmath.c.orig 2020-05-13 19:46:49 UTC
++++ src/recompiler/Sun/testmath.c
+@@ -273,8 +273,6 @@ extern int testmath(void)
#endif
set_cw(0x27f);
@@ -9,14 +9,14 @@
CHECK(remainderl(1.0L, 1.0L), 0.0);
CHECK(remainderl(1.0L, 1.5L), -0.5);
CHECK(remainderl(42.0L, 34.25L), 7.75);
-@@ -315,10 +313,6 @@
+@@ -341,10 +339,6 @@ extern int testmath(void)
+
CHECK(tanl(0.0L), 0.0);
CHECK(tanl(0.7853981633974483096156608458198757L), 1.0);
-
+-
- CHECK(powl(0.0, 0.0), 1.0);
- CHECK(powl(2.0, 2.0), 4.0);
- CHECK(powl(3.0, 3.0), 27.0);
--
+
return cErrors;
}
-
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_pam_pam__vbox.cpp
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_pam_pam__vbox.cpp Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_pam_pam__vbox.cpp Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Additions/common/pam/pam_vbox.cpp.orig 2016-07-18 11:50:44 UTC
+--- src/VBox/Additions/common/pam/pam_vbox.cpp.orig 2020-05-13 19:37:05 UTC
+++ src/VBox/Additions/common/pam/pam_vbox.cpp
-@@ -105,7 +105,7 @@ static void pam_vbox_writesyslog(char *p
+@@ -105,7 +105,7 @@ static void pam_vbox_writesyslog(char *pszBuf)
openlog("pam_vbox", LOG_PID, LOG_AUTHPRIV);
syslog(LOG_ERR, "%s", pszBuf);
closelog();
@@ -9,7 +9,7 @@
syslog(LOG_ERR, "pam_vbox: %s\n", pszBuf);
#endif
}
-@@ -180,7 +180,7 @@ static int vbox_set_msg(pam_handle_t *hP
+@@ -184,7 +184,7 @@ static int vbox_set_msg(pam_handle_t *hPAM, int iStyle
pam_message msg;
msg.msg_style = iStyle;
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_Makefile
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_Makefile Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_Makefile Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Additions/freebsd/Makefile.orig 2017-04-28 16:59:22.000000000 +0200
-+++ src/VBox/Additions/freebsd/Makefile 2017-07-13 00:04:11.766870597 +0200
-@@ -31,6 +31,14 @@
+--- src/VBox/Additions/freebsd/Makefile.orig 2020-05-13 19:37:06 UTC
++++ src/VBox/Additions/freebsd/Makefile
+@@ -30,6 +30,14 @@ all:
cp vboxvfs/vboxvfs.ko .; \
fi; \
fi
@@ -15,7 +15,7 @@
install:
-@@ -38,13 +46,19 @@
+@@ -37,13 +45,19 @@ install:
@if [ -d vboxvfs ]; then \
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvfs install; \
fi
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_Makefile.kmk
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_Makefile.kmk Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_Makefile.kmk Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk.orig 2017-04-28 16:59:22.000000000 +0200
-+++ src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk 2017-07-13 00:52:49.020669620 +0200
-@@ -33,32 +33,36 @@
+--- src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk.orig 2020-05-13 19:37:06 UTC
++++ src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
+@@ -33,32 +33,36 @@ vboxvfs_INCS = \
$(vboxvfs_0_OUTDIR)
vboxvfs_SOURCES = \
vboxvfs_vfsops.c \
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__prov.c
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__prov.c Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__prov.c Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,5 +1,5 @@
---- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c.orig 1970-01-01 01:00:00.000000000 +0100
-+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c 2017-07-12 19:24:26.109029000 +0200
+--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c.orig 2020-06-26 09:59:35 UTC
++++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c
@@ -0,0 +1,1020 @@
+/*
+ * Copyright (C) 2008-2016 Oracle Corporation
Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c Sun Jul 19 09:19:22 2020 (r542551)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c Sun Jul 19 09:21:49 2020 (r542552)
@@ -1,6 +1,6 @@
---- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig 2017-04-28 16:59:22.000000000 +0200
-+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c 2017-07-12 19:24:26.109029000 +0200
-@@ -1,10 +1,5 @@
+--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig 2020-05-13 19:37:06 UTC
++++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c
+@@ -1,8 +1,3 @@
-/* $Id: vboxvfs_vfsops.c $ */
-/** @file
- * Description.
@@ -9,8 +9,6 @@
/*
* Copyright (C) 2008-2017 Oracle Corporation
*
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
@@ -14,245 +9,479 @@
* VirtualBox OSE distribution. VirtualBox OSE is distributed in the
* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
@@ -38,20 +36,26 @@
+#include <sys/sbuf.h>
-#include <iprt/mem.h>
--
--#define VFSMP2SFGLOBINFO(mp) ((struct sf_glob_info *)mp->mnt_data)
--
--static int vboxvfs_version = VBOXVFS_VERSION;
+#include <geom/geom.h>
+#include <geom/geom_vfs.h>
++#include "vboxvfs.h"
++
+ #define VFSMP2SFGLOBINFO(mp) ((struct sf_glob_info *)mp->mnt_data)
+
+-static int vboxvfs_version = VBOXVFS_VERSION;
++#ifdef MALLOC_DECLARE
++MALLOC_DEFINE(M_VBOXVFS, "vboxvfs", "VBOX VFS");
++#endif
+
-SYSCTL_NODE(_vfs, OID_AUTO, vboxvfs, CTLFLAG_RW, 0, "VirtualBox shared filesystem");
-SYSCTL_INT(_vfs_vboxvfs, OID_AUTO, version, CTLFLAG_RD, &vboxvfs_version, 0, "");
-+#include "vboxvfs.h"
++static sfp_connection_t *sfprov = NULL;
-/* global connection to the host service. */
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list