[Pkg-virtualbox-commits] [virtualbox] 01/01: Prepare wheezy
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Mon Aug 31 07:47:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch wheezy
in repository virtualbox.
commit 62c0cb6825be1b08c2afee6b44fb74de63f41227
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Aug 28 17:09:15 2015 +0200
Prepare wheezy
---
debian/changelog | 7 +
debian/patches/01-build-arch.patch | 2 +-
debian/patches/04-vboxdrv-references.patch | 13 +-
debian/patches/06-xsession.patch | 2 +-
debian/patches/07-vboxnetflt-reference.patch | 2 +-
debian/patches/13-module-mismatch.patch | 2 +-
debian/patches/16-no-update.patch | 48 ++-
debian/patches/18-system-xorg.patch | 125 +++---
debian/patches/23-remove-invalid-chars-check.patch | 2 +-
debian/patches/27-hide-host-cache-warning.patch | 2 +-
debian/patches/28-no-selinux-fedora.patch | 2 +-
debian/patches/29-fix-ftbfs-as-needed.patch | 14 +-
debian/patches/30-usb-warning-filters.patch | 2 +-
.../patches/32-disable-guest-version-check.patch | 2 +-
debian/patches/36-fix-ftbfs-xserver-112.patch | 6 +-
debian/patches/37-wheezy-kernel-drm.patch | 35 +-
debian/patches/38-security-fixes-2014-01.patch | 471 ---------------------
debian/patches/CVE-2013-0420.patch | 15 -
debian/patches/CVE-2014-0981.patch | 53 ---
debian/patches/CVE-2014-0983.patch | 62 ---
debian/patches/CVE-2015-0377.patch | 20 -
debian/patches/CVE-2015-0418.patch | 32 --
debian/patches/CVE-2015-3456.patch | 74 ----
debian/patches/cve-2012-3221.patch | 18 -
debian/patches/series | 8 -
25 files changed, 152 insertions(+), 867 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d7635a1..e23dd06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (4.1.40-dfsg-1+deb7u1) wheezy-security; urgency=medium
+
+ * New upstream release.
+ * Remove all the CVE related patches, and refresh patches.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Fri, 28 Aug 2015 16:01:27 +0200
+
virtualbox (4.1.18-dfsg-2+deb7u5) wheezy-security; urgency=medium
* d/p/CVE-2015-3456.patch fix for CVE-2015-3456 a.k.a. VENOM
diff --git a/debian/patches/01-build-arch.patch b/debian/patches/01-build-arch.patch
index 5d1b31a..08f6139 100644
--- a/debian/patches/01-build-arch.patch
+++ b/debian/patches/01-build-arch.patch
@@ -4,7 +4,7 @@ Author: Michael Meskes <meskes at debian.org>
diff -urNad virtualbox-ose-3.0.8-dfsg~/configure virtualbox-ose-3.0.8-dfsg/configure
--- virtualbox-ose-3.0.8-dfsg~/configure 2009-10-07 11:27:13.000000000 +0200
+++ virtualbox-ose-3.0.8-dfsg/configure 2009-10-07 13:41:49.012963906 +0200
-@@ -314,7 +314,7 @@
+@@ -329,7 +329,7 @@
check_environment()
{
test_header environment
diff --git a/debian/patches/04-vboxdrv-references.patch b/debian/patches/04-vboxdrv-references.patch
index 04ac674..660f7be 100644
--- a/debian/patches/04-vboxdrv-references.patch
+++ b/debian/patches/04-vboxdrv-references.patch
@@ -1,10 +1,11 @@
Description: Change error messages for vboxdrv failure, according to virtualbox-ose-dkms.
Author: Daniel Hahler <ubuntu at thequod.de>
-diff -urNad virtualbox-ose-4.0.2-dfsg/src/VBox/VMM/VMMR3/VM.cpp virtualbox-ose-4.0.2-dfsg/src/VBox/VMM/VMMR3/VM.cpp
---- virtualbox-ose-4.0.2-dfsg/src/VBox/VMM/VMMR3/VM.cpp 2011-01-20 11:55:54.000000000 +0100
-+++ virtualbox-ose-4.0.2-dfsg/src/VBox/VMM/VMMR3/VM.cpp 2011-01-20 11:56:18.215472116 +0100
-@@ -289,10 +289,8 @@
+Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/VMM/VMMR3/VM.cpp
++++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp
+@@ -307,10 +307,8 @@
#ifdef RT_OS_LINUX
case VERR_SUPDRV_COMPONENT_NOT_FOUND:
@@ -17,7 +18,7 @@ diff -urNad virtualbox-ose-4.0.2-dfsg/src/VBox/VMM/VMMR3/VM.cpp virtualbox-ose-4
break;
#endif
-@@ -334,10 +332,8 @@
+@@ -373,10 +371,8 @@
{
case VERR_VM_DRIVER_LOAD_ERROR:
#ifdef RT_OS_LINUX
@@ -30,7 +31,7 @@ diff -urNad virtualbox-ose-4.0.2-dfsg/src/VBox/VMM/VMMR3/VM.cpp virtualbox-ose-4
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
-@@ -376,10 +372,8 @@
+@@ -415,10 +411,8 @@
case VERR_INVALID_HANDLE: /** @todo track down and fix this error. */
case VERR_VM_DRIVER_NOT_INSTALLED:
#ifdef RT_OS_LINUX
diff --git a/debian/patches/06-xsession.patch b/debian/patches/06-xsession.patch
index 2181015..448f289 100644
--- a/debian/patches/06-xsession.patch
+++ b/debian/patches/06-xsession.patch
@@ -4,7 +4,7 @@ Author: Michael Meskes <meskes at debian.org>
diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/x11/Installer/98vboxadd-xclient virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/x11/Installer/98vboxadd-xclient
--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2009-10-07 11:27:13.000000000 +0200
+++ virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2009-10-07 13:42:27.862988136 +0200
-@@ -40,9 +40,9 @@
+@@ -42,9 +42,9 @@
no_display=1
fi
diff --git a/debian/patches/07-vboxnetflt-reference.patch b/debian/patches/07-vboxnetflt-reference.patch
index 8a14aa3..b302fb1 100644
--- a/debian/patches/07-vboxnetflt-reference.patch
+++ b/debian/patches/07-vboxnetflt-reference.patch
@@ -4,7 +4,7 @@ Author: Michael Meskes <meskes at debian.org>
diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Devices/Network/DrvIntNet.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Devices/Network/DrvIntNet.cpp
--- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Devices/Network/DrvIntNet.cpp 2010-11-28 18:24:07.000000000 +0100
+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Devices/Network/DrvIntNet.cpp 2011-01-01 23:39:33.408286663 +0100
-@@ -1569,7 +1569,7 @@
+@@ -1692,7 +1692,7 @@
return VERR_PDM_NO_ATTACHED_DRIVER;
}
return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
diff --git a/debian/patches/13-module-mismatch.patch b/debian/patches/13-module-mismatch.patch
index 9783a83..b63962f 100644
--- a/debian/patches/13-module-mismatch.patch
+++ b/debian/patches/13-module-mismatch.patch
@@ -4,7 +4,7 @@ Author: Daniel Baumann <daniel at debian.org>
diff -urNad virtualbox-ose-4.0.2-dfsg/src/VBox/VMM/VMMR3/VM.cpp virtualbox-ose-3.0.8-dfsg/src/VBox/VMM/VMMR3/VM.cpp
--- virtualbox-ose-4.0.2-dfsg/src/VBox/VMM/VMMR3/VM.cpp 2011-01-20 11:58:26.000000000 +0100
+++ virtualbox-ose-4.0.2-dfsg/src/VBox/VMM/VMMR3/VM.cpp 2011-01-20 11:58:27.000000000 +0100
-@@ -410,9 +410,11 @@
+@@ -422,9 +422,11 @@
break;
case VERR_VERSION_MISMATCH:
case VERR_VM_DRIVER_VERSION_MISMATCH:
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 351e1dc..04e7fe8 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -3,9 +3,11 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
Author: Daniel Hahler <ubuntu at thequod.de>, Felix Geyer <debfx-pkg at fobos.de>
diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
---- a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
-@@ -65,6 +65,8 @@ void UIUpdateManager::shutdown()
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
+@@ -65,6 +65,8 @@
void UIUpdateManager::sltForceCheck()
{
@@ -14,10 +16,11 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
/* Force call for new version check: */
sltCheckIfUpdateIsNecessary(true);
}
-diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2010-12-17 16:14:24.000000000 +0100
-+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2011-01-02 00:03:55.120533579 +0100
-@@ -501,6 +501,10 @@
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+@@ -540,6 +540,10 @@
#endif /* !VBOX_WITH_NETFLT */
break;
}
@@ -28,10 +31,11 @@ diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/setti
default:
break;
}
-diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
---- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
-@@ -438,7 +438,6 @@ void UIActionPool::createActions()
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
+@@ -438,7 +438,6 @@
#ifdef VBOX_WITH_REGISTRATION
m_pool[UIActionIndex_Simple_Register] = new PerformRegisterAction(this);
#endif /* VBOX_WITH_REGISTRATION */
@@ -39,7 +43,7 @@ diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp b/src/VB
m_pool[UIActionIndex_Simple_About] = new ShowAboutAction(this);
}
-@@ -472,9 +471,6 @@ void UIActionPool::createMenus()
+@@ -472,9 +471,6 @@
m_pool[UIActionIndex_Simple_Update]->setVisible(false);
#endif
#if !(defined(Q_WS_MAC) && (QT_VERSION < 0x040700))
@@ -49,10 +53,11 @@ diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp b/src/VB
if (m_pool[UIActionIndex_Simple_About])
delete m_pool[UIActionIndex_Simple_About];
m_pool[UIActionIndex_Simple_About] = new ShowAboutAction(this);
-diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
---- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
-+++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
-@@ -45,7 +45,6 @@ enum UIActionIndex
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
+@@ -45,7 +45,6 @@
#ifdef VBOX_WITH_REGISTRATION
UIActionIndex_Simple_Register,
#endif /* VBOX_WITH_REGISTRATION */
@@ -60,10 +65,11 @@ diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h b/src/VBox
UIActionIndex_Simple_About,
/* Maximum index: */
-diff --git a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp
---- a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp
-@@ -1747,12 +1747,6 @@ void VBoxSelectorWnd::prepareMenuHelp(QMenu *pMenu)
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp
+@@ -1751,12 +1751,6 @@
pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Register));
#endif /* VBOX_WITH_REGISTRATION */
@@ -76,7 +82,7 @@ diff --git a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp b/sr
pMenu->addAction(gActionPool->action(UIActionIndex_Simple_About));
/* Configure connections: */
-@@ -1768,8 +1762,6 @@ void VBoxSelectorWnd::prepareMenuHelp(QMenu *pMenu)
+@@ -1772,8 +1766,6 @@
VBoxGlobal::connect(gEDataEvents, SIGNAL(sigCanShowRegistrationDlg(bool)),
gActionPool->action(UIActionIndex_Simple_Register), SLOT(setEnabled(bool)));
#endif /* VBOX_WITH_REGISTRATION */
diff --git a/debian/patches/18-system-xorg.patch b/debian/patches/18-system-xorg.patch
index 4b330b2..2607573 100644
--- a/debian/patches/18-system-xorg.patch
+++ b/debian/patches/18-system-xorg.patch
@@ -1,10 +1,11 @@
Description: Build the X.Org driver only for the selected system X Server version.
Author: Michael Meskes <meskes at debian.org>, Felix Geyer <debfx-pkg at fobos.de>
-diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
---- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-@@ -40,8 +40,8 @@ LIBRARIES += \
+Index: virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
++++ virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+@@ -40,8 +40,8 @@
VBoxGuestR3LibShared
ifndef VBOX_ONLY_TESTSUITE
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
@@ -15,21 +16,24 @@ diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Addi
endif
endif
LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
-diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL
+Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
++++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+@@ -63,18 +63,12 @@
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)/1.3/xorg \
+- $(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 \
@@ -40,9 +44,10 @@ diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Addition
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
-diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
---- a/src/VBox/Additions/x11/Makefile.kmk
-+++ b/src/VBox/Additions/x11/Makefile.kmk
+Index: virtualbox/src/VBox/Additions/x11/Makefile.kmk
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/x11/Makefile.kmk
++++ virtualbox/src/VBox/Additions/x11/Makefile.kmk
@@ -17,6 +17,10 @@
SUB_DEPTH = ../../../..
include $(KBUILD_PATH)/subheader.kmk
@@ -54,10 +59,11 @@ diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefi
# Include sub-makefiles.
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
-diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
---- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
-+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
-@@ -23,7 +23,6 @@ include $(KBUILD_PATH)/subheader.kmk
+Index: virtualbox/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
++++ virtualbox/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+@@ -29,7 +29,6 @@
# vboxmouse_drv
#
if1of ($(KBUILD_TARGET), linux)
@@ -65,7 +71,7 @@ diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/
vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
vboxmouse_drv_DEFS.linux = linux
vboxmouse_drv_DEFS.x86 += __i386__
-@@ -59,7 +58,6 @@ endif
+@@ -65,7 +64,6 @@
#
# vboxmouse_drv_70
#
@@ -73,7 +79,7 @@ diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/
vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_70_DEFS = \
XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE
-@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \
+@@ -86,7 +84,6 @@
#
# vboxmouse_drv_71
#
@@ -81,7 +87,7 @@ diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/
vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
vboxmouse_drv_71_INCS := \
-@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \
+@@ -103,7 +100,6 @@
#
# vboxmouse_drv_13
#
@@ -89,7 +95,7 @@ diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/
vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_13_INCS := \
-@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \
+@@ -117,7 +113,6 @@
#
# vboxmouse_drv_14
#
@@ -97,7 +103,7 @@ diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/
vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_14_INCS := \
-@@ -126,7 +121,6 @@ endif
+@@ -131,7 +126,6 @@
#
# vboxmouse_drv_15
#
@@ -105,7 +111,7 @@ diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/
vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_15_INCS := \
-@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \
+@@ -145,7 +139,6 @@
#
# vboxmouse_drv_16
#
@@ -113,10 +119,11 @@ diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/
vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_16_INCS := \
-diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-@@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk
+Index: virtualbox/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
++++ virtualbox/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+@@ -51,7 +51,6 @@
# vboxvideo_drv
#
if1of ($(KBUILD_TARGET), linux)
@@ -124,7 +131,7 @@ diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/
endif # target linux
vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
vboxvideo_drv_DEFS.linux = linux
-@@ -89,7 +88,6 @@ endif # target linux
+@@ -121,7 +120,6 @@
# base keywords instead of using .solaris or .linux.
# Also it is *important* to use := and not = when deriving a property.
#
@@ -132,96 +139,112 @@ diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/
vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
if1of ($(KBUILD_TARGET), linux)
vboxvideo_drv_70_CFLAGS += \
-@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES)
+@@ -142,7 +140,6 @@
#
# 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 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES)
+ vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
+@@ -157,7 +154,6 @@
#
# 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 +142,6 @@ vboxvideo_drv_13_SOURCES = \
+ vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
+@@ -171,7 +167,6 @@
#
# 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 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES)
+ vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
+@@ -185,7 +180,6 @@
#
# 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 +186,6 @@ endif
+ vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
+@@ -206,7 +200,6 @@
#
# 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)
-@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
+@@ -220,7 +213,6 @@
#
# 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_drv_15_DEFS)
-@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
+@@ -234,7 +226,6 @@
#
# 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 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
+@@ -248,7 +239,6 @@
#
# 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)
-@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
+@@ -262,7 +252,6 @@
#
# 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_drv_15_DEFS)
-@@ -320,7 +309,6 @@ vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
+@@ -276,7 +265,6 @@
#
# 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_drv_15_DEFS)
-@@ -347,7 +336,6 @@ vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
+@@ -290,7 +278,6 @@
#
# 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_drv_15_DEFS)
-@@ -317,6 +306,23 @@ vboxvideo_drv_111_INCS = \
- vboxvideo_drv_112_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
+@@ -304,7 +291,6 @@
+ #
+ # 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
+@@ -318,7 +304,6 @@
+ #
+ # vboxvideo_drv_114
+ #
+-DLLS += vboxvideo_drv_114
+ vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101400000
+@@ -329,6 +316,23 @@
+ vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_15_SOURCES)
+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
diff --git a/debian/patches/23-remove-invalid-chars-check.patch b/debian/patches/23-remove-invalid-chars-check.patch
index 615707c..d3529e4 100644
--- a/debian/patches/23-remove-invalid-chars-check.patch
+++ b/debian/patches/23-remove-invalid-chars-check.patch
@@ -5,7 +5,7 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
diff -Nur virtualbox-ose-3.1.53-dfsg.orig/configure virtualbox-ose-3.1.53-dfsg/configure
--- virtualbox-ose-3.1.53-dfsg.orig/configure 2010-05-13 19:56:04.000000000 +0200
+++ virtualbox-ose-3.1.53-dfsg/configure 2010-05-17 13:07:47.848976527 +0200
-@@ -157,11 +157,6 @@
+@@ -161,11 +161,6 @@
# the restricting tool is ar (mri mode).
INVALID_CHARS="[^A-Za-z0-9/\\$:._-]"
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index 0ee4a1e..57d3d0f 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -5,7 +5,7 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Main/src-client/ConsoleImpl2.cpp
--- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp 2010-12-22 15:00:24.000000000 +0100
+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Main/src-client/ConsoleImpl2.cpp 2011-01-02 00:15:06.952597774 +0100
-@@ -2890,36 +2890,12 @@
+@@ -3137,36 +3137,12 @@
if ( enmFsTypeFile == RTFSTYPE_EXT4
|| enmFsTypeFile == RTFSTYPE_XFS)
{
diff --git a/debian/patches/28-no-selinux-fedora.patch b/debian/patches/28-no-selinux-fedora.patch
index 98fd3d9..6530d43 100644
--- a/debian/patches/28-no-selinux-fedora.patch
+++ b/debian/patches/28-no-selinux-fedora.patch
@@ -4,7 +4,7 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Additions/linux/Makefile.kmk virtualbox-ose-4.0.0-dfsg/src/VBox/Additions/linux/Makefile.kmk
--- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Additions/linux/Makefile.kmk 2010-12-05 19:17:42.000000000 +0100
+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Additions/linux/Makefile.kmk 2011-01-02 11:02:43.379712209 +0100
-@@ -323,9 +323,7 @@
+@@ -307,9 +307,7 @@
lnx_add_inst-noexec_INSTTYPE = stage
lnx_add_inst-noexec_SOURCES = \
$(VBOX_REL_X11_ADD_INST)vboxclient.desktop \
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 5fa3be7..242d1cc 100644
--- a/debian/patches/29-fix-ftbfs-as-needed.patch
+++ b/debian/patches/29-fix-ftbfs-as-needed.patch
@@ -3,12 +3,12 @@ Origin: vendor, http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-emul
--- VirtualBox-4.0.0_OSE/Config.kmk
+++ VirtualBox-4.0.0_OSE/Config.kmk
-@@ -4082,7 +4082,7 @@
- TEMPLATE_VBOXBLDPROG_LDFLAGS.amd64 = -m64
- TEMPLATE_VBOXBLDPROG_LDFLAGS.sparc64 = -m64
+@@ -4552,7 +4552,7 @@
+ TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64
+ TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64
ifeq ($(KBUILD_HOST),linux)
--TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl
-+TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl crypt
+-TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl
++TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl crypt
else ifeq ($(KBUILD_HOST),os2)
- TEMPLATE_VBOXBLDPROG_TOOL = GXX3OMF
- TEMPLATE_VBOXBLDPROG_LIBS = socket iconv
+ TEMPLATE_VBoxBldProg_TOOL = GXX3OMF
+ TEMPLATE_VBoxBldProg_LIBS = socket iconv
diff --git a/debian/patches/30-usb-warning-filters.patch b/debian/patches/30-usb-warning-filters.patch
index 306ed44..f9db17b 100644
--- a/debian/patches/30-usb-warning-filters.patch
+++ b/debian/patches/30-usb-warning-filters.patch
@@ -5,7 +5,7 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
--- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -1096,7 +1096,7 @@ bool UISettingsDialogMachine::isPageAvailable(int iPageId)
+@@ -1100,7 +1100,7 @@ bool UISettingsDialogMachine::isPageAvailable(int iPageId)
/* Get the USB controller object: */
CUSBController controller = m_machine.GetUSBController();
/* Show the machine error message if any: */
diff --git a/debian/patches/32-disable-guest-version-check.patch b/debian/patches/32-disable-guest-version-check.patch
index 8f8441e..0064404 100644
--- a/debian/patches/32-disable-guest-version-check.patch
+++ b/debian/patches/32-disable-guest-version-check.patch
@@ -4,7 +4,7 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
diff --git a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
--- a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
-@@ -40,6 +40,8 @@ public:
+@@ -43,6 +43,8 @@ public:
virtual int showNotify(const char *pcHeader, const char *pcBody)
{
diff --git a/debian/patches/36-fix-ftbfs-xserver-112.patch b/debian/patches/36-fix-ftbfs-xserver-112.patch
index 9c1267c..50734f0 100644
--- a/debian/patches/36-fix-ftbfs-xserver-112.patch
+++ b/debian/patches/36-fix-ftbfs-xserver-112.patch
@@ -9,6 +9,6 @@ Bug-Debian: http://bugs.debian.org/671061
#include <elf.h>
#include <unistd.h>
+#include "xorg-server.h"
- #include "xf86.h"
-
- #define VBOX_NO_MESA_PATCH_REPORTS
+ /** X server message type definitions. */
+ typedef enum {
+ X_PROBED, /* Value was probed */
diff --git a/debian/patches/37-wheezy-kernel-drm.patch b/debian/patches/37-wheezy-kernel-drm.patch
index 343d1a0..f473245 100644
--- a/debian/patches/37-wheezy-kernel-drm.patch
+++ b/debian/patches/37-wheezy-kernel-drm.patch
@@ -2,12 +2,13 @@ Description: Fix build failure with the Debian wheezy kernel which backports the
Bug-Debian: http://bugs.debian.org/703358
Author: Felix Geyer <fgeyer at debian.org>
-diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.c b/src/VBox/Additions/linux/drm/vboxvideo_drm.c
---- a/src/VBox/Additions/linux/drm/vboxvideo_drm.c
-+++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.c
-@@ -73,6 +73,12 @@
- #include "drm/drmP.h"
- #include "vboxvideo_drm.h"
+Index: virtualbox/src/VBox/Additions/linux/drm/vboxvideo_drm.c
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/linux/drm/vboxvideo_drm.c
++++ virtualbox/src/VBox/Additions/linux/drm/vboxvideo_drm.c
+@@ -97,6 +97,12 @@
+ # endif
+ #endif
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
+# ifdef DRM_IOCTL_MODE_GETPLANE
@@ -18,30 +19,30 @@ diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.c b/src/VBox/Additions/l
static struct pci_device_id pciidlist[] = {
vboxvideo_PCI_IDS
};
-@@ -85,7 +91,7 @@ int vboxvideo_driver_load(struct drm_device * dev, unsigned long flags)
+@@ -109,7 +115,7 @@
return 0;
#endif
}
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) || defined(DRM_DEBIAN70)
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_FOPS_AS_POINTER)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_FOPS_AS_POINTER) || defined(DRM_DEBIAN70)
/* since linux-3.3.0-rc1 drm_driver::fops is pointer */
static struct file_operations driver_fops =
{
-@@ -109,7 +115,7 @@ static struct drm_driver driver =
+@@ -134,7 +140,7 @@
.get_map_ofs = drm_core_get_map_ofs,
.get_reg_ofs = drm_core_get_reg_ofs,
#endif
--# if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) && !defined(DRM_DEBIAN70)
+-# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_FOPS_AS_POINTER)
++# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_FOPS_AS_POINTER) && !defined(DRM_DEBIAN70)
.fops =
{
.owner = THIS_MODULE,
-@@ -126,7 +132,7 @@ static struct drm_driver driver =
+@@ -150,7 +156,7 @@
+ .mmap = drm_mmap,
.poll = drm_poll,
- .fasync = drm_fasync,
},
--#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */
-+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) || defined(DRM_DEBIAN70) */
+-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_FOPS_AS_POINTER) */
++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_FOPS_AS_POINTER) || defined(DRM_DEBIAN70) */
.fops = &driver_fops,
#endif
- #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) && !defined(DRM_RHEL61)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61)
diff --git a/debian/patches/38-security-fixes-2014-01.patch b/debian/patches/38-security-fixes-2014-01.patch
deleted file mode 100644
index cebaf6a..0000000
--- a/debian/patches/38-security-fixes-2014-01.patch
+++ /dev/null
@@ -1,471 +0,0 @@
---- a/include/VBox/VMMDev.h
-+++ b/include/VBox/VMMDev.h
-@@ -114,6 +114,10 @@
-
- /** Maximum request packet size. */
- #define VMMDEV_MAX_VMMDEVREQ_SIZE _1M
-+/** Maximum number of HGCM parameters. */
-+#define VMMDEV_MAX_HGCM_PARMS 1024
-+/** Maximum total size of hgcm buffers in one call. */
-+#define VMMDEV_MAX_HGCM_DATA_SIZE UINT32_C(0x7FFFFFFF)
-
- /**
- * VMMDev request types.
---- a/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp
-+++ b/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp
-@@ -613,6 +613,13 @@
-
- if (fShape)
- {
-+ if (pShape->u32Width > 8192 || pShape->u32Height > 8192)
-+ {
-+ Log(("vbvaMousePointerShape: unsupported size %ux%u\n",
-+ pShape->u32Width, pShape->u32Height));
-+ return VERR_INVALID_PARAMETER;
-+ }
-+
- cbPointerData = ((((pShape->u32Width + 7) / 8) * pShape->u32Height + 3) & ~3)
- + pShape->u32Width * 4 * pShape->u32Height;
- }
---- a/src/VBox/Devices/VMMDev/VMMDev.cpp
-+++ b/src/VBox/Devices/VMMDev/VMMDev.cpp
-@@ -795,6 +795,20 @@
-
- #endif /* VBOX_WITH_PAGE_SHARING */
-
-+static int vmmdevVerifyPointerShape(VMMDevReqMousePointer *pReq)
-+{
-+ /* Should be enough for most mouse pointers. */
-+ if (pReq->width > 8192 || pReq->height > 8192)
-+ return VERR_INVALID_PARAMETER;
-+
-+ uint32_t cbShape = (pReq->width + 7) / 8 * pReq->height; /* size of the AND mask */
-+ cbShape = ((cbShape + 3) & ~3) + pReq->width * 4 * pReq->height; /* + gap + size of the XOR mask */
-+ if (RT_UOFFSETOF(VMMDevReqMousePointer, pointerData) + cbShape > pReq->header.size)
-+ return VERR_INVALID_PARAMETER;
-+
-+ return VINF_SUCCESS;
-+}
-+
- /**
- * Port I/O Handler for the generic request interface
- * @see FNIOMIOPORTOUT for details.
-@@ -1163,6 +1177,10 @@
- /* forward call to driver */
- if (fShape)
- {
-+ pRequestHeader->rc = vmmdevVerifyPointerShape(pointerShape);
-+ if (RT_FAILURE(pRequestHeader->rc))
-+ break;
-+
- pThis->pDrv->pfnUpdatePointerShape(pThis->pDrv,
- fVisible,
- fAlpha,
---- a/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp
-+++ b/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp
-@@ -97,6 +97,9 @@
- */
- VBOXHGCMSVCPARM *paHostParms;
-
-+ /* Number of elements in paHostParms */
-+ uint32_t cHostParms;
-+
- /* Linear pointer parameters information. */
- int cLinPtrs;
-
-@@ -250,8 +253,6 @@
- {
- int rc = VINF_SUCCESS;
-
-- AssertRelease (u32Size > 0);
--
- VBOXHGCMLINPTR *pLinPtr = &paLinPtrs[iLinPtr];
-
- /* Take the offset into the current page also into account! */
-@@ -294,8 +295,6 @@
- GCPtr += PAGE_SIZE;
- }
-
-- AssertRelease (iPage == cPages);
--
- return rc;
- }
-
-@@ -310,7 +309,7 @@
-
- VBOXHGCMLINPTR *pLinPtr = &paLinPtrs[iLinPtr];
-
-- AssertRelease (u32Size > 0 && iParm == (uint32_t)pLinPtr->iParm);
-+ AssertLogRelReturn(u32Size > 0 && iParm == (uint32_t)pLinPtr->iParm, VERR_INVALID_PARAMETER);
-
- RTGCPHYS GCPhysDst = pLinPtr->paPages[0] + pLinPtr->offFirstPage;
- uint8_t *pu8Src = (uint8_t *)pvHost;
-@@ -332,12 +331,17 @@
-
- if (cbWrite >= u32Size)
- {
-- PDMDevHlpPhysWrite(pDevIns, GCPhysDst, pu8Src, u32Size);
-+ rc = PDMDevHlpPhysWrite(pDevIns, GCPhysDst, pu8Src, u32Size);
-+ if (RT_FAILURE(rc))
-+ break;
-+
- u32Size = 0;
- break;
- }
-
- PDMDevHlpPhysWrite(pDevIns, GCPhysDst, pu8Src, cbWrite);
-+ if (RT_FAILURE(rc))
-+ break;
-
- /* next */
- u32Size -= cbWrite;
-@@ -346,8 +350,10 @@
- GCPhysDst = pLinPtr->paPages[iPage];
- }
-
-- AssertRelease (iPage == pLinPtr->cPages);
-- Assert(u32Size == 0);
-+ if (RT_SUCCESS(rc))
-+ {
-+ AssertLogRelReturn(iPage == pLinPtr->cPages, VERR_INVALID_PARAMETER);
-+ }
-
- return rc;
- }
-@@ -623,6 +629,20 @@
- Log(("vmmdevHGCMCall: cParms = %d\n", cParms));
-
- /*
-+ * Sane upper limit.
-+ */
-+ if (cParms > VMMDEV_MAX_HGCM_PARMS)
-+ {
-+ static int s_cRelWarn;
-+ if (s_cRelWarn < 50)
-+ {
-+ s_cRelWarn++;
-+ LogRel(("VMMDev: request packet with too many parameters (%d). Refusing operation.\n", cParms));
-+ }
-+ return VERR_INVALID_PARAMETER;
-+ }
-+
-+ /*
- * Compute size of required memory buffer.
- */
-
-@@ -654,6 +674,12 @@
- if (pGuestParm->u.Pointer.size > 0)
- {
- /* Only pointers with some actual data are counted. */
-+ if (pGuestParm->u.Pointer.size > VMMDEV_MAX_HGCM_DATA_SIZE - cbCmdSize)
-+ {
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
-+ }
-+
- cbCmdSize += pGuestParm->u.Pointer.size;
-
- cLinPtrs++;
-@@ -667,6 +693,12 @@
-
- case VMMDevHGCMParmType_PageList:
- {
-+ if (pGuestParm->u.PageList.size > VMMDEV_MAX_HGCM_DATA_SIZE - cbCmdSize)
-+ {
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
-+ }
-+
- cbCmdSize += pGuestParm->u.PageList.size;
- Log(("vmmdevHGCMCall: pagelist size = %d\n", pGuestParm->u.PageList.size));
- } break;
-@@ -706,6 +738,12 @@
- if (pGuestParm->u.Pointer.size > 0)
- {
- /* Only pointers with some actual data are counted. */
-+ if (pGuestParm->u.Pointer.size > VMMDEV_MAX_HGCM_DATA_SIZE - cbCmdSize)
-+ {
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
-+ }
-+
- cbCmdSize += pGuestParm->u.Pointer.size;
-
- cLinPtrs++;
-@@ -719,6 +757,12 @@
-
- case VMMDevHGCMParmType_PageList:
- {
-+ if (pGuestParm->u.PageList.size > VMMDEV_MAX_HGCM_DATA_SIZE - cbCmdSize)
-+ {
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
-+ }
-+
- cbCmdSize += pGuestParm->u.PageList.size;
- Log(("vmmdevHGCMCall: pagelist size = %d\n", pGuestParm->u.PageList.size));
- } break;
-@@ -787,6 +831,7 @@
- uint8_t *pcBuf = (uint8_t *)pHostParm + cParms * sizeof (VBOXHGCMSVCPARM);
-
- pCmd->paHostParms = pHostParm;
-+ pCmd->cHostParms = cParms;
-
- uint32_t iLinPtr = 0;
- RTGCPHYS *pPages = (RTGCPHYS *)((uint8_t *)pCmd->paLinPtrs + sizeof (VBOXHGCMLINPTR) *cLinPtrs);
-@@ -1135,6 +1180,20 @@
- Log(("vmmdevHGCMCall: cParms = %d\n", cParms));
-
- /*
-+ * Sane upper limit.
-+ */
-+ if (cParms > VMMDEV_MAX_HGCM_PARMS)
-+ {
-+ static int s_cRelWarn;
-+ if (s_cRelWarn < 50)
-+ {
-+ s_cRelWarn++;
-+ LogRel(("VMMDev: request packet with too many parameters (%d). Refusing operation.\n", cParms));
-+ }
-+ return VERR_INVALID_PARAMETER;
-+ }
-+
-+ /*
- * Compute size of required memory buffer.
- */
-
-@@ -1289,6 +1348,7 @@
- uint8_t *pu8Buf = (uint8_t *)pHostParm + cParms * sizeof (VBOXHGCMSVCPARM);
-
- pCmd->paHostParms = pHostParm;
-+ pCmd->cHostParms = cParms;
-
- uint32_t iParm;
- int iLinPtr = 0;
-@@ -1758,6 +1818,88 @@
- return VERR_INVALID_PARAMETER;
- }
-
-+#ifdef VBOX_WITH_64_BITS_GUESTS
-+static int vmmdevHGCMParmVerify64(HGCMFunctionParameter64 *pGuestParm, VBOXHGCMSVCPARM *pHostParm)
-+{
-+ int rc = VERR_INVALID_PARAMETER;
-+
-+ switch (pGuestParm->type)
-+ {
-+ case VMMDevHGCMParmType_32bit:
-+ if (pHostParm->type == VBOX_HGCM_SVC_PARM_32BIT)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ case VMMDevHGCMParmType_64bit:
-+ if (pHostParm->type == VBOX_HGCM_SVC_PARM_64BIT)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ case VMMDevHGCMParmType_LinAddr_In: /* In (read) */
-+ case VMMDevHGCMParmType_LinAddr_Out: /* Out (write) */
-+ case VMMDevHGCMParmType_LinAddr: /* In & Out */
-+ if ( pHostParm->type == VBOX_HGCM_SVC_PARM_PTR
-+ && pGuestParm->u.Pointer.size >= pHostParm->u.pointer.size)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ case VMMDevHGCMParmType_PageList:
-+ if ( pHostParm->type == VBOX_HGCM_SVC_PARM_PTR
-+ && pGuestParm->u.PageList.size >= pHostParm->u.pointer.size)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ default:
-+ AssertLogRelMsgFailed(("hgcmCompleted: invalid parameter type %08X\n", pGuestParm->type));
-+ break;
-+ }
-+
-+ return rc;
-+}
-+#endif /* VBOX_WITH_64_BITS_GUESTS */
-+
-+#ifdef VBOX_WITH_64_BITS_GUESTS
-+static int vmmdevHGCMParmVerify32(HGCMFunctionParameter32 *pGuestParm, VBOXHGCMSVCPARM *pHostParm)
-+#else
-+static int vmmdevHGCMParmVerify32(HGCMFunctionParameter *pGuestParm, VBOXHGCMSVCPARM *pHostParm)
-+#endif
-+{
-+ int rc = VERR_INVALID_PARAMETER;
-+
-+ switch (pGuestParm->type)
-+ {
-+ case VMMDevHGCMParmType_32bit:
-+ if (pHostParm->type == VBOX_HGCM_SVC_PARM_32BIT)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ case VMMDevHGCMParmType_64bit:
-+ if (pHostParm->type == VBOX_HGCM_SVC_PARM_64BIT)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ case VMMDevHGCMParmType_LinAddr_In: /* In (read) */
-+ case VMMDevHGCMParmType_LinAddr_Out: /* Out (write) */
-+ case VMMDevHGCMParmType_LinAddr: /* In & Out */
-+ if ( pHostParm->type == VBOX_HGCM_SVC_PARM_PTR
-+ && pGuestParm->u.Pointer.size >= pHostParm->u.pointer.size)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ case VMMDevHGCMParmType_PageList:
-+ if ( pHostParm->type == VBOX_HGCM_SVC_PARM_PTR
-+ && pGuestParm->u.PageList.size >= pHostParm->u.pointer.size)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ default:
-+ AssertLogRelMsgFailed(("hgcmCompleted: invalid parameter type %08X\n", pGuestParm->type));
-+ break;
-+ }
-+
-+ return rc;
-+}
-+
- #define PDMIHGCMPORT_2_VMMDEVSTATE(pInterface) ( (VMMDevState *) ((uintptr_t)pInterface - RT_OFFSETOF(VMMDevState, IHGCMPort)) )
-
- DECLCALLBACK(void) hgcmCompletedWorker (PPDMIHGCMPORT pInterface, int32_t result, PVBOXHGCMCMD pCmd)
-@@ -1858,6 +2000,8 @@
- VMMDevHGCMCall *pHGCMCall = (VMMDevHGCMCall *)pHeader;
-
- uint32_t cParms = pHGCMCall->cParms;
-+ if (cParms != pCmd->cHostParms)
-+ rc = VERR_INVALID_PARAMETER;
-
- VBOXHGCMSVCPARM *pHostParm = pCmd->paHostParms;
-
-@@ -1866,8 +2010,12 @@
-
- HGCMFunctionParameter64 *pGuestParm = VMMDEV_HGCM_CALL_PARMS64(pHGCMCall);
-
-- for (i = 0; i < cParms; i++, pGuestParm++, pHostParm++)
-+ for (i = 0; i < cParms && RT_SUCCESS(rc); i++, pGuestParm++, pHostParm++)
- {
-+ rc = vmmdevHGCMParmVerify64(pGuestParm, pHostParm);
-+ if (RT_FAILURE(rc))
-+ break;
-+
- switch (pGuestParm->type)
- {
- case VMMDevHGCMParmType_32bit:
-@@ -1894,7 +2042,6 @@
- /* Use the saved page list to write data back to the guest RAM. */
- rc = vmmdevHGCMWriteLinPtr (pVMMDevState->pDevIns, i, pHostParm->u.pointer.addr,
- size, iLinPtr, pCmd->paLinPtrs);
-- AssertReleaseRC(rc);
- }
-
- /* All linptrs with size > 0 were saved. Advance the index to the next linptr. */
-@@ -1945,7 +2092,8 @@
- default:
- {
- /* This indicates that the guest request memory was corrupted. */
-- AssertReleaseMsgFailed(("hgcmCompleted: invalid parameter type %08X\n", pGuestParm->type));
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
- }
- }
- }
-@@ -1961,6 +2109,8 @@
- VMMDevHGCMCall *pHGCMCall = (VMMDevHGCMCall *)pHeader;
-
- uint32_t cParms = pHGCMCall->cParms;
-+ if (cParms != pCmd->cHostParms)
-+ rc = VERR_INVALID_PARAMETER;
-
- VBOXHGCMSVCPARM *pHostParm = pCmd->paHostParms;
-
-@@ -1969,8 +2119,12 @@
-
- HGCMFunctionParameter32 *pGuestParm = VMMDEV_HGCM_CALL_PARMS32(pHGCMCall);
-
-- for (i = 0; i < cParms; i++, pGuestParm++, pHostParm++)
-+ for (i = 0; i < cParms && RT_SUCCESS(rc); i++, pGuestParm++, pHostParm++)
- {
-+ rc = vmmdevHGCMParmVerify32(pGuestParm, pHostParm);
-+ if (RT_FAILURE(rc))
-+ break;
-+
- switch (pGuestParm->type)
- {
- case VMMDevHGCMParmType_32bit:
-@@ -1996,7 +2150,6 @@
- {
- /* Use the saved page list to write data back to the guest RAM. */
- rc = vmmdevHGCMWriteLinPtr (pVMMDevState->pDevIns, i, pHostParm->u.pointer.addr, size, iLinPtr, pCmd->paLinPtrs);
-- AssertReleaseRC(rc);
- }
-
- /* All linptrs with size > 0 were saved. Advance the index to the next linptr. */
-@@ -2047,7 +2200,8 @@
- default:
- {
- /* This indicates that the guest request memory was corrupted. */
-- AssertReleaseMsgFailed(("hgcmCompleted: invalid parameter type %08X\n", pGuestParm->type));
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
- }
- }
- }
-@@ -2063,6 +2217,8 @@
- VMMDevHGCMCall *pHGCMCall = (VMMDevHGCMCall *)pHeader;
-
- uint32_t cParms = pHGCMCall->cParms;
-+ if (cParms != pCmd->cHostParms)
-+ rc = VERR_INVALID_PARAMETER;
-
- VBOXHGCMSVCPARM *pHostParm = pCmd->paHostParms;
-
-@@ -2071,8 +2227,12 @@
-
- HGCMFunctionParameter *pGuestParm = VMMDEV_HGCM_CALL_PARMS(pHGCMCall);
-
-- for (i = 0; i < cParms; i++, pGuestParm++, pHostParm++)
-+ for (i = 0; i < cParms && RT_SUCCESS(rc); i++, pGuestParm++, pHostParm++)
- {
-+ rc = vmmdevHGCMParmVerify32(pGuestParm, pHostParm);
-+ if (RT_FAILURE(rc))
-+ break;
-+
- switch (pGuestParm->type)
- {
- case VMMDevHGCMParmType_32bit:
-@@ -2098,7 +2258,6 @@
- {
- /* Use the saved page list to write data back to the guest RAM. */
- rc = vmmdevHGCMWriteLinPtr (pVMMDevState->pDevIns, i, pHostParm->u.pointer.addr, size, iLinPtr, pCmd->paLinPtrs);
-- AssertReleaseRC(rc);
- }
-
- /* All linptrs with size > 0 were saved. Advance the index to the next linptr. */
-@@ -2149,7 +2308,8 @@
- default:
- {
- /* This indicates that the guest request memory was corrupted. */
-- AssertReleaseMsgFailed(("hgcmCompleted: invalid parameter type %08X\n", pGuestParm->type));
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
- }
- }
- }
-@@ -2175,10 +2335,11 @@
- break;
- }
- }
-- else
-+
-+ if (RT_FAILURE(rc))
- {
-- /* Command type is wrong. Return error to the guest. */
-- pHeader->header.rc = rc;
-+ /* Command is wrong. Return HGCM error result to the guest. */
-+ pHeader->result = rc;
- }
-
- /* Mark request as processed. */
diff --git a/debian/patches/CVE-2013-0420.patch b/debian/patches/CVE-2013-0420.patch
deleted file mode 100644
index e301734..0000000
--- a/debian/patches/CVE-2013-0420.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: DevVGA: Do not draw more lines than necessary.
-Origin: upstream, https://www.virtualbox.org/changeset/44055/vbox
-Bug-Debian: http://bugs.debian.org/698292
-
---- virtualbox-4.1.18-dfsg.orig/src/VBox/Devices/Graphics/DevVGA.cpp
-+++ virtualbox-4.1.18-dfsg/src/VBox/Devices/Graphics/DevVGA.cpp
-@@ -1795,7 +1795,7 @@ static int vga_draw_text(VGAState *s, in
- cx_max_upd = -1;
- cx_min_upd = width;
-
-- for(cy = 0; cy < height; cy = cy + (1 << dscan)) {
-+ for(cy = 0; cy < (height - dscan); cy = cy + (1 << dscan)) {
- d1 = dest;
- src = s1;
- cx_min = width;
diff --git a/debian/patches/CVE-2014-0981.patch b/debian/patches/CVE-2014-0981.patch
deleted file mode 100644
index 7257f9d..0000000
--- a/debian/patches/CVE-2014-0981.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Nur VirtualBox-4.1.30/src/VBox/GuestHost/OpenGL/util/net.c VirtualBox-4.1.32/src/VBox/GuestHost/OpenGL/util/net.c
---- VirtualBox-4.1.30/src/VBox/GuestHost/OpenGL/util/net.c 2014-01-10 17:21:21.000000000 +0100
-+++ VirtualBox-4.1.32/src/VBox/GuestHost/OpenGL/util/net.c 2014-03-14 08:18:19.000000000 +0100
-@@ -957,7 +957,7 @@
- conn->InstantReclaim( conn, (CRMessage *) msg );
- }
-
--
-+#ifdef IN_GUEST
- /**
- * Called by the main receive function when we get a CR_MESSAGE_WRITEBACK
- * message. Writeback is used to implement glGet*() functions.
-@@ -990,7 +990,7 @@
- (*writeback)--;
- crMemcpy( dest_ptr, ((char *)rb) + sizeof(*rb), payload_len );
- }
--
-+#endif
-
- /**
- * This is used by the SPUs that do packing (such as Pack, Tilesort and
-@@ -1068,13 +1068,21 @@
- }
- break;
- case CR_MESSAGE_READ_PIXELS:
-- crError( "Can't handle read pixels" );
-+ crWarning( "Can't handle read pixels" );
- return;
- case CR_MESSAGE_WRITEBACK:
-+#ifdef IN_GUEST
- crNetRecvWriteback( &(pRealMsg->writeback) );
-+#else
-+ crWarning("CR_MESSAGE_WRITEBACK not expected\n");
-+#endif
- return;
- case CR_MESSAGE_READBACK:
-+#ifdef IN_GUEST
- crNetRecvReadback( &(pRealMsg->readback), len );
-+#else
-+ crWarning("CR_MESSAGE_READBACK not expected\n");
-+#endif
- return;
- case CR_MESSAGE_CRUT:
- /* nothing */
-@@ -1092,7 +1100,7 @@
- {
- char string[128];
- crBytesToString( string, sizeof(string), msg, len );
-- crError("crNetDefaultRecv: received a bad message: type=%d buf=[%s]\n"
-+ crWarning("crNetDefaultRecv: received a bad message: type=%d buf=[%s]\n"
- "Did you add a new message type and forget to tell "
- "crNetDefaultRecv() about it?\n",
- msg->header.type, string );
diff --git a/debian/patches/CVE-2014-0983.patch b/debian/patches/CVE-2014-0983.patch
deleted file mode 100644
index 3be5d9c..0000000
--- a/debian/patches/CVE-2014-0983.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_dispatch.py
-+++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_dispatch.py
-@@ -46,6 +46,7 @@
- for func_name in keys:
- current = 0
- array = ""
-+ condition = ""
- m = re.search( r"^(Color|Normal)([1234])(ub|b|us|s|ui|i|f|d)$", func_name )
- if m :
- current = 1
-@@ -68,6 +69,7 @@
- name = "texCoord"
- type = m.group(3) + m.group(2)
- array = "[texture-GL_TEXTURE0_ARB]"
-+ condition = "if (texture >= GL_TEXTURE0_ARB && texture < GL_TEXTURE0_ARB + CR_MAX_TEXTURE_UNITS)"
- m = re.match( r"^(Index)(ub|b|us|s|ui|i|f|d)$", func_name )
- if m :
- current = 1
-@@ -91,18 +93,23 @@
- name = string.lower( m.group(1)[:1] ) + m.group(1)[1:]
- type = m.group(3) + m.group(2)
- array = "[index]"
-+ condition = "if (index < CR_MAX_VERTEX_ATTRIBS)"
- if func_name == "VertexAttrib4NubARB":
- current = 1
- name = "vertexAttrib"
- type = "ub4"
- array = "[index]"
-+ condition = "if (index < CR_MAX_VERTEX_ATTRIBS)"
-
- if current:
- params = apiutil.Parameters(func_name)
- print 'void SERVER_DISPATCH_APIENTRY crServerDispatch%s( %s )' % ( func_name, apiutil.MakeDeclarationString(params) )
- print '{'
-- print '\tcr_server.head_spu->dispatch_table.%s( %s );' % (func_name, apiutil.MakeCallString(params) )
-- print "\tcr_server.current.c.%s.%s%s = cr_unpackData;" % (name,type,array)
-+ print '\t%s' % (condition)
-+ print '\t{'
-+ print '\t\tcr_server.head_spu->dispatch_table.%s( %s );' % (func_name, apiutil.MakeCallString(params) )
-+ print "\t\tcr_server.current.c.%s.%s%s = cr_unpackData;" % (name,type,array)
-+ print '\t}'
- print '}\n'
-
- print """
---- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_simpleget.py
-+++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_simpleget.py
-@@ -113,7 +113,14 @@
- *get_values = (%s)CR_MAX_TEXTURE_UNITS;
- }
- }
-- """ % (types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index])
-+ else if (GL_MAX_VERTEX_ATTRIBS_ARB==pname)
-+ {
-+ if (CR_MAX_VERTEX_ATTRIBS < (GLuint)*get_values)
-+ {
-+ *get_values = (%s)CR_MAX_VERTEX_ATTRIBS;
-+ }
-+ }
-+ """ % (types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index])
- print '\tcrServerReturnValue( get_values, tablesize );'
- print '\tcrFree(get_values);'
- print '}\n'
diff --git a/debian/patches/CVE-2015-0377.patch b/debian/patches/CVE-2015-0377.patch
deleted file mode 100644
index 432afbe..0000000
--- a/debian/patches/CVE-2015-0377.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: src/VBox/VMM/VMMAll/IOMAllMMIO.cpp
-===================================================================
---- a/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (revision 95342)
-+++ b/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (revision 95343)
-@@ -1696,7 +1696,14 @@
- if (rc2 == VERR_SEM_BUSY)
- return VINF_IOM_HC_MMIO_READ_WRITE;
- #endif
-- VBOXSTRICTRC rcStrict = iomMMIOHandler(pVM, (uint32_t)uErrorCode, pCtxCore, GCPhysFault, iomMmioGetRange(pVM, GCPhysFault));
-+ PIOMMMIORANGE pRange = iomMmioGetRange(pVM, GCPhysFault);
-+ if (RT_UNLIKELY(!pRange))
-+ {
-+ IOM_UNLOCK(pVM);
-+ return VERR_IOM_MMIO_RANGE_NOT_FOUND;
-+ }
-+
-+ VBOXSTRICTRC rcStrict = iomMMIOHandler(pVM, (uint32_t)uErrorCode, pCtxCore, GCPhysFault, pRange);
- IOM_UNLOCK(pVM);
- return VBOXSTRICTRC_VAL(rcStrict);
- }
diff --git a/debian/patches/CVE-2015-0418.patch b/debian/patches/CVE-2015-0418.patch
deleted file mode 100644
index 824dce5..0000000
--- a/debian/patches/CVE-2015-0418.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: include/VBox/vmm/hwacc_vmx.h
-===================================================================
---- a/include/VBox/vmm/hwacc_vmx.h (revision 96156)
-+++ b/include/VBox/vmm/hwacc_vmx.h (revision 96157)
-@@ -525,6 +525,12 @@
- #define VMX_EXIT_WBINVD 54
- /** 55 XSETBV. Guest software attempted to execute XSETBV. */
- #define VMX_EXIT_XSETBV 55
-+/** 57 RDRAND. Guest software attempted to execute RDRAND. */
-+#define VMX_EXIT_RDRAND 57
-+/** 58 INVPCID. Guest software attempted to execute INVPCID. */
-+#define VMX_EXIT_INVPCID 58
-+/** 59 VMFUNC. Guest software attempted to execute VMFUNC. */
-+#define VMX_EXIT_VMFUNC 59
- /** @} */
-
-
-Index: src/VBox/VMM/VMMR0/HWVMXR0.cpp
-===================================================================
---- a/src/VBox/VMM/VMMR0/HWVMXR0.cpp (revision 96156)
-+++ b/src/VBox/VMM/VMMR0/HWVMXR0.cpp (revision 96157)
-@@ -4112,6 +4112,10 @@
- case VMX_EXIT_VMWRITE: /* 25 Guest software executed VMWRITE. */
- case VMX_EXIT_VMXOFF: /* 26 Guest software executed VMXOFF. */
- case VMX_EXIT_VMXON: /* 27 Guest software executed VMXON. */
-+ case VMX_EXIT_INVEPT: /* 50 Guest software executed INVEPT. */
-+ case VMX_EXIT_INVVPID: /* 53 Guest software executed INVVPID. */
-+ case VMX_EXIT_INVPCID: /* 58 Guest software executed INVPCID. */
-+ case VMX_EXIT_VMFUNC: /* 59 Guest software executed VMFUNC. */
- /** @todo inject #UD immediately */
- rc = VERR_EM_INTERPRETER;
- break;
diff --git a/debian/patches/CVE-2015-3456.patch b/debian/patches/CVE-2015-3456.patch
deleted file mode 100644
index e20d370..0000000
--- a/debian/patches/CVE-2015-3456.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: virtualbox/src/VBox/Devices/Storage/fdc.c
-===================================================================
---- virtualbox.orig/src/VBox/Devices/Storage/fdc.c
-+++ virtualbox/src/VBox/Devices/Storage/fdc.c
-@@ -1514,7 +1514,7 @@
- FLOPPY_ERROR("controller not ready for reading\n");
- return 0;
- }
-- pos = fdctrl->data_pos;
-+ pos = fdctrl->data_pos % FD_SECTOR_LEN;
- if (fdctrl->msr & FD_MSR_NONDMA) {
- pos %= FD_SECTOR_LEN;
- if (pos == 0) {
-@@ -1736,7 +1736,7 @@
- {
- fdrive_t *cur_drv = get_cur_drv(fdctrl);
-
-- /* XXX: should set main status register to busy */
-+ fdctrl->msr &= ~FD_MSR_RQM;
- cur_drv->head = (fdctrl->fifo[1] >> 2) & 1;
- #ifdef VBOX
- TMTimerSetMillies(fdctrl->result_timer, 1000 / 50);
-@@ -1897,22 +1897,25 @@
- {
- fdrive_t *cur_drv = get_cur_drv(fdctrl);
-
-- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) {
-+ /* This command takes a variable number of parameters. It can be terminated
-+ * at any time if the high bit of a parameter is set. Once there are 6 bytes
-+ * in the FIFO (command + 5 parameter bytes), data_len/data_pos will be 7.
-+ */
-+ if (fdctrl->data_len == 7 || (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80)) {
-+
- /* Command parameters done */
- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) {
-- fdctrl->fifo[0] = fdctrl->fifo[1];
-+ /* Data is echoed, but not stored! */
-+ fdctrl->fifo[0] = fdctrl->data_len > 2 ? fdctrl->fifo[1] : 0;
-+ fdctrl->fifo[1] = fdctrl->data_len > 3 ? fdctrl->fifo[2] : 0;
- fdctrl->fifo[2] = 0;
- fdctrl->fifo[3] = 0;
- fdctrl_set_fifo(fdctrl, 4, 0);
- } else {
- fdctrl_reset_fifo(fdctrl);
- }
-- } else if (fdctrl->data_len > 7) {
-- /* ERROR */
-- fdctrl->fifo[0] = 0x80 |
-- (cur_drv->head << 2) | GET_CUR_DRV(fdctrl);
-- fdctrl_set_fifo(fdctrl, 1, 0);
-- }
-+ } else
-+ fdctrl->data_len++; /* Wait for another byte. */
- }
-
- static void fdctrl_handle_relative_seek_out(fdctrl_t *fdctrl, int direction)
-@@ -1977,7 +1980,7 @@
- { FD_CMD_CONFIGURE, 0xff, "CONFIGURE", 3, fdctrl_handle_configure },
- { FD_CMD_POWERDOWN_MODE, 0xff, "POWERDOWN MODE", 2, fdctrl_handle_powerdown_mode },
- { FD_CMD_OPTION, 0xff, "OPTION", 1, fdctrl_handle_option },
-- { FD_CMD_DRIVE_SPECIFICATION_COMMAND, 0xff, "DRIVE SPECIFICATION COMMAND", 5, fdctrl_handle_drive_specification_command },
-+ { FD_CMD_DRIVE_SPECIFICATION_COMMAND, 0xff, "DRIVE SPECIFICATION COMMAND", 1, fdctrl_handle_drive_specification_command },
- { FD_CMD_RELATIVE_SEEK_OUT, 0xff, "RELATIVE SEEK OUT", 2, fdctrl_handle_relative_seek_out },
- { FD_CMD_FORMAT_AND_WRITE, 0xff, "FORMAT AND WRITE", 10, fdctrl_unimplemented },
- { FD_CMD_RELATIVE_SEEK_IN, 0xff, "RELATIVE SEEK IN", 2, fdctrl_handle_relative_seek_in },
-@@ -2038,7 +2041,7 @@
- }
-
- FLOPPY_DPRINTF("%s: %02x\n", __func__, value);
-- fdctrl->fifo[fdctrl->data_pos++] = value;
-+ fdctrl->fifo[fdctrl->data_pos++ % FD_SECTOR_LEN] = value;
- if (fdctrl->data_pos == fdctrl->data_len) {
- /* We now have all parameters
- * and will be able to treat the command
diff --git a/debian/patches/cve-2012-3221.patch b/debian/patches/cve-2012-3221.patch
deleted file mode 100644
index 239740a..0000000
--- a/debian/patches/cve-2012-3221.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: virtualbox-4.1.18-dfsg/src/recompiler/target-i386/op_helper.c
-===================================================================
---- virtualbox-4.1.18-dfsg.orig/src/recompiler/target-i386/op_helper.c 2012-06-20 09:20:29.000000000 -0400
-+++ virtualbox-4.1.18-dfsg/src/recompiler/target-i386/op_helper.c 2012-10-18 16:39:20.647324489 -0400
-@@ -872,6 +872,13 @@
- type = (e2 >> DESC_TYPE_SHIFT) & 0x1f;
- switch(type) {
- case 5: /* task gate */
-+#ifdef VBOX
-+ dpl = (e2 >> DESC_DPL_SHIFT) & 3;
-+ cpl = env->hflags & HF_CPL_MASK;
-+ /* check privilege if software int */
-+ if (is_int && dpl < cpl)
-+ raise_exception_err(EXCP0D_GPF, intno * 8 + 2);
-+#endif
- /* must do that check here to return the correct error code */
- if (!(e2 & DESC_P_MASK))
- raise_exception_err(EXCP0B_NOSEG, intno * 8 + 2);
diff --git a/debian/patches/series b/debian/patches/series
index 913d697..4888211 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,12 +14,4 @@
32-disable-guest-version-check.patch
35-libvdeplug-soname.patch
36-fix-ftbfs-xserver-112.patch
-cve-2012-3221.patch
-CVE-2013-0420.patch
37-wheezy-kernel-drm.patch
-38-security-fixes-2014-01.patch
-CVE-2014-0981.patch
-CVE-2014-0983.patch
-CVE-2015-0377.patch
-CVE-2015-0418.patch
-CVE-2015-3456.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git
More information about the Pkg-virtualbox-commits
mailing list