[Pkg-virtualbox-commits] [virtualbox] 01/05: Move to 4.3.20 debian packaging again
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Fri Feb 13 14:48:17 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 172f52a7c58ac4a06d1ab3c6443d6ab9a8f1d694
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Feb 13 10:36:06 2015 +0100
Move to 4.3.20 debian packaging again
---
debian/.gitattributes | 1 +
debian/README.source | 14 +-
debian/changelog | 189 ++++++-
debian/control | 244 ++------
debian/copyright | 19 +-
debian/gbp.conf | 10 -
debian/get-orig-source.sh | 51 ++
debian/manpages/VBoxBalloonCtrl.1 | 26 +
debian/manpages/VBoxClient.1 | 9 +-
debian/manpages/VBoxControl.8 | 20 +-
debian/manpages/VBoxHeadless.1 | 26 +-
debian/manpages/VBoxManage.1 | 472 ++++++++++------
debian/manpages/VBoxSDL.1 | 12 +-
debian/manpages/VBoxService.8 | 50 +-
debian/manpages/VirtualBox.1 | 38 +-
debian/manpages/mount.vboxsf.8 | 4 +-
debian/manpages/vboxwebsrv.1 | 19 +-
debian/manpages/vdfuse.1 | 43 --
debian/patches/01-build-arch.patch | 11 +-
debian/patches/02-gsoap-build-fix.patch | 14 +
debian/patches/04-vboxdrv-references.patch | 15 +-
debian/patches/06-xsession.patch | 35 +-
debian/patches/07-vboxnetflt-reference.patch | 9 +-
debian/patches/12-make-module.patch | 45 +-
debian/patches/13-module-mismatch.patch | 13 +-
debian/patches/16-no-update.patch | 129 ++---
debian/patches/18-system-xorg.patch | 249 +-------
debian/patches/23-remove-invalid-chars-check.patch | 11 +-
debian/patches/27-hide-host-cache-warning.patch | 17 +-
debian/patches/28-no-selinux-fedora.patch | 15 +-
debian/patches/29-fix-ftbfs-as-needed.patch | 20 +-
debian/patches/30-usb-warning-filters.patch | 26 +-
.../patches/32-disable-guest-version-check.patch | 5 +-
debian/patches/35-libvdeplug-soname.patch | 13 +-
debian/patches/36-fix-ftbfs-xserver-112.patch | 14 -
debian/patches/36-fix-vnc-version-string.patch | 25 +
debian/patches/37-linux-3.11.patch | 89 +++
debian/patches/37-wheezy-kernel-drm.patch | 47 --
debian/patches/38-linux-3.11-vboxnet.patch | 17 +
debian/patches/38-security-fixes-2014-01.patch | 471 ----------------
debian/patches/CVE-2013-0420.patch | 15 -
debian/patches/CVE-2014-0981.patch | 53 --
debian/patches/CVE-2014-0983.patch | 62 --
debian/patches/cve-2012-3221.patch | 18 -
debian/patches/rrs-build-fix.patch | 13 +
debian/patches/series | 10 +-
debian/rules | 105 +---
debian/source.lintian-overrides | 1 -
debian/vdfuse/vdfuse.c | 625 ---------------------
debian/virtualbox-fuse.install | 1 -
debian/virtualbox-fuse.lintian-overrides | 1 -
debian/virtualbox-fuse.manpages | 1 -
debian/virtualbox-guest-dkms.install.in | 4 -
.../control.modules.in | 6 +-
debian/virtualbox-guest-source.install | 3 -
debian/virtualbox-guest-source.links | 2 +-
debian/virtualbox-guest-utils.init | 29 +
debian/virtualbox-guest-utils.preinst | 31 -
debian/virtualbox-guest-x11.init | 67 +++
debian/virtualbox-guest-x11.install | 1 -
debian/virtualbox-guest-x11.postrm | 9 +
debian/virtualbox-guest-x11.preinst | 14 +
debian/virtualbox-source.files/control.modules.in | 6 +-
debian/virtualbox-source.links | 2 +-
debian/virtualbox.files/VBox.sh | 57 +-
debian/virtualbox.install | 5 +-
debian/virtualbox.links | 2 +
debian/virtualbox.lintian-overrides | 14 +-
debian/virtualbox.postinst | 21 +-
debian/virtualbox.preinst | 54 --
debian/watch | 3 +-
71 files changed, 1310 insertions(+), 2462 deletions(-)
diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/README.source b/debian/README.source
index 840b774..40a00fc 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,17 +3,7 @@ Source repackaging
The upstream tarball used to build this package has been repackaged to
remove unneeded/unwanted files and directories.
-You can follow these steps to upgrade to a new upstream version:
-
-uscan --rename --download-version $VERSION
-mkdir ../virtualbox-$VERSION
-tar -xj -C ../virtualbox-$VERSION --strip-components 1 -f ../virtualbox_$VERSION.orig.tar.bz2
-rm -rf ../virtualbox-$VERSION/debian
-cp -a debian ../virtualbox-$VERSION
-cd ../virtualbox-$VERSION
-debchange -v $VERSION-dfsg-1
-fakeroot debian/rules dfsg-free
-rm ../virtualbox_$VERSION.orig.tar.bz2
+You can just call "uscan" to upgrade to a new upstream version
Generating manpages
@@ -22,9 +12,9 @@ Generating manpages
help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxHeadless | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_[a-zA-Z]+)//g' > VBoxHeadless.1
help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxManage | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_[a-zA-Z]+)//g' > VBoxManage.1
help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxSDL | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_[a-zA-Z]+)//g' > VBoxSDL.1
+help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxBalloonCtrl | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_[a-zA-Z]+)//g' > VBoxBalloonCtrl.1
help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info --no-discard-stderr vboxwebsrv | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_[a-zA-Z]+)//g' > vboxwebsrv.1
help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VirtualBox | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_[a-zA-Z]+)//g' > VirtualBox.1
-help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --help-option="-help" --no-info --no-discard-stderr vdfuse | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_[a-zA-Z]+)//g' > vdfuse.1
help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxClient | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_[a-zA-Z]+)//g' > VBoxClient.1
help2man --section=8 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxService | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_[a-zA-Z]+)//g' > VBoxService.8
diff --git a/debian/changelog b/debian/changelog
index f5c715b..80c6fff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,186 @@
-virtualbox (4.1.18-dfsg-2+deb7u3) wheezy-security; urgency=high
+virtualbox (4.3.20-dfsg-1) experimental; urgency=medium
- * Fix memory corruption vulnerabilities in 3D acceleration. (Closes: #741602)
- - CVE-2014-0981, CVE-2014-0983
- - Backport fixes from version 4.1.32 in debian/patches/CVE-2014-0981.patch
- and debian/patches/CVE-2014-0983.patch
+ [ Gianfranco Costamagna ]
+ * Imported Upstream release.
- -- Felix Geyer <fgeyer at debian.org> Mon, 14 Apr 2014 11:19:01 +0200
+ [ Ritesh Raj Sarraf ]
+ * Flip build dependency to libcurl4-gnutls-dev
-virtualbox (4.1.18-dfsg-2+deb7u2) wheezy-security; urgency=high
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 03 Dec 2014 09:37:08 +0100
- * Apply fixes from the January 2014 security advisory. (Closes: #735410)
- - Add debian/patches/38-security-fixes-2014-01.patch
- - CVE-2013-5892, CVE-2014-0407, CVE-2014-0406, CVE-2014-0404
+virtualbox (4.3.18-dfsg-1) unstable; urgency=medium
- -- Felix Geyer <fgeyer at debian.org> Sun, 09 Mar 2014 19:46:52 +0100
+ [ Gianfranco Costamagna ]
+ * Imported Upstream release.
+ * Add myself to uploaders.
+ * Patch refresh.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Wrap-and-sort control file.
+ * Fix lintian warnings:
+ - Remove old hardening-wrapper
+ - Remove broken symlinks.
+
+ [ Felix Geyer ]
+ * Remove myself from uploaders.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Fri, 17 Oct 2014 11:54:01 +0200
+
+virtualbox (4.3.14-dfsg-1) unstable; urgency=medium
+
+ [ Gianfranco Costamagna ]
+ * New upstream release (Closes: #754220)
+ thanks Mateusz Łukasik for the patch.
+ * Rebuild against the new xorg-video-abi-18 (Closes: #755067)
+ * Tweak README.source to show how to upgrade the package with
+ uscan (Closes: #699141), thanks Dmitry!
+ * Removing some binary files from the source tarball,
+ spotted by lintian.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Sat, 26 Jul 2014 15:25:37 +0200
+
+virtualbox (4.3.12-dfsg-1) unstable; urgency=medium
+
+ [ Gianfranco Costamagna ]
+ * New upstream release.
+
+ -- Ritesh Raj Sarraf <rrs at debian.org> Wed, 04 Jun 2014 09:43:11 -0400
+
+virtualbox (4.3.10-dfsg-1) unstable; urgency=high
+
+ * New upstream release.
+ - Fixes multiple memory corruption vulnerabilities in the 3D acceleration
+ code. (Closes: #741602)
+ CVE-2014-0981, CVE-2014-0983
+
+ [ Gianfranco Costamagna ]
+ * Patch refresh.
+ * d/control, enforcing gsoap min required version.
+ * Add module-assistant as dependency, fixing broken symlink
+ * disabled some old unused lintian overrides.
+
+ [ Felix Geyer ]
+ * Override embedded-library nspr lintian warning, it's a locally modified
+ version.
+
+ -- Felix Geyer <fgeyer at debian.org> Sun, 06 Apr 2014 15:31:09 +0200
+
+virtualbox (4.3.6-dfsg-2) unstable; urgency=medium
+
+ * Disable bindnow in hardening-wrapper. This fixes loading the x11 driver.
+ (LP: #1280292)
+
+ -- Felix Geyer <fgeyer at debian.org> Sat, 15 Feb 2014 11:02:21 +0100
+
+virtualbox (4.3.6-dfsg-1) unstable; urgency=medium
+
+ * New upstream release. (Closes: #733263)
+ - Fixes build against Linux 3.13. (Closes: #734340)
+ - Fixes several vulnerabilities. (Closes: #735410)
+ CVE-2013-5892, CVE-2014-0407, CVE-2014-0406, CVE-2014-0404
+ * Drop compatibility with old X11 server packages.
+ * Enable hardened build flags using hardening-wrapper. The upstream build
+ system ignores the *FLAGS env variables. (Closes: #736459)
+ * Refresh 16-no-update.patch.
+
+ -- Felix Geyer <fgeyer at debian.org> Mon, 10 Feb 2014 21:41:40 +0100
+
+virtualbox (4.3.2-dfsg-1) unstable; urgency=low
+
+ [ Ritesh Raj Sarraf ]
+ * [a4d35eb] Drop patch 30-usb-warning-filters.patch
+ * [84b99a4] Refresh patch 27-hide-host-cache-warning.patch
+ * [55f29e6] Add virtualbox-guest-x11.postrm and call ldconfig in postrm
+ * [9bbe020] Don't ship .debug files, when we already are stripping dwarf
+ symbols from its libraries
+ * Fix VBox network interface error on Linux 3.11
+ - Add 38-linux-3.11-vboxnet.patch
+ * [8e73a12] Imported Upstream version 4.3.2-dfsg
+ * [9b2bc93] Fix VBox network interface error on Linux 3.11
+ * [516aa9a] Refresh patches and drop patch 37 and 38 for linux 3.11
+ * [ab699e4] bump versioned build-dep on kbuild to r2695
+ * [5913c87] Add myself to Uploaders
+ * [8e53496] Add libvpx-dev to build-deps
+ * [caeed37] Add patch 02-gsoap-build-fix.patch to fix build
+ incompatibilities with gsoap > 2.8.13
+
+ -- Ritesh Raj Sarraf <rrs at debian.org> Tue, 10 Dec 2013 10:15:34 -0500
+
+virtualbox (4.2.16-dfsg-3) unstable; urgency=low
+
+ [ Ritesh Raj Sarraf ]
+ * Fix VBox network interface error on Linux 3.11. (Closes: #721786)
+ - Extend 37-linux-3.11.patch
+
+ -- Felix Geyer <fgeyer at debian.org> Thu, 19 Sep 2013 21:52:12 +0200
+
+virtualbox (4.2.16-dfsg-2) unstable; urgency=low
+
+ [ Whoopie ]
+ * Add VNC plugin module.
+ - debian/patches/36-fix-vnc-version-string.patch: fix version string.
+
+ [ Felix Geyer ]
+ * Fix compilation of guest additions with linux 3.11.
+ - Add 37-linux-3.11.patch.
+
+ -- Felix Geyer <fgeyer at debian.org> Wed, 28 Aug 2013 22:15:25 +0200
+
+virtualbox (4.2.16-dfsg-1) unstable; urgency=high
+
+ [ Felix Geyer ]
+ * New upstream release.
+ - Fixes CVE-2013-3792: virtio-net host DoS vulnerability. (Closes: #715327)
+ * Drop 36-python-multiarch.patch and 37-wheezy-kernel-drm.patch,
+ fixed upstream.
+ * Explicity load the vboxguest and vboxsf kernel modules in the
+ virtualbox-guest-utils init script.
+ This makes sure that shared folders can be mounted. (Closes: #712438)
+
+ [ Gianfranco Costamagna ]
+ * Patch refresh.
+
+ -- Felix Geyer <fgeyer at debian.org> Sun, 21 Jul 2013 23:25:44 +0200
+
+virtualbox (4.2.10-dfsg-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #691148)
+ - Fixes compatibility with kernel 3.8. (Closes: #700823; LP: #1101867)
+ * Switch to my @debian.org email address.
+ * 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,
+ CVE-2013-0420.patch 37-kcompat-3.6.patch and 38-kcompat-3.7.patch.
+ * Drop all virtualbox-ose transitional packages.
+ * Drop the virtualbox-fuse package as vdfuse fails to build with
+ virtualbox 4.2.
+ * Update install files and VBox.sh.
+ * Bump required kbuild version to 0.1.9998svn2577.
+ * Fix path to VBoxCreateUSBNode.sh in virtualbox.postinst. (Closes: #700479)
+ * Add an init script to virtuabox-guest-x11 which loads the vboxvideo
+ kernel module. The X Server 1.13 doesn't load it anymore. (Closes: #686994)
+ * Update man pages. (Closes: #680053)
+ * Add 36-python-multiarch.patch from Rico Tzschichholz to fix detection of
+ python in multiarch paths using pkg-config.
+ * Fix build failure with the Debian wheezy kernel which backports the drm
+ subsystem from Linux 3.4. (Closes: #703358)
+ * Drop build-dependency on bcc as it's not needed anymore.
+ * Link VBoxOGL against the X libraries it requires.
+ - Update 18-system-xorg.patch
+ * Use canonical URIs for Vcs-* fields.
+ * Bump Standards-Version to 3.9.4, no changes needed.
+
+ -- Felix Geyer <fgeyer at debian.org> Thu, 09 May 2013 11:30:42 +0200
+
+virtualbox (4.1.18-dfsg-2.1) experimental; urgency=low
+
+ [ Stefan Lippers-Hollmann ]
+ * Non-maintainer upload.
+ * fix kernel module compilation against v3.6 and v3.7
+ (closes: #691169, #696011, #696667, #696953, #698607)
+
+ -- Daniel Baumann <daniel.baumann at progress-technologies.net> Sat, 26 Jan 2013 17:55:16 +0100
virtualbox (4.1.18-dfsg-2+deb7u1) unstable; urgency=high
diff --git a/debian/control b/debian/control
index c71a896..c226214 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,12 @@
Source: virtualbox
-Section: misc
+Section: contrib/misc
Priority: optional
Maintainer: Debian Virtualbox Team <pkg-virtualbox-devel at lists.alioth.debian.org>
Uploaders: Michael Meskes <meskes at debian.org>,
- Felix Geyer <debfx-pkg at fobos.de>
-DM-Upload-Allowed: yes
-Build-Depends: bcc,
- bzip2,
- debhelper (>= 7.2.7~),
+ Ritesh Raj Sarraf <rrs at debian.org>,
+ Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Build-Depends: bzip2,
+ debhelper (>= 9),
default-jdk,
dkms (>= 2.1.1.1),
docbook-xml,
@@ -15,15 +14,15 @@ Build-Depends: bcc,
dpkg-dev (>= 1.15.6~),
g++-multilib [amd64],
genisoimage,
- gsoap,
+ gsoap (>= 2.8.16),
iasl,
imagemagick,
- kbuild (>= 1:0.1.9998svn2537),
+ kbuild (>= 1:0.1.9998svn2695),
libasound2-dev,
libcap-dev,
- libcurl4-openssl-dev,
+ libcurl4-gnutls-dev,
+ libdevmapper-dev,
libdrm-dev,
- libfuse-dev,
libgl1-mesa-dev,
libglu1-mesa-dev,
libidl-dev,
@@ -32,10 +31,12 @@ Build-Depends: bcc,
libpng-dev,
libpulse-dev,
libqt4-dev (>= 4.4.0),
+ libqt4-network (>= 4.4.0),
libqt4-opengl-dev (>= 4.4.0),
libsdl1.2-dev,
libssl-dev,
libvncserver-dev,
+ libvpx-dev,
libx11-dev,
libxcomposite-dev,
libxcursor-dev,
@@ -43,13 +44,16 @@ Build-Depends: bcc,
libxext-dev,
libxi-dev,
libxinerama-dev,
+ libxml2-dev,
libxmu-dev,
libxrandr-dev,
libxrender-dev,
libxslt1-dev,
+ libxt-dev,
lsb-release,
lynx-cur,
makeself,
+ module-assistant,
python-dev (>= 2.6.6-3~),
texlive-fonts-extra,
texlive-fonts-recommended,
@@ -63,22 +67,17 @@ Build-Depends: bcc,
yasm (>= 0.7.0),
zlib1g-dev
X-Python-Version: >= 2.5
-Standards-Version: 3.9.3
+Standards-Version: 3.9.6
Homepage: http://www.virtualbox.org/
-Vcs-Git: git://git.debian.org/git/pkg-virtualbox/virtualbox.git
-Vcs-Browser: http://git.debian.org/?p=pkg-virtualbox/virtualbox.git
+Vcs-Git: git://anonscm.debian.org/pkg-virtualbox/virtualbox.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-virtualbox/virtualbox.git
Package: virtualbox-qt
Architecture: amd64 i386
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- virtualbox (= ${binary:Version})
-Breaks: virtualbox-ose-qt (<< 4.0.6-dfsg-1~),
- virtualbox (<< 4.1.6-dfsg-2~)
-Replaces: virtualbox-ose-qt (<< 4.0.6-dfsg-1~),
- virtualbox-ose (<< 2.2.0-dfsg-1~),
- virtualbox (<< 4.1.6-dfsg-2~)
+Depends: virtualbox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: virtualbox (<< 4.1.6-dfsg-2~)
+Replaces: virtualbox (<< 4.1.6-dfsg-2~)
Description: x86 virtualization solution - Qt based user interface
VirtualBox is a free x86 virtualization solution allowing a wide range
of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -89,18 +88,16 @@ Description: x86 virtualization solution - Qt based user interface
Package: virtualbox
Architecture: amd64 i386
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${python:Depends},
- adduser
+Depends: adduser, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
Recommends: virtualbox-dkms (= ${source:Version}) | virtualbox-source (= ${source:Version}),
virtualbox-qt (= ${binary:Version}),
${shlibs:Recommends}
-Suggests: virtualbox-guest-additions-iso,
- vde2
-Conflicts: virtualbox-2.0, virtualbox-2.1, virtualbox-2.2, virtualbox-3.0
-Breaks: virtualbox-ose (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose (<< 4.0.6-dfsg-1~)
+Suggests: vde2, virtualbox-guest-additions-iso
+Conflicts: virtualbox-2.0,
+ virtualbox-2.1,
+ virtualbox-2.2,
+ virtualbox-3.0,
+ virtualbox-4.2
Description: x86 virtualization solution - base binaries
VirtualBox is a free x86 virtualization solution allowing a wide range
of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -112,14 +109,12 @@ Description: x86 virtualization solution - base binaries
VirtualBox is provided by the package virtualbox-qt.
Package: virtualbox-dbg
-Section: debug
+Section: contrib/debug
Priority: extra
Architecture: amd64 i386
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends},
- virtualbox (= ${binary:Version}) | virtualbox-guest-utils (= ${binary:Version})
-Breaks: virtualbox-ose-dbg (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-dbg (<< 4.0.6-dfsg-1~)
+Depends: virtualbox (= ${binary:Version}) | virtualbox-guest-utils (= ${binary:Version}),
+ ${misc:Depends}
Description: x86 virtualization solution - debugging symbols
VirtualBox is a free x86 virtualization solution allowing a wide range
of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -128,13 +123,10 @@ Description: x86 virtualization solution - debugging symbols
This package provides the debugging symbols for VirtualBox.
Package: virtualbox-dkms
-Section: kernel
+Section: contrib/kernel
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends}, virtualbox (>= ${source:Version})
-Breaks: virtualbox-ose-dkms (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-dkms (<< 4.0.6-dfsg-1~),
- virtualbox-ose-source (<< 3.1.0-dfsg-1~)
+Depends: virtualbox (>= ${source:Version}), ${misc:Depends}
Description: x86 virtualization solution - kernel module sources for dkms
VirtualBox is a free x86 virtualization solution allowing a wide range
of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -145,16 +137,14 @@ Description: x86 virtualization solution - kernel module sources for dkms
module.
Package: virtualbox-source
-Section: kernel
+Section: contrib/kernel
Architecture: all
-Depends: ${misc:Depends},
- build-essential,
- debhelper (>= 5),
+Depends: build-essential,
bzip2,
- kbuild
-Recommends: module-assistant
-Breaks: virtualbox-ose-source (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-source (<< 4.0.6-dfsg-1~)
+ debhelper (>= 9),
+ kbuild,
+ module-assistant,
+ ${misc:Depends}
Description: x86 virtualization solution - kernel module source
VirtualBox is a free x86 virtualization solution allowing a wide range
of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -165,14 +155,10 @@ Description: x86 virtualization solution - kernel module source
modules. Kernel sources or headers are required to compile this module.
Package: virtualbox-guest-dkms
-Section: kernel
+Section: contrib/kernel
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends},
- virtualbox-guest-utils (>= ${source:Version})
-Breaks: virtualbox-ose-guest-dkms (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-guest-dkms (<< 4.0.6-dfsg-1~),
- virtualbox-ose-guest-source (<< 3.1.0-dfsg-1~)
+Depends: virtualbox-guest-utils (>= ${source:Version}), ${misc:Depends}
XB-Modaliases: ${modaliases}
Description: x86 virtualization solution - guest addition module source for dkms
VirtualBox is a free x86 virtualization solution allowing a wide range
@@ -184,16 +170,14 @@ Description: x86 virtualization solution - guest addition module source for dkms
compile these modules.
Package: virtualbox-guest-source
-Section: kernel
+Section: contrib/kernel
Architecture: all
-Depends: ${misc:Depends},
- build-essential,
- debhelper (>= 5),
+Depends: build-essential,
bzip2,
- kbuild
-Recommends: module-assistant
-Breaks: virtualbox-ose-guest-source (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-guest-source (<< 4.0.6-dfsg-1~)
+ debhelper (>= 9),
+ kbuild,
+ module-assistant,
+ ${misc:Depends}
Description: x86 virtualization solution - guest addition module source
VirtualBox is a free x86 virtualization solution allowing a wide range
of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -205,17 +189,14 @@ Description: x86 virtualization solution - guest addition module source
these modules.
Package: virtualbox-guest-x11
-Section: x11
+Section: contrib/x11
Architecture: amd64 i386
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends},
+Depends: virtualbox-guest-utils (= ${binary:Version}),
${misc:Depends},
- ${xserver:Depends},
- virtualbox-guest-utils (= ${binary:Version})
-Provides: ${xviddriver:Provides}
-Breaks: virtualbox-ose-guest-x11 (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-guest-x11 (<< 4.0.6-dfsg-1~),
- virtualbox-ose-guest-utils (<< 2.2.0-dfsg-1~)
+ ${shlibs:Depends},
+ ${xserver:Depends}
+Provides: xorg-driver-video
Description: x86 virtualization solution - X11 guest utilities
VirtualBox is a free x86 virtualization solution allowing a wide range
of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -228,14 +209,9 @@ Description: x86 virtualization solution - X11 guest utilities
Package: virtualbox-guest-utils
Architecture: amd64 i386
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- adduser,
- pciutils
+Depends: adduser, pciutils, ${misc:Depends}, ${shlibs:Depends}
Recommends: virtualbox-guest-dkms (= ${source:Version}) | virtualbox-guest-source (= ${source:Version}),
virtualbox-guest-x11 (= ${binary:Version})
-Breaks: virtualbox-ose-guest-utils (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-guest-utils (<< 4.0.6-dfsg-1~)
Description: x86 virtualization solution - non-X11 guest utilities
VirtualBox is a free x86 virtualization solution allowing a wide range
of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
@@ -245,119 +221,3 @@ Description: x86 virtualization solution - non-X11 guest utilities
utilities are meant to be run inside the virtual machine.
They provide closer integration and allow to share data through shared folders
between the host system and the virtual machine.
-
-Package: virtualbox-fuse
-Architecture: amd64 i386
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- virtualbox (= ${binary:Version})
-Breaks: virtualbox-ose-fuse (<< 4.0.6-dfsg-1~)
-Replaces: virtualbox-ose-fuse (<< 4.0.6-dfsg-1~)
-Description: x86 virtualization solution - virtual filesystem
- VirtualBox is a free x86 virtualization solution allowing a wide range
- of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
- Linux system.
- .
- This package provides a FUSE-based VFS (Virtual FileSystem) to mount a
- VirtualBox disk so all partitions can be loop-mounted.
-
-Package: virtualbox-ose-qt
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
- virtualbox-qt
-Description: transitional package for virtualbox-qt
- This is a dummy transitional package for virtualbox-qt and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
- virtualbox
-Description: transitional package for virtualbox
- This is a dummy transitional package for virtualbox and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-dbg
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
- virtualbox-dbg
-Description: transitional package for virtualbox-dbg
- This is a dummy transitional package for virtualbox-dbg and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-dkms
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
- virtualbox-dkms
-Description: transitional package for virtualbox-dkms
- This is a dummy transitional package for virtualbox-dkms and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-source
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
- virtualbox-source
-Description: transitional package for virtualbox-source
- This is a dummy transitional package for virtualbox-source and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-guest-dkms
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
- virtualbox-guest-dkms
-Description: transitional package for virtualbox-guest-dkms
- This is a dummy transitional package for virtualbox-guest-dkms and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-guest-source
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
- virtualbox-guest-source
-Description: transitional package for virtualbox-guest-source
- This is a dummy transitional package for virtualbox-guest-source and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-guest-x11
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
- virtualbox-guest-x11
-Description: transitional package for virtualbox-guest-x11
- This is a dummy transitional package for virtualbox-guest-x11 and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-guest-utils
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
- virtualbox-guest-utils
-Description: transitional package for virtualbox-guest-utils
- This is a dummy transitional package for virtualbox-guest-utils and can be
- safely removed after the installation is complete.
-
-Package: virtualbox-ose-fuse
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends},
- virtualbox-fuse
-Description: transitional package for virtualbox-fuse
- This is a dummy transitional package for virtualbox-fuse and can be
- safely removed after the installation is complete.
diff --git a/debian/copyright b/debian/copyright
index 2547635..6046c66 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,11 @@ Mon, 15 Jan 2007 14:33:00 +0100.
It was downloaded from <http://www.virtualbox.org/>.
+This package is not part of the Debian operating system.
+It is in the "contrib" area of the Debian archive because it requires a
+non-free compiler (Open Watcom) to build the BIOS.
+Upstream provides pre-built BIOS images which is used instead.
+
Upstream Author: Oracle Corporation
Copyright:
@@ -97,7 +102,7 @@ Copyright:
VirtualBox may contain x86 SIMD extension for IJG JPEG library which is governed by the
license in the section called "x86 SIMD extension for IJG JPEG library license" and
Copyright 2009 Pierre Ossman <ossman at cendio.se> for Cendio AB;
- Copyright 2010 D. R. Commander; Copyright (C) 1999-2006, MIYASAKA Masaru.
+ Copyright 2010 D. R. Commander; Copyright (C) 1999-2006, MIYASAKA Masaru.
License:
@@ -1562,7 +1567,13 @@ misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
-The Debian packaging is copyright 2007-2001, Patrick Winnertz <patrick.winnertz at skolelinux.org>,
-Daniel Baumann <daniel at debian.org>, Philipp Hug <debian at hug.cx>, Michael Meskes <meskes at debian.org>,
-Felix Geyer <debfx-pkg at fobos.de> and is licensed under the GPL-2+,
+The Debian packaging is copyright 2007-2014,
+ Patrick Winnertz <patrick.winnertz at skolelinux.org>,
+ Daniel Baumann <daniel at debian.org>,
+ Philipp Hug <debian at hug.cx>,
+ Michael Meskes <meskes at debian.org>,
+ Felix Geyer <fgeyer at debian.org>,
+ Ritesh Raj Sarraf <rrs at debian.org>,
+ Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+ and is licensed under the GPL-2+,
see `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index b18541a..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[DEFAULT]
-pristine-tar = True
-sign-tags = True
-color = auto
-
-[git-import-orig]
-dch = True
-
-[git-dch]
-id-length = 7
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
new file mode 100755
index 0000000..c09cd40
--- /dev/null
+++ b/debian/get-orig-source.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+set -ex
+
+UPSTREAM_VERSION=$2
+ORIG_TARBALL=$3
+
+REAL_TARBALL=`readlink -f ${ORIG_TARBALL}`
+
+WORKING_DIR=`dirname ${ORIG_TARBALL}`
+
+ORIG_TARBALL_DFSG=`echo ${ORIG_TARBALL} | sed -e "s/\(${UPSTREAM_VERSION}\)\(\.orig\)/\1-dfsg/g"`
+ORIG_TARBALL_DIR=`echo ${ORIG_TARBALL_DFSG} | sed -e "s/_\(${UPSTREAM_VERSION}\)/-\1/g" -e "s/\.tar\.bz2//g"`
+ORIG_TARBALL_DIR_STRIP=`basename ${ORIG_TARBALL_DIR}`
+DEST_TARBALL_NAME=`echo ${ORIG_TARBALL_DIR} | sed -e "s#-\(${UPSTREAM_VERSION}\)#_\1#g"`.orig.tar.xz
+
+mkdir -p ${ORIG_TARBALL_DIR}
+tar --directory=${ORIG_TARBALL_DIR} --strip 1 -xjf ${REAL_TARBALL} || exit 1
+rm -f ${ORIG_TARBALL} ${REAL_TARBALL}
+
+rm -fr ${ORIG_TARBALL_DIR}/debian
+rm -fr ${ORIG_TARBALL_DIR}/kBuild
+rm -fr ${ORIG_TARBALL_DIR}/tools
+rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Additions/os2
+rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Additions/WINNT
+rm -f ${ORIG_TARBALL_DIR}/VBox/HostDrivers/Support/darwin/load.sh
+rm -f ${ORIG_TARBALL_DIR}/include/VBox/VBoxGuest.inc
+rm -f ${ORIG_TARBALL_DIR}/include/VBox/VBoxGuest16.h
+rm -f ${ORIG_TARBALL_DIR}/include/VBox/VBoxGuest.mac
+rm -f ${ORIG_TARBALL_DIR}/src/libs/xpcom18a4/xpcom/MoreFiles/FSCopyObject.c
+rm -f ${ORIG_TARBALL_DIR}/src/libs/xpcom18a4/xpcom/MoreFiles/FSCopyObject.h
+rm -fr ${ORIG_TARBALL_DIR}/src/libs/libpng*
+rm -fr ${ORIG_TARBALL_DIR}/src/libs/libxml2*
+rm -fr ${ORIG_TARBALL_DIR}/src/libs/libxslt*
+rm -fr ${ORIG_TARBALL_DIR}/src/libs/zlib*
+rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Additions/linux/selinux-fedora
+find ${ORIG_TARBALL_DIR}/src/VBox/Additions/x11/x11include -mindepth 1 -maxdepth 1 \
+ -type d ! -name '*mesa-*' -exec rm -rf {} \;
+rm -fr ${ORIG_TARBALL_DIR}/src/libs/kStuff/kStuff/kLdr/testcase/bin
+rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Devices/EFI/Firmware/FatBinPkg/EnhancedFatDxe/Ebc/Fat.efi
+rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Devices/EFI/Firmware/FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi
+rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Devices/EFI/Firmware/FatBinPkg/EnhancedFatDxe/Ipf/Fat.efi
+rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Devices/EFI/Firmware/FatBinPkg/EnhancedFatDxe/X64/Fat.efi
+rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Devices/EFI/Firmware/StdLib/LibC/Main/Ia32/ftol2.obj
+rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Devices/EFI/Firmware/BaseTools/Source/Python/UPT/Dll/sqlite3.dll
+rm -fr ${ORIG_TARBALL_DIR}/src/VBox/Main/webservice/jaxlibs/*.jar
+
+tar --exclude .svn --exclude '.git*' --exclude debian --directory ${WORKING_DIR} -cJf ${DEST_TARBALL_NAME} ${ORIG_TARBALL_DIR_STRIP} || exit 1
+rm -rf ${ORIG_TARBALL_DIR}
+echo "Done, now you can run git-import-orig ${DEST_TARBALL_NAME}"
+exit 0
diff --git a/debian/manpages/VBoxBalloonCtrl.1 b/debian/manpages/VBoxBalloonCtrl.1
new file mode 100644
index 0000000..438e55a
--- /dev/null
+++ b/debian/manpages/VBoxBalloonCtrl.1
@@ -0,0 +1,26 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.11.
+.TH VBOXBALLOONCTRL "1" "March 2013" "VBoxBalloonCtrl" "User Commands"
+.SH NAME
+VBoxBalloonCtrl \- x86 virtualization solution
+.SH DESCRIPTION
+\fB\-\-balloon\-dec\fR Sets the ballooning decrement in MB (128 MB).
+\fB\-\-balloon\-groups\fR Sets the VM groups for ballooning (all).
+\fB\-\-balloon\-inc\fR Sets the ballooning increment in MB (256 MB).
+\fB\-\-balloon\-interval\fR Sets the check interval in ms (30 seconds).
+\fB\-\-balloon\-lower\-limit\fR Sets the ballooning lower limit in MB (64 MB).
+\fB\-\-balloon\-max\fR Sets the balloon maximum limit in MB (0 MB).
+.IP
+Specifying "0" means disabled ballooning.
+.PP
+Set "VBoxInternal/Guest/BalloonSizeMax" for a per\-VM maximum ballooning size.
+\fB\-\-balloon\-safety\-margin\fR Free memory when deflating a balloon in MB (1024 MB).
+\fB\-\-apimon\-groups\fR Sets the VM groups for monitoring (all),
+.IP
+comma\-separated list.
+.SS "--apimon-isln-response Sets the isolation response to one of:"
+.IP
+none, pause, poweroff, save, shutdown
+(none).
+.PP
+\fB\-\-apimon\-isln\-timeout\fR Sets the isolation timeout in ms (30s).
+\fB\-\-apimon\-resp\-timeout\fR Sets the response timeout in ms (30s).
diff --git a/debian/manpages/VBoxClient.1 b/debian/manpages/VBoxClient.1
index 24d78ab..4c855f4 100644
--- a/debian/manpages/VBoxClient.1
+++ b/debian/manpages/VBoxClient.1
@@ -1,10 +1,10 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.4.
-.TH VBOXCLIENT "1" "January 2011" "VBoxClient" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.1.
+.TH VBOXCLIENT "1" "March 2013" "VBoxClient" "User Commands"
.SH NAME
VBoxClient \- x86 virtualization solution
.SH SYNOPSIS
.B VBoxClient
-\fI--clipboard|--display|--checkhostversion|--seamless \fR[\fI-d|--nodaemon\fR]
+\fI--clipboard|--draganddrop|--display|--checkhostversion|--seamless \fR[\fI-d|--nodaemon\fR]
.SH DESCRIPTION
Start the VirtualBox X Window System guest services.
.SH OPTIONS
@@ -12,6 +12,9 @@ Start the VirtualBox X Window System guest services.
\fB\-\-clipboard\fR
start the shared clipboard service
.TP
+\fB\-\-draganddrop\fR
+start the drag and drop service
+.TP
\fB\-\-display\fR
start the display management service
.HP
diff --git a/debian/manpages/VBoxControl.8 b/debian/manpages/VBoxControl.8
index 6158a96..2b68ddf 100644
--- a/debian/manpages/VBoxControl.8
+++ b/debian/manpages/VBoxControl.8
@@ -1,24 +1,24 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.4.
-.TH VBOXCONTROL "8" "January 2011" "VBoxControl" "System Administration Utilities"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.1.
+.TH VBOXCONTROL "8" "March 2013" "VBoxControl" "System Administration Utilities"
.SH NAME
VBoxControl \- x86 virtualization solution
.SH DESCRIPTION
Oracle VM VirtualBox Guest Additions Command Line Management Interface
-(C) 2008\-2011 Oracle Corporation
+(C) 2008\-2013 Oracle Corporation
All rights reserved.
.PP
Usage:
.PP
-VBoxControl [\-v|\-version] print version number and exit
-VBoxControl \fB\-nologo\fR ... suppress the logo
+VBoxControl [\-v|\-\-version] print version number and exit
+VBoxControl \fB\-\-nologo\fR ... suppress the logo
.PP
-VBoxControl guestproperty get <property> [\-verbose]
-VBoxControl guestproperty set <property> [<value> [\-flags <flags>]]
-VBoxControl guestproperty enumerate [\-patterns <patterns>]
+VBoxControl guestproperty get <property> [\-\-verbose]
+VBoxControl guestproperty set <property> [<value> [\-\-flags <flags>]]
+VBoxControl guestproperty enumerate [\-\-patterns <patterns>]
VBoxControl guestproperty wait <patterns>
.IP
-[\-timestamp <last timestamp>]
-[\-timeout <timeout in ms>
+[\-\-timestamp <last timestamp>]
+[\-\-timeout <timeout in ms>
.PP
VBoxControl sharedfolder list [\-automount]
VBoxControl writecoredump
diff --git a/debian/manpages/VBoxHeadless.1 b/debian/manpages/VBoxHeadless.1
index 4c6b73a..2a7d7b2 100644
--- a/debian/manpages/VBoxHeadless.1
+++ b/debian/manpages/VBoxHeadless.1
@@ -1,25 +1,16 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2.
-.TH VBOXHEADLESS "1" "January 2011" "VBoxHeadless" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.11.
+.TH VBOXHEADLESS "1" "March 2013" "VBoxHeadless" "User Commands"
.SH NAME
VBoxHeadless \- x86 virtualization solution
.SH DESCRIPTION
Oracle VM VirtualBox Headless Interface
-(C) 2008\-2011 Oracle Corporation
+(C) 2008\-2013 Oracle Corporation
All rights reserved.
.SS "Usage:"
.TP
\fB\-s\fR, \fB\-startvm\fR, \fB\-\-startvm\fR <name|uuid>
Start given VM (required argument)
.TP
-\fB\-n\fR, \fB\-\-vnc\fR
-Enable the built in VNC server
-.TP
-\fB\-m\fR, \fB\-\-vncport\fR <port>
-TCP port number to use for the VNC server
-.TP
-\fB\-o\fR, \fB\-\-vncpass\fR <pw>
-Set the VNC server password
-.TP
\fB\-v\fR, \fB\-vrde\fR, \fB\-\-vrde\fR on|off|config
Enable (default) or disable the VRDE
server or don't change the setting
@@ -31,6 +22,12 @@ two port numbers to specify a range
"TCP/Address" \- interface IP the VRDE server
will bind to
.TP
+\fB\-\-settingspw\fR <pw>
+Specify the settings password
+.TP
+\fB\-\-settingspwfile\fR <file>
+Specify a file containing the settings password
+.TP
\fB\-c\fR, \fB\-capture\fR, \fB\-\-capture\fR
Record the VM screen output to a file
.TP
@@ -44,6 +41,5 @@ Frame height when recording
Recording bit rate when recording
.TP
\fB\-f\fR, \fB\-\-filename\fR
-File name when recording. The codec
-used will be chosen based on the
-file extension
+File name when recording. The codec used
+will be chosen based on the file extension
diff --git a/debian/manpages/VBoxManage.1 b/debian/manpages/VBoxManage.1
index a9044f6..ccdc941 100644
--- a/debian/manpages/VBoxManage.1
+++ b/debian/manpages/VBoxManage.1
@@ -1,48 +1,71 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2.
-.TH VBOXMANAGE "1" "January 2011" "VBoxManage" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.11.
+.TH VBOXMANAGE "1" "March 2013" "VBoxManage" "User Commands"
.SH NAME
VBoxManage \- x86 virtualization solution
.SH DESCRIPTION
Oracle VM VirtualBox Command Line Management Interface
-(C) 2005\-2011 Oracle Corporation
+(C) 2005\-2013 Oracle Corporation
All rights reserved.
.PP
Usage:
-.PP
-VBoxManage [\-v|\-\-version] print version number and exit
-VBoxManage [\-q|\-\-nologo] ... suppress the logo
-.PP
-VBoxManage list [\-\-long|\-l] vms|runningvms|ostypes|hostdvds|hostfloppies|
.IP
+VBoxManage [<general option>] <command>
+.PP
+General Options:
+.TP
+[\-v|\-\-version]
+print version number and exit
+.TP
+[\-q|\-\-nologo]
+suppress the logo
+.TP
+[\-\-settingspw <pw>]
+provide the settings password
+.IP
+[\-\-settingspwfile <file>] provide a file containing the settings password
+.PP
+Commands:
+.TP
+list [\-\-long|\-l]
+vms|runningvms|ostypes|hostdvds|hostfloppies|
bridgedifs|hostonlyifs|dhcpservers|hostinfo|
hostcpuids|hddbackends|hdds|dvds|floppies|
-usbhost|usbfilters|systemproperties|extpacks
-.PP
-VBoxManage showvminfo <uuid>|<name> [\-\-details] [\-\-statistics]
-.IP
+usbhost|usbfilters|systemproperties|extpacks|
+groups
+.TP
+showvminfo
+<uuid>|<name> [\-\-details]
[\-\-machinereadable]
-.PP
-VBoxManage showvminfo <uuid>|<name> \fB\-\-log\fR <idx>
-.PP
-VBoxManage registervm <filename>
-.PP
-VBoxManage unregistervm <uuid>|<name> [\-\-delete]
-.PP
-VBoxManage createvm \fB\-\-name\fR <name>
-.IP
+.TP
+showvminfo
+<uuid>|<name> \fB\-\-log\fR <idx>
+.TP
+registervm
+<filename>
+.TP
+unregistervm
+<uuid>|<name> [\-\-delete]
+.TP
+createvm
+\fB\-\-name\fR <name>
+[\-\-groups <group>, ...]
[\-\-ostype <ostype>]
[\-\-register]
-[\-\-basefolder <path> | \fB\-\-settingsfile\fR <path>]
+[\-\-basefolder <path>]
[\-\-uuid <uuid>]
-.PP
-VBoxManage modifyvm <uuid|name>
-.IP
+.TP
+modifyvm
+<uuid|name>
[\-\-name <name>]
+[\-\-groups <group>, ...]
[\-\-ostype <ostype>]
[\-\-memory <memorysize in MB>]
[\-\-pagefusion on|off]
[\-\-vram <vramsize in MB>]
[\-\-acpi on|off]
+[\-\-pciattach 03:04.0]
+[\-\-pciattach 03:04.0 at 02:01.0]
+[\-\-pcidetach 03:04.0]
[\-\-ioapic on|off]
[\-\-pae on|off]
[\-\-hpet on|off]
@@ -77,7 +100,7 @@ VBoxManage modifyvm <uuid|name>
[\-\-boot<1\-4> none|floppy|dvd|disk|net>]
[\-\-nic<1\-N> none|null|nat|bridged|intnet|hostonly|
.IP
-vde]
+generic]
.IP
[\-\-nictype<1\-N> Am79C970A|Am79C973|
.IP
@@ -87,13 +110,16 @@ virtio]
[\-\-cableconnected<1\-N> on|off]
[\-\-nictrace<1\-N> on|off]
[\-\-nictracefile<1\-N> <filename>]
+[\-\-nicproperty<1\-N> name=[value]]
[\-\-nicspeed<1\-N> <kbps>]
[\-\-nicbootprio<1\-N> <priority>]
+[\-\-nicpromisc<1\-N> deny|allow\-vms|allow\-all]
+[\-\-nicbandwidthgroup<1\-N> none|<name>]
[\-\-bridgeadapter<1\-N> none|<devicename>]
[\-\-hostonlyadapter<1\-N> none|<devicename>]
[\-\-intnet<1\-N> <network name>]
[\-\-natnet<1\-N> <network>|default]
-[\-\-vdenet<1\-N> <network>|default]
+[\-\-nicgenericdrv<1\-N> <driver>
[\-\-natsettings<1\-N> [<mtu>],[<socksnd>],
.IP
[<sockrcv>],[<tcpsnd>],
@@ -107,6 +133,7 @@ virtio]
[\-\-nattftpprefix<1\-N> <prefix>]
[\-\-nattftpfile<1\-N> <file>]
[\-\-nattftpserver<1\-N> <ip>]
+[\-\-natbindip<1\-N> <ip>
[\-\-natdnspassdomain<1\-N> on|off]
[\-\-natdnsproxy<1\-N> on|off]
[\-\-natdnshostresolver<1\-N> on|off]
@@ -125,6 +152,8 @@ client <pipe>|
file <file>|
<devicename>]
.IP
+[\-\-lpt<1\-N> off|<I/O base> <IRQ>]
+[\-\-lptmode<1\-N> <devicename>]
[\-\-guestmemoryballoon <balloonsize in MB>]
[\-\-gueststatisticsinterval <seconds>]
[\-\-audio none|null|oss|alsa|pulse]
@@ -133,6 +162,7 @@ file <file>|
.IP
bidirectional]
.IP
+[\-\-draganddrop disabled|hosttoguest
[\-\-vrde on|off]
[\-\-vrdeextpack default|<name>
[\-\-vrdeproperty <name=[value]>]
@@ -151,16 +181,41 @@ bidirectional]
[\-\-teleporterport <port>]
[\-\-teleporteraddress <address|empty>
[\-\-teleporterpassword <password>]
-.PP
-VBoxManage import <ovf/ova> [\-\-dry\-run|\-n] [more options]
+[\-\-teleporterpasswordfile <file>|stdin]
+[\-\-tracing\-enabled on|off]
+[\-\-tracing\-config <config\-string>]
+[\-\-tracing\-allow\-vm\-access on|off]
+[\-\-usbwebcam on|off]
+[\-\-usbcardreader on|off]
+[\-\-autostart\-enabled on|off]
+[\-\-autostart\-delay <seconds>]
+.TP
+clonevm
+<uuid>|<name>
+[\-\-snapshot <uuid>|<name>]
+[\-\-mode machine|machineandchildren|all]
+[\-\-options link|keepallmacs|keepnatmacs|
+.IP
+keepdisknames]
.IP
+[\-\-name <name>]
+[\-\-groups <group>, ...]
+[\-\-basefolder <basefolder>]
+[\-\-uuid <uuid>]
+[\-\-register]
+.TP
+import
+<ovf/ova>
+[\-\-dry\-run|\-n]
+[\-\-options keepallmacs|keepnatmacs]
+[more options]
(run with \fB\-n\fR to have options displayed
.IP
for a particular OVF)
-.PP
-VBoxManage export <machines> \fB\-\-output\fR|\-o <ovf/ova>
-.IP
-[\-\-legacy09]
+.TP
+export
+<machines> \fB\-\-output\fR|\-o <name>.<ovf/ova>
+[\-\-legacy09|\-\-ovf09|\-\-ovf10|\-\-ovf20]
[\-\-manifest]
[\-\-vsys <number of virtual system>]
.IP
@@ -171,23 +226,24 @@ VBoxManage export <machines> \fB\-\-output\fR|\-o <ovf/ova>
[\-\-version <version info>]
[\-\-eula <license text>]
[\-\-eulafile <filename>]
-.PP
-VBoxManage startvm <uuid>|<name>
-.IP
+.TP
+startvm
+<uuid>|<name>...
[\-\-type gui|sdl|headless]
-.PP
-VBoxManage controlvm <uuid>|<name>
-.IP
+.TP
+controlvm
+<uuid>|<name>
pause|resume|reset|poweroff|savestate|
acpipowerbutton|acpisleepbutton|
keyboardputscancode <hex> [<hex> ...]|
setlinkstate<1\-N> on|off |
-nic<1\-N> null|nat|bridged|intnet|hostonly
+nic<1\-N> null|nat|bridged|intnet|hostonly|generic
.IP
[<devicename>] |
.IP
nictrace<1\-N> on|off
nictracefile<1\-N> <filename>
+nicproperty<1\-N> name=[value]
natpf<1\-N> [<rulename>],tcp|udp,[<hostip>],
.IP
<hostport>,[<guestip>],<guestport>
@@ -197,29 +253,47 @@ guestmemoryballoon <balloonsize in MB>]
gueststatisticsinterval <seconds>]
usbattach <uuid>|<address> |
usbdetach <uuid>|<address> |
+clipboard disabled|hosttoguest|guesttohost|
+.IP
+bidirectional]
+.IP
+draganddrop disabled|hosttoguest]
vrde on|off |
vrdeport <port> |
vrdeproperty <name=[value]> |
vrdevideochannelquality <percent>
-setvideomodehint <xres> <yres> <bpp> [display] |
-setcredentials <username> <password> <domain>
+setvideomodehint <xres> <yres> <bpp>
+.IP
+[[<display>] [<enabled:yes|no>
+.IP
+[<xorigin> <yorigin>]]] |
.IP
+screenshotpng <file> [display] |
+setcredentials <username>
+.IP
+\fB\-\-passwordfile\fR <file> | <password>
+<domain>
[\-\-allowlocallogon <yes|no>] |
.IP
teleport \fB\-\-host\fR <name> \fB\-\-port\fR <port>
.IP
-[\-\-maxdowntime <msec>] [\-\-password password]
+[\-\-maxdowntime <msec>]
+[\-\-passwordfile <file> |
+.IP
+\fB\-\-password\fR <password>]
.IP
plugcpu <id>
unplugcpu <id>
cpuexecutioncap <1\-100>
-.PP
-VBoxManage discardstate <uuid>|<name>
-.PP
-VBoxManage adoptstate <uuid>|<name> <state_file>
-.PP
-VBoxManage snapshot <uuid>|<name>
-.IP
+.TP
+discardstate
+<uuid>|<name>
+.TP
+adoptstate
+<uuid>|<name> <state_file>
+.TP
+snapshot
+<uuid>|<name>
take <name> [\-\-description <desc>] [\-\-pause] |
delete <uuid>|<name> |
restore <uuid>|<name> |
@@ -229,19 +303,20 @@ edit <uuid>|<name>|\-\-current
[\-\-name <name>]
[\-\-description <desc>] |
.IP
+list [\-\-details|\-\-machinereadable]
showvminfo <uuid>|<name>
-.PP
-VBoxManage closemedium disk|dvd|floppy <uuid>|<filename>
-.IP
+.TP
+closemedium
+disk|dvd|floppy <uuid>|<filename>
[\-\-delete]
-.PP
-VBoxManage storageattach <uuid|vmname>
-.IP
+.TP
+storageattach
+<uuid|vmname>
\fB\-\-storagectl\fR <name>
-\fB\-\-port\fR <number>
-\fB\-\-device\fR <number>
+[\-\-port <number>]
+[\-\-device <number>]
[\-\-type dvddrive|hdd|fdd]
-[\-\-medium none|emptydrive|
+[\-\-medium none|emptydrive|additions|
.IP
<uuid>|<filename>|host:<drive>|iscsi]
.IP
@@ -250,49 +325,65 @@ VBoxManage storageattach <uuid|vmname>
readonly|multiattach]
.IP
[\-\-comment <text>]
+[\-\-setuuid <uuid>]
+[\-\-setparentuuid <uuid>]
[\-\-passthrough on|off]
+[\-\-tempeject on|off]
+[\-\-nonrotational on|off]
+[\-\-discard on|off]
[\-\-bandwidthgroup <name>]
[\-\-forceunmount]
[\-\-server <name>|<ip>]
[\-\-target <target>]
-[\-\-port <port>]
+[\-\-tport <port>]
[\-\-lun <lun>]
[\-\-encodedlun <lun>]
[\-\-username <username>]
[\-\-password <password>]
+[\-\-initiator <initiator>]
[\-\-intnet]
-.PP
-VBoxManage storagectl <uuid|vmname>
-.IP
+.TP
+storagectl
+<uuid|vmname>
\fB\-\-name\fR <name>
[\-\-add ide|sata|scsi|floppy|sas]
[\-\-controller LSILogic|LSILogicSAS|BusLogic|
.IP
IntelAHCI|PIIX3|PIIX4|ICH6|I82078]
.IP
-[\-\-sataideemulation<1\-4> <1\-30>]
[\-\-sataportcount <1\-30>]
[\-\-hostiocache on|off]
[\-\-bootable on|off]
[\-\-remove]
-.PP
-VBoxManage bandwidthctl <uuid|vmname>
-.IP
-\fB\-\-name\fR <name>
-[\-\-add disk|network]
-[\-\-limit <megabytes per second>
-[\-\-delete]
-.PP
-VBoxManage showhdinfo <uuid>|<filename>
-.PP
-VBoxManage createhd \fB\-\-filename\fR <filename>
-.IP
-\fB\-\-size\fR <megabytes>|\-\-sizebyte <bytes>
+.TP
+bandwidthctl
+<uuid|vmname>
+add <name> \fB\-\-type\fR disk|network
+.IP
+\fB\-\-limit\fR <megabytes per second>[k|m|g|K|M|G] |
+.IP
+set <name>
+.IP
+\fB\-\-limit\fR <megabytes per second>[k|m|g|K|M|G] |
+.IP
+remove <name> |
+list [\-\-machinereadable]
+(limit units: k=kilobit, m=megabit, g=gigabit,
+.IP
+K=kilobyte, M=megabyte, G=gigabyte)
+.TP
+showhdinfo
+<uuid>|<filename>
+.TP
+createhd
+\fB\-\-filename\fR <filename>
+[\-\-size <megabytes>|\-\-sizebyte <bytes>]
+[\-\-diffparent <uuid>|<filename>
[\-\-format VDI|VMDK|VHD] (default: VDI)
[\-\-variant Standard,Fixed,Split2G,Stream,ESX]
-.PP
-VBoxManage modifyhd <uuid>|<filename>
-.IP
+.TP
+modifyhd
+<uuid>|<filename>
[\-\-type normal|writethrough|immutable|shareable|
.IP
readonly|multiattach]
@@ -300,41 +391,44 @@ readonly|multiattach]
[\-\-autoreset on|off]
[\-\-compact]
[\-\-resize <megabytes>|\-\-resizebyte <bytes>]
-.PP
-VBoxManage clonehd <uuid>|<filename> <outputfile>
-.IP
+.TP
+clonehd
+<uuid>|<filename> <uuid>|<outputfile>
[\-\-format VDI|VMDK|VHD|RAW|<other>]
[\-\-variant Standard,Fixed,Split2G,Stream,ESX]
[\-\-existing]
-.PP
-VBoxManage convertfromraw <filename> <outputfile>
-.IP
+.TP
+convertfromraw
+<filename> <outputfile>
[\-\-format VDI|VMDK|VHD]
[\-\-variant Standard,Fixed,Split2G,Stream,ESX]
-.PP
-VBoxManage convertfromraw stdin <outputfile> <bytes>
-.IP
+[\-\-uuid <uuid>]
+.TP
+convertfromraw
+stdin <outputfile> <bytes>
[\-\-format VDI|VMDK|VHD]
[\-\-variant Standard,Fixed,Split2G,Stream,ESX]
-.PP
-VBoxManage getextradata global|<uuid>|<name>
-.IP
+[\-\-uuid <uuid>]
+.TP
+getextradata
+global|<uuid>|<name>
<key>|enumerate
-.PP
-VBoxManage setextradata global|<uuid>|<name>
-.IP
+.TP
+setextradata
+global|<uuid>|<name>
<key>
[<value>] (no value deletes key)
-.PP
-VBoxManage setproperty machinefolder default|<folder> |
-.IP
+.TP
+setproperty
+machinefolder default|<folder> |
vrdeauthlibrary default|<library> |
websrvauthlibrary default|null|<library> |
vrdeextpack null|<library> |
+autostartdbpath null|<folder> |
loghistorycount <value>
-.PP
-VBoxManage usbfilter add <index,0\-N>
-.IP
+.TP
+usbfilter
+add <index,0\-N>
\fB\-\-target\fR <uuid>|<name>|global
\fB\-\-name\fR <string>
\fB\-\-action\fR ignore|hold (global filters only)
@@ -347,9 +441,9 @@ VBoxManage usbfilter add <index,0\-N>
[\-\-remote yes|no] (null, VM filters only)
[\-\-serialnumber <string>] (null)
[\-\-maskedinterfaces <XXXXXXXX>]
-.PP
-VBoxManage usbfilter modify <index,0\-N>
-.IP
+.TP
+usbfilter
+modify <index,0\-N>
\fB\-\-target\fR <uuid>|<name>|global
[\-\-name <string>]
[\-\-action ignore|hold] (global filters only)
@@ -362,110 +456,139 @@ VBoxManage usbfilter modify <index,0\-N>
[\-\-remote yes|no] (null, VM filters only)
[\-\-serialnumber <string>|""]
[\-\-maskedinterfaces <XXXXXXXX>]
-.PP
-VBoxManage usbfilter remove <index,0\-N>
-.IP
+.TP
+usbfilter
+remove <index,0\-N>
\fB\-\-target\fR <uuid>|<name>|global
-.PP
-VBoxManage sharedfolder add <vmname>|<uuid>
-.IP
+.TP
+sharedfolder
+add <vmname>|<uuid>
\fB\-\-name\fR <name> \fB\-\-hostpath\fR <hostpath>
[\-\-transient] [\-\-readonly] [\-\-automount]
-.PP
-VBoxManage sharedfolder remove <vmname>|<uuid>
-.IP
+.TP
+sharedfolder
+remove <vmname>|<uuid>
\fB\-\-name\fR <name> [\-\-transient]
-.PP
-VBoxManage guestproperty get <vmname>|<uuid>
-.IP
+.TP
+guestproperty
+get <vmname>|<uuid>
<property> [\-\-verbose]
-.PP
-VBoxManage guestproperty set <vmname>|<uuid>
-.IP
+.TP
+guestproperty
+set <vmname>|<uuid>
<property> [<value> [\-\-flags <flags>]]
-.PP
-VBoxManage guestproperty enumerate <vmname>|<uuid>
-.IP
+.TP
+guestproperty
+enumerate <vmname>|<uuid>
[\-\-patterns <patterns>]
-.PP
-VBoxManage guestproperty wait <vmname>|<uuid> <patterns>
-.IP
+.TP
+guestproperty
+wait <vmname>|<uuid> <patterns>
[\-\-timeout <msec>] [\-\-fail\-on\-timeout]
-.PP
-VBoxManage guestcontrol exec[ute] <vmname>|<uuid>
-.IP
-<path to program>
-\fB\-\-username\fR <name> \fB\-\-password\fR <password>
-[\-\-arguments "<arguments>"]
+.TP
+guestcontrol
+<vmname>|<uuid>
+exec[ute]
+\fB\-\-image\fR <path to program> \fB\-\-username\fR <name>
+[\-\-passwordfile <file> | \fB\-\-password\fR <password>]
+[\-\-domain <domain>] [\-\-verbose] [\-\-timeout <msec>]
[\-\-environment "<NAME>=<VALUE> [<NAME>=<VALUE>]"]
-[\-\-flags <flags>] [\-\-timeout <msec>]
-[\-\-verbose] [\-\-wait\-for exit,stdout,stderr||]
-.IP
-copyto|cp <vmname>|<uuid>
-<source on host> <destination on guest>
-\fB\-\-username\fR <name> \fB\-\-password\fR <password>
-[\-\-dryrun] [\-\-follow] [\-\-recursive] [\-\-verbose]
-.IP
-createdir[ectory]|mkdir|md <vmname>|<uuid>
-<directory to create on guest>
-\fB\-\-username\fR <name> \fB\-\-password\fR <password>
-[\-\-parents] [\-\-mode <mode>] [\-\-verbose]
-.IP
-updateadditions <vmname>|<uuid>
+[\-\-wait\-exit] [\-\-wait\-stdout] [\-\-wait\-stderr]
+[\-\-dos2unix] [\-\-unix2dos]
+[\-\- [<argument1>] ... [<argumentN>]]
+.IP
+copyfrom
+<guest source> <host dest> \fB\-\-username\fR <name>
+[\-\-passwordfile <file> | \fB\-\-password\fR <password>]
+[\-\-domain <domain>] [\-\-verbose]
+[\-\-dryrun] [\-\-follow] [\-\-recursive]
+.IP
+copyto|cp
+<host source> <guest dest> \fB\-\-username\fR <name>
+[\-\-passwordfile <file> | \fB\-\-password\fR <password>]
+[\-\-domain <domain>] [\-\-verbose]
+[\-\-dryrun] [\-\-follow] [\-\-recursive]
+.IP
+createdir[ectory]|mkdir|md
+<guest directory>... \fB\-\-username\fR <name>
+[\-\-passwordfile <file> | \fB\-\-password\fR <password>]
+[\-\-domain <domain>] [\-\-verbose]
+[\-\-parents] [\-\-mode <mode>]
+.IP
+stat
+<file>... \fB\-\-username\fR <name>
+[\-\-passwordfile <file> | \fB\-\-password\fR <password>]
+[\-\-domain <domain>] [\-\-verbose]
+.IP
+updateadditions
[\-\-source <guest additions .ISO>] [\-\-verbose]
-.PP
-VBoxManage debugvm <uuid>|<name>
-.IP
+[\-\-wait\-start]
+.TP
+debugvm
+<uuid>|<name>
dumpguestcore \fB\-\-filename\fR <name> |
info <item> [args] |
injectnmi |
+log [\-\-release|\-\-debug] <settings> ...|
+logdest [\-\-release|\-\-debug] <settings> ...|
+logflags [\-\-release|\-\-debug] <settings> ...|
osdetect |
osinfo |
getregisters [\-\-cpu <id>] <reg>|all ... |
setregisters [\-\-cpu <id>] <reg>=<value> ... |
+show [\-\-human\-readable|\-\-sh\-export|\-\-sh\-eval|
+.IP
+\fB\-\-cmd\-set]\fR
+.IP
+<logdbg\-settings|logrel\-settings>
+[[opt] what ...] |
+.IP
statistics [\-\-reset] [\-\-pattern <pattern>]
[\-\-descriptions]
-.PP
-VBoxManage metrics list [*|host|<vmname> [<metric_list>]]
+.TP
+metrics
+list [*|host|<vmname> [<metric_list>]]
.IP
(comma\-separated)
-.PP
-VBoxManage metrics setup
-.IP
+.TP
+metrics
+setup
[\-\-period <seconds>] (default: 1)
[\-\-samples <count>] (default: 1)
[\-\-list]
[*|host|<vmname> [<metric_list>]]
-.PP
-VBoxManage metrics query [*|host|<vmname> [<metric_list>]]
-.PP
-VBoxManage metrics enable
-.IP
+.TP
+metrics
+query [*|host|<vmname> [<metric_list>]]
+.TP
+metrics
+enable
[\-\-list]
[*|host|<vmname> [<metric_list>]]
-.PP
-VBoxManage metrics disable
-.IP
+.TP
+metrics
+disable
[\-\-list]
[*|host|<vmname> [<metric_list>]]
-.PP
-VBoxManage metrics collect
-.IP
+.TP
+metrics
+collect
[\-\-period <seconds>] (default: 1)
[\-\-samples <count>] (default: 1)
[\-\-list]
[\-\-detach]
[*|host|<vmname> [<metric_list>]]
-.PP
-VBoxManage hostonlyif ipconfig <name>
-.IP
+.TP
+hostonlyif
+ipconfig <name>
[\-\-dhcp |
\fB\-\-ip\fR<ipv4> [\-\-netmask<ipv4> (def: 255.255.255.0)] |
\fB\-\-ipv6\fR<ipv6> [\-\-netmasklengthv6<length> (def: 64)]]
create |
remove <name>
-.PP
-VBoxManage dhcpserver add|modify \fB\-\-netname\fR <network_name> |
+.TP
+dhcpserver
+add|modify \fB\-\-netname\fR <network_name> |
.IP
\fB\-\-ifname\fR <hostonly_if_name>
.IP
@@ -474,12 +597,13 @@ VBoxManage dhcpserver add|modify \fB\-\-netname\fR <network_name> |
\fB\-\-lowerip\fR <lower_ip>
\fB\-\-upperip\fR <upper_ip>]
[\-\-enable | \fB\-\-disable]\fR
-.PP
-VBoxManage dhcpserver remove \fB\-\-netname\fR <network_name> |
+.TP
+dhcpserver
+remove \fB\-\-netname\fR <network_name> |
.IP
\fB\-\-ifname\fR <hostonly_if_name>
-.PP
-VBoxManage extpack install <tarball> |
-.IP
+.TP
+extpack
+install [\-\-replace] <tarball> |
uninstall [\-\-force] <name> |
cleanup
diff --git a/debian/manpages/VBoxSDL.1 b/debian/manpages/VBoxSDL.1
index 597010b..5f290ee 100644
--- a/debian/manpages/VBoxSDL.1
+++ b/debian/manpages/VBoxSDL.1
@@ -1,10 +1,10 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2.
-.TH VBOXSDL "1" "January 2011" "VBoxSDL" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.11.
+.TH VBOXSDL "1" "March 2013" "VBoxSDL" "User Commands"
.SH NAME
VBoxSDL \- x86 virtualization solution
.SH DESCRIPTION
Oracle VM VirtualBox SDL GUI version
-(C) 2005\-2011 Oracle Corporation
+(C) 2005\-2013 Oracle Corporation
All rights reserved.
.SS "Usage:"
.TP
@@ -66,6 +66,12 @@ Listen for VRDP connections on one of specified ports (default if not specified)
\fB\-\-discardstate\fR
Discard saved state (if present) and revert to last snapshot (if present)
.TP
+\fB\-\-settingspw\fR <pw>
+Specify the settings password
+.TP
+\fB\-\-settingspwfile\fR <file>
+Specify a file containing the settings password
+.TP
\fB\-\-[no]rawr0\fR
Enable or disable raw ring 3
.TP
diff --git a/debian/manpages/VBoxService.8 b/debian/manpages/VBoxService.8
index 8301d99..704eac6 100644
--- a/debian/manpages/VBoxService.8
+++ b/debian/manpages/VBoxService.8
@@ -1,18 +1,21 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.4.
-.TH VBOXSERVICE "8" "January 2011" "VBoxService" "System Administration Utilities"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.1.
+.TH VBOXSERVICE "8" "March 2013" "VBoxService" "System Administration Utilities"
.SH NAME
VBoxService \- x86 virtualization solution
.SH DESCRIPTION
.SS "Usage:"
.TP
VBoxService
-[\-f|\-\-foreground] [\-v|\-\-verbose] [\-i|\-\-interval <seconds>]
-[\-\-disable\-<service>] [\-\-enable\-<service>] [\-h|\-?|\-\-help]
-[\-\-control\-interval <ms>]
+[\-f|\-\-foreground] [\-v|\-\-verbose] [\-l|\-\-logfile <file>]
+[\-i|\-\-interval <seconds>]
+[\-\-disable\-<service>] [\-\-enable\-<service>]
+[\-\-only\-<service>] [\-h|\-?|\-\-help]
+[\-\-control\-interval <ms>] [\-\-control\-procs\-max\-kept <x>]
+[\-\-control\-procs\-mem\-std[in|out|err] <KB>]
[\-\-timesync\-interval <ms>] [\-\-timesync\-min\-adjust <ms>]
[\-\-timesync\-latency\-factor <x>] [\-\-timesync\-max\-latency <ms>]
-[\-\-timesync\-set\-threshold <ms>] [\-\-timesync\-set\-start] [\-\-timesync\-set\-restore 0|1]
-.IP
+[\-\-timesync\-set\-threshold <ms>] [\-\-timesync\-set\-start]
+[\-\-timesync\-set\-on\-restore 0|1]
[\-\-vminfo\-interval <ms>]
.SH OPTIONS
.TP
@@ -22,9 +25,15 @@ The default interval.
\fB\-f\fR | \fB\-\-foreground\fR
Don't daemonize the program. For debugging.
.TP
+\fB\-l\fR | \fB\-\-logfile\fR <file>
+Enables logging to a file.
+.TP
\fB\-v\fR | \fB\-\-verbose\fR
Increment the verbosity level. For debugging.
.TP
+\fB\-V\fR | \fB\-\-version\fR
+Show version information.
+.TP
\fB\-h\fR | \-? | \fB\-\-help\fR
Show this message and exit with status 1.
.SS "Service-specific options:"
@@ -35,16 +44,26 @@ Enables the control service. (default)
\fB\-\-disable\-control\fR
Disables the control service.
.TP
+\fB\-\-only\-control\fR
+Only enables the control service.
+.TP
\fB\-\-control\-interval\fR
Specifies the interval at which to check for
new control commands. The default is 1000 ms.
.TP
+\fB\-\-control\-procs\-max\-kept\fR
+Specifies how many started guest processes are
+kept into memory to work with. Default is 256.
+.TP
\fB\-\-enable\-timesync\fR
Enables the timesync service. (default)
.TP
\fB\-\-disable\-timesync\fR
Disables the timesync service.
.TP
+\fB\-\-only\-timesync\fR
+Only enables the timesync service.
+.TP
\fB\-\-timesync\-interval\fR
Specifies the interval at which to synchronize the
time with the host. The default is 10000 ms.
@@ -81,6 +100,9 @@ Enables the vminfo service. (default)
\fB\-\-disable\-vminfo\fR
Disables the vminfo service.
.TP
+\fB\-\-only\-vminfo\fR
+Only enables the vminfo service.
+.TP
\fB\-\-vminfo\-interval\fR
Specifies the interval at which to retrieve the
VM information. The default is 10000 ms.
@@ -91,22 +113,34 @@ Enables the cpuhotplug service. (default)
\fB\-\-disable\-cpuhotplug\fR
Disables the cpuhotplug service.
.TP
+\fB\-\-only\-cpuhotplug\fR
+Only enables the cpuhotplug service.
+.TP
\fB\-\-enable\-memballoon\fR
Enables the memballoon service. (default)
.TP
\fB\-\-disable\-memballoon\fR
Disables the memballoon service.
.TP
+\fB\-\-only\-memballoon\fR
+Only enables the memballoon service.
+.TP
\fB\-\-enable\-vmstats\fR
Enables the vmstats service. (default)
.TP
\fB\-\-disable\-vmstats\fR
Disables the vmstats service.
.TP
+\fB\-\-only\-vmstats\fR
+Only enables the vmstats service.
+.TP
\fB\-\-enable\-automount\fR
Enables the automount service. (default)
.TP
\fB\-\-disable\-automount\fR
Disables the automount service.
+.TP
+\fB\-\-only\-automount\fR
+Only enables the automount service.
.IP
-Copyright (C) 2009\-2011 Oracle Corporation
+Copyright (C) 2009\-2013 Oracle Corporation
diff --git a/debian/manpages/VirtualBox.1 b/debian/manpages/VirtualBox.1
index 4036e63..ffdb2a6 100644
--- a/debian/manpages/VirtualBox.1
+++ b/debian/manpages/VirtualBox.1
@@ -1,10 +1,10 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2.
-.TH VIRTUALBOX "1" "January 2011" "VirtualBox" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.11.
+.TH VIRTUALBOX "1" "March 2013" "VirtualBox" "User Commands"
.SH NAME
VirtualBox \- x86 virtualization solution
.SH DESCRIPTION
Oracle VM VirtualBox Manager
-(C) 2005\-2011 Oracle Corporation
+(C) 2005\-2013 Oracle Corporation
All rights reserved.
.SS "Usage:"
.TP
@@ -43,12 +43,36 @@ start the VM in the paused state
.TP
\fB\-\-start\-running\fR
start the VM running (for overriding \fB\-\-debug\fR*)
-.SS "The following environment variables are evaluated:"
+.SS "Expert options:"
.TP
-VBOX_GUI_DBG_ENABLED
-enable the GUI debug menu if set
+\fB\-\-disable\-patm\fR
+disable code patching (ignored by AMD\-V/VT\-x)
+.TP
+\fB\-\-disable\-csam\fR
+disable code scanning (ignored by AMD\-V/VT\-x)
+.TP
+\fB\-\-recompile\-supervisor\fR
+recompiled execution of supervisor code (*)
.TP
-VBOX_GUI_DBG_AUTO_SHOW
+\fB\-\-recompile\-user\fR
+recompiled execution of user code (*)
+.TP
+\fB\-\-recompile\-all\fR
+recompiled execution of all code, with disabled
+code patching and scanning
+.TP
+\fB\-\-warp\-pct\fR <pct>
+time warp factor, 100% (= 1.0) = normal speed
+.IP
+(*) For AMD\-V/VT\-x setups the effect is \fB\-\-recompile\-all\fR.
+.SS "The following environment (and extra data) variables are evaluated:"
+.IP
+VBOX_GUI_DBG_ENABLED (GUI/Dbg/Enabled)
+.IP
+enable the GUI debug menu if set
+.IP
+VBOX_GUI_DBG_AUTO_SHOW (GUI/Dbg/AutoShow)
+.IP
show debug windows at VM startup
.TP
VBOX_GUI_NO_DEBUGGER
diff --git a/debian/manpages/mount.vboxsf.8 b/debian/manpages/mount.vboxsf.8
index 4c1ff0a..759cfa8 100644
--- a/debian/manpages/mount.vboxsf.8
+++ b/debian/manpages/mount.vboxsf.8
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.4.
-.TH MOUNT.VBOXSF "8" "January 2011" "mount.vboxsf" "System Administration Utilities"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.1.
+.TH MOUNT.VBOXSF "8" "March 2013" "mount.vboxsf" "System Administration Utilities"
.SH NAME
mount.vboxsf \- x86 virtualization solution
.SH SYNOPSIS
diff --git a/debian/manpages/vboxwebsrv.1 b/debian/manpages/vboxwebsrv.1
index 1930808..72e5787 100644
--- a/debian/manpages/vboxwebsrv.1
+++ b/debian/manpages/vboxwebsrv.1
@@ -1,13 +1,13 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2.
-.TH VBOXWEBSRV "1" "January 2011" "vboxwebsrv" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.11.
+.TH VBOXWEBSRV "1" "March 2013" "vboxwebsrv" "User Commands"
.SH NAME
vboxwebsrv \- x86 virtualization solution
.SH SYNOPSIS
.B vboxwebsrv
[\fIoptions\fR]
.SH DESCRIPTION
-Oracle VM VirtualBox web service version
-(C) 2005\-2011 Oracle Corporation
+Oracle VM VirtualBox web service
+(C) 2007\-2013 Oracle Corporation
All rights reserved.
.PP
Supported options (default values in brackets):
@@ -15,10 +15,21 @@ Supported options (default values in brackets):
\fB\-\-background\fR, \fB\-b\fR: Run in background (daemon mode).
\fB\-\-host\fR, \fB\-H\fR: The host to bind to (localhost).
\fB\-\-port\fR, \fB\-p\fR: The port to bind to (18083).
+\fB\-\-ssl\fR, \fB\-s\fR: Enable SSL/TLS encryption.
+\fB\-\-keyfile\fR, \fB\-K\fR: Server key and certificate file, PEM format ("").
+\fB\-\-passwordfile\fR, \fB\-a\fR: File name for password to server key ("").
+\fB\-\-cacert\fR, \fB\-c\fR: CA certificate file, PEM format ("").
+\fB\-\-capath\fR, \fB\-C\fR: CA certificate path ("").
+\fB\-\-dhfile\fR, \fB\-D\fR: DH file name or DH key length in bits ("").
+\fB\-\-randfile\fR, \fB\-r\fR: File containing seed for random number generator ("").
\fB\-\-timeout\fR, \fB\-t\fR: Session timeout in seconds; 0 = disable timeouts (300).
\fB\-\-check\-interval\fR, \fB\-i\fR: Frequency of timeout checks in seconds (5).
\fB\-\-threads\fR, \fB\-T\fR: Maximum number of worker threads to run in parallel (100).
\fB\-\-keepalive\fR, \fB\-k\fR: Maximum number of requests before a socket will be closed (100).
+\fB\-\-authentication\fR, \fB\-A\fR: Authentication method for the webservice ("").
\fB\-\-verbose\fR, \fB\-v\fR: Be verbose.
\fB\-\-pidfile\fR, \fB\-P\fR: Name of the PID file which is created when the daemon was started.
\fB\-\-logfile\fR, \fB\-F\fR: Name of file to write log to (no file).
+\fB\-\-logrotate\fR, \fB\-R\fR: Number of log files (0 disables log rotation).
+\fB\-\-logsize\fR, \fB\-S\fR: Maximum size of a log file to trigger rotation (bytes).
+\fB\-\-loginterval\fR, \fB\-I\fR: Maximum time interval to trigger log rotation (seconds).
diff --git a/debian/manpages/vdfuse.1 b/debian/manpages/vdfuse.1
deleted file mode 100644
index 578277b..0000000
--- a/debian/manpages/vdfuse.1
+++ /dev/null
@@ -1,43 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2.
-.TH VDFUSE "1" "September 2010" "vdfuse" "User Commands"
-.SH NAME
-vdfuse \- x86 virtualization solution
-.SH DESCRIPTION
-DESCRIPTION: This Fuse module uses the VirtualBox access library to open a
-VirtualBox supported VD image file and mount it as a Fuse file system. The
-mount point contains a flat directory containing the files EntireDisk,
-Partition1 .. PartitionN. These can then be loop mounted to access the
-underlying file systems
-.PP
-USAGE: vdfuse [options] \fB\-f\fR image\-file mountpoint
-.TP
-\fB\-h\fR
-help
-.TP
-\fB\-r\fR
-readonly
-.TP
-\fB\-t\fR
-specify type (VDI, VMDK, VHD, or raw; default: auto)
-.TP
-\fB\-f\fR
-VDimage file
-.TP
-\fB\-a\fR
-allow all users to read disk
-.TP
-\fB\-w\fR
-allow all users to read and write to disk
-.TP
-\fB\-g\fR
-run in foreground
-.TP
-\fB\-v\fR
-verbose
-.TP
-\fB\-d\fR
-debug
-.PP
-NOTE: you must add the line "user_allow_other" (without quotes)
-to /etc/fuse.confand set proper permissions on /etc/fuse.conf
-for this to work.
diff --git a/debian/patches/01-build-arch.patch b/debian/patches/01-build-arch.patch
index 5d1b31a..68e7e27 100644
--- a/debian/patches/01-build-arch.patch
+++ b/debian/patches/01-build-arch.patch
@@ -1,10 +1,11 @@
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 @@
+Index: virtualbox/configure
+===================================================================
+--- virtualbox.orig/configure 2013-11-19 03:40:50.133475296 -0500
++++ virtualbox/configure 2013-11-19 03:40:50.129475296 -0500
+@@ -336,7 +336,7 @@
check_environment()
{
test_header environment
@@ -12,4 +13,4 @@ diff -urNad virtualbox-ose-3.0.8-dfsg~/configure virtualbox-ose-3.0.8-dfsg/confi
+ BUILD_CPU=`dpkg-architecture -qDEB_HOST_GNU_CPU`
[ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '`
case "$BUILD_CPU" in
- i[3456789]86|x86|i86pc)
+ i[3456789]86|x86|i86pc|BePC)
diff --git a/debian/patches/02-gsoap-build-fix.patch b/debian/patches/02-gsoap-build-fix.patch
new file mode 100644
index 0000000..df9fe79
--- /dev/null
+++ b/debian/patches/02-gsoap-build-fix.patch
@@ -0,0 +1,14 @@
+Interim build fix for gsoap > 2.8.13
+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
+@@ -683,7 +683,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 $@
+- $(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
diff --git a/debian/patches/04-vboxdrv-references.patch b/debian/patches/04-vboxdrv-references.patch
index 04ac674..70f8400 100644
--- a/debian/patches/04-vboxdrv-references.patch
+++ b/debian/patches/04-vboxdrv-references.patch
@@ -1,10 +1,11 @@
-Description: Change error messages for vboxdrv failure, according to virtualbox-ose-dkms.
+Description: Change error messages for vboxdrv failure, according to virtualbox-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 @@
+Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/VMM/VMMR3/VM.cpp 2013-11-19 03:40:56.013475569 -0500
++++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp 2013-11-19 03:40:56.013475569 -0500
+@@ -310,10 +310,8 @@
#ifdef RT_OS_LINUX
case VERR_SUPDRV_COMPONENT_NOT_FOUND:
@@ -17,7 +18,7 @@ diff -urNad virtualbox-ose-4.0.2-dfsg/src/VBox/VMM/VMMR3/VM.cpp virtualbox-ose-4
break;
#endif
-@@ -334,10 +332,8 @@
+@@ -376,10 +374,8 @@
{
case VERR_VM_DRIVER_LOAD_ERROR:
#ifdef RT_OS_LINUX
@@ -30,7 +31,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 @@
+@@ -418,10 +414,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/06-xsession.patch b/debian/patches/06-xsession.patch
index 2181015..780da61 100644
--- a/debian/patches/06-xsession.patch
+++ b/debian/patches/06-xsession.patch
@@ -1,20 +1,23 @@
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 @@
- no_display=1
+Index: virtualbox/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2013-11-19 03:40:59.137475714 -0500
++++ virtualbox/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2013-11-19 03:40:59.133475714 -0500
+@@ -28,9 +28,9 @@ done
+ # we had in mind, so we do not start VBoxClient in that case. We do not use
+ # "exit" here as this script is "source"d, not executed.
+ if test -z "${SSH_CONNECTION}"; then
+- /usr/bin/VBoxClient --clipboard
+- /usr/bin/VBoxClient --checkhostversion
+- /usr/bin/VBoxClient --display
+- /usr/bin/VBoxClient --seamless
+- /usr/bin/VBoxClient --draganddrop
++ /usr/bin/VBoxClient --clipboard || true
++ /usr/bin/VBoxClient --checkhostversion || true
++ /usr/bin/VBoxClient --display || true
++ /usr/bin/VBoxClient --seamless || true
++ /usr/bin/VBoxClient --draganddrop || true
fi
-
--/usr/bin/VBoxClient --clipboard
--/usr/bin/VBoxClient --checkhostversion
-+/usr/bin/VBoxClient --clipboard || true
-+/usr/bin/VBoxClient --checkhostversion || true
- test -z "$no_display" &&
-- /usr/bin/VBoxClient --display
-+ /usr/bin/VBoxClient --display || true
- test -z "$no_display" &&
-- /usr/bin/VBoxClient --seamless
-+ /usr/bin/VBoxClient --seamless || true
+
diff --git a/debian/patches/07-vboxnetflt-reference.patch b/debian/patches/07-vboxnetflt-reference.patch
index 8a14aa3..753ec8c 100644
--- a/debian/patches/07-vboxnetflt-reference.patch
+++ b/debian/patches/07-vboxnetflt-reference.patch
@@ -1,10 +1,11 @@
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 @@
+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
+@@ -1750,7 +1750,7 @@
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..a8c9467 100644
--- a/debian/patches/12-make-module.patch
+++ b/debian/patches/12-make-module.patch
@@ -1,10 +1,11 @@
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),)
+Index: virtualbox/src/VBox/HostDrivers/Support/linux/Makefile
+===================================================================
+--- virtualbox.orig/src/VBox/HostDrivers/Support/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
++++ virtualbox/src/VBox/HostDrivers/Support/linux/Makefile 2013-11-19 03:41:05.817476025 -0500
+@@ -44,9 +44,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
@@ -28,10 +29,11 @@ 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),)
+Index: virtualbox/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
+===================================================================
+--- virtualbox.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
++++ virtualbox/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2013-11-19 03:41:05.817476025 -0500
+@@ -35,9 +35,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
@@ -55,10 +57,11 @@ 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),)
+Index: virtualbox/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
+===================================================================
+--- virtualbox.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
++++ virtualbox/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
+@@ -35,9 +35,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
@@ -82,10 +85,11 @@ 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),)
+Index: virtualbox/src/VBox/HostDrivers/VBoxPci/linux/Makefile
+===================================================================
+--- virtualbox.orig/src/VBox/HostDrivers/VBoxPci/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
++++ virtualbox/src/VBox/HostDrivers/VBoxPci/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
+@@ -35,9 +35,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
@@ -109,10 +113,11 @@ 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),)
+Index: virtualbox/src/VBox/Installer/linux/Makefile.include.header
+===================================================================
+--- virtualbox.orig/src/VBox/Installer/linux/Makefile.include.header 2013-11-19 03:41:05.821476025 -0500
++++ virtualbox/src/VBox/Installer/linux/Makefile.include.header 2013-11-19 03:41:05.821476025 -0500
+@@ -54,9 +54,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
diff --git a/debian/patches/13-module-mismatch.patch b/debian/patches/13-module-mismatch.patch
index 9783a83..80fd3ba 100644
--- a/debian/patches/13-module-mismatch.patch
+++ b/debian/patches/13-module-mismatch.patch
@@ -1,10 +1,11 @@
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 @@
+Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/VMM/VMMR3/VM.cpp 2013-11-19 03:41:10.333476234 -0500
++++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp 2013-11-19 03:41:10.333476234 -0500
+@@ -425,9 +425,11 @@
break;
case VERR_VERSION_MISMATCH:
case VERR_VM_DRIVER_VERSION_MISMATCH:
@@ -13,9 +14,9 @@ diff -urNad virtualbox-ose-4.0.2-dfsg/src/VBox/VMM/VMMR3/VM.cpp virtualbox-ose-3
- "running instances of VirtualBox and reinstalling the software.");
+ pszError = N_("The version of the VirtualBox kernel modules and the version of "
+ "VirtualBox application are not matching. You can correct this by "
-+ "either installing the correct virtualbox-ose-modules package "
++ "either installing the correct virtualbox-modules package "
+ "(if available) through apt-get or by building it manually with: "
-+ "module-assistant auto-install virtualbox-ose");
++ "module-assistant auto-install virtualbox");
break;
default:
pszError = N_("Unknown error initializing kernel driver");
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 351e1dc..35411d0 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -1,87 +1,82 @@
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
-Author: Daniel Hahler <ubuntu at thequod.de>, Felix Geyer <debfx-pkg at fobos.de>
+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
-@@ -65,6 +65,8 @@ void UIUpdateManager::shutdown()
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp 2013-11-19 03:42:12.725479132 -0500
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp 2013-11-19 03:42:12.721479132 -0500
+@@ -440,6 +440,8 @@
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 @@
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp 2013-11-19 03:42:12.725479132 -0500
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp 2013-11-19 03:42:12.721479132 -0500
+@@ -658,7 +658,6 @@
+ m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
+- m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
+ }
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h 2013-11-19 03:42:12.725479132 -0500
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h 2013-11-19 03:42:12.721479132 -0500
+@@ -59,7 +59,6 @@
+ UIActionIndex_Simple_ResetWarnings,
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ UIActionIndex_Simple_NetworkAccessManager,
+- UIActionIndex_Simple_CheckForUpdates,
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ UIActionIndex_Simple_About,
+
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp 2013-11-19 03:42:12.725479132 -0500
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp 2013-11-19 04:34:19.701624365 -0500
+@@ -1331,12 +1331,6 @@
+ pMenu->addSeparator();
+ m_pNetworkAccessManager = gActionPool->action(UIActionIndex_Simple_NetworkAccessManager);
+ pMenu->addAction(m_pNetworkAccessManager);
+- m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
+- CVirtualBox vbox = vboxGlobal().virtualBox();
+- if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox))
+- pMenu->addAction(m_pUpdateAction);
+- else
+- m_pUpdateAction->setEnabled(false);
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ #ifndef Q_WS_MAC
+ pMenu->addSeparator();
+@@ -1473,7 +1467,6 @@
+ connect(m_pResetWarningsAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltResetSuppressedMessages()));
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ connect(m_pNetworkAccessManager, SIGNAL(triggered()), gNetworkManager, SLOT(show()));
+- connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
+
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2013-11-19 03:42:12.725479132 -0500
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2013-11-19 03:42:12.725479132 -0500
+@@ -545,6 +545,10 @@
#endif /* !VBOX_WITH_NETFLT */
break;
}
-+ case GLSettingsPage_Update:
++ case GlobalSettingsPageType_Update:
+ {
+ return false;
+ }
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);
- }
-
-@@ -472,9 +471,6 @@ void UIActionPool::createMenus()
- m_pool[UIActionIndex_Simple_Update]->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_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
---- 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,
- 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));
- #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)));
- #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()));
- }
diff --git a/debian/patches/18-system-xorg.patch b/debian/patches/18-system-xorg.patch
index 4b330b2..a94cd87 100644
--- a/debian/patches/18-system-xorg.patch
+++ b/debian/patches/18-system-xorg.patch
@@ -1,35 +1,37 @@
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>
+Author: Michael Meskes <meskes at debian.org>, Felix Geyer <fgeyer at debian.org>
-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 += \
+Index: virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-11-19 04:35:17.181627034 -0500
++++ virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-11-19 04:36:33.913630598 -0500
+@@ -40,8 +40,6 @@
VBoxGuestR3LibShared
ifndef VBOX_ONLY_TESTSUITE
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
- LIBRARIES += \
- VBoxGuestR3LibXFree86
-+# LIBRARIES += \
-+# VBoxGuestR3LibXFree86
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
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+ LIBRARIES += \
+Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-11-19 04:35:17.181627034 -0500
++++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-11-19 04:35:17.181627034 -0500
+@@ -74,18 +74,12 @@
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 +42,18 @@ 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
+@@ -215,10 +209,10 @@
+ $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+ VBoxOGL_LIBS += \
+- $(PATH_STAGE_LIB)/libXcomposite.so \
+- $(PATH_STAGE_LIB)/libXdamage.so \
+- $(PATH_STAGE_LIB)/libXfixes.so \
+- $(PATH_STAGE_LIB)/libXext.so
++ Xcomposite \
++ Xdamage \
++ Xfixes \
++ Xext
+ ifdef VBoxOGL_FAKEDRI
+ ifeq ($(KBUILD_TARGET), freebsd)
+ VBoxOGL_LIBS += \
diff --git a/debian/patches/23-remove-invalid-chars-check.patch b/debian/patches/23-remove-invalid-chars-check.patch
index 615707c..7447036 100644
--- a/debian/patches/23-remove-invalid-chars-check.patch
+++ b/debian/patches/23-remove-invalid-chars-check.patch
@@ -1,11 +1,12 @@
Description: Remove check for invalid characters in the build path since we have fixed
kBuild to handle those pathes starting from version 1:0.1.98svn2318-7.
-Author: Felix Geyer <debfx-pkg at fobos.de>
+Author: Felix Geyer <fgeyer at debian.org>
-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 @@
+Index: virtualbox/configure
+===================================================================
+--- virtualbox.orig/configure 2013-11-19 04:36:42.817631012 -0500
++++ virtualbox/configure 2013-11-19 04:36:42.813631012 -0500
+@@ -168,11 +168,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 0ee4a1e..056c0b8 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -1,16 +1,16 @@
Description: Silently enable the host I/O cache when the image is on an ext4/XFS partition.
No need to warn users about it.
-Author: Felix Geyer <debfx-pkg at fobos.de>
+Author: Felix Geyer <fgeyer at debian.org>
-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 @@
+Index: virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp 2013-12-03 07:11:18.165655881 -0500
++++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp 2013-12-03 07:12:44.373659885 -0500
+@@ -3681,34 +3681,12 @@
if ( enmFsTypeFile == RTFSTYPE_EXT4
|| enmFsTypeFile == RTFSTYPE_XFS)
{
-- setVMRuntimeErrorCallbackF(pVM, this, 0,
-- "Ext4PartitionDetected",
+- setVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
- N_("The host I/O cache for at least one controller is disabled "
- "and the medium '%ls' for this VM "
- "is located on an %s partition. There is a known Linux "
@@ -27,8 +27,7 @@ diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Main/src-client/ConsoleImpl2.c
|| enmFsTypeSnap == RTFSTYPE_XFS)
&& !mfSnapshotFolderExt4WarningShown)
{
-- setVMRuntimeErrorCallbackF(pVM, this, 0,
-- "Ext4PartitionDetected",
+- setVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
- N_("The host I/O cache for at least one controller is disabled "
- "and the snapshot folder for this VM "
- "is located on an %s partition. There is a known Linux "
diff --git a/debian/patches/28-no-selinux-fedora.patch b/debian/patches/28-no-selinux-fedora.patch
index 98fd3d9..6d0e066 100644
--- a/debian/patches/28-no-selinux-fedora.patch
+++ b/debian/patches/28-no-selinux-fedora.patch
@@ -1,17 +1,16 @@
Description: Don't install the selinux-fedora modules.
-Author: Felix Geyer <debfx-pkg at fobos.de>
+Author: Felix Geyer <fgeyer at debian.org>
-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 @@
- lnx_add_inst-noexec_INSTTYPE = stage
+--- a/src/VBox/Additions/linux/Makefile.kmk
++++ b/src/VBox/Additions/linux/Makefile.kmk
+@@ -347,9 +347,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 \
+ $(VBOX_REL_X11_ADD_INST)vboxvideo.ids \
+- $(if $(VBOX_WITH_LIGHTDM_GREETER_PACKING),lightdm-greeter/vbox-greeter.desktop,) \
- selinux-fedora/vbox_x11.pp \
- selinux-fedora/vbox_accel.pp
-+ $(VBOX_REL_X11_ADD_INST)vboxclient.desktop
++ $(if $(VBOX_WITH_LIGHTDM_GREETER_PACKING),lightdm-greeter/vbox-greeter.desktop,)
INSTALLS += lnx_add_inst-license
lnx_add_inst-license_INST = $(VBOX_LNX_ADD_INST_OUT_DIR)
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 5fa3be7..54c8c09 100644
--- a/debian/patches/29-fix-ftbfs-as-needed.patch
+++ b/debian/patches/29-fix-ftbfs-as-needed.patch
@@ -1,14 +1,16 @@
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 @@
- TEMPLATE_VBOXBLDPROG_LDFLAGS.amd64 = -m64
- TEMPLATE_VBOXBLDPROG_LDFLAGS.sparc64 = -m64
+Index: virtualbox/Config.kmk
+===================================================================
+--- virtualbox.orig/Config.kmk 2013-11-19 04:39:48.053639615 -0500
++++ virtualbox/Config.kmk 2013-11-19 04:39:48.049639615 -0500
+@@ -5013,7 +5013,7 @@
+ TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64
+ TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64
ifeq ($(KBUILD_HOST),linux)
--TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl
-+TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl crypt
+-TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl
++TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl crypt
else ifeq ($(KBUILD_HOST),os2)
- TEMPLATE_VBOXBLDPROG_TOOL = GXX3OMF
- TEMPLATE_VBOXBLDPROG_LIBS = socket iconv
+ TEMPLATE_VBoxBldProg_TOOL = GXX3OMF
+ TEMPLATE_VBoxBldProg_LIBS = socket iconv
diff --git a/debian/patches/30-usb-warning-filters.patch b/debian/patches/30-usb-warning-filters.patch
index 306ed44..59e1b3f 100644
--- a/debian/patches/30-usb-warning-filters.patch
+++ b/debian/patches/30-usb-warning-filters.patch
@@ -1,16 +1,16 @@
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>
+Author: Felix Geyer <fgeyer at debian.org>
-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)
- /* Get the USB controller object: */
- CUSBController controller = m_machine.GetUSBController();
- /* Show the machine error message if any: */
-- if (!m_machine.isReallyOk() && !controller.isNull() && controller.GetEnabled())
-+ if (!m_machine.isReallyOk() && !controller.isNull() && controller.GetEnabled() && (controller.GetDeviceFilters().size() != 0))
- msgCenter().cannotAccessUSB(m_machine);
- /* Check if USB is implemented: */
- if (controller.isNull() || !controller.GetProxyAvailable())
+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/32-disable-guest-version-check.patch b/debian/patches/32-disable-guest-version-check.patch
index 8f8441e..53eccca 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>
+Author: Felix Geyer <fgeyer at debian.org>
-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..7d9dd4e 100644
--- a/debian/patches/35-libvdeplug-soname.patch
+++ b/debian/patches/35-libvdeplug-soname.patch
@@ -1,19 +1,22 @@
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>
+Author: Felix Geyer <fgeyer at debian.org>
---- 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/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
new file mode 100644
index 0000000..01e32db
--- /dev/null
+++ b/debian/patches/36-fix-vnc-version-string.patch
@@ -0,0 +1,25 @@
+Index: virtualbox/Config.kmk
+===================================================================
+--- virtualbox.orig/Config.kmk 2013-11-19 04:41:16.173643708 -0500
++++ virtualbox/Config.kmk 2013-11-19 04:41:16.169643708 -0500
+@@ -2497,6 +2497,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' \
++ -e 's/@VBOX_VERSION_STRING_RAW@/$(VBOX_VERSION_STRING_RAW)/g' \
+ -e 's/@VBOX_SVN_REV@/$(VBOX_SVN_REV)/g' \
+ -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
+ -e 's/@VBOX_VENDOR_SHORT@/$(VBOX_VENDOR_SHORT)/g' \
+Index: virtualbox/src/VBox/ExtPacks/VNC/ExtPack.xml
+===================================================================
+--- virtualbox.orig/src/VBox/ExtPacks/VNC/ExtPack.xml 2013-11-19 04:41:16.173643708 -0500
++++ virtualbox/src/VBox/ExtPacks/VNC/ExtPack.xml 2013-11-19 04:41:16.169643708 -0500
+@@ -2,7 +2,7 @@
+ <VirtualBoxExtensionPack xmlns="http://www.virtualbox.org/VirtualBoxExtensionPack" version="1.0">
+ <Name>VNC</Name>
+ <Description>VNC plugin module</Description>
+- <Version revision="@VBOX_SVN_REV@">@VBOX_VERSION_STRING@</Version>
++ <Version revision="@VBOX_SVN_REV@">@VBOX_VERSION_STRING_RAW@</Version>
+ <MainModule>VBoxVNCMain</MainModule>
+ <VRDEModule>VBoxVNC</VRDEModule>
+ <ShowLicense/>
diff --git a/debian/patches/37-linux-3.11.patch b/debian/patches/37-linux-3.11.patch
new file mode 100644
index 0000000..19a577f
--- /dev/null
+++ b/debian/patches/37-linux-3.11.patch
@@ -0,0 +1,89 @@
+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/37-wheezy-kernel-drm.patch b/debian/patches/37-wheezy-kernel-drm.patch
deleted file mode 100644
index 343d1a0..0000000
--- a/debian/patches/37-wheezy-kernel-drm.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Fix build failure with the Debian wheezy kernel which backports the drm subsystem from Linux 3.4.
-Bug-Debian: http://bugs.debian.org/703358
-Author: Felix Geyer <fgeyer at debian.org>
-
-diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.c b/src/VBox/Additions/linux/drm/vboxvideo_drm.c
---- a/src/VBox/Additions/linux/drm/vboxvideo_drm.c
-+++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.c
-@@ -73,6 +73,12 @@
- #include "drm/drmP.h"
- #include "vboxvideo_drm.h"
-
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+# ifdef DRM_IOCTL_MODE_GETPLANE
-+# define DRM_DEBIAN70
-+# endif
-+# endif
-+
- static struct pci_device_id pciidlist[] = {
- vboxvideo_PCI_IDS
- };
-@@ -85,7 +91,7 @@ int vboxvideo_driver_load(struct drm_device * dev, unsigned long flags)
- return 0;
- #endif
- }
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) || defined(DRM_DEBIAN70)
- /* since linux-3.3.0-rc1 drm_driver::fops is pointer */
- static struct file_operations driver_fops =
- {
-@@ -109,7 +115,7 @@ static struct drm_driver driver =
- .get_map_ofs = drm_core_get_map_ofs,
- .get_reg_ofs = drm_core_get_reg_ofs,
- #endif
--# if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) && !defined(DRM_DEBIAN70)
- .fops =
- {
- .owner = THIS_MODULE,
-@@ -126,7 +132,7 @@ static struct drm_driver driver =
- .poll = drm_poll,
- .fasync = drm_fasync,
- },
--#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */
-+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) || defined(DRM_DEBIAN70) */
- .fops = &driver_fops,
- #endif
- #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) && !defined(DRM_RHEL61)
diff --git a/debian/patches/38-linux-3.11-vboxnet.patch b/debian/patches/38-linux-3.11-vboxnet.patch
new file mode 100644
index 0000000..ec16ab9
--- /dev/null
+++ b/debian/patches/38-linux-3.11-vboxnet.patch
@@ -0,0 +1,17 @@
+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/38-security-fixes-2014-01.patch b/debian/patches/38-security-fixes-2014-01.patch
deleted file mode 100644
index cebaf6a..0000000
--- a/debian/patches/38-security-fixes-2014-01.patch
+++ /dev/null
@@ -1,471 +0,0 @@
---- a/include/VBox/VMMDev.h
-+++ b/include/VBox/VMMDev.h
-@@ -114,6 +114,10 @@
-
- /** Maximum request packet size. */
- #define VMMDEV_MAX_VMMDEVREQ_SIZE _1M
-+/** Maximum number of HGCM parameters. */
-+#define VMMDEV_MAX_HGCM_PARMS 1024
-+/** Maximum total size of hgcm buffers in one call. */
-+#define VMMDEV_MAX_HGCM_DATA_SIZE UINT32_C(0x7FFFFFFF)
-
- /**
- * VMMDev request types.
---- a/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp
-+++ b/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp
-@@ -613,6 +613,13 @@
-
- if (fShape)
- {
-+ if (pShape->u32Width > 8192 || pShape->u32Height > 8192)
-+ {
-+ Log(("vbvaMousePointerShape: unsupported size %ux%u\n",
-+ pShape->u32Width, pShape->u32Height));
-+ return VERR_INVALID_PARAMETER;
-+ }
-+
- cbPointerData = ((((pShape->u32Width + 7) / 8) * pShape->u32Height + 3) & ~3)
- + pShape->u32Width * 4 * pShape->u32Height;
- }
---- a/src/VBox/Devices/VMMDev/VMMDev.cpp
-+++ b/src/VBox/Devices/VMMDev/VMMDev.cpp
-@@ -795,6 +795,20 @@
-
- #endif /* VBOX_WITH_PAGE_SHARING */
-
-+static int vmmdevVerifyPointerShape(VMMDevReqMousePointer *pReq)
-+{
-+ /* Should be enough for most mouse pointers. */
-+ if (pReq->width > 8192 || pReq->height > 8192)
-+ return VERR_INVALID_PARAMETER;
-+
-+ uint32_t cbShape = (pReq->width + 7) / 8 * pReq->height; /* size of the AND mask */
-+ cbShape = ((cbShape + 3) & ~3) + pReq->width * 4 * pReq->height; /* + gap + size of the XOR mask */
-+ if (RT_UOFFSETOF(VMMDevReqMousePointer, pointerData) + cbShape > pReq->header.size)
-+ return VERR_INVALID_PARAMETER;
-+
-+ return VINF_SUCCESS;
-+}
-+
- /**
- * Port I/O Handler for the generic request interface
- * @see FNIOMIOPORTOUT for details.
-@@ -1163,6 +1177,10 @@
- /* forward call to driver */
- if (fShape)
- {
-+ pRequestHeader->rc = vmmdevVerifyPointerShape(pointerShape);
-+ if (RT_FAILURE(pRequestHeader->rc))
-+ break;
-+
- pThis->pDrv->pfnUpdatePointerShape(pThis->pDrv,
- fVisible,
- fAlpha,
---- a/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp
-+++ b/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp
-@@ -97,6 +97,9 @@
- */
- VBOXHGCMSVCPARM *paHostParms;
-
-+ /* Number of elements in paHostParms */
-+ uint32_t cHostParms;
-+
- /* Linear pointer parameters information. */
- int cLinPtrs;
-
-@@ -250,8 +253,6 @@
- {
- int rc = VINF_SUCCESS;
-
-- AssertRelease (u32Size > 0);
--
- VBOXHGCMLINPTR *pLinPtr = &paLinPtrs[iLinPtr];
-
- /* Take the offset into the current page also into account! */
-@@ -294,8 +295,6 @@
- GCPtr += PAGE_SIZE;
- }
-
-- AssertRelease (iPage == cPages);
--
- return rc;
- }
-
-@@ -310,7 +309,7 @@
-
- VBOXHGCMLINPTR *pLinPtr = &paLinPtrs[iLinPtr];
-
-- AssertRelease (u32Size > 0 && iParm == (uint32_t)pLinPtr->iParm);
-+ AssertLogRelReturn(u32Size > 0 && iParm == (uint32_t)pLinPtr->iParm, VERR_INVALID_PARAMETER);
-
- RTGCPHYS GCPhysDst = pLinPtr->paPages[0] + pLinPtr->offFirstPage;
- uint8_t *pu8Src = (uint8_t *)pvHost;
-@@ -332,12 +331,17 @@
-
- if (cbWrite >= u32Size)
- {
-- PDMDevHlpPhysWrite(pDevIns, GCPhysDst, pu8Src, u32Size);
-+ rc = PDMDevHlpPhysWrite(pDevIns, GCPhysDst, pu8Src, u32Size);
-+ if (RT_FAILURE(rc))
-+ break;
-+
- u32Size = 0;
- break;
- }
-
- PDMDevHlpPhysWrite(pDevIns, GCPhysDst, pu8Src, cbWrite);
-+ if (RT_FAILURE(rc))
-+ break;
-
- /* next */
- u32Size -= cbWrite;
-@@ -346,8 +350,10 @@
- GCPhysDst = pLinPtr->paPages[iPage];
- }
-
-- AssertRelease (iPage == pLinPtr->cPages);
-- Assert(u32Size == 0);
-+ if (RT_SUCCESS(rc))
-+ {
-+ AssertLogRelReturn(iPage == pLinPtr->cPages, VERR_INVALID_PARAMETER);
-+ }
-
- return rc;
- }
-@@ -623,6 +629,20 @@
- Log(("vmmdevHGCMCall: cParms = %d\n", cParms));
-
- /*
-+ * Sane upper limit.
-+ */
-+ if (cParms > VMMDEV_MAX_HGCM_PARMS)
-+ {
-+ static int s_cRelWarn;
-+ if (s_cRelWarn < 50)
-+ {
-+ s_cRelWarn++;
-+ LogRel(("VMMDev: request packet with too many parameters (%d). Refusing operation.\n", cParms));
-+ }
-+ return VERR_INVALID_PARAMETER;
-+ }
-+
-+ /*
- * Compute size of required memory buffer.
- */
-
-@@ -654,6 +674,12 @@
- if (pGuestParm->u.Pointer.size > 0)
- {
- /* Only pointers with some actual data are counted. */
-+ if (pGuestParm->u.Pointer.size > VMMDEV_MAX_HGCM_DATA_SIZE - cbCmdSize)
-+ {
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
-+ }
-+
- cbCmdSize += pGuestParm->u.Pointer.size;
-
- cLinPtrs++;
-@@ -667,6 +693,12 @@
-
- case VMMDevHGCMParmType_PageList:
- {
-+ if (pGuestParm->u.PageList.size > VMMDEV_MAX_HGCM_DATA_SIZE - cbCmdSize)
-+ {
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
-+ }
-+
- cbCmdSize += pGuestParm->u.PageList.size;
- Log(("vmmdevHGCMCall: pagelist size = %d\n", pGuestParm->u.PageList.size));
- } break;
-@@ -706,6 +738,12 @@
- if (pGuestParm->u.Pointer.size > 0)
- {
- /* Only pointers with some actual data are counted. */
-+ if (pGuestParm->u.Pointer.size > VMMDEV_MAX_HGCM_DATA_SIZE - cbCmdSize)
-+ {
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
-+ }
-+
- cbCmdSize += pGuestParm->u.Pointer.size;
-
- cLinPtrs++;
-@@ -719,6 +757,12 @@
-
- case VMMDevHGCMParmType_PageList:
- {
-+ if (pGuestParm->u.PageList.size > VMMDEV_MAX_HGCM_DATA_SIZE - cbCmdSize)
-+ {
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
-+ }
-+
- cbCmdSize += pGuestParm->u.PageList.size;
- Log(("vmmdevHGCMCall: pagelist size = %d\n", pGuestParm->u.PageList.size));
- } break;
-@@ -787,6 +831,7 @@
- uint8_t *pcBuf = (uint8_t *)pHostParm + cParms * sizeof (VBOXHGCMSVCPARM);
-
- pCmd->paHostParms = pHostParm;
-+ pCmd->cHostParms = cParms;
-
- uint32_t iLinPtr = 0;
- RTGCPHYS *pPages = (RTGCPHYS *)((uint8_t *)pCmd->paLinPtrs + sizeof (VBOXHGCMLINPTR) *cLinPtrs);
-@@ -1135,6 +1180,20 @@
- Log(("vmmdevHGCMCall: cParms = %d\n", cParms));
-
- /*
-+ * Sane upper limit.
-+ */
-+ if (cParms > VMMDEV_MAX_HGCM_PARMS)
-+ {
-+ static int s_cRelWarn;
-+ if (s_cRelWarn < 50)
-+ {
-+ s_cRelWarn++;
-+ LogRel(("VMMDev: request packet with too many parameters (%d). Refusing operation.\n", cParms));
-+ }
-+ return VERR_INVALID_PARAMETER;
-+ }
-+
-+ /*
- * Compute size of required memory buffer.
- */
-
-@@ -1289,6 +1348,7 @@
- uint8_t *pu8Buf = (uint8_t *)pHostParm + cParms * sizeof (VBOXHGCMSVCPARM);
-
- pCmd->paHostParms = pHostParm;
-+ pCmd->cHostParms = cParms;
-
- uint32_t iParm;
- int iLinPtr = 0;
-@@ -1758,6 +1818,88 @@
- return VERR_INVALID_PARAMETER;
- }
-
-+#ifdef VBOX_WITH_64_BITS_GUESTS
-+static int vmmdevHGCMParmVerify64(HGCMFunctionParameter64 *pGuestParm, VBOXHGCMSVCPARM *pHostParm)
-+{
-+ int rc = VERR_INVALID_PARAMETER;
-+
-+ switch (pGuestParm->type)
-+ {
-+ case VMMDevHGCMParmType_32bit:
-+ if (pHostParm->type == VBOX_HGCM_SVC_PARM_32BIT)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ case VMMDevHGCMParmType_64bit:
-+ if (pHostParm->type == VBOX_HGCM_SVC_PARM_64BIT)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ case VMMDevHGCMParmType_LinAddr_In: /* In (read) */
-+ case VMMDevHGCMParmType_LinAddr_Out: /* Out (write) */
-+ case VMMDevHGCMParmType_LinAddr: /* In & Out */
-+ if ( pHostParm->type == VBOX_HGCM_SVC_PARM_PTR
-+ && pGuestParm->u.Pointer.size >= pHostParm->u.pointer.size)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ case VMMDevHGCMParmType_PageList:
-+ if ( pHostParm->type == VBOX_HGCM_SVC_PARM_PTR
-+ && pGuestParm->u.PageList.size >= pHostParm->u.pointer.size)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ default:
-+ AssertLogRelMsgFailed(("hgcmCompleted: invalid parameter type %08X\n", pGuestParm->type));
-+ break;
-+ }
-+
-+ return rc;
-+}
-+#endif /* VBOX_WITH_64_BITS_GUESTS */
-+
-+#ifdef VBOX_WITH_64_BITS_GUESTS
-+static int vmmdevHGCMParmVerify32(HGCMFunctionParameter32 *pGuestParm, VBOXHGCMSVCPARM *pHostParm)
-+#else
-+static int vmmdevHGCMParmVerify32(HGCMFunctionParameter *pGuestParm, VBOXHGCMSVCPARM *pHostParm)
-+#endif
-+{
-+ int rc = VERR_INVALID_PARAMETER;
-+
-+ switch (pGuestParm->type)
-+ {
-+ case VMMDevHGCMParmType_32bit:
-+ if (pHostParm->type == VBOX_HGCM_SVC_PARM_32BIT)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ case VMMDevHGCMParmType_64bit:
-+ if (pHostParm->type == VBOX_HGCM_SVC_PARM_64BIT)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ case VMMDevHGCMParmType_LinAddr_In: /* In (read) */
-+ case VMMDevHGCMParmType_LinAddr_Out: /* Out (write) */
-+ case VMMDevHGCMParmType_LinAddr: /* In & Out */
-+ if ( pHostParm->type == VBOX_HGCM_SVC_PARM_PTR
-+ && pGuestParm->u.Pointer.size >= pHostParm->u.pointer.size)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ case VMMDevHGCMParmType_PageList:
-+ if ( pHostParm->type == VBOX_HGCM_SVC_PARM_PTR
-+ && pGuestParm->u.PageList.size >= pHostParm->u.pointer.size)
-+ rc = VINF_SUCCESS;
-+ break;
-+
-+ default:
-+ AssertLogRelMsgFailed(("hgcmCompleted: invalid parameter type %08X\n", pGuestParm->type));
-+ break;
-+ }
-+
-+ return rc;
-+}
-+
- #define PDMIHGCMPORT_2_VMMDEVSTATE(pInterface) ( (VMMDevState *) ((uintptr_t)pInterface - RT_OFFSETOF(VMMDevState, IHGCMPort)) )
-
- DECLCALLBACK(void) hgcmCompletedWorker (PPDMIHGCMPORT pInterface, int32_t result, PVBOXHGCMCMD pCmd)
-@@ -1858,6 +2000,8 @@
- VMMDevHGCMCall *pHGCMCall = (VMMDevHGCMCall *)pHeader;
-
- uint32_t cParms = pHGCMCall->cParms;
-+ if (cParms != pCmd->cHostParms)
-+ rc = VERR_INVALID_PARAMETER;
-
- VBOXHGCMSVCPARM *pHostParm = pCmd->paHostParms;
-
-@@ -1866,8 +2010,12 @@
-
- HGCMFunctionParameter64 *pGuestParm = VMMDEV_HGCM_CALL_PARMS64(pHGCMCall);
-
-- for (i = 0; i < cParms; i++, pGuestParm++, pHostParm++)
-+ for (i = 0; i < cParms && RT_SUCCESS(rc); i++, pGuestParm++, pHostParm++)
- {
-+ rc = vmmdevHGCMParmVerify64(pGuestParm, pHostParm);
-+ if (RT_FAILURE(rc))
-+ break;
-+
- switch (pGuestParm->type)
- {
- case VMMDevHGCMParmType_32bit:
-@@ -1894,7 +2042,6 @@
- /* Use the saved page list to write data back to the guest RAM. */
- rc = vmmdevHGCMWriteLinPtr (pVMMDevState->pDevIns, i, pHostParm->u.pointer.addr,
- size, iLinPtr, pCmd->paLinPtrs);
-- AssertReleaseRC(rc);
- }
-
- /* All linptrs with size > 0 were saved. Advance the index to the next linptr. */
-@@ -1945,7 +2092,8 @@
- default:
- {
- /* This indicates that the guest request memory was corrupted. */
-- AssertReleaseMsgFailed(("hgcmCompleted: invalid parameter type %08X\n", pGuestParm->type));
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
- }
- }
- }
-@@ -1961,6 +2109,8 @@
- VMMDevHGCMCall *pHGCMCall = (VMMDevHGCMCall *)pHeader;
-
- uint32_t cParms = pHGCMCall->cParms;
-+ if (cParms != pCmd->cHostParms)
-+ rc = VERR_INVALID_PARAMETER;
-
- VBOXHGCMSVCPARM *pHostParm = pCmd->paHostParms;
-
-@@ -1969,8 +2119,12 @@
-
- HGCMFunctionParameter32 *pGuestParm = VMMDEV_HGCM_CALL_PARMS32(pHGCMCall);
-
-- for (i = 0; i < cParms; i++, pGuestParm++, pHostParm++)
-+ for (i = 0; i < cParms && RT_SUCCESS(rc); i++, pGuestParm++, pHostParm++)
- {
-+ rc = vmmdevHGCMParmVerify32(pGuestParm, pHostParm);
-+ if (RT_FAILURE(rc))
-+ break;
-+
- switch (pGuestParm->type)
- {
- case VMMDevHGCMParmType_32bit:
-@@ -1996,7 +2150,6 @@
- {
- /* Use the saved page list to write data back to the guest RAM. */
- rc = vmmdevHGCMWriteLinPtr (pVMMDevState->pDevIns, i, pHostParm->u.pointer.addr, size, iLinPtr, pCmd->paLinPtrs);
-- AssertReleaseRC(rc);
- }
-
- /* All linptrs with size > 0 were saved. Advance the index to the next linptr. */
-@@ -2047,7 +2200,8 @@
- default:
- {
- /* This indicates that the guest request memory was corrupted. */
-- AssertReleaseMsgFailed(("hgcmCompleted: invalid parameter type %08X\n", pGuestParm->type));
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
- }
- }
- }
-@@ -2063,6 +2217,8 @@
- VMMDevHGCMCall *pHGCMCall = (VMMDevHGCMCall *)pHeader;
-
- uint32_t cParms = pHGCMCall->cParms;
-+ if (cParms != pCmd->cHostParms)
-+ rc = VERR_INVALID_PARAMETER;
-
- VBOXHGCMSVCPARM *pHostParm = pCmd->paHostParms;
-
-@@ -2071,8 +2227,12 @@
-
- HGCMFunctionParameter *pGuestParm = VMMDEV_HGCM_CALL_PARMS(pHGCMCall);
-
-- for (i = 0; i < cParms; i++, pGuestParm++, pHostParm++)
-+ for (i = 0; i < cParms && RT_SUCCESS(rc); i++, pGuestParm++, pHostParm++)
- {
-+ rc = vmmdevHGCMParmVerify32(pGuestParm, pHostParm);
-+ if (RT_FAILURE(rc))
-+ break;
-+
- switch (pGuestParm->type)
- {
- case VMMDevHGCMParmType_32bit:
-@@ -2098,7 +2258,6 @@
- {
- /* Use the saved page list to write data back to the guest RAM. */
- rc = vmmdevHGCMWriteLinPtr (pVMMDevState->pDevIns, i, pHostParm->u.pointer.addr, size, iLinPtr, pCmd->paLinPtrs);
-- AssertReleaseRC(rc);
- }
-
- /* All linptrs with size > 0 were saved. Advance the index to the next linptr. */
-@@ -2149,7 +2308,8 @@
- default:
- {
- /* This indicates that the guest request memory was corrupted. */
-- AssertReleaseMsgFailed(("hgcmCompleted: invalid parameter type %08X\n", pGuestParm->type));
-+ rc = VERR_INVALID_PARAMETER;
-+ break;
- }
- }
- }
-@@ -2175,10 +2335,11 @@
- break;
- }
- }
-- else
-+
-+ if (RT_FAILURE(rc))
- {
-- /* Command type is wrong. Return error to the guest. */
-- pHeader->header.rc = rc;
-+ /* Command is wrong. Return HGCM error result to the guest. */
-+ pHeader->result = rc;
- }
-
- /* Mark request as processed. */
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-2014-0981.patch b/debian/patches/CVE-2014-0981.patch
deleted file mode 100644
index 7257f9d..0000000
--- a/debian/patches/CVE-2014-0981.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Nur VirtualBox-4.1.30/src/VBox/GuestHost/OpenGL/util/net.c VirtualBox-4.1.32/src/VBox/GuestHost/OpenGL/util/net.c
---- VirtualBox-4.1.30/src/VBox/GuestHost/OpenGL/util/net.c 2014-01-10 17:21:21.000000000 +0100
-+++ VirtualBox-4.1.32/src/VBox/GuestHost/OpenGL/util/net.c 2014-03-14 08:18:19.000000000 +0100
-@@ -957,7 +957,7 @@
- conn->InstantReclaim( conn, (CRMessage *) msg );
- }
-
--
-+#ifdef IN_GUEST
- /**
- * Called by the main receive function when we get a CR_MESSAGE_WRITEBACK
- * message. Writeback is used to implement glGet*() functions.
-@@ -990,7 +990,7 @@
- (*writeback)--;
- crMemcpy( dest_ptr, ((char *)rb) + sizeof(*rb), payload_len );
- }
--
-+#endif
-
- /**
- * This is used by the SPUs that do packing (such as Pack, Tilesort and
-@@ -1068,13 +1068,21 @@
- }
- break;
- case CR_MESSAGE_READ_PIXELS:
-- crError( "Can't handle read pixels" );
-+ crWarning( "Can't handle read pixels" );
- return;
- case CR_MESSAGE_WRITEBACK:
-+#ifdef IN_GUEST
- crNetRecvWriteback( &(pRealMsg->writeback) );
-+#else
-+ crWarning("CR_MESSAGE_WRITEBACK not expected\n");
-+#endif
- return;
- case CR_MESSAGE_READBACK:
-+#ifdef IN_GUEST
- crNetRecvReadback( &(pRealMsg->readback), len );
-+#else
-+ crWarning("CR_MESSAGE_READBACK not expected\n");
-+#endif
- return;
- case CR_MESSAGE_CRUT:
- /* nothing */
-@@ -1092,7 +1100,7 @@
- {
- char string[128];
- crBytesToString( string, sizeof(string), msg, len );
-- crError("crNetDefaultRecv: received a bad message: type=%d buf=[%s]\n"
-+ crWarning("crNetDefaultRecv: received a bad message: type=%d buf=[%s]\n"
- "Did you add a new message type and forget to tell "
- "crNetDefaultRecv() about it?\n",
- msg->header.type, string );
diff --git a/debian/patches/CVE-2014-0983.patch b/debian/patches/CVE-2014-0983.patch
deleted file mode 100644
index 3be5d9c..0000000
--- a/debian/patches/CVE-2014-0983.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_dispatch.py
-+++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_dispatch.py
-@@ -46,6 +46,7 @@
- for func_name in keys:
- current = 0
- array = ""
-+ condition = ""
- m = re.search( r"^(Color|Normal)([1234])(ub|b|us|s|ui|i|f|d)$", func_name )
- if m :
- current = 1
-@@ -68,6 +69,7 @@
- name = "texCoord"
- type = m.group(3) + m.group(2)
- array = "[texture-GL_TEXTURE0_ARB]"
-+ condition = "if (texture >= GL_TEXTURE0_ARB && texture < GL_TEXTURE0_ARB + CR_MAX_TEXTURE_UNITS)"
- m = re.match( r"^(Index)(ub|b|us|s|ui|i|f|d)$", func_name )
- if m :
- current = 1
-@@ -91,18 +93,23 @@
- name = string.lower( m.group(1)[:1] ) + m.group(1)[1:]
- type = m.group(3) + m.group(2)
- array = "[index]"
-+ condition = "if (index < CR_MAX_VERTEX_ATTRIBS)"
- if func_name == "VertexAttrib4NubARB":
- current = 1
- name = "vertexAttrib"
- type = "ub4"
- array = "[index]"
-+ condition = "if (index < CR_MAX_VERTEX_ATTRIBS)"
-
- if current:
- params = apiutil.Parameters(func_name)
- print 'void SERVER_DISPATCH_APIENTRY crServerDispatch%s( %s )' % ( func_name, apiutil.MakeDeclarationString(params) )
- print '{'
-- print '\tcr_server.head_spu->dispatch_table.%s( %s );' % (func_name, apiutil.MakeCallString(params) )
-- print "\tcr_server.current.c.%s.%s%s = cr_unpackData;" % (name,type,array)
-+ print '\t%s' % (condition)
-+ print '\t{'
-+ print '\t\tcr_server.head_spu->dispatch_table.%s( %s );' % (func_name, apiutil.MakeCallString(params) )
-+ print "\t\tcr_server.current.c.%s.%s%s = cr_unpackData;" % (name,type,array)
-+ print '\t}'
- print '}\n'
-
- print """
---- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_simpleget.py
-+++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_simpleget.py
-@@ -113,7 +113,14 @@
- *get_values = (%s)CR_MAX_TEXTURE_UNITS;
- }
- }
-- """ % (types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index])
-+ else if (GL_MAX_VERTEX_ATTRIBS_ARB==pname)
-+ {
-+ if (CR_MAX_VERTEX_ATTRIBS < (GLuint)*get_values)
-+ {
-+ *get_values = (%s)CR_MAX_VERTEX_ATTRIBS;
-+ }
-+ }
-+ """ % (types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index])
- print '\tcrServerReturnValue( get_values, tablesize );'
- print '\tcrFree(get_values);'
- print '}\n'
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/rrs-build-fix.patch b/debian/patches/rrs-build-fix.patch
new file mode 100644
index 0000000..872c39c
--- /dev/null
+++ b/debian/patches/rrs-build-fix.patch
@@ -0,0 +1,13 @@
+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
+
diff --git a/debian/patches/series b/debian/patches/series
index 58cc347..5b32c83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
01-build-arch.patch
+02-gsoap-build-fix.patch
04-vboxdrv-references.patch
06-xsession.patch
07-vboxnetflt-reference.patch
@@ -10,13 +11,6 @@
27-hide-host-cache-warning.patch
28-no-selinux-fedora.patch
29-fix-ftbfs-as-needed.patch
-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
-37-wheezy-kernel-drm.patch
-38-security-fixes-2014-01.patch
-CVE-2014-0981.patch
-CVE-2014-0983.patch
+36-fix-vnc-version-string.patch
diff --git a/debian/rules b/debian/rules
index 3604046..1f5df85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,74 +12,25 @@ sxname:=virtualbox-qt
gname:=virtualbox-guest
uname:=virtualbox-guest-utils
uxname:=virtualbox-guest-x11
-fname:=virtualbox-fuse
INSTALL_PATH:=/usr/lib/virtualbox
MAKE:=kmk
upstreamversion := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p')
-pkgs_xzcompress = $(shell dh_listpackages | grep -v -e ose -e source)
+pkgs_xzcompress = $(shell dh_listpackages | grep -v -e source)
DIST_NAME := $(shell lsb_release -si)
DIST_RELEASE := $(DIST_NAME)/$(shell lsb_release -sc)
XSERVER_VERSION = 17
-XORG_PKG_ABI = 3
-
-ifeq ($(DIST_RELEASE),Debian/squeeze)
- XORG_PKG_ABI = 2
-endif
-
-ifeq ($(DIST_RELEASE),Ubuntu/maverick)
- XORG_PKG_ABI = 2
-endif
-
-ifeq ($(DIST_RELEASE),Ubuntu/lucid)
- XORG_PKG_ABI = 1
-endif
-
-
-ifeq ($(XORG_PKG_ABI),3)
- VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
-
- SERVER_DEPENDS = $(VIDEODEP)
- VIDDRIVER_PROVIDES = xorg-driver-video
-
- ifeq ($(strip $(VIDEODEP)),)
- XORG_PKG_ABI_ERROR = VIDEODEP is empty
- endif
-endif
-ifeq ($(XORG_PKG_ABI),2)
- VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
- VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
-
- SERVER_DEPENDS = $(VIDEODEP)
- VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-
- ifeq ($(strip $(VIDEODEP)),)
- XORG_PKG_ABI_ERROR = VIDEODEP is empty
- endif
- ifeq ($(strip $(VIDEOABI)),)
- XORG_PKG_ABI_ERROR = VIDEOABI is empty
- endif
-endif
-ifeq ($(XORG_PKG_ABI),1)
- SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
- VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
-
- SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
- VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-
- ifeq ($(strip $(SERVERMINVERS)),)
- XORG_PKG_ABI_ERROR = SERVERMINVERS is empty
- endif
- ifeq ($(strip $(VIDEOABI)),)
- XORG_PKG_ABI_ERROR = VIDEOABI is empty
- endif
-endif
+SERVER_DEPENDS = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+export DEB_BUILD_HARDENING=1
+export DEB_BUILD_HARDENING_PIE=0
+export DEB_BUILD_HARDENING_FORMAT=0
+export DEB_BUILD_HARDENING_BINDNOW=0
%:
dh $@ --with python2,dkms
@@ -87,8 +38,8 @@ endif
override_dh_auto_configure:
@echo Building for $(DIST_RELEASE)
-ifdef XORG_PKG_ABI_ERROR
- @echo 'error: $(XORG_PKG_ABI_ERROR)'
+ifeq ($(strip $(SERVER_DEPENDS)),)
+ @echo 'error: SERVER_DEPENDS is empty'
@exit 1
endif
@@ -109,17 +60,12 @@ 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= \
KBUILD_VERBOSE=2
- mkdir -p out/vdfuse
- gcc debian/vdfuse/vdfuse.c -o out/vdfuse/vdfuse -pipe -g -Wl,--as-needed -Wl,--rpath,$(INSTALL_PATH) -Wall \
- $(shell pkg-config --cflags --libs fuse) -Iinclude $(addprefix out/bin/, \
- VBoxDD.so VBoxDD2.so VBoxDDU.so VBoxVMM.so VBoxREM.so VBoxRT.so)
-
xsltproc --nonet --stringparam section.autolabel 1 \
-o debian/README.Debian.html \
/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl \
@@ -145,8 +91,6 @@ override_dh_auto_install:
sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gdkms).install.in > debian/$(gdkms).install
echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(uxname).substvars
- echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(uxname).substvars
- echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(uxname).substvars
ifeq ($(DIST_NAME),Ubuntu)
echo "modaliases=vboxguest(pci:v000080EEd0000CAFEsv00000000sd00000000bc*sc*i*)" >> debian/$(gdkms).substvars
@@ -156,6 +100,8 @@ override_dh_install:
dh_install -p$(sname) -X out/bin/VBoxDbg.so
dh_install --remaining-packages
+ install -m 644 -p -D out/bin/additions/vboxvideo_drv_system.so \
+ debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
convert debian/$(sxname)/usr/share/icons/hicolor/32x32/apps/virtualbox.png \
debian/$(sxname)/usr/share/pixmaps/virtualbox.xpm
@@ -210,7 +156,8 @@ ifneq (,$(filter $(psource), $(shell dh_listpackages)))
endif
override_dh_installinit:
- dh_installinit --no-start
+ dh_installinit -p$(uxname) --no-start --update-rcd-params="start 45 S ."
+ dh_installinit --remaining-packages --no-start
override_dh_dkms:
dh_dkms -V $(upstreamversion)
@@ -224,6 +171,9 @@ ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
strip --strip-debug --remove-section=.comment --remove-section=.note $${file}; \
done
endif
+ # I don't see a reason to have these. If any user complains, we can try ship it.
+ rm -f debian/$(sname)/usr/lib/virtualbox/VMMGC.debug
+ rm -f debian/$(sname)/usr/lib/virtualbox/VMMR0.debug
override_dh_shlibdeps:
dh_shlibdeps -p$(sname) -X debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -- \
@@ -251,26 +201,3 @@ override_dh_auto_clean:
find . -name "*.pyc" -exec rm -f {} \;
-#Rebuild the orig.tar.gz
-dfsg-free: clean
- rm -rf ./kBuild
- rm -rf ./tools
- rm -rf ./src/VBox/Additions/os2
- rm -rf ./src/VBox/Additions/WINNT
- rm -f ./src/VBox/HostDrivers/Support/darwin/load.sh
- rm -f ./include/VBox/VBoxGuest.inc
- rm -f ./include/VBox/VBoxGuest16.h
- rm -f ./include/VBox/VBoxGuest.mac
- rm -f ./src/libs/xpcom18a4/xpcom/MoreFiles/FSCopyObject.c
- rm -f ./src/libs/xpcom18a4/xpcom/MoreFiles/FSCopyObject.h
- rm -rf ./src/libs/libpng*
- rm -rf ./src/libs/libxml2*
- rm -rf ./src/libs/libxslt*
- rm -rf ./src/libs/zlib*
- rm -rf ./src/VBox/Additions/linux/selinux-fedora
- find src/VBox/Additions/x11/x11include -mindepth 1 -maxdepth 1 \
- -type d ! -name '*mesa-*' -exec rm -rf {} \;
- cd ..; mv $(CURDIR) virtualbox-$(upstreamversion)-dfsg; \
- tar --exclude .svn --exclude '.git*' --exclude debian \
- -cJf virtualbox_$(upstreamversion)-dfsg.orig.tar.xz \
- virtualbox-$(upstreamversion)-dfsg
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index 9b63346..2acde93 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,3 +1,2 @@
virtualbox source: ancient-autotools-helper-file src/VBox/RDP/client/config.sub 2003-06-18
virtualbox source: ancient-autotools-helper-file src/VBox/RDP/client/config.guess 2003-06-17
-virtualbox source: dbg-package-missing-depends virtualbox-ose-dbg
diff --git a/debian/vdfuse/vdfuse.c b/debian/vdfuse/vdfuse.c
deleted file mode 100644
index 753c9ff..0000000
--- a/debian/vdfuse/vdfuse.c
+++ /dev/null
@@ -1,625 +0,0 @@
-/* Original author: h2o on forums.virtualbox.org *
- * http://forums.virtualbox.org/viewtopic.php?p=59275 *
- * Reworked with Terry Ellison *
- * vdfuse.c - tool for mounting VDI/VMDK/VHD files *
- * * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* VERSION 01 TE 14 Feb 09 Initial release
- * 02 TE 15 Feb 09 Use the stat on the container file as the basis for any getattr on
- * the partiton pseudo-files
- * 03 TE 16 Feb 09 Bug corrections from Gavin, plus EntireDisc/Partition interlock.
- * 04 TE 23 Mar 09 Another Bug correction from Gavin, plus addition of printPartition.
- * 05 09 May 09 Change sizes from size_t to uint64_t (size_t is 32-bit on 32-bit systems)
- * Fix _FILE_OFFSET_BITS
- * Option for older VBox
- * 07 22 Feb 10 VBOX_SUCCESS macro was removed, replace with RT_SUCCESS
- * 08 27 Jun 10 Support for snapshots through frontend (-s option)
- *
- *
- * DESCRIPTION
- *
- * This Fuse module uses the VBox access library to open a VBox supported VD image file and mount
- * it as a Fuse file system. The mount point contains a flat directory with the following files
- * * EntireDisk
- * * PartitionN
- *
- * Note that each file should only be opened once and opening EntireDisk should locks out
- * the other files. However, since file close isn't passed to the fuse utilities, I can only
- * enforce this in a brute fashion: If you open EntireDisk then all further I/O to
- * the PartitionN files will fail. If open any PartitionN file then all further I/O to EntireDisk
- * will fail. Hence in practice you can only access on or the other within a single mount.
- *
- * This code is structured in the following sections:
- * * The main(argc, argv) routine including validation of arguments and call to fuse_main
- * * MBR and EBR parsing routines
- * * The Fuse callback routines for destroy ,flush ,getattr ,open, read, readdir, write
- *
- * For further details on how this all works see http://fuse.sourceforge.net/
- *
- * VirtualBox provided an API to enable you to manipulate VD image files programmatically.
- * This is documented in the embedded source comments. See for further details
- * http://www.virtualbox.org/svn/vbox/trunk/include/VBox/VBoxHDD-new.h
- *
- * To compile this you need to pull (wget) the VBox OSE source from http://www.virtualbox.org/downloads.
- * Set the environment variable VBOX_INCLUDE to the include directory within this tree
- *
- * gcc vdfuse.c -o vdfuse `pkg-config --cflags --libs fuse` \
- * -l:/usr/lib/virtualbox/VBoxDD.so -Wl,-rpath,/usr/lib/virtualbox \
- * -pthread -I$VBOX_INCLUDE
- *
- */
-#define FUSE_USE_VERSION 26
-#define _FILE_OFFSET_BITS 64
-#include <limits.h>
-#include <fuse.h>
-#include <errno.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <pthread.h>
-
-#ifdef __GNUC__
-#define UNUSED __attribute__ ((unused))
-#else
-#define UNUSED
-#endif
-
-#define IN_RING3
-#define BLOCKSIZE 512
-#define UNALLOCATED -1
-#define GETOPT_ARGS "rgvawt:s:f:dh?"
-#define HOSTPARTITION_MAX 100
-#define DIFFERENCING_MAX 100
-#define PNAMESIZE 15
-#define MBR_START 446
-#define EBR_START 446
-#define PARTTYPE_IS_EXTENDED(x) ((x) == 0x05 || (x) == 0x0f || (x) == 0x85)
-
-
-void usageAndExit (char *optFormat, ...);
-void vbprintf (const char *format, ...);
-void vdErrorCallback(void *pvUser, int rc, const char *file, unsigned iLine, const char *function, const char *format, va_list va);
-void initialisePartitionTable(void);
-int findPartition (const char* filename);
-int detectDiskType (char **disktype, char *filename);
-static int VD_open (const char *c, struct fuse_file_info *i);
-static int VD_release (const char *name, struct fuse_file_info *fi);
-static int VD_read (const char *c, char *out, size_t len, off_t offset, struct fuse_file_info *i UNUSED);
-static int VD_write (const char *c, const char *in, size_t len, off_t offset, struct fuse_file_info *i UNUSED);
-static int VD_flush (const char *p, struct fuse_file_info *i UNUSED);
-static int VD_readdir (const char *p, void *buf, fuse_fill_dir_t filler, off_t offset UNUSED, struct fuse_file_info *i UNUSED);
-static int VD_getattr (const char *p, struct stat *stbuf);
-void VD_destroy (void *u);
-
-// if you don't have VBoxHDD.h, run 'svn co http://www.virtualbox.org/svn/vbox/trunk/include'
-// if your VirtualBox version is older than 4.0, add -DOLDVBOXHDD to your gcc flags
-#ifdef OLDVBOXHDD // < v4.0
-#include <VBox/VBoxHDD.h>
-#else // >= v4.0
-#include <VBox/vd.h>
-#endif
-#define DISKread(o,b,s) VDRead (hdDisk,o,b,s);
-#define DISKwrite(o,b,s) VDWrite (hdDisk,o,b,s);
-#define DISKclose VDCloseAll(hdDisk)
-#define DISKsize VDGetSize(hdDisk, 0)
-#define DISKflush VDFlush(hdDisk)
-#define DISKopen(t,i) \
- if (RT_FAILURE(VDOpen(hdDisk,t , i, readonly ? VD_OPEN_FLAGS_READONLY : VD_OPEN_FLAGS_NORMAL, NULL))) \
- usageAndExit("opening vbox image failed");
-
-PVBOXHDD hdDisk;
-PVDINTERFACE pVDifs = NULL;
-VDINTERFACE vdError;
-VDINTERFACEERROR vdErrorCallbacks = {
- .cbSize = sizeof(VDINTERFACEERROR),
- .enmInterface = VDINTERFACETYPE_ERROR,
- .pfnError = vdErrorCallback };
-
-// Partition table information
-
-typedef struct { // See http://en.wikipedia.org/wiki/Master_boot_record
- uint8_t status; // status[7] (0x80 = bootable, 0x00 = non-bootable,other = invalid[8])
- // ** CHS address of first block **
- uint8_t shead; // first head
- uint8_t ssector; // first sector is in bits 5-0; bits 9-8 of cylinder are in bits 7-6
- uint8_t sbits; // first bits 7-0 of cylinder
- uint8_t type; // partition type
- // ** CHS address of last block **
- uint8_t ehead; // last head
- uint8_t esector; // last sector is in bits 5-0; bits 9-8 of cylinder are in bits 7-6
- uint8_t ebits; // last bits 7-0 of cylinder
- uint32_t offset; // LBA of first sector in the partition
- uint32_t size; // number of blocks in partition, in little-endian format
-} MBRentry;
-
-typedef struct {
- char name[PNAMESIZE+1];// name of partition
- off_t offset; // offset into disk in bytes
- uint64_t size; // size of partiton in bytes
- int no; // partition number
- MBRentry descriptor; // copy of MBR / EBR descriptor that defines the partion
-} Partition;
-
-#pragma pack( push )
-#pragma pack( 1 )
-
-typedef struct {
- char fill[ MBR_START ];
- MBRentry descriptor[ 4 ];
- uint16_t signature;
-} MBRblock;
-
-
-typedef struct { // See http://en.wikipedia.org/wiki/Extended_boot_record for details
- char fill[ EBR_START ];
- MBRentry descriptor;
- MBRentry chain;
- MBRentry fill1, fill2;
- uint16_t signature;
-} EBRentry;
-
-#pragma pack( pop )
-
-Partition partitionTable[HOSTPARTITION_MAX+1]; // Note the partitionTable[0] is reserved for the EntireDisk descriptor
-static int lastPartition = 0;
-
-static struct fuse_operations fuseOperations = {
- .readdir = VD_readdir,
- .getattr = VD_getattr,
- .open = VD_open,
- .release = VD_release,
- .read = VD_read,
- .write = VD_write,
- .flush = VD_flush,
- .destroy = VD_destroy
-};
-
-static struct fuse_args fuseArgs = FUSE_ARGS_INIT (0, NULL);
-
-static struct stat VDfile_stat;
-
-static int verbose = 0;
-static int readonly = 0;
-static int allowall = 0; // allow all users to read from disk
-static int allowallw = 0; // allow all users to write to disk
-static uid_t myuid = 0;
-static gid_t mygid = 0;
-static char *processName;
-static int entireDiskOpened = 0;
-static int partitionOpened = 0;
-static int opened = 0; // how many opened instances are there
-
-//
-//====================================================================================================
-// Main routine including validation
-//====================================================================================================
-
-int main (int argc, char **argv) {
- char *diskType = "auto";
- char *imagefilename = NULL;
- char *mountpoint = NULL;
- int debug = 0;
- int foreground = 0;
- char c;
- int i;
- char *differencing[DIFFERENCING_MAX];
- int differencingLen = 0;
-
- extern char *optarg;
- extern int optind, optopt;
-
- //
- // *** Parse the command line options ***
- //
- processName = argv[0];
-
- while ((c = getopt(argc, argv, GETOPT_ARGS)) != -1) {
- switch(c) {
- case 'r' : readonly = 1; break;
- case 'g' : foreground = 1; break;
- case 'v' : verbose = 1; break;
- case 'a' : allowall = 1; break;
- case 'w' : allowall = 1; allowallw = 1; break;
- case 't' : diskType = (char *) optarg; break; // ignored if OLDAPI
- case 's' :
- if (differencingLen == DIFFERENCING_MAX)
- usageAndExit("Too many differencing disks");
- differencing[differencingLen++] = (char *)optarg;
- break;
- case 'f' : imagefilename = (char *)optarg; break;
- case 'd' : foreground = 1; debug = 1; break;
- case 'h' : usageAndExit(NULL);
- case '?' : usageAndExit("Unknown option");
- }
- }
- //
- // *** Validate the command line ***
- //
- if (argc != optind+1) usageAndExit("a single mountpoint must be specified");
- mountpoint = argv[optind];
- if (!mountpoint) usageAndExit("no mountpoint specified");
- if (!imagefilename) usageAndExit("no image chosen");
- if (stat(imagefilename, &VDfile_stat)<0) usageAndExit("cannot access imagefile");
- if (access (imagefilename, F_OK | R_OK | ((!readonly) ? W_OK : 0))
- < 0) usageAndExit("cannot access imagefile");
- for (i = 0; i < differencingLen; i++)
- if (access(differencing[i], F_OK | R_OK | ((readonly) ? 0 : W_OK)) < 0)
- usageAndExit("cannot access differencing imagefile %s", differencing[i]);
-
-#define IS_TYPE(s) (strcmp (s, diskType) == 0)
- if ( !(IS_TYPE("auto") || IS_TYPE("VDI" ) || IS_TYPE("VMDK") || IS_TYPE("VHD" ) ||
- IS_TYPE("auto")) ) usageAndExit("invalid disk type specified");
- if (strcmp ("auto", diskType) == 0 && detectDiskType (&diskType, imagefilename) < 0) return 1;
-
- //
- // *** Open the VDI, parse the MBR + EBRs and connect to the fuse service ***
- //
- if (RT_FAILURE(VDInterfaceAdd(&vdError, "VD Error", VDINTERFACETYPE_ERROR,
- &vdErrorCallbacks, NULL, &pVDifs)))
- usageAndExit("invalid initialisation of VD interface");
- if (RT_FAILURE(VDCreate(&vdError, VDTYPE_HDD, &hdDisk)))
- usageAndExit("invalid initialisation of VD interface");
- DISKopen(diskType, imagefilename);
-
- for (i = 0; i < differencingLen; i++)
- {
- char *diffType;
- char *diffFilename = differencing[i];
- detectDiskType (&diffType, diffFilename);
- DISKopen (diffType, diffFilename);
- }
-
- initialisePartitionTable();
-
- myuid = geteuid ();
- mygid = getegid ();
-
- fuse_opt_add_arg (&fuseArgs, "vdfuse");
-
- {
- char fsname[strlen(imagefilename) + 12];
- strcpy (fsname, "-ofsname=\0");
- strcat (fsname, imagefilename);
- fuse_opt_add_arg (&fuseArgs, fsname);
- }
-
- fuse_opt_add_arg (&fuseArgs, "-osubtype=vdfuse");
- fuse_opt_add_arg (&fuseArgs, "-o");
- fuse_opt_add_arg (&fuseArgs, (allowall) ? "allow_other" : "allow_root");
- if (foreground) fuse_opt_add_arg (&fuseArgs, "-f");
- if (debug) fuse_opt_add_arg (&fuseArgs, "-d");
- fuse_opt_add_arg (&fuseArgs, mountpoint);
-
- return fuse_main (fuseArgs.argc, fuseArgs.argv, &fuseOperations
-#if FUSE_USE_VERSION >= 26
- , NULL
-#endif
- );
-}
-//====================================================================================================
-// Miscellaneous output utilities
-//====================================================================================================
-
-void usageAndExit(char *optFormat, ... ) {
- va_list ap;
- if (optFormat !=NULL) {
- fputs ("\nERROR: ", stderr);
- va_start (ap, optFormat); vfprintf (stderr, optFormat, ap); va_end (ap);
- fputs ("\n\n", stderr);
- }
-// ---------!---------!---------!---------!---------!---------!---------!---------!
- fprintf (stderr,
- "DESCRIPTION: This Fuse module uses the VirtualBox access library to open a \n"
- "VirtualBox supported VD image file and mount it as a Fuse file system. The\n"
- "mount point contains a flat directory containing the files EntireDisk,\n"
- "Partition1 .. PartitionN. These can then be loop mounted to access the\n"
- "underlying file systems\n\n"
- "USAGE: %s [options] -f image-file mountpoint\n"
- "\t-h\thelp\n"
- "\t-r\treadonly\n"
-#ifndef OLDAPI
- "\t-t\tspecify type (VDI, VMDK, VHD, or raw; default: auto)\n"
-#endif
- "\t-f\tVDimage file\n"
-// "\t-s\tdifferencing disk files\n" // prevent misuse
- "\t-a\tallow all users to read disk\n"
- "\t-w\tallow all users to read and write to disk\n"
- "\t-g\trun in foreground\n"
- "\t-v\tverbose\n"
- "\t-d\tdebug\n\n"
- "NOTE: you must add the line \"user_allow_other\" (without quotes)\n"
- "to /etc/fuse.confand set proper permissions on /etc/fuse.conf\n"
- "for this to work.\n", processName);
- exit(1);
-}
-
-void vbprintf (const char *format, ...) {
- va_list ap;
- if (!verbose) return;
- va_start (ap, format); vprintf (format, ap); va_end (ap);
- fputs ("\n", stdout);
- fflush (stdout);
-}
-
-void vdErrorCallback(void *pvUser UNUSED, int rc, const char *file, unsigned iLine, const char *function, const char *format, va_list va) {
- fprintf(stderr, "\nVD CallbackError rc %d at %s:%u (%s): ", rc, file, iLine, function);
- vfprintf(stderr, format, va);
- fputs("\n", stderr);
-}
-
-
-//====================================================================================================
-// MBR + EBR parsing routine
-//====================================================================================================
-//
-// This code is algorithmically based on partRead in VBoxInternalManage.cpp plus the Wikipedia articles
-// on MBR and EBR. As in partRead, a statically allocated partition list is used same to keep things
-// simple (but up to a max 100 partitions :lol:). Note than unlike partRead, this doesn't resort the
-// partitions.
-//
-//int VDRead(PVBOXHDD pDisk, uint64_t uOffset, void *pvBuf, size_t cbRead, int ii );
-
-void initialisePartitionTable(void) {
- //uint16_t MBRsignature;
- int entendedFlag = UNALLOCATED;
- int i;
- MBRblock mbrb;
-
- memset(partitionTable, 0, sizeof(partitionTable));
- for (i=0; i <= (signed) (sizeof(partitionTable)/sizeof(Partition)) ; i++) partitionTable[i].no = UNALLOCATED;
-
- partitionTable[0].no = 0;
- partitionTable[0].offset = 0;
- partitionTable[0].size = DISKsize;
- strcpy(partitionTable[0].name, "EntireDisk");
- //
- // Check that this is unformated or a DOS partitioned disk. Sorry but other formats not supported.
- //
- DISKread(0, &mbrb, sizeof (mbrb) );
- if (mbrb.signature == 0x0000) return; // an unformated disk is allowed but only EntireDisk is defined
- if (mbrb.signature != 0xaa55) usageAndExit("Invalid MBR found on image with signature 0x%04hX", mbrb.signature);
-
- //
- // Process the four physical partition entires in the MBR
- //
- for (i = 1; i <= 4; i++) {
- Partition *p = partitionTable + i;
-// MBRentry *m = &(p->descriptor);
- //DISKread (MBR_START + (i-1) * sizeof(MBRentry), &(p->descriptor), sizeof(MBRentry));
- memcpy( &(p->descriptor), &mbrb.descriptor[ i - 1 ], sizeof( MBRentry ) );
- if ((p->descriptor).type == 0) continue;
- if (PARTTYPE_IS_EXTENDED((p->descriptor).type)) {
- if (entendedFlag != UNALLOCATED) usageAndExit("More than one extended partition in MBR");
- entendedFlag = i;
- } else {
- lastPartition = i;
- p->no = i;
- p->offset = (off_t)((p->descriptor).offset) * BLOCKSIZE;
- p->size = (off_t)((p->descriptor).size) * BLOCKSIZE;
- }
- }
- //
- // Now chain down any EBRs to process the logical partition entries
- //
- if (entendedFlag != UNALLOCATED) {
- EBRentry ebr;
- off_t uStart = (off_t)((partitionTable[entendedFlag].descriptor).offset) * BLOCKSIZE;
- off_t uOffset = 0;
-
- if (!uStart) usageAndExit("Inconsistency for logical partition start. Aborting\n");
-
- for (i = 5; i <= HOSTPARTITION_MAX; i++) {
- lastPartition++;
- Partition *p = partitionTable + i;
-
- DISKread (uStart + uOffset, &ebr, sizeof(ebr));
-
- if (ebr.signature != 0xaa55) usageAndExit("Invalid EBR signature found on image");
- if ((ebr.descriptor).type == 0) usageAndExit("Logical partition with type 0 encountered");
- if (!((ebr.descriptor).offset)) usageAndExit("Logical partition invalid partition start offset encountered");
-
- p->descriptor = ebr.descriptor;
- p->no = i;
- lastPartition = i;
- p->offset = uStart + uOffset + (off_t)((ebr.descriptor).offset) * BLOCKSIZE;
- p->size = (off_t)((ebr.descriptor).size) * BLOCKSIZE;
-
- if (ebr.chain.type == 0) break;
- if (!PARTTYPE_IS_EXTENDED(ebr.chain.type)) usageAndExit("Logical partition chain broken");
- uOffset = (off_t)((ebr.chain).offset) * BLOCKSIZE;
- }
- }
- //
- // Now print out the partition table
- //
- vbprintf( "Partition Size Offset\n"
- "========= ==== ======\n");
- for (i = 1; i <= lastPartition; i++) {
- Partition *p = partitionTable + i;
- if (p->no != UNALLOCATED) {
- sprintf(p->name, "Partition%d", i);
- vbprintf ( "%-14s %-13lld %-13lld", p->name, p->offset, p->size );
- }
- }
- vbprintf( "\n" );
-}
-
-int findPartition (const char* filename) {
- // Use a dumb serial search since there are typically less than 3 entries
- int i;
- register Partition *p = partitionTable;
- for (i = 0; i <= lastPartition; i++, p++) {
- if (p->no != UNALLOCATED && strcmp(filename+1, p->name) == 0) return i;
- }
- return -1;
-}
-
-// detects type of virtual image
-int detectDiskType (char **disktype, char *filename) {
- char buf[8];
- int fd = open (filename, O_RDONLY);
- read (fd, buf, sizeof (buf));
-
- if (strncmp (buf, "conectix", 8) == 0) *disktype = "VHD";
- else if (strncmp (buf, "VMDK", 4) == 0) *disktype = "VMDK";
- else if (strncmp (buf, "KDMV", 4) == 0) *disktype = "VMDK";
- else if (strncmp (buf, "<<<", 3) == 0) *disktype = "VDI";
- else usageAndExit("cannot autodetect disk type of %s", filename);
-
- vbprintf ("disktype is %s", *disktype);
- close(fd);
- return 0;
-}
-
-//====================================================================================================
-// Fuse Callback Routines
-//====================================================================================================
-//
-// in alphetic order to help find them: destroy ,flush ,getattr ,open, read, readdir, write
-
-pthread_mutex_t disk_mutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t part_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-void VD_destroy (void *u UNUSED) {
-// called when the fuse filesystem is umounted
- vbprintf ("destroy");
- DISKclose;
-}
-
-int VD_flush(const char *p, struct fuse_file_info *i UNUSED) {
- vbprintf ("flush: %s", p);
- DISKflush;
- return 0;
-}
-
-static int VD_getattr (const char *p, struct stat *stbuf) {
- vbprintf ("getattr: %s", p);
- int isFileRoot = (strcmp ("/", p) == 0);
- int n = findPartition(p);
-
- if (!isFileRoot && n == -1) return -ENOENT;
-
- // Use the container file's stat return as the basis. However since partitions cannot
- // be created by creating files, there is no write access to the directory. I also
- // treat group access the same as other.
-
- memcpy (stbuf, &VDfile_stat, sizeof (struct stat));
-
- if (isFileRoot) {
- stbuf->st_mode = S_IFDIR | S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP;
- if (allowall) stbuf->st_mode |= S_IROTH;
- stbuf->st_size = 0;
- stbuf->st_blocks = 2;
- } else {
- stbuf->st_mode = S_IFREG | S_IRUSR | S_IWUSR;
- if (allowall) stbuf->st_mode |= S_IRGRP | S_IROTH;
- if (allowallw) stbuf->st_mode |= S_IWGRP | S_IWOTH;
- stbuf->st_size = partitionTable[n].size;
- stbuf->st_blocks = (stbuf->st_size + BLOCKSIZE - 1) / BLOCKSIZE;
- }
- if (readonly) {
- stbuf->st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
- }
-
- stbuf->st_nlink = 1;
-
- return 0;
-}
-
-static int VD_open(const char *cName, struct fuse_file_info *i) {
- vbprintf ("open: %s, %lld, 0X%08lX ", cName, i->fh, i->flags );
- int n = findPartition(cName);
- if ( (n == -1) ||
- (entireDiskOpened && n > 0) ||
- (partitionOpened && n == 0) ) return -ENOENT;
- if ( readonly &&
- ((i->flags & (O_WRONLY | O_RDWR)) != 0)) return -EROFS;
-
- if (n == 0) entireDiskOpened = 1;
- else partitionOpened = 1;
-
- pthread_mutex_lock (&part_mutex);
- opened++;
- pthread_mutex_unlock (&part_mutex);
-
- return 0;
-}
-
-static int VD_release (const char *name, struct fuse_file_info *fi) {
- (void) fi;
- vbprintf ("release: %s", name);
-
- pthread_mutex_lock (&part_mutex);
- opened--;
- if (opened == 0) {
- initialisePartitionTable ();
- entireDiskOpened = 0;
- partitionOpened = 0;
- }
- pthread_mutex_unlock (&part_mutex);
-
- return 0;
-}
-
-static int VD_read (const char *c, char *out, size_t len, off_t offset, struct fuse_file_info *i UNUSED) {
- vbprintf ("read: %s, offset=%lld, length=%d", c, offset, len);
- int n = findPartition(c);
- if (n<0) return -ENOENT;
- if ((n == 0) ? partitionOpened : entireDiskOpened) return -EIO;
-
- Partition *p = &(partitionTable[n]);
-// if (offset >= p->size) return 0;
-// if (offset + len> p->size) len = p->size - offset;
- if ((uint64_t)offset >= p->size) return 0;
- if ((uint64_t)(offset + len) > p->size) len = p->size - offset;
-
- pthread_mutex_lock (&disk_mutex);
- int ret = DISKread(offset + p->offset, out, len);
- pthread_mutex_unlock (&disk_mutex);
-
- return RT_SUCCESS(ret) ? (signed) len : -EIO;
-}
-
-static int VD_readdir (const char *p, void *buf, fuse_fill_dir_t filler, off_t offset UNUSED, struct fuse_file_info *i UNUSED){
- int n;
- vbprintf ("readdir");
- if (strcmp ("/", p) != 0) return -ENOENT;
- filler (buf, ".", NULL, 0);
- filler (buf, "..", NULL, 0);
- for (n = 0; n <= lastPartition; n++) {
- Partition *p = partitionTable + n;
- if (p->no != UNALLOCATED) filler(buf, p->name, NULL, 0);
- }
- return 0;
-}
-
-static int VD_write (const char *c, const char *in, size_t len, off_t offset, struct fuse_file_info *i UNUSED) {
- vbprintf ("write: %s, offset=%lld, length=%d", c, offset, len);
- int n = findPartition(c);
- if (n<0) return -ENOENT;
- if ((n == 0) ? partitionOpened : entireDiskOpened) return -EIO;
- Partition *p = &(partitionTable[n]);
- if ((uint64_t)offset >= p->size) return 0;
- if ((uint64_t)(offset + len) > p->size) len = p->size - offset;
-
- pthread_mutex_lock (&disk_mutex);
- int ret = DISKwrite(offset + p->offset, in, len);
- pthread_mutex_unlock (&disk_mutex);
-
- return RT_SUCCESS(ret) ? (signed) len : -EIO;
-}
diff --git a/debian/virtualbox-fuse.install b/debian/virtualbox-fuse.install
deleted file mode 100644
index bc9d897..0000000
--- a/debian/virtualbox-fuse.install
+++ /dev/null
@@ -1 +0,0 @@
-out/vdfuse/vdfuse usr/bin
diff --git a/debian/virtualbox-fuse.lintian-overrides b/debian/virtualbox-fuse.lintian-overrides
deleted file mode 100644
index f58eec6..0000000
--- a/debian/virtualbox-fuse.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-virtualbox-fuse: binary-or-shlib-defines-rpath *usr/bin/vdfuse /usr/lib/virtualbox
diff --git a/debian/virtualbox-fuse.manpages b/debian/virtualbox-fuse.manpages
deleted file mode 100644
index f4213b7..0000000
--- a/debian/virtualbox-fuse.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/manpages/vdfuse.1
diff --git a/debian/virtualbox-guest-dkms.install.in b/debian/virtualbox-guest-dkms.install.in
index 66d7061..bcae4f7 100644
--- a/debian/virtualbox-guest-dkms.install.in
+++ b/debian/virtualbox-guest-dkms.install.in
@@ -2,15 +2,12 @@ out/bin/additions/src/vboxguest/*.* /usr/src/virtualbox-guest-CVERSION/vboxguest
out/bin/additions/src/vboxguest/common /usr/src/virtualbox-guest-CVERSION/vboxguest
out/bin/additions/src/vboxguest/generic /usr/src/virtualbox-guest-CVERSION/vboxguest
out/bin/additions/src/vboxguest/VBox /usr/src/virtualbox-guest-CVERSION/vboxguest
-out/bin/additions/src/vboxguest/build_in_tmp /usr/src/virtualbox-guest-CVERSION/vboxguest
out/bin/additions/src/vboxguest/Makefile /usr/src/virtualbox-guest-CVERSION/vboxguest
out/bin/additions/src/vboxsf/*.* /usr/src/virtualbox-guest-CVERSION/vboxsf
-out/bin/additions/src/vboxsf/build_in_tmp /usr/src/virtualbox-guest-CVERSION/vboxsf
out/bin/additions/src/vboxsf/Makefile /usr/src/virtualbox-guest-CVERSION/vboxsf
out/bin/additions/src/vboxvideo/*.* /usr/src/virtualbox-guest-CVERSION/vboxvideo
-out/bin/additions/src/vboxvideo/build_in_tmp /usr/src/virtualbox-guest-CVERSION/vboxvideo
out/bin/additions/src/vboxvideo/Makefile /usr/src/virtualbox-guest-CVERSION/vboxvideo
out/bin/additions/src/vboxguest/include/iprt/* /usr/src/virtualbox-guest-CVERSION/include/iprt
@@ -23,4 +20,3 @@ out/bin/additions/src/vboxsf/include/VBox/* /usr/src/virtualbox-guest-CVERSION/i
out/bin/additions/src/vboxguest/r0drv /usr/src/virtualbox-guest-CVERSION/
debian/virtualbox-guest-dkms.files/Makefile /usr/src/virtualbox-guest-CVERSION
-
diff --git a/debian/virtualbox-guest-source.files/control.modules.in b/debian/virtualbox-guest-source.files/control.modules.in
index 3d866f3..b4d93f5 100644
--- a/debian/virtualbox-guest-source.files/control.modules.in
+++ b/debian/virtualbox-guest-source.files/control.modules.in
@@ -3,7 +3,7 @@ Section: misc
Priority: optional
Maintainer: Debian Virtualbox Team <pkg-virtualbox-devel at lists.alioth.debian.org>
Uploaders: Michael Meskes <meskes at debian.org>,
- Felix Geyer <debfx-pkg at fobos.de>
+ Felix Geyer <fgeyer at debian.org>
Build-Depends: debhelper (>= 5), kbuild
Standards-Version: 3.8.3
Homepage: http://www.virtualbox.org/
@@ -15,9 +15,7 @@ Section: kernel
Architecture: amd64 i386
Depends: linux-modules-_KVERS_ | linux-image-_KVERS_
Recommends: virtualbox-guest-utils
-Provides: virtualbox-guest-modules, virtualbox-ose-guest-modules-_KVERS_
-Conflicts: virtualbox-ose-guest-modules-_KVERS_
-Replaces: virtualbox-ose-guest-modules-_KVERS_
+Provides: virtualbox-guest-modules
Description: VirtualBox guest addition modules for Linux (kernel _KVERS_)
This package contains the set of loadable kernel modules for VirtualBox Guest Additions.
.
diff --git a/debian/virtualbox-guest-source.install b/debian/virtualbox-guest-source.install
index 6756d12..7bfb6d0 100644
--- a/debian/virtualbox-guest-source.install
+++ b/debian/virtualbox-guest-source.install
@@ -2,15 +2,12 @@ out/bin/additions/src/vboxguest/*.* /usr/src/modules/virtualbox-guest/vboxguest
out/bin/additions/src/vboxguest/common /usr/src/modules/virtualbox-guest/vboxguest
out/bin/additions/src/vboxguest/generic /usr/src/modules/virtualbox-guest/vboxguest
out/bin/additions/src/vboxguest/VBox /usr/src/modules/virtualbox-guest/vboxguest
-out/bin/additions/src/vboxguest/build_in_tmp /usr/src/modules/virtualbox-guest/vboxguest
out/bin/additions/src/vboxguest/Makefile /usr/src/modules/virtualbox-guest/vboxguest
out/bin/additions/src/vboxsf/*.* /usr/src/modules/virtualbox-guest/vboxsf
-out/bin/additions/src/vboxsf/build_in_tmp /usr/src/modules/virtualbox-guest/vboxsf
out/bin/additions/src/vboxsf/Makefile /usr/src/modules/virtualbox-guest/vboxsf
out/bin/additions/src/vboxvideo/*.* /usr/src/modules/virtualbox-guest/vboxvideo
-out/bin/additions/src/vboxvideo/build_in_tmp /usr/src/modules/virtualbox-guest/vboxvideo
out/bin/additions/src/vboxvideo/Makefile /usr/src/modules/virtualbox-guest/vboxvideo
out/bin/additions/src/vboxguest/include/iprt/* /usr/src/modules/virtualbox-guest/include/iprt
diff --git a/debian/virtualbox-guest-source.links b/debian/virtualbox-guest-source.links
index ae0d9eb..a7e74d9 100644
--- a/debian/virtualbox-guest-source.links
+++ b/debian/virtualbox-guest-source.links
@@ -4,4 +4,4 @@
/usr/src/modules/virtualbox-guest/include /usr/src/modules/virtualbox-guest/vboxsf/include
/usr/src/modules/virtualbox-guest/include /usr/src/modules/virtualbox-guest/vboxvideo/include
-/usr/share/modass/packages/default.sh /usr/share/modass/overrides/virtualbox-guest-source
+#/usr/share/modass/packages/default.sh /usr/share/modass/overrides/virtualbox-guest-source
diff --git a/debian/virtualbox-guest-utils.init b/debian/virtualbox-guest-utils.init
index 3cb777f..2f7a518 100644
--- a/debian/virtualbox-guest-utils.init
+++ b/debian/virtualbox-guest-utils.init
@@ -26,11 +26,40 @@ in_virtual_machine()
return 0
}
+running()
+{
+ lsmod | grep -q "$1[^_-]"
+}
+
case "$1" in
start)
in_virtual_machine || exit 0
log_begin_msg "Starting VirtualBox Additions"
+ if ! running vboxguest; then
+ if ! modprobe vboxguest > /dev/null 2>&1; then
+ if ! find /lib/modules/`uname -r` -name "vboxguest\.*" 2>/dev/null|grep -q vboxguest; then
+ log_failure_msg "No suitable module for running kernel found"
+ else
+ log_failure_msg "modprobe vboxguest failed. Please use 'dmesg' to find out why"
+ fi
+ log_end_msg 1
+ return 1
+ fi
+ fi
+
+ if ! running vboxsf; then
+ if ! modprobe vboxsf > /dev/null 2>&1; then
+ if ! find /lib/modules/`uname -r` -name "vboxsf\.*" 2>/dev/null|grep -q vboxsf; then
+ log_failure_msg "No suitable module for running kernel found"
+ else
+ log_failure_msg "modprobe vboxsf failed. Please use 'dmesg' to find out why"
+ fi
+ log_end_msg 1
+ return 1
+ fi
+ fi
+
start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/VBoxService
if [ $? -ne 0 ]; then
log_end_msg 1
diff --git a/debian/virtualbox-guest-utils.preinst b/debian/virtualbox-guest-utils.preinst
deleted file mode 100644
index f50f3dd..0000000
--- a/debian/virtualbox-guest-utils.preinst
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-# Remove a no-longer used conffile
-rm_conffile() {
- PKGNAME="$1"
- CONFFILE="$2"
- if [ -e "$CONFFILE" ]; then
- md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
- if [ "$md5sum" != "$old_md5sum" ]; then
- echo "Obsolete conffile $CONFFILE has been modified by you."
- echo "Saving as $CONFFILE.dpkg-bak ..."
- mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
- else
- echo "Removing obsolete conffile $CONFFILE ..."
- rm -f "$CONFFILE"
- fi
- fi
-}
-
-if [ "$1" = install ]; then
- # virtualbox-ose-guest-utils << 4.0.6-dfsg-1~
- if [ -e /etc/init.d/virtualbox-ose-guest-utils ]; then
- rm_conffile virtualbox-ose-guest-utils /etc/init.d/virtualbox-ose-guest-utils
- update-rc.d virtualbox-ose-guest-utils remove >/dev/null
- fi
-fi
diff --git a/debian/virtualbox-guest-x11.init b/debian/virtualbox-guest-x11.init
new file mode 100644
index 0000000..8ce6d44
--- /dev/null
+++ b/debian/virtualbox-guest-x11.init
@@ -0,0 +1,67 @@
+#!/bin/sh
+# (C) 2012 Felix Geyer <fgeyer at debian@org>
+
+### BEGIN INIT INFO
+# Provides: virtualbox-guest-x11
+# Short-Description: VirtualBox Linux X11 Additions
+# Required-Start: $remote_fs
+# Required-Stop:
+# Default-Start: S
+# Default-Stop:
+### END INIT INFO
+
+PATH=$PATH:/bin:/sbin:/usr/sbin
+
+. /lib/lsb/init-functions
+
+test -e /usr/lib/VBoxOGL.so || exit 0
+
+in_virtual_machine()
+{
+ if [ -z "$(lspci -d 80ee:beef)" ]; then
+ log_warning_msg "VirtualBox Additions disabled, not in a Virtual Machine"
+ return 1
+ fi
+
+ return 0
+}
+
+running()
+{
+ lsmod | grep -q "$1[^_-]"
+}
+
+case "$1" in
+ start)
+ in_virtual_machine || exit 0
+ log_begin_msg "Loading VirtualBox video kernel module"
+
+ if ! running vboxvideo; then
+ if ! modprobe vboxvideo > /dev/null 2>&1; then
+ if ! find /lib/modules/`uname -r` -name "vboxvideo\.*" 2>/dev/null|grep -q vboxvideo; then
+ log_failure_msg "No suitable module for running kernel found"
+ else
+ log_failure_msg "modprobe vboxvideo failed. Please use 'dmesg' to find out why"
+ fi
+ log_end_msg 1
+ exit 1
+ fi
+ fi
+
+ log_end_msg 0
+ ;;
+
+ stop)
+ ;;
+
+ restart|force-reload)
+ $0 start
+ ;;
+
+ *)
+ echo "Usage: $0 {start|stop|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/debian/virtualbox-guest-x11.install b/debian/virtualbox-guest-x11.install
index 3158f4e..b41e824 100644
--- a/debian/virtualbox-guest-x11.install
+++ b/debian/virtualbox-guest-x11.install
@@ -1,5 +1,4 @@
out/bin/additions/VBoxClient /usr/bin
src/VBox/Additions/x11/Installer/x11config.pl /usr/share/virtualbox
src/VBox/Additions/x11/Installer/98vboxadd-xclient /etc/X11/Xsession.d
-out/bin/additions/vboxvideo_drv.so /usr/lib/xorg/modules/drivers
out/bin/additions/VBoxOGL*.so /usr/lib
diff --git a/debian/virtualbox-guest-x11.postrm b/debian/virtualbox-guest-x11.postrm
new file mode 100644
index 0000000..fca5e17
--- /dev/null
+++ b/debian/virtualbox-guest-x11.postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "remove" ]; then
+ ldconfig
+fi
diff --git a/debian/virtualbox-guest-x11.preinst b/debian/virtualbox-guest-x11.preinst
new file mode 100644
index 0000000..3d4bebd
--- /dev/null
+++ b/debian/virtualbox-guest-x11.preinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+case "$1" in
+ install|upgrade)
+ if dpkg --compare-versions "$2" gt "4.1.22-dfsg" && dpkg --compare-versions "$2" lt "4.2.10-dfsg"; then
+ # hack to change runlevels from default to S
+ update-rc.d -f virtualbox-guest-x11 remove > /dev/null || true
+ fi
+ ;;
+esac
diff --git a/debian/virtualbox-source.files/control.modules.in b/debian/virtualbox-source.files/control.modules.in
index 1cde61c..142b8b3 100644
--- a/debian/virtualbox-source.files/control.modules.in
+++ b/debian/virtualbox-source.files/control.modules.in
@@ -3,7 +3,7 @@ Section: misc
Priority: optional
Maintainer: Debian Virtualbox Team <pkg-virtualbox-devel at lists.alioth.debian.org>
Uploaders: Michael Meskes <meskes at debian.org>,
- Felix Geyer <debfx-pkg at fobos.de>
+ Felix Geyer <fgeyer at debian.org>
Build-Depends: debhelper (>= 5), kbuild
Standards-Version: 3.8.3
Homepage: http://www.virtualbox.org/
@@ -15,9 +15,7 @@ Section: kernel
Architecture: amd64 i386
Depends: linux-modules-_KVERS_ | linux-image-_KVERS_
Recommends: virtualbox
-Provides: virtualbox-modules, virtualbox-ose-guest-modules-_KVERS_
-Conflicts: virtualbox-ose-guest-modules-_KVERS_
-Replaces: virtualbox-ose-guest-modules-_KVERS_
+Provides: virtualbox-modules
Description: VirtualBox modules for Linux (kernel _KVERS_)
This package contains the set of loadable kernel modules for VirtualBox.
.
diff --git a/debian/virtualbox-source.links b/debian/virtualbox-source.links
index b85bfe1..568084a 100644
--- a/debian/virtualbox-source.links
+++ b/debian/virtualbox-source.links
@@ -1,4 +1,4 @@
-/usr/share/modass/packages/default.sh /usr/share/modass/overrides/virtualbox-source
+#/usr/share/modass/packages/default.sh /usr/share/modass/overrides/virtualbox-source
/usr/src/modules/virtualbox/r0drv /usr/src/modules/virtualbox/vboxdrv/r0drv
/usr/src/modules/virtualbox/r0drv /usr/src/modules/virtualbox/vboxnetflt/r0drv
diff --git a/debian/virtualbox.files/VBox.sh b/debian/virtualbox.files/VBox.sh
index 6a9bc60..cd2f37c 100755
--- a/debian/virtualbox.files/VBox.sh
+++ b/debian/virtualbox.files/VBox.sh
@@ -5,74 +5,71 @@
# and placed under GPLv2
#
# this is based on a script by
-# InnoTek VirtualBox
+# Oracle VirtualBox
#
-# Copyright (C) 2006 InnoTek Systemberatung GmbH
+# Copyright (C) 2006-2011 Oracle Corporation
#
# This file is part of VirtualBox Open Source Edition (OSE), as
# available from http://www.virtualbox.org. This file is free software;
# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation,
-# in version 2 as it comes in the "COPYING" file of the VirtualBox OSE
-# distribution. VirtualBox OSE is distributed in the hope that it will
-# be useful, but WITHOUT ANY WARRANTY of any kind.
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
PATH="/usr/bin:/bin:/usr/sbin:/sbin"
# VirtualBox installation directory
INSTALL_DIR="/usr/lib/virtualbox"
-# We don't distribute this file anymore. However, if it is still there we use
-# it, just to be sure we stay compatible with older versions.
-[ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg
-
-if [ "$VBOX_USER_HOME" = "" ]; then
- if [ ! -d "$HOME/.VirtualBox" ]; then
- mkdir -p "$HOME/.VirtualBox"
- fi
- LOG="$HOME/.VirtualBox/VBoxSVC.log"
-else
- if [ ! -d "$VBOX_USER_HOME" ]; then
- mkdir -p "$VBOX_USER_HOME"
- fi
- LOG="$VBOX_USER_HOME/VBoxSVC.log"
-fi
-
# Note: This script must not fail if the module was not successfully installed
# because the user might not want to run a VM but only change VM params!
if [ ! -c /dev/vboxdrv ]; then
cat << EOF
WARNING: The character device /dev/vboxdrv does not exist.
- Please install the virtualbox-ose-dkms package and the appropriate
+ Please install the virtualbox-dkms package and the appropriate
headers, most likely linux-headers-$(uname -r | cut -d- -f3).
You will not be able to start VMs until this problem is fixed.
EOF
fi
-APP=`which $0`
-APP=${APP##/*/}
+SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`
+if [ -z "$SERVER_PID" ]; then
+ # Server not running yet/anymore, cleanup socket path.
+ # See IPC_GetDefaultSocketPath()!
+ if [ -n "$LOGNAME" ]; then
+ rm -rf /tmp/.vbox-$LOGNAME-ipc > /dev/null 2>&1
+ else
+ rm -rf /tmp/.vbox-$USER-ipc > /dev/null 2>&1
+ fi
+fi
+
+APP=`basename $0`
case "$APP" in
VirtualBox|virtualbox)
exec "$INSTALL_DIR/VirtualBox" "$@"
;;
- VBoxHeadless|vboxheadless)
- exec "$INSTALL_DIR/VBoxHeadless" "$@"
- ;;
VBoxManage|vboxmanage)
exec "$INSTALL_DIR/VBoxManage" "$@"
;;
VBoxSDL|vboxsdl)
exec "$INSTALL_DIR/VBoxSDL" "$@"
;;
- vditool)
- exec "$INSTALL_DIR/vditool" "$@"
+ VBoxHeadless|vboxheadless)
+ exec "$INSTALL_DIR/VBoxHeadless" "$@"
+ ;;
+ VBoxBalloonCtrl|vboxballoonctrl)
+ exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
;;
vboxwebsrv)
exec "$INSTALL_DIR/vboxwebsrv" "$@"
;;
*)
echo "Unknown application - $APP"
+ exit 1
;;
esac
+
+exit 0
diff --git a/debian/virtualbox.install b/debian/virtualbox.install
index 48d661d..1612e66 100644
--- a/debian/virtualbox.install
+++ b/debian/virtualbox.install
@@ -1,10 +1,13 @@
debian/virtualbox.files/*.sh /usr/share/virtualbox
out/bin/components /usr/lib/virtualbox
-out/bin/VBoxREM* /usr/lib/virtualbox
+out/bin/ExtensionPacks /usr/lib/virtualbox
+out/bin/VBoxREM.so /usr/lib/virtualbox
out/bin/VBox*.so /usr/lib/virtualbox
out/bin/VBox*.gc /usr/lib/virtualbox
out/bin/VBox*.r0 /usr/lib/virtualbox
+out/bin/VBoxAutostart /usr/lib/virtualbox
+out/bin/VBoxBalloonCtrl /usr/lib/virtualbox
out/bin/VBoxEFI* /usr/lib/virtualbox
out/bin/VBoxExtPackHelperApp /usr/lib/virtualbox
out/bin/VBoxHeadless /usr/lib/virtualbox
diff --git a/debian/virtualbox.links b/debian/virtualbox.links
index e2fa4e3..3333323 100644
--- a/debian/virtualbox.links
+++ b/debian/virtualbox.links
@@ -1,10 +1,12 @@
/usr/share/virtualbox/VBox.sh /usr/bin/vboxheadless
/usr/share/virtualbox/VBox.sh /usr/bin/vboxmanage
/usr/share/virtualbox/VBox.sh /usr/bin/vboxsdl
+/usr/share/virtualbox/VBox.sh /usr/bin/vboxballoonctrl
/usr/share/virtualbox/VBox.sh /usr/bin/vboxwebsrv
/usr/share/virtualbox/VBox.sh /usr/bin/VBoxHeadless
/usr/share/virtualbox/VBox.sh /usr/bin/VBoxManage
/usr/share/virtualbox/VBox.sh /usr/bin/VBoxSDL
+/usr/share/virtualbox/VBox.sh /usr/bin/VBoxBalloonCtrl
/usr/share/man/man1/VBoxHeadless.1 /usr/share/man/man1/vboxheadless.1
/usr/share/man/man1/VBoxManage.1 /usr/share/man/man1/vboxmanage.1
diff --git a/debian/virtualbox.lintian-overrides b/debian/virtualbox.lintian-overrides
index abf62a6..023bf70 100644
--- a/debian/virtualbox.lintian-overrides
+++ b/debian/virtualbox.lintian-overrides
@@ -1,11 +1,3 @@
-virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDD.so
-virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDD2.so
-virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDDU.so
-virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM.so
-virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxRT.so
-virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVMM.so
-virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxC.so
-virtualbox: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxSVCM.so
virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2GC.gc
virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2R0.r0
virtualbox: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDGC.gc
@@ -16,3 +8,9 @@ virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxHeadless 6755 root/root
virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxNetAdpCtl 6755 root/root
virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxNetDHCP 6755 root/root
virtualbox: setuid-gid-binary usr/lib/virtualbox/VBoxSDL 6755 root/root
+virtualbox: jar-not-in-usr-share usr/lib/virtualbox/sdk/bindings/xpcom/java/vboxjxpcom.jar
+virtualbox: executable-not-elf-or-script usr/lib/virtualbox/VBoxNetDHCP
+virtualbox: executable-not-elf-or-script usr/lib/virtualbox/VBoxNetAdpCtl
+virtualbox: executable-not-elf-or-script usr/lib/virtualbox/VBoxHeadless
+virtualbox: executable-not-elf-or-script usr/lib/virtualbox/VBoxSDL
+virtualbox: embedded-library usr/lib/virtualbox/VBoxXPCOM.so: nspr
diff --git a/debian/virtualbox.postinst b/debian/virtualbox.postinst
index 8333e05..4bb493e 100644
--- a/debian/virtualbox.postinst
+++ b/debian/virtualbox.postinst
@@ -4,26 +4,7 @@ set -e
#DEBHELPER#
-mv_conffile() {
- local OLDCONFFILE="$1"
- local NEWCONFFILE="$2"
-
- [ -e "$OLDCONFFILE" ] || return 0
-
- echo "Preserving user changes to $NEWCONFFILE ..."
- mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
- mv -f "$OLDCONFFILE" "$NEWCONFFILE"
-}
-
if [ "$1" = configure ]; then
- if [ -e /etc/default/virtualbox-ose ]; then
- mv_conffile /etc/default/virtualbox-ose /etc/default/virtualbox
- sed -i 's/^# Defaults for virtualbox-ose initscript$/# Defaults for virtualbox initscript/g' /etc/default/virtualbox
- sed -i 's/^# sourced by \/etc\/init\.d\/virtualbox-ose$/# sourced by \/etc\/init.d\/virtualbox/g' /etc/default/virtualbox
- sed -i 's/^# installed at \/etc\/default\/virtualbox-ose by the maintainer scripts$/# installed at \/etc\/default\/virtualbox by the maintainer scripts/g' /etc/default/virtualbox
- sed -i 's/^# Set this to 1 if you would like the virtualbox-ose modules to be loaded by/# Set this to 1 if you would like the virtualbox modules to be loaded by/g' /etc/default/virtualbox
- fi
-
if [ -z `getent group vboxusers` ]; then
addgroup --system --quiet vboxusers
fi
@@ -35,7 +16,7 @@ if [ "$1" = configure ]; then
major="`expr "$dev" : '\(.*\):' 2> /dev/null || true`"
minor="`expr "$dev" : '.*:\(.*\)' 2> /dev/null || true`"
class="`cat $i/bDeviceClass 2> /dev/null || true`"
- /usr/share/virtualbox/VBoxCreateUSBNode.sh "$major" "$minor" "$class" vboxusers 2>/dev/null || true
+ /lib/udev/VBoxCreateUSBNode.sh "$major" "$minor" "$class" vboxusers 2>/dev/null || true
fi
done
diff --git a/debian/virtualbox.preinst b/debian/virtualbox.preinst
deleted file mode 100644
index 5a49bea..0000000
--- a/debian/virtualbox.preinst
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-# Remove a no-longer used conffile
-rm_conffile() {
- PKGNAME="$1"
- CONFFILE="$2"
- if [ -e "$CONFFILE" ]; then
- md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
- if [ "$md5sum" != "$old_md5sum" ]; then
- echo "Obsolete conffile $CONFFILE has been modified by you."
- echo "Saving as $CONFFILE.dpkg-bak ..."
- mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
- else
- echo "Removing obsolete conffile $CONFFILE ..."
- rm -f "$CONFFILE"
- fi
- fi
-}
-
-prep_mv_conffile() {
- local PKGNAME="$1"
- local CONFFILE="$2"
-
- [ -e "$CONFFILE" ] || return 0
-
- local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
- local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
- sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
- if [ "$md5sum" = "$old_md5sum" ]; then
- rm -f "$CONFFILE"
- fi
-}
-
-if [ "$1" = install ]; then
- # virtualbox-ose << 2.1.2-dfsg-1~
- rm_conffile virtualbox-ose /etc/network/if-post-down.d/virtualbox-ose
- rm_conffile virtualbox-ose /etc/network/if-pre-up.d/virtualbox-ose
- rm_conffile virtualbox-ose /etc/vbox/interfaces
-
- # virtualbox-ose << 2.2.2-dfsg-3~
- rm_conffile virtualbox-ose /etc/vbox/vbox.cfg
-
- # virtualbox-ose << 4.0.6-dfsg-1~
- if [ -e /etc/init.d/virtualbox-ose ]; then
- rm_conffile virtualbox-ose /etc/init.d/virtualbox-ose
- update-rc.d virtualbox-ose remove >/dev/null
- fi
- prep_mv_conffile virtualbox-ose /etc/default/virtualbox-ose
-fi
diff --git a/debian/watch b/debian/watch
index c264ceb..53334cf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,5 @@
version=3
opts=dversionmangle=s/-dfsg\d*$//,uversionmangle=s/-.*// \
- http://download.virtualbox.org/virtualbox/([\d\.\-]+)/VirtualBox-([\d\.\-]+).tar.bz2
+ http://download.virtualbox.org/virtualbox/([\d\.\-]+)/VirtualBox-([\d\.\-]+).tar.bz2 \
+ debian /bin/sh debian/get-orig-source.sh
--
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