SILENT: ABF Import

2025-02-23 17:12:46 +00:00 · 2012-11-13 00:43:58 +00:00 · 2012-11-13 00:43:58 +00:00 · 71d35ce896
commit 71d35ce896
parent 9774ea98ec
11 changed files with 464 additions and 0 deletions
--- a/.abf.yml
+++ b/.abf.yml
@ -0,0 +1,6 @@
+sources:
+  "60-vboxadd.perms:"	4491f0c13603e446a0914fb444c0229c73957631
+  "UserManual.pdf:"	10144b8deaf19c0c8a075ef825bb78d8a61bfe67
+  "VirtualBox-4.2.2.tar.bz2:"	fe82772e336b5de1a72ff71e8d3e5f5a57ddef52
+  "virtualbox.init:"	061ddb9b510433540843473bdb073d62d1e08639
+  "virtualbox.rpmlintrc:"	528944a44d229d7c97de9892791f467cbb8934e3
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,5 @@
+60-vboxadd.perms
+UserManual.pdf
+VirtualBox-4.2.2.tar.bz2
+virtualbox.init
+virtualbox.rpmlintrc
--- a/VirtualBox-4.1.8-dont-check-for-mkisofs-or-makeself.patch
+++ b/VirtualBox-4.1.8-dont-check-for-mkisofs-or-makeself.patch
@ -0,0 +1,21 @@
+diff -Nurp VirtualBox-4.1.8_OSE-p5/configure VirtualBox-4.1.8_OSE-p9/configure
+--- VirtualBox-4.1.8_OSE-p5/configure	2011-12-24 15:18:03.271635525 +0200
+++ VirtualBox-4.1.8_OSE-p9/configure	2011-12-24 15:42:37.404156620 +0200
+@@ -2549,7 +2549,7 @@ check_gcc
+ # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
+ # [ "$OS" != "darwin" ] && check_yasm
+ [ "$OS" != "darwin"  ] && check_xsltproc
+-[ "$OS" != "darwin"  ] && check_mkisofs
+#[ "$OS" != "darwin"  ] && check_mkisofs
+ 
+ # the libraries
+ [ "$OS" != "darwin"  ] && check_pthread
+@@ -2607,7 +2607,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
--- a/VirtualBox-4.1.8-futex.patch
+++ b/VirtualBox-4.1.8-futex.patch
@ -0,0 +1,12 @@
+diff -Nurp VirtualBox-4.1.8_OSE-p2/src/VBox/Runtime/r3/linux/semmutex-linux.cpp VirtualBox-4.1.8_OSE-p3/src/VBox/Runtime/r3/linux/semmutex-linux.cpp
+--- VirtualBox-4.1.8_OSE-p2/src/VBox/Runtime/r3/linux/semmutex-linux.cpp	2011-12-19 15:01:33.000000000 +0200
+++ VirtualBox-4.1.8_OSE-p3/src/VBox/Runtime/r3/linux/semmutex-linux.cpp	2011-12-24 15:25:16.791196405 +0200
+@@ -88,7 +88,7 @@ struct RTSEMMUTEXINTERNAL
+ static long sys_futex(int32_t volatile *uaddr, int op, int val, struct timespec *utime, int32_t *uaddr2, int val3)
+ {
+     errno = 0;
+-    long rc = syscall(__NR_futex, uaddr, op, val, utime, uaddr2, val3);
+    long rc = syscall(SYS_futex, uaddr, op, val, utime, uaddr2, val3);
+     if (rc < 0)
+     {
+         Assert(rc == -1);
--- a/VirtualBox-4.1.8-initscriptname.patch
+++ b/VirtualBox-4.1.8-initscriptname.patch
@ -0,0 +1,21 @@
+diff -Nurp VirtualBox-4.1.8_OSE-p4/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.8_OSE-p5/src/VBox/Installer/linux/VBox.sh
+--- VirtualBox-4.1.8_OSE-p4/src/VBox/Installer/linux/VBox.sh	2011-12-19 15:01:10.000000000 +0200
+++ VirtualBox-4.1.8_OSE-p5/src/VBox/Installer/linux/VBox.sh	2011-12-24 15:28:55.036010629 +0200
+@@ -34,7 +34,7 @@ WARNING: The vboxdrv kernel module is no
+          available for the current kernel (`uname -r`) or it failed to
+          load. Please recompile the kernel module and install it by
+ 
+-           sudo /etc/init.d/vboxdrv setup
+           sudo /etc/rc.d/init.d/virtualbox start
+ 
+          You will not be able to start VMs until this problem is fixed.
+ EOF
+@@ -42,7 +42,7 @@ elif [ ! -c /dev/vboxdrv ]; then
+     cat << EOF
+ WARNING: The character device /dev/vboxdrv does not exist. Try
+ 
+-           sudo /etc/init.d/vboxdrv restart
+           sudo /etc/rc.d/init.d/virtualbox restart
+ 
+          and if that is not successful, try to re-install the package.
+ 
--- a/VirtualBox-4.1.8-kernelrelease.patch
+++ b/VirtualBox-4.1.8-kernelrelease.patch
@ -0,0 +1,30 @@
+diff -Nurp VirtualBox-4.1.8_OSE-p1/src/VBox/HostDrivers/Support/linux/Makefile VirtualBox-4.1.8_OSE-p2/src/VBox/HostDrivers/Support/linux/Makefile
+--- VirtualBox-4.1.8_OSE-p1/src/VBox/HostDrivers/Support/linux/Makefile	2011-12-19 15:01:06.000000000 +0200
+++ VirtualBox-4.1.8_OSE-p2/src/VBox/HostDrivers/Support/linux/Makefile	2011-12-24 15:22:08.487043179 +0200
+@@ -165,7 +165,7 @@ ifeq ($(KERNELRELEASE),)
+  # kernel base directory
+  ifndef KERN_DIR
+   # build for the current kernel, version check
+-  KERN_DIR := /lib/modules/$(shell uname -r)/build
+  KERN_DIR := /lib/modules/$(KERNELRELEASE)/build
+   ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
+    KERN_DIR := /usr/src/linux
+    ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
+@@ -194,7 +194,7 @@ ifeq ($(KERNELRELEASE),)
+  # module install dir, only for current kernel
+  ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
+   ifndef MODULE_DIR
+-   MODULE_DIR_TST := /lib/modules/$(shell uname -r)
+   MODULE_DIR_TST := /lib/modules/$(KERNELRELEASE)
+    ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
+     MODULE_DIR := $(MODULE_DIR_TST)/misc
+    else
+@@ -286,7 +286,7 @@ install_rpm: $(MODULE)
+ else # eq ($(MAKECMDGOALS),clean)
+ 
+  ifndef KERN_DIR
+-  KERN_DIR := /lib/modules/$(shell uname -r)/build
+  KERN_DIR := /lib/modules/$(KERNELRELEASE)/build
+   ifeq ($(wildcard $(KERN_DIR)/Makefile),)
+    KERN_DIR := /usr/src/linux
+   endif
--- a/VirtualBox-4.1.8-usb-warning-filters.patch
+++ b/VirtualBox-4.1.8-usb-warning-filters.patch
@ -0,0 +1,19 @@
+--- ./src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.usb	2012-09-20 23:43:00.716556922 -0300
+++ ./src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2012-09-20 23:45:03.484555275 -0300
+@@ -55,6 +55,7 @@
+ 
+ /* COM includes: */
+ #include "CUSBController.h"
+#include "CUSBDeviceFilter.h"
+ 
+ #if 0 /* Global USB filters are DISABLED now: */
+ # define ENABLE_GLOBAL_USB
+@@ -1107,7 +1108,7 @@ bool UISettingsDialogMachine::isPageAvai
+             /* Get the USB controller object: */
+             CUSBController controller = m_machine.GetUSBController();
+             /* Show the machine error message if any: */
+-            if (!m_machine.isReallyOk() && !controller.isNull() && controller.GetEnabled())
+            if (!m_machine.isReallyOk() && !controller.isNull() && controller.GetEnabled() && (controller.GetDeviceFilters().size() != 0))
+                 msgCenter().cannotAccessUSB(m_machine);
+             /* Check if USB is implemented: */
+             if (controller.isNull() || !controller.GetProxyAvailable())
--- a/VirtualBox-4.2.2-remove-missing-translation.patch
+++ b/VirtualBox-4.2.2-remove-missing-translation.patch
@ -0,0 +1,20 @@
+--- VirtualBox-4.2.2/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk~	2012-10-18 16:22:52.000000000 +0200
+++ VirtualBox-4.2.2/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk	2012-10-25 09:53:33.962193785 +0200
+@@ -23,7 +23,6 @@ VBOX_APPROVED_GUI_LANGUAGES := \
+ 	de    \
+ 	en    \
+ 	es    \
+-	fa_IR \
+ 	hu    \
+ 	it    \
+ 	ja    \
+--- VirtualBox-4.2.2/src/VBox/Frontends/VirtualBox/VBoxUI.pro~	2012-10-18 16:22:47.000000000 +0200
+++ VirtualBox-4.2.2/src/VBox/Frontends/VirtualBox/VBoxUI.pro	2012-10-25 09:53:10.003887784 +0200
+@@ -63,7 +63,6 @@ TRANSLATIONS = \
+ 	nls/VirtualBox_es.ts \
+ 	nls/VirtualBox_eu.ts \
+ 	nls/VirtualBox_fi.ts \
+-	nls/VirtualBox_fa_IR.ts \
+ 	nls/VirtualBox_fr.ts \
+ 	nls/VirtualBox_gl_ES.ts \
+ 	nls/VirtualBox_hu.ts \
--- a/VirtualBox-4.2.2-system-xorg.patch
+++ b/VirtualBox-4.2.2-system-xorg.patch
@ -0,0 +1,294 @@
+--- VirtualBox-4.2.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk.xorg~	2012-10-18 16:19:30.000000000 +0200
+++ VirtualBox-4.2.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2012-10-25 06:42:45.910739485 +0200
+@@ -63,18 +63,12 @@ VBoxOGL_TEMPLATE       = VBOXCROGLR3GUES
+ VBoxOGL_INCS           = .
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+  VBoxOGL_INCS     += \
+-	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
+-	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
+-	$(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
+-	$(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
+-	$(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
+-	$(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
+-	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
+-	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
+-	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+-	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+	/usr/include/x11 \
+	/usr/include/xorg \
+	/usr/include/pixman-1 \
+ 	$(VBOX_MESA_INCS) \
+-	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+	/usr/include/drm \
+	/usr/include/libdrm
+  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
+ endif
+ 
+--- VirtualBox-4.2.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.xorg~	2012-10-18 16:19:25.000000000 +0200
+++ VirtualBox-4.2.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2012-10-25 06:42:45.910739485 +0200
+@@ -40,8 +40,8 @@ LIBRARIES += \
+ 	VBoxGuestR3LibShared
+ ifndef VBOX_ONLY_TESTSUITE
+  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
+-  LIBRARIES += \
+-  	VBoxGuestR3LibXFree86
+#  LIBRARIES += \
+#  	VBoxGuestR3LibXFree86
+  endif
+ endif
+ LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
+--- VirtualBox-4.2.2/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg~	2012-10-18 16:19:45.000000000 +0200
+++ VirtualBox-4.2.2/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2012-10-25 06:42:45.910739485 +0200
+@@ -29,7 +29,6 @@ vboxmouse_xorg_INCS = \
+ # vboxmouse_drv
+ #
+ if1of ($(KBUILD_TARGET), linux)
+- SYSMODS += vboxmouse_drv
+  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+  vboxmouse_drv_DEFS.linux = linux
+  vboxmouse_drv_DEFS.x86 += __i386__
+@@ -69,7 +68,6 @@ endif
+ #
+ # vboxmouse_drv_70
+ #
+-DLLS += vboxmouse_drv_70
+ vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_70_DEFS = \
+ 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
+@@ -85,7 +83,6 @@ vboxmouse_drv_70_SOURCES = \
+ #
+ # vboxmouse_drv_71
+ #
+-DLLS += vboxmouse_drv_71
+ vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_71_INCS := \
+@@ -100,7 +97,6 @@ vboxmouse_drv_71_SOURCES = \
+ #
+ # 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 := \
+@@ -114,7 +110,6 @@ vboxmouse_drv_13_SOURCES = \
+ #
+ # 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 := \
+@@ -128,7 +123,6 @@ vboxmouse_drv_14_SOURCES = \
+ #
+ # 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 := \
+@@ -142,7 +136,6 @@ vboxmouse_drv_15_SOURCES = \
+ #
+ # 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 := \
+@@ -158,7 +151,6 @@ ifneq ($(KBUILD_TARGET), linux)
+ #
+ # vboxmouse_drv_17
+ #
+-DLLS += vboxmouse_drv_17
+ vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+@@ -173,7 +165,6 @@ vboxmouse_drv_17_SOURCES = \
+ #
+ # 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
+@@ -188,7 +179,6 @@ vboxmouse_drv_18_SOURCES = \
+ #
+ # 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
+@@ -203,7 +193,6 @@ vboxmouse_drv_19_SOURCES = \
+ #
+ # vboxmouse_drv_110
+ #
+-DLLS += vboxmouse_drv_110
+ vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+@@ -214,7 +203,6 @@ vboxmouse_drv_110_INCS := \
+ vboxmouse_drv_110_SOURCES = \
+ 	vboxmouse.c
+ 
+-DLLS += vboxmouse_drv_111
+ vboxmouse_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_111_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+@@ -225,7 +213,6 @@ vboxmouse_drv_111_INCS := \
+ vboxmouse_drv_111_SOURCES = \
+ 	vboxmouse.c
+ 
+-DLLS += vboxmouse_drv_112
+ vboxmouse_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_112_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+@@ -236,6 +223,13 @@ vboxmouse_drv_112_INCS := \
+ vboxmouse_drv_112_SOURCES = \
+ 	vboxmouse.c
+ 
+vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv
+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
+	/usr/include/x11 \
+	/usr/include/xorg \
+	/usr/include/pixman-1
+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
+
+ endif # neq ($(KBUILD_TARGET),linux)
+ 
+ 
+--- VirtualBox-4.2.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg~	2012-10-18 16:19:45.000000000 +0200
+++ VirtualBox-4.2.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2012-10-25 06:42:45.911739499 +0200
+@@ -53,7 +53,6 @@ vboxvideo_xorg_INCS = \
+ # vboxvideo_drv
+ #
+ if1of ($(KBUILD_TARGET), linux)
+- SYSMODS += vboxvideo_drv
+ endif   # target linux
+ vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+ vboxvideo_drv_DEFS.linux = linux
+@@ -128,7 +127,6 @@ 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
+ vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
+ if1of ($(KBUILD_TARGET), linux)
+  vboxvideo_drv_70_CFLAGS += \
+@@ -149,7 +147,6 @@ vboxvideo_drv_70_SOURCES  = $(vboxvideo_
+ #
+ # 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_70_DEFS) XORG_VERSION_CURRENT=700100000
+@@ -164,7 +161,6 @@ vboxvideo_drv_71_SOURCES  = $(vboxvideo_
+ #
+ # 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_13_DEFS) XORG_VERSION_CURRENT=100300000
+@@ -178,7 +174,6 @@ vboxvideo_drv_13_SOURCES = $(vboxvideo_d
+ #
+ # 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_13_DEFS) XORG_VERSION_CURRENT=100400000
+@@ -192,7 +187,6 @@ vboxvideo_drv_14_SOURCES  = $(vboxvideo_
+ #
+ # 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_15_DEFS) XORG_VERSION_CURRENT=100503000
+@@ -213,7 +207,6 @@ endif
+ #
+ # 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_15_DEFS) XORG_VERSION_CURRENT=100600000
+@@ -227,7 +220,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_
+ #
+ # vboxvideo_drv_17
+ #
+-DLLS += vboxvideo_drv_17
+ vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
+@@ -241,7 +233,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_
+ #
+ # 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_15_DEFS) XORG_VERSION_CURRENT=100800000
+@@ -255,7 +246,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_
+ #
+ # 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_15_DEFS) XORG_VERSION_CURRENT=100900000
+@@ -269,7 +259,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_
+ #
+ # vboxvideo_drv_110
+ #
+-DLLS += vboxvideo_drv_110
+ vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
+@@ -283,7 +272,6 @@ vboxvideo_drv_110_SOURCES := $(vboxvideo
+ #
+ # vboxvideo_drv_111
+ #
+-DLLS += vboxvideo_drv_111
+ vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
+@@ -297,7 +285,6 @@ vboxvideo_drv_111_SOURCES := $(vboxvideo
+ #
+ # vboxvideo_drv_112
+ #
+-DLLS += vboxvideo_drv_112
+ vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
+@@ -311,7 +298,6 @@ vboxvideo_drv_112_SOURCES := $(vboxvideo
+ #
+ # vboxvideo_drv_113
+ #
+-DLLS += vboxvideo_drv_113
+ vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000
+@@ -321,6 +307,20 @@ vboxvideo_drv_113_INCS = \
+ vboxvideo_drv_113_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
+ vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ 
+#
+# build only for selected server
+#
+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
+	/usr/include/xorg \
+	/usr/include/x11 \
+	/usr/include/pixman-1 \
+	/usr/include/X11/dri \
+	/usr/include/drm \
+	/usr/include/libdrm
+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
+DLLS += vboxvideo_drv_$(XSERVER_VERSION)
+
+ 
+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
+  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
--- a/virtualbox-default-to-mandriva.patch
+++ b/virtualbox-default-to-mandriva.patch
@ -0,0 +1,19 @@
+--- VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp.bero	2012-09-14 23:01:47.260704397 +0200
+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	2012-09-14 23:02:14.994853287 +0200
+@@ -200,12 +200,12 @@ void UINameAndSystemEditor::sltFamilyCha
+         if (iIndexWinXP != -1)
+             m_pTypeCombo->setCurrentIndex(iIndexWinXP);
+     }
+-    /* Or select Ubuntu item for Linux family as default: */
+    /* Or select Mandriva item for Linux family as default: */
+     else if (strFamilyId == "Linux")
+     {
+-        int iIndexUbuntu = m_pTypeCombo->findData("Ubuntu", TypeID);
+-        if (iIndexUbuntu != -1)
+-            m_pTypeCombo->setCurrentIndex(iIndexUbuntu);
+        int iIndexMandriva = m_pTypeCombo->findData("Mandriva", TypeID);
+        if (iIndexMandriva != -1)
+            m_pTypeCombo->setCurrentIndex(iIndexMandriva);
+     }
+     /* Else simply select the first one present: */
+     else m_pTypeCombo->setCurrentIndex(0);
--- a/virtualbox-fix-vboxadd-req.patch
+++ b/virtualbox-fix-vboxadd-req.patch
@ -0,0 +1,17 @@
+--- VirtualBox-4.1.2_OSE/src/VBox/Additions/linux/installer/vboxadd-service.sh.0004~	2011-08-15 14:28:49.000000000 +0200
+++ VirtualBox-4.1.2_OSE/src/VBox/Additions/linux/installer/vboxadd-service.sh	2011-08-17 21:33:39.000000000 +0200
+@@ -18,10 +18,12 @@
+ #
+ ### BEGIN INIT INFO
+ # Provides:       vboxadd-service
+-# Required-Start: vboxadd
+-# Required-Stop:  vboxadd
+# Should-Start:   dkms
+ # Default-Start:  2 3 4 5
+ # Default-Stop:   0 1 6
+# Required-Start:
+# Required-Stop:
+# Short-Description: VirtualBox Additions Service
+ # Description:    VirtualBox Additions Service
+ ### END INIT INFO
+