From dfb7c858b00636378e14745d06c3f16c526c7e471b5afa09e821ffb640aa8c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Sep 2017 10:40:13 +0000 Subject: [PATCH] Accepting request 527433 from home:lwfinger:branches:Virtualization Update to build on kernel 4.14 OBS-URL: https://build.opensuse.org/request/show/527433 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=363 --- UserManual.pdf | 4 ++-- VirtualBox-5.1.26-patched.tar.bz2 | 3 --- VirtualBox-5.1.28-patched.tar.bz2 | 3 +++ fixes_for_4.14.patch | 16 ++++++++++++++++ vbox_fix_42.3_api.patch | 27 --------------------------- virtualbox.changes | 25 +++++++++++++++++++++++++ virtualbox.spec | 8 +++----- 7 files changed, 49 insertions(+), 37 deletions(-) delete mode 100644 VirtualBox-5.1.26-patched.tar.bz2 create mode 100644 VirtualBox-5.1.28-patched.tar.bz2 create mode 100644 fixes_for_4.14.patch delete mode 100644 vbox_fix_42.3_api.patch diff --git a/UserManual.pdf b/UserManual.pdf index 6462627..8b1eb6e 100644 --- a/UserManual.pdf +++ b/UserManual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cabbbe0f41866e8d2441e82a3001d3a30519e62bb61b3e91cf2c27c642ba037 -size 4381023 +oid sha256:5ce94a74064b5f8c6a1ad80c7c04e1f646b6ce249473a9bce7b4739fa5fd2652 +size 4383529 diff --git a/VirtualBox-5.1.26-patched.tar.bz2 b/VirtualBox-5.1.26-patched.tar.bz2 deleted file mode 100644 index 9a75893..0000000 --- a/VirtualBox-5.1.26-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e95a00bc8ada6a1afa9a676321371d3093b91f650bd8ed914c56f27bcdfeb16 -size 81246143 diff --git a/VirtualBox-5.1.28-patched.tar.bz2 b/VirtualBox-5.1.28-patched.tar.bz2 new file mode 100644 index 0000000..940818d --- /dev/null +++ b/VirtualBox-5.1.28-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d1081419e40eb6d4236c3eb03cc975aee935534893fbc5473fb84dd8eb5fe46 +size 81776170 diff --git a/fixes_for_4.14.patch b/fixes_for_4.14.patch new file mode 100644 index 0000000..34db20e --- /dev/null +++ b/fixes_for_4.14.patch @@ -0,0 +1,16 @@ +Index: VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +=================================================================== +--- VirtualBox-5.1.28.orig/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c ++++ VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +@@ -357,7 +357,11 @@ static int vboxPciFileWrite(struct file* + + fs_save = get_fs(); + set_fs(get_ds()); ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) ++ ret = kernel_write(file, data, size, &offset); ++#else + ret = vfs_write(file, data, size, &offset); ++#endif + set_fs(fs_save); + if (ret < 0) + printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret); diff --git a/vbox_fix_42.3_api.patch b/vbox_fix_42.3_api.patch deleted file mode 100644 index be7d6f6..0000000 --- a/vbox_fix_42.3_api.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: VirtualBox-5.1.18/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -=================================================================== ---- VirtualBox-5.1.18.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -+++ VirtualBox-5.1.18/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -@@ -1084,18 +1079,14 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser - # endif - ); - #else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) */ -- rc = get_user_pages(pTask, /* Task for fault accounting. */ -- pTask->mm, /* Whose pages. */ -- R3Ptr, /* Where from. */ -+ /* The following is modified for Leap 42.3 having the -+ * get_user_pages() API from kernel 4.10 -+ */ -+ rc = get_user_pages(R3Ptr, /* Where from. */ - cPages, /* How many pages. */ --# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) - fWrite ? FOLL_WRITE | /* Write to memory. */ - FOLL_FORCE /* force write access. */ - : 0, /* Write to memory. */ --# else -- fWrite, /* Write to memory. */ -- fWrite, /* force write access. */ --# endif - &pMemLnx->apPages[0], /* Page array. */ - papVMAs); /* vmas */ - #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) */ diff --git a/virtualbox.changes b/virtualbox.changes index 5107cf8..d0cf0aa 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Sep 20 00:44:12 UTC 2017 - Larry.Finger@lwfinger.net + +- Add file "fixes_for_4.14.patch" to handle API change in kernel 4.14. + Remove file "vbox_fix_42.3_api.patch" as that fix is included in upstream code. + +------------------------------------------------------------------- +Fri Sep 15 14:14:15 UTC 2017 - Larry.Finger@lwfinger.net + +- Version bump to 5.1.28 (released 2017-09-13 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + + Audio: fixed accidental crashes when using the AC'97 sound emulation (bug #16959) + Audio: fixed crash when default input or output devices have changed (bugs #16968, #16969, #17004) + Audio: fixed recording when using the ALSA backend + Audio: fixed handle leak when using the OSS backend + E1000: fixed a crash related to VLAN traffic over internal network (5.1.26 regression; bug #16960) + NAT: apply --natbindip1 to TCP connections (bug #16478) + OVF: when importing an appliance with XHCI controller, don't add an OHCI controller. + Linux hosts: fixed creating fixed sized VDI images (bug #17010) + Linux hosts / guests: fixes for Linux 4.4 of openSUSE Leap 42.3 (bug #16966) + Bridged networking: align outgoing packet at word boundary, preventing Windows host crash in MsLbfoProvider. + Linux Additions: kernel drm driver support for custom EL7 Linux 3.10 kernel + ------------------------------------------------------------------- Sun Sep 10 16:18:04 UTC 2017 - meissner@suse.com diff --git a/virtualbox.spec b/virtualbox.spec index 493927a..40f0288 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -22,7 +22,7 @@ %define _vbox_instdir %{_libexecdir}/virtualbox %define _udevrulesdir %{_sysconfdir}/udev/rules.d Name: virtualbox -Version: 5.1.26 +Version: 5.1.28 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0+ @@ -97,8 +97,8 @@ Patch109: vbox-usb-warning.diff Patch112: modify_for_4_8_bo_move.patch # Remove all mention of _smp_mflags Patch113: vbox_remove_smp_mflags.patch -# Fix change in API for get_user_pages() -Patch114: vbox_fix_42.3_api.patch +# Fix for removal of vfs_write() in kernel 4.14 +Patch114: fixes_for_4.14.patch # Allow use of gcc7 Patch115: vbox_fix_for_gcc7.patch # Fix for missing include needed for server 1.19 @@ -382,9 +382,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch109 -p1 %patch112 -p1 %patch113 -p1 -%if 0%{?sle_version} == 120300 %patch114 -p1 -%endif %patch115 -p1 %patch116 -p1 %patch117 -p1