forked from pool/virtualbox
Accepting request 68294 from home:mseben:branches:Virtualization
update to virtualbox 4.0.6 OBS-URL: https://build.opensuse.org/request/show/68294 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=43
This commit is contained in:
Michal Seben
Git OBS Bridge
parent
9f186762ba
commit
d04ebed955
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dd938cb401092145bb3540f243ccf3da065ba7d356067ec7d7336f78a3bc9da8
|
||||
size 43795894
|
||||
3
VirtualBox-4.0.6-patched.tar.bz2
Normal file
3
VirtualBox-4.0.6-patched.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f6357b27fbfd7177a2c13aae6a2338a324f47fe582831fab7bb4f17d1949f77c
|
||||
size 43174127
|
||||
@ -1,168 +0,0 @@
|
||||
Index: src/VBox/Additions/linux/drm/vboxvideo_drm.c
|
||||
===================================================================
|
||||
--- src/VBox/Additions/linux/drm/vboxvideo_drm.c (revisión: 36470)
|
||||
+++ src/VBox/Additions/linux/drm/vboxvideo_drm.c (revisión: 36471)
|
||||
@@ -66,63 +66,83 @@
|
||||
#include "vboxvideo_drm.h"
|
||||
|
||||
static struct pci_device_id pciidlist[] = {
|
||||
- vboxvideo_PCI_IDS
|
||||
+ vboxvideo_PCI_IDS
|
||||
};
|
||||
|
||||
int vboxvideo_driver_load(struct drm_device * dev, unsigned long flags)
|
||||
{
|
||||
# if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 28)
|
||||
- return drm_vblank_init(dev, 1);
|
||||
+ return drm_vblank_init(dev, 1);
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
-static struct drm_driver driver = {
|
||||
- /* .driver_features = DRIVER_USE_MTRR, */
|
||||
- .load = vboxvideo_driver_load,
|
||||
- .reclaim_buffers = drm_core_reclaim_buffers,
|
||||
- /* As of Linux 2.65.37, always the internal functions are used. */
|
||||
+static struct drm_driver driver =
|
||||
+{
|
||||
+ /* .driver_features = DRIVER_USE_MTRR, */
|
||||
+ .load = vboxvideo_driver_load,
|
||||
+ .reclaim_buffers = drm_core_reclaim_buffers,
|
||||
+ /* As of Linux 2.65.37, always the internal functions are used. */
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 37)
|
||||
- .get_map_ofs = drm_core_get_map_ofs,
|
||||
- .get_reg_ofs = drm_core_get_reg_ofs,
|
||||
+ .get_map_ofs = drm_core_get_map_ofs,
|
||||
+ .get_reg_ofs = drm_core_get_reg_ofs,
|
||||
#endif
|
||||
- .fops = {
|
||||
- .owner = THIS_MODULE,
|
||||
- .open = drm_open,
|
||||
- .release = drm_release,
|
||||
- /* This was changed with Linux 2.6.33 but Fedora backported this
|
||||
- * change to their 2.6.32 kernel. */
|
||||
+ .fops =
|
||||
+ {
|
||||
+ .owner = THIS_MODULE,
|
||||
+ .open = drm_open,
|
||||
+ .release = drm_release,
|
||||
+ /* This was changed with Linux 2.6.33 but Fedora backported this
|
||||
+ * change to their 2.6.32 kernel. */
|
||||
#if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 33)
|
||||
- .unlocked_ioctl = drm_ioctl,
|
||||
+ .unlocked_ioctl = drm_ioctl,
|
||||
#else
|
||||
- .ioctl = drm_ioctl,
|
||||
+ .ioctl = drm_ioctl,
|
||||
#endif
|
||||
- .mmap = drm_mmap,
|
||||
- .poll = drm_poll,
|
||||
- .fasync = drm_fasync,
|
||||
- },
|
||||
- .pci_driver = {
|
||||
- .name = DRIVER_NAME,
|
||||
- .id_table = pciidlist,
|
||||
- },
|
||||
+ .mmap = drm_mmap,
|
||||
+ .poll = drm_poll,
|
||||
+ .fasync = drm_fasync,
|
||||
+ },
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39)
|
||||
+ .pci_driver =
|
||||
+ {
|
||||
+ .name = DRIVER_NAME,
|
||||
+ .id_table = pciidlist,
|
||||
+ },
|
||||
+#endif
|
||||
+ .name = DRIVER_NAME,
|
||||
+ .desc = DRIVER_DESC,
|
||||
+ .date = DRIVER_DATE,
|
||||
+ .major = DRIVER_MAJOR,
|
||||
+ .minor = DRIVER_MINOR,
|
||||
+ .patchlevel = DRIVER_PATCHLEVEL,
|
||||
+};
|
||||
|
||||
- .name = DRIVER_NAME,
|
||||
- .desc = DRIVER_DESC,
|
||||
- .date = DRIVER_DATE,
|
||||
- .major = DRIVER_MAJOR,
|
||||
- .minor = DRIVER_MINOR,
|
||||
- .patchlevel = DRIVER_PATCHLEVEL,
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 39)
|
||||
+static struct pci_driver pci_driver =
|
||||
+{
|
||||
+ .name = DRIVER_NAME,
|
||||
+ .id_table = pciidlist,
|
||||
};
|
||||
+#endif
|
||||
|
||||
static int __init vboxvideo_init(void)
|
||||
{
|
||||
- return drm_init(&driver);
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39)
|
||||
+ return drm_init(&driver);
|
||||
+#else
|
||||
+ return drm_pci_init(&driver, &pci_driver);
|
||||
+#endif
|
||||
}
|
||||
|
||||
static void __exit vboxvideo_exit(void)
|
||||
{
|
||||
- drm_exit(&driver);
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39)
|
||||
+ drm_exit(&driver);
|
||||
+#else
|
||||
+ drm_pci_exit(&driver, &pci_driver);
|
||||
+#endif
|
||||
}
|
||||
|
||||
module_init(vboxvideo_init);
|
||||
Index: src/VBox/Additions/linux/sharedfolders/vfsmod.c
|
||||
===================================================================
|
||||
--- src/VBox/Additions/linux/sharedfolders/vfsmod.c (revisión: 36470)
|
||||
+++ src/VBox/Additions/linux/sharedfolders/vfsmod.c (revisión: 36471)
|
||||
@@ -446,27 +446,38 @@
|
||||
return err;
|
||||
}
|
||||
|
||||
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
|
||||
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
|
||||
static struct super_block *sf_get_sb(struct file_system_type *fs_type, int flags,
|
||||
- const char *dev_name, void *data)
|
||||
+ const char *dev_name, void *data)
|
||||
{
|
||||
TRACE();
|
||||
return get_sb_nodev(fs_type, flags, data, sf_read_super_26);
|
||||
}
|
||||
-#else
|
||||
+# elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
|
||||
static int sf_get_sb(struct file_system_type *fs_type, int flags,
|
||||
const char *dev_name, void *data, struct vfsmount *mnt)
|
||||
{
|
||||
TRACE();
|
||||
return get_sb_nodev(fs_type, flags, data, sf_read_super_26, mnt);
|
||||
}
|
||||
-#endif
|
||||
+# else
|
||||
+static struct dentry *sf_mount(struct file_system_type *fs_type, int flags,
|
||||
+ const char *dev_name, void *data)
|
||||
+{
|
||||
+ TRACE();
|
||||
+ return mount_nodev(fs_type, flags, data, sf_read_super_26);
|
||||
+}
|
||||
+# endif
|
||||
|
||||
static struct file_system_type vboxsf_fs_type =
|
||||
{
|
||||
.owner = THIS_MODULE,
|
||||
.name = "vboxsf",
|
||||
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
|
||||
.get_sb = sf_get_sb,
|
||||
+# else
|
||||
+ .mount = sf_mount,
|
||||
+# endif
|
||||
.kill_sb = kill_anon_super
|
||||
};
|
||||
#endif
|
||||
@ -37,7 +37,7 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
|
||||
|
||||
if [ -n "$NOLSB" ]; then
|
||||
if [ -f /etc/redhat-release ]; then
|
||||
@@ -189,13 +190,6 @@ start()
|
||||
@@ -192,13 +193,6 @@ start()
|
||||
failure "Cannot create device $DEVICE with major $MAJOR and minor $MINOR"
|
||||
fi
|
||||
fi
|
||||
@ -51,7 +51,7 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
|
||||
if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
|
||||
failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
|
||||
fi
|
||||
@@ -279,48 +273,8 @@ stop_vms()
|
||||
@@ -288,48 +282,8 @@ stop_vms()
|
||||
# setup_script
|
||||
setup()
|
||||
{
|
||||
@ -95,9 +95,10 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
|
||||
- fi
|
||||
- fi
|
||||
- rm -f /etc/vbox/module_not_compiled
|
||||
+ begin_msg "Recompiling VirtualBox vboxadd kernel module, NOT. It has been packaged."
|
||||
succ_msg
|
||||
- succ_msg
|
||||
- start
|
||||
+ begin_msg "Recompiling VirtualBox vboxadd kernel module, NOT. It has been packaged."
|
||||
+ succ_msg
|
||||
}
|
||||
|
||||
dmnstatus()
|
||||
|
||||
@ -1,3 +1,65 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 22 16:35:55 UTC 2011 - mseben@gmail.com
|
||||
|
||||
- updated to Virtualbox 4.0.6 (maintenance release)
|
||||
* VMM: fixed incorrect handling of ballooned pages when restoring a VMM from a saved state
|
||||
* VMM: don't crash on hosts with more than 64 cores / hyperthreads; implemented support for up to 256 host cores (except Windows hosts; bug #8489)
|
||||
* VMM: fixed guru meditation for PAE guests running on hosts without PAE (bug #8006)
|
||||
* VMM: fixed slow Linux guests with raw mode and recent guest kernels (bug #8726)
|
||||
* GUI: support host key combinations (bug #979)
|
||||
* GUI: fixed progress indicator (bug #7814)
|
||||
* GUI: show the mouse pointer while the VM is paused if the USB tablet mouse emulation is used (bug #6799)
|
||||
* GUI: adapt the snapshot folder as well when renaming a VM (bug #8469)
|
||||
* GUI: persistently remember the last folders of the disk/DVD/floppy selectors
|
||||
* GUI: never allow to start a VM with USB-2.0 activated if the proper extension pack is missing (bug #8182)
|
||||
* GUI: fixed hang/crash when opening a file dialog in an non-existing folder (bug #8673)
|
||||
* Snapshots: fixed a bug which could lose entries in the media registry when restoring a snapshot (bug #8363)
|
||||
* Snapshots: allow snapshots to be stored in the VM directory
|
||||
* 3D support: fixed a crash if a VM was forced to terminate (Windows hosts only; bug #7133)
|
||||
* Storage: fixed memory leak (4.0 regression; bug #7966)
|
||||
* Storage: fixed access to iSCSI targets over internal network
|
||||
* Storage: fixed reading from disks with more than one snapshot for VHD and VMDK images with disabled host cache (bug #8408)
|
||||
* Storage: fixed a possible hang during VM suspend after an I/O error occurred
|
||||
* Storage: fixed a possible hang during VM suspend / reset (bug #8276, #8294)
|
||||
* Storage: automatically create a diff image when attaching a streamOptimized VMDK image to a VM
|
||||
* ATA/SATA: fixed automounting of virtual CD/DVD mediums with recent Linux distributions by correctly reporting the current profile as 'none' if no medium is present
|
||||
* Buslogic: fixed emulation for certain guests (e.g. jRockit VE)
|
||||
* Host-Only Networking: fixed interface creation failure on Windows hosts (4.0.4 regression; bug #8362)
|
||||
* Host-Only & Bridged & Internal Networking: fix for processing promiscuous mode requests by VMs, defaulting to switch behaviour
|
||||
* Host-Only Networking: fixed connectivity issue after resuming the host from sleep (bug #3625)
|
||||
* Bridged Networking: support for interface bonding on Mac OS X hosts (bug #8731)
|
||||
* NAT: fixed processing of ARP announcements for guests with static assigned IPs (bug #8609)
|
||||
* VRDP: backward compatibility with VRDPAuth external authentication library (bug #8063)
|
||||
* Shared Folders: don't fail to start a VM if a path is not absolute, for example when importing an OVF from a different host (bug #7941)
|
||||
* Audio: fixed crash under certain conditions (bug #8527)
|
||||
* USB: fixed a crash when plugging certain USB devices (bug #8699)
|
||||
* HPET: fixed time jumps when reading the counter (bug #8707)
|
||||
* OVF/OVA: automatically adjust disk paths if the VM name is changed on import
|
||||
* OVF/OVA: fix export to slow medias
|
||||
* OVF/OVA: automatically repair inconsistent appliances with multiple disks (bug #8253)
|
||||
* rdesktop-vrdp: fixed an assertion triggered under certain conditions (bug #8593)
|
||||
* Windows hosts: fixed occasional hangs during VM shutdown because sometimes COM was not properly uninitialized
|
||||
* Mac OS X hosts: prevent the mouse from leaving the VM window while captured
|
||||
* Mac OS X hosts: keep aspect ratio while resizing in scale mode (shift for old behaviour) (part of bug #7822)
|
||||
* X11 hosts: fixed Yen key support (bug #8438)
|
||||
* X11 hosts: fixed a regression which caused Host+F1 to pop up help instead of sending Ctrl+Alt+F1
|
||||
* Linux hosts / Linux Additions: mangle IPRT symbols to allow installing VirtualBox inside a VM while the Guest Additions are active (bug #5686)
|
||||
* Linux hosts / Linux guests: workaround for a bug in GLIBC older than version 1.11 leading to crashes under certain conditions (signed/unsigned problem with memchr on 64-bit machines)
|
||||
* Solaris hosts: fixed a deadlock in event semaphores that could lead to unkillable VM processes
|
||||
* Windows Additions: fixed Sysprep parameter handling
|
||||
* Windows Additions: fixed spontaneous guest reboots under certain circumstances (4.0.2 regression; bugs #8406, #8429)
|
||||
* Windows Additions: added auto logon support for locked workstations on legacy Windows versions
|
||||
* Windows Additions: fixed driver bugcheck error when handling PnP messages (4.0 regression; bug #8367)
|
||||
* Windows Additions: fixed memory leak in VBoxVideo
|
||||
* X11 Additions: added support for X.Org Server 1.10 final
|
||||
* Linux Additions: Linux kernel 2.6.39-rc1 fixes
|
||||
* Linux Additions: improved auto-run support (bug #5509)
|
||||
* Linux Additions: fix mouse support on SUSE 11 SP 1 guests (bug #7946)
|
||||
* Solaris Additions: added support for X.Org Server 1.9
|
||||
* Guest Additions: various bugfixes for guest control execution
|
||||
* Webservice: use own log file, with log rotation to limit size
|
||||
- deprecated vbox-kernel-2.6.39.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 15 23:01:48 UTC 2011 - crrodriguez@opensuse.org
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@ BuildRequires: gcc-32bit gcc-c++-32bit
|
||||
%endif
|
||||
#
|
||||
ExclusiveArch: %ix86 x86_64
|
||||
Version: 4.0.4
|
||||
Version: 4.0.6
|
||||
Release: 1
|
||||
Summary: VirtualBox is an Emulator
|
||||
License: GPLv2+
|
||||
@ -92,8 +92,7 @@ Patch100: vbox-no-build-dates.diff
|
||||
Patch101: vbox-default-os-type.diff
|
||||
#disable update in vbox gui
|
||||
Patch102: vbox-disable-updates.diff
|
||||
Patch103: virtualbox-ose_4.0.4-dfsg-1.diff.gz
|
||||
Patch104: vbox-kernel-2.6.39.patch
|
||||
Patch103: virtualbox-ose_%{version}-dfsg-1.diff.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
PreReq: pwdutils permissions
|
||||
Requires: %{name}-host-kmp = %version
|
||||
@ -218,7 +217,6 @@ quilt push -a
|
||||
%patch100
|
||||
%patch101
|
||||
%patch102 -p1
|
||||
%patch104
|
||||
#copy user manual
|
||||
%__cp %{S:1} ./UserManual.pdf
|
||||
|
||||
@ -433,14 +431,16 @@ pushd out/linux.*/release/bin
|
||||
popd
|
||||
|
||||
# the build process tells us the desktop file is missing a semicolon...(repackage?)
|
||||
%__sed 's/^MimeType.*[^;]$/&;/' out/linux.*/release/bin/virtualbox.desktop > %{_tmppath}/virtualbox.desktop
|
||||
#%__sed 's/^MimeType.*[^;]$/&;/' out/linux.*/release/bin/virtualbox.desktop > %{_tmppath}/virtualbox.desktop
|
||||
#%__sed 's/Icon=VBox/Icon=VBox.png/' out/linux.*/release/bin/virtualbox.desktop > %{_tmppath}/virtualbox.desktop
|
||||
# install desktop file
|
||||
%__install -m 644 %{_tmppath}/virtualbox.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
|
||||
#%__install -m 644 %{_tmppath}/virtualbox.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
|
||||
%__install -m 644 out/linux.*/release/bin/virtualbox.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
|
||||
%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop 'System Emulator'
|
||||
|
||||
# create a menu entry
|
||||
%__install -m 644 out/linux.*/release/bin/VBox.png \
|
||||
%{buildroot}%{_datadir}/pixmaps/
|
||||
%{buildroot}%{_datadir}/pixmaps/virtualbox.png
|
||||
# install udev rule for host (virtualbox)
|
||||
%__install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/udev/rules.d/60-vboxdrv.rules
|
||||
# install config with session shutdown defs
|
||||
@ -612,7 +612,7 @@ exit 0
|
||||
%{_var}/adm/fillup-templates/sysconfig.vbox
|
||||
%{_sbindir}/rcvboxes
|
||||
%{_sbindir}/rcvboxdrv
|
||||
%if %suse_version > 1140
|
||||
%if %suse_version >= 1140
|
||||
%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP
|
||||
%else
|
||||
%{_vbox_instdir}/VBoxNetDHCP
|
||||
@ -637,7 +637,7 @@ exit 0
|
||||
#qm's translations
|
||||
%{_datadir}/virtualbox/nls
|
||||
%{_vbox_instdir}/VirtualBox.so
|
||||
%{_datadir}/pixmaps/VBox.png
|
||||
%{_datadir}/pixmaps/virtualbox.png
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
#
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user