[Pkg-virtualbox-commits] [virtualbox] 03/04: Update patches and copyright
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Wed Aug 17 08:35:53 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 fa4682688677a9183c2072ec1ee33b9e40d39846
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed Aug 17 10:33:35 2016 +0200
Update patches and copyright
---
debian/copyright | 2 +-
debian/patches/01-build-arch.patch | 2 +-
debian/patches/02-gsoap-build-fix.patch | 10 +++++-----
debian/patches/04-vboxdrv-references.patch | 6 +++---
debian/patches/07-vboxnetflt-reference.patch | 2 +-
debian/patches/13-module-mismatch.patch | 2 +-
debian/patches/16-no-update.patch | 9 +++++----
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/32-disable-guest-version-check.patch | 2 +-
debian/patches/36-fix-vnc-version-string.patch | 2 +-
12 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index ab075c6..e87a661 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -94,7 +94,7 @@ Copyright:
VirtualBox contains code from the EFI Development Kit II which is governed by the license in
the section called "BSD license from Intel" and
- Copyright (c) 2004-2008, Intel Corporation.
+ Copyright (c) 2004-2014, Intel Corporation.
VirtualBox contains libjpeg which is governed by the license in the section called "libjpeg License" and
Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.
diff --git a/debian/patches/01-build-arch.patch b/debian/patches/01-build-arch.patch
index c0afea6..4bcf61f 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
-@@ -358,7 +358,7 @@
+@@ -360,7 +360,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 3e3f315..2cc4e6b 100644
--- a/debian/patches/02-gsoap-build-fix.patch
+++ b/debian/patches/02-gsoap-build-fix.patch
@@ -3,12 +3,12 @@ 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
-@@ -707,7 +707,7 @@
- : $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
+@@ -724,7 +724,7 @@
+ $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
$(RM) -f $@
- $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
+ $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
- $(APPEND) $@ done
-
- # Copy the generated headers and stuff. This was split into a separate rule
+ ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
+ $(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
+ $(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
diff --git a/debian/patches/04-vboxdrv-references.patch b/debian/patches/04-vboxdrv-references.patch
index afedb99..5397a8c 100644
--- a/debian/patches/04-vboxdrv-references.patch
+++ b/debian/patches/04-vboxdrv-references.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:11.989792459 +0200
+++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp 2015-04-02 14:37:11.989792459 +0200
-@@ -316,10 +316,8 @@
+@@ -308,10 +308,8 @@
#ifdef RT_OS_LINUX
case VERR_SUPDRV_COMPONENT_NOT_FOUND:
@@ -18,7 +18,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
break;
#endif
-@@ -382,10 +380,8 @@
+@@ -374,10 +372,8 @@
{
case VERR_VM_DRIVER_LOAD_ERROR:
#ifdef RT_OS_LINUX
@@ -31,7 +31,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
-@@ -424,10 +420,8 @@
+@@ -416,10 +412,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/07-vboxnetflt-reference.patch b/debian/patches/07-vboxnetflt-reference.patch
index 5501a89..c7a873e 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
-@@ -1755,7 +1755,7 @@
+@@ -1764,7 +1764,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 1a84b28..60812c3 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
-@@ -431,9 +431,11 @@
+@@ -423,9 +423,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 37a21c8..ac2be6b 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -77,7 +77,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1271,8 +1271,6 @@
+@@ -1302,8 +1302,6 @@
/* 'About' action goes to Application menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -86,7 +86,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
/* 'Network Access Manager' action goes to Application menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-@@ -1312,7 +1310,7 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+@@ -1343,7 +1341,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));
@@ -95,12 +95,13 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
-@@ -1337,8 +1335,6 @@
+@@ -1368,9 +1366,6 @@
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* 'Network Access Manager' action goes to 'File' menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
- /* 'Check for Updates' action goes to 'File' menu: */
-- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+- if (gEDataManager->applicationUpdateEnabled())
+- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* 'Reset Warnings' action goes 'File' menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
diff --git a/debian/patches/23-remove-invalid-chars-check.patch b/debian/patches/23-remove-invalid-chars-check.patch
index a8887da..fc445b6 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
-@@ -179,11 +179,6 @@
+@@ -181,11 +181,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 f0055e9..8aa644b 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
-@@ -4077,34 +4077,12 @@ int Console::i_configMediumAttachment(const char *pcszDevice,
+@@ -4102,34 +4102,12 @@ int Console::i_configMediumAttachment(const char *pcszDevice,
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 5ce7476..8b0ff22 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
-@@ -5837,7 +5837,7 @@
+@@ -6099,7 +6099,7 @@
TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64
TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64
ifeq ($(KBUILD_HOST),linux)
diff --git a/debian/patches/32-disable-guest-version-check.patch b/debian/patches/32-disable-guest-version-check.patch
index 8f76df6..bf7576e 100644
--- a/debian/patches/32-disable-guest-version-check.patch
+++ b/debian/patches/32-disable-guest-version-check.patch
@@ -5,7 +5,7 @@ Author: Felix Geyer <fgeyer at debian.org>
+++ b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
@@ -40,6 +40,7 @@ public:
- static int showNotify(const char *pcHeader, const char *pcBody)
+ static int showNotify(const char *pszHeader, const char *pszBody)
{
+ return VINF_SUCCESS;
int rc;
diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
index 60ae5bf..7a7170e 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
-@@ -2837,6 +2837,7 @@
+@@ -2930,6 +2930,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' \
--
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