Accepting request 1119375 from Virtualization
OBS-URL: https://build.opensuse.org/request/show/1119375 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=265
This commit is contained in:
commit
215d98c7ae
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c0b39f7d5cb1f94327c1d260a08668ec11427ca5be3536945de897a866c4c32b
|
||||
size 4591275
|
||||
oid sha256:fd75f42e3e30c009c5421773f1e05dd1b2705aea8609331e2732277acc0ae740
|
||||
size 4593947
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/x11/Installer/98vboxadd-xclient
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/x11/Installer/98vboxadd-xclient
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/x11/Installer/98vboxadd-xclient
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/x11/Installer/98vboxadd-xclient
|
||||
@@ -31,15 +31,9 @@ for i in $HOME/.vboxclient-*.pid; do
|
||||
test -w $i || rm -f $i
|
||||
done
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0609ba229ba6ca0cc893977d4c84f3fb6613aa5ed567532536e8f3c8407347d0
|
||||
size 153272438
|
3
VirtualBox-7.0.12-patched.tar.bz2
Normal file
3
VirtualBox-7.0.12-patched.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a0f06554083f301dd321a7080b326019b2613382e7e81d0db03a6872c33ec7e6
|
||||
size 153525074
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
@@ -28,6 +28,7 @@
|
||||
/* Qt includes: */
|
||||
#include <QApplication>
|
||||
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cp
|
||||
#include <QPaintEvent>
|
||||
#include <QStyle>
|
||||
#include <QVBoxLayout>
|
||||
Index: VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
|
||||
Index: VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
|
||||
+++ VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
|
||||
+++ VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
|
||||
@@ -47,7 +47,6 @@ class QIcon;
|
||||
class QLabel;
|
||||
class QMouseEvent;
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
|
||||
@@ -4537,9 +4537,11 @@ static int supdrvTscDeltaThreadWait(PSUP
|
||||
*/
|
||||
static void supdrvTscDeltaThreadStartMeasurement(PSUPDRVDEVEXT pDevExt, bool fForceAll)
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
|
||||
@@ -140,7 +140,7 @@ static struct vboxguest_module_info g_VB
|
||||
RTMemAllocExTag,
|
||||
RTMemContAlloc,
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/configure
|
||||
Index: VirtualBox-7.0.12/configure
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/configure
|
||||
+++ VirtualBox-7.0.10/configure
|
||||
--- VirtualBox-7.0.12.orig/configure
|
||||
+++ VirtualBox-7.0.12/configure
|
||||
@@ -1191,21 +1191,19 @@ check_sdl()
|
||||
fail
|
||||
fi
|
||||
@ -50,10 +50,10 @@ Index: VirtualBox-7.0.10/configure
|
||||
[ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf
|
||||
[ $WITH_X11 -eq 1 ] && check_x
|
||||
# TODO check for xcomposite-dev (X11/extensions/Xcomposite.h, additions only)
|
||||
Index: VirtualBox-7.0.10/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
@@ -51,7 +51,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
|
||||
PROGRAMS += VBoxSDL
|
||||
endif
|
||||
|
@ -1,236 +0,0 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
@@ -197,9 +197,13 @@ static struct fb_ops vboxfb_ops = {
|
||||
.owner = THIS_MODULE,
|
||||
.fb_check_var = drm_fb_helper_check_var,
|
||||
.fb_set_par = drm_fb_helper_set_par,
|
||||
+#if RTLNX_VER_MIN(6, 5, 0)
|
||||
+ FB_DEFAULT_SYS_OPS,
|
||||
+#else
|
||||
.fb_fillrect = drm_fb_helper_sys_fillrect,
|
||||
.fb_copyarea = drm_fb_helper_sys_copyarea,
|
||||
.fb_imageblit = drm_fb_helper_sys_imageblit,
|
||||
+#endif
|
||||
.fb_pan_display = drm_fb_helper_pan_display,
|
||||
.fb_blank = drm_fb_helper_blank,
|
||||
.fb_setcmap = drm_fb_helper_setcmap,
|
||||
Index: VirtualBox-7.0.10/include/iprt/cdefs.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/include/iprt/cdefs.h
|
||||
+++ VirtualBox-7.0.10/include/iprt/cdefs.h
|
||||
@@ -38,8 +38,9 @@
|
||||
#ifndef RT_WITHOUT_PRAGMA_ONCE
|
||||
# pragma once
|
||||
#endif
|
||||
-
|
||||
-
|
||||
+#if defined(DECLARE_FLEX_ARRAY)
|
||||
+# include <linux/version.h>
|
||||
+#endif
|
||||
/** @defgroup grp_rt_cdefs IPRT Common Definitions and Macros
|
||||
* @{
|
||||
*/
|
||||
@@ -2961,6 +2962,12 @@
|
||||
* @note GCC does not permit using this in nested structures, where as MSC
|
||||
* does. So, use RT_FLEXIBLE_ARRAY_NESTED for that.
|
||||
*
|
||||
+ * @note Linux kernels 6.5+ enforce field-spanning write operations
|
||||
+ * and require flexible arrays to end with 'array[]' rather than array[1].
|
||||
+ * This construct fails with unions, but VB does not have any such unions.
|
||||
+ * This header is used with both kernel- and user-mode code. In user-mode,
|
||||
+ * the old method works. If DECLARE_FLEX_ARRAY is defined, we are
|
||||
+ * building kernel-mode code and RT_FLEXIBLE_ARRAY is set to blank.
|
||||
* @sa RT_FLEXIBLE_ARRAY_NESTED, RT_FLEXIBLE_ARRAY_IN_UNION
|
||||
*/
|
||||
#if RT_MSC_PREREQ(RT_MSC_VER_VS2005) /** @todo Probably much much earlier. */ \
|
||||
@@ -2976,10 +2983,18 @@
|
||||
# if __STDC_VERSION__ >= 1999901L
|
||||
# define RT_FLEXIBLE_ARRAY
|
||||
# else
|
||||
-# define RT_FLEXIBLE_ARRAY 1
|
||||
+# if defined(DECLARE_FLEX_ARRAY)
|
||||
+# define RT_FLEXIBLE_ARRAY
|
||||
+# else
|
||||
+# define RT_FLEXIBLE_ARRAY 1
|
||||
+# endif
|
||||
# endif
|
||||
#else
|
||||
+# if defined(DECLARE_FLEX_ARRAY)
|
||||
+# define RT_FLEXIBLE_ARRAY
|
||||
+# else
|
||||
# define RT_FLEXIBLE_ARRAY 1
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
/** @def RT_FLEXIBLE_ARRAY_EXTENSION
|
||||
@@ -3008,7 +3023,9 @@
|
||||
#ifdef _MSC_VER
|
||||
# define RT_FLEXIBLE_ARRAY_NESTED RT_FLEXIBLE_ARRAY
|
||||
#else
|
||||
+# if !defined(DECLARE_FLEX_ARRAY)
|
||||
# define RT_FLEXIBLE_ARRAY_NESTED 1
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
/** @def RT_FLEXIBLE_ARRAY_IN_UNION
|
||||
@@ -3024,7 +3041,9 @@
|
||||
#ifdef _MSC_VER
|
||||
# define RT_FLEXIBLE_ARRAY_IN_UNION RT_FLEXIBLE_ARRAY
|
||||
#else
|
||||
-# define RT_FLEXIBLE_ARRAY_IN_UNION 1
|
||||
+# if !defined(DECLARE_FLEX_ARRAY)
|
||||
+# define RT_FLEXIBLE_ARRAY_IN_UNION 1
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
/** @def RT_FLEXIBLE_ARRAY_IN_NESTED_UNION
|
||||
@@ -3037,7 +3056,9 @@
|
||||
#ifdef _MSC_VER
|
||||
# define RT_FLEXIBLE_ARRAY_IN_NESTED_UNION RT_FLEXIBLE_ARRAY_NESTED
|
||||
#else
|
||||
-# define RT_FLEXIBLE_ARRAY_IN_NESTED_UNION 1
|
||||
+# if !defined(DECLARE_FLEX_ARRAY)
|
||||
+# define RT_FLEXIBLE_ARRAY_IN_NESTED_UNION 1
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
/** @def RT_UNION_NM
|
||||
Index: VirtualBox-7.0.10/include/VBox/VBoxGuest.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/include/VBox/VBoxGuest.h
|
||||
+++ VirtualBox-7.0.10/include/VBox/VBoxGuest.h
|
||||
@@ -458,8 +458,12 @@ typedef struct VBGLIOCLOG
|
||||
{
|
||||
/** The log message.
|
||||
* The length is determined from the input size and zero termination. */
|
||||
- char szMsg[RT_FLEXIBLE_ARRAY_IN_NESTED_UNION];
|
||||
- } In;
|
||||
+#if defined(DECLARE_FLEX_ARRAY)
|
||||
+ DECLARE_FLEX_ARRAY(char, szMsg);
|
||||
+#else
|
||||
+ char szMsg[RT_FLEXIBLE_ARRAY_IN_NESTED_UNION];
|
||||
+#endif
|
||||
+ } In;
|
||||
} u;
|
||||
} VBGLIOCLOG, RT_FAR *PVBGLIOCLOG;
|
||||
/** @} */
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/sharedfolders/regops.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/sharedfolders/regops.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/sharedfolders/regops.c
|
||||
@@ -1,4 +1,4 @@
|
||||
-/* $Id: regops.c $ */
|
||||
+/* $Id: regops.c 100799 2023-08-04 18:04:14Z vboxsync $ */
|
||||
/** @file
|
||||
* vboxsf - VBox Linux Shared Folders VFS, regular file inode and file operations.
|
||||
*/
|
||||
@@ -58,6 +58,14 @@
|
||||
# define SEEK_END 2
|
||||
#endif
|
||||
|
||||
+#if RTLNX_VER_MIN(6,4,0)
|
||||
+# define VBOX_ITER_IOV_ADDR(a_iter) iter_iov_addr(a_iter)
|
||||
+#elif RTLNX_VER_MIN(3,19,0)
|
||||
+# define VBOX_ITER_IOV_ADDR(a_iter) (a_iter->kvec->iov_base + a_iter->iov_offset)
|
||||
+#else
|
||||
+# define VBOX_ITER_IOV_ADDR(a_iter) (a_iter->iov->iov_base + a_iter->iov_offset)
|
||||
+#endif
|
||||
+
|
||||
#if RTLNX_VER_MAX(3,16,0)
|
||||
# define iter_is_iovec(a_pIter) ( !((a_pIter)->type & ITER_KVEC) )
|
||||
#elif RTLNX_VER_MAX(3,19,0)
|
||||
@@ -96,6 +104,14 @@
|
||||
# define VBSF_GET_ITER_IOV(_iter) iter->iov
|
||||
#endif
|
||||
|
||||
+/** @def VBOX_IOV_ITER_IS_KVEC
|
||||
+ * Test if iov iter type is ITER_KVEC. */
|
||||
+#if RTLNX_VER_MIN(4,20,0)
|
||||
+# define VBOX_IOV_ITER_IS_KVEC(a_iter) iov_iter_is_kvec(a_iter)
|
||||
+#else
|
||||
+# define VBOX_IOV_ITER_IS_KVEC(a_iter) (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)
|
||||
+#endif
|
||||
+
|
||||
|
||||
/*********************************************************************************************************************************
|
||||
* Structures and Typedefs *
|
||||
@@ -254,7 +270,11 @@ static ssize_t vbsf_iov_iter_get_pages(s
|
||||
size_t cPagesLocked;
|
||||
|
||||
down_read(&pTask->mm->mmap_sem);
|
||||
- cPagesLocked = get_user_pages(pTask, pTask->mm, uPtrFrom, cPages, iter->v_write, 1 /*force*/, papPages, NULL);
|
||||
+ cPagesLocked = get_user_pages(pTask, pTask->mm, uPtrFrom, cPages, iter->v_write, 1 /*force*/, papPages,
|
||||
+# if RTLNX_VER_MAX(6, 5, 0)
|
||||
+ NULL
|
||||
+# endif
|
||||
+ );
|
||||
up_read(&pTask->mm->mmap_sem);
|
||||
if (cPagesLocked == cPages) {
|
||||
size_t cbRet = (cPages << PAGE_SHIFT) - offPg0;
|
||||
@@ -367,8 +387,8 @@ static size_t copy_from_iter(uint8_t *pb
|
||||
if (cbThisCopy > cbToCopy)
|
||||
cbThisCopy = cbToCopy;
|
||||
if (pSrcIter->type & ITER_KVEC)
|
||||
- memcpy(pbDst, (void *)pSrcIter->iov->iov_base + pSrcIter->iov_offset, cbThisCopy);
|
||||
- else if (copy_from_user(pbDst, pSrcIter->iov->iov_base + pSrcIter->iov_offset, cbThisCopy) != 0)
|
||||
+ memcpy(pbDst, (void *)VBOX_ITER_IOV_ADDR(pSrcIter), cbThisCopy);
|
||||
+ else if (copy_from_user(pbDst, VBOX_ITER_IOV_ADDR(pSrcIter), cbThisCopy) != 0)
|
||||
break;
|
||||
pbDst += cbThisCopy;
|
||||
cbToCopy -= cbThisCopy;
|
||||
@@ -406,8 +426,8 @@ static size_t copy_to_iter(uint8_t const
|
||||
if (cbThisCopy > cbToCopy)
|
||||
cbThisCopy = cbToCopy;
|
||||
if (pDstIter->type & ITER_KVEC)
|
||||
- memcpy((void *)pDstIter->iov->iov_base + pDstIter->iov_offset, pbSrc, cbThisCopy);
|
||||
- else if (copy_to_user(pDstIter->iov->iov_base + pDstIter->iov_offset, pbSrc, cbThisCopy) != 0) {
|
||||
+ memcpy((void *)VBOX_ITER_IOV_ADDR(pDstIter), pbSrc, cbThisCopy);
|
||||
+ else if (copy_to_user(VBOX_ITER_IOV_ADDR(pDstIter), pbSrc, cbThisCopy) != 0) {
|
||||
break;
|
||||
}
|
||||
pbSrc += cbThisCopy;
|
||||
@@ -1462,12 +1482,16 @@ DECLINLINE(int) vbsf_lock_user_pages(uin
|
||||
ssize_t cPagesLocked = get_user_pages_unlocked(current, current->mm, uPtrFrom, cPages, papPages,
|
||||
fWrite ? FOLL_WRITE | FOLL_FORCE : FOLL_FORCE);
|
||||
# elif RTLNX_VER_MIN(4,0,0)
|
||||
- ssize_t cPagesLocked = get_user_pages_unlocked(current, current->mm, uPtrFrom, cPages, fWrite, 1 /*force*/, papPages);
|
||||
-# else
|
||||
+ ssize_t cPagesLocked = get_user_pages_unlocked(current, current->mm, uPtrFrom, cPages, fWrite, 1 /*force*/, papPages);
|
||||
+ # else
|
||||
struct task_struct *pTask = current;
|
||||
ssize_t cPagesLocked;
|
||||
down_read(&pTask->mm->mmap_sem);
|
||||
- cPagesLocked = get_user_pages(pTask, pTask->mm, uPtrFrom, cPages, fWrite, 1 /*force*/, papPages, NULL);
|
||||
+ cPagesLocked = get_user_pages(pTask, pTask->mm, uPtrFrom, cPages, fWrite, 1 /*force*/, papPages,
|
||||
+# if RTLNX_VER_MAX(6, 5, 0)
|
||||
+ NULL
|
||||
+#endif
|
||||
+ );
|
||||
up_read(&pTask->mm->mmap_sem);
|
||||
# endif
|
||||
*pfLockPgHack = false;
|
||||
@@ -2152,7 +2176,8 @@ static int vbsf_iter_lock_pages(struct i
|
||||
int rc = 0;
|
||||
|
||||
Assert(iov_iter_count(iter) + pStash->cb > 0);
|
||||
- if (!(VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
|
||||
+ if (!VBOX_IOV_ITER_IS_KVEC(iter))
|
||||
+ {
|
||||
/*
|
||||
* Do we have a stashed page?
|
||||
*/
|
||||
@@ -2309,11 +2334,7 @@ static int vbsf_iter_lock_pages(struct i
|
||||
cbSeg = iov_iter_single_seg_count(iter);
|
||||
}
|
||||
|
||||
-# if RTLNX_VER_MIN(3,19,0)
|
||||
- pbBuf = iter->kvec->iov_base + iter->iov_offset;
|
||||
-# else
|
||||
- pbBuf = iter->iov->iov_base + iter->iov_offset;
|
||||
-# endif
|
||||
+ pbBuf = VBOX_ITER_IOV_ADDR(iter);
|
||||
offStart = (uintptr_t)pbBuf & PAGE_OFFSET_MASK;
|
||||
if (!cPages)
|
||||
offPage0 = offStart;
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
|
||||
Index: VirtualBox-7.0.12/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
|
||||
+++ VirtualBox-7.0.10/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
|
||||
--- VirtualBox-7.0.12.orig/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
|
||||
+++ VirtualBox-7.0.12/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <intrin.h>
|
||||
#endif
|
||||
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.10/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
|
||||
#include "util_likely.h"
|
||||
#include "util_math.h"
|
||||
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
|
||||
@@ -66,6 +66,9 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CO
|
||||
OF THIS SOFTWARE.
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
||||
@@ -89,6 +89,21 @@
|
||||
#define VBOXNETFLT_OS_SPECFIC 1
|
||||
#include "../VBoxNetFltInternal.h"
|
||||
@ -24,10 +24,10 @@ Index: VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
|
||||
typedef struct VBOXNETFLTNOTIFIER {
|
||||
struct notifier_block Notifier;
|
||||
PVBOXNETFLTINS pThis;
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
@@ -39,6 +39,7 @@
|
||||
#include "vbox_drv.h"
|
||||
|
||||
@ -36,15 +36,6 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
#if RTLNX_VER_MIN(5,1,0) || RTLNX_RHEL_MAJ_PREREQ(8,1)
|
||||
# include <drm/drm_probe_helper.h>
|
||||
#endif
|
||||
@@ -52,7 +53,7 @@
|
||||
|
||||
/** Detect whether kernel mode setting is OFF. */
|
||||
#if defined(CONFIG_VGA_CONSOLE)
|
||||
-# if RTLNX_VER_MIN(5,17,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MIN(9,1)
|
||||
+# if RTLNX_VER_MIN(5,17,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MIN(9,1) || RTLNX_SUSE_MAJ_PREREQ(15,5)
|
||||
# define VBOX_VIDEO_NOMODESET() drm_firmware_drivers_only() && vbox_modeset == -1
|
||||
# elif RTLNX_VER_MIN(4,7,0)
|
||||
# define VBOX_VIDEO_NOMODESET() vgacon_text_force() && vbox_modeset == -1
|
||||
@@ -342,12 +343,15 @@ static void vbox_master_drop(struct drm_
|
||||
}
|
||||
|
||||
@ -64,19 +55,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
#else /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */
|
||||
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
|
||||
#endif /* < 5.4.0 */
|
||||
@@ -369,7 +373,7 @@ static struct drm_driver driver = {
|
||||
#endif
|
||||
|
||||
.fops = &vbox_fops,
|
||||
-#if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_RANGE(8,7, 8,99) && !RTLNX_RHEL_MAJ_PREREQ(9,1)
|
||||
+#if !RTLNX_SUSE_MAJ_PREREQ(15,5) && RTLNX_VER_MAX(5,19,0)
|
||||
.irq_handler = vbox_irq_handler,
|
||||
#endif
|
||||
.name = DRIVER_NAME,
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
@@ -663,8 +663,12 @@ static inline u64 vbox_bo_mmap_offset(st
|
||||
#elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0)
|
||||
return bo->bo.addr_space_offset;
|
||||
@ -90,10 +72,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
}
|
||||
|
||||
int
|
||||
Index: VirtualBox-7.0.10/include/iprt/cdefs.h
|
||||
Index: VirtualBox-7.0.12/include/iprt/cdefs.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/include/iprt/cdefs.h
|
||||
+++ VirtualBox-7.0.10/include/iprt/cdefs.h
|
||||
--- VirtualBox-7.0.12.orig/include/iprt/cdefs.h
|
||||
+++ VirtualBox-7.0.12/include/iprt/cdefs.h
|
||||
@@ -1399,14 +1399,15 @@
|
||||
#if RT_CLANG_PREREQ(4, 0) && RT_CPLUSPLUS_PREREQ(201100)
|
||||
# define RT_FALL_THROUGH() [[clang::fallthrough]]
|
||||
@ -113,10 +95,10 @@ Index: VirtualBox-7.0.10/include/iprt/cdefs.h
|
||||
|
||||
|
||||
/** @def RT_IPRT_FORMAT_ATTR
|
||||
Index: VirtualBox-7.0.10/kBuild/header.kmk
|
||||
Index: VirtualBox-7.0.12/kBuild/header.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/kBuild/header.kmk
|
||||
+++ VirtualBox-7.0.10/kBuild/header.kmk
|
||||
--- VirtualBox-7.0.12.orig/kBuild/header.kmk
|
||||
+++ VirtualBox-7.0.12/kBuild/header.kmk
|
||||
@@ -764,7 +764,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm
|
||||
RMDIR_INT := kmk_builtin_rmdir
|
||||
RMDIR := $(RMDIR_INT)
|
||||
@ -126,10 +108,10 @@ Index: VirtualBox-7.0.10/kBuild/header.kmk
|
||||
SED_INT := $(SED_EXT)
|
||||
SED := $(SED_EXT)
|
||||
|
||||
Index: VirtualBox-7.0.10/configure
|
||||
Index: VirtualBox-7.0.12/configure
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/configure
|
||||
+++ VirtualBox-7.0.10/configure
|
||||
--- VirtualBox-7.0.12.orig/configure
|
||||
+++ VirtualBox-7.0.12/configure
|
||||
@@ -2039,7 +2039,7 @@ check_kbuild()
|
||||
fi
|
||||
echo "export KBUILD_PATH KBUILD_DEVTOOLS PATH" >> $ENV
|
||||
@ -148,10 +130,10 @@ Index: VirtualBox-7.0.10/configure
|
||||
else
|
||||
fail
|
||||
fi
|
||||
Index: VirtualBox-7.0.10/tools/bin/backport-commit.sh
|
||||
Index: VirtualBox-7.0.12/tools/bin/backport-commit.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/tools/bin/backport-commit.sh
|
||||
+++ VirtualBox-7.0.10/tools/bin/backport-commit.sh
|
||||
--- VirtualBox-7.0.12.orig/tools/bin/backport-commit.sh
|
||||
+++ VirtualBox-7.0.12/tools/bin/backport-commit.sh
|
||||
@@ -29,7 +29,7 @@
|
||||
#
|
||||
# Determin script dir so we can source the common bits.
|
||||
@ -161,10 +143,10 @@ Index: VirtualBox-7.0.10/tools/bin/backport-commit.sh
|
||||
MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
|
||||
if test "${MY_SCRIPT_DIR}" = "$0"; then
|
||||
MY_SCRIPT_DIR=`pwd -L`
|
||||
Index: VirtualBox-7.0.10/tools/bin/backport-common.sh
|
||||
Index: VirtualBox-7.0.12/tools/bin/backport-common.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/tools/bin/backport-common.sh
|
||||
+++ VirtualBox-7.0.10/tools/bin/backport-common.sh
|
||||
--- VirtualBox-7.0.12.orig/tools/bin/backport-common.sh
|
||||
+++ VirtualBox-7.0.12/tools/bin/backport-common.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-# $Id: backport-common.sh $
|
||||
+ $Id: backport-common.sh $
|
||||
@ -180,10 +162,10 @@ Index: VirtualBox-7.0.10/tools/bin/backport-common.sh
|
||||
|
||||
#
|
||||
# Functions.
|
||||
Index: VirtualBox-7.0.10/tools/bin/backport-merge-and-commit.sh
|
||||
Index: VirtualBox-7.0.12/tools/bin/backport-merge-and-commit.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/tools/bin/backport-merge-and-commit.sh
|
||||
+++ VirtualBox-7.0.10/tools/bin/backport-merge-and-commit.sh
|
||||
--- VirtualBox-7.0.12.orig/tools/bin/backport-merge-and-commit.sh
|
||||
+++ VirtualBox-7.0.12/tools/bin/backport-merge-and-commit.sh
|
||||
@@ -29,7 +29,7 @@
|
||||
#
|
||||
# Determin script dir so we can invoke the two worker scripts.
|
||||
@ -193,10 +175,10 @@ Index: VirtualBox-7.0.10/tools/bin/backport-merge-and-commit.sh
|
||||
MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
|
||||
if test "${MY_SCRIPT_DIR}" = "$0"; then
|
||||
MY_SCRIPT_DIR=`pwd -L`
|
||||
Index: VirtualBox-7.0.10/tools/bin/backport-merge.sh
|
||||
Index: VirtualBox-7.0.12/tools/bin/backport-merge.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/tools/bin/backport-merge.sh
|
||||
+++ VirtualBox-7.0.10/tools/bin/backport-merge.sh
|
||||
--- VirtualBox-7.0.12.orig/tools/bin/backport-merge.sh
|
||||
+++ VirtualBox-7.0.12/tools/bin/backport-merge.sh
|
||||
@@ -29,7 +29,7 @@
|
||||
#
|
||||
# Determin script dir so we can source the common bits.
|
||||
@ -206,10 +188,10 @@ Index: VirtualBox-7.0.10/tools/bin/backport-merge.sh
|
||||
MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
|
||||
if test "${MY_SCRIPT_DIR}" = "$0"; then
|
||||
MY_SCRIPT_DIR=`pwd -L`
|
||||
Index: VirtualBox-7.0.10/src/VBox/Main/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/Main/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Main/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/Main/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Main/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/VBox/Main/Makefile.kmk
|
||||
@@ -264,7 +264,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE
|
||||
| $$(dir $$@)
|
||||
$(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
|
||||
@ -219,10 +201,10 @@ Index: VirtualBox-7.0.10/src/VBox/Main/Makefile.kmk
|
||||
$(QUIET)$(RM) -- $(VBOX_XIDL_FILE).ts-tmp
|
||||
$(QUIET)$(CP) --changed -fv -- $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE)
|
||||
|
||||
Index: VirtualBox-7.0.10/src/VBox/Runtime/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/Runtime/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Runtime/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/Runtime/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Runtime/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/VBox/Runtime/Makefile.kmk
|
||||
@@ -4421,6 +4421,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V
|
||||
#
|
||||
# Generate the status code data.
|
||||
@ -231,10 +213,10 @@ Index: VirtualBox-7.0.10/src/VBox/Runtime/Makefile.kmk
|
||||
$(IPRT_OUT_DIR)/errmsgdata.h: \
|
||||
$(VBOX_PATH_RUNTIME_SRC)/common/err/errmsg.sed \
|
||||
$(PATH_ROOT)/include/iprt/err.h \
|
||||
Index: VirtualBox-7.0.10/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
|
||||
Index: VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
|
||||
+++ VirtualBox-7.0.10/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
|
||||
+++ VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
|
||||
@@ -147,9 +147,9 @@
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/completion.h>
|
||||
@ -247,10 +229,10 @@ Index: VirtualBox-7.0.10/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
|
||||
#if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38)
|
||||
# include <linux/smp_lock.h>
|
||||
#endif
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyXPCOM.h
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyXPCOM.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyXPCOM.h
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyXPCOM.h
|
||||
@@ -191,7 +191,7 @@ extern "C" PyAPI_FUNC(const char *) PyUn
|
||||
# endif
|
||||
|
||||
@ -260,10 +242,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyXPCOM.h
|
||||
|
||||
DECLINLINE(int) PyRun_SimpleString(const char *pszCode)
|
||||
{
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
@@ -121,7 +121,7 @@ void DoLogMessage(const char *methodName
|
||||
#if PY_MAJOR_VERSION <= 2
|
||||
c += PyString_AsString(repr);
|
||||
@ -304,10 +286,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
#endif
|
||||
result = (char *)PyMem_Malloc(strlen(tempResult)+1);
|
||||
if (result==NULL)
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
@@ -117,7 +117,7 @@ PyG_Base::PyG_Base(PyObject *instance, c
|
||||
#if PY_MAJOR_VERSION <= 2
|
||||
szRepr = PyString_AsString(r);
|
||||
@ -317,10 +299,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
#endif
|
||||
if (szRepr==NULL) szRepr = "";
|
||||
int reprOffset = *szRepr=='<' ? 1 : 0;
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyIID.cpp
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyIID.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/PyIID.cpp
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyIID.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/PyIID.cpp
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyIID.cpp
|
||||
@@ -137,7 +137,7 @@ Py_nsIID::IIDFromPyObject(PyObject *ob,
|
||||
ok = iid.Parse(PyString_AsString(ob));
|
||||
#else
|
||||
@ -330,10 +312,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyIID.cpp
|
||||
#endif
|
||||
if (!ok) {
|
||||
PyXPCOM_BuildPyException(NS_ERROR_ILLEGAL_VALUE);
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/VariantUtils.cpp
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/VariantUtils.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/VariantUtils.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/VariantUtils.cpp
|
||||
@@ -141,7 +141,7 @@ PyObject *PyObject_FromNSString( const n
|
||||
#if PY_MAJOR_VERSION <= 2
|
||||
char* dest = (char *)PyString_AS_STRING(ret);
|
||||
@ -379,10 +361,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/VariantUtils.cpp
|
||||
BREAK_FALSE;
|
||||
|
||||
const char *sz = PyBytes_AS_STRING(val_use);
|
||||
Index: VirtualBox-7.0.10/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
|
||||
@@ -710,7 +710,7 @@ static const char *keyModToStr(unsigned
|
||||
RT_CASE_RET_STR(KMOD_NUM);
|
||||
RT_CASE_RET_STR(KMOD_CAPS);
|
||||
@ -392,10 +374,10 @@ Index: VirtualBox-7.0.10/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
|
||||
default:
|
||||
break;
|
||||
}
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
@@ -39,6 +39,7 @@
|
||||
# pragma once
|
||||
#endif
|
||||
@ -404,67 +386,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
#include <linux/version.h>
|
||||
|
||||
/* iprt/linux/version.h copy - start */
|
||||
@@ -166,9 +167,9 @@
|
||||
# include <drm/drm_device.h>
|
||||
# include <drm/drm_ioctl.h>
|
||||
# include <drm/drm_fourcc.h>
|
||||
-# if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_RANGE(8,7, 8,99) && !RTLNX_RHEL_MAJ_PREREQ(9,1)
|
||||
-# include <drm/drm_irq.h>
|
||||
-# endif
|
||||
+//# if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_RANGE(8,7, 8,99) && !RTLNX_RHEL_MAJ_PREREQ(9,1)
|
||||
+//# include <drm/drm_irq.h>
|
||||
+//# endif
|
||||
# include <drm/drm_vblank.h>
|
||||
#else /* < 5.5.0 || RHEL < 8.3 || SLES < 15-SP3 */
|
||||
# include <drm/drmP.h>
|
||||
@@ -198,15 +199,15 @@
|
||||
# include <drm/ttm/ttm_resource.h>
|
||||
#endif
|
||||
|
||||
-#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2)
|
||||
+#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2)
|
||||
# include <drm/drm_framebuffer.h>
|
||||
-#endif
|
||||
|
||||
#include "vboxvideo_guest.h"
|
||||
#include "vboxvideo_vbe.h"
|
||||
#include "hgsmi_ch_setup.h"
|
||||
|
||||
#include "product-generated.h"
|
||||
+#endif
|
||||
|
||||
#if RTLNX_VER_MAX(4,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,5)
|
||||
static inline void drm_gem_object_put_unlocked(struct drm_gem_object *obj)
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_irq.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_irq.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_irq.c
|
||||
@@ -205,21 +205,11 @@ int vbox_irq_init(struct vbox_private *v
|
||||
{
|
||||
INIT_WORK(&vbox->hotplug_work, vbox_hotplug_worker);
|
||||
vbox_update_mode_hints(vbox);
|
||||
-#if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,1)
|
||||
return request_irq(VBOX_DRM_TO_PCI_DEV(vbox->dev)->irq, vbox_irq_handler, IRQF_SHARED, vbox->dev->driver->name, vbox->dev);
|
||||
-#elif RTLNX_VER_MIN(3,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,1)
|
||||
- return drm_irq_install(vbox->dev, VBOX_DRM_TO_PCI_DEV(vbox->dev)->irq);
|
||||
-#else
|
||||
- return drm_irq_install(vbox->dev);
|
||||
-#endif
|
||||
}
|
||||
|
||||
void vbox_irq_fini(struct vbox_private *vbox)
|
||||
{
|
||||
-#if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,1)
|
||||
free_irq(VBOX_DRM_TO_PCI_DEV(vbox->dev)->irq, vbox->dev);
|
||||
-#else
|
||||
- drm_irq_uninstall(vbox->dev);
|
||||
-#endif
|
||||
flush_work(&vbox->hotplug_work);
|
||||
}
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
@@ -38,6 +38,10 @@
|
||||
# include <drm/ttm/ttm_tt.h>
|
||||
#endif
|
||||
@ -476,15 +401,6 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_MAJ_PREREQ(8,5)
|
||||
# include <drm/drm_gem.h>
|
||||
# include <drm/drm_gem_ttm_helper.h>
|
||||
@@ -321,7 +325,7 @@ static struct ttm_tt *vbox_ttm_tt_create
|
||||
#if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
|
||||
tt->func = &vbox_tt_backend_func;
|
||||
#endif
|
||||
-#if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2)
|
||||
+#if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2) || defined(OPENSUSE_155)
|
||||
if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined, 0)) {
|
||||
#elif RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99)
|
||||
if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) {
|
||||
@@ -330,11 +334,9 @@ static struct ttm_tt *vbox_ttm_tt_create
|
||||
#else
|
||||
if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
|
||||
@ -497,19 +413,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
return tt;
|
||||
}
|
||||
|
||||
@@ -628,7 +630,7 @@ int vbox_bo_create(struct drm_device *de
|
||||
drm_vma_node_reset(&vboxbo->bo.base.vma_node);
|
||||
#endif
|
||||
|
||||
-#if RTLNX_VER_MIN(6,1,0)
|
||||
+#if RTLNX_VER_MIN(6,1,0) || defined(OPENSUSE_155)
|
||||
ret = ttm_bo_init_validate(&vbox->ttm.bdev, &vboxbo->bo,
|
||||
#else
|
||||
ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
@@ -47,6 +47,7 @@
|
||||
#include <drm/drm_crtc.h>
|
||||
#include <drm/drm_fb_helper.h>
|
||||
@ -518,33 +425,22 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
|
||||
#include <VBoxVideo.h>
|
||||
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
@@ -39,10 +39,8 @@
|
||||
#include "vbox_drv.h"
|
||||
#include <linux/export.h>
|
||||
#include <drm/drm_crtc_helper.h>
|
||||
-#if RTLNX_VER_MIN(6,3,0)
|
||||
# include <drm/drm_modeset_helper_vtables.h>
|
||||
# include <drm/drm_modeset_helper.h>
|
||||
-#endif
|
||||
#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
|
||||
# include <drm/drm_plane_helper.h>
|
||||
#endif
|
||||
@@ -53,6 +51,7 @@
|
||||
#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2)
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
@@ -53,6 +53,7 @@
|
||||
#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2) || RTLNX_SUSE_MAJ_PREREQ(15,5)
|
||||
# include <drm/drm_edid.h>
|
||||
#endif
|
||||
+#include <drm/drm_edid.h>
|
||||
|
||||
#include "VBoxVideo.h"
|
||||
|
||||
Index: VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
|
||||
@@ -77,7 +77,7 @@
|
||||
#define VBOXNETADP_FROM_IFACE(iface) ((PVBOXNETADP) ifnet_softc(iface))
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/HostDrivers/linux/Makefile
|
||||
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/linux/Makefile
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/linux/Makefile
|
||||
+++ VirtualBox-7.0.10/src/VBox/HostDrivers/linux/Makefile
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/linux/Makefile
|
||||
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/linux/Makefile
|
||||
@@ -43,11 +43,8 @@ obj-m = vboxdrv/
|
||||
obj-m += vboxnetflt/
|
||||
endif
|
||||
@ -140,10 +140,10 @@ Index: VirtualBox-7.0.10/src/VBox/HostDrivers/linux/Makefile
|
||||
if test -f $$module.ko; then \
|
||||
echo "Installing $$module module"; \
|
||||
$(SUDO) /sbin/insmod $$module.ko; \
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/Makefile
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/Makefile
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/Makefile
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/Makefile
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/Makefile
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/Makefile
|
||||
@@ -34,6 +34,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/
|
||||
else # ! KERNELRELEASE
|
||||
|
||||
@ -184,11 +184,11 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/Makefile
|
||||
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \
|
||||
fi
|
||||
|
||||
Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
Index: VirtualBox-7.0.12/include/iprt/x86.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/include/iprt/x86.h
|
||||
+++ VirtualBox-7.0.10/include/iprt/x86.h
|
||||
@@ -894,37 +894,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
|
||||
--- VirtualBox-7.0.12.orig/include/iprt/x86.h
|
||||
+++ VirtualBox-7.0.12/include/iprt/x86.h
|
||||
@@ -895,37 +895,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
|
||||
* reserved flags.
|
||||
* @{ */
|
||||
/** Bit 0 - PE - Protection Enabled */
|
||||
@ -248,7 +248,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
#define X86_CR0_PAGING RT_BIT_32(31)
|
||||
#define X86_CR0_BIT_PG 31 /**< Bit number of X86_CR0_PG */
|
||||
/** @} */
|
||||
@@ -933,9 +955,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
|
||||
@@ -934,9 +956,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
|
||||
/** @name CR3
|
||||
* @{ */
|
||||
/** Bit 3 - PWT - Page-level Writes Transparent. */
|
||||
@ -262,7 +262,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
/** Bits 12-31 - - Page directory page number. */
|
||||
#define X86_CR3_PAGE_MASK (0xfffff000)
|
||||
/** Bits 5-31 - - PAE Page directory page number. */
|
||||
@@ -954,46 +980,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
|
||||
@@ -955,46 +981,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
|
||||
/** @name CR4
|
||||
* @{ */
|
||||
/** Bit 0 - VME - Virtual-8086 Mode Extensions. */
|
||||
@ -347,7 +347,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
/** Bit 23 - CET - Control-flow Enhancement Technology enabled. */
|
||||
#define X86_CR4_CET RT_BIT_32(23)
|
||||
/** @} */
|
||||
@@ -1224,12 +1288,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1225,12 +1289,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
/** Machine check type register (P5). */
|
||||
#define MSR_P5_MC_TYPE UINT32_C(0x00000001)
|
||||
/** Time Stamp Counter. */
|
||||
@ -364,7 +364,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
|
||||
#ifndef MSR_IA32_APICBASE /* qemu cpu.h kludge */
|
||||
# define MSR_IA32_APICBASE 0x1b
|
||||
@@ -1255,7 +1323,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1256,7 +1324,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
#define MSR_CORE_THREAD_COUNT 0x35
|
||||
|
||||
/** CPU Feature control. */
|
||||
@ -374,7 +374,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
/** Feature control - Lock MSR from writes (R/W0). */
|
||||
#define MSR_IA32_FEATURE_CONTROL_LOCK RT_BIT_64(0)
|
||||
/** Feature control - Enable VMX inside SMX operation (R/WL). */
|
||||
@@ -1280,11 +1350,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1281,11 +1351,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
#define MSR_IA32_FEATURE_CONTROL_LMCE RT_BIT_64(20)
|
||||
|
||||
/** Per-processor TSC adjust MSR. */
|
||||
@ -390,7 +390,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
/** IBRS - Indirect branch restricted speculation. */
|
||||
#define MSR_IA32_SPEC_CTRL_F_IBRS RT_BIT_32(0)
|
||||
/** STIBP - Single thread indirect branch predictors. */
|
||||
@@ -1294,7 +1368,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1295,7 +1369,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
|
||||
/** Prediction command register.
|
||||
* Write only, logical processor scope, no state since write only. */
|
||||
@ -400,7 +400,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
/** IBPB - Indirect branch prediction barrie when written as 1. */
|
||||
#define MSR_IA32_PRED_CMD_F_IBPB RT_BIT_32(0)
|
||||
|
||||
@@ -1305,7 +1381,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1306,7 +1382,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
#define MSR_IA32_BIOS_SIGN_ID 0x8B
|
||||
|
||||
/** SMM monitor control. */
|
||||
@ -410,7 +410,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
/** SMM control - Valid. */
|
||||
#define MSR_IA32_SMM_MONITOR_VALID RT_BIT_64(0)
|
||||
/** SMM control - VMXOFF unblocks SMI. */
|
||||
@@ -1314,10 +1392,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1315,10 +1393,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
#define MSR_IA32_SMM_MONITOR_MSGEG_PHYSADDR(a) (((a) >> 12) & UINT64_C(0xfffff))
|
||||
|
||||
/** SMBASE - Base address of SMRANGE image (Read-only, SMM only). */
|
||||
@ -425,7 +425,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
/** General performance counter no. 1. */
|
||||
#define MSR_IA32_PMC1 0xC2
|
||||
/** General performance counter no. 2. */
|
||||
@@ -1340,18 +1422,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1341,18 +1423,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
#define MSR_IA32_FSB_CLOCK_STS 0xCD
|
||||
|
||||
/** C-State configuration control. Intel specific: Nehalem, Sandy Bridge. */
|
||||
@ -452,7 +452,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
/** CPU is no subject to meltdown problems. */
|
||||
#define MSR_IA32_ARCH_CAP_F_RDCL_NO RT_BIT_32(0)
|
||||
/** CPU has better IBRS and you can leave it on all the time. */
|
||||
@@ -1365,7 +1455,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1366,7 +1456,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
#define MSR_IA32_ARCH_CAP_F_MDS_NO RT_BIT_32(4)
|
||||
|
||||
/** Flush command register. */
|
||||
@ -462,7 +462,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
/** Flush the level 1 data cache when this bit is written. */
|
||||
#define MSR_IA32_FLUSH_CMD_F_L1D RT_BIT_32(0)
|
||||
|
||||
@@ -1386,14 +1478,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1387,14 +1479,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
#endif
|
||||
|
||||
/** Machine Check Global Capabilities Register. */
|
||||
@ -483,7 +483,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
/** Default PAT MSR value on processor powerup / reset (see Intel spec. 11.12.4
|
||||
* "Programming the PAT", AMD spec. 7.8.2 "PAT Indexing") */
|
||||
#define MSR_IA32_CR_PAT_INIT_VAL UINT64_C(0x0007040600070406)
|
||||
@@ -1412,36 +1510,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1413,36 +1511,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
#define MSR_FLEX_RATIO 0x194
|
||||
/** Performance state value and starting with Intel core more.
|
||||
* Apple uses the >=core features to determine TSC granularity on older CPUs. */
|
||||
@ -542,7 +542,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
|
||||
/** Trace/Profile Resource Control (R/W) */
|
||||
#define MSR_IA32_DEBUGCTL UINT32_C(0x000001d9)
|
||||
@@ -1622,7 +1742,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1623,7 +1743,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
/** @} */
|
||||
|
||||
/** Intel TSX (Transactional Synchronization Extensions) control MSR. */
|
||||
@ -552,7 +552,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
|
||||
/** Variable range MTRRs.
|
||||
* @{ */
|
||||
@@ -1672,93 +1794,171 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1673,93 +1795,171 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
#define MSR_IA32_PERF_GLOBAL_OVF_CTRL 0x390
|
||||
|
||||
/** Precise Event Based sampling (Intel only). */
|
||||
@ -724,7 +724,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
|
||||
/** X2APIC MSR range start. */
|
||||
#define MSR_IA32_X2APIC_START 0x800
|
||||
@@ -1893,23 +2093,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1894,23 +2094,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
/** The mask which give the SYSCALL EIP. */
|
||||
#define MSR_K6_STAR_SYSCALL_EIP_MASK UINT32_C(0xffffffff)
|
||||
/** K6 WHCR - Write Handling Control Register. */
|
||||
@ -772,7 +772,7 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
|
||||
/** K8 LSTAR - Long mode SYSCALL target (RIP). */
|
||||
#define MSR_K8_LSTAR UINT32_C(0xc0000082)
|
||||
@@ -1925,14 +2149,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
@@ -1926,14 +2150,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
|
||||
#define MSR_K8_KERNEL_GS_BASE UINT32_C(0xc0000102)
|
||||
/** K8 TSC_AUX - Used with RDTSCP. */
|
||||
#define MSR_K8_TSC_AUX UINT32_C(0xc0000103)
|
||||
@ -793,10 +793,10 @@ Index: VirtualBox-7.0.10/include/iprt/x86.h
|
||||
|
||||
/** SMM MSRs. */
|
||||
#define MSR_K7_SMBASE UINT32_C(0xc0010111)
|
||||
Index: VirtualBox-7.0.10/include/VBox/vmm/hm_vmx.h
|
||||
Index: VirtualBox-7.0.12/include/VBox/vmm/hm_vmx.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/include/VBox/vmm/hm_vmx.h
|
||||
+++ VirtualBox-7.0.10/include/VBox/vmm/hm_vmx.h
|
||||
--- VirtualBox-7.0.12.orig/include/VBox/vmm/hm_vmx.h
|
||||
+++ VirtualBox-7.0.12/include/VBox/vmm/hm_vmx.h
|
||||
@@ -1633,7 +1633,9 @@ AssertCompileSize(VMXABORT, 4);
|
||||
/** VMCS (and related regions) memory type - Uncacheable. */
|
||||
#define VMX_BASIC_MEM_TYPE_UC 0
|
||||
@ -807,10 +807,10 @@ Index: VirtualBox-7.0.10/include/VBox/vmm/hm_vmx.h
|
||||
/** Width of physical addresses used for VMCS and associated memory regions
|
||||
* (1=32-bit, 0=processor's physical address width). */
|
||||
#define VMX_BASIC_PHYSADDR_WIDTH_32BIT RT_BIT_64(48)
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
@@ -87,6 +87,12 @@
|
||||
#else
|
||||
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
|
||||
|
@ -6,10 +6,10 @@ to "#!/usr/bin/python3".
|
||||
|
||||
Larry Finger
|
||||
|
||||
Index: VirtualBox-7.0.10/src/VBox/Frontends/VBoxShell/vboxshell.py
|
||||
Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxShell/vboxshell.py
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
|
||||
+++ VirtualBox-7.0.10/src/VBox/Frontends/VBoxShell/vboxshell.py
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
|
||||
+++ VirtualBox-7.0.12/src/VBox/Frontends/VBoxShell/vboxshell.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/include/VBox/VBoxGL2D.h
|
||||
Index: VirtualBox-7.0.12/include/VBox/VBoxGL2D.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/include/VBox/VBoxGL2D.h
|
||||
+++ VirtualBox-7.0.10/include/VBox/VBoxGL2D.h
|
||||
--- VirtualBox-7.0.12.orig/include/VBox/VBoxGL2D.h
|
||||
+++ VirtualBox-7.0.12/include/VBox/VBoxGL2D.h
|
||||
@@ -123,7 +123,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN
|
||||
/* GL_ARB_pixel_buffer_object*/
|
||||
#ifndef Q_WS_MAC
|
||||
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.10/include/VBox/VBoxGL2D.h
|
||||
#endif
|
||||
|
||||
#ifndef GL_READ_ONLY
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
|
||||
@@ -466,7 +466,12 @@ GLAPI void APIENTRY glBlendEquation (GLe
|
||||
|
||||
#ifndef GL_VERSION_1_5
|
||||
@ -28,10 +28,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext
|
||||
typedef khronos_intptr_t GLintptr;
|
||||
#define GL_BUFFER_SIZE 0x8764
|
||||
#define GL_BUFFER_USAGE 0x8765
|
||||
Index: VirtualBox-7.0.10/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
|
||||
Index: VirtualBox-7.0.12/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
|
||||
+++ VirtualBox-7.0.10/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
|
||||
+++ VirtualBox-7.0.12/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
|
||||
@@ -4680,6 +4680,14 @@ GLAPI void APIENTRY glWeightuivARB (GLin
|
||||
GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer);
|
||||
GLAPI void APIENTRY glVertexBlendARB (GLint count);
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
@@ -362,7 +362,9 @@ static struct drm_driver driver = {
|
||||
.master_drop = vbox_master_drop,
|
||||
#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
|
||||
@ -12,10 +12,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
# endif
|
||||
#endif
|
||||
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
@@ -626,11 +626,13 @@ int vbox_dumb_destroy(struct drm_file *f
|
||||
#endif
|
||||
|
||||
@ -30,10 +30,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
|
||||
void vbox_gem_free_object(struct drm_gem_object *obj)
|
||||
{
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
@@ -302,7 +302,7 @@ static struct ttm_backend_func vbox_tt_b
|
||||
};
|
||||
#endif
|
||||
@ -52,7 +52,7 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
|
||||
{
|
||||
return ttm_pool_populate(ttm);
|
||||
@@ -393,7 +393,7 @@ static struct ttm_bo_driver vbox_bo_driv
|
||||
@@ -406,7 +406,7 @@ static struct ttm_bo_driver vbox_bo_driv
|
||||
.io_mem_reserve = &vbox_ttm_io_mem_reserve,
|
||||
.io_mem_free = &vbox_ttm_io_mem_free,
|
||||
#if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
|
||||
@ -61,7 +61,7 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
.io_mem_pfn = ttm_bo_default_io_mem_pfn,
|
||||
# endif
|
||||
#endif
|
||||
@@ -634,7 +634,7 @@ int vbox_bo_create(struct drm_device *de
|
||||
@@ -651,7 +651,7 @@ int vbox_bo_create(struct drm_device *de
|
||||
ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
|
||||
#endif /* < 6.1.0 */
|
||||
ttm_bo_type_device, &vboxbo->placement,
|
||||
@ -70,7 +70,7 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
align >> PAGE_SHIFT, false, NULL, acc_size,
|
||||
#elif RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_RANGE(8,6, 8,99) /* < 5.13.0, < RHEL(8.6, 8.99) */
|
||||
align >> PAGE_SHIFT, false, acc_size,
|
||||
@@ -676,7 +676,7 @@ static inline u64 vbox_bo_gpu_offset(str
|
||||
@@ -693,7 +693,7 @@ static inline u64 vbox_bo_gpu_offset(str
|
||||
|
||||
int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr)
|
||||
{
|
||||
@ -79,7 +79,7 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
struct ttm_operation_ctx ctx = { false, false };
|
||||
#endif
|
||||
int ret;
|
||||
@@ -699,7 +699,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
|
||||
@@ -716,7 +716,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
|
||||
PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
|
||||
#endif
|
||||
|
||||
@ -88,7 +88,7 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
|
||||
#else
|
||||
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
|
||||
@@ -721,7 +721,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
|
||||
@@ -738,7 +738,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
|
||||
|
||||
int vbox_bo_unpin(struct vbox_bo *bo)
|
||||
{
|
||||
@ -97,7 +97,7 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
# if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
|
||||
struct ttm_operation_ctx ctx = { false, false };
|
||||
# endif
|
||||
@@ -744,7 +744,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
|
||||
@@ -761,7 +761,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
|
||||
PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
|
||||
#endif
|
||||
|
||||
@ -106,7 +106,7 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
|
||||
#elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
|
||||
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
|
||||
@@ -767,7 +767,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
|
||||
@@ -784,7 +784,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
|
||||
*/
|
||||
int vbox_bo_push_sysram(struct vbox_bo *bo)
|
||||
{
|
||||
@ -115,7 +115,7 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
struct ttm_operation_ctx ctx = { false, false };
|
||||
# endif
|
||||
int i, ret;
|
||||
@@ -788,7 +788,7 @@ int vbox_bo_push_sysram(struct vbox_bo *
|
||||
@@ -805,7 +805,7 @@ int vbox_bo_push_sysram(struct vbox_bo *
|
||||
for (i = 0; i < bo->placement.num_placement; i++)
|
||||
PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
|
||||
|
||||
@ -124,10 +124,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c
|
||||
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
|
||||
# else
|
||||
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
@@ -87,6 +87,9 @@
|
||||
#else
|
||||
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
|
||||
@ -138,11 +138,11 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h
|
||||
|
||||
/** @def RTLNX_RHEL_RANGE
|
||||
* Check that it's a RedHat kernel in the given version range.
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
@@ -556,7 +556,8 @@ static void vbox_set_edid(struct drm_con
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
@@ -557,7 +557,8 @@ static void vbox_set_edid(struct drm_con
|
||||
for (i = 0; i < EDID_SIZE - 1; ++i)
|
||||
sum += edid[i];
|
||||
edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
|
||||
@ -152,7 +152,7 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||
drm_connector_update_edid_property(connector, (struct edid *)edid);
|
||||
#else
|
||||
drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
|
||||
@@ -731,7 +732,7 @@ static int vbox_connector_init(struct dr
|
||||
@@ -732,7 +733,7 @@ static int vbox_connector_init(struct dr
|
||||
drm_connector_register(connector);
|
||||
#endif
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/configure
|
||||
Index: VirtualBox-7.0.12/configure
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/configure
|
||||
+++ VirtualBox-7.0.10/configure
|
||||
--- VirtualBox-7.0.12.orig/configure
|
||||
+++ VirtualBox-7.0.12/configure
|
||||
@@ -475,8 +475,13 @@ check_gcc()
|
||||
log_failure "cannot execute '$CXX -dumpversion'"
|
||||
fail really
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Main/webservice/vboxweb.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Main/webservice/vboxweb.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Main/webservice/vboxweb.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Main/webservice/vboxweb.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Main/webservice/vboxweb.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Main/webservice/vboxweb.cpp
|
||||
@@ -955,9 +955,9 @@ static void doQueuesLoop()
|
||||
continue; // timeout, not necessary to bother gsoap
|
||||
// r < 0, errno
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
||||
@@ -45,7 +45,7 @@
|
||||
#include <iprt/assert.h>
|
||||
#include <iprt/errcore.h>
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/configure
|
||||
Index: VirtualBox-7.0.12/configure
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/configure
|
||||
+++ VirtualBox-7.0.10/configure
|
||||
--- VirtualBox-7.0.12.orig/configure
|
||||
+++ VirtualBox-7.0.12/configure
|
||||
@@ -2178,7 +2178,7 @@ extern "C" int main(void)
|
||||
}
|
||||
EOF
|
||||
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.10/configure
|
||||
for p in $PYTHONDIR; do
|
||||
for d in $SUPPYTHONLIBS; do
|
||||
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
|
||||
Index: VirtualBox-7.0.10/src/VBox/Installer/linux/routines.sh
|
||||
Index: VirtualBox-7.0.12/src/VBox/Installer/linux/routines.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Installer/linux/routines.sh
|
||||
+++ VirtualBox-7.0.10/src/VBox/Installer/linux/routines.sh
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/routines.sh
|
||||
+++ VirtualBox-7.0.12/src/VBox/Installer/linux/routines.sh
|
||||
@@ -444,7 +444,7 @@ maybe_run_python_bindings_installer() {
|
||||
# the VirtualBox API bindings. Needs to prevent double installs which waste
|
||||
# quite a bit of time.
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/Makefile.kmk
|
||||
@@ -824,7 +824,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \
|
||||
src/VBox/Additions/x11/vboxmouse \
|
||||
src/VBox/Additions/x11/vboxmouse/xorg70 \
|
||||
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.10/Makefile.kmk
|
||||
src/VBox/NetworkServices \
|
||||
src/VBox/NetworkServices/Dhcpd \
|
||||
src/VBox/NetworkServices/NAT \
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||
@@ -404,7 +404,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s
|
||||
vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES)
|
||||
vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS)
|
||||
@ -24,10 +24,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||
# Build using local X.Org headers. We assume X.Org Server 1.7 or later.
|
||||
DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
|
||||
SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/x11/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/x11/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/x11/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/x11/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/x11/Makefile.kmk
|
||||
@@ -32,7 +32,7 @@ include $(KBUILD_PATH)/subheader.kmk
|
||||
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
|
||||
include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
|
||||
|
@ -5,10 +5,10 @@
|
||||
#
|
||||
# January 31, 2019 - Larry Finger
|
||||
#
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
@@ -1228,9 +1228,11 @@ dmnstatus()
|
||||
fi
|
||||
}
|
||||
@ -24,10 +24,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
case "$1" in
|
||||
# Does setup without clean-up first and marks all kernels currently found on the
|
||||
# system so that we can see later if any were added.
|
||||
Index: VirtualBox-7.0.10/src/VBox/Installer/linux/vboxdrv.sh
|
||||
Index: VirtualBox-7.0.12/src/VBox/Installer/linux/vboxdrv.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Installer/linux/vboxdrv.sh
|
||||
+++ VirtualBox-7.0.10/src/VBox/Installer/linux/vboxdrv.sh
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/vboxdrv.sh
|
||||
+++ VirtualBox-7.0.12/src/VBox/Installer/linux/vboxdrv.sh
|
||||
@@ -48,6 +48,9 @@ DEVICE=/dev/vboxdrv
|
||||
MODPROBE=/sbin/modprobe
|
||||
SCRIPTNAME=vboxdrv.sh
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
|
||||
@@ -61,6 +61,12 @@
|
||||
# include <iprt/power.h>
|
||||
# define VBOX_WITH_SUSPEND_NOTIFICATION
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/Config.kmk
|
||||
Index: VirtualBox-7.0.12/Config.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/Config.kmk
|
||||
+++ VirtualBox-7.0.10/Config.kmk
|
||||
--- VirtualBox-7.0.12.orig/Config.kmk
|
||||
+++ VirtualBox-7.0.12/Config.kmk
|
||||
@@ -981,11 +981,9 @@ if1of ($(KBUILD_TARGET), freebsd linux)
|
||||
endif
|
||||
# Use new VBoxNetDhcpd instead of old VBoxNetDHCP
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
|
||||
@@ -397,15 +397,15 @@ void UINameAndSystemEditor::sltFamilyCha
|
||||
if (iIndexWin10 != -1)
|
||||
m_pComboType->setCurrentIndex(iIndexWin10);
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Main/webservice/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/Main/webservice/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Main/webservice/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/Main/webservice/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Main/webservice/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/VBox/Main/webservice/Makefile.kmk
|
||||
@@ -848,7 +848,7 @@ ifdef VBOX_GSOAP_INSTALLED
|
||||
$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
|
||||
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||
@@ -98,8 +98,6 @@ void UISettingsDialogGlobal::retranslate
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||
@@ -99,8 +99,6 @@ void UISettingsDialogGlobal::retranslate
|
||||
m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
|
||||
|
||||
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
|
||||
@ -11,7 +11,7 @@ Index: VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDi
|
||||
#endif
|
||||
|
||||
/* Language page: */
|
||||
@@ -224,17 +222,6 @@ void UISettingsDialogGlobal::prepare()
|
||||
@@ -225,17 +223,6 @@ void UISettingsDialogGlobal::prepare()
|
||||
addPageHelpKeyword(iPageIndex, "preferences");
|
||||
break;
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/Config.kmk
|
||||
Index: VirtualBox-7.0.12/Config.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/Config.kmk
|
||||
+++ VirtualBox-7.0.10/Config.kmk
|
||||
--- VirtualBox-7.0.12.orig/Config.kmk
|
||||
+++ VirtualBox-7.0.12/Config.kmk
|
||||
@@ -6778,6 +6778,9 @@ TEMPLATE_VBoxR3HardenedExe_LDFLAGS.darwi
|
||||
ifeq ($(KBUILD_TARGET),linux)
|
||||
# not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Main/webservice/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/Main/webservice/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Main/webservice/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/Main/webservice/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Main/webservice/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/VBox/Main/webservice/Makefile.kmk
|
||||
@@ -412,11 +412,12 @@ ifdef VBOX_GSOAP_INSTALLED
|
||||
endif
|
||||
endif
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
printf("VirtualBox DirectFB GUI built %s %s\n"
|
||||
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.10/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||
|
||||
fputs("\nWARNING! Unmaintained code.\nWARNING! Needs fixing & debugging!\n\n", stdout);
|
||||
|
||||
Index: VirtualBox-7.0.10/src/VBox/Runtime/common/string/uniread.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Runtime/common/string/uniread.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Runtime/common/string/uniread.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Runtime/common/string/uniread.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Runtime/common/string/uniread.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Runtime/common/string/uniread.cpp
|
||||
@@ -1049,7 +1049,7 @@ int PrintHeader(const char *argv0, const
|
||||
" * IPRT - Unicode Tables.\n"
|
||||
" *\n"
|
||||
@ -24,10 +24,10 @@ Index: VirtualBox-7.0.10/src/VBox/Runtime/common/string/uniread.cpp
|
||||
" */\n"
|
||||
"\n"
|
||||
"/*\n"
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||
@@ -42,16 +42,13 @@
|
||||
/**************************IDENTITY AND VERSIONING***********************/
|
||||
/************************************************************************/
|
||||
@ -50,10 +50,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||
#if !defined(_PRODUCTION)
|
||||
#define _PRODUCTION ""
|
||||
#endif
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
||||
+++ VirtualBox-7.0.12/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-7.0.10/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
||||
#if !defined(_PRODUCTION)
|
||||
#define _PRODUCTION ""
|
||||
#endif
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||
@@ -42,16 +42,13 @@
|
||||
/**************************IDENTITY AND VERSIONING***********************/
|
||||
/************************************************************************/
|
||||
@ -99,10 +99,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||
#if !defined(_PRODUCTION)
|
||||
#define _PRODUCTION ""
|
||||
#endif
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||
@@ -42,16 +42,13 @@
|
||||
/**************************IDENTITY AND VERSIONING***********************/
|
||||
/************************************************************************/
|
||||
@ -125,10 +125,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||
#if !defined(_PRODUCTION)
|
||||
#define _PRODUCTION ""
|
||||
#endif
|
||||
Index: VirtualBox-7.0.10/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
|
||||
@@ -327,7 +327,7 @@ static int vboxInitLogging(const char *p
|
||||
#endif
|
||||
"Log opened %s\n",
|
||||
@ -138,10 +138,10 @@ Index: VirtualBox-7.0.10/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.
|
||||
|
||||
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
||||
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
|
||||
Index: VirtualBox-7.0.10/src/VBox/Devices/PC/BIOS/bios.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Devices/PC/BIOS/bios.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Devices/PC/BIOS/bios.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Devices/PC/BIOS/bios.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Devices/PC/BIOS/bios.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Devices/PC/BIOS/bios.c
|
||||
@@ -164,7 +164,7 @@ void set_mode(uint8_t mode);
|
||||
|
||||
#define BX_PCIBIOS 1
|
||||
@ -151,10 +151,10 @@ Index: VirtualBox-7.0.10/src/VBox/Devices/PC/BIOS/bios.c
|
||||
//--------------------------------------------------------------------------
|
||||
// print_bios_banner
|
||||
// displays a the bios version
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
||||
@@ -255,7 +255,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-7.0.10/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-7.0.10/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
|
||||
@@ -193,7 +193,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-7.0.10/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
|
||||
# Clean up
|
||||
$(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/
|
||||
|
||||
Index: VirtualBox-7.0.10/src/VBox/ExtPacks/Skeleton/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/ExtPacks/Skeleton/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/ExtPacks/Skeleton/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/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,10 +190,10 @@ Index: VirtualBox-7.0.10/src/VBox/ExtPacks/Skeleton/Makefile.kmk
|
||||
# Clean up
|
||||
$(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/
|
||||
|
||||
Index: VirtualBox-7.0.10/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
||||
@@ -354,7 +354,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
|
||||
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \
|
||||
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature
|
||||
@ -203,10 +203,10 @@ Index: VirtualBox-7.0.10/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
||||
# Clean up
|
||||
$(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/
|
||||
|
||||
Index: VirtualBox-7.0.10/src/VBox/ExtPacks/VNC/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/ExtPacks/VNC/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/ExtPacks/VNC/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/VBox/ExtPacks/VNC/Makefile.kmk
|
||||
@@ -164,7 +164,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-7.0.10/src/VBox/ExtPacks/VNC/Makefile.kmk
|
||||
# Clean up
|
||||
$(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/
|
||||
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
|
||||
@@ -329,7 +329,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv
|
||||
}
|
||||
VGDrvCommonInitLoggers();
|
||||
@ -229,10 +229,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
|
||||
|
||||
/*
|
||||
* Check if the NT version is supported and initialize g_enmVGDrvNtVer.
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
|
||||
@@ -882,7 +882,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-7.0.10/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.c
|
||||
|
||||
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
||||
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/solaris/Mouse/vboxms.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/solaris/Mouse/vboxms.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/solaris/Mouse/vboxms.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/solaris/Mouse/vboxms.c
|
||||
@@ -266,7 +266,7 @@ static VBMSSTATE g_OpenNodeSt
|
||||
int _init(void)
|
||||
{
|
||||
@ -255,10 +255,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/solaris/Mouse/vboxms.c
|
||||
mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL);
|
||||
/*
|
||||
* Prevent module autounloading.
|
||||
Index: VirtualBox-7.0.10/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
|
||||
@@ -251,10 +251,10 @@ Returns:
|
||||
UTILITY_NAME,
|
||||
UTILITY_MAJOR_VERSION,
|
||||
@ -272,10 +272,10 @@ Index: VirtualBox-7.0.10/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInf
|
||||
Usage ();
|
||||
return -1;
|
||||
}
|
||||
Index: VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
|
||||
@@ -128,7 +128,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI
|
||||
static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject)
|
||||
{
|
||||
@ -294,10 +294,10 @@ Index: VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
|
||||
|
||||
NTSTATUS Status = vboxUsbRtGlobalsInit();
|
||||
Assert(Status == STATUS_SUCCESS);
|
||||
Index: VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
|
||||
@@ -1518,7 +1518,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB
|
||||
RTLogDestinations(0, "debugger");
|
||||
#endif
|
||||
@ -307,10 +307,10 @@ Index: VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
|
||||
|
||||
memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals));
|
||||
|
||||
Index: VirtualBox-7.0.10/src/VBox/Main/glue/VBoxLogRelCreate.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Main/glue/VBoxLogRelCreate.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Main/glue/VBoxLogRelCreate.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Main/glue/VBoxLogRelCreate.cpp
|
||||
@@ -71,7 +71,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
|
||||
#endif
|
||||
"Log opened %s\n",
|
||||
@ -320,10 +320,10 @@ Index: VirtualBox-7.0.10/src/VBox/Main/glue/VBoxLogRelCreate.cpp
|
||||
|
||||
pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE);
|
||||
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
|
||||
+++ VirtualBox-7.0.12/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-7.0.10/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
|
||||
|
||||
printf("Depend.c build time is %s %s\n", buildDate, buildTime);
|
||||
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
|
||||
@@ -458,7 +458,7 @@ int
|
||||
main()
|
||||
{
|
||||
@ -346,10 +346,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/pro
|
||||
#ifdef TEST_STD_STRING
|
||||
cout << "Testing std::string." << endl;
|
||||
#else
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
|
||||
@@ -425,7 +425,7 @@ int
|
||||
main()
|
||||
{
|
||||
@ -359,10 +359,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/tes
|
||||
|
||||
#if 0
|
||||
{
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
|
||||
@@ -102,7 +102,7 @@ class test_message
|
||||
public:
|
||||
test_message()
|
||||
@ -372,10 +372,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
|
||||
}
|
||||
|
||||
~test_message()
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
|
||||
@@ -30,9 +30,8 @@
|
||||
#include "build_id.h"
|
||||
#include "macros.h"
|
||||
@ -387,10 +387,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_i
|
||||
|
||||
#ifndef ElfW
|
||||
#define ElfW(type) Elf_##type
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/x11/VBoxClient/logging.cpp
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/x11/VBoxClient/logging.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/x11/VBoxClient/logging.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/x11/VBoxClient/logging.cpp
|
||||
@@ -328,10 +328,10 @@ static DECLCALLBACK(void) vbClLogHeaderF
|
||||
case RTLOGPHASE_BEGIN:
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/apps/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/apps/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/apps/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/apps/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/apps/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/apps/Makefile.kmk
|
||||
@@ -28,5 +28,7 @@
|
||||
SUB_DEPTH = ../..
|
||||
include $(KBUILD_PATH)/subheader.kmk
|
||||
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.10/src/apps/Makefile.kmk
|
||||
+
|
||||
include $(FILE_KBUILD_SUB_FOOTER)
|
||||
|
||||
Index: VirtualBox-7.0.10/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ VirtualBox-7.0.10/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
@@ -0,0 +1,32 @@
|
||||
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
|
||||
+## @file
|
||||
@ -47,10 +47,10 @@ Index: VirtualBox-7.0.10/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
+
|
||||
+include $(KBUILD_PATH)/subfooter.kmk
|
||||
+
|
||||
Index: VirtualBox-7.0.10/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
|
||||
Index: VirtualBox-7.0.12/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ VirtualBox-7.0.10/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
|
||||
+++ VirtualBox-7.0.12/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
|
||||
@@ -0,0 +1,12 @@
|
||||
+#include <QtWidgets/QApplication>
|
||||
+#include <QtWidgets/QMessageBox>
|
||||
|
@ -1,9 +1,9 @@
|
||||
# https://www.virtualbox.org/changeset/90537/vbox
|
||||
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/Makefile.kmk
|
||||
@@ -642,11 +642,57 @@ ifndef VBOX_ONLY_SDK
|
||||
VBoxPython3_12_x86_LIBS = $(VBOX_PYTHON312_LIB_X86)
|
||||
endif
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/bldprogs/scm.cpp
|
||||
Index: VirtualBox-7.0.12/src/bldprogs/scm.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/bldprogs/scm.cpp
|
||||
+++ VirtualBox-7.0.10/src/bldprogs/scm.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/bldprogs/scm.cpp
|
||||
+++ VirtualBox-7.0.12/src/bldprogs/scm.cpp
|
||||
@@ -2367,7 +2367,7 @@ static int scmProcessFileInner(PSCMRWSTA
|
||||
pszTreatAs = "shell";
|
||||
else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0)
|
||||
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.10/src/bldprogs/scm.cpp
|
||||
else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0)
|
||||
|| (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) )
|
||||
pszTreatAs = "perl";
|
||||
Index: VirtualBox-7.0.10/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
||||
Index: VirtualBox-7.0.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
||||
+++ VirtualBox-7.0.10/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
||||
+++ VirtualBox-7.0.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
||||
@@ -32,6 +32,9 @@
|
||||
%define VBOXDOCDIR %{_defaultdocdir}/%NAME%
|
||||
%global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$|^/usr/lib/python.*$|^.*\\.py$
|
||||
@ -25,10 +25,10 @@ Index: VirtualBox-7.0.10/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
|
||||
|
||||
Summary: Oracle VM VirtualBox
|
||||
Name: %NAME%
|
||||
Index: VirtualBox-7.0.10/src/libs/libxml2-2.9.14/libxml.spec.in
|
||||
Index: VirtualBox-7.0.12/src/libs/libxml2-2.9.14/libxml.spec.in
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/libxml2-2.9.14/libxml.spec.in
|
||||
+++ VirtualBox-7.0.10/src/libs/libxml2-2.9.14/libxml.spec.in
|
||||
--- VirtualBox-7.0.12.orig/src/libs/libxml2-2.9.14/libxml.spec.in
|
||||
+++ VirtualBox-7.0.12/src/libs/libxml2-2.9.14/libxml.spec.in
|
||||
@@ -1,3 +1,4 @@
|
||||
+%global with_python2 0
|
||||
%global with_python3 1
|
||||
@ -93,10 +93,10 @@ Index: VirtualBox-7.0.10/src/libs/libxml2-2.9.14/libxml.spec.in
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{name}
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
@@ -438,7 +438,9 @@ char *PyTraceback_AsString(PyObject *exc
|
||||
|
||||
{ // a temp scope so I can use temp locals.
|
||||
@ -108,10 +108,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
|
||||
#else
|
||||
/* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
|
||||
const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
@@ -183,7 +183,11 @@ PyG_Base::~PyG_Base()
|
||||
// Get the correct interface pointer for this object given the IID.
|
||||
void *PyG_Base::ThisAsIID( const nsIID &iid )
|
||||
@ -125,10 +125,10 @@ Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
||||
if (iid.Equals(NS_GET_IID(nsISupports)))
|
||||
return (nsISupports *)(nsIInternalPython *)this;
|
||||
if (iid.Equals(NS_GET_IID(nsISupportsWeakReference)))
|
||||
Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/gen_python_deps.py
|
||||
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/gen_python_deps.py
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/gen_python_deps.py
|
||||
+++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/gen_python_deps.py
|
||||
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/gen_python_deps.py
|
||||
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/gen_python_deps.py
|
||||
@@ -96,7 +96,7 @@ def main(argv):
|
||||
else:
|
||||
multi = 1
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Devices/PC/vbox.dsl
|
||||
Index: VirtualBox-7.0.12/src/VBox/Devices/PC/vbox.dsl
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Devices/PC/vbox.dsl
|
||||
+++ VirtualBox-7.0.10/src/VBox/Devices/PC/vbox.dsl
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Devices/PC/vbox.dsl
|
||||
+++ VirtualBox-7.0.12/src/VBox/Devices/PC/vbox.dsl
|
||||
@@ -1225,7 +1225,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
|
||||
Device (SMC)
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/apps/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/apps/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/apps/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/apps/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/apps/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/apps/Makefile.kmk
|
||||
@@ -32,5 +32,7 @@ include $(PATH_SUB_CURRENT)/VBoxPermissi
|
||||
|
||||
include $(PATH_SUB_CURRENT)/VBoxUSB_DevRules/Makefile.kmk
|
||||
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.10/src/apps/Makefile.kmk
|
||||
+
|
||||
include $(FILE_KBUILD_SUB_FOOTER)
|
||||
|
||||
Index: VirtualBox-7.0.10/src/apps/VBoxSUIDMessage/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/apps/VBoxSUIDMessage/Makefile.kmk
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ VirtualBox-7.0.10/src/apps/VBoxSUIDMessage/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/apps/VBoxSUIDMessage/Makefile.kmk
|
||||
@@ -0,0 +1,33 @@
|
||||
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
|
||||
+## @file
|
||||
@ -48,10 +48,10 @@ Index: VirtualBox-7.0.10/src/apps/VBoxSUIDMessage/Makefile.kmk
|
||||
+include $(KBUILD_PATH)/subfooter.kmk
|
||||
+
|
||||
+
|
||||
Index: VirtualBox-7.0.10/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
|
||||
Index: VirtualBox-7.0.12/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ VirtualBox-7.0.10/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
|
||||
+++ VirtualBox-7.0.12/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
|
||||
@@ -0,0 +1,15 @@
|
||||
+#include <QtWidgets/QApplication>
|
||||
+#include <QtWidgets/QMessageBox>
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/apps/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/apps/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/apps/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/apps/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/apps/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/apps/Makefile.kmk
|
||||
@@ -30,5 +30,7 @@ include $(KBUILD_PATH)/subheader.kmk
|
||||
|
||||
include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk
|
||||
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.10/src/apps/Makefile.kmk
|
||||
+
|
||||
include $(FILE_KBUILD_SUB_FOOTER)
|
||||
|
||||
Index: VirtualBox-7.0.10/src/apps/VBoxUSB_DevRules/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/apps/VBoxUSB_DevRules/Makefile.kmk
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ VirtualBox-7.0.10/src/apps/VBoxUSB_DevRules/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/apps/VBoxUSB_DevRules/Makefile.kmk
|
||||
@@ -0,0 +1,30 @@
|
||||
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
|
||||
+## @file
|
||||
@ -45,10 +45,10 @@ Index: VirtualBox-7.0.10/src/apps/VBoxUSB_DevRules/Makefile.kmk
|
||||
+include $(KBUILD_PATH)/subfooter.kmk
|
||||
+
|
||||
+
|
||||
Index: VirtualBox-7.0.10/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
|
||||
Index: VirtualBox-7.0.12/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ VirtualBox-7.0.10/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
|
||||
+++ VirtualBox-7.0.12/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
|
||||
@@ -0,0 +1,25 @@
|
||||
+#include <QtWidgets/QApplication>
|
||||
+#include <QtWidgets/QMessageBox>
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
@@ -36,11 +36,14 @@
|
||||
# Provides: vboxadd
|
||||
# Required-Start:
|
||||
@ -133,10 +133,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
fi
|
||||
rm -f /sbin/mount.vboxsf 2>/dev/null
|
||||
rm -f /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
|
||||
Index: VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
||||
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
||||
+++ VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
||||
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
||||
@@ -36,7 +36,7 @@
|
||||
# Provides: vboxadd-service
|
||||
# Required-Start: vboxadd
|
||||
@ -146,10 +146,10 @@ Index: VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
||||
# Default-Stop: 0 1 6
|
||||
# X-Conflicts-With: systemd-timesyncd.service
|
||||
# Description: VirtualBox Additions Service
|
||||
Index: VirtualBox-7.0.10/src/VBox/Installer/linux/vboxautostart-service.sh
|
||||
Index: VirtualBox-7.0.12/src/VBox/Installer/linux/vboxautostart-service.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Installer/linux/vboxautostart-service.sh
|
||||
+++ VirtualBox-7.0.10/src/VBox/Installer/linux/vboxautostart-service.sh
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/vboxautostart-service.sh
|
||||
+++ VirtualBox-7.0.12/src/VBox/Installer/linux/vboxautostart-service.sh
|
||||
@@ -33,7 +33,7 @@
|
||||
# Provides: vboxautostart-service
|
||||
# Required-Start: vboxdrv
|
||||
@ -159,10 +159,10 @@ Index: VirtualBox-7.0.10/src/VBox/Installer/linux/vboxautostart-service.sh
|
||||
# Default-Stop: 0 1 6
|
||||
# Description: VirtualBox autostart service
|
||||
### END INIT INFO
|
||||
Index: VirtualBox-7.0.10/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
||||
Index: VirtualBox-7.0.12/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
||||
+++ VirtualBox-7.0.10/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
||||
+++ VirtualBox-7.0.12/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
||||
@@ -33,7 +33,7 @@
|
||||
# Provides: vboxballoonctrl-service
|
||||
# Required-Start: vboxdrv
|
||||
@ -172,10 +172,10 @@ Index: VirtualBox-7.0.10/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
||||
# Default-Stop: 0 1 6
|
||||
# Description: VirtualBox watchdog daemon
|
||||
### END INIT INFO
|
||||
Index: VirtualBox-7.0.10/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
|
||||
Index: VirtualBox-7.0.12/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
|
||||
+++ VirtualBox-7.0.10/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
|
||||
+++ VirtualBox-7.0.12/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
|
||||
@@ -41,7 +41,7 @@
|
||||
# Provides: testboxscript-service
|
||||
# Required-Start: $network
|
||||
@ -185,10 +185,10 @@ Index: VirtualBox-7.0.10/src/VBox/ValidationKit/testboxscript/linux/testboxscrip
|
||||
# Default-Stop: 0 1 6
|
||||
# Description: TestBoxScript service
|
||||
### END INIT INFO
|
||||
Index: VirtualBox-7.0.10/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
|
||||
Index: VirtualBox-7.0.12/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
|
||||
+++ VirtualBox-7.0.10/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
|
||||
+++ VirtualBox-7.0.12/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
|
||||
@@ -41,7 +41,7 @@
|
||||
# Provides: vboxtxs
|
||||
# Required-Start: $network
|
||||
@ -198,10 +198,10 @@ Index: VirtualBox-7.0.10/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs
|
||||
# Default-Stop: 0 1 6
|
||||
# Description: VirtualBox Test Execution Service
|
||||
### END INIT INFO
|
||||
Index: VirtualBox-7.0.10/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
|
||||
Index: VirtualBox-7.0.12/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
|
||||
+++ VirtualBox-7.0.10/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
|
||||
+++ VirtualBox-7.0.12/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
|
||||
@@ -41,7 +41,7 @@
|
||||
# Provides: vboxtxs
|
||||
# Required-Start: $network
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Installer/linux/vboxdrv.sh
|
||||
Index: VirtualBox-7.0.12/src/VBox/Installer/linux/vboxdrv.sh
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Installer/linux/vboxdrv.sh
|
||||
+++ VirtualBox-7.0.10/src/VBox/Installer/linux/vboxdrv.sh
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/vboxdrv.sh
|
||||
+++ VirtualBox-7.0.12/src/VBox/Installer/linux/vboxdrv.sh
|
||||
@@ -29,11 +29,12 @@
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
@ -66,10 +66,10 @@ Index: VirtualBox-7.0.10/src/VBox/Installer/linux/vboxdrv.sh
|
||||
|
||||
# Sign kernel modules if kernel configuration requires it.
|
||||
if test "$(kernel_requires_module_signature)" = "1"; then
|
||||
Index: VirtualBox-7.0.10/Config.kmk
|
||||
Index: VirtualBox-7.0.12/Config.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/Config.kmk
|
||||
+++ VirtualBox-7.0.10/Config.kmk
|
||||
--- VirtualBox-7.0.12.orig/Config.kmk
|
||||
+++ VirtualBox-7.0.12/Config.kmk
|
||||
@@ -3084,6 +3084,9 @@ else
|
||||
endif
|
||||
VBOX_MACOSX_ICON_FILE ?= $(PATH_ROOT)/src/VBox/Artwork/darwin/NonOSE/VirtualBox.icns
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.10/src/VBox/Main/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/Main/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Main/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/Main/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Main/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/VBox/Main/Makefile.kmk
|
||||
@@ -1895,7 +1895,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \
|
||||
$(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \
|
||||
--stringparam generating "dtrace-probes" \
|
||||
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.10/src/VBox/Main/Makefile.kmk
|
||||
"$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start$(if-expr "$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d" \
|
||||
"$@" \
|
||||
"$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end$(if-expr "$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d"
|
||||
Index: VirtualBox-7.0.10/src/VBox/Devices/Makefile.kmk
|
||||
Index: VirtualBox-7.0.12/src/VBox/Devices/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.10.orig/src/VBox/Devices/Makefile.kmk
|
||||
+++ VirtualBox-7.0.10/src/VBox/Devices/Makefile.kmk
|
||||
--- VirtualBox-7.0.12.orig/src/VBox/Devices/Makefile.kmk
|
||||
+++ VirtualBox-7.0.12/src/VBox/Devices/Makefile.kmk
|
||||
@@ -989,8 +989,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(in
|
||||
$(call MSG_TOOL,iasl,VBoxDD,$<,$@)
|
||||
$(QUIET)$(RM) -f $@ $@.tmp $@.pre
|
||||
|
@ -1,3 +1,46 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 21 19:27:40 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
- Restored changes entry accidentally deleted.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 18 17:26:11 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
- Version bump to VirtualBox 7.0.12 (released October 17 2023 by Oracle)
|
||||
|
||||
Fixes the following:
|
||||
CVE-2023-22098 (boo#1216363)
|
||||
CVE-2023-22099 (boo#1216364)
|
||||
CVE-2023-22100 (boo#1216365)
|
||||
|
||||
Patch file "fixes_for_6.5.patch" removed - fixed upstream.
|
||||
|
||||
This is a maintenance release. The following items were fixed and/or added:
|
||||
|
||||
VMM: Fixed using a debugger inside the guest under certain circumstances (bugs #21413 and #21546)
|
||||
VMM: Fixed detection of VT-x being used by other hypervisors (bug #21867)
|
||||
VMM: Introduced additional improvements in Split Lock Detection feature of recent Intel CPUs on Linux hosts (bug #20180)
|
||||
GUI: Fixed issue when the nested hardware virtualization setting was not displayed in the VM details panel (bug #21707)
|
||||
GUI: Introduced NLS update for Croatian, Indonesian, Italian, Japanese, Korean, Dutch and Turkish languages as well as added general look-and-feel improvements
|
||||
Devices: Fixed black screen in Windows guests with multiple guest screens when 3D is disabled (7.0.10 regression)
|
||||
Devices: Fixed PCI device identifiers for the VirtIO network interface (bug #21516)
|
||||
Devices: Fixed VLAN support for the VirtIO network interface (bug #21778)
|
||||
Devices: Fixed loading saved states when a TPM is configured (7.0.10 regression, bug #21773)
|
||||
Networking: Fixed memory leaks in the VBoxIntNetSwitch process on macOS (bug #21752)
|
||||
Networking: Fixed TCP connections with IP addresses ending on .2 when the NAT network attachment is used (bug #21513)
|
||||
VRDP: Added general improvements
|
||||
VBoxManage: Added improvements for "list usbfilters" command
|
||||
Unattended: Added kick start file support for Oracle Linux 8 and Oracle Linux 9.
|
||||
Main: Added more Linux OS subtypes
|
||||
Host Services: Fixed Guest Properties service crash under rare circumstance
|
||||
Linux Host and Guest: Fixed few "field-spanning write" kernel warnings (bugs #21410 and #21862)
|
||||
Linux Guest Additions: Added more fixes for RHEL 8.9 and 9.3 kernel
|
||||
Linux Guest Additions: Added more fixes for kernel 6.4
|
||||
Linux Guest Additions: Added initial support for OpenSUSE 15.5 kernel
|
||||
Linux Guest Additions: Added initial support for kernels 6.5 and 6.6
|
||||
Linux Guest Additions: Added version reporting for "rcvboxadd status-kernel" and "rcvboxadd status-user" commands
|
||||
BIOS: Restored support for ISA SCSI HBAs in the BIOS (bug #21736)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 22 12:19:15 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>
|
||||
|
||||
@ -1426,6 +1469,7 @@ Tue Dec 24 21:59:07 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
||||
- EFI: Added support for booting from APFS
|
||||
- EFI: Added support for non-standard SATA and NVMe boot device paths created by OS X
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 24 01:49:21 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
- Turn build of vboxvideo back on just in case VB is used with an older kernel,
|
||||
@ -6830,7 +6874,7 @@ Wed Feb 25 13:48:04 CET 2009 - suse-tux@gmx.de
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 24 16:46:46 CET 2009 - dmueller@suse.de
|
||||
|
||||
- merge with factory
|
||||
merge with factory
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 24 16:46:46 CET 2009 - suse-tux@gmx.de
|
||||
@ -7013,6 +7057,7 @@ Sat Oct 25 19:29:13 CEST 2008 - dmueller@suse.de
|
||||
* Web services: improved documentation and fixed example (bug #1642)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 25 14:25:40 CEST 2008 - suse-tux@gmx.de
|
||||
|
||||
- new upstream version 2.0.4
|
||||
|
@ -49,7 +49,7 @@
|
||||
%endif
|
||||
# ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!!
|
||||
Name: virtualbox%{?dash}%{?name_suffix}
|
||||
Version: 7.0.10
|
||||
Version: 7.0.12
|
||||
Release: 0
|
||||
Summary: %{package_summary}
|
||||
License: GPL-2.0-or-later
|
||||
@ -159,8 +159,6 @@ Patch38: python311.patch
|
||||
Patch39: fix_sdl_build.patch
|
||||
# Fixes for openSUSE Leap 15.X
|
||||
Patch40: fixes_for_leap.patch
|
||||
# Fixes for kernel 6.5
|
||||
Patch41: fixes_for_6.5.patch
|
||||
#
|
||||
# Common BuildRequires for both virtualbox and virtualbox-kmp
|
||||
BuildRequires: %{kernel_module_package_buildreqs}
|
||||
@ -473,7 +471,6 @@ This package contains the kernel-modules that VirtualBox uses to create or run v
|
||||
%patch38 -p1
|
||||
%patch39 -p1
|
||||
%patch40 -p1
|
||||
%patch41 -p1
|
||||
|
||||
### Documents for virtualbox main package ###
|
||||
%if %{main_package}
|
||||
|
Loading…
Reference in New Issue
Block a user