[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.2.10-dfsg-1-7-g5f4e0cf

[Felix Geyer]

The following commit has been merged in the master branch:
commit 5f4e0cf14854518918062e5785113f2cb366604a
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jul 15 00:59:52 2013 +0200

    Patch refresh.

diff --git a/debian/changelog b/debian/changelog
index c8d0060..0322d73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 virtualbox (4.2.16-dfsg-1) UNRELEASED; urgency=low
 
+  [ Felix Geyer ]
   * New upstream release.
     - Fixes CVE-2013-3792: virtio-net host DoS (Closes: #715327)
   * Drop 36-python-multiarch.patch and 37-wheezy-kernel-drm.patch,
     fixed upstream.
 
+  [ Gianfranco Costamagna ]
+  * Patch refresh.
+
  -- Felix Geyer <fgeyer at debian.org>  Sun, 14 Jul 2013 17:52:45 +0200
 
 virtualbox (4.2.10-dfsg-1) unstable; urgency=low
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index a09cfa3..7b32640 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -5,7 +5,7 @@ Author: Daniel Hahler <ubuntu at thequod.de>, Felix Geyer <fgeyer at debian.org>
 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
-@@ -465,6 +465,8 @@ void UIUpdateManager::shutdown()
+@@ -474,6 +474,8 @@ void UIUpdateManager::shutdown()
  
  void UIUpdateManager::sltForceCheck()
  {
@@ -16,7 +16,7 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
  }
 --- 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
+@@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvail
  #endif /* !VBOX_WITH_NETFLT */
              break;
          }
@@ -59,16 +59,20 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      /* Maximum index: */
 --- 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
+@@ -1301,12 +1301,6 @@ void UISelectorWindow::prepareMenuHelp(Q
      m_pRegisterAction = gActionPool->action(UIActionIndex_Simple_Register);
      pMenu->addAction(m_pRegisterAction);
  #endif /* VBOX_WITH_REGISTRATION */
 -    m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
--    pMenu->addAction(m_pUpdateAction);
+-    CVirtualBox vbox = vboxGlobal().virtualBox();
+-    if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox))
+-        pMenu->addAction(m_pUpdateAction);
+-    else
+-        m_pUpdateAction->setEnabled(false);
  #ifndef Q_WS_MAC
      pMenu->addSeparator();
  #endif /* !Q_WS_MAC */
-@@ -1438,7 +1436,6 @@ void UISelectorWindow::prepareConnection
+@@ -1443,7 +1437,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 */
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index b106979..afd00f2 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -4,7 +4,7 @@ Author: Felix Geyer <fgeyer at debian.org>
 
 --- a/src/VBox/Main/src-client/ConsoleImpl2.cpp
 +++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp
-@@ -3300,36 +3300,12 @@ int Console::configMediumAttachment(PCFG
+@@ -3319,36 +3319,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 1a0769e..632fdaa 100644
--- a/debian/patches/28-no-selinux-fedora.patch
+++ b/debian/patches/28-no-selinux-fedora.patch
@@ -3,7 +3,7 @@ Author: Felix Geyer <fgeyer at debian.org>
 
 --- 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
+@@ -345,9 +345,7 @@ lnx_add_inst-noexec_INST     = $(VBOX_LN
  lnx_add_inst-noexec_SOURCES  = \
  	$(VBOX_REL_X11_ADD_INST)vboxclient.desktop \
  	$(VBOX_REL_X11_ADD_INST)vboxvideo.ids \
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 0c9d011..55015a8 100644
--- a/debian/patches/29-fix-ftbfs-as-needed.patch
+++ b/debian/patches/29-fix-ftbfs-as-needed.patch
@@ -3,7 +3,7 @@ Origin: vendor, http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-emul
 
 --- a/Config.kmk
 +++ b/Config.kmk
-@@ -4511,7 +4511,7 @@ TEMPLATE_VBOXBLDPROG_LDFLAGS.sparc32
+@@ -4523,7 +4523,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 0b6f342..7a07a38 100644
--- a/debian/patches/30-usb-warning-filters.patch
+++ b/debian/patches/30-usb-warning-filters.patch
@@ -12,7 +12,7 @@ Author: Felix Geyer <fgeyer at debian.org>
  
  #if 0 /* Global USB filters are DISABLED now: */
  # define ENABLE_GLOBAL_USB
-@@ -1117,7 +1118,7 @@ bool UISettingsDialogMachine::isPageAvai
+@@ -1137,7 +1138,7 @@ bool UISettingsDialogMachine::isPageAvai
              /* Get the USB controller object: */
              CUSBController controller = m_machine.GetUSBController();
              /* Show the machine error message if any: */

-- 
virtualbox Debian packaging