Thu Sep 22 12:04:39 CEST 2011

Author: lkundrak

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

Modified Files:
	.cvsignore VirtualBox-OSE-90-vboxdrv.rules VirtualBox-OSE.spec 
	sources 
Added Files:
	VirtualBox-OSE-4.1.2-libcxx.patch 
	VirtualBox-OSE-4.1.2-noupdate.patch 
	VirtualBox-OSE-4.1.2-testmangle.patch 
	VirtualBox-OSE-4.1.2-usblib.patch 
	VirtualBox-OSE-4.1.2-vboxpci.patch vboxweb-service 
Removed Files:
	VirtualBox-OSE-3.2.0-noupdate.patch 
	VirtualBox-OSE-3.2.6-vboxkeyboard.patch 
	VirtualBox-OSE-4.0.0-usblib.patch 
	VirtualBox-OSE-4.0.2-gcc46.patch 
	VirtualBox-OSE-4.0.2-libcxx.patch 
Log Message:
Import 4.1.2


VirtualBox-OSE-4.1.2-libcxx.patch:
 Config.kmk                                                |    4 ++--
 configure                                                 |    2 +-
 src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk |    2 +-
 src/VBox/Additions/x11/VBoxClient/Makefile.kmk            |    5 +----
 src/VBox/Frontends/VirtualBox/Makefile.kmk                |    2 +-
 src/VBox/HostDrivers/Support/Makefile.kmk                 |    2 +-
 src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk              |   12 ++++++------
 src/VBox/HostDrivers/win/Makefile.kmk                     |    2 +-
 src/VBox/Installer/win/InstallHelper/Makefile.kmk         |    2 +-
 src/VBox/Installer/win/Resources/Makefile.kmk             |    2 +-
 src/VBox/Installer/win/Stub/Makefile.kmk                  |    2 +-
 src/VBox/Storage/testcase/Makefile.kmk                    |    2 +-
 src/libs/liblzf-3.4/Makefile.kmk                          |    2 +-
 src/libs/zlib-1.2.1/Makefile.kmk                          |    3 +--
 14 files changed, 20 insertions(+), 24 deletions(-)

--- NEW FILE VirtualBox-OSE-4.1.2-libcxx.patch ---
>From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 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 2/3] 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                                         |    4 ++--
 configure                                          |    2 +-
 .../WINNT/Graphics/Video/disp/Makefile.kmk         |    2 +-
 src/VBox/Additions/x11/VBoxClient/Makefile.kmk     |    5 +----
 src/VBox/Frontends/VirtualBox/Makefile.kmk         |    2 +-
 src/VBox/HostDrivers/Support/Makefile.kmk          |    2 +-
 src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk       |   12 ++++++------
 src/VBox/HostDrivers/win/Makefile.kmk              |    2 +-
 src/VBox/Installer/win/InstallHelper/Makefile.kmk  |    2 +-
 src/VBox/Installer/win/Resources/Makefile.kmk      |    2 +-
 src/VBox/Installer/win/Stub/Makefile.kmk           |    2 +-
 src/VBox/Storage/testcase/Makefile.kmk             |    2 +-
 src/libs/liblzf-3.4/Makefile.kmk                   |    2 +-
 src/libs/zlib-1.2.1/Makefile.kmk                   |    2 +-
 17 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/Config.kmk b/Config.kmk
index 0ea34d8..2ec388c 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -3163,7 +3163,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)
@@ -3311,7 +3311,7 @@ endif
 # Temporary: Renaming the template and warnings will be errors (soon).
 #
 TEMPLATE_VBoxR3Static               = New name for VBOXR3STATIC
-TEMPLATE_VBoxR3Static_EXTENDS       = VBOXR3STATIC
+TEMPLATE_VBoxR3Static_EXTENDS       = VBOXR3EXE
 TEMPLATE_VBoxR3Static_EXTENDS_BY    = appending
 ifeq ($(KBUILD_TARGET),win)
  TEMPLATE_VBoxR3Static_CFLAGS      += $(VBOX_VCC_WERR)
diff --git a/configure b/configure
index 987cf1b..75d556c 100755
--- a/configure
+++ b/configure
@@ -2582,7 +2582,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/WINNT/Graphics/Video/disp/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
index 52fb6d3..af7ba4b 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
@@ -160,7 +160,7 @@ endif #ifdef VBOX_WITH_WDDM
 
 ifdef VBOXVIDEOWINDBG
 DLLS += vbvdbg
-vbvdbg_TEMPLATE = VBOXR3STATIC
+vbvdbg_TEMPLATE = VBOXR3EXE
 vbvdbg_DEFS     = UNICODE _UNICODE
 vbvdbg_SOURCES  = \
 	wddm/dbg/VBoxVideoWinDbg.cpp \
diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
index ee73ed0..e359702 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 += \
diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk
index ed0163b..2ee8418 100644
--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
@@ -957,7 +957,7 @@ endif # darwin
 if defined(VBOX_WITH_VIDEOHWACCEL)
  if1of ($(KBUILD_TARGET), win linux freebsd)
   LIBRARIES += VBoxOGL2D
-  VBoxOGL2D_TEMPLATE = VBOXR3STATIC
+  VBoxOGL2D_TEMPLATE = VBOXR3EXE
   VBoxOGL2D_USES = qt4
   VBoxOGL2D_SDKS = QT4
   VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
diff --git a/src/VBox/HostDrivers/Support/Makefile.kmk b/src/VBox/HostDrivers/Support/Makefile.kmk
index bf77085..9d67f49 100644
--- a/src/VBox/HostDrivers/Support/Makefile.kmk
+++ b/src/VBox/HostDrivers/Support/Makefile.kmk
@@ -95,7 +95,7 @@ SUPR3_SOURCES       = \
 #
 # Static version of SUPR3.
 #
-SUPR3Static_TEMPLATE = VBOXR3STATIC
+SUPR3Static_TEMPLATE = VBOXR3EXE
 SUPR3Static_EXTENDS = SUPR3
 
 #
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
index a40f46d..e29273f 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
+++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
@@ -141,7 +141,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
  # WinNetConfig - static library with host network interface config API
  #
  LIBRARIES.win += WinNetConfig
- WinNetConfig_TEMPLATE = VBOXR3STATIC
+ WinNetConfig_TEMPLATE = VBOXR3EXE
  WinNetConfig_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE
  WinNetConfig_SDKS     = WINPSDK W2K3DDK
  WinNetConfig_SOURCES  = \
@@ -152,7 +152,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
  # NetFltInstall
  #
  PROGRAMS.win  += NetFltInstall
- NetFltInstall_TEMPLATE = VBOXR3STATIC
+ NetFltInstall_TEMPLATE = VBOXR3EXE
  NetFltInstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
  NetFltInstall_SOURCES  = win/tools/VBoxNetFltInstall.cpp
  NetFltInstall_LIBS     = \
@@ -166,7 +166,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
  # NetFltUninstall
  #
  PROGRAMS.win  += NetFltUninstall
- NetFltUninstall_TEMPLATE = VBOXR3STATIC
+ NetFltUninstall_TEMPLATE = VBOXR3EXE
  NetFltUninstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
  NetFltUninstall_SOURCES  = win/tools/VBoxNetFltUninstall.cpp
  NetFltUninstall_LIBS     = \
@@ -179,7 +179,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
  # NetAdpInstall
  #
  PROGRAMS.win  += NetAdpInstall
- NetAdpInstall_TEMPLATE = VBOXR3STATIC
+ NetAdpInstall_TEMPLATE = VBOXR3EXE
  NetAdpInstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
  NetAdpInstall_SOURCES  = win/tools/VBoxNetAdpInstall.cpp
  NetAdpInstall_LIBS     = \
@@ -193,7 +193,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
  # NetAdpUninstall
  #
  PROGRAMS.win  += NetAdpUninstall
- NetAdpUninstall_TEMPLATE = VBOXR3STATIC
+ NetAdpUninstall_TEMPLATE = VBOXR3EXE
  NetAdpUninstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
  NetAdpUninstall_SOURCES  = win/tools/VBoxNetAdpUninstall.cpp
  NetAdpUninstall_LIBS     = \
@@ -206,7 +206,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
  # VBoxNetFltNobj
  #
  DLLS.win += VBoxNetFltNobj
- VBoxNetFltNobj_TEMPLATE   = VBOXR3STATIC
+ VBoxNetFltNobj_TEMPLATE   = VBOXR3EXE
  if defined(VBOX_SIGNING_MODE)
   VBoxNetFltNobj_NOINST    = true
  endif
diff --git a/src/VBox/HostDrivers/win/Makefile.kmk b/src/VBox/HostDrivers/win/Makefile.kmk
index 19c15d5..6d2366f 100644
--- a/src/VBox/HostDrivers/win/Makefile.kmk
+++ b/src/VBox/HostDrivers/win/Makefile.kmk
@@ -19,7 +19,7 @@ SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
 
 LIBRARIES += VBoxDrvCfg
-VBoxDrvCfg_TEMPLATE       = VBOXR3STATIC
+VBoxDrvCfg_TEMPLATE       = VBOXR3EXE
 VBoxDrvCfg_SDKS           = WINPSDK W2K3DDK
 VBoxDrvCfg_DEFS           = _WIN32_WINNT=0x0501 _UNICODE UNICODE
 VBoxDrvCfg_SOURCES        = cfg/VBoxDrvCfg.cpp
diff --git a/src/VBox/Installer/win/InstallHelper/Makefile.kmk b/src/VBox/Installer/win/InstallHelper/Makefile.kmk
index 5271e49..aa18e57 100644
--- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk
+++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk
@@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../..
 include	$(KBUILD_PATH)/subheader.kmk
 
 DLLS += VBoxInstallHelper
-VBoxInstallHelper_TEMPLATE = VBOXR3STATIC
+VBoxInstallHelper_TEMPLATE = VBOXR3EXE
 VBoxInstallHelper_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE
 VBoxInstallHelper_DEFS    += VBOX_SVN_REV=$(VBOX_SVN_REV)
 VBoxInstallHelper_DEPS     = $(VBOX_SVN_REV_KMK)
diff --git a/src/VBox/Installer/win/Resources/Makefile.kmk b/src/VBox/Installer/win/Resources/Makefile.kmk
index 77ea1b7..5e58fdc 100644
--- a/src/VBox/Installer/win/Resources/Makefile.kmk
+++ b/src/VBox/Installer/win/Resources/Makefile.kmk
@@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../..
 include	$(KBUILD_PATH)/subheader.kmk
 
 DLLS += VBoxRes
-VBoxRes_TEMPLATE = VBOXR3STATIC
+VBoxRes_TEMPLATE = VBOXR3EXE
 VBoxRes_DEPS     = $(VBOX_SVN_REV_KMK)
 VBoxRes_SOURCES = \
 	dummy.cpp \
diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk
index a8f89eb..6cf55cc 100644
--- a/src/VBox/Installer/win/Stub/Makefile.kmk
+++ b/src/VBox/Installer/win/Stub/Makefile.kmk
@@ -22,7 +22,7 @@ include	$(KBUILD_PATH)/subheader.kmk
 if "$(KBUILD_TARGET_ARCH)" == "x86"
 
 TEMPLATE_VBOXSTUB = Drop the signing, we will sign it later.
-TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3STATIC
+TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3EXE
 TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE)
 
 PROGRAMS.x86 += VBoxStub
diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk
index f935b05..40f6bf2 100644
--- a/src/VBox/Storage/testcase/Makefile.kmk
+++ b/src/VBox/Storage/testcase/Makefile.kmk
@@ -68,7 +68,7 @@ ifdef VBOX_WITH_TESTCASES
  #
  # vbox-img - static because it migth be used as at standalone tool.
  #
- vbox-img_TEMPLATE = VBOXR3STATIC
+ vbox-img_TEMPLATE = VBOXR3EXE
  vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3
  vbox-img_SOURCES = \
 	vbox-img.cpp \
diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk
index 44088fa..0afe89a 100644
--- a/src/libs/liblzf-3.4/Makefile.kmk
+++ b/src/libs/liblzf-3.4/Makefile.kmk
@@ -33,7 +33,7 @@ VBox-liblzf_SOURCES = \
 	lzf_c.c \
 	lzf_d.c
 
-VBox-liblzf-static_TEMPLATE   = VBOXR3STATIC
+VBox-liblzf-static_TEMPLATE   = VBOXR3EXE
 VBox-liblzf-static_BLD_TYPE   = $(VBox-liblzf_BLD_TYPE)
 VBox-liblzf-static_DEFS       = $(VBox-liblzf_DEFS)
 VBox-liblzf-static_DEFS.x86   = $(VBox-liblzf_DEFS.x86)
diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk
index fde8b7c..405d354 100644
--- a/src/libs/zlib-1.2.1/Makefile.kmk
+++ b/src/libs/zlib-1.2.1/Makefile.kmk
@@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \
 	inftrees.c \
 	inffast.c
 
-VBox-zlib-static_TEMPLATE = VBOXR3STATIC
+VBox-zlib-static_TEMPLATE = VBOXR3EXE
 VBox-zlib-static_DEFS = $(VBox-zlib_DEFS)
 VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES)
 
-- 
1.7.1


VirtualBox-OSE-4.1.2-noupdate.patch:
 VBoxUpdateDlg.cpp |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE VirtualBox-OSE-4.1.2-noupdate.patch ---
>From a16880964c51ff647c94e6aaf83ec67f6d1aeca5 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 28 Apr 2010 11:53:40 +0200
Subject: [PATCH 2/2] Disable automatic check for updates

Our OS provides superior way of dealing with updates (PackageKit).
Let's not bug the user with updates that are not yet packaged.
---
 .../Frontends/VirtualBox/src/VBoxUpdateDlg.cpp     |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
index f135c26..cc8399b 100644
--- a/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
@@ -187,7 +187,12 @@ void VBoxUpdateData::decode()
         if (parser.size() > 1)
         {
             QDate date = QDate::fromString(parser[1], Qt::ISODate);
-            m_date = date.isValid() ? date : QDate::currentDate();
+            if (date.isValid()) {
+                m_date = date;
+            } else {
+                m_periodIndex = PeriodNever;
+            }
+
         }
 
         /* Parse 'branch' value: */
-- 
1.7.1


VirtualBox-OSE-4.1.2-testmangle.patch:
 Makefile.kmk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE VirtualBox-OSE-4.1.2-testmangle.patch ---
Disable a failing check.

diff -urp VirtualBox-4.1.2_OSE/src/VBox/Runtime/Makefile.kmk VirtualBox-4.1.2_OSE.fixed/src/VBox/Runtime/Makefile.kmk
--- VirtualBox-4.1.2_OSE/src/VBox/Runtime/Makefile.kmk	2011-08-15 14:28:32.000000000 +0200
+++ VirtualBox-4.1.2_OSE.fixed/src/VBox/Runtime/Makefile.kmk	2011-09-20 21:49:21.961684047 +0200
@@ -2268,7 +2268,7 @@ test-doxygen::
 #
 # Test mangling.
 #
-if1of ($(LIBRARIES),RuntimeR3 RuntimeR0 RuntimeR0Drv RuntimeRC)
+if1of (wololo,RuntimeR3 RuntimeR0 RuntimeR0Drv RuntimeRC)
  test-mangling:: $(IPRT_OUT_DIR)/mangling.run
  OTHERS      += $(IPRT_OUT_DIR)/mangling.run
  CLEANS      += $(IPRT_OUT_DIR)/mangling.run

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

--- NEW FILE VirtualBox-OSE-4.1.2-usblib.patch ---
>From 62776a195748d36f311bbbc3d7542e17a7cb4a86 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 3/3] 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 c6acdd1..1e593d6 100644
--- a/src/VBox/Main/testcase/Makefile.kmk
+++ b/src/VBox/Main/testcase/Makefile.kmk
@@ -183,7 +183,7 @@ tstUSBProxyLinux_DEFS      = \
 tstUSBProxyLinux_DEPS     = \
 	$(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 tstUSBProxyLinux_LIBS     += \
-	$(PATH_OUT)/lib/USBLib.a
+	$(PATH_OUT)/obj/USBLib/USBLib.o
 
 
 # generate rules.
-- 
1.7.1


VirtualBox-OSE-4.1.2-vboxpci.patch:
 Makefile.kmk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE VirtualBox-OSE-4.1.2-vboxpci.patch ---
>From d7f04987c6e52962a8c740d4d642b2bb1f33a41b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Tue, 20 Sep 2011 09:52:11 +0200
Subject: [PATCH 1/2] Fix a vboxpci compilation failure with vboxdrv disabled

Simply disable the compilation test.
---
 src/VBox/HostDrivers/VBoxPci/Makefile.kmk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/VBox/HostDrivers/VBoxPci/Makefile.kmk b/src/VBox/HostDrivers/VBoxPci/Makefile.kmk
index e13ac97..9091abf 100644
--- a/src/VBox/HostDrivers/VBoxPci/Makefile.kmk
+++ b/src/VBox/HostDrivers/VBoxPci/Makefile.kmk
@@ -18,6 +18,7 @@
 SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
 if1of ($(KBUILD_TARGET), linux)
+ifdef VBOX_WITH_VBOXDRV
 
  #
  # The driver.
@@ -41,6 +42,7 @@ if1of ($(KBUILD_TARGET), linux)
  VBoxPci_LIBS          += \
  	$(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
 
+endif
 
  #
  # Install the sources.
-- 
1.7.1



--- NEW FILE vboxweb-service ---
#! /bin/bash
#
# vboxweb-service: VirtualBox OSE Web Service init script.
#
# Author: Lubomir Rintel <lkundrak at v3.sk>
# 
# chkconfig: - 80 30
# description: VirtualBox OSE Web Services
# processname: vboxweb
# pidfile: /var/run/vboxweb-service.pid
#
### BEGIN INIT INFO
# Provides: vboxweb-service
# Required-Start: network
# Required-Stop:
# Default-Start:
# Default-Stop: 0 1 2 6
# Short-Description: VirtualBox OSE Web Service
# Description: VirtualBox OSE Web Services API
### END INIT INFO

SERVICE=vboxweb-service
PROCESS=vboxwebsrv
DAEMON=/usr/bin/$PROCESS
PIDFILE=/var/run/$SERVICE.pid

# Source function library.
. /etc/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Source service configuration.
[ -f /etc/sysconfig/$SERVICE ] && . /etc/sysconfig/$SERVICE

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

[ -x $DAEMON ] || exit 1

start ()
{
        echo -n $"Starting $SERVICE: "
	daemon $DAEMON --pidfile $PIDFILE --background $VBOXWEB_OPTS >/dev/null 2>&1
	# We suppressed nonessential output, so we need to reprint status msg
        RETVAL=$?
	if [ $RETVAL = 0 ]
	then
		success
		touch /var/lock/subsys/$SERVICE
	else
		failure
	fi
	echo
        return $RETVAL
}

stop ()
{
        echo -n $"Stopping $SERVICE:"
        killproc $PROCESS
	RETVAL=$?
        echo
        if [ $RETVAL -eq 0 ]
	then
        	rm -f /var/lock/subsys/$SERVICE
        	rm -f $PIDFILE
        fi
        return $RETVAL
}

restart ()
{
	stop && start
}

RETVAL=0
case "$1" in
start)
	start
	RETVAL=$?
	;;
stop)
	stop
	RETVAL=$?
	;;
restart)
	restart
	RETVAL=$?
	;;
reload)
	echo "$0 does not support configuration reloading, you have to restart it."
	RETVAL=1
	;;
status)
	status $PROCESS
	RETVAL=$?
	;;
*)
	echo $"Usage: $0 {start|stop|restart|reload|status}"
	RETVAL=1
esac

exit $RETVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	4 Apr 2011 06:59:28 -0000	1.28
+++ .cvsignore	22 Sep 2011 10:04:37 -0000	1.29
@@ -1 +1 @@
-VirtualBox-4.0.4.tar.bz2
+VirtualBox-4.1.2.tar.bz2


Index: VirtualBox-OSE-90-vboxdrv.rules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-90-vboxdrv.rules,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VirtualBox-OSE-90-vboxdrv.rules	22 Aug 2009 03:43:09 -0000	1.5
+++ VirtualBox-OSE-90-vboxdrv.rules	22 Sep 2011 10:04:38 -0000	1.6
@@ -1,2 +1,3 @@
-ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxdrv", OWNER="root", MODE="0666"
-ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxnetctl", OWNER="root", MODE="0666"
+ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxdrv", OWNER="root", MODE="0600"
+ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxnetctl", OWNER="root", MODE="0600"
+ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{bDeviceClass}!="09", GROUP="vboxusers", MODE="660", SYMLINK+="vboxusb/$env{BUSNUM}/$env{DEVNUM}"


Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- VirtualBox-OSE.spec	4 Apr 2011 06:59:28 -0000	1.69
+++ VirtualBox-OSE.spec	22 Sep 2011 10:04:38 -0000	1.70
@@ -14,7 +14,7 @@
 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
 
 Name:		VirtualBox-OSE
-Version:	4.0.4
+Version:	4.1.2
 Release:	1%{?prerel:.%{prerel}}%{?dist}
 Summary:	A general-purpose full virtualizer for PC hardware
 
@@ -28,20 +28,21 @@
 Source7:	VirtualBox-OSE-guest.modules
 Source8:	VirtualBox-OSE-vboxresize.desktop
 Source9:	VirtualBox-OSE-00-vboxvideo.conf
-Patch1:		VirtualBox-OSE-3.2.0-noupdate.patch
+Source10:	vboxweb-service
+Patch1:		VirtualBox-OSE-4.1.2-noupdate.patch
 Patch2:		VirtualBox-OSE-4.0.2-strings.patch
-Patch3:		VirtualBox-OSE-4.0.2-libcxx.patch
+Patch3:		VirtualBox-OSE-4.1.2-libcxx.patch
 Patch5:		VirtualBox-OSE-4.0.2-xorg17.patch
 Patch9:		VirtualBox-OSE-3.2.4-optflags.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
-Patch14:	VirtualBox-OSE-3.2.6-vboxkeyboard.patch
 Patch15:	VirtualBox-OSE-4.0.0-makeself.patch
-Patch16:	VirtualBox-OSE-4.0.0-usblib.patch
+Patch16:	VirtualBox-OSE-4.1.2-usblib.patch
 Patch17:	VirtualBox-OSE-4.0.0-beramono.patch
 Patch18:	VirtualBox-OSE-4.0.2-aiobug.patch
-Patch19:        VirtualBox-OSE-4.0.2-gcc46.patch
+Patch19:	VirtualBox-OSE-4.1.2-vboxpci.patch
+Patch20:	VirtualBox-OSE-4.1.2-testmangle.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -84,6 +85,9 @@
 ExclusiveArch:	i386 x86_64
 %endif
 
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+
 Requires:	%{name}-kmod = %{version}%{?prereltag}
 Provides:	%{name}-kmod-common = %{version}%{?prereltag}
 Conflicts:	%{name}-guest <= %{version}-%{release}
@@ -124,9 +128,9 @@
 Obsoletes:	xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
 Conflicts:	%{name} <= %{version}-%{release}
 %if "%(xserver-sdk-abi-requires 2>/dev/null)"
-Requires:       %(xserver-sdk-abi-requires ansic)
-Requires:       %(xserver-sdk-abi-requires videodrv)
-Requires:       %(xserver-sdk-abi-requires xinput)
+Requires:	%(xserver-sdk-abi-requires ansic)
+Requires:	%(xserver-sdk-abi-requires videodrv)
+Requires:	%(xserver-sdk-abi-requires xinput)
 %endif
 
 
@@ -157,12 +161,12 @@
 %patch10 -p1 -b .32bit
 %patch11 -p1 -b .visibility
 %patch12 -p1 -b .noansi
-%patch14 -p1 -b .vboxkeyboard
 %patch15 -p1 -b .makeself
 %patch16 -p1 -b .usblib
 %patch17 -p1 -b .beramono
 %patch18 -p1 -b .aiobug
-%patch19 -p1 -b .gcc46
+%patch19 -p1 -b .vboxpci
+%patch20 -p1 -b .testmangle
 
 # Remove prebuilt binary tools
 rm -rf kBuild
@@ -181,16 +185,14 @@
 # really been installed to. Therefore we do not override any of
 # the installation paths, but install the tree with the default
 # layout under 'obj' and shuffle files around in %%install.
-echo %{optflags}
 kmk %{_smp_mflags} \
-	KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_INS="$PWD/obj"		\
+	KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_OUT="$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_GCC_WERR=""			\
-	VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" 			\
-	VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java				
+	VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL"				\
+	VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java
 
 
 %install
@@ -206,9 +208,12 @@
 install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox
 install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/components
 install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls
+install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/ExtensionPacks
 install -d $RPM_BUILD_ROOT%{_libdir}/dri
-install -d $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk
+install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
+install -d $RPM_BUILD_ROOT%{_datadir}/icons
 install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-kmod-%{version}
 install -d $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
 
@@ -216,16 +221,20 @@
 install -p -m 0755 obj/bin/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBox
 ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
 ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxManage
+ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
+ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
 ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
 ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox
+ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
 
 install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
 	obj/bin/VBoxTunctl	\
-	obj/bin/VBoxBFE
 
 # Components
 install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/components \
-	obj/bin/components/*
+	obj/bin/components/VBoxC.so	\
+	obj/bin/components/VBoxSVCM.so	\
+	obj/bin/components/*XPCOM*.so
 
 # Lib
 install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
@@ -242,7 +251,6 @@
 
 # Executables
 install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
-	obj/bin/EfiThunk	\
 	obj/bin/VBoxHeadless	\
 	obj/bin/VBoxSDL		\
 	obj/bin/VBoxNetDHCP	\
@@ -255,22 +263,43 @@
 	obj/bin/vboxshell.py	\
 	obj/bin/VBoxTestOGL	\
 	obj/bin/vboxwebsrv	\
-	obj/bin/webtest
+	obj/bin/VBoxBalloonCtrl	\
+	obj/bin/webtest		\
+	obj/bin/VBoxBFE
+
+# Lowercase aliases
+for F in VBoxBalloonCtrl VBoxHeadless VBoxManage VBoxSDL VirtualBox VBoxBFE
+do
+	ln $RPM_BUILD_ROOT%{_bindir}/$F \
+		$RPM_BUILD_ROOT%{_bindir}/$(echo $F |awk '{print tolower($0)}')
+done
 
 # Language files
 install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
 	obj/bin/nls/*
 
 # SDK
-cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk
-mv $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom \
-	$RPM_BUILD_ROOT%{python_sitelib}/virtualbox
-ln -sf ../../../../../../..%{python_sitelib}/virtualbox/xpcom \
-	$RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom
+pushd obj/bin/sdk/installer
+VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
+	python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT
+popd
+cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk
+rm -rf $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk/installer
 
-# Icon
+# Icons
 install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
 	obj/bin/VBox.png
+ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png
+for S in obj/bin/icons/*
+do
+	SIZE=$(basename $S)
+	install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps}
+	install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes
+	[ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \
+		$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \
+		$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png
+done
+install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
 
 # Guest X.Org drivers
 # With the xorg17 patch, the _17 driver builds against what's
@@ -342,55 +371,42 @@
 	--remove-key=DocPath --remove-category=X-MandrivaLinux-System \
 	--vendor='' obj/bin/virtualbox.desktop
 
-%check
-exit 0
-
-# Dear contributor,
-#
-# If you forget a file when updating to a later version, it's
-# not you fault; as you can see, install section is far from
-# ideal. This section is meant to make it easier for you to spot
-# files you've forgotten to include. Feel free to blacklist
-# uninteresting files here.
-#
-# Not sure if a file is "uninteresting"? See if closed version
-# contains it? No? Remove it. Application doesn't run without
-# it? Bring it back.
-
-set +o posix
-diff -u <((find obj/bin/additions/* -maxdepth 0 -type f	   \
-		-not -name 'autorun.sh'			\
-		-not -name '*_drv*'			\
-		-not -name 'pam_vbox.so'		\
-		-exec basename '{}' \;
-	find obj/bin/* -maxdepth 0 -type f		\
-		-not -name 'tst*'			\
-		-not -name 'SUP*'			\
-		-not -name 'VBox.sh'			\
-		-not -name 'xpidl'			\
-		-not -name 'scm'			\
-		-not -name 'vboxkeyboard.tar.*'		\
-		-exec basename '{}' \;) |sort) \
-	<(find $RPM_BUILD_ROOT%{_libdir}/virtualbox/*	\
-		$RPM_BUILD_ROOT%{_bindir}/*		\
-		$RPM_BUILD_ROOT%{_libdir}/*OGL*.so	\
-		$RPM_BUILD_ROOT%{_datadir}/{pixmaps,applications}/* \
-		-maxdepth 0 -type f			\
-		-not -name '*.py[co]'			\
-		-not -name 'UserManual.pdf'		\
-		-not -name VBox -exec basename '{}' \; |sort)
-set -o posix
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%pre devel
-# This changed to a symlink from directory, which would cause
-# the new package's CPIO payload to fail to unpack unless removed
-PYXP=%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom
-[ -d "$PYXP" ] && rm -rf "$PYXP"
+%post
+# Group for USB devices
+getent group vboxusers >/dev/null || groupadd -r vboxusers
+
+# Desktop databases
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-desktop-database &>/dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
+
+# Web service
+/sbin/chkconfig --add vboxweb-service >/dev/null 2>&1 || :
+
+# Assign USB devices
+if /sbin/udevadm control --reload-rules >/dev/null 2>&1
+then
+	/sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
+	/sbin/udevadm settle >/dev/null 2>&1 || :
+fi
+
+
+%preun
+[ $1 = 0 ] && /sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
+
+
+%postun
+/usr/bin/update-desktop-database &>/dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
+
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 # Guest additions install the OGL libraries
@@ -401,12 +417,20 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/VBox
+%{_bindir}/vboxballoonctrl
+%{_bindir}/VBoxBalloonCtrl
+%{_bindir}/vboxbfe
 %{_bindir}/VBoxBFE
+%{_bindir}/vboxheadless
 %{_bindir}/VBoxHeadless
+%{_bindir}/vboxmanage
 %{_bindir}/VBoxManage
+%{_bindir}/vboxsdl
 %{_bindir}/VBoxSDL
 %{_bindir}/VBoxTunctl
+%{_bindir}/virtualbox
 %{_bindir}/VirtualBox
+%{_bindir}/vboxwebsrv
 %dir %{_libdir}/virtualbox
 %doc %{_libdir}/virtualbox/*.pdf
 %{_libdir}/virtualbox/*.[^p]*
@@ -417,15 +441,18 @@
 %{_libdir}/virtualbox/VBoxSVC
 %{_libdir}/virtualbox/VBoxTestOGL
 %{_libdir}/virtualbox/VBoxXPCOMIPCD
+%{_libdir}/virtualbox/VBoxBalloonCtrl
 %{_libdir}/virtualbox/vboxwebsrv
 %{_libdir}/virtualbox/webtest
-%{_libdir}/virtualbox/EfiThunk
 %attr(4755,root,root) %{_libdir}/virtualbox/VBoxHeadless
 %attr(4755,root,root) %{_libdir}/virtualbox/VBoxSDL
+%attr(4755,root,root) %{_libdir}/virtualbox/VBoxBFE
 %attr(4755,root,root) %{_libdir}/virtualbox/VBoxNetDHCP
 %attr(4755,root,root) %{_libdir}/virtualbox/VBoxNetAdpCtl
 %attr(4755,root,root) %{_libdir}/virtualbox/VirtualBox
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/*
+%{_datadir}/mime/*
 %{_datadir}/applications/*.desktop
 %dir %{_sysconfdir}/vbox
 %config %{_sysconfdir}/vbox/vbox.cfg
@@ -436,12 +463,13 @@
 
 %files devel
 %defattr(0644,root,root,0755)
-%{_datadir}/virtualbox
+%{_libdir}/virtualbox/sdk
 
 
 %files -n python-%{name}
 %defattr(0644,root,root,0755)
 %{python_sitelib}/virtualbox
+%{python_sitelib}/vboxapi*
 
 
 %files guest
@@ -470,6 +498,12 @@
 
 
 %changelog
+* Wed Sep 21 2011 Lubomir Rintel <lkundrak at v3.sk> - 4.1.2-1
+- New release
+- Assign USB devices to vboxusers
+- Add a web service
+- Install MIME types for disk images
+
 * Sun Apr 03 2011 Lubomir Rintel <lkundrak at v3.sk> - 4.0.4-1
 - New release
 - Add requires for particular server ABIs


Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	4 Apr 2011 06:59:28 -0000	1.28
+++ sources	22 Sep 2011 10:04:38 -0000	1.29
@@ -1 +1 @@
-b4770ca14d1a8cbad9b3eb0e0028ff4b  VirtualBox-4.0.4.tar.bz2
+945d2c94c15a4f47280be4b01b67e244  VirtualBox-4.1.2.tar.bz2


--- VirtualBox-OSE-3.2.0-noupdate.patch DELETED ---


--- VirtualBox-OSE-3.2.6-vboxkeyboard.patch DELETED ---


--- VirtualBox-OSE-4.0.0-usblib.patch DELETED ---


--- VirtualBox-OSE-4.0.2-gcc46.patch DELETED ---


--- VirtualBox-OSE-4.0.2-libcxx.patch DELETED ---

