1
0
forked from pool/virtualbox

Accepting request 420307 from home:lwfinger:branches:Virtualization

Version bump to 5.1.4

OBS-URL: https://build.opensuse.org/request/show/420307
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=265
This commit is contained in:
Ismail Dönmez 2016-08-19 08:55:54 +00:00 committed by Git OBS Bridge
parent 5d3c358938
commit 3e21ca3b13
14 changed files with 129 additions and 100 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:29d3963621a4b98f9996f90745303b1885d5271807a85aa021ea11ac3cfa29a6
size 4286798
oid sha256:abc723f25b8429f5485d07abbfb5ad0c773a2fc85acb388c4b7e9a7c75705819
size 4335525

View File

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

View File

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

View File

@ -1,13 +0,0 @@
Index: VirtualBox-5.1.2/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
===================================================================
--- VirtualBox-5.1.2.orig/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
+++ VirtualBox-5.1.2/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
@@ -3771,7 +3771,7 @@ static DECLCALLBACK(int) lsilogicR3IsaIO
Log2(("%s: pu32=%p:{%.*Rhxs} iRegister=%d rc=%Rrc\n",
__FUNCTION__, pu32, 1, pu32, iRegister, rc));
- return rc;
+ return VINF_SUCCESS;
}
/**

View File

@ -0,0 +1,35 @@
Index: VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_ttm.c
===================================================================
--- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -221,7 +221,11 @@ static int vbox_bo_move(struct ttm_buffe
struct ttm_mem_reg *new_mem)
{
int r;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
+#else
+ r = ttm_bo_move_memcpy(bo, evict, interruptible, no_wait_gpu, new_mem);
+#endif
return r;
}
Index: VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -244,9 +244,14 @@ static int vbox_master_set(struct drm_de
return 0;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
static void vbox_master_drop(struct drm_device *dev,
struct drm_file *file_priv,
bool from_release)
+#else
+static void vbox_master_drop(struct drm_device *dev,
+ struct drm_file *file_priv)
+#endif
{
struct vbox_private *vbox = dev->dev_private;
vbox->initial_mode_queried = false;

View File

@ -1,7 +1,7 @@
Index: VirtualBox-5.1.2/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
Index: VirtualBox-5.1.4/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
===================================================================
--- VirtualBox-5.1.2.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+++ VirtualBox-5.1.2/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
--- VirtualBox-5.1.4.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+++ VirtualBox-5.1.4/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
@@ -50,6 +50,12 @@
# include <iprt/power.h>
# define VBOX_WITH_SUSPEND_NOTIFICATION
@ -14,4 +14,4 @@ Index: VirtualBox-5.1.2/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+#endif
#include <linux/sched.h>
#ifdef CONFIG_DEVFS_FS
#include <linux/miscdevice.h>

View File

@ -1,13 +1,13 @@
Index: VirtualBox-5.1.2/src/VBox/Main/webservice/Makefile.kmk
Index: VirtualBox-5.1.4/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- VirtualBox-5.1.2.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-5.1.2/src/VBox/Main/webservice/Makefile.kmk
@@ -707,7 +707,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
: $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
--- VirtualBox-5.1.4.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-5.1.4/src/VBox/Main/webservice/Makefile.kmk
@@ -724,7 +724,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
$(RM) -f $@
- $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
+ $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
$(APPEND) $@ done
# Copy the generated headers and stuff. This was split into a separate rule
ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
$(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
$(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"

View File

@ -1,8 +1,8 @@
Index: VirtualBox-5.1.2/Config.kmk
Index: VirtualBox-5.1.4/Config.kmk
===================================================================
--- VirtualBox-5.1.2.orig/Config.kmk
+++ VirtualBox-5.1.2/Config.kmk
@@ -4635,6 +4635,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
--- VirtualBox-5.1.4.orig/Config.kmk
+++ VirtualBox-5.1.4/Config.kmk
@@ -4852,6 +4852,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
ifeq ($(KBUILD_TARGET),linux)
# not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
# TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap
@ -12,7 +12,7 @@ Index: VirtualBox-5.1.2/Config.kmk
endif
ifeq ($(KBUILD_TARGET),win) # No CRT!
TEMPLATE_VBOXR3HARDENEDEXE_SDKS = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS)
@@ -4654,8 +4657,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
@@ -4871,8 +4874,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)
else ifn1of ($(KBUILD_TARGET), os2 solaris)
# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)

View File

@ -1,15 +0,0 @@
Index: VirtualBox-5.1.2/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
===================================================================
--- VirtualBox-5.1.2.ori/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-5.1.2/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -257,7 +257,7 @@
# ifdef __PAGE_KERNEL_EXEC
/* >= 2.6.27 */
-# define MY_PAGE_KERNEL_EXEC __pgprot(cpu_has_pge ? __PAGE_KERNEL_EXEC | _PAGE_GLOBAL : __PAGE_KERNEL_EXEC)
+# define MY_PAGE_KERNEL_EXEC __pgprot(boot_cpu_has(X86_FEATURE_PGE) ? __PAGE_KERNEL_EXEC | _PAGE_GLOBAL : __PAGE_KERNEL_EXEC)
# else
-# define MY_PAGE_KERNEL_EXEC __pgprot(cpu_has_pge ? _PAGE_KERNEL_EXEC | _PAGE_GLOBAL : _PAGE_KERNEL_EXEC)
+# define MY_PAGE_KERNEL_EXEC __pgprot(boot_cpu_has(X86_FEATURE_PGE) ? _PAGE_KERNEL_EXEC | _PAGE_GLOBAL : _PAGE_KERNEL_EXEC)
# endif
#else

View File

@ -1,7 +1,7 @@
Index: VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
Index: VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh
===================================================================
--- VirtualBox-5.1.2.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
--- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -23,9 +23,12 @@
# Provides: vboxadd
# Required-Start:
@ -16,7 +16,7 @@ Index: VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
### END INIT INFO
## @todo This file duplicates a lot of script with vboxdrv.sh. When making
@@ -100,7 +103,6 @@ fail()
@@ -94,7 +97,6 @@ fail()
dev=/dev/vboxguest
userdev=/dev/vboxuser
@ -24,7 +24,7 @@ Index: VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
owner=vboxadd
group=1
@@ -146,12 +148,6 @@ do_vboxguest_non_udev()
@@ -140,12 +142,6 @@ do_vboxguest_non_udev()
fail "Cannot create device $dev with major $maj and minor $min"
}
fi
@ -37,7 +37,7 @@ Index: VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
if [ ! -c $userdev ]; then
maj=10
@@ -162,12 +158,6 @@ do_vboxguest_non_udev()
@@ -156,12 +152,6 @@ do_vboxguest_non_udev()
rmmod vboxguest 2>/dev/null
fail "Cannot create device $userdev with major $maj and minor $min"
}
@ -50,7 +50,7 @@ Index: VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
fi
fi
}
@@ -177,13 +167,6 @@ start()
@@ -171,13 +161,6 @@ start()
begin "Starting the VirtualBox Guest Additions" console;
# If we got this far assume that the slow set-up has been done.
QUICKSETUP=yes
@ -64,7 +64,7 @@ Index: VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
no_udev=1
@@ -199,7 +182,7 @@ start()
@@ -193,7 +176,7 @@ start()
$MODPROBE vboxguest >/dev/null 2>&1 || {
setup
$MODPROBE vboxguest >/dev/null 2>&1 || {
@ -73,7 +73,7 @@ Index: VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
fail "modprobe vboxguest failed"
}
}
@@ -223,7 +206,7 @@ start()
@@ -217,7 +200,7 @@ start()
}
# Put the X.Org driver in place. This is harmless if it is not needed.
@ -82,7 +82,7 @@ Index: VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
# Install the guest OpenGL drivers. For now we don't support
# multi-architecture installations
rm -f /etc/ld.so.conf.d/00vboxvideo.conf
@@ -424,7 +407,7 @@ extra_setup()
@@ -378,7 +361,7 @@ extra_setup()
ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin
# And an rc file to re-build the kernel modules and re-set-up the X server.
ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd
@ -91,7 +91,7 @@ Index: VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
# And a post-installation script for rebuilding modules when a new kernel
# is installed.
mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d
@@ -457,49 +440,13 @@ EOF
@@ -411,49 +394,13 @@ EOF
# setup_script
setup()
{
@ -142,8 +142,8 @@ Index: VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
-
# Delete old versions of VBox modules.
cleanup_modules
for i in /lib/modules/*; do
@@ -512,12 +459,12 @@ cleanup()
depmod
@@ -464,12 +411,12 @@ cleanup()
done
# Clean-up X11-related bits
@ -158,4 +158,3 @@ Index: VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
rm -f /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd
rmdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d 2>/dev/null
rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null

View File

@ -1,7 +1,7 @@
Index: src/VBox/Installer/linux/vboxdrv.sh
Index: VirtualBox-5.1.4/src/VBox/Installer/linux/vboxdrv.sh
===================================================================
--- src/VBox/Installer/linux/vboxdrv.sh
+++ src/VBox/Installer/linux/vboxdrv.sh
--- VirtualBox-5.1.4.orig/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-5.1.4/src/VBox/Installer/linux/vboxdrv.sh
@@ -19,11 +19,12 @@
#
### BEGIN INIT INFO
@ -18,8 +18,8 @@ Index: src/VBox/Installer/linux/vboxdrv.sh
+# Description: VirtualBox Linux kernel module
### END INIT INFO
PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
@@ -275,13 +276,6 @@ start()
## @todo This file duplicates a lot of script with vboxadd.sh. When making
@@ -258,13 +259,6 @@ start()
fi
fi
# ensure permissions
@ -33,7 +33,7 @@ Index: 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
@@ -412,36 +406,8 @@ cleanup()
@@ -395,36 +389,8 @@ cleanup()
# setup_script
setup()
{

View File

@ -1,27 +1,12 @@
diff -urN VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c
--- VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c 2015-07-14 20:53:12.121479325 +0200
+++ VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_printf.c 2015-07-19 17:11:11.677617929 +0200
@@ -1568,10 +1568,10 @@
width = 0;
if (width != 0)
- f += snprintf(f, sizeof (format), "%d", ABS(width));
+ f += snprintf(f, sizeof (f), "%d", ABS(width));
if (prec > 0)
- f += snprintf(f, sizeof (format), ".%d", prec);
+ f += snprintf(f, sizeof (f), ".%d", prec);
(void) strcpy(f, pfd->pfd_fmt);
pfd->pfd_rec = rec;
diff -urN VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
--- VirtualBox-5.0.0.old/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c 2015-07-14 20:53:12.120479323 +0200
+++ VirtualBox-5.0.0/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c 2015-07-19 17:12:35.554945664 +0200
@@ -866,6 +866,7 @@
x = x + (x >> 32);
return (x & 0x7F);
Index: VirtualBox-5.1.4/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
===================================================================
--- VirtualBox-5.1.4.orig/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
+++ VirtualBox-5.1.4/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
@@ -833,6 +833,7 @@ dt_gmatch(const char *s, const char *p)
#else
return (p == NULL || *p == '\0' || RTStrSimplePatternMatch(p, s)); /** @todo implement gmatch. */
#endif
+ return 0;
}
/*
char *

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Thu Aug 18 20:24:23 UTC 2016 - Larry.Finger@lwfinger.net
- The API for ttm_bo_move_memcpy() is changed in kernel 4.8.
Add patch file "modify_for_4_8_bo_move.patch" to handle this case.
-------------------------------------------------------------------
Thu Aug 18 18:29:35 UTC 2016 - Larry.Finger@lwfinger.net
- Version bump to 5.1.4 (released 2016-08-16 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
GUI: show actual VM uptime in the session information window
Audio: re-enabled speakers for Mac OS X guests (5.1.0 regression; bug #15611)
Audio: fixed crashes under certain conditions
USB: fixed a hang under certain conditions
USB: fixed a hanging guest under certain conditions (bug #15747)
PIIX4: implemented dummy SMBus controller to prevent annoying Linux kernel warnings about uninitialized SMBus base address (bug #9517)
NVMe: several fixes to improve stability, fixed a crash while saving a VM state
VMDK: Fixed an issue creating fixed size images with certain sizes and the Split2G option enabled (bug #15748)
VHDX: fixed cloning images with VBoxManage clonehd (bug #14288)
Storage: Fixed broken bandwidth limitation when the limit is very low (bug #14982)
EFI: fixed sending debug messages in the EFI firmware if a serial port is enabled (bug #12161)
OVF: when importing appliances, make sure that the version of the embedded VirtualBox-specific settings is processed, to get the default settings handling right
VBoxManage: Don't try to set the medium type if there is no change (bug #13850)
Linux installer: fixed some scripting issues (bugs #15701 and #15702)
Linux installer: fixed a path issue on certain Linux distributions (bug #15717)
Windows hosts: fixed corrupted mouse pointers with some Linux and Solaris guests (bug #15665)
Linux Additions: made the video driver work on 32-bit guests with large video memory sizes (bug #15621)
Linux Additions: made the video driver work on kernel 4.7 and later (bug #15769)
Linux Additions: converted a failure message to an informational one when drivers could not be stopped during upgrade (bug #15692)
Linux Additions: made the video driver work around an X server bug which cause screen refresh to stop (bug #15511)
Windows Additions: auto-resizing fixes for Windows 10 guests (bug #15257)
Windows Additions: fixed VBoxTray problems with Windows 2000 (bug #15661)
- Other local changes:
"changeset_60565.diff" is removed - fixed in upstream.
"vbox-kernel47-cpu_has_pge.diff" -s removed - also fixed in upstream.
-------------------------------------------------------------------
Mon Aug 8 17:13:27 UTC 2016 - Larry.Finger@lwfinger.net

View File

@ -19,7 +19,7 @@
%define _vbox_instdir %{_libexecdir}/virtualbox
%define _udevrulesdir %{_libexecdir}/udev/rules.d
Name: virtualbox
Version: 5.1.2
Version: 5.1.4
Release: 0
Summary: VirtualBox is an Emulator
License: GPL-2.0+
@ -63,8 +63,6 @@ Patch8: vbox-python-detection.diff
Patch9: vbox-deprec-gsoap-service-proxies.diff
#fix failed linking process during build - this patch is just quick workaround
Patch10: vbox-gsoapssl-deps.diff
#fix failed cpu_has_pge removed macro in kernel 4.7
Patch11: vbox-kernel47-cpu_has_pge.diff
#PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user
#try to start VirtualBox and is not memeber of vboxusers group
Patch99: vbox-permissions_warning.diff
@ -87,8 +85,8 @@ Patch108: virtualbox-snpritnf-buffer-overflow.patch
Patch109: vbox-usb-warning.diff
# Prevent Guest Additions from creating wrong SONAME
Patch111: vbox_prevent_wrong_SONAME.patch
# Apply Changeset 60565 - Fix bug in DevLsiLogicSCSI.cpp
Patch112: changeset_60565.diff
# Fix change in kernel API for ttm_bo_move_memcpy()
Patch112: modify_for_4_8_bo_move.patch
#
BuildRequires: LibVNCServer-devel
BuildRequires: SDL-devel
@ -302,7 +300,7 @@ This package contains icons for guest desktop files that were created on the des
%prep
%setup -q -n VirtualBox-%{version}
%patch1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
@ -310,7 +308,6 @@ This package contains icons for guest desktop files that were created on the des
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch99 -p1
%patch100
%patch101 -p1