[Pkg-virtualbox-commits] [virtualbox] 02/06: patch refresh/drop

Gianfranco Costamagna locutusofborg at moszumanska.debian.org
Tue Jun 28 10:00:08 UTC 2016


This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch experimental
in repository virtualbox.

commit cf97b06c2d08a81de17027c1ab8d9ea592a5464e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Jun 9 10:26:58 2016 +0200

    patch refresh/drop
---
 debian/changelog                                   |   5 +-
 debian/control                                     |   6 +-
 debian/patches/01-build-arch.patch                 |   2 +-
 debian/patches/02-gsoap-build-fix.patch            |   2 +-
 debian/patches/04-vboxdrv-references.patch         |  34 ++---
 debian/patches/07-vboxnetflt-reference.patch       |   2 +-
 debian/patches/13-module-mismatch.patch            |   2 +-
 debian/patches/16-no-update.patch                  |  51 ++++---
 debian/patches/23-remove-invalid-chars-check.patch |   2 +-
 debian/patches/27-hide-host-cache-warning.patch    |   2 +-
 debian/patches/29-fix-ftbfs-as-needed.patch        |   2 +-
 debian/patches/36-fix-vnc-version-string.patch     |   2 +-
 debian/patches/fix-gcc-pie.patch                   | 163 ---------------------
 debian/patches/fix-kernel-4.7.patch                |  14 --
 debian/patches/gcc-5.4.patch                       |  13 ++
 debian/patches/series                              |   3 +-
 16 files changed, 75 insertions(+), 230 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3294581..30d3d72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-virtualbox (5.0.20-dfsg-3) UNRELEASED; urgency=medium
+virtualbox (5.1.0~BETA1-dfsg-1) UNRELEASED; urgency=medium
 
   [ Adam Borowski ]
   * debian/patches/fix-kernel-4.7.patch (Closes: #825819)
 
   [ Gianfranco Costamagna ]
   * Conflict with virtualbox-5.1
+  * New upstream major release, patch refresh.
+  * Drop pie patch and kernel fix, upstream
+  * Update to qt5
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 30 May 2016 12:30:24 +0200
 
diff --git a/debian/control b/debian/control
index 3c37407..e75a125 100644
--- a/debian/control
+++ b/debian/control
@@ -31,9 +31,9 @@ Build-Depends: bzip2,
                libpixman-1-dev,
                libpng-dev,
                libpulse-dev,
-               libqt4-dev (>= 4.4.0),
-               libqt4-network (>= 4.4.0),
-               libqt4-opengl-dev (>= 4.4.0),
+               libqt5x11extras5-dev,
+               libqt5opengl5-dev,
+               qttools5-dev-tools,
                libsdl1.2-dev,
                libssl-dev,
                libvncserver-dev,
diff --git a/debian/patches/01-build-arch.patch b/debian/patches/01-build-arch.patch
index 99c0989..c0afea6 100644
--- a/debian/patches/01-build-arch.patch
+++ b/debian/patches/01-build-arch.patch
@@ -5,7 +5,7 @@ Index: virtualbox/configure
 ===================================================================
 --- virtualbox.orig/configure	2013-11-19 03:40:50.133475296 -0500
 +++ virtualbox/configure	2013-11-19 03:40:50.129475296 -0500
-@@ -350,7 +350,7 @@
+@@ -358,7 +358,7 @@
  check_environment()
  {
    test_header environment
diff --git a/debian/patches/02-gsoap-build-fix.patch b/debian/patches/02-gsoap-build-fix.patch
index 7e396b8..3e3f315 100644
--- a/debian/patches/02-gsoap-build-fix.patch
+++ b/debian/patches/02-gsoap-build-fix.patch
@@ -3,7 +3,7 @@ Index: virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk
 ===================================================================
 --- virtualbox-git-orig.orig/src/VBox/Main/webservice/Makefile.kmk	2013-12-02 12:32:51.211124975 -0500
 +++ virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk	2013-12-02 12:36:04.531133954 -0500
-@@ -687,7 +687,7 @@
+@@ -707,7 +707,7 @@
  : $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
  	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
  	$(RM) -f $@
diff --git a/debian/patches/04-vboxdrv-references.patch b/debian/patches/04-vboxdrv-references.patch
index 5649c12..afedb99 100644
--- a/debian/patches/04-vboxdrv-references.patch
+++ b/debian/patches/04-vboxdrv-references.patch
@@ -5,67 +5,67 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
 ===================================================================
 --- virtualbox.orig/src/VBox/VMM/VMMR3/VM.cpp	2015-04-02 14:37:11.989792459 +0200
 +++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp	2015-04-02 14:37:11.989792459 +0200
-@@ -312,10 +312,8 @@
+@@ -316,10 +316,8 @@
  
  #ifdef RT_OS_LINUX
                  case VERR_SUPDRV_COMPONENT_NOT_FOUND:
 -                    pszError = N_("One of the kernel modules was not successfully loaded. Make sure "
 -                                  "that no kernel modules from an older version of VirtualBox exist. "
 -                                  "Then try to recompile and reload the kernel modules by executing "
--                                  "'/sbin/rcvboxdrv setup' as root");
+-                                  "'/sbin/vboxconfig' as root");
 +		    pszError = N_("Please install the virtualbox-dkms package "
 +				  "and execute 'modprobe vboxdrv' as root");
                      break;
  #endif
  
-@@ -378,10 +376,8 @@
+@@ -382,10 +380,8 @@
              {
                  case VERR_VM_DRIVER_LOAD_ERROR:
  #ifdef RT_OS_LINUX
 -                    pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
 -                                  "was either not loaded or /dev/vboxdrv is not set up properly. "
 -                                  "Re-setup the kernel module by executing "
--                                  "'/sbin/rcvboxdrv setup' as root");
+-                                  "'/sbin/vboxconfig' as root");
 +                    pszError = N_("Please install the virtualbox-dkms package "
 +		    		  "and execute 'modprobe vboxdrv' as root");
  #else
                      pszError = N_("VirtualBox kernel driver not loaded");
  #endif
-@@ -420,10 +416,8 @@
+@@ -424,10 +420,8 @@
                  case VERR_INVALID_HANDLE: /** @todo track down and fix this error. */
                  case VERR_VM_DRIVER_NOT_INSTALLED:
  #ifdef RT_OS_LINUX
 -                    pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
 -                                  "was either not loaded or /dev/vboxdrv was not created for some "
 -                                  "reason. Re-setup the kernel module by executing "
--                                  "'/sbin/rcvboxdrv setup' as root");
+-                                  "'/sbin/vboxconfig' as root");
 +                    pszError = N_("Please install the virtualbox-dkms package "
 +		    		  "and execute 'modprobe vboxdrv' as root");
  #else
                      pszError = N_("VirtualBox kernel driver not installed");
  #endif
 diff --git a/src/VBox/Frontends/VirtualBox/src/main.cpp b/src/VBox/Frontends/VirtualBox/src/main.cpp
-index 66a1200..e174ae7 100644
+index b4c8f19..4d1e83d 100644
 --- a/src/VBox/Frontends/VirtualBox/src/main.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/main.cpp
-@@ -100,9 +100,10 @@ QString g_QStrHintLinuxNoMemory = QApplication::tr(
+@@ -102,9 +102,9 @@ QString g_QStrHintLinuxNoMemory = QApplication::tr(
  
  QString g_QStrHintLinuxNoDriver = QApplication::tr(
      "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
 -    "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
-+    "there is a permission problem with /dev/vboxdrv. Please install virtualbox-dkms "
-+    "package and load the kernel "
-     "module by executing<br/><br/>"
--    "  <font color=blue>'/sbin/rcvboxdrv setup'</font><br/><br/>"
+-    "module by executing<br/><br/>"
+-    "  <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
++    "there is a permission problem with /dev/vboxdrv. Please reinstall virtualbox-dkms "
++    "package and load the kernel module by executing<br/><br/>"
 +    "  <font color=blue>'modprobe vboxdrv'</font><br/><br/>"
-     "as root. If it is available in your distribution, you should install the "
-     "DKMS package first. This package keeps track of Linux kernel changes and "
-     "recompiles the vboxdrv kernel module if necessary."
-@@ -119,7 +120,7 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
+     "as root."
+     );
+ 
+@@ -119,7 +119,7 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
      "The VirtualBox kernel modules do not match this version of "
      "VirtualBox. The installation of VirtualBox was apparently not "
      "successful. Executing<br/><br/>"
--    "  <font color=blue>'/sbin/rcvboxdrv setup'</font><br/><br/>"
+-    "  <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
 +    "  <font color=blue>'modprobe vboxdrv'</font><br/><br/>"
      "may correct this. Make sure that you do not mix the "
      "OSE version and the PUEL version of VirtualBox."
diff --git a/debian/patches/07-vboxnetflt-reference.patch b/debian/patches/07-vboxnetflt-reference.patch
index 2f1dc24..5501a89 100644
--- a/debian/patches/07-vboxnetflt-reference.patch
+++ b/debian/patches/07-vboxnetflt-reference.patch
@@ -5,7 +5,7 @@ Index: virtualbox/src/VBox/Devices/Network/DrvIntNet.cpp
 ===================================================================
 --- virtualbox.orig/src/VBox/Devices/Network/DrvIntNet.cpp	2013-11-19 03:41:03.413475913 -0500
 +++ virtualbox/src/VBox/Devices/Network/DrvIntNet.cpp	2013-11-19 03:41:03.409475913 -0500
-@@ -1751,7 +1751,7 @@
+@@ -1755,7 +1755,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 1d86045..1a84b28 100644
--- a/debian/patches/13-module-mismatch.patch
+++ b/debian/patches/13-module-mismatch.patch
@@ -5,7 +5,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
 ===================================================================
 --- virtualbox.orig/src/VBox/VMM/VMMR3/VM.cpp	2015-04-02 14:37:20.225796295 +0200
 +++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp	2015-04-02 14:37:20.221796293 +0200
-@@ -427,9 +427,11 @@
+@@ -431,9 +431,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 9c075a2..ed1f922 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -5,9 +5,9 @@ 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
 Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
 ===================================================================
---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp	2015-04-02 15:44:20.879669066 +0200
-+++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp	2015-04-02 15:44:20.879669066 +0200
-@@ -433,6 +433,8 @@
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
+@@ -447,6 +447,8 @@
  
  void UIUpdateManager::sltForceCheck()
  {
@@ -16,12 +16,11 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
      /* Force call for new version check: */
      sltCheckIfUpdateIsNecessary(true /* force call */);
  }
-diff a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
 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
-@@ -996,7 +996,6 @@ void UIActionPool::preparePool()
+@@ -1097,7 +1097,6 @@
      m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this);
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
@@ -29,7 +28,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this);
      m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
-@@ -1039,8 +1038,6 @@ void UIActionPool::prepareConnections()
+@@ -1143,8 +1142,6 @@
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), SIGNAL(triggered()),
              gNetworkManager, SLOT(show()), Qt::UniqueConnection);
@@ -38,7 +37,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()),
              &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
-@@ -1115,7 +1112,7 @@ void UIActionPool::updateConfiguration()
+@@ -1225,7 +1222,7 @@
      if (!fUpdateAllowed)
      {
          m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::MenuApplicationActionType)
@@ -47,12 +46,11 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
      }
  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
  
-diff a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
 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
-@@ -62,7 +62,6 @@ enum UIActionIndex
+@@ -62,7 +62,6 @@
      UIActionIndex_M_Application_S_Preferences,
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      UIActionIndex_M_Application_S_NetworkAccessManager,
@@ -62,9 +60,9 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
      UIActionIndex_M_Application_S_Close,
 Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
 ===================================================================
---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2015-04-02 15:44:20.879669066 +0200
-+++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2015-04-02 15:44:20.879669066 +0200
-@@ -310,6 +310,10 @@
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+@@ -308,6 +308,10 @@
  #endif /* !VBOX_WITH_NETFLT */
              break;
          }
@@ -75,11 +73,11 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpe
          default:
              break;
      }
-diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-index 752afd4..0438cef 100644
---- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1239,8 +1239,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+@@ -1262,8 +1262,6 @@
      /* 'About' action goes to Application menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
  # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -88,7 +86,16 @@ index 752afd4..0438cef 100644
      /* 'Network Access Manager' action goes to Application menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
  # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-@@ -1283,8 +1281,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+@@ -1303,7 +1301,7 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+     addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
+ #  ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+-    addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
++//    addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+ #  endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+     addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
+     addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
+@@ -1328,8 +1326,6 @@
  # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      /* 'Network Access Manager' action goes to 'File' menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
@@ -97,10 +104,10 @@ index 752afd4..0438cef 100644
  # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      /* 'Reset Warnings' action goes 'File' menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
-diff --git a/doc/manual/en_US/user_Introduction.xml b/doc/manual/en_US/user_Introduction.xml
-index cb6770b..a1d4496 100644
---- a/doc/manual/en_US/user_Introduction.xml
-+++ b/doc/manual/en_US/user_Introduction.xml
+Index: virtualbox/doc/manual/en_US/user_Introduction.xml
+===================================================================
+--- virtualbox.orig/doc/manual/en_US/user_Introduction.xml
++++ virtualbox/doc/manual/en_US/user_Introduction.xml
 @@ -1761,10 +1761,12 @@
           used to trigger certain VM actions (see <xref
           linkend="specialcharacters"/>)</para>
diff --git a/debian/patches/23-remove-invalid-chars-check.patch b/debian/patches/23-remove-invalid-chars-check.patch
index a5f0ce8..a8887da 100644
--- a/debian/patches/23-remove-invalid-chars-check.patch
+++ b/debian/patches/23-remove-invalid-chars-check.patch
@@ -6,7 +6,7 @@ Index: virtualbox/configure
 ===================================================================
 --- virtualbox.orig/configure	2013-11-19 04:36:42.817631012 -0500
 +++ virtualbox/configure	2013-11-19 04:36:42.813631012 -0500
-@@ -176,11 +176,6 @@
+@@ -179,11 +179,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 3262028..33515b9 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -6,7 +6,7 @@ Index: virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
 ===================================================================
 --- virtualbox.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp	2015-04-02 15:46:54.415740583 +0200
 +++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp	2015-04-02 15:46:54.411740580 +0200
-@@ -3861,34 +3861,12 @@
+@@ -4075,34 +4075,12 @@
                      if (   enmFsTypeFile == RTFSTYPE_EXT4
                          || enmFsTypeFile == RTFSTYPE_XFS)
                      {
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index ac22dd8..372daa9 100644
--- a/debian/patches/29-fix-ftbfs-as-needed.patch
+++ b/debian/patches/29-fix-ftbfs-as-needed.patch
@@ -5,7 +5,7 @@ Index: virtualbox/Config.kmk
 ===================================================================
 --- virtualbox.orig/Config.kmk	2015-04-02 15:46:59.611743003 +0200
 +++ virtualbox/Config.kmk	2015-04-02 15:46:59.611743003 +0200
-@@ -5531,7 +5531,7 @@
+@@ -5815,7 +5815,7 @@
  TEMPLATE_VBoxBldProg_LDFLAGS.amd64       = -m64
  TEMPLATE_VBoxBldProg_LDFLAGS.sparc64     = -m64
   ifeq ($(KBUILD_HOST),linux)
diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
index b5c38dc..fc7740b 100644
--- a/debian/patches/36-fix-vnc-version-string.patch
+++ b/debian/patches/36-fix-vnc-version-string.patch
@@ -3,7 +3,7 @@ Index: virtualbox/Config.kmk
 ===================================================================
 --- virtualbox.orig/Config.kmk	2015-04-02 15:47:04.439745251 +0200
 +++ virtualbox/Config.kmk	2015-04-02 15:47:04.435745250 +0200
-@@ -2628,6 +2628,7 @@
+@@ -2817,6 +2817,7 @@
  	-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
  	-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
  	-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
diff --git a/debian/patches/fix-gcc-pie.patch b/debian/patches/fix-gcc-pie.patch
deleted file mode 100644
index 9860906..0000000
--- a/debian/patches/fix-gcc-pie.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Author: Frank Mehnert
-Description: add no-pie for gcc built with explicit pie support.
-
---- virtualbox-5.0.20-dfsg.orig/Config.kmk
-+++ virtualbox-5.0.20-dfsg/Config.kmk
-@@ -2460,6 +2460,7 @@ $(PATH_OUT)/DynamicConfig.kmk: \
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-overlength-strings?= $(call VBOX_GCC_CHECK_CC,-Wno-overlength-strings,)'
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-stack-protector   ?= $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)'
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-dwarf2-cfi-asm    ?= $(call VBOX_GCC_CHECK_CC,-fno-dwarf2-cfi-asm,)'
-+	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_no-pie                ?= $(call VBOX_GCC_CHECK_CC,-no-pie,)'
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_fdiagnostics-show-option ?= $(call VBOX_GCC_CHECK_CC,-fdiagnostics-show-option,)'
- # Produce code optimized for the most common IA32/AMD64/EM64T processors. Introduced with gcc version 4.2.
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_mtune-generic         ?= $(call VBOX_GCC_CHECK_CC,-mtune=generic,)'
-@@ -3525,8 +3526,8 @@ ifdef VBOX_WITH_RAW_MODE
- 
-  ifeq ($(VBOX_LDR_FMT32),elf)
-  TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC32_TOOL)
-- TEMPLATE_VBoxRc_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
-- TEMPLATE_VBoxRc_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
-+ TEMPLATE_VBoxRc_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
-+ TEMPLATE_VBoxRc_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
-   ifeq ($(KBUILD_TARGET),solaris)
-    TEMPLATE_VBoxRc_LDFLAGS           = -r
-   else
-@@ -3665,8 +3666,8 @@ endif # pe
- 
- ifeq ($(VBOX_LDR_FMT),elf)
- TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
--TEMPLATE_VBoxR0_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
--TEMPLATE_VBoxR0_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
-+TEMPLATE_VBoxR0_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
-+TEMPLATE_VBoxR0_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
- TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
- TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
- ifeq ($(KBUILD_TARGET),solaris)
-@@ -3770,7 +3771,7 @@ TEMPLATE_VBOXR0DRV_TOOL                =
- TEMPLATE_VBOXR0DRV_INSTTYPE.linux      = none
- TEMPLATE_VBOXR0DRV_DEFS               += __KERNEL__ MODULE
- TEMPLATE_VBOXR0DRV_INCS                = $(VBOX_LINUX_INCS)
--TEMPLATE_VBOXR0DRV_CFLAGS              = -nostdinc -iwithprefix include $(VBOX_LINUX_INCLUDE) \
-+TEMPLATE_VBOXR0DRV_CFLAGS              = -fno-pie -nostdinc -iwithprefix include $(VBOX_LINUX_INCLUDE) \
- 	$(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare $(VBOX_GCC_fdiagnostics-show-option) \
- 	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
- 	-fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
-@@ -5839,8 +5840,8 @@ if1of ($(KBUILD_TARGET), dragonfly freeb
-  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86     = -m elf_i386
-  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64   = -m elf_x86_64
- endif
--TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS)   -fno-merge-constants -std=c99 -ffreestanding
--TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants -ffreestanding
-+TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-pie -fno-merge-constants -std=c99 -ffreestanding
-+TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants -ffreestanding
- ifeq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
-  TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS   += $(VBOX_GCC_fno-stack-protector)
-  TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS += $(VBOX_GCC_fno-stack-protector)
---- virtualbox-5.0.20-dfsg.orig/src/VBox/Additions/common/VBoxGuest/linux/Makefile
-+++ virtualbox-5.0.20-dfsg/src/VBox/Additions/common/VBoxGuest/linux/Makefile
-@@ -129,7 +129,7 @@ ifeq ($(KERN_VERSION),24)
-  ## @todo move to MOD_DEFS when we have finished refactoring
-  MOD_CFLAGS = -DEXPORT_SYMTAB
- else
-- MOD_CFLAGS = -Wno-declaration-after-statement -include $(MANGLING)
-+ MOD_CFLAGS = -Wno-declaration-after-statement -include $(MANGLING) -fno-pie
- endif
- 
- MOD_CLEAN = . linux r0drv generic r0drv/linux r0drv/generic VBox \
---- virtualbox-5.0.20-dfsg.orig/src/VBox/Additions/linux/drm/Makefile.module.kms
-+++ virtualbox-5.0.20-dfsg/src/VBox/Additions/linux/drm/Makefile.module.kms
-@@ -37,7 +37,7 @@ ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxv
- else
-  MANGLING := $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h
- endif
--MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(MANGLING)
-+MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(MANGLING) -fno-pie
- MOD_INCL   = $(addprefix -I$(KBUILD_EXTMOD),/ /include)
- # What on earth is this?
- MOD_INCL  += $(addprefix -I$(KBUILD_EXTMOD)/vboxvideo,/ /include)
---- virtualbox-5.0.20-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module
-+++ virtualbox-5.0.20-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module
-@@ -65,7 +65,7 @@ endif
- ifeq ($(KERN_VERSION), 24)
-  MOD_CFLAGS =
- else
-- MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(MANGLING)
-+ MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(MANGLING) -fno-pie
- 
- # special hack for Fedora Core 6 2.6.18 (fc6), rhel5 2.6.18 (el5),
- # ClarkConnect 4.3 (cc4) and ClarkConnect 5 (v5)
---- virtualbox-5.0.20-dfsg.orig/src/VBox/Devices/PC/ipxe/Makefile.kmk
-+++ virtualbox-5.0.20-dfsg/src/VBox/Devices/PC/ipxe/Makefile.kmk
-@@ -110,6 +110,7 @@ else
- endif
-  TEMPLATE_iPxe_LNK_DEPS = $(VBOX_PATH_IPXE_SRC)/src/arch/i386/scripts/i386.lds
-  TEMPLATE_iPxe_CFLAGS  = \
-+	-fno-pie \
- 	-ffreestanding \
- 	-ffunction-sections \
- 	-march=i386 \
---- virtualbox-5.0.20-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile
-+++ virtualbox-5.0.20-dfsg/src/VBox/HostDrivers/Support/linux/Makefile
-@@ -299,7 +299,7 @@ MODULE_EXT    := ko
- $(MODULE)-y   := $(OBJS)
- 
- # build defs
--EXTRA_CFLAGS  += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG)
-+EXTRA_CFLAGS  += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG) -fno-pie
- 
- all: $(MODULE)
- 
---- virtualbox-5.0.20-dfsg.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-+++ virtualbox-5.0.20-dfsg/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-@@ -202,7 +202,7 @@ MODULE_EXT    := ko
- $(MODULE)-y   := $(OBJS)
- 
- # build defs
--EXTRA_CFLAGS  += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG)
-+EXTRA_CFLAGS  += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG) -fno-pie
- 
- all: $(MODULE)
- 
---- virtualbox-5.0.20-dfsg.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
-+++ virtualbox-5.0.20-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
-@@ -206,7 +206,7 @@ MODULE_EXT    := ko
- $(MODULE)-y   := $(OBJS)
- 
- # build defs
--EXTRA_CFLAGS  += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG)
-+EXTRA_CFLAGS  += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG) -fno-pie
- 
- all: $(MODULE)
- 
---- virtualbox-5.0.20-dfsg.orig/src/VBox/HostDrivers/VBoxPci/linux/Makefile
-+++ virtualbox-5.0.20-dfsg/src/VBox/HostDrivers/VBoxPci/linux/Makefile
-@@ -205,7 +205,7 @@ MODULE_EXT    := ko
- $(MODULE)-y   := $(OBJS)
- 
- # build defs
--EXTRA_CFLAGS  += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG)
-+EXTRA_CFLAGS  += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG) -fno-pie
- 
- all: $(MODULE)
- 
---- virtualbox-5.0.20-dfsg.orig/src/VBox/Runtime/Makefile.kmk
-+++ virtualbox-5.0.20-dfsg/src/VBox/Runtime/Makefile.kmk
-@@ -2893,6 +2893,8 @@ if1of ($(LIBRARIES),RuntimeR3 RuntimeR0
- 			-e '/^g_Logger/d' \
- 			-e '/^g_RelLogger/d' \
- 			-e '/^g_VM/d',) \
-+			$(if-expr "$(KBUILD_TARGET)" == "linux", \
-+			-e '/^g_kLdrRdrFileOps/d',) \
- 			\
- 			-e '/^RTDBusLoadLib/d' \
- 			\
---- virtualbox-5.0.20-dfsg.orig/src/VBox/VMM/testcase/Makefile.kmk
-+++ virtualbox-5.0.20-dfsg/src/VBox/VMM/testcase/Makefile.kmk
-@@ -344,6 +344,7 @@ tstAnimate_LIBS         = $(LIB_VMM) $(L
- tstX86-1_TEMPLATE       = VBOXR3TSTEXE
- tstX86-1_SOURCES        = tstX86-1.cpp tstX86-1A.asm
- tstX86-1_LIBS           = $(LIB_RUNTIME)
-+tstX86-1_LDFLAGS.linux  = $(VBOX_GCC_no-pie)
- 
- tstX86-FpuSaveRestore_TEMPLATE = VBOXR3TSTEXE
- tstX86-FpuSaveRestore_SOURCES  = tstX86-FpuSaveRestore.cpp tstX86-FpuSaveRestoreA.asm
diff --git a/debian/patches/fix-kernel-4.7.patch b/debian/patches/fix-kernel-4.7.patch
deleted file mode 100644
index 2ca9275..0000000
--- a/debian/patches/fix-kernel-4.7.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- virtualbox-5.0.20/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c.orig	2016-04-28 15:14:24.000000000 +0200
-+++ virtualbox-5.0.20/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c		2016-05-30 11:07:38.806490593 +0200
-@@ -153,7 +153,11 @@
-     pPriv->Stats.tx_packets++;
-     pPriv->Stats.tx_bytes += pSkb->len;
-     /* Update transmission time stamp. */
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+    netif_trans_update(pNetDev);
-+# else
-     pNetDev->trans_start = jiffies;
-+# endif
-     /* Nothing else to do, just free the sk_buff. */
-     dev_kfree_skb(pSkb);
-     return 0;
diff --git a/debian/patches/gcc-5.4.patch b/debian/patches/gcc-5.4.patch
new file mode 100644
index 0000000..b84ff56
--- /dev/null
+++ b/debian/patches/gcc-5.4.patch
@@ -0,0 +1,13 @@
+Author: Gianfranco Costamagna <locutusofborg at debian.org>
+
+--- virtualbox-5.1.0~BETA1-dfsg.orig/configure
++++ virtualbox-5.1.0~BETA1-dfsg/configure
+@@ -438,7 +438,7 @@ check_gcc()
+              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
+              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
+              -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \
+-             -o \( $cc_maj -eq 5 -a $cc_min -gt 3 \) \
++             -o \( $cc_maj -eq 5 -a $cc_min -gt 4 \) \
+              -o \( $cc_maj -eq 6 -a $cc_min -gt 1 \) \
+              -o $cc_maj -gt 6 ]; then
+         log_failure "gcc version $cc_maj.$cc_min found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10, gcc 5.x with x<10 or gcc 6.x with x<2"
diff --git a/debian/patches/series b/debian/patches/series
index 0591094..825906d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,5 +14,4 @@
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
-fix-gcc-pie.patch
-fix-kernel-4.7.patch
+gcc-5.4.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