Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at Mon Jan 3 13:56:32 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/virtualbox/virtualbox.changes 2011-01-01 16:40:31.000000000 +0100 @@ -0,0 +1,2061 @@ +------------------------------------------------------------------- +Fri Dec 31 22:41:25 UTC 2010 - mseben@gmail.com + +- added vbox-smc-napa.diff to fix build + +------------------------------------------------------------------- +Thu Dec 30 19:50:12 UTC 2010 - tejas.guruswamy@opensuse.org + +- Use xserver 1.9 additions on Factory + +------------------------------------------------------------------- +Thu Dec 23 17:43:05 UTC 2010 - mseben@gmail.com + +- update to VirtualBox 4.0.0 + New Features: + * Reorganization of VirtualBox into a base package and Extension Packs + * New settings/disk file layout for VM portability; see chapter 10.1, Where VirtualBox stores its files + * Major rework of the GUI (now called “VirtualBox Manager”): + - Redesigned user interface with guest window preview (also for screenshots) + - New “scale” display mode with scaled guest display + - Support for creating and starting .vbox desktop shortcuts (bug #1889) + - The VM list is now sortable + - Machines can now be deleted easily without a trace including snapshots and saved states, + and optionally including attached disk images (bug #5511; also, VBoxManage unregistervm --delete can do the same now) + * Built-in creation of desktop file shortcuts to start VMs on double click (bug #2322) + * VMM: support more than 1.5/2 GB guest RAM on 32-bit hosts + * New virtual hardware: + - Intel ICH9 chipset with three PCI buses, PCI Express and Message Signaled Interrupts (MSI) + - Intel HD Audio, for better support of modern guest operating systems (e.g. 64-bit Windows; bug #2785) + * Improvements to OVF support : + - Open Virtualization Format Archive (OVA) support + - Significant performance improvements during export and import + - Creation of the manifest file on export is optional now + - Imported disks can have formats other than VMDK + * Resource control: added support for limiting a VM’s CPU time and IO bandwidth + * Storage: support asynchronous I/O for iSCSI, VMDK, VHD and Parallels images + * Storage: support for resizing VDI and VHD images. + * Guest Additions: support for multiple virtual screens in Linux and Solaris guests using X.Org server 1.3 and later + * Language bindings: uniform Java bindings for both local (COM/XPCOM) and remote (SOAP) invocation APIs + * In addition, the following items were fixed and/or added: + Bug Fixes: + * VMM: Enable large page support by default on 64-bit hosts (applies to nested paging only) + * VMM: fixed guru meditation when running Minix (VT-x only; bug #6557) + * VMM: fixed crash under certain circumstances (Linux hosts only, non VT-x/AMD-V mode only; bugs #4529 and #7819) + * GUI: add configuration dialog for port forwarding in NAT mode (bug #1657) + * GUI: show the guest window content on save and restore + * GUI: certain GUI warnings don’t stop the VM output anymore + * GUI: fixed black fullscreen minitoolbar on KDE4 hosts (Linux hosts only; bug #5449) + * BIOS: implemented multi-sector reading to speed up booting of certain guests (e.g. Solaris) + * Bridged networking: improved throughput by filtering out outgoing packets intended for the host before they reach the physical network (Linux hosts only; bug #7792) + * 3D support: allow use of CR_SYSTEM_GL_PATH again (bug #6864) + * 3D support: fixed various clipping/visibility issues (bugs #5659, #5794, #5848, #6018, #6187, #6570) + * 3D support: guest application stack corruption when using glGetVertexAttrib[ifd]v (bug #7395) + * 3D support: fixed OpenGL support for libMesa 7.9 + * 3D support: fixed Unity/Compiz crashes on natty + * 2D Video acceleration: multimonitor support + * VRDP: fixed rare crash in multimonitor configuration + * VRDP: support for upstream audio + * Display: fixed occasional guest resize crash + * NAT: port forwarding rules can be applied at runtime + * SATA: allow to attach CD/DVD-ROM drives including passthrough (bug #7058) + * Floppy: support readonly image files, taking this as the criteria for making the medium readonly (bug #5651) + * Audio: fixed memory corruption during playback under rare circumstances + * Audio: the DirectSound backend now allows VMs to be audible when another DirectSound application is active, including another VM (bug #5578) + * EFI: support for SATA disks and CDROMs + * BIOS: reduce the stack usage of the VESA BIOS function #4F01 (Quake fix) + * OVF/OVA: fixed export of VMs with iSCSI disks + * Storage: Apple DMG image support for the virtual CD/DVD (bug #6760) + * Linux host USB support: introduced a less invasive way of accessing raw USB devices (bugs #1093, #5345, #7759) + * Linux hosts: support recent Linux kernels with CONFIG_DEBUG_SET_MODULE_RONX set + * Guest Additions: Shared Folders now can be marked as being auto-mounted on Windows, Linux and Solaris guests + * Linux Additions: Shared Folders now support symbolic links (bug #818) + * Linux Additions: combined 32-bit and 64-bit additions into one file + * Windows Additions: automatic logon on Windows Vista/Windows 7 is now able to handle renamed user accounts; added various bugfixes + + +------------------------------------------------------------------- +Mon Dec 20 12:03:12 UTC 2010 - mseben@gmail.com + +- rename to virtualbox - drop ose postfix, Oracle team dosn't build + puel version - we have now extension packs +- rename xorg-x11-driver-virtualbox-ose subpackage to virtualbox-guest-x11 +- use Provides: virtualbox-gui for virtualbox-qt subpackage and + Recommends: virtualbox-gui for virtualbox package, so user could + install another type of gui easily + +------------------------------------------------------------------- +Fri Dec 17 19:37:43 UTC 2010 - mseben@gmail.com + +- update to VirtualBox 4.0.0 BETA4 + * see announcement with changelog http://forums.virtualbox.org/viewtopic.php?f=15&t=37177 +- set propper path for link to pdf in .desktop file + +------------------------------------------------------------------- +Tue Dec 14 08:52:37 UTC 2010 - mseben@gmail.com + +- update to VirtualBox 4.0.0 BETA2 + * see announcement with changelog http://forums.virtualbox.org/viewtopic.php?f=15&t=36893 + +------------------------------------------------------------------- +Sat Dec 11 22:13:52 UTC 2010 - coolo@novell.com + +- cleanup 32bit buildrequires + +------------------------------------------------------------------- +Tue Dec 7 08:59:32 UTC 2010 - mseben@gmail.com + +- update to VirtualBox 4.0.0 BETA1 + * see announcement with changelog http://forums.virtualbox.org/viewtopic.php?f=15&t=36748 + +------------------------------------------------------------------- +Thu Dec 2 14:02:16 UTC 2010 - mseben@gmail.com + +- updated to VirtualBox-ose 3.2.12 + * VMM: fixed rare host crash when running 64-bit guests on 32-bit hosts (bug #7577) + * VMM: fixed host reboots under rare circumstances due to NMIs triggered by active performance counters + * VMM: fixed out of memory guru meditation for large memory guests (bug #7586) + * VMM: fixed a guru meditation related to large pages + * VMM: use new VT-x feature to keep the guest from hogging the CPU + * Snapshots: implemented deleting the last remaining snapshot while the VM is running + * GUI: perform the checks for exceeding the size limit of the host file system and for broken asynchronous I/O + * NAT: fixed memory leak (3.2.0 regression; bugs #6918, #7353) + * Networking: fixed VM reset handling in e1000 + * VRDP: fixed rare crash in multimonitor configuration + * Display: fixed occasional guest resize crash + * Mouse: don't send relative mouse events together with absolute mouse events (3.2.10 regression; bug #7571) + * Keyboard: fixes for the USB keyboard emulation; fixes for Koran keyboards + * Serial: don't hang if the host device would block during open (bugs #5756, #5380) + * Serial: fixed modem status lines (Linux hosts only; bug #812) + * Graphics: Horizontal resolutions are no longer restricted to a multiple of 8 pixels + * USB: fixed a crash with older Linux kernels and non-ASCII characters in device strings + * USB: fixed a crash under rare circumstances (bug #7409; Windows hosts only) + * iSCSI: respond to NOP-In requests from the target immediately to avoid being disconnected if the guest is idle + * 3D support: fixed a crash under certain circumstances (bug #7659) + * 3D support: fixed crashes for GLUT based apps (bug #6848) + * 3D support: added missing GLX 1.3 functionality (bugs #7652, #7195) + * 2D Video acceleration: fixed potential deadlock when saving the VM state (bug #4124) + * Windows hosts: another fix for BSODs under certain circumstances in VBoxNetFlt.sys (bug #7601) + * Solaris hosts: fixed host USB DVD drive detection + * Mac OS X hosts: fixed swapped keys for certain ISO keyboard types (bug #2996) + * Linux hosts: added link state handling for TAP devices needed for proper operation with bridged networking + * Linux hosts/guests: Linux 2.6.37 fixes + * Linux Additions: properly compile the vboxvideo module if DKMS is not installed (bug #7572) + * Linux Additions: fixed a memory leak when accessing non-existing files on a Shared Folders (bug #7705) + * Windows Additions: skip none-mapped user accounts when enumerating user accounts for VM information +- deprecated vbox-kernel-2637.diff +- added rpath.diff to fix build +- modify vboxdrv init script with proper macros in install section + +------------------------------------------------------------------- +Thu Dec 2 11:26:48 CET 2010 - dmueller@suse.de + +- remove runlevel 4 from start scripts + +------------------------------------------------------------------- +Fri Nov 19 19:06:48 UTC 2010 - coolo@novell.com + +- take patch from upstream to fix build with 2.6.37 + +------------------------------------------------------------------- +Wed Nov 10 00:06:58 UTC 2010 - javier@opensuse.org + +- Added vbox-default-os-type.diff + * Changes the default Linux guest OS to openSUSE + +------------------------------------------------------------------- +Wed Oct 13 21:44:12 UTC 2010 - crrodriguez@novell.com + +- Update to VirtualBox 3.2.10 + * Fix build with newer kernels + * support X.Org Server 1.9 + * don't crash VBoxClient during reboot + * Bridged networking: fixed occasional host freeze during VM shutdown + * fixed memory leak under certain circumstances + * under rare conditions the NAT engine consumed 100% CPU load + +------------------------------------------------------------------- +Tue Sep 21 15:47:03 UTC 2010 - puzel@novell.com + +- install mount.vboxsf into /sbin, not /usr/sbin (bnc#636347) + +------------------------------------------------------------------- +Wed Sep 15 08:35:14 UTC 2010 - jeffm@novell.com + +- added a patch that converts vbox shared folders to use 2.6-style + embedded inodes but i haven't tested it. I don't use virtualbox and don't + intend to start. + +------------------------------------------------------------------- +Tue Sep 14 14:10:57 UTC 2010 - coolo@novell.com + +- add vbox-kernel-2.6.36.diff to support kernel > 2.6.35 + +------------------------------------------------------------------- +Tue Sep 7 18:20:54 UTC 2010 - mseben@gmail.com + +- created qt subpackage with qt dependency ++++ 1864 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/virtualbox/virtualbox.changes calling whatdependson for head-i586 New: ---- vbox-default-os-type.diff vbox-disable-updates.diff vbox-no-build-dates.diff vbox-permissions_warning.diff vbox-ret-in-nonvoid-fnc.diff vbox-rpath.diff vbox-smc-napa.diff vbox-vboxadd-init-script.diff vbox-vboxdrv-init-script.diff VirtualBox-4.0.0-patched.tar.bz2 virtualbox-4.0.0-rpmlintrc VirtualBox-4.0.0-UserManual.pdf virtualbox-60-vboxdrv.rules virtualbox-60-vboxguest.rules virtualbox-60-vboxmouse.conf virtualbox.changes virtualbox-default.virtualbox virtualbox-guest-kmp-files virtualbox-guest-preamble virtualbox-host-kmp-files virtualbox-host-preamble virtualbox-patch-source.sh virtualbox.spec virtualbox-sysconfig.vbox virtualbox-vboxes virtualbox-wrapper.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ ++++ 632 lines (skipped) ++++++ vbox-default-os-type.diff ++++++ --- src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp.orig 2010-11-10 21:27:23.000000000 +0100 +++ src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2010-11-10 21:27:53.000000000 +0100 @@ -199,10 +199,10 @@ if (xpIndex != -1) mCbType->setCurrentIndex (xpIndex); } - /* Or select Ubuntu item for Linux family as default */ + /* Or select openSUSE item for Linux family as default */ else if (familyId == "Linux") { - int ubIndex = mCbType->findData ("Ubuntu", RoleTypeID); + int ubIndex = mCbType->findData ("OpenSUSE", RoleTypeID); if (ubIndex != -1) mCbType->setCurrentIndex (ubIndex); } ++++++ vbox-disable-updates.diff ++++++ Index: src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp =================================================================== --- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp.orig +++ src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp @@ -45,7 +45,8 @@ void VBoxGLSettingsUpdate::getFrom (cons { VBoxUpdateData data (vboxGlobal().virtualBox().GetExtraData (VBoxDefs::GUI_UpdateDate)); - mCbCheck->setChecked (!data.isNoNeedToCheck()); + mCbCheck->setChecked (false); + if (mCbCheck->isChecked()) { mCbOncePer->setCurrentIndex (data.periodIndex()); Index: src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp =================================================================== --- src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp.orig +++ src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp @@ -5115,6 +5115,9 @@ void VBoxGlobal::showRegistrationDialog */ void VBoxGlobal::showUpdateDialog (bool aForce) { + // Disable update dialog for openSUSE + return; + /* Silently check in one day after current time-stamp */ QTimer::singleShot (24 /* hours */ * 60 /* minutes */ * 60 /* seconds */ * 1000 /* milliseconds */, Index: src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp =================================================================== --- src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp.orig 2009-03-13 11:38:50.000000000 +0100 +++ src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2009-04-15 17:03:52.000000000 +0200 @@ -87,8 +87,8 @@ #endif aMenu->addAction (updateAction); - updateAction->setEnabled (vboxGlobal().virtualBox(). - GetExtraData (VBoxDefs::GUI_UpdateDlgWinID).isEmpty()); + updateAction->setDisabled( true ); + #ifndef Q_WS_MAC aMenu->addSeparator(); Index: src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsUpdate.ui =================================================================== --- src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsUpdate.ui.orig +++ src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsUpdate.ui @@ -18,6 +18,9 @@ </comment> <class>VBoxGLSettingsUpdate</class> <widget class="QWidget" name="VBoxGLSettingsUpdate" > + <property name="enabled" > + <bool>false</bool> + </property> <property name="geometry" > <rect> <x>0</x> @@ -48,7 +51,7 @@ <string>&Check for updates</string> </property> <property name="checked" > - <bool>true</bool> + <bool>false</bool> </property> </widget> </item> ++++++ vbox-no-build-dates.diff ++++++ --- src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp.orig +++ src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp @@ -1150,10 +1150,9 @@ DECLCALLBACK(int) VMPowerUpThread(RTTHRE char szNowUct[64]; RTTimeSpecToString(RTTimeNow(&TimeSpec), szNowUct, sizeof(szNowUct)); RTLogRelLogger(pLogger, 0, ~0U, - "VBoxBFE %s (%s %s) release log\n" + "VBoxBFE %s release log\n" "Log opened %s\n", - VBOX_VERSION_STRING, __DATE__, __TIME__, - szNowUct); + VBOX_VERSION_STRING, szNowUct); /* register this logger as the release logger */ RTLogRelSetDefaultInstance(pLogger); --- src/VBox/Main/ConsoleImpl.cpp.orig +++ src/VBox/Main/ConsoleImpl.cpp @@ -5063,13 +5063,12 @@ HRESULT Console::consoleInitReleaseLog(c char szTmp[256]; RTTimeSpecToString(RTTimeNow(&timeSpec), szTmp, sizeof(szTmp)); RTLogRelLogger(loggerRelease, 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, - __DATE__, __TIME__, szTmp); + VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET, szTmp); vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) --- src/VBox/Main/generic/OpenGLTestApp.cpp.orig +++ src/VBox/Main/generic/OpenGLTestApp.cpp @@ -141,13 +141,12 @@ static int vboxInitLogging(const char *p char szTmp[256]; RTTimeSpecToString(RTTimeNow(&timeSpec), szTmp, sizeof(szTmp)); RTLogRelLogger(loggerRelease, 0, ~0U, - "VBoxTestGL %s r%u %s (%s %s) release log\n" + "VBoxTestGL %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, - __DATE__, __TIME__, szTmp); + VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET, szTmp); vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) --- src/VBox/Frontends/VBoxFB/VBoxFB.cpp.orig +++ src/VBox/Frontends/VBoxFB/VBoxFB.cpp @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) printf("VirtualBox DirectFB GUI built %s %s\n" "(C) 2004-" VBOX_C_YEAR " " VBOX_VENDOR "\n" - "(C) 2004-2005 secunet Security Networks AG\n", __DATE__, __TIME__); + "(C) 2004-2005 secunet Security Networks AG\n"); for (;;) { --- src/VBox/Runtime/common/string/uniread.cpp.orig +++ src/VBox/Runtime/common/string/uniread.cpp @@ -979,7 +979,7 @@ int PrintHeader(const char *argv0) " *\n" " * IPRT - Unicode Tables.\n" " *\n" - " * Automatically Generated by %s (" __DATE__ " " __TIME__ ")\n" + " * Automatically Generated by %s\n" " */\n" "\n" "/*\n" ++++++ vbox-permissions_warning.diff ++++++ Index: VirtualBox-3.2.2_OSE/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- VirtualBox-3.2.2_OSE.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk +++ VirtualBox-3.2.2_OSE/src/VBox/Frontends/VirtualBox/Makefile.kmk @@ -48,7 +48,7 @@ endif # The targets. # 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 +VBoxPermissionsMessage_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE) +VBoxPermissionsMessage_NAME = VBoxPermissionMessage +VBoxPermissionsMessage_DEFS.linux = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL + ifdef VBOX_WITH_ICHAT_THEATER # 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 = \ + 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 +++ VirtualBox-3.2.2_OSE/src/VBox/Frontends/VirtualBox/src/VBoxPermissionsMessage.cpp @@ -0,0 +1,12 @@ +#include <QtGui/QApplication> +#include <QtGui/QMessageBox> +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + QMessageBox msgBox; + msgBox.setWindowTitle(QObject::tr("Permissions problem !")); + msgBox.setText(QObject::tr("You are not a member of the \"vboxusers\" group. Please add yourself to this group before starting VirtualBox. You could do it using: Yast / Security and Users / User and Group management. Don't forget re-login your user account!")); + int ret = msgBox.exec(); + app.quit(); + return 0; +} \ No newline at end of file ++++++ vbox-ret-in-nonvoid-fnc.diff ++++++ Index: VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/nic.c =================================================================== --- VirtualBox-3.1.4_OSE.orig/src/VBox/Devices/PC/Etherboot-src/core/nic.c +++ VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/nic.c @@ -478,6 +478,7 @@ int eth_load(struct dev *dev __unused) } interruptible_sleep(2); /* lay off the server for a while */ longjmp(restart_etherboot, -1); + return 0; } Index: VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/osloader.c =================================================================== --- VirtualBox-3.1.4_OSE.orig/src/VBox/Devices/PC/Etherboot-src/core/osloader.c +++ VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/osloader.c @@ -81,6 +81,7 @@ dead_download - Restart etherboot if pro **************************************************************************/ static sector_t dead_download ( unsigned char *data __unused, unsigned int len __unused, int eof __unused) { longjmp(restart_etherboot, -2); + return 0; } #ifdef IMAGE_MULTIBOOT ++++++ vbox-rpath.diff ++++++ Index: VirtualBox-4.0.0_OSE/Config.kmk =================================================================== --- VirtualBox-4.0.0_OSE.orig/Config.kmk +++ VirtualBox-4.0.0_OSE/Config.kmk @@ -580,7 +580,7 @@ endif #VBOX_PATH_APP_PRIVATE = /usr/lib/virtualbox ifdef VBOX_WITH_HARDENING if1of ($(KBUILD_TARGET), linux solaris) - VBOX_PATH_APP_PRIVATE = /opt/VirtualBox + VBOX_PATH_APP_PRIVATE = /usr/lib/virtualbox else ifeq ($(KBUILD_TARGET),darwin) VBOX_PATH_APP_PRIVATE = /Applications/VirtualBox.app/Contents/MacOS else ifeq ($(KBUILD_TARGET),freebsd) ++++++ vbox-smc-napa.diff ++++++ Index: VirtualBox-4.0.0_OSE/src/VBox/Devices/PC/vbox.dsl =================================================================== --- VirtualBox-4.0.0_OSE.orig/src/VBox/Devices/PC/vbox.dsl +++ VirtualBox-4.0.0_OSE/src/VBox/Devices/PC/vbox.dsl @@ -778,7 +778,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, Device (SMC) { Name (_HID, EisaId ("APP0001")) - Name (_CID, "smc-napa") + Name (_CID, "smcnapa") Method (_STA, 0, NotSerialized) { ++++++ vbox-vboxadd-init-script.diff ++++++ 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 @@ # ### BEGIN INIT INFO # Provides: vboxadd -# Required-Start: -# Required-Stop: -# Default-Start: 2 3 4 5 +# Required-Start: $remote_fs +# Required-Stop: $remote_fs +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Description: VirtualBox Linux Additions kernel modules +# Short-Description: VirtualBox Linux Additions kernel modules ### END INIT INFO PATH=$PATH:/bin:/sbin:/usr/sbin @@ -165,8 +166,6 @@ fi dev=/dev/vboxguest userdev=/dev/vboxuser -owner=vboxadd -group=1 test_sane_kernel_dir() { @@ -236,12 +235,6 @@ do_vboxguest_non_udev() fail "Cannot create device $dev with major $maj and minor $min" } fi - chown $owner:$group $dev 2>/dev/null || { - rm -f $dev 2>/dev/null - rm -f $userdev 2>/dev/null - rmmod vboxguest 2>/dev/null - fail "Cannot change owner $owner:$group for device $dev" - } if [ ! -c $userdev ]; then maj=10 @@ -252,12 +245,6 @@ do_vboxguest_non_udev() rmmod vboxguest 2>/dev/null fail "Cannot create device $userdev with major $maj and minor $min" } - chown $owner:$group $userdev 2>/dev/null || { - rm -f $dev 2>/dev/null - rm -f $userdev 2>/dev/null - rmmod vboxguest 2>/dev/null - fail "Cannot change owner $owner:$group for device $userdev" - } fi fi } @@ -286,8 +273,7 @@ start() do_vboxguest_non_udev;; esac - if [ -n "$BUILDVBOXSF" ]; then - running_vboxsf || { + running_vboxsf || { $MODPROBE vboxsf > /dev/null 2>&1 || { if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then fail_msg @@ -297,8 +283,7 @@ start() fi fail "modprobe vboxsf failed" } - } - fi + } # Mount all shared folders from /etc/fstab. Normally this is done by some # other startup script but this requires the vboxdrv kernel module loaded. @@ -315,10 +300,8 @@ stop() if ! umount -a -t vboxsf 2>/dev/null; then fail "Cannot unmount vboxsf folders" fi - if [ -n "$BUILDVBOXSF" ]; then - if running_vboxsf; then - rmmod vboxsf 2>/dev/null || fail "Cannot unload module vboxsf" - fi + if running_vboxsf; then + rmmod vboxsf 2>/dev/null || fail "Cannot unload module vboxsf" fi if running_vboxguest; then rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest" ++++++ vbox-vboxdrv-init-script.diff ++++++ Index: src/VBox/Installer/linux/vboxdrv.sh.in =================================================================== --- src/VBox/Installer/linux/vboxdrv.sh.in.orig +++ src/VBox/Installer/linux/vboxdrv.sh.in @@ -3,7 +3,7 @@ # Linux kernel module init script # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2007-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -19,11 +19,12 @@ # ### BEGIN INIT INFO # Provides: vboxdrv -# Required-Start: $syslog -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 1 +# Required-Start: $syslog $remote_fs +# Required-Stop: $syslog $remote_fs +# Default-Start: 2 3 5 +# Default-Stop: 0 1 6 # Short-Description: VirtualBox Linux kernel module +# Description: VirtualBox Linux kernel module ### END INIT INFO PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH @@ -56,7 +57,7 @@ fi # silently exit if the package was uninstalled but not purged, # applies to Debian packages only -[ -z "$DEBIAN" -o -x $VBOXMANAGE -a -x $BUILDVBOXDRV ] || exit 0 +[ -z "$DEBIAN" -o -x $VBOXMANAGE -a -x $BUILDVBOXDRV ] || exit 1 if [ -n "$NOLSB" ]; then if [ -f /etc/redhat-release ]; then @@ -189,13 +190,6 @@ start() failure "Cannot create device $DEVICE with major $MAJOR and minor $MINOR" fi fi - # ensure permissions - if ! chown :%GROUP% $DEVICE 2>/dev/null; then - rmmod vboxnetadp 2>/dev/null - rmmod vboxnetflt 2>/dev/null - rmmod vboxdrv 2>/dev/null - failure "Cannot change group %GROUP% for device $DEVICE" - fi if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" fi ++++++ virtualbox-4.0.0-rpmlintrc ++++++ addFilter("incoherent-init-script-name vboxdrv") addFilter("incoherent-init-script-name vboxadd") addFilter("xorg-x11-driver-virtualbox-ose.* shlib-policy-missing-suffix") ++++++ virtualbox-60-vboxdrv.rules ++++++ KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ++++++ virtualbox-60-vboxguest.rules ++++++ KERNEL=="vboxguest", NAME="vboxguest", OWNER="root", MODE="0660" ENV{ID_INPUT}="1", ENV{ID_INPUT_MOUSE}="1" KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0600", TAG+="udev-acl" ++++++ virtualbox-60-vboxmouse.conf ++++++ Section "InputClass" Identifier "VBoxMouse" Driver "vboxmouse" MatchDevicePath "/dev/vboxguest" EndSection ++++++ virtualbox-default.virtualbox ++++++ # /etc/default/virtualbox # # ------------------------------------------------------------------------------------------------- # In the "SHUTDOWN_USERS" list all users for which a check for runnings VMs should be done during # shutdown of "vboxdrv" resp. the server: # SHUTDOWN_USERS="foo bar" # # Set "SHUTDOWN" to one of "poweroff", "acpibutton" or "savestate" depending on which of the # shutdown methods for running VMs are wanted: # SHUTDOWN="poweroff" # SHUTDOWN="acpibutton" # SHUTDOWN="savestate" # ------------------------------------------------------------------------------------------------- # #SHUTDOWN_USERS="foo bar" #SHUTDOWN="savestate" ++++++ virtualbox-guest-kmp-files ++++++ %defattr (-,root,root) %dir /lib/modules/%2-%1/ %dir /lib/modules/%2-%1/updates /lib/modules/%2-%1/updates/vboxsf.ko /lib/modules/%2-%1/updates/vboxvideo.ko /lib/modules/%2-%1/updates/vboxguest.ko ++++++ virtualbox-guest-preamble ++++++ Requires: kernel-%1 Provides: virtualbox-guest-kmp = %version #rename from ose version: Provides: virtualbox-ose-guest-kmp-%1 = %version Obsoletes: virtualbox-ose-guest-kmp-%1 < %version ++++++ virtualbox-host-kmp-files ++++++ %defattr (-,root,root) %dir /lib/modules/%2-%1/ %dir /lib/modules/%2-%1/updates /lib/modules/%2-%1/updates/vboxdrv.ko /lib/modules/%2-%1/updates/vboxnetadp.ko /lib/modules/%2-%1/updates/vboxnetflt.ko ++++++ virtualbox-host-preamble ++++++ Requires: kernel-%1 Provides: virtualbox-host-kmp = %version #rename from ose version: Provides: virtualbox-ose-host-kmp-%1 = %version Obsoletes: virtualbox-ose-host-kmp-%1 < %version ++++++ virtualbox-patch-source.sh ++++++ #!/bin/bash REMOVE_DIRS=( src/VBox/Additions/WINNT src/VBox/Additions/os2 kBuild/bin kBuild/msgstyles kBuild/tools kBuild/sdks tools/darwin.x86 tools/darwin.amd64 tools/freebsd.x86 tools/os2.x86 tools/solaris.x86 tools/solaris.amd64 tools/win.amd64 tools/win.x86 tools/linux.x86 tools/linux.amd64 ) set -o errexit CMDNAME=${0##*/} SOURCEDIR=${0%$CMDNAME} BASENAME=${1%.tar.bz2} trap "rm -rf \"$BASENAME-patched.tar\" \"$BASENAME-patched.tar.bz2\"" ERR for (( N=0 ; N<${#REMOVE_DIRS[@]} ; N++ )) ; do #REMOVE_DIRS[N]="$BASENAME/${REMOVE_DIRS[N]}" # use a wildcard because VirtualBox-1.6.0-OSE != VirtualBox-1.6.0_OSE REMOVE_DIRS[N]="*/${REMOVE_DIRS[N]}" done cd "$SOURCEDIR" >/dev/null if ! test -f "$BASENAME.tar.bz2" ; then exit 0 fi if test -f "$BASENAME-patched.tar.bz2" ; then if test "$BASENAME.tar.bz2" -ot "$BASENAME-patched.tar.bz2" ; then if test $CMDNAME -ot "$BASENAME-patched.tar.bz2" ; then exit 0 fi fi fi cp -a "$BASENAME.tar.bz2" "$BASENAME-patched.tar.bz2" bunzip2 "$BASENAME-patched.tar.bz2" tar --wildcards --delete -f "$BASENAME-patched.tar" "${REMOVE_DIRS[@]}" bzip2 "$BASENAME-patched.tar" ++++++ virtualbox-sysconfig.vbox ++++++ ## Path: System/Virtual Machines/VBox ## Description: Virtual box machines to autostart during boot ## Type: string ## Default: "" # # Configuration file for the script /etc/init.d/vboxes # # The variable VBOX_AUTOSTART holds the virtual machines to be started during # boot time. One entry must contain the virtual machine name and the # virtual machine owner. They are separated with a ";". Multiple entries # (virtual machines) are separated with a space. # # Examples: # MachineName1;user1 # # One virtual machine: # openSUSE_Factory;vbox # # Multiple virtual machines: # openSUSE_Factory;vbox openSUSE_stable;suse # VBOX_AUTOSTART="" ++++++ virtualbox-vboxes ++++++ #!/bin/sh # # chkconfig: - 91 35 # description: Starts and stops vbox autostart VMs. # Based on # http://www.amiryan.org/2009/11/04/virtualbox-init-d-service-autostart-script... # # By Richard Bos <rbos at opensuse dot org> - May 2010 ### BEGIN INIT INFO # Provides: vboxes # Required-Start: $network vboxdrv $ALL # Required-Stop: $network $named # Default-Start: 3 5 # Default-Stop: 0 1 2 3 4 5 6 # Short-Description: Autostart Virtual Box VMs # Description: Autostart Virtual Box VMs that are mentioned in /etc/sysconfig/vbox file ### END INIT INFO # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v be verbose in local rc status and clear it afterwards # rc_status -v -r ditto and clear both the local and overall rc status # rc_status -s display "skipped" and exit with status 3 # rc_status -u display "unused" and exit with status 3 # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear both the local and overall rc status # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks . /etc/rc.status # Reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - user had insufficient privileges # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signaling is not supported) are # considered a success. VBOXMGR_BIN=/usr/lib/virtualbox/VBoxManage if [[ ! -x $VBOXMGR_BIN ]]; then echo "$VBOXMGR_BIN does not exist" if [ "$1" = "stop" ]; then exit 0; else exit 6 fi; fi VBOXHeadLess_BIN=/usr/lib/virtualbox/VBoxHeadless if [[ ! -x $VBOXHeadLess_BIN ]]; then echo "$VBOXHeadLess_BIN does not exist" if [ "$1" = "start" ]; then exit 6; else exit 0 fi; fi PRG=$(basename $0) SERVICE="Virtualbox machines" [ -r /etc/sysconfig/vbox ] && . /etc/sysconfig/vbox start() { N=1 for VBOX in $VBOX_AUTOSTART; do if grep -q \; <<< "$VBOX"; then VBOX_NAME[$N]=$(cut -d\; -f1 <<< "$VBOX") VBOX_USER[$N]=$(cut -d\; -f2 <<< "$VBOX") else VBOX_NAME[$N]="$VBOX" VBOX_USER[$N]="" fi N=$(($N+1)) done VBOXES=${#VBOX_NAME[*]} if [ $VBOXES -eq 0 ]; then # The virtual machines have to be configured in /etc/sysconfig/vbox echo -n "Starting $SERVICE: no virtual machines configured" rc_status -u else N=1 echo -n "Starting $SERVICE: " while [[ $N -le $VBOXES ]]; do if [[ $N -lt $VBOXES ]]; then echo -n "${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]}), " else echo "${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]})" fi N=$(($N+1)) done N=1 while [[ $N -le $VBOXES ]]; do if [[ -n "${VBOX_USER[$N]}" ]]; then if grep --quiet --word-regexp ${VBOX_USER[$N]} /etc/passwd; then # The tag "Name:" occurs in multiple sections. Require at least 7 blanks # with an additional flexible amount of spaces. At the moment of writing # 13 spaces are needed. VBOX_RUNNING=$(su ${VBOX_USER[$N]} -c "VBoxManage list --long runningvms" | sed -n 's/^Name:[[:blank:]]\{7\} *//p' | grep -w "${VBOX_NAME[$N]}") if [[ -z "$VBOX_RUNNING" ]]; then VBOX_PRESENT=$(su ${VBOX_USER[$N]} -c "$VBOXMGR_BIN list --long vms" | sed -n 's/^Name:[[:blank:]]\{7\} *//p' | grep -w "${VBOX_NAME[$N]}") if [[ -n "$VBOX_PRESENT" ]]; then # VBoxManage startvm does not result in a VM with working networking # su ${VBOX_USER[$N]} -c "$VBOXMGR_BIN -q startvm "${VBOX_NAME[$N]}" -type headless" > /tmp/$PRG.$$ 2>&1 # Start virtualbox in Headless mode su ${VBOX_USER[$N]} -c "$VBOXHeadLess_BIN --startvm "${VBOX_NAME[$N]}"" > /tmp/$PRG.$$ 2>&1 & RETVAL=$? if [[ $RETVAL == 0 ]]; then echo -n " Starting virtual machine: ${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]})" rc_status -v -r else echo -n " Starting virtual machine: ${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]}) failed with the following output: " rc_failed; rc_status -v -r # Give the VBOXHeadLess_BIN some time to write the output file sleep 2 cat /tmp/$PRG.$$ fi rm /tmp/$PRG.$$ else echo -n " Virtual machine: ${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]}) does not exist" rc_status -s -r fi else echo -n " Virtual machine: ${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]}) is already running" rc_status -v -r fi else echo -n " Virtual machine: ${VBOX_NAME[$N]}, VBOX_USER: ${VBOX_USER[$N]} does not exist" rc_status -s -r fi else echo -n " Virtual machine: ${VBOX_NAME[$N]}: VBOX_USER not configured" rc_status -s -r fi N=$(($N+1)) done fi } stop() { for VBOX in $VBOX_AUTOSTART; do if grep -q \; <<< "$VBOX"; then VBOX_USER=$(cut -d\; -f2 <<< "$VBOX") # Only add the user to the list, if not present yet if ! grep -qw "$VBOX_USER" <<< "$VBOX_USERS"; then VBOX_USERS="$VBOX_USERS $VBOX_USER" fi fi done N=1 for VBOX_USER in $VBOX_USERS; do VBOX_RUNNING=$(su $VBOX_USER -c "$VBOXMGR_BIN list --long runningvms" | sed -n 's/^Name:[[:blank:]]\{7\} *//p') for VBOX in $VBOX_RUNNING; do VBOX_NAME[$N]="$VBOX" VBOX_USER[$N]="$VBOX_USER" N=$(($N+1)) done done VBOXES=${#VBOX_NAME[*]} if [[ $VBOXES -eq 0 ]]; then echo -n "Shutting down $SERVICE: no virtual machines running." rc_status -s -r else echo -n "Shutting down $SERVICE: " N=1 while [[ $N -le $VBOXES ]]; do if [[ $N -lt $VBOXES ]]; then echo -n "${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]}), " else echo "${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]})" fi N=$(($N+1)) done N=1 while [[ $N -le $VBOXES ]]; do echo -n " ${VBOX_NAME[$N]}: " su ${VBOX_USER[$N]} -c "$VBOXMGR_BIN -q controlvm "${VBOX_NAME[$N]}" savestate" RETVAL=$? echo -n " Shutting down virtual machine: ${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]})" if [[ $RETVAL == $? ]]; then rc_status -v -r else rc_failed; rc_status -v -r fi N=$(($N+1)) done fi } status() { for VBOX in $VBOX_AUTOSTART; do if grep -q \; <<< "$VBOX"; then VBOX_USER=$(cut -d\; -f2 <<< "$VBOX") # Only add the user to the list, if not present yet if ! grep -qw "$VBOX_USER" <<< "$VBOX_USERS"; then VBOX_USERS="$VBOX_USERS $VBOX_USER" fi fi done N=1 for VBOX_USER in $VBOX_USERS; do # The tag "Name:" occurs in multiple sections. Require at least 7 blanks # with an additional flexible amount of spaces. At the moment of writing # 13 spaces are needed. VBOX_RUNNING=$(su $VBOX_USER -c "$VBOXMGR_BIN list --long runningvms" | sed -n 's/^Name:[[:blank:]]\{7\} *//p') for VBOX in $VBOX_RUNNING; do VBOX_NAME[$N]="$VBOX" VBOX_USER[$N]="$VBOX_USER" N=$(($N+1)) done done VBOXES=${#VBOX_NAME[*]} if [[ $VBOXES -eq 0 ]]; then echo -n "$SERVICE: no virtual machines running." rc_status -s -r else N=1 while [[ $N -le $VBOXES ]]; do # The long sed line changes the output from: # running (since 2010-04-25T14:51:57.373000000) # to: # running (since 2010-04-25 14:51:57) # STATE=$(su ${VBOX_USER[$N]} -c "$VBOXMGR_BIN showvminfo "${VBOX_NAME[$N]}"" | sed -n 's/State: *//p' | sed 's/\([0-9][0-9]\)\.[0-9]\{9\}/\1/;s/\([0-9][0-9]\)T\([0-9][0-9]\)/\1 \2/') printf " %-56s %s" "${VBOX_NAME[$N]} (user: ${VBOX_USER[$N]}):" "$STATE" rc_status -v N=$(($N+1)) done fi } case "$1" in start) start ;; stop) stop ;; restart|force-reload) stop start ;; status) status ;; *) echo "Usage: $PRG {start|stop|restart|force-reload|status}" >&2 exit 3 ;; esac ++++++ virtualbox-wrapper.sh ++++++ #!/bin/bash export QT_NO_KDE_INTEGRATION=1 /usr/bin/id -nG | grep -v -e "root" -e "vboxusers" >/dev/null && /usr/lib/virtualbox/VBoxPermissionMessage && exit LD_LIBRARY_PATH="/usr/lib/virtualbox${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" /usr/lib/virtualbox/VirtualBox $@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org