--- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-dkms.udev +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-dkms.udev @@ -0,0 +1,2 @@ +KERNEL=="vboxguest", NAME="vboxguest", OWNER="root", MODE="0660" +KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0666" --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.install +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.install @@ -0,0 +1,29 @@ +debian/virtualbox-ose.files/*.sh /usr/share/virtualbox +debian/virtualbox-ose.files/source_virtualbox-ose.py /usr/share/apport/package-hooks + +out/bin/components /usr/lib/virtualbox +out/bin/VBoxREM* /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/VBoxEFI* /usr/lib/virtualbox +out/bin/VBoxExtPackHelperApp /usr/lib/virtualbox +out/bin/VBoxHeadless /usr/lib/virtualbox +out/bin/VBoxManage /usr/lib/virtualbox +out/bin/VBoxNetAdpCtl /usr/lib/virtualbox +out/bin/VBoxNetDHCP /usr/lib/virtualbox +out/bin/VBoxSDL /usr/lib/virtualbox +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 +out/bin/libvboxjxpcom.so /usr/lib/virtualbox + +out/bin/sdk/bindings/xpcom/java /usr/lib/virtualbox/sdk/bindings/xpcom +out/bin/sdk/bindings/xpcom/python /usr/lib/virtualbox/sdk/bindings/xpcom + +out/bin/VBoxCreateUSBNode.sh /usr/share/virtualbox +out/bin/VBoxSysInfo.sh /usr/share/virtualbox --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-fuse.lintian-overrides +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-fuse.lintian-overrides @@ -0,0 +1 @@ +virtualbox-ose-fuse: binary-or-shlib-defines-rpath ./usr/bin/vdfuse /usr/lib/virtualbox --- virtualbox-ose-4.0.4-dfsg.orig/debian/gbp.conf +++ virtualbox-ose-4.0.4-dfsg/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +pristine-tar = True +debian-branch = ubuntu --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-qt.install +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-qt.install @@ -0,0 +1,5 @@ +debian/virtualbox-ose-qt.files/virtualbox-ose.desktop /usr/share/applications + +out/bin/VirtualBox* /usr/lib/virtualbox + +out/bin/nls /usr/share/virtualbox --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-qt.lintian-overrides +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-qt.lintian-overrides @@ -0,0 +1 @@ +virtualbox-ose-qt: setuid-gid-binary usr/lib/virtualbox/VirtualBox 6755 root/root --- virtualbox-ose-4.0.4-dfsg.orig/debian/lynx-dump-postprocess +++ virtualbox-ose-4.0.4-dfsg/debian/lynx-dump-postprocess @@ -0,0 +1,51 @@ +#!/usr/bin/perl + +# taken from the exim4 package + +open IN, '<&STDIN'; +#open IN, 'dump'; +{ + local $/; + $content=; +} +close IN; + +($title,$body,$links) = + ($content =~ + /^(.*)\n\s+_+\n\n + (\s+Table\ of\ Contents.*) + (References\n\n\s+1\..*)/sx); + +die unless ($title); + +print "$title\n".'-' x length($title)."\n\n"; + +# Sort out local links. +# The regex might not be entirely accurate. +foreach (split /\n/, $links) { + ($index, $url) = /^\s*(\d+)\. (.+)$/; + if ($url !~ /file:\/\/.*#.*$/) { + $links[$index] = $url; + } +} + +$linkno=0; +# Split paragraphs +foreach (split /\n(?:\s+_+\n)?\n/, $body) { + my $footnote = ''; + my $rest = $_; + while ( $rest =~ /^(.*?)\[(\d+)\](.*)$/s ) { + print $1; + if (defined $links[$2]) { + $linkno++; + print "[$linkno]"; + $footnote.=" $linkno. $links[$2]\n"; + } + $rest = $3; + } + print $rest; + print "\n\n"; + if ($footnote ne '') { + print "$footnote\n"; + } +} --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-fuse.install +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-fuse.install @@ -0,0 +1 @@ +out/vdfuse/vdfuse usr/bin --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-dkms.install.in +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-dkms.install.in @@ -0,0 +1,32 @@ +out/bin/src/vboxdrv/*.* /usr/src/virtualbox-ose-CVERSION/vboxdrv +out/bin/src/vboxdrv/linux /usr/src/virtualbox-ose-CVERSION/vboxdrv +out/bin/src/vboxdrv/Makefile /usr/src/virtualbox-ose-CVERSION/vboxdrv + +out/bin/src/vboxnetflt/*.* /usr/src/virtualbox-ose-CVERSION/vboxnetflt +out/bin/src/vboxnetflt/linux /usr/src/virtualbox-ose-CVERSION/vboxnetflt +out/bin/src/vboxnetflt/Makefile /usr/src/virtualbox-ose-CVERSION/vboxnetflt + +out/bin/src/vboxnetadp/*.* /usr/src/virtualbox-ose-CVERSION/vboxnetadp +out/bin/src/vboxnetadp/linux /usr/src/virtualbox-ose-CVERSION/vboxnetadp +out/bin/src/vboxnetadp/Makefile /usr/src/virtualbox-ose-CVERSION/vboxnetadp + +out/bin/src/vboxdrv/*-generated.h /usr/src/virtualbox-ose-CVERSION/include +out/bin/src/vboxdrv/include/iprt/* /usr/src/virtualbox-ose-CVERSION/include/iprt +out/bin/src/vboxdrv/include/VBox/* /usr/src/virtualbox-ose-CVERSION/include/VBox +out/bin/src/vboxdrv/include/internal/* /usr/src/virtualbox-ose-CVERSION/include/internal + +out/bin/src/vboxnetflt/include/iprt/* /usr/src/virtualbox-ose-CVERSION/include/iprt +out/bin/src/vboxnetflt/include/VBox/* /usr/src/virtualbox-ose-CVERSION/include/VBox + +out/bin/src/vboxnetadp/include/iprt/* /usr/src/virtualbox-ose-CVERSION/include/iprt +out/bin/src/vboxnetadp/include/VBox/* /usr/src/virtualbox-ose-CVERSION/include/VBox +out/bin/src/vboxnetadp/include/internal/* /usr/src/virtualbox-ose-CVERSION/include/internal + +out/bin/src/vboxdrv/r0drv /usr/src/virtualbox-ose-CVERSION +out/bin/src/vboxdrv/common /usr/src/virtualbox-ose-CVERSION +out/bin/src/vboxdrv/generic /usr/src/virtualbox-ose-CVERSION +out/bin/src/vboxdrv/math /usr/src/virtualbox-ose-CVERSION +out/bin/src/vboxdrv/VBox /usr/src/virtualbox-ose-CVERSION +out/bin/src/vboxdrv/include/iprt/nocrt /usr/src/virtualbox-ose-CVERSION/include/iprt + +debian/virtualbox-ose-dkms.files/Makefile /usr/src/virtualbox-ose-CVERSION --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.default +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.default @@ -0,0 +1,23 @@ +# Defaults for virtualbox-ose initscript +# sourced by /etc/init.d/virtualbox-ose +# installed at /etc/default/virtualbox-ose by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +# 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 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-x11.udev +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-x11.udev @@ -0,0 +1 @@ +ACTION=="add|change", KERNEL=="vboxguest", ENV{ID_INPUT}="1", ENV{ID_INPUT_MOUSE}="1" --- virtualbox-ose-4.0.4-dfsg.orig/debian/rules +++ virtualbox-ose-4.0.4-dfsg/debian/rules @@ -0,0 +1,267 @@ +#!/usr/bin/make -f + +# Name of the source packages +psource:=virtualbox-ose-source +gsource:=virtualbox-ose-guest-source +pdkms:=virtualbox-ose-dkms +gdkms:=virtualbox-ose-guest-dkms + +# The short upstream name +sname:=virtualbox-ose +sxname:=virtualbox-ose-qt +gname:=virtualbox-ose-guest +uname:=virtualbox-ose-guest-utils +uxname:=virtualbox-ose-guest-x11 +fname:=virtualbox-ose-fuse + +INSTALL_PATH:=/usr/lib/virtualbox +MAKE:=kmk + +upstreamversion := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p') + +X11_BACKPORT = + +XSERVER_VERSION = 17 +INSTALL_X11_PCI_ID = 0 +INSTALL_X11_HAL = 0 +INSTALL_X11_UDEV = 1 +INSTALL_XORGCONFD = new +XORG_PKG_ABI = new + +ifeq ($(X11_BACKPORT),lenny) + XSERVER_VERSION = 14 + INSTALL_X11_PCI_ID = 1 + INSTALL_X11_HAL = 1 + INSTALL_X11_UDEV = 0 + INSTALL_XORGCONFD = no + XORG_PKG_ABI = old +else ifeq ($(X11_BACKPORT),lucid) + INSTALL_XORGCONFD = old + XORG_PKG_ABI = old +endif + + +ifeq ($(XORG_PKG_ABI),new) + # Some defines needed for X + VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) + INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + # these two can be removed post-squeeze + VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) + INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) + VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) + INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +else + # Some defines needed for X + SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) + VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) + INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) + SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) + VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) + INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +endif + + + +%: + dh $@ --with quilt,python_central,dkms + +override_dh_auto_configure: + mkdir -p out + ./configure \ + --ose \ + --odir=$(abspath out) \ + --with-linux="/usr" \ + --disable-kmods \ + --enable-webservice \ + --enable-vde + +override_dh_auto_build: + # Building package + . out/env.sh && $(MAKE) \ + AUTOCFG=$(abspath out/AutoConfig.kmk) \ + LOCALCFG=$(abspath debian/LocalConfig.kmk) \ + PATH_OUT=$(abspath out) \ + TOOL_YASM_AS=yasm \ + XSERVER_VERSION=$(XSERVER_VERSION) \ + VBOX_WITH_REGISTRATION_REQUEST= \ + VBOX_WITH_UPDATE_REQUEST= \ + $(if $(DH_VERBOSE),KBUILD_VERBOSE=2,) + + mkdir -p out/vdfuse + gcc debian/vdfuse/vdfuse.c -o out/vdfuse/vdfuse -pipe -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 \ + debian/virtualbox-ose.files/README.Debian.xml + + chmod 755 debian/lynx-dump-postprocess + export LC_ALL=C; lynx -force_html -dump debian/README.Debian.html | \ + ./debian/lynx-dump-postprocess > debian/virtualbox-ose.README.Debian.tmp + mv debian/virtualbox-ose.README.Debian.tmp debian/virtualbox-ose.README.Debian + +override_dh_auto_install: + dh_auto_install + + export VBOX_INSTALL_PATH=$(INSTALL_PATH) && \ + cd out/bin/sdk/installer && \ + python ./vboxapisetup.py install --root $(CURDIR)/debian/$(sname) + + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gdkms).links.in > debian/$(gdkms).links + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(pdkms).links.in > debian/$(pdkms).links + + # Build install files for the dkms'ified sources + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(pdkms).install.in > debian/$(pdkms).install + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gdkms).install.in > debian/$(gdkms).install + +ifeq ($(XORG_PKG_ABI),new) + +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' + @exit 1 +else + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(uxname).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(uxname).substvars + # the following is there for compatibility... + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(uxname).substvars + echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(uxname).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(uxname).substvars +endif + +else # ifeq ($(XORG_PKG_ABI),new) + +ifeq ($(SERVERMINVERS),) + @echo error: xserver-xorg-dev needs to be installed + @exit 1 +else + echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(uxname).substvars + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(uxname).substvars + echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(uxname).substvars +endif + +endif # ifeq ($(XORG_PKG_ABI),new) + + +override_dh_install: + dh_install + +ifeq ($(INSTALL_X11_PCI_ID),1) + dh_install -p$(uxname) --ignore debian/$(uxname).install \ + src/VBox/Additions/x11/Installer/vboxvideo.ids \ + /usr/share/xserver-xorg/pci +endif + +ifeq ($(INSTALL_X11_HAL),1) + dh_install -p$(uxname) --ignore debian/$(uxname).install \ + src/VBox/Additions/linux/installer/90-vboxguest.fdi \ + /usr/share/hal/fdi/policy/20thirdparty +endif + +ifeq ($(INSTALL_XORGCONFD),new) + dh_install -p$(uxname) --ignore debian/$(uxname).install \ + src/VBox/Additions/x11/Installer/50-vboxmouse.conf \ + /usr/share/X11/xorg.conf.d +else ifeq ($(INSTALL_XORGCONFD),old) + dh_install -p$(uxname) --ignore debian/$(uxname).install \ + src/VBox/Additions/x11/Installer/50-vboxmouse.conf \ + /usr/lib/X11/xorg.conf.d +endif + + cp src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_16px.png \ + debian/$(sxname)/usr/share/icons/hicolor/16x16/apps/virtualbox-ose.png + cp src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png \ + debian/$(sxname)/usr/share/icons/hicolor/32x32/apps/virtualbox-ose.png + cp src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png \ + debian/$(sxname)/usr/share/icons/hicolor/48x48/apps/virtualbox-ose.png + cp src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_64px.png \ + debian/$(sxname)/usr/share/icons/hicolor/64x64/apps/virtualbox-ose.png + + convert debian/$(sxname)/usr/share/icons/hicolor/32x32/apps/virtualbox-ose.png \ + debian/$(sxname)/usr/share/pixmaps/virtualbox-ose.xpm + +override_dh_fixperms: + dh_fixperms + + chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxSDL + chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxHeadless + chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxNetDHCP + chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxNetAdpCtl + chmod +s debian/$(sxname)$(INSTALL_PATH)/VirtualBox + + chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/*.py + chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/server/*.py + chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/client/*.py + chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/java/vboxjxpcom.jar + + chmod 755 debian/$(uxname)/usr/share/virtualbox/x11config.pl + chmod 755 debian/$(sname)/usr/share/virtualbox/VBox.sh + +override_dh_installudev: +ifeq ($(INSTALL_X11_UDEV),1) + dh_installudev -p$(uxname) --priority=69 + dh_installudev --remaining-packages +else + dh_installudev -N$(uxname) +endif + +override_dh_installinit: + dh_installinit --no-start + +override_dh_dkms: + dh_dkms -V $(upstreamversion) + +override_dh_strip: + dh_strip --dbg-package=$(sname)-dbg + +override_dh_shlibdeps: + dh_shlibdeps -p$(sname) -X debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -- \ + -dRecommends debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -dDepends + dh_shlibdeps --remaining-packages + +override_dh_compress: + dh_compress -X.pdf + +override_dh_auto_clean: + dh_auto_clean + + # Cleaning package + rm -rf out + rm -f build-stamp + rm -f debian/virtualbox-ose.README.Debian debian/README.Debian.html + rm -f debian/$(pdkms).install + rm -f debian/$(gdkms).install + rm -f debian/$(pdkms).links + rm -f debian/$(gdkms).links + + 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-*' ! -name '1.4' -exec rm -rf {} \; + # x11include/1.4/xorg/Pci.h is required for lenny backports + find src/VBox/Additions/x11/x11include/1.4 -mindepth 1 \ + -type f ! -wholename '*/xorg/Pci.h' -exec rm -rf {} \; + find src/VBox/Additions/x11/x11include/1.4 -mindepth 1 \ + -depth -type d -empty -exec rmdir {} \; + cd ..; mv $(CURDIR) virtualbox-ose-$(upstreamversion)-dfsg; \ + tar --exclude .svn --exclude '.git*' --exclude debian \ + -czf virtualbox-ose_$(upstreamversion)-dfsg.orig.tar.gz \ + virtualbox-ose-$(upstreamversion)-dfsg --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-dkms.install.in +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-dkms.install.in @@ -0,0 +1,26 @@ +out/bin/additions/src/vboxguest/*.* /usr/src/virtualbox-ose-guest-CVERSION/vboxguest +out/bin/additions/src/vboxguest/common /usr/src/virtualbox-ose-guest-CVERSION/vboxguest +out/bin/additions/src/vboxguest/generic /usr/src/virtualbox-ose-guest-CVERSION/vboxguest +out/bin/additions/src/vboxguest/VBox /usr/src/virtualbox-ose-guest-CVERSION/vboxguest +out/bin/additions/src/vboxguest/build_in_tmp /usr/src/virtualbox-ose-guest-CVERSION/vboxguest +out/bin/additions/src/vboxguest/Makefile /usr/src/virtualbox-ose-guest-CVERSION/vboxguest + +out/bin/additions/src/vboxsf/*.* /usr/src/virtualbox-ose-guest-CVERSION/vboxsf +out/bin/additions/src/vboxsf/build_in_tmp /usr/src/virtualbox-ose-guest-CVERSION/vboxsf +out/bin/additions/src/vboxsf/Makefile /usr/src/virtualbox-ose-guest-CVERSION/vboxsf + +out/bin/additions/src/vboxvideo/*.* /usr/src/virtualbox-ose-guest-CVERSION/vboxvideo +out/bin/additions/src/vboxvideo/build_in_tmp /usr/src/virtualbox-ose-guest-CVERSION/vboxvideo +out/bin/additions/src/vboxvideo/Makefile /usr/src/virtualbox-ose-guest-CVERSION/vboxvideo + +out/bin/additions/src/vboxguest/include/iprt/* /usr/src/virtualbox-ose-guest-CVERSION/include/iprt +out/bin/additions/src/vboxguest/include/VBox/* /usr/src/virtualbox-ose-guest-CVERSION/include/VBox +out/bin/additions/src/vboxguest/include/internal/* /usr/src/virtualbox-ose-guest-CVERSION/include/internal + +out/bin/additions/src/vboxsf/include/iprt/* /usr/src/virtualbox-ose-guest-CVERSION/include/iprt +out/bin/additions/src/vboxsf/include/VBox/* /usr/src/virtualbox-ose-guest-CVERSION/include/VBox + +out/bin/additions/src/vboxguest/r0drv /usr/src/virtualbox-ose-guest-CVERSION/ + +debian/virtualbox-ose-guest-dkms.files/Makefile /usr/src/virtualbox-ose-guest-CVERSION + --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-utils.manpages +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-utils.manpages @@ -0,0 +1,3 @@ +debian/manpages/VBoxService.8 +debian/manpages/VBoxControl.8 +debian/manpages/mount.vboxsf.8 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-qt.dirs +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-qt.dirs @@ -0,0 +1,5 @@ +usr/share/icons/hicolor/16x16/apps +usr/share/icons/hicolor/32x32/apps +usr/share/icons/hicolor/48x48/apps +usr/share/icons/hicolor/64x64/apps +usr/share/pixmaps --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-x11.README.Debian +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-x11.README.Debian @@ -0,0 +1,6 @@ +To enable guest additions in X either run /usr/share/virtualbox/x11config.pl or +edit your xorg.conf manually. The video driver has to be set to "vboxvideo" and +the mouse driver to "vboxmouse". Additionally the options "alwayscore" and +"sendcoreevents" should be removed from the mouse section. + + -- Michael Meskes Mon, 19 Nov 2007 11:17:46 +0100 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-utils.install +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-utils.install @@ -0,0 +1,4 @@ +out/bin/additions/VBoxService /usr/sbin +out/bin/additions/VBoxControl /usr/sbin +out/bin/additions/mount.vboxsf /sbin +out/bin/additions/pam_vbox.so /lib/security --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-x11.manpages +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-x11.manpages @@ -0,0 +1 @@ +debian/manpages/VBoxClient.1 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-dkms.dkms +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-dkms.dkms @@ -0,0 +1,13 @@ +PACKAGE_NAME="virtualbox-ose" +PACKAGE_VERSION="#MODULE_VERSION#" +CLEAN="rm -f *.*o" +BUILT_MODULE_NAME[0]="vboxdrv" +BUILT_MODULE_LOCATION[0]="vboxdrv" +DEST_MODULE_LOCATION[0]="/updates" +BUILT_MODULE_NAME[1]="vboxnetadp" +BUILT_MODULE_LOCATION[1]="vboxnetadp" +DEST_MODULE_LOCATION[1]="/updates" +BUILT_MODULE_NAME[2]="vboxnetflt" +BUILT_MODULE_LOCATION[2]="vboxnetflt" +DEST_MODULE_LOCATION[2]="/updates" +AUTOINSTALL="yes" --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-dkms.preinst +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-dkms.preinst @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +case "$1" in + install|upgrade) + # These are no longer used + for mod in vboxdrv vboxnetflt vboxnetadp; do + dkms status -m $mod | while read line; do + if echo "$line" | grep -q added > /dev/null || + echo "$line" | grep -q built > /dev/null || + echo "$line" | grep -q installed > /dev/null; + then + version=`echo "$line" | sed "s/$mod,\([^,]*\)[,:].*/\1/;t;d"` + echo "Removing obsolete module $mod version $version" + dkms remove -m $mod -v $version --all + fi + done + done + ;; +esac --- virtualbox-ose-4.0.4-dfsg.orig/debian/copyright +++ virtualbox-ose-4.0.4-dfsg/debian/copyright @@ -0,0 +1,1168 @@ +This package was debianized by Daniel Baumann on +Mon, 15 Jan 2007 14:33:00 +0100. + +It was downloaded from . + +Upstream Author: innotek GmbH + +License: + + Copyright (C) 2004-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 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. + +Some files are dual licensed and also carry the CDDL as listed below. + +This applies to the complete sourcetree with the execptions mentioned below: + +The following files are licensed under GPLv2: + +./src/VBox/Installer/linux/tunctl.c + Copyright 2002 Jeff Dike + +./src/VBox/HostDrivers/VBoxTAP/ + Copyright (C) Damion K. Wilson, 2003 + +./src/VBox/Runtime/generic/semrw-generic.cpp +./src/VBox/Runtime/table/avl_Base.cpp.h +./src/VBox/Runtime/table/avl_Destroy.cpp.h +./src/VBox/Runtime/table/avl_DoWithAll.cpp.h +./src/VBox/Runtime/table/avlgcptr.cpp +./src/VBox/Runtime/table/avl_GetBestFit.cpp.h +./src/VBox/Runtime/table/avl_Get.cpp.h +./src/VBox/Runtime/table/avlhcphys.cpp +./src/VBox/Runtime/table/avlogcphys.cpp +./src/VBox/Runtime/table/avlogcptr.cpp +./src/VBox/Runtime/table/avlohcphys.cpp +./src/VBox/Runtime/table/avloioport.cpp +./src/VBox/Runtime/table/avlpv.cpp +./src/VBox/Runtime/table/avl_Range.cpp.h +./src/VBox/Runtime/table/avl_RemoveBestFit.cpp.h +./src/VBox/Runtime/table/avlrgcptr.cpp +./src/VBox/Runtime/table/avlrogcptr.cpp +./src/VBox/Runtime/table/avlroioport.cpp +./src/VBox/Runtime/table/avlroogcptr.cpp +./src/VBox/Runtime/table/avlu32.cpp +./src/VBox/Runtime/table/avlul.cpp +./src/VBox/Runtime/table/table.cpp +./src/VBox/Devices/VBoxDDUDeps.cpp + Copyright (c) 2005-2007 knut st. osmundsen + +./include/avl.h + Copyright (c) 2005-2007 knut st. osmundsen + Copyright (C) 2006-2007 innotek GmbH + +./src/VBox/Devices/PC/Etherboot-src/ + this subtree is licensed as mentioned in ./src/VBox/Devices/PC/Etherboot-src/README-vbox + with the execptions which are listed here. + +./src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.h +./src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.c +./src/VBox/Devices/PC/Etherboot-src/core/pxe_export.c + Copyright: 2003 Michael Brown + +./src/VBox/Devices/PC/Etherboot-src/include/string.h +./src/VBox/Devices/PC/Etherboot-src/core/string.c + Copyright: 1991, 1992 Linus Torvalds + Copyright: 2004 Tobias Lorenz + +./src/VBox/Devices/PC/Etherboot-src/include/i82365.h +./src/VBox/Devices/PC/Etherboot-src/core/i82365.c + Copyright: 1999 David A. Hinds + +./src/VBox/Devices/PC/Etherboot-src/include/isapnp.h +./src/VBox/Devices/PC/Etherboot-src/core/isapnp.c + Copyright: 2001 P.J.H.Fox + +./src/VBox/Devices/PC/BIOS/rombios.c + Copyright: 2002 MandrakeSoft S.A + +./src/VBox/Devices/Graphics/BIOS/vbe.c + Copyright: 2002 Jeroen Janssen + +./src/VBox/Devices/Graphics/BIOS/clext.c + Copyright: (c) 2004 Makoto Suzuki (suzu) + +./src/VBox/HostDrivers/VBoxTAP/config-win32.h + Copyright: 2002-2005 OpenVPN Solutions LLC + +./src/VBox/Devices/PC/Etherboot-src/include/mii.h + Copyright (C) 1996, 1999, 2001 David S. Miller + +./src/VBox/Devices/PC/Etherboot-src/core/proto_eth_slow.c + Copyright 2004 Linux Networx + +./src/VBox/Devices/PC/Etherboot-src/util/getopt.c + Copyright (c) 1990-1995 by Eberhard Mattes + +./src/VBox/RDP + Copyright (C) Matthew Chapman 1999-2000 + +On Debian systems, the complete text of the GNU General Public License +can be found in /usr/share/common-licenses/GPL-2 file. + +------------------------------------------------------------------------------- + +The MPL applies to the complete subtree of ./src/libs/xpcom18a4, which was +synced from mozilla-cvs (the copyright file is in mozilla/COPYRIGHT and +synced were only mozilla/xpcom, mozilla/nsprpub and mozilla/ipc ) + +The license is attached below. + +------------------------------------------------------------------------------- + +The BSD License applies to the complete subtree of: + +./src/libs/liblzf-1.51/ + Copyright (c) 2000-2005 Marc Alexander Lehmann + +./src/VBox/Devices/Audio/coreaudio.h + Copyright (c) 2005 Mike Kronenberg + +./src/VBox/Devices/Network/slirp + Copyright (c), 1995,1996 Danny Gasparovski + Slirp uses code that is copyrighted by the following people: + Juha Pirkola. + Gregory M. Christy. + The Regents of the University of California. + Carnegie Mellon University. + The Australian National University. + RSA Data Security, Inc. + +./src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c +./src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp +./src/VBox/Runtime/r0drv/freebsd/ +./src/VBox/Runtime/r0drv/os2/ +./src/VBox/Runtime/r3/os2/time-os2.cpp +./src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c +./src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c +./src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c + Copyright (c) 2007 knut st. osmundsen + +./src/VBox/Runtime/include/internal/ldrELF32.h +./src/VBox/Runtime/include/internal/lldrELF64.h +./src/VBox/Runtime/include/internal/lldrELFAmd64.h +./src/VBox/Runtime/include/internal/lldrELFCommon.h +./src/VBox/Runtime/include/internal/lldrELFi386.h + Copyright (c) 1996-1998 John D. Polstra. + +./src/VBox/Devices/Audio/alsaaudio.c +./src/VBox/Devices/Audio/audio.c +./src/VBox/Devices/Audio/audio.h +./src/VBox/Devices/Audio/audio_int.h +./src/VBox/Devices/Audio/audio_template.h +./src/VBox/Devices/Audio/dsoundaudio.c +./src/VBox/Devices/Audio/dsound_template.h +./src/VBox/Devices/Audio/mixeng_template.h +./src/VBox/Devices/Audio/noaudio.c +./src/VBox/Devices/Audio/ossaudio.c + Copyright (c) 2005 Vassili Karpov (malc) + +./src/VBox/Devices/Audio/mixeng.c +./src/VBox/Devices/Audio/reate_template.h + Copyright (c) 2005 Vassili Karpov (malc) + Copyright 1998 Fabrice Bellard + +./src/VBox/Devices/Audio/sys-queue.h +./src/VBox/Runtime/math/gcc/* + Copyright (c) 1991, 1993 The Regents of the University of California. + +./src/VBox/Runtime/testcase/soundcard.h + Copyright by Hannu Savolainen 1993-1997 + +./src/VBox/Devices/Network/slirp/tftp.c + Copyright: (c) 2004 Magnus Damm + +./src/VBox/Devices/PC/Etherboot-src/core/proto_fsp.c + Copyright: (c) 2005 by Radim Kolar + +./include/Box/HostServices/glext.h +./include/VBox/HostServices/wglext.h +./include/VBox/HostServices/glxext.h + Copyright: (c) 2007 The Khronos Group Inc + +The complete text of the BSD License: + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +------------------------------------------------------------------------------- + +The LGPL (v2.1 or later) applies to the complete subtree of: + +./src/recompiler/ + Copyright (c) 2003 Fabrice Bellard + with the exeption of: + ./src/recompiler/InnoTek (GPLv2) + Copyright (C) 2004-2006 InnoTek Systemberatung GmbH + ./src/recompiler/a.out.h (Cygwin License, see below) + Copyright 1997, 1998, 1999, 2001 Red Hat, Inc. + ./src/recompiler/vl.h (BSD) + Copyright: (c) 2003 Fabrice Bellard + ./src/recompiler/dyngen.c (GPLv2) + Copyright: (c) 2003 Fabrice Bellard + +./src/recompiler/fpu + Copyright (C) John R. Hauser. + +./src/VBox/Devices/Graphics/BIOS + Copyright (c) 2004 Makoto Suzuki (suzu) + Copyright (C) 2002 Jeroen Janssen + +./src/VBox/Devices/PC/BIOS/ + Copyright (C) 2004 Fabrice Bellard + Copyright (C) 2005 Struan Bartlett + +./src/VBox/Frontends/src/linux/keyboard.c + Copyright 1993 Bob Amstadt + Copyright 1996 Albrecht Kleine + Copyright 1997 David Faure + Copyright 1998 Morten Welinder + Copyright 1998 Ulrich Weigand + Copyright 1999 Ove Kåven + +./src/VBox/Frontends/src/linux/keyboard_outofwine.h + +./src/VBox/Runtime/math/x86/fenv-x86.c + Copyright (c) 2004-2005 David Schultz + +./src/VBox/Devices/Graphics/BIOS/vgabios.c + Copyright: 2001,2002 the LGPL VGABios developers Team + +./src/libs/kStuff + Copyright (C) 2007 Sun Microsystems, Inc. + +On Debian systems, the complete text of the LGPL License +can be found in /usr/share/common-licenses/LGPL-2.1 file. + +------------------------------------------------------------------------------- +The Cygwin License applies to: + +./src/recompiler/a.out.h + Copyright 1997, 1998, 1999, 2001 Red Hat, Inc. + +A copy of this license is appended below. + +------------------------------------------------------------------------------- +Large part of the ./src/VBox/Additions/Linux/ subtree is taken from the X +sources and still carries the original license. Some work under +./src/VBox/Additions/Linux was derived from the X sources and carries both, the +original X license and the innotek GPL license. The remaining sources under +./src/VBox/Additions/Linux only carry the innotek GPL license. + +------------------------------------------------------------------------------- +The following files are licensed under GPLv2+: + +debian/vdfuse/vdfuse.c + Copyright (C) Terry Ellison and "h2o" + http://forums.virtualbox.org/viewtopic.php?f=7&t=17574 + +On Debian systems, the complete text of the GNU General Public License +can be found in /usr/share/common-licenses/GPL-2 file. + +------------------------------------------------------------------------------- + +Due to license issues, parts of the Guest Additions have to be removed from the +sourcecode. Some of the files were copyright Microsoft with an license which has to be +considered non-free. + +Below a copy of the MPL: +############################################################################### + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + + +The Cygwin License: +############################################################################### + This program 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 version 2 of the License. + 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, write to the + Free Software Foundation, Inc., + 51 Franklin St - + Fifth Floor, Boston, + MA 02110-1301, USA. + + *** NOTE *** + In accordance with section 10 of the GPL, Red Hat permits programs whose sources + are distributed under a license that complies with the Open Source definition + to be linked with libcygwin.a/cygwin1.dll without libcygwin.a/cygwin1.dll itself + causing the resulting program to be covered by the GNU GPL. + This means that you can port an Open Source(tm) application to cygwin, and + distribute that executable as if it didn't include a copy of + libcygwin.a/cygwin1.dll linked into it. Note that this does not apply to the + cygwin DLL itself. If you distribute a (possibly modified) version of the DLL + you must adhere to the terms of the GPL, i.e. you must provide sources + for the cygwin DLL. + + See http://www.opensource.org/docs/osd/ for the precise Open Source + Definition referenced above. + +The COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0 + +1. Definitions. + + 1.1. "Contributor" means each individual or entity that creates + or contributes to the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Software, prior Modifications used by a Contributor (if any), + and the Modifications made by that particular Contributor. + + 1.3. "Covered Software" means (a) the Original Software, or (b) + Modifications, or (c) the combination of files containing + Original Software with files containing Modifications, in + each case including portions thereof. + + 1.4. "Executable" means the Covered Software in any form other + than Source Code. + + 1.5. "Initial Developer" means the individual or entity that first + makes Original Software available under this License. + + 1.6. "Larger Work" means a work which combines Covered Software or + portions thereof with code not governed by the terms of this + License. + + 1.7. "License" means this document. + + 1.8. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed + herein. + + 1.9. "Modifications" means the Source Code and Executable form of + any of the following: + + A. Any file that results from an addition to, deletion from or + modification of the contents of a file containing Original + Software or previous Modifications; + + B. Any new file that contains any part of the Original + Software or previous Modifications; or + + C. Any new file that is contributed or otherwise made + available under the terms of this License. + + 1.10. "Original Software" means the Source Code and Executable + form of computer software code that is originally released + under this License. + + 1.11. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, + process, and apparatus claims, in any patent Licensable by + grantor. + + 1.12. "Source Code" means (a) the common form of computer software + code in which modifications are made and (b) associated + documentation included in or with such code. + + 1.13. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms + of, this License. For legal entities, "You" includes any + entity which controls, is controlled by, or is under common + control with You. For purposes of this definition, + "control" means (a) the power, direct or indirect, to cause + the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty + percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants. + + 2.1. The Initial Developer Grant. + + Conditioned upon Your compliance with Section 3.1 below and + subject to third party intellectual property claims, the Initial + Developer hereby grants You a world-wide, royalty-free, + non-exclusive license: + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer, to use, + reproduce, modify, display, perform, sublicense and + distribute the Original Software (or portions thereof), + with or without Modifications, and/or as part of a Larger + Work; and + + (b) under Patent Claims infringed by the making, using or + selling of Original Software, to make, have made, use, + practice, sell, and offer for sale, and/or otherwise + dispose of the Original Software (or portions thereof). + + (c) The licenses granted in Sections 2.1(a) and (b) are + effective on the date Initial Developer first distributes + or otherwise makes the Original Software available to a + third party under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: (1) for code that You delete from the Original + Software, or (2) for infringements caused by: (i) the + modification of the Original Software, or (ii) the + combination of the Original Software with other software + or devices. + + 2.2. Contributor Grant. + + Conditioned upon Your compliance with Section 3.1 below and + subject to third party intellectual property claims, each + Contributor hereby grants You a world-wide, royalty-free, + non-exclusive license: + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor to use, reproduce, + modify, display, perform, sublicense and distribute the + Modifications created by such Contributor (or portions + thereof), either on an unmodified basis, with other + Modifications, as Covered Software and/or as part of a + Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either + alone and/or in combination with its Contributor Version + (or portions of such combination), to make, use, sell, + offer for sale, have made, and/or otherwise dispose of: + (1) Modifications made by that Contributor (or portions + thereof); and (2) the combination of Modifications made by + that Contributor with its Contributor Version (or portions + of such combination). + + (c) The licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first distributes or + otherwise makes the Modifications available to a third + party. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: (1) for any code that Contributor has deleted + from the Contributor Version; (2) for infringements caused + by: (i) third party modifications of Contributor Version, + or (ii) the combination of Modifications made by that + Contributor with other software (except as part of the + Contributor Version) or other devices; or (3) under Patent + Claims infringed by Covered Software in the absence of + Modifications made by that Contributor. + +3. Distribution Obligations. + + 3.1. Availability of Source Code. + + Any Covered Software that You distribute or otherwise make + available in Executable form must also be made available in Source + Code form and that Source Code form must be distributed only under + the terms of this License. You must include a copy of this + License with every copy of the Source Code form of the Covered + Software You distribute or otherwise make available. You must + inform recipients of any such Covered Software in Executable form + as to how they can obtain such Covered Software in Source Code + form in a reasonable manner on or through a medium customarily + used for software exchange. + + 3.2. Modifications. + + The Modifications that You create or to which You contribute are + governed by the terms of this License. You represent that You + believe Your Modifications are Your original creation(s) and/or + You have sufficient rights to grant the rights conveyed by this + License. + + 3.3. Required Notices. + + You must include a notice in each of Your Modifications that + identifies You as the Contributor of the Modification. You may + not remove or alter any copyright, patent or trademark notices + contained within the Covered Software, or any notices of licensing + or any descriptive text giving attribution to any Contributor or + the Initial Developer. + + 3.4. Application of Additional Terms. + + You may not offer or impose any terms on any Covered Software in + Source Code form that alters or restricts the applicable version + of this License or the recipients' rights hereunder. You may + choose to offer, and to charge a fee for, warranty, support, + indemnity or liability obligations to one or more recipients of + Covered Software. However, you may do so only on Your own behalf, + and not on behalf of the Initial Developer or any Contributor. + You must make it absolutely clear that any such warranty, support, + indemnity or liability obligation is offered by You alone, and You + hereby agree to indemnify the Initial Developer and every + Contributor for any liability incurred by the Initial Developer or + such Contributor as a result of warranty, support, indemnity or + liability terms You offer. + + 3.5. Distribution of Executable Versions. + + You may distribute the Executable form of the Covered Software + under the terms of this License or under the terms of a license of + Your choice, which may contain terms different from this License, + provided that You are in compliance with the terms of this License + and that the license for the Executable form does not attempt to + limit or alter the recipient's rights in the Source Code form from + the rights set forth in this License. If You distribute the + Covered Software in Executable form under a different license, You + must make it absolutely clear that any terms which differ from + this License are offered by You alone, not by the Initial + Developer or Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred + by the Initial Developer or such Contributor as a result of any + such terms You offer. + + 3.6. Larger Works. + + You may create a Larger Work by combining Covered Software with + other code not governed by the terms of this License and + distribute the Larger Work as a single product. In such a case, + You must make sure the requirements of this License are fulfilled + for the Covered Software. + +4. Versions of the License. + + 4.1. New Versions. + + Sun Microsystems, Inc. is the initial license steward and may + publish revised and/or new versions of this License from time to + time. Each version will be given a distinguishing version number. + Except as provided in Section 4.3, no one other than the license + steward has the right to modify this License. + + 4.2. Effect of New Versions. + + You may always continue to use, distribute or otherwise make the + Covered Software available under the terms of the version of the + License under which You originally received the Covered Software. + If the Initial Developer includes a notice in the Original + Software prohibiting it from being distributed or otherwise made + available under any subsequent version of the License, You must + distribute and make the Covered Software available under the terms + of the version of the License under which You originally received + the Covered Software. Otherwise, You may also choose to use, + distribute or otherwise make the Covered Software available under + the terms of any subsequent version of the License published by + the license steward. + + 4.3. Modified Versions. + + When You are an Initial Developer and You want to create a new + license for Your Original Software, You may create and use a + modified version of this License if You: (a) rename the license + and remove any references to the name of the license steward + (except to note that the license differs from this License); and + (b) otherwise make it clear that the license contains terms which + differ from this License. + +5. DISCLAIMER OF WARRANTY. + + COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" + BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, + INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED + SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR + PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND + PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY + COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE + INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY + NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF + WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS + DISCLAIMER. + +6. TERMINATION. + + 6.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to + cure such breach within 30 days of becoming aware of the breach. + Provisions which, by their nature, must remain in effect beyond + the termination of this License shall survive. + + 6.2. If You assert a patent infringement claim (excluding + declaratory judgment actions) against Initial Developer or a + Contributor (the Initial Developer or Contributor against whom You + assert such claim is referred to as "Participant") alleging that + the Participant Software (meaning the Contributor Version where + the Participant is a Contributor or the Original Software where + the Participant is the Initial Developer) directly or indirectly + infringes any patent, then any and all rights granted directly or + indirectly to You by such Participant, the Initial Developer (if + the Initial Developer is not the Participant) and all Contributors + under Sections 2.1 and/or 2.2 of this License shall, upon 60 days + notice from Participant terminate prospectively and automatically + at the expiration of such 60 day notice period, unless if within + such 60 day period You withdraw Your claim with respect to the + Participant Software against such Participant either unilaterally + or pursuant to a written agreement with Participant. + + 6.3. In the event of termination under Sections 6.1 or 6.2 above, + all end user licenses that have been validly granted by You or any + distributor hereunder prior to termination (excluding licenses + granted to You by any distributor) shall survive termination. + +7. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE + INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF + COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE + LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR + CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT + LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK + STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL + INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT + APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO + NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR + CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT + APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + + The Covered Software is a "commercial item," as that term is + defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial + computer software" (as that term is defined at 48 + C.F.R. 252.227-7014(a)(1)) and "commercial computer software + documentation" as such terms are used in 48 C.F.R. 12.212 + (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 + C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all + U.S. Government End Users acquire Covered Software with only those + rights set forth herein. This U.S. Government Rights clause is in + lieu of, and supersedes, any other FAR, DFAR, or other clause or + provision that addresses Government rights in computer software + under this License. + +9. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed + by the law of the jurisdiction specified in a notice contained + within the Original Software (except to the extent applicable law, + if any, provides otherwise), excluding such jurisdiction's + conflict-of-law provisions. Any litigation relating to this + License shall be subject to the jurisdiction of the courts located + in the jurisdiction and venue specified in a notice contained + within the Original Software, with the losing party responsible + for costs, including, without limitation, court costs and + reasonable attorneys' fees and expenses. The application of the + United Nations Convention on Contracts for the International Sale + of Goods is expressly excluded. Any law or regulation which + provides that the language of a contract shall be construed + against the drafter shall not apply to this License. You agree + that You alone are responsible for compliance with the United + States export administration regulations (and the export control + laws and regulation of any other countries) when You use, + distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or + indirectly, out of its utilization of rights under this License + and You agree to work with Initial Developer and Contributors to + distribute such responsibility on an equitable basis. Nothing + herein is intended or shall be deemed to constitute any admission + of liability. + +-------------------------------------------------------------------- + +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND +DISTRIBUTION LICENSE (CDDL) + +For Covered Software in this distribution, this License shall be +governed by the laws of Germany. Legal venue shall be Stuttgart, +Germany. + +The Debian packaging is copyright 2007, Patrick Winnertz , +Daniel Baumann , Philipp Hug and is licensed under +the GPL, see `/usr/share/common-licenses/GPL'. --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-x11.links +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-x11.links @@ -0,0 +1 @@ +/usr/lib/VBoxOGL.so /usr/lib/dri/vboxvideo_dri.so --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.lintian-overrides +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.lintian-overrides @@ -0,0 +1,18 @@ +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/VBoxREM.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxRT.so +virtualbox-ose: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVMM.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 +virtualbox-ose: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDDR0.r0 +virtualbox-ose: unstripped-binary-or-object ./usr/lib/virtualbox/VMMGC.gc +virtualbox-ose: unstripped-binary-or-object ./usr/lib/virtualbox/VMMR0.r0 +virtualbox-ose: setuid-gid-binary usr/lib/virtualbox/VBoxHeadless 6755 root/root +virtualbox-ose: setuid-gid-binary usr/lib/virtualbox/VBoxNetAdpCtl 6755 root/root +virtualbox-ose: setuid-gid-binary usr/lib/virtualbox/VBoxNetDHCP 6755 root/root +virtualbox-ose: setuid-gid-binary usr/lib/virtualbox/VBoxSDL 6755 root/root --- virtualbox-ose-4.0.4-dfsg.orig/debian/README.source +++ virtualbox-ose-4.0.4-dfsg/debian/README.source @@ -0,0 +1,42 @@ +Debian patch system +=================== + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. + + +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-ose-$VERSION +tar -xj -C ../virtualbox-ose-$VERSION --strip-components 1 -f ../virtualbox-ose_$VERSION.orig.tar.bz2 +rm -rf ../virtualbox-ose-$VERSION/debian +cp -a debian ../virtualbox-ose-$VERSION +cd ../virtualbox-ose-$VERSION +debchange -v $VERSION-dfsg-1 +fakeroot debian/rules dfsg-free +rm ../virtualbox-ose_$VERSION.orig.tar.bz2 + + +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]_OSE)//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]_OSE)//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]_OSE)//g' > VBoxSDL.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]_OSE)//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]_OSE)//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]_OSE)//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]_OSE)//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]_OSE)//g' > VBoxService.8 +help2man --section=8 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxControl | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_OSE)//g' > VBoxControl.8 +help2man --section=8 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info mount.vboxsf | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_OSE)//g' > mount.vboxsf.8 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.docs +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.docs @@ -0,0 +1,4 @@ +debian/README.Debian.html +debian/virtualbox-ose.files/wiki.html +debian/virtualbox-ose.files/NEWS.Debian +out/bin/UserManual.pdf --- virtualbox-ose-4.0.4-dfsg.orig/debian/LocalConfig.kmk +++ virtualbox-ose-4.0.4-dfsg/debian/LocalConfig.kmk @@ -0,0 +1,15 @@ +VBOX_WITH_ADDITION_DRIVERS = +VBOX_WITH_INSTALLER = 1 +VBOX_WITH_LINUX_ADDITIONS = 1 +VBOX_WITH_X11_ADDITIONS = 1 +VBOX_WITH_TESTCASES = +VBOX_WITH_TESTSUITE = +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 = /usr/share/doc/virtualbox-ose +VBOX_WITH_VNC := 1 +VBOX_WITH_VBOXBFE := +VBOX_JAVA_HOME := /usr/lib/jvm/default-java --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-utils.init +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-utils.init @@ -0,0 +1,73 @@ +#!/bin/sh +# (C) 2007 Michael Meskes + +### BEGIN INIT INFO +# Provides: vboxguest virtualbox-ose-guest-utils +# Short-Description: VirtualBox Linux Additions +# Required-Start: $remote_fs +# Required-Stop: $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +### END INIT INFO + +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" + return 1 + fi + + return 0 +} + +case "$1" in + start) + in_virtual_machine || exit 0 + log_begin_msg "Starting VirtualBox Additions" + + 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_begin_msg "Stopping VirtualBox Additions" + + start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/VBoxService + if [ $? -ne 0 ]; then + log_end_msg 1 + exit 1 + fi + + log_end_msg 0 + ;; + + restart|force-reload) + $0 stop && $0 start + ;; + + status) + if ! pgrep -x VBoxService > /dev/null; then + echo "VBoxService daemon isn't running" + exit 3 + fi + + exit 0 + ;; + + *) + echo "Usage: $0 {start|stop|restart|force-reload|status}" + exit 1 + ;; +esac --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-dkms.links.in +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-dkms.links.in @@ -0,0 +1,4 @@ +/usr/src/virtualbox-ose-guest-CVERSION/r0drv /usr/src/virtualbox-ose-guest-CVERSION/vboxguest/r0drv +/usr/src/virtualbox-ose-guest-CVERSION/r0drv /usr/src/virtualbox-ose-guest-CVERSION/vboxsf/r0drv +/usr/src/virtualbox-ose-guest-CVERSION/include /usr/src/virtualbox-ose-guest-CVERSION/vboxguest/include +/usr/src/virtualbox-ose-guest-CVERSION/include /usr/src/virtualbox-ose-guest-CVERSION/vboxsf/include --- virtualbox-ose-4.0.4-dfsg.orig/debian/changelog +++ virtualbox-ose-4.0.4-dfsg/debian/changelog @@ -0,0 +1,2203 @@ +virtualbox-ose (4.0.4-dfsg-1ubuntu4.1) natty-security; urgency=low + + * SECURITY UPDATE: possible arbitrary code execution on the host (LP: #816874) + - debian/patches/31-CVE-2011-2305.patch: patch from upstream + - CVE-2011-2305 + + -- Felix Geyer Wed, 27 Jul 2011 11:45:28 +0200 + +virtualbox-ose (4.0.4-dfsg-1ubuntu4) natty; urgency=low + + * Fix build failures of guest kernel modules with kernel 2.6.39-rc1. + - Add 30-kernel-2.6.39.patch, cherry-picked from upstream. + + -- Felix Geyer Fri, 22 Apr 2011 19:00:47 +0200 + +virtualbox-ose (4.0.4-dfsg-1ubuntu3) natty; urgency=low + + * Rebuild to pick up new xserver-xorg-core dependencies. + + -- Felix Geyer Fri, 18 Mar 2011 22:06:00 +0100 + +virtualbox-ose (4.0.4-dfsg-1ubuntu2) natty; urgency=low + + * Rebuild to pick up new xserver-xorg-core dependencies. + + -- Felix Geyer Wed, 23 Feb 2011 20:06:25 +0100 + +virtualbox-ose (4.0.4-dfsg-1ubuntu1) natty; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add Apport hook. + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Drop *-source packages. + * Drop ubuntu-01-xserver-1.10.diff, fixed upstream. + + -- Felix Geyer Mon, 21 Feb 2011 17:45:23 +0100 + +virtualbox-ose (4.0.4-dfsg-1) unstable; urgency=low + + [ Felix Geyer ] + * New upstream release. (LP: #722431) + * Drop 30-kernel-2.6.38.diff, applied upstream. + * Adapt 18-system-xorg.patch to new upstream version. + * Drop unused lintian overrides. + + [ Patrick Winnertz ] + * Add if statement around adduser to prevent failure in some cases. + (Closes: #611604) + + -- Felix Geyer Fri, 18 Feb 2011 18:09:29 +0100 + +virtualbox-ose (4.0.2-dfsg-1ubuntu2) natty; urgency=low + + * Support the current snapshot of X.Org Server 1.10. (LP: #712385) + - Add ubuntu-01-xserver-1.10.diff. + + -- Felix Geyer Fri, 04 Feb 2011 23:27:19 +0100 + +virtualbox-ose (4.0.2-dfsg-1ubuntu1) natty; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add Apport hook. + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Drop *-source packages. + * Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream. + * Drop ubuntu-02-as-needed.patch, added to the Debian package. + + -- Felix Geyer Sun, 30 Jan 2011 23:27:25 +0100 + +virtualbox-ose (4.0.2-dfsg-1) unstable; urgency=low + + * New upstream release. (LP: #709027) + - Ships with a manual and upstream changelog. + (Closes: #483702, #541127; LP: #243782) + * Adapt patches for new upstream version. + * Add new required build-dependencies: + default-jdk, genisoimage, makeself, texlive-fonts-extra, + texlive-fonts-recommended, texlive-latex-extra, texlive-latex-recommended. + * Set VBOX_JAVA_HOME to /usr/lib/jvm/default-java. + * Add 28-no-selinux-fedora.patch so VirtualBox doesn't try to install + selinux-fedora/vbox_x11.pp which is stripped by the dfsg-free target. + * Update install files. + * Add 29-fix-ftbfs-as-needed.patch to fix FTBFS with ld --as-needed. + * Automatically generate the pixmap icon from png. + * Fix the watch file. + * Update man pages. + * Support passing through USB 1.1 devices to virtual machines. + * Update vdfuse for VirtualBox 4. + * Make the kernel modules buildable with kernel 2.6.38-rc2. (LP: #705593) + - Add 30-kernel-2.6.38.diff + + -- Felix Geyer Sat, 29 Jan 2011 20:13:14 +0100 + +virtualbox-ose (3.2.12-dfsg-1ubuntu2) natty; urgency=low + + * Rebuild with python 2.7 as the python default. + + -- Matthias Klose Thu, 09 Dec 2010 16:57:38 +0000 + +virtualbox-ose (3.2.12-dfsg-1ubuntu1) natty; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add Apport hook. + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Drop *-source packages. + - Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized + variables. + - Add ubuntu-02-as-needed.patch to fix FTBFS with --as-needed. + + -- Felix Geyer Sun, 05 Dec 2010 11:27:36 +0100 + +virtualbox-ose (3.2.12-dfsg-1) unstable; urgency=low + + * New upstream release. + * Drop 03-2.6.37.patch and 24-xserver-19-support.patch, applied upstream. + + -- Felix Geyer Thu, 02 Dec 2010 21:18:36 +0100 + +virtualbox-ose (3.2.10-dfsg-2ubuntu1) natty; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add Apport hook. + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Drop *-source packages. + - Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized + variables. + * Fixes: vboxvideo module fails to build with kernel 2.6.37. (LP: #671883) + * Fix FTBFS with --as-needed. + - Add ubuntu-02-as-needed.patch from Gentoo. + + -- Felix Geyer Mon, 22 Nov 2010 17:56:12 +0100 + +virtualbox-ose (3.2.10-dfsg-2) unstable; urgency=low + + * Added two patches from virtualbox-ose SVN/bug tracking to fix some + issues with kernels > 2.6.36. (Closes: #604259) + * Moved program to utilities where it belongs. + * Fixed typo in desktop file + + -- Michael Meskes Mon, 22 Nov 2010 12:28:19 +0100 + +virtualbox-ose (3.2.10-dfsg-1ubuntu1) natty; urgency=low + + * Merge from Debian unstable, remaining changes: + - VirtualBox should go in Accessories, not in System tools. + - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add Apport hook. + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Drop *-source packages. + * Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized + variables. Thanks to Lubomir Rintel for the patch. + + -- Felix Geyer Fri, 15 Oct 2010 02:12:28 +0200 + +virtualbox-ose (3.2.10-dfsg-1) unstable; urgency=low + + * New upstream release. + * Adapt 18-system-xorg.patch and 27-hide-host-cache-warning.patch for + new upstream version. + * Drop 25-vboxnetadp_kernel_2.6.36.patch and 26-vboxsf_kernel_2.6.36.patch, + applied upstream. + * Drop lpia from the architectures as Ubuntu doesn't support it anymore and + Debian never has. + + -- Felix Geyer Tue, 12 Oct 2010 23:54:04 +0200 + +virtualbox-ose (3.2.8-dfsg-2ubuntu1) maverick; urgency=low + + * Merge from Debian unstable (LP: #637320), remaining changes: + - VirtualBox should go in Accessories, not in System tools. (LP: #288590) + - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add Apport hook. + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Drop *-source packages. + + -- Felix Geyer Mon, 13 Sep 2010 17:48:14 +0200 + +virtualbox-ose (3.2.8-dfsg-2) unstable; urgency=high + + * Fix FTBFS with recent libdrm-dev versions. (Closes: #594599) + * Make the kernel modules buildable with kernel 2.6.36. + (Closes: #594602; LP: #619497) + - Add 25-vboxnetadp_kernel_2.6.36.patch + - Add 26-vboxsf_kernel_2.6.36.patch + * Silently enable the host I/O cache when the image is on an ext4/XFS + partition. No need to warn users about it. (Closes: #595050) + - Add 27-hide-host-cache-warning.patch + * Recompiled to fix incorrectly generated dependencies. (Closes: #595715) + * Add man pages for all commands. (Closes: #440609; LP: #610895) + + -- Felix Geyer Mon, 13 Sep 2010 11:29:12 +0200 + +virtualbox-ose (3.2.8-dfsg-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable (LP: #618934), remaining changes: + - VirtualBox should go in Accessories, not in System tools. (LP: #288590) + - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add Apport hook. + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Drop *-source packages. + + -- Felix Geyer Mon, 16 Aug 2010 23:03:36 +0200 + +virtualbox-ose (3.2.8-dfsg-1) unstable; urgency=low + + * New upstream release. (LP: #614697) + * Replace the reference to /usr/share/common-licenses/BSD with the full text + of the license. + * Bump Standards-Version to 3.9.1, no changes needed. + * Revert: virtualbox-ose-dkms and virtualbox-ose-guest-dkms break each other + instead of conflicting. + * Drop 24-dsdt.patch, applied upstream. + * Move "$@" to the first parameter of dh to be compatible with debhelper + compat level 8. + * Add 24-xserver-19-support.patch to make the guest additions compatible + with XServer 1.9. (LP: #616217) + + -- Felix Geyer Tue, 10 Aug 2010 21:06:46 +0200 + +virtualbox-ose (3.2.6-dfsg-2ubuntu1) maverick; urgency=low + + * Merge from Debian unstable (LP: #610398), remaining changes: + - VirtualBox should go in Accessories, not in System tools. (LP: #288590) + - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add Apport hook. + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Drop *-source packages. + + -- Felix Geyer Tue, 27 Jul 2010 11:54:39 +0200 + +virtualbox-ose (3.2.6-dfsg-2) unstable; urgency=low + + * Added patch taken from FreeBSD to make DSDT files compile with + latest versions of iasl. (Closes: #587609) + * Bump Standards-Version to 3.9.0, no changes needed. + + -- Michael Meskes Fri, 02 Jul 2010 15:24:21 +0200 + +virtualbox-ose (3.2.6-dfsg-1) unstable; urgency=low + + [ Michael Meskes ] + * Do not use standard compiler optimization for vdfuse. (Closes: + #586265) + + [ Felix Geyer ] + * New upstream release. + * virtualbox-ose-dkms and virtualbox-ose-guest-dkms break each other + instead of conflicting. + + -- Felix Geyer Sat, 26 Jun 2010 01:26:22 +0200 + +virtualbox-ose (3.2.4-dfsg-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - VirtualBox should go in Accessories, not in System tools. (LP: #288590) + - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add Apport hook. + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Drop *-source packages. + + -- Felix Geyer Mon, 14 Jun 2010 09:52:34 +0200 + +virtualbox-ose (3.2.4-dfsg-1) unstable; urgency=low + + * New upstream release. + + -- Felix Geyer Wed, 09 Jun 2010 15:31:05 +0200 + +virtualbox-ose (3.2.2-dfsg-1) unstable; urgency=low + + * Imported Upstream version 3.2.2-dfsg (Closes: #584488, #585003) + * Fixed dh_install usage in rules file for backports. - thanks to + Corey Wright + + -- Michael Meskes Tue, 08 Jun 2010 11:50:51 +0200 + +virtualbox-ose (3.2.0-dfsg-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - Set x11 backport switch to "lucid". + - VirtualBox should go in Accessories, not in System tools. (LP: #288590) + - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add Apport hook. + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Drop *-source packages. + * Drop u03-fix-cpu-lockup.dpatch, fixed upstream. + * Remove Launchpad integration as (non-packaging) bugs should be reported + upstream. + + -- Felix Geyer Tue, 25 May 2010 22:51:39 +0200 + +virtualbox-ose (3.2.0-dfsg-1) unstable; urgency=low + + [ Felix Geyer ] + * New upstream release. + * Add 23-remove-invalid-chars-check.patch to remove a check for invalid + characters in the build path since kBuild is now able to handle those. + * Fix FTBFS when building without arch-all packages. + + [ Michael Meskes ] + * Changed order of some commands to make sure links are created inside + the source tarball not outside. + + -- Michael Meskes Sun, 23 May 2010 11:39:11 +0200 + +virtualbox-ose (3.1.53-dfsg-1) experimental; urgency=low + + * New upstream release 3.2.0 Beta 3. + * Add build-dependencies required by new upstream version. + * Adapt 18-system-xorg.dpatch to new upstream version. + * Update to new upstream release of vdfuse. + * Build vdfuse with -Wl,--as-needed. + * Install vbox PAM module. + * Drop 17-disable-help-contents.dpatch and 20-hide-help-buttons.dpatch + as VirtualBox can download the manual. + * Enable VDE networking. + * Enable VNC server in VBoxHeadless. + * Don't build VBoxBFE as it's not installed anyway. + * Hide the update menu item and settings page instead of disabling them. + * Make both dkms packages conflict with each other as the kernel modules + export the same symbol. (LP: #571574) + * Switch from dpatch to quilt patching system. + * Convert debian/rules to dh7. + * Use dkms debhelper script. + + -- Felix Geyer Thu, 13 May 2010 18:20:43 +0200 + +virtualbox-ose (3.1.8-dfsg-1) unstable; urgency=low + + * New upstream version (LP: #578723). + - Fixes vboxsf file systems not being mounted while booting on Ubuntu. + (LP: #530179) + * Adapt 18-system-xorg.dpatch and 06-xsession.dpatch to new upstream version. + * Use upstream 50-vboxmouse.conf instead of our own. + * Add libxrandr-dev to build-dependencies. + * Don't load the kernel modules in the guest utils init script as they are + loaded automatically. + * Drop 15-wined3d-guest-addition.dpatch as the Windows guest additions + provide Direct3D acceleration. + + -- Felix Geyer Tue, 11 May 2010 18:06:04 +0200 + +virtualbox-ose (3.1.6-dfsg-3) unstable; urgency=low + + * Move 10-vboxmouse.conf to 50-vboxmouse.conf and install it in + /usr/share/X11/xorg.conf.d. + * Use substvar from new xsfbs.mk. + + -- Felix Geyer Sun, 18 Apr 2010 18:56:10 +0200 + +virtualbox-ose (3.1.6-dfsg-2ubuntu2) lucid; urgency=low + + * Disable Launchpad integration for the stable release. + * Add u03-fix-cpu-lockup.dpatch, cherry-picked from upstream to + fix a bug causing the CPU to lockup on boot. (LP: #562187) + + -- Felix Geyer Wed, 14 Apr 2010 16:53:41 +0200 + +virtualbox-ose (3.1.6-dfsg-2ubuntu1) lucid; urgency=low + + * Merge from Debian unstable (LP: #549588), remaining changes: + - VirtualBox should go in Accessories, not in System tools (LP: #288590) + - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add Apport hook + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Add Launchpad integration + - debian/control + - debian/lpi-bug.xpm + - debian/patches/u02-lp-integration.dpatch + - Replace *-source packages with transitional packages for *-dkms + * Mention the transitional status of the *-source packages in the long + description to fix lintian warning empty-binary-package. + + -- Felix Geyer Thu, 01 Apr 2010 14:42:00 +0200 + +virtualbox-ose (3.1.6-dfsg-2) unstable; urgency=low + + * Improve 20-hide-help-buttons.dpatch so all help buttons are hidden. + * Set source format version explicitly to "1.0". + * Adapt to xserver 1.8 input driver detection. (LP: #546933) + - Add 10-vboxmouse.conf + - Update virtualbox-ose-guest-x11.udev + + -- Felix Geyer Wed, 31 Mar 2010 15:15:44 +0200 + +virtualbox-ose (3.1.6-dfsg-1) unstable; urgency=low + + * New upstream version. + * Drop 02-r27248.dpatch as it's applied upstream. + * Use dh_lintian to install overrides. + + -- Felix Geyer Fri, 26 Mar 2010 11:25:46 +0100 + +virtualbox-ose (3.1.4-dfsg-3) unstable; urgency=low + + [ Felix Geyer ] + * Move virtualbox-ose-guest-x11 to section x11. + * Replace 18-xorg-1.6.dpatch with a new patch that allows to easily + switch to a different X Server version. + * Remove /usr/share/virtualbox/x11config15.pl as we are at X Server 1.7. + + [ Michael Meskes ] + * Apply upstream changeset 27248 to make virtualbox guest additions + work with drm code in kernels 2.6.33+. (Closes: #574662) + * Applied patch by nutzteil to make init script + consistent in (Closes: #574831) + + -- Michael Meskes Tue, 23 Mar 2010 15:54:49 +0100 + +virtualbox-ose (3.1.4-dfsg-2ubuntu1) lucid; urgency=low + + * Merge from Debian unstable (LP: #528561), remaining changes: + - VirtualBox should go in Accessories, not in System tools (LP: #288590) + - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add Apport hook + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Add Launchpad integration + - debian/control + - debian/lpi-bug.xpm + - debian/patches/u02-lp-integration.dpatch + - Replace *-source packages with transitional packages for *-dkms + * Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code + (LP: #535297) + * Add a list of linux-headers packages to the apport hook + * Update debian/patches/u02-lp-integration.dpatch with a + DEP-3 compliant header + * Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source + Depends + + -- Felix Geyer Thu, 11 Mar 2010 17:16:37 +0100 + +virtualbox-ose (3.1.4-dfsg-2) unstable; urgency=low + + [ Felix Geyer ] + * Add INSTALL_PATH variable + * Downgrade library dependencies of VBoxTestOGL to Recommends. + (Closes: #567800) + * Provide an udev instead of hal rule for the mouse driver + autodetection. (LP: #525558) + * Update device names in guest udev rules. + + [ Michael Meskes ] + * Document QT4 usage for virtualbox-ose. + * Changed build-dependency from libcap2-dev to libcap-dev. (Closes: + #569769) + + -- Michael Meskes Tue, 16 Feb 2010 15:03:46 +0100 + +virtualbox-ose (3.1.4-dfsg-1) unstable; urgency=low + + * New upstream version: + - Rebuild makes sure all packages share the same version. (Closes: #567030, + #568296) + - Fixes mouse integration in Lenny. (Closes: #565285) + + [ Felix Geyer ] + * Install EFI firmware images + * Make the dkms dependency versioned as we require the common postinst + script to be present + * Pass the architecture to the dkms postinst script + * Use ${source:Version} for arch all package dependencies + * Bump Standards-Version to 3.8.4, no changes needed. + * Make patches DEP-3 compliant + * Update vdfuse code as upstream has changed the license to GPLv2+ + * Adapt 18-xorg-1.6.dpatch for new upstream version. + * Add lintian override for virtualbox-ose-fuse + + [ Michael Meskes ] + * Merged Ubuntu patch to disable update action into Debian tree. + * Removed Uploaders that haven't committed anything for more than a + year. + * Added virtualbox-ose-fuse package to fuse mount vdi images. (Closes: + #565900) + + -- Michael Meskes Sat, 13 Feb 2010 21:31:50 +0100 + +virtualbox-ose (3.1.2-dfsg-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable (LP: #498219), remaining changes: + - Disable update action + - debian/patches/u01-disable-update-action.dpatch + - VirtualBox should go in Accessories, not in System tools (LP: #288590) + - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add Apport hook + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Add Launchpad integration + - debian/control + - debian/lpi-bug.xpm + - debian/patches/u02-lp-integration.dpatch + * Fixes the following bugs: + - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625) + - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935) + - The *-source packages try to build the kernel modules even though the + kernel headers aren't available (LP: #473334) + * Replace *-source packages with transitional packages for *-dkms. + * Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for + new upstream version. + + -- Felix Geyer Fri, 18 Dec 2009 16:44:29 +0100 + +virtualbox-ose (3.1.2-dfsg-1) unstable; urgency=low + + [ Felix Geyer ] + * New upstream version. + - Fixes FTBFS with binutils-gold. (Closes: #556918) + * Adapt patches for new upstream version. + * Change priority to optional (except for the debug package). + * virtualbox-ose-guest-utils: Recommend dkms or source package instead + of both. + * Use common dkms postinst script instead of custom code. (LP: #497149) + * Check for right package in dkms prerm. + + -- Michael Meskes Fri, 18 Dec 2009 08:23:16 +0100 + +virtualbox-ose (3.1.0-dfsg-3) unstable; urgency=low + + * Removed yet another mentioning of upstream's init script. (Closes: + #560320) + * Adjusted dependencies to new setup. (Closes: #556595) + + -- Michael Meskes Fri, 11 Dec 2009 11:45:14 +0100 + +virtualbox-ose (3.1.0-dfsg-2) unstable; urgency=low + + [ Michael Meskes ] + * Check for right package in postinst. (Closes: #559502) + + [ Felix Geyer ] + * Made *-dkms packages only replace older *-source packages + * Promote dkms to a dependency + * Build-depend on libqt4-opengl-dev + + -- Michael Meskes Tue, 08 Dec 2009 08:11:09 +0100 + +virtualbox-ose (3.1.0-dfsg-1) experimental; urgency=low + + * Imported Upstream version 3.1.0-dfsg (Closes: #559172) + * Divided -source packages into a classical -source package and + a -dkms package. + + -- Michael Meskes Thu, 03 Dec 2009 09:46:14 +0100 + +virtualbox-ose (3.0.12-dfsg-1) unstable; urgency=low + + [ Felix Geyer ] + * New Upstream Version + + -- Michael Meskes Fri, 27 Nov 2009 11:56:21 +0100 + +virtualbox-ose (3.0.10-dfsg-2) unstable; urgency=low + + * Downgrade dkms dependency to recommendation. (Closes: #553918) + * Added dependencies for building with m-a. + * Changed source packages to also build modules via module-assistant. + (Closes: #554385) + + -- Michael Meskes Sat, 14 Nov 2009 20:43:09 +0100 + +virtualbox-ose (3.0.10-dfsg-1) unstable; urgency=low + + [ Felix Geyer ] + * Fix SHUTDOWN_USERS=all only parses the first user + * New Upstream version + * Added dependency upon pciutils to virtualbox-ose-guest-utils. + (Closes: #551390) + + [ Michael Meskes ] + * Converted virtualbox-ose to dkms. (Closes: #551531) - thanks to + Ubuntu + + -- Michael Meskes Sat, 31 Oct 2009 19:58:01 +0100 + +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: + - 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 + - virtualbox, virtualbox-* (names of the upstream proprietary packages) + conflict with virtualbox-ose (LP: #379878) + * Make debug package depend on normal or guest utils package + * Drop patches/22-pulseaudio-stubs.dpatch (applied upstream) + * Rename Ubuntu specific patches to uXX-*.dpatch + * Fix lintian warnings in maintainer scripts + + -- Felix Geyer Mon, 14 Sep 2009 18:25:07 +0200 + +virtualbox-ose (3.0.6-dfsg-1) unstable; urgency=low + + [ Felix Geyer ] + * New Upstream Version, closes: #543234 + * Add 21-dont-strip-x11-drivers.dpatch: + Don't strip debugging symbols from x11 guest drivers + * Strip more unneeded library header files + * Drop 11-gcc-4.3.dpatch (not needed anymore) + + [ Michael Meskes ] + * Made debug package depend on normal package. + + -- Michael Meskes Fri, 11 Sep 2009 14:10:04 +0200 + +virtualbox-ose (3.0.4-dfsg-2) unstable; urgency=low + + * Made sure installed packages have the same version, closes: #538945 + + -- Michael Meskes Mon, 17 Aug 2009 13:31:47 +0200 + +virtualbox-ose (3.0.4-dfsg-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #416314), 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/13-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 + - debian/control + - debian/lpi-bug.xpm + - debian/patches/21-lp-integration.dpatch + - virtualbox, virtualbox-* (names of the upstream proprietary packages) + conflict with virtualbox-ose (LP: #379878) + * Fix FTBFS with PulseAudio 0.9.16 + - debian/patches/00list + - debian/patches/22-pulseaudio-stubs.dpatch + + -- Felix Geyer Thu, 13 Aug 2009 12:39:26 +0200 + +virtualbox-ose (3.0.4-dfsg-1) unstable; urgency=low + + [ Felix Geyer ] + * New Upstream Version + * Install network management tools and guest dri driver + * Drop vboxvideo.ids as the X server now uses an internal table to + pick a driver during autoconfig + + [ Michael Meskes ] + * Provide python stuff needed by vboxgtk, closes: #539445 + + -- Michael Meskes Mon, 10 Aug 2009 13:27:41 +0200 + +virtualbox-ose (3.0.2-dfsg-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #394188) + * Install virtual network management tool + * Improve apport hook + * Add launchpad integration + * Conflict with virtualbox-3.0 + + -- Felix Geyer Mon, 13 Jul 2009 21:56:50 +0200 + +virtualbox-ose (3.0.2-dfsg-1) unstable; urgency=low + + * New Upstream Version, closes: #536338, #536371, #536578 + * Do not create empty icons directory in virtualbox-ose package. + * Remove lintian overrides that are no longer needed. + + -- Michael Meskes Sat, 11 Jul 2009 20:04:17 +0200 + +virtualbox-ose (3.0.0-dfsg-2) unstable; urgency=low + + [ Felix Geyer ] + * Move to gcc 4.3, closes: #533786 + * Install 3D test program. + + [ Michael Meskes ] + * Added missing build dependencies, closes: #535853 + + -- Michael Meskes Sat, 04 Jul 2009 20:18:20 +0200 + +virtualbox-ose (3.0.0-dfsg-1) unstable; urgency=low + + * New Upstream Version + + -- Michael Meskes Wed, 01 Jul 2009 09:48:15 +0200 + +virtualbox-ose (2.2.4-dfsg-2) unstable; urgency=low + + * Added patch by Daniel Hahler to disable the + Help->Contents menu entry, closes: #533255 + * Applied patch by Felix Geyer to automatically load + vboxvfs, closes: #533250 + * Added upstream patch to fix appliance export problem, closes: #532870 + * Suggest new guest-additions package. + * Bumped Standards-Version to 3.8.2, no changes needed. + + -- Michael Meskes Sun, 28 Jun 2009 14:56:19 +0200 + +virtualbox-ose (2.2.4-dfsg-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, fixes the following bugs: + - Virtualbox OSE mouse integration doesn't work (LP: #379057) + - vboxwebsrv/vboxwebserv name confusion (LP: #383134) + - virtualbox-ose help buttons don't work (LP: #383823) + * Automatically load vboxvfs kernel module and mount all shared folders + from /etc/fstab (LP: #385494) + * Stop providing/replacing virtualbox, virtualbox-* and virtualbox-source, + so that virtualbox-ose and virtualbox-ose-source can conflict with + virtualbox, virtualbox-2.0, virtualbox-2.1 and virtualbox-2.2 (LP: #379878) + + -- Felix Geyer Sun, 14 Jun 2009 12:40:03 +0200 + +virtualbox-ose (2.2.4-dfsg-1) unstable; urgency=low + + * New Upstream Version, closes: #531468 + * Added patch by Felix Geyer to remove disabled help + buttons, closes: #531320 + * Moved hal driver description to make sure it gets merged in after evdev + driver description, closes: #531618 + + -- Michael Meskes Sun, 21 Jun 2009 14:06:59 +0200 + +virtualbox-ose (2.2.2-dfsg-3) unstable; urgency=low + + * Made virtualbox-ose-qt package only replace older virtualbox-ose packages + that still contained the qt frontend, closes: #527140 + * Added the same versioning for virtualbox-ose-guest-x11. + * Fixed typo in vboxwebsrv call. + * Applied patch by Felix Geyer to make X autodetect + mouse using hal, closes: #530299 + * Applied patch by Felix Geyer to set correct + permissions for guest devices, closes: #530302 + * Remove vbox.cfg as suggested and implemented by Daniel Hahler + , closes: #530321 + + -- Michael Meskes Fri, 29 May 2009 13:12:07 +0200 + +virtualbox-ose (2.2.2-dfsg-2ubuntu3) karmic; urgency=low + + * Rollback my last change in the last upload: do not conflict + with packages we're providing ourselves (LP: #379878). + - debian/control + + -- Daniel Hahler Mon, 25 May 2009 01:02:11 +0200 + +virtualbox-ose (2.2.2-dfsg-2ubuntu2) karmic; urgency=low + + [ Felix Geyer ] + * Install virtualbox-ose-source udev rules + - debian/rules + * Add missing vboxuser udev rule and fix permissions for + vboxadd (Closes: #530302) + - debian/virtualbox-ose-guest-source.udev + * Auto-detect mouse driver by installing HAL device information + (Closes: #530299) + - debian/virtualbox-ose-guest-x11.install + + [ Daniel Hahler ] + * Remove usage/references to /etc/vbox/vbox.cfg (as handled + upstream) (LP: #280973). + This prevents "Could not find VirtualBox installation. + Please reinstall." error, after having installed the + upstream debian package. + - debian/virtualbox-ose.files/VBox.sh: do not source + vbox.cfg anymore. + - Delete debian/virtualbox-ose.files/vbox.cfg + - debian/virtualbox-ose.preinst: remove vbox.cfg on + upgrades. + * Move debian/virtualbox-ose.udev => virtualbox-ose-source.udev, + to complement virtualbox-ose-guest-source.udev. + * virtualbox-ose-source: conflict with virtualbox.org packages + (LP: #379878). + - debian/control + + -- Daniel Hahler Sun, 24 May 2009 02:22:17 +0200 + +virtualbox-ose (2.2.2-dfsg-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #358215), remaining changes: + - Disable update action + - patches/13-disable-update-action.dpatch + - Disable Help Contents menu item + - patches/17-disable-help-contents.dpatch + - Enable DKMS support on virtualbox host and guest modules (LP: #267097) + - Drop: + - virtualbox-ose-source.files/rules + - virtualbox-ose-source.files/postinst.modules.in + - virtualbox-ose-source.files/control.modules.in + - virtualbox-ose-source.files/Makefile + - virtualbox-ose-guest-source.files/rules + - virtualbox-ose-guest-source.files/postinst.modules.in + - virtualbox-ose-guest-source.files/control.modules.in + - virtualbox-ose-source.links + - Rename / Add version to .in files: + - virtualbox-ose-source.dirs -> virtualbox-ose-source.dirs.in + - virtualbox-ose-guest-utils.udev -> virtualbox-ose-guest-source.udev + - virtualbox-ose-guest-source.install -> + virtualbox-ose-guest-source.install.in + - virtualbox-ose-guest-source.dirs -> + virtualbox-ose-guest-source.dirs.in + - virtualbox-ose-guest-source.links -> + virtualbox-ose-guest-source.links.in + - New: + - virtualbox-ose-source.files/dkms.conf.in + - virtualbox-ose-source.postinst + - virtualbox-ose-source.prerm + - virtualbox-ose-guest-source.prerm + - virtualbox-ose-guest-source.postinst + - virtualbox-ose-guest-source.files/dkms.conf.in + - debian/rules: + - Add support to update all ".in" files in install target + - Add support to remove all sed produced ".in" files in clean target + - Drop extra rules that were modifying the "debian" directory in -source + - Make sure to include postinst/prerm scripts for arch indep packages. + - debian/control: + - Recommends on the source package instead of modules packages + - Depends on the source packages for dkms and libc6-dev + - Replace error messages related to missing/mismatched + kernel module accordingly: + - patches/04-vboxdrv-references.dpatch + - patches/13-module-mismatch.dpatch + - virtualbox-ose.files/VBox.sh + - Autoload kernel module + - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default + - Virtualbox should go in Accessories, not in System tools (LP: #288590) + - virtualbox-ose-qt.files/virtualbox-ose.desktop + - Change Vcs-Svn and Vcs-Browser to XS-Original-Vcs-* + - debian/control + - Add apport hook + - virtualbox-ose.files/source_virtualbox-ose.py + - virtualbox-ose.install + - Remove old vboxdrv init script + - virtualbox-ose.preinst + * Add virtualbox-2.0, virtualbox-2.1, virtualbox-2.2 to + Conflicts, Provides, Replaces (names of the upstream proprietary packages) + - debian/control + * Install apport hook to the correct location: /usr/share/apport/package-hooks + - debian/virtualbox-ose.install + + -- Felix Geyer Sat, 16 May 2009 15:42:23 +0200 + +virtualbox-ose (2.2.2-dfsg-2) unstable; urgency=low + + * Made initscript call find only in case of an error, closes: #526395 + * Removed setup option from initscript, closes: #526322 + * Added upstream patch to fix bug in VBoxManage modifyhd, closes: #526820 + * Merged our init script patches into one patch. + * Made initscript more verbose. + + -- Michael Meskes Tue, 05 May 2009 09:29:24 +0200 + +virtualbox-ose (2.2.2-dfsg-1) unstable; urgency=low + + * New Upstream Version + * Extended error message patch for vboxdrv failure. + + -- Michael Meskes Wed, 29 Apr 2009 09:13:24 +0200 + +virtualbox-ose (2.2.0-dfsg-3) unstable; urgency=low + + * Putting back the tar command that was lost in debian/rules, closes: #524897 + + -- Michael Meskes Tue, 21 Apr 2009 08:45:06 +0200 + +virtualbox-ose (2.2.0-dfsg-2) unstable; urgency=low + + * Remove obsolete conffiles, closes: #523778 + * Made package description clearer, closes: #524154 + * Documented guest utils download, closes: #524171 + * Made build system use files provided by xserver-xorg instead of local + copies, closes: #515631 + + -- Michael Meskes Sun, 19 Apr 2009 12:37:04 +0200 + +virtualbox-ose (2.2.0-dfsg-1) unstable; urgency=low + + * New upstream version. + * Move X11 guest utils into separate packages, closes: #520438 + * Also switched them to new X.Org X server version. + * Move QT4 based user interface into separate package, closes: #508395 + * Added new URL for WineD3D guest additions, closes: 522672 + * Documented problem with kernel 2.6.29, closes: #518739 + * Documented missing format attribute, closes: #517454 + * Added patch to disable checking for updates, closes: #516551 + * Added patch to tell about missing vboxnetflt module, closes: #516819 + * Bumped Standards-Version to 3.8.1 + + -- Michael Meskes Fri, 10 Apr 2009 11:16:49 +0200 + +virtualbox-ose (2.1.4-dfsg-1ubuntu5) karmic; urgency=low + + * Merge proper fix for LP: #369550 from Debian. + - debian/patches/00list + - debian/patches/09-initscript.dpatch + - Drop debian/patches/08- + + -- Daniel Hahler Tue, 05 May 2009 23:54:28 +0200 + +virtualbox-ose (2.1.4-dfsg-1ubuntu4) karmic; urgency=low + + * Do not use find in virtulbox-ose init script, which saves about + ~10s during boot/init (LP: #369550). + Thanks to Marius Gedminas for the suggestion and bug report. + - debian/patches/09-initscript.dpatch: + + -- Daniel Hahler Thu, 30 Apr 2009 23:06:48 +0200 + +virtualbox-ose (2.1.4-dfsg-1ubuntu3) jaunty; urgency=low + + * Use source_virtualbox-ose.py to provide an apport hook for all + packages. (LP: #340149) + - debian/virtualbox-ose.install + - virtualbox-ose.files/virtualbox-ose.py + + -- Daniel Hahler Sun, 29 Mar 2009 21:06:29 +0200 + +virtualbox-ose (2.1.4-dfsg-1ubuntu2) jaunty; urgency=low + + * Add apport hook to provide output of "dpkg -l | grep virtualbox" + (LP: #340149) + - debian/virtualbox-ose.install + - virtualbox-ose.files/virtualbox-ose.py + * Provides: xserver-xorg-video-5, xserver-xorg-input-4 (LP: #313510) + - debian/control + * Install vbox{video,mouse}_drv_16.so (instead of *_15.*) + - debian/rules + + -- Daniel Hahler Fri, 20 Mar 2009 01:19:13 +0100 + +virtualbox-ose (2.1.4-dfsg-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #328161), remaining changes: + - See 2.1.0-dfsg-1ubuntu1 + * Drop 15-fix-byteorder-hack-jaunty.dpatch, applied upstream. + * Drop Conflicts, Replaces, Provides: virtualbox-2.0. No real + reason. + - debian/control + * Add debian/patches/17-disable-help-contents.dpatch, + Disable Help>Contents... menu item (LP: #323988) + * Refreshed 13-disable-update-action.dpatch + * debian/rules: add CXXFLAGS+=-fpermissive to fix FTBFS + (see LP: #328161) + * Drop Ubuntu specific patches/16-fix-ftbfs-morePadding.dpatch. + Not required anymore and caused build failure in tests now. + + -- Daniel Hahler Sun, 01 Mar 2009 23:51:51 +0100 + +virtualbox-ose (2.1.4-dfsg-1) unstable; urgency=high + + * New upstream version. + * Made package use rpath where needed to deal with a security issue. + * Set urgency to high for the very same reason. + * Updated control file to refer to git instead of svn. + * Made sure that init script does not fail if module loading is not enabled. + Closes: #516242 + + -- Michael Meskes Wed, 18 Feb 2009 12:55:59 +0100 + +virtualbox-ose (2.1.2-dfsg-2) unstable; urgency=low + + * Enabled OpenGL support. Closes: #513533 + * Added patch to install WineD3D guest additions as provided by Robert Millan + . Closes: #514181 + * Fixed watch file yet again. + * Recompiled to bring 2.1.2 into unstable. This changes + - Network setup. Closes: #507169 + - File and device ownership. Closes: #509014 + + -- Michael Meskes Mon, 16 Feb 2009 10:49:27 +0100 + +virtualbox-ose (2.1.2-dfsg-1) experimental; urgency=low + + * New upstream version. + * Enabled webservice. + * Install VBoxSysInfo script. + * Removed SUP[Un]install test case. + * Removed xpidl and sdk. This might go into a -dev package if it is really + useful for anyone not developing virtualbox-ose. + * Documented changes in network setup and removed useless scripts and + configs. Closes: #512024 + * Added missing architecture amd64 to guest source package. Closes: #512811 + + -- Michael Meskes Thu, 22 Jan 2009 11:47:53 +0100 + +virtualbox-ose (2.1.0-dfsg-2ubuntu1) jaunty; urgency=low + + * Merge from Debian experimental. Closes LP: #253933 + + -- Daniel Hahler Thu, 22 Jan 2009 21:41:50 +0100 + +virtualbox-ose (2.1.0-dfsg-2) experimental; urgency=low + + * Added versioned build dependency for kbuild. Closes: #510736 + * Added versioned build dependency for qt4. Closes: #510785 + * Re-created two patches against initscript to make them clearer and to + re-add a line lost in the transition. Closes: #474089 + + -- Michael Meskes Sun, 04 Jan 2009 16:58:38 +0100 + +virtualbox-ose (2.1.0-dfsg-1ubuntu2) jaunty; urgency=low + + * Remove vboxnetflt dkms module in virtualbox-ose-source.prerm + * Make script used for DKMS "interlinking" executable, so DKMS + executes it (LP: #314650) + - debian/rules + + -- Daniel Hahler Wed, 07 Jan 2009 20:27:10 +0100 + +virtualbox-ose (2.1.0-dfsg-1ubuntu1) jaunty; urgency=low + + * Merge from Debian experimental (LP: #304859). Remaining Ubuntu changes: + - DKMS support + - For the complete list of added, moved and dropped files see the + log of 2.0.2-dfsg-0ubuntu1 + - virtualbox-ose-guest-utils.udev => virtualbox-ose-guest-source.udev + - debian/rules + - Refer to virtualbox-ose-source instead of -modules: + - virtualbox-ose.files/VBox.sh + - patches/04-vboxdrv-references.dpatch + - patches/13-module-mismatch.dpatch + - debian/control: + - Recommend virtualbox-ose-source instead of -modules + - The -source packages depends are changed for DKMS + - Autoload kernel module + - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default + - Keep adjusted debian/virtualbox-ose.preinst.in to remove old vboxdrv + conffile + - debian/virtualbox-ose-source.postinst: call "virtualbox-ose restart", + depending on LOAD_VBOXDRV_MODULE + - virtualbox-ose-guest-utils: Install vboxvideo_drv_15.so instead + of vboxvideo_drv_14.so (LP: #292856) + - debian/rules + - Enable 64 bit guest support when building on AMD64 (LP: #271651) + - debian/rules (VBOX_WITH_64_BITS_GUESTS) + - Virtualbox should go in Accessories, not in System tools (LP: #288590) + - virtualbox-ose.files/virtualbox-ose.desktop + - debian/patches/13-disable-update-action.dpatch + - Change Vcs-Svn and Vcs-Browser to XS-Original-Vcs-* + - debian/control + - virtualbox-ose Conflicts, Replaces, Provides: virtualbox-2.0 + - debian/control + - debian/control: + - Bump provides of guest-utils to xserver-xorg-input-2.1 + - Bump provides of guest-utils to xserver-xorg-video-2.9 + - patches/15-fix-byteorder-hack-jaunty.dpatch to + fix FTBFS on Jaunty (patch from Nathan, LP: #278466) + * virtualbox-ose-guest-source.links.in: fix install of r0drv to vboxvfs + (there have been two lines for vboxadd only) (LP: #310647) + * Add vboxnetflt to DKMS system + - add virtualbox-ose-source.files/do_Module.symvers which is used + in PRE_BUILD/POST_BUILD (dkms.conf) + * Add patches/16-fix-ftbfs-morePadding.dpatch to fix FTBFS on i386 + during tests (Thanks Nathan Summers) + * Fix grammar in virtualbox-ose.README.Debian.xml + * mv virtualbox-ose.preinst{.in,} and fix + Lintian error "maintainer-script-uses-dpkg-status-directly" + - debian/rules + * Closes the following bugs in Launchpad: + - VirtualBox virtual machines are frozen after suspend-resume + (LP: #292794) + - Clean LocalConfig.kmk in clean target (LP: #286854) + + -- Daniel Hahler Wed, 07 Jan 2009 06:39:04 +0100 + +virtualbox-ose (2.1.0-dfsg-1) experimental; urgency=low + + * New upstream version + This one doesn't use /dev/net/tun anymore. Closes: #509524 + * Removed obsoleted vditool, VBoxAddIF.sh and VBoxTunctl. + + -- Michael Meskes Thu, 18 Dec 2008 12:49:34 +0100 + +virtualbox-ose (2.0.6-dfsg-1) experimental; urgency=low + + * New upstream version. Closes: #497840 + * Do not warn user about losing snapshots anymore, this is supposed to be a + thing of the past. Closes: #500101 + * Made guest utils init script more verbose if module was not loadable. + Closes: #505586 + * Documented need for hardware virtualization if running a 64-bit guest. + + -- Michael Meskes Thu, 20 Nov 2008 14:09:54 +0100 + +virtualbox-ose (2.0.4-dfsg-0ubuntu3) jaunty; urgency=low + + [ Nathan Summers ] + * Add alloc/heapsimple.c to fix build on amd64. (LP: #278466) + - virtualbox-ose-guest-source.install.in + * Add link to alloc/ so that dkms can find it. + - virtualbox-ose-guest-source.links.in + + [ Daniel Hahler ] + * debian/rules: expand bash-style shell expansion in "clean" + target, so the generated files get removed actually. + * Add debian/patches/15-fix-byteorder-hack-jaunty.dpatch to + fix FTBFS on Jaunty (patch from Nathan, LP: #278466) + + -- Daniel Hahler Sat, 06 Dec 2008 02:39:14 +0100 + +virtualbox-ose (2.0.4-dfsg-0ubuntu2) jaunty; urgency=low + + * Upload as non-native package. (Discussion at LP: #288957) + * Do not recommend non-existant package virtualbox-ose-guest-modules, + recommend virtualbox-ose-guest-source instead (for DKMS) + (LP: #293237) + - debian/control + * virtualbox-ose-guest-utils: Install vboxvideo_drv_15.so instead + of vboxvideo_drv_14.so. Thanks for the patch, packet. + (LP: #292856) + - debian/rules + * Remove vboxdrv init script and set LOAD_VBOXDRV_MODULE=1 instead, + to trigger kernel module loading in virtualbox-ose init script + (LP: #293109) + - debian/virtualbox-ose.preinst.in modified + - debian/virtualbox-ose.vboxdrv.init.in removed + - debian/virtualbox-ose.default + - debian/patches/09-initscript.dpatch: + - Re-add parts from Debian to handle LOAD_VBOXDRV_MODULE + - Make "restart" and "force-reload" call "stop"/"start", + not stop_networt/start_network only + - Add info about kernel module to "status" + - debian/rules + - debian/virtualbox-ose-source.postinst: call "virtualbox-ose restart", + depending on LOAD_VBOXDRV_MODULE + * Refer to virtualbox-ose-source in error messages + - debian/patches/04-vboxdrv-references.dpatch updated + * Fix indent for reference to virtualbox-ose-source in + - debian/virtualbox-ose.files/VBox.sh + * virtualbox-ose Conflicts, Replaces, Provides: virtualbox-2.0 + - debian/control + + -- Daniel Hahler Tue, 04 Nov 2008 18:29:14 +0100 + +virtualbox-ose (2.0.4-dfsg-0ubuntu1) intrepid; urgency=low + + [ Jonathan Ernst ] + * Virtualbox should go in Accessories, not in System tools (LP: #288590) + + [ Daniel Hahler ] + * New upstream version (LP: #288957) + - Updated debian/patches/09-initscript.dpatch (one hunk rejected/obsolete) + * Drop debconf question about losing snapshots because of upgrading: it is + no longer relevant and the default (cancel upgrade) caused a lot of + trouble (LP: #288178, #221736) + - debian/virtualbox-ose.preinst.in, debian/virtualbox-ose.templates, + debian/rules + * Improve patch for disabling the "check for updates" dialog (LP: #272212) + - debian/patches/13-disable-update-action.dpatch + * Disable registration request at Sun (LP: #285684, #271603) + - debian/patches/14-disable-registration-request.dpatch + + -- Daniel Hahler Sun, 26 Oct 2008 02:23:42 +0100 + +virtualbox-ose (2.0.2-dfsg-0ubuntu3) intrepid; urgency=low + + * debian/patches/13-disable-update-action.dpatch: + Disable update action menu entry (LP: #272212) + + -- Daniel Hahler Fri, 19 Sep 2008 23:33:32 +0200 + +virtualbox-ose (2.0.2-dfsg-0ubuntu2) intrepid; urgency=low + + * debian/virtualbox-ose.install: + - Install VBoxHeadless (LP: #271753) + * debian/virtualbox-ose.links: + - Include symlink for VBoxHeadless + * debian/virtualbox-ose.files/VBox.sh: + - Remove check for vboxusers, not necessary w/ + hardening. + * debian/virtualbox-ose.udev: + - Don't set vboxdrv to vboxusers, not necessary + w/ hardening. + * debian/virtualbox-ose.vboxdrv.init: + - Remove permissions check for vboxdrv. + * debian/rules: + - Enable 64 bit guest support when building on + AMD64 (LP: #271651) + - Set VBoxHeadless suid. + * debian/control: + - Add depends for linux-headers to make sure + that the modules can compile initially (LP: #271534) + + -- Mario Limonciello Thu, 18 Sep 2008 12:49:02 -0500 + +virtualbox-ose (2.0.2-dfsg-0ubuntu1) intrepid; urgency=low + + * New upstream version (LP: #268795) + - Introduces support for Intrepid Guests + - Introduces support for kernel 2.6.27 + * Update patches for new upstream version: + - 02-config-kmk + - 09-initscript + * Drop patches no longer necessary (or absorbed upstream): + - 05-vboxadd-udev + - 01-no-64bit-guest + * New patches: + - 01-64bit, for making sure we query the target arch properly. + * debian/control: + - Build depend on libqt4-dev for new upstream version. + - Build depend on python2.5-dev for new upstream version. + - Drop libqt3-mt-dev from build depends + - Bump provides of guest-utils to xserver-xorg-input-2.1 + - Bump provides of guest-utils to xserver-xorg-video-2.9 + - Enable 64 bit guest utils support. + * debian/rules: + - Disable QT3 support as we are using the QT4 frontend by + default. + - Set VirtualBox binaries to suid root per new hardening + requirements in this release. + - Add amd64 to a valid arch in the X11 additions check. + * debian/virtualbox-ose.install: + - Update location that xpidl is installed from. + * debian/virtualbox-ose.vboxdrv.init: + - Start at runlevels 2,3,4,5 rather than just 3,5 + * Enable DKMS support on virtualbox host and guest modules. (LP: #267097) + - Rebuilding is no longer necessary for new kernels (LP: #268367) + - Drop: + + virtualbox-ose-source.files/rules + + virtualbox-ose-source.files/postinst.modules.in + + virtualbox-ose-source.files/control.modules.in + + virtualbox-ose-guest-source.files/rules + + virtualbox-ose-guest-source.files/postinst.modules.in + + virtualbox-ose-guest-source.files/control.modules.in + + virtualbox-ose-source.links + - Rename / Add version to .in files: + + virtualbox-ose-guest-source.files/udev -> + virtualbox-ose-guest-source.udev + + virtualbox-ose-guest-source.install -> + virtualbox-ose-guest-source.install.in + + virtualbox-ose-source.dirs -> virtualbox-ose-source.dirs.in + + virtualbox-ose-guest-source.dirs -> virtualbox-ose-guest-source.dirs.in + + virtualbox-ose-guest-source.links -> + virtualbox-ose-guest-source.links.in + - New: + + virtualbox-ose-source.files/dkms.conf.in + + virtualbox-ose-source.postinst + + virtualbox-ose-source.prerm + + virtualbox-ose-guest-source.prerm + + virtualbox-ose-guest-source.postinst + + virtualbox-ose-guest-source.files/dkms.conf.in + + virtualbox-ose-guest-source.files/Makefile + - debian/rules: + + Add support to update all ".in" files in install target + + Add support to remove all sed produced ".in" files in clean target + + Drop extra rules that were modifying the "debian" directory in -source. + + Make sure to include postinst/prerm scripts for arch indep packages. + - debian/control: + + Recommends on the source package instead of modules packages + + Depends on the source packages for dkms and libc6-dev + - debian/virtualbox-ose.vboxdrv.init: + + Search for module in proper location + + -- Mario Limonciello Wed, 10 Sep 2008 13:50:20 -0500 + +virtualbox-ose (1.6.6-dfsg-3) unstable; urgency=high + + * Added upstream patch to support kernel 2.6.27, closes: #502068 + * Added upstream patch to prevent potential symlink attack, closes: #504149 + + -- Michael Meskes Mon, 13 Oct 2008 16:38:47 +0200 + +virtualbox-ose (1.6.6-dfsg-2) unstable; urgency=low + + * Added NOTPARALLEL option in guest sources Makefile, that somehow got lost, + closes: #494475 + * Stop spamming log files by using patch provided by Stefan Lippers-Hollmann + , closes: #500484 + + -- Michael Meskes Fri, 03 Oct 2008 17:17:10 +0200 + +virtualbox-ose (1.6.6-dfsg-1) unstable; urgency=low + + [ Michael Meskes ] + * New upstream version + - no longer able to select disk in use for new VM, closes: #495028 + * Removed patch 05-vboxadd-udev which was applied upstream. + * Removed absolute paths in maintainer scripts. + * Override lintian error in RDP subdir because the client is not build anyway. + + [ Patrick Winnertz ] + * New upstream version fixes compilation error of -modules with kernelversion + 2.6.27 (Closes: #499623) + + -- Patrick Winnertz Sun, 21 Sep 2008 22:29:58 +0200 + +virtualbox-ose (1.6.2-dfsg-6) unstable; urgency=medium + + * Apply changesets 12299, 12303, 12305, 12307 and 12308 from upstream SVN + to fix errors running 2.6.26-686 kernels in a Virtual Machine. Patch + created by Frans Pop . Closes: #497505. + + -- Michael Meskes Mon, 15 Sep 2008 10:01:21 +0200 + +virtualbox-ose (1.6.2-dfsg-5) unstable; urgency=low + + [ Michael Meskes ] + * Updated initscript to better handle LSB compatibility, yet again + closes: #474089 + * Added a short note to README.Debian asking user to use only the 486 version + of the 2.6.26 kernel. This documents a workaround for #497505 and #497875. + * In VBox.sh honor LD_LIBRARY_PATH if already set, closes: #496953 + * Changed rules file for guest-module to correctly build modules with + symbols, thanks to Bastian Blank for the hint. + * Do not build guest modules in parallel, closes: #494475 + + [ Loic Minier ] + * Demote module-assistant deps to Recommends; closes: #495671. + * Don't prepend current directory to LD_LIBRARY_PATH if it isn't set. + + -- Michael Meskes Sat, 09 Aug 2008 21:46:44 +0200 + +virtualbox-ose (1.6.2-dfsg-4) unstable; urgency=medium + + * Adding patch from Gonéri Le Bouder to fix FTBFS with + dash as /bin/sh (Closes: #493402). + * Adding patch from Gonéri Le Bouder to fix FTBFS with + LC_ALL set to fr_FR.UTF-8 (Closes: #494157). + * Adding Swedish debconf translation from Martin Ågren + (Closes: #492162). + + -- Daniel Baumann Thu, 7 Aug 2008 11:38:00 -0300 + +virtualbox-ose (1.6.2-dfsg-3) unstable; urgency=medium + + [ Daniel Baumann ] + * Removing empty lines at EOF and whitespaces at EOL. + * Including vboxvideo.ids in virtualbox-ose-guest-utils to allow xserver to + automagically detect the display adapter, thanks to Avi Rozen + (Closes: #490541). + * Adding Turkish debconf translation from Mert Dirik + (Closes: #490725). + + [ Loic Minier ] + * Drop useless subshells in rules files and export environment vars + explicitely; also change "cd foo; $(MAKE)" patterns to "$(MAKE) -C foo". + + -- Daniel Baumann Mon, 14 Jul 2008 07:14:00 +0200 + +virtualbox-ose (1.6.2-dfsg-2) unstable; urgency=low + + [ Daniel Baumann ] + * Using dpkg-architecture rather than dpkg --print-architecture in + 01-no-64bit-guest.dpatch in order to be more accurate for ia32 subarchs + like lpia, thanks to Loic Minier . + * Rediffing 02-config-kmk.dpatch. + * Adding patch to adjust failure message with Debian specific solution when + experiencing kernel module version mismatch. + + [ Hilko Bengen ] + * Re-added watch file: Innotek/Sun still want us to use their INTERSHOP + system to download the tarball, but luckily, there is an alternative + download location. + * Enhanced README.Debian + + [ Patrick Winnertz ] + * Adding VBoxHeadless to virtualbox. Thanks to Stefan Lippers-Hollmann. + (Closes: #486544) + + [ Michael Meskes ] + * Remove LocalConfig.kmk in clean target. + * Source env.sh before starting to build. + * Include our wiki page as simple html file under + /usr/share/doc/virtualbox-ose. (Closes: #484998) + * Install VBoxRandR into guest-utils package. + * Moved udev rule from virtualbox-ose-guest-modules package to + virtualbox-ose-guest-utils package. (Closes: #488455) + + [ Loic Minier ] + * Build virtualbox-ose, virtualbox-ose-dbg, and virtualbox-ose-guest-utils + for lpia. + * Wrap uploaders, bdeps, and deps on multiple lines to get cleaner diffs. + * Cleanup upstreamversion computation and compute it only once. + * Set VBOX_WITH_X11_ADDITIONS in rules when the DEB_HOST_ARCH is i386 or + lpia instead of using dpkg --print-architecture. + * Use the -s flag to dh_ commands instead of 3 debhelper calls and a shell + test; as a bonus, this provides additional detached symbols in -dbg. + * Move all -a flags to -s. + * Install files into virtualbox-ose-guest-utils unconditionally and ignore + errors -- even if these exist, the package is disabled on amd64. + * Cleanup rules slightly. + * Add ${misc:Depends} as this is recommended nowadays. + * Drop now empty debian/virtualbox-ose-guest-utils.postinst which used to + call /usr/lib/virtualbox/x11config.pl in the past. + * Cleanup debian/virtualbox-ose-source.files/rules and + debian/virtualbox-ose-guest-source.files/rules slightly. + * Drop trailing exit 0 from "set -e"-ed postinst templates. + + -- Michael Meskes Tue, 17 Jun 2008 14:52:36 +0200 + +virtualbox-ose (1.6.2-dfsg-1ubuntu2) intrepid; urgency=low + + * Fix dpatch 01-no-64bit-guest to change upstream's uname -m into + dpkg-architecture -qDEB_HOST_GNU_CPU instead of dpkg --print-architecture; + fixes build on lpia. + * Build virtualbox-ose, virtualbox-ose-dbg, and virtualbox-ose-guest-utils + for lpia. + * Set VBOX_WITH_X11_ADDITIONS in rules when the DEB_HOST_ARCH is i386 or + lpia instead of using dpkg --print-architecture. + * Use the -s flag to dh_ commands instead of 3 debhelper calls and a shell + test; as a bonus, this provides additional detached symbols in -dbg. + * Install files into virtualbox-ose-guest-utils unconditionally and ignore + errors -- even if these exist, the package is disabled on amd64. + * Cleanup upstreamversion computation and compute it only once. + * Change Vcs-Svn and Vcs-Browser to XS-Original-Vcs-*. + + -- Loic Minier Tue, 24 Jun 2008 19:20:10 +0200 + +virtualbox-ose (1.6.2-dfsg-1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable (LP: #236221). Remaining Ubuntu changes: + - debian/virtualbox-ose.vboxdrv.init: init script to load vboxdrv kernel + module + - debian/rules: install vboxdrv init script + - debian/control: + - DebianMaintainerField + - debian/patches/09-initscript.dpatch: + - do not source /etc/default/virtualbox-ose + - do not load vboxdrv in here, gets done in separate vboxdrv init script + - debian/virtualbox-ose.default: + - Dropped, not used in Ubuntu (see 10-initscript.dpatch) + - debian/virtualbox-ose.preinst: + - Remove /etc/default/virtualbox-ose + - debian/virtualbox-ose-guest-utils.init: + Use log_action_cont_msg instead of log_warning_msg to not cause display + issues in usplash (without "quiet"), when not running in VirtualBox. + (Forwarded to Debian at bug #475297) + - debian/patches/04-vboxdrv-references.dpatch: + Do not mention "modprobe vboxdrv", because it's already done when + installing the module package. + - debian/virtualbox-ose.files/VBox.sh: + Improve error message for missing vboxdrv module and what package to + install. Use "uname -r" in the virtualbox wrapper script for this. + + -- Daniel Hahler Tue, 17 Jun 2008 01:10:51 +0200 + +virtualbox-ose (1.6.2-dfsg-1) unstable; urgency=low + + [ Michael Meskes ] + * New upstream version, closes: #479744, #482504, #483592 + * Removed unneeded xalan build dependency. + * Added build dependency on libxslt and libxml. + * Fixed LocalConfig.kmk to list new variables. + * Use upstream provided X session file, but patch our changes in there. + * Build with gcc/g++ 4.2. + * Bumped Standards-Version to 3.8.0. + + [ Daniel Baumann ] + * Removing ffmpeg recursively in dfsg-free target in rules. + * Rediffing all patches. + * Renumbering all patches. + * Sanitizing dpatch headers. + * Stripping off embedded copy of libpng in dfsg-free target of rules. + * Stripping off embedded copy of libxml2 in dfsg-free target of rules. + * Stripping off embedded copy of libxslt in dfsg-free target of rules. + * Stripping off embedded copy of zlib in dfsg-free target of rules. + * Improving long description of virtualbox-ose-guest-utils. + * Correcting wrong virtualbox-ose-guest-utils package name in long + description of virtuabox-ose-guest-source. + * Adding note about kernel module requirement in virtualbox-ose long + description. + + -- Michael Meskes Sun, 11 May 2008 22:48:59 +0200 + +virtualbox-ose (1.5.6-dfsg-7) unstable; urgency=low + + [ Michael Meskes ] + * Made virtualbox-ose-modules recommend virtualbox-ose-guest-utils. + * Added recommendation on up-to-date xserver-xorg-core and conflict on + older versions to guest-utils, closes: #476526 + * Provide xserver-xorg-input-2 and xserver-xorg-video-2 with guest-utils. + * Removed watch file, I couldn't find a way to get the orig tarball without + first accepting a license. + * Rewrote debian/rules for both source packages, hopefully this + finally closes: #469882 + * Patched module Makefile to allow amd64 build in linux-modules-extra-2.6. + * Added patch by Pascal Volk to prevent + init script from overwriting values, closes: #475193 + * Added patch from upstream SVN to fix FTBFS in xpcom, closes: #479910 + * Took another change from SVN to update sed file for newer buildchain. + * Recompiled against latest libxalan110, closes: #480739 + + [ Daniel Baumann ] + * Correcting wrong module-assistant manpage section in + virtualbox-ose-*source.README.Debian. + * Removing some reimported useless whitespaces. + * Sanitizing all po headers. + + [ Patrick Winnertz ] + * Added patch to make virtualbox-ose-guest-source build with kernels >= + 2.6.25. Thanks to Stefan Lippers-Hollmann. (Closes: 478373, 478333, 480736) + + -- Michael Meskes Sun, 11 May 2008 22:48:50 +0200 + +virtualbox-ose (1.5.6-dfsg-6ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/virtualbox-ose.vboxdrv.init: init script to load vboxdrv kernel + module + - debian/rules: install vboxdrv init script + - debian/control: + - DebianMaintainerField + - Breaks on virtualbox-ose-modules (can be dropped after Hardy) + - debian/patches/10-initscript.dpatch: + - do not source /etc/default/virtualbox-ose + - do not load vboxdrv in here, gets done in separate vboxdrv init script + - debian/virtualbox-ose.default: + - Dropped, not used in Ubuntu (see 10-initscript.dpatch) + - debian/virtualbox-ose.preinst: + - Remove /etc/default/virtualbox-ose + * debian/virtualbox-ose-guest-utils.init: + Use log_action_cont_msg instead of log_warning_msg to not cause display + issues in usplash (without "quiet"), when not running in VirtualBox. + * debian/patches/05-vboxdrv-references.dpatch, + debian/virtualbox-ose.files/VBox.sh: + Improve error message for missing vboxdrv module and what package to + install. Use "uname -r" in the virtualbox wrapper script for this. + Do not mention "modprobe vboxdrv", because it's already done when + installing the module package. + + -- Daniel Hahler Wed, 09 Apr 2008 03:01:59 +0200 + +virtualbox-ose (1.5.6-dfsg-6) unstable; urgency=low + + * Added two patches from upstream SVN to make virtualbox-ose build with + gcc-4.3. However, this compiler is not yet officially supported. + Closes: #474907 + + -- Michael Meskes Tue, 08 Apr 2008 09:58:35 +0200 + +virtualbox-ose (1.5.6-dfsg-5) unstable; urgency=low + + [ Hilko Bengen ] + * Don't fail in guest-utils init script if the vboxadd module cannot + get loaded (Closes: #474195) + + [ Michael Meskes ] + * Fixed default ARCH setting in module Makefile, closes: #474196 + * Made initscript even more LSB compliant by using LSB logging + functions, closes: #474089 + + -- Michael Meskes Fri, 04 Apr 2008 10:16:48 +0200 + +virtualbox-ose (1.5.6-dfsg-4ubuntu2) hardy; urgency=low + + * Move the removal of /etc/default/virtualbox-ose from postinst to preinst, + where it belongs + + -- Daniel Hahler Fri, 04 Apr 2008 03:17:43 +0200 + +virtualbox-ose (1.5.6-dfsg-4ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/virtualbox-ose-guest-utils.init: "exit 0" in case the module + cannot be loaded + - debian/virtualbox-ose.vboxdrv.init: init script to load vboxdrv kernel + module + - debian/rules: install vboxdrv init script + - debian/control: + - DebianMaintainerField + - Breaks on virtualbox-ose-modules (can be dropped after Hardy) + * debian/patches/10-initscript.dpatch: + - do not source /etc/default/virtualbox-ose + - do not load vboxdrv in here, gets done in separate vboxdrv init script + * debian/virtualbox-ose.default: + - Dropped, not used in Ubuntu (see 10-initscript.dpatch) + * debian/virtualbox-ose.postinst: + - Remove /etc/default/virtualbox-ose + + -- Daniel Hahler Fri, 04 Apr 2008 01:44:25 +0200 + +virtualbox-ose (1.5.6-dfsg-4) unstable; urgency=low + + [ Michael Meskes ] + * Set default architecture in debian/rules for module source package. + * Fixed and rearranged patches against init script. + + [ Patrick Winnertz ] + * Improve init.d script patch to write done also on the first startup. + (Closes: #473059) + + -- Michael Meskes Wed, 02 Apr 2008 12:08:30 +0200 + +virtualbox-ose (1.5.6-dfsg-3) unstable; urgency=low + + [ Michael Meskes ] + * Fixed arch check in virtualbox-ose-source rules file, closes: #469882 + * Added just another patch to the initscript. This patch makes sure the tun + module is only loaded if it is needed, closes: #470172 + * Made desktop file comply to the Free Desktop specification, closes: #470937 + * Replaced $(PWD) with $(CURDIR) in rules file. + * Bumped build dependency for debhelper to version >= 5.0.44~ because of + dh_installifupdown. + * Moved to Hilko's docbook version of README.Debian. + * Also added information about VBoxADDIF to README.Debian. + * Copied lynx-dump-postprocess script from exim4 package. + + [ Hilko Bengen ] + * Added scripts for managing `vbox' interfaces from + /etc/network/interfaces + + -- Michael Meskes Tue, 18 Mar 2008 15:13:39 +0100 + +virtualbox-ose (1.5.6-dfsg-2ubuntu2) hardy; urgency=low + + * debian/control: change Depends of modules to Recommends (LP: #188579) + - virtualbox-ose-guest-utils only recommends virtualbox-ose-guest-modules + - virtualbox-ose only recommends virtualbox-ose-modules + * debian/virtualbox-ose-guest-utils.init: + Exit with status 0 in case "vboxadd" cannot get loaded in "start" + * debian/virtualbox-ose.vboxdrv.init: + Fix test for existing kernel module. Forwarded upstream as #1357. + + -- Daniel Hahler Thu, 20 Mar 2008 20:36:30 +0100 + +virtualbox-ose (1.5.6-dfsg-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #202727). Remaining Ubuntu changes: + - Move virtualbox-ose-modules from recommends + to depends for virtualbox-ose. We can drop this change when Synaptic + installs recommended packages by default. + - Fix deprecated values in desktop file (LP: #196714) + - Change Maintainer to Ubuntu MOTU Developers. + * debian/virtualbox-ose.vboxdrv.init, debian/rules: + Move init script from virtualbox-ose-modules to here (LP: #200380). + This also makes sure that the udev rule to handle permissions of + /dev/vboxdrv is installed, when this init script to modprobe the + module is run (LP: #147076). + debian/control: Add Breaks for virtualbox-ose-modules* meta packages + (<< 17) + * debian/control: virtualbox-ose-guest-utils depends on + virtualbox-ose-guest-modules, instead of "recommends". The "vboxadd" + module is required by the guest-utils init script (LP: #189444). + This is also in line with the Depends for virtualbox-ose on the vboxdrv module. + * debian/control: Drop "suggest uml-utilities" for virtualbox-ose again + (LP: #154305) + * Fixes the following bugs in Ubuntu: + - Clearer message about losing snapshots during upgrade (LP: #187082) + - virtualbox-ose conditionally modprobes vboxdrv + (from virtualbox-ose-modules) in its init script, so that the + modules do not need any init scripts anymore (LP: #200380) + + -- Daniel Hahler Sun, 16 Mar 2008 23:53:00 +0100 + +virtualbox-ose (1.5.6-dfsg-2) unstable; urgency=low + + [ Daniel Baumann ] + * Added Brazilian-Portuguese debconf translation from Eder L. Marques + (Closes: #467452). + + [ Michael Meskes ] + * Added patch by Frans Pop to make modules compile with + kernel 2.6.25, closes: #468864 + * Suggest bridge-utils which is needed for static host networking. + * Added patch against init script to remove newly created file again on + failure, closes: #468419 + * Fixed watch file to cope with -1 upstream release. + + -- Michael Meskes Sun, 02 Mar 2008 10:38:31 +0100 + +virtualbox-ose (1.5.6-dfsg-1) unstable; urgency=low + + [ Michael Meskes ] + * New upstream version + * Fixed LSB headers in init.d scripts, closes: #466311 + * list x11config.pl with correct path in README file, closes: #466621 + * Added last changes made by the translation projects, thanks to + Christian Perrier . + * Tweaked dfsg-free target in rules file so it is really executable, first + steps made by Hilko. + + [ Hilko Bengen ] + * Make module loading in initscript configurable (disabled by default). + + [ Patrick Winnertz ] + * prevent initscript from failing if module doesn't exist. (Closes: #466851) + + -- Michael Meskes Sat, 23 Feb 2008 10:49:28 +0100 + +virtualbox-ose (1.5.4-dfsg-5) unstable; urgency=low + + [ Daniel Baumann ] + * Again removing reimported useless whitespaces at EOL and EOF in debian/*. + * Unified headers of debconf template translations. + * Rediffed patches and again fixed their headers. + * Added Portuguese debconf translation from Ricardo Silva + (Closes: #464761). + * Removed extra whitespace in maintainer field of control, thanks to + Christoph Berg (Closes: #465327). + + [ Michael Meskes ] + * Added Basque debconf translation, closes: #460348 + * Added Japanese debconf translation, closes: #465682 + * Added French debconf translation, closes: #465779 + * Added Russian debconf translation, closes: #466092 + * Added Italian debconf translation, closes: #466095 + * Added Dutch debconf translation, closes: #466113 + * Added Spanish debconf translation, closes: #466280 + * Updated German translation. + * Really use runtime assertion patch. + * Replaced two patches for module build process by upstream changes taken + from SVN. + * Added ARCH setting to virtualbox-ose-source rules file so we can cross + compile the module. + * Insert module in initscript. + + [ Patrick Winnertz ] + * Fix error of postrm if vboxusers is a non-system group (maybe added + manually before installation of virtualbox-ose). (Closes: #462885) + * Added reviewed debconf templates and translations. + (Closes: #463283) Thanks to Christian Perrier + (Closes: #463828) Thanks to Jacobo Tarrio. + (Closes: #463959) Thanks to Esko Arajärvi + (Closes: #464043) Thanks to Miroslav Kure + (Closes: #464509) Thanks to Clytie Siddall + + -- Michael Meskes Sun, 17 Feb 2008 19:08:04 +0100 + +virtualbox-ose (1.5.4-dfsg-4ubuntu3) hardy; urgency=low + + * Ignore delgroup failures in postrm as it's called a second time by + debconf; see also Debian #462885 for the same fix but related to a + seemingly different cause. + + -- Loic Minier Mon, 03 Mar 2008 16:34:05 +0100 + +virtualbox-ose (1.5.4-dfsg-4ubuntu2) hardy; urgency=low + + [ Saïvann Carignan ] + * Fix deprecated values in desktop file (LP: #196714) + + [ Daniel Hahler ] + * debian/control: Suggest bridge-utils and uml-utilities (LP: #154305) + + -- Daniel Hahler Fri, 29 Feb 2008 02:26:49 +0100 + +virtualbox-ose (1.5.4-dfsg-4ubuntu1) hardy; urgency=low + + * Sync with Debian (LP: #156210). Remaining changes are: + - Move virtualbox-ose-modules from recommends + to depends for virtualbox-ose. We can drop this change when Synaptic + installs recommended packages by default. + - Change Maintainer to Ubuntu MOTU Developers. + + * The new 1.5.4 release closes LP: #179807, #185628. + + -- Emilio Pozuelo Monfort Sat, 26 Jan 2008 16:11:06 +0100 + +virtualbox-ose (1.5.4-dfsg-4) unstable; urgency=low + + [ Daniel Baumann ] + * Again removing reimported useless whitespaces at EOL and EOF in debian/*. + + [ Patrick Winnertz ] + * Fixed broken symlink (Closes: #458991) + + -- Patrick Winnertz Tue, 15 Jan 2008 11:49:18 +0100 + +virtualbox-ose (1.5.4-dfsg-3) unstable; urgency=low + + * Added patch from SVN send by Frank Mehnert to fix + runtime assertions. + * Improved debconf text. + * Check for package upgrade in preinst. + * Pre-Depend on debconf. + + -- Michael Meskes Thu, 10 Jan 2008 15:14:26 +0100 + +virtualbox-ose (1.5.4-dfsg-2) unstable; urgency=low + + [ Hilko Bengen ] + * Added debian/watch + + [ Daniel Baumann ] + * Rediffed 02-module-in-kernel.dpatch. + * Again removing reimported useless whitespaces at EOL and EOF in debian/*. + + [ Michael Meskes ] + * Removed two additional include files from guest-sources again because they + were only needed for amd64. + * Install VBoxAddIF.sh which was lost during transition, closes: #458991. + * Added a recommend to libhal, see #448347 for details. + * Added debconf support. + * Tell the user about losing snapshots and ask via debconf whether to + proceed, closes: #458842. + * Clarified error message coming up if module is not loaded, closes: #459440. + + -- Michael Meskes Mon, 07 Jan 2008 17:41:32 +0100 + +virtualbox-ose (1.5.4-dfsg-1) unstable; urgency=low + + [ Michael Meskes ] + * Do not build guest-utils on amd64 because 64bit guests are nor support + yet. + * Removed build time dependency on i32-libs that is not really needed. + * New upstream version. + * Removed some new files because of licensing problems: + ./src/VBox/Additions/linux/selinux-fedora + ./src/VBox/Additions/linux/xmouse/Imakefile + ./src/VBox/HostServices/SharedClipboard/linux-stub.cpp + * Removed the following patches because they are not needed anymore: + 01-configure.dpatch + 08-no-kernel.dpatch + 09-fix-initscript.dpatch + 12-kcompat-2.6.24.dpatch + * Replaced our registration patch by the new config option taken from SVN. + * Rediffed and renumbered some of the remaining patches. + * Added build dependency on libpulse-dev. + * Moved shell scripts from /usr/lib to /usr/share. + * g++-multilib on amd64 depends on libc6-dev-i386, no need to specify both + as build dependency. + * Manually install missing include files for guest-sources. + * Changed layout of guest-sources package to not have to patch the Makefile. + * Changed patch accordingly. + * Removed old 02-host-module patch, it wasn't needed anymore. + * Added new patch 02-module-in-kernel to make sure modules build in a kernel + build environment. + + [ Hilko Bengen ] + * Make dh_strip ignore symlink(s) in /usr/share + + [ Daniel Baumann ] + * Again fixing dpatch headers. + * Again removing reimported useless whitespaces at EOL and EOF in debian/*. + * Correcting the name of Phillip in copyright. + * Syncronising Uploaders of control with control.module.in. + * Rediffed all patches properly. + + -- Michael Meskes Tue, 01 Jan 2008 14:26:51 +0100 + +virtualbox-ose (1.5.2-dfsg2-7) unstable; urgency=low + + [ Patrick Winnertz ] + * Do only recommend the virtualbox-ose-modules package. Maybe someone + would like to compile it on it's own, or not with m-a. (Closes: #456989) + + [ Hilko Bengen ] + * Build system: a large move towards using dh_install + - This requires that we force the build output dir to a fixed location. + - The dh_install call needs to go to the `install' target. + * Leave out code/data for test cases from virtualbox-ose binary package + + [ Michael Meskes ] + * Only suggest guest-sources in guest-utils. With l-m-e expected to include + the guest-modules in the near future, this should be sufficient. + * Rearranged parts of the debian dir. + * Replaced our patch to not need kernel sources by new configure option + taken from svn. + + [ Daniel Baumann ] + * Bumping policy also in module controls, no other changes needed. + + -- Michael Meskes Thu, 20 Dec 2007 15:51:13 +0100 + +virtualbox-ose (1.5.2-dfsg2-6) unstable; urgency=low + + [ Daniel Baumann ] + * Again removing reimported useless whitespaces at EOL and EOF in debian/*. + * Fixing dpatch headers. + * Rediffed dpatches 6-12. + * Removed svn:executable on dpatch 9 and 12. + + [ Michael Meskes ] + * Fixed rules file to correctly install module sources, closes: #456916 + + -- Michael Meskes Tue, 18 Dec 2007 16:21:33 +0100 + +virtualbox-ose (1.5.2-dfsg2-5) unstable; urgency=low + + [ Daniel Baumann ] + * Upgrading virtualbox-ose-modules recommends to depends. + * Downgrading virtualbox-ose-source recommends to suggests. + * Bumping policy version, no other changes needed. + + [ Hilko Bengen ] + * Added support for vditool to VBox.sh + * Build system: + - Cleaned up patch/config phase + - Added copy of init script to debian directory -- no longer copy it + from src/VBox/Installer/linux/vboxnet.sh + - symlinks/directories in packages are now created using debhelper + * Add 2.6.24 compatibility fix (Closes: #456464) + + [ Patrick Winnertz ] + * Moved initscript again out of debian, we should use the upstream one + and created a patch for this one. (in order to fix lintian warning) + * Add description to 02-host-module.dpatch + + -- Patrick Winnertz Mon, 17 Dec 2007 17:37:52 +0100 + +virtualbox-ose (1.5.2-dfsg2-4) unstable; urgency=low + + [ Patrick Winnertz ] + * Changed my maintainer address + + [ meskes@debian.org ] + * Made virtualbox-ose-guest-source compile under linux-modules-extra. + * Made virtualbox-ose-guest-modules i386 only. + * Re-encoded copyright file in UTF-8. + * Removed empty /usr/sbin directory in virtualbox-ose package. + * Removed /usr/lib/virtualbox/VBox.png, doesn't seem to be needed. + * Also removed override for this file. + * Moved binary file xpidl from /usr/share back to /usr/lib. + + -- Michael Meskes Thu, 06 Dec 2007 09:11:51 +0100 + +virtualbox-ose (1.5.2-dfsg2-3) unstable; urgency=low + + * Added patch to remove registration form, closes: #447626, #453784 + * Added just another patch to make sure module is build with the correct + name when build by linux-modules-extra, closes: #453681, #454123 + * Patched Makefile for guest modules for the same reason. + + -- Michael Meskes Sun, 02 Dec 2007 18:06:27 +0100 + +virtualbox-ose (1.5.2-dfsg2-2) unstable; urgency=low + + [ Michael Meskes ] + * Removed superfluous build dependencies: + - libqt3-mt-dev depends on zlib1g-dev and libxcursor-dev + - libxalan110-dev depends on libxerces27-dev + - bcc depends on bin86 + * Remove guest libs from debug package. + * Call "invoke-rc.d udev reload" conditionally in modules postinst. + * Do not call modprobe in postinst script, closes: #451743, #451742 + * Made grep command in vboxnet.sh be quiet, closes: #451741 + * Do not start guest utils if not inside the vm. + * Disabled modprobing of vboxadd because udev seems to be able to handle it. + * Applied patch by Kel Modderman improving + guest utils init script. + * Do not change xorg.conf in postinst, closes: #451745 + + [ Daniel Baumann ] + * Removing again whitespaces at EOL. + * Removing empty virtualbox-ose-guest-utils.postrm. + + -- Michael Meskes Mon, 19 Nov 2007 10:56:31 +0100 + +virtualbox-ose (1.5.2-dfsg2-1) unstable; urgency=low + + [ Daniel Baumann ] + * Added debug package. + * Converting XS-* fields to their official counterparts. + * Removed some re-imported useless whitespaces. + + [ Michael Meskes ] + * Made sure modules postinst calls debmod before modprobe. + * Added reference to http://wiki.debian.org/VirtualBox to README.Debian. + * Moved architecture independant files from /usr/lib to /usr/share, closes: #448951 + * Checked license of linux installer and additions. + * Repackaged dfsg orig tarball accordingly. + * Added linux installer tools, closes: #448749 + * Provide programs with upstream upper/lower case mix as used by upstream. + * Added linux additions in two separate packages, closes: #440517, #449315 + * Install vboxnet.sh as init script. + * Changed build system to work without kernel sources. + + -- Michael Meskes Tue, 12 Nov 2007 20:26:35 +0100 + +virtualbox-ose (1.5.2-dfsg-2) unstable; urgency=low + + * Adding depends to adduser (Closes: #447271). + * Conditionally call delgroup in virtualbox-ose.postrm. + * Replacing virtualbox-modules with virtualbox-ose-modules in + scripts/VBox.sh. + * Sorting recommends. + * Adding patch from Daniel Hahler to change the error + message for vboxdrv failure, according to virtualbox-ose-modules. + + -- Daniel Baumann Sat, 20 Oct 2007 06:40:00 +0200 + +virtualbox-ose (1.5.2-dfsg-1) unstable; urgency=low + + [ Michael Meskes ] + * Made build process install menu file, closes: #444842 + * Move virtualbox to Apps/System. + * Syncronized desktop and menu file. + * Documented features missing in Open-Source-Edition in + README.Debian, closes: #444941 + * Changed menu section to Applications/Emulators. + + [ Daniel Baumann ] + * Removing useless whitespaces at EOL and EOF in debian/*. + * Sorting architectures. + * Sorting build-depends. + * Sorting control fields. + * Adding VCS control fields. + * Adding Homepage control fields. + * Renaming virtualbox.desktop and virtualbox.xpm to virtualbox-ose.desktop + and virtualbox-ose.xpm. + * Using the term 'VirtualBox OSE' consistently in virtualbox-ose.desktop, + virtualbox-ose-source.README.Debian and virtualbox-ose.menu. + * Renaming README.Debian and README.rebuild to virtualbox-ose.README.Debian + and virtualbox-ose.README.rebuild for consistency reasons. + * Rediffed, cleaned up and properly named all dpatches. + * Added forgotton changelog from the 1.5.0-dfsg-1 upload. + * Using install -D call to install the lintian override. + * Removed comment in rules about "dh_lintian"; this will not be implemented + in debhelper anyway, see #109642 for more information. + * Fixed spelling error and improved language in + virtualbox-ose.README.rebuild. + * Cleaned, simplified and refractored postinst.modules.in, + virtualbox-ose.postinst and virtualbox-ose.postrm. + * Added m-a override link for virtualbox-ose-source. + * Re-applied improvements to dfsg-target in rules from 1.5.0-dfsg-1 upload. + * Removing not needed debhelper calls in binary-indep target in rules. + * Moving debian/virtualbox-ose.lintian-overrides to + debian/lintian/virtualbox-ose for consistency reasons. + * Moving debian/VBox.sh to debian/scripts/VBox.sh for consistency reasons. + * Updated menu file to new menu policy. + * Updated fsf address in copyright. + * New upstream release: + - Updating dfsg-free target in rules. + - Updating 01-configure.dpatch. + + -- Michael Meskes Fri, 19 Oct 2007 10:19:49 +0200 + +virtualbox-ose (1.5.0-dfsg2-2) unstable; urgency=low + + [ Patrick Winnertz ] + * Added README.Debian to virtualbox-ose in order to document that the + configuration xml files of the machines are not compatible between + 1.4.0-svn4130 and the 1.5.0 release. (Closes: #441634) + * Build only binary-dep packages in binary-dep target and only binary-indep + packages in binary-indep target. + * Added postrm to virtualbox-ose in order to remove the vboxusers group on + purge. (Closes: #442396) + + [ Michael Meskes ] + * Force udev to reload the rules in postinst. Hopefully this makes sure that + the device always belongs to the right group. + + -- Michael Meskes Sun, 23 Sep 2007 13:55:37 +0200 + +virtualbox-ose (1.5.0-dfsg2-1) unstable; urgency=low + + * Improved README.Debian for virtualbox-ose-source (Closes: #440793 ) + * Fixed error using different kernel sources than the one which is running + (Closes: #440693 ) + Thanks to Stefan Lippers-Hollmann + * The kernel module for virtualbox will only build on amd64 and i386 + (Closes: #440564) + * Merge some changes that Daniel Baumann made in his own package before. + Thanks. + * Set the alioth ML as maintainer address, since this list will be used to + discuss issues from now on. + * Removed one patch for makefile. Instead use variables now. + - Improved patch localconfig-kmk.dpatch + * Upload of 1.5.0 fixes scrolling issue. (Closes: #440773 ) + + -- Patrick Winnertz Thu, 06 Sep 2007 09:52:48 +0200 + +virtualbox-ose (1.5.0-dfsg-1) unstable; urgency=low + + * New upstream release. + * Re-added myself as co-maintainer as I'm the original maintainer. + * Updated dfsg-free target in rules for new upstream version. + * Don't forkbomb in dfsg-free target, use xargs. + * Don't do a subshell in dfsg-free target, not required. + * Cleaned the 'dh_make'-template header in postinst.modules.in. + * Rediffed all patches with the same diff options. + * Properly named all patches and adjusted their dpatch headers. + + -- Daniel Baumann Wed, 5 Sep 2007 06:58:00 +0200 + +virtualbox-ose (1.4.0svn4130-dfsg-1) unstable; urgency=low + + [ Patrick Winnertz ] + * Rename virtualbox to virtualbox-ose since innotek has a trademark on this + name and they prohibit us to use this name together with the open-source edition. + See http://www.virtualbox.org/wiki/Licensing_FAQ point 8 for details. + * If module is not loadable on this kernel don't fail to install kernel + module. (Closes: #440509) + * Adjusted Upstream Authors name. The name of the company has changed. + * Adjusted copyright. virtualbox is GPLv2 *only*. + + [ Michael Meskes ] + * Added Build-Dependancy to g++-multilib on amd64. + + -- Michael Meskes Mon, 03 Sep 2007 14:27:30 +0200 + +virtualbox (1.4.0svn4130-dfsg-1) unstable; urgency=low + + [ Daniel Baumann ] + * Initial release (Closes: #406992, #407001, #409711). + + [ Philipp Hug ] + * Stripped kbuild and yasm from source tarball + * Use Debian's kbuild and yasm instead + * Added myself as uploader + * Build target for module is now all instead of module + * Build against correct kernel source + * Integrated changes by Patrick Winnertz + * clean: rm env.sh AutoConfig.kmk configure.log + * Install udev rules to automatically create device + * Automatically create vboxusers group + * Binary names are now lowercase + * Disabled stripping for VMM because it breaks VirtualBox + * Don't require kernel module, recommend it instead + + [ Patrick Winnertz ] + * Remove Microsoft license stuff from orig.tar.gz (repackaged it ) + See dfsg-free section in debian/rules for details. + * Added patch to use own yasm + * Added patch to remove Additions from the Makefile.kmk + * Remove ./src/libs/xpcom18a4/nsprpub/build/autoconf from source tarball. + * Doesn't depend on gcc-3.4 and g++-3.4 since they are going to be removed from + debian. Use default instead. + Therefore I removed the patch, too. + * Don't call dh_installdeb twice. (build-dep & build-indep) + * Added section to create dfsg tarball automatically to debian/rules (experimental!!) + * Added lintian.overrides for -fPIC since somehow virtualbox doesn't work with + * Added patch to prevent building modules and kernel code when building the + gui. + * Install udev rule with virtualbox and not with the module, since several + modules for several kernels could be there. + * Improved copyright statements in copyright file. + * Corrected .desktop file + + -- Patrick Winnertz Thu, 30 Aug 2007 12:35:51 +0200 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-x11.postinst +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-x11.postinst @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + ldconfig +fi + +#DEBHELPER# --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.postrm +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.postrm @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +#case "$1" in +# remove|purge) +# # Remove usb device tree +# rm -rf /dev/vboxusb +# ;; +#esac + +if [ "$1" = "purge" ]; then + delgroup --quiet vboxusers || true +fi --- virtualbox-ose-4.0.4-dfsg.orig/debian/control +++ virtualbox-ose-4.0.4-dfsg/debian/control @@ -0,0 +1,203 @@ +Source: virtualbox-ose +Section: misc +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Virtualbox Team +Uploaders: Michael Meskes , + Felix Geyer +Build-Depends: bcc, + bzip2, + debhelper (>= 7.2.7~), + default-jdk, + dkms (>= 2.1.1.1), + docbook-xml, + docbook-xsl, + g++-multilib [amd64], + genisoimage, + gsoap, + iasl, + imagemagick, + kbuild (>= 1:0.1.5svn2274), + libasound2-dev, + libcap-dev, + libcurl4-openssl-dev | libcurl3-openssl-dev (>= 7.16.1), + libdrm-dev, + libfuse-dev, + libgl1-mesa-dev, + libglu1-mesa-dev, + libidl-dev, + libpam0g-dev, + libpixman-1-dev, + libpng12-dev, + libpulse-dev, + libqt4-dev (>= 4.4.0), + libqt4-opengl-dev (>= 4.4.0), + libsdl1.2-dev, + libssl-dev, + libvncserver-dev, + libx11-dev, + libxcomposite-dev, + libxcursor-dev, + libxdamage-dev, + libxext-dev, + libxi-dev, + libxinerama-dev, + libxmu-dev, + libxrandr-dev, + libxrender-dev, + libxslt1-dev, + lynx-cur, + makeself, + python-central (>= 0.6.7~), + python-dev (>= 2.4), + quilt (>= 0.46-7~), + texlive-fonts-extra, + texlive-fonts-recommended, + texlive-latex-extra, + texlive-latex-recommended, + uuid-dev, + x11proto-gl-dev, + x11proto-xf86dri-dev, + xserver-xorg-dev, + xsltproc, + yasm (>= 0.7.0), + zlib1g-dev +XS-Python-Version: >= 2.4 +Standards-Version: 3.9.1 +Homepage: http://www.virtualbox.org/ +Vcs-Git: git://git.debian.org/git/pkg-virtualbox/virtualbox-ose.git +Vcs-Browser: http://git.debian.org/?p=pkg-virtualbox/virtualbox-ose.git + +Package: virtualbox-ose-qt +Architecture: amd64 i386 +Depends: ${shlibs:Depends}, + ${misc:Depends}, + virtualbox-ose (= ${binary:Version}) +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 + Linux system. + . + This package provides the Qt based graphical user interface of the Open Source + Edition of VirtualBox. + +Package: virtualbox-ose +Architecture: amd64 i386 +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + adduser +Recommends: virtualbox-ose-dkms (= ${source:Version}), + virtualbox-ose-qt (= ${binary:Version}), + ${shlibs:Recommends} +Suggests: virtualbox-guest-additions, + libasound2, libpulse0, + vde2 +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 + Linux system. + . + This package provides the binaries for the Open Source Edition of + VirtualBox. The virtualbox-ose-dkms package is also required in order + to compile the kernel modules needed for virtualbox-ose. A graphical user + interface for VirtualBox is provided by the package virtualbox-ose-qt. + +Package: virtualbox-ose-dbg +Section: debug +Priority: extra +Architecture: amd64 i386 +Depends: ${misc:Depends}, + 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 + Linux system. + . + This package provides the debugging symbols for the Open Source Edition of + VirtualBox. + +Package: virtualbox-ose-dkms +Replaces: virtualbox-ose-source (<< 3.1.0-dfsg-1) +Conflicts: virtualbox-ose-guest-dkms +Section: kernel +Architecture: all +Depends: ${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 + Linux system. + . + This package provides the source code for the virtualbox kernel module to be + build with dkms. The virtualbox-ose package is also required in order to make + use of these modules. Kernel sources or headers are required to compile this + module. + +Package: virtualbox-ose-guest-dkms +Replaces: virtualbox-ose-guest-source (<< 3.1.0-dfsg-1) +Conflicts: virtualbox-ose-dkms +Section: kernel +Architecture: all +Depends: ${misc:Depends} +Description: x86 virtualization solution - guest addition module source 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 + Linux system. + . + This package provides the source code for the virtualbox guest addition kernel + modules to be build with dkms. The virtualbox-ose-guest-utils package is also + required in order to make use of these modules. Kernel sources or headers are + required to compile these modules. + +Package: virtualbox-ose-guest-x11 +Section: x11 +Architecture: amd64 i386 +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${xserver:Depends}, + virtualbox-ose-guest-utils (= ${binary:Version}) +Provides: ${xviddriver:Provides}, + ${xinpdriver:Provides} +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 + Linux system. + . + This package provides the X11 guest utilities of the Open Source Edition of + VirtualBox. These utilities are meant to be run inside the virtual machine. + They provide closer integration and improve the interactive performance. + +Package: virtualbox-ose-guest-utils +Architecture: amd64 i386 +Depends: ${shlibs:Depends}, + ${misc:Depends}, + pciutils +Recommends: virtualbox-ose-guest-dkms (= ${source:Version}), + virtualbox-ose-guest-x11 (= ${binary:Version}) +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 + Linux system. + . + This package provides the non-X11 guest utilities of the Open Source Edition of + VirtualBox. These 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-ose-fuse +Architecture: amd64 i386 +Depends: ${shlibs:Depends}, + ${misc:Depends}, + virtualbox-ose (= ${binary:Version}) +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. + --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-qt.manpages +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-qt.manpages @@ -0,0 +1 @@ +debian/manpages/VirtualBox.1 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.prerm +++ virtualbox-ose-4.0.4-dfsg/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# --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-dkms.README.Debian +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-dkms.README.Debian @@ -0,0 +1,11 @@ +virtualbox-ose for Debian +------------------------- + + - Starting with version 3.0.10 virtualbox-ose uses dkms(8) to build the + modules automatically. The dkms package recommends the linux-headers + package needed to build modules for the current distribution kernel. If this + for whatever reason does not work or you are using a non-distribution kernel + please make sure the right set of kernel headers is installed. + + -- Michael Meskes Wed, 02 Dec 2009 15:29:58 +0100 + --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.README.rebuild +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.README.rebuild @@ -0,0 +1,2 @@ +For information about a rebuild of the orig.tar.gz please have a look into +the dfsg-free target of debian/rules. --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-x11.install +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-x11.install @@ -0,0 +1,6 @@ +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/vboxmouse_drv.so /usr/lib/xorg/modules/input +out/bin/additions/vboxvideo_drv.so /usr/lib/xorg/modules/drivers +out/bin/additions/VBoxOGL*.so /usr/lib --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-qt.menu +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-qt.menu @@ -0,0 +1,4 @@ +?package(virtualbox-ose-qt):needs="X11" section="Applications/Emulators"\ + title="VirtualBox OSE" longtitle="PC virtualization solution"\ + description="Run several virtual systems on a single host computer"\ + command="/usr/bin/virtualbox" icon="/usr/share/pixmaps/virtualbox-ose.xpm" --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.postinst +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.postinst @@ -0,0 +1,42 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +case "${1}" in + configure) + if [ -z `getent group vboxusers` ]; then + addgroup --system --quiet vboxusers + fi + + # Build usb device tree + for i in /sys/bus/usb/devices/*; do + if test -r "$i/dev"; then + dev="`cat "$i/dev" 2> /dev/null || true`" + 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 + fi + done + + # 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 + ;; + + abort-upgrade|abort-deconfigure|abort-remove) + + ;; + + *) + echo "${0} called with unknown argument \`${1}'" 1>&2 + exit 1 + ;; +esac --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.init +++ virtualbox-ose-4.0.4-dfsg/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 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 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 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 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 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-dkms.udev +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-dkms.udev @@ -0,0 +1 @@ +KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-dkms.links.in +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-dkms.links.in @@ -0,0 +1,21 @@ +/usr/src/virtualbox-ose-CVERSION/r0drv /usr/src/virtualbox-ose-CVERSION/vboxdrv/r0drv +/usr/src/virtualbox-ose-CVERSION/r0drv /usr/src/virtualbox-ose-CVERSION/vboxnetflt/r0drv +/usr/src/virtualbox-ose-CVERSION/r0drv /usr/src/virtualbox-ose-CVERSION/vboxnetadp/r0drv +/usr/src/virtualbox-ose-CVERSION/include /usr/src/virtualbox-ose-CVERSION/vboxdrv/include +/usr/src/virtualbox-ose-CVERSION/include /usr/src/virtualbox-ose-CVERSION/vboxnetflt/include +/usr/src/virtualbox-ose-CVERSION/include /usr/src/virtualbox-ose-CVERSION/vboxnetadp/include +/usr/src/virtualbox-ose-CVERSION/alloc /usr/src/virtualbox-ose-CVERSION/vboxdrv/alloc +/usr/src/virtualbox-ose-CVERSION/alloc /usr/src/virtualbox-ose-CVERSION/vboxnetflt/alloc +/usr/src/virtualbox-ose-CVERSION/alloc /usr/src/virtualbox-ose-CVERSION/vboxnetadp/alloc +/usr/src/virtualbox-ose-CVERSION/common /usr/src/virtualbox-ose-CVERSION/vboxdrv/common +/usr/src/virtualbox-ose-CVERSION/common /usr/src/virtualbox-ose-CVERSION/vboxnetflt/common +/usr/src/virtualbox-ose-CVERSION/common /usr/src/virtualbox-ose-CVERSION/vboxnetadp/common +/usr/src/virtualbox-ose-CVERSION/generic /usr/src/virtualbox-ose-CVERSION/vboxdrv/generic +/usr/src/virtualbox-ose-CVERSION/generic /usr/src/virtualbox-ose-CVERSION/vboxnetflt/generic +/usr/src/virtualbox-ose-CVERSION/generic /usr/src/virtualbox-ose-CVERSION/vboxnetadp/generic +/usr/src/virtualbox-ose-CVERSION/math /usr/src/virtualbox-ose-CVERSION/vboxdrv/math +/usr/src/virtualbox-ose-CVERSION/math /usr/src/virtualbox-ose-CVERSION/vboxnetflt/math +/usr/src/virtualbox-ose-CVERSION/math /usr/src/virtualbox-ose-CVERSION/vboxnetadp/math +/usr/src/virtualbox-ose-CVERSION/VBox /usr/src/virtualbox-ose-CVERSION/vboxdrv/VBox +/usr/src/virtualbox-ose-CVERSION/VBox /usr/src/virtualbox-ose-CVERSION/vboxnetflt/VBox +/usr/src/virtualbox-ose-CVERSION/VBox /usr/src/virtualbox-ose-CVERSION/vboxnetadp/VBox --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-fuse.manpages +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-fuse.manpages @@ -0,0 +1 @@ +debian/manpages/vdfuse.1 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-x11.lintian-overrides +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-x11.lintian-overrides @@ -0,0 +1,8 @@ +virtualbox-ose-guest-x11: shlib-without-versioned-soname +virtualbox-ose-guest-x11: shlib-without-versioned-soname +virtualbox-ose-guest-x11: shlib-without-versioned-soname +virtualbox-ose-guest-x11: shlib-without-versioned-soname +virtualbox-ose-guest-x11: shlib-without-versioned-soname +virtualbox-ose-guest-x11: shlib-without-versioned-soname +virtualbox-ose-guest-x11: shlib-without-versioned-soname +virtualbox-ose-guest-x11: package-name-doesnt-match-sonames --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.udev +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.udev @@ -0,0 +1,4 @@ +SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" --- virtualbox-ose-4.0.4-dfsg.orig/debian/watch +++ virtualbox-ose-4.0.4-dfsg/debian/watch @@ -0,0 +1,4 @@ +version=3 + +opts=dversionmangle=s/-dfsg\d*$//,uversionmangle=s/-.*// \ + http://download.virtualbox.org/virtualbox/([\d\.\-]+)/VirtualBox-([\d\.\-]+).tar.bz2 --- virtualbox-ose-4.0.4-dfsg.orig/debian/compat +++ virtualbox-ose-4.0.4-dfsg/debian/compat @@ -0,0 +1 @@ +7 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.manpages +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.manpages @@ -0,0 +1,4 @@ +debian/manpages/VBoxHeadless.1 +debian/manpages/VBoxManage.1 +debian/manpages/VBoxSDL.1 +debian/manpages/vboxwebsrv.1 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.links +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.links @@ -0,0 +1,11 @@ +/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/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/man/man1/VBoxHeadless.1 /usr/share/man/man1/vboxheadless.1 +/usr/share/man/man1/VBoxManage.1 /usr/share/man/man1/vboxmanage.1 +/usr/share/man/man1/VBoxSDL.1 /usr/share/man/man1/vboxsdl.1 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.preinst +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.preinst @@ -0,0 +1,49 @@ +#!/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 +} + +case "$1" in + install|upgrade) + # Remove /etc/init.d/vboxdrv + if dpkg --compare-versions "$2" le "2.0.4-dfsg-0ubuntu2"; then + rm_conffile virtualbox-ose /etc/init.d/vboxdrv + fi + 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 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-dkms.postinst +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-dkms.postinst @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +case "$1" in + configure) + # 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 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-qt.links +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-qt.links @@ -0,0 +1,4 @@ +/usr/share/virtualbox/VBox.sh /usr/bin/virtualbox +/usr/share/virtualbox/VBox.sh /usr/bin/VirtualBox + +/usr/share/man/man1/VirtualBox.1 /usr/share/man/man1/virtualbox.1 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-utils.postinst +++ virtualbox-ose-4.0.4-dfsg/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 --- virtualbox-ose-4.0.4-dfsg.orig/debian/source.lintian-overrides +++ virtualbox-ose-4.0.4-dfsg/debian/source.lintian-overrides @@ -0,0 +1,2 @@ +virtualbox-ose source: ancient-autotools-helper-file src/VBox/RDP/client/config.sub 2003-06-18 +virtualbox-ose source: ancient-autotools-helper-file src/VBox/RDP/client/config.guess 2003-06-17 --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-dkms.README.Debian +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-dkms.README.Debian @@ -0,0 +1,11 @@ +virtualbox-ose for Debian +------------------------- + + - Starting with version 3.0.10 virtualbox-ose uses dkms(8) to build the + modules automatically. The dkms package recommends the linux-headers + package needed to build modules for the current distribution kernel. If this + for whatever reason does not work or you are using a non-distribution kernel + please make sure the right set of kernel headers is installed. + + -- Michael Meskes Wed, 02 Dec 2009 15:29:58 +0100 + --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-dkms.dkms +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-dkms.dkms @@ -0,0 +1,13 @@ +PACKAGE_NAME="virtualbox-ose-guest" +PACKAGE_VERSION="#MODULE_VERSION#" +CLEAN="rm -f *.*o" +BUILT_MODULE_NAME[0]="vboxguest" +BUILT_MODULE_LOCATION[0]="vboxguest" +DEST_MODULE_LOCATION[0]="/updates" +BUILT_MODULE_NAME[1]="vboxsf" +BUILT_MODULE_LOCATION[1]="vboxsf" +DEST_MODULE_LOCATION[1]="/updates" +BUILT_MODULE_NAME[2]="vboxvideo" +BUILT_MODULE_LOCATION[2]="vboxvideo" +DEST_MODULE_LOCATION[2]="/updates" +AUTOINSTALL="yes" --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-qt.files/virtualbox-ose.desktop +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-qt.files/virtualbox-ose.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=VirtualBox OSE +GenericName=PC virtualization solution +Type=Application +Comment=Run several virtual systems on a single host computer +Exec=virtualbox +TryExec=virtualbox +Icon=virtualbox-ose +Categories=Emulator;Utility; --- virtualbox-ose-4.0.4-dfsg.orig/debian/manpages/VBoxHeadless.1 +++ virtualbox-ose-4.0.4-dfsg/debian/manpages/VBoxHeadless.1 @@ -0,0 +1,49 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VBOXHEADLESS "1" "January 2011" "VBoxHeadless" "User Commands" +.SH NAME +VBoxHeadless \- x86 virtualization solution +.SH DESCRIPTION +Oracle VM VirtualBox Headless Interface +(C) 2008\-2011 Oracle Corporation +All rights reserved. +.SS "Usage:" +.TP +\fB\-s\fR, \fB\-startvm\fR, \fB\-\-startvm\fR +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 +TCP port number to use for the VNC server +.TP +\fB\-o\fR, \fB\-\-vncpass\fR +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 +.TP +\fB\-e\fR, \fB\-vrdeproperty\fR, \fB\-\-vrdeproperty\fR Set a VRDE property: +"TCP/Ports" \- comma\-separated list of ports +the VRDE server can bind to. Use a dash between +two port numbers to specify a range +"TCP/Address" \- interface IP the VRDE server +will bind to +.TP +\fB\-c\fR, \fB\-capture\fR, \fB\-\-capture\fR +Record the VM screen output to a file +.TP +\fB\-w\fR, \fB\-\-width\fR +Frame width when recording +.TP +\fB\-h\fR, \fB\-\-height\fR +Frame height when recording +.TP +\fB\-r\fR, \fB\-\-bitrate\fR +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 --- virtualbox-ose-4.0.4-dfsg.orig/debian/manpages/mount.vboxsf.8 +++ virtualbox-ose-4.0.4-dfsg/debian/manpages/mount.vboxsf.8 @@ -0,0 +1,61 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.4. +.TH MOUNT.VBOXSF "8" "January 2011" "mount.vboxsf" "System Administration Utilities" +.SH NAME +mount.vboxsf \- x86 virtualization solution +.SH SYNOPSIS +.B mount.vboxsf +[\fIOPTIONS\fR] \fINAME MOUNTPOINT\fR +.SH DESCRIPTION +Mount the VirtualBox shared folder NAME from the host system to MOUNTPOINT. +.TP +\fB\-w\fR +mount the shared folder writable (the default) +.TP +\fB\-r\fR +mount the shared folder read\-only +.TP +\fB\-n\fR +do not create an mtab entry +.HP +\fB\-o\fR OPTION[,OPTION...] use the mount options specified +.SS "Available mount options are:" +.TP +rw +mount writable (the default) +.TP +ro +mount read only +.TP +uid=UID +set the default file owner user id to UID +.TP +gid=GID +set the default file owner group id to GID +.TP +ttl=TTL +set the "time to live" to TID for the dentry +.TP +dmode=MODE +override the mode of all directories to (octal) MODE +.TP +fmode=MODE +override the mode of all regular files to (octal) MODE +.TP +umask=UMASK +set the umask to (octal) UMASK +.TP +dmask=UMASK +set the umask applied to directories only +.TP +fmask=UMASK +set the umask applied to regular files only +.TP +iocharset CHARSET +use the character set CHARSET for I/O operations +(default set is utf8) +.TP +convertcp CHARSET +convert the folder name from CHARSET to utf8 +.SS "Less common used options:" +.IP +noexec,exec,nodev,dev,nosuid,suid --- virtualbox-ose-4.0.4-dfsg.orig/debian/manpages/vboxwebsrv.1 +++ virtualbox-ose-4.0.4-dfsg/debian/manpages/vboxwebsrv.1 @@ -0,0 +1,24 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VBOXWEBSRV "1" "January 2011" "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 +All rights reserved. +.PP +Supported options (default values in brackets): +\fB\-\-help\fR, \fB\-h\fR: Print this help message and exit. +\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\-\-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\-\-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). --- virtualbox-ose-4.0.4-dfsg.orig/debian/manpages/VBoxSDL.1 +++ virtualbox-ose-4.0.4-dfsg/debian/manpages/VBoxSDL.1 @@ -0,0 +1,98 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VBOXSDL "1" "January 2011" "VBoxSDL" "User Commands" +.SH NAME +VBoxSDL \- x86 virtualization solution +.SH DESCRIPTION +Oracle VM VirtualBox SDL GUI version +(C) 2005\-2011 Oracle Corporation +All rights reserved. +.SS "Usage:" +.TP +\fB\-\-startvm\fR +Virtual machine to start, either UUID or name +.TP +\fB\-\-hda\fR +Set temporary first hard disk to file +.TP +\fB\-\-fda\fR +Set temporary first floppy disk to file +.TP +\fB\-\-cdrom\fR +Set temporary CDROM/DVD to file/device ('none' to unmount) +.TP +\fB\-\-boot\fR +Set temporary boot device (a = floppy, c = 1st HD, d = DVD, n = network) +.TP +\fB\-\-memory\fR +Set temporary memory size in megabytes +.TP +\fB\-\-vram\fR +Set temporary size of video memory in megabytes +.TP +\fB\-\-fullscreen\fR +Start VM in fullscreen mode +.TP +\fB\-\-fullscreenresize\fR +Resize the guest on fullscreen +.HP +\fB\-\-fixedmode\fR Use a fixed SDL video mode with given width, height and bits per pixel +.TP +\fB\-\-nofstoggle\fR +Forbid switching to/from fullscreen mode +.TP +\fB\-\-noresize\fR +Make the SDL frame non resizable +.TP +\fB\-\-nohostkey\fR +Disable all hostkey combinations +.TP +\fB\-\-nohostkeys\fR ... +Disable specific hostkey combinations, see below for valid keys +.TP +\fB\-\-nograbonclick\fR +Disable mouse/keyboard grabbing on mouse click w/o additions +.TP +\fB\-\-detecthostkey\fR +Get the hostkey identifier and modifier state +.HP +\fB\-\-hostkey\fR {} Set the host key to the values obtained using \fB\-\-detecthostkey\fR +.TP +\fB\-\-termacpi\fR +Send an ACPI power button event when closing the window +.TP +\fB\-\-vrdp\fR +Listen for VRDP connections on one of specified ports (default if not specified) +.TP +\fB\-\-discardstate\fR +Discard saved state (if present) and revert to last snapshot (if present) +.TP +\fB\-\-[no]rawr0\fR +Enable or disable raw ring 3 +.TP +\fB\-\-[no]rawr3\fR +Enable or disable raw ring 0 +.TP +\fB\-\-[no]patm\fR +Enable or disable PATM +.TP +\fB\-\-[no]csam\fR +Enable or disable CSAM +.TP +\fB\-\-[no]hwvirtex\fR +Permit or deny the usage of VT\-x/AMD\-V +.SS "Key bindings:" +.TP + + +f Switch to full screen / restore to previous view +h Press ACPI power button +n Take a snapshot and continue execution +p Pause / resume execution +q Power off +r VM reset +s Save state and power off +.TP + +Send +.TP +... +Send --- virtualbox-ose-4.0.4-dfsg.orig/debian/manpages/VBoxClient.1 +++ virtualbox-ose-4.0.4-dfsg/debian/manpages/VBoxClient.1 @@ -0,0 +1,24 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.4. +.TH VBOXCLIENT "1" "January 2011" "VBoxClient" "User Commands" +.SH NAME +VBoxClient \- x86 virtualization solution +.SH SYNOPSIS +.B VBoxClient +\fI--clipboard|--display|--checkhostversion|--seamless \fR[\fI-d|--nodaemon\fR] +.SH DESCRIPTION +Start the VirtualBox X Window System guest services. +.SH OPTIONS +.TP +\fB\-\-clipboard\fR +start the shared clipboard service +.TP +\fB\-\-display\fR +start the display management service +.HP +\fB\-\-checkhostversion\fR start the host version notifier service +.TP +\fB\-\-seamless\fR +start the seamless windows service +.TP +\fB\-d\fR, \fB\-\-nodaemon\fR +continue running as a system service --- virtualbox-ose-4.0.4-dfsg.orig/debian/manpages/VBoxManage.1 +++ virtualbox-ose-4.0.4-dfsg/debian/manpages/VBoxManage.1 @@ -0,0 +1,485 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VBOXMANAGE "1" "January 2011" "VBoxManage" "User Commands" +.SH NAME +VBoxManage \- x86 virtualization solution +.SH DESCRIPTION +Oracle VM VirtualBox Command Line Management Interface +(C) 2005\-2011 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 +bridgedifs|hostonlyifs|dhcpservers|hostinfo| +hostcpuids|hddbackends|hdds|dvds|floppies| +usbhost|usbfilters|systemproperties|extpacks +.PP +VBoxManage showvminfo | [\-\-details] [\-\-statistics] +.IP +[\-\-machinereadable] +.PP +VBoxManage showvminfo | \fB\-\-log\fR +.PP +VBoxManage registervm +.PP +VBoxManage unregistervm | [\-\-delete] +.PP +VBoxManage createvm \fB\-\-name\fR +.IP +[\-\-ostype ] +[\-\-register] +[\-\-basefolder | \fB\-\-settingsfile\fR ] +[\-\-uuid ] +.PP +VBoxManage modifyvm +.IP +[\-\-name ] +[\-\-ostype ] +[\-\-memory ] +[\-\-pagefusion on|off] +[\-\-vram ] +[\-\-acpi on|off] +[\-\-ioapic on|off] +[\-\-pae on|off] +[\-\-hpet on|off] +[\-\-hwvirtex on|off] +[\-\-hwvirtexexcl on|off] +[\-\-nestedpaging on|off] +[\-\-largepages on|off] +[\-\-vtxvpid on|off] +[\-\-synthcpu on|off] +[\-\-cpuidset ] +[\-\-cpuidremove ] +[\-\-cpuidremoveall] +[\-\-hardwareuuid ] +[\-\-cpus ] +[\-\-cpuhotplug on|off] +[\-\-plugcpu ] +[\-\-unplugcpu ] +[\-\-cpuexecutioncap <1\-100>] +[\-\-rtcuseutc on|off] +[\-\-monitorcount ] +[\-\-accelerate3d on|off] +[\-\-accelerate2dvideo on|off] +[\-\-firmware bios|efi|efi32|efi64] +[\-\-chipset ich9|piix3] +[\-\-bioslogofadein on|off] +[\-\-bioslogofadeout on|off] +[\-\-bioslogodisplaytime ] +[\-\-bioslogoimagepath ] +[\-\-biosbootmenu disabled|menuonly|messageandmenu] +[\-\-biossystemtimeoffset ] +[\-\-biospxedebug on|off] +[\-\-boot<1\-4> none|floppy|dvd|disk|net>] +[\-\-nic<1\-N> none|null|nat|bridged|intnet|hostonly| +.IP +vde] +.IP +[\-\-nictype<1\-N> Am79C970A|Am79C973| +.IP +82540EM|82543GC|82545EM| +virtio] +.IP +[\-\-cableconnected<1\-N> on|off] +[\-\-nictrace<1\-N> on|off] +[\-\-nictracefile<1\-N> ] +[\-\-nicspeed<1\-N> ] +[\-\-nicbootprio<1\-N> ] +[\-\-bridgeadapter<1\-N> none|] +[\-\-hostonlyadapter<1\-N> none|] +[\-\-intnet<1\-N> ] +[\-\-natnet<1\-N> |default] +[\-\-vdenet<1\-N> |default] +[\-\-natsettings<1\-N> [],[], +.IP +[],[], +[]] +.IP +[\-\-natpf<1\-N> [],tcp|udp,[], +.IP +,[],] +.IP +[\-\-natpf<1\-N> delete ] +[\-\-nattftpprefix<1\-N> ] +[\-\-nattftpfile<1\-N> ] +[\-\-nattftpserver<1\-N> ] +[\-\-natdnspassdomain<1\-N> on|off] +[\-\-natdnsproxy<1\-N> on|off] +[\-\-natdnshostresolver<1\-N> on|off] +[\-\-nataliasmode<1\-N> default|[log],[proxyonly], +.IP +[sameports]] +.IP +[\-\-macaddress<1\-N> auto|] +[\-\-mouse ps2|usb|usbtablet +[\-\-keyboard ps2|usb +[\-\-uart<1\-N> off| ] +[\-\-uartmode<1\-N> disconnected| +.IP +server | +client | +file | +] +.IP +[\-\-guestmemoryballoon ] +[\-\-gueststatisticsinterval ] +[\-\-audio none|null|oss|alsa|pulse] +[\-\-audiocontroller ac97|hda|sb16] +[\-\-clipboard disabled|hosttoguest|guesttohost| +.IP +bidirectional] +.IP +[\-\-vrde on|off] +[\-\-vrdeextpack default| +[\-\-vrdeproperty ] +[\-\-vrdeport ] +[\-\-vrdeaddress ] +[\-\-vrdeauthtype null|external|guest] +[\-\-vrdeauthlibrary default| +[\-\-vrdemulticon on|off] +[\-\-vrdereusecon on|off] +[\-\-vrdevideochannel on|off] +[\-\-vrdevideochannelquality ] +[\-\-usb on|off] +[\-\-usbehci on|off] +[\-\-snapshotfolder default|] +[\-\-teleporter on|off] +[\-\-teleporterport ] +[\-\-teleporteraddress +[\-\-teleporterpassword ] +.PP +VBoxManage import [\-\-dry\-run|\-n] [more options] +.IP +(run with \fB\-n\fR to have options displayed +.IP +for a particular OVF) +.PP +VBoxManage export \fB\-\-output\fR|\-o +.IP +[\-\-legacy09] +[\-\-manifest] +[\-\-vsys ] +.IP +[\-\-product ] +[\-\-producturl ] +[\-\-vendor ] +[\-\-vendorurl ] +[\-\-version ] +[\-\-eula ] +[\-\-eulafile ] +.PP +VBoxManage startvm | +.IP +[\-\-type gui|sdl|headless] +.PP +VBoxManage controlvm | +.IP +pause|resume|reset|poweroff|savestate| +acpipowerbutton|acpisleepbutton| +keyboardputscancode [ ...]| +setlinkstate<1\-N> on|off | +nic<1\-N> null|nat|bridged|intnet|hostonly +.IP +[] | +.IP +nictrace<1\-N> on|off +nictracefile<1\-N> +natpf<1\-N> [],tcp|udp,[], +.IP +,[], +.IP +natpf<1\-N> delete +guestmemoryballoon ] +gueststatisticsinterval ] +usbattach |
| +usbdetach |
| +vrde on|off | +vrdeport | +vrdeproperty | +vrdevideochannelquality +setvideomodehint [display] | +setcredentials +.IP +[\-\-allowlocallogon ] | +.IP +teleport \fB\-\-host\fR \fB\-\-port\fR +.IP +[\-\-maxdowntime ] [\-\-password password] +.IP +plugcpu +unplugcpu +cpuexecutioncap <1\-100> +.PP +VBoxManage discardstate | +.PP +VBoxManage adoptstate | +.PP +VBoxManage snapshot | +.IP +take [\-\-description ] [\-\-pause] | +delete | | +restore | | +restorecurrent | +edit ||\-\-current +.IP +[\-\-name ] +[\-\-description ] | +.IP +showvminfo | +.PP +VBoxManage closemedium disk|dvd|floppy | +.IP +[\-\-delete] +.PP +VBoxManage storageattach +.IP +\fB\-\-storagectl\fR +\fB\-\-port\fR +\fB\-\-device\fR +[\-\-type dvddrive|hdd|fdd] +[\-\-medium none|emptydrive| +.IP +||host:|iscsi] +.IP +[\-\-mtype normal|writethrough|immutable|shareable| +.IP +readonly|multiattach] +.IP +[\-\-comment ] +[\-\-passthrough on|off] +[\-\-bandwidthgroup ] +[\-\-forceunmount] +[\-\-server |] +[\-\-target ] +[\-\-port ] +[\-\-lun ] +[\-\-encodedlun ] +[\-\-username ] +[\-\-password ] +[\-\-intnet] +.PP +VBoxManage storagectl +.IP +\fB\-\-name\fR +[\-\-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 +.IP +\fB\-\-name\fR +[\-\-add disk|network] +[\-\-limit +[\-\-delete] +.PP +VBoxManage showhdinfo | +.PP +VBoxManage createhd \fB\-\-filename\fR +.IP +\fB\-\-size\fR |\-\-sizebyte +[\-\-format VDI|VMDK|VHD] (default: VDI) +[\-\-variant Standard,Fixed,Split2G,Stream,ESX] +.PP +VBoxManage modifyhd | +.IP +[\-\-type normal|writethrough|immutable|shareable| +.IP +readonly|multiattach] +.IP +[\-\-autoreset on|off] +[\-\-compact] +[\-\-resize |\-\-resizebyte ] +.PP +VBoxManage clonehd | +.IP +[\-\-format VDI|VMDK|VHD|RAW|] +[\-\-variant Standard,Fixed,Split2G,Stream,ESX] +[\-\-existing] +.PP +VBoxManage convertfromraw +.IP +[\-\-format VDI|VMDK|VHD] +[\-\-variant Standard,Fixed,Split2G,Stream,ESX] +.PP +VBoxManage convertfromraw stdin +.IP +[\-\-format VDI|VMDK|VHD] +[\-\-variant Standard,Fixed,Split2G,Stream,ESX] +.PP +VBoxManage getextradata global|| +.IP +|enumerate +.PP +VBoxManage setextradata global|| +.IP + +[] (no value deletes key) +.PP +VBoxManage setproperty machinefolder default| | +.IP +vrdeauthlibrary default| | +websrvauthlibrary default|null| | +vrdeextpack null| | +loghistorycount +.PP +VBoxManage usbfilter add +.IP +\fB\-\-target\fR ||global +\fB\-\-name\fR +\fB\-\-action\fR ignore|hold (global filters only) +[\-\-active yes|no] (yes) +[\-\-vendorid ] (null) +[\-\-productid ] (null) +[\-\-revision ] (null) +[\-\-manufacturer ] (null) +[\-\-product ] (null) +[\-\-remote yes|no] (null, VM filters only) +[\-\-serialnumber ] (null) +[\-\-maskedinterfaces ] +.PP +VBoxManage usbfilter modify +.IP +\fB\-\-target\fR ||global +[\-\-name ] +[\-\-action ignore|hold] (global filters only) +[\-\-active yes|no] +[\-\-vendorid |""] +[\-\-productid |""] +[\-\-revision |""] +[\-\-manufacturer |""] +[\-\-product |""] +[\-\-remote yes|no] (null, VM filters only) +[\-\-serialnumber |""] +[\-\-maskedinterfaces ] +.PP +VBoxManage usbfilter remove +.IP +\fB\-\-target\fR ||global +.PP +VBoxManage sharedfolder add | +.IP +\fB\-\-name\fR \fB\-\-hostpath\fR +[\-\-transient] [\-\-readonly] [\-\-automount] +.PP +VBoxManage sharedfolder remove | +.IP +\fB\-\-name\fR [\-\-transient] +.PP +VBoxManage guestproperty get | +.IP + [\-\-verbose] +.PP +VBoxManage guestproperty set | +.IP + [ [\-\-flags ]] +.PP +VBoxManage guestproperty enumerate | +.IP +[\-\-patterns ] +.PP +VBoxManage guestproperty wait | +.IP +[\-\-timeout ] [\-\-fail\-on\-timeout] +.PP +VBoxManage guestcontrol exec[ute] | +.IP + +\fB\-\-username\fR \fB\-\-password\fR +[\-\-arguments ""] +[\-\-environment "= [=]"] +[\-\-flags ] [\-\-timeout ] +[\-\-verbose] [\-\-wait\-for exit,stdout,stderr||] +.IP +copyto|cp | + +\fB\-\-username\fR \fB\-\-password\fR +[\-\-dryrun] [\-\-follow] [\-\-recursive] [\-\-verbose] +.IP +createdir[ectory]|mkdir|md | + +\fB\-\-username\fR \fB\-\-password\fR +[\-\-parents] [\-\-mode ] [\-\-verbose] +.IP +updateadditions | +[\-\-source ] [\-\-verbose] +.PP +VBoxManage debugvm | +.IP +dumpguestcore \fB\-\-filename\fR | +info [args] | +injectnmi | +osdetect | +osinfo | +getregisters [\-\-cpu ] |all ... | +setregisters [\-\-cpu ] = ... | +statistics [\-\-reset] [\-\-pattern ] +[\-\-descriptions] +.PP +VBoxManage metrics list [*|host| []] +.IP +(comma\-separated) +.PP +VBoxManage metrics setup +.IP +[\-\-period ] (default: 1) +[\-\-samples ] (default: 1) +[\-\-list] +[*|host| []] +.PP +VBoxManage metrics query [*|host| []] +.PP +VBoxManage metrics enable +.IP +[\-\-list] +[*|host| []] +.PP +VBoxManage metrics disable +.IP +[\-\-list] +[*|host| []] +.PP +VBoxManage metrics collect +.IP +[\-\-period ] (default: 1) +[\-\-samples ] (default: 1) +[\-\-list] +[\-\-detach] +[*|host| []] +.PP +VBoxManage hostonlyif ipconfig +.IP +[\-\-dhcp | +\fB\-\-ip\fR [\-\-netmask (def: 255.255.255.0)] | +\fB\-\-ipv6\fR [\-\-netmasklengthv6 (def: 64)]] +create | +remove +.PP +VBoxManage dhcpserver add|modify \fB\-\-netname\fR | +.IP +\fB\-\-ifname\fR +.IP +[\-\-ip +\fB\-\-netmask\fR +\fB\-\-lowerip\fR +\fB\-\-upperip\fR ] +[\-\-enable | \fB\-\-disable]\fR +.PP +VBoxManage dhcpserver remove \fB\-\-netname\fR | +.IP +\fB\-\-ifname\fR +.PP +VBoxManage extpack install | +.IP +uninstall [\-\-force] | +cleanup --- virtualbox-ose-4.0.4-dfsg.orig/debian/manpages/vdfuse.1 +++ virtualbox-ose-4.0.4-dfsg/debian/manpages/vdfuse.1 @@ -0,0 +1,43 @@ +.\" 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. --- virtualbox-ose-4.0.4-dfsg.orig/debian/manpages/VirtualBox.1 +++ virtualbox-ose-4.0.4-dfsg/debian/manpages/VirtualBox.1 @@ -0,0 +1,55 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VIRTUALBOX "1" "January 2011" "VirtualBox" "User Commands" +.SH NAME +VirtualBox \- x86 virtualization solution +.SH DESCRIPTION +Oracle VM VirtualBox Manager +(C) 2005\-2011 Oracle Corporation +All rights reserved. +.SS "Usage:" +.TP +\fB\-\-startvm\fR +start a VM by specifying its UUID or name +.TP +\fB\-\-seamless\fR +switch to seamless mode during startup +.TP +\fB\-\-fullscreen\fR +switch to fullscreen mode during startup +.TP +\fB\-\-rmode\fR sdl|image +select different render mode (default is sdl) +.TP +\fB\-\-no\-startvm\-errormsgbox\fR +do not show a message box for VM start errors +.TP +\fB\-\-dbg\fR +enable the GUI debug menu +.TP +\fB\-\-debug\fR +like \fB\-\-dbg\fR and show debug windows at VM startup +.TP +\fB\-\-debug\-command\-line\fR +like \fB\-\-dbg\fR and show command line window at VM startup +.TP +\fB\-\-debug\-statistics\fR +like \fB\-\-dbg\fR and show statistics window at VM startup +.TP +\fB\-\-no\-debug\fR +disable the GUI debug menu and debug windows +.TP +\fB\-\-start\-paused\fR +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:" +.TP +VBOX_GUI_DBG_ENABLED +enable the GUI debug menu if set +.TP +VBOX_GUI_DBG_AUTO_SHOW +show debug windows at VM startup +.TP +VBOX_GUI_NO_DEBUGGER +disable the GUI debug menu and debug windows --- virtualbox-ose-4.0.4-dfsg.orig/debian/manpages/VBoxService.8 +++ virtualbox-ose-4.0.4-dfsg/debian/manpages/VBoxService.8 @@ -0,0 +1,112 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.4. +.TH VBOXSERVICE "8" "January 2011" "VBoxService" "System Administration Utilities" +.SH NAME +VBoxService \- x86 virtualization solution +.SH DESCRIPTION +.SS "Usage:" +.TP +VBoxService +[\-f|\-\-foreground] [\-v|\-\-verbose] [\-i|\-\-interval ] +[\-\-disable\-] [\-\-enable\-] [\-h|\-?|\-\-help] +[\-\-control\-interval ] +[\-\-timesync\-interval ] [\-\-timesync\-min\-adjust ] +[\-\-timesync\-latency\-factor ] [\-\-timesync\-max\-latency ] +[\-\-timesync\-set\-threshold ] [\-\-timesync\-set\-start] [\-\-timesync\-set\-restore 0|1] +.IP +[\-\-vminfo\-interval ] +.SH OPTIONS +.TP +\fB\-i\fR | \fB\-\-interval\fR +The default interval. +.TP +\fB\-f\fR | \fB\-\-foreground\fR +Don't daemonize the program. For debugging. +.TP +\fB\-v\fR | \fB\-\-verbose\fR +Increment the verbosity level. For debugging. +.TP +\fB\-h\fR | \-? | \fB\-\-help\fR +Show this message and exit with status 1. +.SS "Service-specific options:" +.TP +\fB\-\-enable\-control\fR +Enables the control service. (default) +.TP +\fB\-\-disable\-control\fR +Disables 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\-\-enable\-timesync\fR +Enables the timesync service. (default) +.TP +\fB\-\-disable\-timesync\fR +Disables 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. +.TP +\fB\-\-timesync\-min\-adjust\fR +The minimum absolute drift value measured in +milliseconds to make adjustments for. +The default is 1000 ms on OS/2 and 100 ms elsewhere. +.TP +\fB\-\-timesync\-latency\-factor\fR +The factor to multiply the time query latency with +to calculate the dynamic minimum adjust time. +The default is 8 times. +.TP +\fB\-\-timesync\-max\-latency\fR +The max host timer query latency to accept. +The default is 250 ms. +.TP +\fB\-\-timesync\-set\-threshold\fR +The absolute drift threshold, given as milliseconds, +where to start setting the time instead of trying to +adjust it. The default is 20 min. +.TP +\fB\-\-timesync\-set\-start\fR +Set the time when starting the time sync service. +.TP +\fB\-\-timesync\-set\-on\-restore\fR 0|1 +Immediately set the time when the VM was restored. +1 = set (default), 0 = don't set. +.TP +\fB\-\-enable\-vminfo\fR +Enables the vminfo service. (default) +.TP +\fB\-\-disable\-vminfo\fR +Disables the vminfo service. +.TP +\fB\-\-vminfo\-interval\fR +Specifies the interval at which to retrieve the +VM information. The default is 10000 ms. +.TP +\fB\-\-enable\-cpuhotplug\fR +Enables the cpuhotplug service. (default) +.TP +\fB\-\-disable\-cpuhotplug\fR +Disables the cpuhotplug service. +.TP +\fB\-\-enable\-memballoon\fR +Enables the memballoon service. (default) +.TP +\fB\-\-disable\-memballoon\fR +Disables the memballoon service. +.TP +\fB\-\-enable\-vmstats\fR +Enables the vmstats service. (default) +.TP +\fB\-\-disable\-vmstats\fR +Disables the vmstats service. +.TP +\fB\-\-enable\-automount\fR +Enables the automount service. (default) +.TP +\fB\-\-disable\-automount\fR +Disables the automount service. +.IP +Copyright (C) 2009\-2011 Oracle Corporation --- virtualbox-ose-4.0.4-dfsg.orig/debian/manpages/VBoxControl.8 +++ virtualbox-ose-4.0.4-dfsg/debian/manpages/VBoxControl.8 @@ -0,0 +1,30 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.4. +.TH VBOXCONTROL "8" "January 2011" "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 +All rights reserved. +.PP +Usage: +.PP +VBoxControl [\-v|\-version] print version number and exit +VBoxControl \fB\-nologo\fR ... suppress the logo +.PP +VBoxControl guestproperty get [\-verbose] +VBoxControl guestproperty set [ [\-flags ]] +VBoxControl guestproperty enumerate [\-patterns ] +VBoxControl guestproperty wait +.IP +[\-timestamp ] +[\-timeout +.PP +VBoxControl sharedfolder list [\-automount] +VBoxControl writecoredump +VBoxControl takesnapshot +VBoxControl savestate +VBoxControl suspend +VBoxControl poweroff +VBoxControl help [command] +VBoxControl version --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.files/README.Debian.xml +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.files/README.Debian.xml @@ -0,0 +1,173 @@ + + +
+ Virtualbox OSE for Debian +
+ Guest utilities + + The guest utilities are provided as separate Debian packages. These + packages contain all features virtualbox-ose offers for Debian guests. + Guest utilities for operating systems not offering virtualbox-ose + packages have to be downloaded from the internet. The upstream provided + ISO images cannot be distributed with this package for licensing reasons. + The same holds for the externally provided WineD3D extensions. + +
+
+ Different versions + + The Open Source Edition of VirtualBox contains most but not all + features of the closed-source VirtualBox product that is + distributed under different terms and available from the + Virtualbox + homepage. Missing are: + + + + + Remote Display Protocol (RDP) Server + + + This component implements a complete RDP server on top of + the virtual hardware and allows users to connect to a + virtual machine remotely using any RDP compatible client. + + + + USB support + + VirtualBox implements a virtual USB controller and supports + passing through USB 1.1 and USB 2.0 devices to virtual + machines. + + + + USB over RDP + + This is a combination of the RDP server and USB support + allowing users to make USB devices available to virtual + machines running remotely. + + + + iSCSI initiator + + VirtualBox contains a builtin iSCSI initiator making it + possible to use iSCSI targets as virtual disks without the + guest requiring support for iSCSI. + + + +
+
+ 64-bit guests + + Starting with version 2.0.0 VirtualBox also supports 64-bit guest operating systems, + under the following conditions: + + + + + You need a 64-bit processor with hardware virtualization support + and a 64-bit host operating system. + + + + + You must run a 64-bit version of VirtualBox on that OS. This can + then run both 32-bit and 64-bit VMs; a 32-bit VirtualBox can only run 32-bit + VMs, regardless of the hardware. + + + + + You must enable hardware virtualization; software virtualization is not supported + for 64-bit VMs. + + + + + There is no specific setting to enable 64-bit support for a guest. + However, you should enable the I/O APIC for virtual machines that you intend to + use in 64-bit mode. + +
+
+ How to provide networking to virtual machines +
+ Mechanism + + VirtualBox can use three alternative mechanisms to provide + Ethernet networking to its virtual machines:b + +
+ NAT + + This is the easiest to use type of setup: The virtual + ethernet interface is connected to a virtual NAT router + including a DHCP server that is implemented within + the VirtualBox host software. + + + This is the default mode. It usually does not require + any extra configuration on the host. + +
+
+ Internal network + + In this mode, there is only connectivity within an + emulated network shared between two or more virtual + machines running in the same VirtualBox instance. + +
+
+ Host interface + + The virtual ethernet interface is connected to a + real device on the host filtering out its traffic. + +
+
+
+
+ Incompatibilities + + When upgrading from a pre 2.0.0 version to virtualbox might complaing + about a missing format attribute in the HardDisk tag of + ~/.VirtualBox/VirtualBox.xml. Manually adding + 'format="vdi"' solves this. + + + A bug appeared in in kernel 2.6.29 RC5 that broke virtualbox-ose. The fix + was added in 2.6.29.1. If you happen to use 2.6.29 and epxerience + problems starting your VMs please upgrade. In Debian all + linux-image-2.6.29 versions starting with Debian version 2.6.29-2 are + fine. + +
+
+ See also + + Additional and updated information may be found on + + + + the + + End-user documentation section of the official + VirtualBox site. + + + + + the + VirtualBox + page in the Debian Wiki. + + + + +
+
--- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.files/wiki.html +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.files/wiki.html @@ -0,0 +1,325 @@ + + + + + + +VirtualBox - Debian Wiki + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +

Translation(s): Español

(!) /Discussion


+ + +

VirtualBox is an x86 emulator developed by innotek (bought by Sun) comparable to VMWare. It has a version called VirtualBox Open Source Edition (OSE) which is freely available as Open Source Software under the terms of the GNU General Public License (GPL).
+
+Its a relatively new program and still has some minor issues, but in general it is reliable, stable and, above all, very fast. It has been used successfully to do installation tests with Debian Installer.
+
+This page contains some how-to, tips and tricks that can be useful when setting up and using VirtualBox

+

Installation

+

Currently (2008/01/01), VirtualBox is not supported natively by DebianEtch, the 4.0 version of Debian. To install it, you can use different methods:

+

Debian/Etch-backports

+

# cd /usr/src
+# tar xvjf virtualbox-ose.tar.bz2
+# cd modules/virtualbox-ose
+# make
+# make install
+# modprobe vboxdrv
+# lsmod | grep vbox
+vboxdrv                55344  0
  • Or simply use module-assistant (as root)

# module-assistant auto-install virtualbox-ose
+# modprobe vboxdrv
+# lsmod | grep vbox
+vboxdrv                55344  0
+
  • Start VirtualBox:

In KDE, go to menu KDE > System > VirtualBox OSE

  • or

In Gnome, goto menu Gnome > Applications > System tools > VirtualBox OSE

+

Debian/Testing (lenny)

+

Testing repository contains some precompiled kernel module. So you don't need to compile it like previous method. Except that, it's the same mechanism. Be carreful, using testing repository could break your system. Note that virtualbox need to update libc6 and linux-image-2.6

+

Experience

+

Legend :

  • {OK} = OK

  • /!\ = Failed

+ + + + + + + + + + + +

Who

Kernel

Disribution

Package Version

Status

-- SalokineTerata 2008-01-01 19:52:09

2.6.22-6~bpo40+1

Debian/Etch-backports

1.5.2-dfsg2-4~bpo40+1

{OK}

+

Errors

+

+

32-bit userland with x64_64 kernel

+

It is know bug that VirtualBox does not work in such scenarios: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456391

However VirtualBox version 2.0 promises support for this, but it is not yet packaged in Debian.

+

-1909 VERR VM DRIVER NOT ACCESSIBLE

+

Solution: Add your current user in the group vboxusers.

  • Under KDE:
    • K > Configuration Center > System Administration > User Management

    • Select your user and edit it
    • Go to Groups page

    • Select vboxusers group and validate

  • Reconnect your session
  • Under GNOME:
    • System > Administration > Users and Groups

    • Click on "Manage groups"

    • Select the vboxusers group and click "Properties"

    • Check your username in the list and click "Ok"
    • Logout and login again
  • On the commandline
    • log as user root either by su or sudo (su [return] - <give root password> [return] OR sudo su [return])

    • Use the following command: adduser <youruser> vboxusers

    • Logout and login again

You can verify if your are really member of this group with this command line:

# id MY_USER
+uid=1000(MY_USER) gid=1000(MY_USER) groupes=1000(MY_USER),8(mail),...127(vboxusers)
+

+

Tips & tricks

+

+

Switching consoles

+

The normal way to switch consoles in Linux is to use the ctrl-alt-Fx key combination. This does not work for a VirtualBox virtual machine (VM); it will switch consoles for the host system instead.

You should use <Host Key>-Fx instead, where <Host Key> is the key defined in File->Preferences->Input.

This also works for ctrl-alt-del and ctrl-alt-backspace

This is documented in the VirtualBox user manual in the section "Keyboard and mouse support in virtual machines", subsection "Typing special characters".

(An alternative method to switch between text consoles is to use alt-left and alt-right, but that does not work for graphical consoles like XOrg or DirectFB.)

+

Setting up bridged networking for VirtualBox (VirtualBox < 2.1.0)

+

By default VirtualBox uses NAT for the network interfaces of virtual machines and use an internal DHCP server to obtain an IP address. This works well but the disadvantage is that the machine will not have an IP address visible outside the VM and so you cannot connect to it from the host system or from other systems.

By attaching the VM's interface to "Host Interface" and creating a bridge on the host system, the VM can be made visible on the local network. This also allows to do fun stuff like netbooting the VM (boot from LAN using PXE). It is comparable to the "bridged networking" option in VMWare.

NB To use a wireless host device you need one that has support for Master mode (eg. it can be used as an access point, afaik only the Atheros and Prism drivers has this support)

+

Preparation

+

First install the package bridge-utils.

Next, change the network configuration of the host system so that the network interface becomes part of a bridge. Note that this requires restarting the network, so be careful when doing this on a remote system!

Change the file /etc/network/interfaces to look something like this:

# The loopback network interface
+auto lo
+iface lo inet loopback
+# An entry for eth0 is no longer needed
+#auto eth0
+#iface eth0 inet dhcp
+# Create the bridge (with the regular IP address of the host)
+auto br0
+iface br0 inet dhcp
+        bridge_ports eth0
+        bridge_fd 2.5
+

In this example the bridge gets its IP address and configuration from DHCP. For static configuration see
+/usr/share/doc/bridge-utils/README.Debian.gz

If you don't find the information for static configuration there, try:
+

# man bridge-utils-interfaces

Restart the networking of the host system using:

# /etc/init.d/networking restart

After this brctl show should show the bridge and ifconfig should show the bridge has the host's IP address.

It is also necessary for your user to own the device /dev/net/tun 

Run the following command to change the owner of that device:

# chown <username> /dev/net/tun

+

Configuring the VirtualBox VM

+

There are different ways the TAP interface for the VM can be created:

  • statically (before VirtualBox is even started)

  • on demand (when a VM is being started)

See also the chapter on "Virtual networking" in the VirtualBox user manual.

+

Static interfaces
+

In this case you only need to "define" an interface for use by a particular user once. All defined interfaces are "remembered" in the file /etc/vbox/interfaces and recreated by the VirtualBox init script every time the host system is booted.

Example to create an interface for a user:

# VBoxAddIF vbox0 <username> br0
+

You can of course create multiple interfaces per users, but all interfaces should have unique names.

To configure the VM to use static bridged networking, go to the "network" page of the VM's settings and change the following fields:

  • Attached to: Host Interface

  • Interface Name: vbox0

  • Setup Application: <empty>

  • Terminate Application: <empty>

+

Dynamic interfaces (on demand)
+

The example below shows the second method. This example will allow you to use multiple VM's, but the script assumes that each interface will be named in the form "vbox*". You may need to adapt the script to match your needs. Note that the script assumes you can execute the needed commands using sudo. A snippet of a sudoers file is included below as an example.

#!/bin/sh
+set -e
+BRIDGE="br0"
+case "${1}" in
+        "up" )
+                # Get the last vbox interface that was created or "" if none
+                TAP=$(cat /proc/net/dev | grep vbox | tail -n 1 | cut -d":" -f1 | sed 's/\s*vbox\(\.*\)/\1/')
+                # If there was no previous interface then set to -1 (this is so the += works)
+                [ "${TAP}" = "" ] && TAP=-1
+                # Increment TAP
+                let "TAP+=1"
+                # prepend vbox onto the TAP no
+                TAP="vbox${TAP}"
+                # Create the new TAP device
+                sudo VBoxTunctl -b -u $(whoami) -t ${TAP}
+                # Bring up the TAP (without an ip)
+                sudo ifconfig ${TAP} up
+                # Add the TAP to the Bridge
+                sudo brctl addif ${BRIDGE} ${TAP}
+                # Echo the name of the TAP so VirtualBox knows which one to use
+                # on lenny the echo must be commented for virtuabox to work correctly
+                echo ${TAP}
+                ;;
+        "down" )
+                # VirtualBox tells us which TAP it used
+                TAP=${3}
+                # Bring the TAP down
+                sudo ifconfig ${TAP} down
+                # Remove the TAP
+                sudo VBoxTunctl -d ${TAP} > /dev/null 2>&1
+                ;;
+esac
+

Save the script, for example as ~/.VirtualBox/bridge_setup. The script can be tested by running it from the command line. If successful, brctl show should show interface vbox* (where * will be a number) added to the bridge.

Here is a snippet of a sudoers file to help (replace username and hostname with the appropriate values):

Cmnd_Alias      VIRTUALBOX = /usr/bin/VBoxTunctl, /sbin/ifconfig vbox* up, /sbin/ifconfig vbox* down, /usr/sbin/brctl addif br0 vbox*
+username     ALL=(ALL) PASSWD: ALL
+username     hostname = NOPASSWD: VIRTUALBOX
+

To configure the VM to use dynamic bridged networking, go to the "network" page of the VM's settings and change the following fields:

  • Attached to: Host Interface

  • Interface Name: <empty>

  • Setup Application: ~/.VirtualBox/bridge_setup up

  • Terminate Application: ~/.VirtualBox/bridge_setup down

When the VM is started after that, the interface should be created automatically and the VM can be used just like it was a system connected directly to your local network.

+

How to remotely start virtual machines using vnc

+

Remote:

  • log onto your remote box
  • install tightvncserver
  • launch it (you don't need a display), pick a password
  • determine which port it is using, a way to do so:
    • netstat -tap | grep vnc
    • Let's say it's 5901
  • unlog from there since the server forked in the background

Local:

  • install xtightvncviewer
  • create a ssh tunnel to your box:
    • ssh -L 5901:localhost:5901 you@remote
  • use it: (note there are two colons)
    • xtightvncviewer localhost::5901
  • then VBoxManage startvm $yourvm &

  • and start as many virtual machines as wanted.

+

External Links

+

VirtualBox (last edited 2008-12-29 13:24:45 by MichaelMeskes)

+ +
+
+ + + + + + --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.files/VBox.sh +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.files/VBox.sh @@ -0,0 +1,78 @@ +#!/bin/sh +# +# written by Patrick Winnertz and +# Michael Meskes +# and placed under GPLv2 +# +# this is based on a script by +# InnoTek VirtualBox +# +# Copyright (C) 2006 InnoTek Systemberatung GmbH +# +# 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. + +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 + 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##/*/} +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" "$@" + ;; + vboxwebsrv) + exec "$INSTALL_DIR/vboxwebsrv" "$@" + ;; + *) + echo "Unknown application - $APP" + ;; +esac --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.files/source_virtualbox-ose.py +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.files/source_virtualbox-ose.py @@ -0,0 +1,11 @@ +import apport.hookutils + +def add_info(report): + """Add a list of installed packages matching 'virtualbox' or 'linux-headers'""" + report['VirtualBoxOse.DpkgList'] = apport.hookutils.command_output(["sh", "-c", "dpkg -l | grep -e virtualbox -e linux-headers"]) + + """Add information about installed VirtualBox kernel modules""" + report['VirtualBoxOse.ModInfo'] = apport.hookutils.command_output(["sh", "-c", + "find /lib/modules/`uname -r` -name \"vbox*\" | xargs -r modinfo"]) + + report['LsMod'] = apport.hookutils.command_output(["lsmod"]) --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose.files/NEWS.Debian +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose.files/NEWS.Debian @@ -0,0 +1,25 @@ +virtualbox-ose (3.1.4-dfsg-2) unstable; urgency=low + + virtualbox-ose no longer depends on QT4 to not force anyone to install QT4 + even if the virtualbox-ose provided gui is not installed. However, QT4 is still + recommended because there is one little utility in virtualbox-ose that is + linked againbt QT4. This utility, VBoxTestOGL, is used to test for OpenGL + capabilities. So if you use OpenGL you might want to install QT4 nonetheless. + If you know your OpenGL capabilities you can of course also replace VBoxTestOGL + by /bin/true or /bin/false depending on your capabilities. + + -- Michael Meskes Mon, 15 Feb 2010 20:53:12 +0100 + +virtualbox-ose (2.0.6-dfsg-1) experimental; urgency=low + + The way Host Interface Networking works has been completely rewritten with + VirtualBox 2. The main difference is that the complex bridging configuration + is no longer necessary. With the new mechanism, to enable Host Interface + Networking, all you need to do is to open the Settings dialog of a virtual + machine, go to the “Network” page and select “Host Interface” in the drop down + list for the “Attached to” field. Finally, select the desired host interface + from the list at the bottom of the page, which contains the physical network + interfaces. + + -- Michael Meskes Thu, 20 Nov 2008 14:09:54 +0100 + --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-guest-dkms.files/Makefile +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-guest-dkms.files/Makefile @@ -0,0 +1,3 @@ +.NOTPARALLEL: + +obj-m = vboxguest/ vboxsf/ vboxvideo/ --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/13-module-mismatch.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/13-module-mismatch.patch @@ -0,0 +1,19 @@ +Description: Adjusts failure message with Debian specific solution. +Author: Daniel Baumann + +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,9 @@ + break; + case VERR_VERSION_MISMATCH: + case VERR_VM_DRIVER_VERSION_MISMATCH: +- pszError = N_("The VirtualBox support driver which is running is from a different " +- "version of VirtualBox. You can correct this by stopping all " +- "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 " ++ "installing the virtualbox-ose-dkms package through apt-get."); + break; + default: + pszError = N_("Unknown error initializing kernel driver"); --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/23-remove-invalid-chars-check.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/23-remove-invalid-chars-check.patch @@ -0,0 +1,19 @@ +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 + +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 @@ + # the restricting tool is ar (mri mode). + INVALID_CHARS="[^A-Za-z0-9/\\$:._-]" + +-if (cd `dirname $0`; pwd)|grep -q "$INVALID_CHARS"; then +- echo "Error: VBox base path contains invalid characters!" +- exit 1 +-fi +- + # darwin /bin/sh has a builtin echo that doesn't grok -n. gotta love it. + if [ "$OS" = "darwin" ]; then + ECHO_N="/bin/echo -n" --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/series +++ virtualbox-ose-4.0.4-dfsg/debian/patches/series @@ -0,0 +1,15 @@ +01-build-arch.patch +04-vboxdrv-references.patch +06-xsession.patch +07-vboxnetflt-reference.patch +12-make-module.patch +13-module-mismatch.patch +16-no-update.patch +18-system-xorg.patch +22-no-static-libstdcpp.patch +23-remove-invalid-chars-check.patch +27-hide-host-cache-warning.patch +28-no-selinux-fedora.patch +29-fix-ftbfs-as-needed.patch +30-kernel-2.6.39.patch +31-CVE-2011-2305.patch --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/28-no-selinux-fedora.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/28-no-selinux-fedora.patch @@ -0,0 +1,16 @@ +Description: Don't install the selinux-fedora module. +Author: Felix Geyer + +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 +@@ -315,8 +315,7 @@ + $(VBOX_REL_X11_ADD_INST)vboxvideo.ids \ + $(VBOX_REL_X11_ADD_INST)50-vboxmouse.conf \ + $(VBOX_REL_LNX_ADD_INST)70-xorg-vboxmouse.rules \ +- $(VBOX_REL_LNX_ADD_INST)90-vboxguest.fdi \ +- selinux-fedora/vbox_x11.pp ++ $(VBOX_REL_LNX_ADD_INST)90-vboxguest.fdi + + INSTALLS += lnx_add_inst-license + lnx_add_inst-license_INST = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_OUT_DIR))/ --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/16-no-update.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/16-no-update.patch @@ -0,0 +1,65 @@ +Description: Disable "Check for Updates" action. +Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212 +Author: Daniel Hahler , Felix Geyer + +diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +--- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2010-12-17 16:14:24.000000000 +0100 ++++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2011-01-01 23:55:23.240440031 +0100 +@@ -4565,6 +4565,9 @@ + */ + void VBoxGlobal::showUpdateDialog (bool aForce) + { ++ // Updates are handled through package managers. ++ return; ++ + /* Silently check in one day after current time-stamp */ + QTimer::singleShot (24 /* hours */ * 60 /* minutes */ * + 60 /* seconds */ * 1000 /* milliseconds */, +diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp +--- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2010-11-22 11:05:07.000000000 +0100 ++++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2011-01-01 23:56:55.292774878 +0100 +@@ -266,13 +266,6 @@ + #if defined(Q_WS_MAC) && (QT_VERSION < 0x040700) + if (m_fIsFirstTime) + # endif +- pMenu->addAction(pActionsPool->action(UIActionIndex_Simple_Update)); +-#ifndef Q_WS_MAC +- pMenu->addSeparator(); +-#endif /* !Q_WS_MAC */ +-#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700) +- if (m_fIsFirstTime) +-# endif + pMenu->addAction(pActionsPool->action(UIActionIndex_Simple_About)); + + +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 @@ + #endif /* !VBOX_WITH_NETFLT */ + break; + } ++ case GLSettingsPage_Update: ++ { ++ return false; ++ } + default: + break; + } +diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp +--- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2010-08-13 12:17:07.000000000 +0200 ++++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2011-01-02 00:00:00.599195342 +0100 +@@ -90,13 +90,6 @@ + GetExtraData (VBoxDefs::GUI_RegistrationDlgWinID).isEmpty()); + #endif + +- aMenu->addAction (updateAction); +- updateAction->setEnabled (vboxGlobal().virtualBox(). +- GetExtraData (VBoxDefs::GUI_UpdateDlgWinID).isEmpty()); +- +-#ifndef Q_WS_MAC +- aMenu->addSeparator(); +-#endif /* Q_WS_MAC */ + aMenu->addAction (aboutAction); + } + --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/07-vboxnetflt-reference.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/07-vboxnetflt-reference.patch @@ -0,0 +1,15 @@ +Description: Made error message tell about missing vboxnetflt module. +Author: Michael Meskes + +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 @@ + else + { + return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, +- N_("Failed to open/create the internal network '%s'"), pThis->szNetwork); ++ N_("Failed to open/create the internal network '%s' (you might need to modprobe vboxnetflt to make it accessible)"), pThis->szNetwork); + } + } + --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/27-hide-host-cache-warning.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/27-hide-host-cache-warning.patch @@ -0,0 +1,44 @@ +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 + +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 @@ + if ( enmFsTypeFile == RTFSTYPE_EXT4 + || enmFsTypeFile == RTFSTYPE_XFS) + { +- setVMRuntimeErrorCallbackF(pVM, this, 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 " +- "kernel bug which can lead to the corruption of the virtual " +- "disk image under these conditions.\n" +- "Either enable the host I/O cache permanently in the VM " +- "settings or put the disk image and the snapshot folder " +- "onto a different file system.\n" +- "The host I/O cache will now be enabled for this medium"), +- strFile.raw(), enmFsTypeFile == RTFSTYPE_EXT4 ? "ext4" : "xfs"); + fUseHostIOCache = true; + } + else if ( ( enmFsTypeSnap == RTFSTYPE_EXT4 + || enmFsTypeSnap == RTFSTYPE_XFS) + && !mfSnapshotFolderExt4WarningShown) + { +- setVMRuntimeErrorCallbackF(pVM, this, 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 " +- "kernel bug which can lead to the corruption of the virtual " +- "disk image under these conditions.\n" +- "Either enable the host I/O cache permanently in the VM " +- "settings or put the disk image and the snapshot folder " +- "onto a different file system.\n" +- "The host I/O cache will now be enabled for this medium"), +- enmFsTypeSnap == RTFSTYPE_EXT4 ? "ext4" : "xfs"); + fUseHostIOCache = true; + mfSnapshotFolderExt4WarningShown = true; + } --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/12-make-module.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/12-make-module.patch @@ -0,0 +1,111 @@ +Description: Fix ARCH setting in modules Makefiles. +Author: Michael Meskes + +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 +@@ -33,9 +33,21 @@ + BUILD_TARGET_ARCH := amd64 + else + ifeq ($(ARCH),i386) +- BUILD_TARGET_ARCH := x86 ++ ifeq ($(CONFIG_X86_32),y) ++ BUILD_TARGET_ARCH := x86 ++ else ++ BUILD_TARGET_ARCH := amd64 ++ endif + else +- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF) ++ ifeq ($(ARCH),x86) ++ ifeq ($(CONFIG_X86_32),y) ++ BUILD_TARGET_ARCH := x86 ++ else ++ BUILD_TARGET_ARCH := amd64 ++ endif ++ else ++ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF) ++ endif + endif + endif + else +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 +@@ -44,9 +44,21 @@ + BUILD_TARGET_ARCH := amd64 + else + ifeq ($(ARCH),i386) +- BUILD_TARGET_ARCH := x86 ++ ifeq ($(CONFIG_X86_32),y) ++ BUILD_TARGET_ARCH := x86 ++ else ++ BUILD_TARGET_ARCH := amd64 ++ endif + else +- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF) ++ ifeq ($(ARCH),x86) ++ ifeq ($(CONFIG_X86_32),y) ++ BUILD_TARGET_ARCH := x86 ++ else ++ BUILD_TARGET_ARCH := amd64 ++ endif ++ else ++ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF) ++ endif + endif + endif + else +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 +@@ -35,9 +35,21 @@ + BUILD_TARGET_ARCH := amd64 + else + ifeq ($(ARCH),i386) +- BUILD_TARGET_ARCH := x86 ++ ifeq ($(CONFIG_X86_32),y) ++ BUILD_TARGET_ARCH := x86 ++ else ++ BUILD_TARGET_ARCH := amd64 ++ endif + else +- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF) ++ ifeq ($(ARCH),x86) ++ ifeq ($(CONFIG_X86_32),y) ++ BUILD_TARGET_ARCH := x86 ++ else ++ BUILD_TARGET_ARCH := amd64 ++ endif ++ else ++ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF) ++ endif + endif + endif + else +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 +@@ -35,9 +35,21 @@ + BUILD_TARGET_ARCH := amd64 + else + ifeq ($(ARCH),i386) +- BUILD_TARGET_ARCH := x86 ++ ifeq ($(CONFIG_X86_32),y) ++ BUILD_TARGET_ARCH := x86 ++ else ++ BUILD_TARGET_ARCH := amd64 ++ endif + else +- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF) ++ ifeq ($(ARCH),x86) ++ ifeq ($(CONFIG_X86_32),y) ++ BUILD_TARGET_ARCH := x86 ++ else ++ BUILD_TARGET_ARCH := amd64 ++ endif ++ else ++ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF) ++ endif + endif + endif + else --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/30-kernel-2.6.39.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/30-kernel-2.6.39.patch @@ -0,0 +1,166 @@ +Description: Fix build failure with kernel 2.6.39-rc1. +Origin: upstream, http://www.virtualbox.org/changeset/36471 + +Index: trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c +=================================================================== +--- trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 35662) ++++ trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 36471) +@@ -67,5 +67,5 @@ + + static struct pci_device_id pciidlist[] = { +- vboxvideo_PCI_IDS ++ vboxvideo_PCI_IDS + }; + +@@ -73,5 +73,5 @@ + { + # if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 28) +- return drm_vblank_init(dev, 1); ++ return drm_vblank_init(dev, 1); + #else + return 0; +@@ -79,49 +79,69 @@ + } + +-static struct drm_driver driver = { +- /* .driver_features = DRIVER_USE_MTRR, */ +- .load = vboxvideo_driver_load, +- .reclaim_buffers = drm_core_reclaim_buffers, +- /* As of Linux 2.65.37, always the internal functions are used. */ ++static struct drm_driver driver = ++{ ++ /* .driver_features = DRIVER_USE_MTRR, */ ++ .load = vboxvideo_driver_load, ++ .reclaim_buffers = drm_core_reclaim_buffers, ++ /* As of Linux 2.65.37, always the internal functions are used. */ + #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 37) +- .get_map_ofs = drm_core_get_map_ofs, +- .get_reg_ofs = drm_core_get_reg_ofs, ++ .get_map_ofs = drm_core_get_map_ofs, ++ .get_reg_ofs = drm_core_get_reg_ofs, + #endif +- .fops = { +- .owner = THIS_MODULE, +- .open = drm_open, +- .release = drm_release, +- /* This was changed with Linux 2.6.33 but Fedora backported this +- * change to their 2.6.32 kernel. */ ++ .fops = ++ { ++ .owner = THIS_MODULE, ++ .open = drm_open, ++ .release = drm_release, ++ /* This was changed with Linux 2.6.33 but Fedora backported this ++ * change to their 2.6.32 kernel. */ + #if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 33) +- .unlocked_ioctl = drm_ioctl, ++ .unlocked_ioctl = drm_ioctl, + #else +- .ioctl = drm_ioctl, ++ .ioctl = drm_ioctl, + #endif +- .mmap = drm_mmap, +- .poll = drm_poll, +- .fasync = drm_fasync, +- }, +- .pci_driver = { +- .name = DRIVER_NAME, +- .id_table = pciidlist, +- }, ++ .mmap = drm_mmap, ++ .poll = drm_poll, ++ .fasync = drm_fasync, ++ }, ++#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) ++ .pci_driver = ++ { ++ .name = DRIVER_NAME, ++ .id_table = pciidlist, ++ }, ++#endif ++ .name = DRIVER_NAME, ++ .desc = DRIVER_DESC, ++ .date = DRIVER_DATE, ++ .major = DRIVER_MAJOR, ++ .minor = DRIVER_MINOR, ++ .patchlevel = DRIVER_PATCHLEVEL, ++}; + +- .name = DRIVER_NAME, +- .desc = DRIVER_DESC, +- .date = DRIVER_DATE, +- .major = DRIVER_MAJOR, +- .minor = DRIVER_MINOR, +- .patchlevel = DRIVER_PATCHLEVEL, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 39) ++static struct pci_driver pci_driver = ++{ ++ .name = DRIVER_NAME, ++ .id_table = pciidlist, + }; ++#endif + + static int __init vboxvideo_init(void) + { +- return drm_init(&driver); ++#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) ++ return drm_init(&driver); ++#else ++ return drm_pci_init(&driver, &pci_driver); ++#endif + } + + static void __exit vboxvideo_exit(void) + { +- drm_exit(&driver); ++#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) ++ drm_exit(&driver); ++#else ++ drm_pci_exit(&driver, &pci_driver); ++#endif + } + +Index: trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c +=================================================================== +--- trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 33994) ++++ trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 36471) +@@ -447,12 +447,12 @@ + } + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) ++# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) + static struct super_block *sf_get_sb(struct file_system_type *fs_type, int flags, +- const char *dev_name, void *data) ++ const char *dev_name, void *data) + { + TRACE(); + return get_sb_nodev(fs_type, flags, data, sf_read_super_26); + } +-#else ++# elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) + static int sf_get_sb(struct file_system_type *fs_type, int flags, + const char *dev_name, void *data, struct vfsmount *mnt) +@@ -461,5 +461,12 @@ + return get_sb_nodev(fs_type, flags, data, sf_read_super_26, mnt); + } +-#endif ++# else ++static struct dentry *sf_mount(struct file_system_type *fs_type, int flags, ++ const char *dev_name, void *data) ++{ ++ TRACE(); ++ return mount_nodev(fs_type, flags, data, sf_read_super_26); ++} ++# endif + + static struct file_system_type vboxsf_fs_type = +@@ -467,5 +474,9 @@ + .owner = THIS_MODULE, + .name = "vboxsf", ++# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) + .get_sb = sf_get_sb, ++# else ++ .mount = sf_mount, ++# endif + .kill_sb = kill_anon_super + }; --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/29-fix-ftbfs-as-needed.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/29-fix-ftbfs-as-needed.patch @@ -0,0 +1,30 @@ +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-asneeded.patch?revision=1.2 + +--- VirtualBox-4.0.0_OSE/src/libs/xpcom18a4/Makefile.kmk ++++ VirtualBox-4.0.0_OSE/src/libs/xpcom18a4/Makefile.kmk +@@ -469,9 +469,11 @@ + libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags) + libIDL_config_libs := $(shell $(VBOX_LIBIDL_CONFIG) --libs) + xpidl_CFLAGS = \ +- $(libIDL_config_cflags) ++ $(shell pkg-config --cflags libIDL-2.0) + xpidl_LDFLAGS = \ +- $(libIDL_config_libs) ++ $(shell pkg-config --libs-only-L libIDL-2.0) ++xpidl_LIBS.linux = \ ++ $(shell pkg-config --libs-only-l libIDL-2.0 | sed -e 's/-l//g') + xpidl_LDFLAGS.linux = \ + $(VBOX_LD_as_needed) + endif +--- 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 + ifeq ($(KBUILD_HOST),linux) +-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 --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/01-build-arch.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/01-build-arch.patch @@ -0,0 +1,15 @@ +Description: Correctly check build architecture. +Author: Michael Meskes + +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 +- BUILD_CPU=`uname -m` ++ 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) --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/31-CVE-2011-2305.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/31-CVE-2011-2305.patch @@ -0,0 +1,26 @@ +Description: crOpenGL: strict offset check +Origin: upstream, http://www.virtualbox.org/changeset/37432 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/816874 + +Index: trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp +=================================================================== +--- trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp (revision 36846) ++++ trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp (revision 37432) +@@ -487,4 +487,10 @@ + if (pBuffer->uiId == iBuffer) + { ++ if (pBuffer->uiSize!=cbBufferSize) ++ { ++ LogRel(("SHARED_CROPENGL svcGetBuffer: invalid buffer(%i) size %i instead of %i\n", ++ iBuffer, pBuffer->uiSize, cbBufferSize)); ++ return NULL; ++ } + return pBuffer; + } +@@ -819,5 +825,5 @@ + /* Execute the function. */ + CRVBOXSVCBUFFER_t *pSvcBuffer = svcGetBuffer(iBuffer, cbBufferSize); +- if (!pSvcBuffer || ui32Offset+cbBuffer>cbBufferSize) ++ if (!pSvcBuffer || ((uint64_t)ui32Offset+cbBuffer)>cbBufferSize) + { + rc = VERR_INVALID_PARAMETER; --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/22-no-static-libstdcpp.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/22-no-static-libstdcpp.patch @@ -0,0 +1,31 @@ +Description: Do not include statically linked libstdc++. + Not a good idea if we don't need to be binary-compatible across exotic + distribution. Doesn't work with trunk glibc heading towards 2.11 anyways. + Static linking is not really supported anyways. +Author: Lubomir Rintel +Origin: http://cvs.rpmfusion.org/viewvc/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-3.1.0-libcxx.patch?root=free&view=markup + +diff -urNad virtualbox-ose-3.1.0-dfsg~/src/VBox/Additions/x11/VBoxClient/Makefile.kmk virtualbox-ose-3.1.0-dfsg/src/VBox/Additions/x11/VBoxClient/Makefile.kmk +--- virtualbox-ose-3.1.0-dfsg~/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.1.0-dfsg/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2009-10-07 18:44:29.962989537 +0200 +@@ -69,20 +69,6 @@ + ifdef VBOX_WITH_GUEST_PROPS + VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS + endif +-# +-# Link against 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 += $(VBoxClient_0_OUTDIR) +-VBoxClient_ORDERDEPS = $(VBoxClient_0_OUTDIR)/libstdc++.a +-VBoxClient_CLEAN = $(VBoxClient_0_OUTDIR)/libstdc++.a +-$$(VBoxClient_0_OUTDIR)/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) --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/06-xsession.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/06-xsession.patch @@ -0,0 +1,20 @@ +Description: Make Xsession.d script ignore errors. +Author: Michael Meskes + +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 + 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 --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/18-system-xorg.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/18-system-xorg.patch @@ -0,0 +1,277 @@ +Description: Build the X.Org driver only for the selected system X Server version. +Author: Michael Meskes , Felix Geyer + +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 += \ + 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 + 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)/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_MESA_INCS) \ +- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 ++ /usr/include/drm \ ++ /usr/include/libdrm + 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) ++ 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 := \ +@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \ + # + # vboxmouse_drv_17 + # +-DLLS += vboxmouse_drv_17 + 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 +@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \ + # + # vboxmouse_drv_18 + # +-DLLS += vboxmouse_drv_18 + vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \ + # + # vboxmouse_drv_19 + # +-DLLS += vboxmouse_drv_19 + vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \ + # + # vboxmouse_drv_110 + # +-DLLS += vboxmouse_drv_110 + vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \ + vboxmouse_15.c + + ++vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv ++vboxmouse_drv_$(XSERVER_VERSION)_INCS := \ ++ /usr/include/x11 \ ++ /usr/include/xorg \ ++ /usr/include/pixman-1 ++DLLS += vboxmouse_drv_$(XSERVER_VERSION) ++ ++ + # 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 +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) +@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \ + vboxvideo_drv_110_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 --- virtualbox-ose-4.0.4-dfsg.orig/debian/patches/04-vboxdrv-references.patch +++ virtualbox-ose-4.0.4-dfsg/debian/patches/04-vboxdrv-references.patch @@ -0,0 +1,79 @@ +Description: Change error messages for vboxdrv failure, according to virtualbox-ose-dkms. +Author: Daniel Hahler + +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 @@ + + #ifdef RT_OS_LINUX + case VERR_SUPDRV_COMPONENT_NOT_FOUND: +- pszError = N_("One of the kernel modules was not successfully loaded. Make sure " +- "that no kernel modules from an older version of VirtualBox exist. " +- "Then try to recompile and reload the kernel modules by executing " +- "'/etc/init.d/vboxdrv setup' as root"); ++ pszError = N_("Please install the virtualbox-ose-dkms package " ++ "and execute 'modprobe vboxdrv' as root"); + break; + #endif + +@@ -334,10 +332,8 @@ + { + case VERR_VM_DRIVER_LOAD_ERROR: + #ifdef RT_OS_LINUX +- pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module " +- "was either not loaded or /dev/vboxdrv is not set up properly. " +- "Re-setup the kernel module by executing " +- "'/etc/init.d/vboxdrv setup' as root"); ++ pszError = N_("Please install the virtualbox-ose-dkms package " ++ "and execute 'modprobe vboxdrv' as root"); + #else + pszError = N_("VirtualBox kernel driver not loaded"); + #endif +@@ -376,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 " +- "was either not loaded or /dev/vboxdrv was not created for some " +- "reason. Re-setup the kernel module by executing " +- "'/etc/init.d/vboxdrv setup' as root"); ++ pszError = N_("Please install the virtualbox-ose-dkms package " ++ "and execute 'modprobe vboxdrv' as root"); + #else + pszError = N_("VirtualBox kernel driver not installed"); + #endif +diff -urNad virtualbox-ose-3.1.0-dfsg~/src/VBox/Frontends/VirtualBox/src/main.cpp virtualbox-ose-3.1.0-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp +--- virtualbox-ose-3.1.0-dfsg~/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-10-07 11:27:13.000000000 +0200 ++++ virtualbox-ose-3.1.0-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-10-07 13:42:18.215472116 +0200 +@@ -72,13 +72,8 @@ + ); + + QString g_QStrHintLinuxNoDriver = QApplication::tr( +- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " +- "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " +- "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-dkms package " ++ "and execute 'modprobe vboxdrv' as root." + ); + + QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( +@@ -89,12 +84,8 @@ + ); + + QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( +- "The VirtualBox kernel modules do not match this version of " +- "VirtualBox. The installation of VirtualBox was apparently not " +- "successful. Executing

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

" +- "may correct this. Make sure that you do not mix the " +- "OSE version and the PUEL version of VirtualBox." ++ "Please install the virtualbox-ose-dkms package " ++ "and execute 'modprobe vboxdrv' as root." + ); + + QString g_QStrHintOtherNoDriver = QApplication::tr( --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-dkms.files/do_Module.symvers +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-dkms.files/do_Module.symvers @@ -0,0 +1,46 @@ +#!/bin/sh + +# +# This script is used when building kernel modules from DKMS. I don't +# know how to solve the problem of inter-module dependencies better. +# +# Copyright (C) 2008 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. +# +# The contents of this file may alternatively be used under the terms +# of the Common Development and Distribution License Version 1.0 +# (CDDL) only, as it comes in the "COPYING.CDDL" file of the +# VirtualBox OSE distribution, in which case the provisions of the +# CDDL are applicable instead of those of the GPL. +# +# You may elect to license modified versions of this file under the +# terms and conditions of either the GPL or the CDDL or both. +# +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa +# Clara, CA 95054 USA or visit http://www.sun.com if you need +# additional information or have any questions. +# + +SYMFILE="/tmp/$1-Module.symvers" +case "$2" in + save) + if [ -f "$3" ]; then + cp "$3" "$SYMFILE" + fi + ;; + restore) + if [ -f "$SYMFILE" ]; then + cp "$SYMFILE" "$3" + fi + ;; + *) + echo "Usage: save|restore " + ;; +esac --- virtualbox-ose-4.0.4-dfsg.orig/debian/virtualbox-ose-dkms.files/Makefile +++ virtualbox-ose-4.0.4-dfsg/debian/virtualbox-ose-dkms.files/Makefile @@ -0,0 +1,3 @@ +.NOTPARALLEL: + +obj-m = vboxdrv/ vboxnetflt/ vboxnetadp/ --- virtualbox-ose-4.0.4-dfsg.orig/debian/source/format +++ virtualbox-ose-4.0.4-dfsg/debian/source/format @@ -0,0 +1 @@ +1.0 --- virtualbox-ose-4.0.4-dfsg.orig/debian/vdfuse/vdfuse.c +++ virtualbox-ose-4.0.4-dfsg/debian/vdfuse/vdfuse.c @@ -0,0 +1,625 @@ +/* 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 . */ + +/* 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#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 +#else // >= v4.0 +#include +#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_START, &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 = (ebr.chain).offset; + } + } + // + // 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; +}