From 41f791f7793f6f3afabcf32b743f6e342f858332c2fce1ad345889daed209de2 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Fri, 27 May 2011 07:05:28 +0000 Subject: [PATCH 1/2] Accepting request 71600 from home:mseben:branches:Virtualization fix bnc#694311 OBS-URL: https://build.opensuse.org/request/show/71600 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=47 --- vbox-netflt_start_xmit_enable.diff | 13 +++++++++++++ virtualbox.changes | 6 ++++++ virtualbox.spec | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 vbox-netflt_start_xmit_enable.diff diff --git a/vbox-netflt_start_xmit_enable.diff b/vbox-netflt_start_xmit_enable.diff new file mode 100644 index 0000000..14850d4 --- /dev/null +++ b/vbox-netflt_start_xmit_enable.diff @@ -0,0 +1,13 @@ +--- VirtualBox-4.0.8_OSE/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ++++ VirtualBox-4.0.8_OSE/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +@@ -50,8 +50,9 @@ + #define VBOXNETFLT_OS_SPECFIC 1 + #include "../VBoxNetFltInternal.h" + ++#define VBOXNETFLT_WITH_FILTER_HOST2GUEST_SKBS_EXPERIMENT + #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 + # endif /* VBOXNETFLT_WITH_QDISC */ diff --git a/virtualbox.changes b/virtualbox.changes index bfd5d91..0400d28 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 26 10:40:30 UTC 2011 - mseben@gmail.com + +- added vbox-netflt_start_xmit_enable.diff (bnc#694311), + enable alternative packet filter, http://www.virtualbox.org/ticket/8076 + ------------------------------------------------------------------- Wed May 18 06:55:17 UTC 2011 - mseben@gmail.com diff --git a/virtualbox.spec b/virtualbox.spec index 2e10b93..07c4537 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -85,6 +85,8 @@ Patch5: vbox-config.diff Patch6: vbox-smc-napa.diff #fix build of Python and dev package on openSUSE 11.3 Patch8: vbox-python-detection.diff +#bnc#694311 http://www.virtualbox.org/ticket/8076 +Patch9: vbox-netflt_start_xmit_enable.diff #PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user #try to start VirtualBox and is not memeber of vboxusers group Patch99: vbox-permissions_warning.diff @@ -214,6 +216,7 @@ quilt push -a %patch5 -p1 %patch6 -p1 %patch8 -p1 +%patch9 -p1 %patch99 -p1 %patch100 %patch101 From ebf0b7fac9086e016ec50991f4ea16da099716366eb310807ab5dea7f4645d9b Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Wed, 1 Jun 2011 07:54:57 +0000 Subject: [PATCH 2/2] Accepting request 72396 from home:mseben:branches:Virtualization drop hal dependency from BuildRequires (bnc#697034) OBS-URL: https://build.opensuse.org/request/show/72396 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=48 --- virtualbox.changes | 5 +++++ virtualbox.spec | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/virtualbox.changes b/virtualbox.changes index 0400d28..93bd6e6 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 31 06:45:32 UTC 2011 - mseben@gmail.com + +- drop hal dependency from BuildRequires (bnc#697034) + ------------------------------------------------------------------- Thu May 26 10:40:30 UTC 2011 - mseben@gmail.com diff --git a/virtualbox.spec b/virtualbox.spec index 07c4537..fe1a7d1 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -26,17 +26,24 @@ BuildRequires: acpica dmidecode %else BuildRequires: pmtools %endif +#drop hal dependency +%if %suse_version < 1210 +BuildRequires: hal-devel +%endif BuildRequires: bin86 dev86 libidl-devel libqt4-devel libxslt-devel yasm BuildRequires: SDL-devel kernel-syms module-init-tools BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-desktop-files -BuildRequires: hal-devel pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk +BuildRequires: pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk BuildRequires: LibVNCServer-devel gcc gcc-c++ kbuild pam-devel udev quilt BuildRequires: boost-devel %if %suse_version > 1110 BuildRequires: zlib-devel-static %endif %ifarch amd64 x86_64 ia32e em64t +#drop hal dependency +%if %suse_version < 1210 BuildRequires: hal-32bit +%endif BuildRequires: xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit xorg-x11-libs-32bit BuildRequires: xorg-x11-libXext-devel-32bit xorg-x11-libXmu-devel-32bit BuildRequires: gcc-32bit gcc-c++-32bit