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

Accepting request 933168 from home:lwfinger:branches:Virtualization

Browse Source 
- Version bump to 6.1.30 (released November 22 2021 by Oracle)
  This is a maintenance release. The following items were fixed and/or added:
  VMM: Fixed 6.1.28 regression preventing VMs starting when using Hyper-V mode on Windows 10
  GUI: Fixed inability to complete First Run wizard after browsing for an external image
  GUI: Fixed crash on macOS Big Sur while browsing for an external image from First Run wizard
  GUI: Fixed bug on Windows with inability to save taken screenshot under a folder with native name (bug #15561)
  GUI: Fixed bug on X11 with drag and drop initiated on single mouse click in VM storage settings
  GUI: Fixed settings check on machines not supporting hardware virtualization
  GUI: Non critical media related errors should not cause modal pop-up error messages
  Host-only networking: Fixed crash parsing /etc/vbox/networks.conf
  DVD: Fixed drive lock handling across VM reset
  VBoxHeadless: Fixed crash when running on macOS Monterey (bug #20636)
  VBoxManage: Fixed incorrect help text for "hostonlyif"
  vboximg-mount: Error message if no image is specified
  Linux host: For all distribution specific packages (deb/rpm format) fix the packaging so that the feature for unattended installation of guest OSes works
  Linux host and guest: Introduced initial support for kernel 5.16
  Shared Clipboard: Improved communication between guest and host when guest has no clipboard data to report
  Linux Guest Additions: Allow running only one VBoxDRMClient instance (bug #19373)
  File "fixes_for_5.14.patch" deleted - fixed upstream.
  File "fixes-for-5.15.patch" deleted - fixed upstream.
  File "fixes-for-5.16.patch" deleted - fixed upstream.

OBS-URL: https://build.opensuse.org/request/show/933168
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=624
This commit is contained in:
Larry Finger 2021-11-22 22:02:03 +00:00 committed by Git OBS Bridge
parent eb72d76ac8
commit 8ecd8a37a0
9 changed files with 101 additions and 202 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:80ef644c1fce8dabf09eb56f093c6f24e309d36040acdc4fe84388c495a6a11d oid sha256:146b685a481888b3de307c518c11157aac946c23c13513d6b61cd898d1808f90
size 4982517 size 4985087

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

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

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

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

19
fixes-for-5.15.patch
View File

@ -1,19 +0,0 @@
Index: VirtualBox-6.1.28/include/iprt/stdarg.h
===================================================================
--- VirtualBox-6.1.28.orig/include/iprt/stdarg.h
+++ VirtualBox-6.1.28/include/iprt/stdarg.h
@@ -51,7 +51,12 @@
# include <stdarg.h>
# endif
# else
-# include <stdarg.h>
+# include <linux/version.h>
+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
+# include <stdarg.h>
+# else
+# include <linux/stdarg.h>
+# endif
# endif
#endif

80
fixes-for-5.16.patch
View File

@ -1,80 +0,0 @@
Index: VirtualBox-6.1.28/include/iprt/types.h
===================================================================
--- VirtualBox-6.1.28.orig/include/iprt/types.h
+++ VirtualBox-6.1.28/include/iprt/types.h
@@ -90,8 +90,13 @@ RT_C_DECLS_END
* though they need to be long long unsigned and long long int). These
* defines conflict with our declaration in stdint.h. Adding the defines
* below omits the definitions in the system header.
+ *
*/
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0)
# include <stddef.h>
+#else
+# include <linux/stddef.h>
+#endif
# define _UINT64_T_DECLARED
# define _INT64_T_DECLARED
# define _UINTPTR_T_DECLARED
@@ -131,13 +136,19 @@ RT_C_DECLS_END
* 3. Starting with 2.6.24, linux/types.h typedefs uintptr_t.
* We work around these issues here and nowhere else.
*/
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0)
# include <stddef.h>
+#else
+# include <linux/stddef.h>
+#endif
# if defined(__cplusplus)
typedef bool _Bool;
# endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0)
# define bool linux_bool
# define true linux_true
# define false linux_false
+#endif
# define uintptr_t linux_uintptr_t
# include <linux/version.h>
# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
@@ -185,7 +196,11 @@ RT_C_DECLS_END
# undef true
# undef bool
# else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0)
# include <stddef.h>
+#else
+# include <linux/stddef.h>
+#endif
# include <sys/types.h>
# endif
Index: VirtualBox-6.1.28/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
===================================================================
--- VirtualBox-6.1.28.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-6.1.28/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -35,7 +35,9 @@
* Then use the linux bool type for all the stuff include here.
*/
#include <iprt/types.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0)
#define bool linux_bool
+#endif
#if RT_GNUC_PREREQ(4, 6)
# pragma GCC diagnostic push
Index: VirtualBox-6.1.28/src/VBox/Runtime/include/internal/iprt.h
===================================================================
--- VirtualBox-6.1.28.orig/src/VBox/Runtime/include/internal/iprt.h
+++ VirtualBox-6.1.28/src/VBox/Runtime/include/internal/iprt.h
@@ -41,8 +41,10 @@
&& defined(IN_RING0) \
&& defined(MODULE) \
&& !defined(RT_NO_EXPORT_SYMBOL)
-# define bool linux_bool /* see r0drv/linux/the-linux-kernel.h */
# include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0)
+# define bool linux_bool /* see r0drv/linux/the-linux-kernel.h */
+#endif
# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
# include <generated/autoconf.h>
# else

50
fixes_for_5.14.patch
View File

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

62
switch_to_python3.4+.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.24/src/bldprogs/scm.cpp Index: VirtualBox-6.1.30/src/bldprogs/scm.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/bldprogs/scm.cpp --- VirtualBox-6.1.30.orig/src/bldprogs/scm.cpp
+++ VirtualBox-6.1.24/src/bldprogs/scm.cpp +++ VirtualBox-6.1.30/src/bldprogs/scm.cpp
@@ -2206,7 +2206,7 @@ static int scmProcessFileInner(PSCMRWSTA @@ -2206,7 +2206,7 @@ static int scmProcessFileInner(PSCMRWSTA
pszTreatAs = "shell"; pszTreatAs = "shell";
else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0) else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0)
@ -11,10 +11,10 @@ Index: VirtualBox-6.1.24/src/bldprogs/scm.cpp
else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0) else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0)
|| (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) ) || (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) )
pszTreatAs = "perl"; pszTreatAs = "perl";
Index: VirtualBox-6.1.24/src/libs/libxml2-2.9.4/configure Index: VirtualBox-6.1.30/src/libs/libxml2-2.9.4/configure
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/libs/libxml2-2.9.4/configure --- VirtualBox-6.1.30.orig/src/libs/libxml2-2.9.4/configure
+++ VirtualBox-6.1.24/src/libs/libxml2-2.9.4/configure +++ VirtualBox-6.1.30/src/libs/libxml2-2.9.4/configure
@@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES= @@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES=
PYTHON_TESTS= PYTHON_TESTS=
pythondir= pythondir=
@ -39,10 +39,10 @@ Index: VirtualBox-6.1.24/src/libs/libxml2-2.9.4/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PYTHON+:} false; then : if ${ac_cv_path_PYTHON+:} false; then :
Index: VirtualBox-6.1.24/src/VBox/ValidationKit/testboxscript/setup.sh Index: VirtualBox-6.1.30/src/VBox/ValidationKit/testboxscript/setup.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/VBox/ValidationKit/testboxscript/setup.sh --- VirtualBox-6.1.30.orig/src/VBox/ValidationKit/testboxscript/setup.sh
+++ VirtualBox-6.1.24/src/VBox/ValidationKit/testboxscript/setup.sh +++ VirtualBox-6.1.30/src/VBox/ValidationKit/testboxscript/setup.sh
@@ -652,7 +652,7 @@ import sys;\ @@ -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));\ 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);\ sys.exit(not x);\
@ -52,10 +52,10 @@ Index: VirtualBox-6.1.24/src/VBox/ValidationKit/testboxscript/setup.sh
do do
python=`which ${python} 2> /dev/null` python=`which ${python} 2> /dev/null`
if [ -n "${python}" -a -x "${python}" ]; then if [ -n "${python}" -a -x "${python}" ]; then
Index: VirtualBox-6.1.24/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec Index: VirtualBox-6.1.30/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec --- VirtualBox-6.1.30.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+++ VirtualBox-6.1.24/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +++ VirtualBox-6.1.30/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
%define %CHM% 1 %define %CHM% 1
%define VBOXDOCDIR %{_defaultdocdir}/%NAME% %define VBOXDOCDIR %{_defaultdocdir}/%NAME%
@ -73,11 +73,11 @@ Index: VirtualBox-6.1.24/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+ %{python3} ./vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT) + %{python3} ./vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT)
%endif %endif
rm -rf sdk/installer rm -rf sdk/installer
mv nls $RPM_BUILD_ROOT/usr/share/virtualbox mv UnattendedTemplates $RPM_BUILD_ROOT/usr/share/virtualbox
Index: VirtualBox-6.1.24/src/libs/libxml2-2.9.4/libxml.spec.in Index: VirtualBox-6.1.30/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.30.orig/src/libs/libxml2-2.9.4/libxml.spec.in
+++ VirtualBox-6.1.24/src/libs/libxml2-2.9.4/libxml.spec.in +++ VirtualBox-6.1.30/src/libs/libxml2-2.9.4/libxml.spec.in
@@ -101,11 +101,11 @@ rm -fr %{buildroot} @@ -101,11 +101,11 @@ rm -fr %{buildroot}
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
@ -93,10 +93,10 @@ Index: VirtualBox-6.1.24/src/libs/libxml2-2.9.4/libxml.spec.in
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
Index: VirtualBox-6.1.24/src/libs/libxml2-2.9.4/libxml2.spec Index: VirtualBox-6.1.30/src/libs/libxml2-2.9.4/libxml2.spec
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/libs/libxml2-2.9.4/libxml2.spec --- VirtualBox-6.1.30.orig/src/libs/libxml2-2.9.4/libxml2.spec
+++ VirtualBox-6.1.24/src/libs/libxml2-2.9.4/libxml2.spec +++ VirtualBox-6.1.30/src/libs/libxml2-2.9.4/libxml2.spec
@@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot} @@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot}
%if 0%{?with_python3} %if 0%{?with_python3}
@ -106,10 +106,10 @@ Index: VirtualBox-6.1.24/src/libs/libxml2-2.9.4/libxml2.spec
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
%endif # with_python3 %endif # with_python3
Index: VirtualBox-6.1.24/src/libs/xpcom18a4/python/src/ErrorUtils.cpp Index: VirtualBox-6.1.30/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp --- VirtualBox-6.1.30.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-6.1.24/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +++ VirtualBox-6.1.30/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
@@ -439,6 +439,8 @@ char *PyTraceback_AsString(PyObject *exc @@ -439,6 +439,8 @@ char *PyTraceback_AsString(PyObject *exc
{ // a temp scope so I can use temp locals. { // a temp scope so I can use temp locals.
#if PY_MAJOR_VERSION <= 2 #if PY_MAJOR_VERSION <= 2
@ -119,10 +119,10 @@ Index: VirtualBox-6.1.24/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
#else #else
/* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */ /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult); const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
Index: VirtualBox-6.1.24/src/libs/xpcom18a4/python/src/PyGBase.cpp Index: VirtualBox-6.1.30/src/libs/xpcom18a4/python/src/PyGBase.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp --- VirtualBox-6.1.30.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-6.1.24/src/libs/xpcom18a4/python/src/PyGBase.cpp +++ VirtualBox-6.1.30/src/libs/xpcom18a4/python/src/PyGBase.cpp
@@ -183,7 +183,11 @@ PyG_Base::~PyG_Base() @@ -183,7 +183,11 @@ PyG_Base::~PyG_Base()
// Get the correct interface pointer for this object given the IID. // Get the correct interface pointer for this object given the IID.
void *PyG_Base::ThisAsIID( const nsIID &iid ) void *PyG_Base::ThisAsIID( const nsIID &iid )
@ -136,10 +136,10 @@ Index: VirtualBox-6.1.24/src/libs/xpcom18a4/python/src/PyGBase.cpp
if (iid.Equals(NS_GET_IID(nsISupports))) if (iid.Equals(NS_GET_IID(nsISupports)))
return (nsISupports *)(nsIInternalPython *)this; return (nsISupports *)(nsIInternalPython *)this;
if (iid.Equals(NS_GET_IID(nsISupportsWeakReference))) if (iid.Equals(NS_GET_IID(nsISupportsWeakReference)))
Index: VirtualBox-6.1.24/src/libs/xpcom18a4/python/Makefile.kmk Index: VirtualBox-6.1.30/src/libs/xpcom18a4/python/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/libs/xpcom18a4/python/Makefile.kmk --- VirtualBox-6.1.30.orig/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-6.1.24/src/libs/xpcom18a4/python/Makefile.kmk +++ VirtualBox-6.1.30/src/libs/xpcom18a4/python/Makefile.kmk
@@ -579,6 +579,52 @@ VBoxPython3_9m_x86_LIBS = $(VBOX_P @@ -579,6 +579,52 @@ VBoxPython3_9m_x86_LIBS = $(VBOX_P
endif endif
endif endif
@ -193,10 +193,10 @@ Index: VirtualBox-6.1.24/src/libs/xpcom18a4/python/Makefile.kmk
ifdef VBOX_PYTHONDEF_INC ifdef VBOX_PYTHONDEF_INC
# #
# Python without versioning # Python without versioning
Index: VirtualBox-6.1.24/src/libs/xpcom18a4/python/gen_python_deps.py Index: VirtualBox-6.1.30/src/libs/xpcom18a4/python/gen_python_deps.py
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/src/libs/xpcom18a4/python/gen_python_deps.py --- VirtualBox-6.1.30.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-6.1.24/src/libs/xpcom18a4/python/gen_python_deps.py +++ VirtualBox-6.1.30/src/libs/xpcom18a4/python/gen_python_deps.py
@@ -16,7 +16,7 @@ from __future__ import print_function @@ -16,7 +16,7 @@ from __future__ import print_function
import os,sys import os,sys
from distutils.version import StrictVersion from distutils.version import StrictVersion

28
virtualbox.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Mon Nov 22 20:13:41 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>
- Version bump to 6.1.30 (released November 22 2021 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
VMM: Fixed 6.1.28 regression preventing VMs starting when using Hyper-V mode on Windows 10
GUI: Fixed inability to complete First Run wizard after browsing for an external image
GUI: Fixed crash on macOS Big Sur while browsing for an external image from First Run wizard
GUI: Fixed bug on Windows with inability to save taken screenshot under a folder with native name (bug #15561)
GUI: Fixed bug on X11 with drag and drop initiated on single mouse click in VM storage settings
GUI: Fixed settings check on machines not supporting hardware virtualization
GUI: Non critical media related errors should not cause modal pop-up error messages
Host-only networking: Fixed crash parsing /etc/vbox/networks.conf
DVD: Fixed drive lock handling across VM reset
VBoxHeadless: Fixed crash when running on macOS Monterey (bug #20636)
VBoxManage: Fixed incorrect help text for "hostonlyif"
vboximg-mount: Error message if no image is specified
Linux host: For all distribution specific packages (deb/rpm format) fix the packaging so that the feature for unattended installation of guest OSes works
Linux host and guest: Introduced initial support for kernel 5.16
Shared Clipboard: Improved communication between guest and host when guest has no clipboard data to report
Linux Guest Additions: Allow running only one VBoxDRMClient instance (bug #19373)
File "fixes_for_5.14.patch" deleted - fixed upstream.
File "fixes-for-5.15.patch" deleted - fixed upstream.
File "fixes-for-5.16.patch" deleted - fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 17 19:26:11 UTC 2021 - Larry Finger <Larry.Finger@gmail.com> Wed Nov 17 19:26:11 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>

54
virtualbox.spec
View File

@ -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.28 Version: 6.1.30
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"
@ -174,10 +174,6 @@ Patch135: fix-missing-includes-with-qt-5.15.patch
Patch136: fixes_for_gcc10.patch Patch136: fixes_for_gcc10.patch
# Fix for changes in GSOAP 2.8.103 # Fix for changes in GSOAP 2.8.103
Patch137: handle_gsoap_208103.patch Patch137: handle_gsoap_208103.patch
# Fixes for kernel 5.14
Patch138: fixes_for_5.14.patch
Patch139: fixes-for-5.15.patch
Patch140: fixes-for-5.16.patch
# Fix for struct file_operations backport in 15.3 # Fix for struct file_operations backport in 15.3
Patch142: fixes_for_leap15.3.patch Patch142: fixes_for_leap15.3.patch
Patch143: vb-6.1.16-modal-dialog-parent.patch Patch143: vb-6.1.16-modal-dialog-parent.patch
@ -320,8 +316,11 @@ 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
@ -354,8 +353,11 @@ 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
@ -382,8 +384,11 @@ 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
@ -412,8 +417,11 @@ 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
@ -447,8 +455,11 @@ 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
@ -482,8 +493,11 @@ 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
@ -512,8 +526,11 @@ 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
@ -560,8 +577,11 @@ 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
@ -589,8 +609,11 @@ 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
@ -657,9 +680,6 @@ This package contains the kernel-modules that VirtualBox uses to create or run v
%patch135 -p1 %patch135 -p1
%patch136 -p1 %patch136 -p1
%patch137 -p1 %patch137 -p1
%patch138 -p1
%patch139 -p1
%patch140 -p1
%if 0%{?sle_version} == 150300 && 0%{?is_opensuse} %if 0%{?sle_version} == 150300 && 0%{?is_opensuse}
# Patch for Leap 15.3 # Patch for Leap 15.3
%patch142 -p1 %patch142 -p1