From ed8a70cdf5c42fd896879888bfc03f9dd2ecfbe7519891ca3c56e7fc8e78c0d2 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 17 Apr 2018 12:58:34 +0000 Subject: [PATCH 1/2] - Add file "fixes_for_4.17.patch" to follow API changes in kernel 4.17. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=416 --- fixes_for_4.17.patch | 31 +++++++++++++++++++++++++++++++ virtualbox.changes | 5 +++++ virtualbox.spec | 3 +++ 3 files changed, 39 insertions(+) create mode 100644 fixes_for_4.17.patch diff --git a/fixes_for_4.17.patch b/fixes_for_4.17.patch new file mode 100644 index 0000000..c9e3903 --- /dev/null +++ b/fixes_for_4.17.patch @@ -0,0 +1,31 @@ +In kernel 4.17, pci_get_bus_and_slot() has been removed in favor of +pci_get_domain_bus_and_slot(). It appears that VirtualBox only uses +domain number 0, thus pci_get_domain_bus_and_slot(0, bus, devfn) +is a suitable replacement for pci_get_bus_and_slot(bus, devfn). + +The resulting code compiles; however, I do not use PCI passthru, which +I think means that I have not actually tested the code. + +This patch released under a combined MIT/GPLv2 license. + +Signed-off-by: Larry Finger + +Index: VirtualBox-5.2.8/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +=================================================================== +--- VirtualBox-5.2.8.orig/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c ++++ VirtualBox-5.2.8/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +@@ -89,7 +89,14 @@ MODULE_VERSION(VBOX_VERSION_STRING " r" + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) + # define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p) + # define PCI_DEV_PUT(x) pci_dev_put(x) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0) ++/* assume the domain number to be zero - exactly the same assumption of ++ * pci_get_bus_and_slot() ++ */ ++# define PCI_DEV_GET_SLOT(bus, devfn) pci_get_domain_bus_and_slot(0, bus, devfn) ++#else + # define PCI_DEV_GET_SLOT(bus, devfn) pci_get_bus_and_slot(bus, devfn) ++#endif + #else + # define PCI_DEV_GET(v,d,p) pci_find_device(v,d,p) + # define PCI_DEV_PUT(x) do { } while (0) diff --git a/virtualbox.changes b/virtualbox.changes index 2abc344..d55c2d0 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 17 12:57:03 UTC 2018 - Larry.Finger@lwfinger.net + +- Add file "fixes_for_4.17.patch" to follow API changes in kernel 4.17. + ------------------------------------------------------------------- Thu Mar 22 19:32:44 UTC 2018 - Larry.Finger@lwfinger.net diff --git a/virtualbox.spec b/virtualbox.spec index 4c42c82..134b9e2 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -117,6 +117,8 @@ Patch120: fixes_for_python.patch Patch121: remove_vbox_video_build.patch # Fix build for kernel 4.16 Patch122: fixes_for_4.16.patch +# Fix build for kernel 4.17 +Patch123: fixes_for_4.17.patch # BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel @@ -413,6 +415,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. # The patch for kernel 4.16 interferes with Leap 15 fixes %patch122 -p1 %endif +%patch123 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf From 98f2781f2bf31dc2818f82b42fca50e2a7f76b62d61170d73624f33acf0b6e4b Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 18 Apr 2018 16:43:44 +0000 Subject: [PATCH 2/2] - Version bump to 5.2.10 (released April 17 2018 by Oracle) This is a maintenance release. The following items were fixed and/or added: Vulnerabilities CVE-2018-0739, CVE-2018-2830, CVE-2018-2831, CVE-2018-2835, CVE-2018-2836, CVE-2018-2837, CVE-2018-2842, CVE-2018-2843, CVE-2018-2844, CVE-2018-2845, and CVE-2018-2860 VMM: Fixed missing NULL pointer check in MMIO code Storage: fixed having multiple NVMe controllers with ICH9 enabled (5.2.0 regression) Network: fixed wireless detection regression when bridging to adapters with unbound IP protocols (bug #17543) Audio: Fixed interrupt storm in FreeBSD guests with HDA (bug #17219) Keyboard: Introduced a small delay to fix old software which expects to be able to read an incoming scan code more than once (bug #17592) NAT: Handle nameserver 0.0.0.0 which is a valid setting (bug #17584) BIOS: INT 15h/87h service must disable A20 gate when done Linux Guest Additions: fix a hang starting KDE Plasma OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=417 --- UserManual.pdf | 4 ++-- VirtualBox-5.2.10-patched.tar.bz2 | 3 +++ VirtualBox-5.2.8-patched.tar.bz2 | 3 --- virtualbox.changes | 18 ++++++++++++++++++ virtualbox.spec | 2 +- 5 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 VirtualBox-5.2.10-patched.tar.bz2 delete mode 100644 VirtualBox-5.2.8-patched.tar.bz2 diff --git a/UserManual.pdf b/UserManual.pdf index abd4b3b..a4f0dc0 100644 --- a/UserManual.pdf +++ b/UserManual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ac2b153528860547be427945351c6ecfa5de71057b8d88424198a6d54576d41 -size 4435486 +oid sha256:92a0048f70ab8504f3fc11db8615b44205faabe259ccd2dcb1a034e42d096c6e +size 4438609 diff --git a/VirtualBox-5.2.10-patched.tar.bz2 b/VirtualBox-5.2.10-patched.tar.bz2 new file mode 100644 index 0000000..3accbcd --- /dev/null +++ b/VirtualBox-5.2.10-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71ff33fc6247114b58809e274d5fd71fcc65081a412494aa62f62f3efd412244 +size 83379852 diff --git a/VirtualBox-5.2.8-patched.tar.bz2 b/VirtualBox-5.2.8-patched.tar.bz2 deleted file mode 100644 index c5c011c..0000000 --- a/VirtualBox-5.2.8-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f750ceea200e632618428916824613f5327f427c71762a048564d5841ba868a -size 83297131 diff --git a/virtualbox.changes b/virtualbox.changes index d55c2d0..c4d35b6 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Apr 18 15:56:20 UTC 2018 - Larry.Finger@lwfinger.net + +- Version bump to 5.2.10 (released April 17 2018 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + + Vulnerabilities CVE-2018-0739, CVE-2018-2830, CVE-2018-2831, CVE-2018-2835, CVE-2018-2836, CVE-2018-2837, + CVE-2018-2842, CVE-2018-2843, CVE-2018-2844, CVE-2018-2845, and CVE-2018-2860 + VMM: Fixed missing NULL pointer check in MMIO code + Storage: fixed having multiple NVMe controllers with ICH9 enabled (5.2.0 regression) + Network: fixed wireless detection regression when bridging to adapters with unbound IP protocols (bug #17543) + Audio: Fixed interrupt storm in FreeBSD guests with HDA (bug #17219) + Keyboard: Introduced a small delay to fix old software which expects to be able to read an incoming scan code more than once (bug #17592) + NAT: Handle nameserver 0.0.0.0 which is a valid setting (bug #17584) + BIOS: INT 15h/87h service must disable A20 gate when done + Linux Guest Additions: fix a hang starting KDE Plasma + ------------------------------------------------------------------- Tue Apr 17 12:57:03 UTC 2018 - Larry.Finger@lwfinger.net diff --git a/virtualbox.spec b/virtualbox.spec index 134b9e2..d2898da 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.8 +Version: 5.2.10 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0-or-later