From 41af93535152cbe169262a56b12f14229e6c27dd3e558c3d6e8809f4667a6c66 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 17 Jan 2018 18:52:30 +0000 Subject: [PATCH 1/2] - Version bump to 5.2.6 (released 2018-01-15 by Oracle) Fixes for the following vulnerabilities (bsc#1076372) CVE-2018-2694, CVE-2018-2698, CVE-2018-2685, CVE-2018-2686, CVE-2018-2687, CVE-2018-2688 CVE-2018-2689, CVE-2018-2690, CVE-2018-2676, CVE-2018-2693, CVE-2017-5715 This is a maintenance release. The following items were fixed and/or added: GUI: fixed occasional screen corruption when host screen resolutio n is changed User interface: increase proposed disk size when creating new VMs for Windows 7 and newer User interface: various improvements for high resolution screens VMM: Fixed problems using 256MB VRAM in raw-mode VMs Audio: implemented support for audio playback and recording for macOS guests Audio: further timing improvements for Windows 10 guests Linux hosts: fixed problem accessing mini-toolbar under XFCE (bug #17280, contributed by Dusan Gallo) OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=397 --- UserManual.pdf | 4 +- VirtualBox-5.2.4-patched.tar.bz2 | 3 - VirtualBox-5.2.6-patched.tar.bz2 | 3 + fixes_for_leap15.patch | 12 ++-- vbox-vboxadd-init-script.diff | 95 ++++++++++++++++---------------- virtualbox.changes | 19 +++++++ virtualbox.spec | 6 +- 7 files changed, 81 insertions(+), 61 deletions(-) delete mode 100644 VirtualBox-5.2.4-patched.tar.bz2 create mode 100644 VirtualBox-5.2.6-patched.tar.bz2 diff --git a/UserManual.pdf b/UserManual.pdf index f49a615..894b613 100644 --- a/UserManual.pdf +++ b/UserManual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f18919271750c11c48225a1dbf80565a97d4422cd246301d8d818a6f7e44e5a2 -size 4434524 +oid sha256:734e4c675478edc0aca3bac402196a016422f32135af70a0305824a9f261c603 +size 4432638 diff --git a/VirtualBox-5.2.4-patched.tar.bz2 b/VirtualBox-5.2.4-patched.tar.bz2 deleted file mode 100644 index 133837e..0000000 --- a/VirtualBox-5.2.4-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3034b2d002cd783efd67e1e0b19a95566cc81a101787c343588e186797a849af -size 83292969 diff --git a/VirtualBox-5.2.6-patched.tar.bz2 b/VirtualBox-5.2.6-patched.tar.bz2 new file mode 100644 index 0000000..bada661 --- /dev/null +++ b/VirtualBox-5.2.6-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c152874c81bbd81c1b31de69457fdbb3898c8a7de5782de7ca84e344419384ac +size 83275377 diff --git a/fixes_for_leap15.patch b/fixes_for_leap15.patch index 6969bc5..edb62b9 100644 --- a/fixes_for_leap15.patch +++ b/fixes_for_leap15.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-5.2.4/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h +Index: VirtualBox-5.2.6/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h =================================================================== ---- VirtualBox-5.2.4.orig/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h -+++ VirtualBox-5.2.4/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h +--- VirtualBox-5.2.6.orig/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h ++++ VirtualBox-5.2.6/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h @@ -46,7 +46,7 @@ typedef struct RTR0SEMLNXWAIT { @@ -11,10 +11,10 @@ Index: VirtualBox-5.2.4/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h wait_queue_entry_t WaitQE; #else wait_queue_t WaitQE; -Index: VirtualBox-5.2.4/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +Index: VirtualBox-5.2.6/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c =================================================================== ---- VirtualBox-5.2.4.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -+++ VirtualBox-5.2.4/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +--- VirtualBox-5.2.6.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ++++ VirtualBox-5.2.6/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c @@ -150,6 +150,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOX # endif #endif diff --git a/vbox-vboxadd-init-script.diff b/vbox-vboxadd-init-script.diff index 4105462..048dc63 100644 --- a/vbox-vboxadd-init-script.diff +++ b/vbox-vboxadd-init-script.diff @@ -1,8 +1,8 @@ -Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-5.2.6/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-5.2.0.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh -@@ -25,11 +25,14 @@ +--- VirtualBox-5.2.6.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-5.2.6/src/VBox/Additions/linux/installer/vboxadd.sh +@@ -26,11 +26,14 @@ # Provides: vboxadd # Required-Start: # Required-Stop: @@ -18,13 +18,14 @@ Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh ### END INIT INFO ## @todo This file duplicates a lot of script with vboxdrv.sh. When making -@@ -129,18 +132,9 @@ log() +@@ -130,19 +133,10 @@ log() - dev=/dev/vboxguest - userdev=/dev/vboxuser + dev=vboxguest + userdev=vboxuser -config=/var/lib/VBoxGuestAdditions/config owner=vboxadd group=1 + usergroup=vboxadd -if test -r $config; then - . $config @@ -37,33 +38,33 @@ Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh running_vboxguest() { lsmod | grep -q "vboxguest[^_-]" -@@ -183,12 +177,6 @@ do_vboxguest_non_udev() - fail "Cannot create device $dev with major $maj and minor $min" +@@ -185,12 +179,6 @@ do_vboxguest_non_udev() + fail "Cannot create device /dev/$dev with major $maj and minor $min" } fi -- chown $owner:$group $dev 2>/dev/null || { -- rm -f $dev 2>/dev/null -- rm -f $userdev 2>/dev/null +- chown $owner:$group /dev/$dev 2>/dev/null || { +- rm -f /dev/$dev 2>/dev/null +- rm -f /dev/$userdev 2>/dev/null - rmmod vboxguest 2>/dev/null -- fail "Cannot change owner $owner:$group for device $dev" +- fail "Cannot change owner $owner:$group for device /dev/$dev" - } - if [ ! -c $userdev ]; then + if [ ! -c /dev/$userdev ]; then maj=10 -@@ -199,12 +187,6 @@ do_vboxguest_non_udev() +@@ -201,12 +189,6 @@ do_vboxguest_non_udev() rmmod vboxguest 2>/dev/null - fail "Cannot create device $userdev with major $maj and minor $min" + fail "Cannot create device /dev/$userdev with major $maj and minor $min" } -- chown $owner:$group $userdev 2>/dev/null || { -- rm -f $dev 2>/dev/null -- rm -f $userdev 2>/dev/null +- chown $owner:$usergroup /dev/$userdev 2>/dev/null || { +- rm -f /dev/$dev 2>/dev/null +- rm -f /dev/$userdev 2>/dev/null - rmmod vboxguest 2>/dev/null -- fail "Cannot change owner $owner:$group for device $userdev" +- fail "Cannot change owner $owner:$usergroup for device /dev/$userdev" - } fi fi } -@@ -214,9 +196,8 @@ start() +@@ -216,9 +198,8 @@ start() begin "Starting." # If we got this far assume that the slow set-up has been done. QUICKSETUP=yes @@ -74,8 +75,8 @@ Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh + ps -A -o comm | grep -q '/*udevd$' 2>/dev/null || no_udev=1 running_vboxguest || { - rm -f $dev || { -@@ -229,7 +210,7 @@ start() + rm -f /dev/$dev || { +@@ -231,7 +212,7 @@ start() $MODPROBE vboxguest >/dev/null 2>&1 || { setup @@ -84,7 +85,7 @@ Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh fail "modprobe vboxguest failed" } case "$no_udev" in 1) -@@ -252,14 +233,15 @@ start() +@@ -254,14 +235,15 @@ start() fi # INSTALL_NO_MODULE_BUILDS # Put the X.Org driver in place. This is harmless if it is not needed. @@ -102,7 +103,7 @@ Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh # SELinux for the OpenGL libraries, so that gdm can load them during the # acceleration support check. This prevents an "Oh no, something has gone # wrong!" error when starting EL7 guests. -@@ -270,6 +252,15 @@ start() +@@ -272,6 +254,15 @@ start() chcon -h -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1" fi echo "/var/lib/VBoxGuestAdditions/lib" > /etc/ld.so.conf.d/00vboxvideo.conf @@ -119,7 +120,7 @@ Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh ldconfig @@ -408,9 +399,9 @@ create_udev_rule() - echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules + echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"${userdev}\", OWNER=\"${owner}\", GROUP=\"${usergroup}\", MODE=\"0660\"" >> /etc/udev/rules.d/60-vboxadd.rules fi } - @@ -201,11 +202,11 @@ Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh fi rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null } -Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd-service.sh +Index: VirtualBox-5.2.6/src/VBox/Additions/linux/installer/vboxadd-service.sh =================================================================== ---- VirtualBox-5.2.0.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh -+++ VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd-service.sh -@@ -23,7 +23,7 @@ +--- VirtualBox-5.2.6.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh ++++ VirtualBox-5.2.6/src/VBox/Additions/linux/installer/vboxadd-service.sh +@@ -26,7 +26,7 @@ # Provides: vboxadd-service # Required-Start: vboxadd # Required-Stop: vboxadd @@ -214,11 +215,11 @@ Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd-service.sh # Default-Stop: 0 1 6 # X-Conflicts-With: systemd-timesyncd.service # Description: VirtualBox Additions Service -Index: VirtualBox-5.2.0/src/VBox/Installer/linux/vboxautostart-service.sh +Index: VirtualBox-5.2.6/src/VBox/Installer/linux/vboxautostart-service.sh =================================================================== ---- VirtualBox-5.2.0.orig/src/VBox/Installer/linux/vboxautostart-service.sh -+++ VirtualBox-5.2.0/src/VBox/Installer/linux/vboxautostart-service.sh -@@ -20,7 +20,7 @@ +--- VirtualBox-5.2.6.orig/src/VBox/Installer/linux/vboxautostart-service.sh ++++ VirtualBox-5.2.6/src/VBox/Installer/linux/vboxautostart-service.sh +@@ -23,7 +23,7 @@ # Provides: vboxautostart-service # Required-Start: vboxdrv # Required-Stop: vboxdrv @@ -227,11 +228,11 @@ Index: VirtualBox-5.2.0/src/VBox/Installer/linux/vboxautostart-service.sh # Default-Stop: 0 1 6 # Description: VirtualBox autostart service ### END INIT INFO -Index: VirtualBox-5.2.0/src/VBox/Installer/linux/vboxballoonctrl-service.sh +Index: VirtualBox-5.2.6/src/VBox/Installer/linux/vboxballoonctrl-service.sh =================================================================== ---- VirtualBox-5.2.0.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh -+++ VirtualBox-5.2.0/src/VBox/Installer/linux/vboxballoonctrl-service.sh -@@ -20,7 +20,7 @@ +--- VirtualBox-5.2.6.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh ++++ VirtualBox-5.2.6/src/VBox/Installer/linux/vboxballoonctrl-service.sh +@@ -23,7 +23,7 @@ # Provides: vboxballoonctrl-service # Required-Start: vboxdrv # Required-Stop: vboxdrv @@ -240,10 +241,10 @@ Index: VirtualBox-5.2.0/src/VBox/Installer/linux/vboxballoonctrl-service.sh # Default-Stop: 0 1 6 # Description: VirtualBox watchdog daemon ### END INIT INFO -Index: VirtualBox-5.2.0/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +Index: VirtualBox-5.2.6/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh =================================================================== ---- VirtualBox-5.2.0.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh -+++ VirtualBox-5.2.0/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +--- VirtualBox-5.2.6.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh ++++ VirtualBox-5.2.6/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh @@ -31,7 +31,7 @@ # Provides: testboxscript-service # Required-Start: $network @@ -253,10 +254,10 @@ Index: VirtualBox-5.2.0/src/VBox/ValidationKit/testboxscript/linux/testboxscript # Default-Stop: 0 1 6 # Description: TestBoxScript service ### END INIT INFO -Index: VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +Index: VirtualBox-5.2.6/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh =================================================================== ---- VirtualBox-5.2.0.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh -+++ VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +--- VirtualBox-5.2.6.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh ++++ VirtualBox-5.2.6/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh @@ -31,7 +31,7 @@ # Provides: vboxtxs # Required-Start: $network @@ -266,10 +267,10 @@ Index: VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs- # Default-Stop: 0 1 6 # Description: VirtualBox Test Execution Service ### END INIT INFO -Index: VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +Index: VirtualBox-5.2.6/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh =================================================================== ---- VirtualBox-5.2.0.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh -+++ VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +--- VirtualBox-5.2.6.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh ++++ VirtualBox-5.2.6/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh @@ -31,7 +31,7 @@ # Provides: vboxtxs # Required-Start: $network diff --git a/virtualbox.changes b/virtualbox.changes index eb347c7..769f0df 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed Jan 17 18:49:36 UTC 2018 - Larry.Finger@lwfinger.net + +- Version bump to 5.2.6 (released 2018-01-15 by Oracle) + +Fixes for the following vulnerabilities (bsc#1076372) +CVE-2018-2694, CVE-2018-2698, CVE-2018-2685, CVE-2018-2686, CVE-2018-2687, CVE-2018-2688 +CVE-2018-2689, CVE-2018-2690, CVE-2018-2676, CVE-2018-2693, CVE-2017-5715 + +This is a maintenance release. The following items were fixed and/or added: + + GUI: fixed occasional screen corruption when host screen resolutio n is changed + User interface: increase proposed disk size when creating new VMs for Windows 7 and newer + User interface: various improvements for high resolution screens + VMM: Fixed problems using 256MB VRAM in raw-mode VMs + Audio: implemented support for audio playback and recording for macOS guests + Audio: further timing improvements for Windows 10 guests + Linux hosts: fixed problem accessing mini-toolbar under XFCE (bug #17280, contributed by Dusan Gallo) + ------------------------------------------------------------------- Fri Jan 12 17:13:07 UTC 2018 - Larry.Finger@lwfinger.net diff --git a/virtualbox.spec b/virtualbox.spec index 34641e9..a9d67d3 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -28,7 +28,7 @@ %define _udevrulesdir %{_sysconfdir}/udev/rules.d Name: virtualbox # ********* If the VB version exceeds 5.2.x, notify the libvirt maintainer!! -Version: 5.2.4 +Version: 5.2.6 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0+ @@ -108,7 +108,7 @@ Patch115: vbox_fix_for_gcc7.patch # Fix for missing include needed for server 1.19 Patch116: Fix_for_server_1.19.patch # Fix for removal of init_timer_pinned() in kernel 4.15 -Patch117: fixes_for_4.15.patch +#Patch117: fixes_for_4.15.patch # Fix invalid use of internal headers Patch118: internal-headers.patch # Fix kernl API change in Leap 15 @@ -402,7 +402,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch113 -p1 %patch115 -p1 %patch116 -p1 -%patch117 -p1 +#%patch117 -p1 %patch118 -p1 %if 0%{suse_version} == 1500 %patch119 -p1 From 24bac2814ba375d767f3a6e0674c56819cce8e6fd570bfc18444f0de6c9e8b11 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 18 Jan 2018 19:03:09 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=398 --- fixes_for_4.15.patch | 117 ++++--------------------------------------- virtualbox.changes | 2 +- virtualbox.spec | 12 ++--- 3 files changed, 18 insertions(+), 113 deletions(-) diff --git a/fixes_for_4.15.patch b/fixes_for_4.15.patch index 900b269..7ddd841 100644 --- a/fixes_for_4.15.patch +++ b/fixes_for_4.15.patch @@ -1,87 +1,7 @@ -This patch file makes the necessary changes to the VirtualBox 5.1.30 sources -to allow the kernel modules to build with kernel 4.15. - -The API changes are of several types: - -1. The timer initialization routine init_timer_pinned() no longer exists, and - is replaced by timer_setup(). -2. The timer callback routine calling sequence is changed as is the technique - for getting the timer information from the callback parameters. -3. The calling sequence for drm_encoder_find() is changed. -4. The calling sequence for the .get and .set members of the module_param_call() - calls have changed. - -This patch is released under the MIT license when appropriate, GPLv2 otherwise. - -Signed-off-by: Larry Finger - -This patch file makes the necessary changes to the VirtualBox 5.1.30 sources -to allow the kernel modules to build with kernel 4.15. - -The API changes are of several types: - -1. The timer initialization routine init_timer_pinned() no longer exists, and - is replaced by timer_setup(). -2. The timer callback routine calling sequence is changed as is the technique - for getting the timer information from the callback parameters. -3. The calling sequence for drm_encoder_find() is changed. -4. The calling sequence for the .get and .set members of the module_param_call() - calls have changed. - -This patch is released under the MIT license when appropriate, GPLv2 otherwise. - -Signed-off-by: Larry Finger - -Index: VirtualBox-5.2.2/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c +Index: VirtualBox-5.2.6/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c =================================================================== ---- VirtualBox-5.2.2.orig/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c -+++ VirtualBox-5.2.2/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c -@@ -715,6 +715,14 @@ static enum hrtimer_restart rtTimerLinux - #endif /* RTTIMER_LINUX_WITH_HRTIMER */ - - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) -+/** -+ * Timer callback for kernels 4.15 and later -+ */ -+static void rtTimerLinuxStdCallback(struct timer_list *t) -+{ -+ PRTTIMERLNXSUBTIMER pSubTimer = from_timer(pSubTimer, t, u.Std.LnxTimer); -+#else - /** - * Timer callback function for standard timers. - * -@@ -723,6 +731,7 @@ static enum hrtimer_restart rtTimerLinux - static void rtTimerLinuxStdCallback(unsigned long ulUser) - { - PRTTIMERLNXSUBTIMER pSubTimer = (PRTTIMERLNXSUBTIMER)ulUser; -+#endif - PRTTIMER pTimer = pSubTimer->pParent; - - RTTIMERLNX_LOG(("stdcallback %p\n", pTimer)); -@@ -1584,13 +1593,17 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *pp - else - #endif - { --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) -+ timer_setup(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer,rtTimerLinuxStdCallback, TIMER_PINNED); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) - init_timer_pinned(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer); - #else - init_timer(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer); - #endif -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) - pTimer->aSubTimers[iCpu].u.Std.LnxTimer.data = (unsigned long)&pTimer->aSubTimers[iCpu]; - pTimer->aSubTimers[iCpu].u.Std.LnxTimer.function = rtTimerLinuxStdCallback; -+#endif - pTimer->aSubTimers[iCpu].u.Std.LnxTimer.expires = jiffies; - pTimer->aSubTimers[iCpu].u.Std.u64NextTS = 0; - } -Index: VirtualBox-5.2.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c -=================================================================== ---- VirtualBox-5.2.2.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c -+++ VirtualBox-5.2.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c +--- VirtualBox-5.2.6.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c ++++ VirtualBox-5.2.6/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c @@ -1058,7 +1058,11 @@ void VGDrvNativeISRMousePollEvent(PVBOXG #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) @@ -178,37 +98,22 @@ Index: VirtualBox-5.2.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c { strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled"); return strlen(pszBuf); -Index: VirtualBox-5.2.2/src/VBox/Additions/linux/drm/vbox_mode.c +Index: VirtualBox-5.2.6/src/VBox/Additions/linux/drm/vbox_mode.c =================================================================== ---- VirtualBox-5.2.2.orig/src/VBox/Additions/linux/drm/vbox_mode.c -+++ VirtualBox-5.2.2/src/VBox/Additions/linux/drm/vbox_mode.c -@@ -398,11 +398,15 @@ static struct drm_encoder *vbox_best_sin - *connector) - { - int enc_id = connector->encoder_ids[0]; -- +--- VirtualBox-5.2.6.orig/src/VBox/Additions/linux/drm/vbox_mode.c ++++ VirtualBox-5.2.6/src/VBox/Additions/linux/drm/vbox_mode.c +@@ -401,8 +401,13 @@ static struct drm_encoder *vbox_best_sin + /* pick the encoder ids */ if (enc_id) +- return drm_encoder_find(connector->dev, enc_id); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) -+ return drm_encoder_find(connector->dev, NULL, enc_id); ++ return drm_encoder_find(connector->dev, NULL, enc_id); +#else - return drm_encoder_find(connector->dev, enc_id); ++ return drm_encoder_find(connector->dev, enc_id); +#endif + LogFunc(("vboxvideo: %d\n", __LINE__)); return NULL; } -Index: VirtualBox-5.2.2/configure -=================================================================== ---- VirtualBox-5.2.2.orig/configure -+++ VirtualBox-5.2.2/configure -@@ -1538,7 +1538,7 @@ EOF - INCQT5=`strip_I "$FLGQT5"` - LIBDIR5=`pkg-config Qt5Core --variable=libdir` - LIBQT5=`pkg-config Qt5Core --libs` -- LIBQT5="-L$LIBDIR5 $LIBQT5" -+ LIBQT5="-L$LIBDIR5 $LIBQT5 -std=c++11" - TOOLQT5=`pkg-config Qt5Core --variable=prefix` - TOOLQT5BIN=`pkg-config Qt5Core --variable=host_bins` - if test_compile "$LIBQT5 $LIBPTHREAD $FLGQT5" qt5 qt5 nofatal; then diff --git a/virtualbox.changes b/virtualbox.changes index 769f0df..20d21fc 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Wed Jan 17 18:49:36 UTC 2018 - Larry.Finger@lwfinger.net +Thu Jan 18 19:01:59 UTC 2018 - Larry.Finger@lwfinger.net - Version bump to 5.2.6 (released 2018-01-15 by Oracle) diff --git a/virtualbox.spec b/virtualbox.spec index a9d67d3..11d0e61 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -38,7 +38,7 @@ Url: http://www.virtualbox.org/ # so you don't need to repack virtualbox by hand, just add new release of VirtualBox-x.x.x.tar.bz2 and line below with # script virtualbox-patch-source.sh will do the job :) # WARNING: This is not a comment, but the real command to repack souce -#%(bash %{_sourcedir}/virtualbox-patch-source.sh VirtualBox-%{version}.tar.bz2) +##\%(bash %{_sourcedir}/virtualbox-patch-source.sh VirtualBox-%{version}.tar.bz2) Source0: VirtualBox-%{version}-patched.tar.bz2 Source1: UserManual.pdf Source3: %{name}-60-vboxguest.rules @@ -108,7 +108,7 @@ Patch115: vbox_fix_for_gcc7.patch # Fix for missing include needed for server 1.19 Patch116: Fix_for_server_1.19.patch # Fix for removal of init_timer_pinned() in kernel 4.15 -#Patch117: fixes_for_4.15.patch +Patch117: fixes_for_4.15.patch # Fix invalid use of internal headers Patch118: internal-headers.patch # Fix kernl API change in Leap 15 @@ -251,7 +251,7 @@ websrv GUI part for %{name}. %package host-KMP Summary: Host kernel module for VirtualBox -#%kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %{SOURCE7} -n %{name}-host -f %{SOURCE5} -x kdump um xen pae xenpae pv +##\%kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %{SOURCE7} -n %{name}-host -f %{SOURCE5} -x kdump um xen pae xenpae pv Group: System/Emulators/PC Requires: %{kernel_module_package_buildreqs} @@ -402,7 +402,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch113 -p1 %patch115 -p1 %patch116 -p1 -#%patch117 -p1 +%patch117 -p1 %patch118 -p1 %if 0%{suse_version} == 1500 %patch119 -p1 @@ -946,8 +946,8 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_bindir}/VBoxClient %{_libdir}/VBoxOGL*.so %{_libdir}/VBoxEGL*.so -#%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so -#%{_libdir}/dri/vboxvideo_dri.so +##\%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so +##\%{_libdir}/dri/vboxvideo_dri.so %{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh %files guest-tools