1
0
forked from pool/virtualbox

Accepting request 811977 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/811977
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=199
This commit is contained in:
Dominique Leuenberger 2020-06-11 12:41:55 +00:00 committed by Git OBS Bridge
commit c28029396d
8 changed files with 153 additions and 109 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:46fef574f347a997f0fea79e088bf79ff8363832987b8994242df84b41650598
size 4895364
oid sha256:b17eae7e0261744398c9ef98f4ec21c0007093a4d14343cf9fc14a22dadcedd5
size 4896302

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9dab5cd74130e91e4a711c6cb39d2ba35c1f85b390abe3666f2e01bdbd057835
size 119433886

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c9b3410b0aa2f8ff0bf777fe5affdc18290d2a1c2ce68ec94289329495e08de2
size 119544634

View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.8/Config.kmk
Index: VirtualBox-6.1.10/Config.kmk
===================================================================
--- VirtualBox-6.1.8.orig/Config.kmk
+++ VirtualBox-6.1.8/Config.kmk
--- VirtualBox-6.1.10.orig/Config.kmk
+++ VirtualBox-6.1.10/Config.kmk
@@ -2684,8 +2684,16 @@ else
# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
# Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
@ -21,13 +21,13 @@ Index: VirtualBox-6.1.8/Config.kmk
endif
# YASM macros
Index: VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp
Index: VirtualBox-6.1.10/src/VBox/Debugger/DBGCDumpImage.cpp
===================================================================
--- VirtualBox-6.1.8.orig/src/VBox/Debugger/DBGCDumpImage.cpp
+++ VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp
@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(uint
--- VirtualBox-6.1.10.orig/src/VBox/Debugger/DBGCDumpImage.cpp
+++ VirtualBox-6.1.10/src/VBox/Debugger/DBGCDumpImage.cpp
@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(int3
{
switch (uType)
switch (iType)
{
- case CPU_TYPE_ANY: return "CPU_TYPE_ANY";
+ default: return "CPU_TYPE_ANY";

17
handle_gsoap_208103.patch Normal file
View File

@ -0,0 +1,17 @@
Index: VirtualBox-6.1.8/src/VBox/Main/webservice/vboxweb.cpp
===================================================================
--- VirtualBox-6.1.8.orig/src/VBox/Main/webservice/vboxweb.cpp
+++ VirtualBox-6.1.8/src/VBox/Main/webservice/vboxweb.cpp
@@ -944,7 +944,11 @@ static void doQueuesLoop()
if (rv == 0)
continue; // timeout, not necessary to bother gsoap
// r < 0, errno
- if (soap_socket_errno(soap.master) == SOAP_EINTR)
+#if GSOAP_VERSION >= 208103
+ if (soap_socket_errno == SOAP_EINTR)
+#else
+ if (soap_socket_errno(fd) == SOAP_EINTR)
+#endif
rv = 0; // re-check if we should terminate
break;
}

View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.2/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
Index: VirtualBox-6.1.10/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+++ VirtualBox-6.1.2/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
--- VirtualBox-6.1.10.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+++ VirtualBox-6.1.10/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
printf("VirtualBox DirectFB GUI built %s %s\n"
@ -11,10 +11,10 @@ Index: VirtualBox-6.1.2/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
for (;;)
{
Index: VirtualBox-6.1.2/src/VBox/Runtime/common/string/uniread.cpp
Index: VirtualBox-6.1.10/src/VBox/Runtime/common/string/uniread.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Runtime/common/string/uniread.cpp
+++ VirtualBox-6.1.2/src/VBox/Runtime/common/string/uniread.cpp
--- VirtualBox-6.1.10.orig/src/VBox/Runtime/common/string/uniread.cpp
+++ VirtualBox-6.1.10/src/VBox/Runtime/common/string/uniread.cpp
@@ -1036,7 +1036,7 @@ int PrintHeader(const char *argv0, const
" * IPRT - Unicode Tables.\n"
" *\n"
@ -24,10 +24,10 @@ Index: VirtualBox-6.1.2/src/VBox/Runtime/common/string/uniread.cpp
" */\n"
"\n"
"/*\n"
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
===================================================================
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@ -50,10 +50,10 @@ Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
===================================================================
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
@@ -44,16 +44,10 @@
#ifndef XP_MAC
#include "_pr_bld.h"
@ -73,10 +73,10 @@ Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
===================================================================
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@ -99,10 +99,10 @@ Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
===================================================================
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@ -125,10 +125,10 @@ Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-6.1.2/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
Index: VirtualBox-6.1.10/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+++ VirtualBox-6.1.2/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
--- VirtualBox-6.1.10.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+++ VirtualBox-6.1.10/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
@@ -308,7 +308,7 @@ static int vboxInitLogging(const char *p
#endif
"Log opened %s\n",
@ -138,10 +138,10 @@ Index: VirtualBox-6.1.2/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.c
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.2/src/VBox/Devices/PC/BIOS/bios.c
Index: VirtualBox-6.1.10/src/VBox/Devices/PC/BIOS/bios.c
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Devices/PC/BIOS/bios.c
+++ VirtualBox-6.1.2/src/VBox/Devices/PC/BIOS/bios.c
--- VirtualBox-6.1.10.orig/src/VBox/Devices/PC/BIOS/bios.c
+++ VirtualBox-6.1.10/src/VBox/Devices/PC/BIOS/bios.c
@@ -143,7 +143,7 @@ void set_mode(uint8_t mode);
#define BX_PCIBIOS 1
@ -151,10 +151,10 @@ Index: VirtualBox-6.1.2/src/VBox/Devices/PC/BIOS/bios.c
//--------------------------------------------------------------------------
// print_bios_banner
// displays a the bios version
Index: VirtualBox-6.1.2/src/VBox/Additions/common/VBoxService/VBoxService.cpp
Index: VirtualBox-6.1.10/src/VBox/Additions/common/VBoxService/VBoxService.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ VirtualBox-6.1.2/src/VBox/Additions/common/VBoxService/VBoxService.cpp
--- VirtualBox-6.1.10.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ VirtualBox-6.1.10/src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -243,7 +243,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
"VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n"
"Log opened %s\n",
@ -164,10 +164,10 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/common/VBoxService/VBoxService.cpp
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.2/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
Index: VirtualBox-6.1.10/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+++ VirtualBox-6.1.2/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
--- VirtualBox-6.1.10.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+++ VirtualBox-6.1.10/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
@@ -187,7 +187,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA
$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature
@ -177,10 +177,10 @@ Index: VirtualBox-6.1.2/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.2/src/VBox/ExtPacks/Skeleton/Makefile.kmk
Index: VirtualBox-6.1.10/src/VBox/ExtPacks/Skeleton/Makefile.kmk
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+++ VirtualBox-6.1.2/src/VBox/ExtPacks/Skeleton/Makefile.kmk
--- VirtualBox-6.1.10.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+++ VirtualBox-6.1.10/src/VBox/ExtPacks/Skeleton/Makefile.kmk
@@ -161,7 +161,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_SKELETON_MA
$(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.signature
@ -190,11 +190,11 @@ Index: VirtualBox-6.1.2/src/VBox/ExtPacks/Skeleton/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.2/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
Index: VirtualBox-6.1.10/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+++ VirtualBox-6.1.2/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
@@ -342,7 +342,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
--- VirtualBox-6.1.10.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+++ VirtualBox-6.1.10/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
@@ -346,7 +346,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature
# Tar it up.
@ -203,10 +203,10 @@ Index: VirtualBox-6.1.2/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.2/src/VBox/ExtPacks/VNC/Makefile.kmk
Index: VirtualBox-6.1.10/src/VBox/ExtPacks/VNC/Makefile.kmk
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
+++ VirtualBox-6.1.2/src/VBox/ExtPacks/VNC/Makefile.kmk
--- VirtualBox-6.1.10.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
+++ VirtualBox-6.1.10/src/VBox/ExtPacks/VNC/Makefile.kmk
@@ -154,7 +154,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED
$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature
@ -216,10 +216,10 @@ Index: VirtualBox-6.1.2/src/VBox/ExtPacks/VNC/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
Index: VirtualBox-6.1.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+++ VirtualBox-6.1.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
--- VirtualBox-6.1.10.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+++ VirtualBox-6.1.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
@@ -318,7 +318,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv
}
VGDrvCommonInitLoggers();
@ -229,10 +229,10 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
/*
* Check if the NT version is supported and initialize g_enmVGDrvNtVer.
Index: VirtualBox-6.1.2/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
Index: VirtualBox-6.1.10/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+++ VirtualBox-6.1.2/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
--- VirtualBox-6.1.10.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+++ VirtualBox-6.1.10/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
@@ -872,7 +872,7 @@ static DECLCALLBACK(void) vboxGreeterLog
"vbox-greeter %s r%s (verbosity: %d) %s (%s %s) release log\n"
"Log opened %s\n",
@ -242,10 +242,10 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cp
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.2/src/VBox/Additions/solaris/Mouse/vboxms.c
Index: VirtualBox-6.1.10/src/VBox/Additions/solaris/Mouse/vboxms.c
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
+++ VirtualBox-6.1.2/src/VBox/Additions/solaris/Mouse/vboxms.c
--- VirtualBox-6.1.10.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
+++ VirtualBox-6.1.10/src/VBox/Additions/solaris/Mouse/vboxms.c
@@ -256,7 +256,7 @@ static VBMSSTATE g_OpenNodeSt
int _init(void)
{
@ -255,10 +255,10 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/solaris/Mouse/vboxms.c
mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL);
/*
* Prevent module autounloading.
Index: VirtualBox-6.1.2/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
Index: VirtualBox-6.1.10/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+++ VirtualBox-6.1.2/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
--- VirtualBox-6.1.10.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+++ VirtualBox-6.1.10/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
@@ -247,10 +247,10 @@ Returns:
UTILITY_NAME,
UTILITY_MAJOR_VERSION,
@ -272,10 +272,10 @@ Index: VirtualBox-6.1.2/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo
Usage ();
return -1;
}
Index: VirtualBox-6.1.2/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
Index: VirtualBox-6.1.10/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ VirtualBox-6.1.2/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
--- VirtualBox-6.1.10.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ VirtualBox-6.1.10/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
@@ -118,7 +118,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI
static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject)
{
@ -294,10 +294,10 @@ Index: VirtualBox-6.1.2/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
NTSTATUS Status = vboxUsbRtGlobalsInit();
Assert(Status == STATUS_SUCCESS);
Index: VirtualBox-6.1.2/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
Index: VirtualBox-6.1.10/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ VirtualBox-6.1.2/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
--- VirtualBox-6.1.10.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ VirtualBox-6.1.10/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
@@ -1515,7 +1515,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB
RTLogDestinations(0, "debugger");
#endif
@ -307,10 +307,10 @@ Index: VirtualBox-6.1.2/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals));
Index: VirtualBox-6.1.2/src/VBox/Main/glue/VBoxLogRelCreate.cpp
Index: VirtualBox-6.1.10/src/VBox/Main/glue/VBoxLogRelCreate.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+++ VirtualBox-6.1.2/src/VBox/Main/glue/VBoxLogRelCreate.cpp
--- VirtualBox-6.1.10.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+++ VirtualBox-6.1.10/src/VBox/Main/glue/VBoxLogRelCreate.cpp
@@ -61,7 +61,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
#endif
"Log opened %s\n",
@ -320,10 +320,10 @@ Index: VirtualBox-6.1.2/src/VBox/Main/glue/VBoxLogRelCreate.cpp
pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE);
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
===================================================================
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
@@ -141,7 +141,7 @@ int main(int argc, char **argv)
{
PRIntn tab = 0;
@ -333,10 +333,10 @@ Index: VirtualBox-6.1.2/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
printf("Depend.c build time is %s %s\n", buildDate, buildTime);
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
@@ -458,7 +458,7 @@ int
main()
{
@ -346,10 +346,10 @@ Index: VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/prof
#ifdef TEST_STD_STRING
cout << "Testing std::string." << endl;
#else
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
@@ -425,7 +425,7 @@ int
main()
{
@ -359,10 +359,10 @@ Index: VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test
#if 0
{
Index: VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
===================================================================
--- VirtualBox-6.1.2.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+++ VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
@@ -102,7 +102,7 @@ class test_message
public:
test_message()
@ -372,10 +372,10 @@ Index: VirtualBox-6.1.2/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
}
~test_message()
Index: VirtualBox-6.1.2/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
Index: VirtualBox-6.1.10/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
+++ VirtualBox-6.1.2/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
--- VirtualBox-6.1.10.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
+++ VirtualBox-6.1.10/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
@@ -29,9 +29,8 @@
#include "build_id.h"
@ -387,11 +387,26 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id
#ifndef ElfW
#define ElfW(type) Elf_##type
Index: VirtualBox-6.1.2/src/VBox/Additions/x11/VBoxClient/main.cpp
Index: VirtualBox-6.1.10/src/libs/zlib-1.2.11/os400/make.sh
===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Additions/x11/VBoxClient/main.cpp
+++ VirtualBox-6.1.2/src/VBox/Additions/x11/VBoxClient/main.cpp
@@ -228,10 +228,10 @@ static DECLCALLBACK(void) vbClLogHeaderF
--- VirtualBox-6.1.10.orig/src/libs/zlib-1.2.11/os400/make.sh
+++ VirtualBox-6.1.10/src/libs/zlib-1.2.11/os400/make.sh
@@ -258,8 +258,8 @@ fi
# Create and compile the identification source file.
echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
-echo '#pragma comment(user, __DATE__)' >> os400.c
-echo '#pragma comment(user, __TIME__)' >> os400.c
+#echo '#pragma comment(user, __DATE__)' >> os400.c
+#echo '#pragma comment(user, __TIME__)' >> os400.c
echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
make_module OS400 os400.c
LINK= # No need to rebuild service program yet.
Index: VirtualBox-6.1.10/src/VBox/Additions/x11/VBoxClient/logging.cpp
===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
+++ VirtualBox-6.1.10/src/VBox/Additions/x11/VBoxClient/logging.cpp
@@ -162,10 +162,10 @@ static DECLCALLBACK(void) vbClLogHeaderF
case RTLOGPHASE_BEGIN:
{
pfnLog(pLoggerRelease,
@ -404,18 +419,3 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/x11/VBoxClient/main.cpp
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.2/src/libs/zlib-1.2.11/os400/make.sh
===================================================================
--- VirtualBox-6.1.2.orig/src/libs/zlib-1.2.11/os400/make.sh
+++ VirtualBox-6.1.2/src/libs/zlib-1.2.11/os400/make.sh
@@ -258,8 +258,8 @@ fi
# Create and compile the identification source file.
echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
-echo '#pragma comment(user, __DATE__)' >> os400.c
-echo '#pragma comment(user, __TIME__)' >> os400.c
+#echo '#pragma comment(user, __DATE__)' >> os400.c
+#echo '#pragma comment(user, __TIME__)' >> os400.c
echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
make_module OS400 os400.c
LINK= # No need to rebuild service program yet.

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Jun 5 20:42:04 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>
- Version bump to 6.1.10 (released June 05 2020 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
GUI: Fixed crash when using Qt on Xwayland sessions (bug #19583)
GUI: Fixed mouse pointer doesn't work properly in Windows guests when scaling is on (bug #19597)
VBoxManage: Fixed crash of 'VBoxManage internalcommands repairhd' when processing invalid input (bug #19579)
Settings: disable audio input and audio output by default for new VMs (bug #19527)
Guest Additions: Fixed resizing and multi monitor handling for Wayland guests. (bug #19496)
Guest Additions: Fixed VBoxClient error: The parent session seems to be non-X11. (bug #19590)
Linux host and guest: Linux kernel version 5.7 support. (bug #19516
File "fix_wayland_crash.patch" is removed - fixed upstream.
-------------------------------------------------------------------
Fri May 29 14:59:11 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>
- Gsoap 2.8.103 changes the way that "soap_socket_errno" is handled.
File "handle_gsoap_208103.patch" is added.
Handle case where Wayland chooses wrong video. File "fix_wayland_crash.patch" is added.
-------------------------------------------------------------------
Sat May 16 00:52:34 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>

View File

@ -47,7 +47,7 @@ python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile
%define _udevrulesdir /usr/lib/udev/rules.d
Name: virtualbox
# ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!!
Version: 6.1.8
Version: 6.1.10
Release: 0
Summary: VirtualBox is an Emulator
License: GPL-2.0-or-later
@ -154,6 +154,8 @@ Patch134: fixes_for_5.5.patch
Patch135: fix-missing-includes-with-qt-5.15.patch
# Fix builds with GCC10
Patch136: fixes_for_gcc10.patch
# Fix for chanes in GSOAP 2.8.103
Patch137: handle_gsoap_208103.patch
Patch999: virtualbox-fix-ui-background-color.patch
#
BuildRequires: LibVNCServer-devel
@ -458,6 +460,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
%patch134 -p1
%patch135 -p1
%patch136 -p1
%patch137 -p1
# make VB UI background colors look sane again
%patch999 -p1