jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 72397 from Virtualization

Browse Source 
drop hal dependency from BuildRequires (bnc#697034) + fix bnc#694311

OBS-URL: https://build.opensuse.org/request/show/72397
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=26
This commit is contained in:
Sascha Peilicke 2011-06-01 10:16:39 +00:00 committed by Git OBS Bridge
commit 3510359260
3 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vbox-netflt_start_xmit_enable.diff Normal file
View File

@ -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 <net/pkt_sched.h>
# endif /* VBOXNETFLT_WITH_QDISC */

11
virtualbox.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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
- 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

27
virtualbox.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package virtualbox
# spec file for package virtualbox (Version 3.9.80)
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,20 +26,27 @@ 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: LibVNCServer-devel gcc gcc-c++ kbuild pam-devel quilt udev
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
BuildRequires: gcc-32bit gcc-c++-32bit
%endif
#
ExclusiveArch: %ix86 x86_64
@ -85,6 +92,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
@ -177,7 +186,6 @@ VirtualBox guest addition tools.
###########################################
%package -n python-%{name}
Summary: Python bindings for %{name}
Group: Development/Libraries/Python
Requires: %{name} = %{version}
@ -215,6 +223,7 @@ quilt push -a
%patch5 -p1
%patch6 -p1
%patch8 -p1
%patch9 -p1
%patch99 -p1
%patch100
%patch101
@ -449,6 +458,7 @@ popd
#install wrapper script
%__install -m 644 %{S:9} %{buildroot}%{_bindir}/VirtualBox
# modify and install the vboxdrv init script
# TODO: some of this stuff breaks the fillup macros below?
%__sed -i "s|%NOLSB%|yes|g;s|%DEBIAN%||g;s|%PACKAGE%|virtualbox|g" src/VBox/Installer/linux/vboxdrv.sh.in
@ -463,6 +473,8 @@ popd
%__install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates
install -m 700 %{S:13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox
######################################################
echo "entrering python-virtualbox install section"
######################################################
@ -516,6 +528,7 @@ groupadd -r vboxusers 2>/dev/null || :
%run_permissions
%endif
%verifyscript
%if %suse_version >=1140
%verify_permissions -e %{_vbox_instdir}/VBoxNetDHCP
@ -548,6 +561,7 @@ exit 0
%restart_on_update vboxadd
%insserv_cleanup
%clean
[ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}"
@ -622,7 +636,6 @@ exit 0
%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxHeadless
%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL
#
%files qt
%defattr(-, root, root)
%{_vbox_instdir}/VBoxPermissionMessage