From 8643fd20d7ec405fac45bc35a947ba565e605c35 Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Apr 22 2018 05:41:24 +0000 Subject: Update to 5.2.10 --- diff --git a/VirtualBox-5.2.10-xclient.patch b/VirtualBox-5.2.10-xclient.patch new file mode 100644 index 0000000..1f16bc7 --- /dev/null +++ b/VirtualBox-5.2.10-xclient.patch @@ -0,0 +1,21 @@ +--- VirtualBox-5.2.10.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2018-04-13 17:32:05.000000000 +0100 ++++ VirtualBox-5.2.10/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2018-04-22 04:31:42.483190045 +0100 +@@ -21,15 +21,9 @@ for i in $HOME/.vboxclient-*.pid; do + test -w $i || rm -f $i + done + +-if ! test -c /dev/vboxguest 2>/dev/null; then +- # Do not start if the kernel module is not present. +- # Execute notify-send in the back-ground to avoid racing with sddm, +- # as notify-send may wait for sddm to start while it waits for us to exit. +- notify-send "VBoxClient: the VirtualBox kernel service is not running. Exiting." & +-elif test -z "${SSH_CONNECTION}"; then +- # This script can also be triggered by a connection over SSH, which is not +- # what we had in mind, so we do not start VBoxClient in that case. We do +- # not use "exit" here as this script is "source"d, not executed. ++# Do not start if the kernel module is not present; or if this script is ++# triggered by a connection over SSH. ++if [ -c /dev/vboxguest -a -z "${SSH_CONNECTION}" ]; then + /usr/bin/VBoxClient --clipboard + /usr/bin/VBoxClient --checkhostversion + /usr/bin/VBoxClient --display diff --git a/VirtualBox-5.2.6-xclient.patch b/VirtualBox-5.2.6-xclient.patch deleted file mode 100644 index 75eabab..0000000 --- a/VirtualBox-5.2.6-xclient.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up VirtualBox-5.2.6/src/VBox/Additions/x11/Installer/98vboxadd-xclient~ VirtualBox-5.2.6/src/VBox/Additions/x11/Installer/98vboxadd-xclient ---- VirtualBox-5.2.6/src/VBox/Additions/x11/Installer/98vboxadd-xclient~ 2018-01-15 15:49:57.000000000 +0100 -+++ VirtualBox-5.2.6/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2018-02-07 12:13:51.578170786 +0100 -@@ -21,13 +21,9 @@ for i in $HOME/.vboxclient-*.pid; do - test -w $i || rm -f $i - done - --if ! test -c /dev/vboxguest 2>/dev/null; then -- # Do not start if the kernel module is not present. -- notify-send "VBoxClient: the VirtualBox kernel service is not running. Exiting." --elif test -z "${SSH_CONNECTION}"; then -- # This script can also be triggered by a connection over SSH, which is not -- # what we had in mind, so we do not start VBoxClient in that case. We do -- # not use "exit" here as this script is "source"d, not executed. -+# Do not start if the kernel module is not present; or if this script is -+# triggered by a connection over SSH. -+if [ -c /dev/vboxguest -a -z "${SSH_CONNECTION}" ]; then - /usr/bin/VBoxClient --clipboard - /usr/bin/VBoxClient --checkhostversion - /usr/bin/VBoxClient --display diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec index 25e92e5..327f246 100644 --- a/virtualbox-guest-additions.spec +++ b/virtualbox-guest-additions.spec @@ -1,7 +1,7 @@ %global __provides_exclude_from %{_libdir}/VBoxGuestAdditions Name: virtualbox-guest-additions -Version: 5.2.8 +Version: 5.2.10 Release: 1%{?dist} Summary: VirtualBox Guest Additions License: GPLv2 or (GPLv2 and CDDL) @@ -18,7 +18,7 @@ Patch1: VirtualBox-5.0.18-xserver_guest.patch # Mainline vboxsf uses an option string rather then a custom binary data struct Patch2: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch # Do not show an error dialog when not running under vbox -Patch3: VirtualBox-5.2.6-xclient.patch +Patch3: VirtualBox-5.2.10-xclient.patch # Fix build with gcc8 Patch4: VirtualBox-5.2.6-gcc8.patch @@ -190,6 +190,9 @@ getent passwd vboxadd >/dev/null || \ %changelog +* Sun Apr 22 2018 Sérgio Basto - 5.2.10-1 +- Update to 5.2.10 + * Thu Mar 1 2018 Hans de Goede - 5.2.8-1 - Update to 5.2.8 - Use https for all URLs