pool/virtualbox
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 907366 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/907366
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=220
This commit is contained in:
Dominique Leuenberger 2021-07-22 20:42:50 +00:00 committed by Git OBS Bridge
commit 237ab3e340
11 changed files with 197 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UserManual.pdf
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:66b7dd9f1d5b53b6273d883e16b3776d9a168279383bfba5db479f99effa89b4
size 4972709
oid sha256:be04d8dc6dbde599a34ab3941d85f920cb5363e0c065f3f49292c7dc93bea807
size 4976146

3
VirtualBox-6.1.22-patched.tar.bz2
View File

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

3
VirtualBox-6.1.24-patched.tar.bz2 Normal file
View File

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

23
fix_random_stack_failure.patch
View File

@ -1,23 +0,0 @@
Index: VirtualBox-6.1.22/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm
===================================================================
--- VirtualBox-6.1.22.orig/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm
+++ VirtualBox-6.1.22/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm
@@ -32,10 +32,17 @@
%define STACK_PADDING 0eeeeeeeeeeeeeeeeh
;; Workaround for linux 4.6 fast/slow syscall stack depth difference.
+;; Update: This got worse with linux 5.13 and CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT.
+;; The x86 arch_exit_to_user_mode_prepare code limits the offset to 255,
+;; while the generic limit is 1023. See bugref:10064 for details.
%ifdef VMM_R0_SWITCH_STACK
%define STACK_FUZZ_SIZE 0
%else
- %define STACK_FUZZ_SIZE 128
+ %ifdef RT_OS_LINUX
+ %define STACK_FUZZ_SIZE 384
+ %else
+ %define STACK_FUZZ_SIZE 128
+ %endif
%endif

4
fixes_for_5.14.patch
View File

@ -9,7 +9,7 @@ Index: VirtualBox-6.1.22/src/VBox/Additions/linux/sharedfolders/regops.c
+#if RTLNX_VER_MAX(5, 14,0)
if (!(iter->type & ITER_KVEC)) {
+#else
+ if (iov_iter_type(iter) != ITER_KVEC) {
+ if (!iov_iter_is_kvec(iter)) {
+#endif
/*
* Do we have a stashed page?
@ -21,7 +21,7 @@ Index: VirtualBox-6.1.22/src/VBox/Additions/linux/sharedfolders/regops.c
+# if RTLNX_VER_MAX(5, 14, 0)
if (iter_is_iovec(iter) || (iter->type & ITER_KVEC)) {
+#else
+ if (iter_is_iovec(iter) || (iter_is_iovec(iter) == ITER_KVEC)) {
+ if (iter_is_iovec(iter) || iov_iter_is_kvec(iter)) {
+#endif
#endif
const struct iovec *pCurIov = iter->iov;

30
fixes_for_leap15.2.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.20/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
Index: VirtualBox-6.1.24/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
===================================================================
--- VirtualBox-6.1.20.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-6.1.20/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
--- VirtualBox-6.1.24.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-6.1.24/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -76,6 +76,10 @@
#define VBOXNETFLT_OS_SPECFIC 1
#include "../VBoxNetFltInternal.h"
@ -13,15 +13,15 @@ Index: VirtualBox-6.1.20/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
typedef struct VBOXNETFLTNOTIFIER {
struct notifier_block Notifier;
PVBOXNETFLTINS pThis;
Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_drv.c
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-6.1.20.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_drv.c
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -310,12 +310,15 @@ static void vbox_master_drop(struct drm_
}
static struct drm_driver driver = {
-#if RTLNX_VER_MAX(5,4,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
-#if RTLNX_VER_MAX(5,4,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3) && !RTLNX_SUSE_MAJ_PREREQ(15,3)
- .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
+#if RTLNX_VER_MAX(5,4,0)
+ .driver_features =
@ -33,13 +33,13 @@ Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_drv.c
# endif
- DRIVER_PRIME,
+ DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
#else /* >= 5.4.0 && RHEL >= 8.3 */
#else /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
#endif /* < 5.4.0 */
Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_main.c
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
--- VirtualBox-6.1.20.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_main.c
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_main.c
@@ -640,8 +640,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;
@ -53,11 +53,11 @@ Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_main.c
}
int
Index: VirtualBox-6.1.20/include/iprt/cdefs.h
Index: VirtualBox-6.1.24/include/iprt/cdefs.h
===================================================================
--- VirtualBox-6.1.20.orig/include/iprt/cdefs.h
+++ VirtualBox-6.1.20/include/iprt/cdefs.h
@@ -1173,14 +1173,15 @@
--- VirtualBox-6.1.24.orig/include/iprt/cdefs.h
+++ VirtualBox-6.1.24/include/iprt/cdefs.h
@@ -1184,14 +1184,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)

10
fixes_for_leap15.3.patch
View File

@ -1,13 +1,13 @@
Index: VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
Index: VirtualBox-6.1.24/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
===================================================================
--- VirtualBox-6.1.18.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
--- VirtualBox-6.1.24.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-6.1.24/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -137,9 +137,9 @@
#include <linux/interrupt.h>
#include <linux/completion.h>
#include <linux/compiler.h>
-#if RTLNX_VER_MIN(5,9,0) /* linux/fs.h defined HAVE_UNLOCKED_IOCTL from 2.6.11 up to 5.9, when it became an implicit assumption. */
+//#if RTLNX_VER_MIN(5,9,0) /* linux/fs.h defined HAVE_UNLOCKED_IOCTL from 2.6.11 up to 5.9, when it became an implicit assumption. */
-#if RTLNX_VER_MIN(5,9,0) || RTLNX_SUSE_MAJ_PREREQ(15,3) /* linux/fs.h defined HAVE_UNLOCKED_IOCTL from 2.6.11 up to 5.9 (also 5.3.18-56 in SLES15-SP3), when it became an implicit assumption. */
+//#if RTLNX_VER_MIN(5,9,0) || RTLNX_SUSE_MAJ_PREREQ(15,3) /* linux/fs.h defined HAVE_UNLOCKED_IOCTL from 2.6.11 up to 5.9 (also 5.3.18-56 in SLES15-SP3), when it became an implicit assumption. */
# define HAVE_UNLOCKED_IOCTL 1 /* We use this in a couple of places, so for now just define it for 5.9+ too. */
-#endif
+//#endif

54
fixes_for_sle12.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_drv.c
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-6.1.20.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_drv.c
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -330,7 +330,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-6.1.20/src/VBox/Additions/linux/drm/vbox_drv.c
# endif
#endif
Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_main.c
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
--- VirtualBox-6.1.20.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_main.c
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_main.c
@@ -618,11 +618,13 @@ int vbox_dumb_destroy(struct drm_file *f
#endif
@ -30,11 +30,11 @@ Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_main.c
void vbox_gem_free_object(struct drm_gem_object *obj)
{
Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_ttm.c
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c
===================================================================
--- VirtualBox-6.1.20.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -271,7 +271,7 @@ static struct ttm_backend_func vbox_tt_b
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -291,7 +291,7 @@ static struct ttm_backend_func vbox_tt_b
};
#endif
@ -43,7 +43,7 @@ Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_ttm.c
static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
unsigned long size,
u32 page_flags,
@@ -290,7 +290,7 @@ static struct ttm_tt *vbox_ttm_tt_create
@@ -310,7 +310,7 @@ static struct ttm_tt *vbox_ttm_tt_create
#if RTLNX_VER_MAX(5,10,0)
tt->func = &vbox_tt_backend_func;
#endif
@ -52,7 +52,7 @@ Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_ttm.c
if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
#elif RTLNX_VER_MAX(5,11,0)
if (ttm_tt_init(tt, bo, page_flags)) {
@@ -305,7 +305,7 @@ static struct ttm_tt *vbox_ttm_tt_create
@@ -325,7 +325,7 @@ static struct ttm_tt *vbox_ttm_tt_create
}
#if RTLNX_VER_MAX(4,17,0)
@ -61,7 +61,7 @@ Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_ttm.c
static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
{
return ttm_pool_populate(ttm);
@@ -353,7 +353,7 @@ static struct ttm_bo_driver vbox_bo_driv
@@ -377,7 +377,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)
@ -70,16 +70,16 @@ Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_ttm.c
.io_mem_pfn = ttm_bo_default_io_mem_pfn,
# endif
#endif
@@ -556,7 +556,7 @@ int vbox_bo_create(struct drm_device *de
@@ -600,7 +600,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 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
#elif RTLNX_VER_MAX(5,13,0) /* < 5.13.0 */
align >> PAGE_SHIFT, false, acc_size,
@@ -589,7 +589,7 @@ static inline u64 vbox_bo_gpu_offset(str
@@ -635,7 +635,7 @@ static inline u64 vbox_bo_gpu_offset(str
int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr)
{
@ -88,7 +88,7 @@ Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_ttm.c
struct ttm_operation_ctx ctx = { false, false };
#endif
int ret;
@@ -612,7 +612,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
@@ -658,7 +658,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
#endif
@ -97,7 +97,7 @@ Index: VirtualBox-6.1.20/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);
@@ -634,7 +634,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
@@ -680,7 +680,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
int vbox_bo_unpin(struct vbox_bo *bo)
{
@ -106,7 +106,7 @@ Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_ttm.c
# if RTLNX_VER_MAX(5,11,0)
struct ttm_operation_ctx ctx = { false, false };
# endif
@@ -657,7 +657,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
@@ -703,7 +703,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
#endif
@ -115,7 +115,7 @@ Index: VirtualBox-6.1.20/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)
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
@@ -680,7 +680,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
@@ -726,7 +726,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
*/
int vbox_bo_push_sysram(struct vbox_bo *bo)
{
@ -124,7 +124,7 @@ Index: VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_ttm.c
struct ttm_operation_ctx ctx = { false, false };
# endif
int i, ret;
@@ -701,7 +701,7 @@ int vbox_bo_push_sysram(struct vbox_bo *
@@ -747,7 +747,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;
@ -133,10 +133,10 @@ Index: VirtualBox-6.1.20/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-6.1.20/src/VBox/Additions/linux/drm/vbox_drv.h
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
--- VirtualBox-6.1.20.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_drv.h
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -87,6 +87,9 @@
#else
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
@ -147,10 +147,10 @@ Index: VirtualBox-6.1.20/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-6.1.20/src/VBox/Additions/linux/drm/vbox_mode.c
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_mode.c
===================================================================
--- VirtualBox-6.1.20.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-6.1.20/src/VBox/Additions/linux/drm/vbox_mode.c
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-6.1.24/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];

66
switch_to_python3.4+.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.20/src/bldprogs/scm.cpp
Index: VirtualBox-6.1.24/src/bldprogs/scm.cpp
===================================================================
--- VirtualBox-6.1.20.orig/src/bldprogs/scm.cpp
+++ VirtualBox-6.1.20/src/bldprogs/scm.cpp
--- VirtualBox-6.1.24.orig/src/bldprogs/scm.cpp
+++ VirtualBox-6.1.24/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 @@ Index: VirtualBox-6.1.20/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-6.1.20/src/libs/libxml2-2.9.4/configure
Index: VirtualBox-6.1.24/src/libs/libxml2-2.9.4/configure
===================================================================
--- VirtualBox-6.1.20.orig/src/libs/libxml2-2.9.4/configure
+++ VirtualBox-6.1.20/src/libs/libxml2-2.9.4/configure
--- VirtualBox-6.1.24.orig/src/libs/libxml2-2.9.4/configure
+++ VirtualBox-6.1.24/src/libs/libxml2-2.9.4/configure
@@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES=
PYTHON_TESTS=
pythondir=
@ -39,10 +39,10 @@ Index: VirtualBox-6.1.20/src/libs/libxml2-2.9.4/configure
{ $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.20/src/VBox/ValidationKit/testboxscript/setup.sh
Index: VirtualBox-6.1.24/src/VBox/ValidationKit/testboxscript/setup.sh
===================================================================
--- VirtualBox-6.1.20.orig/src/VBox/ValidationKit/testboxscript/setup.sh
+++ VirtualBox-6.1.20/src/VBox/ValidationKit/testboxscript/setup.sh
--- VirtualBox-6.1.24.orig/src/VBox/ValidationKit/testboxscript/setup.sh
+++ VirtualBox-6.1.24/src/VBox/ValidationKit/testboxscript/setup.sh
@@ -652,7 +652,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 @@ Index: VirtualBox-6.1.20/src/VBox/ValidationKit/testboxscript/setup.sh
do
python=`which ${python} 2> /dev/null`
if [ -n "${python}" -a -x "${python}" ]; then
Index: VirtualBox-6.1.20/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
Index: VirtualBox-6.1.24/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
===================================================================
--- VirtualBox-6.1.20.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+++ VirtualBox-6.1.20/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
@@ -20,7 +20,7 @@
%define %PYTHON% 1
--- VirtualBox-6.1.24.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+++ VirtualBox-6.1.24/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.*$|^/usr/lib/python.*$|^.*\\.py$
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
@ -65,7 +65,7 @@ Index: VirtualBox-6.1.20/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
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 @@ Index: VirtualBox-6.1.20/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
%endif
rm -rf sdk/installer
mv nls $RPM_BUILD_ROOT/usr/share/virtualbox
Index: VirtualBox-6.1.20/src/libs/libxml2-2.9.4/libxml.spec.in
Index: VirtualBox-6.1.24/src/libs/libxml2-2.9.4/libxml.spec.in
===================================================================
--- VirtualBox-6.1.20.orig/src/libs/libxml2-2.9.4/libxml.spec.in
+++ VirtualBox-6.1.20/src/libs/libxml2-2.9.4/libxml.spec.in
--- VirtualBox-6.1.24.orig/src/libs/libxml2-2.9.4/libxml.spec.in
+++ VirtualBox-6.1.24/src/libs/libxml2-2.9.4/libxml.spec.in
@@ -101,11 +101,11 @@ rm -fr %{buildroot}
make install DESTDIR=%{buildroot}
@ -93,10 +93,10 @@ Index: VirtualBox-6.1.20/src/libs/libxml2-2.9.4/libxml.spec.in
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
Index: VirtualBox-6.1.20/src/libs/libxml2-2.9.4/libxml2.spec
Index: VirtualBox-6.1.24/src/libs/libxml2-2.9.4/libxml2.spec
===================================================================
--- VirtualBox-6.1.20.orig/src/libs/libxml2-2.9.4/libxml2.spec
+++ VirtualBox-6.1.20/src/libs/libxml2-2.9.4/libxml2.spec
--- VirtualBox-6.1.24.orig/src/libs/libxml2-2.9.4/libxml2.spec
+++ VirtualBox-6.1.24/src/libs/libxml2-2.9.4/libxml2.spec
@@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot}
%if 0%{?with_python3}
@ -106,10 +106,10 @@ Index: VirtualBox-6.1.20/src/libs/libxml2-2.9.4/libxml2.spec
make install DESTDIR=%{buildroot}
%endif # with_python3
Index: VirtualBox-6.1.20/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
Index: VirtualBox-6.1.24/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
===================================================================
--- VirtualBox-6.1.20.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-6.1.20/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
--- VirtualBox-6.1.24.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-6.1.24/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 @@ Index: VirtualBox-6.1.20/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-6.1.20/src/libs/xpcom18a4/python/src/PyGBase.cpp
Index: VirtualBox-6.1.24/src/libs/xpcom18a4/python/src/PyGBase.cpp
===================================================================
--- VirtualBox-6.1.20.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-6.1.20/src/libs/xpcom18a4/python/src/PyGBase.cpp
--- VirtualBox-6.1.24.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-6.1.24/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,10 +136,10 @@ Index: VirtualBox-6.1.20/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-6.1.20/src/libs/xpcom18a4/python/Makefile.kmk
Index: VirtualBox-6.1.24/src/libs/xpcom18a4/python/Makefile.kmk
===================================================================
--- VirtualBox-6.1.20.orig/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-6.1.20/src/libs/xpcom18a4/python/Makefile.kmk
--- VirtualBox-6.1.24.orig/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-6.1.24/src/libs/xpcom18a4/python/Makefile.kmk
@@ -579,6 +579,52 @@ VBoxPython3_9m_x86_LIBS = $(VBOX_P
endif
endif
@ -193,10 +193,10 @@ Index: VirtualBox-6.1.20/src/libs/xpcom18a4/python/Makefile.kmk
ifdef VBOX_PYTHONDEF_INC
#
# Python without versioning
Index: VirtualBox-6.1.20/src/libs/xpcom18a4/python/gen_python_deps.py
Index: VirtualBox-6.1.24/src/libs/xpcom18a4/python/gen_python_deps.py
===================================================================
--- VirtualBox-6.1.20.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-6.1.20/src/libs/xpcom18a4/python/gen_python_deps.py
--- VirtualBox-6.1.24.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-6.1.24/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

35
virtualbox.changes
View File

@ -1,8 +1,41 @@
-------------------------------------------------------------------
Tue Jul 20 23:38:41 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>
- Version bump to 6.1.24 (released July 20 2021 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
Storage: Fixed starting a VM if a device is attached to a VirtIO SCSI port higher than 30 (bug #20213)
Storage: Improvement to DVD medium change signaling
Serial: Fixed a the guest missing interrupts under certain circumstances (6.0 regression, bug #18668)
Audio: Multiple fixes and enhancements
Network: Fixed connectivity issue with virtio-net after resuming VM with disconnected link
Network: Fixed UDP GSO fragmentation issue with missing 8 bytes of payload at the end of the first fragment
API: Fixed VM configuration for recent Windows Server versions
Extension Pack: Fixed issues with USB webcam pass-through on Linux
Host and guest driver: Fix small memory leak (bug #20280)
Linux host and guest: Support kernel version 5.13 (bug #20456)
Linux host and guest: Introduce support for SUSE SLES/SLED 15 SP3 kernels (bug #20396)
Linux host: Installer will not attempt to build kernel modules if system already has them installed and modules versions match current version
Guest Additions: Fixed crash on using shared clipboard (bug #19165)
Linux Guest Additions: Introduce support for Ubuntu specific kernels (bug #20325)
Solaris guest: Increased default memory and disk sizes
EFI: Support network booting with the E1000 network controller emulation
EFI: Stability improvements (bug #20090)
Delete file "fix_random_stack_failure.patch" - fixed upstream.
-------------------------------------------------------------------
Fri Jul 16 18:52:48 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>
- Add vboximg-mount to packaging. boo#1188045.
Fix an error in file "fixes_for_5.14.patch".
-------------------------------------------------------------------
Thu Jul 15 00:31:08 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>
- Add file "fix_random_stack_failure.patch" to fix CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT
problem with kernel 5.13 as shown in boo#118105.
problem with kernel 5.13 as shown in boo#1188105.
-------------------------------------------------------------------
Wed Jul 14 04:03:16 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>

80
virtualbox.spec
View File

@ -70,7 +70,7 @@ python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile
# ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!!
Name: virtualbox%{?dash}%{?name_suffix}
Version: 6.1.22
Version: 6.1.24
Release: 0
Summary: %{package_summary}
License: GPL-2.0-or-later
@ -188,8 +188,6 @@ Patch139: fixes_for_leap15.3.patch
Patch141: vb-6.1.16-modal-dialog-parent.patch
# Fixes for kernel 5.14
Patch142: fixes_for_5.14.patch
# Fix for CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT
Patch143: fix_random_stack_failure.patch
Patch999: virtualbox-fix-ui-background-color.patch
#
@ -338,6 +336,14 @@ the terms of the GNU Public License (GPL).
@ -388,6 +394,14 @@ This package contains the code for the GUI used to control VMs.
@ -432,6 +446,14 @@ The VirtualBox web server is used to control headless VMs using a browser.
@ -478,6 +500,14 @@ This package contains X11 guest utilities and X11 guest mouse and video drivers
@ -529,6 +559,14 @@ VirtualBox guest addition tools.
@ -580,6 +618,14 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
@ -626,6 +672,14 @@ Development file for %{name}
@ -676,6 +730,14 @@ sudo /sbin/vboxguestconfig
@ -718,6 +780,14 @@ This package contains icons for guest desktop files that were created on the des
@ -800,7 +870,6 @@ This package contains the kernel-modules that VirtualBox uses to create or run v
%endif
%patch141 -p1
%patch142 -p1
%patch143 -p1
# make VB UI background colors look sane again
%patch999 -p1
@ -959,6 +1028,7 @@ install -m 755 VBoxDTrace %{buildroot}%{_vbox_instdir}
install -m 755 VBoxDbg.so %{buildroot}%{_vbox_instdir}
install -m 755 VBoxDbg.so %{buildroot}%{_vbox_instdir}
install -m 755 UICommon.so %{buildroot}%{_vbox_instdir}
install -m 755 vboximg-mount %{buildroot}%{_vbox_instdir}
# create links to vbox tools in PATH - they could be usefull for controlling vbox from command line
ln -s %{_vbox_instdir}/VBoxManage %{buildroot}%{_bindir}/VBoxManage
ln -s %{_vbox_instdir}/VBoxHeadless %{buildroot}%{_bindir}/VBoxHeadless
@ -970,6 +1040,7 @@ install -m 755 VBoxExtPackHelperApp %{buildroot}%{_vbox_instdir}
install -m 755 VBoxTestOGL %{buildroot}%{_vbox_instdir}
install -m 755 VBoxPermissionMessage %{buildroot}%{_vbox_instdir}
install -m 755 VBoxSUIDMessage %{buildroot}%{_vbox_instdir}
install -m 755 vboximg-mount %{buildroot}%{_vbox_instdir}
install -m 755 VBoxUSB_DevRules %{buildroot}%{_vbox_instdir}
install -m 755 VBoxNetDHCP %{buildroot}%{_vbox_instdir}
install -m 755 VBoxNetAdpCtl %{buildroot}%{_vbox_instdir}
@ -1261,6 +1332,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
%{_vbox_instdir}/VBoxTunctl
%{_vbox_instdir}/VBoxXPCOMIPCD
%{_vbox_instdir}/VBoxExtPackHelperApp
%{_vbox_instdir}/vboximg-mount
%{_vbox_instdir}/DbgPlugInDiggers.so
%{_vbox_instdir}/VBoxAuth.so
%{_vbox_instdir}/VBoxAuthSimple.so