[Pkg-virtualbox-commits] r336 - in trunk/debian: . patches
meskes at alioth.debian.org
meskes at alioth.debian.org
Sat Aug 9 19:48:31 UTC 2008
Author: meskes
Date: 2008-08-09 19:48:30 +0000 (Sat, 09 Aug 2008)
New Revision: 336
Added:
trunk/debian/patches/14_logging.dpatch
trunk/debian/patches/15_makefiles.dpatch
Modified:
trunk/debian/changelog
trunk/debian/patches/00list
trunk/debian/patches/05-vboxadd-udev.dpatch
trunk/debian/patches/09-initscript.dpatch
Log:
New upstream version.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-08-08 15:57:53 UTC (rev 335)
+++ trunk/debian/changelog 2008-08-09 19:48:30 UTC (rev 336)
@@ -1,3 +1,9 @@
+virtualbox-ose (1.6.4-dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+
+ -- Michael Meskes <meskes at debian.org> 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 <goneri at rulezlan.org> to fix FTBFS with
Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2008-08-08 15:57:53 UTC (rev 335)
+++ trunk/debian/patches/00list 2008-08-09 19:48:30 UTC (rev 336)
@@ -11,3 +11,5 @@
11-gcc-4.3.dpatch
12-make-module.dpatch
13-module-mismatch.dpatch
+14_logging.dpatch
+15_makefiles.dpatch
Modified: trunk/debian/patches/05-vboxadd-udev.dpatch
===================================================================
--- trunk/debian/patches/05-vboxadd-udev.dpatch 2008-08-08 15:57:53 UTC (rev 335)
+++ trunk/debian/patches/05-vboxadd-udev.dpatch 2008-08-09 19:48:30 UTC (rev 336)
@@ -9,60 +9,6 @@
diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/linux/module/vboxmod.c virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c
--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/linux/module/vboxmod.c 2008-04-30 14:05:58.000000000 +0000
+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c 2008-05-09 09:26:26.000000000 +0000
-@@ -71,6 +71,7 @@ do { \
- #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
-@@ -582,6 +583,13 @@ static struct file_operations vbox_fops
- .llseek = no_llseek
- };
-
-+static struct miscdevice vbox_dev =
-+{
-+ minor: MISC_DYNAMIC_MINOR,
-+ name: "vboxadd",
-+ fops: &vbox_fops,
-+};
-+
- #ifndef IRQ_RETVAL
- /* interrupt handlers in 2.4 kernels don't return anything */
- # define irqreturn_t void
-@@ -851,17 +859,22 @@ static __init int init(void)
- 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)
- {
-- 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)))
-+ {
-+ 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;
- }
-- /* if no major code was set, take the return value */
-- if (!vbox_major)
-- vbox_major = err;
-+ else
-+ err = misc_register(&vbox_dev);
-
- /* allocate and initialize device extension */
- vboxDev = kmalloc(sizeof(*vboxDev), GFP_KERNEL);
@@ -1029,7 +1042,10 @@ static __init int init(void)
fail:
PCI_DEV_PUT(pcidev);
Modified: trunk/debian/patches/09-initscript.dpatch
===================================================================
--- trunk/debian/patches/09-initscript.dpatch 2008-08-08 15:57:53 UTC (rev 335)
+++ trunk/debian/patches/09-initscript.dpatch 2008-08-09 19:48:30 UTC (rev 336)
@@ -5,10 +5,10 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:41.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:29:40.000000000 +0000
-@@ -34,6 +34,11 @@ VARFILE="/var/run/VirtualBox/vboxnet"
+diff -Naurp virtualbox-ose-1.6.4-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.4-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
+--- virtualbox-ose-1.6.4-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-08-06 09:28:41.000000000 +0000
++++ virtualbox-ose-1.6.4-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-08-06 09:29:40.000000000 +0000
+@@ -34,6 +34,11 @@
TAPDEV="/dev/net/tun"
NOLSB=%NOLSB%
@@ -20,7 +20,7 @@
[ -f /lib/lsb/init-functions ] || NOLSB=yes
if [ -n "$NOLSB" ]; then
-@@ -162,13 +167,6 @@ start_network()
+@@ -162,13 +167,6 @@
if ! VBoxTunctl -h 2>&1 | grep VBoxTunctl > /dev/null; then
failure "VBoxTunctl not found"
fi
@@ -34,13 +34,13 @@
# Read the configuration file entries line by line and create the
# interfaces
while read line; do
-@@ -179,6 +177,19 @@ start_network()
+@@ -179,6 +177,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
+ 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.
@@ -51,10 +51,10 @@
+ fi
+ module_available=1
+ fi
- # 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 +245,7 @@ start_network()
+ # Name our parameters, to make this script slightly less unreadable
+ interface=$1
+ user=$2
+@@ -238,6 +249,7 @@
chgrp vboxusers "$TAPDEV"
chmod 0660 "$TAPDEV"
fi
@@ -62,7 +62,7 @@
return 0
}
-@@ -327,10 +339,17 @@ force_stop_network()
+@@ -331,10 +343,17 @@
case "$1" in
start)
Added: trunk/debian/patches/14_logging.dpatch
===================================================================
--- trunk/debian/patches/14_logging.dpatch (rev 0)
+++ trunk/debian/patches/14_logging.dpatch 2008-08-09 19:48:30 UTC (rev 336)
@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 14-logging.dpatch by Michael Meskes <meskes at debian.org>
+##
+## DP: Remove excessive logging.
+
+ at DPATCH@
+
+diff -Naurp VirtualBox-1.6.4/src/recompiler/VBoxRecompiler.c.orig VirtualBox-1.6.4/src/recompiler/VBoxRecompiler.c
+--- VirtualBox-1.6.4/src/recompiler/VBoxRecompiler.c.orig 2008-08-06 10:03:37.000000000 +0200
++++ VirtualBox-1.6.4/src/recompiler/VBoxRecompiler.c 2008-08-06 10:03:56.000000000 +0200
+@@ -1521,7 +1521,7 @@ int remR3NotifyTrap(CPUState *env, uint3
+ STAM_COUNTER_INC(&s_aStatTrap[uTrap]);
+ }
+ #endif
+- RTLogPrintf("remR3NotifyTrap: uTrap=%x error=%x next_eip=%VGv eip=%VGv cr2=%08x\n", uTrap, uErrorCode, pvNextEIP, env->eip, env->cr[2]);
++ /*RTLogPrintf("remR3NotifyTrap: uTrap=%x error=%x next_eip=%VGv eip=%VGv cr2=%08x\n", uTrap, uErrorCode, pvNextEIP, env->eip, env->cr[2]);*/
+ if( uTrap < 0x20
+ && (env->cr[0] & X86_CR0_PE)
+ && !(env->eflags & X86_EFL_VM))
Added: trunk/debian/patches/15_makefiles.dpatch
===================================================================
--- trunk/debian/patches/15_makefiles.dpatch (rev 0)
+++ trunk/debian/patches/15_makefiles.dpatch 2008-08-09 19:48:30 UTC (rev 336)
@@ -0,0 +1,84 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 15-makefiles.dpatch by Michael Meskes <meskes at debian.org>
+##
+## DP: Add missing makefiles.
+
+ at DPATCH@
+
+--- virtualbox-ose-1.6.4-dfsg/src/apps/Makefile.kmk 1970-01-01 01:00:00.000000000 +0100
++++ Makefile.kmk 2008-08-09 21:40:09.000000000 +0200
+@@ -0,0 +1,36 @@
++# $Id: Makefile.kmk 34052 2008-08-04 17:27:28Z klaus $
++## @file
++# Top-level makefile for the external apps.
++#
++
++#
++# Copyright (C) 2006-2007 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.
++#
++# 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.
++#
++
++DEPTH = ../..
++include $(KBUILD_PATH)/header.kmk
++
++ifdef VBOX_WITH_KCHMVIEWER
++ifneq ($(wildcard kchmviewer-2.6),)
++SUBDIRS.linux = kchmviewer-2.6
++endif
++endif
++
++ifneq ($(wildcard tunctl),)
++SUBDIRS.linux += tunctl
++endif
++
++include $(KBUILD_PATH)/rules.kmk
++
+--- virtualbox-ose-1.6.4-dfsg/src/apps/tunctl/Makefile.kmk 1970-01-01 01:00:00.000000000 +0100
++++ Makefile.kmk 2008-08-09 21:42:10.000000000 +0200
+@@ -0,0 +1,35 @@
++# $Id: Makefile.kmk 31342 2008-05-28 08:44:35Z frank $
++## @file
++# Makefile for VBoxTunctl, which is identical to tunctl from Usermode Linux
++# except for the name.
++#
++
++#
++# Copyright (C) 2006-2007 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.
++#
++# 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.
++#
++
++DEPTH = ../../..
++include $(KBUILD_PATH)/header.kmk
++
++ifneq ($(KBUILD_HOST),linux)
++$(error "VBoxTunctl can only be built on Linux!")
++endif
++
++PROGRAMS = VBoxTunctl
++
++VBoxTunctl_TEMPLATE = VBOXR3EXE
++VBoxTunctl_SOURCES = tunctl.c
++
++include $(KBUILD_PATH)/footer.kmk
More information about the Pkg-virtualbox-commits
mailing list