1
0
forked from pool/virtualbox

Accepting request 199135 from Virtualization

update to vbox 4.2.18 (forwarded request 199134 from mseben)

OBS-URL: https://build.opensuse.org/request/show/199135
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=74
This commit is contained in:
Stephan Kulow 2013-09-16 10:49:45 +00:00 committed by Git OBS Bridge
commit b36a593d60
8 changed files with 35 additions and 74 deletions

View File

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

View File

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

View File

@ -1,63 +0,0 @@
Index: trunk/src/VBox/Additions/linux/sharedfolders/dirops.c
===================================================================
--- trunk/src/VBox/Additions/linux/sharedfolders/dirops.c
+++ trunk/src/VBox/Additions/linux/sharedfolders/dirops.c
@@ -234,5 +234,9 @@
* c. filldir returns an error (see comment on that)
*/
-static int sf_dir_read (struct file *dir, void *opaque, filldir_t filldir)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+static int sf_dir_iterate(struct file *dir, struct dir_context *ctx)
+#else
+static int sf_dir_read(struct file *dir, void *opaque, filldir_t filldir)
+#endif
{
TRACE();
@@ -258,4 +262,7 @@
LogFunc(("sf_getdent error %d\n", err));
dir->f_pos += 1;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+ ctx->pos += 1;
+#endif
continue;
}
@@ -263,5 +270,9 @@
/* d_name now contains a valid entry name */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+ sanity = ctx->pos + 0xbeef;
+#else
sanity = dir->f_pos + 0xbeef;
+#endif
fake_ino = sanity;
if (sanity - fake_ino)
@@ -271,6 +282,9 @@
}
- err = filldir(opaque, d_name, strlen(d_name),
- dir->f_pos, fake_ino, DT_UNKNOWN);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+ err = dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN);
+#else
+ err = filldir(opaque, d_name, strlen(d_name), dir->f_pos, fake_ino, DT_UNKNOWN);
+#endif
if (err)
{
@@ -282,4 +296,7 @@
dir->f_pos += 1;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+ ctx->pos += 1;
+#endif
}
@@ -290,5 +307,9 @@
{
.open = sf_dir_open,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+ .iterate = sf_dir_iterate,
+#else
.readdir = sf_dir_read,
+#endif
.release = sf_dir_release,
.read = generic_read_dir

View File

@ -1,3 +1,5 @@
Index: src/VBox/Additions/linux/installer/vboxadd.sh
===================================================================
--- src/VBox/Additions/linux/installer/vboxadd.sh.orig
+++ src/VBox/Additions/linux/installer/vboxadd.sh
@@ -21,11 +21,12 @@
@ -53,7 +55,7 @@
+ fi
+ fi
+
uname -r | grep -q '^2\.6' 2>/dev/null &&
uname -r | grep -q -E '^2\.6|^3' 2>/dev/null &&
ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
no_udev=1
@@ -491,32 +487,8 @@ extra_setup()

View File

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

View File

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

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Sun Sep 15 06:14:34 UTC 2013 - mseben@gmail.com
- deprecated vbox-linux-3.11.diff
- updated to virtualbox 4.2.18
* VMM: properly handle NMIs on Linux hosts with X2APIC enabled
* VMM: fixed potential crashes with 64-bit guests on 32-bit hosts (bug #11979)
* GUI / seamless: properly handle mouse wheel scroll events
* GUI, VBoxManage: when unregistering a VM, also unregister the hard disk images which are used exclusively (bug #10311)
* GUI: prevent crashes under certain conditions on X11 hosts
* 3D: multiscreen fixes (incorrect mouse position, flickers)
* 3D Support: several fixes for the Windows WDDM video driver (multiscreen, seamless)
* Snapshots: made live snapshots work again (bug #9255)
* Teleportation: made it work again (bug #9455)
* VBoxManage: on snapshot take, --pause is default and --live is for doing live snapshots
* VBoxSVC: don't crash on systems with many VLAN interfaces (Solaris hosts only)
* Network: after the host resumes from suspend, disconnect and reconnect the virtual network cables to force renewing the DHCP leases for the guests. So far only Mac OS X hosts and Windows hosts (bug #10063).
* NAT: on name server changes force a reconnect of the virtual network cable to notify the guest (Mac OS X hosts only)
* Mac OS X installer: keep previously installed Extension Packs on VirtualBox upgrade
* Linux hosts / guests: Linux 3.11 fixes (bug #12001)
* Solaris hosts: fixed a potential kernel panic caused due to unexpected preemption due to logging.
* Windows hosts: fixed an issue with USB2 devices being inaccessible when plugged into USB3 ports.
* Linux Additions: added PCI device identifier to vboxvideo.ko fixing DRI initialization under certain conditions (bug #11957)
* Linux Additions: fixed udev detection in the init script with Linux 3.x kernels
-------------------------------------------------------------------
Fri Aug 30 06:50:23 UTC 2013 - mseben@gmail.com

View File

@ -92,7 +92,7 @@ BuildRequires: xorg-x11-libXt-devel-32bit
%endif
#
ExclusiveArch: %ix86 x86_64
Version: 4.2.16
Version: 4.2.18
Release: 0
Summary: VirtualBox is an Emulator
License: GPL-2.0+
@ -136,8 +136,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 for Linux 3.11+, upstream diff : https://www.virtualbox.org/changeset/47588/vbox
Patch11: vbox-linux-3.11.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
@ -267,7 +265,6 @@ Development file for %{name}
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch99 -p1
%patch100
%patch101