[Pkg-virtualbox-commits] [virtualbox] 01/01: Remove old patches
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Sat Feb 14 13:40:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository virtualbox.
commit 452296c8e5f180140be8019f0c8f90480fb573f8
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sat Feb 14 14:40:39 2015 +0100
Remove old patches
---
debian/changelog | 1 +
debian/patches/30-usb-warning-filters.patch | 16 ------
debian/patches/37-linux-3.11.patch | 89 -----------------------------
debian/patches/38-linux-3.11-vboxnet.patch | 17 ------
debian/patches/rrs-build-fix.patch | 13 -----
5 files changed, 1 insertion(+), 135 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f5cd7b3..8fabadd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ virtualbox (4.3.22-dfsg-1) UNRELEASED; urgency=medium
* d/p/37-fix-build.patch fix build, following upstream change in
xorg driver build (thanks to Michael Thayer for the hint and
the help).
+ * Remove old patches.
-- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Fri, 13 Feb 2015 10:53:56 +0100
diff --git a/debian/patches/30-usb-warning-filters.patch b/debian/patches/30-usb-warning-filters.patch
deleted file mode 100644
index 59e1b3f..0000000
--- a/debian/patches/30-usb-warning-filters.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Only display warnings about broken USB support when it's actually
- used (i.e. the machine has USB device filters).
-Author: Felix Geyer <fgeyer at debian.org>
-
-Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-===================================================================
---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2013-11-19 04:39:58.033640079 -0500
-+++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2013-11-19 04:39:58.029640078 -0500
-@@ -55,6 +55,7 @@
-
- /* COM includes: */
- #include "CUSBController.h"
-+#include "CUSBDeviceFilter.h"
-
- #if 0 /* Global USB filters are DISABLED now: */
- # define ENABLE_GLOBAL_USB
diff --git a/debian/patches/37-linux-3.11.patch b/debian/patches/37-linux-3.11.patch
deleted file mode 100644
index 19a577f..0000000
--- a/debian/patches/37-linux-3.11.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Description: Fix for Linux 3.11
-Origin: upstream, https://www.virtualbox.org/changeset/47588/vbox and
- https://www.virtualbox.org/changeset/47484/vbox
-
---- a/src/VBox/Additions/linux/sharedfolders/dirops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/dirops.c
-@@ -233,7 +233,11 @@
- * b. failure to compute fake inode number
- * c. filldir returns an error (see comment on that)
- */
--static int sf_dir_read (struct file *dir, void *opaque, filldir_t filldir)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+static int sf_dir_iterate(struct file *dir, struct dir_context *ctx)
-+#else
-+static int sf_dir_read(struct file *dir, void *opaque, filldir_t filldir)
-+#endif
- {
- TRACE();
- for (;;)
-@@ -257,12 +261,19 @@
- /* skip erroneous entry and proceed */
- LogFunc(("sf_getdent error %d\n", err));
- dir->f_pos += 1;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+ ctx->pos += 1;
-+#endif
- continue;
- }
-
- /* d_name now contains a valid entry name */
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+ sanity = ctx->pos + 0xbeef;
-+#else
- sanity = dir->f_pos + 0xbeef;
-+#endif
- fake_ino = sanity;
- if (sanity - fake_ino)
- {
-@@ -270,8 +281,11 @@
- return -EINVAL;
- }
-
-- err = filldir(opaque, d_name, strlen(d_name),
-- dir->f_pos, fake_ino, DT_UNKNOWN);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+ err = dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN);
-+#else
-+ err = filldir(opaque, d_name, strlen(d_name), dir->f_pos, fake_ino, DT_UNKNOWN);
-+#endif
- if (err)
- {
- LogFunc(("filldir returned error %d\n", err));
-@@ -281,6 +295,9 @@
- }
-
- dir->f_pos += 1;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+ ctx->pos += 1;
-+#endif
- }
-
- BUG();
-@@ -289,7 +306,11 @@
- struct file_operations sf_dir_fops =
- {
- .open = sf_dir_open,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+ .iterate = sf_dir_iterate,
-+#else
- .readdir = sf_dir_read,
-+#endif
- .release = sf_dir_release,
- .read = generic_read_dir
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
---- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-@@ -1804,7 +1804,11 @@
-
- {
- PVBOXNETFLTINS pThis = VBOX_FLT_NB_TO_INST(self);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+ struct net_device *pDev = netdev_notifier_info_to_dev(ptr);
-+#else
- struct net_device *pDev = (struct net_device *)ptr;
-+#endif
- int rc = NOTIFY_OK;
-
- Log(("VBoxNetFlt: got event %s(0x%lx) on %s, pDev=%p pThis=%p pThis->u.s.pDev=%p\n",
diff --git a/debian/patches/38-linux-3.11-vboxnet.patch b/debian/patches/38-linux-3.11-vboxnet.patch
deleted file mode 100644
index ec16ab9..0000000
--- a/debian/patches/38-linux-3.11-vboxnet.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix vbox network interface error in linux 3.11. Patch taken from upstream at ticket #12001
-Index: virtualbox/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-===================================================================
---- virtualbox.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c 2013-09-13 13:16:20.016285000 -0400
-+++ virtualbox/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c 2013-09-13 13:22:15.460285000 -0400
-@@ -1804,7 +1804,11 @@
-
- {
- PVBOXNETFLTINS pThis = VBOX_FLT_NB_TO_INST(self);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+ struct net_device *pDev = netdev_notifier_info_to_dev(ptr);
-+#else
- struct net_device *pDev = (struct net_device *)ptr;
-+#endif
- int rc = NOTIFY_OK;
-
- Log(("VBoxNetFlt: got event %s(0x%lx) on %s, pDev=%p pThis=%p pThis->u.s.pDev=%p\n",
diff --git a/debian/patches/rrs-build-fix.patch b/debian/patches/rrs-build-fix.patch
deleted file mode 100644
index 872c39c..0000000
--- a/debian/patches/rrs-build-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: virtualbox/src/VBox/Main/webservice/Makefile.kmk
-===================================================================
---- virtualbox.orig/src/VBox/Main/webservice/Makefile.kmk 2013-11-22 14:26:08.851312152 -0500
-+++ virtualbox/src/VBox/Main/webservice/Makefile.kmk 2013-11-22 14:30:33.635324450 -0500
-@@ -694,7 +694,7 @@
- ifdef VBOX_GSOAP_VERBOSE
- $(MV) -f $(wildcard $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml) $(PATH_TARGET_SOAPDEMOXML)
- endif
-- $(MV) -f $(wildcard $(VBOXWEB_OUT_DIR)/soapvbox*.h) $(PATH_TARGET_SOAPDEMOHEADERS)
-+ #$(MV) -f $(wildcard $(VBOXWEB_OUT_DIR)/soapvbox*.h) $(PATH_TARGET_SOAPDEMOHEADERS)
- $(MV) -f $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)
- $(APPEND) $@ done
-
--
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