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

Accepting request 741636 from home:lwfinger:branches:Virtualization

Browse Source 
- Add directory %{buildroot}%{_datadir}/metainfo for metafile "virtualbox.appdata.xml

- Version bumk to 6.0.14 (released October 15 2019 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
Virtualization core: fixed an invalid-guest state guru meditation in some rare circumstances on Intel hosts
Virtualization core: some fixes for systems with lots of processors
Audio: relaxed VRM / VRA (variable rate audio) bit checks to provide more compatibility for guests running ALSA setups with the AC'97 emulation
USB: made device capturing for passthrough more accurate and reliable on Windows host
Network: fixed potential issue with interrupt signalling for network adapters in UEFI guests
3D: fixed flicker and redraw issues when using VBoxSVGA or VMSVGA graphics adapter (bugs #18562, #18956)
3D: fixed crash with some applications when using VBoxSVGA or VMSVGA graphics adapter (bug #18638)
macOS host: fix crash of GUI VM process which showed up frequently with 10.15 Catalina (bug #18990)
Linux host: support Linux 5.3, thank you Larry Finger (see also bug #18911)
Linux host: improve python version detection during rpm package creation, can change package dependencies and fix some installation problems
Linux guests: calls to aio_read(3) and aio_write(3) may fail inside shared folders (bug #18805)
Linux guests: fix problem with shared folder unmounting in service script, thank you Denis Ryndine (bug #18853)
Linux guests: VBox 6.0.10 GAs fail to compile on Red Hat/CentOS/Oracle Linux 7.7 and Red Hat 8.1 Beta (bug #18917)
Fix vulnerabilities CVE-2019-3028 CVE-2019-3017 CVE-2019-2944 CVE-2019-3026 CVE-2019-3021
                    CVE-2019-2984 CVE-2019-3002 CVE-2019-3005 CVE-2019-3031 CVE-2019-1547
                    CVE-2019-2926 (bsc#1154166)
Removed file "fixes_for_5.3.patch" - fixes included upstream.

OBS-URL: https://build.opensuse.org/request/show/741636
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=514
This commit is contained in:
Larry Finger 2019-10-22 01:29:29 +00:00 committed by Git OBS Bridge
parent ba36997994
commit dc964dce20
8 changed files with 91 additions and 142 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:4827072513cee45f7a132866294b108e08b2a3aef594a3f69a7eea48d659c6da oid sha256:e8fd7b98890b6505904bc30e0860e69b39ecb8ffda4279887a5ec6ce54e3b3b7
size 4340413 size 4344956

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

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

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

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

81
fixes_for_5.3.patch
View File

@ -1,81 +0,0 @@
Index: VirtualBox-6.0.10/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
===================================================================
--- VirtualBox-6.0.10.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-6.0.10/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -2123,7 +2123,10 @@ static int vboxNetFltLinuxEnumeratorCall
#endif
if (in_dev != NULL)
{
- for_ifa(in_dev) {
+ /* macros for_ifa() and endfor_ifs() disappear for kernel 5.3
+ * Code them directly */
+ struct in_ifaddr *ifa;
+ for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address))
return NOTIFY_OK;
@@ -2137,7 +2140,7 @@ static int vboxNetFltLinuxEnumeratorCall
pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
/* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address);
- } endfor_ifa(in_dev);
+ }
}
/*
Index: VirtualBox-6.0.10/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c
===================================================================
--- VirtualBox-6.0.10.orig/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c
+++ VirtualBox-6.0.10/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c
@@ -283,12 +283,16 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnW
if (RTCpuSetCount(&OnlineSet) > 1)
{
/* Fire the function on all other CPUs without waiting for completion. */
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
+ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
-# else
+#else
int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
-# endif
+#endif
+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
Assert(!rc); NOREF(rc);
+#endif
}
#endif
@@ -326,7 +330,9 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER p
{
#ifdef CONFIG_SMP
IPRT_LINUX_SAVE_EFL_AC();
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
int rc;
+#endif
RTMPARGS Args;
RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
@@ -337,14 +343,18 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER p
Args.cHits = 0;
RTThreadPreemptDisable(&PreemptState);
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
+ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-# else /* older kernels */
+#else /* older kernels */
rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
-# endif /* older kernels */
+#endif /* older kernels */
RTThreadPreemptRestore(&PreemptState);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
Assert(rc == 0); NOREF(rc);
+#endif
IPRT_LINUX_RESTORE_EFL_AC();
#else
RT_NOREF(pfnWorker, pvUser1, pvUser2);

38
fixes_for_5.4.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c Index: VirtualBox-6.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c --- VirtualBox-6.0.14.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-6.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +++ VirtualBox-6.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -924,8 +924,13 @@ static void vboxNetFltLinuxSkBufToSG(PVB @@ -924,8 +924,13 @@ static void vboxNetFltLinuxSkBufToSG(PVB
for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++) for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++)
{ {
@ -30,10 +30,10 @@ Index: VirtualBox-6.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
Log6((" %p", pSG->aSegs[iSeg].pv)); Log6((" %p", pSG->aSegs[iSeg].pv));
pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS; pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS;
Assert(iSeg <= pSG->cSegsAlloc); Assert(iSeg <= pSG->cSegsAlloc);
Index: VirtualBox-6.0.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c Index: VirtualBox-6.0.14/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c --- VirtualBox-6.0.14.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+++ VirtualBox-6.0.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +++ VirtualBox-6.0.14/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
@@ -443,9 +443,6 @@ RTR0DECL(void *) RTMemContAlloc(PRTCCPHY @@ -443,9 +443,6 @@ RTR0DECL(void *) RTMemContAlloc(PRTCCPHY
} }
@ -54,10 +54,10 @@ Index: VirtualBox-6.0.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
} }
__free_pages(paPages, cOrder); __free_pages(paPages, cOrder);
IPRT_LINUX_RESTORE_EFL_AC(); IPRT_LINUX_RESTORE_EFL_AC();
Index: VirtualBox-6.0.12/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c Index: VirtualBox-6.0.14/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c --- VirtualBox-6.0.14.orig/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
+++ VirtualBox-6.0.12/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c +++ VirtualBox-6.0.14/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
@@ -36,6 +36,9 @@ @@ -36,6 +36,9 @@
#include <iprt/errcore.h> #include <iprt/errcore.h>
#include "internal/thread.h" #include "internal/thread.h"
@ -68,10 +68,10 @@ Index: VirtualBox-6.0.12/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
RTDECL(RTTHREAD) RTThreadSelf(void) RTDECL(RTTHREAD) RTThreadSelf(void)
{ {
Index: VirtualBox-6.0.12/src/VBox/Additions/linux/drm/vbox_drv.c Index: VirtualBox-6.0.14/src/VBox/Additions/linux/drm/vbox_drv.c
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.c --- VirtualBox-6.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.0.12/src/VBox/Additions/linux/drm/vbox_drv.c +++ VirtualBox-6.0.14/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -271,11 +271,13 @@ static void vbox_master_drop(struct drm_ @@ -271,11 +271,13 @@ static void vbox_master_drop(struct drm_
static struct drm_driver driver = { static struct drm_driver driver = {
@ -80,7 +80,7 @@ Index: VirtualBox-6.0.12/src/VBox/Additions/linux/drm/vbox_drv.c
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+ DRIVER_PRIME | + DRIVER_PRIME |
+#endif +#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81)
DRIVER_IRQ_SHARED | DRIVER_IRQ_SHARED |
#endif #endif
- DRIVER_PRIME, - DRIVER_PRIME,
@ -88,10 +88,10 @@ Index: VirtualBox-6.0.12/src/VBox/Additions/linux/drm/vbox_drv.c
.dev_priv_size = 0, .dev_priv_size = 0,
.load = vbox_driver_load, .load = vbox_driver_load,
Index: VirtualBox-6.0.12/src/VBox/Additions/linux/drm/vbox_main.c Index: VirtualBox-6.0.14/src/VBox/Additions/linux/drm/vbox_main.c
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/VBox/Additions/linux/drm/vbox_main.c --- VirtualBox-6.0.14.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.0.12/src/VBox/Additions/linux/drm/vbox_main.c +++ VirtualBox-6.0.14/src/VBox/Additions/linux/drm/vbox_main.c
@@ -619,8 +619,12 @@ static inline u64 vbox_bo_mmap_offset(st @@ -619,8 +619,12 @@ static inline u64 vbox_bo_mmap_offset(st
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_70) #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_70)
return bo->bo.addr_space_offset; return bo->bo.addr_space_offset;
@ -105,10 +105,10 @@ Index: VirtualBox-6.0.12/src/VBox/Additions/linux/drm/vbox_main.c
} }
int int
Index: VirtualBox-6.0.12/include/iprt/cdefs.h Index: VirtualBox-6.0.14/include/iprt/cdefs.h
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/include/iprt/cdefs.h --- VirtualBox-6.0.14.orig/include/iprt/cdefs.h
+++ VirtualBox-6.0.12/include/iprt/cdefs.h +++ VirtualBox-6.0.14/include/iprt/cdefs.h
@@ -1166,14 +1166,15 @@ @@ -1166,14 +1166,15 @@
* Tell the compiler that we're falling through to the next case in a switch. * Tell the compiler that we're falling through to the next case in a switch.
* @sa RT_FALL_THRU */ * @sa RT_FALL_THRU */

66
switch_to_python3.4+.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.0.12/configure Index: VirtualBox-6.0.14/configure
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/configure --- VirtualBox-6.0.14.orig/configure
+++ VirtualBox-6.0.12/configure +++ VirtualBox-6.0.14/configure
@@ -1977,17 +1977,17 @@ extern "C" int main(void) @@ -1977,17 +1977,17 @@ extern "C" int main(void)
{ {
Py_Initialize(); Py_Initialize();
@ -23,10 +23,10 @@ Index: VirtualBox-6.0.12/configure
for p in $PYTHONDIR; do for p in $PYTHONDIR; do
for d in $SUPPYTHONLIBS; do for d in $SUPPYTHONLIBS; do
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
Index: VirtualBox-6.0.12/src/VBox/Installer/linux/routines.sh Index: VirtualBox-6.0.14/src/VBox/Installer/linux/routines.sh
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/VBox/Installer/linux/routines.sh --- VirtualBox-6.0.14.orig/src/VBox/Installer/linux/routines.sh
+++ VirtualBox-6.0.12/src/VBox/Installer/linux/routines.sh +++ VirtualBox-6.0.14/src/VBox/Installer/linux/routines.sh
@@ -391,8 +391,8 @@ terminate_proc() { @@ -391,8 +391,8 @@ terminate_proc() {
maybe_run_python_bindings_installer() { maybe_run_python_bindings_installer() {
VBOX_INSTALL_PATH="${1}" VBOX_INSTALL_PATH="${1}"
@ -38,10 +38,10 @@ Index: VirtualBox-6.0.12/src/VBox/Installer/linux/routines.sh
if sys.version_info >= (2, 6): if sys.version_info >= (2, 6):
print \"test\"' 2> /dev/null`" != "test" ]; then print \"test\"' 2> /dev/null`" != "test" ]; then
echo 1>&2 "Python 2.6 or later not available, skipping bindings installation." echo 1>&2 "Python 2.6 or later not available, skipping bindings installation."
Index: VirtualBox-6.0.12/src/bldprogs/scm.cpp Index: VirtualBox-6.0.14/src/bldprogs/scm.cpp
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/bldprogs/scm.cpp --- VirtualBox-6.0.14.orig/src/bldprogs/scm.cpp
+++ VirtualBox-6.0.12/src/bldprogs/scm.cpp +++ VirtualBox-6.0.14/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)
@ -51,10 +51,10 @@ Index: VirtualBox-6.0.12/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.0.12/src/libs/libxml2-2.9.4/configure Index: VirtualBox-6.0.14/src/libs/libxml2-2.9.4/configure
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/libs/libxml2-2.9.4/configure --- VirtualBox-6.0.14.orig/src/libs/libxml2-2.9.4/configure
+++ VirtualBox-6.0.12/src/libs/libxml2-2.9.4/configure +++ VirtualBox-6.0.14/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=
@ -79,10 +79,10 @@ Index: VirtualBox-6.0.12/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.0.12/src/VBox/ValidationKit/testboxscript/setup.sh Index: VirtualBox-6.0.14/src/VBox/ValidationKit/testboxscript/setup.sh
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/VBox/ValidationKit/testboxscript/setup.sh --- VirtualBox-6.0.14.orig/src/VBox/ValidationKit/testboxscript/setup.sh
+++ VirtualBox-6.0.12/src/VBox/ValidationKit/testboxscript/setup.sh +++ VirtualBox-6.0.14/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);\
@ -92,20 +92,20 @@ Index: VirtualBox-6.0.12/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.0.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec Index: VirtualBox-6.0.14/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec --- VirtualBox-6.0.14.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+++ VirtualBox-6.0.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +++ VirtualBox-6.0.14/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
%define %PYTHON% 1 %define %PYTHON% 1
%define VBOXDOCDIR %{_defaultdocdir}/%NAME% %define VBOXDOCDIR %{_defaultdocdir}/%NAME%
%global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$ %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()")} -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitelib: %define python_sitelib python3 -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %define python_sitelib python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
Summary: Oracle VM VirtualBox Summary: Oracle VM VirtualBox
Name: %NAME% Name: %NAME%
@@ -97,7 +97,7 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/sh @@ -100,7 +100,7 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/sh
%if %{?with_python:1}%{!?with_python:0} %if %{?with_python:1}%{!?with_python:0}
(export VBOX_INSTALL_PATH=/usr/lib/virtualbox && \ (export VBOX_INSTALL_PATH=/usr/lib/virtualbox && \
cd ./sdk/installer && \ cd ./sdk/installer && \
@ -114,10 +114,10 @@ Index: VirtualBox-6.0.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
%endif %endif
rm -rf sdk/installer rm -rf sdk/installer
mv nls $RPM_BUILD_ROOT/usr/share/virtualbox mv nls $RPM_BUILD_ROOT/usr/share/virtualbox
Index: VirtualBox-6.0.12/src/libs/libxml2-2.9.4/libxml.spec.in Index: VirtualBox-6.0.14/src/libs/libxml2-2.9.4/libxml.spec.in
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/libs/libxml2-2.9.4/libxml.spec.in --- VirtualBox-6.0.14.orig/src/libs/libxml2-2.9.4/libxml.spec.in
+++ VirtualBox-6.0.12/src/libs/libxml2-2.9.4/libxml.spec.in +++ VirtualBox-6.0.14/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}
@ -133,10 +133,10 @@ Index: VirtualBox-6.0.12/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.0.12/src/libs/libxml2-2.9.4/libxml2.spec Index: VirtualBox-6.0.14/src/libs/libxml2-2.9.4/libxml2.spec
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/libs/libxml2-2.9.4/libxml2.spec --- VirtualBox-6.0.14.orig/src/libs/libxml2-2.9.4/libxml2.spec
+++ VirtualBox-6.0.12/src/libs/libxml2-2.9.4/libxml2.spec +++ VirtualBox-6.0.14/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}
@ -146,10 +146,10 @@ Index: VirtualBox-6.0.12/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.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp Index: VirtualBox-6.0.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp --- VirtualBox-6.0.14.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-6.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +++ VirtualBox-6.0.14/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
@ -159,10 +159,10 @@ Index: VirtualBox-6.0.12/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.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp Index: VirtualBox-6.0.14/src/libs/xpcom18a4/python/src/PyGBase.cpp
=================================================================== ===================================================================
--- VirtualBox-6.0.12.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp --- VirtualBox-6.0.14.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-6.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp +++ VirtualBox-6.0.14/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 )

32
virtualbox.changes
View File

@ -1,8 +1,40 @@
-------------------------------------------------------------------
Tue Oct 22 00:39:41 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
- Add directory %{buildroot}%{_datadir}/metainfo for metafile "virtualbox.appdata.xml
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 21 18:39:47 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org> Mon Oct 21 18:39:47 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org>
- Add appstream file (boo#1154128) - Add appstream file (boo#1154128)
-------------------------------------------------------------------
Wed Oct 16 18:14:41 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
- Version bumk to 6.0.14 (released October 15 2019 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
Virtualization core: fixed an invalid-guest state guru meditation in some rare circumstances on Intel hosts
Virtualization core: some fixes for systems with lots of processors
Audio: relaxed VRM / VRA (variable rate audio) bit checks to provide more compatibility for guests running ALSA setups with the AC'97 emulation
USB: made device capturing for passthrough more accurate and reliable on Windows host
Network: fixed potential issue with interrupt signalling for network adapters in UEFI guests
3D: fixed flicker and redraw issues when using VBoxSVGA or VMSVGA graphics adapter (bugs #18562, #18956)
3D: fixed crash with some applications when using VBoxSVGA or VMSVGA graphics adapter (bug #18638)
macOS host: fix crash of GUI VM process which showed up frequently with 10.15 Catalina (bug #18990)
Linux host: support Linux 5.3, thank you Larry Finger (see also bug #18911)
Linux host: improve python version detection during rpm package creation, can change package dependencies and fix some installation problems
Linux guests: calls to aio_read(3) and aio_write(3) may fail inside shared folders (bug #18805)
Linux guests: fix problem with shared folder unmounting in service script, thank you Denis Ryndine (bug #18853)
Linux guests: VBox 6.0.10 GAs fail to compile on Red Hat/CentOS/Oracle Linux 7.7 and Red Hat 8.1 Beta (bug #18917)
Fix vulnerabilities CVE-2019-3028 CVE-2019-3017 CVE-2019-2944 CVE-2019-3026 CVE-2019-3021
CVE-2019-2984 CVE-2019-3002 CVE-2019-3005 CVE-2019-3031 CVE-2019-1547
CVE-2019-2926 (bsc#1154166)
Removed file "fixes_for_5.3.patch" - fixes included upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 15 20:27:49 UTC 2019 - Larry Finger <Larry.Finger@gmail.com> Tue Oct 15 20:27:49 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>

6
virtualbox.spec
View File

@ -47,7 +47,7 @@ python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile
%define _udevrulesdir /usr/lib/udev/rules.d %define _udevrulesdir /usr/lib/udev/rules.d
Name: virtualbox Name: virtualbox
# ********* If the VB version exceeds 6.0.x, notify the libvirt maintainer!! # ********* If the VB version exceeds 6.0.x, notify the libvirt maintainer!!
Version: 6.0.12 Version: 6.0.14
Release: 0 Release: 0
Summary: VirtualBox is an Emulator Summary: VirtualBox is an Emulator
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -145,8 +145,6 @@ Patch125: remove_vbox_video_build.patch
Patch128: fix_lib_search.patch Patch128: fix_lib_search.patch
# Fixes for modified kernel in Leap 42.3 # Fixes for modified kernel in Leap 42.3
Patch130: fixes_for_Leap42.3.patch Patch130: fixes_for_Leap42.3.patch
# Fixes for API changes in kernel 5.3
Patch131: fixes_for_5.3.patch
# Fixes for Qt5.13 on 32-bit systems # Fixes for Qt5.13 on 32-bit systems
Patch132: fixes_for_qt5.13.patch Patch132: fixes_for_qt5.13.patch
#endif #endif
@ -451,7 +449,6 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
# Patch for Leap 42.3 # Patch for Leap 42.3
%patch130 -p1 %patch130 -p1
%endif %endif
%patch131 -p1
# Handle the 32-bit changes needed for Qt 5.13 # Handle the 32-bit changes needed for Qt 5.13
%ifarch %ix86 && 0%{?qt5ver} >= 51300 %ifarch %ix86 && 0%{?qt5ver} >= 51300
%patch132 -p1 %patch132 -p1
@ -592,6 +589,7 @@ install -d -m 755 %{buildroot}%{_bindir}
install -d -m 755 %{buildroot}%{_sbindir} install -d -m 755 %{buildroot}%{_sbindir}
install -d -m 755 %{buildroot}%{_datadir}/virtualbox/nls install -d -m 755 %{buildroot}%{_datadir}/virtualbox/nls
install -d -m 755 %{buildroot}%{_datadir}/pixmaps install -d -m 755 %{buildroot}%{_datadir}/pixmaps
install -d -m 755 %{buildroot}%{_datadir}/metainfo
install -d -m 755 %{buildroot}%{_datadir}/applications install -d -m 755 %{buildroot}%{_datadir}/applications
install -d -m 755 %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom install -d -m 755 %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom
install -d -m 755 %{buildroot}%{_vbox_instdir}/components install -d -m 755 %{buildroot}%{_vbox_instdir}/components