1
0
forked from pool/virtualbox

Accepting request 563907 from Virtualization

- Updated file "fixes_for_leap15.patch" for new source.

OBS-URL: https://build.opensuse.org/request/show/563907
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=153
This commit is contained in:
Dominique Leuenberger 2018-01-16 08:38:04 +00:00 committed by Git OBS Bridge
commit e37095b12e
3 changed files with 15 additions and 18 deletions

View File

@ -1,7 +1,7 @@
Index: VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h Index: VirtualBox-5.2.4/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
=================================================================== ===================================================================
--- VirtualBox-5.1.30.orig/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.1.30/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h +++ VirtualBox-5.2.4/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
typedef struct RTR0SEMLNXWAIT typedef struct RTR0SEMLNXWAIT
{ {
@ -11,12 +11,12 @@ Index: VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
wait_queue_entry_t WaitQE; wait_queue_entry_t WaitQE;
#else #else
wait_queue_t WaitQE; wait_queue_t WaitQE;
Index: VirtualBox-5.1.30/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c Index: VirtualBox-5.2.4/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
=================================================================== ===================================================================
--- VirtualBox-5.1.30.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c --- VirtualBox-5.2.4.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-5.1.30/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +++ VirtualBox-5.2.4/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -130,6 +130,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOX @@ -150,6 +150,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOX
#define SKB_GSO_UDP 0 # endif
#endif #endif
+# if 1 +# if 1
@ -26,12 +26,3 @@ Index: VirtualBox-5.1.30/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
# define VBOX_HAVE_SKB_VLAN # define VBOX_HAVE_SKB_VLAN
#else #else
@@ -726,7 +730,7 @@ static struct sk_buff *vboxNetFltLinuxSk
case PDMNETWORKGSOTYPE_IPV4_TCP:
fGsoType = SKB_GSO_TCPV4;
break;
-# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+# if 1
case PDMNETWORKGSOTYPE_IPV4_UDP:
fGsoType = SKB_GSO_UDP;
break;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 12 17:13:07 UTC 2018 - Larry.Finger@lwfinger.net
- Updated file "fixes_for_leap15.patch" for new source.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 29 19:19:22 UTC 2017 - Larry.Finger@lwfinger.net Fri Dec 29 19:19:22 UTC 2017 - Larry.Finger@lwfinger.net

View File

@ -1,7 +1,7 @@
# #
# spec file for package virtualbox # spec file for package virtualbox
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -27,6 +27,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
# ********* If the VB version exceeds 5.2.x, notify the libvirt maintainer!!
Version: 5.2.4 Version: 5.2.4
Release: 0 Release: 0
Summary: VirtualBox is an Emulator Summary: VirtualBox is an Emulator