Sat Sep 1 22:00:39 CEST 2012

Author: sergiomb

Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25134

Modified Files:
	.cvsignore VirtualBox.spec sources 
Added Files:
	VirtualBox-00-vboxvideo.conf VirtualBox-4.1.18-strings.patch 
	VirtualBox-4.1.20-libcxx.patch VirtualBox-60-vboxguest.rules 
	VirtualBox-90-vboxdrv.rules VirtualBox-guest.modules 
	VirtualBox-vboxresize.desktop 
Removed Files:
	VirtualBox-OSE-00-vboxvideo.conf 
	VirtualBox-OSE-3.2.10-noansi.patch 
	VirtualBox-OSE-3.2.4-optflags.patch 
	VirtualBox-OSE-4.1.2-libcxx.patch 
	VirtualBox-OSE-4.1.6-strings.patch 
	VirtualBox-OSE-60-vboxguest.rules 
	VirtualBox-OSE-90-vboxdrv.rules VirtualBox-OSE-guest.modules 
	VirtualBox-OSE-vboxresize.desktop VirtualBox-OSE.modules 
Log Message:
* Sat Sep 01 2012 SÃ©rgio Basto <sergio at serjux.com> - 4.1.20-1
- New upstream release.
- Redo VirtualBox-4.1.20-libcxx.patch
- Patch9 (VirtualBox-OSE-3.2.4-optflags.patch) integrated in Patch3 (VirtualBox-4.1.20-libcxx.patch).
- drop Patch12 (VirtualBox-OSE-3.2.10-noansi.patch) no need anymore.
- drop Patch11 (VirtualBox-OSE-3.2.0-visibility.patch) no need anymore.
- fix rfbz #2416 - /bin/mount.vboxsf must be moved to /sbin/mount.vboxsf
- move files VirtualBox-OSE .rules .modules .desktop and .conf to VirtualBox



--- NEW FILE VirtualBox-00-vboxvideo.conf ---
Section "Device"
	Identifier "Videocard666"
	Driver "vboxvideo"
EndSection

VirtualBox-4.1.18-strings.patch:
 Frontends/VirtualBox/src/main.cpp | 22 +++++++++++-----------
 Installer/linux/VBox.sh | 13 ++++++++-----
 VMM/VMMR3/VM.cpp | 8 ++++----
 3 files changed, 23 insertions(+), 20 deletions(-)

--- NEW FILE VirtualBox-4.1.18-strings.patch ---
* Mon Jul 09 2012 SÃ©rgio Basto <sergio at serjux.com> 
- rfbz #1826, last review of https://bugzilla.rpmfusion.org/attachment.cgi?id=888
 by: Naveed Hasan <naveed at cs.columbia.edu>

* Sat Jun 16 2012 SÃ©rgio Basto <sergio at serjux.com>
- Rebased for 4.1.16 (partial rfbz #1826)


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/VMMR3/VM.cpp | 8 ++++----
 3 files changed, 20 insertions(+), 19 deletions(-)


diff -Nurp VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp	2012-06-20 14:16:20.000000000 +0100
+++ VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp	2012-07-09 04:57:00.690645723 +0100
@@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QAppli
 );
 
 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 "
- " '/etc/init.d/vboxdrv setup' "
- "as root. If it is available in your distribution, you 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. "
+ "If you installed or VirtualBox package recently you need to restart "
+ "the computer for the driver to load. "
+ "Alternatively, you may attempt to load the driver by issuing the "
+ "following command with system administrator (root) privileges: "
+ " '/etc/sysconfig/modules/VirtualBox.modules' "
 );
 
 QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -92,18 +92,18 @@ QString g_QStrHintLinuxWrongDriverVersio
 "The VirtualBox kernel modules do not match this version of "
 "VirtualBox. The installation of VirtualBox was apparently not "
 "successful. Executing "
- " '/etc/init.d/vboxdrv setup' "
+ " '/etc/sysconfig/modules/VirtualBox.modules' as root "
 "may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
+ "RPM Fusion version and the Oracle version of VirtualBox."
 );
 
 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 -Nurp VirtualBox-4.1.18/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.18.new2/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-4.1.18/src/VBox/Installer/linux/VBox.sh	2012-06-20 14:17:29.000000000 +0100
+++ VirtualBox-4.1.18.new2/src/VBox/Installer/linux/VBox.sh	2012-07-09 05:02:47.158108166 +0100
@@ -32,19 +32,22 @@ 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 load the kernel module by executing
 
- sudo /etc/init.d/vboxdrv setup
+ '/etc/sysconfig/modules/VirtualBox.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 executing
 
- sudo /etc/init.d/vboxdrv restart
+ '/sbin/udevadm control --reload-rules' (as root)
+ 'systemctl restart udev-trigger.service' (as root)
+ 'systemctl restart udev-settle.service' (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 -Nurp VirtualBox-4.1.18/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-4.1.18.new2/src/VBox/VMM/VMMR3/VM.cpp
--- VirtualBox-4.1.18/src/VBox/VMM/VMMR3/VM.cpp	2012-06-20 14:18:34.000000000 +0100
+++ VirtualBox-4.1.18.new2/src/VBox/VMM/VMMR3/VM.cpp	2012-07-09 05:01:48.544521745 +0100
@@ -375,8 +375,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
 #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 load the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox.modules' as root");
 #else
 pszError = N_("VirtualBox kernel driver not loaded");
 #endif
@@ -417,8 +417,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
 #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. Load the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox.modules' as root");
 #else
 pszError = N_("VirtualBox kernel driver not installed");
 #endif

VirtualBox-4.1.20-libcxx.patch:
 Config.kmk | 6 +++---
 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.6/Makefile.kmk | 3 +--
 14 files changed, 21 insertions(+), 25 deletions(-)

--- NEW FILE VirtualBox-4.1.20-libcxx.patch ---
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 14 May 2010 12:26:33 +0200
Subject: [PATCH] If anyone finds out why did I remove those I owe him a beer.

Seems like this patch could be safely left out.
removes -g -pipe 
---
 Config.kmk | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

>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)
@@ -4055,7 +4055,7 @@ ifdef VBOX_WITH_QTGUI
 	$(LIB_SDL_INC)
   ## @todo Use VBOX_GCC_PEDANTIC_CXX?
   TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \
-	-g -pipe $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \
+ 	$(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \
 	-Wno-long-long -fshort-wchar -fno-strict-aliasing \
 	$(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) \
 	$(VBOX_GCC_Wno-delete-non-virtual-dtor)
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.6/Makefile.kmk
+++ b/src/libs/zlib-1.2.6/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



--- NEW FILE VirtualBox-60-vboxguest.rules ---
ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"


--- NEW FILE VirtualBox-90-vboxdrv.rules ---
SUBSYSTEM=="usb_device", ACTION=="add", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"


--- NEW FILE VirtualBox-guest.modules ---
#!/bin/sh

# Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083
insert_module ()
{
        grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return
        modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL
}

insert_module vboxguest
insert_module vboxsf



--- NEW FILE VirtualBox-vboxresize.desktop ---
[Desktop Entry]
Type=Application
Version=1.0
Name=vbox-autoresize
Exec=/usr/bin/VBoxClient --autoresize
X-GNOME-Autostart-enabled=true


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	21 Jun 2012 03:00:25 -0000	1.36
+++ .cvsignore	1 Sep 2012 20:00:35 -0000	1.37
@@ -1 +1 @@
-VirtualBox-4.1.18.tar.bz2
+VirtualBox-4.1.20.tar.bz2


Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- VirtualBox.spec	9 Jul 2012 04:27:12 -0000	1.14
+++ VirtualBox.spec	1 Sep 2012 20:00:39 -0000	1.15
@@ -14,30 +14,28 @@
 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
 
 Name:		VirtualBox
-Version:	4.1.18
-Release:	2%{?prerel:.%{prerel}}%{?dist}
+Version:	4.1.20
+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://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
-Source7:	VirtualBox-OSE-guest.modules
-Source8:	VirtualBox-OSE-vboxresize.desktop
-Source9:	VirtualBox-OSE-00-vboxvideo.conf
+Source3:	VirtualBox-90-vboxdrv.rules
+Source5:	VirtualBox-60-vboxguest.rules
+Source6:	VirtualBox.modules
+Source7:	VirtualBox-guest.modules
+Source8:	VirtualBox-vboxresize.desktop
+Source9:	VirtualBox-00-vboxvideo.conf
 Source10:	vboxweb.service
 Source11:	vboxservice.service
 Patch1:		VirtualBox-OSE-4.1.4-noupdate.patch
-Patch2:		VirtualBox-OSE-4.1.6-strings.patch
-Patch3:		VirtualBox-OSE-4.1.2-libcxx.patch
+Patch2:		VirtualBox-4.1.18-strings.patch
+Patch3:		VirtualBox-4.1.20-libcxx.patch
 Patch5:		VirtualBox-OSE-4.1.4-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
+#Patch11:	VirtualBox-OSE-3.2.0-visibility.patch
 Patch15:	VirtualBox-OSE-4.0.0-makeself.patch
 Patch16:	VirtualBox-OSE-4.1.2-usblib.patch
 Patch17:	VirtualBox-OSE-4.0.0-beramono.patch
@@ -179,10 +177,8 @@
 %patch2 -p1 -b .strings
 %patch3 -p1 -b .libcxx
 %patch5 -p1 -b .xorg17
-%patch9 -p1 -b .optflags
 %patch10 -p1 -b .32bit
-%patch11 -p1 -b .visibility
-%patch12 -p1 -b .noansi
+#%patch11 -p1 -b .visibility
 %patch15 -p1 -b .makeself
 %patch16 -p1 -b .usblib
 %patch17 -p1 -b .beramono
@@ -233,6 +229,7 @@
 # Directory structure
 install -d $RPM_BUILD_ROOT/%{_lib}/security
 install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_sbindir}
 install -d $RPM_BUILD_ROOT%{_libdir}
 install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox
 install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/components
@@ -341,8 +338,10 @@
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 
 # Guest tools
+install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir}	\
+	obj/bin/additions/mount.vboxsf
+
 install -m 0755 -t $RPM_BUILD_ROOT%{_bindir}	\
-	obj/bin/additions/mount.vboxsf		\
 	obj/bin/additions/VBoxService		\
 	obj/bin/additions/VBoxClient		\
 	obj/bin/additions/VBoxControl
@@ -529,7 +528,7 @@
 
 %files guest
 /%{_lib}/security/pam_vbox.so
-%{_bindir}/mount.vboxsf
+%{_sbindir}/mount.vboxsf
 %{_bindir}/VBoxClient
 %{_bindir}/VBoxControl
 %{_bindir}/VBoxService
@@ -551,6 +550,18 @@
 
 
 %changelog
+* Sat Sep 01 2012 SÃ©rgio Basto <sergio at serjux.com> - 4.1.20-1
+- New upstream release.
+- Redo VirtualBox-4.1.20-libcxx.patch
+- Patch9 (VirtualBox-OSE-3.2.4-optflags.patch) integrated in Patch3 (VirtualBox-4.1.20-libcxx.patch).
+- drop Patch12 (VirtualBox-OSE-3.2.10-noansi.patch) no need anymore.
+- drop Patch11 (VirtualBox-OSE-3.2.0-visibility.patch) no need anymore.
+- fix rfbz #2416 - /bin/mount.vboxsf must be moved to /sbin/mount.vboxsf
+- move files VirtualBox-OSE .rules .modules .desktop and .conf to VirtualBox
+
+* Mon Jul 09 2012 SÃ©rgio Basto <sergio at serjux.com> 4.1.18-2
+- Improve some strings suggest on rfbz #1826
+
 * Thu Jun 21 2012 SÃ©rgio Basto <sergio at serjux.com> - 4.1.18-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	21 Jun 2012 03:00:25 -0000	1.36
+++ sources	1 Sep 2012 20:00:39 -0000	1.37
@@ -1 +1 @@
-38db0a87cba659b484af868b0c2bd3ac  VirtualBox-4.1.18.tar.bz2
+5784c6dda8a9d53f8f21b2d41eba903c  VirtualBox-4.1.20.tar.bz2


--- VirtualBox-OSE-00-vboxvideo.conf DELETED ---


--- VirtualBox-OSE-3.2.10-noansi.patch DELETED ---


--- VirtualBox-OSE-3.2.4-optflags.patch DELETED ---


--- VirtualBox-OSE-4.1.2-libcxx.patch DELETED ---


--- VirtualBox-OSE-4.1.6-strings.patch DELETED ---


--- VirtualBox-OSE-60-vboxguest.rules DELETED ---


--- VirtualBox-OSE-90-vboxdrv.rules DELETED ---


--- VirtualBox-OSE-guest.modules DELETED ---


--- VirtualBox-OSE-vboxresize.desktop DELETED ---


--- VirtualBox-OSE.modules DELETED ---
