[Pkg-virtualbox-commits] r258 - in trunk/debian: . patches
meskes at alioth.debian.org
meskes at alioth.debian.org
Fri May 2 09:50:50 UTC 2008
Author: meskes
Date: 2008-05-02 09:50:49 +0000 (Fri, 02 May 2008)
New Revision: 258
Removed:
trunk/debian/patches/02-2.6.25.dpatch
trunk/debian/patches/02-2.6.25_part2.dpatch
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/copyright
trunk/debian/patches/00list
trunk/debian/patches/01-no-64bit-guest.dpatch
trunk/debian/patches/03-config-kmk.dpatch
trunk/debian/patches/04-localconf-kmk.dpatch
trunk/debian/patches/05-vboxdrv-references.dpatch
trunk/debian/patches/06-vboxadd-udev.dpatch
trunk/debian/patches/08-init-fail.dpatch
trunk/debian/patches/09-init-lsb.dpatch
trunk/debian/patches/10-initscript.dpatch
trunk/debian/patches/12-gcc-4.3.dpatch
Log:
Started preparing for upcoming 1.6.0 release:
- Adapted patches, not completely rediffed though
- Removed patches for kernel 2.6.25, should be fixed in release
- Fixed build dependencies
This is work in progress.
*** DOES NOT COMPILE YET ***
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/changelog 2008-05-02 09:50:49 UTC (rev 258)
@@ -1,6 +1,6 @@
-virtualbox-ose (1.5.6-dfsg-7) unstable; urgency=low
+virtualbox-ose (1.6.0-dfsg-1) unstable; urgency=low
- [ Michael Meskes ]
+ * New upstream version, closes: #478373, #478333
* Made virtualbox-ose-modules recommend virtualbox-ose-guest-utils.
* Added patch by Pascal Volk <user at localhost.localdomain.org> to prevent
init script from overwriting values, closes: #475193
@@ -9,16 +9,15 @@
* 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 virtuabox-ose-source partially, hopefully this
+ * Rewrote debian/rules for virtualbox-ose-source partially, hopefully this
finally closes: #469882
* Patched module Makefile to allow amd64 build in linux-modules-extra-2.6.
+ * Removed unneeded xalan build dependency.
+ * Added build dependency on libxslt and libxml.
+ * Fixed LocalConfig.kmk to list new variables.
- [ Patrick Winnertz ]
- * Added patch to make virtualbox-ose-guest-source build with kernels >=
- 2.6.25. Thanks to Stefan Lippers-Hollmann. (Closes: 478373, 478333)
+ -- Michael Meskes <meskes at debian.org> Fri, 02 May 2008 10:14:01 +0200
- -- Patrick Winnertz <winnie at debian.org> Wed, 30 Apr 2008 10:41:51 +0200
-
virtualbox-ose (1.5.6-dfsg-6) unstable; urgency=low
* Added two patches from upstream SVN to make virtualbox-ose build with
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/control 2008-05-02 09:50:49 UTC (rev 258)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Virtualbox Team <pkg-virtualbox-devel at lists.alioth.debian.org>
Uploaders: Philipp Hug <debian at hug.cx>, Marvin Stark <marv at der-marv.de>, Michael Meskes <meskes at debian.org>, Patrick Winnertz <winnie at debian.org>, Daniel Baumann <daniel at debian.org>, Hilko Bengen <bengen at debian.org>
-Build-Depends: debhelper (>= 5.0.44~), dpatch, bcc, bzip2, g++-multilib [amd64], iasl, kbuild, libacl1-dev, libasound-dev, libhal-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxalan110-dev, uuid-dev, xalan, xsltproc, yasm, libpulse-dev, po-debconf (>= 0.5.0), docbook-xsl, xsltproc, lynx, docbook-xml
+Build-Depends: debhelper (>= 5.0.44~), dpatch, bcc, bzip2, g++-multilib [amd64], iasl, kbuild, libacl1-dev, libasound-dev, libhal-dev, libidl-dev, libqt3-mt-dev, libsdl1.2-dev, libxslt1-dev, uuid-dev, yasm, libpulse-dev, po-debconf (>= 0.5.0), docbook-xsl, xsltproc, lynx, docbook-xml
Standards-Version: 3.7.3
Homepage: http://www.virtualbox.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk
Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/copyright 2008-05-02 09:50:49 UTC (rev 258)
@@ -7,7 +7,7 @@
License:
- Copyright (C) 2004-2007 innotek GmbH
+ Copyright (C) 2004-2008 innotek GmbH
This file is part of VirtualBox Open Source Edition (OSE), as
available from http://www.virtualbox.org. This file is free software;
@@ -17,6 +17,7 @@
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:
@@ -100,6 +101,7 @@
./src/VBox/Devices/PC/Etherboot-src/util/getopt.c
Copyright (c) 1990-1995 by Eberhard Mattes
+
On Debian systems, the complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
@@ -229,6 +231,9 @@
./src/VBox/Devices/Graphics/BIOS/vgabios.c
Copyright: 2001,2002 the LGPL VGABios developers Team
+./src/libs/ffmpeg-20060710
+ Copyright (c) 2000-2003 Fabrice Bellard
+
On Debian systems, the complete text of the LGPL License
can be found in /usr/share/common-licenses/LGPL file.
@@ -757,6 +762,379 @@
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 (C) 2007, Patrick Winnertz <patrick.winnertz at skolelinux.org>,
Daniel Baumann <daniel at debian.org>, Philipp Hug <debian at hug.cx> and is licensed under
the GPL, see `/usr/share/common-licenses/GPL'.
Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/patches/00list 2008-05-02 09:50:49 UTC (rev 258)
@@ -1,6 +1,4 @@
01-no-64bit-guest.dpatch
-02-2.6.25.dpatch
-02-2.6.25_part2.dpatch
03-config-kmk.dpatch
04-localconf-kmk.dpatch
05-vboxdrv-references.dpatch
Modified: trunk/debian/patches/01-no-64bit-guest.dpatch
===================================================================
--- trunk/debian/patches/01-no-64bit-guest.dpatch 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/patches/01-no-64bit-guest.dpatch 2008-05-02 09:50:49 UTC (rev 258)
@@ -5,9 +5,8 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/configure virtualbox-ose-1.5.4-dfsg/configure
---- virtualbox-ose-1.5.4-dfsg.orig/configure 2007-12-28 16:28:21.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/configure 2007-12-30 06:28:14.000000000 +0000
+--- virtualbox-ose-1.6.0-dfsg.orig/configure 2007-12-28 16:28:21.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/configure 2007-12-30 06:28:14.000000000 +0000
@@ -248,7 +248,7 @@ check_environment()
exit 1
;;
@@ -17,18 +16,15 @@
[ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '`
case "$BUILD_CPU" in
i[3456789]86|x86|i86pc)
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.kmk virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
---- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2007-08-14 12:26:25.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2007-12-30 06:28:14.000000000 +0000
-@@ -20,7 +20,10 @@ include $(PATH_KBUILD)/header.kmk
- ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
- SYSMODS = vboxvfs
- endif
--PROGRAMS = mountvboxsf
-+PROGRAMS =
+--- virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk.orig 2008-05-01 18:19:25.000000000 +0200
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2008-05-01 18:19:57.000000000 +0200
+@@ -23,7 +23,9 @@
+ SUB_DEPTH = ../..
+ include $(PATH_KBUILD)/subheader.kmk
+
+ifeq ($(filter-out x86, $(BUILD_TARGET_ARCH)),)
-+PROGRAMS += mountvboxsf
+ PROGRAMS += mountvboxsf
+endif
- INSTALLS = vboxvfs-bin vboxvfs-sh
-
- #
+ INSTALLS += vboxvfs-mod vboxvfs-sh
+ OTHERS.linux += \
+ $(VBOX_PATH_ADDITIONS)/src/vboxvfs/build_in_tmp \
Deleted: trunk/debian/patches/02-2.6.25.dpatch
===================================================================
--- trunk/debian/patches/02-2.6.25.dpatch 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/patches/02-2.6.25.dpatch 2008-05-02 09:50:49 UTC (rev 258)
@@ -1,50 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02-2.6.25.dpatch by Frans Pop <elendil at planet.nl>
-##
-## DP: Changes needed to compile moduls on kernel 2.6.25.
-
- at DPATCH@
-
-diff -ur virtualbox-ose_1.5.6/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h virtualbox-ose/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
---- virtualbox-ose_1.5.6/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h 2008-02-23 11:10:06.000000000 +0100
-+++ virtualbox-ose/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h 2008-02-27 01:57:20.000000000 +0100
-@@ -225,12 +225,16 @@
- #undef bool
-
- /*
-- * There are post-2.6.24 kernels (confusingly with unchanged version number)
-- * which eliminate macros which were marked as deprecated.
-+ * The 2.6.25 kernel eliminates macros that were marked as deprecated and eliminates
-+ * routine change_page_attr() in favor of the set_pages_* API.
- */
- #ifndef __attribute_used__
- #define __attribute_used__ __used
- #endif
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
-+int change_page_attr(struct page *page, int numpages, pgprot_t prot);
-+#endif
-+
- #endif
-
-diff -ur virtualbox-ose_1.5.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c virtualbox-ose/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
---- virtualbox-ose_1.5.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2008-02-23 11:10:05.000000000 +0100
-+++ virtualbox-ose/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2008-02-27 01:54:17.000000000 +0100
-@@ -2069,6 +2069,17 @@
- /* GCC C++ hack. */
- unsigned __gxx_personality_v0 = 0xcccccccc;
-
-+/* Add the change_page_attr routine for kernels 2.6.25 or later */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
-+int change_page_attr(struct page *page, int numpages, pgprot_t prot)
-+{
-+ /* use the set_pages_* API */
-+ if (pgprot_val(prot) & _PAGE_NX)
-+ set_pages_nx(page, numpages);
-+ set_pages_uc(page, numpages);
-+ return 0;
-+}
-+#endif
-
- module_init(VBoxSupDrvInit);
- module_exit(VBoxSupDrvUnload);
Deleted: trunk/debian/patches/02-2.6.25_part2.dpatch
===================================================================
--- trunk/debian/patches/02-2.6.25_part2.dpatch 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/patches/02-2.6.25_part2.dpatch 2008-05-02 09:50:49 UTC (rev 258)
@@ -1,108 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-2.6.25_part2.dpatch by Stefan Lippers-Hollmann <s.l-h at gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix building virtualbox-ose-modules against kernel 2.6.25
-## DP: taken from SUN/ Innotek upstream SVN r7550:
-## DP: "attempt to fix vfsmod for Linux >= 2.6.25"
-
- at DPATCH@
-diff -urNad virtualbox-ose-1.5.6-dfsg~/src/VBox/Additions/linux/sharedfolders/dirops.c virtualbox-ose-1.5.6-dfsg/src/VBox/Additions/linux/sharedfolders/dirops.c
---- virtualbox-ose-1.5.6-dfsg~/src/VBox/Additions/linux/sharedfolders/dirops.c 2008-02-19 12:49:06.000000000 +0100
-+++ virtualbox-ose-1.5.6-dfsg/src/VBox/Additions/linux/sharedfolders/dirops.c 2008-04-28 21:24:26.000000000 +0200
-@@ -286,7 +286,11 @@
- }
-
- ino = iunique (parent->i_sb, 1);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 25)
-+ inode = iget_locked (parent->i_sb, ino);
-+#else
- inode = iget (parent->i_sb, ino);
-+#endif
- if (!inode) {
- elog2 ("iget failed\n");
- err = -ENOMEM; /* XXX: ??? */
-@@ -296,6 +300,10 @@
- SET_INODE_INFO (inode, sf_new_i);
- sf_init_inode (sf_g, inode, &fsinfo);
- sf_new_i->path = path;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 25)
-+ unlock_new_inode(inode);
-+#endif
- }
-
- sf_i->force_restat = 0;
-@@ -338,7 +346,11 @@
- }
-
- ino = iunique (parent->i_sb, 1);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 25)
-+ inode = iget_locked (parent->i_sb, ino);
-+#else
- inode = iget (parent->i_sb, ino);
-+#endif
- if (!inode) {
- elog3 ("%s: %s: iget failed\n", caller, __func__);
- err = -ENOMEM;
-@@ -354,6 +366,11 @@
- sf_new_i->force_restat = 1;
-
- d_instantiate (dentry, inode);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 25)
-+ unlock_new_inode(inode);
-+#endif
-+
- return 0;
-
- fail1:
-diff -urNad virtualbox-ose-1.5.6-dfsg~/src/VBox/Additions/linux/sharedfolders/vfsmod.c virtualbox-ose-1.5.6-dfsg/src/VBox/Additions/linux/sharedfolders/vfsmod.c
---- virtualbox-ose-1.5.6-dfsg~/src/VBox/Additions/linux/sharedfolders/vfsmod.c 2007-12-12 16:13:12.000000000 +0100
-+++ virtualbox-ose-1.5.6-dfsg/src/VBox/Additions/linux/sharedfolders/vfsmod.c 2008-04-28 21:26:42.000000000 +0200
-@@ -257,7 +257,11 @@
- sb->s_blocksize = 1024;
- sb->s_op = &sf_super_ops;
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 25)
-+ iroot = iget_locked (sb, 0);
-+#else
- iroot = iget (sb, 0);
-+#endif
- if (!iroot) {
- err = -ENOMEM; /* XXX */
- elog2 ("could not get root inode\n");
-@@ -267,6 +271,10 @@
- sf_init_inode (sf_g, iroot, &fsinfo);
- SET_INODE_INFO (iroot, sf_i);
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 25)
-+ unlock_new_inode(iroot);
-+#endif
-+
- droot = d_alloc_root (iroot);
- if (!droot) {
- err = -ENOMEM; /* XXX */
-@@ -329,10 +337,12 @@
- the only thing that is known about inode at this point is its index
- hence we can't do anything here, and let lookup/whatever with the
- job to properly fill then [inode] */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 25)
- static void
- sf_read_inode (struct inode *inode)
- {
- }
-+#endif
-
- /* vfs is done with [sb] (umount called) call [sf_glob_free] to unmap
- the folder and free [sf_g] */
-@@ -370,7 +380,9 @@
-
- static struct super_operations sf_super_ops = {
- .clear_inode = sf_clear_inode,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 25)
- .read_inode = sf_read_inode,
-+#endif
- .put_super = sf_put_super,
- .statfs = sf_statfs,
- .remount_fs = sf_remount_fs
Modified: trunk/debian/patches/03-config-kmk.dpatch
===================================================================
--- trunk/debian/patches/03-config-kmk.dpatch 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/patches/03-config-kmk.dpatch 2008-05-02 09:50:49 UTC (rev 258)
@@ -6,19 +6,18 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/Config.kmk virtualbox-ose-1.5.4-dfsg/Config.kmk
---- virtualbox-ose-1.5.4-dfsg.orig/Config.kmk 2007-12-29 06:56:28.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/Config.kmk 2007-12-30 06:29:55.000000000 +0000
-@@ -852,7 +852,7 @@ VBOX_PATH_DIFX ?= $(PATH_DEVTOOLS)/win.$
+--- virtualbox-ose-1.6.0-dfsg/Config.kmk.orig 2008-05-01 18:24:58.000000000 +0200
++++ virtualbox-ose-1.6.0-dfsg/Config.kmk 2008-05-01 18:25:43.000000000 +0200
+@@ -970,7 +970,7 @@
# We need to export YASM for OSE, but since it was converted to .zip we need to
# allow for the location used by the zip to be properly cleaned up first.
- ifeq ($(filter-out win.x86 linux.x86 solaris.x86, $(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),)
+ if1of ($(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH), win.x86 linux.x86 solaris.x86)
- PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
+ PATH_TOOL_YASM ?= /usr/bin
endif
# XPCOM setup for all but win32.
-@@ -1214,7 +1214,7 @@ ifneq ($(filter linux,$(BUILD_TARGET)),)
+@@ -1456,7 +1456,7 @@
kernelsrc := $(shell $(SED_EXT) -ne 's+^KERNELSRC.*= *\(.*\)+\1+p' $(VBOX_LINUX_SRC)/Makefile)
ifneq ($(kernelsrc),)
kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
Modified: trunk/debian/patches/04-localconf-kmk.dpatch
===================================================================
--- trunk/debian/patches/04-localconf-kmk.dpatch 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/patches/04-localconf-kmk.dpatch 2008-05-02 09:50:49 UTC (rev 258)
@@ -10,8 +10,7 @@
diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/LocalConfig.kmk virtualbox-ose-1.5.4-dfsg/LocalConfig.kmk
--- virtualbox-ose-1.5.4-dfsg.orig/LocalConfig.kmk 1970-01-01 00:00:00.000000000 +0000
+++ virtualbox-ose-1.5.4-dfsg/LocalConfig.kmk 2007-12-30 06:30:31.000000000 +0000
-@@ -0,0 +1,12 @@
-+VBOX_WITH_LINUX_ONLY =
+@@ -0,0 +1,11 @@
+VBOX_ADDITIONS_LINUX_ONLY =
+VBOX_WITH_INSTALLER = 1
+VBOX_WITH_LINUX_ADDITIONS = 1
Modified: trunk/debian/patches/05-vboxdrv-references.dpatch
===================================================================
--- trunk/debian/patches/05-vboxdrv-references.dpatch 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/patches/05-vboxdrv-references.dpatch 2008-05-02 09:50:49 UTC (rev 258)
@@ -6,29 +6,31 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1.5.4-dfsg/src/VBox/VMM/VM.cpp
---- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/VMM/VM.cpp 2007-12-04 13:14:26.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/VMM/VM.cpp 2007-12-30 06:31:00.000000000 +0000
-@@ -314,8 +314,8 @@ VMR3DECL(int) VMR3Create(PFNVMATERROR
+--- virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/VM.cpp.orig 2008-05-01 18:27:14.000000000 +0200
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/VM.cpp 2008-05-01 18:28:25.000000000 +0200
+@@ -257,10 +257,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");
-+ "Please install the virtualbox-ose-modules package for your "
-+ "kernel and execute 'modprobe vboxdrv' as root");
+- 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-modules package for your "
++ "kernel and execute 'modprobe vboxdrv' as root");
#else
- pszError = N_("VirtualBox kernel driver not loaded.");
+ pszError = N_("VirtualBox kernel driver not loaded");
#endif
-@@ -337,8 +337,9 @@ VMR3DECL(int) VMR3Create(PFNVMATERROR
+@@ -280,10 +278,8 @@
+ break;
+ 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");
-+ "reason. "
-+ "Please install the virtualbox-ose-modules package for your "
-+ "kernel and execute 'modprobe vboxdrv' as root");
+- 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-modules package for your "
++ "kernel and execute 'modprobe vboxdrv' as root");
#else
- pszError = N_("VirtualBox kernel driver not installed");
+ pszError = N_("VirtualBox kernel driver not installed");
#endif
Modified: trunk/debian/patches/06-vboxadd-udev.dpatch
===================================================================
--- trunk/debian/patches/06-vboxadd-udev.dpatch 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/patches/06-vboxadd-udev.dpatch 2008-05-02 09:50:49 UTC (rev 258)
@@ -6,18 +6,18 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/module/vboxmod.c virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/module/vboxmod.c
---- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/module/vboxmod.c 2007-12-12 15:13:12.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/module/vboxmod.c 2007-12-30 06:32:01.000000000 +0000
-@@ -23,6 +23,7 @@
- #include "vboxmod.h"
- #include "waitcompat.h"
- #include <VBox/log.h>
+diff -Naurp virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c.orig virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c
+--- virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c.orig 2008-05-01 18:30:44.000000000 +0200
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c 2008-05-01 18:35:30.000000000 +0200
+@@ -71,6 +71,7 @@
+ #include <VBox/VBoxDev.h>
+ #include <iprt/asm.h>
+ #include <iprt/assert.h>
+#include <linux/miscdevice.h>
#define xstr(s) str(s)
#define str(s) #s
-@@ -412,6 +413,13 @@ static struct file_operations vbox_fops
+@@ -582,6 +583,13 @@
.llseek = no_llseek
};
@@ -31,29 +31,29 @@
#ifndef IRQ_RETVAL
/* interrupt handlers in 2.4 kernels don't return anything */
# define irqreturn_t void
-@@ -684,17 +692,22 @@ static __init int init(void)
- }
-
+@@ -851,17 +859,22 @@
+ LogRel(("Starting VirtualBox version %s Guest Additions\n",
+ VBOX_VERSION_STRING));
/* register a character device */
- err = register_chrdev(vbox_major, "vboxadd", &vbox_fops);
- if (err < 0 || ((vbox_major & err) || (!vbox_major && !err)))
+ if (vbox_major > 0)
{
-- printk(KERN_ERR "vboxadd: register_chrdev failed: vbox_major: %d, err = %d\n",
-- vbox_major, err);
+- LogRelFunc(("register_chrdev failed: vbox_major: %d, err = %d\n",
+- vbox_major, err));
- PCI_DEV_PUT(pcidev);
- return -ENODEV;
+ err = register_chrdev(vbox_major, "vboxadd", &vbox_fops);
+ if (err < 0 || ((vbox_major & err) || (!vbox_major && !err)))
+ {
-+ printk(KERN_ERR "vboxadd: register_chrdev failed: vbox_major: %d, err = %d\n",
-+ vbox_major, err);
-+ PCI_DEV_PUT(pcidev);
-+ return -ENODEV;
++ LogRelFunc(("register_chrdev failed: vbox_major: %d, err = %d\n",
++ vbox_major, err));
++ PCI_DEV_PUT(pcidev);
++ return -ENODEV;
+ }
+ /* if no major code was set, take the return value */
+ if (!vbox_major)
-+ vbox_major = err;
++ vbox_major = err;
}
- /* if no major code was set, take the return value */
- if (!vbox_major)
@@ -63,7 +63,7 @@
/* allocate and initialize device extension */
vboxDev = kmalloc(sizeof(*vboxDev), GFP_KERNEL);
-@@ -831,7 +844,10 @@ static __init int init(void)
+@@ -1029,7 +1042,10 @@
fail:
PCI_DEV_PUT(pcidev);
free_resources();
@@ -75,15 +75,15 @@
return err;
}
-@@ -843,7 +859,10 @@ static __exit void fini(void)
+@@ -1039,7 +1055,10 @@
+ */
+ static __exit void fini(void)
{
- printk(KERN_DEBUG "vboxadd: unloading...\n");
-
- unregister_chrdev(vbox_major, "vboxadd");
+ if (vbox_major > 0)
+ unregister_chrdev(vbox_major, "vboxadd");
+ else
-+ misc_deregister(&vbox_dev);
++ misc_deregister(&vbox_dev);
free_resources();
vboxadd_cmc_fini ();
- printk(KERN_DEBUG "vboxadd: unloaded\n");
+ }
Modified: trunk/debian/patches/08-init-fail.dpatch
===================================================================
--- trunk/debian/patches/08-init-fail.dpatch 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/patches/08-init-fail.dpatch 2008-05-02 09:50:49 UTC (rev 258)
@@ -5,31 +5,14 @@
## DP: Fix some failures in init script.
@DPATCH@
-diff -urNad virtualbox-ose-1.5.6-dfsg~/src/VBox/Installer/linux/vboxnet.sh virtualbox-ose-1.5.6-dfsg/src/VBox/Installer/linux/vboxnet.sh
---- virtualbox-ose-1.5.6-dfsg~/src/VBox/Installer/linux/vboxnet.sh 2008-02-19 12:49:05.000000000 +0100
-+++ virtualbox-ose-1.5.6-dfsg/src/VBox/Installer/linux/vboxnet.sh 2008-03-28 16:34:55.000000000 +0100
-@@ -97,6 +97,7 @@
-
- if [ "$system" = "other" ]; then
+diff -urNad virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in.orig virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
+--- virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in.orig 2008-05-01 18:37:12.000000000 +0200
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-01 18:38:51.000000000 +0200
+@@ -49,6 +49,7 @@
+ if [ -z "$NOLSB" ]; then
+ . /lib/lsb/init-functions
fail_msg() {
-+ [ -f "$VARFILE" ] && rm $VARFILE
- echo " ...fail!"
++ [ -f "$VARFILE" ] && rm $VARFILE
+ echo ""
+ log_failure_msg "$1"
}
-
-@@ -226,13 +226,13 @@
- then
- if brctl addif "$3" "$1" 2> /dev/null
- then
-- echo "$1 $2 $3" > "$VARFILE"
-+ echo "$1 $2 $3" >> "$VARFILE"
- else
-- echo "$1 $2" > "$VARFILE"
-+ echo "$1 $2" >> "$VARFILE"
- echo "Warning - failed to add interface $1 to the bridge $3"
- fi
- else
-- echo "$1 $2" > $VARFILE
-+ echo "$1 $2" >> $VARFILE
- fi
- i=20
- else
Modified: trunk/debian/patches/09-init-lsb.dpatch
===================================================================
--- trunk/debian/patches/09-init-lsb.dpatch 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/patches/09-init-lsb.dpatch 2008-05-02 09:50:49 UTC (rev 258)
@@ -5,9 +5,9 @@
## DP: Make initscript lsb cmpliant.
@DPATCH@
-diff -urNad virtualbox-ose~/src/VBox/Installer/linux/vboxnet.sh virtualbox-ose/src/VBox/Installer/linux/vboxnet.sh
---- virtualbox-ose~/src/VBox/Installer/linux/vboxnet.sh 2008-02-20 14:47:20.000000000 +0100
-+++ virtualbox-ose/src/VBox/Installer/linux/vboxnet.sh 2008-02-21 00:57:47.000000000 +0100
+diff -urNad virtualbox-ose~/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose/src/VBox/Installer/linux/vboxnet.sh.in
+--- virtualbox-ose~/src/VBox/Installer/linux/vboxnet.sh.in 2008-02-20 14:47:20.000000000 +0100
++++ virtualbox-ose/src/VBox/Installer/linux/vboxnet.sh.in 2008-02-21 00:57:47.000000000 +0100
@@ -19,10 +19,10 @@
#
### BEGIN INIT INFO
@@ -23,26 +23,22 @@
# Description: VirtualBox permanent host networking setup
### END INIT INFO
-@@ -101,17 +101,19 @@
- fi
-
- if [ "$system" = "other" ]; then
-+ . /lib/lsb/init-functions
-+
+@@ -49,15 +49,14 @@
+ if [ -z "$NOLSB" ]; then
+ . /lib/lsb/init-functions
fail_msg() {
- [ -f "$VARFILE" ] && rm $VARFILE
-- echo " ...fail!"
-+ log_action_end_msg 1
+ [ -f "$VARFILE" ] && rm $VARFILE
+- echo ""
+- log_failure_msg "$1"
++ log_action_end_msg 1
}
-
succ_msg() {
-- echo " ...done."
+- log_success_msg " done."
+ log_action_end_msg 0
}
-
- begin() {
-- echo -n $1
-+ log_action_begin_msg $1
+ begin_msg() {
+- log_daemon_msg "$@"
++ log_action_begin_msg $1
}
- fi
-
+ else
+ if [ "$system" = "redhat" ]; then
Modified: trunk/debian/patches/10-initscript.dpatch
===================================================================
--- trunk/debian/patches/10-initscript.dpatch 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/patches/10-initscript.dpatch 2008-05-02 09:50:49 UTC (rev 258)
@@ -5,81 +5,78 @@
## DP: Some changes to initscript.
@DPATCH@
-diff -urNad virtualbox-ose~/src/VBox/Installer/linux/vboxnet.sh virtualbox-ose/src/VBox/Installer/linux/vboxnet.sh
---- virtualbox-ose~/src/VBox/Installer/linux/vboxnet.sh 2008-02-20 14:47:20.000000000 +0100
-+++ virtualbox-ose/src/VBox/Installer/linux/vboxnet.sh 2008-02-21 00:57:47.000000000 +0100
-@@ -32,6 +32,11 @@
- VARFILE="/var/run/VirtualBox/vboxnet"
+diff -urNad virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in.orig virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
+--- virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in.orig 2008-05-01 18:45:05.000000000 +0200
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-01 18:52:17.000000000 +0200
+@@ -34,6 +34,11 @@
TAPDEV="/dev/net/tun"
+ NOLSB=%NOLSB%
+# Include virtualbox-ose defaults if available
+if [ -f /etc/default/virtualbox-ose ] ; then
-+ . /etc/default/virtualbox-ose
++ . /etc/default/virtualbox-ose
+fi
+
- if [ -f /etc/redhat-release ]; then
- system=redhat
- elif [ -f /etc/SuSE-release ]; then
-@@ -173,15 +173,6 @@
- fail_msg
- return 1
+ [ -f /lib/lsb/init-functions ] || NOLSB=yes
+
+ if [ -n "$NOLSB" ]; then
+@@ -162,13 +168,6 @@
+ if ! VBoxTunctl -h 2>&1 | grep VBoxTunctl > /dev/null; then
+ failure "VBoxTunctl not found"
fi
- # Fail if we don't have the kernel tun device
- # Make sure that the tun module is loaded (Ubuntu 7.10 needs this)
- modprobe tun > /dev/null 2>&1
-- if ! cat /proc/misc 2>/dev/null | grep tun > /dev/null
-- then
-- fail_msg
-- return 1
+- if ! cat /proc/misc 2>/dev/null | grep tun > /dev/null; then
+- failure "Linux tun/tap subsystem not available"
- fi
- succ_msg
# Read the configuration file entries line by line and create the
# interfaces
- while read line
-@@ -195,6 +186,20 @@
+ while read line; do
+@@ -179,6 +178,19 @@
+ # or two non-comment entries, possibly followed by a comment).
if ((! expr match "$2" "#" > /dev/null) &&
- (test -z "$4" || expr match "$4" "#" > /dev/null))
- then
+ (test -z "$4" || expr match "$4" "#" > /dev/null)); then
+ if [ "$module_available" != 1 ]
+ then
-+ # Fail if we don't have the kernel tun device
++ # Fail if we don't have the kernel tun device
+ # Make sure that the tun module is loaded (Ubuntu 7.10 needs this)
+ # We only test this once, but we have to do it here, because otherwise an empty
+ # configuration file would trigger the modprobe too.
+ modprobe tun > /dev/null 2>&1
+ if ! cat /proc/misc 2>/dev/null | grep tun > /dev/null
+ then
-+ fail_msg
-+ return 1
-+ fi
++ failure "Linux tun/tap subsystem not available"
++ fi
+ module_available=1
+ fi
- case $user in
- +*)
- group=`echo $2 | cut -c2-`
-@@ -258,6 +259,7 @@
+ # As the very first thing, try delete the interface. Might already
+ # exist with different configuration. Ignore errors.
+ VBoxTunctl -d $1 > /dev/null 2>&1
+@@ -234,6 +246,7 @@
chgrp vboxusers "$TAPDEV"
chmod 0660 "$TAPDEV"
fi
+ succ_msg
return 0
}
-
-@@ -382,10 +387,17 @@
+@@ -327,10 +340,17 @@
+
case "$1" in
start)
+ # try to insert module but do not fail if not possible
+ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then
+ /sbin/modprobe -q vboxdrv || true
+ fi
- start
+ start_network
;;
stop)
- stop
+ stop_network
+ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then
-+ /sbin/modprobe -qr vboxdrv || true
++ /sbin/modprobe -qr vboxdrv || true
+ fi
;;
- restart)
- restart
+ restart|reload)
+ stop_network && start_network
Modified: trunk/debian/patches/12-gcc-4.3.dpatch
===================================================================
--- trunk/debian/patches/12-gcc-4.3.dpatch 2008-05-02 07:11:36 UTC (rev 257)
+++ trunk/debian/patches/12-gcc-4.3.dpatch 2008-05-02 09:50:49 UTC (rev 258)
@@ -6,8 +6,8 @@
@DPATCH@
---- virtualbox-ose-1.5.6-dfsg/src/VBox/Main/VMMDevInterface.cpp.orig
-+++ virtualbox-ose-1.5.6-dfsg/src/VBox/Main/VMMDevInterface.cpp
+--- virtualbox-ose-1.6.0-dfsg/src/VBox/Main/VMMDevInterface.cpp.orig
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Main/VMMDevInterface.cpp
@@ -27,6 +27,7 @@
#include <VBox/VBoxGuest.h>
#include <VBox/shflsvc.h>
@@ -16,16 +16,6 @@
#ifdef VBOX_HGCM
#include "hgcm/HGCM.h"
---- virtualbox-ose-1.5.6-dfsg/src/VBox/Additions/linux/xclient/main.cpp.orig
-+++ virtualbox-ose-1.5.6-dfsg/src/VBox/Additions/linux/xclient/main.cpp
-@@ -30,6 +30,7 @@ using std::endl;
- #include <sys/types.h>
- #include <unistd.h>
- #include <getopt.h>
-+#include <stdlib.h>
-
- #include <X11/Xlib.h>
- #include <X11/Intrinsic.h>
--- virtualbox-ose-1.5.6-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp.orig
+++ virtualbox-ose-1.5.6-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
@@ -28,6 +28,8 @@
@@ -37,8 +27,8 @@
#include <qapplication.h>
#include <qmessagebox.h>
#include <qpixmap.h>
---- virtualbox-ose-1.5.6-dfsg/src/recompiler/InnoTek/op-validate.sed.orig
-+++ virtualbox-ose-1.5.6-dfsg/src/recompiler/InnoTek/op-validate.sed
+--- virtualbox-ose-1.5.6-dfsg/src/recompiler/Sun/op-validate.sed.orig
++++ virtualbox-ose-1.5.6-dfsg/src/recompiler/Sun/op-validate.sed
@@ -63,6 +63,8 @@ s/^[[:blank:]]*ret[[:blank:]]*\n*[[:blan
/\.Lfe[0-9][0-9]*:/d
/\.LFE[0-9][0-9]*:/d
More information about the Pkg-virtualbox-commits
mailing list