Accepting request 540677 from Virtualization

- Update "fixes_for_leap15.patch" for wait queue API changes.

- Add file "fixes_for_python.patch".

- Modify "fixes_for_leap15.patch" to handle SKB_GSO_UDP API change.
- Addresses VUL-0: CVE-2017-10392,CVE-2017-10407,CVE-2017-10408,CVE-2017-3733,CVE-2017-10428 as noted in bsc #1064200

OBS-URL: https://build.opensuse.org/request/show/540677
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=147

fixes_for_leap15.patch

@@ -11,3 +11,27 @@ Index: VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
      wait_queue_entry_t WaitQE;
  #else
      wait_queue_t    WaitQE;
+Index: VirtualBox-5.1.30/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+===================================================================
+--- VirtualBox-5.1.30.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
++++ VirtualBox-5.1.30/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+@@ -130,6 +130,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOX
+ #define SKB_GSO_UDP	0
+ #endif
+ 
++# if 1
++#define SKB_GSO_UDP	0
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
+ # define VBOX_HAVE_SKB_VLAN
+ #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;

fixes_for_python.patch

@@ -0,0 +1,19 @@
+To eliminate an rpmlint error, the shebang for this script should be
+changed to use pythin directly, rather than through env.
+
+When openSUSE switches to Python3, the shebang below should be changed
+to "#!/usr/bin/python3".
+
+Larry Finger
+
+Index: VirtualBox-5.1.30/src/VBox/Frontends/VBoxShell/vboxshell.py
+===================================================================
+--- VirtualBox-5.1.30.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
++++ VirtualBox-5.1.30/src/VBox/Frontends/VBoxShell/vboxshell.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ # $Id: vboxshell.py $
+ 
+

vboxguestconfig.sh

@@ -5,7 +5,7 @@
 #
 # This script is part of the openSUSE VirtualBox package
 #
-SOURCE="/usr/src/kernel-modules"
+SOURCE="/usr/src/kernel-modules/"
 LOGFILE="/var/log/virtualbox.log"
 INCLUDE="/lib/modules/`uname -r`/build/include"
 #
@@ -15,13 +15,19 @@ if [ -n "$loaded" ] ; then
 	echo "Kernel modules available - exiting..."
 	exit 0
 fi
-# Force installation of VB guest sources. Zypper will install all the prerequisies
+#
-echo "Installing all required packages..."
+# Check if virtualbox-guest-source is installed, quit if not
-killproc PackageKit
+if ! rpm -qf "$SOURCE/virtualbox/src/Makefile" &>/dev/null ; then
-zypper install -y virtualbox-guest-source > /dev/null 2>&1
+	echo "Sources for building guest modules are not present,"
-if [ "$?" -ne 0 ] ; then
+	echo "Use 'sudo zypper install virtualbox-guest-source' to install them. Quitting .."
-	echo "Installation of required packages failed."
+	exit 1
-	echo "Use 'sudo zypper install virtualbox-guest-source' to see the reason."
+fi
+#
+# Check if virtualbox-guest-source version matches virtualbox version
+if [ "$(rpm -q virtualbox virtualbox-guest-source --queryformat='%{version}-%{release}\n' 2>/dev/null | sort -u | wc -l)" -ne "1" ] ; then
+	echo "virtualbox-guest-source package version doesn't match"
+	echo "the version of virtualbox package."
+	echo "Reinstall virtualbox-guest-source package. Quitting .."
 	exit 1
 fi
 # Prerequisites are available, start build

virtualbox.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Nov 11 03:40:07 UTC 2017 - Larry.Finger@lwfinger.net
+
+- Update "fixes_for_leap15.patch" for wait queue API changes.
+
+-------------------------------------------------------------------
+Wed Nov  8 02:08:27 UTC 2017 - Larry.Finger@lwfinger.net
+
+- Add file "fixes_for_python.patch".
+
+-------------------------------------------------------------------
+Tue Nov  7 16:34:21 UTC 2017 - Larry.Finger@lwfinger.net
+
+- Modify "fixes_for_leap15.patch" to handle SKB_GSO_UDP API change.
+- Addresses VUL-0: CVE-2017-10392,CVE-2017-10407,CVE-2017-10408,CVE-2017-3733,CVE-2017-10428 as noted in bsc #1064200
+
 -------------------------------------------------------------------
 Wed Nov  1 15:22:09 UTC 2017 - mpluskal@suse.com
 

virtualbox.spec

@@ -109,6 +109,8 @@ Patch117:       fix_KMS_support.patch
 Patch118:       internal-headers.patch
 # Fix kernl API change in Leap 15
 Patch119:       fixes_for_leap15.patch
+# Fix rpmlint error for script /lib/usr/virtualbox/vboxshell.py
+Patch120:       fixes_for_python.patch
 #
 BuildRequires:  LibVNCServer-devel
 BuildRequires:  SDL-devel
@@ -203,6 +205,7 @@ BuildRequires:  xorg-x11-libXmu-devel-32bit
 BuildRequires:  xorg-x11-libXt-devel-32bit
 %endif
 %{?systemd_requires}
+%posttrans
 
 %description
 VirtualBox is an extremely feature rich, high performance product
@@ -243,6 +246,7 @@ websrv GUI part for %{name}.
 Summary:        Host kernel module for VirtualBox
 Group:          System/Emulators/PC
 %kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %{SOURCE7} -n %{name}-host -f %{SOURCE5} -x kdump um xen pae xenpae pv
+Requires:       kernel-devel
 
 %description host-KMP
 This package contains the kernel-module for VirtualBox.
@@ -252,6 +256,7 @@ This package contains the kernel-module for VirtualBox.
 Summary:        Guest kernel modules for VirtualBox
 Group:          System/Emulators/PC
 %kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %{SOURCE8} -n %{name}-guest -f %{SOURCE6} -x kdump um xen pae xenpae pv
+Requires:       kernel-devel
 
 %description guest-KMP
 This package contains the kernel-module for VirtualBox.
@@ -394,6 +399,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
 %if 0%{suse_version} >= 1500
 %patch119 -p1
 %endif
+%patch120 -p1
 
 #copy user manual
 cp %{SOURCE1} UserManual.pdf