packages: VirtualBox/VirtualBox.spec, VirtualBox/VirtualBox-vboxnetflt-no-q...

[baggins]

Author: baggins                      Date: Wed Dec 29 15:52:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable qdisc support in netflt module as it causes random freezes and oopses

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.337 -> 1.338) , VirtualBox-vboxnetflt-no-qdisc.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.337 packages/VirtualBox/VirtualBox.spec:1.338
--- packages/VirtualBox/VirtualBox.spec:1.337	Wed Dec 29 11:47:51 2010
+++ packages/VirtualBox/VirtualBox.spec	Wed Dec 29 16:52:34 2010
@@ -30,7 +30,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		2
+%define		rel		2.1
 %define		pname		VirtualBox
 
 Summary:	VirtualBox OSE - x86 hardware virtualizer
@@ -58,6 +58,7 @@
 Patch3:		%{pname}-warning_workaround.patch
 Patch4:		%{pname}-vnc.patch
 Patch5:		%{pname}-dri.patch
+Patch6:		%{pname}-vboxnetflt-no-qdisc.patch
 URL:		http://www.virtualbox.org/
 BuildRequires:	rpmbuild(macros) >= 1.535
 %if %{with userspace}
@@ -426,6 +427,7 @@
 ../src/VBox/HostDrivers/linux/export_modules host-modules.tar.gz --without-hardening
 tar -zxf host-modules.tar.gz -C HostDrivers
 cd -
+%patch6 -p1
 
 %build
 %if %{with userspace}
@@ -849,6 +851,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.338  2010/12/29 15:52:34  baggins
+- disable qdisc support in netflt module as it causes random freezes and oopses
+
 Revision 1.337  2010/12/29 10:47:51  baggins
 - rel 2
 - add icons dirs

================================================================
Index: packages/VirtualBox/VirtualBox-vboxnetflt-no-qdisc.patch
diff -u /dev/null packages/VirtualBox/VirtualBox-vboxnetflt-no-qdisc.patch:1.1
--- /dev/null	Wed Dec 29 16:52:40 2010
+++ packages/VirtualBox/VirtualBox-vboxnetflt-no-qdisc.patch	Wed Dec 29 16:52:34 2010
@@ -0,0 +1,11 @@
+--- VirtualBox-4.0.0_OSE/PLD-MODULE-BUILD/HostDrivers/vboxnetflt/linux/VBoxNetFlt-linux.c~	2010-12-29 16:48:42.000000000 +0100
++++ VirtualBox-4.0.0_OSE/PLD-MODULE-BUILD/HostDrivers/vboxnetflt/linux/VBoxNetFlt-linux.c	2010-12-29 16:50:09.328529008 +0100
+@@ -51,7 +51,7 @@
+ #include "../VBoxNetFltInternal.h"
+ 
+ #ifdef CONFIG_NET_SCHED
+-# define VBOXNETFLT_WITH_QDISC /* Comment this out to disable qdisc support */
++//# define VBOXNETFLT_WITH_QDISC /* Comment this out to disable qdisc support */
+ # ifdef VBOXNETFLT_WITH_QDISC
+ # include <net/pkt_sched.h>
+ # endif /* VBOXNETFLT_WITH_QDISC */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.337&r2=1.338&f=u