1
0
forked from pool/virtualbox

Accepting request 58748 from Virtualization

Accepted submit request 58748 from user mseben

OBS-URL: https://build.opensuse.org/request/show/58748
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=9
This commit is contained in:
Lars Vogdt 2011-01-25 09:30:44 +00:00 committed by Git OBS Bridge
commit 7a98a63c97
10 changed files with 129 additions and 18 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -13,8 +13,8 @@
/* register this logger as the release logger */
RTLogRelSetDefaultInstance(pLogger);
--- src/VBox/Main/ConsoleImpl.cpp.orig
+++ src/VBox/Main/ConsoleImpl.cpp
--- src/VBox/Main/src-client/ConsoleImpl.cpp.orig
+++ src/VBox/Main/src-client/ConsoleImpl.cpp
@@ -5063,13 +5063,12 @@ HRESULT Console::consoleInitReleaseLog(c
char szTmp[256];
RTTimeSpecToString(RTTimeNow(&timeSpec), szTmp, sizeof(szTmp));
@ -31,8 +31,8 @@
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
--- 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
char szTmp[256];
RTTimeSpecToString(RTTimeNow(&timeSpec), szTmp, sizeof(szTmp));

View File

@ -86,3 +86,22 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
fi
if running_vboxguest; then
rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest"
@@ -464,16 +447,8 @@ extra_setup()
# setup_script
setup()
{
- setup_modules
- mod_succ="$?"
- extra_setup
- if [ "$mod_succ" -eq "0" ]; then
- if running_vboxguest || running_vboxadd; then
- printf "You should restart your guest to make sure the new modules are actually used\n\n"
- else
- start
- fi
- fi
+ begin "Recompiling VirtualBox kernel module, NOT. It has been packaged."
+ succ_msg
}
# cleanup_script

View File

@ -51,3 +51,53 @@ 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()
# setup_script
setup()
{
- stop
- begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
- $DODKMS uninstall > $LOG
- succ_msg
- 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
- succ_msg
- fi
- if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then
- begin_msg "Removing old VirtualBox netflt kernel module"
- find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
- if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
- begin_msg "Removing old VirtualBox kernel module"
- find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
- begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
- if ! $DODKMS install >> $LOG; then
- fail_msg "Failed, trying without DKMS"
- begin_msg "Recompiling VirtualBox kernel modules"
- if ! $BUILDVBOXDRV \
- --save-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
- if ! $BUILDVBOXNETFLT \
- --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
- if ! $BUILDVBOXNETADP \
- --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
+ begin_msg "Recompiling VirtualBox vboxadd kernel module, NOT. It has been packaged."
succ_msg
- start
}
dmnstatus()

View File

@ -1,3 +1,46 @@
-------------------------------------------------------------------
Wed Jan 19 13:49:49 UTC 2011 - mseben@gmail.com
- disable setup parameter for init scripts
-------------------------------------------------------------------
Wed Jan 19 07:32:14 UTC 2011 - mseben@gmail.com
- updated to VirtualBox 4.0.2
* GUI: don't crash if a removable host drive referenced from the VM settings vanished
* GUI: fixed a crash when using the KDE4 Oxygen theme and clicked on the settings button (4.0 regression; bug #7875)
* GUI: properly warn if the machine folder cannot be created (bug #8031)
* GUI: several fixes for multimonitor X11 guests
* ExtPack: dont make the installer helper application suid root (Linux .deb/.rpm packages only)
* ExtPack: improved user experience on Vista / Windows 7 when installing an extension pack
* ExtPack: fixed issue with non-ascii characters in the path name during installing an extension pack (bug #7917)
* ExtPack: fixed SELinux issues on 32-bit Linux hosts
* VBoxManage: Host-only interface creation and removal is now supported for all platforms except Solaris (bug #7741)
* VBoxManage: fixed segmentation fault when removing non-existent host-only interface
* Storage: fixed possible crashes with VMDK/VHD images with snapshots and async I/O (4.0 regression)
* Storage: dont eject the physical medium if a DVD/CDROM/floppy drive is detached from a VM (bug #5825)
* Storage: be more robust when a faulty guest sends ATA commands to an ATAPI device (bug #6597)
* Parallels: fixed deletion of the image during suspend, pause or power off (4.0 regression)
* Bridged networking: fixed host kernel panic when bridging to devices with no TX queue
* NAT: port-forwarding rule registration respects protocol parameter (bug #8094)
* E1000: fixed PXE boot issues with WDS (bug #6330)
* Virtio-net: fixed the issue with TX performance in some Linux guests
* ICH9: fixed VM crash (software virtualization only; bug #7885)
* VGA: fixed VESA screen issue (4.0 regression; bug #7986)
* Shared Folders: fixed parameter parsing when creating symbolic links, fixes 32-bit/64-bit bitness issue (bug #818)
* Main: fixed crash under rare circumstances due to an invalid logging string (4.0 regression)
* Main: improve error information propagation for errors preventing a VM start
* Main: fixed problems with snapshots and non-ASCII characters in machine paths (bug #8024)
* Webservice: now listens to localhost by default as documented (bug #6067)
* Settings: do not fail loading machine settings if removeable drive attachment
* Settings: fixed issue that changing a snapshot name or description was not saved to machine XML
* OVF/OVA: fixed import of files created by other OVF tools (bug #7983)
* rdesktop-vrdp: fix a crash during USB device enumeration (bug #7981)
* Linux hosts: fixed a crash during USB device enumeration.
* Linux hosts: try a bit harder to allocate memory (bug #8035; 4.0 regression)
* Guest Additions: fixed parsing of parameters for guest control in VBoxService (4.0 regression; bug #8010)
* Windows Guest Additions: automatic logon on Windows Vista/Windows 7 now supports unlocking previously locked workstations
-------------------------------------------------------------------
Fri Jan 14 21:58:00 UTC 2011 - mseben@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package virtualbox
# spec file for package virtualbox (Version 3.9.80)
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -32,7 +32,7 @@ BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-d
BuildRequires: hal-devel pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk
BuildRequires: LibVNCServer-devel gcc43-c++ kbuild pam-devel udev
%if %suse_version > 1110
BuildRequires: zlib-devel-static
BuildRequires: zlib-devel-static
%endif
%ifarch amd64 x86_64 ia32e em64t
BuildRequires: hal-32bit
@ -42,8 +42,8 @@ BuildRequires: gcc43-32bit libstdc++43-devel-32bit
%endif
#
ExclusiveArch: %ix86 x86_64
Version: 4.0.0
Release: 4
Version: 4.0.2
Release: 1
Summary: VirtualBox is an Emulator
License: GPLv2+
Group: System/Emulators/PC
@ -89,7 +89,7 @@ Patch99: vbox-permissions_warning.diff
Patch100: vbox-no-build-dates.diff
Patch101: vbox-default-os-type.diff
#disable update in vbox gui
Patch102: vbox-disable-updates.diff
Patch102: vbox-disable-updates.diff
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils permissions
@ -118,6 +118,7 @@ Provides: %{name}-ose:/usr/lib/virtualbox/VirtualBox.so
Provides: %{name}-ose-qt = %version
Obsoletes: %{name}-ose-qt < %version
%description qt
Qt GUI part for %{name}.
#########################################
@ -170,7 +171,6 @@ VirtualBox guest addition tools.
###########################################
%package -n python-%{name}
Summary: Python bindings for %{name}
Group: Development/Libraries/Python
Requires: %{name} = %{version}
@ -611,7 +611,6 @@ exit 0
%config %{_sysconfdir}/init.d/vboxadd
%{_sbindir}/rcvboxadd
#
%files -n python-%{name}
%defattr(-,root, root)
%dir %{_vbox_instdir}/sdk