1
0
forked from pool/virtualbox

Accepting request 76631 from home:mseben:branches:Virtualization

update package to virtualbox 4.1.0

OBS-URL: https://build.opensuse.org/request/show/76631
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=51
This commit is contained in:
Michal Seben 2011-07-21 10:51:05 +00:00 committed by Git OBS Bridge
parent ecd81ccc95
commit 30517dfda7
15 changed files with 249 additions and 122 deletions

View File

@ -0,0 +1,27 @@
--- VirtualBox-4.0.0_OSE/src/libs/xpcom18a4/Makefile.kmk
+++ VirtualBox-4.0.0_OSE/src/libs/xpcom18a4/Makefile.kmk
@@ -469,9 +469,11 @@
libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags)
libIDL_config_libs := $(shell $(VBOX_LIBIDL_CONFIG) --libs)
xpidl_CFLAGS = \
- $(libIDL_config_cflags)
+ $(shell pkg-config --cflags libIDL-2.0)
xpidl_LDFLAGS = \
- $(libIDL_config_libs)
+ $(shell pkg-config --libs-only-L libIDL-2.0)
+xpidl_LIBS.linux = \
+ $(shell pkg-config --libs-only-l libIDL-2.0 | sed -e 's/-l//g')
xpidl_LDFLAGS.linux = \
$(VBOX_LD_as_needed)
endif
--- VirtualBox-4.0.0_OSE/Config.kmk
+++ VirtualBox-4.0.0_OSE/Config.kmk
@@ -4082,7 +4082,7 @@
TEMPLATE_VBOXBLDPROG_LDFLAGS.amd64 = -m64
TEMPLATE_VBOXBLDPROG_LDFLAGS.sparc64 = -m64
ifeq ($(KBUILD_HOST),linux)
-TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl
+TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl crypt
else ifeq ($(KBUILD_HOST),os2)
TEMPLATE_VBOXBLDPROG_TOOL = GXX3OMF
TEMPLATE_VBOXBLDPROG_LIBS = socket iconv

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
Index: VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
===================================================================
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
--- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
+++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
@@ -63,7 +63,7 @@ void UIGlobalSettingsUpdate::loadToCache
void UIGlobalSettingsUpdate::getFromCache()
{
@ -11,11 +11,11 @@ Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UI
if (m_pEnableUpdateCheckbox->isChecked())
{
m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex);
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
Index: VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
===================================================================
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
@@ -91,8 +91,7 @@ void VBoxHelpActions::addTo (QMenu *aMen
--- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
+++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
@@ -92,8 +92,7 @@ void VBoxHelpActions::addTo (QMenu *aMen
#endif
aMenu->addAction (updateAction);
@ -25,28 +25,39 @@ Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cp
#ifndef Q_WS_MAC
aMenu->addSeparator();
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
Index: VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
===================================================================
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
@@ -322,16 +322,6 @@ UIGLSettingsDlg::UIGLSettingsDlg(QWidget
i, "#input", pSettingsPage);
--- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
+++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
@@ -34,7 +34,6 @@ public:
{
GLSettingsPage_General = 0,
GLSettingsPage_Input,
- GLSettingsPage_Update,
GLSettingsPage_Language,
GLSettingsPage_USB,
GLSettingsPage_Network,
Index: VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
===================================================================
--- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
@@ -340,15 +340,6 @@ UISettingsDialogGlobal::UISettingsDialog
iPageIndex, "#input", pSettingsPage);
break;
}
- /* Update page: */
- case GLSettingsPage_Update:
- {
- UISettingsPage *pSettingsPage = new UIGlobalSettingsUpdate;
- pSettingsPage->setId(i);
- pSettingsPage = new UIGlobalSettingsUpdate;
- addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png",
- ":/refresh_16px.png", ":/refresh_disabled_16px.png",
- i, "#update", pSettingsPage);
- iPageIndex, "#update", pSettingsPage);
- break;
- }
/* Language page: */
case GLSettingsPage_Language:
{
@@ -442,9 +432,6 @@ void UIGLSettingsDlg::retranslateUi()
@@ -481,9 +472,6 @@ void UISettingsDialogGlobal::retranslate
/* Input page: */
m_pSelector->setItemText(GLSettingsPage_Input, tr("Input"));
@ -56,15 +67,3 @@ Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISetting
/* Language page: */
m_pSelector->setItemText(GLSettingsPage_Language, tr("Language"));
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
===================================================================
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
@@ -34,7 +34,6 @@ public:
{
GLSettingsPage_General = 0,
GLSettingsPage_Input,
- GLSettingsPage_Update,
GLSettingsPage_Language,
GLSettingsPage_USB,
GLSettingsPage_Network,

View File

@ -0,0 +1,28 @@
Index: src/VBox/HostDrivers/VBoxPci/Makefile.kmk
===================================================================
--- src/VBox/HostDrivers/VBoxPci/Makefile.kmk.orig
+++ src/VBox/HostDrivers/VBoxPci/Makefile.kmk
@@ -1,7 +1,7 @@
SUB_DEPTH = ../../../..
include $(KBUILD_PATH)/subheader.kmk
-ifeq (1,1)
+ifdef VBOX_WITH_VBOXDRV
if1of ($(KBUILD_TARGET), linux)
@@ -25,6 +25,7 @@ VBoxPci_LIBS += \
endif
+endif
ifeq ($(KBUILD_TARGET),linux)
@@ -73,6 +74,5 @@ $$(VBoxPci-sh_0_OUTDIR)/build_in_tmp: \
$(QUIET)chmod 0755 $@
endif
-endif
include $(KBUILD_PATH)/subfooter.kmk

View File

@ -1,13 +0,0 @@
--- VirtualBox-4.0.8_OSE/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-4.0.8_OSE/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -50,8 +50,9 @@
#define VBOXNETFLT_OS_SPECFIC 1
#include "../VBoxNetFltInternal.h"
+#define VBOXNETFLT_WITH_FILTER_HOST2GUEST_SKBS_EXPERIMENT
#ifdef CONFIG_NET_SCHED
-# define VBOXNETFLT_WITH_QDISC /* Comment this out to disable qdisc support */
+//# define VBOXNETFLT_WITH_QDISC /* Comment this out to disable qdisc support */
# ifdef VBOXNETFLT_WITH_QDISC
# include <net/pkt_sched.h>
# endif /* VBOXNETFLT_WITH_QDISC */

View File

@ -1,6 +1,8 @@
Index: src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp
===================================================================
--- src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp.orig
+++ src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp
@@ -424,7 +424,7 @@ extern "C" DECLEXPORT(int) TrustedMain (
@@ -388,7 +388,7 @@ extern "C" DECLEXPORT(int) TrustedMain (
#endif
int rc = VINF_SUCCESS;
@ -9,7 +11,7 @@
// less than one parameter is not possible
if (argc < 2)
@@ -1144,10 +1144,9 @@ DECLCALLBACK(int) VMPowerUpThread(RTTHRE
@@ -1051,10 +1051,9 @@ DECLCALLBACK(int) VMPowerUpThread(RTTHRE
char szNowUct[64];
RTTimeSpecToString(RTTimeNow(&TimeSpec), szNowUct, sizeof(szNowUct));
RTLogRelLogger(pLogger, 0, ~0U,
@ -22,27 +24,31 @@
/* register this logger as the release logger */
RTLogRelSetDefaultInstance(pLogger);
Index: src/VBox/Main/src-client/ConsoleImpl.cpp
===================================================================
--- src/VBox/Main/src-client/ConsoleImpl.cpp.orig
+++ src/VBox/Main/src-client/ConsoleImpl.cpp
@@ -5262,13 +5262,12 @@ HRESULT Console::consoleInitReleaseLog(c
@@ -6040,13 +6040,13 @@ HRESULT Console::consoleInitReleaseLog(c
char szTmp[256];
RTTimeSpecToString(RTTimeNow(&timeSpec), szTmp, sizeof(szTmp));
RTLogRelLogger(loggerRelease, 0, ~0U,
RTLogRelLogger(pReleaseLogger, 0, ~0U,
- "VirtualBox %s r%u %s (%s %s) release log\n"
+ "VirtualBox %s r%u %s release log\n"
#ifdef VBOX_BLEEDING_EDGE
"EXPERIMENTAL build " VBOX_BLEEDING_EDGE "\n"
#endif
"Log opened %s\n",
- VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
- __DATE__, __TIME__, szTmp);
+ VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET, szTmp);
+ szTmp);
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: src/VBox/Main/src-server/generic/OpenGLTestApp.cpp
===================================================================
--- src/VBox/Main/src-server/generic/OpenGLTestApp.cpp.orig
+++ src/VBox/Main/src-server/generic/OpenGLTestApp.cpp
@@ -141,13 +141,12 @@ static int vboxInitLogging(const char *p
@@ -142,13 +142,12 @@ static int vboxInitLogging(const char *p
char szTmp[256];
RTTimeSpecToString(RTTimeNow(&timeSpec), szTmp, sizeof(szTmp));
RTLogRelLogger(loggerRelease, 0, ~0U,
@ -58,6 +64,8 @@
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: src/VBox/Frontends/VBoxFB/VBoxFB.cpp
===================================================================
--- src/VBox/Frontends/VBoxFB/VBoxFB.cpp.orig
+++ src/VBox/Frontends/VBoxFB/VBoxFB.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
@ -69,6 +77,8 @@
for (;;)
{
Index: src/VBox/Runtime/common/string/uniread.cpp
===================================================================
--- src/VBox/Runtime/common/string/uniread.cpp.orig
+++ src/VBox/Runtime/common/string/uniread.cpp
@@ -979,7 +979,7 @@ int PrintHeader(const char *argv0)
@ -80,6 +90,8 @@
" */\n"
"\n"
"/*\n"
Index: src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
===================================================================
--- src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c.orig
+++ src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
@@ -42,16 +42,13 @@
@ -104,6 +116,8 @@
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
===================================================================
--- src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c.orig
+++ src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
@@ -44,16 +44,10 @@
@ -125,6 +139,8 @@
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
===================================================================
--- src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c.orig
+++ src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
@@ -42,16 +42,13 @@
@ -149,6 +165,8 @@
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
===================================================================
--- src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c.orig
+++ src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
@@ -42,16 +42,13 @@

View File

@ -28,7 +28,7 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
### END INIT INFO
PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
@@ -56,7 +57,7 @@ fi
@@ -58,7 +59,7 @@ fi
# silently exit if the package was uninstalled but not purged,
# applies to Debian packages only
@ -37,12 +37,12 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
if [ -n "$NOLSB" ]; then
if [ -f /etc/redhat-release ]; then
@@ -192,13 +193,6 @@ start()
failure "Cannot create device $DEVICE with major $MAJOR and minor $MINOR"
@@ -195,13 +196,6 @@ start()
fi
fi
- # ensure permissions
# ensure permissions
- if ! chown :%GROUP% $DEVICE 2>/dev/null; then
- rmmod vboxpci 2>/dev/null
- rmmod vboxnetadp 2>/dev/null
- rmmod vboxnetflt 2>/dev/null
- rmmod vboxdrv 2>/dev/null
@ -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
@@ -288,48 +282,8 @@ stop_vms()
@@ -299,58 +293,8 @@ stop_vms()
# setup_script
setup()
{
@ -59,6 +59,11 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
- begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
- $DODKMS uninstall > $LOG
- succ_msg
- if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
- begin_msg "Removing old VirtualBox pci kernel module"
- find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
- if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then
- begin_msg "Removing old VirtualBox netadp kernel module"
- find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null
@ -93,12 +98,16 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
- if ! $BUILDVBOXPCI \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
- fi
- rm -f /etc/vbox/module_not_compiled
- succ_msg
- start
+ begin_msg "Recompiling VirtualBox vboxadd kernel module, NOT. It has been packaged."
+ succ_msg
succ_msg
- start
}
dmnstatus()

View File

@ -4,3 +4,4 @@
/lib/modules/%2-%1/updates/vboxdrv.ko
/lib/modules/%2-%1/updates/vboxnetadp.ko
/lib/modules/%2-%1/updates/vboxnetflt.ko
/lib/modules/%2-%1/updates/vboxpci.ko

View File

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

View File

@ -1,3 +1,73 @@
-------------------------------------------------------------------
Thu Jul 21 06:12:54 UTC 2011 - mseben@gmail.com
- update to Virtualbox 4.1.0 (major update)
* Support for cloning of VMs (bug #5853): full clones can be created through the GUI and VBoxManage, linked clones only through VBoxManage
* GUI: enhanced wizard for creating new virtual disks
* GUI: new wizard for copying virtual disks
* GUI: keep the aspect ratio in scale mode (Windows and OSX hosts only; bug #7822)
* VMM: raised the memory limit for 64-bit hosts to 1TB
* Experimental support for PCI passthrough for Linux hosts, see the manual for more information
* Windows guests: Experimental WDDM graphics driver, supporting Windows Aero (bug #4607) and providing Direct3D support using a cleaner approach (no need to install the guest drivers in Safe Mode anymore)
* Guest Additions: status of modules and features can now be queried separately by the frontends
* Networking: new network attachment mode "Generic Driver", which offers an open plugin architecture for arbitrary and separately distributable virtual network implementations
* Host-only Networking: fixed host crash in kernels prior to 2.6.29
* New Networking Mode UDP Tunnel: allows to interconnect VMs running on different hosts easily and transparently
* Experimental support for SATA hard disk hotplugging available with VBoxManage
* Solaris hosts: New Crossbow based bridged networking driver for Solaris 11 build 159 and above
* VMM: more SMP timer fixes
* VMM: fixed sporadic recompiler crashes with SMP guests
* VMM: many small fixes
* GUI: when reverting to a snapshot, ask for taking a snapshot of the current state
* GUI: added a View menu
* GUI: added a setting for the promiscuous mode policy for internal networks, bridged networks and host-only networks
* GUI: added slider for setting the CPU execution cap allowing to limit the amount of CPU time spent for the execution of the guest
* GUI: the VM description is editable during the runtime of a VM (bug #1551)
* GUI: added proxy settings (bug #2870)
* GUI: made the number of SATA ports configurable
* GUI: decrease time before showing the VM configuration dialog
* VBoxManage: more convenient configuration of storage controller attachments by automatically determining the port or device parameter when a storage controller has only one port or device per port
* VBoxManage: changed syntax of the guestcontrol command group, fixed various bugs, removed obsolete options
* VBoxBalloonCtrl: new service for automatic dynamic adjustment of the balloon size for running VMs
* Settings: machine names and snapshot names are not allowed to be a valid UUID
* Settings: provide better diagnostics if a single medium is used twice in a VM configuration
* Settings: provide better diagnostics for errors in medium create/merge/clone operations, and fix memory leaks in error cases
* Storage: ATA/SATA drives can be marked as non-rotational, i.e. the guest OS will detect them as a SSD if supported, which can improve performance
* Storage: virtual CD/DVD images will be detached if the guest ejects the medium, unless the drive is marked to handle ejects only on a temporary basis
* Storage: the medium UUID can be changed again when attaching a medium for the first time, which allows using images which are exact duplicates including the UUID
* Storage: fixed possible data corruption under certain circumstances with VHD and Parallels images (bug #9150)
* Storage: fixed unnecessary expansion when cloning differential images in VDI format
* Storage: fixed detection code to handle empty files for VDI and VMDK format
* Storage: fixed access to CD/DVD images beyond 4GB when using the SATA controller (bug #8592)
* Floppy: several bugs have been fixed
* Floppy: make it possible to unmount a host floppy disk (bug #6651)
* BIOS: disk-related structures are now checksummed correctly (bug #8739)
* USB: many fixes for the Windows USB host driver
* NAT: reduced memory footprint
* Networking: fixed the problem with segmentation offloading when several VMs are transmitting in parallel
* Networking: workaround for a bug in wireshark when operating directly on a capture file created by VirtualBox
* Serial: announce the serial devices in the ACPI tables to make Windows guests find the virtual hardware (bug #7411)
* VRDP: support for TLS connections (see the manual for more information)
* VRDP: support for multimonitor client configurations with MS RDP clients
* VRDP: fixed a rare screen corruption
* 3D support: fixed GL_VERSION string for different locales (bug #8916)
* Webservice: fixed timeout handling with HTTP 1.1 keepalive, and be more robust when connections fail
* VBoxSVC: fixed regression when several clients trigger autostart simultaneously
* Main: fixed incorrect handling of the medium location for media which are not file based, which resulted in confusing location values in many places
* JAX-WS client bindings: fixed resource leak
* Sources: fixed USB 2.0 support using extension packs for non-official builds
* Mac OS X hosts: fixed non-VT-x mode on Lion hosts
* Windows hosts: fixed copy'n'paste in the GUI and for the VM window (bug #4491)
* Windows hosts (64-bit only): enabled removing of all mediums when removing a VM
* Windows hosts (64-bit only): enabled live snapshot deletion
* Windows hosts: use native controls in the installer (bug #5520)
* Solaris hosts: fixed preemption issue with Solaris 11 hosts (builds 166 and above)
* Solaris hosts: better control of USB device access on Solaris 11 hosts
* Guest Additions: improved driver installation on Windows guests
* Guest Additions: fixed high CPU usage while executing guest programs from the host
* Solaris Additions: fixed automounting of shared folders (bug #8014)
- deprecated vbox-netflt_start_xmit_enable.diff
-------------------------------------------------------------------
Thu Jun 30 07:30:30 UTC 2011 - mseben@gmail.com

View File

@ -53,7 +53,7 @@ BuildRequires: gcc-32bit gcc-c++-32bit
%endif
#
ExclusiveArch: %ix86 x86_64
Version: 4.0.10
Version: 4.1.0
Release: 1
Summary: VirtualBox is an Emulator
License: GPLv2+
@ -95,8 +95,8 @@ Patch5: vbox-config.diff
Patch6: vbox-smc-napa.diff
#fix build of Python and dev package on openSUSE 11.3
Patch8: vbox-python-detection.diff
#bnc#694311 http://www.virtualbox.org/ticket/8076
Patch9: vbox-netflt_start_xmit_enable.diff
Patch10: vbox-disable_vboxpci_build.diff
Patch11: 29-fix-ftbfs-as-needed.patch.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
@ -105,7 +105,6 @@ 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_%{version}-dfsg-1.diff.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils permissions
Requires: %{name}-host-kmp = %version
@ -214,19 +213,14 @@ Development file for %{name}
###########################################
%prep
%setup -q -n VirtualBox-%{version}_OSE
%patch103 -p1
export QUILT_PATCHES=debian/patches
#echo "18-system-xorg.patch" > debian/patches/series
echo "22-no-static-libstdcpp.patch" > debian/patches/series
echo "29-fix-ftbfs-as-needed.patch" >> debian/patches/series
quilt push -a
%patch1
%patch2
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch8 -p1
%patch9 -p1
%patch10
%patch11 -p1
%patch99 -p1
%patch100
%patch101
@ -238,9 +232,8 @@ quilt push -a
#ensure we dont ever use them
rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*}
# --disable-kmods \ don't build Linux kernel modules - but use SUSE specific way see few lines under
# --with-gcc=/usr/bin/gxx-4.3 do configure and set proper gcc - currently vbox support only gcc<=4.4
# --nofatal try to avoid build fail caused by missing makeself package
# --disable-kmods don't build Linux kernel modules - but use SUSE specific way see few lines under
# --nofatal try to avoid build fail caused by missing makeself package
./configure \
--disable-kmods \
--disable-java \
@ -254,8 +247,9 @@ source env.sh
# VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop file
# VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui
# -j1 disable parallel build to avoid "Out of memory: Kill process" crash of build in buildservice
echo "build basic parts"
/usr/bin/kmk \
-j2 \
-j1 \
VBOX_GCC_WERR= \
KBUILD_VERBOSE=2 \
VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
@ -266,7 +260,8 @@ source env.sh
# build kernel modules for guest and host (check novel-kmp package as example)
# host modules : vboxdrv,vboxnetflt,vboxnetadp
# guest modules : vboxguest,vboxsf,vboxvideo
for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp} \
echo "build kernel modules"
for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \
out/linux.*/release/bin/additions/src/vbox{guest,sf,video}; do
#get the module name from path
module_name=$(basename "$vbox_module")
@ -284,7 +279,8 @@ for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp} \
# copy vboxdrv (for host) module symbols which are used by vboxnetflt and vboxnetadp km's:
if [ "$module_name" = "vboxnetflt" -o \
"$module_name" = "vboxnetadp" ]; then
"$module_name" = "vboxnetadp" -o \
"$module_name" = "vboxpci" ] ; then
%__cp $PWD/modules_build_dir/$flavor/vboxdrv/Module.symvers \
$PWD/modules_build_dir/$flavor/$module_name
fi
@ -333,11 +329,11 @@ echo "entering virtualbox-kmp-guest and virtualbox-kmp-host install section"
export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
export INSTALL_MOD_DIR=updates
#to install modules we use here similar steps like in build phase, go trought the all modules :
for module_name in vbox{drv,netflt,netadp,guest,sf,video}
for module_name in vbox{drv,netflt,pci,netadp,guest,sf,video}
do
#and trought the all flavors
for flavor in %flavors_to_build; do
#to install modules use Makefile from /usr/src/linux-obj/%_target_cpu/$flavor and builds from $PWD/modules_build_dir/$flavor/$module_name
#to install modules use Makefile from /usr/src/linux-obj/%_target_cpu/$flavor and builds from $PWD/modules_build_dir/$flavor/$module_name
%__make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD/modules_build_dir/$flavor/$module_name
done
done
@ -363,49 +359,49 @@ echo "entering guest-x11 install section"
##############################################################
pushd out/linux.*/release/bin/additions/
#VBoxClient daemon (support for clipboard,autoresize,seamless windows)
%__install -m 755 VBoxClient %{buildroot}%{_bindir}
%__install -m 755 VBoxClient %{buildroot}%{_bindir}
# xorg drivers for mouse and videos check suse version to add propper driver
%if %suse_version > 1130
%__install -m 755 vboxmouse_drv_19.so \
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%__install -m 755 vboxvideo_drv_19.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%else
%if %suse_version == 1130
%__install -m 755 vboxmouse_drv_18.so \
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%__install -m 755 vboxvideo_drv_18.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%else
%if %suse_version == 1120
%__install -m 755 vboxmouse_drv_16.so \
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%__install -m 755 vboxvideo_drv_16.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%else
%__install -m 755 vboxmouse_drv_15.so \
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%__install -m 755 vboxvideo_drv_15.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%endif
%endif
%endif
popd
# VBoxOGL* libs for guest-x11 subpackage
%__install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \
%{buildroot}%{_libdir}
%{buildroot}%{_libdir}
# make link for dri lib
%__ln_s %{_libdir}/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
%__ln_s %{_libdir}/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
# install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows)
%__install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient \
%{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
%{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
%if %suse_version >= 1130
# add xorg config snipet to vbox mouse integration recognize
%__install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/60-vboxmouse.conf
%__install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/60-vboxmouse.conf
%else
# hal policy file to autodetect the virtualbox mouse
%__install -m 644 src/VBox/Additions/linux/installer/90-vboxguest.fdi \
%{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
%{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
%endif
##############################################
@ -415,32 +411,32 @@ echo "entering virtualbox(-qt) install section"
pushd out/linux.*/release/bin
%__install -m 755 VBoxManage %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxHeadless %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxSDL %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxSDL %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxTunctl %{buildroot}%{_vbox_instdir}
# create links to vbox tools in PATH - they could be usefull for controlling vbox from command line
%__ln_s %{_vbox_instdir}/VBoxManage %{buildroot}%{_bindir}/VBoxManage
%__ln_s %{_vbox_instdir}/VBoxHeadless \
%{buildroot}%{_bindir}/VBoxHeadless
%__ln_s %{_vbox_instdir}/VBoxSDL %{buildroot}%{_bindir}/VBoxSDL
%__ln_s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl
%__install -m 755 VBoxSVC %{buildroot}%{_vbox_instdir}
%{buildroot}%{_bindir}/VBoxHeadless
%__ln_s %{_vbox_instdir}/VBoxSDL %{buildroot}%{_bindir}/VBoxSDL
%__ln_s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl
%__install -m 755 VBoxSVC %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxXPCOMIPCD %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxExtPackHelperApp %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxTestOGL %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxPermissionMessage \
%{buildroot}%{_vbox_instdir}
%{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxNetDHCP %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxNetAdpCtl %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxBFE %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxBFE %{buildroot}%{_vbox_instdir}
%__install -m 755 VirtualBox %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxEFI*.fd %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir}
%__install -m 755 *.so %{buildroot}%{_vbox_instdir}
%__install -m 644 V*.gc %{buildroot}%{_vbox_instdir}
%__install -m 644 *.r0 %{buildroot}%{_vbox_instdir}
%__install -m 755 *.so %{buildroot}%{_vbox_instdir}
%__install -m 644 V*.gc %{buildroot}%{_vbox_instdir}
%__install -m 644 *.r0 %{buildroot}%{_vbox_instdir}
%__install -m 644 components/* %{buildroot}%{_vbox_instdir}/components/
# install languages
%__install -m 644 nls/* %{buildroot}%{_datadir}/virtualbox/nls/
%__install -m 644 nls/* %{buildroot}%{_datadir}/virtualbox/nls/
popd
# the build process tells us the desktop file is missing a semicolon...(repackage?)
@ -453,28 +449,28 @@ popd
# create a menu entry
%__install -m 644 out/linux.*/release/bin/VBox.png \
%{buildroot}%{_datadir}/pixmaps/virtualbox.png
%{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
%__install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/default/virtualbox
#install wrapper script
%__install -m 644 %{S:9} %{buildroot}%{_bindir}/VirtualBox
%__install -m 644 %{S:9} %{buildroot}%{_bindir}/VirtualBox
# modify and install the vboxdrv init script
# TODO: some of this stuff breaks the fillup macros below?
%__sed -i "s|%NOLSB%|yes|g;s|%DEBIAN%||g;s|%PACKAGE%|virtualbox|g" src/VBox/Installer/linux/vboxdrv.sh.in
%__install -m 744 src/VBox/Installer/linux/vboxdrv.sh.in \
%{buildroot}%{_sysconfdir}/init.d/vboxdrv
%{buildroot}%{_sysconfdir}/init.d/vboxdrv
%__ln_s %{_sysconfdir}/init.d/vboxdrv \
%{buildroot}%{_sbindir}/rcvboxdrv
%{buildroot}%{_sbindir}/rcvboxdrv
# Init script to start virtual boxes during boot
%__install -m 755 %{S:12} %{buildroot}%{_sysconfdir}/init.d/vboxes
%__install -m 755 %{S:12} %{buildroot}%{_sysconfdir}/init.d/vboxes
%__ln_s %{_sysconfdir}/init.d/vboxes \
%{buildroot}%{_sbindir}/rcvboxes
%__install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates
install -m 700 %{S:13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox
%{buildroot}%{_sbindir}/rcvboxes
%__install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates
install -m 700 %{S:13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox
@ -531,7 +527,6 @@ groupadd -r vboxusers 2>/dev/null || :
%run_permissions
%endif
%verifyscript
%if %suse_version >=1140
%verify_permissions -e %{_vbox_instdir}/VBoxNetDHCP
@ -564,7 +559,6 @@ exit 0
%restart_on_update vboxadd
%insserv_cleanup
%clean
[ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}"
@ -653,7 +647,6 @@ exit 0
%{_datadir}/pixmaps/virtualbox.png
%{_datadir}/applications/%{name}.desktop
#
%files guest-x11
%defattr(-, root, root)
%dir %{_libdir}/xorg/modules/drivers
@ -671,7 +664,6 @@ exit 0
%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
%endif
#
%files guest-tools
%defattr(-, root, root)
%{_bindir}/VBoxControl
@ -681,7 +673,6 @@ exit 0
%config %{_sysconfdir}/init.d/vboxadd
%{_sbindir}/rcvboxadd
#
%files -n python-%{name} -f %{_tmppath}/SITE_FILES
%defattr(-, root, root)
%dir %{_vbox_instdir}/sdk