diff --git a/debian/LocalConfig.kmk b/debian/LocalConfig.kmk new file mode 100644 index 0000000..1cc8b3b --- /dev/null +++ b/debian/LocalConfig.kmk @@ -0,0 +1,14 @@ +VBOX_WITH_ADDITION_DRIVERS = +VBOX_ADDITIONS_LINUX_ONLY = +VBOX_WITH_INSTALLER = 1 +VBOX_WITH_LINUX_ADDITIONS = 1 +VBOX_WITH_X11_ADDITIONS = 1 +VBOX_WITH_TESTCASES = +VBOX_WITH_TESTSUITE = +VBOX_WITH_CROGL = 1 +VBOX_WITH_ORIGIN := +VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox +VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox +VBOX_PATH_APP_DOCS = $(VBOX_PATH_PACKAGE_DOCS) diff --git a/debian/changelog b/debian/changelog index f8e0e31..05aaac5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,61 @@ +virtualbox-ose (3.0.8-dfsg-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #444812), remaining changes: + - Enable DKMS support on virtualbox host and guest modules (LP: #267097) + - Drop virtualbox-ose{-guest,}-modules-* package templates + - Recommend *-source instead of *-modules packages + - Replace error messages related to missing/mismatched + kernel module accordingly + - Autoload kernel module + - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default + - Disable update action + - patches/u01-disable-update-action.dpatch + - Virtualbox should go in Accessories, not in System tools (LP: #288590) + - virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add apport hook + - virtualbox-ose.files/source_virtualbox-ose.py + - virtualbox-ose.install + - Add launchpad integration + - control + - lpi-bug.xpm + - patches/u02-lp-integration.dpatch + * Try to remove existing dkms modules before adding the new modules + (LP: #434503) + - debian/virtualbox-ose-source.postinst + - debian/virtualbox-ose-guest-source.postinst + * Don't fail if dkms modules have already been removed + - debian/virtualbox-ose-source.prerm + - debian/virtualbox-ose-guest-source.prerm + + -- Felix Geyer Tue, 13 Oct 2009 23:06:00 +0200 + +virtualbox-ose (3.0.8-dfsg-1) unstable; urgency=high + + [ Felix Geyer ] + * New Upstream Version + - Fixes security vulnerability in VBoxNetAdpCtl (SunSolve #268188) + * Conflict with upstream proprietary packages + * Install vboxapi python module, closes: #549542 + * Use an own cleaned-up virtualbox-ose init script instead of + patching the upstream script + * Only restart virtualbox-ose after upgrade if it's not running; do not + restart virtualbox-ose-guest-utils at all + * Call notify-reboot-required after guest utils upgrade + * Remove vboxusers group as it's not needed anymore + * Don't statically link VBoxClient with libstdc++ + - Add patch 22-no-static-libstdcpp.dpatch from Fedora + * Pass more build options through the command line, which allows us to drop + 02-config-kmk.dpatch, 03-localconf-kmk.dpatch and + 14-disable-registration-request.dpatch + * No longer reload udev rules in postinst as they are reloaded automatically + * Add lintian overrides for non-PIC code in /usr/lib/virtualbox/*.so + + [ Michael Meskes ] + * Made debug package also depend on guest utilities package. + * Added option to close down all active VMs from init script. + + -- Michael Meskes Tue, 13 Oct 2009 13:46:44 +0200 + virtualbox-ose (3.0.6-dfsg-1ubuntu1) karmic; urgency=low * Merge from debian unstable (LP: #429697), remaining changes: diff --git a/debian/control b/debian/control index 8d18413..63e31f7 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,8 @@ Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Debian Virtualbox Team Uploaders: Michael Meskes , Patrick Winnertz , - Hilko Bengen + Hilko Bengen , + Felix Geyer Build-Depends: bcc, bzip2, chrpath, @@ -17,17 +18,15 @@ Build-Depends: bcc, gsoap, iasl, kbuild (>= 1:0.1.5svn2274), - libacl1-dev, - libasound-dev, + libasound2-dev, libcap2-dev, - libcurl4-openssl-dev | libcurl3-openssl-dev, + libcurl4-openssl-dev | libcurl3-openssl-dev (>= 7.16.1), libdrm-dev, libgl1-mesa-dev, libglu1-mesa-dev, - libhal-dev, libidl-dev, - libpng12-dev, libpixman-1-dev, + libpng12-dev, libpulse-dev, libqt4-dev (>= 4.3.0), libsdl1.2-dev, @@ -42,8 +41,8 @@ Build-Depends: bcc, libxrender-dev, libxslt1-dev, lynx-cur, - po-debconf (>= 0.5.0), - python-dev, + python-central, + python-dev (>= 2.4), uuid-dev, x11proto-gl-dev, x11proto-xf86dri-dev, @@ -51,6 +50,7 @@ Build-Depends: bcc, xsltproc, yasm (>= 0.7.0), zlib1g-dev +XS-Python-Version: >= 2.4 Standards-Version: 3.8.3 Homepage: http://www.virtualbox.org/ Vcs-Git: git://git.debian.org/git/pkg-virtualbox/virtualbox-ose.git @@ -62,8 +62,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, virtualbox-ose (= ${binary:Version}), launchpad-integration -Pre-Depends: debconf | debconf-2.0 -Replaces: virtualbox-ose (<< 2.2.0-dfsg-1) +Replaces: virtualbox-ose (<< 2.2.0-dfsg-1) 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 @@ -76,14 +75,16 @@ Package: virtualbox-ose Architecture: amd64 i386 lpia Depends: ${shlibs:Depends}, ${misc:Depends}, - adduser, - python -Pre-Depends: debconf | debconf-2.0 + ${python:Depends}, + adduser Recommends: virtualbox-ose-source (= ${binary:Version}), virtualbox-ose-qt (= ${binary:Version}), - libgl1 -Suggests: virtualbox-guest-additions + libgl1, + libhal1 +Suggests: virtualbox-guest-additions, + libasound2, libpulse0 Conflicts: virtualbox, virtualbox-2.0, virtualbox-2.1, virtualbox-2.2, virtualbox-3.0 +XB-Python-Version: ${python:Versions} 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 @@ -98,7 +99,7 @@ Package: virtualbox-ose-dbg Section: debug Architecture: amd64 i386 lpia Depends: ${misc:Depends}, - virtualbox-ose (= ${binary:Version}) | virtualbox-guest-utils (= ${binary:Version}) + virtualbox-ose (= ${binary:Version}) | virtualbox-ose-guest-utils (= ${binary:Version}) 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 @@ -114,6 +115,7 @@ Depends: ${misc:Depends}, dkms, libc6-dev, linux-headers-generic | linux-headers +Recommends: virtualbox-ose Conflicts: virtualbox, virtualbox-2.0, virtualbox-2.1, virtualbox-2.2, virtualbox-3.0 Description: x86 virtualization solution - kernel module source VirtualBox is a free x86 virtualization solution allowing a wide range @@ -131,6 +133,7 @@ Depends: ${misc:Depends}, dkms, libc6-dev, linux-headers-generic | linux-headers +Recommends: virtualbox-ose-guest-utils 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 @@ -150,7 +153,7 @@ Depends: ${shlibs:Depends}, pciutils Provides: ${xviddriver:Provides}, ${xinpdriver:Provides} -Replaces: virtualbox-ose-guest-utils (<< 2.2.0-dfsg-1) +Replaces: virtualbox-ose-guest-utils (<< 2.2.0-dfsg-1) 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 diff --git a/debian/lintian/virtualbox-ose b/debian/lintian/virtualbox-ose index f4d1315..27b67e0 100644 --- a/debian/lintian/virtualbox-ose +++ b/debian/lintian/virtualbox-ose @@ -1,4 +1,29 @@ +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxBFE.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDD.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDD2.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDDU.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxGuestPropSvc.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxHeadless.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxKeyboard.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxNetDHCP.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxOGLhostcrutil.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxOGLhosterrorspu.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxOGLrenderspu.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxPython.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxPython2_5.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM32.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM64.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxRT.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSDL.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSettings.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedClipboard.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedCrOpenGL.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedFolders.so virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVMM.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxXPCOMC.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxC.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxSVCM.so virtualbox-ose: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDD2GC.gc virtualbox-ose: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDD2R0.r0 virtualbox-ose: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDDGC.gc diff --git a/debian/lintian/virtualbox-ose-qt b/debian/lintian/virtualbox-ose-qt index 21ba5b9..ff53799 100644 --- a/debian/lintian/virtualbox-ose-qt +++ b/debian/lintian/virtualbox-ose-qt @@ -1 +1,2 @@ virtualbox-ose-qt: setuid-gid-binary usr/lib/virtualbox/VirtualBox 6755 root/root +virtualbox-ose-qt: shlib-with-non-pic-code usr/lib/virtualbox/VirtualBox.so diff --git a/debian/patches/00list b/debian/patches/00list index 20c0cd8..03e89c7 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,18 +1,15 @@ 01-build-arch.dpatch -02-config-kmk.dpatch -03-localconf-kmk.dpatch 04-vboxdrv-references.dpatch 06-xsession.dpatch 07-vboxnetflt-reference.dpatch -09-initscript.dpatch 12-make-module.dpatch 13-module-mismatch.dpatch -14-disable-registration-request.dpatch 15-wined3d-guest-addition.dpatch 16-no-update.dpatch 17-disable-help-contents.dpatch 18-xorg-1.6.dpatch 20-hide-help-buttons.dpatch 21-dont-strip-x11-drivers.dpatch +22-no-static-libstdcpp.dpatch u01-disable-update-action.dpatch u02-lp-integration.dpatch diff --git a/debian/patches/01-build-arch.dpatch b/debian/patches/01-build-arch.dpatch index 5a99727..60b88e7 100755 --- a/debian/patches/01-build-arch.dpatch +++ b/debian/patches/01-build-arch.dpatch @@ -4,11 +4,10 @@ ## DP: Correctly check build architecture. @DPATCH@ - -diff -Naurp virtualbox-ose-3.0.0-dfsg.orig/configure virtualbox-ose-3.0.0-dfsg/configure ---- virtualbox-ose-3.0.0-dfsg.orig/configure 2009-07-01 09:55:34.000000000 +0200 -+++ virtualbox-ose-3.0.0-dfsg/configure 2009-07-01 09:57:03.000000000 +0200 -@@ -310,7 +310,7 @@ +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 @@ check_environment() { test_header environment diff --git a/debian/patches/02-config-kmk.dpatch b/debian/patches/02-config-kmk.dpatch deleted file mode 100755 index 6cde110..0000000 --- a/debian/patches/02-config-kmk.dpatch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 02-config-kmk.dpatch by Patrick Winnertz -## -## DP: Some patches for Config.kmk to build with the debian tools -## DP: XPCOM setup for all but win32. - -@DPATCH@ - -diff -Naurp virtualbox-ose-1.6.2-dfsg.orig/Config.kmk virtualbox-ose-1.6.2-dfsg/Config.kmk ---- virtualbox-ose-1.6.2-dfsg.orig/Config.kmk 2008-05-31 17:22:52.000000000 +0000 -+++ virtualbox-ose-1.6.2-dfsg/Config.kmk 2008-06-09 17:40:09.000000000 +0000 -@@ -969,7 +969,7 @@ VBOX_PATH_DIFX ?= $(PATH_DEVTOOLS)/win.$ - # We need to export YASM for OSE, but since it was converted to .zip we need to - # allow for the location used by the zip to be properly cleaned up first. - if1of ($(KBUILD_HOST).$(KBUILD_HOST_ARCH), win.x86 linux.x86 solaris.x86) -- PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin -+ PATH_TOOL_YASM ?= /usr/bin - endif - - # XPCOM setup for all but win32. diff --git a/debian/patches/03-localconf-kmk.dpatch b/debian/patches/03-localconf-kmk.dpatch deleted file mode 100755 index 9e1f0c7..0000000 --- a/debian/patches/03-localconf-kmk.dpatch +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 03-localconf-kmk.dpatch by Patrick Winnertz -## expanded my Michael Meskes to set paths -## -## DP: Don't build the module for testing and don't build any guest additions. -## DP: both depends on kernel headers, which are not available atm. - -@DPATCH@ - -diff -Naurp virtualbox-ose-2.0.4-dfsg.orig/LocalConfig.kmk virtualbox-ose-2.0.4-dfsg/LocalConfig.kmk ---- virtualbox-ose-2.0.4-dfsg.orig/LocalConfig.kmk 2008-11-23 11:52:44.000000000 +0100 -+++ virtualbox-ose-2.0.4-dfsg/LocalConfig.kmk 2008-11-23 11:53:14.000000000 +0100 -@@ -0,0 +1,15 @@ -+VBOX_WITH_ADDITION_DRIVERS = -+VBOX_ADDITIONS_LINUX_ONLY = -+VBOX_WITH_INSTALLER = 1 -+VBOX_WITH_LINUX_ADDITIONS = 1 -+VBOX_WITH_X11_ADDITIONS = 1 -+VBOX_WITH_TESTCASES = -+VBOX_WITH_TESTSUITE = -+VBOX_WITH_USB = -+VBOX_WITH_CROGL= 1 -+VBOX_WITH_ORIGIN := -+VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox -+VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) -+VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) -+VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox -+VBOX_PATH_APP_DOCS = $(VBOX_PATH_PACKAGE_DOCS) diff --git a/debian/patches/04-vboxdrv-references.dpatch b/debian/patches/04-vboxdrv-references.dpatch index 5c3e370..7b5828f 100755 --- a/debian/patches/04-vboxdrv-references.dpatch +++ b/debian/patches/04-vboxdrv-references.dpatch @@ -5,11 +5,28 @@ ## DP: virtualbox-ose-source (DKMS). @DPATCH@ - -diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/VM.cpp ---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/VMM/VM.cpp 2008-04-30 14:05:26.000000000 +0000 -+++ virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/VM.cpp 2008-05-09 09:25:54.000000000 +0000 -@@ -257,10 +257,8 @@ VMR3DECL(int) VMR3Create(PFNVMATERROR +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/src/main.cpp virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-10-07 13:42:18.215472116 +0200 +@@ -71,13 +71,7 @@ + ); + + QString g_QStrHintLinuxNoDriver = QApplication::tr( +- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " +- "there is a permission problem with /dev/vboxdrv. Re-setup the kernel " +- "module by executing

" +- " '/etc/init.d/vboxdrv setup'

" +- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " +- "package first. This package keeps track of Linux kernel changes and " +- "recompiles the vboxdrv kernel module if necessary." ++ "Please install the virtualbox-ose-source package." + ); + + QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/VMM/VM.cpp virtualbox-ose-3.0.8-dfsg/src/VBox/VMM/VM.cpp +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/VMM/VM.cpp 2009-10-07 11:27:14.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/VMM/VM.cpp 2009-10-07 13:42:18.215472116 +0200 +@@ -332,10 +332,8 @@ { case VERR_VM_DRIVER_LOAD_ERROR: #ifdef RT_OS_LINUX @@ -22,8 +39,8 @@ diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1. #else pszError = N_("VirtualBox kernel driver not loaded"); #endif -@@ -280,10 +278,8 @@ VMR3DECL(int) VMR3Create(PFNVMATERROR - break; +@@ -374,10 +372,8 @@ + case VERR_INVALID_HANDLE: /** @todo track down and fix this error. */ case VERR_VM_DRIVER_NOT_INSTALLED: #ifdef RT_OS_LINUX - pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module " @@ -35,20 +52,3 @@ diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1. #else pszError = N_("VirtualBox kernel driver not installed"); #endif ---- virtualbox-ose/src/VBox/Frontends/VirtualBox/src/main.cpp.orig 2009-04-24 15:19:59.000000000 +0200 -+++ virtualbox-ose/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-04-24 15:21:15.000000000 +0200 -@@ -71,13 +71,7 @@ - ); - - QString g_QStrHintLinuxNoDriver = QApplication::tr( -- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " -- "there is a permission problem with /dev/vboxdrv. Re-setup the kernel " -- "module by executing

" -- " '/etc/init.d/vboxdrv setup'

" -- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " -- "package first. This package keeps track of Linux kernel changes and " -- "recompiles the vboxdrv kernel module if necessary." -+ "Please install the virtualbox-ose-source package." - ); - - QString g_QStrHintOtherNoDriver = QApplication::tr( diff --git a/debian/patches/06-xsession.dpatch b/debian/patches/06-xsession.dpatch index 3abdb8d..44eb1fa 100755 --- a/debian/patches/06-xsession.dpatch +++ b/debian/patches/06-xsession.dpatch @@ -4,9 +4,9 @@ ## DP: Create a start script in Xsession.d. @DPATCH@ - ---- virtualbox-ose-2.2.0-dfsg/src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2009-04-09 11:01:44.000000000 +0200 -+++ virtualbox-ose-2.2.0-dfsg/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2009-04-09 11:01:59.000000000 +0200 +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 @@ -17,6 +17,6 @@ # additional information or have any questions. # diff --git a/debian/patches/07-vboxnetflt-reference.dpatch b/debian/patches/07-vboxnetflt-reference.dpatch index 34c0187..e51bf7d 100755 --- a/debian/patches/07-vboxnetflt-reference.dpatch +++ b/debian/patches/07-vboxnetflt-reference.dpatch @@ -5,10 +5,10 @@ ## DP: Made error message tell about missing vboxnetflt module @DPATCH@ - ---- virtualbox-ose/src/VBox/Devices/Network/DrvIntNet.cpp.orig 2009-04-09 13:16:16.000000000 +0200 -+++ virtualbox-ose/src/VBox/Devices/Network/DrvIntNet.cpp 2009-04-09 13:18:37.000000000 +0200 -@@ -1035,7 +1035,7 @@ +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Devices/Network/DrvIntNet.cpp virtualbox-ose-3.0.8-dfsg/src/VBox/Devices/Network/DrvIntNet.cpp +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Devices/Network/DrvIntNet.cpp 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Devices/Network/DrvIntNet.cpp 2009-10-07 13:43:15.622989484 +0200 +@@ -1049,7 +1049,7 @@ rc = pDrvIns->pDrvHlp->pfnSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_OPEN, &OpenReq, sizeof(OpenReq)); if (RT_FAILURE(rc)) return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, diff --git a/debian/patches/09-initscript.dpatch b/debian/patches/09-initscript.dpatch deleted file mode 100755 index 2ad8670..0000000 --- a/debian/patches/09-initscript.dpatch +++ /dev/null @@ -1,155 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 09-initscript.dpatch by Michael Meskes -## -## DP: Several initscript changes. - -@DPATCH@ - -diff -Naurp virtualbox-ose-3.0.4-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in virtualbox-ose-3.0.4-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in ---- virtualbox-ose-3.0.4-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in 2009-08-04 19:18:41.000000000 +0200 -+++ virtualbox-ose-3.0.4-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in 2009-08-07 11:36:12.843146051 +0200 -@@ -19,8 +19,8 @@ - # - ### BEGIN INIT INFO - # Provides: vboxdrv --# Required-Start: $syslog --# Required-Stop: -+# Required-Start: $remote_fs $network -+# Required-Stop: $remote_fs - # Default-Start: 2 3 4 5 - # Default-Stop: 0 1 6 - # Short-Description: VirtualBox Linux kernel module -@@ -32,7 +32,9 @@ GROUPNAME=vboxusers - LOG="/var/log/vbox-install.log" - NOLSB=%NOLSB% - --[ -f /lib/lsb/init-functions ] || NOLSB=yes -+# Include virtualbox-ose defaults if available -+[ -f /etc/default/virtualbox-ose ] && . /etc/default/virtualbox-ose -+[ -f /lib/lsb/init-functions ] && NOLSB= - [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg - - if [ -n "$INSTALL_DIR" ]; then -@@ -66,11 +68,14 @@ if [ -z "$NOLSB" ]; then - log_failure_msg "$1" - } - succ_msg() { -- log_success_msg " done." -+ log_end_msg 0 - } - begin_msg() { - log_daemon_msg "$@" - } -+ prog_msg() { -+ log_progress_msg "$1" -+ } - else - if [ "$system" = "redhat" ]; then - . /etc/init.d/functions -@@ -148,8 +153,9 @@ running() - - start() - { -- begin_msg "Starting VirtualBox kernel module" -+ begin_msg "Starting VirtualBox kernel modules" - if ! running vboxdrv; then -+ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then - if ! rm -f $DEVICE; then - failure "Cannot remove $DEVICE" - fi -@@ -158,9 +164,19 @@ start() - echo 2 > /proc/sys/kernel/perf_counter_paranoid - fi - if ! modprobe vboxdrv > /dev/null 2>&1; then -+ if ! find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then -+ failure "No suitable module for running kernel found" -+ else - failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why" -- fi -- sleep .2 -+ fi -+ else -+ prog_msg vboxdrv -+ fi -+ else -+ succ_msg -+ return -+ fi -+ sleep .2 - fi - # ensure the character special exists - if [ ! -c $DEVICE ]; then -@@ -189,31 +205,51 @@ start() - rmmod vboxdrv 2>/dev/null - failure "Cannot change owner $GROUPNAME for device $DEVICE" - fi -- if ! modprobe vboxnetflt > /dev/null 2>&1; then -- failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" -- fi -- if ! modprobe vboxnetadp > /dev/null 2>&1; then -- failure "modprobe vboxnetadp failed. Please use 'dmesg' to find out why" -+ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then -+ if ! modprobe vboxnetflt > /dev/null 2>&1; then -+ if ! find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then -+ failure "No suitable vboxnetflt module for running kernel found" -+ else -+ failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" -+ fi -+ else -+ prog_msg vboxnetflt -+ fi -+ if ! modprobe vboxnetadp > /dev/null 2>&1; then -+ if ! find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then -+ failure "No suitable vboxnetadp module for running kernel found" -+ else -+ failure "modprobe vboxnetadp failed. Please use 'dmesg' to find out why" -+ fi -+ else -+ prog_msg vboxnetadp -+ fi - fi - succ_msg - } - - stop() - { -- begin_msg "Stopping VirtualBox kernel module" -+ begin_msg "Stopping VirtualBox kernel modules" - if running vboxnetadp; then - if ! rmmod vboxnetadp 2>/dev/null; then - failure "Cannot unload module vboxnetadp" -+ else -+ prog_msg vboxnetadp - fi - fi - if running vboxdrv; then - if running vboxnetflt; then - if ! rmmod vboxnetflt 2>/dev/null; then - failure "Cannot unload module vboxnetflt" -+ else -+ prog_msg vboxnetflt - fi - fi - if ! rmmod vboxdrv 2>/dev/null; then - failure "Cannot unload module vboxdrv" -+ else -+ prog_msg vboxdrv - fi - if ! rm -f $DEVICE; then - failure "Cannot unlink $DEVICE" -@@ -356,14 +392,11 @@ force-reload) - stop - start - ;; --setup) -- setup -- ;; - status) - dmnstatus - ;; - *) -- echo "Usage: $0 {start|stop|stop_vms|restart|force-reload|status|setup}" -+ echo "Usage: $0 {start|stop|stop_vms|restart|force-reload|status}" - exit 1 - esac - diff --git a/debian/patches/12-make-module.dpatch b/debian/patches/12-make-module.dpatch index 1f5659d..cda6194 100755 --- a/debian/patches/12-make-module.dpatch +++ b/debian/patches/12-make-module.dpatch @@ -4,10 +4,9 @@ ## DP: Fix ARCH setting in modules Makefiles @DPATCH@ - -diff -Naurp virtualbox-ose-3.0.0-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module virtualbox-ose-3.0.0-dfsg/src/VBox/Additions/linux/module/Makefile.module ---- virtualbox-ose-3.0.0-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module 2009-07-01 11:30:49.000000000 +0200 -+++ virtualbox-ose-3.0.0-dfsg/src/VBox/Additions/linux/module/Makefile.module 2009-07-01 11:30:40.000000000 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/linux/module/Makefile.module virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/linux/module/Makefile.module +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/linux/module/Makefile.module 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/linux/module/Makefile.module 2009-10-07 13:43:30.705472033 +0200 @@ -37,9 +37,21 @@ BUILD_TARGET_ARCH := amd64 else @@ -32,9 +31,9 @@ diff -Naurp virtualbox-ose-3.0.0-dfsg.orig/src/VBox/Additions/linux/module/Makef endif endif else -diff -Naurp virtualbox-ose-3.0.0-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-3.0.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module ---- virtualbox-ose-3.0.0-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module 2009-07-01 11:35:37.000000000 +0200 -+++ virtualbox-ose-3.0.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module 2009-07-01 11:36:21.000000000 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/linux/sharedfolders/Makefile.module 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module 2009-10-07 13:43:30.705472033 +0200 @@ -37,9 +37,21 @@ BUILD_TARGET_ARCH := amd64 else @@ -59,9 +58,9 @@ diff -Naurp virtualbox-ose-3.0.0-dfsg.orig/src/VBox/Additions/linux/sharedfolder endif endif else -diff -Naurp virtualbox-ose-2.2.4-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-2.2.4-dfsg/src/VBox/HostDrivers/Support/linux/Makefile ---- virtualbox-ose-2.2.4-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile 2009-06-04 13:30:14.000000000 +0200 -+++ virtualbox-ose-2.2.4-dfsg/src/VBox/HostDrivers/Support/linux/Makefile 2009-06-04 13:34:46.000000000 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/Support/linux/Makefile +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/Support/linux/Makefile 2009-10-07 11:27:14.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/Support/linux/Makefile 2009-10-07 13:43:30.705472033 +0200 @@ -48,9 +48,21 @@ BUILD_TARGET_ARCH := amd64 else @@ -86,10 +85,10 @@ diff -Naurp virtualbox-ose-2.2.4-dfsg.orig/src/VBox/HostDrivers/Support/linux/Ma endif endif else -diff -Naurp virtualbox-ose-2.2.4-dfsg.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile virtualbox-ose-2.2.4-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile ---- virtualbox-ose-2.2.4-dfsg.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2009-06-04 13:30:14.000000000 +0200 -+++ virtualbox-ose-2.2.4-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2009-06-04 13:34:46.000000000 +0200 -@@ -48,9 +48,21 @@ +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2009-10-07 11:27:14.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2009-10-07 13:43:30.705472033 +0200 +@@ -39,9 +39,21 @@ BUILD_TARGET_ARCH := amd64 else ifeq ($(ARCH),i386) @@ -113,9 +112,9 @@ diff -Naurp virtualbox-ose-2.2.4-dfsg.orig/src/VBox/HostDrivers/VBoxNetFlt/linux endif endif else -diff -Naurp virtualbox-ose-3.0.0-dfsg.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile virtualbox-ose-3.0.0-dfsg/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile ---- virtualbox-ose-3.0.0-dfsg.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2009-07-01 11:37:57.000000000 +0200 -+++ virtualbox-ose-3.0.0-dfsg/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2009-07-01 11:38:20.000000000 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2009-10-07 11:27:14.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2009-10-07 13:43:30.705472033 +0200 @@ -39,9 +39,21 @@ BUILD_TARGET_ARCH := amd64 else diff --git a/debian/patches/13-module-mismatch.dpatch b/debian/patches/13-module-mismatch.dpatch index 339e599..be3fbfa 100755 --- a/debian/patches/13-module-mismatch.dpatch +++ b/debian/patches/13-module-mismatch.dpatch @@ -4,11 +4,10 @@ ## DP: Adjusts failure message with Ubuntu specific solution. @DPATCH@ - -diff -Naurp virtualbox-ose-1.6.2-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1.6.2-dfsg/src/VBox/VMM/VM.cpp ---- virtualbox-ose-1.6.2-dfsg.orig/src/VBox/VMM/VM.cpp 2008-05-14 15:09:39.000000000 +0000 -+++ virtualbox-ose-1.6.2-dfsg/src/VBox/VMM/VM.cpp 2008-06-23 16:10:30.000000000 +0000 -@@ -293,9 +293,11 @@ VMR3DECL(int) VMR3Create(PFNVMATERROR +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/VMM/VM.cpp virtualbox-ose-3.0.8-dfsg/src/VBox/VMM/VM.cpp +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/VMM/VM.cpp 2009-10-07 13:43:36.542988533 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/VMM/VM.cpp 2009-10-07 13:43:37.342988388 +0200 +@@ -383,9 +383,11 @@ break; case VERR_VERSION_MISMATCH: case VERR_VM_DRIVER_VERSION_MISMATCH: diff --git a/debian/patches/14-disable-registration-request.dpatch b/debian/patches/14-disable-registration-request.dpatch deleted file mode 100755 index 6724b34..0000000 --- a/debian/patches/14-disable-registration-request.dpatch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 14-disable-registration-request.dpatch by Daniel Hahler -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Disable the registration request at startup (LP: #285684) -## DP: This is probably not the right way to do it, but I have found no -## DP: better way to undefine VBOX_WITH_REGISTRATION_REQUEST - -@DPATCH@ -diff -urNad virtualbox-ose-2.2.0-dfsg~/src/VBox/Frontends/VirtualBox/Makefile.kmk virtualbox-ose-2.2.0-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk ---- virtualbox-ose-2.2.0-dfsg~/src/VBox/Frontends/VirtualBox/Makefile.kmk 2009-04-09 11:15:55.000000000 +0200 -+++ virtualbox-ose-2.2.0-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk 2009-04-09 11:17:00.000000000 +0200 -@@ -32,7 +32,7 @@ VBOX_WITH_REGISTRATION := 1 - - # Ask the user to register at Sun. If this setting is disabled the user can - # still register using the menu if desired. --VBOX_WITH_REGISTRATION_REQUEST := 1 -+#VBOX_WITH_REGISTRATION_REQUEST := 1 - - # Show the update notifier dialog during startup. If this setting is disabled - # the user can still update using the menu if desired. diff --git a/debian/patches/15-wined3d-guest-addition.dpatch b/debian/patches/15-wined3d-guest-addition.dpatch index 2f50bc8..643b1f9 100755 --- a/debian/patches/15-wined3d-guest-addition.dpatch +++ b/debian/patches/15-wined3d-guest-addition.dpatch @@ -5,11 +5,10 @@ ## DP: Add WineD3D guest additions @DPATCH@ - -diff -ur virtualbox-ose-2.1.2-dfsg/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h virtualbox-ose-2.1.2-dfsg.new/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h ---- virtualbox-ose-2.1.2-dfsg/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h 2009-01-14 21:00:46.000000000 +0100 -+++ virtualbox-ose-2.1.2-dfsg.new/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h 2009-02-03 23:25:14.000000000 +0100 -@@ -191,6 +191,7 @@ +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h 2009-10-07 13:43:54.515463037 +0200 +@@ -211,6 +211,7 @@ void devicesSwitchVrdp (bool); void devicesOpenSFDialog(); void devicesInstallGuestAdditions(); @@ -17,7 +16,7 @@ diff -ur virtualbox-ose-2.1.2-dfsg/src/VBox/Frontends/VirtualBox/include/VBoxCon void prepareFloppyMenu(); void prepareDVDMenu(); -@@ -265,6 +266,7 @@ +@@ -289,6 +290,7 @@ QAction *mDevicesSwitchVrdpAction; QAction *mDevicesSFDialogAction; QAction *mDevicesInstallGuestToolsAction; @@ -25,12 +24,12 @@ diff -ur virtualbox-ose-2.1.2-dfsg/src/VBox/Frontends/VirtualBox/include/VBoxCon #ifdef VBOX_WITH_DEBUGGER_GUI /* Debugger actions */ -diff -ur virtualbox-ose-2.1.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp virtualbox-ose-2.1.2-dfsg.new/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp ---- virtualbox-ose-2.1.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp 2009-01-21 09:41:58.000000000 +0100 -+++ virtualbox-ose-2.1.2-dfsg.new/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp 2009-02-04 02:10:36.000000000 +0100 -@@ -357,6 +357,10 @@ - mDevicesInstallGuestToolsAction->setIcon (VBoxGlobal::iconSet (":/guesttools_16px.png", - ":/guesttools_disabled_16px.png")); +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp 2009-10-07 13:43:54.515463037 +0200 +@@ -381,6 +381,10 @@ + VBoxGlobal::iconSet (":/guesttools_16px.png", + ":/guesttools_disabled_16px.png")); + mDevicesInstallWineD3DAction = new QAction (mRunningActions); + mDevicesInstallWineD3DAction->setIcon (VBoxGlobal::iconSet (":/guesttools_16px.png", @@ -39,7 +38,7 @@ diff -ur virtualbox-ose-2.1.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsole #ifdef VBOX_WITH_DEBUGGER_GUI if (vboxGlobal().isDebuggerEnabled()) { -@@ -452,6 +456,7 @@ +@@ -478,6 +482,7 @@ mDevicesVRDPMenuSeparator = mDevicesMenu->addSeparator(); mDevicesMenu->addAction (mDevicesInstallGuestToolsAction); @@ -47,7 +46,7 @@ diff -ur virtualbox-ose-2.1.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsole /* reset the "context menu" flag */ mDevicesMountFloppyMenu->menuAction()->setData (false); -@@ -610,6 +615,7 @@ +@@ -652,6 +657,7 @@ connect (mDevicesSwitchVrdpAction, SIGNAL(toggled (bool)), this, SLOT(devicesSwitchVrdp (bool))); connect (mDevicesSFDialogAction, SIGNAL(triggered()), this, SLOT(devicesOpenSFDialog())); connect (mDevicesInstallGuestToolsAction, SIGNAL(triggered()), this, SLOT(devicesInstallGuestAdditions())); @@ -55,7 +54,7 @@ diff -ur virtualbox-ose-2.1.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsole connect (mDevicesMountFloppyMenu, SIGNAL(aboutToShow()), this, SLOT(prepareFloppyMenu())); -@@ -1680,6 +1686,10 @@ +@@ -1744,6 +1750,10 @@ mDevicesInstallGuestToolsAction->setStatusTip ( tr ("Mount the Guest Additions installation image")); @@ -66,7 +65,7 @@ diff -ur virtualbox-ose-2.1.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsole #ifdef VBOX_WITH_DEBUGGER_GUI /* Debug actions */ -@@ -2855,6 +2865,55 @@ +@@ -2994,6 +3004,55 @@ } } diff --git a/debian/patches/16-no-update.dpatch b/debian/patches/16-no-update.dpatch index 7cadde4..45c2e7c 100755 --- a/debian/patches/16-no-update.dpatch +++ b/debian/patches/16-no-update.dpatch @@ -5,10 +5,10 @@ ## DP: Do not check for updates @DPATCH@ - ---- virtualbox-ose-2.2.0-dfsg/src/VBox/Main/VirtualBoxImpl.cpp.orig 2009-04-08 13:47:26.000000000 +0200 -+++ virtualbox-ose-2.2.0-dfsg/src/VBox/Main/VirtualBoxImpl.cpp 2009-04-08 14:20:41.000000000 +0200 -@@ -85,6 +85,9 @@ +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Main/VirtualBoxImpl.cpp virtualbox-ose-3.0.8-dfsg/src/VBox/Main/VirtualBoxImpl.cpp +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Main/VirtualBoxImpl.cpp 2009-10-07 11:27:14.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Main/VirtualBoxImpl.cpp 2009-10-07 13:44:02.835497353 +0200 +@@ -90,6 +90,9 @@ "" RTFILE_LINEFEED " "RTFILE_LINEFEED @@ -17,15 +17,4 @@ + " "RTFILE_LINEFEED " "RTFILE_LINEFEED " "RTFILE_LINEFEED - " "RTFILE_LINEFEED ---- virtualbox-ose-2.2.0-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk.orig2 2009-04-09 11:19:52.000000000 +0200 -+++ virtualbox-ose-2.2.0-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk 2009-04-09 11:20:03.000000000 +0200 -@@ -36,7 +36,7 @@ VBOX_WITH_REGISTRATION := 1 - - # Show the update notifier dialog during startup. If this setting is disabled - # the user can still update using the menu if desired. --VBOX_WITH_UPDATE_REQUEST := 1 -+#VBOX_WITH_UPDATE_REQUEST := 1 - - - # + " "RTFILE_LINEFEED diff --git a/debian/patches/17-disable-help-contents.dpatch b/debian/patches/17-disable-help-contents.dpatch index 2e55156..b7500f8 100755 --- a/debian/patches/17-disable-help-contents.dpatch +++ b/debian/patches/17-disable-help-contents.dpatch @@ -5,9 +5,9 @@ ## DP: Disable Help>Contents... menu item (LP: #323988) @DPATCH@ -diff -urNad virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp virtualbox-ose-2.2.2-dfsg.patch/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp ---- virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2009-04-29 09:12:58.000000000 +0200 -+++ virtualbox-ose-2.2.2-dfsg.patch/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2009-05-16 16:25:28.503521210 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2009-10-07 13:44:10.275472897 +0200 @@ -33,6 +33,7 @@ contentsAction = new QAction (aParent); diff --git a/debian/patches/18-xorg-1.6.dpatch b/debian/patches/18-xorg-1.6.dpatch index 10ec1bd..308da47 100755 --- a/debian/patches/18-xorg-1.6.dpatch +++ b/debian/patches/18-xorg-1.6.dpatch @@ -5,9 +5,38 @@ ## DP: Use XServer-Xorg 1.6 @DPATCH@ - ---- virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.org 2009-09-09 20:07:47.000000000 +0200 -+++ virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2009-09-10 19:48:05.000000000 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/common/crOpenGL/Makefile.kmk virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/common/crOpenGL/Makefile.kmk +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2009-10-07 13:44:19.145463290 +0200 +@@ -69,21 +69,16 @@ + VBoxOGL_INCS = . + if1of ($(KBUILD_TARGET),linux solaris) + VBoxOGL_INCS += \ +- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ +- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ +- $(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 \ ++ /usr/include/x11 \ ++ /usr/include/xorg \ ++ /usr/include/pixman-1 \ + $(VBOX_PATH_MESA_SOURCE) \ + $(VBOX_PATH_MESA_SOURCE)/include \ + $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \ + $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \ + $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \ + $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common \ +- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.5 ++ /usr/include/drm + VBoxOGL_DEFS += VBOX_NO_NATIVEGL + endif + ifdef VBoxOGL_DRI +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/x11/vboxmouse/Makefile.kmk virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2009-10-07 13:44:19.145463290 +0200 @@ -27,7 +27,6 @@ # vboxmouse_drv # @@ -80,8 +109,9 @@ vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local ---- virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.org 2009-09-09 20:07:50.000000000 +0200 -+++ virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2009-09-10 19:51:47.000000000 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/x11/vboxvideo/Makefile.kmk virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2009-10-07 13:44:19.145463290 +0200 @@ -26,7 +26,6 @@ # vboxvideo_drv # @@ -169,31 +199,3 @@ vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS) ---- virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/common/crOpenGL/Makefile.kmk.org 2009-09-09 20:07:35.000000000 +0200 -+++ virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2009-09-10 23:04:18.000000000 +0200 -@@ -69,21 +69,16 @@ - VBoxOGL_INCS = . - if1of ($(KBUILD_TARGET),linux solaris) - VBoxOGL_INCS += \ -- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ -- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ -- $(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 \ -+ /usr/include/x11 \ -+ /usr/include/xorg \ -+ /usr/include/pixman-1 \ - $(VBOX_PATH_MESA_SOURCE) \ - $(VBOX_PATH_MESA_SOURCE)/include \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common \ -- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.5 -+ /usr/include/drm - VBoxOGL_DEFS += VBOX_NO_NATIVEGL - endif - ifdef VBoxOGL_DRI diff --git a/debian/patches/20-hide-help-buttons.dpatch b/debian/patches/20-hide-help-buttons.dpatch index 2c0c91f..6e21463 100755 --- a/debian/patches/20-hide-help-buttons.dpatch +++ b/debian/patches/20-hide-help-buttons.dpatch @@ -5,10 +5,9 @@ ## DP: Hide useless help buttons in dialogs @DPATCH@ - -diff -Nur virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxCloseVMDlg.ui virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxCloseVMDlg.ui ---- virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxCloseVMDlg.ui 2009-04-29 09:12:58.000000000 +0200 -+++ virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxCloseVMDlg.ui 2009-05-30 00:17:42.357421009 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/ui/VBoxCloseVMDlg.ui virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxCloseVMDlg.ui +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/ui/VBoxCloseVMDlg.ui 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxCloseVMDlg.ui 2009-10-07 13:44:29.935463062 +0200 @@ -220,7 +220,7 @@ @@ -18,9 +17,9 @@ diff -Nur virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxCl -diff -Nur virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxMediaManagerDlg.ui virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxMediaManagerDlg.ui ---- virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxMediaManagerDlg.ui 2009-04-29 09:12:58.000000000 +0200 -+++ virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxMediaManagerDlg.ui 2009-05-30 00:18:11.877419434 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/ui/VBoxMediaManagerDlg.ui virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxMediaManagerDlg.ui +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/ui/VBoxMediaManagerDlg.ui 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxMediaManagerDlg.ui 2009-10-07 13:44:29.935463062 +0200 @@ -348,7 +348,7 @@ @@ -30,9 +29,9 @@ diff -Nur virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxMe -diff -Nur virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxSettingsDialog.ui virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxSettingsDialog.ui ---- virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxSettingsDialog.ui 2009-04-29 09:12:58.000000000 +0200 -+++ virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxSettingsDialog.ui 2009-05-30 00:18:06.749419816 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/ui/VBoxSettingsDialog.ui virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxSettingsDialog.ui +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/ui/VBoxSettingsDialog.ui 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxSettingsDialog.ui 2009-10-07 13:44:29.935463062 +0200 @@ -145,7 +145,7 @@ @@ -42,9 +41,9 @@ diff -Nur virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxSe -diff -Nur virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxSnapshotDetailsDlg.ui virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxSnapshotDetailsDlg.ui ---- virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxSnapshotDetailsDlg.ui 2009-04-29 09:12:58.000000000 +0200 -+++ virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxSnapshotDetailsDlg.ui 2009-05-30 00:18:01.725420541 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/ui/VBoxSnapshotDetailsDlg.ui virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxSnapshotDetailsDlg.ui +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/ui/VBoxSnapshotDetailsDlg.ui 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxSnapshotDetailsDlg.ui 2009-10-07 13:44:29.935463062 +0200 @@ -126,7 +126,7 @@ @@ -54,9 +53,9 @@ diff -Nur virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxSn -diff -Nur virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxTakeSnapshotDlg.ui virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxTakeSnapshotDlg.ui ---- virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxTakeSnapshotDlg.ui 2009-04-29 09:12:58.000000000 +0200 -+++ virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxTakeSnapshotDlg.ui 2009-05-30 00:17:57.001419921 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/ui/VBoxTakeSnapshotDlg.ui virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxTakeSnapshotDlg.ui +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/ui/VBoxTakeSnapshotDlg.ui 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxTakeSnapshotDlg.ui 2009-10-07 13:44:29.935463062 +0200 @@ -114,7 +114,7 @@ @@ -66,9 +65,9 @@ diff -Nur virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxTa -diff -Nur virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxVMLogViewer.ui virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxVMLogViewer.ui ---- virtualbox-ose-2.2.2-dfsg.orig/src/VBox/Frontends/VirtualBox/ui/VBoxVMLogViewer.ui 2009-04-29 09:12:58.000000000 +0200 -+++ virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxVMLogViewer.ui 2009-05-30 00:17:49.933420256 +0200 +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/ui/VBoxVMLogViewer.ui virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxVMLogViewer.ui +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/ui/VBoxVMLogViewer.ui 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxVMLogViewer.ui 2009-10-07 13:44:29.935463062 +0200 @@ -44,7 +44,7 @@ diff --git a/debian/patches/21-dont-strip-x11-drivers.dpatch b/debian/patches/21-dont-strip-x11-drivers.dpatch index 85f11d9..5f3e7a4 100755 --- a/debian/patches/21-dont-strip-x11-drivers.dpatch +++ b/debian/patches/21-dont-strip-x11-drivers.dpatch @@ -5,10 +5,10 @@ ## DP: Don't strip debugging symbols from x11 guest drivers @DPATCH@ - ---- virtualbox-ose-3.0.6-dfsg/Config.kmk.org 2009-09-09 20:05:34.000000000 +0200 -+++ virtualbox-ose-3.0.6-dfsg/Config.kmk 2009-09-11 00:42:37.000000000 +0200 -@@ -3539,7 +3539,7 @@ +diff -urNad virtualbox-ose-3.0.8-dfsg~/Config.kmk virtualbox-ose-3.0.8-dfsg/Config.kmk +--- virtualbox-ose-3.0.8-dfsg~/Config.kmk 2009-10-07 13:44:42.642984972 +0200 ++++ virtualbox-ose-3.0.8-dfsg/Config.kmk 2009-10-07 13:44:43.382965537 +0200 +@@ -3543,7 +3543,7 @@ TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64 endif if1of ($(KBUILD_TARGET), linux) diff --git a/debian/patches/22-no-static-libstdcpp.dpatch b/debian/patches/22-no-static-libstdcpp.dpatch new file mode 100755 index 0000000..a6253b6 --- /dev/null +++ b/debian/patches/22-no-static-libstdcpp.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 22-no-static-libstdcpp.dpatch by Lubomir Rintel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Do not include statically linked libstdc++. Not a good idea if we don't need +## DP: to be binary-compatible across exotic distribution. Doesn't work with trunk +## DP: glibc heading towards 2.11 anyways. Static linking is not really supported +## DP: anyways. + +@DPATCH@ +diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/x11/VBoxClient/Makefile.kmk virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/x11/VBoxClient/Makefile.kmk +--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2009-10-07 18:44:29.962989537 +0200 +@@ -62,20 +62,6 @@ + Xext Xmu + endif + +-# +-# Link aginst libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/). +-# (It would've been preferred to avoid features depending on libstdc++, of course...) +-# +-# Actually, this is darn annoying and will *NOT* be tolerated for any new code! +-# +-VBoxClient_LIBPATH += $(PATH_VBoxClient) +-VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a +-VBoxClient_CLEAN = $(PATH_VBoxClient)/libstdc++.a +-$$(PATH_VBoxClient)/libstdc++.a: +- $(call MSG_L1,Forcing static libstdc++) +- $(QUIET)$(MKDIR) -p $(@D) +- $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \ +- || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ + + ifdef VBOX_X11_SEAMLESS_GUEST + if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK) diff --git a/debian/rules b/debian/rules index 0da4787..49b05aa 100755 --- a/debian/rules +++ b/debian/rules @@ -40,25 +40,28 @@ debian/virtualbox-ose.README.Debian: debian/README.Debian.html export LC_ALL=C; lynx -force_html -dump $< | ./debian/lynx-dump-postprocess > $@.tmp mv $@.tmp $@ -env.sh: patch-stamp +out/env.sh: patch-stamp dh_testdir + mkdir -p out ./configure \ + --ose \ + --odir=$(abspath out) \ --with-linux="/usr" \ --disable-kmods \ --enable-webservice build: build-stamp -build-stamp: env.sh +build-stamp: out/env.sh dh_testdir # Building package - . ./env.sh; $(MAKE) \ - BUILD_TYPE=release \ - PATH_OUT=$(abspath out) - # VBoxService - $(MAKE) PATH_OUT=$(abspath out) -C src/VBox/Additions/common/VBoxService/ - # and vboxdrv.sh - $(MAKE) -C src/VBox/Installer/linux $(abspath out/obj/Installer/linux/vboxdrv.sh) \ - PATH_OUT=$(abspath out) + . out/env.sh && $(MAKE) \ + AUTOCFG=$(abspath out/AutoConfig.kmk) \ + LOCALCFG=$(abspath debian/LocalConfig.kmk) \ + PATH_OUT=$(abspath out) \ + TOOL_YASM_AS=yasm \ + VBOX_WITH_REGISTRATION_REQUEST= \ + VBOX_WITH_UPDATE_REQUEST= \ + $(if $(DH_VERBOSE),KBUILD_VERBOSE=2,) touch $@ clean: unpatch @@ -66,8 +69,7 @@ clean: unpatch dh_testroot # Cleaning package rm -rf out - rm -f AutoConfig.kmk configure.log env.sh LocalConfig.kmk - rm -f debian/$(sname).init build-stamp + rm -f build-stamp rm -f debian/virtualbox-ose.README.Debian debian/README.Debian.html rm -f debian/$(gsource).files/dkms.conf rm -f debian/$(psource).install @@ -114,8 +116,6 @@ install: build debian/virtualbox-ose.README.Debian debian/README.Debian.html sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gsource).links.in > debian/$(gsource).links dh_installdirs - # This will get installed into the package by dh_installinit - install -m 644 out/obj/Installer/linux/vboxdrv.sh debian/$(sname).init # Create DKMS control files sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(psource).files/dkms.conf.vboxdrv.in > debian/$(psource)/usr/src/vboxdrv-$(upstreamversion)/dkms.conf @@ -127,6 +127,9 @@ install: build debian/virtualbox-ose.README.Debian debian/README.Debian.html sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(psource).install.in > debian/$(psource).install sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gsource).install.in > debian/$(gsource).install + export VBOX_INSTALL_PATH=/usr/lib/virtualbox && \ + cd out/bin/sdk/installer && \ + python ./vboxapisetup.py install --root $(CURDIR)/debian/virtualbox-ose # Install helper scripts for vbox* interfaces dh_installifupdown -p$(sname) @@ -156,10 +159,11 @@ binary-arch: build install serverabi -chrpath -d debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so -chrpath -d debian/$(uxname)/usr/lib/xorg/modules/input/vboxmouse_drv.so -install -m 755 out/bin/additions/mountvboxsf debian/$(uname)/sbin/mount.vboxsf - -chrpath -d debian/$(uname)/sbin/mount.vboxsf + -chrpath -d debian/$(uname)/sbin/mount.vboxsf -chrpath -d debian/$(uname)/usr/sbin/VBoxService -chrpath -d debian/$(uname)/usr/sbin/VBoxControl -chmod 755 debian/$(sname)/usr/share/virtualbox/VBox.sh + dh_pycentral -pvirtualbox-ose dh_strip -s --dbg-package=$(sname)-dbg dh_link -s dh_compress -s @@ -170,8 +174,7 @@ binary-arch: build install serverabi chmod +s debian/$(sname)/usr/lib/virtualbox/VBoxNetAdpCtl chmod +s debian/$(sxname)/usr/lib/virtualbox/VirtualBox dh_installudev -s - dh_installdebconf -s - dh_installinit -s + dh_installinit -s --no-start dh_installdeb -s dh_shlibdeps -s dh_gencontrol -s diff --git a/debian/virtualbox-ose-guest-source.postinst b/debian/virtualbox-ose-guest-source.postinst index 80bf960..cea73ec 100644 --- a/debian/virtualbox-ose-guest-source.postinst +++ b/debian/virtualbox-ose-guest-source.postinst @@ -9,15 +9,8 @@ CVERSION=`dpkg-query -W -f='${Version}' virtualbox-ose-guest-source | awk -F "-" case "$1" in configure) - #Refresh groups - if [ -x /etc/init.d/udev ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d udev reload || true - else - /etc/init.d/udev reload || true - fi - fi - + #Silently remove existing modules + dkms remove -m virtualbox-ose-guest -v $CVERSION --all > /dev/null 2>&1 || true #Create DKMS modules echo "Adding Module to DKMS build system" dkms add -m virtualbox-ose-guest -v $CVERSION > /dev/null @@ -26,12 +19,5 @@ case "$1" in echo "Installing initial module" dkms install -m virtualbox-ose-guest -v $CVERSION --force > /dev/null echo "Done." - - #restart VBox service due to new modules - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d virtualbox-ose-guest-utils restart || true - else - /etc/init.d/virtualbox-ose-guest-utils restart || true - fi ;; esac diff --git a/debian/virtualbox-ose-guest-source.prerm b/debian/virtualbox-ose-guest-source.prerm index d125be5..614d740 100644 --- a/debian/virtualbox-ose-guest-source.prerm +++ b/debian/virtualbox-ose-guest-source.prerm @@ -10,7 +10,7 @@ CVERSION=`dpkg-query -W -f='${Version}' virtualbox-ose-guest-source | awk -F "-" case "$1" in remove|upgrade|purge) echo "Removing all DKMS Modules" - dkms remove -m virtualbox-ose-guest -v $CVERSION --all > /dev/null + dkms remove -m virtualbox-ose-guest -v $CVERSION --all > /dev/null || true echo "Done." ;; esac diff --git a/debian/virtualbox-ose-guest-utils.init b/debian/virtualbox-ose-guest-utils.init index 4bb0fd5..6fe1445 100644 --- a/debian/virtualbox-ose-guest-utils.init +++ b/debian/virtualbox-ose-guest-utils.init @@ -2,7 +2,7 @@ # (C) 2007 Michael Meskes ### BEGIN INIT INFO -# Provides: vboxadd +# Provides: vboxadd virtualbox-ose-guest-utils # Short-Description: VirtualBox Linux Additions # Required-Start: $remote_fs # Required-Stop: $remote_fs @@ -14,64 +14,118 @@ PATH=$PATH:/bin:/sbin:/usr/sbin . /lib/lsb/init-functions +test -d /usr/share/doc/virtualbox-ose-guest-utils -a -x /usr/sbin/VBoxService || exit 0 + in_virtual_machine() { if [ -z "$(lspci -d 80ee:beef)" ]; then - log_warning_msg 'VirtualBox Additions Disabled, not in a Virtual Machine'; + 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_action_begin_msg 'Starting VirtualBox Additions'; - - # udev should have already handled this module - modprobe --quiet vboxadd - if [ "$?" -ne 0 ]; then - # vboxadd not installed, or has a problem - log_action_msg 'no guest utils available, kernel module not loadable'; - log_end_msg 1 - exit 0 + in_virtual_machine || exit 0 + log_begin_msg "Starting VirtualBox Additions" + + # should already be loaded automatically + if ! running vboxadd; then + if ! modprobe vboxadd > /dev/null 2>&1; then + # vboxadd not installed, or has a problem + log_failure_msg "Guest additions not available, kernel module not loadable (vboxadd)" + log_end_msg 1 + exit 1 + fi fi - # this one is not handled by udev - modprobe --quiet vboxvfs - if [ "$?" -ne 0 ]; then - # vboxvfs not installed, or has a problem - log_action_msg 'shared folders not available, kernel module not loadable'; - log_end_msg 1 - exit 0 + if ! running vboxvfs; then + if ! modprobe vboxvfs > /dev/null 2>&1; then + # vboxvfs not installed, or has a problem + log_failure_msg "Shared folders not available, kernel module not loadable (vboxvfs)" + log_end_msg 1 + exit 1 + fi fi + # Mount all shared folders from /etc/fstab. Normally this is done by some - # other startup script but this requires the vboxdrv kernel module loaded. + # other startup script but this requires the vboxvfs kernel module loaded. mount -a -t vboxsf - start-stop-daemon --start --quiet --exec /usr/sbin/VBoxService - log_end_msg $? + start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/VBoxService + if [ $? -ne 0 ]; then + log_end_msg 1 + exit 1 + fi + + log_end_msg 0 ;; + stop) - in_virtual_machine || exit 0 - log_action_begin_msg 'Stopping VirtualBox Additions'; + in_virtual_machine || exit 0 + log_begin_msg "Stopping VirtualBox Additions" + start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/VBoxService - log_end_msg $? + if [ $? -ne 0 ]; then + log_end_msg 1 + exit 1 + fi + + umount -a -t vboxsf + + if running vboxvfs; then + if ! rmmod vboxvfs 2>/dev/null; then + log_failure_msg "Cannot unload shared folders kernel module (vboxvfs)" + log_end_msg 1 + exit 1 + fi + fi + + if running vboxadd; then + if ! rmmod vboxadd 2>/dev/null; then + log_failure_msg "Cannot unload guest additions kernel module (vboxadd)" + log_end_msg 1 + exit 1 + fi + fi + + log_end_msg 0 ;; + restart|force-reload) - # - # If the "reload" option is implemented, move the "force-reload" - # option to the "reload" entry. If not, "force-reload" is - # just the same as "restart". - # - $0 stop - $0 start + $0 stop && $0 start + ;; + + status) + status=0 + + if ! running vboxadd; then + echo "Guest additions kernel module (vboxadd) not loaded" + status=3 + fi + + if ! running vboxvfs; then + echo "Shared folders kernel module (vboxvfs) not loaded" + status=3 + fi + + if ! pgrep -x VBoxService > /dev/null; then + echo "VBoxService daemon isn't running" + status=3 + fi + + exit $status ;; + *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + echo "Usage: $0 {start|stop|restart|force-reload|status}" exit 1 ;; esac - -exit 0 diff --git a/debian/virtualbox-ose-guest-utils.postinst b/debian/virtualbox-ose-guest-utils.postinst new file mode 100644 index 0000000..6cc5fef --- /dev/null +++ b/debian/virtualbox-ose-guest-utils.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" = configure ] && [ -n "$2" ] && \ + [ -x /usr/share/update-notifier/notify-reboot-required ] && \ + pidof VBoxService > /dev/null; then + /usr/share/update-notifier/notify-reboot-required || true +fi diff --git a/debian/virtualbox-ose-source.postinst b/debian/virtualbox-ose-source.postinst index e1cb475..6ade2b8 100644 --- a/debian/virtualbox-ose-source.postinst +++ b/debian/virtualbox-ose-source.postinst @@ -9,15 +9,10 @@ CVERSION=`dpkg-query -W -f='${Version}' virtualbox-ose-source | awk -F "-" '{pri case "$1" in configure) - #Refresh groups - if [ -x /etc/init.d/udev ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d udev reload || true - else - /etc/init.d/udev reload || true - fi - fi - + #Silently remove existing modules + dkms remove -m vboxdrv -v $CVERSION --all > /dev/null 2>&1 || true + dkms remove -m vboxnetflt -v $CVERSION --all > /dev/null 2>&1 || true + dkms remove -m vboxnetadp -v $CVERSION --all > /dev/null 2>&1 || true #Create DKMS modules echo "Adding modules to DKMS build system" dkms add -m vboxdrv -v $CVERSION > /dev/null @@ -33,17 +28,13 @@ case "$1" in dkms install -m vboxnetadp -v $CVERSION --force > /dev/null echo "Done." - #restart VBox service due to new modules - if [ -f /etc/default/virtualbox-ose ] ; then - . /etc/default/virtualbox-ose - fi - if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then + # only restart if VirtualBox isn't running + if test -x /etc/init.d/virtualbox-ose && ! pidof VBoxSVC > /dev/null; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then invoke-rc.d virtualbox-ose restart || true else /etc/init.d/virtualbox-ose restart || true fi fi - - ;; + ;; esac diff --git a/debian/virtualbox-ose-source.prerm b/debian/virtualbox-ose-source.prerm index b1ad205..7d46343 100644 --- a/debian/virtualbox-ose-source.prerm +++ b/debian/virtualbox-ose-source.prerm @@ -10,9 +10,9 @@ CVERSION=`dpkg-query -W -f='${Version}' virtualbox-ose-source | awk -F "-" '{pri case "$1" in remove|upgrade|purge) echo "Removing all DKMS Modules" - dkms remove -m vboxdrv -v $CVERSION --all > /dev/null - dkms remove -m vboxnetflt -v $CVERSION --all > /dev/null - dkms remove -m vboxnetadp -v $CVERSION --all > /dev/null + dkms remove -m vboxdrv -v $CVERSION --all > /dev/null || true + dkms remove -m vboxnetflt -v $CVERSION --all > /dev/null || true + dkms remove -m vboxnetadp -v $CVERSION --all > /dev/null || true echo "Done." ;; esac diff --git a/debian/virtualbox-ose.default b/debian/virtualbox-ose.default index bbd15bd..fa706b1 100644 --- a/debian/virtualbox-ose.default +++ b/debian/virtualbox-ose.default @@ -9,3 +9,15 @@ # Set this to 1 if you would like the virtualbox-ose modules to be loaded by # the init script. LOAD_VBOXDRV_MODULE=1 + +# SHUTDOWN_USERS="foo bar" +# check for running VMs of user 'foo' and user 'bar' +# 'all' checks for all active users +# SHUTDOWN=poweroff +# SHUTDOWN=acpibutton +# SHUTDOWN=savestate +# select one of these shutdown methods for running VMs +# acpibutton and savestate causes the init script to wait +# 30 seconds for the VMs to shutdown +SHUTDOWN_USERS="" +SHUTDOWN=poweroff diff --git a/debian/virtualbox-ose.dirs b/debian/virtualbox-ose.dirs index d7be74c..2b73dbd 100644 --- a/debian/virtualbox-ose.dirs +++ b/debian/virtualbox-ose.dirs @@ -1,4 +1,3 @@ usr/bin usr/lib/virtualbox/sdk/bindings/xpcom/python usr/share/virtualbox -etc/vbox diff --git a/debian/virtualbox-ose.files/source_virtualbox-ose.py b/debian/virtualbox-ose.files/source_virtualbox-ose.py index 4dbc386..34f1464 100644 --- a/debian/virtualbox-ose.files/source_virtualbox-ose.py +++ b/debian/virtualbox-ose.files/source_virtualbox-ose.py @@ -6,6 +6,6 @@ def add_info(report): """Add information about installed VirtualBox kernel modules""" report['VirtualBoxOse.ModInfo'] = apport.hookutils.command_output(["sh", "-c", - "find /lib/modules/`uname -r` -name \"vbox*\" | xargs modinfo"]) + "find /lib/modules/`uname -r` -name \"vbox*\" | xargs -r modinfo"]) report['LsMod'] = apport.hookutils.command_output(["lsmod"]) diff --git a/debian/virtualbox-ose.init b/debian/virtualbox-ose.init new file mode 100644 index 0000000..b9f10b3 --- /dev/null +++ b/debian/virtualbox-ose.init @@ -0,0 +1,241 @@ +#! /bin/sh +# Sun VirtualBox +# Linux kernel module init script + +# +# Copyright (C) 2006-2009 Sun Microsystems, Inc. +# +# 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 (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. +# + +# chkconfig: 35 30 70 +# description: VirtualBox Linux kernel module +# +### BEGIN INIT INFO +# Provides: vboxdrv virtualbox-ose +# Required-Start: $remote_fs $network +# Required-Stop: $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: VirtualBox Linux kernel module +### END INIT INFO + +. /lib/lsb/init-functions + +test -d /usr/share/doc/virtualbox-ose -a -x /usr/bin/VBoxHeadless || exit 0 + +# Include virtualbox-ose defaults if available +[ -r /etc/default/virtualbox-ose ] && . /etc/default/virtualbox-ose + +# set list of all active users if asked to do so +if [ "$SHUTDOWN_USERS" = "all" ]; then + SHUTDOWN_USERS="" + for i in /tmp/.vbox-*-ipc; do + SHUTDOWN_USERS="$SHUTDOWN_USERS $(echo $i|cut -d'-' -f2)" + done +fi + +if [ "$LOAD_VBOXDRV_MODULE" != 1 ]; then + log_success_msg "virtualbox-ose disabled; edit /etc/default/virtualbox-ose" + exit 0 +fi + +running() +{ + lsmod | grep -q "$1[^_-]" +} + +start() +{ + log_begin_msg "Starting VirtualBox kernel modules" + + if ! running vboxdrv; then + # HACK: disable the hardware performance counter framework + if [ -e /proc/sys/kernel/perf_counter_paranoid ]; then + if [ $(cat /proc/sys/kernel/perf_counter_paranoid) -ne 2 ]; then + log_warning_msg "Disabling the hardware performance counter framework" + echo 2 > /proc/sys/kernel/perf_counter_paranoid + fi + fi + + if ! modprobe vboxdrv > /dev/null 2>&1; then + if ! find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then + log_failure_msg "No suitable module for running kernel found" + else + log_failure_msg "modprobe vboxdrv failed. Please use 'dmesg' to find out why" + fi + log_end_msg 1 + return 1 + fi + fi + + if ! running vboxnetadp; then + if ! modprobe vboxnetadp > /dev/null 2>&1; then + if ! find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then + log_failure_msg "No suitable vboxnetflt module for running kernel found" + else + log_failure_msg "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" + fi + log_end_msg 1 + return 1 + fi + fi + + if ! running vboxnetflt; then + if ! modprobe vboxnetflt > /dev/null 2>&1; then + if ! find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then + log_failure_msg "No suitable vboxnetadp module for running kernel found" + else + log_failure_msg "modprobe vboxnetadp failed. Please use 'dmesg' to find out why" + fi + log_end_msg 1 + return 1 + fi + fi + + log_end_msg 0 +} + +stop() +{ + log_begin_msg "Stopping VirtualBox kernel modules" + + if running vboxnetadp; then + if ! rmmod vboxnetadp 2>/dev/null; then + log_failure_msg "Cannot unload module vboxnetadp" + log_end_msg 1 + return 1 + fi + fi + + if running vboxdrv; then + if running vboxnetflt; then + if ! rmmod vboxnetflt 2>/dev/null; then + log_failure_msg "Cannot unload module vboxnetflt" + log_end_msg 1 + return 1 + fi + fi + + if ! rmmod vboxdrv 2>/dev/null; then + log_failure_msg "Cannot unload module vboxdrv" + log_end_msg 1 + return 1 + fi + fi + + log_end_msg 0 +} + +# enter the following variables in /etc/default/virtualbox-ose: +# SHUTDOWN_USERS="foo bar" +# check for running VMs of user foo and user bar +# SHUTDOWN=poweroff +# SHUTDOWN=acpibutton +# SHUTDOWN=savestate +# select one of these shutdown methods for running VMs +stop_vms() +{ + if ! pidof VBoxSVC > /dev/null; then + return 0 + fi + + wait=0 + + for i in $SHUTDOWN_USERS; do + if [ -d /tmp/.vbox-$i-ipc ]; then + export VBOX_IPC_SOCKETID="$i" + VMS=`VBoxManage --nologo list runningvms 2>/dev/null` + if [ $? -eq 0 -a -n "$VMS" ]; then + VMS=`echo "$VMS" | sed -e 's/^".*".*{\(.*\)}/\1/'` + if [ "$SHUTDOWN" = "poweroff" ]; then + log_action_msg "Powering off remaining VMs from user $i" + for v in $VMS; do + VBoxManage --nologo controlvm $v poweroff + wait=10 + done + elif [ "$SHUTDOWN" = "acpibutton" ]; then + log_action_msg "Sending ACPI power button event to remaining VMs from user $i" + for v in $VMS; do + VBoxManage --nologo controlvm $v acpipowerbutton + wait=30 + done + elif [ "$SHUTDOWN" = "savestate" ]; then + log_action_msg "Saving state of remaining VMs from user $i" + for v in $VMS; do + VBoxManage --nologo controlvm $v savestate + wait=30 + done + fi + fi + fi + done + + # wait for some seconds when doing ACPI shutdown + if [ "$wait" -ne 0 ]; then + log_action_begin_msg "Waiting for $wait seconds for VM shutdown" + sleep $wait + log_action_end_msg 0 + fi + return 0 +} + +dmnstatus() +{ + if running vboxdrv; then + if running vboxnetflt; then + if running vboxnetadp; then + echo "VirtualBox kernel modules (vboxdrv, vboxnetflt and vboxnetadp) are loaded." + else + echo "VirtualBox kernel modules (vboxdrv and vboxnetflt) are loaded." + fi + else + echo "VirtualBox kernel module is loaded." + fi + + for i in $SHUTDOWN_USERS; do + if [ -d /tmp/.vbox-$i-ipc ]; then + export VBOX_IPC_SOCKETID="$i" + VMS=`VBoxManage --nologo list runningvms 2>/dev/null` + if [ $? -eq 0 -a -n "$VMS" ]; then + VMS=`echo "$VMS" | sed -e 's/^".*".*{\(.*\)}/\1/'` + echo "The following VMs are currently running:" + for v in $VMS; do + echo " $v" + done + fi + fi + done + return 0 + else + echo "VirtualBox kernel module is not loaded." + return 3 + fi +} + +case "$1" in +start) + start + ;; +stop) + stop_vms && stop + ;; +stop_vms) + stop_vms + ;; +restart|force-reload) + stop_vms && stop && start + ;; +status) + dmnstatus + ;; +*) + echo "Usage: $0 {start|stop|stop_vms|restart|force-reload|status}" + exit 1 +esac diff --git a/debian/virtualbox-ose.install b/debian/virtualbox-ose.install index 7c66c29..024c5db 100644 --- a/debian/virtualbox-ose.install +++ b/debian/virtualbox-ose.install @@ -17,6 +17,7 @@ out/bin/VBoxSVC /usr/lib/virtualbox out/bin/VBoxTestOGL /usr/lib/virtualbox out/bin/VBoxXPCOM* /usr/lib/virtualbox out/bin/VMM* /usr/lib/virtualbox +out/bin/vboxshell.py /usr/lib/virtualbox out/bin/vboxwebsrv /usr/lib/virtualbox out/bin/webtest /usr/lib/virtualbox diff --git a/debian/virtualbox-ose.postinst b/debian/virtualbox-ose.postinst index 86d04e1..73cc121 100644 --- a/debian/virtualbox-ose.postinst +++ b/debian/virtualbox-ose.postinst @@ -2,33 +2,26 @@ set -e +#DEBHELPER# + case "${1}" in configure) - # Adding vboxusers group - if ! getent group vboxusers > /dev/null - then - if [ -x /usr/sbin/addgroup ] - then - addgroup --quiet --system vboxusers + # only restart if VirtualBox isn't running + if test -x /etc/init.d/virtualbox-ose && ! pidof VBoxSVC > /dev/null; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d virtualbox-ose restart || true + else + /etc/init.d/virtualbox-ose restart || true fi fi - - # In case the system is running without inotify tell udev to - # reload the rules - if [ -x /sbin/udevcontrol ] - then - udevcontrol reload_rules || true - fi ;; - + abort-upgrade|abort-deconfigure|abort-remove) - + ;; - + *) echo "${0} called with unknown argument \`${1}'" 1>&2 exit 1 ;; esac - -#DEBHELPER# diff --git a/debian/virtualbox-ose.postrm b/debian/virtualbox-ose.postrm deleted file mode 100644 index 356c755..0000000 --- a/debian/virtualbox-ose.postrm +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -case "${1}" in - purge) - # Removing vboxusers group - if [ -x /usr/sbin/delgroup ] - then - # delgroup may return error status 3 if there is a non-system group - # "vboxusers". The postrm should not fail in this case! - delgroup --quiet --system vboxusers || true - fi - ;; - - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - ;; - - *) - echo "postrm called with unknown argument \`${1}'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/virtualbox-ose.preinst b/debian/virtualbox-ose.preinst index 0795854..9e07378 100644 --- a/debian/virtualbox-ose.preinst +++ b/debian/virtualbox-ose.preinst @@ -31,10 +31,19 @@ case "$1" in 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 + # Remove /etc/vbox/vbox.cfg if dpkg --compare-versions "$2" le "2.2.2-dfsg-2ubuntu2"; then rm_conffile virtualbox-ose /etc/vbox/vbox.cfg fi + + # Remove vboxusers group + if dpkg --compare-versions "$2" lt "3.0.8-dfsg-1"; then + if [ -x /usr/sbin/delgroup ]; then + # delgroup may return error status 3 if there is a non-system group + # "vboxusers". The postrm should not fail in this case! + delgroup --quiet --system vboxusers || true + fi + fi ;; esac - diff --git a/debian/virtualbox-ose.prerm b/debian/virtualbox-ose.prerm new file mode 100644 index 0000000..5ce9f7c --- /dev/null +++ b/debian/virtualbox-ose.prerm @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +if [ -x "/etc/init.d/virtualbox-ose" ] && [ "$1" = remove ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d virtualbox-ose stop || exit $? + else + /etc/init.d/virtualbox-ose stop || exit $? + fi +fi + +#DEBHELPER#