12:37 a.m.
commit 1f06b3ce62afff337f25d1a8d62d1b819d2a20af
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Apr 4 05:16:00 2020 +0100
Fix rfbz#5581 USB devices are not available
VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch | 23 ++++++++++++++++++++++
VirtualBox-60-vboxdrv.rules | 8 ++++----
VirtualBox.spec | 10 +++++++++-
3 files changed, 36 insertions(+), 5 deletions(-)
---
diff --git a/VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
b/VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
new file mode 100644
index 0000000..27ba6b2
--- /dev/null
+++ b/VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
@@ -0,0 +1,23 @@
+diff -up VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp~
VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
+--- VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp~ 2020-02-18
18:13:08.000000000 +0100
++++ VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp 2020-03-03
16:27:49.947341705 +0100
+@@ -100,16 +100,19 @@ static void x11Connect(struct X11CONTEXT
+ {
+ XCloseDisplay(pContext->pDisplay);
+ pContext->pDisplay = NULL;
++ return;
+ }
+ if (!XRRQueryExtension(pContext->pDisplay, &pContext->hRandREventBase,
&pContext->hRandRErrorBase))
+ {
+ XCloseDisplay(pContext->pDisplay);
+ pContext->pDisplay = NULL;
++ return;
+ }
+ if (!XRRQueryVersion(pContext->pDisplay, &pContext->hRandRMajor,
&pContext->hRandRMinor))
+ {
+ XCloseDisplay(pContext->pDisplay);
+ pContext->pDisplay = NULL;
++ return;
+ }
+ pContext->rootWindow = DefaultRootWindow(pContext->pDisplay);
+ }
diff --git a/VirtualBox-60-vboxdrv.rules b/VirtualBox-60-vboxdrv.rules
index fd843f3..f147ccd 100644
--- a/VirtualBox-60-vboxdrv.rules
+++ b/VirtualBox-60-vboxdrv.rules
@@ -1,7 +1,7 @@
KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root",
GROUP="root", MODE="0600"
KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root",
GROUP="root", MODE="0666"
KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root",
GROUP="root", MODE="0600"
-SUBSYSTEM=="usb_device", ACTION=="add",
RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb", ACTION=="add",
ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor
$attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb_device", ACTION=="remove",
RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove",
ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major
$minor"
+SUBSYSTEM=="usb_device", ACTION=="add",
RUN+="/usr/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}
vboxusers"
+SUBSYSTEM=="usb", ACTION=="add",
ENV{DEVTYPE}=="usb_device", RUN+="/usr/lib/udev/VBoxCreateUSBNode.sh $major
$minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb_device", ACTION=="remove",
RUN+="/usr/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove",
ENV{DEVTYPE}=="usb_device", RUN+="/usr/lib/udev/VBoxCreateUSBNode.sh
--remove $major $minor"
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 0da812b..2c1c901 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -46,7 +46,7 @@
Name: VirtualBox
Version: 6.1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -93,6 +93,8 @@ Patch70: vbox-python-detection.diff
Patch80: VirtualBox-6.1.4-hacks.patch
Patch81: fixes_for_5.6.patch
Patch82: Clipboard.patch
+Patch83: VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
+
BuildRequires: kBuild >= 0.1.9998.r3093
BuildRequires: SDL-devel
@@ -346,6 +348,8 @@ rm -r src/libs/zlib-1.2.*/
%patch81 -p1 -b .kernel5.6
%endif
%patch82 -p1 -b .clipboard
+%patch83 -p1 -b .vmsvga-x11-crash
+
%build
./configure --disable-kmods \
@@ -886,6 +890,10 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Sat Apr 04 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.4-4
+- Fix rfbz#5581 USB devices are not available
+- VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch, just for epel7 guest-additions.
+
* Thu Mar 19 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.4-3
- Fixes for kernel 5.6 from
https://build.opensuse.org/package/show/Virtualization/virtualbox