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

Accepting request 975265 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/975265
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=233
This commit is contained in:
Dominique Leuenberger 2022-05-08 19:52:20 +00:00 committed by Git OBS Bridge
commit 819dfcb32b
9 changed files with 157 additions and 256 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:3c68d5ec7d75889a6e503bcbaf29468e20c308a2b51892d87ee31f4960501189 oid sha256:dfc384986686311cd679833013eba0de42764006178e3914ba6b989c0f3cde6b
size 4987653 size 4990618

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

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

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

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

68
fixes_for_kernel_5.17.patch
View File

@ -1,68 +0,0 @@
Index: VirtualBox-6.1.32/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-6.1.32.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.32/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -50,6 +50,19 @@
#include "version-generated.h"
#include "revision-generated.h"
+/** Detect whether kernel mode setting is OFF. */
+#if defined(CONFIG_VGA_CONSOLE)
+# if RTLNX_VER_MIN(5,17,0)
+# define VBOX_VIDEO_NOMODESET() drm_firmware_drivers_only() && vbox_modeset == -1
+# elif RTLNX_VER_MIN(4,7,0)
+# define VBOX_VIDEO_NOMODESET() vgacon_text_force() && vbox_modeset == -1
+# else /* < 4.7.0 */
+# define VBOX_VIDEO_NOMODESET() 0
+# endif /* < 4.7.0 */
+#else /* !CONFIG_VGA_CONSOLE */
+# define VBOX_VIDEO_NOMODESET() 0
+#endif /* !CONFIG_VGA_CONSOLE */
+
static int vbox_modeset = -1;
MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
@@ -401,15 +414,13 @@ static struct drm_driver driver = {
static int __init vbox_init(void)
{
printk("vboxvideo: loading version " VBOX_VERSION_STRING " r" __stringify(VBOX_SVN_REV) "\n");
-#if defined(CONFIG_VGA_CONSOLE) || RTLNX_VER_MIN(4,7,0)
- if (vgacon_text_force() && vbox_modeset == -1)
+ if (VBOX_VIDEO_NOMODESET())
{
printk("vboxvideo: kernel is running with *nomodeset* parameter,\n");
printk("vboxvideo: please consider either to remove it or load driver\n");
printk("vboxvideo: with parameter modeset=1, unloading\n");
return -EINVAL;
}
-#endif
if (vbox_modeset == 0)
{
Index: VirtualBox-6.1.32/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
===================================================================
--- VirtualBox-6.1.32.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
+++ VirtualBox-6.1.32/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
@@ -66,6 +66,12 @@
#define VBOXNETADP_FROM_IFACE(iface) ((PVBOXNETADP) ifnet_softc(iface))
+/** Set netdev MAC address. */
+#if RTLNX_VER_MIN(5,17,0)
+# define VBOX_DEV_ADDR_SET(dev, addr, len) dev_addr_mod(dev, 0, addr, len)
+#else /* < 5.17.0 */
+# define VBOX_DEV_ADDR_SET(dev, addr, len) memcpy(dev->dev_addr, addr, len)
+#endif
/*********************************************************************************************************************************
* Internal Functions *
@@ -303,7 +309,7 @@ int vboxNetAdpOsCreate(PVBOXNETADP pThis
if (pNetDev->dev_addr)
{
- memcpy(pNetDev->dev_addr, pMACAddress, ETH_ALEN);
+ VBOX_DEV_ADDR_SET(pNetDev, pMACAddress, ETH_ALEN);
Log2(("vboxNetAdpOsCreate: pNetDev->dev_addr = %.6Rhxd\n", pNetDev->dev_addr));
/*

87
fixes_for_kernel_5.18.patch
View File

@ -1,18 +1,87 @@
Index: VirtualBox-6.1.32/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c Index: VirtualBox-6.1.34/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
=================================================================== ===================================================================
--- VirtualBox-6.1.32.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c --- VirtualBox-6.1.34.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-6.1.32/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +++ VirtualBox-6.1.34/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -2314,8 +2314,13 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS @@ -2311,7 +2311,13 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS
{
vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1); vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1);
Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb)); Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb));
+# if RTLNX_VER_MAX(5, 18, 0)
Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf)); Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf));
err = netif_rx_ni(pBuf); +#if RTLNX_VER_MIN(5,18,0)
+#else + local_bh_disable();
+ Log6(("vboxNetFltPortOsXmit: netif_rx(%p)\n", pBuf));
+ err = netif_rx(pBuf); + err = netif_rx(pBuf);
+ local_bh_enable();
+#else
err = netif_rx_ni(pBuf);
+#endif +#endif
if (err) if (err)
rc = RTErrConvertFromErrno(err); rc = RTErrConvertFromErrno(err);
} }
Index: VirtualBox-6.1.34/src/VBox/HostDrivers/Support/SUPDrv.cpp
===================================================================
--- VirtualBox-6.1.34.orig/src/VBox/HostDrivers/Support/SUPDrv.cpp
+++ VirtualBox-6.1.34/src/VBox/HostDrivers/Support/SUPDrv.cpp
@@ -1742,7 +1742,15 @@ static int supdrvIOCtlInnerUnrestricted(
/* execute */
pReq->u.Out.cFunctions = RT_ELEMENTS(g_aFunctions);
+
+ /* In 5.18.0, memcpy became a wrapper which does fortify checks
+ * before triggering __underlying_memcpy() call. We do not pass these checks here,
+ * so bypass them for now. */
+#if RTLNX_VER_MIN(5,18,0)
+ __underlying_memcpy(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
+#else
memcpy(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
+#endif
pReq->Hdr.rc = VINF_SUCCESS;
return 0;
}
Index: VirtualBox-6.1.34/src/VBox/HostDrivers/Support/SUPLib.cpp
===================================================================
--- VirtualBox-6.1.34.orig/src/VBox/HostDrivers/Support/SUPLib.cpp
+++ VirtualBox-6.1.34/src/VBox/HostDrivers/Support/SUPLib.cpp
@@ -505,7 +505,7 @@ static int supInitFake(PSUPDRVSESSION *p
if (g_pSupFunctions)
{
g_pSupFunctions->u.Out.cFunctions = RT_ELEMENTS(s_aFakeFunctions);
- memcpy(&g_pSupFunctions->u.Out.aFunctions[0], &s_aFakeFunctions[0], sizeof(s_aFakeFunctions));
+ memcpy(&g_pSupFunctions->u.Out.aFunctions, &s_aFakeFunctions[0], sizeof(s_aFakeFunctions));
g_pSession = (PSUPDRVSESSION)(void *)g_pSupFunctions;
if (ppSession)
*ppSession = g_pSession;
Index: VirtualBox-6.1.34/src/VBox/Additions/linux/sharedfolders/regops.c
===================================================================
--- VirtualBox-6.1.34.orig/src/VBox/Additions/linux/sharedfolders/regops.c
+++ VirtualBox-6.1.34/src/VBox/Additions/linux/sharedfolders/regops.c
@@ -3823,7 +3823,9 @@ struct address_space_operations vbsf_reg
.readpage = vbsf_readpage,
.writepage = vbsf_writepage,
/** @todo Need .writepages if we want msync performance... */
-#if RTLNX_VER_MIN(2,5,12)
+#if RTLNX_VER_MIN(5,18,0)
+ .dirty_folio = block_dirty_folio,
+#elif RTLNX_VER_MIN(2,5,12)
.set_page_dirty = __set_page_dirty_buffers,
#endif
#if RTLNX_VER_MIN(5,14,0)
Index: VirtualBox-6.1.34/Config.kmk
===================================================================
--- VirtualBox-6.1.34.orig/Config.kmk
+++ VirtualBox-6.1.34/Config.kmk
@@ -4502,11 +4502,14 @@ ifeq ($(VBOX_LDR_FMT),elf)
TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \
$(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
+ $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \
$(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
$(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
-fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
+ if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++.
+ TEMPLATE_VBoxR0_CXXFLAGS += -ffreestanding
+ endif
TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding

34
fixes_for_sle12.patch
View File

@ -1,8 +1,8 @@
Index: VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_drv.c Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_drv.c
=================================================================== ===================================================================
--- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/drm/vbox_drv.c --- VirtualBox-6.1.34.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_drv.c +++ VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -349,7 +349,9 @@ static struct drm_driver driver = { @@ -362,7 +362,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,10 +12,10 @@ Index: VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_drv.c
# endif # endif
#endif #endif
Index: VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_main.c Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_main.c
=================================================================== ===================================================================
--- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/drm/vbox_main.c --- VirtualBox-6.1.34.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_main.c +++ VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_main.c
@@ -622,11 +622,13 @@ int vbox_dumb_destroy(struct drm_file *f @@ -622,11 +622,13 @@ int vbox_dumb_destroy(struct drm_file *f
#endif #endif
@ -30,10 +30,10 @@ Index: VirtualBox-6.1.28/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.28/src/VBox/Additions/linux/drm/vbox_ttm.c Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c
=================================================================== ===================================================================
--- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/drm/vbox_ttm.c --- VirtualBox-6.1.34.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_ttm.c +++ VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -297,7 +297,7 @@ static struct ttm_backend_func vbox_tt_b @@ -297,7 +297,7 @@ static struct ttm_backend_func vbox_tt_b
}; };
#endif #endif
@ -77,7 +77,7 @@ Index: VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_ttm.c
-#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)
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) && !RTLNX_RHEL_RANGE(8,6, 8,99) /* < 5.13.0, < RHEL(8.6, 8.99) */
align >> PAGE_SHIFT, false, acc_size, align >> PAGE_SHIFT, false, acc_size,
@@ -664,7 +664,7 @@ static inline u64 vbox_bo_gpu_offset(str @@ -664,7 +664,7 @@ static inline u64 vbox_bo_gpu_offset(str
@ -133,10 +133,10 @@ Index: VirtualBox-6.1.28/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.28/src/VBox/Additions/linux/drm/vbox_drv.h Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_drv.h
=================================================================== ===================================================================
--- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/drm/vbox_drv.h --- VirtualBox-6.1.34.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_drv.h +++ VirtualBox-6.1.34/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,10 +147,10 @@ Index: VirtualBox-6.1.28/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.28/src/VBox/Additions/linux/drm/vbox_mode.c Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_mode.c
=================================================================== ===================================================================
--- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/drm/vbox_mode.c --- VirtualBox-6.1.34.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-6.1.28/src/VBox/Additions/linux/drm/vbox_mode.c +++ VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -548,7 +548,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];

3
virtualbox-patch-source.sh
View File

@ -3,6 +3,9 @@
REMOVE_DIRS=( REMOVE_DIRS=(
src/VBox/Additions/WINNT src/VBox/Additions/WINNT
src/VBox/Additions/os2 src/VBox/Additions/os2
src/VBox/Runtime/r3/darwin
src/VBox/Runtime/r0drv/darwin
src/VBox/Runtime/darwin
kBuild/bin kBuild/bin
kBuild/msgstyles kBuild/msgstyles
kBuild/tools kBuild/tools

40
virtualbox.changes
View File

@ -1,3 +1,43 @@
-------------------------------------------------------------------
Wed Apr 20 17:51:18 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>
- Version bump to 6.1.34 (released March 22 2022) by Oracle
This is a maintenance release. The following items were fixed and/or added:
VMM: Fix instruction emulation for "cmpxchg16b"
GUI: Improved GUI behavior on macOS Big Sur and later when kernel extensions are not loaded
EHCI: Addressed an issue with handling short packets (bug #20726)
Storage: Fixed a potential hang during disk I/O when the host I/O cache is disabled (bug #20875)
NVMe: Fixed loading saved state when nothing is attached to it (bug #20791)
DevPcBios: Addressed an issue which resulted in rejecting the detected LCHS geometry when the head count was above 16
virtio-scsi: Improvements
E1000: Improve descriptor handling
VBoxManage: Fixed handling of command line arguments with incomplete quotes (bug #20740)
VBoxManage: Improved 'natnetwork list' output
VBoxManage: NATNetwork: Provide an option (--ipv6-prefix) to set IPv6 prefix
VBoxManage: NATNetwork: Provide an option (--ipv6-default) to advertise default IPv6 route (bug #20714)
VBoxManage: Fix documentation of "usbdevsource add" (bug #20849)
Networking: General improvements in IPv4 and IPv6 area (bug #20714)
OVF Import: Allow users to specify a different storage controller and/or controller port for hard disks when importing a VM
Unattended install: Improvements
Shared Clipboard: Improved HTML clipboard handling for Windows host
Linux host and guest: Introduced initial support for kernel 5.17
Solaris package: Fixes for API access from Python
Solaris IPS package: Suppress dependency on libpython2.7.so.*
Linux host and guest: Fixes for Linux kernel 5.14
Linux Guest Additions: Fixed guest screen resize for older guests which are running libXrandr older than version 1.4
Linux Guest Additions: Introduced initial support for RHEL 8.6 kernels (bug #20877)
Windows guest: Make driver install smarter
Solaris guest: Addressed an issue which prevented VBox GAs 6.1.30 or 6.1.32 from being removed in Solaris 10 guests (bug #20780)
EFI: Fixed booting from FreeBSD ISO images (bug #19910)
Removed file "fixes_for_kernel_5.17.patch" - fixed upstream.
Fixes CVE-2022-21465 (boo#1198676), CVE-2022-21471 (boo#1198677), CVE-2022-21491 (boo#1198680), CVE-2022-21487 (boo#1198678), and CVE-2022-21488 (boo#1198679).
Fixed boo#1198703 - package virtualbox-websrv needs sysvinit-tools
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 29 19:01:11 UTC 2022 - Larry Finger <Larry.Finger@gmail.com> Tue Mar 29 19:01:11 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>

171
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.32 Version: 6.1.34
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,8 +179,8 @@ Patch137: handle_gsoap_208103.patch
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
Patch144: fixes_for_leap15.4.patch Patch144: fixes_for_leap15.4.patch
Patch145: fixes_for_kernel_5.17.patch Patch145: fixes_for_kernel_5.18.patch
Patch146: fixes_for_kernel_5.18.patch #Patch998: fix_warnings.patch
Patch999: virtualbox-fix-ui-background-color.patch Patch999: virtualbox-fix-ui-background-color.patch
# #
# Common BuildRequires for both virtualbox and virtualbox-kmp # Common BuildRequires for both virtualbox and virtualbox-kmp
@ -308,28 +308,12 @@ 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
@ -350,32 +334,17 @@ 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
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: sysvinit-tools
Provides: %{name}-gui = %{version} Provides: %{name}-gui = %{version}
Obsoletes: %{name}-vboxwebsrv < %{version} Obsoletes: %{name}-vboxwebsrv < %{version}
@ -386,28 +355,12 @@ 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
@ -425,28 +378,12 @@ 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
@ -468,28 +405,12 @@ 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
@ -511,28 +432,12 @@ 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
@ -549,28 +454,12 @@ 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
@ -604,28 +493,12 @@ sudo %{_sbindir}/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
@ -640,28 +513,12 @@ 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
@ -738,7 +595,7 @@ This package contains the kernel-modules that VirtualBox uses to create or run v
%endif %endif
%patch143 -p1 %patch143 -p1
%patch145 -p1 %patch145 -p1
%patch146 -p1 #%patch998 -p1
# make VB UI background colors look sane again # make VB UI background colors look sane again
%patch999 -p1 %patch999 -p1