jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 79956 from home:mseben:branches:Virtualization

Browse Source 
update to virtualbox 4.1.2

OBS-URL: https://build.opensuse.org/request/show/79956
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=54
This commit is contained in:
Michal Seben 2011-08-28 07:05:37 +00:00 committed by Git OBS Bridge
parent 7ee419d30f
commit 088706ea8e
11 changed files with 113 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VirtualBox-4.1.0-UserManual.pdf
View File

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

3
VirtualBox-4.1.0-patched.tar.bz2
View File

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

3
VirtualBox-4.1.2-UserManual.pdf Normal file
View File

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

3
VirtualBox-4.1.2-patched.tar.bz2 Normal file
View File

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

32
vbox-disable-updates.diff
View File

@ -1,7 +1,5 @@
Index: VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp --- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
=================================================================== +++ 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 @@ -63,7 +63,7 @@ void UIGlobalSettingsUpdate::loadToCache
void UIGlobalSettingsUpdate::getFromCache() void UIGlobalSettingsUpdate::getFromCache()
{ {
@ -11,24 +9,8 @@ Index: VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UI
if (m_pEnableUpdateCheckbox->isChecked()) if (m_pEnableUpdateCheckbox->isChecked())
{ {
m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex); m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex);
Index: VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp --- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
=================================================================== +++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
--- 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);
- updateAction->setEnabled (vboxGlobal().virtualBox().
- GetExtraData (VBoxDefs::GUI_UpdateDlgWinID).isEmpty());
+ updateAction->setDisabled ( true );
#ifndef Q_WS_MAC
aMenu->addSeparator();
Index: VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
===================================================================
--- 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: @@ -34,7 +34,6 @@ public:
{ {
GLSettingsPage_General = 0, GLSettingsPage_General = 0,
@ -37,10 +19,8 @@ Index: VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISetting
GLSettingsPage_Language, GLSettingsPage_Language,
GLSettingsPage_USB, GLSettingsPage_USB,
GLSettingsPage_Network, GLSettingsPage_Network,
Index: VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp --- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
=================================================================== +++ 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 @@ -340,15 +340,6 @@ UISettingsDialogGlobal::UISettingsDialog
iPageIndex, "#input", pSettingsPage); iPageIndex, "#input", pSettingsPage);
break; break;

31
vbox-disable_vboxpci_build.diff
View File

@ -2,27 +2,22 @@ Index: src/VBox/HostDrivers/VBoxPci/Makefile.kmk
=================================================================== ===================================================================
--- src/VBox/HostDrivers/VBoxPci/Makefile.kmk.orig --- src/VBox/HostDrivers/VBoxPci/Makefile.kmk.orig
+++ src/VBox/HostDrivers/VBoxPci/Makefile.kmk +++ src/VBox/HostDrivers/VBoxPci/Makefile.kmk
@@ -1,7 +1,7 @@ @@ -17,7 +17,9 @@
SUB_DEPTH = ../../../.. SUB_DEPTH = ../../../..
include $(KBUILD_PATH)/subheader.kmk include $(KBUILD_PATH)/subheader.kmk
+
-ifeq (1,1) if1of ($(KBUILD_TARGET), linux)
+ifdef VBOX_WITH_VBOXDRV +ifdef VBOX_WITH_VBOXDRV
if1of ($(KBUILD_TARGET), linux) #
# The driver.
@@ -25,6 +25,7 @@ VBoxPci_LIBS += \ @@ -41,7 +43,7 @@ if1of ($(KBUILD_TARGET), linux)
VBoxPci_LIBS += \
endif $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
-
+endif +endif
#
ifeq ($(KBUILD_TARGET),linux) # Install the sources.
#
@@ -73,6 +74,5 @@ $$(VBoxPci-sh_0_OUTDIR)/build_in_tmp: \
$(QUIET)chmod 0755 $@
endif
-endif
include $(KBUILD_PATH)/subfooter.kmk

94
vbox-permissions_warning.diff
View File

@ -1,59 +1,55 @@
Index: VirtualBox-3.2.2_OSE/src/VBox/Frontends/VirtualBox/Makefile.kmk Index: VirtualBox-4.1.2_OSE/src/apps/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-3.2.2_OSE.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk --- VirtualBox-4.1.2_OSE.orig/src/apps/Makefile.kmk
+++ VirtualBox-3.2.2_OSE/src/VBox/Frontends/VirtualBox/Makefile.kmk +++ VirtualBox-4.1.2_OSE/src/apps/Makefile.kmk
@@ -48,7 +48,7 @@ endif @@ -34,5 +34,7 @@ if1of ($(KBUILD_TARGET),darwin solaris l
# The targets. endif
#
ifdef VBOX_WITH_HARDENING
-PROGRAMS += VirtualBoxHardened
+PROGRAMS += VirtualBoxHardened VBoxPermissionsMessage
DLLS += VirtualBox
else
PROGRAMS += VirtualBox
@@ -94,6 +94,10 @@ if1of ($(KBUILD_TARGET), freebsd linux n
VirtualBox_SDKS += LIBSDL
endif endif
+VBoxPermissionsMessage_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE) +include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk
+VBoxPermissionsMessage_NAME = VBoxPermissionMessage
+VBoxPermissionsMessage_DEFS.linux = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
+ +
ifdef VBOX_WITH_ICHAT_THEATER include $(KBUILD_PATH)/subfooter.kmk
# For testing iChat Theater stuff change the sdk path (HACK ALERT!)
VBOX_PATH_MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk
@@ -366,6 +370,9 @@ ifdef VBOX_WITH_REGISTRATION
src/wizards/registration/UIRegistrationWzd.cpp
endif
+VBoxPermissionsMessage_SOURCES = \ Index: VirtualBox-4.1.2_OSE/src/apps/VBoxPermissionMessage/Makefile.kmk
+ src/VBoxPermissionsMessage.cpp
+
VirtualBox_SOURCES = \
src/main.cpp \
src/VBoxAboutDlg.cpp \
@@ -537,6 +544,8 @@ endif
# (The include directory and lib/framework for each module will be added by the Qt4 unit.)
VirtualBox_QT_MODULES = Core Gui Network
+VBoxPermissionsMessage_QT_MODULES = Core Gui Network
+
if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
VirtualBox_QT_MODULES += OpenGL
endif
@@ -757,6 +766,8 @@ $$(PATH_VirtualBox)/VirtualBox-icon.rc:
endif # win
+INSTALLS += VBoxPermissionsMessage
+VBoxPermissionsMessage_INST = $(INST_VIRTUALBOX)
ifeq ($(KBUILD_TARGET),darwin)
#
Index: VirtualBox-3.2.2_OSE/src/VBox/Frontends/VirtualBox/src/VBoxPermissionsMessage.cpp
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-3.2.2_OSE/src/VBox/Frontends/VirtualBox/src/VBoxPermissionsMessage.cpp +++ VirtualBox-4.1.2_OSE/src/apps/VBoxPermissionMessage/Makefile.kmk
@@ -0,0 +1,31 @@
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
+## @file
+#
+# VBoxPermissionMessage is wrapper for suse users
+#
+#
+# Copyright (C) 2009 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+
+SUB_DEPTH = ../../..
+include $(KBUILD_PATH)/subheader.kmk
+
+PROGRAMS += VBoxPermissionMessage
+
+VBoxPermissionMessage_TEMPLATE = VBOXQT4GUIEXE
+VBoxPermissionMessage_SOURCES = VBoxPermissionMessage.cpp
+VBoxPermissionMessage_QT_MODULES = Core Gui
+
+#INSTALLS += VBoxPermissionMessage
+
+include $(KBUILD_PATH)/subfooter.kmk
+
Index: VirtualBox-4.1.2_OSE/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
===================================================================
--- /dev/null
+++ VirtualBox-4.1.2_OSE/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+#include <QtGui/QApplication> +#include <QtGui/QApplication>
+#include <QtGui/QMessageBox> +#include <QtGui/QMessageBox>

6
vbox-vboxdrv-init-script.diff
View File

@ -17,12 +17,10 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
# Provides: vboxdrv # Provides: vboxdrv
-# Required-Start: $syslog -# Required-Start: $syslog
-# Required-Stop: -# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 1
+# Required-Start: $syslog $remote_fs +# Required-Start: $syslog $remote_fs
+# Required-Stop: $syslog $remote_fs +# Required-Stop: $syslog $remote_fs
+# Default-Start: 2 3 5 # Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: VirtualBox Linux kernel module # Short-Description: VirtualBox Linux kernel module
+# Description: VirtualBox Linux kernel module +# Description: VirtualBox Linux kernel module
### END INIT INFO ### END INIT INFO

0
virtualbox-4.1.0-rpmlintrc → virtualbox-4.1.2-rpmlintrc
View File

37
virtualbox.changes
View File

@ -1,3 +1,40 @@
-------------------------------------------------------------------
Mon Aug 22 11:29:11 UTC 2011 - mseben@gmail.com
- update to Virtualbox 4.1.2
* VMM: fixed 64-bit guests on AMD Fusion CPUs (bug #8824)
* VMM: fixed handling of the sysenter/sysexit machine instructions in 64-bit guests on Intel hosts
* GUI: added linked clone support
* GUI: fixed error check when changing the VM controller settings (4.1.0 regression; bug #9246)
* GUI: fixed the inclusion of additional information (license, vendor, ...) on OVF export
* GUI: when taking a snapshot from the VM selector, don't do a live snapshot
* GUI: fixed immediate crash during start on certain environments due to a library version conflict
* Guest control execution: implemented copying single files from guest to the host (directories and filters not supported yet)
* Guest control execution: limited to serve up to 5 guest processes at a time by default
* Main: return the correct RDP default port fixing settings warnings in the GUI if the remote display was enabled at runtime (bug #9368)
* VBoxSVC: made the path comparison OS independent when images are registered (bug #9303)
* VBoxSVC: several fixes/performance improvements for cloning of VMs
* Snapshots: fixed "Solid-State drive" flag survival on snapshot creation (bug #9379)
* VBoxManage: implemented copyfrom and stat guest control tools to copy files from guest to host and to check for existence of files on the guest
* VBoxManage: fixed extpack install --replace (bug #9308)
* VBoxManage: allow to start multiple VMs with startvm
* VBoxManage: experimental support for SATA CD/DVD hotplugging
* Mouse support: fixed an off-by-one pointer position error affecting Windows guests (bugs #7566, #9321)
* VRDP: fixed a case when the screen was not redrawn correctly (bug #9242)
* NAT: changed TCP connection establishment according to Winsock API requirements (Windows hosts only; bug #8919)
* USB: fixed device recognition issues (bugs #9299) and fixed several device capturing issues (Windows hosts; bug #9299)
* USB: fixed issues with remote filters being applied to local USB devices
* OVA: fixed import of renamed OVA files (bug #9033)
* Windows host: fixed icon for .VDI files (bug #9393)
* Solaris hosts: fixed a bug preventing parallel usage of multiple host NICs with Crossbow based bridged networking
* Linux hosts: fixed random kernel panics on host suspend / shutdown (4.1.0 regression; bug #9305)
* Guest Additions: keep logged in user count in out-of-memory situations and warn about it
* Solaris Additions: fixed shared folders due to missing symbols in the vboxfs module (4.0.12 / 4.1.0 regression; bug #9264)
* Windows Additions: fixed file truncation on a shared folder with some applications (bugs #9276, #9315)
* Windows Additions: fixed shared folder issues with antivirus software and 64 bit Windows guests (bug #9318)
* Windows Vista and 7 guests: WDDM driver fixes and performance enhancements, fixed WinSAT crashes (#9267)
* Linux Additions: fixed llseek() for Linux kernels 2.6.37 and above
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 9 12:37:27 UTC 2011 - mseben@gmail.com Tue Aug 9 12:37:27 UTC 2011 - mseben@gmail.com

16
virtualbox.spec
View File

@ -53,7 +53,7 @@ BuildRequires: gcc-32bit gcc-c++-32bit
%endif %endif
# #
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
Version: 4.1.0 Version: 4.1.2
Release: 1 Release: 1
Summary: VirtualBox is an Emulator Summary: VirtualBox is an Emulator
License: GPLv2+ License: GPLv2+
@ -224,9 +224,9 @@ Development file for %{name}
%patch10 %patch10
%patch11 -p1 %patch11 -p1
%patch99 -p1 %patch99 -p1
%patch100 %patch100
%patch101 %patch101
%patch102 -p1 %patch102
#copy user manual #copy user manual
%__cp %{S:1} ./UserManual.pdf %__cp %{S:1} ./UserManual.pdf
@ -248,16 +248,8 @@ source env.sh
# #
# VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop file # 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 # 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" echo "build basic parts"
/usr/bin/kmk \ /usr/bin/kmk %{?_smp_mflags} VBOX_GCC_WERR= KBUILD_VERBOSE=2 VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= TOOL_YASM_AS=yasm VBOX_PATH_PACKAGE_DOCS=/usr/share/doc/packages/virtualbox all
-j1 \
VBOX_GCC_WERR= \
KBUILD_VERBOSE=2 \
VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
TOOL_YASM_AS=yasm \
VBOX_PATH_PACKAGE_DOCS=/usr/share/doc/packages/virtualbox \
all
# #
# build kernel modules for guest and host (check novel-kmp package as example) # build kernel modules for guest and host (check novel-kmp package as example)
# host modules : vboxdrv,vboxnetflt,vboxnetadp # host modules : vboxdrv,vboxnetflt,vboxnetadp