[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, experimental, updated. debian/4.1.18-dfsg-2-18-g73d2d44

Felix Geyer fgeyer at debian.org
Sat Mar 2 21:57:48 UTC 2013 

The following commit has been merged in the experimental branch:
commit 1e63018bf257b00be5d8091ef267523ee24fbc26
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Jan 26 16:54:10 2013 +0100

    Refresh patches.
    
    Drop 36-fix-ftbfs-xserver-112.patch, cve-2012-3221.patch and
    CVE-2013-0420.patch.

diff --git a/debian/changelog b/debian/changelog
index bdc89cc..483526a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ virtualbox (4.2.6-dfsg-1) UNRELEASED; urgency=low
   * Move package to contrib as virtualbox 4.2 needs a non-free compiler to
     build the BIOS.
   * Build-depend on libdevmapper-dev.
+  * Refresh patches.
+    - Drop 36-fix-ftbfs-xserver-112.patch, cve-2012-3221.patch and
+      CVE-2013-0420.patch.
 
  -- Felix Geyer <fgeyer at debian.org>  Fri, 25 Jan 2013 18:14:24 +0100
 
diff --git a/debian/patches/01-build-arch.patch b/debian/patches/01-build-arch.patch
index 5d1b31a..cde5dc6 100644
--- a/debian/patches/01-build-arch.patch
+++ b/debian/patches/01-build-arch.patch
@@ -1,10 +1,9 @@
 Description: Correctly check build architecture.
 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 @@
+--- a/configure
++++ b/configure
+@@ -330,7 +330,7 @@ test_execute_path()
  check_environment()
  {
    test_header environment
diff --git a/debian/patches/04-vboxdrv-references.patch b/debian/patches/04-vboxdrv-references.patch
index 04ac674..6388efd 100644
--- a/debian/patches/04-vboxdrv-references.patch
+++ b/debian/patches/04-vboxdrv-references.patch
@@ -1,10 +1,9 @@
 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 @@
+--- a/src/VBox/VMM/VMMR3/VM.cpp
++++ b/src/VBox/VMM/VMMR3/VM.cpp
+@@ -318,10 +318,8 @@ VMMR3DECL(int)   VMR3Create(uint32_t cCp
  
  #ifdef RT_OS_LINUX
                  case VERR_SUPDRV_COMPONENT_NOT_FOUND:
@@ -17,7 +16,7 @@ diff -urNad virtualbox-ose-4.0.2-dfsg/src/VBox/VMM/VMMR3/VM.cpp virtualbox-ose-4
                      break;
  #endif
  
-@@ -334,10 +332,8 @@
+@@ -384,10 +382,8 @@ VMMR3DECL(int)   VMR3Create(uint32_t cCp
              {
                  case VERR_VM_DRIVER_LOAD_ERROR:
  #ifdef RT_OS_LINUX
@@ -30,7 +29,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 @@
+@@ -426,10 +422,8 @@ VMMR3DECL(int)   VMR3Create(uint32_t cCp
                  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..e2d5d36 100644
--- a/debian/patches/06-xsession.patch
+++ b/debian/patches/06-xsession.patch
@@ -1,10 +1,9 @@
 Description: Make Xsession.d script ignore errors.
 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 @@
+--- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient
++++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+@@ -42,11 +42,11 @@ then
      no_display=1
  fi
  
@@ -18,3 +17,6 @@ diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/x11/Installer/98vboxad
  test -z "$no_display" &&
 -    /usr/bin/VBoxClient --seamless
 +    /usr/bin/VBoxClient --seamless || true
+ test -z "$no_display" &&
+-    /usr/bin/VBoxClient --draganddrop
++    /usr/bin/VBoxClient --draganddrop || true
diff --git a/debian/patches/07-vboxnetflt-reference.patch b/debian/patches/07-vboxnetflt-reference.patch
index 8a14aa3..9f68fee 100644
--- a/debian/patches/07-vboxnetflt-reference.patch
+++ b/debian/patches/07-vboxnetflt-reference.patch
@@ -1,10 +1,9 @@
 Description: Made error message tell about missing vboxnetflt module.
 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 @@
+--- a/src/VBox/Devices/Network/DrvIntNet.cpp
++++ b/src/VBox/Devices/Network/DrvIntNet.cpp
+@@ -1716,7 +1716,7 @@ static DECLCALLBACK(int) drvR3IntNetCons
              return VERR_PDM_NO_ATTACHED_DRIVER;
          }
          return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
diff --git a/debian/patches/12-make-module.patch b/debian/patches/12-make-module.patch
index ead1a9f..785cb9d 100644
--- a/debian/patches/12-make-module.patch
+++ b/debian/patches/12-make-module.patch
@@ -1,7 +1,6 @@
 Description: Fix ARCH setting in modules Makefiles.
 Author: Michael Meskes <meskes at debian.org>
 
-diff --git a/src/VBox/HostDrivers/Support/linux/Makefile b/src/VBox/HostDrivers/Support/linux/Makefile
 --- a/src/VBox/HostDrivers/Support/linux/Makefile
 +++ b/src/VBox/HostDrivers/Support/linux/Makefile
 @@ -44,9 +44,21 @@ ifeq ($(BUILD_TARGET_ARCH),)
@@ -28,7 +27,6 @@ diff --git a/src/VBox/HostDrivers/Support/linux/Makefile b/src/VBox/HostDrivers/
    endif
   endif
  else
-diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
 --- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
 +++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
 @@ -35,9 +35,21 @@ ifeq ($(BUILD_TARGET_ARCH),)
@@ -55,7 +53,6 @@ diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrive
    endif
   endif
  else
-diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
 --- a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
 +++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
 @@ -35,9 +35,21 @@ ifeq ($(BUILD_TARGET_ARCH),)
@@ -82,7 +79,6 @@ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile b/src/VBox/HostDrive
    endif
   endif
  else
-diff --git a/src/VBox/HostDrivers/VBoxPci/linux/Makefile b/src/VBox/HostDrivers/VBoxPci/linux/Makefile
 --- a/src/VBox/HostDrivers/VBoxPci/linux/Makefile
 +++ b/src/VBox/HostDrivers/VBoxPci/linux/Makefile
 @@ -35,9 +35,21 @@ ifeq ($(BUILD_TARGET_ARCH),)
@@ -109,7 +105,6 @@ diff --git a/src/VBox/HostDrivers/VBoxPci/linux/Makefile b/src/VBox/HostDrivers/
    endif
   endif
  else
-diff --git a/src/VBox/Installer/linux/Makefile.include.header b/src/VBox/Installer/linux/Makefile.include.header
 --- a/src/VBox/Installer/linux/Makefile.include.header
 +++ b/src/VBox/Installer/linux/Makefile.include.header
 @@ -54,9 +54,21 @@ ifeq ($(BUILD_TARGET_ARCH),)
diff --git a/debian/patches/13-module-mismatch.patch b/debian/patches/13-module-mismatch.patch
index 9783a83..2490944 100644
--- a/debian/patches/13-module-mismatch.patch
+++ b/debian/patches/13-module-mismatch.patch
@@ -1,10 +1,9 @@
 Description: Adjusts failure message with Debian specific solution.
 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 @@
+--- a/src/VBox/VMM/VMMR3/VM.cpp
++++ b/src/VBox/VMM/VMMR3/VM.cpp
+@@ -433,9 +433,11 @@ VMMR3DECL(int)   VMR3Create(uint32_t cCp
                      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..4addb0f 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -5,19 +5,18 @@ 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()
+@@ -465,6 +465,8 @@ void UIUpdateManager::shutdown()
  
  void UIUpdateManager::sltForceCheck()
  {
 +    return;
 +
      /* Force call for new version check: */
-     sltCheckIfUpdateIsNecessary(true);
+     sltCheckIfUpdateIsNecessary(true /* force call */);
  }
-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 @@
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+@@ -550,6 +550,10 @@ bool UISettingsDialogGlobal::isPageAvail
  #endif /* !VBOX_WITH_NETFLT */
              break;
          }
@@ -28,60 +27,52 @@ 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()
- #ifdef VBOX_WITH_REGISTRATION
-     m_pool[UIActionIndex_Simple_Register] = new PerformRegisterAction(this);
- #endif /* VBOX_WITH_REGISTRATION */
--    m_pool[UIActionIndex_Simple_Update] = new PerformUpdateAction(this);
-     m_pool[UIActionIndex_Simple_About] = new ShowAboutAction(this);
+@@ -538,7 +538,6 @@ void UIActionPool::createActions()
+     m_pool[UIActionIndex_Simple_WebSite] = new UIActionSimpleWebSite(this);
+     m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
+     m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
+-    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
+     m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
  }
  
-@@ -472,9 +471,6 @@ void UIActionPool::createMenus()
-     m_pool[UIActionIndex_Simple_Update]->setVisible(false);
+@@ -570,9 +569,6 @@ void UIActionPool::createMenus()
+     m_pool[UIActionIndex_Simple_CheckForUpdates]->setVisible(false);
  #endif
  #if !(defined(Q_WS_MAC) && (QT_VERSION < 0x040700))
--    if (m_pool[UIActionIndex_Simple_Update])
--        delete m_pool[UIActionIndex_Simple_Update];
--    m_pool[UIActionIndex_Simple_Update] = new PerformUpdateAction(this);
+-    if (m_pool[UIActionIndex_Simple_CheckForUpdates])
+-        delete m_pool[UIActionIndex_Simple_CheckForUpdates];
+-    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
      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
+     m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
-@@ -45,7 +45,6 @@ enum UIActionIndex
- #ifdef VBOX_WITH_REGISTRATION
-     UIActionIndex_Simple_Register,
- #endif /* VBOX_WITH_REGISTRATION */
--    UIActionIndex_Simple_Update,
+@@ -47,7 +47,6 @@ enum UIActionIndex
+     UIActionIndex_Simple_WebSite,
+     UIActionIndex_Simple_ResetWarnings,
+     UIActionIndex_Simple_NetworkAccessManager,
+-    UIActionIndex_Simple_CheckForUpdates,
      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)
-     pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Register));
+--- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+@@ -1300,8 +1300,6 @@ void UISelectorWindow::prepareMenuHelp(Q
+     m_pRegisterAction = gActionPool->action(UIActionIndex_Simple_Register);
+     pMenu->addAction(m_pRegisterAction);
  #endif /* VBOX_WITH_REGISTRATION */
- 
--    pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Update));
--
--#ifndef Q_WS_MAC
--    pMenu->addSeparator();
--#endif /* !Q_WS_MAC */
--
-     pMenu->addAction(gActionPool->action(UIActionIndex_Simple_About));
- 
-     /* Configure connections: */
-@@ -1768,8 +1762,6 @@ void VBoxSelectorWnd::prepareMenuHelp(QMenu *pMenu)
-     VBoxGlobal::connect(gEDataEvents, SIGNAL(sigCanShowRegistrationDlg(bool)),
-                         gActionPool->action(UIActionIndex_Simple_Register), SLOT(setEnabled(bool)));
+-    m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
+-    pMenu->addAction(m_pUpdateAction);
+ #ifndef Q_WS_MAC
+     pMenu->addSeparator();
+ #endif /* !Q_WS_MAC */
+@@ -1438,7 +1436,6 @@ void UISelectorWindow::prepareConnection
+     connect(m_pRegisterAction, SIGNAL(triggered()), &vboxGlobal(), SLOT(showRegistrationDialog()));
+     connect(gEDataEvents, SIGNAL(sigCanShowRegistrationDlg(bool)), m_pRegisterAction, SLOT(setEnabled(bool)));
  #endif /* VBOX_WITH_REGISTRATION */
--    VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_Update), SIGNAL(triggered()),
--                        gUpdateManager, SLOT(sltForceCheck()));
-     VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_About), SIGNAL(triggered()),
-                         &msgCenter(), SLOT(sltShowHelpAboutDialog()));
- }
+-    connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
+     connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
+ 
+     /* Status-bar connections: */
diff --git a/debian/patches/18-system-xorg.patch b/debian/patches/18-system-xorg.patch
index 4b330b2..cd9842c 100644
--- a/debian/patches/18-system-xorg.patch
+++ b/debian/patches/18-system-xorg.patch
@@ -1,7 +1,6 @@
 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 += \
@@ -15,21 +14,22 @@ 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
+@@ -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)/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,207 +40,3 @@ 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
-@@ -17,6 +17,10 @@
- SUB_DEPTH = ../../../..
- include $(KBUILD_PATH)/subheader.kmk
- 
-+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110 111)
-+ XSERVER_VERSION := 17
-+endif
-+
- # 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
- # vboxmouse_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxmouse_drv
-  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
-  vboxmouse_drv_DEFS.linux = linux
-  vboxmouse_drv_DEFS.x86 += __i386__
-@@ -59,7 +58,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
-@@ -80,7 +78,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)
- vboxmouse_drv_71_INCS := \
-@@ -97,7 +94,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 := \
-@@ -112,7 +108,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 := \
-@@ -126,7 +121,6 @@ endif
- #
- # vboxmouse_drv_15
- #
--DLLS += vboxmouse_drv_15
- vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_15_INCS := \
-@@ -141,7 +135,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 := \
-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
- # vboxvideo_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxvideo_drv
- endif   # target linux
- vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
- vboxvideo_drv_DEFS.linux = linux
-@@ -89,7 +88,6 @@ endif   # target linux
- #         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 += \
-@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES  = $(vboxvideo_drv_SOURCES)
- #
- # 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_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_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_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_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_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_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_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_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_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_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_$(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)
-+
-+# required for lenny backports
-+ifeq ($(XSERVER_VERSION),14)
-+	vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
-+endif
-+
-+
- # Check the undefined symbols in the X.Org modules against lists of allowed
- # symbols.  Not very elegant, but it will catch problems early.
- ifdef VBOX_WITH_TESTCASES
diff --git a/debian/patches/23-remove-invalid-chars-check.patch b/debian/patches/23-remove-invalid-chars-check.patch
index 615707c..0ee854b 100644
--- a/debian/patches/23-remove-invalid-chars-check.patch
+++ b/debian/patches/23-remove-invalid-chars-check.patch
@@ -2,10 +2,9 @@ Description: Remove check for invalid characters in the build path since we have
  kBuild to handle those pathes starting from version 1:0.1.98svn2318-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 @@
+--- a/configure
++++ b/configure
+@@ -162,11 +162,6 @@ BUILD_TYPE="release"
  # 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..f0dcd93 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -2,10 +2,9 @@ Description: Silently enable the host I/O cache when the image is on an ext4/XFS
  No need to warn users about it.
 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 @@
+--- a/src/VBox/Main/src-client/ConsoleImpl2.cpp
++++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp
+@@ -3300,36 +3300,12 @@ int Console::configMediumAttachment(PCFG
                      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..563a4cc 100644
--- a/debian/patches/28-no-selinux-fedora.patch
+++ b/debian/patches/28-no-selinux-fedora.patch
@@ -1,10 +1,9 @@
 Description: Don't install the selinux-fedora modules.
 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 @@
+--- a/src/VBox/Additions/linux/Makefile.kmk
++++ b/src/VBox/Additions/linux/Makefile.kmk
+@@ -340,9 +340,7 @@ lnx_add_inst-noexec_INST     = $(VBOX_LN
  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..0c9d011 100644
--- a/debian/patches/29-fix-ftbfs-as-needed.patch
+++ b/debian/patches/29-fix-ftbfs-as-needed.patch
@@ -1,9 +1,9 @@
 Description: Fix FTBFS with ld --as-needed.
 Origin: vendor, http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch?revision=1.2&view=markup
 
---- VirtualBox-4.0.0_OSE/Config.kmk
-+++ VirtualBox-4.0.0_OSE/Config.kmk
-@@ -4082,7 +4082,7 @@
+--- a/Config.kmk
++++ b/Config.kmk
+@@ -4511,7 +4511,7 @@ TEMPLATE_VBOXBLDPROG_LDFLAGS.sparc32
  TEMPLATE_VBOXBLDPROG_LDFLAGS.amd64       = -m64
  TEMPLATE_VBOXBLDPROG_LDFLAGS.sparc64     = -m64
   ifeq ($(KBUILD_HOST),linux)
diff --git a/debian/patches/30-usb-warning-filters.patch b/debian/patches/30-usb-warning-filters.patch
index 306ed44..d2a1929 100644
--- a/debian/patches/30-usb-warning-filters.patch
+++ b/debian/patches/30-usb-warning-filters.patch
@@ -2,10 +2,17 @@ Description: Only display warnings about broken USB support when it's actually
  used (i.e. the machine has USB device filters).
 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)
+@@ -55,6 +55,7 @@
+ 
+ /* COM includes: */
+ #include "CUSBController.h"
++#include "CUSBDeviceFilter.h"
+ 
+ #if 0 /* Global USB filters are DISABLED now: */
+ # define ENABLE_GLOBAL_USB
+@@ -1117,7 +1118,7 @@ bool UISettingsDialogMachine::isPageAvai
              /* 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..8676bcc 100644
--- a/debian/patches/32-disable-guest-version-check.patch
+++ b/debian/patches/32-disable-guest-version-check.patch
@@ -1,10 +1,9 @@
 Description: Disable notifications about outdated guest additions.
 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/35-libvdeplug-soname.patch b/debian/patches/35-libvdeplug-soname.patch
index 3f4b558..0510fc8 100644
--- a/debian/patches/35-libvdeplug-soname.patch
+++ b/debian/patches/35-libvdeplug-soname.patch
@@ -2,18 +2,21 @@ Description: Revert http://www.virtualbox.org/changeset/36310
  The libvdeplug.so symlink is only shipped in the -dev package.
 Author: Felix Geyer <debfx-pkg at fobos.de>
 
---- trunk/include/VBox/VDEPlugSymDefs.h
-+++ trunk/include/VBox/VDEPlugSymDefs.h
-@@ -1,4 +1,4 @@
+--- a/include/VBox/VDEPlugSymDefs.h
++++ b/include/VBox/VDEPlugSymDefs.h
+@@ -1,5 +1,5 @@
  /** @file
 - * Symbols from libvdeplug.so to be loaded at runtime for DrvVDE.cpp
 + * Symbols from libvdeplug.so.2 to be loaded at runtime for DrvVDE.cpp
   */
  
-@@ -44,5 +44,5 @@
+ /*
+@@ -43,7 +43,7 @@ struct vde_open_args
+ };
  
  /** The file name of the DBus library */
 -#define VBOX_LIB_VDE_PLUG_NAME "libvdeplug.so"
 +#define VBOX_LIB_VDE_PLUG_NAME "libvdeplug.so.2"
  #define RT_RUNTIME_LOADER_LIB_NAME VBOX_LIB_VDE_PLUG_NAME
  
+ /** The name of the loader function */
diff --git a/debian/patches/36-fix-ftbfs-xserver-112.patch b/debian/patches/36-fix-ftbfs-xserver-112.patch
deleted file mode 100644
index 9c1267c..0000000
--- a/debian/patches/36-fix-ftbfs-xserver-112.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix FTBFS with X Server 1.12.
-Author: Felix Geyer <debfx-pkg at fobos.de>
-Bug-Debian: http://bugs.debian.org/671061
-
---- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
-+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
-@@ -29,6 +29,7 @@
- #include <dlfcn.h>
- #include <elf.h>
- #include <unistd.h>
-+#include "xorg-server.h"
- #include "xf86.h"
- 
- #define VBOX_NO_MESA_PATCH_REPORTS
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-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 640b328..32a41e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,6 +13,3 @@
 30-usb-warning-filters.patch
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
-36-fix-ftbfs-xserver-112.patch
-cve-2012-3221.patch
-CVE-2013-0420.patch
diff --git a/debian/rules b/debian/rules
index 3604046..604322a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -109,7 +109,7 @@ override_dh_auto_build:
 	    LOCALCFG=$(abspath debian/LocalConfig.kmk) \
 	    PATH_OUT=$(abspath out) \
 	    TOOL_YASM_AS=yasm \
-	    XSERVER_VERSION=$(XSERVER_VERSION) \
+	    VBOX_USE_SYSTEM_XORG_HEADERS=1 \
 	    VBOX_BUILD_PUBLISHER=_$(DIST_NAME) \
 	    VBOX_WITH_REGISTRATION_REQUEST= \
 	    VBOX_WITH_UPDATE_REQUEST= \

-- 
virtualbox Debian packaging

More information about the Pkg-virtualbox-commits mailing list