mirror of https://git.FreeBSD.org/ports.git
emulators/virtualbox-ose{,-kmod,-nox11}-72: Add new ports VirtualBox 7.2.0
Port based on patch from Stas Timokhin <devel@stasyan.com>. The main work on porting was done by the author of the original patch. The rest is a several various improvements and bug fixes that have been made over the past few months in older versions and one upstream regression: https://github.com/VirtualBox/virtualbox/issues/135 The requirements for 7.2.x are the same as for 7.1.x, but for now we'll leave both versions: 7.2.x in experimental/test mode and 7.1.x - stable. Upstream ported on aarch64, but for now we keep ONLY_FOR_ARCHS=amd64. If you interested in porting it on aarch64 - create PR with patch. The following ports also need to be created (they are not available for versions 7.0.x and 7.1.x either): - emulators/virtualbox-ose-additions-72; - emulators/virtualbox-ose-additions-nox11-72. www/phpvirtualbox-72 already in ports. Changelog: https://www.virtualbox.org/wiki/Changelog-7.2 While here refresh patches. PR: 289019 Relnotes: Add VirtualBox 7.2.0 Co-authored-by: Stas Timokhin <devel@stasyan.com> Co-authored-by: Mario Lobo <lobo@bsd.com.br>
This commit is contained in:
parent
54a5827bb6
commit
3fd0f81ce5
|
@ -158,6 +158,7 @@
|
|||
SUBDIR += virtualbox-ose
|
||||
SUBDIR += virtualbox-ose-70
|
||||
SUBDIR += virtualbox-ose-71
|
||||
SUBDIR += virtualbox-ose-72
|
||||
SUBDIR += virtualbox-ose-additions
|
||||
SUBDIR += virtualbox-ose-additions-legacy
|
||||
SUBDIR += virtualbox-ose-additions-nox11
|
||||
|
@ -165,11 +166,13 @@
|
|||
SUBDIR += virtualbox-ose-kmod
|
||||
SUBDIR += virtualbox-ose-kmod-70
|
||||
SUBDIR += virtualbox-ose-kmod-71
|
||||
SUBDIR += virtualbox-ose-kmod-72
|
||||
SUBDIR += virtualbox-ose-kmod-legacy
|
||||
SUBDIR += virtualbox-ose-legacy
|
||||
SUBDIR += virtualbox-ose-nox11
|
||||
SUBDIR += virtualbox-ose-nox11-70
|
||||
SUBDIR += virtualbox-ose-nox11-71
|
||||
SUBDIR += virtualbox-ose-nox11-72
|
||||
SUBDIR += virtualbox-ose-nox11-legacy
|
||||
SUBDIR += visualboyadvance-m
|
||||
SUBDIR += vmips
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
PORTNAME= virtualbox-ose
|
||||
DISTVERSION= 7.1.12
|
||||
DISTVERSION= 7.2.0
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES= emulators
|
||||
MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \
|
||||
LOCAL/vvd:docs
|
||||
PKGNAMESUFFIX?= -71
|
||||
PKGNAMESUFFIX?= -72
|
||||
DISTFILES= VirtualBox-${DISTVERSION}${EXTRACT_SUFX}:src \
|
||||
VirtualBox-docs-${DISTVERSION}${EXTRACT_SUFX}:docs
|
||||
EXTRACT_ONLY= VirtualBox-${DISTVERSION}${EXTRACT_SUFX} \
|
||||
|
@ -25,7 +25,7 @@ BUILD_DEPENDS= gtar:archivers/gtar \
|
|||
xsltproc:textproc/libxslt
|
||||
LIB_DEPENDS= libpng.so:graphics/png \
|
||||
libcurl.so:ftp/curl
|
||||
RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-71
|
||||
RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-72
|
||||
|
||||
USES= compiler:c++17-lang cpe gnome iconv pkgconfig qt:6 ssl tar:bzip2
|
||||
CPE_VENDOR= oracle
|
||||
|
@ -45,10 +45,10 @@ CONFLICTS_INSTALL= virtualbox-ose-legacy \
|
|||
virtualbox-ose-nox11 \
|
||||
virtualbox-ose-70 \
|
||||
virtualbox-ose-nox11-70 \
|
||||
virtualbox-ose-72 \
|
||||
virtualbox-ose-nox11-72
|
||||
virtualbox-ose-71 \
|
||||
virtualbox-ose-nox11-71
|
||||
|
||||
PORTSCOUT= limit:^7\.1\.
|
||||
PORTSCOUT= limit:^7\.2\.
|
||||
SUB_FILES= pkg-message
|
||||
SUB_LIST= VBOXDIR=${VBOX_DIR} \
|
||||
VBOX_ETC=${VBOX_ETC} \
|
||||
|
@ -148,9 +148,9 @@ ENV=
|
|||
.include <bsd.port.options.mk>
|
||||
|
||||
.if ${SLAVE_PORT} == no
|
||||
CONFLICTS_INSTALL+= virtualbox-ose-nox11-71
|
||||
CONFLICTS_INSTALL+= virtualbox-ose-nox11-72
|
||||
.else
|
||||
CONFLICTS_INSTALL+= virtualbox-ose-71
|
||||
CONFLICTS_INSTALL+= virtualbox-ose-72
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MDEBUG}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
TIMESTAMP = 1752700000
|
||||
SHA256 (VirtualBox-7.1.12.tar.bz2) = 6f9618f39168898134975f51df7c2d6d5129c0aa82b6ae11cf47f920c70df276
|
||||
SIZE (VirtualBox-7.1.12.tar.bz2) = 214691769
|
||||
SHA256 (VirtualBox-docs-7.1.12.tar.bz2) = ba48f2da2593d8cae56fcf601c132d77dbf1d16b1e26db162c89449250c269bd
|
||||
SIZE (VirtualBox-docs-7.1.12.tar.bz2) = 10109084
|
||||
SHA256 (VBoxGuestAdditions_7.1.12.iso) = 256883e2eabf7ab5c10fb3b6831c294942ce34bc615807f9d0cf6c3d2e882236
|
||||
SIZE (VBoxGuestAdditions_7.1.12.iso) = 61331456
|
||||
TIMESTAMP = 1756400000
|
||||
SHA256 (VirtualBox-7.2.0.tar.bz2) = 4f2804ff27848ea772aee6b637bb1e10ee74ec2da117c257413e2d2c4f670ba0
|
||||
SIZE (VirtualBox-7.2.0.tar.bz2) = 206755781
|
||||
SHA256 (VirtualBox-docs-7.2.0.tar.bz2) = 12b27989f2ab9b9316384322a8f1cdadd7003d2e2d6592298e1a84e81f5e0572
|
||||
SIZE (VirtualBox-docs-7.2.0.tar.bz2) = 9200668
|
||||
SHA256 (VBoxGuestAdditions_7.2.0.iso) = 43f7a1045cad0aab40e3af906fea37244ba6873b91b4e227245a14e51b399abd
|
||||
SIZE (VBoxGuestAdditions_7.2.0.iso) = 53143552
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- Config.kmk.orig 2025-05-10 18:43:02 UTC
|
||||
--- Config.kmk.orig 2025-08-28 22:09:24 UTC
|
||||
+++ Config.kmk
|
||||
@@ -610,11 +610,11 @@ endif
|
||||
@@ -624,11 +624,11 @@ endif
|
||||
# Enable OSS audio support.
|
||||
VBOX_WITH_AUDIO_OSS = 1
|
||||
endif
|
||||
|
@ -14,7 +14,7 @@
|
|||
# Enable PulseAudio audio support.
|
||||
VBOX_WITH_AUDIO_PULSE = 1
|
||||
endif
|
||||
@@ -627,11 +627,11 @@ VBOX_WITH_PCI_PASSTHROUGH =
|
||||
@@ -641,11 +641,11 @@ VBOX_WITH_PCI_PASSTHROUGH =
|
||||
# (disabled with 6.1, since it's not complete/useful enough)
|
||||
VBOX_WITH_PCI_PASSTHROUGH =
|
||||
# Enable statically linked dbus support.
|
||||
|
@ -28,7 +28,7 @@
|
|||
VBOX_WITH_PAM = 1
|
||||
endif
|
||||
# Enable internal networking.
|
||||
@@ -639,7 +639,7 @@ VBOX_WITH_VMSVGA = 1
|
||||
@@ -653,7 +653,7 @@ VBOX_WITH_VMSVGA = 1
|
||||
# Enable vmsvga (svga2) graphics device variant, 2D part
|
||||
VBOX_WITH_VMSVGA = 1
|
||||
# Enable vmsvga (svga2) graphics device variant, 3D part
|
||||
|
@ -37,7 +37,7 @@
|
|||
VBOX_WITH_VMSVGA3D = 1
|
||||
endif
|
||||
# Enable vmsvga (svga2) graphics device variant, 3D part, VGPU10 DX commands
|
||||
@@ -825,7 +825,7 @@ VBOX_WITH_VBOXMANAGE_NLS = 1
|
||||
@@ -847,7 +847,7 @@ VBOX_WITH_VBOXMANAGE_NLS = 1
|
||||
#endif
|
||||
# Set this to prefix all C symbols in XPCOM, to avoid dynamic linking problems
|
||||
# caused by our XPCOM library polluting the symbol namespace for system libs.
|
||||
|
@ -46,7 +46,7 @@
|
|||
VBOX_WITH_XPCOM_NAMESPACE_CLEANUP = 1
|
||||
endif
|
||||
# The webservices api.
|
||||
@@ -1357,10 +1357,6 @@ endif
|
||||
@@ -1376,10 +1376,6 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -57,7 +57,7 @@
|
|||
ifeq ($(KBUILD_TARGET),haiku)
|
||||
VBOX_WITH_VRDP_RDESKTOP =
|
||||
# Permanent (no working SDL).
|
||||
@@ -1545,7 +1541,7 @@ ifdef VBOX_OSE
|
||||
@@ -1563,7 +1559,7 @@ ifdef VBOX_OSE
|
||||
# not yet
|
||||
VBOX_WITH_PLUGIN_CRYPT =
|
||||
VBOX_WITH_DRAG_AND_DROP_PROMISES =
|
||||
|
@ -66,11 +66,12 @@
|
|||
VBOX_WITH_DOCS =
|
||||
VBOX_WITH_DOCS_PACKING =
|
||||
endif
|
||||
@@ -3680,19 +3676,7 @@ ifndef VBOX_GCC_std
|
||||
@@ -3637,19 +3633,19 @@ ifndef VBOX_GCC_std
|
||||
#
|
||||
## @todo consider maxing this out.
|
||||
ifndef VBOX_GCC_std
|
||||
- if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.arm64) # Go straight for c++17 here.
|
||||
- if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.arm64 linux.arm64) # Go straight for c++17 here.
|
||||
+# if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.arm64 linux.arm64) # Go straight for c++17 here.
|
||||
VBOX_GCC_std := -std=c++17
|
||||
- # else if "$(VBOX_CLANG_VERSION_CXX)" vge 60000 # Most language features complete by v6. Lib stuff was less complete in v6, but hopefully acceptable for out purposes.
|
||||
- #VBOX_GCC_std := -std=c++17
|
||||
|
@ -83,10 +84,21 @@
|
|||
- else if "$(VBOX_GCC_VERSION_CXX)" vge 40600
|
||||
- VBOX_GCC_std := -std=c++0x
|
||||
- endif
|
||||
+# # else if "$(VBOX_CLANG_VERSION_CXX)" vge 60000 # Most language features complete by v6. Lib stuff was less complete in v6, but hopefully acceptable for out purposes.
|
||||
+# #VBOX_GCC_std := -std=c++17
|
||||
+# else if "$(VBOX_CLANG_VERSION_CXX)" vge 50000 # darwin Xcode 5 allegedly knows what C++11 is
|
||||
+# VBOX_GCC_std := -std=c++11
|
||||
+# # else if "$(VBOX_GCC_VERSION_CXX)" vge 70000 # Language feature P0512R0 was v8, rest v7 or earlier. Most lib stuff present in 7, complete in v12.
|
||||
+# #VBOX_GCC_std := -std=gnu++17
|
||||
+# else if "$(VBOX_GCC_VERSION_CXX)" vge 40800
|
||||
+# VBOX_GCC_std := -std=c++11
|
||||
+# else if "$(VBOX_GCC_VERSION_CXX)" vge 40600
|
||||
+# VBOX_GCC_std := -std=c++0x
|
||||
+# endif
|
||||
endif
|
||||
ifndef VBOX_VCC_std
|
||||
if $(VBOX_VCC_TOOL_STEM) >= VCC141 # since 2017 15.3
|
||||
@@ -5682,11 +5666,11 @@ ifeq ($(VBOX_LDR_FMT),elf)
|
||||
@@ -5688,11 +5684,11 @@ ifeq ($(VBOX_LDR_FMT),elf)
|
||||
# Solaris driver signing.
|
||||
TEMPLATE_VBoxR0_POST_CMDS = $(VBOX_SIGN_DRIVER_CMDS)
|
||||
else
|
||||
|
@ -100,7 +112,7 @@
|
|||
VBOX_WITH_VBOXR0_AS_DLL = 1
|
||||
TEMPLATE_VBoxR0_DLLSUFF = .r0
|
||||
TEMPLATE_VBoxR0_CFLAGS += -fPIC
|
||||
@@ -5697,7 +5681,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
|
||||
@@ -5703,7 +5699,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
|
||||
else
|
||||
TEMPLATE_VBoxR0_CFLAGS.amd64 += -mcmodel=kernel
|
||||
TEMPLATE_VBoxR0_CXXFLAGS.amd64 += -mcmodel=kernel
|
||||
|
@ -109,7 +121,7 @@
|
|||
ifdef VBOX_WITH_KMOD_WRAPPED_R0_MODS # For BTF/pahold issue we use -g1
|
||||
TEMPLATE_VBoxR0_DEFS += VBOX_WITH_KMOD_WRAPPED_R0_MODS
|
||||
TEMPLATE_VBoxR0_LDFLAGS.linux += $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/VBoxR0-wrapped.lds
|
||||
@@ -6081,7 +6065,7 @@ ifeq ($(KBUILD_TARGET),freebsd)
|
||||
@@ -6100,7 +6096,7 @@ ifeq ($(KBUILD_TARGET),freebsd)
|
||||
# x86 FreeBSD (6.2 or something):
|
||||
# cc -O2 -fno-strict-aliasing -pipe -Werror -D_KERNEL -DKLD_MODULE \
|
||||
# -nostdinc -I- -I. -I@ -I@/contrib/altq -I@/../include -I/usr/include \
|
||||
|
@ -118,7 +130,7 @@
|
|||
# -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs \
|
||||
# -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -fformat-extensions \
|
||||
# -std=c99 -c ../my.c
|
||||
@@ -6092,7 +6076,7 @@ ifeq ($(KBUILD_TARGET),freebsd)
|
||||
@@ -6111,7 +6107,7 @@ ifeq ($(KBUILD_TARGET),freebsd)
|
||||
#
|
||||
# AMD64 FreeBSD (7.1):
|
||||
# cc -O2 -fno-strict-aliasing -pipe -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc -I. -I@ -I@/contrib/altq \
|
||||
|
@ -127,7 +139,7 @@
|
|||
# -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 -ffreestanding \
|
||||
# -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign \
|
||||
@@ -6174,7 +6158,7 @@ ifeq ($(KBUILD_TARGET),freebsd)
|
||||
@@ -6193,7 +6189,7 @@ ifeq ($(KBUILD_TARGET),freebsd)
|
||||
| xargs -J% objcopy % $(outbase).kld
|
||||
|
||||
# Link the final .ko (a shared object).
|
||||
|
@ -136,8 +148,8 @@
|
|||
endef
|
||||
endif # x86
|
||||
|
||||
@@ -6209,7 +6193,7 @@ ifeq ($(KBUILD_TARGET),netbsd)
|
||||
$(VBOX_GCC_fdiagnostics-show-option) \
|
||||
@@ -6228,7 +6224,7 @@ ifeq ($(KBUILD_TARGET),netbsd)
|
||||
$(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_fdiagnostics-color) \
|
||||
-Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
|
||||
-Wimplicit-function-declaration -Werror-implicit-function-declaration \
|
||||
- -O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
|
||||
|
@ -145,7 +157,7 @@
|
|||
$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
|
||||
-nostdinc -std=c99 -msoft-float
|
||||
TEMPLATE_VBoxR0Drv_CFLAGS.x86 = -m32 -mno-mmx -mno-sse -mno-avx \
|
||||
@@ -6220,7 +6204,7 @@ ifeq ($(KBUILD_TARGET),netbsd)
|
||||
@@ -6239,7 +6235,7 @@ ifeq ($(KBUILD_TARGET),netbsd)
|
||||
-fno-asynchronous-unwind-tables -mno-fp-ret-in-387
|
||||
TEMPLATE_VBoxR0Drv_CXXFLAGS = -fno-exceptions -fno-rtti \
|
||||
$(VBOX_GCC_WARN) -Wpointer-arith -Winline \
|
||||
|
@ -154,26 +166,26 @@
|
|||
$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
|
||||
-nostdinc -msoft-float
|
||||
TEMPLATE_VBoxR0Drv_CXXFLAGS.x86 = $(TEMPLATE_VBoxR0Drv_CFLAGS.x86)
|
||||
@@ -6528,11 +6512,11 @@ else # the gcc guys
|
||||
TEMPLATE_VBoxR3Exe_LIBS = pthread m rt dl
|
||||
@@ -6565,11 +6561,11 @@ else # the gcc guys
|
||||
TEMPLATE_VBoxR3Exe_LATE_LIBS = pthread m rt dl
|
||||
else ifeq ($(KBUILD_TARGET),os2)
|
||||
TEMPLATE_VBoxR3Exe_TOOL = GXX3OMF
|
||||
- TEMPLATE_VBoxR3Exe_LIBS = socket iconv
|
||||
+ TEMPLATE_VBoxR3Exe_LIBS = socket
|
||||
- TEMPLATE_VBoxR3Exe_LATE_LIBS = socket iconv
|
||||
+ TEMPLATE_VBoxR3Exe_LATE_LIBS = socket
|
||||
else ifeq ($(KBUILD_TARGET),darwin)
|
||||
TEMPLATE_VBoxR3Exe_TOOL = $(VBOX_GCC_TOOL)
|
||||
TEMPLATE_VBoxR3Exe_LIBS =
|
||||
TEMPLATE_VBoxR3Exe_LATE_LIBS =
|
||||
- TEMPLATE_VBoxR3Exe_DEFS += LIBICONV_PLUG # Avoid 3rd party libiconv (from macports).
|
||||
+ TEMPLATE_VBoxR3Exe_DEFS += LIBICONV_PLUG # Avoid 3rd party lib (from macports).
|
||||
TEMPLATE_VBoxR3Exe_SDKS.darwin = $(VBOX_DARWIN_DEF_SDK_SDKS)
|
||||
TEMPLATE_VBoxR3Exe_DEFS.darwin = $(VBOX_DARWIN_DEF_SDK_DEFS)
|
||||
TEMPLATE_VBoxR3Exe_CFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -fno-common
|
||||
@@ -6549,17 +6533,26 @@ else # the gcc guys
|
||||
@@ -6585,24 +6581,29 @@ else # the gcc guys
|
||||
else ifeq ($(KBUILD_TARGET),haiku)
|
||||
TEMPLATE_VBoxR3Exe_TOOL = GXX3
|
||||
TEMPLATE_VBoxR3Exe_POST_CMDS = $(VBOX_HAIKU_XRES_SETVER_CMDS)
|
||||
- TEMPLATE_VBoxR3Exe_LIBS = network iconv stdc++ supc++
|
||||
+ TEMPLATE_VBoxR3Exe_LIBS = network stdc++ supc++
|
||||
TEMPLATE_VBoxR3Exe_POST_CMDS = $(VBOX_HAIKU_XRES_SETVER_CMDS)
|
||||
- TEMPLATE_VBoxR3Exe_LATE_LIBS = network iconv stdc++ supc++
|
||||
+ TEMPLATE_VBoxR3Exe_LATE_LIBS = network stdc++ supc++
|
||||
TEMPLATE_VBoxR3Exe_LIBPATH += \
|
||||
/boot/common/lib
|
||||
# Haiku uses PIC by default...
|
||||
|
@ -181,23 +193,30 @@
|
|||
TEMPLATE_VBoxR3Exe_CXXFLAGS += -fno-pic
|
||||
TEMPLATE_VBoxR3Exe_LDFLAGS += -fno-pic
|
||||
- else if1of ($(KBUILD_TARGET), freebsd openbsd)
|
||||
+ else ifeq ($(KBUILD_TARGET), freebsd)
|
||||
+ else if1of ($(KBUILD_TARGET), freebsd)
|
||||
TEMPLATE_VBoxR3Exe_TOOL = GXX3
|
||||
TEMPLATE_VBoxR3Exe_LIBS = pthread
|
||||
TEMPLATE_VBoxR3Exe_LATE_LIBS = pthread
|
||||
+ TEMPLATE_VBoxR3Exe_LDFLAGS = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
|
||||
+ TEMPLATE_VBoxR3Exe_LDFLAGS.freebsd.x86 = -Wl,-z,notext
|
||||
TEMPLATE_VBoxR3Exe_INCS += \
|
||||
+ /usr/local/include
|
||||
+ TEMPLATE_VBoxR3Exe_LIBPATH += \
|
||||
+ /usr/local/lib
|
||||
- /usr/include \
|
||||
- /usr/X11R6/include \
|
||||
/usr/local/include
|
||||
TEMPLATE_VBoxR3Exe_LIBPATH += \
|
||||
- /usr/lib \
|
||||
- /usr/X11R6/lib \
|
||||
/usr/local/lib
|
||||
+ else ifeq ($(KBUILD_TARGET), openbsd)
|
||||
+ TEMPLATE_VBoxR3Exe_TOOL = GXX3
|
||||
+ TEMPLATE_VBoxR3Exe_LIBS = pthread
|
||||
+ TEMPLATE_VBoxR3Exe_INCS += \
|
||||
/usr/include \
|
||||
/usr/X11R6/include \
|
||||
/usr/local/include
|
||||
@@ -6578,7 +6571,7 @@ else # the gcc guys
|
||||
+ /usr/include \
|
||||
+ /usr/X11R6/include \
|
||||
+ /usr/local/include
|
||||
else ifeq ($(KBUILD_TARGET),netbsd)
|
||||
TEMPLATE_VBoxR3Exe_TOOL = GXX3
|
||||
TEMPLATE_VBoxR3Exe_LATE_LIBS = pthread
|
||||
@@ -6614,7 +6615,7 @@ else # the gcc guys
|
||||
/usr/X11R7/lib
|
||||
else ifeq ($(KBUILD_TARGET),solaris)
|
||||
TEMPLATE_VBoxR3Exe_TOOL = GXX3PLAIN
|
||||
|
@ -206,7 +225,7 @@
|
|||
if $(VBOX_GCC_VERSION_CC) < 30500
|
||||
TEMPLATE_VBoxR3Exe_CFLAGS += -std=gnu99
|
||||
endif
|
||||
@@ -6594,6 +6587,7 @@ else # the gcc guys
|
||||
@@ -6630,6 +6631,7 @@ else # the gcc guys
|
||||
TEMPLATE_VBoxR3Exe_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
|
||||
endif
|
||||
ifdef VBOX_WITH_ORIGIN
|
||||
|
@ -214,7 +233,7 @@
|
|||
TEMPLATE_VBoxR3Exe_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)
|
||||
endif
|
||||
endif
|
||||
@@ -6808,7 +6802,7 @@ else
|
||||
@@ -6868,7 +6870,7 @@ else
|
||||
ifdef VBOX_WITH_NOCRT_STATIC
|
||||
TEMPLATE_VBoxR3StaticBase_DEFS += RT_WITH_NOCRT_WRAPPERS
|
||||
endif
|
||||
|
@ -223,24 +242,24 @@
|
|||
# The gcc guys sans darwin, linux and solaris (don't depend on statically compiled system libs there)
|
||||
TEMPLATE_VBoxR3StaticBase_CFLAGS = $(TEMPLATE_VBoxR3Exe_CFLAGS) -static
|
||||
TEMPLATE_VBoxR3StaticBase_CXXFLAGS = $(TEMPLATE_VBoxR3Exe_CXXFLAGS) -static
|
||||
@@ -6876,7 +6870,7 @@ else
|
||||
$(SDK_VBoxZlib_LIBS) \
|
||||
@@ -6936,7 +6938,7 @@ else
|
||||
$(SDK_VBoxZlib_LATE_LIBS) \
|
||||
$(SDK_VBoxLibLzma_LIBS)
|
||||
if1of ($(KBUILD_TARGET), darwin freebsd)
|
||||
- TEMPLATE_VBoxR3Static_LIBS += iconv
|
||||
+ TEMPLATE_VBoxR3Static_LIBS +=
|
||||
- TEMPLATE_VBoxR3Static_LATE_LIBS += iconv
|
||||
+ TEMPLATE_VBoxR3Static_LATE_LIBS +=
|
||||
else ifeq ($(KBUILD_TARGET),solaris)
|
||||
TEMPLATE_VBoxR3Static_LIBS += kstat
|
||||
TEMPLATE_VBoxR3Static_LATE_LIBS += kstat
|
||||
endif
|
||||
@@ -7048,6 +7042,7 @@ else ifn1of ($(KBUILD_TARGET), os2)
|
||||
@@ -7137,6 +7139,7 @@ else ifn1of ($(KBUILD_TARGET), os2)
|
||||
else ifn1of ($(KBUILD_TARGET), os2)
|
||||
ifneq ($(KBUILD_TYPE),asan) # Keep RPATH in asan builds so we can find libasan.so.X and libubsan.so.Y.
|
||||
TEMPLATE_VBoxR3HardenedExe_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3Exe_LDFLAGS))
|
||||
+ TEMPLATE_VBoxR3HardenedExe_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3Exe_LDFLAGS.freebsd))
|
||||
TEMPLATE_VBoxR3HardenedExe_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3Exe_LDFLAGS.linux))
|
||||
TEMPLATE_VBoxR3HardenedExe_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3Exe_LDFLAGS))
|
||||
+ TEMPLATE_VBoxR3HardenedExe_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3Exe_LDFLAGS.freebsd))
|
||||
TEMPLATE_VBoxR3HardenedExe_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3Exe_LDFLAGS.linux))
|
||||
endif
|
||||
endif
|
||||
@@ -7079,6 +7074,7 @@ ifn1of ($(KBUILD_TARGET), win os2)
|
||||
@@ -7168,6 +7171,7 @@ ifn1of ($(KBUILD_TARGET), win os2)
|
||||
$(if-expr !defined(VBOX_WITHOUT_WINDOWS_KERNEL_CODE_SIGNING_CERT),-IntegrityCheck,)
|
||||
ifn1of ($(KBUILD_TARGET), win os2)
|
||||
TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3TstDll_LDFLAGS))
|
||||
|
@ -248,7 +267,7 @@
|
|||
TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3TstDll_LDFLAGS.linux))
|
||||
endif
|
||||
|
||||
@@ -7102,6 +7098,7 @@ ifndef VBOX_WITH_HARDENING
|
||||
@@ -7192,6 +7196,7 @@ ifndef VBOX_WITH_HARDENING
|
||||
TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
|
||||
endif
|
||||
ifdef VBOX_WITH_ORIGIN
|
||||
|
@ -256,7 +275,7 @@
|
|||
TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)
|
||||
endif
|
||||
endif
|
||||
@@ -7454,7 +7451,7 @@ else # the GCC guys:
|
||||
@@ -7570,7 +7575,7 @@ else # the GCC guys:
|
||||
endif
|
||||
TEMPLATE_VBoxMainExe_CXXFLAGS = -g $(VBOX_GCC_pipe) \
|
||||
$(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_Wno-multistatement-macros) $(VBOX_GCC_Wno-class-memaccess) -Wshadow \
|
||||
|
@ -265,20 +284,20 @@
|
|||
$(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_std) $(VBOX_GCC_IPRT_FMT_CHECK) \
|
||||
$(VBOX_GCC_SANITIZER_FLAGS)
|
||||
if !defined("VBOX_GCC_Wno-delete-non-virtual-dtor") && defined("VBOX_GCC_Wno-non-virtual-dtor")
|
||||
@@ -7518,10 +7515,19 @@ else # the GCC guys:
|
||||
@@ -7633,10 +7638,19 @@ else # the GCC guys:
|
||||
else ifeq ($(KBUILD_TARGET),haiku)
|
||||
TEMPLATE_VBoxMainExe_TOOL = GXX3
|
||||
TEMPLATE_VBoxMainExe_LIBS = $(LIB_RUNTIME) network stdc++ supc++
|
||||
TEMPLATE_VBoxMainExe_LATE_LIBS = $(LIB_RUNTIME) network stdc++ supc++
|
||||
- else if1of ($(KBUILD_TARGET), freebsd openbsd)
|
||||
+ else ifeq ($(KBUILD_TARGET), freebsd)
|
||||
+ else if1of ($(KBUILD_TARGET), freebsd)
|
||||
TEMPLATE_VBoxMainExe_TOOL = GXX3
|
||||
TEMPLATE_VBoxMainExe_LIBS = $(LIB_RUNTIME)
|
||||
TEMPLATE_VBoxMainExe_LATE_LIBS = $(LIB_RUNTIME)
|
||||
+ TEMPLATE_VBoxMainExe_LDFLAGS = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
|
||||
+ TEMPLATE_VBoxMainExe_LDFLAGS.freebsd.x86 = -Wl,-z,notext
|
||||
TEMPLATE_VBoxMainExe_INCS += \
|
||||
+ /usr/local/include
|
||||
+ /usr/local/include
|
||||
+ TEMPLATE_VBoxMainExe_LIBPATH += \
|
||||
+ /usr/local/lib
|
||||
+ /usr/local/lib
|
||||
+ else ifeq ($(KBUILD_TARGET), openbsd)
|
||||
+ TEMPLATE_VBoxMainExe_TOOL = GXX3
|
||||
+ TEMPLATE_VBoxMainExe_LIBS = $(LIB_RUNTIME)
|
||||
|
@ -286,7 +305,7 @@
|
|||
/usr/include \
|
||||
/usr/X11R6/include \
|
||||
/usr/local/include
|
||||
@@ -7553,6 +7559,7 @@ else # the GCC guys:
|
||||
@@ -7668,6 +7682,7 @@ else # the GCC guys:
|
||||
TEMPLATE_VBoxMainExe_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
|
||||
endif
|
||||
ifdef VBOX_WITH_ORIGIN
|
||||
|
@ -294,7 +313,7 @@
|
|||
TEMPLATE_VBoxMainExe_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)
|
||||
endif
|
||||
|
||||
@@ -8181,14 +8188,13 @@ ifdef VBOX_WITH_QTGUI
|
||||
@@ -8352,14 +8367,13 @@ ifdef VBOX_WITH_QTGUI
|
||||
TEMPLATE_VBoxQtGuiExe_LIBPATH += \
|
||||
$(VBOX_LIBPATH_X11)
|
||||
ifeq ($(KBUILD_TARGET),freebsd)
|
||||
|
@ -312,31 +331,31 @@
|
|||
endif
|
||||
ifeq ($(KBUILD_TARGET),solaris)
|
||||
TEMPLATE_VBoxQtGuiExe_LDFLAGS.solaris = -Wl,-z,ignore # Same as VBOX_LD_as_needed.
|
||||
@@ -8460,7 +8466,7 @@ else
|
||||
TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl
|
||||
@@ -8623,7 +8637,7 @@ else
|
||||
TEMPLATE_VBoxBldProg_LATE_LIBS = pthread m rt dl
|
||||
else ifeq ($(KBUILD_HOST),os2)
|
||||
TEMPLATE_VBoxBldProg_TOOL = GXX3OMF
|
||||
- TEMPLATE_VBoxBldProg_LIBS = socket iconv
|
||||
+ TEMPLATE_VBoxBldProg_LIBS = socket
|
||||
- TEMPLATE_VBoxBldProg_LATE_LIBS = socket iconv
|
||||
+ TEMPLATE_VBoxBldProg_LATE_LIBS = socket
|
||||
else ifeq ($(KBUILD_HOST),darwin)
|
||||
TEMPLATE_VBoxBldProg_TOOL = $(VBOX_GCC_TOOL)
|
||||
if "$(VBOX_DEF_MACOSX_VERSION_MIN)" == "10.7" || "$(VBOX_DARWIN_HOST_VERSION_MAJOR)" == "7"
|
||||
@@ -8500,13 +8506,20 @@ else
|
||||
TEMPLATE_VBoxBldProg_LIBS =
|
||||
@@ -8663,13 +8677,20 @@ else
|
||||
TEMPLATE_VBoxBldProg_LATE_LIBS =
|
||||
else ifeq ($(KBUILD_HOST),haiku)
|
||||
TEMPLATE_VBoxBldProg_TOOL = GXX3
|
||||
- TEMPLATE_VBoxBldProg_LIBS = network iconv
|
||||
+ TEMPLATE_VBoxBldProg_LIBS = network
|
||||
- TEMPLATE_VBoxBldProg_LATE_LIBS = network iconv
|
||||
+ TEMPLATE_VBoxBldProg_LATE_LIBS = network
|
||||
TEMPLATE_VBoxBldProg_LIBPATH += \
|
||||
/boot/common/lib
|
||||
- else if1of ($(KBUILD_HOST), freebsd openbsd)
|
||||
+ else ifeq ($(KBUILD_HOST), freebsd)
|
||||
+ else if1of ($(KBUILD_HOST), freebsd)
|
||||
TEMPLATE_VBoxBldProg_TOOL = $(VBOX_GCC_TOOL)
|
||||
TEMPLATE_VBoxBldProg_LIBS = pthread
|
||||
TEMPLATE_VBoxBldProg_LATE_LIBS = pthread
|
||||
TEMPLATE_VBoxBldProg_INCS += \
|
||||
+ /usr/local/include
|
||||
+ /usr/local/include
|
||||
+ TEMPLATE_VBoxBldProg_LIBPATH += \
|
||||
+ /usr/local/lib
|
||||
+ /usr/local/lib
|
||||
+ else ifeq ($(KBUILD_HOST), openbsd)
|
||||
+ TEMPLATE_VBoxBldProg_TOOL = $(VBOX_GCC_TOOL)
|
||||
+ TEMPLATE_VBoxBldProg_LIBS = pthread
|
||||
|
@ -344,21 +363,21 @@
|
|||
/usr/include \
|
||||
/usr/X11R6/include \
|
||||
/usr/local/include
|
||||
@@ -8553,11 +8566,11 @@ TEMPLATE_VBoxAdvBldProg_LIBS.darwin = \
|
||||
$(TEMPLATE_VBoxBldProg_LIBS)
|
||||
TEMPLATE_VBoxAdvBldProg_LIBS.darwin = \
|
||||
$(TEMPLATE_VBoxAdvBldProg_LIBS) \
|
||||
@@ -8716,11 +8737,11 @@ TEMPLATE_VBoxAdvBldProg_LATE_LIBS.darwin = \
|
||||
$(TEMPLATE_VBoxBldProg_LATE_LIBS)
|
||||
TEMPLATE_VBoxAdvBldProg_LATE_LIBS.darwin = \
|
||||
$(TEMPLATE_VBoxAdvBldProg_LATE_LIBS) \
|
||||
- iconv \
|
||||
+ \
|
||||
$(TEMPLATE_VBoxBldProg_LIBS.darwin)
|
||||
TEMPLATE_VBoxAdvBldProg_LIBS.freebsd = \
|
||||
$(TEMPLATE_VBoxAdvBldProg_LIBS) \
|
||||
+ \
|
||||
$(TEMPLATE_VBoxBldProg_LATE_LIBS.darwin)
|
||||
TEMPLATE_VBoxAdvBldProg_LATE_LIBS.freebsd = \
|
||||
$(TEMPLATE_VBoxAdvBldProg_LATE_LIBS) \
|
||||
- iconv \
|
||||
+ \
|
||||
+ \
|
||||
rt \
|
||||
$(TEMPLATE_VBoxBldProg_LIBS.freebsd)
|
||||
TEMPLATE_VBoxAdvBldProg_LIBS.linux = \
|
||||
@@ -8648,6 +8661,7 @@ else # the gcc guys
|
||||
$(TEMPLATE_VBoxBldProg_LATE_LIBS.freebsd)
|
||||
TEMPLATE_VBoxAdvBldProg_LATE_LIBS.linux = \
|
||||
@@ -8813,6 +8834,7 @@ else # the gcc guys
|
||||
# Do not inherit sanitizer flags from VBoxR3Exe in guest executables. Deal with them separately.
|
||||
TEMPLATE_VBoxGuestR3ExeBase_CXXFLAGS.debug = $(NO_SUCH_VARIABLE)
|
||||
TEMPLATE_VBoxGuestR3ExeBase_CFLAGS.debug = $(NO_SUCH_VARIABLE)
|
||||
|
@ -366,16 +385,16 @@
|
|||
TEMPLATE_VBoxGuestR3ExeBase_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LDFLAGS.linux))
|
||||
TEMPLATE_VBoxGuestR3ExeBase_LDFLAGS.debug = $(NO_SUCH_VARIABLE)
|
||||
TEMPLATE_VBoxGuestR3ExeBase_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LDFLAGS))
|
||||
@@ -8671,7 +8685,7 @@ else if1of ($(KBUILD_TARGET), darwin freebsd openbsd)
|
||||
@@ -8836,7 +8858,7 @@ else if1of ($(KBUILD_TARGET), darwin freebsd openbsd)
|
||||
ifeq ($(KBUILD_TARGET),linux) # As few libs as possible on linux.
|
||||
TEMPLATE_VBoxGuestR3ExeBase_LIBS = pthread rt m dl
|
||||
TEMPLATE_VBoxGuestR3ExeBase_LATE_LIBS = pthread rt m dl
|
||||
else if1of ($(KBUILD_TARGET), darwin freebsd openbsd)
|
||||
- TEMPLATE_VBoxGuestR3ExeBase_LIBS = $(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LIBS) iconv
|
||||
+ TEMPLATE_VBoxGuestR3ExeBase_LIBS = $(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LIBS)
|
||||
- TEMPLATE_VBoxGuestR3ExeBase_LATE_LIBS = $(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LATE_LIBS) iconv
|
||||
+ TEMPLATE_VBoxGuestR3ExeBase_LATE_LIBS = $(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LATE_LIBS)
|
||||
else ifeq ($(KBUILD_TARGET),solaris)
|
||||
TEMPLATE_VBoxGuestR3ExeBase_LIBS = $(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LIBS) nsl
|
||||
TEMPLATE_VBoxGuestR3ExeBase_LATE_LIBS = $(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LATE_LIBS) nsl
|
||||
endif
|
||||
@@ -8684,6 +8698,7 @@ TEMPLATE_VBoxGuestR3ExeBase_CFLAGS.linux = $(TEMP
|
||||
@@ -8849,6 +8871,7 @@ TEMPLATE_VBoxGuestR3ExeBase_CFLAGS.linux = $(TEMP
|
||||
$(VBOX_GCC_fno-stack-protector)
|
||||
TEMPLATE_VBoxGuestR3ExeBase_CFLAGS.linux = $(TEMPLATE_VBoxGuestR3ExeBase_CXXFLAGS.linux)
|
||||
# The GNU_HASH ELF tag is not supported by older systems.
|
||||
|
@ -383,7 +402,7 @@
|
|||
TEMPLATE_VBoxGuestR3ExeBase_LDFLAGS.linux += $(VBOX_LD_hash_style_sysv)
|
||||
|
||||
|
||||
@@ -8929,6 +8944,7 @@ TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.$(KBUILD_TARGET
|
||||
@@ -9085,6 +9108,7 @@ TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.$(KBUILD_TARGET
|
||||
TEMPLATE_VBoxGuestR3XFree86Mod_CXXFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
|
||||
TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
|
||||
# The GNU_HASH ELF tag is not supported by older glibc dynamic linkers.
|
||||
|
@ -391,12 +410,12 @@
|
|||
TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.linux = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv))
|
||||
TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE)
|
||||
TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS := -r
|
||||
@@ -8970,7 +8986,7 @@ TEMPLATE_VBoxGuestR3XOrgMod_LIBS.$(KBUILD_TARGET) =
|
||||
TEMPLATE_VBoxGuestR3XOrgMod_LIBS = $(VBOX_LIB_VBGL_R3_XORG)
|
||||
TEMPLATE_VBoxGuestR3XOrgMod_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE)
|
||||
TEMPLATE_VBoxGuestR3XOrgMod_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
|
||||
-TEMPLATE_VBoxGuestR3XOrgMod_LIBS.freebsd += iconv
|
||||
+TEMPLATE_VBoxGuestR3XOrgMod_LIBS.freebsd +=
|
||||
|
||||
|
||||
#
|
||||
@@ -9128,7 +9152,7 @@ TEMPLATE_VBoxGuestR3XOrgMod_LATE_LIBS.$(KBUILD_TARGET)
|
||||
TEMPLATE_VBoxGuestR3XOrgMod_LATE_LIBS = $(VBOX_LIB_VBGL_R3_XORG)
|
||||
TEMPLATE_VBoxGuestR3XOrgMod_LATE_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE)
|
||||
TEMPLATE_VBoxGuestR3XOrgMod_LATE_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
|
||||
-TEMPLATE_VBoxGuestR3XOrgMod_LATE_LIBS.freebsd = iconv
|
||||
+TEMPLATE_VBoxGuestR3XOrgMod_LATE_LIBS.freebsd =
|
||||
TEMPLATE_VBoxGuestR3XOrgMod_LIBS = $(NO_SUCH_VARIABLE) # These three aren't necessary, just being careful.
|
||||
TEMPLATE_VBoxGuestR3XOrgMod_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE)
|
||||
TEMPLATE_VBoxGuestR3XOrgMod_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- configure.orig 2025-04-14 17:41:37 UTC
|
||||
--- configure.orig 2025-08-13 19:37:05 UTC
|
||||
+++ configure
|
||||
@@ -158,10 +158,14 @@ if [ "$OS" = "freebsd" ]; then
|
||||
@@ -155,10 +155,14 @@ if [ "$OS" = "freebsd" ]; then
|
||||
if [ "$OS" = "freebsd" ]; then
|
||||
INCCURL="-I/usr/local/include"
|
||||
LIBCURL="-L/usr/local/lib -lcurl"
|
||||
|
@ -15,7 +15,7 @@
|
|||
else
|
||||
INCCURL=""
|
||||
LIBCURL="-lcurl"
|
||||
@@ -1211,6 +1215,9 @@ extern "C" int main(int argc, char** argv)
|
||||
@@ -1171,6 +1175,9 @@ extern "C" int main(int argc, char** argv)
|
||||
printf("found version %d.%d.%d",
|
||||
SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
|
||||
#if SDL_VERSION_ATLEAST(1,2,7)
|
||||
|
@ -25,7 +25,7 @@
|
|||
printf(", OK.\n");
|
||||
return 0;
|
||||
#else
|
||||
@@ -1295,7 +1302,7 @@ EOF
|
||||
@@ -1255,7 +1262,7 @@ EOF
|
||||
#endif
|
||||
}
|
||||
EOF
|
||||
|
@ -34,7 +34,7 @@
|
|||
test_execute
|
||||
fi
|
||||
}
|
||||
@@ -1599,6 +1606,7 @@ EOF
|
||||
@@ -1559,6 +1566,7 @@ EOF
|
||||
SDKQT6=$PATH_SDK_QT6
|
||||
fi
|
||||
FLGQT6="-framework QtCore -std=c++17 -Wl,-rpath,`L_to_PATH "$LIBQT6"`"
|
||||
|
@ -42,19 +42,7 @@
|
|||
else
|
||||
log_failure "Qt6 framework not found (can be disabled using --disable-qt)"
|
||||
fail
|
||||
@@ -1875,9 +1883,9 @@ check_libvorbis()
|
||||
if which_wrapper pkg-config > /dev/null; then
|
||||
libvorbis_ver=`pkg-config vorbis --modversion 2>> $LOG`
|
||||
if [ $? -eq 0 ]; then
|
||||
- FLGVRB=`pkg-config vorbis --cflags`
|
||||
+ FLGVRB=`pkg-config vorbis vorbisenc --cflags`
|
||||
INCVRB=`strip_I "$FLGVRB"`
|
||||
- LIBVRB=`pkg-config vorbis --libs`
|
||||
+ LIBVRB=`pkg-config vorbis vorbisenc --libs`
|
||||
fi
|
||||
cat > $ODIR.tmp_src.cc << EOF
|
||||
#include <cstdio>
|
||||
@@ -1927,7 +1935,7 @@ EOF
|
||||
@@ -1897,7 +1905,7 @@ EOF
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
|
@ -63,7 +51,7 @@
|
|||
if test_compile "$LIBOGG $I_INCOGG" ogg ogg nofatal; then
|
||||
if test_execute; then
|
||||
cnf_append "SDK_VBoxLibOgg_INCS" "$INCOGG"
|
||||
@@ -2194,8 +2202,8 @@ EOF
|
||||
@@ -2125,8 +2133,8 @@ EOF
|
||||
echo "compiling the following source file:" >> $LOG
|
||||
cat $ODIR.tmp_src.cc >> $LOG
|
||||
echo "using the following command line:" >> $LOG
|
||||
|
@ -74,7 +62,7 @@
|
|||
if [ $? -eq 0 ]; then
|
||||
found=1
|
||||
break
|
||||
@@ -2311,7 +2319,7 @@ check_gsoap()
|
||||
@@ -2246,7 +2254,7 @@ check_gsoap()
|
||||
else
|
||||
cnf_append "VBOX_GSOAP_CXX_SOURCES" ""
|
||||
fi
|
||||
|
@ -83,7 +71,7 @@
|
|||
gsoap_version=`pkg-config gsoapssl++ --modversion`
|
||||
log_success "found version $gsoap_version"
|
||||
return
|
||||
@@ -2687,7 +2695,7 @@ for option in "$@"; do
|
||||
@@ -2619,7 +2627,7 @@ for option in "$@"; do
|
||||
--with-openssl-dir=*)
|
||||
OPENSSLDIR=`echo $option | cut -d'=' -f2`
|
||||
INCCRYPTO="-I${OPENSSLDIR}/include"
|
||||
|
@ -92,7 +80,7 @@
|
|||
# On Darwin (at least for macports) static OpenSSL also needs zlib.
|
||||
[ "$OS" = "darwin" ] && LIBCRYPTO="$LIBCRYPTO ${OPENSSLDIR}/lib/libz.a"
|
||||
# On Linux static OpenSSL typically needs a few additional libraries.
|
||||
@@ -3054,12 +3062,22 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
|
||||
@@ -2978,12 +2986,22 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
|
||||
[ $WITH_JAVA -eq 1 ] && check_java
|
||||
|
||||
# PulseAudio
|
||||
|
@ -121,7 +109,7 @@
|
|||
fi
|
||||
fi
|
||||
|
||||
@@ -3075,14 +3093,6 @@ if [ "$OS" = "linux" ]; then
|
||||
@@ -2999,14 +3017,6 @@ if [ "$OS" = "linux" ]; then
|
||||
cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
|
||||
fi
|
||||
if [ $ONLY_ADDITIONS -eq 0 ]; then
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- doc/manual/en_US/dita/UserManual.ditamap.orig 2025-04-14 17:41:38 UTC
|
||||
--- doc/manual/en_US/dita/UserManual.ditamap.orig 2025-08-13 19:37:06 UTC
|
||||
+++ doc/manual/en_US/dita/UserManual.ditamap
|
||||
@@ -613,7 +613,7 @@
|
||||
@@ -540,7 +540,7 @@
|
||||
<topicref href="topics/security-model.dita"/>
|
||||
<topicref href="topics/secure-config-vms.dita">
|
||||
<topicref href="topics/security-networking.dita"/>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- include/iprt/x86.h.orig 2021-04-20 04:22:23 UTC
|
||||
--- include/iprt/x86.h.orig 2025-08-13 19:37:26 UTC
|
||||
+++ include/iprt/x86.h
|
||||
@@ -38,6 +38,16 @@
|
||||
@@ -53,6 +53,16 @@
|
||||
# pragma D depends_on library vbox-types.d
|
||||
#endif
|
||||
|
||||
|
@ -15,5 +15,5 @@
|
|||
+#endif
|
||||
+
|
||||
/** Workaround for Solaris sys/regset.h defining CS, DS and sys/controlregs.h
|
||||
* defining MSR_IA32_FLUSH_CMD */
|
||||
* defining MSR_IA32_FLUSH_CMD and MSR_AMD_VIRT_SPEC_CTL */
|
||||
#ifdef RT_OS_SOLARIS
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- include/VBox/com/array.h.orig 2021-01-07 15:31:25 UTC
|
||||
--- include/VBox/com/array.h.orig 2025-08-13 19:37:15 UTC
|
||||
+++ include/VBox/com/array.h
|
||||
@@ -171,7 +171,7 @@
|
||||
@@ -181,7 +181,7 @@
|
||||
|
||||
#include "VBox/com/defs.h"
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
/** @def VBOX_WITH_TYPE_TRAITS
|
||||
* Type traits are a C++ 11 feature, so not available everywhere (yet).
|
||||
* Only GCC 4.6 or newer and MSVC++ 16.0 (Visual Studio 2010) or newer.
|
||||
@@ -960,12 +960,12 @@ class SafeArray : public Traits (public)
|
||||
@@ -1014,12 +1014,12 @@ class SafeArray : public Traits (public)
|
||||
{
|
||||
/** @todo r=klaus should do this as a AssertCompile, but cannot find a way which works. */
|
||||
Assert(sizeof(T) <= sizeof(Zeroes));
|
||||
|
@ -25,7 +25,7 @@
|
|||
return m.raw[aIdx];
|
||||
#endif
|
||||
}
|
||||
@@ -980,7 +980,7 @@ class SafeArray : public Traits (public)
|
||||
@@ -1034,7 +1034,7 @@ class SafeArray : public Traits (public)
|
||||
#ifdef VBOX_WITH_XPCOM
|
||||
return m.arr[aIdx];
|
||||
#else
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- include/VBox/sup.h.orig 2024-12-27 04:08:45.986426000 +0100
|
||||
+++ include/VBox/sup.h 2024-12-27 04:09:08.925387000 +0100
|
||||
@@ -2248,7 +2248,7 @@
|
||||
--- include/VBox/sup.h.orig 2025-08-13 19:37:16 UTC
|
||||
+++ include/VBox/sup.h
|
||||
@@ -2325,7 +2325,7 @@ SUPR0DECL(void) SUPR0BadContext(PSUPDRVSESSION pSessio
|
||||
|
||||
SUPR0DECL(void) SUPR0BadContext(PSUPDRVSESSION pSession, const char *pszFile, uint32_t uLine, const char *pszExpr);
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- include/iprt/string.h.orig 2021-01-07 15:31:33 UTC
|
||||
--- include/iprt/string.h.orig 2025-08-13 19:37:25 UTC
|
||||
+++ include/iprt/string.h
|
||||
@@ -46,6 +46,11 @@
|
||||
@@ -57,6 +57,11 @@
|
||||
#elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
|
||||
RT_C_DECLS_BEGIN
|
||||
# include <sys/libkern.h>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2022-10-06 19:03:06.000000000 +0200
|
||||
+++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c 2024-12-26 15:28:38.066230000 +0100
|
||||
--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2025-08-13 19:41:14 UTC
|
||||
+++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c
|
||||
@@ -55,6 +55,7 @@
|
||||
#include <sys/uio.h>
|
||||
#include <sys/bus.h>
|
||||
|
@ -16,7 +16,7 @@
|
|||
#include <iprt/initterm.h>
|
||||
#include <iprt/process.h>
|
||||
#include <iprt/string.h>
|
||||
@@ -112,8 +114,6 @@
|
||||
@@ -112,8 +114,6 @@ struct VBoxGuestDeviceState
|
||||
struct resource *pIrqRes;
|
||||
/** Pointer to the IRQ handler. */
|
||||
void *pfnIrqHandler;
|
||||
|
@ -25,7 +25,7 @@
|
|||
};
|
||||
|
||||
|
||||
@@ -123,8 +123,7 @@
|
||||
@@ -123,8 +123,7 @@ struct VBoxGuestDeviceState
|
||||
/*
|
||||
* Character device file handlers.
|
||||
*/
|
||||
|
@ -35,7 +35,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;
|
||||
@@ -155,8 +154,7 @@
|
||||
@@ -155,8 +154,7 @@ static struct cdevsw g_vgdrvFreeBSDChrDevSW =
|
||||
{
|
||||
.d_version = D_VERSION,
|
||||
.d_flags = D_TRACKCLOSE | D_NEEDMINOR,
|
||||
|
@ -45,7 +45,7 @@
|
|||
.d_ioctl = vgdrvFreeBSDIOCtl,
|
||||
.d_read = vgdrvFreeBSDRead,
|
||||
.d_write = vgdrvFreeBSDWrite,
|
||||
@@ -164,81 +162,28 @@
|
||||
@@ -164,81 +162,28 @@ static struct cdevsw g_vgdrvFreeBSDChrDevSW =
|
||||
.d_name = "vboxguest"
|
||||
};
|
||||
|
||||
|
@ -134,7 +134,7 @@
|
|||
{
|
||||
int rc;
|
||||
PVBOXGUESTSESSION pSession;
|
||||
@@ -250,12 +195,6 @@
|
||||
@@ -250,12 +195,6 @@ static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOp
|
||||
LogFlow(("vgdrvFreeBSDOpen:\n"));
|
||||
|
||||
/*
|
||||
|
@ -147,7 +147,7 @@
|
|||
* Create a new session.
|
||||
*/
|
||||
fRequestor = VMMDEV_REQUESTOR_USERMODE | VMMDEV_REQUESTOR_TRUST_NOT_GIVEN;
|
||||
@@ -272,47 +211,20 @@
|
||||
@@ -272,47 +211,20 @@ static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOp
|
||||
rc = VGDrvCommonCreateUserSession(&g_DevExt, fRequestor, &pSession);
|
||||
if (RT_SUCCESS(rc))
|
||||
{
|
||||
|
@ -201,7 +201,7 @@
|
|||
/**
|
||||
* I/O control request.
|
||||
*
|
||||
@@ -326,8 +238,12 @@
|
||||
@@ -326,8 +238,12 @@ static int vgdrvFreeBSDIOCtl(struct cdev *pDev, u_long
|
||||
static int vgdrvFreeBSDIOCtl(struct cdev *pDev, u_long ulCmd, caddr_t pvData, int fFile, struct thread *pTd)
|
||||
{
|
||||
PVBOXGUESTSESSION pSession;
|
||||
|
@ -215,7 +215,7 @@
|
|||
/*
|
||||
* Deal with the fast ioctl path first.
|
||||
*/
|
||||
@@ -526,8 +442,10 @@
|
||||
@@ -526,8 +442,10 @@ static int vgdrvFreeBSDPoll(struct cdev *pDev, int fEv
|
||||
|
||||
LogFlow(("vgdrvFreeBSDPoll: fEvents=%d\n", fEvents));
|
||||
|
||||
|
@ -228,7 +228,7 @@
|
|||
Log(("vgdrvFreeBSDPoll: no state data for %s\n", devtoname(pDev)));
|
||||
return (fEvents & (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM));
|
||||
}
|
||||
@@ -568,11 +486,8 @@
|
||||
@@ -568,11 +486,8 @@ static int vgdrvFreeBSDDetach(device_t pDevice)
|
||||
/*
|
||||
* Reverse what we did in vgdrvFreeBSDAttach.
|
||||
*/
|
||||
|
@ -241,7 +241,7 @@
|
|||
vgdrvFreeBSDRemoveIRQ(pDevice, pState);
|
||||
|
||||
if (pState->pVMMDevMemRes)
|
||||
@@ -737,18 +652,21 @@
|
||||
@@ -738,18 +653,21 @@ static int vgdrvFreeBSDAttach(device_t pDevice)
|
||||
VGDrvCommonProcessOptionsFromHost(&g_DevExt);
|
||||
|
||||
/*
|
||||
|
@ -269,7 +269,7 @@
|
|||
vgdrvFreeBSDRemoveIRQ(pDevice, pState);
|
||||
}
|
||||
else
|
||||
@@ -792,8 +710,12 @@
|
||||
@@ -793,8 +711,12 @@ static driver_t vgdrvFreeBSDDriver =
|
||||
sizeof(struct VBoxGuestDeviceState),
|
||||
};
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2019-04-16 10:09:09 UTC
|
||||
--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2025-08-13 19:41:14 UTC
|
||||
+++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile
|
||||
@@ -25,7 +25,7 @@
|
||||
@@ -35,7 +35,7 @@ KMOD = vboxguest
|
||||
#
|
||||
KMOD = vboxguest
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
|
||||
.if (${MACHINE_ARCH} == "i386")
|
||||
CFLAGS += -DRT_ARCH_X86
|
||||
@@ -80,6 +80,7 @@ SRCS += \
|
||||
@@ -91,6 +91,7 @@ SRCS += \
|
||||
handletable.c \
|
||||
handletablectx.c \
|
||||
once.c \
|
||||
|
@ -17,7 +17,7 @@
|
|||
thread.c
|
||||
|
||||
.PATH: ${.CURDIR}/common/string
|
||||
@@ -147,6 +148,7 @@ SRCS += \
|
||||
@@ -163,6 +164,7 @@ SRCS += \
|
||||
|
||||
.PATH: ${.CURDIR}/r0drv
|
||||
SRCS += \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2019-01-25 18:12:28 UTC
|
||||
--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2025-08-13 19:41:14 UTC
|
||||
+++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest
|
||||
@@ -63,6 +63,7 @@ FILES_VBOXGUEST_NOBIN=" \
|
||||
@@ -74,6 +74,7 @@ FILES_VBOXGUEST_NOBIN=" \
|
||||
${PATH_ROOT}/include/iprt/time.h=>include/iprt/time.h \
|
||||
${PATH_ROOT}/include/iprt/timer.h=>include/iprt/timer.h \
|
||||
${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
|
||||
|
@ -8,7 +8,7 @@
|
|||
${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
|
||||
${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
|
||||
${PATH_ROOT}/include/iprt/crc.h=>include/iprt/crc.h \
|
||||
@@ -111,6 +112,7 @@ FILES_VBOXGUEST_NOBIN=" \
|
||||
@@ -125,6 +126,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 \
|
||||
|
@ -16,7 +16,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 \
|
||||
@@ -181,6 +183,7 @@ FILES_VBOXGUEST_NOBIN=" \
|
||||
@@ -200,6 +202,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 +24,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 \
|
||||
@@ -207,6 +210,7 @@ FILES_VBOXGUEST_NOBIN=" \
|
||||
@@ -226,6 +229,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 \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2025-01-21 19:49:30.000000000 +0700
|
||||
+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient 2025-01-23 00:43:43.597269000 +0700
|
||||
@@ -42,15 +42,15 @@
|
||||
--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2025-08-13 19:41:21 UTC
|
||||
+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient
|
||||
@@ -42,15 +42,15 @@ elif test -z "${SSH_CONNECTION}"; then
|
||||
# not use "exit" here as this script is "source"d, not executed.
|
||||
|
||||
# Check wheather X11 or Wayland version of VBoxClient should be started.
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
--- 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 */
|
||||
+#ifdef M_SKIP_FIREWALL
|
||||
+#undef M_SKIP_FIREWALL
|
||||
+#endif
|
||||
#define M_SKIP_FIREWALL 0x00004000 /* skip firewall processing */
|
||||
#define M_FREELIST 0x00008000 /* mbuf is on the free list */
|
||||
#define M_VLANTAG 0x00010000 /* ether_vtag is valid */
|
|
@ -1,8 +1,8 @@
|
|||
--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig 2019-05-13 13:33:07 UTC
|
||||
--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig 2025-08-13 19:51:10 UTC
|
||||
+++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
|
||||
@@ -206,10 +206,14 @@ $$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \
|
||||
$$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
|
||||
| $$(dir $$@)
|
||||
@@ -220,10 +220,14 @@ ifeq ($(KBUILD_TARGET),freebsd)
|
||||
$$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
|
||||
| $$(dir $$@)
|
||||
$(QUIET)$(RM) -f -- $@
|
||||
- ifndef VBOX_WITH_HARDENING
|
||||
- $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $<
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt.orig 2022-10-06 19:11:15.000000000 +0200
|
||||
+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt 2024-12-26 15:41:50.870345000 +0100
|
||||
@@ -72,6 +72,7 @@
|
||||
--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt.orig 2025-08-13 19:51:11 UTC
|
||||
+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt
|
||||
@@ -73,6 +73,7 @@ VBOX_VBOXNETFLT_SOURCES=" \
|
||||
${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
|
||||
${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
|
||||
${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Installer/Makefile.kmk.orig 2020-05-13 19:44:01 UTC
|
||||
--- src/VBox/Installer/Makefile.kmk.orig 2025-08-13 19:51:15 UTC
|
||||
+++ src/VBox/Installer/Makefile.kmk
|
||||
@@ -41,9 +41,11 @@ ifndef VBOX_ONLY_SDK
|
||||
@@ -51,9 +51,11 @@ ifndef VBOX_ONLY_SDK
|
||||
if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_HOST)" == "win"
|
||||
include $(PATH_SUB_CURRENT)/win/Makefile.kmk
|
||||
endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2021-01-07 15:41:43 UTC
|
||||
--- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2025-08-13 19:51:27 UTC
|
||||
+++ src/VBox/Main/src-server/VirtualBoxImpl.cpp
|
||||
@@ -2663,7 +2663,7 @@ int VirtualBox::i_encryptSettingBytes(const uint8_t *a
|
||||
@@ -3097,7 +3097,7 @@ int VirtualBox::i_encryptSettingBytes(const uint8_t *a
|
||||
if (aCiphertextSize < 32)
|
||||
return VERR_INVALID_PARAMETER;
|
||||
|
||||
|
|
|
@ -9,9 +9,9 @@ follows what tvtohz does. The rest of the patch just chases an upstream
|
|||
KPI change.
|
||||
|
||||
Submitted by: Andriy Gapon <avg@FreeBSD.org>
|
||||
--- src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h.orig 2024-07-29 13:10:32 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h
|
||||
@@ -84,6 +84,8 @@ DECLINLINE(uint32_t) rtR0SemBsdWaitUpdateTimeout(PRTR0
|
||||
@@ -94,6 +94,8 @@ DECLINLINE(uint32_t) rtR0SemBsdWaitUpdateTimeout(PRTR0
|
||||
uint64_t cTicks = ASMMultU64ByU32DivByU32(uTimeout, hz, UINT32_C(1000000000));
|
||||
if (cTicks >= INT_MAX)
|
||||
return RTSEMWAIT_FLAGS_INDEFINITE;
|
||||
|
@ -20,7 +20,7 @@ Submitted by: Andriy Gapon <avg@FreeBSD.org>
|
|||
else
|
||||
pWait->iTimeout = (int)cTicks;
|
||||
#endif
|
||||
@@ -300,10 +302,16 @@ DECLINLINE(void) rtR0SemBsdSignal(void *pvWaitChan)
|
||||
@@ -310,10 +312,16 @@ DECLINLINE(void) rtR0SemBsdSignal(void *pvWaitChan)
|
||||
DECLINLINE(void) rtR0SemBsdSignal(void *pvWaitChan)
|
||||
{
|
||||
sleepq_lock(pvWaitChan);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2021-01-07 15:34:20 UTC
|
||||
--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2025-08-13 19:41:16 UTC
|
||||
+++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp
|
||||
@@ -67,8 +67,8 @@
|
||||
@@ -77,8 +77,8 @@
|
||||
# include <net/if.h>
|
||||
# include <pwd.h> /* getpwuid */
|
||||
# include <unistd.h>
|
||||
|
@ -11,16 +11,16 @@
|
|||
# endif
|
||||
# ifdef RT_OS_OS2
|
||||
# include <net/if_dl.h>
|
||||
@@ -528,7 +528,7 @@ static void vgsvcVMInfoWriteFixedProperties(void)
|
||||
@@ -573,7 +573,7 @@ static void vgsvcVMInfoWriteFixedProperties(void)
|
||||
}
|
||||
|
||||
|
||||
-#if defined(VBOX_WITH_DBUS) && defined(RT_OS_LINUX) /* Not yet for Solaris/FreeBSB. */
|
||||
+#if defined(VBOX_WITH_DBUS) && (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) /* Not yet for Solaris. */
|
||||
/*
|
||||
* Simple wrapper to work around compiler-specific va_list madness.
|
||||
* Simple wrappers to work around compiler-specific va_list madness.
|
||||
*/
|
||||
@@ -555,12 +555,6 @@ static int vgsvcVMInfoWriteUsers(void)
|
||||
@@ -702,12 +702,6 @@ static int vgsvcVMInfoWriteUsers(void)
|
||||
#ifdef RT_OS_WINDOWS
|
||||
rc = VGSvcVMInfoWinWriteUsers(&g_VMInfoPropCache, &pszUserList, &cUsersInList);
|
||||
|
||||
|
@ -33,7 +33,7 @@
|
|||
#elif defined(RT_OS_HAIKU)
|
||||
/** @todo Haiku: Port logged on user info retrieval. */
|
||||
rc = VERR_NOT_IMPLEMENTED;
|
||||
@@ -586,7 +580,7 @@ static int vgsvcVMInfoWriteUsers(void)
|
||||
@@ -733,7 +727,7 @@ static int vgsvcVMInfoWriteUsers(void)
|
||||
while ( (ut_user = getutxent())
|
||||
&& RT_SUCCESS(rc))
|
||||
{
|
||||
|
@ -42,7 +42,7 @@
|
|||
VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32)\n", ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid);
|
||||
# else
|
||||
VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32, session: %RU32)\n",
|
||||
@@ -621,7 +615,7 @@ static int vgsvcVMInfoWriteUsers(void)
|
||||
@@ -749,7 +743,7 @@ static int vgsvcVMInfoWriteUsers(void)
|
||||
}
|
||||
|
||||
# ifdef VBOX_WITH_DBUS
|
||||
|
@ -51,7 +51,7 @@
|
|||
DBusError dbErr;
|
||||
DBusConnection *pConnection = NULL;
|
||||
int rc2 = RTDBusLoadLib();
|
||||
@@ -830,7 +824,7 @@ static int vgsvcVMInfoWriteUsers(void)
|
||||
@@ -1074,7 +1068,7 @@ static int vgsvcVMInfoWriteUsers(void)
|
||||
if ( fHaveLibDbus
|
||||
&& dbus_error_is_set(&dbErr))
|
||||
dbus_error_free(&dbErr);
|
||||
|
@ -59,8 +59,8 @@
|
|||
+# endif /* RT_OS_LINUX || RT_OS_FREEBSD */
|
||||
# endif /* VBOX_WITH_DBUS */
|
||||
|
||||
/** @todo Fedora/others: Handle systemd-loginctl. */
|
||||
@@ -867,7 +861,7 @@ static int vgsvcVMInfoWriteUsers(void)
|
||||
/* Calc the string length. */
|
||||
@@ -1109,7 +1103,7 @@ static int vgsvcVMInfoWriteUsers(void)
|
||||
RTMemFree(papszUsers);
|
||||
|
||||
endutxent(); /* Close utmpx file. */
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Additions/common/pam/pam_vbox.cpp.orig 2021-01-07 15:34:21 UTC
|
||||
--- src/VBox/Additions/common/pam/pam_vbox.cpp.orig 2025-08-13 19:41:17 UTC
|
||||
+++ src/VBox/Additions/common/pam/pam_vbox.cpp
|
||||
@@ -104,7 +104,7 @@ static void pam_vbox_writesyslog(char *pszBuf)
|
||||
@@ -113,7 +113,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
|
||||
}
|
||||
@@ -183,7 +183,7 @@ static int vbox_set_msg(pam_handle_t *hPAM, int iStyle
|
||||
@@ -192,7 +192,7 @@ static int vbox_set_msg(pam_handle_t *hPAM, int iStyle
|
||||
|
||||
pam_message msg;
|
||||
msg.msg_style = iStyle;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Additions/freebsd/Makefile.orig 2020-05-13 19:37:06 UTC
|
||||
--- src/VBox/Additions/freebsd/Makefile.orig 2025-08-13 19:41:17 UTC
|
||||
+++ src/VBox/Additions/freebsd/Makefile
|
||||
@@ -30,6 +30,14 @@ all:
|
||||
@@ -40,6 +40,14 @@ all:
|
||||
cp vboxvfs/vboxvfs.ko .; \
|
||||
fi; \
|
||||
fi
|
||||
|
@ -15,7 +15,7 @@
|
|||
|
||||
|
||||
install:
|
||||
@@ -37,13 +45,19 @@ install:
|
||||
@@ -47,13 +55,19 @@ install:
|
||||
@if [ -d vboxvfs ]; then \
|
||||
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvfs install; \
|
||||
fi
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Additions/freebsd/Makefile.kmk.orig 2021-01-07 15:34:22 UTC
|
||||
--- src/VBox/Additions/freebsd/Makefile.kmk.orig 2025-08-13 19:41:17 UTC
|
||||
+++ src/VBox/Additions/freebsd/Makefile.kmk
|
||||
@@ -23,8 +23,9 @@ $(error "The FreeBSD guest additions installer can onl
|
||||
@@ -33,8 +33,9 @@ endif
|
||||
endif
|
||||
|
||||
# Include sub-makefiles.
|
||||
|
@ -12,7 +12,7 @@
|
|||
|
||||
#
|
||||
# Globals
|
||||
@@ -66,11 +67,14 @@ VBOX_FBSD_ADD_STRIP_BIN = \
|
||||
@@ -76,11 +77,14 @@ VBOX_FBSD_ADD_STRIP_BIN = \
|
||||
vboxvideo_drv_14.so \
|
||||
vboxvideo_drv_15.so \
|
||||
vboxvideo_drv_16.so \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Additions/freebsd/drm/vboxvideo_drm.c.orig 2022-07-26 18:05:21 UTC
|
||||
--- src/VBox/Additions/freebsd/drm/vboxvideo_drm.c.orig 2025-08-13 19:41:18 UTC
|
||||
+++ src/VBox/Additions/freebsd/drm/vboxvideo_drm.c
|
||||
@@ -154,10 +154,14 @@ static driver_t vboxvideo_driver = {
|
||||
@@ -164,10 +164,14 @@ static driver_t vboxvideo_driver = {
|
||||
sizeof(struct drm_device)
|
||||
};
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.8.orig 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.8 2017-07-12 19:24:26.106029000 +0200
|
||||
--- src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.8.orig 2025-08-28 22:09:24 UTC
|
||||
+++ src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.8
|
||||
@@ -0,0 +1,53 @@
|
||||
+.\"
|
||||
+.\" Copyright (c) 1992, 1993, 1994
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.c.orig 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.c 2017-07-12 19:24:26.106029000 +0200
|
||||
--- src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.c.orig 2025-08-28 22:09:24 UTC
|
||||
+++ src/VBox/Additions/freebsd/mount_vboxvfs/mount_vboxvfs.c
|
||||
@@ -0,0 +1,168 @@
|
||||
+/*
|
||||
+* Copyright (c) 1992, 1993, 1994
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h.orig 2021-01-07 15:34:22 UTC
|
||||
--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h.orig 2025-08-13 19:41:18 UTC
|
||||
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h
|
||||
@@ -1,8 +1,3 @@
|
||||
-/* $Id: vboxvfs.h $ */
|
||||
|
@ -7,9 +7,9 @@
|
|||
- */
|
||||
-
|
||||
/*
|
||||
* Copyright (C) 2010-2020 Oracle Corporation
|
||||
* Copyright (C) 2010-2025 Oracle and/or its affiliates.
|
||||
*
|
||||
@@ -24,72 +19,378 @@
|
||||
@@ -34,72 +29,378 @@
|
||||
#define VBOXVFS_VFSNAME "vboxvfs"
|
||||
#define VBOXVFS_VERSION 1
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c.orig 2024-08-15 13:18:37.777504000 +0900
|
||||
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c 2024-08-15 13:18:37.777446000 +0900
|
||||
--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c.orig 2025-08-28 22:09:24 UTC
|
||||
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c
|
||||
@@ -0,0 +1,1012 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2008-2016 Oracle Corporation
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig 2021-04-28 16:24:46 UTC
|
||||
--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig 2025-08-13 19:41:18 UTC
|
||||
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c
|
||||
@@ -1,8 +1,3 @@
|
||||
-/* $Id: vboxvfs_vfsops.c $ */
|
||||
|
@ -7,11 +7,11 @@
|
|||
- */
|
||||
-
|
||||
/*
|
||||
* Copyright (C) 2008-2020 Oracle Corporation
|
||||
* Copyright (C) 2008-2025 Oracle and/or its affiliates.
|
||||
*
|
||||
@@ -14,245 +9,478 @@
|
||||
* VirtualBox OSE distribution. VirtualBox OSE is distributed in the
|
||||
* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
|
||||
@@ -24,245 +19,478 @@
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-3.0-only
|
||||
*/
|
||||
-
|
||||
-#include "vboxvfs.h"
|
||||
|
@ -38,10 +38,9 @@
|
|||
-#include <iprt/mem.h>
|
||||
+#include <geom/geom.h>
|
||||
+#include <geom/geom_vfs.h>
|
||||
-
|
||||
+#include <vm/uma.h>
|
||||
+#include "vboxvfs.h"
|
||||
+
|
||||
|
||||
#define VFSMP2SFGLOBINFO(mp) ((struct sf_glob_info *)mp->mnt_data)
|
||||
|
||||
-static int vboxvfs_version = VBOXVFS_VERSION;
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig 2023-07-12 15:59:35 UTC
|
||||
--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig 2025-08-13 19:41:18 UTC
|
||||
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c
|
||||
@@ -14,228 +14,1416 @@
|
||||
* VirtualBox OSE distribution. VirtualBox OSE is distributed in the
|
||||
* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
|
||||
@@ -24,228 +24,1416 @@
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-3.0-only
|
||||
*/
|
||||
-
|
||||
-#include "vboxvfs.h"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig 2019-01-25 18:24:30 UTC
|
||||
--- src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig 2025-08-13 19:41:22 UTC
|
||||
+++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk
|
||||
@@ -227,10 +227,22 @@ endif # neq ($(KBUILD_TARGET),linux)
|
||||
@@ -237,10 +237,22 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
|
||||
|
||||
|
||||
ifdef VBOX_USE_SYSTEM_XORG_HEADERS
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- src/VBox/Devices/Graphics/DevVGA-SVGA.cpp.orig 2025-04-14 17:55:41 UTC
|
||||
--- src/VBox/Devices/Graphics/DevVGA-SVGA.cpp.orig 2025-08-13 19:47:43 UTC
|
||||
+++ src/VBox/Devices/Graphics/DevVGA-SVGA.cpp
|
||||
@@ -178,7 +178,7 @@
|
||||
# ifdef RT_OS_DARWIN
|
||||
|
@ -9,7 +9,7 @@
|
|||
# ifdef IN_RING3
|
||||
# include "DevVGA-SVGA3d-glLdr.h"
|
||||
# endif
|
||||
@@ -7685,7 +7685,7 @@ static void vmsvgaR3PowerOnDevice(PPDMDEVINS pDevIns,
|
||||
@@ -7949,7 +7949,7 @@ static void vmsvgaR3PowerOnDevice(PPDMDEVINS pDevIns,
|
||||
}
|
||||
# endif
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp.orig 2025-05-12 17:49:35 UTC
|
||||
--- src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp.orig 2025-08-13 19:47:43 UTC
|
||||
+++ src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp
|
||||
@@ -3363,7 +3363,7 @@ static DECLCALLBACK(int) vmsvga3dBackInit(PPDMDEVINS p
|
||||
@@ -3021,7 +3021,7 @@ static DECLCALLBACK(int) vmsvga3dBackInit(PPDMDEVINS p
|
||||
RT_NOREF(pDevIns, pThis);
|
||||
|
||||
int rc;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Devices/Makefile.kmk.orig 2024-10-10 20:29:17.000000000 +0200
|
||||
+++ src/VBox/Devices/Makefile.kmk 2024-12-27 13:26:17.132294000 +0100
|
||||
@@ -132,6 +132,7 @@
|
||||
--- src/VBox/Devices/Makefile.kmk.orig 2025-08-13 19:48:02 UTC
|
||||
+++ src/VBox/Devices/Makefile.kmk
|
||||
@@ -135,6 +135,7 @@ if !defined(VBOX_ONLY_EXTPACKS)
|
||||
VBoxDDU_LDFLAGS.darwin += -framework IOKit
|
||||
endif
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
|||
VBoxDDU_LDFLAGS.linux = $(VBOX_GCC_NO_UNDEFINED)
|
||||
$(call VBOX_SET_VER_INFO_DLL,VBoxDDU,VirtualBox VMM Devices and Drivers Utilities)
|
||||
|
||||
@@ -286,6 +287,7 @@
|
||||
@@ -290,6 +291,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBU
|
||||
-framework SystemConfiguration \
|
||||
-framework AVFoundation \
|
||||
-framework Foundation
|
||||
|
@ -16,7 +16,7 @@
|
|||
VBoxDD_LDFLAGS.linux = $(VBOX_GCC_NO_UNDEFINED)
|
||||
|
||||
# --- Tracing bits. ---
|
||||
@@ -331,7 +333,7 @@
|
||||
@@ -334,7 +336,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBU
|
||||
Graphics/DevVGA-SVGA-cmd.cpp
|
||||
endif
|
||||
ifdef VBOX_WITH_VMSVGA3D
|
||||
|
@ -25,7 +25,7 @@
|
|||
# Dynamically load 3D library (opengl32, libGL).
|
||||
# This is a temporary solution. In future the 3D backend will be in a separate library.
|
||||
VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
|
||||
@@ -390,6 +392,7 @@
|
||||
@@ -410,6 +412,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBU
|
||||
Graphics/DevVGA-SVGA3d-glLdr.cpp
|
||||
else
|
||||
VBoxDD_LIBS.linux += X11 GL
|
||||
|
@ -33,7 +33,7 @@
|
|||
VBoxDD_LIBS.win += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
|
||||
endif
|
||||
VBoxDD_LDFLAGS.darwin += -framework OpenGL
|
||||
@@ -1701,6 +1704,8 @@
|
||||
@@ -1523,6 +1526,8 @@ if defined(VBOX_WITH_VMSVGA3D) && !defined(VBOX_ONLY_E
|
||||
VBoxSVGA3D_INCS = $(VBOX_GRAPHICS_INCS)
|
||||
VBoxSVGA3D_INCS.win := \
|
||||
Graphics/shaderlib/libWineStub/include
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- src/VBox/Devices/Network/DrvNATlibslirp.cpp.orig 2025-01-25 00:56:57.537046000 +0700
|
||||
+++ src/VBox/Devices/Network/DrvNATlibslirp.cpp 2025-01-25 00:58:05.112538000 +0700
|
||||
--- src/VBox/Devices/Network/DrvNAT.cpp.orig 2025-08-13 19:48:03 UTC
|
||||
+++ src/VBox/Devices/Network/DrvNAT.cpp
|
||||
@@ -57,6 +57,7 @@
|
||||
|
||||
#ifdef RT_OS_FREEBSD
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2025-01-21 19:56:40.000000000 +0700
|
||||
+++ src/VBox/Devices/PC/ipxe/Makefile.kmk 2025-01-23 00:47:50.818978000 +0700
|
||||
@@ -45,7 +45,7 @@
|
||||
--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2025-08-13 19:48:06 UTC
|
||||
+++ src/VBox/Devices/PC/ipxe/Makefile.kmk
|
||||
@@ -45,7 +45,7 @@ iPxeBiosBin_CLEAN = \
|
||||
iPxeBiosBin_CLEAN = \
|
||||
$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
$$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) | $$(dir $$@)
|
||||
$(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
|
||||
$(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@
|
||||
@@ -131,7 +131,7 @@
|
||||
@@ -131,7 +131,7 @@ endif
|
||||
-falign-loops=1 \
|
||||
-Os \
|
||||
-falign-functions=1 \
|
||||
|
@ -18,7 +18,7 @@
|
|||
-mregparm=3 \
|
||||
-mrtd \
|
||||
-freg-struct-return \
|
||||
@@ -154,7 +154,7 @@
|
||||
@@ -154,7 +154,7 @@ endif
|
||||
-falign-jumps=1 \
|
||||
-falign-loops=1 \
|
||||
-falign-functions=1 \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp.orig 2024-01-11 12:23:15 UTC
|
||||
--- src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp.orig 2025-08-13 19:49:01 UTC
|
||||
+++ src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp
|
||||
@@ -57,7 +57,7 @@
|
||||
@@ -67,7 +67,7 @@
|
||||
#include "../USBProxyDevice.h"
|
||||
|
||||
/** Maximum endpoints supported. */
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/ExtPacks/VNC/VBoxVNC.cpp.orig 2024-01-11 12:24:04 UTC
|
||||
--- src/VBox/ExtPacks/VNC/VBoxVNC.cpp.orig 2025-08-13 19:50:02 UTC
|
||||
+++ src/VBox/ExtPacks/VNC/VBoxVNC.cpp
|
||||
@@ -45,7 +45,7 @@
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
#ifdef LIBVNCSERVER_IPv6
|
||||
// enable manually!
|
||||
|
@ -9,7 +9,7 @@
|
|||
#endif
|
||||
|
||||
|
||||
@@ -421,7 +421,7 @@ DECLCALLBACK(int) VNCServerImpl::VRDEEnableConnections
|
||||
@@ -431,7 +431,7 @@ DECLCALLBACK(int) VNCServerImpl::VRDEEnableConnections
|
||||
|
||||
// get address
|
||||
char *pszTCPAddress = (char *)RTMemTmpAllocZ(VNC_ADDRESS_OPTION_MAX);
|
||||
|
@ -18,7 +18,7 @@
|
|||
VRDE_QP_NETWORK_ADDRESS,
|
||||
pszTCPAddress,
|
||||
VNC_ADDRESS_OPTION_MAX,
|
||||
@@ -582,19 +582,35 @@ DECLCALLBACK(int) VNCServerImpl::VRDEEnableConnections
|
||||
@@ -592,19 +592,35 @@ DECLCALLBACK(int) VNCServerImpl::VRDEEnableConnections
|
||||
pszServerAddress6 = szIPv6ListenAll;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp.orig 2024-12-26 22:32:13.106542000 +0100
|
||||
+++ src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp 2024-12-26 22:32:32.805126000 +0100
|
||||
@@ -61,7 +61,7 @@
|
||||
--- src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp.orig 2025-08-13 19:50:04 UTC
|
||||
+++ src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp
|
||||
@@ -63,7 +63,7 @@ using namespace com;
|
||||
# include <iprt/process.h>
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp.orig 2022-10-06 19:10:28.000000000 +0200
|
||||
+++ src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp 2024-12-26 16:08:30.624183000 +0100
|
||||
@@ -170,7 +170,7 @@
|
||||
--- src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp.orig 2025-08-13 19:50:05 UTC
|
||||
+++ src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
|
||||
@@ -151,7 +151,7 @@ enum
|
||||
MODIFYVM_UARTMODE,
|
||||
MODIFYVM_UARTTYPE,
|
||||
MODIFYVM_UART,
|
||||
|
@ -9,7 +9,7 @@
|
|||
MODIFYVM_LPTMODE,
|
||||
MODIFYVM_LPT,
|
||||
#endif
|
||||
@@ -382,7 +382,7 @@
|
||||
@@ -393,7 +393,7 @@ static const RTGETOPTDEF g_aModifyVMOptions[] =
|
||||
OPT2("--uart-mode", "--uartmode", MODIFYVM_UARTMODE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX),
|
||||
OPT2("--uart-type", "--uarttype", MODIFYVM_UARTTYPE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX),
|
||||
OPT1("--uart", MODIFYVM_UART, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX),
|
||||
|
@ -18,7 +18,7 @@
|
|||
OPT2("--lpt-mode", "--lptmode", MODIFYVM_LPTMODE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX),
|
||||
OPT1("--lpt", MODIFYVM_LPT, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX),
|
||||
#endif
|
||||
@@ -2496,7 +2496,7 @@
|
||||
@@ -2680,7 +2680,7 @@ RTEXITCODE handleModifyVM(HandlerArg *a)
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,46 @@
|
|||
--- src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp.orig 2025-08-13 19:50:55 UTC
|
||||
+++ src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
|
||||
@@ -2402,6 +2402,9 @@ void UIVirtualBoxManager::prepare()
|
||||
qApp->installEventFilter(this);
|
||||
#endif
|
||||
|
||||
+ /* Prepare notification-center invisibvle way: */
|
||||
+ prepareNotificationCenter();
|
||||
+
|
||||
/* Cache media data early if necessary: */
|
||||
if (uiCommon().agressiveCaching())
|
||||
gpMediumEnumerator->enumerateMedia();
|
||||
@@ -2446,6 +2449,12 @@ void UIVirtualBoxManager::prepare()
|
||||
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER && VBOX_WITH_UPDATE_REQUEST */
|
||||
}
|
||||
|
||||
+void UIVirtualBoxManager::prepareNotificationCenter()
|
||||
+{
|
||||
+ UINotificationCenter::create();
|
||||
+
|
||||
+}
|
||||
+
|
||||
void UIVirtualBoxManager::prepareCloudMachineManager()
|
||||
{
|
||||
UICloudMachineManager::create();
|
||||
@@ -2805,6 +2814,12 @@ void UIVirtualBoxManager::cleanupCloudMachineManager()
|
||||
UICloudMachineManager::destroy();
|
||||
}
|
||||
|
||||
+void UIVirtualBoxManager::cleanupNotificationCenter()
|
||||
+{
|
||||
+ UINotificationCenter::destroy();
|
||||
+
|
||||
+}
|
||||
+
|
||||
void UIVirtualBoxManager::cleanup()
|
||||
{
|
||||
/* Ask sub-dialogs to commit data: */
|
||||
@@ -2814,6 +2829,7 @@ void UIVirtualBoxManager::cleanup()
|
||||
cleanupWidgets();
|
||||
cleanupMenuBar();
|
||||
cleanupCloudMachineManager();
|
||||
+ cleanupNotificationCenter();
|
||||
}
|
||||
|
||||
UIVirtualMachineItem *UIVirtualBoxManager::currentItem() const
|
|
@ -0,0 +1,20 @@
|
|||
--- src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h.orig 2025-08-13 19:50:55 UTC
|
||||
+++ src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h
|
||||
@@ -341,6 +341,8 @@ private slots: (private)
|
||||
* @{ */
|
||||
/** Prepares window. */
|
||||
void prepare();
|
||||
+ /** Prepares notification-center. */
|
||||
+ void prepareNotificationCenter();
|
||||
/** Prepares cloud machine manager. */
|
||||
void prepareCloudMachineManager();
|
||||
/** Prepares icon. */
|
||||
@@ -366,6 +368,8 @@ private slots: (private)
|
||||
void cleanupMenuBar();
|
||||
/** Cleanups cloud machine manager. */
|
||||
void cleanupCloudMachineManager();
|
||||
+ /** Cleanups notification-center. */
|
||||
+ void cleanupNotificationCenter();
|
||||
/** Cleanups window. */
|
||||
void cleanup();
|
||||
/** @} */
|
|
@ -0,0 +1,24 @@
|
|||
--- src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxWidget.cpp.orig 2025-08-13 19:50:55 UTC
|
||||
+++ src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxWidget.cpp
|
||||
@@ -399,8 +399,8 @@ void UIVirtualBoxWidget::prepareWidgets()
|
||||
}
|
||||
}
|
||||
|
||||
- /* Create notification-center: */
|
||||
- UINotificationCenter::create(this);
|
||||
+ /* Reparent notification-center: */
|
||||
+ gpNotificationCenter->setParent(this);
|
||||
|
||||
/* Update toolbar finally: */
|
||||
updateToolbar();
|
||||
@@ -746,8 +746,8 @@ void UIVirtualBoxWidget::cleanup()
|
||||
|
||||
void UIVirtualBoxWidget::cleanup()
|
||||
{
|
||||
- /* Destroy notification-center: */
|
||||
- UINotificationCenter::destroy();
|
||||
+ /* Reparent notification-center: */
|
||||
+ gpNotificationCenter->setParent(0);
|
||||
}
|
||||
|
||||
UIGlobalToolsWidget *UIVirtualBoxWidget::globalToolsWidget() const
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/HostDrivers/Support/SUPDrv.cpp.orig 2024-12-27 08:34:02.157677000 +0100
|
||||
+++ src/VBox/HostDrivers/Support/SUPDrv.cpp 2024-12-27 08:34:25.419134000 +0100
|
||||
@@ -317,8 +317,8 @@
|
||||
--- src/VBox/HostDrivers/Support/SUPDrv.cpp.orig 2025-08-13 19:51:08 UTC
|
||||
+++ src/VBox/HostDrivers/Support/SUPDrv.cpp
|
||||
@@ -322,8 +322,8 @@ static SUPFUNC g_aFunctions[] =
|
||||
SUPEXP_STK_BACK( 2, SUPR0PageFree),
|
||||
SUPEXP_STK_BACK( 6, SUPR0PageMapKernel),
|
||||
SUPEXP_STK_BACK( 6, SUPR0PageProtect),
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/HostDrivers/Support/SUPDrvInternal.h.orig 2021-01-07 15:41:25 UTC
|
||||
--- src/VBox/HostDrivers/Support/SUPDrvInternal.h.orig 2025-08-13 19:51:08 UTC
|
||||
+++ src/VBox/HostDrivers/Support/SUPDrvInternal.h
|
||||
@@ -217,7 +217,7 @@
|
||||
@@ -368,7 +368,7 @@
|
||||
# define SUPDRV_WITHOUT_MSR_PROBER
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2025-01-21 19:58:52.000000000 +0700
|
||||
+++ src/VBox/HostDrivers/Support/freebsd/Makefile 2025-03-22 22:28:21.276497000 +0700
|
||||
@@ -93,6 +93,7 @@
|
||||
--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2025-08-13 19:51:09 UTC
|
||||
+++ src/VBox/HostDrivers/Support/freebsd/Makefile
|
||||
@@ -93,6 +93,7 @@ SRCS += \
|
||||
assert.c \
|
||||
handletable.c \
|
||||
handletablectx.c \
|
||||
|
@ -8,7 +8,7 @@
|
|||
once.c \
|
||||
term.c \
|
||||
thread.c
|
||||
@@ -117,7 +118,8 @@
|
||||
@@ -117,7 +118,8 @@ SRCS += \
|
||||
strprintf2-ellipsis.c \
|
||||
strtonum.c \
|
||||
memchr.c \
|
||||
|
@ -18,7 +18,7 @@
|
|||
|
||||
.PATH: ${.CURDIR}/common/rand
|
||||
SRCS += \
|
||||
@@ -163,7 +165,8 @@
|
||||
@@ -163,7 +165,8 @@ SRCS += \
|
||||
rtStrFormatKernelAddress-generic.c \
|
||||
errvars-generic.c \
|
||||
mppresent-generic.c \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp.orig 2024-10-10 20:31:28.000000000 +0200
|
||||
+++ src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp 2024-11-17 18:27:46.400938000 +0100
|
||||
@@ -88,7 +88,7 @@
|
||||
--- src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp.orig 2025-08-13 19:51:09 UTC
|
||||
+++ src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp
|
||||
@@ -88,7 +88,7 @@ DECLHIDDEN(int) suplibOsInit(PSUPLIBDATA pThis, bool f
|
||||
/*
|
||||
* Try open the BSD device.
|
||||
*/
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/HostDrivers/Support/freebsd//files_vboxdrv.orig 2025-01-21 19:58:53.000000000 +0700
|
||||
+++ src/VBox/HostDrivers/Support/freebsd//files_vboxdrv 2025-03-17 00:31:16.880317000 +0700
|
||||
@@ -71,6 +71,7 @@
|
||||
--- src/VBox/HostDrivers/Support/freebsd/files_vboxdrv.orig 2025-08-13 19:51:09 UTC
|
||||
+++ src/VBox/HostDrivers/Support/freebsd/files_vboxdrv
|
||||
@@ -71,6 +71,7 @@ FILES_VBOXDRV_NOBIN=" \
|
||||
${PATH_ROOT}/include/iprt/stdarg.h=>include/iprt/stdarg.h \
|
||||
${PATH_ROOT}/include/iprt/stdint.h=>include/iprt/stdint.h \
|
||||
${PATH_ROOT}/include/iprt/string.h=>include/iprt/string.h \
|
||||
|
@ -8,7 +8,7 @@
|
|||
${PATH_ROOT}/include/iprt/thread.h=>include/iprt/thread.h \
|
||||
${PATH_ROOT}/include/iprt/time.h=>include/iprt/time.h \
|
||||
${PATH_ROOT}/include/iprt/timer.h=>include/iprt/timer.h \
|
||||
@@ -133,6 +134,7 @@
|
||||
@@ -133,6 +134,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 \
|
||||
|
@ -16,7 +16,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 \
|
||||
@@ -154,6 +156,7 @@
|
||||
@@ -154,6 +156,7 @@ FILES_VBOXDRV_NOBIN=" \
|
||||
${PATH_ROOT}/src/VBox/Runtime/common/string/strprintf2-ellipsis.cpp=>common/string/strprintf2-ellipsis.c \
|
||||
${PATH_ROOT}/src/VBox/Runtime/common/string/strtonum.cpp=>common/string/strtonum.c \
|
||||
${PATH_ROOT}/src/VBox/Runtime/common/string/memchr.cpp=>common/string/memchr.c \
|
||||
|
@ -24,7 +24,7 @@
|
|||
${PATH_ROOT}/src/VBox/Runtime/common/string/stringalloc.cpp=>common/string/stringalloc.c \
|
||||
${PATH_ROOT}/src/VBox/Runtime/common/rand/rand.cpp=>common/rand/rand.c \
|
||||
${PATH_ROOT}/src/VBox/Runtime/common/rand/randadv.cpp=>common/rand/randadv.c \
|
||||
@@ -200,6 +203,7 @@
|
||||
@@ -200,6 +203,7 @@ FILES_VBOXDRV_NOBIN=" \
|
||||
${PATH_ROOT}/src/VBox/Runtime/generic/RTMpOnPair-generic.cpp=>generic/RTMpOnPair-generic.c \
|
||||
${PATH_ROOT}/src/VBox/Runtime/generic/errvars-generic.cpp=>generic/errvars-generic.c \
|
||||
${PATH_ROOT}/src/VBox/Runtime/generic/mppresent-generic.cpp=>generic/mppresent-generic.c \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile.orig 2019-05-13 13:33:07 UTC
|
||||
--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile.orig 2025-08-13 19:51:10 UTC
|
||||
+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile
|
||||
@@ -26,7 +26,7 @@
|
||||
@@ -36,7 +36,7 @@ KMOD = vboxnetadp
|
||||
|
||||
KMOD = vboxnetadp
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.orig 2019-05-13 13:33:07 UTC
|
||||
--- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.orig 2025-08-13 19:51:11 UTC
|
||||
+++ src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
|
||||
@@ -565,7 +565,7 @@ $(PATH_OUT)/opt_netgraph.h:
|
||||
@@ -337,7 +337,7 @@ ifeq ($(KBUILD_TARGET),freebsd)
|
||||
$(QUIET)$(RM) -f -- $@
|
||||
$(QUIET)$(CP) -f $< $@
|
||||
ifndef VBOX_WITH_HARDENING
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile.orig 2019-05-13 13:33:07 UTC
|
||||
--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile.orig 2025-08-13 19:51:11 UTC
|
||||
+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile
|
||||
@@ -26,7 +26,7 @@
|
||||
@@ -36,7 +36,7 @@ KMOD = vboxnetflt
|
||||
|
||||
KMOD = vboxnetflt
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp.orig 2022-01-13 18:57:40 UTC
|
||||
--- src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp.orig 2025-08-13 19:51:12 UTC
|
||||
+++ src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp
|
||||
@@ -737,7 +737,7 @@ int Adapter::doIOCtl(unsigned long iCmd, VBOXNETADPREQ
|
||||
@@ -759,7 +759,7 @@ int Adapter::doIOCtl(unsigned long iCmd, VBOXNETADPREQ
|
||||
* Global config file implementation *
|
||||
*********************************************************************************************************************************/
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Main/Makefile.kmk.orig 2024-10-10 20:31:38.000000000 +0200
|
||||
+++ src/VBox/Main/Makefile.kmk 2024-12-27 13:32:31.610875000 +0100
|
||||
@@ -761,6 +761,7 @@
|
||||
--- src/VBox/Main/Makefile.kmk.orig 2025-08-13 19:51:19 UTC
|
||||
+++ src/VBox/Main/Makefile.kmk
|
||||
@@ -771,6 +771,7 @@ if !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_EXTPA
|
||||
|
||||
VBoxSVC_SOURCES.freebsd = \
|
||||
src-server/freebsd/HostHardwareFreeBSD.cpp \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Main/include/HostPower.h.orig 2021-01-07 15:41:38 UTC
|
||||
--- src/VBox/Main/include/HostPower.h.orig 2025-08-13 19:51:21 UTC
|
||||
+++ src/VBox/Main/include/HostPower.h
|
||||
@@ -31,7 +31,7 @@
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
# include <VBox/dbus.h>
|
||||
#endif
|
||||
|
||||
@@ -67,7 +67,7 @@ class HostPowerServiceWin : public HostPowerService (p
|
||||
@@ -77,7 +77,7 @@ class HostPowerServiceWin : public HostPowerService (p
|
||||
RTTHREAD mThread;
|
||||
};
|
||||
# endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Main/src-server/HostImpl.cpp.orig 2021-01-07 15:41:42 UTC
|
||||
--- src/VBox/Main/src-server/HostImpl.cpp.orig 2025-08-13 19:51:26 UTC
|
||||
+++ src/VBox/Main/src-server/HostImpl.cpp
|
||||
@@ -286,7 +286,7 @@ HRESULT Host::init(VirtualBox *aParent)
|
||||
@@ -339,7 +339,7 @@ HRESULT Host::init(VirtualBox *aParent)
|
||||
|
||||
#if defined(RT_OS_WINDOWS)
|
||||
m->pHostPowerService = new HostPowerServiceWin(m->pParent);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp.orig 2017-07-27 13:18:27 UTC
|
||||
--- src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp.orig 2025-08-13 19:51:28 UTC
|
||||
+++ src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp
|
||||
@@ -80,8 +80,10 @@ int CollectorFreeBSD::getHostMemoryUsage(ULONG *total,
|
||||
@@ -90,8 +90,10 @@ int CollectorFreeBSD::getHostMemoryUsage(ULONG *total,
|
||||
cbParameter = sizeof(cPagesMemInactive);
|
||||
if (!sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))
|
||||
cProcessed++;
|
||||
|
@ -11,7 +11,7 @@
|
|||
cProcessed++;
|
||||
cbParameter = sizeof(cbPage);
|
||||
if (!sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0))
|
||||
@@ -90,8 +92,8 @@ int CollectorFreeBSD::getHostMemoryUsage(ULONG *total,
|
||||
@@ -100,8 +102,8 @@ int CollectorFreeBSD::getHostMemoryUsage(ULONG *total,
|
||||
if (cProcessed == 6)
|
||||
{
|
||||
*total = cbMemPhys / _1K;
|
||||
|
@ -21,4 +21,4 @@
|
|||
+ *available = ((uint64_t)cPagesMemFree + cPagesMemInactive + cPagesMemCached) * (cbPage / _1K);
|
||||
}
|
||||
else
|
||||
rc = VERR_NOT_SUPPORTED;
|
||||
vrc = VERR_NOT_SUPPORTED;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/Makefile.kmk.orig 2025-01-21 19:59:19.000000000 +0700
|
||||
+++ src/VBox/Runtime/Makefile.kmk 2025-03-23 20:54:34.250024000 +0700
|
||||
@@ -225,6 +225,9 @@
|
||||
--- src/VBox/Runtime/Makefile.kmk.orig 2025-08-28 22:09:24 UTC
|
||||
+++ src/VBox/Runtime/Makefile.kmk
|
||||
@@ -233,6 +233,9 @@ $(IPRT_OUT_DIR)/oiddb.h.ts +| $(IPRT_OUT_DIR)/oiddb.h:
|
||||
$(QUIET)$(oiddb2c_1_TARGET) "$@" $(filter %.cfg,$^)
|
||||
$(QUIET)$(CP) --changed -fv "$@" "$(IPRT_OUT_DIR)/oiddb.h"
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
|||
|
||||
#
|
||||
# Unicode Specification reader used to regenerate unidata-*.cpp.
|
||||
@@ -1468,6 +1471,7 @@
|
||||
@@ -1516,6 +1519,7 @@ RuntimeBaseR3_SOURCES.freebsd = \
|
||||
generic/RTProcDaemonize-generic.cpp \
|
||||
generic/RTProcIsRunningByName-generic.cpp \
|
||||
generic/RTThreadGetNativeState-generic.cpp \
|
||||
|
@ -18,7 +18,7 @@
|
|||
r3/freebsd/fileaio-freebsd.cpp \
|
||||
r3/freebsd/RTFileQuerySectorSize-freebsd.cpp \
|
||||
r3/freebsd/mp-freebsd.cpp \
|
||||
@@ -3011,6 +3015,8 @@
|
||||
@@ -3072,6 +3076,8 @@ VBoxRT_LDFLAGS.win = /MANIFEST \
|
||||
/delayload:ole32.dll \
|
||||
/delayload:oleaut32.dll \
|
||||
/delayload:advapi32.dll
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c.orig 2024-10-10 20:32:14.000000000 +0200
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c 2024-12-27 13:39:49.059878000 +0100
|
||||
@@ -88,6 +88,7 @@
|
||||
--- src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c
|
||||
@@ -88,6 +88,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl
|
||||
|
||||
DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFlags, PRTMEMHDR *ppHdr)
|
||||
{
|
||||
|
@ -8,7 +8,7 @@
|
|||
size_t cbAllocated = cb;
|
||||
PRTMEMHDR pHdr = (PRTMEMHDR)malloc(cb + sizeof(RTMEMHDR), M_IPRTHEAP,
|
||||
fFlags & RTMEMHDR_FLAG_ZEROED ? M_NOWAIT | M_ZERO : M_NOWAIT);
|
||||
@@ -99,21 +100,28 @@
|
||||
@@ -99,21 +100,28 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl
|
||||
pHdr->cbReq = cb;
|
||||
|
||||
*ppHdr = pHdr;
|
||||
|
@ -38,7 +38,7 @@
|
|||
void *pv;
|
||||
|
||||
/*
|
||||
@@ -138,6 +146,7 @@
|
||||
@@ -138,6 +146,7 @@ RTR0DECL(void *) RTMemContAlloc(PRTCCPHYS pPhys, size_
|
||||
*pPhys = vtophys(pv);
|
||||
Assert(!(*pPhys & PAGE_OFFSET_MASK));
|
||||
}
|
||||
|
@ -46,7 +46,7 @@
|
|||
return pv;
|
||||
}
|
||||
|
||||
@@ -147,7 +156,9 @@
|
||||
@@ -147,7 +156,9 @@ RTR0DECL(void) RTMemContFree(void *pv, size_t cb)
|
||||
if (pv)
|
||||
{
|
||||
AssertMsg(!((uintptr_t)pv & PAGE_OFFSET_MASK), ("pv=%p\n", pv));
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c.orig 2021-01-07 15:42:08 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c
|
||||
@@ -68,15 +68,18 @@
|
||||
@@ -78,15 +78,18 @@ DECLHIDDEN(void) rtR0AssertNativeMsg1(const char *pszE
|
||||
|
||||
DECLHIDDEN(void) rtR0AssertNativeMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
|
||||
{
|
||||
|
@ -19,7 +19,7 @@
|
|||
char szMsg[256];
|
||||
|
||||
RTStrPrintfV(szMsg, sizeof(szMsg) - 1, pszFormat, va);
|
||||
@@ -84,6 +87,7 @@ DECLHIDDEN(void) rtR0AssertNativeMsg2V(bool fInitial,
|
||||
@@ -94,6 +97,7 @@ DECLHIDDEN(void) rtR0AssertNativeMsg2V(bool fInitial,
|
||||
printf("%s", szMsg);
|
||||
|
||||
NOREF(fInitial);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c.orig 2018-10-15 14:31:31 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c
|
||||
@@ -36,7 +36,9 @@
|
||||
@@ -46,7 +46,9 @@ RTR0DECL(int) RTR0MemUserCopyFrom(void *pvDst, RTR3PTR
|
||||
|
||||
RTR0DECL(int) RTR0MemUserCopyFrom(void *pvDst, RTR3PTR R3PtrSrc, size_t cb)
|
||||
{
|
||||
|
@ -10,7 +10,7 @@
|
|||
if (RT_LIKELY(rc == 0))
|
||||
return VINF_SUCCESS;
|
||||
return VERR_ACCESS_DENIED;
|
||||
@@ -45,7 +47,9 @@ RTR0DECL(int) RTR0MemUserCopyFrom(void *pvDst, RTR3PTR
|
||||
@@ -55,7 +57,9 @@ RTR0DECL(int) RTR0MemUserCopyTo(RTR3PTR R3PtrDst, void
|
||||
|
||||
RTR0DECL(int) RTR0MemUserCopyTo(RTR3PTR R3PtrDst, void const *pvSrc, size_t cb)
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c.orig 2019-04-16 10:17:21 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c
|
||||
@@ -147,7 +147,9 @@ RTDECL(RTCPUID) RTMpGetOnlineCount(void)
|
||||
@@ -157,7 +157,9 @@ static void rtmpOnAllFreeBSDWrapper(void *pvArg)
|
||||
static void rtmpOnAllFreeBSDWrapper(void *pvArg)
|
||||
{
|
||||
PRTMPARGS pArgs = (PRTMPARGS)pvArg;
|
||||
|
@ -10,7 +10,7 @@
|
|||
}
|
||||
|
||||
|
||||
@@ -159,7 +161,9 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void *p
|
||||
@@ -169,7 +171,9 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void *p
|
||||
Args.pvUser2 = pvUser2;
|
||||
Args.idCpu = NIL_RTCPUID;
|
||||
Args.cHits = 0;
|
||||
|
@ -20,7 +20,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -175,7 +179,11 @@ static void rtmpOnOthersFreeBSDWrapper(void *pvArg)
|
||||
@@ -185,7 +189,11 @@ static void rtmpOnOthersFreeBSDWrapper(void *pvArg)
|
||||
PRTMPARGS pArgs = (PRTMPARGS)pvArg;
|
||||
RTCPUID idCpu = curcpu;
|
||||
if (pArgs->idCpu != idCpu)
|
||||
|
@ -32,7 +32,7 @@
|
|||
}
|
||||
|
||||
|
||||
@@ -196,6 +204,7 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
|
||||
@@ -206,6 +214,7 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
|
||||
Args.pvUser2 = pvUser2;
|
||||
Args.idCpu = RTMpCpuId();
|
||||
Args.cHits = 0;
|
||||
|
@ -40,7 +40,7 @@
|
|||
#if __FreeBSD_version >= 700000
|
||||
# if __FreeBSD_version >= 900000
|
||||
Mask = all_cpus;
|
||||
@@ -207,6 +216,7 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
|
||||
@@ -217,6 +226,7 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
|
||||
#else
|
||||
smp_rendezvous(NULL, rtmpOnOthersFreeBSDWrapper, NULL, &Args);
|
||||
#endif
|
||||
|
@ -48,7 +48,7 @@
|
|||
}
|
||||
return VINF_SUCCESS;
|
||||
}
|
||||
@@ -224,8 +234,10 @@ static void rtmpOnSpecificFreeBSDWrapper(void *pvArg)
|
||||
@@ -234,8 +244,10 @@ static void rtmpOnSpecificFreeBSDWrapper(void *pvArg)
|
||||
RTCPUID idCpu = curcpu;
|
||||
if (pArgs->idCpu == idCpu)
|
||||
{
|
||||
|
@ -59,7 +59,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
@@ -248,6 +260,7 @@ RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKE
|
||||
@@ -258,6 +270,7 @@ RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKE
|
||||
Args.pvUser2 = pvUser2;
|
||||
Args.idCpu = idCpu;
|
||||
Args.cHits = 0;
|
||||
|
@ -67,7 +67,7 @@
|
|||
#if __FreeBSD_version >= 700000
|
||||
# if __FreeBSD_version >= 900000
|
||||
CPU_SETOF(idCpu, &Mask);
|
||||
@@ -258,6 +271,7 @@ RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKE
|
||||
@@ -268,6 +281,7 @@ RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKE
|
||||
#else
|
||||
smp_rendezvous(NULL, rtmpOnSpecificFreeBSDWrapper, NULL, &Args);
|
||||
#endif
|
||||
|
@ -75,7 +75,7 @@
|
|||
return Args.cHits == 1
|
||||
? VINF_SUCCESS
|
||||
: VERR_CPU_NOT_FOUND;
|
||||
@@ -287,12 +301,14 @@ RTDECL(int) RTMpPokeCpu(RTCPUID idCpu)
|
||||
@@ -297,12 +311,14 @@ RTDECL(int) RTMpPokeCpu(RTCPUID idCpu)
|
||||
if (!RTMpIsCpuOnline(idCpu))
|
||||
return VERR_CPU_NOT_FOUND;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c.orig 2021-01-07 15:42:08 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c
|
||||
@@ -101,7 +101,9 @@ RTDECL(int) RTSemEventCreateEx(PRTSEMEVENT phEventSem
|
||||
@@ -111,7 +111,9 @@ RTDECL(int) RTSemEventCreateEx(PRTSEMEVENT phEventSem
|
||||
Assert(!(fFlags & RTSEMEVENT_FLAGS_BOOTSTRAP_HACK) || (fFlags & RTSEMEVENT_FLAGS_NO_LOCK_VAL));
|
||||
AssertPtrReturn(phEventSem, VERR_INVALID_POINTER);
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
|||
if (!pThis)
|
||||
return VERR_NO_MEMORY;
|
||||
|
||||
@@ -152,10 +154,12 @@ RTDECL(int) RTSemEventDestroy(RTSEMEVENT hEventSem)
|
||||
@@ -162,10 +164,12 @@ RTDECL(int) RTSemEventDestroy(RTSEMEVENT hEventSem)
|
||||
/*
|
||||
* Invalidate it and signal the object just in case.
|
||||
*/
|
||||
|
@ -23,7 +23,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -173,9 +177,11 @@ RTDECL(int) RTSemEventSignal(RTSEMEVENT hEventSem)
|
||||
@@ -183,9 +187,11 @@ RTDECL(int) RTSemEventSignal(RTSEMEVENT hEventSem)
|
||||
/*
|
||||
* Signal the event object.
|
||||
*/
|
||||
|
@ -35,7 +35,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -199,6 +205,7 @@ static int rtR0SemEventWait(PRTSEMEVENTINTERNAL pThis,
|
||||
@@ -209,6 +215,7 @@ static int rtR0SemEventWait(PRTSEMEVENTINTERNAL pThis,
|
||||
AssertPtrReturn(pThis, VERR_INVALID_PARAMETER);
|
||||
AssertMsgReturn(pThis->u32Magic == RTSEMEVENT_MAGIC, ("%p u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_PARAMETER);
|
||||
AssertReturn(RTSEMWAIT_FLAGS_ARE_VALID(fFlags), VERR_INVALID_PARAMETER);
|
||||
|
@ -43,7 +43,7 @@
|
|||
rtR0SemEventBsdRetain(pThis);
|
||||
|
||||
/*
|
||||
@@ -248,6 +255,7 @@ static int rtR0SemEventWait(PRTSEMEVENTINTERNAL pThis,
|
||||
@@ -258,6 +265,7 @@ static int rtR0SemEventWait(PRTSEMEVENTINTERNAL pThis,
|
||||
}
|
||||
|
||||
rtR0SemEventBsdRelease(pThis);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c.orig 2021-01-07 15:42:08 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c
|
||||
@@ -120,7 +120,9 @@ RTDECL(int) RTSemEventMultiCreateEx(PRTSEMEVENTMULTI
|
||||
@@ -130,7 +130,9 @@ RTDECL(int) RTSemEventMultiCreateEx(PRTSEMEVENTMULTI
|
||||
PRTSEMEVENTMULTIINTERNAL pThis;
|
||||
|
||||
AssertReturn(!(fFlags & ~RTSEMEVENTMULTI_FLAGS_NO_LOCK_VAL), VERR_INVALID_PARAMETER);
|
||||
|
@ -10,7 +10,7 @@
|
|||
if (pThis)
|
||||
{
|
||||
pThis->u32Magic = RTSEMEVENTMULTI_MAGIC;
|
||||
@@ -176,10 +178,12 @@ RTDECL(int) RTSemEventMultiDestroy(RTSEMEVENTMULTI hE
|
||||
@@ -186,10 +188,12 @@ RTDECL(int) RTSemEventMultiDestroy(RTSEMEVENTMULTI hE
|
||||
/*
|
||||
* Invalidate it and signal the object just in case.
|
||||
*/
|
||||
|
@ -23,7 +23,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -188,6 +192,7 @@ RTDECL(int) RTSemEventMultiSignal(RTSEMEVENTMULTI hEv
|
||||
@@ -198,6 +202,7 @@ RTDECL(int) RTSemEventMultiSignal(RTSEMEVENTMULTI hEv
|
||||
{
|
||||
uint32_t fNew;
|
||||
uint32_t fOld;
|
||||
|
@ -31,7 +31,7 @@
|
|||
|
||||
/*
|
||||
* Validate input.
|
||||
@@ -214,12 +219,15 @@ RTDECL(int) RTSemEventMultiSignal(RTSEMEVENTMULTI hEv
|
||||
@@ -224,12 +229,15 @@ RTDECL(int) RTSemEventMultiSignal(RTSEMEVENTMULTI hEv
|
||||
|
||||
rtR0SemBsdBroadcast(pThis);
|
||||
rtR0SemEventMultiBsdRelease(pThis);
|
||||
|
@ -47,7 +47,7 @@
|
|||
/*
|
||||
* Validate input.
|
||||
*/
|
||||
@@ -236,6 +244,7 @@ RTDECL(int) RTSemEventMultiReset(RTSEMEVENTMULTI hEve
|
||||
@@ -246,6 +254,7 @@ RTDECL(int) RTSemEventMultiReset(RTSEMEVENTMULTI hEve
|
||||
ASMAtomicAndU32(&pThis->fStateAndGen, ~RTSEMEVENTMULTIBSD_STATE_MASK);
|
||||
|
||||
rtR0SemEventMultiBsdRelease(pThis);
|
||||
|
@ -55,7 +55,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -252,6 +261,7 @@ RTDECL(int) RTSemEventMultiReset(RTSEMEVENTMULTI hEve
|
||||
@@ -262,6 +271,7 @@ static int rtR0SemEventMultiBsdWait(PRTSEMEVENTMULTIIN
|
||||
static int rtR0SemEventMultiBsdWait(PRTSEMEVENTMULTIINTERNAL pThis, uint32_t fFlags, uint64_t uTimeout,
|
||||
PCRTLOCKVALSRCPOS pSrcPos)
|
||||
{
|
||||
|
@ -63,7 +63,7 @@
|
|||
uint32_t fOrgStateAndGen;
|
||||
int rc;
|
||||
|
||||
@@ -311,6 +321,7 @@ static int rtR0SemEventMultiBsdWait(PRTSEMEVENTMULTIIN
|
||||
@@ -321,6 +331,7 @@ static int rtR0SemEventMultiBsdWait(PRTSEMEVENTMULTIIN
|
||||
}
|
||||
|
||||
rtR0SemEventMultiBsdRelease(pThis);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c.orig 2021-01-07 15:42:08 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c
|
||||
@@ -86,6 +86,7 @@ RTDECL(int) RTSemFastMutexCreate(PRTSEMFASTMUTEX phFa
|
||||
@@ -96,6 +96,7 @@ RTDECL(int) RTSemFastMutexCreate(PRTSEMFASTMUTEX phFa
|
||||
{
|
||||
AssertCompile(sizeof(RTSEMFASTMUTEXINTERNAL) > sizeof(void *));
|
||||
AssertPtrReturn(phFastMtx, VERR_INVALID_POINTER);
|
||||
|
@ -8,7 +8,7 @@
|
|||
|
||||
PRTSEMFASTMUTEXINTERNAL pThis = (PRTSEMFASTMUTEXINTERNAL)RTMemAllocZ(sizeof(*pThis));
|
||||
if (pThis)
|
||||
@@ -94,8 +95,10 @@ RTDECL(int) RTSemFastMutexCreate(PRTSEMFASTMUTEX phFa
|
||||
@@ -104,8 +105,10 @@ RTDECL(int) RTSemFastMutexCreate(PRTSEMFASTMUTEX phFa
|
||||
sx_init_flags(&pThis->SxLock, "IPRT Fast Mutex Semaphore", SX_DUPOK);
|
||||
|
||||
*phFastMtx = pThis;
|
||||
|
@ -19,7 +19,7 @@
|
|||
return VERR_NO_MEMORY;
|
||||
}
|
||||
|
||||
@@ -107,11 +110,13 @@ RTDECL(int) RTSemFastMutexDestroy(RTSEMFASTMUTEX hFas
|
||||
@@ -117,11 +120,13 @@ RTDECL(int) RTSemFastMutexDestroy(RTSEMFASTMUTEX hFas
|
||||
return VINF_SUCCESS;
|
||||
AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
|
||||
AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
|
||||
|
@ -33,7 +33,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -121,8 +126,11 @@ RTDECL(int) RTSemFastMutexRequest(RTSEMFASTMUTEX hFas
|
||||
@@ -131,8 +136,11 @@ RTDECL(int) RTSemFastMutexRequest(RTSEMFASTMUTEX hFas
|
||||
PRTSEMFASTMUTEXINTERNAL pThis = hFastMtx;
|
||||
AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
|
||||
AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
|
||||
|
@ -45,7 +45,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -132,8 +140,11 @@ RTDECL(int) RTSemFastMutexRelease(RTSEMFASTMUTEX hFas
|
||||
@@ -142,8 +150,11 @@ RTDECL(int) RTSemFastMutexRelease(RTSEMFASTMUTEX hFas
|
||||
PRTSEMFASTMUTEXINTERNAL pThis = hFastMtx;
|
||||
AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
|
||||
AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c.orig 2018-10-15 14:31:31 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c
|
||||
@@ -62,6 +62,7 @@ RTDECL(int) RTSemMutexCreate(PRTSEMMUTEX phMutexSem)
|
||||
@@ -72,6 +72,7 @@ RTDECL(int) RTSemMutexCreate(PRTSEMMUTEX phMutexSem)
|
||||
{
|
||||
AssertCompile(sizeof(RTSEMMUTEXINTERNAL) > sizeof(void *));
|
||||
AssertPtrReturn(phMutexSem, VERR_INVALID_POINTER);
|
||||
|
@ -8,7 +8,7 @@
|
|||
|
||||
PRTSEMMUTEXINTERNAL pThis = (PRTSEMMUTEXINTERNAL)RTMemAllocZ(sizeof(*pThis));
|
||||
if (pThis)
|
||||
@@ -70,8 +71,10 @@ RTDECL(int) RTSemMutexCreate(PRTSEMMUTEX phMutexSem)
|
||||
@@ -80,8 +81,10 @@ RTDECL(int) RTSemMutexCreate(PRTSEMMUTEX phMutexSem)
|
||||
sx_init_flags(&pThis->SxLock, "IPRT Mutex Semaphore", SX_RECURSE);
|
||||
|
||||
*phMutexSem = pThis;
|
||||
|
@ -19,7 +19,7 @@
|
|||
return VERR_NO_MEMORY;
|
||||
}
|
||||
|
||||
@@ -83,12 +86,14 @@ RTDECL(int) RTSemMutexDestroy(RTSEMMUTEX hMutexSem)
|
||||
@@ -93,12 +96,14 @@ RTDECL(int) RTSemMutexDestroy(RTSEMMUTEX hMutexSem)
|
||||
return VINF_SUCCESS;
|
||||
AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
|
||||
AssertMsgReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
|
||||
|
@ -34,7 +34,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -99,6 +104,7 @@ RTDECL(int) RTSemMutexRequest(RTSEMMUTEX hMutexSem, R
|
||||
@@ -109,6 +114,7 @@ RTDECL(int) RTSemMutexRequest(RTSEMMUTEX hMutexSem, R
|
||||
int rc;
|
||||
AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
|
||||
AssertMsgReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
|
||||
|
@ -42,7 +42,7 @@
|
|||
|
||||
if (cMillies == RT_INDEFINITE_WAIT)
|
||||
{
|
||||
@@ -133,6 +139,7 @@ RTDECL(int) RTSemMutexRequest(RTSEMMUTEX hMutexSem, R
|
||||
@@ -143,6 +149,7 @@ RTDECL(int) RTSemMutexRequest(RTSEMMUTEX hMutexSem, R
|
||||
} while (RTTimeSystemMilliTS() - StartTS < cMillies);
|
||||
}
|
||||
|
||||
|
@ -50,7 +50,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -149,6 +156,7 @@ RTDECL(int) RTSemMutexRequestNoResume(RTSEMMUTEX hMut
|
||||
@@ -159,6 +166,7 @@ RTDECL(int) RTSemMutexRequestNoResume(RTSEMMUTEX hMut
|
||||
int rc;
|
||||
AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
|
||||
AssertMsgReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
|
||||
|
@ -58,7 +58,7 @@
|
|||
|
||||
if (cMillies == RT_INDEFINITE_WAIT)
|
||||
{
|
||||
@@ -186,6 +194,7 @@ RTDECL(int) RTSemMutexRequestNoResume(RTSEMMUTEX hMut
|
||||
@@ -196,6 +204,7 @@ RTDECL(int) RTSemMutexRequestNoResume(RTSEMMUTEX hMut
|
||||
} while (RTTimeSystemMilliTS() - StartTS < cMillies);
|
||||
}
|
||||
|
||||
|
@ -66,7 +66,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -201,8 +210,11 @@ RTDECL(int) RTSemMutexRelease(RTSEMMUTEX hMutexSem)
|
||||
@@ -211,8 +220,11 @@ RTDECL(int) RTSemMutexRelease(RTSEMMUTEX hMutexSem)
|
||||
PRTSEMMUTEXINTERNAL pThis = hMutexSem;
|
||||
AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
|
||||
AssertMsgReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c.orig 2021-01-07 15:42:09 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c
|
||||
@@ -106,7 +106,9 @@ RTDECL(int) RTSpinlockCreate(PRTSPINLOCK pSpinlock, u
|
||||
@@ -116,7 +116,9 @@ RTDECL(int) RTSpinlockCreate(PRTSPINLOCK pSpinlock, u
|
||||
* Allocate.
|
||||
*/
|
||||
AssertCompile(sizeof(RTSPINLOCKINTERNAL) > sizeof(void *));
|
||||
|
@ -10,7 +10,7 @@
|
|||
if (!pThis)
|
||||
return VERR_NO_MEMORY;
|
||||
|
||||
@@ -140,7 +142,9 @@ RTDECL(int) RTSpinlockDestroy(RTSPINLOCK Spinlock)
|
||||
@@ -150,7 +152,9 @@ RTDECL(int) RTSpinlockDestroy(RTSPINLOCK Spinlock)
|
||||
* Make the lock invalid and release the memory.
|
||||
*/
|
||||
ASMAtomicIncU32(&pThis->u32Magic);
|
||||
|
@ -20,7 +20,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -166,6 +170,7 @@ RTDECL(void) RTSpinlockAcquire(RTSPINLOCK Spinlock)
|
||||
@@ -176,6 +180,7 @@ RTDECL(void) RTSpinlockAcquire(RTSPINLOCK Spinlock)
|
||||
{
|
||||
RT_ASSERT_PREEMPT_CPUID_SPIN_ACQUIRED(pThis);
|
||||
pThis->fIntSaved = fIntSaved;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c.orig 2021-04-20 04:32:44 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c
|
||||
@@ -49,7 +49,6 @@ RTDECL(RTNATIVETHREAD) RTThreadNativeSelf(void)
|
||||
@@ -59,7 +59,6 @@ static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMil
|
||||
static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMillies)
|
||||
{
|
||||
int rc;
|
||||
|
@ -8,7 +8,7 @@
|
|||
|
||||
/*
|
||||
* 0 ms sleep -> yield.
|
||||
@@ -60,30 +59,34 @@ static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMil
|
||||
@@ -70,30 +69,34 @@ static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMil
|
||||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
|
@ -60,7 +60,7 @@
|
|||
switch (rc)
|
||||
{
|
||||
case 0:
|
||||
@@ -114,11 +117,13 @@ RTDECL(int) RTThreadSleepNoLog(RTMSINTERVAL cMillies)
|
||||
@@ -124,11 +127,13 @@ RTDECL(bool) RTThreadYield(void)
|
||||
|
||||
RTDECL(bool) RTThreadYield(void)
|
||||
{
|
||||
|
@ -74,7 +74,7 @@
|
|||
return false; /** @todo figure this one ... */
|
||||
}
|
||||
|
||||
@@ -167,12 +172,14 @@ RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTST
|
||||
@@ -177,12 +182,14 @@ RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTST
|
||||
|
||||
RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState)
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c.orig 2021-01-07 15:42:09 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c
|
||||
@@ -94,6 +94,8 @@ DECLHIDDEN(int) rtThreadNativeSetPriority(PRTTHREADINT
|
||||
@@ -104,6 +104,8 @@ DECLHIDDEN(int) rtThreadNativeSetPriority(PRTTHREADINT
|
||||
return VERR_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
#if __FreeBSD_version < 700000
|
||||
/* Do like they're doing in subr_ntoskrnl.c... */
|
||||
mtx_lock_spin(&sched_lock);
|
||||
@@ -110,6 +112,7 @@ DECLHIDDEN(int) rtThreadNativeSetPriority(PRTTHREADINT
|
||||
@@ -120,6 +122,7 @@ DECLHIDDEN(int) rtThreadNativeSetPriority(PRTTHREADINT
|
||||
thread_unlock(curthread);
|
||||
#endif
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -159,6 +162,7 @@ static void rtThreadNativeMain(void *pvThreadInt)
|
||||
@@ -169,6 +172,7 @@ DECLHIDDEN(int) rtThreadNativeCreate(PRTTHREADINT pThr
|
||||
|
||||
DECLHIDDEN(int) rtThreadNativeCreate(PRTTHREADINT pThreadInt, PRTNATIVETHREAD pNativeThread)
|
||||
{
|
||||
|
@ -25,7 +25,7 @@
|
|||
int rc;
|
||||
struct proc *pProc;
|
||||
|
||||
@@ -174,6 +178,7 @@ DECLHIDDEN(int) rtThreadNativeCreate(PRTTHREADINT pThr
|
||||
@@ -184,6 +188,7 @@ DECLHIDDEN(int) rtThreadNativeCreate(PRTTHREADINT pThr
|
||||
}
|
||||
else
|
||||
rc = RTErrConvertFromErrno(rc);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c.orig 2021-01-07 15:42:09 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c
|
||||
@@ -64,16 +64,23 @@
|
||||
@@ -74,16 +74,23 @@ RTDECL(uint64_t) RTTimeNanoTS(void)
|
||||
|
||||
RTDECL(uint64_t) RTTimeNanoTS(void)
|
||||
{
|
||||
|
@ -29,7 +29,7 @@
|
|||
}
|
||||
|
||||
|
||||
@@ -91,8 +98,7 @@ RTDECL(uint64_t) RTTimeSystemMilliTS(void)
|
||||
@@ -101,8 +108,7 @@ RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime)
|
||||
|
||||
RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime)
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c.orig 2021-01-07 15:42:09 UTC
|
||||
--- src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c.orig 2025-08-13 19:51:51 UTC
|
||||
+++ src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c
|
||||
@@ -116,6 +116,7 @@ static void rtTimerFreeBSDCallback(void *pvTimer);
|
||||
@@ -126,6 +126,7 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *ppTimer, uint64_
|
||||
RTDECL(int) RTTimerCreateEx(PRTTIMER *ppTimer, uint64_t u64NanoInterval, uint32_t fFlags, PFNRTTIMER pfnTimer, void *pvUser)
|
||||
{
|
||||
*ppTimer = NULL;
|
||||
|
@ -8,7 +8,7 @@
|
|||
|
||||
/*
|
||||
* Validate flags.
|
||||
@@ -145,6 +146,7 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *ppTimer, uint64_
|
||||
@@ -155,6 +156,7 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *ppTimer, uint64_
|
||||
callout_init(&pTimer->Callout, CALLOUT_MPSAFE);
|
||||
|
||||
*ppTimer = pTimer;
|
||||
|
@ -16,7 +16,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -165,6 +167,8 @@ DECLINLINE(bool) rtTimerIsValid(PRTTIMER pTimer)
|
||||
@@ -175,6 +177,8 @@ RTDECL(int) RTTimerDestroy(PRTTIMER pTimer)
|
||||
|
||||
RTDECL(int) RTTimerDestroy(PRTTIMER pTimer)
|
||||
{
|
||||
|
@ -25,7 +25,7 @@
|
|||
/* It's ok to pass NULL pointer. */
|
||||
if (pTimer == /*NIL_RTTIMER*/ NULL)
|
||||
return VINF_SUCCESS;
|
||||
@@ -177,6 +181,8 @@ RTDECL(int) RTTimerDestroy(PRTTIMER pTimer)
|
||||
@@ -187,6 +191,8 @@ RTDECL(int) RTTimerDestroy(PRTTIMER pTimer)
|
||||
pTimer->u32Magic++;
|
||||
callout_stop(&pTimer->Callout);
|
||||
RTMemFree(pTimer);
|
||||
|
@ -34,7 +34,7 @@
|
|||
return VINF_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -184,6 +190,7 @@ RTDECL(int) RTTimerDestroy(PRTTIMER pTimer)
|
||||
@@ -194,6 +200,7 @@ RTDECL(int) RTTimerStart(PRTTIMER pTimer, uint64_t u64
|
||||
RTDECL(int) RTTimerStart(PRTTIMER pTimer, uint64_t u64First)
|
||||
{
|
||||
struct timeval tv;
|
||||
|
@ -42,7 +42,7 @@
|
|||
|
||||
if (!rtTimerIsValid(pTimer))
|
||||
return VERR_INVALID_HANDLE;
|
||||
@@ -207,12 +214,15 @@ RTDECL(int) RTTimerStart(PRTTIMER pTimer, uint64_t u64
|
||||
@@ -217,12 +224,15 @@ RTDECL(int) RTTimerStart(PRTTIMER pTimer, uint64_t u64
|
||||
tv.tv_usec = (u64First % 1000000000) / 1000;
|
||||
callout_reset(&pTimer->Callout, tvtohz(&tv), rtTimerFreeBSDCallback, pTimer);
|
||||
|
||||
|
@ -58,7 +58,7 @@
|
|||
if (!rtTimerIsValid(pTimer))
|
||||
return VERR_INVALID_HANDLE;
|
||||
if (pTimer->fSuspended)
|
||||
@@ -224,6 +234,7 @@ RTDECL(int) RTTimerStop(PRTTIMER pTimer)
|
||||
@@ -234,6 +244,7 @@ RTDECL(int) RTTimerStop(PRTTIMER pTimer)
|
||||
pTimer->fSuspended = true;
|
||||
callout_stop(&pTimer->Callout);
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/Runtime/r3/posix/process-creation-posix.cpp.orig 2022-01-13 18:58:24 UTC
|
||||
--- src/VBox/Runtime/r3/posix/process-creation-posix.cpp.orig 2025-08-13 19:51:58 UTC
|
||||
+++ src/VBox/Runtime/r3/posix/process-creation-posix.cpp
|
||||
@@ -30,7 +30,7 @@
|
||||
@@ -40,7 +40,7 @@
|
||||
*********************************************************************************************************************************/
|
||||
#define LOG_GROUP RTLOGGROUP_PROCESS
|
||||
#include <iprt/cdefs.h>
|
||||
|
@ -9,8 +9,8 @@
|
|||
# define IPRT_WITH_DYNAMIC_CRYPT_R
|
||||
#endif
|
||||
#if (defined(RT_OS_LINUX) || defined(RT_OS_OS2)) && !defined(_GNU_SOURCE)
|
||||
@@ -69,7 +69,7 @@
|
||||
# include <shadow.h>
|
||||
@@ -85,7 +85,7 @@
|
||||
# include <xlocale.h> /* for newlocale() */
|
||||
#endif
|
||||
|
||||
-#if defined(RT_OS_LINUX) || defined(RT_OS_OS2)
|
||||
|
@ -18,7 +18,7 @@
|
|||
/* While Solaris has posix_spawn() of course we don't want to use it as
|
||||
* we need to have the child in a different process contract, no matter
|
||||
* whether it is started detached or not. */
|
||||
@@ -157,7 +157,7 @@
|
||||
@@ -174,7 +174,7 @@
|
||||
# define IPRT_LIBPAM_FILE_3 "libpam.1.dylib"
|
||||
# define IPRT_LIBPAM_FILE_3_FIRST_VER 0
|
||||
# define IPRT_LIBPAM_FILE_3_END_VER 0
|
||||
|
@ -27,7 +27,7 @@
|
|||
# define IPRT_LIBPAM_FILE_1 "libpam.so.0"
|
||||
# define IPRT_LIBPAM_FILE_1_FIRST_VER 0
|
||||
# define IPRT_LIBPAM_FILE_1_END_VER 0
|
||||
@@ -572,7 +572,7 @@ static int rtCheckCredentials(const char *pszUser, con
|
||||
@@ -681,7 +681,7 @@ static int rtCheckCredentials(const char *pszUser, con
|
||||
if (pPw->pw_passwd && *pPw->pw_passwd)
|
||||
# endif
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/VMM/Config.kmk.orig 2024-12-27 03:55:34.269311000 +0100
|
||||
+++ src/VBox/VMM/Config.kmk 2024-12-27 03:42:41.858673000 +0100
|
||||
@@ -91,7 +91,7 @@
|
||||
--- src/VBox/VMM/Config.kmk.orig 2025-08-13 19:52:06 UTC
|
||||
+++ src/VBox/VMM/Config.kmk
|
||||
@@ -133,7 +133,7 @@ endif
|
||||
VMM_COMMON_DEFS += VBOX_WITH_NATIVE_NEM VBOX_WITH_NEM_R0
|
||||
endif
|
||||
endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp.orig 2021-04-19 21:33:04.000000000 -0700
|
||||
+++ src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp 2021-05-18 11:45:08.396136000 -0700
|
||||
@@ -27,6 +27,13 @@
|
||||
--- src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp.orig 2025-08-13 19:52:13 UTC
|
||||
+++ src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp
|
||||
@@ -37,6 +37,13 @@
|
||||
#include <iprt/string.h>
|
||||
#include <iprt/assert.h>
|
||||
#include <VBox/log.h>
|
||||
|
@ -14,7 +14,7 @@
|
|||
|
||||
#include "PDMAsyncCompletionFileInternal.h"
|
||||
|
||||
@@ -1120,8 +1127,40 @@
|
||||
@@ -1119,8 +1126,40 @@ static int pdmacFileAioMgrNormalProcessTaskList(PPDMAC
|
||||
*/
|
||||
pdmacFileAioMgrNormalBalanceLoad(pAioMgr);
|
||||
#else
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/libs/xpcom18a4/Makefile.kmk.orig 2021-01-07 15:44:04 UTC
|
||||
--- src/libs/xpcom18a4/Makefile.kmk.orig 2025-08-13 19:56:45 UTC
|
||||
+++ src/libs/xpcom18a4/Makefile.kmk
|
||||
@@ -985,6 +985,8 @@ VBoxXPCOM_LIBS = \
|
||||
@@ -601,6 +601,8 @@ VBoxXPCOM_LIBS = \
|
||||
$(VBox-xpcom-proxy_1_TARGET) \
|
||||
$(VBox-xpcom-nspr_1_TARGET) \
|
||||
$(VBoxXPCOMGlue_s_1_TARGET)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c.orig 2025-01-21 20:03:59.000000000 +0700
|
||||
+++ src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c 2025-01-23 01:00:59.324267000 +0700
|
||||
--- src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c.orig 2025-08-13 19:56:47 UTC
|
||||
+++ src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c
|
||||
@@ -45,6 +45,10 @@
|
||||
#include <string.h>
|
||||
#include <pthread.h>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h.orig 2020-05-13 19:46:34 UTC
|
||||
--- src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h.orig 2025-08-13 19:56:51 UTC
|
||||
+++ src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h
|
||||
@@ -72,14 +72,6 @@
|
||||
@@ -74,14 +74,6 @@
|
||||
#define STATFS statfs
|
||||
#endif
|
||||
|
||||
|
|
|
@ -252,8 +252,10 @@ lib/virtualbox/VBoxDDU.so
|
|||
%%QT%%lib/virtualbox/UICommon.so
|
||||
%%QT%%lib/virtualbox/VBoxDbg.so
|
||||
%%QT%%lib/virtualbox/VBoxDragAndDropSvc.so
|
||||
lib/virtualbox/VBoxEFI32.fd
|
||||
lib/virtualbox/VBoxEFI64.fd
|
||||
lib/virtualbox/VBoxEFI-amd64.fd
|
||||
lib/virtualbox/VBoxEFI-arm32.fd
|
||||
lib/virtualbox/VBoxEFI-arm64.fd
|
||||
lib/virtualbox/VBoxEFI-x86.fd
|
||||
lib/virtualbox/VBoxExtPackHelperApp
|
||||
lib/virtualbox/VBoxGuestControlSvc.so
|
||||
lib/virtualbox/VBoxGuestPropSvc.so
|
||||
|
@ -276,6 +278,7 @@ lib/virtualbox/VBoxSharedClipboard.so
|
|||
lib/virtualbox/VBoxSharedFolders.so
|
||||
lib/virtualbox/VBoxTraceLogDecoders.so
|
||||
lib/virtualbox/VBoxVMM.so
|
||||
lib/virtualbox/VBoxVMMArm.so
|
||||
lib/virtualbox/VBoxVMMPreload.so
|
||||
lib/virtualbox/VBoxXPCOM.so
|
||||
lib/virtualbox/VBoxXPCOMC.so
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
PORTNAME= virtualbox-ose
|
||||
DISTVERSION= 7.1.12
|
||||
DISTVERSION= 7.2.0
|
||||
CATEGORIES= emulators
|
||||
MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/
|
||||
PKGNAMESUFFIX= -kmod-71
|
||||
PKGNAMESUFFIX= -kmod-72
|
||||
DISTNAME= VirtualBox-${DISTVERSION}
|
||||
|
||||
MAINTAINER= vbox@FreeBSD.org
|
||||
|
@ -35,11 +35,10 @@ CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}"
|
|||
|
||||
CONFLICTS_INSTALL= virtualbox-ose-kmod-legacy \
|
||||
virtualbox-ose-kmod \
|
||||
virtualbox-ose-kmod-70 \
|
||||
virtualbox-ose-kmod-72
|
||||
virtualbox-ose-kmod-70
|
||||
|
||||
PATCHDIR= ${.CURDIR}/../${PORTNAME}-71/files
|
||||
PORTSCOUT= limit:^7\.1\.
|
||||
PATCHDIR= ${.CURDIR}/../${PORTNAME}-72/files
|
||||
PORTSCOUT= limit:^7\.2\.
|
||||
SUB_FILES= pkg-message
|
||||
SUB_LIST= OPSYS=${OPSYS} OSREL=${OSREL}
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1752700000
|
||||
SHA256 (VirtualBox-7.1.12.tar.bz2) = 6f9618f39168898134975f51df7c2d6d5129c0aa82b6ae11cf47f920c70df276
|
||||
SIZE (VirtualBox-7.1.12.tar.bz2) = 214691769
|
||||
TIMESTAMP = 1755276527
|
||||
SHA256 (VirtualBox-7.2.0.tar.bz2) = 4f2804ff27848ea772aee6b637bb1e10ee74ec2da117c257413e2d2c4f670ba0
|
||||
SIZE (VirtualBox-7.2.0.tar.bz2) = 206755781
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
PORTREVISION= 0
|
||||
PKGNAMESUFFIX= -nox11-71
|
||||
PKGNAMESUFFIX= -nox11-72
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../virtualbox-ose-71
|
||||
MASTERDIR= ${.CURDIR}/../virtualbox-ose-72
|
||||
|
||||
OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS OGG PULSEAUDIO \
|
||||
QT6 VORBIS VPX X11
|
||||
|
|
Loading…
Reference in New Issue