[VirtualBox] Minor fixes

commit da592e9a40b2fd706343d7ca7f86d106cf43afbf Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Mon Jun 8 01:57:10 2020 +0100 Minor fixes Rename patch VirtualBox-6.1.4-hacks to VirtualBox-6.1.4-gcc10 Syncronize vboxservice.service with virtualbox-guest-additions from Fedora Remove bundled src/libs/openssl VirtualBox-6.1.4-hacks.patch => VirtualBox-6.1.4-gcc10.patch | 0 VirtualBox.spec | 7 ++++--- vboxservice.service | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) --- diff --git a/VirtualBox-6.1.4-hacks.patch b/VirtualBox-6.1.4-gcc10.patch similarity index 100% rename from VirtualBox-6.1.4-hacks.patch rename to VirtualBox-6.1.4-gcc10.patch diff --git a/VirtualBox.spec b/VirtualBox.spec index 26c7bed..a427879 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -88,7 +88,7 @@ Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch # from OpenSuse Patch70: vbox-python-detection.diff -Patch80: VirtualBox-6.1.4-hacks.patch +Patch80: VirtualBox-6.1.4-gcc10.patch Patch84: VirtualBox-6.1.4-wayland-crash.patch Patch85: VirtualBox-6.1.4-Xwayland-shortcut-inhibit.patch Patch86: VirtualBox-6.1.0-VBoxRem.patch @@ -314,8 +314,9 @@ rm -r src/VBox/Additions/3D/mesa/mesa-17.3.9/ #rm -r src/VBox/GuestHost/OpenGL/include/GL #rm -rf src/libs/liblzf-3.4/ -rm -r src/libs/libxml2-2.9.*/ rm -r src/libs/libpng-1.6.*/ +rm -r src/libs/libxml2-2.9.*/ +rm -r src/libs/openssl-1.*/ rm -r src/libs/zlib-1.2.*/ %patch1 -p1 -b .noupdates @@ -903,7 +904,7 @@ getent passwd vboxadd >/dev/null || \ - Fix rfbz#5581 USB devices are not available - VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch, just for epel7 guest-additions. -- rfbz #5598 2 patches: Fix VBox crash when started under Wayland, Fix +- rfbz #5589 2 patches: Fix VBox crash when started under Wayland, Fix keyboard-grab under Wayland * Thu Mar 19 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.4-3 diff --git a/vboxservice.service b/vboxservice.service index 69c6b77..cdfa4ce 100644 --- a/vboxservice.service +++ b/vboxservice.service @@ -5,11 +5,10 @@ ConditionVirtualization=|kvm ConditionVirtualization=|oracle [Service] +Type=simple ExecStartPre=-/usr/bin/modprobe vboxguest -ExecStartPre=-/usr/bin/modprobe vboxvideo -ExecStartPre=-/usr/bin/modprobe vboxsf -ExecStartPre=-/usr/bin/VBoxClient --vmsvga ExecStart=/usr/sbin/VBoxService -f +Restart=on-failure [Install] WantedBy=multi-user.target