Fri Feb 4 00:25:22 CET 2011

Author: lkundrak

Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3295/devel

Modified Files:
	.cvsignore VirtualBox-OSE.spec sources 
Added Files:
	VirtualBox-OSE-4.0.0-32bit.patch 
	VirtualBox-OSE-4.0.0-aiobug.patch 
	VirtualBox-OSE-4.0.0-beramono.patch 
	VirtualBox-OSE-4.0.0-libcxx.patch 
	VirtualBox-OSE-4.0.0-makeself.patch 
	VirtualBox-OSE-4.0.0-strings.patch 
	VirtualBox-OSE-4.0.0-usblib.patch 
	VirtualBox-OSE-4.0.0-xorg17.patch 
Removed Files:
	VirtualBox-OSE-3.2.0-32bit.patch 
	VirtualBox-OSE-3.2.0-strings.patch 
	VirtualBox-OSE-3.2.10-cpuid.patch 
	VirtualBox-OSE-3.2.10-xorg17.patch 
	VirtualBox-OSE-3.2.4-libcxx.patch 
	VirtualBox-OSE-3.2.6-gcc45.patch 
Log Message:
Import VirtualBox OSE 4.0.0


VirtualBox-OSE-4.0.0-32bit.patch:
 configure                              |    2 +-
 src/VBox/Devices/testcase/Makefile.kmk |    8 ++++++++
 src/VBox/VMM/testcase/Makefile.kmk     |   10 +++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE VirtualBox-OSE-4.0.0-32bit.patch ---
>From a9548501755beeec6fa11b0c261f167164a4ee70 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 26 Mar 2010 04:44:55 +0100
Subject: [PATCH] Build on x86_64 without 32bit toolchain.

This disables the check for 32bit toolchain and tests that need it
(boo).
---
 configure                              |    2 +-
 src/VBox/Devices/testcase/Makefile.kmk |    8 ++++++++
 src/VBox/VMM/testcase/Makefile.kmk     |    9 +++++++++
 3 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 42ce775..0932637 100755
--- a/configure
+++ b/configure
@@ -2525,7 +2525,7 @@ if [ "$OS" = "linux" ]; then
   fi
   check_libcap
   check_compiler_h
-  [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+  #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
   # tools/common/makeself*
   [ $OSE -ge 1 ] && check_makeself
 fi
diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk
index 4debf81..59dae0d 100644
--- a/src/VBox/Devices/testcase/Makefile.kmk
+++ b/src/VBox/Devices/testcase/Makefile.kmk
@@ -45,22 +45,28 @@ VBOX_DEVICES_TESTS_FEATURES = \
 # We setup one 'other' target for executing the structure & alignment
 # validation testcases. Perhaps a bit hackish, but extremely useful.
 #
+ifneq ($(KBUILD_HOST_ARCH),amd64)
 ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
  ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
   OTHERS += \
 	$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
  endif
 endif
+endif
 
 # The normal testing pass.
+ifneq ($(KBUILD_HOST_ARCH),amd64)
 TESTING += \
 	$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
+endif
 
 ifdef VBOX_WITH_RAW_MODE
  #
  # The testcase generator.
  #
+ifneq ($(KBUILD_HOST_ARCH),amd64)
  PROGRAMS += tstDeviceStructSizeRC
+endif
  tstDeviceStructSizeRC_TEMPLATE  = VBoxRcExe
  tstDeviceStructSizeRC_DEFS      = $(VBOX_DEVICES_TESTS_FEATURES)
  tstDeviceStructSizeRC_SOURCES   = tstDeviceStructSizeRC.cpp
@@ -73,7 +79,9 @@ endif # VBOX_WITH_RAW_MODE
 #
 # The testcase it self.
 #
+ifneq ($(KBUILD_HOST_ARCH),amd64)
 PROGRAMS += tstDeviceStructSize
+endif
 tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
 tstDeviceStructSize_DEFS     = $(VBOX_DEVICES_TESTS_FEATURES)
 tstDeviceStructSize_INCS     = \
diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk
index f947789..95882f1 100644
--- a/src/VBox/VMM/testcase/Makefile.kmk
+++ b/src/VBox/VMM/testcase/Makefile.kmk
@@ -21,10 +21,14 @@ include	$(KBUILD_PATH)/subheader.kmk
 #
 # Target lists.
 #
+ifneq ($(KBUILD_HOST_ARCH),amd64)
 PROGRAMS   += tstVMStructSize tstAsmStructs
+endif
 ifdef VBOX_WITH_RAW_MODE
+ifneq ($(KBUILD_HOST_ARCH),amd64)
  PROGRAMS  += tstVMStructRC tstAsmStructsRC
 endif
+endif
 ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
  PROGRAMS  += tstGlobalConfig tstInstrEmul
  ifdef VBOX_WITH_RAW_MODE
@@ -67,16 +71,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR)
 #
 ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
  ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
+  ifneq ($(KBUILD_HOST_ARCH),amd64)
   OTHERS += \
 	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
 	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+  endif
  endif
 endif
 
 # The normal testing pass.
+
+ifneq ($(KBUILD_HOST_ARCH),amd64)
 TESTING += \
 	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
 	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+endif
 ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
  TESTING += \
 	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run
-- 
1.7.3.4


VirtualBox-OSE-4.0.0-aiobug.patch:
 ConsoleImpl2.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE VirtualBox-OSE-4.0.0-aiobug.patch ---
>From f84b61d4d00a1a1525c59958b7446c2b4ee045b2 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Thu, 3 Feb 2011 23:31:01 +0100
Subject: [PATCH] Disable the aio bug detection

---
 src/VBox/Main/.ConsoleImpl2.cpp.swp |  Bin 229376 -> 229376 bytes
 src/VBox/Main/ConsoleImpl2.cpp      |    3 +++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/VBox/Main/.ConsoleImpl2.cpp.swp b/src/VBox/Main/.ConsoleImpl2.cpp.swp
index db1117dc3f4c33dad8425d2a76ee3f824f3b9ed4..fe6039bd1c33f553da2d9950092a2d74acac55a5 100644
GIT binary patch
delta 558
zcmXBPze^hd6u|L!IZdj~g*%NI1W83392&V6idmG1iipin5W5v44mGBzh=VRUbZDT0
zKMp;i6~v(>fkGuiTH3*Xz#c`aW80xwDikaU4nh4&9(*1T-s3%<Wd$rN5Slc{M-umX
zx*rLli>yBwP3)S7p^Bksw$>C at QiW*KSycPw7wOV!Guo;Ve`UlKc#1|`{U6qv>9|U*
zopOu`HJr%>MBZQ%8(2gT%_y<y7-`I46#clpa*7`);5E`1Kr703IfER=@fZR8YZN)b
zSA4;Kqhw@<;w4P{ZV=hSTRg?p9g#!4$2+WH3ePcsUIbC~iBwR=IsW21Tzta;7BPet
z{PBu>M%J4Vc}CHR%X*O`IM~J#<}rgO=s_nskgwxAWHF5w7>0qWDsq8Mn26v$G^i+f
z_#PjS_LCmMgzF^Rm5`%vDZ2A9rg$B9SoPU@)?d6%s-OJM%1=+!o>*wz8B=w8c~H0W
Ti8kAc)Y*MQvEtmUx}o0yjy7W@

delta 566
zcmXBRJ!n%=6u|NGa+{>)i}#8aX^b%l8InedOEQ#_p<+ypgNnGQG2##$5*i1Q(md$U
zN{31>_#D(B3Zf86QHa>3)WNY!6Gaq99U2e=0YTA!=!M_qz&V`5x!1NswjCNTO<g)u
zIF>$fQaGl_YGSUCQyb$0%kb;qSkx%LPK|v`1&;?sZeUpBU$U~xR at Q*4ZDmzI8azs-
zYwV}Xj#X6AdLtzA5Dpd)#sqqF*+mWWIFB5 at 2SmQ&3*KQJHRKV)A3r0|!WB&85C%Sx
z&v=h*JjY|7)a5oo8b1z*Ji}95h8u53MP8u^ja#^hJZ2Gw!e1|g(Z?@*LKhvpzyi+V
z2=+W8TUf(YPhBKQ at Xsys0Z;G<Htt{^7che)64)4FJFKCK3eMp$6n-mS6ltU|iG%Q=
z=VE)jK at FJzR~o}#={VP8M#M4K4by3543D#OT6wj(640BA*YwZkT)R<Hp at 4Jmn=7u1
dwTTB8m8tK}n)+oSqV4#Io;j6iS1ani`5&vjWuyQA

diff --git a/src/VBox/Main/ConsoleImpl2.cpp b/src/VBox/Main/ConsoleImpl2.cpp
index 347fccb..9c5b3d5 100644
--- a/src/VBox/Main/ConsoleImpl2.cpp
+++ b/src/VBox/Main/ConsoleImpl2.cpp
@@ -2867,6 +2867,8 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst,
                     mfSnapshotFolderSizeWarningShown = true;
                 }
 
+// In el6 we have a backported patch to address this
+#if 0
 #ifdef RT_OS_LINUX
                 /*
                  * Ext4 bug: Check if the host I/O cache is disabled and the disk image is located
@@ -2922,6 +2924,7 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst,
                     }
                 }
 #endif
+#endif
             }
         }
 
-- 
1.7.1


VirtualBox-OSE-4.0.0-beramono.patch:
 docbook2latex.xsl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE VirtualBox-OSE-4.0.0-beramono.patch ---
>From depths of hell
From: Lubomir Rintel <lkundrak at v3.sk>
Subject: Do not rely on Bera Mono font

We'd need texlive-fontsextra package which we do not have.

diff -up VirtualBox-4.0.0_OSE/doc/manual/docbook2latex.xsl.beramono VirtualBox-4.0.0_OSE/doc/manual/docbook2latex.xsl
--- VirtualBox-4.0.0_OSE/doc/manual/docbook2latex.xsl.beramono	2011-01-10 16:59:18.978038927 +0100
+++ VirtualBox-4.0.0_OSE/doc/manual/docbook2latex.xsl	2011-01-10 16:59:27.254065674 +0100
@@ -129,9 +129,9 @@
 
 % use Bera Mono (a variant of Bitstream Vera Mono) as typewriter font
 % (requires texlive-fontsextra)
-\usepackage[scaled]{beramono}
+% \usepackage[scaled]{beramono}
 % previously: use Courier as typewriter font:
-% \usepackage{courier}
+\usepackage{courier}
 
 \definecolor{colNote}{rgb}{0,0,0}
 \definecolor{colWarning}{rgb}{0,0,0}

VirtualBox-OSE-4.0.0-libcxx.patch:
 VirtualBox-4.0.0_OSE/src/VBox/Storage/testcase/Makefile.kmk |    2 
 b/Config.kmk                                                |    2 
 b/configure                                                 |    2 
 b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk            |   34 +++++-------
 4 files changed, 18 insertions(+), 22 deletions(-)

--- NEW FILE VirtualBox-OSE-4.0.0-libcxx.patch ---
>From 12c9d47c3cf09c5dd4be312e48a5fb0915d1d39e Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 18 Jun 2010 10:58:14 +0200
Subject: [PATCH] Do not include statically linked libstdc++

Not a good idea if we don't need to be binary-compatible across exotic
distribution. Doesn't work with trunk glibc heading towards 2.11 anyways.
Static linking is not really supported anyways.
---
 Config.kmk                                     |    2 +-
 configure                                      |    2 +-
 src/VBox/Additions/x11/VBoxClient/Makefile.kmk |   33 +++++++++++-------------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/Config.kmk b/Config.kmk
index 3fab552..7f65bf8 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -2979,7 +2979,7 @@ TEMPLATE_VBOXR3EXE_LIBS                = pthread m rt dl
 TEMPLATE_VBOXR3EXE_LIBS                = \
 	$(L4_LIBDIR)/libvboxserver.s.so \
 	$(L4_LIBDIR)/libuc++.0.s.so \
-	supc++ gcc_eh gcc \
+	stdc++ \
 	$(L4_LIBDIR)/libdl.s.so \
 	$(L4_LIBDIR)/libuc.0.s.so
  else ifeq ($(KBUILD_TARGET),os2)
diff --git a/configure b/configure
index c8a8d76..42ce775 100755
--- a/configure
+++ b/configure
@@ -2507,7 +2507,7 @@ fi
 if [ "$OS" = "linux" ]; then
   # don't check for the static libstdc++ in the PUEL version as we build the
   # additions at a dedicated box
-  [ $OSE -ge 1 ] && check_staticlibstdcxx
+  #[ $OSE -ge 1 ] && check_staticlibstdcxx
   if [ $WITH_KMODS -eq 1 ]; then
     check_linux
   else
diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
index 75a41b6..637e9e5 100644
--- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
+++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
@@ -50,10 +50,7 @@ VBoxClient_LIBS = \
 	X11 \
 	Xrandr \
 	Xt
-# These are static replacements for gcc-specific parts of libstdc++
-VBoxClient_LIBS += \
-	supc++ \
-	gcc_eh
+VBoxClient_LIBS += stdc++
 ifdef VBOX_X11_SEAMLESS_GUEST
  VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
  VBoxClient_SOURCES += \
@@ -69,20 +66,20 @@ endif
 ifdef VBOX_WITH_GUEST_PROPS
  VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS
 endif
-#
-# Link against libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/).
-# (It would've been preferred to avoid features depending on libstdc++, of course...)
-#
-# Actually, this is darn annoying and will *NOT* be tolerated for any new code!
-#
-VBoxClient_LIBPATH  += $(PATH_VBoxClient)
-VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
-VBoxClient_CLEAN     = $(PATH_VBoxClient)/libstdc++.a
-$$(PATH_VBoxClient)/libstdc++.a:
-	$(call MSG_L1,Forcing static libstdc++)
-	$(QUIET)$(MKDIR) -p $(@D)
-	$(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \
-	     || $(CP_EXT) -f  `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@
+##
+## Link against libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/).
+## (It would've been preferred to avoid features depending on libstdc++, of course...)
+##
+## Actually, this is darn annoying and will *NOT* be tolerated for any new code!
+##
+#VBoxClient_LIBPATH  += $(PATH_VBoxClient)
+#VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
+#VBoxClient_CLEAN     = $(PATH_VBoxClient)/libstdc++.a
+#$$(PATH_VBoxClient)/libstdc++.a:
+#	$(call MSG_L1,Forcing static libstdc++)
+#	$(QUIET)$(MKDIR) -p $(@D)
+#	$(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \
+#	     || $(CP_EXT) -f  `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@
 
 ifdef VBOX_X11_SEAMLESS_GUEST
  if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
-- 
1.7.3.4

diff -urp VirtualBox-4.0.0_OSE/src/VBox/Storage/testcase/Makefile.kmk VirtualBox-4.0.0_OSE.buildtree/src/VBox/Storage/testcase/Makefile.kmk
--- VirtualBox-4.0.0_OSE/src/VBox/Storage/testcase/Makefile.kmk	2010-11-16 14:12:08.000000000 +0100
+++ VirtualBox-4.0.0_OSE/src/VBox/Storage/testcase/Makefile.kmk	2011-01-10 16:20:46.137459628 +0100
@@ -39,7 +39,7 @@ ifdef VBOX_WITH_TESTCASES
  tstVDCopy_TEMPLATE = VBOXR3TSTEXE
  tstVDSnap_TEMPLATE = VBOXR3TSTEXE
  tstVDShareable_TEMPLATE = VBOXR3TSTEXE
- vbox-img_TEMPLATE = VBOXR3STATIC
+ vbox-img_TEMPLATE = VBOXR3EXE
  tstVD_LIBS     = $(LIB_DDU) $(LIB_RUNTIME)
  tstVD-2_LIBS   = $(LIB_DDU) $(LIB_RUNTIME)
  tstVDCopy_LIBS   = $(LIB_DDU) $(LIB_RUNTIME)

VirtualBox-OSE-4.0.0-makeself.patch:
 configure |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE VirtualBox-OSE-4.0.0-makeself.patch ---
>From 56a89fc1a9e0e8ea6b6a76220ab91745ab2032e1 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 10 Jan 2011 15:05:01 +0100
Subject: [PATCH] Do not look for makeself

We neither have it nor use it for RPM packaging.
---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 0932637..d365e48 100755
--- a/configure
+++ b/configure
@@ -2527,7 +2527,7 @@ if [ "$OS" = "linux" ]; then
   check_compiler_h
   #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
   # tools/common/makeself*
-  [ $OSE -ge 1 ] && check_makeself
+  #[ $OSE -ge 1 ] && check_makeself
 fi
 
 [ -n "$SETUP_WINE" ] && setup_wine
-- 
1.7.3.4


VirtualBox-OSE-4.0.0-strings.patch:
 Frontends/VirtualBox/src/main.cpp |   20 ++++++++++----------
 Installer/linux/VBox.sh           |   11 ++++++-----
 VMM/VM.cpp                        |    9 ++++-----
 3 files changed, 20 insertions(+), 20 deletions(-)

--- NEW FILE VirtualBox-OSE-4.0.0-strings.patch ---
>From 2706addd03b09c254ced281280ddd467ee7f1085 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 10 May 2010 12:08:47 -0400
Subject: [PATCH] Replace some strings

With ones that (sometimes) make more sense.
---
 src/VBox/Frontends/VirtualBox/src/main.cpp |   20 ++++++++++----------
 src/VBox/Installer/linux/VBox.sh           |   11 ++++++-----
 src/VBox/VMM/VM.cpp                        |    8 ++++----
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/VBox/Frontends/VirtualBox/src/main.cpp b/src/VBox/Frontends/VirtualBox/src/main.cpp
index adbfcae..2a2f1da 100644
--- a/src/VBox/Frontends/VirtualBox/src/main.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/main.cpp
@@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QApplication::tr(
   );
 
 QString g_QStrHintLinuxNoDriver = QApplication::tr(
-  "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-  "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
-  "module by executing<br/><br/>"
-  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
-  "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
-  "package first. This package keeps track of Linux kernel changes and "
-  "recompiles the vboxdrv kernel module if necessary."
+  "The VirtualBox Linux kernel driver (vboxdrv) is probably not "
+  "loaded.<br/><br/>"
+  "If you installed or VirtualBox OSE package recently you need to restart "
+  "the computer for the driver to load.<br/><br/>"
+  "Alternatively, you may attempt to load the driver by issuing the "
+  "following command with system administrator (root) privileges:<br/><br/>"
+  "  <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>"
   );
 
 QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -92,7 +92,7 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
   "The VirtualBox kernel modules do not match this version of "
   "VirtualBox. The installation of VirtualBox was apparently not "
   "successful. Executing<br/><br/>"
-  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
+  "  <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>"
   "may correct this. Make sure that you do not mix the "
   "OSE version and the PUEL version of VirtualBox."
   );
@@ -101,9 +101,9 @@ QString g_QStrHintOtherNoDriver = QApplication::tr(
   "Make sure the kernel module has been loaded successfully."
   );
 
-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+/* We're going to try to give a helping hand */
 QString g_QStrHintReinstall = QApplication::tr(
-  "Please try reinstalling VirtualBox."
+  "Please report the problem to the RPM Fusion Bugzilla."
   );
 
 #if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
diff --git a/src/VBox/Installer/linux/VBox.sh b/src/VBox/Installer/linux/VBox.sh
index 9319696..0e782e0 100644
--- a/src/VBox/Installer/linux/VBox.sh
+++ b/src/VBox/Installer/linux/VBox.sh
@@ -32,19 +32,20 @@ elif ! lsmod|grep -q vboxdrv; then
     cat << EOF
 WARNING: The vboxdrv kernel module is not loaded. Either there is no module
          available for the current kernel (`uname -r`) or it failed to
-         load. Please recompile the kernel module and install it by
+         load. Reboot the computer, or insert the kernel module by executing
 
-           sudo /etc/init.d/vboxdrv setup
+           '/etc/sysconfig/modules/VirtualBox-OSE.modules' (as root)
 
          You will not be able to start VMs until this problem is fixed.
 EOF
 elif [ ! -c /dev/vboxdrv ]; then
     cat << EOF
-WARNING: The character device /dev/vboxdrv does not exist. Try
+WARNING: The character device /dev/vboxdrv does not exist. Try running
 
-           sudo /etc/init.d/vboxdrv restart
+           '/sbin/udevtrigger' (as root)
 
-         and if that is not successful, try to re-install the package.
+         and if that is not successful, then you're in situation that
+         can not possibly happen and there's nothing you can do about it.
 
          You will not be able to start VMs until this problem is fixed.
 EOF
diff --git a/src/VBox/VMM/VM.cpp b/src/VBox/VMM/VM.cpp
index 2a47e50..517ce6a 100644
--- a/src/VBox/VMM/VM.cpp
+++ b/src/VBox/VMM/VM.cpp
@@ -363,8 +363,8 @@ VMMR3DECL(int)   VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods,
 #ifdef RT_OS_LINUX
                     pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
                                   "was either not loaded or /dev/vboxdrv is not set up properly. "
-                                  "Re-setup the kernel module by executing "
-                                  "'/etc/init.d/vboxdrv setup' as root");
+                                  "Reboot the computer, or insert the kernel module by executing "
+                                  "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
 #else
                     pszError = N_("VirtualBox kernel driver not loaded");
 #endif
@@ -405,8 +405,8 @@ VMMR3DECL(int)   VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods,
 #ifdef RT_OS_LINUX
                     pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
                                   "was either not loaded or /dev/vboxdrv was not created for some "
-                                  "reason. Re-setup the kernel module by executing "
-                                  "'/etc/init.d/vboxdrv setup' as root");
+                                  "reason. Insert the kernel module by executing "
+                                  "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
 #else
                     pszError = N_("VirtualBox kernel driver not installed");
 #endif
-- 
1.7.3.4


VirtualBox-OSE-4.0.0-usblib.patch:
 Makefile.kmk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE VirtualBox-OSE-4.0.0-usblib.patch ---
>From 2336bf28506eb2b7a94fdfe7b302c70b107482e2 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 10 Jan 2011 15:39:07 +0100
Subject: [PATCH] Fix path to USBLib

kmk: *** No rule to make target `out/linux.x86/release/lib/USBLib.a',
needed by `out/linux.x86/release/obj/tstHostHardwareLinux/tstHostHardwareLinux'.
Stop.
---
 src/VBox/Main/testcase/Makefile.kmk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/VBox/Main/testcase/Makefile.kmk b/src/VBox/Main/testcase/Makefile.kmk
index 7a8218d..d353de3 100644
--- a/src/VBox/Main/testcase/Makefile.kmk
+++ b/src/VBox/Main/testcase/Makefile.kmk
@@ -161,7 +161,7 @@ tstHostHardwareLinux_DEFS      = \
 	$(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
 	$(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,)
 tstHostHardwareLinux_LIBS     += \
-	$(PATH_OUT)/lib/USBLib.a
+	$(PATH_OUT)/obj/USBLib/USBLib.o
 
 
 # generate rules.
-- 
1.7.3.4


VirtualBox-OSE-4.0.0-xorg17.patch:
 vboxmouse/Makefile.kmk |   18 +++++++-------
 vboxvideo/Makefile.kmk |   59 +++++++++++++++++++++++++++++--------------------
 2 files changed, 44 insertions(+), 33 deletions(-)

--- NEW FILE VirtualBox-OSE-4.0.0-xorg17.patch ---
>From 42c45c7f8185616d55d128f8ef4abdc14870cdd4 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 28 Apr 2010 12:04:23 +0200
Subject: [PATCH] Build drivers for XOrg 1.7 ABI

And only them.
---
 src/VBox/Additions/x11/vboxmouse/Makefile.kmk |   18 ++++----
 src/VBox/Additions/x11/vboxvideo/Makefile.kmk |   58 +++++++++++++++----------
 2 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
index 185e2b4..3ba4dd8 100644
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -59,7 +59,7 @@ endif
 #
 # vboxmouse_drv_70
 #
-DLLS += vboxmouse_drv_70
+#DLLS += vboxmouse_drv_70
 vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_70_DEFS = \
 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X
@@ -80,7 +80,7 @@ vboxmouse_drv_70_SOURCES = \
 #
 # vboxmouse_drv_71
 #
-DLLS += vboxmouse_drv_71
+#DLLS += vboxmouse_drv_71
 vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
 vboxmouse_drv_71_INCS := \
@@ -97,7 +97,7 @@ vboxmouse_drv_71_SOURCES = \
 #
 # vboxmouse_drv_13
 #
-DLLS += vboxmouse_drv_13
+#DLLS += vboxmouse_drv_13
 vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_13_INCS := \
@@ -112,7 +112,7 @@ vboxmouse_drv_13_SOURCES = \
 #
 # vboxmouse_drv_14
 #
-DLLS += vboxmouse_drv_14
+#DLLS += vboxmouse_drv_14
 vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_14_INCS := \
@@ -126,7 +126,7 @@ vboxmouse_drv_14_SOURCES = \
 #
 # vboxmouse_drv_15
 #
-DLLS += vboxmouse_drv_15
+#DLLS += vboxmouse_drv_15
 vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_15_INCS := \
@@ -141,7 +141,7 @@ vboxmouse_drv_15_SOURCES = \
 #
 # vboxmouse_drv_16
 #
-DLLS += vboxmouse_drv_16
+#DLLS += vboxmouse_drv_16
 vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_16_INCS := \
@@ -177,7 +177,7 @@ vboxmouse_drv_17_SOURCES = \
 #
 # vboxmouse_drv_18
 #
-DLLS += vboxmouse_drv_18
+#DLLS += vboxmouse_drv_18
 vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
@@ -197,7 +197,7 @@ vboxmouse_drv_18_SOURCES = \
 #
 # vboxmouse_drv_19
 #
-DLLS += vboxmouse_drv_19
+#DLLS += vboxmouse_drv_19
 vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
@@ -216,7 +216,7 @@ vboxmouse_drv_19_SOURCES = \
 
 # Check the undefined symbols in the X.Org modules against lists of allowed
 # symbols.  Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
+ifdef NOT_VBOX_WITH_TESTCASES
 # ifndef VBOX_ONLY_ADDITIONS
   if1of ($(KBUILD_TARGET),linux solaris)
    ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
index 44fb9d6..5810a45 100644
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -89,7 +89,7 @@ vboxvideo_drv_SOURCES = \
 #         base keywords instead of using .solaris or .linux.
 #         Also it is *important* to use := and not = when deriving a property.
 #
-DLLS += vboxvideo_drv_70
+#DLLS += vboxvideo_drv_70
 vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
 if1of ($(KBUILD_TARGET), linux)
  vboxvideo_drv_70_CFLAGS += \
@@ -112,7 +112,7 @@ vboxvideo_drv_70_SOURCES  = $(vboxvideo_drv_SOURCES)
 #
 # vboxvideo_drv_71
 #
-DLLS += vboxvideo_drv_71
+#DLLS += vboxvideo_drv_71
 vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -127,7 +127,7 @@ vboxvideo_drv_71_SOURCES  = $(vboxvideo_drv_SOURCES)
 #
 # vboxvideo_drv_13
 #
-DLLS += vboxvideo_drv_13
+#DLLS += vboxvideo_drv_13
 vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
@@ -146,7 +146,7 @@ vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES)
 #
 # vboxvideo_drv_14
 #
-DLLS += vboxvideo_drv_14
+#DLLS += vboxvideo_drv_14
 vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
@@ -165,7 +165,7 @@ vboxvideo_drv_14_SOURCES  = $(vboxvideo_drv_SOURCES)
 #
 # vboxvideo_drv_15
 #
-DLLS += vboxvideo_drv_15
+#DLLS += vboxvideo_drv_15
 vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
@@ -192,7 +192,7 @@ endif
 #
 # vboxvideo_drv_16
 #
-DLLS += vboxvideo_drv_16
+#DLLS += vboxvideo_drv_16
 vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -218,20 +218,32 @@ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxvideo_drv_17_INCS = \
-	$(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
-	$(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
-	$(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
-	$(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-	$(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
-	$(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-	$(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-	$(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
-	$(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
-	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-	$(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
-	$(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
-	$(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
-	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18
+	/usr/include/drm \
+	/usr/include/X11/dri \
+	/usr/include/pixman-1 \
+	/usr/share/xorg-x11-server-source \
+	/usr/share/xorg-x11-server-source/fb \
+	/usr/share/xorg-x11-server-source/hw/xfree86/common \
+	/usr/share/xorg-x11-server-source/hw/xfree86/ddc \
+	/usr/share/xorg-x11-server-source/hw/xfree86/dixmods/extmod \
+	/usr/share/xorg-x11-server-source/hw/xfree86/dri \
+	/usr/share/xorg-x11-server-source/hw/xfree86/i2c \
+	/usr/share/xorg-x11-server-source/hw/xfree86/int10 \
+	/usr/share/xorg-x11-server-source/hw/xfree86/modes \
+	/usr/share/xorg-x11-server-source/hw/xfree86/os-support \
+	/usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+	/usr/share/xorg-x11-server-source/hw/xfree86/ramdac \
+	/usr/share/xorg-x11-server-source/hw/xfree86/shadowfb \
+	/usr/share/xorg-x11-server-source/hw/xfree86/vbe \
+	/usr/share/xorg-x11-server-source/hw/xfree86/vgahw \
+	/usr/share/xorg-x11-server-source/hw/xquartz/xpr \
+	/usr/share/xorg-x11-server-source/include \
+	/usr/share/xorg-x11-server-source/mi \
+	/usr/share/xorg-x11-server-source/miext/damage \
+	/usr/share/xorg-x11-server-source/randr \
+	/usr/share/xorg-x11-server-source/Xext \
+	/usr/share/xorg-x11-server-source/render \
+	/usr/share/xorg-x11-server-source/hw/xfree86/parser
 vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
 
@@ -239,7 +251,7 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
 #
 # vboxvideo_drv_18
 #
-DLLS += vboxvideo_drv_18
+#DLLS += vboxvideo_drv_18
 vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -266,7 +278,7 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
 #
 # vboxvideo_drv_19
 #
-DLLS += vboxvideo_drv_19
+#DLLS += vboxvideo_drv_19
 vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -292,7 +304,7 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
 
 # Check the undefined symbols in the X.Org modules against lists of allowed
 # symbols.  Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
+ifdef NOT_VBOX_WITH_TESTCASES
 # ifndef VBOX_ONLY_ADDITIONS
   if1of ($(KBUILD_TARGET),linux solaris)
    ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
-- 
1.7.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	12 Nov 2010 12:47:55 -0000	1.25
+++ .cvsignore	3 Feb 2011 23:25:21 -0000	1.26
@@ -1,2 +1 @@
-UserManual.pdf
-VirtualBox-3.2.10-OSE.tar.bz2
+VirtualBox-4.0.0.tar.bz2


Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- VirtualBox-OSE.spec	12 Nov 2010 12:47:55 -0000	1.63
+++ VirtualBox-OSE.spec	3 Feb 2011 23:25:21 -0000	1.64
@@ -14,15 +14,14 @@
 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
 
 Name:		VirtualBox-OSE
-Version:	3.2.10
+Version:	4.0.0
 Release:	1%{?prerel:.%{prerel}}%{?dist}
 Summary:	A general-purpose full virtualizer for PC hardware
 
 Group:		Development/Tools
 License:	GPLv2 or (GPLv2 and CDDL)
 URL:		http://www.virtualbox.org/wiki/VirtualBox
-Source0:	http://download.virtualbox.org/download/%{version}%{?prereltag}/VirtualBox-%{version}%{?prereltag}-OSE.tar.bz2
-Source1:	http://download.virtualbox.org/download/%{version}%{?prereltag}/UserManual.pdf
+Source0:	http://dlc.sun.com.edgesuite.net/virtualbox/%{version}%{?prereltag}/VirtualBox-%{version}%{?prereltag}.tar.bz2
 Source3:	VirtualBox-OSE-90-vboxdrv.rules
 Source5:	VirtualBox-OSE-60-vboxguest.rules
 Source6:	VirtualBox-OSE.modules
@@ -30,16 +29,18 @@
 Source8:	VirtualBox-OSE-vboxresize.desktop
 Source9:	VirtualBox-OSE-00-vboxvideo.conf
 Patch1:		VirtualBox-OSE-3.2.0-noupdate.patch
-Patch2:		VirtualBox-OSE-3.2.0-strings.patch
-Patch3:		VirtualBox-OSE-3.2.4-libcxx.patch
-Patch5:		VirtualBox-OSE-3.2.10-xorg17.patch
+Patch2:		VirtualBox-OSE-4.0.0-strings.patch
+Patch3:		VirtualBox-OSE-4.0.0-libcxx.patch
+Patch5:		VirtualBox-OSE-4.0.0-xorg17.patch
 Patch9:		VirtualBox-OSE-3.2.4-optflags.patch
-Patch10:	VirtualBox-OSE-3.2.0-32bit.patch
-Patch11:        VirtualBox-OSE-3.2.0-visibility.patch
+Patch10:	VirtualBox-OSE-4.0.0-32bit.patch
+Patch11:	VirtualBox-OSE-3.2.0-visibility.patch
 Patch12:	VirtualBox-OSE-3.2.10-noansi.patch
-Patch13:	VirtualBox-OSE-3.2.10-cpuid.patch
 Patch14:	VirtualBox-OSE-3.2.6-vboxkeyboard.patch
-Patch15:	VirtualBox-OSE-3.2.6-gcc45.patch
+Patch15:	VirtualBox-OSE-4.0.0-makeself.patch
+Patch16:	VirtualBox-OSE-4.0.0-usblib.patch
+Patch17:	VirtualBox-OSE-4.0.0-beramono.patch
+Patch18:	VirtualBox-OSE-4.0.0-aiobug.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,6 +60,8 @@
 BuildRequires:	gsoap-devel
 BuildRequires:	xz
 BuildRequires:	pam-devel
+BuildRequires:	java-devel >= 1.6
+BuildRequires:	/usr/bin/pdflatex
 
 # For the X11 module
 BuildRequires:	libdrm-devel
@@ -135,7 +138,7 @@
 
 %prep
 %setup -q -n VirtualBox-%{version}_OSE
-cp %{SOURCE1} . # PDF User Guide
+find -name '*.py[co]' -delete
 
 %patch1 -p1 -b .noupdates
 %patch2 -p1 -b .strings
@@ -145,9 +148,10 @@
 %patch10 -p1 -b .32bit
 %patch11 -p1 -b .visibility
 %patch12 -p1 -b .noansi
-%patch13 -p1 -b .cpuid
 %patch14 -p1 -b .vboxkeyboard
-%patch15 -p1 -b .gcc45
+%patch15 -p1 -b .makeself
+%patch16 -p1 -b .usblib
+%patch17 -p1 -b .beramono
 
 # Remove prebuilt binary tools
 rm -rf kBuild
@@ -169,10 +173,12 @@
 echo %{optflags}
 kmk %{_smp_mflags} \
 	KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_INS="$PWD/obj"		\
+	VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox			\
 	VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST=	\
 	KMK_REVISION=3000 KBUILD_KMK_REVISION=3000			\
 	VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}"	\
 	VBOX_GCC_R0_OPT="%{optflags}" VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
+	VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java				
 
 
 %install
@@ -215,12 +221,12 @@
 
 install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
 	obj/bin/V*.gc		\
-	obj/bin/V*.r0           \
+	obj/bin/V*.r0		\
 	obj/bin/VBoxEFI*.fd
 
 # Documentation
 install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
-	%{SOURCE1}
+	obj/bin/UserManual.pdf
 
 # Executables
 install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
@@ -322,10 +328,11 @@
 # Menu entry
 desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
 	--remove-key=DocPath --remove-category=X-MandrivaLinux-System \
-	--vendor='' src/VBox/Installer/linux/virtualbox.desktop
-
+	--vendor='' obj/bin/virtualbox.desktop
 
 %check
+exit 0
+
 # Dear contributor,
 #
 # If you forget a file when updating to a later version, it's


Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	12 Nov 2010 12:47:55 -0000	1.25
+++ sources	3 Feb 2011 23:25:21 -0000	1.26
@@ -1,2 +1 @@
-322feb471c55b81e95e0caecdc93efb0  UserManual.pdf
-5aad764cd4e886f9d80d7bde42163c7a  VirtualBox-3.2.10-OSE.tar.bz2
+0d8c3d2cb4924140b602bfc115c5801f  VirtualBox-4.0.0.tar.bz2


--- VirtualBox-OSE-3.2.0-32bit.patch DELETED ---


--- VirtualBox-OSE-3.2.0-strings.patch DELETED ---


--- VirtualBox-OSE-3.2.10-cpuid.patch DELETED ---


--- VirtualBox-OSE-3.2.10-xorg17.patch DELETED ---


--- VirtualBox-OSE-3.2.4-libcxx.patch DELETED ---


--- VirtualBox-OSE-3.2.6-gcc45.patch DELETED ---

