1
0
forked from pool/virtualbox

Accepting request 527710 from Virtualization

1

OBS-URL: https://build.opensuse.org/request/show/527710
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=141
This commit is contained in:
Dominique Leuenberger 2017-09-25 11:54:24 +00:00 committed by Git OBS Bridge
commit ad3952c41d
7 changed files with 49 additions and 37 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:9cabbbe0f41866e8d2441e82a3001d3a30519e62bb61b3e91cf2c27c642ba037 oid sha256:5ce94a74064b5f8c6a1ad80c7c04e1f646b6ce249473a9bce7b4739fa5fd2652
size 4381023 size 4383529

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3e95a00bc8ada6a1afa9a676321371d3093b91f650bd8ed914c56f27bcdfeb16
size 81246143

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6d1081419e40eb6d4236c3eb03cc975aee935534893fbc5473fb84dd8eb5fe46
size 81776170

16
fixes_for_4.14.patch Normal file
View File

@ -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);

View File

@ -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) */

View File

@ -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 Sun Sep 10 16:18:04 UTC 2017 - meissner@suse.com

View File

@ -22,7 +22,7 @@
%define _vbox_instdir %{_libexecdir}/virtualbox %define _vbox_instdir %{_libexecdir}/virtualbox
%define _udevrulesdir %{_sysconfdir}/udev/rules.d %define _udevrulesdir %{_sysconfdir}/udev/rules.d
Name: virtualbox Name: virtualbox
Version: 5.1.26 Version: 5.1.28
Release: 0 Release: 0
Summary: VirtualBox is an Emulator Summary: VirtualBox is an Emulator
License: GPL-2.0+ License: GPL-2.0+
@ -97,8 +97,8 @@ Patch109: vbox-usb-warning.diff
Patch112: modify_for_4_8_bo_move.patch Patch112: modify_for_4_8_bo_move.patch
# Remove all mention of _smp_mflags # Remove all mention of _smp_mflags
Patch113: vbox_remove_smp_mflags.patch Patch113: vbox_remove_smp_mflags.patch
# Fix change in API for get_user_pages() # Fix for removal of vfs_write() in kernel 4.14
Patch114: vbox_fix_42.3_api.patch Patch114: fixes_for_4.14.patch
# Allow use of gcc7 # Allow use of gcc7
Patch115: vbox_fix_for_gcc7.patch Patch115: vbox_fix_for_gcc7.patch
# Fix for missing include needed for server 1.19 # 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 %patch109 -p1
%patch112 -p1 %patch112 -p1
%patch113 -p1 %patch113 -p1
%if 0%{?sle_version} == 120300
%patch114 -p1 %patch114 -p1
%endif
%patch115 -p1 %patch115 -p1
%patch116 -p1 %patch116 -p1
%patch117 -p1 %patch117 -p1