- Removed "vbox_fix_4.10_api_changes.patch" - fixed upstream

Removed "vbox_fix_4.11_api_changes.patch" - fixed upstream
- Version bump to 5.1.16 (released 2017-03-08 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
    VMM: don't access the MSR_IA32_SMM_MONITOR_CTL MSR if dual-monitor treatment is not available (KVM workaround, bug #14965)
    VMM: another fix for handling certain MSRs on ancient CPUs without VT-x support for MSR bitmaps
    VMM: fixed VERR_SSM_LOAD_CPUID_MISMATCH errors when restoring a saved state with SMP guests on hosts without the CPUID/HTT bit set (bug #16428)
    VMM: fixed a bug in call gate emulation
    VMM: FWAIT instruction fix
    VMM: fixed a sporadic guest hang under certain conditions
    GUI: hide the mini-toolbar from the taskbar and the pager on certain X11 hosts
    GUI: better error handling on the global settings / network / host-only / DHCP server settings
    GUI: fixes for full-screen with multiple screens
    Host-only Network: fixed host-only adapter creation issue preventing VirtualBox installation on Windows 10 hosts (bug #16379)
    NAT network: fixed two potential crashes in the DHCP server
    ICH9: fixed incorrect initialization of the primary bus for PCI bridges (5.1.14 regression)
    Storage: LsiLogic fix for Windows 10
    USB: fixed not being able to attach certain USB devices having invalid characters in the device strings (5.0.18 regression; bug #15956)
    USB: several fixes for the USB/IP support (bug #16462)
    VBoxSVC: fixed another crash during shutdown under rare circumstances
    VBoxSVC: fixed a stack overflow on (Windows debug builds only; bug #16409)
    OVF: when importing an appliance handle more than 10 network adapters if the OVA was created by VirtualBox (bug #16401)
    OVF: fixes for exporting and importing appliances with many disks (bug #16402)
    VBoxManage: fixed regression with modifyhd --resize (bug #16311)
    rdesktop-vrdp: source code tarball fixes
    Linux Installers: do not rebuild kernel modules unnecessarily (bug #16408)
    Linux hosts: added an action for opening the VM manager window to the .desktop file
    Linux hosts / guests: Linux 4.11 compile fixes (bug #16506)
    Linux Additions: added vboxsf FS modules alias (bug #16404)
    Linux Additions: fix for the shared folders kernel module to compile on Linux 4.10

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=317

UserManual.pdf

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40d625bf41b86bc7c6c6895e29c0ce50e5dd0697bf18b56c5b810eeeb3a912a4
+oid sha256:e70059d634b8003dd17f751b36928a5ada8448b11c19dfe69472087d3137eb8a
-size 4357657
+size 4362838

vbox-vboxdrv-init-script.diff

@@ -1,7 +1,7 @@
-Index: VirtualBox-5.1.4/src/VBox/Installer/linux/vboxdrv.sh
+Index: VirtualBox-5.1.16/src/VBox/Installer/linux/vboxdrv.sh
 ===================================================================
---- VirtualBox-5.1.4.orig/src/VBox/Installer/linux/vboxdrv.sh
+--- VirtualBox-5.1.16.orig/src/VBox/Installer/linux/vboxdrv.sh
-+++ VirtualBox-5.1.4/src/VBox/Installer/linux/vboxdrv.sh
++++ VirtualBox-5.1.16/src/VBox/Installer/linux/vboxdrv.sh
 @@ -19,11 +19,12 @@
  #
  ### BEGIN INIT INFO
@@ -19,7 +19,7 @@ Index: VirtualBox-5.1.4/src/VBox/Installer/linux/vboxdrv.sh
  ### END INIT INFO
  
  ## @todo This file duplicates a lot of script with vboxadd.sh.  When making
-@@ -258,13 +259,6 @@ start()
+@@ -261,13 +262,6 @@ start()
          fi
      fi
      # ensure permissions
@@ -33,12 +33,11 @@ Index: VirtualBox-5.1.4/src/VBox/Installer/linux/vboxdrv.sh
      if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
          failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
      fi
-@@ -395,36 +389,8 @@ cleanup()
+@@ -387,35 +381,8 @@ cleanup()
  # setup_script
  setup()
  {
 -    begin_msg "Building VirtualBox kernel modules" console
--    cleanup
 -    if ! $BUILDINTMP \
 -        --save-module-symvers /tmp/vboxdrv-Module.symvers \
 -        --module-source "$MODULE_SRC/vboxdrv" \

vbox_fix_4.11_api_changes.patch

@@ -137,3 +137,67 @@ Index: VirtualBox-5.1.14/src/VBox/Additions/linux/sharedfolders/regops.c
      struct file *file = vma->vm_file;
      struct inode *inode = GET_F_DENTRY(file)->d_inode;
      struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb);
+Index: VirtualBox-5.1.14/src/VBox/Additions/linux/drm/vbox_drv.c
+===================================================================
+--- VirtualBox-5.1.14.orig/src/VBox/Additions/linux/drm/vbox_drv.c
++++ VirtualBox-5.1.14/src/VBox/Additions/linux/drm/vbox_drv.c
+@@ -45,6 +45,11 @@
+ /*
+  * Authors: Dave Airlie <airlied@redhat.com>
+  */
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <drm/drm_encoder.h>
++#include <drm/drm_drv.h>
++#endif
+ #include "vbox_drv.h"
+ 
+ #include <VBox/VBoxGuest.h>
+@@ -57,7 +62,6 @@
+ 
+ #include <drm/drmP.h>
+ #include <drm/drm_crtc_helper.h>
+-
+ int vbox_modeset = -1;
+ 
+ MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
+Index: VirtualBox-5.1.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+===================================================================
+--- VirtualBox-5.1.14.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
++++ VirtualBox-5.1.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+@@ -31,8 +31,11 @@
+  * Include iprt/types.h to install the bool wrappers.
+  * Then use the linux bool type for all the stuff include here.
+  */
++#include <linux/version.h>
+ #include <iprt/types.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ #define bool linux_bool
++#endif
+ 
+ #if RT_GNUC_PREREQ(4, 6)
+ # pragma GCC diagnostic push
+@@ -44,7 +47,6 @@
+ # endif
+ #endif
+ 
+-#include <linux/version.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
+ # include <generated/autoconf.h>
+ #else
+Index: VirtualBox-5.1.14/src/VBox/Additions/linux/drm/vbox_fb.c
+===================================================================
+--- VirtualBox-5.1.14.orig/src/VBox/Additions/linux/drm/vbox_fb.c
++++ VirtualBox-5.1.14/src/VBox/Additions/linux/drm/vbox_fb.c
+@@ -46,6 +46,11 @@
+  * Authors: Dave Airlie <airlied@redhat.com>
+  */
+ /* Include from most specific to most general to be able to override things. */
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <drm/drm_encoder.h>
++#include <drm/drm_drv.h>
++#endif
+ #include "vbox_drv.h"
+ #include <VBox/VBoxVideo.h>
+ #include <VBox/VMMDev.h>

vbox_remove_smp_mflags.patch

@@ -1,26 +1,26 @@
-Index: VirtualBox-5.1.8/src/libs/libxml2-2.9.2/libxml.spec.in
+Index: VirtualBox-5.1.16/src/libs/libxml2-2.9.4/libxml.spec.in
 ===================================================================
---- VirtualBox-5.1.8.orig/src/libs/libxml2-2.9.2/libxml.spec.in
+--- VirtualBox-5.1.16.orig/src/libs/libxml2-2.9.4/libxml.spec.in
-+++ VirtualBox-5.1.8/src/libs/libxml2-2.9.2/libxml.spec.in
++++ VirtualBox-5.1.16/src/libs/libxml2-2.9.4/libxml.spec.in
-@@ -69,7 +69,7 @@ at parse time or later once the document
+@@ -94,7 +94,7 @@ at parse time or later once the document
  
  %build
  %configure
 -make %{_smp_mflags}
-+make 
++make
  
  %install
  rm -fr %{buildroot}
-Index: VirtualBox-5.1.8/src/libs/libxml2-2.9.2/libxml2.spec
+Index: VirtualBox-5.1.16/src/libs/libxml2-2.9.4/libxml2.spec
 ===================================================================
---- VirtualBox-5.1.8.orig/src/libs/libxml2-2.9.2/libxml2.spec
+--- VirtualBox-5.1.16.orig/src/libs/libxml2-2.9.4/libxml2.spec
-+++ VirtualBox-5.1.8/src/libs/libxml2-2.9.2/libxml2.spec
++++ VirtualBox-5.1.16/src/libs/libxml2-2.9.4/libxml2.spec
-@@ -69,7 +69,7 @@ at parse time or later once the document
+@@ -94,7 +94,7 @@ at parse time or later once the document
  
  %build
  %configure
 -make %{_smp_mflags}
-+make 
++make
  
  %install
  rm -fr %{buildroot}

virtualbox.changes

@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Thu Mar  9 18:54:31 UTC 2017 - Larry.Finger@lwfinger.net
+
+- Removed "vbox_fix_4.10_api_changes.patch" - fixed upstream
+  Removed "vbox_fix_4.11_api_changes.patch" - fixed upstream
+
+- Version bump to 5.1.16 (released 2017-03-08 by Oracle)
+
+This is a maintenance release. The following items were fixed and/or added:
+
+    VMM: don't access the MSR_IA32_SMM_MONITOR_CTL MSR if dual-monitor treatment is not available (KVM workaround, bug #14965)
+    VMM: another fix for handling certain MSRs on ancient CPUs without VT-x support for MSR bitmaps
+    VMM: fixed VERR_SSM_LOAD_CPUID_MISMATCH errors when restoring a saved state with SMP guests on hosts without the CPUID/HTT bit set (bug #16428)
+    VMM: fixed a bug in call gate emulation
+    VMM: FWAIT instruction fix
+    VMM: fixed a sporadic guest hang under certain conditions
+    GUI: hide the mini-toolbar from the taskbar and the pager on certain X11 hosts
+    GUI: better error handling on the global settings / network / host-only / DHCP server settings
+    GUI: fixes for full-screen with multiple screens
+    Host-only Network: fixed host-only adapter creation issue preventing VirtualBox installation on Windows 10 hosts (bug #16379)
+    NAT network: fixed two potential crashes in the DHCP server
+    ICH9: fixed incorrect initialization of the primary bus for PCI bridges (5.1.14 regression)
+    Storage: LsiLogic fix for Windows 10
+    USB: fixed not being able to attach certain USB devices having invalid characters in the device strings (5.0.18 regression; bug #15956)
+    USB: several fixes for the USB/IP support (bug #16462)
+    VBoxSVC: fixed another crash during shutdown under rare circumstances
+    VBoxSVC: fixed a stack overflow on (Windows debug builds only; bug #16409)
+    OVF: when importing an appliance handle more than 10 network adapters if the OVA was created by VirtualBox (bug #16401)
+    OVF: fixes for exporting and importing appliances with many disks (bug #16402)
+    VBoxManage: fixed regression with modifyhd --resize (bug #16311)
+    rdesktop-vrdp: source code tarball fixes
+    Linux Installers: do not rebuild kernel modules unnecessarily (bug #16408)
+    Linux hosts: added an action for opening the VM manager window to the .desktop file
+    Linux hosts / guests: Linux 4.11 compile fixes (bug #16506)
+    Linux Additions: added vboxsf FS modules alias (bug #16404)
+    Linux Additions: fix for the shared folders kernel module to compile on Linux 4.10
+    Linux Additions: properly install the Linux kernel module override rule on distributions without /etc/depmod.d
+    Windows Additions: fixed a crash with recent Windows 10 builds if 3D is disabled (bug #15973) 
+
 -------------------------------------------------------------------
 Wed Mar  8 21:18:08 UTC 2017 - Larry.Finger@lwfinger.net
 

virtualbox.spec

@@ -22,7 +22,7 @@
 %define _vbox_instdir  %{_libexecdir}/virtualbox
 %define _udevrulesdir %{_sysconfdir}/udev/rules.d
 Name:           virtualbox
-Version:        5.1.14
+Version:        5.1.16
 Release:        0
 Summary:        VirtualBox is an Emulator
 License:        GPL-2.0+
@@ -93,10 +93,6 @@ Patch113:       vbox_remove_smp_mflags.patch
 # Fix for missing include needed for server 1.19
 Patch116:       Fix_for_server_1.19.patch
 #
-Patch117:       vbox_fix_4.10_api_changes.patch
-# Fix kernel 4.11 API changes
-Patch118:       vbox_fix_4.11_api_changes.patch
-#
 BuildRequires:  LibVNCServer-devel
 BuildRequires:  SDL-devel
 BuildRequires:  acpica
@@ -138,7 +134,6 @@ BuildRequires:  update-desktop-files
 BuildRequires:  which
 BuildRequires:  xorg-x11
 BuildRequires:  xorg-x11-server
-#BuildRequires:  xorg-x11-server > 7.6_1.18.4-2.1
 BuildRequires:  xorg-x11-server-sdk
 BuildRequires:  yasm
 BuildRequires:  zlib-devel-static
@@ -339,8 +334,6 @@ This package contains icons for guest desktop files that were created on the des
 %patch112 -p1
 %patch113 -p1
 %patch116 -p1
-%patch117 -p1
-%patch118 -p1
 
 #copy user manual
 cp %{SOURCE1} UserManual.pdf