jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 926823 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/926823
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=226
This commit is contained in:
Dominique Leuenberger 2021-10-23 21:13:40 +00:00 committed by Git OBS Bridge
commit 37e63b61f1
11 changed files with 186 additions and 89 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 version https://git-lfs.github.com/spec/v1
oid sha256:2b68d0522399a7aac77c40bd42e7620c426caa97e3a1d904c5391e92c4c86979 oid sha256:80ef644c1fce8dabf09eb56f093c6f24e309d36040acdc4fe84388c495a6a11d
size 4977383 size 4982517

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

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

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

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

13
fix_ordering_of_qt_includes.patch
View File

@ -1,13 +0,0 @@
Index: VirtualBox-6.1.26/configure
===================================================================
--- VirtualBox-6.1.26.orig/configure
+++ VirtualBox-6.1.26/configure
@@ -1561,7 +1561,7 @@ EOF
qt5_ver=`pkg-config Qt5Core --modversion 2>> $LOG`
if [ $? -eq 0 ]; then
echo "(Qt5 from pkg-config)" >> $LOG
- FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags`
+ FLGQT5=`pkg-config Qt5Core --cflags`
# gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
[ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11"
INCQT5=`strip_I "$FLGQT5"`

10
fixes-for-5.15.patch
View File

@ -1,10 +1,10 @@
Index: VirtualBox-6.1.26/include/iprt/stdarg.h Index: VirtualBox-6.1.28/include/iprt/stdarg.h
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/include/iprt/stdarg.h --- VirtualBox-6.1.28.orig/include/iprt/stdarg.h
+++ VirtualBox-6.1.26/include/iprt/stdarg.h +++ VirtualBox-6.1.28/include/iprt/stdarg.h
@@ -44,7 +44,12 @@ @@ -51,7 +51,12 @@
# define __builtin_stdarg_start __builtin_va_start # include <stdarg.h>
# endif # endif
# else # else
-# include <stdarg.h> -# include <stdarg.h>

24
fixes_for_5.14.patch
View File

@ -1,46 +1,46 @@
Index: VirtualBox-6.1.22/src/VBox/Additions/linux/sharedfolders/regops.c Index: VirtualBox-6.1.28/src/VBox/Additions/linux/sharedfolders/regops.c
=================================================================== ===================================================================
--- VirtualBox-6.1.22.orig/src/VBox/Additions/linux/sharedfolders/regops.c --- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/sharedfolders/regops.c
+++ VirtualBox-6.1.22/src/VBox/Additions/linux/sharedfolders/regops.c +++ VirtualBox-6.1.28/src/VBox/Additions/linux/sharedfolders/regops.c
@@ -2126,7 +2126,11 @@ static int vbsf_iter_lock_pages(struct i @@ -2138,7 +2138,11 @@ static int vbsf_iter_lock_pages(struct i
int rc = 0; int rc = 0;
Assert(iov_iter_count(iter) + pStash->cb > 0); Assert(iov_iter_count(iter) + pStash->cb > 0);
+#if RTLNX_VER_MAX(5, 14,0) +#if RTLNX_VER_MAX(5, 14,0)
if (!(iter->type & ITER_KVEC)) { if (!(VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
+#else +#else
+ if (!iov_iter_is_kvec(iter)) { + if (!iov_iter_is_kvec(iter)) {
+#endif +#endif
/* /*
* Do we have a stashed page? * Do we have a stashed page?
*/ */
@@ -2373,7 +2377,11 @@ static size_t vbsf_iter_max_span_of_page @@ -2385,7 +2389,11 @@ static size_t vbsf_iter_max_span_of_page
{ {
size_t cPages; size_t cPages;
# if RTLNX_VER_MIN(3,16,0) # if RTLNX_VER_MIN(3,16,0)
+# if RTLNX_VER_MAX(5, 14, 0) +# if RTLNX_VER_MAX(5, 14, 0)
if (iter_is_iovec(iter) || (iter->type & ITER_KVEC)) { if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
+#else +#else
+ if (iter_is_iovec(iter) || iov_iter_is_kvec(iter)) { + if (iter_is_iovec(iter) || iov_iter_is_kvec(iter)) {
+#endif +#endif
# endif # endif
const struct iovec *pCurIov = iter->iov; const struct iovec *pCurIov = iter->iov;
size_t cLeft = iter->nr_segs; size_t cLeft = iter->nr_segs;
@@ -2436,7 +2444,11 @@ static size_t vbsf_iter_max_span_of_page @@ -2448,7 +2456,11 @@ static size_t vbsf_iter_max_span_of_page
} else { } else {
/* Won't bother with accurate counts for the next two types, just make /* Won't bother with accurate counts for the next two types, just make
some rough estimates (does pipes have segments?): */ some rough estimates (does pipes have segments?): */
+#if RTLNX_VER_MAX(5, 14,0) +#if RTLNX_VER_MAX(5, 14,0)
size_t cSegs = iter->type & ITER_BVEC ? RT_MAX(1, iter->nr_segs) : 1; size_t cSegs = VBSF_GET_ITER_TYPE(iter) & ITER_BVEC ? RT_MAX(1, iter->nr_segs) : 1;
+#else +#else
+ size_t cSegs = (iov_iter_type(iter) == ITER_BVEC) ? RT_MAX(1, iter->nr_segs) : 1; + size_t cSegs = (iov_iter_type(iter) == ITER_BVEC) ? RT_MAX(1, iter->nr_segs) : 1;
+#endif +#endif
cPages = (iov_iter_count(iter) + (PAGE_SIZE * 2 - 2) * cSegs) >> PAGE_SHIFT; cPages = (iov_iter_count(iter) + (PAGE_SIZE * 2 - 2) * cSegs) >> PAGE_SHIFT;
} }
# endif # endif
@@ -3793,7 +3805,9 @@ struct address_space_operations vbsf_reg @@ -3831,7 +3843,9 @@ struct address_space_operations vbsf_reg
#endif .write_end = vbsf_write_end,
#if RTLNX_VER_MIN(2,6,24) #elif RTLNX_VER_MIN(2,6,24)
.write_begin = vbsf_write_begin, .write_begin = vbsf_write_begin,
+#if RTLNX_VER_MAX(5, 14, 0) +#if RTLNX_VER_MAX(5, 14, 0)
.write_end = simple_write_end, .write_end = simple_write_end,

68
fixes_for_sle12.patch
View File

@ -1,8 +1,8 @@
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.c Index: VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_drv.c
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_drv.c --- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.c +++ VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -330,7 +330,9 @@ static struct drm_driver driver = { @@ -349,7 +349,9 @@ static struct drm_driver driver = {
.master_drop = vbox_master_drop, .master_drop = vbox_master_drop,
#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2) #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 RTLNX_VER_MAX(4,14,0) && !RTLNX_RHEL_MAJ_PREREQ(7,5) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
@ -12,11 +12,11 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.c
# endif # endif
#endif #endif
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_main.c Index: VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_main.c
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_main.c --- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_main.c +++ VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_main.c
@@ -618,11 +618,13 @@ int vbox_dumb_destroy(struct drm_file *f @@ -622,11 +622,13 @@ int vbox_dumb_destroy(struct drm_file *f
#endif #endif
#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 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)
@ -30,11 +30,11 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_main.c
void vbox_gem_free_object(struct drm_gem_object *obj) void vbox_gem_free_object(struct drm_gem_object *obj)
{ {
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c Index: VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_ttm.c
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_ttm.c --- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c +++ VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -291,7 +291,7 @@ static struct ttm_backend_func vbox_tt_b @@ -297,7 +297,7 @@ static struct ttm_backend_func vbox_tt_b
}; };
#endif #endif
@ -43,16 +43,16 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c
static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev, static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
unsigned long size, unsigned long size,
u32 page_flags, u32 page_flags,
@@ -310,7 +310,7 @@ static struct ttm_tt *vbox_ttm_tt_create @@ -316,7 +316,7 @@ static struct ttm_tt *vbox_ttm_tt_create
#if RTLNX_VER_MAX(5,10,0) #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
tt->func = &vbox_tt_backend_func; tt->func = &vbox_tt_backend_func;
#endif #endif
-#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)
+#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 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)) { if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
#elif RTLNX_VER_MAX(5,11,0) #elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
if (ttm_tt_init(tt, bo, page_flags)) { if (ttm_tt_init(tt, bo, page_flags)) {
@@ -325,7 +325,7 @@ static struct ttm_tt *vbox_ttm_tt_create @@ -331,7 +331,7 @@ static struct ttm_tt *vbox_ttm_tt_create
} }
#if RTLNX_VER_MAX(4,17,0) #if RTLNX_VER_MAX(4,17,0)
@ -61,7 +61,7 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c
static int vbox_ttm_tt_populate(struct ttm_tt *ttm) static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
{ {
return ttm_pool_populate(ttm); return ttm_pool_populate(ttm);
@@ -377,7 +377,7 @@ static struct ttm_bo_driver vbox_bo_driv @@ -385,7 +385,7 @@ static struct ttm_bo_driver vbox_bo_driv
.io_mem_reserve = &vbox_ttm_io_mem_reserve, .io_mem_reserve = &vbox_ttm_io_mem_reserve,
.io_mem_free = &vbox_ttm_io_mem_free, .io_mem_free = &vbox_ttm_io_mem_free,
#if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5) #if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
@ -70,7 +70,7 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c
.io_mem_pfn = ttm_bo_default_io_mem_pfn, .io_mem_pfn = ttm_bo_default_io_mem_pfn,
# endif # endif
#endif #endif
@@ -600,7 +600,7 @@ int vbox_bo_create(struct drm_device *de @@ -622,7 +622,7 @@ int vbox_bo_create(struct drm_device *de
ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size, ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
ttm_bo_type_device, &vboxbo->placement, ttm_bo_type_device, &vboxbo->placement,
@ -79,7 +79,7 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c
align >> PAGE_SHIFT, false, NULL, acc_size, align >> PAGE_SHIFT, false, NULL, acc_size,
#elif RTLNX_VER_MAX(5,13,0) /* < 5.13.0 */ #elif RTLNX_VER_MAX(5,13,0) /* < 5.13.0 */
align >> PAGE_SHIFT, false, acc_size, align >> PAGE_SHIFT, false, acc_size,
@@ -635,7 +635,7 @@ static inline u64 vbox_bo_gpu_offset(str @@ -664,7 +664,7 @@ static inline u64 vbox_bo_gpu_offset(str
int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr) int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr)
{ {
@ -88,7 +88,7 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c
struct ttm_operation_ctx ctx = { false, false }; struct ttm_operation_ctx ctx = { false, false };
#endif #endif
int ret; int ret;
@@ -658,7 +658,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 @@ -687,7 +687,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT; PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
#endif #endif
@ -97,25 +97,25 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
#else #else
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx); ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
@@ -680,7 +680,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 @@ -709,7 +709,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
int vbox_bo_unpin(struct vbox_bo *bo) int vbox_bo_unpin(struct vbox_bo *bo)
{ {
-#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)
+#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) +#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)
# if RTLNX_VER_MAX(5,11,0) # if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
struct ttm_operation_ctx ctx = { false, false }; struct ttm_operation_ctx ctx = { false, false };
# endif # endif
@@ -703,7 +703,7 @@ int vbox_bo_unpin(struct vbox_bo *bo) @@ -732,7 +732,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT; PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
#endif #endif
-#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)
+#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) +#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); ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
#elif RTLNX_VER_MAX(5,11,0) #elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx); ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
@@ -726,7 +726,7 @@ int vbox_bo_unpin(struct vbox_bo *bo) @@ -755,7 +755,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
*/ */
int vbox_bo_push_sysram(struct vbox_bo *bo) int vbox_bo_push_sysram(struct vbox_bo *bo)
{ {
@ -124,7 +124,7 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c
struct ttm_operation_ctx ctx = { false, false }; struct ttm_operation_ctx ctx = { false, false };
# endif # endif
int i, ret; int i, ret;
@@ -747,7 +747,7 @@ int vbox_bo_push_sysram(struct vbox_bo * @@ -776,7 +776,7 @@ int vbox_bo_push_sysram(struct vbox_bo *
for (i = 0; i < bo->placement.num_placement; i++) for (i = 0; i < bo->placement.num_placement; i++)
PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT; PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
@ -133,10 +133,10 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_ttm.c
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
# else # else
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx); ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.h Index: VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_drv.h
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_drv.h --- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.h +++ VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -87,6 +87,9 @@ @@ -87,6 +87,9 @@
#else #else
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
@ -147,11 +147,11 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.h
/** @def RTLNX_RHEL_RANGE /** @def RTLNX_RHEL_RANGE
* Check that it's a RedHat kernel in the given version range. * Check that it's a RedHat kernel in the given version range.
Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_mode.c Index: VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_mode.c
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_mode.c --- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_mode.c +++ VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -544,7 +544,8 @@ static void vbox_set_edid(struct drm_con @@ -548,7 +548,8 @@ static void vbox_set_edid(struct drm_con
for (i = 0; i < EDID_SIZE - 1; ++i) for (i = 0; i < EDID_SIZE - 1; ++i)
sum += edid[i]; sum += edid[i];
edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF; edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
@ -161,7 +161,7 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_mode.c
drm_connector_update_edid_property(connector, (struct edid *)edid); drm_connector_update_edid_property(connector, (struct edid *)edid);
#else #else
drm_mode_connector_update_edid_property(connector, (struct edid *)edid); drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
@@ -719,7 +720,7 @@ static int vbox_connector_init(struct dr @@ -723,7 +724,7 @@ static int vbox_connector_init(struct dr
drm_connector_register(connector); drm_connector_register(connector);
#endif #endif

8
modify_for_4_8_bo_move.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.13/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c Index: VirtualBox-6.1.28/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.28.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+++ VirtualBox-6.1.13/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +++ VirtualBox-6.1.28/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
#include <iprt/assert.h> #include <iprt/assert.h>
#include <iprt/errcore.h> #include <iprt/errcore.h>
@ -10,7 +10,7 @@ Index: VirtualBox-6.1.13/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+#include <linux/kmemleak.h> +#include <linux/kmemleak.h>
#if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP) #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP)
# if RTLNX_VER_MIN(2,6,23) && RTLNX_VER_MAX(5,8,0) # if RTLNX_VER_MIN(2,6,23) && RTLNX_VER_MAX(5,8,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
@@ -296,6 +296,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb @@ -296,6 +296,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb
fFlags &= ~RTMEMHDR_FLAG_KMALLOC; fFlags &= ~RTMEMHDR_FLAG_KMALLOC;
pHdr = vmalloc(cb + sizeof(*pHdr)); pHdr = vmalloc(cb + sizeof(*pHdr));

1
virtualbox-kmp-files
View File

@ -7,4 +7,3 @@
%{kernel_module_directory}/%2-%1/extra/vboxsf.ko %{kernel_module_directory}/%2-%1/extra/vboxsf.ko
%{kernel_module_directory}/%2-%1/extra/vboxguest.ko %{kernel_module_directory}/%2-%1/extra/vboxguest.ko
#%{kernel_module_directory}/%2-%1/extra/vboxvideo.ko #%{kernel_module_directory}/%2-%1/extra/vboxvideo.ko

33
virtualbox.changes
View File

@ -1,3 +1,36 @@
-------------------------------------------------------------------
Wed Oct 20 05:48:42 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>
- Version bump to 6.1.28 (released October 19 2021 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
VMM: Fixed guru meditation while booting nested-guests accessing debug registers under certain conditions
UI: Bug fixes for touchpad-based scrolling
VMSVGA: Fixed VM black screen issue on first resize after restoring from saved state (bug #20067)
VMSVGA: Fixed display corruption on Linux Mint (bug #20513)
Storage: Fixed a possible write error under certain circumstances when using VHD images (bug #20512)
Network: Multiple updates in virtio-net device support
Network: Disconnecting cable in saved VM state now is handled properly by virtio-net
Network: More administrative control over network ranges, see user manual
NAT: Fixed not rejecting TFTP requests with absolute pathnames (bug #20589)
Audio: Fixed VM session aborting after PC hibernation (bug #20516)
Audio: Fixed setting the line-in volume of the HDA emulation on modern Linux guests
Audio: Fixed resuming playback of the AC'97 emulation while a snapshot has been taken
API: Added bindings support for Python 3.9 (bug #20252)
API: Fixed rare hang of VM when changing settings at runtime
Linux host: Improved kernel modules installation detection which prevents unnecessary modules rebuild
Host Services: Shared Clipboard: Prevent guest clipboard reset when clipboard sharing is disabled (bug #20487)
Host Services: Shared Clipboard over VRDP: Fixed to continue working when guest service reconnects to host (bug #20366)
Host Services: Shared Clipboard over VRDP: Fixed preventing remote RDP client to hang when guest has no clipboard data to report
Linux Host and Guest: Introduced initial support for kernels 5.14 and 5.15
Linux Host and Guest: Introduced initial support for RHEL 8.5 kernel
Windows Guest: Introduced Windows 11 guest support, including unattended installation
Deleted file "fix_ordering_of_qt_includes.patch" - fixed upstream.
Fixes CVE-2021-35538, CVE-2021-35545, CVE-2021-35540, CVE-2021-35542, and CVE-2021-2475 (boo#1191869)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 12 13:03:59 UTC 2021 - Ludwig Nussel <lnussel@suse.de> Tue Oct 12 13:03:59 UTC 2021 - Ludwig Nussel <lnussel@suse.de>

106
virtualbox.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package virtualbox # spec file
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
@ -63,7 +63,7 @@ python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile
%endif %endif
# ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!! # ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!!
Name: virtualbox%{?dash}%{?name_suffix} Name: virtualbox%{?dash}%{?name_suffix}
Version: 6.1.26 Version: 6.1.28
Release: 0 Release: 0
Summary: %{package_summary} Summary: %{package_summary}
# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" # FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
@ -179,7 +179,6 @@ Patch139: fixes_for_leap15.3.patch
Patch141: vb-6.1.16-modal-dialog-parent.patch Patch141: vb-6.1.16-modal-dialog-parent.patch
# Fixes for kernel 5.14 # Fixes for kernel 5.14
Patch142: fixes_for_5.14.patch Patch142: fixes_for_5.14.patch
Patch143: fix_ordering_of_qt_includes.patch
Patch144: fixes_for_leap15.4.patch Patch144: fixes_for_leap15.4.patch
Patch145: fixes-for-5.15.patch Patch145: fixes-for-5.15.patch
Patch999: virtualbox-fix-ui-background-color.patch Patch999: virtualbox-fix-ui-background-color.patch
@ -305,8 +304,17 @@ hardware. VirtualBox is freely available as Open Source Software under
the terms of the GNU Public License (GPL). the terms of the GNU Public License (GPL).
##########################################
##########################################
%package qt %package qt
Summary: Qt GUI part for %{name} Summary: Qt GUI part for %{name}
Group: System/Emulators/PC Group: System/Emulators/PC
@ -324,8 +332,17 @@ Obsoletes: %{name}-ose-qt < %{version}
This package contains the code for the GUI used to control VMs. This package contains the code for the GUI used to control VMs.
#########################################
#########################################
%package websrv %package websrv
Summary: WebService GUI part for %{name} Summary: WebService GUI part for %{name}
Group: System/Emulators/PC Group: System/Emulators/PC
@ -337,8 +354,17 @@ Obsoletes: %{name}-vboxwebsrv < %{version}
The VirtualBox web server is used to control headless VMs using a browser. The VirtualBox web server is used to control headless VMs using a browser.
#########################################
#########################################
%package guest-x11 %package guest-x11
Summary: VirtualBox X11 drivers for mouse and video Summary: VirtualBox X11 drivers for mouse and video
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -352,8 +378,17 @@ Obsoletes: xorg-x11-driver-virtualbox-ose < %{version}
This package contains X11 guest utilities and X11 guest mouse and video drivers This package contains X11 guest utilities and X11 guest mouse and video drivers
###########################################
###########################################
%package guest-tools %package guest-tools
Summary: VirtualBox guest tools Summary: VirtualBox guest tools
Group: System/Emulators/PC Group: System/Emulators/PC
@ -372,8 +407,17 @@ Requires(pre): net-tools-deprecated
VirtualBox guest addition tools. VirtualBox guest addition tools.
###########################################
###########################################
%package -n python3-%{name} %package -n python3-%{name}
Summary: Python bindings for %{name} Summary: Python bindings for %{name}
Group: Development/Libraries/Python Group: Development/Libraries/Python
@ -392,8 +436,17 @@ Obsoletes: python3-%{name}-ose < %{version}
Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
###########################################
###########################################
%package devel %package devel
Summary: Devel files for %{name} Summary: Devel files for %{name}
Group: Development/Libraries/Other Group: Development/Libraries/Other
@ -407,8 +460,17 @@ Obsoletes: %{name}-ose-devel < %{version}
Development file for %{name} Development file for %{name}
###########################################
###########################################
%package host-source %package host-source
Summary: Source files for %{name} host kernel modules Summary: Source files for %{name} host kernel modules
Group: Development/Sources Group: Development/Sources
@ -440,8 +502,17 @@ sudo /usr/sbin/vboxguestconfig
###########################################
###########################################
%package guest-desktop-icons %package guest-desktop-icons
Summary: Icons for guest desktop files Summary: Icons for guest desktop files
Group: System/Emulators/PC Group: System/Emulators/PC
@ -454,8 +525,17 @@ This package contains icons for guest desktop files that were created on the des
###########################################
###########################################
%package vnc %package vnc
Summary: VNC desktop sharing Summary: VNC desktop sharing
Group: System/Emulators/PC Group: System/Emulators/PC
@ -528,7 +608,6 @@ This package contains the kernel-modules that VirtualBox uses to create or run v
%endif %endif
%patch141 -p1 %patch141 -p1
%patch142 -p1 %patch142 -p1
%patch143 -p1
%if 0%{?sle_version} == 1504 && 0%{?is_opensuse} %if 0%{?sle_version} == 1504 && 0%{?is_opensuse}
# Patch for Leap 15.4 # Patch for Leap 15.4
%patch144 -p1 %patch144 -p1
@ -716,7 +795,6 @@ install -m 755 VBoxEFI*.fd %{buildroot}%{_vbox_instdir}
install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir} install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir}
install -m 644 *.so %{buildroot}%{_vbox_instdir} install -m 644 *.so %{buildroot}%{_vbox_instdir}
install -m 644 *.r0 %{buildroot}%{_vbox_instdir} install -m 644 *.r0 %{buildroot}%{_vbox_instdir}
rm components/VBoxREM.so
install -m 644 components/* %{buildroot}%{_vbox_instdir}/components/ install -m 644 components/* %{buildroot}%{_vbox_instdir}/components/
# install languages # install languages
install -m 644 nls/* %{buildroot}%{_datadir}/virtualbox/nls/ install -m 644 nls/* %{buildroot}%{_datadir}/virtualbox/nls/