Hello community,
here is the log from the commit of package virtualbox-ose for openSUSE:Factory
checked in at Fri Nov 20 14:14:47 CET 2009.
--------
--- virtualbox-ose/virtualbox-ose.changes 2009-11-05 13:38:32.000000000 +0100
+++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes 2009-11-18 12:54:41.000000000 +0100
@@ -1,0 +2,47 @@
+Thu Nov 12 21:24:52 UTC 2009 - mseben@novell.com
+
+- updated to 3.1.0_BETA1
+ -major new features:
+ * Teleportation (aka live migration); migrate a live VM session from one machine to another
+ * VM states can now be restored from arbitrary snapshots instead of only the last one, and new snapshots can be taken from other snapshots as well (aka branched snapshots)
+ * 2D video acceleration for Windows guests; use the host video hardware for overlay stretching and colour conversion
+ * The network attachment type can be changed while a VM is running
+ * Experimental USB support for OpenSolaris hosts making use of the latest USB enhancements in Solaris Nevada 124 and higher.
+ * Significant performance improvements for PAE and AMD64 guests (VT-x and AMD-V only; normal (non-nested) paging)
+ * Experimental support for EFI (Extended Firmware Interface)
+ * VirtIO network device support
+ -fixed and/or added:
+ * VMM: reduced IO-APIC overhead for 32 bits Windows NT/2000/XP/2003 guests; requires 64 bits support (VT-x only; bug #4392)
+ * VMM: fixed double timer interrupt delivery on old Linux kernels using IO-APIC (caused guest time to run at double speed; bug #3135)
+ * VMM: reinit VT-x and AMD-V after host suspend or hibernate; some BIOSes forget this (Windows hosts only; bug #5421)
+ * GUI: prevent starting a VM with a single mouse click (bug #2676)
+ * 3D support: major performance improvement in VBO processing
+ * 3D support: added GL_EXT_framebuffer_object, GL_EXT_compiled_vertex_array support
+ * 3D support: fix crashes in FarCry, SecondLife, Call of Duty, Unreal Tournament, Eve Online (bugs #2801, #2791)
+ * 3D support: fix graphics corruption in World of Warcraft (#2816)
+ * iSCSI: support iSCSI targets with more than 2TiB capacity
+ * VRDP: fixed occasional VRDP server crash (bug #5424)
+ * Network: fixed the E1000 emulation for QNX (and probably other) guests (bug #3206)
+ * Network: even if the virtual network cable was disconnected, some guests were able to send / receive packets (E1000; bug #5366)
+ * Network: even if the virtual network cable was disconnected, the PCNet card received some spurious packets which might confuse the guest (bug #4496)
+ * VMDK: fixed handling of split image variants
+ * VHD: fixed incompatibility with Hyper-V
+ * OVF: create manifest files on export and verify the content of an optional manifest file on import
+ * X11 based hosts: allow the user to specify their own scan code layout (bug #2302)
+ * Mac OS X hosts: don't auto show the menu and dock in fullscreen (#bug 4866)
+ * Solaris hosts: combined the kernel interface package into the VirtualBox main package
+ * Solaris hosts: support for OpenSolaris Boomer architecture (with OSS audio backend).
+ * Shared folders: fixed changing case of file names (bug #2520)
+ * Shared folders: VBOXSVR is visible in Network folder (bug #4842)
+ * Windows and Linux Additions: added balloon tip notifier if VirtualBox host version was updated and Additions are out of date
+ * Solaris Additions: fixed as_pagelock() failed errors affecting guest properties (bug #5337)
+ * Windows Additions: added automatic logon support for Windows Vista and Windows 7
+ * Windows Additions: fix crash in seamless mode (contributed by Huihong Luo)
+ * Linux Additions: added support for uninstalling the Linux Guest Additions (bug #4039)
+ * SDK: added object-oriented web service bindings for PHP5
+
+- refresh patches to apply with fuzz=0 (new rpm)
+- added fix_return.diff : fix no-return-in-nonvoid-function build issue
+- removed deprecated : kmp-vboxvfs.diff and gcc43-fixes.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
vbox-kmp-vboxvfs.diff
VirtualBox-3.0.10-OSE-patched.tar.bz2
virtualbox-gcc43-fixes.diff
New:
----
vbox-fix_return.diff
VirtualBox-3.1.0_BETA1_OSE-patched.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox-ose.spec ++++++
--- /var/tmp/diff_new_pack.xqjLv0/_old 2009-11-20 14:12:25.000000000 +0100
+++ /var/tmp/diff_new_pack.xqjLv0/_new 2009-11-20 14:12:25.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package virtualbox-ose (Version 3.0.10)
+# spec file for package virtualbox-ose (Version 3.0.90.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -36,9 +36,6 @@
BuildRequires: bin86 dev86 libidl-devel libqt4-devel libxslt-devel yasm
BuildRequires: SDL-devel kernel-syms module-init-tools
BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-desktop-files
-%if %suse_version <= 1030
-BuildRequires: compat-libstdc++
-%endif
BuildRequires: hal-devel pulseaudio-devel xorg-x11-devel
BuildRequires: kbuild udev
# is needed only as owner of xorg/modules directory
@@ -47,22 +44,18 @@
BuildRequires: gcc-32bit hal-32bit
BuildRequires: xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit xorg-x11-libs-32bit
BuildRequires: libgcc-32bit xorg-x11-libXext-devel-32bit xorg-x11-libXmu-devel-32bit
-%if %suse_version == 1030
-BuildRequires: libstdc++42-devel-32bit
-%endif
-%if %suse_version > 1030
%if %suse_version > 1110
BuildRequires: libstdc++44-devel-32bit
%else
BuildRequires: libstdc++43-devel-32bit
%endif
-%endif
# ifarch
%endif
#
ExclusiveArch: %ix86 x86_64
-Version: 3.0.10
+Version: 3.0.90.1
Release: 1
+%define version_label 3.1.0
Summary: VirtualBox OSE is an Emulator
License: GPL v2 or later
Group: System/Emulators/PC
@@ -70,7 +63,7 @@
#
# WARNING: This is not a comment, but the real command to repack souce:
#%(sh %{_sourcedir}/virtualbox-patch-source VirtualBox-%{version}_OSE.tar.bz2)
-Source0: VirtualBox-%version-OSE-patched.tar.bz2
+Source0: VirtualBox-%{version_label}_BETA1_OSE-patched.tar.bz2
Source2: 60-vboxdrv.rules
Source3: README.SUSE
Source4: virtualbox.desktop
@@ -83,9 +76,7 @@
Source99: virtualbox-patch-source
#
Patch0: vbox-futex.diff
-Patch3: vbox-kmp-vboxvfs.diff
Patch4: %{name}-init-scripts.diff
-Patch6: virtualbox-gcc43-fixes.diff
Patch9: virtualbox-system-yasm.diff
Patch10: vbox-2.6.25.diff
Patch14: vbox-kbuild_unit_paths.diff
@@ -95,8 +86,8 @@
#PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is.displayed, when user
#try to start VirtualBox and is not memeber of vboxusers group
Patch19: virtualbox-ose-permissions_warning.diff
-#PATCH-FIX-UPSTREAM fix build issues with kernel 2.6.32 - missing DEBUG_HASH and DEBUG_HASH2 defines
-Patch20: vbox-debug_hash.diff
+#PATCH-FIX-UPSTREAM fix no-return-in-nonvoid-function build issue (fix already in upstream svn)
+Patch20: vbox-fix_return.diff
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils permissions
@@ -169,16 +160,14 @@
innotek GmbH
%prep
-%setup -q -n VirtualBox-%{version}_OSE
+%setup -q -n VirtualBox-3.1.0_OSE
%ifarch amd64 x86_64 ia32e em64t
# this patch0 is taken from mandriva (i just adapt it to fit
# to the latest virtualbox-ose package)
# http://cvs.mandriva.com/cgi-bin/viewvc.cgi/contrib-SPECS/virtualbox/VirtualB...
%patch0
-%patch3
%endif
%patch4
-%patch6
%patch9
%patch10 -p1
%patch14
@@ -188,7 +177,7 @@
%patch18
%endif
%patch19
-%patch20
+%patch20 -p1
%__cp %{SOURCE7} .
%build
@@ -212,9 +201,9 @@
for mod in out/linux.*/release/bin/src/vboxdrv \
out/linux.*/release/bin/src/vboxnetflt \
out/linux.*/release/bin/src/vboxnetadp \
- out/linux.*/release/bin/additions/src/vboxadd \
+ out/linux.*/release/bin/additions/src/vboxguest \
out/linux.*/release/bin/additions/src/vboxvfs \
- out/linux.*/release/bin/additions/src/vboxvideo_drm
+ out/linux.*/release/bin/additions/src/vboxvideo
do
pushd $mod
%__mkdir obj
@@ -230,7 +219,7 @@
# see linux/Documentation/kbuild/modules.txt section 7.3
test $(basename $mod) = "vboxnetflt" && %__cp ../vboxdrv/obj/$flavor/Module.symvers obj/$flavor
test $(basename $mod) = "vboxnetadp" && %__cp ../vboxdrv/obj/$flavor/Module.symvers obj/$flavor
- test $(basename $mod) = "vboxvfs" && %__cp ../vboxadd/obj/$flavor/Module.symvers obj/$flavor
+ test $(basename $mod) = "vboxvfs" && %__cp ../vboxguest/obj/$flavor/Module.symvers obj/$flavor
%__make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \
M=$PWD/obj/$flavor xPWD=$(pwd) xARCH=%{_target_cpu}
done
@@ -246,9 +235,9 @@
for mod in out/linux.*/release/bin/src/vboxdrv \
out/linux.*/release/bin/src/vboxnetflt \
out/linux.*/release/bin/src/vboxnetadp \
- out/linux.*/release/bin/additions/src/vboxadd \
+ out/linux.*/release/bin/additions/src/vboxguest \
out/linux.*/release/bin/additions/src/vboxvfs \
- out/linux.*/release/bin/additions/src/vboxvideo_drm
+ out/linux.*/release/bin/additions/src/vboxvideo
do
pushd $mod
for flavor in %flavors_to_build; do
@@ -273,13 +262,8 @@
%__install -m 755 vboxmouse_drv_14.so %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%__install -m 755 vboxvideo_drv_14.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%else
- %if %suse_version > 1030
%__install -m 755 vboxmouse_drv_13.so %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%__install -m 755 vboxvideo_drv_13.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
- %else
- %__install -m 755 vboxmouse_drv_71.so %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
- %__install -m 755 vboxvideo_drv_71.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
- %endif
%endif
%endif
%endif
@@ -296,7 +280,7 @@
%__install -d -m 755 %{buildroot}%{_bindir}
%__install -d -m 755 %{buildroot}/sbin
%__install -m 755 VBoxClient %{buildroot}%{_bindir}
-%__install -m 755 mountvboxsf %{buildroot}/sbin/mount.vboxsf
+%__install -m 755 mount.vboxsf %{buildroot}/sbin/mount.vboxsf
popd
pushd src/VBox/Additions/linux/installer
%__install -m 744 vboxadd.sh %{buildroot}%{_sysconfdir}/init.d/vboxadd
++++++ vbox-fix_return.diff ++++++
Index: VirtualBox-3.1.0_OSE/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c
===================================================================
--- VirtualBox-3.1.0_OSE.orig/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c
+++ VirtualBox-3.1.0_OSE/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c
@@ -813,5 +813,7 @@ DECLEXPORT(GLenum) STATE_APIENTRY crStat
}
if (pFBO) pFBO->status = status;
+
+ return status;
}
#endif
++++++ vbox-futex.diff ++++++
--- /var/tmp/diff_new_pack.xqjLv0/_old 2009-11-20 14:12:26.000000000 +0100
+++ /var/tmp/diff_new_pack.xqjLv0/_new 2009-11-20 14:12:26.000000000 +0100
@@ -1,7 +1,7 @@
--- src/VBox/Runtime/r3/linux/semevent-linux.cpp.old 2008-05-04 02:20:12.000000000 +0200
+++ src/VBox/Runtime/r3/linux/semevent-linux.cpp 2008-05-04 02:20:31.000000000 +0200
-@@ -77,7 +77,7 @@ struct RTSEMEVENTINTERNAL
- static long sys_futex(int32_t volatile *uaddr, int op, int val, struct timespec *utime, int32_t *uaddr2, int val3)
+@@ -95,7 +95,7 @@ struct RTSEMEVENTINTERNAL
+ static long sys_futex(uint32_t volatile *uaddr, int op, int val, struct timespec *utime, int32_t *uaddr2, int val3)
{
errno = 0;
- long rc = syscall(__NR_futex, uaddr, op, val, utime, uaddr2, val3);
++++++ vbox-kbuild_unit_paths.diff ++++++
--- /var/tmp/diff_new_pack.xqjLv0/_old 2009-11-20 14:12:26.000000000 +0100
+++ /var/tmp/diff_new_pack.xqjLv0/_new 2009-11-20 14:12:26.000000000 +0100
@@ -2,9 +2,9 @@
================================================================================
--- Config.kmk
+++ Config.kmk
-@@ -37,6 +37,9 @@
- ## @todo checked and dbgopt
- KBUILD_BLD_TYPES = release profile debug kprofile
+@@ -66,6 +66,9 @@ PROPS_DLLS_ACCUMULATE_L += INTERMED
+ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES
+ PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES
+# path to the units
+KBUILD_UNIT_PATHS = $(PWD)/kBuild/units
++++++ virtualbox-ose-disable-updates.diff ++++++
--- /var/tmp/diff_new_pack.xqjLv0/_old 2009-11-20 14:12:26.000000000 +0100
+++ /var/tmp/diff_new_pack.xqjLv0/_new 2009-11-20 14:12:26.000000000 +0100
@@ -1,16 +1,15 @@
Index: src/VBox/Frontends/VirtualBox/src/VBoxGLSettingsUpdate.cpp
===================================================================
---- src/VBox/Frontends/VirtualBox/src/VBoxGLSettingsUpdate.cpp.orig
-+++ src/VBox/Frontends/VirtualBox/src/VBoxGLSettingsUpdate.cpp
-@@ -46,7 +46,7 @@ void VBoxGLSettingsUpdate::getFrom (cons
- VBoxUpdateData data (vboxGlobal().virtualBox().
- GetExtraData (VBoxDefs::GUI_UpdateDate));
+@@ -45,7 +45,8 @@ void VBoxGLSettingsUpdate::getFrom (cons
+ {
+ VBoxUpdateData data (vboxGlobal().virtualBox().GetExtraData (VBoxDefs::GUI_UpdateDate));
-- mCbCheck->setChecked (!data.isNeverCheck());
+- mCbCheck->setChecked (!data.isNoNeedToCheck());
+ mCbCheck->setChecked (false);
++
if (mCbCheck->isChecked())
- mCbOncePer->setCurrentIndex (data.index());
- mTxDate->setText (data.date());
+ {
+ mCbOncePer->setCurrentIndex (data.periodIndex());
Index: src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
===================================================================
--- src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp.orig
++++++ virtualbox-ose-init-scripts.diff ++++++
--- /var/tmp/diff_new_pack.xqjLv0/_old 2009-11-20 14:12:26.000000000 +0100
+++ /var/tmp/diff_new_pack.xqjLv0/_new 2009-11-20 14:12:26.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- src/VBox/Additions/linux/installer/vboxadd.sh.orig
+++ src/VBox/Additions/linux/installer/vboxadd.sh
-@@ -28,14 +28,9 @@
+@@ -30,15 +30,9 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Description: VirtualBox Linux Additions kernel modules
@@ -10,7 +10,8 @@
### END INIT INFO
-PATH=$PATH:/bin:/sbin:/usr/sbin
--BUILDVBOXADD=`/bin/ls /usr/src/vboxadd*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
+-PACKAGE=VBoxGuestAdditions
+-BUILDVBOXGUEST=`/bin/ls /usr/src/vboxguest*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
-BUILDVBOXVFS=`/bin/ls /usr/src/vboxvfs*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
-BUILDVBOXVIDEO=`/bin/ls /usr/src/vboxvideo*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
-LOG="/var/log/vboxadd-install.log"
@@ -18,36 +19,36 @@
if [ -f /etc/arch-release ]; then
system=arch
elif [ -f /etc/redhat-release ]; then
-@@ -143,8 +138,6 @@
+@@ -146,8 +140,6 @@ fi
- dev=/dev/vboxadd
+ dev=/dev/vboxguest
userdev=/dev/vboxuser
-owner=vboxadd
-group=1
fail()
{
-@@ -204,12 +197,6 @@
+@@ -207,12 +199,6 @@ start()
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 vboxadd 2>/dev/null
+- rmmod vboxguest 2>/dev/null
- fail "Cannot change owner $owner:$group for device $dev"
- }
if [ ! -c $userdev ]; then
maj=10
-@@ -220,28 +207,20 @@
- rmmod vboxadd 2>/dev/null
+@@ -223,28 +209,20 @@ start()
+ 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 vboxadd 2>/dev/null
+- rmmod vboxguest 2>/dev/null
- fail "Cannot change owner $owner:$group for device $userdev"
- }
fi
@@ -79,99 +80,121 @@
# Mount all shared folders from /etc/fstab. Normally this is done by some
# other startup script but this requires the vboxdrv kernel module loaded.
-@@ -254,14 +233,14 @@
- stop()
- {
- begin "Stopping VirtualBox Additions ";
-- if !umount -a -t vboxsf 2>/dev/null; then
-+ if ! umount -a -t vboxsf 2>/dev/null; then
+@@ -260,10 +238,8 @@ stop()
+ if ! umount -a -t vboxsf 2>/dev/null; then
fail "Cannot unmount vboxsf folders"
fi
- if [ -n "$BUILDVBOXVFS" ]; then
- if running_vboxvfs; then
-+
-+ if running_vboxvfs; then
- rmmod vboxvfs 2>/dev/null || fail "Cannot unload module vboxvfs"
+- rmmod vboxvfs 2>/dev/null || fail "Cannot unload module vboxvfs"
- fi
++ if running_vboxvfs; then
++ rmmod vboxvfs 2>/dev/null || fail "Cannot unload module vboxvfs"
fi
-+
- if running_vboxadd; then
- rmmod vboxadd 2>/dev/null || fail "Cannot unload module vboxadd"
- rm -f $userdev || fail "Cannot unlink $userdev"
-@@ -279,40 +258,10 @@
-
+ if running_vboxguest; then
+ rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest"
+@@ -283,100 +259,8 @@ restart()
+ # setup_script
setup()
{
- # don't stop the old modules here -- they might be in use
+- if find /lib/modules/`uname -r` -name "vboxvideo\.*" 2>/dev/null|grep -q vboxvideo; then
+- begin "Removing old VirtualBox vboxvideo kernel module"
+- find /lib/modules/`uname -r` -name "vboxvideo\.*" 2>/dev/null|xargs rm -f 2>/dev/null
+- succ_msg
+- fi
- if find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|grep -q vboxvfs; then
- begin "Removing old VirtualBox vboxvfs kernel module"
- find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
-- if find /lib/modules/`uname -r` -name "vboxadd\.*" 2>/dev/null|grep -q vboxadd; then
-- begin "Removing old VirtualBox vboxadd kernel module"
-- find /lib/modules/`uname -r` -name "vboxadd\.*" 2>/dev/null|xargs rm -f 2>/dev/null
+- if find /lib/modules/`uname -r` -name "vboxguest\.*" 2>/dev/null|grep -q vboxguest; then
+- begin "Removing old VirtualBox vboxguest kernel module"
+- find /lib/modules/`uname -r` -name "vboxguest\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
-- begin "Recompiling VirtualBox kernel modules"
-- if ! $BUILDVBOXADD \
-- --save-module-symvers /tmp/vboxadd-Module.symvers \
-- --no-print-directory install > $LOG 2>&1; then
+- begin "Building the VirtualBox Guest Additions kernel modules"
+- if ! sh /usr/share/$PACKAGE/test/build_in_tmp \
+- --no-dkms --no-print-directory > $LOG 2>&1; then
+- fail "`printf "Your system does not seem to be set up to build kernel modules.\nLook at $LOG to find out what went wrong"`"
+- fi
+- echo
+- if ! sh /usr/share/$PACKAGE/test_drm/build_in_tmp \
+- --no-dkms --no-print-directory >> $LOG 2>&1; then
+- printf "Your system does not seem to support OpenGL in the kernel (this requires\nLinux 2.6.27 or later). The OpenGL support will not be built.\n"
+- BUILDVBOXVIDEO=""
+- fi
+- begin "Building the main Guest Additions module"
+- if ! $BUILDVBOXGUEST \
+- --save-module-symvers /tmp/vboxguest-Module.symvers \
+- --no-print-directory install >> $LOG 2>&1; then
- fail "Look at $LOG to find out what went wrong"
- fi
++ begin_msg "Recompiling VirtualBox vboxvfs kernel module, NOT. It has been packaged."
+ succ_msg
- if [ -n "$BUILDVBOXVFS" ]; then
+- begin "Building the shared folder support module"
- if ! $BUILDVBOXVFS \
-- --use-module-symvers /tmp/vboxadd-Module.symvers \
+- --use-module-symvers /tmp/vboxguest-Module.symvers \
- --no-print-directory install >> $LOG 2>&1; then
- fail "Look at $LOG to find out what went wrong"
- fi
+- succ_msg
- fi
- if [ -n "$BUILDVBOXVIDEO" ]; then
+- begin "Building the OpenGL support module"
- if ! $BUILDVBOXVIDEO \
-- --use-module-symvers /tmp/vboxadd-Module.symvers \
+- --use-module-symvers /tmp/vboxguest-Module.symvers \
- --no-print-directory install >> $LOG 2>&1; then
- fail "Look at $LOG to find out what went wrong"
- fi
+- succ_msg
- fi
-+ # don't restart the module
-+ begin_msg "Recompiling VirtualBox vboxadd kernel module, NOT. It has been packaged."
-+ begin_msg "Recompiling VirtualBox vboxvfs kernel module, NOT. It has been packaged."
- succ_msg
-- start
+- depmod
+-
+- begin "Doing non-kernel setup of the Guest Additions"
+- echo "Creating user for the Guest Additions." >> $LOG
+- # This is the LSB version of useradd and should work on recent
+- # distributions
+- useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd >/dev/null 2>&1
+- # And for the others, we choose a UID ourselves
+- useradd -d /var/run/vboxadd -g 1 -u 501 -o -s /bin/false vboxadd >/dev/null 2>&1
+-
+- # Create udev description file
+- if [ -d /etc/udev/rules.d ]; then
+- echo "Creating udev rule for the Guest Additions kernel module." >> $LOG
+- udev_call=""
+- udev_app=`which udevadm 2> /dev/null`
+- if [ $? -eq 0 ]; then
+- udev_call="${udev_app} version 2> /dev/null"
+- else
+- udev_app=`which udevinfo 2> /dev/null`
+- if [ $? -eq 0 ]; then
+- udev_call="${udev_app} -V 2> /dev/null"
+- fi
+- fi
+- udev_fix="="
+- if [ "${udev_call}" != "" ]; then
+- udev_out=`${udev_call}`
+- udev_ver=`expr "$udev_out" : '[^0-9]*\([0-9]*\)'`
+- if [ "$udev_ver" = "" -o "$udev_ver" -lt 55 ]; then
+- udev_fix=""
+- fi
+- fi
+- ## @todo 60-vboxadd.rules -> 60-vboxguest.rules ?
+- echo "KERNEL=${udev_fix}\"vboxguest\", NAME=\"vboxguest\", OWNER=\"vboxadd\", MODE=\"0660\"" > /etc/udev/rules.d/60-vboxadd.rules
+- echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules
+- fi
+-
+- # Put mount.vboxsf in the right place
+- ln -sf /usr/lib/$PACKAGE/mount.vboxsf /sbin
+-
+- succ_msg
- echo
- echo "You should reboot your guest to make sure the new modules are actually used"
- }
-
-@@ -325,6 +274,16 @@
- fi
+- echo "You should reboot your guest to make sure the new modules are actually used"
}
-+reload()
-+{
-+ if [ "$system" = "suse" ]; then
-+ rc_failed 3
-+ rc_status -v
-+ else
-+ exit 3
-+ fi
-+}
-+
- case "$1" in
- start)
- start
-@@ -341,8 +300,11 @@
- status)
- dmnstatus
- ;;
-+reload)
-+ reload
-+ ;;
- *)
-- echo "Usage: $0 {start|stop|restart|status}"
-+ echo "Usage: $0 {start|stop|restart|status|reload}"
- exit 1
- esac
-
+ # cleanup_script
Index: src/VBox/Installer/linux/vboxdrv.sh.in
===================================================================
--- src/VBox/Installer/linux/vboxdrv.sh.in.orig
++++++ virtualbox-ose-permissions_warning.diff ++++++
--- /var/tmp/diff_new_pack.xqjLv0/_old 2009-11-20 14:12:26.000000000 +0100
+++ /var/tmp/diff_new_pack.xqjLv0/_new 2009-11-20 14:12:26.000000000 +0100
@@ -40,13 +40,13 @@
VirtualBox_SOURCES = \
src/main.cpp \
src/COMDefs.cpp \
-@@ -458,6 +467,8 @@ endif
+@@ -497,6 +497,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
+
- ifdef VBOX_WITH_VIDEOHWACCEL
+ if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
VirtualBox_QT_MODULES += OpenGL
endif
@@ -551,6 +562,8 @@ $$(PATH_VirtualBox)/VirtualBox-icon.rc:
++++++ virtualbox-ose-sudo-tmpdir.diff ++++++
--- /var/tmp/diff_new_pack.xqjLv0/_old 2009-11-20 14:12:26.000000000 +0100
+++ /var/tmp/diff_new_pack.xqjLv0/_new 2009-11-20 14:12:26.000000000 +0100
@@ -1,6 +1,6 @@
---- src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp
-+++ src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp
-@@ -44,6 +44,10 @@
+--- src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp 2009-03-13 11:38:20.000000000 +0100
++++ src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp 2009-11-13 08:35:49.000000000 +0100
+@@ -49,6 +49,10 @@
#include "prenv.h"
#include "plstr.h"
@@ -11,7 +11,7 @@
#if defined(XP_OS2) && !defined(XP_OS2_NATIVEIPC)
#ifdef VBOX
static const char kDefaultSocketPrefix[] = "\\socket\\vbox-";
-@@ -60,6 +64,16 @@
+@@ -65,6 +69,16 @@ static const char kDefaultSocketPrefix[]
static const char kDefaultSocketSuffix[] = "-ipc/ipcd";
#endif
@@ -28,9 +28,9 @@
void IPC_GetDefaultSocketPath(char *buf, PRUint32 bufLen)
{
const char *logName;
-@@ -71,12 +85,15 @@
-
- logName = PR_GetEnv("VBOX_IPC_SOCKETID");
+@@ -83,12 +97,15 @@ void IPC_GetDefaultSocketPath(char *buf,
+ }
+ #endif
if (!logName || !logName[0]) {
- logName = PR_GetEnv("LOGNAME");
- if (!logName || !logName[0]) {
++++++ virtualbox-system-yasm.diff ++++++
--- /var/tmp/diff_new_pack.xqjLv0/_old 2009-11-20 14:12:26.000000000 +0100
+++ /var/tmp/diff_new_pack.xqjLv0/_new 2009-11-20 14:12:26.000000000 +0100
@@ -1,8 +1,8 @@
--- Config.kmk
+++ Config.kmk
-@@ -1309,12 +1309,6 @@
- VBOX_PATH_WISUMINFO ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Samples/SysMgmt/Msi/Scripts/WiSumInf.vbs
- VBOX_PATH_DIFX ?= $(PATH_DEVTOOLS)/win.$(KBUILD_TARGET_ARCH)/DIFx/v2.1
+@@ -1387,12 +1390,6 @@ VBOX_PATH_DIFX ?= $(PATH_DEVTOOLS)/
+ VBOX_PATH_CABSDK ?= $(PATH_DEVTOOLS)/win.x86/cabsdk/r1
+ VBOX_PATH_MAKECAB ?= $(VBOX_PATH_CABSDK)/BIN/MAKECAB.EXE
-# We need to export YASM for OSE, but since it was converted to .zip we need to
-# allow for the location used by the zip to be properly cleaned up first.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org