Hello community,
here is the log from the commit of package virtualbox for openSUSE:Factory
checked in at 2020-09-01 20:03:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virtualbox (Old)
and /work/SRC/openSUSE:Factory/.virtualbox.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox"
Tue Sep 1 20:03:12 2020 rev:203 rq:830509 version:6.1.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2020-07-17
20:47:52.604733382 +0200
+++ /work/SRC/openSUSE:Factory/.virtualbox.new.3399/virtualbox.changes
2020-09-01 20:04:34.940514237 +0200
@@ -1,0 +2,34 @@
+Fri Aug 28 20:56:29 UTC 2020 - Larry Finger <larry.fin...@gmail.com>
+
+- Pseudo version bump to 6.1.13, which is NOT an Oracle release.
+
+ Update VB sources to run under kernel 5.8.0+ with no modifications to the
+ kernel. These sources are derived from r85883 of the Oracle svn repository.
+ For operations with USB{2,3}, the extension pack for revision 140056 must
+ be installed. Once Oracle releases 6.1.14, then the extension pack and
+ VB itself will have the same revision number.
+
+ File "fixes_for_5.8.patch" is removed as that part was fixed upstream.
+ Fixes boo#1175201.
+
+-------------------------------------------------------------------
+Thu Aug 20 16:40:59 UTC 2020 - Larry Finger <larry.fin...@gmail.com>
+
+- Modify fixes_for_5.9.patch.
+
+-------------------------------------------------------------------
+Thu Aug 20 05:09:36 UTC 2020 - Larry Finger <larry.fin...@gmail.com>
+
+- Fix build for kernel 5.9. File "fixes_for_5.9.patch" is added.
+
+-------------------------------------------------------------------
+Sat Aug 8 01:14:12 UTC 2020 - Larry Finger <larry.fin...@gmail.com>
+
+- Delete temporary USBpassthru test patch.
+
+-------------------------------------------------------------------
+Fri Aug 7 22:19:20 UTC 2020 - Larry Finger <larry.fin...@gmail.com>
+
+- Apply Oracle changes for kernel 5.8.
+
+-------------------------------------------------------------------
Old:
----
VirtualBox-6.1.12-patched.tar.bz2
fixes_for_5.8.patch
New:
----
VirtualBox-6.1.13-patched.tar.bz2
fixes_for_5.9.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox.spec ++++++
--- /var/tmp/diff_new_pack.DIhDuN/_old 2020-09-01 20:04:37.252515318 +0200
+++ /var/tmp/diff_new_pack.DIhDuN/_new 2020-09-01 20:04:37.256515320 +0200
@@ -66,7 +66,7 @@
# ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!!
Name: virtualbox%{?dash}%{?name_suffix}
-Version: 6.1.12
+Version: 6.1.13
Release: 0
Summary: %{package_summary}
License: GPL-2.0-or-later
@@ -179,8 +179,8 @@
Patch136: fixes_for_gcc10.patch
# Fix for changes in GSOAP 2.8.103
Patch137: handle_gsoap_208103.patch
-# Fixes for kernel 5.8
-Patch138: fixes_for_5.8.patch
+# Fixes for kernel 5.9
+Patch138: fixes_for_5.9.patch
Patch999: virtualbox-fix-ui-background-color.patch
#
@@ -282,7 +282,8 @@
#rename from ose version:
Provides: %{name}-ose = %{version}
Obsoletes: %{name}-ose < %{version}
-%endif # main_package
+# end of main_package
+%endif
### Requirements for virtualbox-kmp ###
%if %{kmp_package}
@@ -291,7 +292,8 @@
%kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %{SOURCE7}
-n virtualbox -f %{SOURCE5} -x kdump um xen pae xenpae pv
Obsoletes: virtualbox-guest-kmp
Obsoletes: virtualbox-host-kmp
-%endif # kmp_package
+# end of kmp_package
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: x86_64
@@ -446,13 +448,15 @@
protocol (RFB) to remotely control another computer. When this optional
feature is desired, it is installed
as an "extpack" for VirtualBox. The implementation is licensed under GPL.
###########################################
-%endif # main_package
+# main_package
+%endif
### Description of virtualbox-kmp ###
%if %{kmp_package}
%description
This package contains the kernel-modules that VirtualBox uses to create or run
virtual machines.
-%endif # kmp_package
+# kmp_package
+%endif
%prep
%setup -q -n VirtualBox-%{version}
@@ -514,7 +518,8 @@
cp %{SOURCE10} LocalConfig.kmk
#copy autostart doc
cp %{SOURCE20} README.autostart
-%endif # main_package
+# main_package
+%endif
#
##########################
@@ -675,7 +680,6 @@
install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir}
install -m 644 *.so %{buildroot}%{_vbox_instdir}
install -m 644 *.r0 %{buildroot}%{_vbox_instdir}
-rm components/VBoxREM.so
install -m 644 components/*
%{buildroot}%{_vbox_instdir}/components/
# install languages
install -m 644 nls/*
%{buildroot}%{_datadir}/virtualbox/nls/
@@ -1084,7 +1088,8 @@
%dir %{_datadir}/licenses
%{_datadir}/licenses/LICENSE.vnc
-%endif # main_package
+# main_package
+%endif
### %build and %install sections of virtualbox-kmp ###
%if %{kmp_package}
@@ -1218,6 +1223,7 @@
make -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor
modules_install M=$PWD/modules_build_dir/$flavor/$module_name
done
done
-%endif # kmp_package
+# kmp_package
+%endif
%changelog
++++++ VirtualBox-6.1.12-patched.tar.bz2 -> VirtualBox-6.1.13-patched.tar.bz2
++++++
/work/SRC/openSUSE:Factory/virtualbox/VirtualBox-6.1.12-patched.tar.bz2
/work/SRC/openSUSE:Factory/.virtualbox.new.3399/VirtualBox-6.1.13-patched.tar.bz2
differ: char 11, line 1
++++++ fixes_for_5.8.patch -> fixes_for_5.9.patch ++++++
--- /work/SRC/openSUSE:Factory/virtualbox/fixes_for_5.8.patch 2020-07-14
07:45:01.219020698 +0200
+++ /work/SRC/openSUSE:Factory/.virtualbox.new.3399/fixes_for_5.9.patch
2020-09-01 20:04:10.472502793 +0200
@@ -1,249 +1,179 @@
-Fixes needed to build vboxdrv with kernel 5.8. The changes handle the
following kernel API changes:
-
-1. In struct mm_struct, member mmap_sem was renamed to mmap_lock.
-2. The information in cpu_tlbstate is no longer exported.
-3. The routines __get_vm_area() and map_vm_area() no longer exist and their
- replacements are not exported. Two fixes have been attempted:
- a. The missing routines were not available until kernel 2.6.23, thus the
code was
- changed to revert back to the "old" method. Unfortunately, this did not
work, and
- likely it will require Oracle to make the changes.
- b. The replacements for __get_vm_area() and map_vm_area() are implemented.
The resulting
- code builds but gets missing globals on loading. For testing, the kernel
is modified.
- This change cannot be permanent, but it can be temporary.
-
-Index: VirtualBox-6.1.10/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ VirtualBox-6.1.10/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -222,9 +222,17 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
- ulAddr = vm_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED |
MAP_ANONYMOUS | MAP_FIXED, 0);
- #else
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
- down_write(&pTask->mm->mmap_sem);
-+#else
-+ down_write(&pTask->mm->mmap_lock);
-+#endif
- ulAddr = do_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED |
MAP_ANONYMOUS | MAP_FIXED, 0);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
- up_write(&pTask->mm->mmap_sem);
-+#else
-+ up_write(&pTask->mm->mmap_lock);
+Index: VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+===================================================================
+--- VirtualBox-6.1.12.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
++++ VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+@@ -137,7 +137,10 @@
+ #include <linux/interrupt.h>
+ #include <linux/completion.h>
+ #include <linux/compiler.h>
+-#ifndef HAVE_UNLOCKED_IOCTL /* linux/fs.h defines this */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++#define HAVE_UNLOCKED_IOCTL 1 /* defined in linux/fs.h for kernels before 5.9
*/
+#endif
++#ifndef HAVE_UNLOCKED_IOCTL
+ # include <linux/smp_lock.h>
#endif
+ /* For the shared folders module */
+Index: VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+===================================================================
+--- VirtualBox-6.1.12.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
++++ VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+@@ -1102,8 +1102,10 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
+ */
+ else
+ rc = get_user_pages_remote(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ pTask, /* Task for fault
accounting. */
+- pTask->mm, /* Whose pages. */
++#endif
++ pTask->mm, /* Whose pages. */
+ R3Ptr, /* Where from. */
+ cPages, /* How many pages. */
+ # if GET_USER_PAGES_API >= KERNEL_VERSION(4, 9, 0)
+Index: VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
+===================================================================
+--- VirtualBox-6.1.12.orig/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
++++ VirtualBox-6.1.12/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
+@@ -92,8 +92,12 @@ DECLHIDDEN(int) rtThreadNativeSetPriorit
+ return VERR_INVALID_PARAMETER;
}
- else
-@@ -232,9 +240,17 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
- ulAddr = vm_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS,
0);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ sched_setscheduler(current, iSchedClass, &Param);
#else
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
- down_write(&pTask->mm->mmap_sem);
-+#else
-+ down_write(&pTask->mm->mmap_lock);
++ sched_set_fifo_low(current);
+#endif
- ulAddr = do_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS,
0);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
- up_write(&pTask->mm->mmap_sem);
+#else
-+ up_write(&pTask->mm->mmap_lock);
-+#endif
+ RT_NOREF_PV(enmType);
#endif
- if ( !(ulAddr & ~PAGE_MASK)
- && (ulAddr & (uAlignment - 1)))
-@@ -269,13 +285,29 @@ static void rtR0MemObjLinuxDoMunmap(void
- Assert(pTask == current); RT_NOREF_PV(pTask);
- vm_munmap((unsigned long)pv, cb);
- #elif defined(USE_RHEL4_MUNMAP)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
- down_write(&pTask->mm->mmap_sem);
-+#else
-+ down_write(&pTask->mm->mmap_lock);
-+#endif
- do_munmap(pTask->mm, (unsigned long)pv, cb, 0); /* should it be 1 or 0? */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
- up_write(&pTask->mm->mmap_sem);
- #else
-+ up_write(&pTask->mm->mmap_lock);
-+#endif
-+#else
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
- down_write(&pTask->mm->mmap_sem);
-+#else
-+ down_write(&pTask->mm->mmap_lock);
-+#endif
- do_munmap(pTask->mm, (unsigned long)pv, cb);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
- up_write(&pTask->mm->mmap_sem);
+ RT_NOREF_PV(pThread);
+Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_drv.c
+===================================================================
+--- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/drm/vbox_drv.c
++++ VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_drv.c
+@@ -263,8 +263,13 @@ static const struct file_operations vbox
+ .read = drm_read,
+ };
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ static int vbox_master_set(struct drm_device *dev,
+ struct drm_file *file_priv, bool from_open)
+#else
-+ up_write(&pTask->mm->mmap_lock);
++static void vbox_master_set(struct drm_device *dev,
++ struct drm_file *file_priv, bool from_open)
+#endif
- #endif
- }
+ {
+ struct vbox_private *vbox = dev->dev_private;
-@@ -593,7 +625,11 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR
- size_t iPage;
- Assert(pTask);
- if (pTask && pTask->mm)
-- down_read(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+ down_read(&pTask->mm->mmap_sem);
-+#else
-+ down_read(&pTask->mm->mmap_lock);
-+#endif
+Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_fb.c
+===================================================================
+--- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/drm/vbox_fb.c
++++ VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_fb.c
+@@ -405,7 +405,11 @@ void vbox_fbdev_fini(struct drm_device *
+ vbox_bo_unpin(bo);
+ vbox_bo_unreserve(bo);
+ }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++ drm_gem_object_put(afb->obj);
++#else
+ drm_gem_object_put_unlocked(afb->obj);
++#endif
+ afb->obj = NULL;
+ }
+ drm_fb_helper_fini(&fbdev->helper);
+Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_main.c
+===================================================================
+--- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/drm/vbox_main.c
++++ VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_main.c
+@@ -40,14 +40,19 @@
+ #include <VBoxVideoVBE.h>
+
+ #include "hgsmi_channels.h"
++#include <linux/version.h>
++
- iPage = pMemLnx->cPages;
- while (iPage-- > 0)
-@@ -608,7 +644,11 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR
- }
+ static void vbox_user_framebuffer_destroy(struct drm_framebuffer *fb)
+ {
+ struct vbox_framebuffer *vbox_fb = to_vbox_framebuffer(fb);
- if (pTask && pTask->mm)
-- up_read(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+ up_read(&pTask->mm->mmap_sem);
+ if (vbox_fb->obj)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ drm_gem_object_put_unlocked(vbox_fb->obj);
+-
+#else
-+ up_read(&pTask->mm->mmap_lock);
++ drm_gem_object_put(vbox_fb->obj);
+#endif
- }
- /* else: kernel memory - nothing to do here. */
- break;
-@@ -1076,7 +1116,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
- papVMAs = (struct vm_area_struct **)RTMemAlloc(sizeof(*papVMAs) * cPages);
- if (papVMAs)
- {
-- down_read(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+ down_read(&pTask->mm->mmap_sem);
+ drm_framebuffer_cleanup(fb);
+ kfree(fb);
+ }
+@@ -221,7 +226,11 @@ static struct drm_framebuffer *vbox_user
+ err_free_vbox_fb:
+ kfree(vbox_fb);
+ err_unref_obj:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ drm_gem_object_put_unlocked(obj);
+#else
-+ down_read(&pTask->mm->mmap_lock);
++ drm_gem_object_put(obj);
+#endif
+ return ERR_PTR(ret);
+ }
- /*
- * Get user pages.
-@@ -1162,7 +1206,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
- papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
- }
+@@ -588,7 +597,11 @@ int vbox_dumb_create(struct drm_file *fi
+ return ret;
-- up_read(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+ up_read(&pTask->mm->mmap_sem);
+ ret = drm_gem_handle_create(file, gobj, &handle);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ drm_gem_object_put_unlocked(gobj);
+#else
-+ up_read(&pTask->mm->mmap_lock);
++ drm_gem_object_put(gobj);
+#endif
+ if (ret)
+ return ret;
- RTMemFree(papVMAs);
-
-@@ -1189,7 +1237,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
+Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_drv.h
+===================================================================
+--- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/drm/vbox_drv.h
++++ VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_drv.h
+@@ -364,6 +364,9 @@ struct vbox_bo {
+ #else
+ struct ttm_place placements[3];
#endif
- }
-
-- up_read(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+ up_read(&pTask->mm->mmap_sem);
-+#else
-+ up_read(&pTask->mm->mmap_lock);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++ uint64_t offset;
+#endif
+ int pin_count;
+ };
- RTMemFree(papVMAs);
- rc = VERR_LOCK_FAILED;
-@@ -1604,7 +1656,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(
- const size_t cPages = (offSub + cbSub) >> PAGE_SHIFT;
- size_t iPage;
-
-- down_write(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+ down_write(&pTask->mm->mmap_sem);
+Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_mode.c
+===================================================================
+--- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/drm/vbox_mode.c
++++ VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_mode.c
+@@ -887,8 +887,11 @@ out_unmap_bo:
+ out_unreserve_bo:
+ vbox_bo_unreserve(bo);
+ out_unref_obj:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ drm_gem_object_put_unlocked(obj);
+-
+#else
-+ down_write(&pTask->mm->mmap_lock);
++ drm_gem_object_put(obj);
+#endif
+ return ret;
+ }
- rc = VINF_SUCCESS;
- if (pMemLnxToMap->cPages)
-@@ -1721,7 +1777,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(
- }
- #endif /* CONFIG_NUMA_BALANCING */
+Index: VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_ttm.c
+===================================================================
+--- VirtualBox-6.1.12.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
++++ VirtualBox-6.1.12/src/VBox/Additions/linux/drm/vbox_ttm.c
+@@ -453,7 +453,11 @@ err_free_vboxbo:
-- up_write(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+ up_write(&pTask->mm->mmap_sem);
+ static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ return bo->bo.offset;
+#else
-+ up_write(&pTask->mm->mmap_lock);
++ return bo->offset;
+#endif
+ }
- if (RT_SUCCESS(rc))
- {
-Index: VirtualBox-6.1.10/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-+++ VirtualBox-6.1.10/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-@@ -757,12 +757,19 @@ EXPORT_SYMBOL(SUPDrvLinuxIDC);
- RTCCUINTREG VBOXCALL supdrvOSChangeCR4(RTCCUINTREG fOrMask, RTCCUINTREG
fAndMask)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
- RTCCUINTREG uOld = this_cpu_read(cpu_tlbstate.cr4);
-+#else
-+ RTCCUINTREG uOld = __read_cr4();
-+#endif
- RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask;
- if (uNew != uOld)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
- this_cpu_write(cpu_tlbstate.cr4, uNew);
- __write_cr4(uNew);
-+#endif
-+ ASMSetCR4(uNew);
- }
- #else
- RTCCUINTREG uOld = ASMGetCR4();
-Index: VirtualBox-6.1.10/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
-===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
-+++ VirtualBox-6.1.10/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
-@@ -168,7 +168,12 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(
- struct vm_struct *pVmArea;
- size_t iPage;
-
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+// pVmArea = __get_vm_area_caller(cbAlloc, VM_ALLOC, MODULES_VADDR,
MODULES_END,
-+// __builtin_return_address(0));
-+#else
- pVmArea = __get_vm_area(cbAlloc, VM_ALLOC, MODULES_VADDR, MODULES_END);
-+#endif
- if (!pVmArea)
- return NULL;
- pVmArea->nr_pages = 0; /* paranoia? */
-@@ -201,6 +206,12 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(
- # endif
- pVmArea->nr_pages = cPages;
- pVmArea->pages = papPages;
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+ unsigned long start = (unsigned long)pVmArea->addr;
-+// unsigned long size = get_vm_area_size(pVmArea);
-+
-+// if (!map_kernel_range(start, size, PAGE_KERNEL_EXEC, papPages))
-+#else
- if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC,
- # if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
- &papPagesIterator
-@@ -208,6 +219,7 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(
- papPages
- # endif
- ))
-+#endif
- {
- PRTMEMLNXHDREX pHdrEx = (PRTMEMLNXHDREX)pVmArea->addr;
- pHdrEx->pVmArea = pVmArea;
-Index: VirtualBox-6.1.10/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-+++ VirtualBox-6.1.10/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-@@ -53,7 +53,7 @@
- #include <linux/seq_file.h>
- #include <linux/vfs.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62)
--# include <linux/vermagic.h>
-+//# include <linux/vermagic.h>
- #endif
- #include <VBox/err.h>
- #include <iprt/path.h>
+ int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
++++++ fixes_for_Leap42.3.patch ++++++
--- /var/tmp/diff_new_pack.DIhDuN/_old 2020-09-01 20:04:37.424515399 +0200
+++ /var/tmp/diff_new_pack.DIhDuN/_new 2020-09-01 20:04:37.424515399 +0200
@@ -1,13 +1,13 @@
-Index: b/src/VBox/Additions/linux/sharedfolders/regops.c
+Index: VirtualBox-6.1.13/src/VBox/Additions/linux/sharedfolders/regops.c
===================================================================
---- a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -1436,7 +1436,7 @@ DECLINLINE(int) vbsf_lock_user_pages(uin
- # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
+--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/sharedfolders/regops.c
++++ VirtualBox-6.1.13/src/VBox/Additions/linux/sharedfolders/regops.c
+@@ -1432,7 +1432,7 @@ DECLINLINE(int) vbsf_lock_user_pages(uin
+ # elif RTLNX_VER_MIN(4,6,0)
ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, fWrite,
1 /*force*/, papPages);
- # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 168) && LINUX_VERSION_CODE
< KERNEL_VERSION(4, 5, 0)
+ # elif RTLNX_VER_RANGE(4,4,168, 4,5,0)
- ssize_t cPagesLocked = get_user_pages_unlocked(current, current->mm,
uPtrFrom, cPages, papPages,
+ ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, papPages,
fWrite ? FOLL_WRITE |
FOLL_FORCE : FOLL_FORCE);
- # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
+ # elif RTLNX_VER_MIN(4,0,0)
ssize_t cPagesLocked = get_user_pages_unlocked(current, current->mm,
uPtrFrom, cPages, fWrite, 1 /*force*/, papPages);
++++++ fixes_for_Qt5.11.patch ++++++
--- /var/tmp/diff_new_pack.DIhDuN/_old 2020-09-01 20:04:37.436515404 +0200
+++ /var/tmp/diff_new_pack.DIhDuN/_new 2020-09-01 20:04:37.440515406 +0200
@@ -1,8 +1,8 @@
-Index: VirtualBox-6.0.2/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+Index: VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
===================================================================
---- VirtualBox-6.0.2.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
-+++ VirtualBox-6.0.2/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
-@@ -83,6 +83,7 @@
+--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
++++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+@@ -85,6 +85,7 @@
#include <QtWidgets/qgraphicsitem.h>
#include <QtWidgets/qgraphicslayoutitem.h>
#include <QtWidgets/qgraphicswidget.h>
@@ -10,15 +10,15 @@
#include <QtCore/QMetaType>
#include <QtGui/qevent.h>
#include <QtGui/qtouchdevice.h>
-Index:
VirtualBox-6.0.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
===================================================================
----
VirtualBox-6.0.2.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
-+++
VirtualBox-6.0.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
-@@ -18,6 +18,7 @@
- /* Qt includes: */
- #include <QButtonGroup>
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+@@ -21,6 +21,7 @@
+ #include <QLabel>
+ #include <QRadioButton>
#include <QRegExpValidator>
+#include <QButtonGroup>
/* GUI includes: */
- #include "QIWidgetValidator.h"
+ #include "QILineEdit.h"
++++++ fixes_for_gcc10.patch ++++++
--- /var/tmp/diff_new_pack.DIhDuN/_old 2020-09-01 20:04:37.448515410 +0200
+++ /var/tmp/diff_new_pack.DIhDuN/_new 2020-09-01 20:04:37.452515411 +0200
@@ -1,13 +1,12 @@
-Index: VirtualBox-6.1.10/Config.kmk
+Index: VirtualBox-6.1.13/Config.kmk
===================================================================
---- VirtualBox-6.1.10.orig/Config.kmk
-+++ VirtualBox-6.1.10/Config.kmk
-@@ -2684,8 +2684,16 @@ else
+--- VirtualBox-6.1.13.orig/Config.kmk
++++ VirtualBox-6.1.13/Config.kmk
+@@ -2721,8 +2721,16 @@ else
# The reason for this hack is that the windows kmk_ash cannot deal with
$((1+1)).
# Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc
-dumpversion`.
# gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
- VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1)
-dumpversion) | \
-- $(SED_EXT)
's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(int-add
$$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3
0))|' )
+ #
+ # Check to make sure that the compiler has either -dumpfullversion or
-dumpversion. gcc-10 has neither
+ RC = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion
2>/dev/null) ; echo $$?)
@@ -16,15 +15,15 @@
+ VBOX_GCC_VERSION = 100001
+ else
+ VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1)
-dumpversion 2>/dev/null) | \
-+ $(SED_EXT)
's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(int-add
$$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3
0))|' )
+ $(SED_EXT)
's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr
10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|' )
+ endif
- endif
-
- # YASM macros
-Index: VirtualBox-6.1.10/src/VBox/Debugger/DBGCDumpImage.cpp
+ ifeq ($(KBUILD_TARGET), darwin)
+ VBOX_CLANG_VERSION = $(shell $(1) --version | \
+ $(SED_EXT) -n 's|.*version
\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000
* \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|p' )
+Index: VirtualBox-6.1.13/src/VBox/Debugger/DBGCDumpImage.cpp
===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/Debugger/DBGCDumpImage.cpp
-+++ VirtualBox-6.1.10/src/VBox/Debugger/DBGCDumpImage.cpp
+--- VirtualBox-6.1.13.orig/src/VBox/Debugger/DBGCDumpImage.cpp
++++ VirtualBox-6.1.13/src/VBox/Debugger/DBGCDumpImage.cpp
@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(int3
{
switch (iType)
++++++ fixes_for_leap15.2.patch ++++++
--- /var/tmp/diff_new_pack.DIhDuN/_old 2020-09-01 20:04:37.464515417 +0200
+++ /var/tmp/diff_new_pack.DIhDuN/_new 2020-09-01 20:04:37.464515417 +0200
@@ -1,7 +1,7 @@
-Index:
VirtualBox-6.1.0_RC1/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+Index:
VirtualBox-6.1.13/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
===================================================================
----
VirtualBox-6.1.0_RC1.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-+++
VirtualBox-6.1.0_RC1/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+---
VirtualBox-6.1.13.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
++++ VirtualBox-6.1.13/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -73,6 +73,10 @@
#define VBOXNETFLT_OS_SPECFIC 1
#include "../VBoxNetFltInternal.h"
@@ -13,85 +13,51 @@
typedef struct VBOXNETFLTNOTIFIER {
struct notifier_block Notifier;
PVBOXNETFLTINS pThis;
-@@ -924,13 +928,13 @@ static void vboxNetFltLinuxSkBufToSG(PVB
- for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++)
- {
- skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i];
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
-+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) || defined(OPENSUSE_152)
- pSG->aSegs[iSeg].cb = pFrag->bv_len;
- pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;
--# else /* < KERNEL_VERSION(5, 4, 0) */
-+# else /* < KERNEL_VERSION(5, 4, 0) */
- pSG->aSegs[iSeg].cb = pFrag->size;
- pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset;
--# endif /* >= KERNEL_VERSION(5, 4, 0) */
-+# endif /* >= KERNEL_VERSION(5, 4, 0) */
- Log6((" %p", pSG->aSegs[iSeg].pv));
- pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS;
- Assert(iSeg <= pSG->cSegsAlloc);
-@@ -945,13 +949,13 @@ static void vboxNetFltLinuxSkBufToSG(PVB
- for (i = 0; i < skb_shinfo(pFragBuf)->nr_frags; i++)
- {
- skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i];
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
-+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) || defined(OPENSUSE_152)
- pSG->aSegs[iSeg].cb = pFrag->bv_len;
- pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) +
pFrag->bv_offset;
--# else /* < KERNEL_VERSION(5, 4, 0) */
-+# else /* < KERNEL_VERSION(5, 4, 0) */
- pSG->aSegs[iSeg].cb = pFrag->size;
- pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) +
pFrag->page_offset;
--# endif /* >= KERNEL_VERSION(5, 4, 0) */
-+# endif /* >= KERNEL_VERSION(5, 4, 0) */
- Log6((" %p", pSG->aSegs[iSeg].pv));
- pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS;
- Assert(iSeg <= pSG->cSegsAlloc);
-Index: VirtualBox-6.1.0_RC1/src/VBox/Additions/linux/drm/vbox_drv.c
+Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
---- VirtualBox-6.1.0_RC1.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ VirtualBox-6.1.0_RC1/src/VBox/Additions/linux/drm/vbox_drv.c
-@@ -307,11 +307,13 @@ static void vbox_master_drop(struct drm_
+--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_drv.c
++++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.c
+@@ -305,11 +305,13 @@ static void vbox_master_drop(struct drm_
static struct drm_driver driver = {
- #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+ #if RTLNX_VER_MAX(5,4,0)
.driver_features =
- DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+ DRIVER_PRIME |
+#endif
- # if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81)
+ # if RTLNX_VER_MAX(5,1,0) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
DRIVER_IRQ_SHARED |
- # endif /* < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81) */
+ # endif
- DRIVER_PRIME,
+ DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
- #else /* >= KERNEL_VERSION(5, 4, 0) */
+ #else /* >= 5.4.0 */
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
- #endif /* < KERNEL_VERSION(5, 4, 0) */
-Index: VirtualBox-6.1.0_RC1/src/VBox/Additions/linux/drm/vbox_main.c
+ #endif /* < 5.4.0 */
+Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
---- VirtualBox-6.1.0_RC1.orig/src/VBox/Additions/linux/drm/vbox_main.c
-+++ VirtualBox-6.1.0_RC1/src/VBox/Additions/linux/drm/vbox_main.c
-@@ -626,8 +626,12 @@ static inline u64 vbox_bo_mmap_offset(st
- #elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_70)
+--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_main.c
++++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_main.c
+@@ -628,8 +628,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;
#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
+ return drm_vma_node_offset_addr(&bo->bo.base.vma_node);
+#else
return drm_vma_node_offset_addr(&bo->bo.vma_node);
- #endif /* >= KERNEL_VERSION(5, 4, 0) */
+ #endif /* >= 5.4.0 */
+#endif
}
int
-Index: VirtualBox-6.1.0_RC1/include/iprt/cdefs.h
+Index: VirtualBox-6.1.13/include/iprt/cdefs.h
===================================================================
---- VirtualBox-6.1.0_RC1.orig/include/iprt/cdefs.h
-+++ VirtualBox-6.1.0_RC1/include/iprt/cdefs.h
-@@ -1173,14 +1173,15 @@
- * Tell the compiler that we're falling through to the next case in a switch.
- * @sa RT_FALL_THRU */
- #if RT_GNUC_PREREQ(7, 0)
+--- VirtualBox-6.1.13.orig/include/iprt/cdefs.h
++++ VirtualBox-6.1.13/include/iprt/cdefs.h
+@@ -1240,14 +1240,15 @@
+ #if RT_CLANG_PREREQ(4, 0) && RT_CPLUSPLUS_PREREQ(201100)
+ # define RT_FALL_THROUGH() [[clang::fallthrough]]
+ #elif RT_GNUC_PREREQ(7, 0)
-# define RT_FALL_THROUGH() __attribute__((__fallthrough__))
+# define FALL_THROUGH __attribute__((__fallthrough__))
#else
++++++ fixes_for_makefile.patch ++++++
--- /var/tmp/diff_new_pack.DIhDuN/_old 2020-09-01 20:04:37.472515421 +0200
+++ /var/tmp/diff_new_pack.DIhDuN/_new 2020-09-01 20:04:37.476515423 +0200
@@ -1,18 +1,8 @@
-Index: VirtualBox-6.1.10/src/VBox/HostDrivers/linux/Makefile
+Index: VirtualBox-6.1.13/src/VBox/HostDrivers/linux/Makefile
===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/HostDrivers/linux/Makefile
-+++ VirtualBox-6.1.10/src/VBox/HostDrivers/linux/Makefile
-@@ -35,9 +35,6 @@ endif
- ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
- obj-m += vboxnetadp/
- endif
--ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
-- obj-m += vboxpci/
--endif
-
- else # ! KERNELRELEASE
-
-@@ -45,10 +42,11 @@ else # ! KERNELRELEASE
+--- VirtualBox-6.1.13.orig/src/VBox/HostDrivers/linux/Makefile
++++ VirtualBox-6.1.13/src/VBox/HostDrivers/linux/Makefile
+@@ -42,8 +41,9 @@ else # ! KERNELRELEASE
KBUILD_VERBOSE ?=
KERN_VER ?= $(shell uname -r)
@@ -22,15 +12,12 @@
+
+.PHONY: all install clean check unload load vboxdrv vboxnetflt vboxnetadp
--all: vboxdrv vboxnetflt vboxnetadp vboxpci
-+all: vboxdrv vboxnetflt vboxnetadp
+ all: vboxdrv vboxnetflt vboxnetadp
- # We want to build on Linux 2.6.18 and later kernels.
- ifneq ($(filter-out 1.% 2.0.% 2.1.% 2.2.% 2.3.% 2.4.% 2.5.%,$(KERN_VER)),)
-@@ -61,55 +59,38 @@ vboxdrv:
+@@ -58,22 +58,18 @@ vboxdrv:
vboxnetflt: vboxdrv
- @if [ -d vboxnetflt ]; then \
+ +@if [ -d vboxnetflt ]; then \
- if [ -f vboxdrv/Module.symvers ]; then \
- cp vboxdrv/Module.symvers vboxnetflt; \
- fi; \
@@ -43,7 +30,7 @@
fi
vboxnetadp: vboxdrv
- @if [ -d vboxnetadp ]; then \
+ +@if [ -d vboxnetadp ]; then \
- if [ -f vboxdrv/Module.symvers ]; then \
- cp vboxdrv/Module.symvers vboxnetadp; \
- fi; \
@@ -54,73 +41,22 @@
cp vboxnetadp/vboxnetadp.ko .; \
echo; \
fi
-
--vboxpci: vboxdrv
-- @if [ -d vboxpci ]; then \
-- if [ -f vboxdrv/Module.symvers ]; then \
-- cp vboxdrv/Module.symvers vboxpci; \
-- fi; \
-- echo "=== Building 'vboxpci' module ==="; \
-- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE)
KBUILD_EXTRA_SYMBOLS=$(abspath vboxpci/Module.symvers) -C vboxpci || exit 1; \
-- cp vboxpci/vboxpci.ko .; \
-- echo; \
-- fi
--
+@@ -81,9 +77,11 @@ vboxnetadp: vboxdrv
install:
- @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv install
- @if [ -d vboxnetflt ]; then \
+ +@$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv install
+ +@if [ -d vboxnetflt ]; then \
+ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxdrv/Module.symvers; \
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt install; \
fi
- @if [ -d vboxnetadp ]; then \
+ +@if [ -d vboxnetadp ]; then \
+ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxdrv/Module.symvers; \
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp install; \
fi
-- @if [ -d vboxpci ]; then \
-- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci install; \
-- fi
-
- else
-
- vboxdrv:
- vboxnetflt:
- vboxnetadp:
--vboxpci:
- install:
- endif
-@@ -122,16 +103,13 @@ clean:
- @if [ -d vboxnetadp ]; then \
- $(MAKE) -C vboxnetadp clean; \
- fi
-- @if [ -d vboxpci ]; then \
-- $(MAKE) -C vboxpci clean; \
-- fi
-- rm -f vboxdrv.ko vboxnetflt.ko vboxnetadp.ko vboxpci.ko
-+ rm -f vboxdrv.ko vboxnetflt.ko vboxnetadp.ko
-
- check:
- @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv check
-
- unload:
-- @for module in vboxpci vboxnetadp vboxnetflt vboxdrv; do \
-+ @for module in vboxnetadp vboxnetflt vboxdrv; do \
- if grep "^$$module " /proc/modules >/dev/null; then \
- echo "Removing previously installed $$module module"; \
- /sbin/rmmod $$module; \
-@@ -139,7 +117,7 @@ unload:
- done
-
- load: unload
-- @for module in vboxdrv vboxnetflt vboxnetadp vboxpci; do \
-+ @for module in vboxdrv vboxnetflt vboxnetadp; do \
- if test -f $$module.ko; then \
- echo "Installing $$module module"; \
- /sbin/insmod $$module.ko; \
-Index: VirtualBox-6.1.10/src/VBox/Additions/linux/Makefile
+Index: VirtualBox-6.1.13/src/VBox/Additions/linux/Makefile
===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/Additions/linux/Makefile
-+++ VirtualBox-6.1.10/src/VBox/Additions/linux/Makefile
+--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/Makefile
++++ VirtualBox-6.1.13/src/VBox/Additions/linux/Makefile
@@ -24,6 +24,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/
else # ! KERNELRELEASE
@@ -147,21 +83,21 @@
if [ -f vboxvideo/vboxvideo.ko ]; then \
@@ -77,9 +80,11 @@ vboxvideo:
install:
- $(VBOX_QUIET)$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest
install
- $(VBOX_QUIET_SH)if [ -d vboxsf ]; then \
+ + $(VBOX_QUIET)$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest
install
+ + $(VBOX_QUIET_SH)if [ -d vboxsf ]; then \
+ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxsf/Module.symvers; \
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxsf install; \
fi
- $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \
+ + $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \
+ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxvideo/Module.symvers; \
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \
fi
-Index: VirtualBox-6.1.10/include/iprt/x86.h
+Index: VirtualBox-6.1.13/include/iprt/x86.h
===================================================================
---- VirtualBox-6.1.10.orig/include/iprt/x86.h
-+++ VirtualBox-6.1.10/include/iprt/x86.h
-@@ -840,37 +840,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
+--- VirtualBox-6.1.13.orig/include/iprt/x86.h
++++ VirtualBox-6.1.13/include/iprt/x86.h
+@@ -858,37 +858,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
* reserved flags.
* @{ */
/** Bit 0 - PE - Protection Enabled */
@@ -221,7 +157,7 @@
#define X86_CR0_PAGING RT_BIT_32(31)
#define X86_CR0_BIT_PG 31 /**< Bit number of X86_CR0_PG
*/
/** @} */
-@@ -879,9 +901,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
+@@ -897,9 +919,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
/** @name CR3
* @{ */
/** Bit 3 - PWT - Page-level Writes Transparent. */
@@ -235,7 +171,7 @@
/** Bits 12-31 - - Page directory page number. */
#define X86_CR3_PAGE_MASK (0xfffff000)
/** Bits 5-31 - - PAE Page directory page number. */
-@@ -894,46 +920,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
+@@ -912,46 +938,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
/** @name CR4
* @{ */
/** Bit 0 - VME - Virtual-8086 Mode Extensions. */
@@ -320,7 +256,7 @@
/** Bit 23 - CET - Control-flow Enhancement Technology enabled. */
#define X86_CR4_CET RT_BIT_32(23)
/** @} */
-@@ -1147,12 +1211,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1165,12 +1229,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. */
@@ -337,7 +273,7 @@
#ifndef MSR_IA32_APICBASE /* qemu cpu.h kludge */
# define MSR_IA32_APICBASE 0x1b
-@@ -1178,7 +1246,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1196,7 +1264,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_CORE_THREAD_COUNT 0x35
/** CPU Feature control. */
@@ -347,7 +283,7 @@
/** 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). */
-@@ -1203,11 +1273,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1221,11 +1291,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_FEATURE_CONTROL_LMCE RT_BIT_64(20)
/** Per-processor TSC adjust MSR. */
@@ -363,7 +299,7 @@
/** IBRS - Indirect branch restricted speculation. */
#define MSR_IA32_SPEC_CTRL_F_IBRS RT_BIT_32(0)
/** STIBP - Single thread indirect branch predictors. */
-@@ -1215,7 +1289,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1235,7 +1309,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
/** Prediction command register.
* Write only, logical processor scope, no state since write only. */
@@ -373,7 +309,7 @@
/** IBPB - Indirect branch prediction barrie when written as 1. */
#define MSR_IA32_PRED_CMD_F_IBPB RT_BIT_32(0)
-@@ -1226,7 +1302,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1246,7 +1322,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_BIOS_SIGN_ID 0x8B
/** SMM monitor control. */
@@ -383,7 +319,7 @@
/** SMM control - Valid. */
#define MSR_IA32_SMM_MONITOR_VALID RT_BIT_64(0)
/** SMM control - VMXOFF unblocks SMI. */
-@@ -1235,10 +1313,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1255,10 +1333,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). */
@@ -398,7 +334,7 @@
/** General performance counter no. 1. */
#define MSR_IA32_PMC1 0xC2
/** General performance counter no. 2. */
-@@ -1261,18 +1343,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1281,18 +1363,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. */
@@ -425,7 +361,7 @@
/** 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. */
-@@ -1286,7 +1376,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1306,7 +1396,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_ARCH_CAP_F_MDS_NO RT_BIT_32(4)
/** Flush command register. */
@@ -435,7 +371,7 @@
/** Flush the level 1 data cache when this bit is written. */
#define MSR_IA32_FLUSH_CMD_F_L1D RT_BIT_32(0)
-@@ -1307,14 +1399,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1327,14 +1419,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#endif
/** Machine Check Global Capabilities Register. */
@@ -456,7 +392,7 @@
/** 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)
-@@ -1333,36 +1431,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1353,36 +1451,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.
*/
@@ -515,7 +451,7 @@
/** Trace/Profile Resource Control (R/W) */
#define MSR_IA32_DEBUGCTL UINT32_C(0x000001d9)
-@@ -1500,7 +1620,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1520,7 +1640,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
/** @} */
/** Intel TSX (Transactional Synchronization Extensions) control MSR. */
@@ -525,7 +461,7 @@
/** Variable range MTRRs.
* @{ */
-@@ -1550,89 +1672,167 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1570,89 +1692,167 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_PERF_GLOBAL_OVF_CTRL 0x390
/** Precise Event Based sampling (Intel only). */
@@ -693,7 +629,7 @@
/** X2APIC MSR range start. */
#define MSR_IA32_X2APIC_START 0x800
-@@ -1767,23 +1967,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1787,23 +1987,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. */
@@ -741,7 +677,7 @@
/** K8 LSTAR - Long mode SYSCALL target (RIP). */
#define MSR_K8_LSTAR UINT32_C(0xc0000082)
-@@ -1799,14 +2023,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1819,14 +2043,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)
@@ -759,13 +695,13 @@
+#ifndef MSR_K8_TOP_MEM2
#define MSR_K8_TOP_MEM2 UINT32_C(0xc001001d)
+#endif
- /** North bridge config? See BIOS & Kernel dev guides for
- * details. */
- #define MSR_K8_NB_CFG UINT32_C(0xc001001f)
-Index: VirtualBox-6.1.10/include/VBox/vmm/hm_vmx.h
+
+ /** SMM MSRs. */
+ #define MSR_K7_SMBASE UINT32_C(0xc0010111)
+Index: VirtualBox-6.1.13/include/VBox/vmm/hm_vmx.h
===================================================================
---- VirtualBox-6.1.10.orig/include/VBox/vmm/hm_vmx.h
-+++ VirtualBox-6.1.10/include/VBox/vmm/hm_vmx.h
+--- VirtualBox-6.1.13.orig/include/VBox/vmm/hm_vmx.h
++++ VirtualBox-6.1.13/include/VBox/vmm/hm_vmx.h
@@ -1473,7 +1473,9 @@ AssertCompileSize(VMXABORT, 4);
/** VMCS (and related regions) memory type - Uncacheable. */
#define VMX_BASIC_MEM_TYPE_UC 0
@@ -776,20 +712,20 @@
/** 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-6.1.10/src/VBox/Additions/linux/drm/vbox_drv.h
+Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ VirtualBox-6.1.10/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -86,10 +86,8 @@
- # endif
- #endif
-
--#if defined(CONFIG_SUSE_VERSION)
--# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 1
--# define OPENSUSE_151
--# endif
-+#if defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15 &&
CONFIG_SUSE_PATCHLEVEL == 1
-+# define OPENSUSE_151
+--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_drv.h
++++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.h
+@@ -87,6 +87,12 @@
+ #else
+ # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
#endif
++
++#if defined(CONFIG_SUSE_VERSION)
++# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 1
++# define OPENSUSE_151
++# endif
++#endif
#if defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 12 &&
CONFIG_SUSE_PATCHLEVEL >= 4
# define SUSE_SLE12
+ #endif
++++++ fixes_for_python.patch ++++++
--- /var/tmp/diff_new_pack.DIhDuN/_old 2020-09-01 20:04:37.488515428 +0200
+++ /var/tmp/diff_new_pack.DIhDuN/_new 2020-09-01 20:04:37.488515428 +0200
@@ -6,14 +6,13 @@
Larry Finger
-Index: VirtualBox-5.1.30/src/VBox/Frontends/VBoxShell/vboxshell.py
+Index: VirtualBox-6.1.13/src/VBox/Frontends/VBoxShell/vboxshell.py
===================================================================
---- VirtualBox-5.1.30.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
-+++ VirtualBox-5.1.30/src/VBox/Frontends/VBoxShell/vboxshell.py
+--- VirtualBox-6.1.13.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
++++ VirtualBox-6.1.13/src/VBox/Frontends/VBoxShell/vboxshell.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
- # $Id: vboxshell.py $
+ # $Id: vboxshell.py 82968 2020-02-04 10:35:17Z vboxsync $
-
++++++ fixes_for_sle12.patch ++++++
--- /var/tmp/diff_new_pack.DIhDuN/_old 2020-09-01 20:04:37.500515434 +0200
+++ /var/tmp/diff_new_pack.DIhDuN/_new 2020-09-01 20:04:37.500515434 +0200
@@ -1,38 +1,25 @@
-Index: VirtualBox-6.1.10/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
+Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
-+++ VirtualBox-6.1.10/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
-@@ -49,7 +49,7 @@ typedef struct RTR0SEMLNXWAIT
- {
- /** The wait queue entry. */
- #if LINUX_VERSION_CODE > KERNEL_VERSION(4, 13, 0) \
-- || defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 12 &&
CONFIG_SUSE_PATCHLEVEL == 4 \
-+ || defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 12 &&
CONFIG_SUSE_PATCHLEVEL >= 4 \
- || defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15
- wait_queue_entry_t WaitQE;
- #else
-Index: VirtualBox-6.1.10/src/VBox/Additions/linux/drm/vbox_drv.c
-===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ VirtualBox-6.1.10/src/VBox/Additions/linux/drm/vbox_drv.c
-@@ -327,7 +327,9 @@ static struct drm_driver driver = {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_72)
- # if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) && !defined(RHEL_75) \
- && !defined(OPENSUSE_151)
+--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_drv.c
++++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.c
+@@ -325,7 +325,9 @@ static struct drm_driver driver = {
+ .master_drop = vbox_master_drop,
+ #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
+ # if RTLNX_VER_MAX(4,14,0) && !RTLNX_RHEL_MAJ_PREREQ(7,5) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
+#if !(defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 12 &&
CONFIG_SUSE_PATCHLEVEL >= 4)
.set_busid = drm_pci_set_busid,
+#endif
# endif
#endif
-Index: VirtualBox-6.1.10/src/VBox/Additions/linux/drm/vbox_main.c
+Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/Additions/linux/drm/vbox_main.c
-+++ VirtualBox-6.1.10/src/VBox/Additions/linux/drm/vbox_main.c
+--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_main.c
++++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_main.c
@@ -606,11 +606,13 @@ int vbox_dumb_destroy(struct drm_file *f
#endif
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) && !defined(OPENSUSE_151)
&& !defined(RHEL_77) && !defined(RHEL_81)
+ #if RTLNX_VER_MAX(4,19,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) &&
!RTLNX_RHEL_MAJ_PREREQ(8,1) && !RTLNX_SUSE_MAJ_PREREQ(15,1) &&
!RTLNX_SUSE_MAJ_PREREQ(12,5)
+#if !(defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 12 &&
CONFIG_SUSE_PATCHLEVEL >= 4)
static void ttm_bo_put(struct ttm_buffer_object *bo)
{
@@ -43,143 +30,143 @@
void vbox_gem_free_object(struct drm_gem_object *obj)
{
-Index: VirtualBox-6.1.10/src/VBox/Additions/linux/drm/vbox_ttm.c
+Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_ttm.c
===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ VirtualBox-6.1.10/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -211,7 +211,7 @@ static struct ttm_backend_func vbox_tt_b
+--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
++++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_ttm.c
+@@ -210,7 +210,7 @@ static struct ttm_backend_func vbox_tt_b
+ .destroy = &vbox_ttm_backend_destroy,
};
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76) \
-- && !defined(OPENSUSE_151)
-+ && !defined(OPENSUSE_151) && !defined(SUSE_SLE12)
+-#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
++#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) &&
!defined(SUSE_SLE12)
static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
unsigned long size,
u32 page_flags,
-@@ -229,7 +229,7 @@ static struct ttm_tt *vbox_ttm_tt_create
+@@ -227,7 +227,7 @@ static struct ttm_tt *vbox_ttm_tt_create
+ return NULL;
tt->func = &vbox_tt_backend_func;
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76) \
-- && !defined(OPENSUSE_151)
-+ && !defined(OPENSUSE_151) && !defined(SUSE_SLE12)
+-#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
++#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) &&
!defined(SUSE_SLE12)
if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
#else
if (ttm_tt_init(tt, bo, page_flags)) {
-@@ -243,7 +243,7 @@ static struct ttm_tt *vbox_ttm_tt_create
+@@ -240,7 +240,7 @@ static struct ttm_tt *vbox_ttm_tt_create
+ }
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
- # if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
-- && !defined(OPENSUSE_151)
-+ && !defined(OPENSUSE_151) && !defined(SUSE_SLE12)
+ #if RTLNX_VER_MAX(4,17,0)
+-# if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
++# if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) &&
!defined(SUSE_SLE12)
static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
{
return ttm_pool_populate(ttm);
-@@ -278,7 +278,7 @@ static struct ttm_bo_driver vbox_bo_driv
+@@ -274,7 +274,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 LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || defined(RHEL_75)
- # if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
-- && !defined(OPENSUSE_151)
-+ && !defined(OPENSUSE_151) && !defined(SUSE_SLE12)
+ #if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
+-# if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
++# if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) &&
!defined(SUSE_SLE12)
.io_mem_pfn = ttm_bo_default_io_mem_pfn,
# endif
#endif
-@@ -429,7 +429,7 @@ int vbox_bo_create(struct drm_device *de
+@@ -421,7 +421,7 @@ int vbox_bo_create(struct drm_device *de
+
ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
ttm_bo_type_device, &vboxbo->placement,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0) && !defined(RHEL_76) \
-- && !defined(OPENSUSE_151)
-+ && !defined(OPENSUSE_151) && !defined(SUSE_SLE12)
+-#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
++#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) &&
!defined(SUSE_SLE12)
align >> PAGE_SHIFT, false, NULL, acc_size,
#else
align >> PAGE_SHIFT, false, acc_size,
-@@ -459,7 +459,7 @@ static inline u64 vbox_bo_gpu_offset(str
+@@ -450,7 +450,7 @@ static inline u64 vbox_bo_gpu_offset(str
+
int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
{
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
-- || defined(OPENSUSE_151)
-+ || defined(OPENSUSE_151) || defined(SUSE_SLE12)
+-#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) ||
RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
++#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) ||
RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) ||
defined(SUSE_SLE12)
struct ttm_operation_ctx ctx = { false, false };
#endif
int i, ret;
-@@ -478,7 +478,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
+@@ -468,7 +468,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
+ for (i = 0; i < bo->placement.num_placement; i++)
PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
-- && !defined(OPENSUSE_151)
-+ && !defined(OPENSUSE_151) && !defined(SUSE_SLE12)
+-#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
++#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) &&
!defined(SUSE_SLE12)
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
#else
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
-@@ -497,7 +497,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
+@@ -486,7 +486,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
+
int vbox_bo_unpin(struct vbox_bo *bo)
{
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
-- || defined(OPENSUSE_151)
-+ || defined(OPENSUSE_151) || defined(SUSE_SLE12)
+-#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) ||
RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
++#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) ||
RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) ||
defined(SUSE_SLE12)
struct ttm_operation_ctx ctx = { false, false };
#endif
int i, ret;
-@@ -514,7 +514,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
+@@ -502,7 +502,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
+ for (i = 0; i < bo->placement.num_placement; i++)
PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
-- && !defined(OPENSUSE_151)
-+ && !defined(OPENSUSE_151) && !defined(SUSE_SLE12)
+-#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
++#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) &&
!defined(SUSE_SLE12)
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
#else
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
-@@ -533,7 +533,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
+@@ -520,7 +520,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
+ */
int vbox_bo_push_sysram(struct vbox_bo *bo)
{
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
-- || defined(OPENSUSE_151)
-+ || defined(OPENSUSE_151) || defined(SUSE_SLE12)
+-#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) ||
RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
++#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) ||
RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) ||
defined(SUSE_SLE12)
struct ttm_operation_ctx ctx = { false, false };
#endif
int i, ret;
-@@ -555,7 +555,7 @@ int vbox_bo_push_sysram(struct vbox_bo *
+@@ -541,7 +541,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;
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
-- && !defined(OPENSUSE_151)
-+ && !defined(OPENSUSE_151) && !defined(SUSE_SLE12)
+-#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
++#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) &&
!defined(SUSE_SLE12)
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
#else
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
-Index: VirtualBox-6.1.10/src/VBox/Additions/linux/drm/vbox_drv.h
+Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ VirtualBox-6.1.10/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -91,6 +91,9 @@
- # define OPENSUSE_151
- # endif
+--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_drv.h
++++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.h
+@@ -87,6 +87,9 @@
+ #else
+ # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
#endif
+#if defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 12 &&
CONFIG_SUSE_PATCHLEVEL >= 4
+# define SUSE_SLE12
+#endif
- #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) || defined(RHEL_71)
- #define U8_MAX ((u8)~0U)
-Index: VirtualBox-6.1.10/src/VBox/Additions/linux/drm/vbox_mode.c
-===================================================================
---- VirtualBox-6.1.10.orig/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ VirtualBox-6.1.10/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -547,7 +547,8 @@ static void vbox_set_edid(struct drm_con
+ /** @def RTLNX_RHEL_RANGE
+ * Check that it's a RedHat kernel in the given version range.
+Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_mode.c
+===================================================================
+--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_mode.c
++++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_mode.c
+@@ -544,7 +544,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;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151)
|| defined(RHEL_77) || defined(RHEL_81)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151)
|| \
-+ defined(SUSE_SLE12) || defined(RHEL_77) ||
defined(RHEL_81)
+-#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,7) ||
RTLNX_RHEL_MAJ_PREREQ(8,1) || RTLNX_SUSE_MAJ_PREREQ(15,1) ||
RTLNX_SUSE_MAJ_PREREQ(12,5)
++#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,7) || \
++ defined(SUSE_SLE12) || RTLNX_RHEL_MAJ_PREREQ(8,1) ||
RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
drm_connector_update_edid_property(connector, (struct edid *)edid);
#else
drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
-@@ -722,7 +723,7 @@ static int vbox_connector_init(struct dr
+@@ -719,7 +720,7 @@ static int vbox_connector_init(struct dr
drm_connector_register(connector);
#endif
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151)
|| defined(RHEL_77) || defined(RHEL_81)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151)
|| defined(SUSE_SLE12) || defined(RHEL_77) || defined(RHEL_81)
+-#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,7) ||
RTLNX_RHEL_MAJ_PREREQ(8,1) || RTLNX_SUSE_MAJ_PREREQ(15,1) ||
RTLNX_SUSE_MAJ_PREREQ(12,5)
++#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,7) ||
defined(SUSE_SLE12) || RTLNX_RHEL_MAJ_PREREQ(8,1) ||
RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
drm_connector_attach_encoder(connector, encoder);
#else
drm_mode_connector_attach_encoder(connector, encoder);
++++++ modify_for_4_8_bo_move.patch ++++++
--- /var/tmp/diff_new_pack.DIhDuN/_old 2020-09-01 20:04:37.520515443 +0200
+++ /var/tmp/diff_new_pack.DIhDuN/_new 2020-09-01 20:04:37.524515445 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-6.0.2/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+Index: VirtualBox-6.1.13/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
===================================================================
---- VirtualBox-6.0.2.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
-+++ VirtualBox-6.0.2/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+--- VirtualBox-6.1.13.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
++++ VirtualBox-6.1.13/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
@@ -35,7 +35,7 @@
#include <iprt/assert.h>
#include <iprt/errcore.h>
@@ -10,8 +10,8 @@
+#include <linux/kmemleak.h>
#if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) &&
!defined(RTMEMALLOC_EXEC_HEAP)
- # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23)
-@@ -294,6 +294,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb
+ # if RTLNX_VER_MIN(2,6,23) && RTLNX_VER_MAX(5,8,0)
+@@ -296,6 +296,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb
fFlags &= ~RTMEMHDR_FLAG_KMALLOC;
pHdr = vmalloc(cb + sizeof(*pHdr));
}
++++++ switch_to_python3.4+.patch ++++++
--- /var/tmp/diff_new_pack.DIhDuN/_old 2020-09-01 20:04:37.540515452 +0200
+++ /var/tmp/diff_new_pack.DIhDuN/_new 2020-09-01 20:04:37.544515454 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-6.1.0/src/bldprogs/scm.cpp
+Index: VirtualBox-6.1.13/src/bldprogs/scm.cpp
===================================================================
---- VirtualBox-6.1.0.orig/src/bldprogs/scm.cpp
-+++ VirtualBox-6.1.0/src/bldprogs/scm.cpp
+--- VirtualBox-6.1.13.orig/src/bldprogs/scm.cpp
++++ VirtualBox-6.1.13/src/bldprogs/scm.cpp
@@ -2206,7 +2206,7 @@ static int scmProcessFileInner(PSCMRWSTA
pszTreatAs = "shell";
else if ( (cchFirst >= 15 && strncmp(pchFirst,
"/usr/bin/python", 15) == 0)
@@ -11,10 +11,10 @@
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-6.1.0/src/libs/libxml2-2.9.4/configure
+Index: VirtualBox-6.1.13/src/libs/libxml2-2.9.4/configure
===================================================================
---- VirtualBox-6.1.0.orig/src/libs/libxml2-2.9.4/configure
-+++ VirtualBox-6.1.0/src/libs/libxml2-2.9.4/configure
+--- VirtualBox-6.1.13.orig/src/libs/libxml2-2.9.4/configure
++++ VirtualBox-6.1.13/src/libs/libxml2-2.9.4/configure
@@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES=
PYTHON_TESTS=
pythondir=
@@ -39,11 +39,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PYTHON+:} false; then :
-Index: VirtualBox-6.1.0/src/VBox/ValidationKit/testboxscript/setup.sh
+Index: VirtualBox-6.1.13/src/VBox/ValidationKit/testboxscript/setup.sh
===================================================================
---- VirtualBox-6.1.0.orig/src/VBox/ValidationKit/testboxscript/setup.sh
-+++ VirtualBox-6.1.0/src/VBox/ValidationKit/testboxscript/setup.sh
-@@ -652,7 +652,7 @@ import sys;\
+--- VirtualBox-6.1.13.orig/src/VBox/ValidationKit/testboxscript/setup.sh
++++ VirtualBox-6.1.13/src/VBox/ValidationKit/testboxscript/setup.sh
+@@ -659,7 +659,7 @@ import sys;\
x = sys.version_info[0] == 2 and (sys.version_info[1] >= 6 or
(sys.version_info[1] == 5 and sys.version_info[2] >= 1));\
sys.exit(not x);\
";
@@ -52,12 +52,12 @@
do
python=`which ${python} 2> /dev/null`
if [ -n "${python}" -a -x "${python}" ]; then
-Index: VirtualBox-6.1.0/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+Index: VirtualBox-6.1.13/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
===================================================================
---- VirtualBox-6.1.0.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
-+++ VirtualBox-6.1.0/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
-@@ -20,7 +20,7 @@
- %define %PYTHON% 1
+--- VirtualBox-6.1.13.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
++++ VirtualBox-6.1.13/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+@@ -21,7 +21,7 @@
+ %define %CHM% 1
%define VBOXDOCDIR %{_defaultdocdir}/%NAME%
%global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
@@ -65,7 +65,7 @@
Summary: Oracle VM VirtualBox
Name: %NAME%
-@@ -100,7 +100,7 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/sh
+@@ -101,7 +101,7 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/sh
%if %{?with_python:1}%{!?with_python:0}
(export VBOX_INSTALL_PATH=/usr/lib/virtualbox && \
cd ./sdk/installer && \
@@ -74,10 +74,10 @@
%endif
rm -rf sdk/installer
mv nls $RPM_BUILD_ROOT/usr/share/virtualbox
-Index: VirtualBox-6.1.0/src/libs/libxml2-2.9.4/libxml.spec.in
+Index: VirtualBox-6.1.13/src/libs/libxml2-2.9.4/libxml.spec.in
===================================================================
---- VirtualBox-6.1.0.orig/src/libs/libxml2-2.9.4/libxml.spec.in
-+++ VirtualBox-6.1.0/src/libs/libxml2-2.9.4/libxml.spec.in
+--- VirtualBox-6.1.13.orig/src/libs/libxml2-2.9.4/libxml.spec.in
++++ VirtualBox-6.1.13/src/libs/libxml2-2.9.4/libxml.spec.in
@@ -101,11 +101,11 @@ rm -fr %{buildroot}
make install DESTDIR=%{buildroot}
@@ -93,10 +93,10 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-Index: VirtualBox-6.1.0/src/libs/libxml2-2.9.4/libxml2.spec
+Index: VirtualBox-6.1.13/src/libs/libxml2-2.9.4/libxml2.spec
===================================================================
---- VirtualBox-6.1.0.orig/src/libs/libxml2-2.9.4/libxml2.spec
-+++ VirtualBox-6.1.0/src/libs/libxml2-2.9.4/libxml2.spec
+--- VirtualBox-6.1.13.orig/src/libs/libxml2-2.9.4/libxml2.spec
++++ VirtualBox-6.1.13/src/libs/libxml2-2.9.4/libxml2.spec
@@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot}
%if 0%{?with_python3}
@@ -106,10 +106,10 @@
make install DESTDIR=%{buildroot}
%endif # with_python3
-Index: VirtualBox-6.1.0/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+Index: VirtualBox-6.1.13/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
===================================================================
---- VirtualBox-6.1.0.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-+++ VirtualBox-6.1.0/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+--- VirtualBox-6.1.13.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
++++ VirtualBox-6.1.13/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
@@ -439,6 +439,8 @@ char *PyTraceback_AsString(PyObject *exc
{ // a temp scope so I can use temp locals.
#if PY_MAJOR_VERSION <= 2
@@ -119,10 +119,10 @@
#else
/* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
-Index: VirtualBox-6.1.0/src/libs/xpcom18a4/python/src/PyGBase.cpp
+Index: VirtualBox-6.1.13/src/libs/xpcom18a4/python/src/PyGBase.cpp
===================================================================
---- VirtualBox-6.1.0.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
-+++ VirtualBox-6.1.0/src/libs/xpcom18a4/python/src/PyGBase.cpp
+--- VirtualBox-6.1.13.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
++++ VirtualBox-6.1.13/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 )
@@ -136,11 +136,11 @@
if (iid.Equals(NS_GET_IID(nsISupports)))
return (nsISupports *)(nsIInternalPython *)this;
if (iid.Equals(NS_GET_IID(nsISupportsWeakReference)))
-Index: VirtualBox-6.1.0/src/libs/xpcom18a4/python/Makefile.kmk
+Index: VirtualBox-6.1.13/src/libs/xpcom18a4/python/Makefile.kmk
===================================================================
---- VirtualBox-6.1.0.orig/src/libs/xpcom18a4/python/Makefile.kmk
-+++ VirtualBox-6.1.0/src/libs/xpcom18a4/python/Makefile.kmk
-@@ -533,6 +533,52 @@ VBoxPython3_8m_x86_LIBS = $(VBOX_P
+--- VirtualBox-6.1.13.orig/src/libs/xpcom18a4/python/Makefile.kmk
++++ VirtualBox-6.1.13/src/libs/xpcom18a4/python/Makefile.kmk
+@@ -554,6 +554,52 @@ VBoxPython3_8m_x86_LIBS = $(VBOX_P
endif
endif
@@ -193,10 +193,10 @@
ifdef VBOX_PYTHONDEF_INC
#
# Python without versioning
-Index: VirtualBox-6.1.0/src/libs/xpcom18a4/python/gen_python_deps.py
+Index: VirtualBox-6.1.13/src/libs/xpcom18a4/python/gen_python_deps.py
===================================================================
---- VirtualBox-6.1.0.orig/src/libs/xpcom18a4/python/gen_python_deps.py
-+++ VirtualBox-6.1.0/src/libs/xpcom18a4/python/gen_python_deps.py
+--- VirtualBox-6.1.13.orig/src/libs/xpcom18a4/python/gen_python_deps.py
++++ VirtualBox-6.1.13/src/libs/xpcom18a4/python/gen_python_deps.py
@@ -16,7 +16,7 @@ from __future__ import print_function
import os,sys
from distutils.version import StrictVersion
++++++ virtualbox-fix-ui-background-color.patch ++++++
--- /var/tmp/diff_new_pack.DIhDuN/_old 2020-09-01 20:04:37.728515541 +0200
+++ /var/tmp/diff_new_pack.DIhDuN/_new 2020-09-01 20:04:37.732515543 +0200
@@ -1,8 +1,8 @@
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
-@@ -114,10 +114,6 @@ void UITools::preparePalette()
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
+@@ -124,10 +124,6 @@ void UITools::preparePalette()
{
/* Setup palette: */
setAutoFillBackground(true);
@@ -13,11 +13,11 @@
}
void UITools::prepareLayout()
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
-@@ -1328,7 +1328,7 @@ void UIVirtualBoxManager::prepareMenuBar
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
+@@ -2033,7 +2033,7 @@ void UIVirtualBoxManager::prepareMenuBar
/* Make sure menu-bar fills own solid background: */
menuBar()->setAutoFillBackground(true);
QPalette pal = menuBar()->palette();
@@ -26,13 +26,13 @@
pal.setColor(QPalette::Active, QPalette::Button, color);
menuBar()->setPalette(pal);
}
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
-@@ -121,10 +121,6 @@ void UIChooser::preparePalette()
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
+@@ -193,10 +193,6 @@ void UIChooser::prepare()
+ void UIChooser::preparePalette()
{
- /* Setup palette: */
setAutoFillBackground(true);
- QPalette pal = palette();
- QColor bodyColor = pal.color(QPalette::Active,
QPalette::Midlight).darker(110);
@@ -40,12 +40,12 @@
- setPalette(pal);
}
- void UIChooser::prepareLayout()
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
+ void UIChooser::prepareModel()
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
-@@ -902,7 +902,7 @@ void UIChooserItemMachine::paintBackgrou
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
+@@ -960,7 +960,7 @@ void UIChooserItemMachine::paintBackgrou
else
{
/* Prepare color: */
@@ -54,7 +54,7 @@
/* Draw gradient: */
QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessMax));
-@@ -931,7 +931,7 @@ void UIChooserItemMachine::paintBackgrou
+@@ -989,7 +989,7 @@ void UIChooserItemMachine::paintBackgrou
/* Default background: */
else
{
@@ -63,7 +63,7 @@
color1 = backgroundColor.lighter(m_iDefaultLightnessMax);
color2 = backgroundColor.lighter(m_iDefaultLightnessMax - 70);
}
-@@ -952,7 +952,7 @@ void UIChooserItemMachine::paintBackgrou
+@@ -1010,7 +1010,7 @@ void UIChooserItemMachine::paintBackgrou
/* Default background: */
else
{
@@ -72,7 +72,7 @@
color1 = backgroundColor.lighter(m_iDefaultLightnessMin);
color2 = backgroundColor.lighter(m_iDefaultLightnessMin - 40);
}
-@@ -987,7 +987,7 @@ void UIChooserItemMachine::paintFrame(QP
+@@ -1045,7 +1045,7 @@ void UIChooserItemMachine::paintFrame(QP
strokeColor = pal.color(QPalette::Active,
QPalette::Highlight).lighter(m_iHoverLightnessMin - 50);
/* Default frame: */
else
@@ -81,11 +81,11 @@
/* Create/assign pen: */
QPen pen(strokeColor);
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
-@@ -710,7 +710,7 @@ void UIToolsItem::paintBackground(QPaint
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
+@@ -716,7 +716,7 @@ void UIToolsItem::paintBackground(QPaint
/* Prepare color: */
const QColor backgroundColor = isEnabled()
? pal.color(QPalette::Active,
QPalette::Highlight)
@@ -94,7 +94,7 @@
/* Draw gradient: */
QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
bgGrad.setColorAt(0,
backgroundColor.lighter(m_iHighlightLightnessMax));
-@@ -749,7 +749,7 @@ void UIToolsItem::paintBackground(QPaint
+@@ -755,7 +755,7 @@ void UIToolsItem::paintBackground(QPaint
/* Prepare color: */
const QColor backgroundColor = isEnabled()
? pal.color(QPalette::Active,
QPalette::Highlight)
@@ -103,7 +103,7 @@
/* Draw gradient: */
QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessMax));
-@@ -787,8 +787,8 @@ void UIToolsItem::paintBackground(QPaint
+@@ -793,8 +793,8 @@ void UIToolsItem::paintBackground(QPaint
{
/* Prepare color: */
const QColor backgroundColor = isEnabled()
@@ -114,7 +114,7 @@
/* Draw gradient: */
QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessMax));
-@@ -821,7 +821,7 @@ void UIToolsItem::paintFrame(QPainter *p
+@@ -827,7 +827,7 @@ void UIToolsItem::paintFrame(QPainter *p
strokeColor = pal.color(QPalette::Active,
QPalette::Highlight).lighter(m_iHoverLightnessMin - 50);
/* Default frame: */
else
@@ -123,13 +123,13 @@
/* Create/assign pen: */
QPen pen(strokeColor);
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
-@@ -314,14 +314,6 @@ void UIVirtualBoxManagerWidget::prepare(
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
+@@ -493,14 +493,6 @@ void UIVirtualBoxManagerWidget::prepare(
+ void UIVirtualBoxManagerWidget::preparePalette()
{
- /* Configure palette: */
setAutoFillBackground(true);
- QPalette pal = palette();
-#ifdef VBOX_WS_MAC
@@ -139,10 +139,10 @@
-#endif
- pal.setColor(QPalette::Window, color);
- setPalette(pal);
+ }
- /* Prepare: */
- prepareWidgets();
-@@ -449,7 +441,7 @@ void UIVirtualBoxManagerWidget::prepareW
+ void UIVirtualBoxManagerWidget::prepareWidgets()
+@@ -621,7 +613,7 @@ void UIVirtualBoxManagerWidget::prepareW
}
/* Adjust splitter colors according to main widgets it splits: */
@@ -151,11 +151,11 @@
/* Set the initial distribution. The right site is bigger. */
m_pSplitter->setStretchFactor(0, 2);
m_pSplitter->setStretchFactor(1, 3);
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
-@@ -643,7 +643,7 @@ void UIChooserItem::paintFlatButton(QPai
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
+@@ -647,7 +647,7 @@ void UIChooserItem::paintFlatButton(QPai
/* Prepare colors: */
const QPalette pal = QApplication::palette();
@@ -164,25 +164,25 @@
/* Prepare pen: */
QPen pen;
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
-@@ -245,10 +245,6 @@ void UIChooserView::prepare()
- void UIChooserView::preparePalette()
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
+@@ -246,10 +246,6 @@ void UIChooserView::prepare()
+ void UIChooserView::prepareThis()
{
- /* Setup palette: */
+ /* Prepare palette: */
- QPalette pal = qApp->palette();
- const QColor bodyColor = pal.color(QPalette::Active,
QPalette::Midlight).darker(110);
- pal.setColor(QPalette::Base, bodyColor);
- setPalette(pal);
- }
- void UIChooserView::resizeEvent(QResizeEvent *pEvent)
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
+ /* Prepare frame: */
+ setFrameShape(QFrame::NoFrame);
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
@@ -182,10 +182,6 @@ void UIToolsView::prepare()
void UIToolsView::preparePalette()
{
@@ -194,11 +194,11 @@
}
void UIToolsView::resizeEvent(QResizeEvent *pEvent)
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
-@@ -1183,7 +1183,7 @@ void UIDetailsElement::paintBackground(Q
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
+@@ -1302,7 +1302,7 @@ void UIDetailsElement::paintBackground(Q
const QPalette pal = palette();
/* Paint default background: */
@@ -207,7 +207,7 @@
const QColor dcTone1 = defaultColor.lighter(m_iDefaultToneFinal);
const QColor dcTone2 = defaultColor.lighter(m_iDefaultToneStart);
QLinearGradient gradientDefault(fullRect.topLeft(),
fullRect.bottomLeft());
-@@ -1224,7 +1224,7 @@ void UIDetailsElement::paintFrame(QPaint
+@@ -1343,7 +1343,7 @@ void UIDetailsElement::paintFrame(QPaint
: optionRect;
/* Paint frame: */
@@ -216,10 +216,10 @@
QPen pen(strokeColor);
pen.setWidth(0);
pPainter->setPen(pen);
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
++++ VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
@@ -110,7 +110,7 @@ void UIToolBar::paintEvent(QPaintEvent *
const QRect rectangle = pEvent->rect();
@@ -229,11 +229,11 @@
QLinearGradient gradient(rectangle.topLeft(), rectangle.bottomLeft());
gradient.setColorAt(0, backgroundColor.lighter(130));
gradient.setColorAt(1, backgroundColor.lighter(125));
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
-@@ -700,7 +700,7 @@ void UIDetailsSet::paintBackground(QPain
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
+@@ -764,7 +764,7 @@ void UIDetailsSet::paintBackground(QPain
const QRect optionRect = pOptions->rect;
/* Paint default background: */
@@ -242,11 +242,11 @@
pPainter->fillRect(optionRect, defaultColor);
/* Restore painter: */
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
-@@ -639,7 +639,7 @@ void UIChooserItemGlobal::paintBackgroun
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
+@@ -644,7 +644,7 @@ void UIChooserItemGlobal::paintBackgroun
pPainter->fillRect(rectangle, bgGrad);
#else
/* Prepare color: */
@@ -255,7 +255,7 @@
/* Draw gradient: */
pPainter->fillRect(rectangle, backgroundColor);
#endif
-@@ -670,7 +670,7 @@ void UIChooserItemGlobal::paintFrame(QPa
+@@ -675,7 +675,7 @@ void UIChooserItemGlobal::paintFrame(QPa
strokeColor = pal.color(QPalette::Active,
QPalette::Highlight).lighter(m_iHoverLightnessMin - 50);
/* Default frame: */
else
@@ -264,11 +264,11 @@
/* Create/assign pen: */
QPen pen(strokeColor);
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
-@@ -277,7 +277,7 @@ void UIDetailsGroup::paintBackground(QPa
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
+@@ -286,7 +286,7 @@ void UIDetailsGroup::paintBackground(QPa
#ifdef VBOX_WS_MAC
const QColor defaultColor = palette().color(QPalette::Active,
QPalette::Mid).lighter(145);
#else
@@ -277,11 +277,11 @@
#endif
pPainter->fillRect(optionRect, defaultColor);
-Index:
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
+Index:
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
===================================================================
----
VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
-+++
VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
-@@ -1499,7 +1499,7 @@ void UIChooserItemGroup::paintBackground
+---
VirtualBox-6.1.13.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
++++
VirtualBox-6.1.13/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
+@@ -1579,7 +1579,7 @@ void UIChooserItemGroup::paintBackground
const QPalette pal = palette();
const QColor headerColor = pal.color(QPalette::Active,
model()->selectedItems().contains(this) ?
@@ -290,7 +290,7 @@
/* Root-item: */
if (isRoot())
-@@ -1596,7 +1596,7 @@ void UIChooserItemGroup::paintFrame(QPai
+@@ -1676,7 +1676,7 @@ void UIChooserItemGroup::paintFrame(QPai
const QPalette pal = palette();
const QColor strokeColor = pal.color(QPalette::Active,
model()->selectedItems().contains(this) ?
