%define _enable_debug_packages 0
%define rel 1
%ifarch %{x8664}
-%define arch amd64
+%define arch amd64
%else
-%define arch x86
+%define arch x86
%endif
+%define prev 53138
-%define prev 49315
%define pname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
Name: %{pname}-bin
-Version: 3.0.0
+Version: 3.0.8
Release: %{rel}
License: Free for non-commercial use, non-distributable
Group: Applications/Emulators
NoSource: 0
#Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
Source1: UserManual.pdf
-# Source1-md5: e62fce82380b3368e2558a663715734c
-Source3: %{pname}-vboxdrv.init
-Source4: %{pname}-vboxadd.init
-Source5: %{pname}-vboxnetflt.init
-Source6: %{pname}-vboxvfs.init
-Source7: %{pname}.desktop
-Source8: %{pname}.sh
+# Source1-md5: 7b9dcaa2339f122db12228c6501c2176
+Source3: %{pname}-vboxdrv.init
+Source4: %{pname}-vboxadd.init
+Source5: %{pname}-vboxnetadp.init
+Source6: %{pname}-vboxnetflt.init
+Source7: %{pname}-vboxvfs.init
+Source8: %{pname}.desktop
+Source9: %{pname}.sh
URL: http://www.virtualbox.org/
%{?with_userspace:BuildRequires: ffmpeg-libs}
BuildRequires: rpmbuild(macros) >= 1.379
VirtualBox Guest Additions for Linux Module.
%description -n kernel%{_alt_kernel}-misc-vboxadd -l pl.UTF-8
-Moduł jądra Linuksa vboxadd dla VirtualBoksa - dodatki dla
-systemu gościa.
+Moduł jądra Linuksa vboxadd dla VirtualBoksa - dodatki dla systemu
+gościa.
%package -n kernel%{_alt_kernel}-misc-vboxdrv
Summary: VirtualBox Support Driver
VirtualBox Support Driver.
%description -n kernel%{_alt_kernel}-misc-vboxdrv -l pl.UTF-8
-Moduł jądra Linuksa dla VirtualBoksa - sterownik wsparcia dla
-systemu głównego.
+Moduł jądra Linuksa dla VirtualBoksa - sterownik wsparcia dla systemu
+głównego.
+
+%package -n kernel%{_alt_kernel}-misc-vboxnetadp
+Summary: VirtualBox Linux Host Virtual Network Adapter Driver
+Release: %{rel}@%{_kernel_ver_str}
+Group: Base/Kernel
+Requires(post,postun): /sbin/depmod
+Requires: dev >= 2.9.0-7
+Requires: kernel%{_alt_kernel}-misc-vboxdrv
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
+Provides: kernel(vboxnetadp) = %{version}-%{rel}
+
+%description -n kernel%{_alt_kernel}-misc-vboxnetadp
+This is a kernel module that creates a virtual interface that can be
+attached to an internal network.
%package -n kernel%{_alt_kernel}-misc-vboxnetflt
-Summary: VirtualBox Guest Additions for Linux Module
+Summary: VirtualBox Linux Host Network Filter Driver
Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
Release: %{rel}@%{_kernel_ver_str}
Group: Base/Kernel
Provides: kernel(vboxnetflt) = %{version}-%{rel}
%description -n kernel%{_alt_kernel}-misc-vboxnetflt
-VirtualBox Network Filter Driver.
+This is a kernel module that attaches to a real interface on the host
+and filters and injects packets.
%description -n kernel%{_alt_kernel}-misc-vboxnetflt -l pl.UTF-8
-Moduł jądra Linuksa dla VirtualBoksa - sterownik filtrowania
-sieci dla systemu głównego.
+Moduł jądra Linuksa dla VirtualBoksa - sterownik filtrowania sieci dla
+systemu głównego.
%package -n kernel%{_alt_kernel}-misc-vboxvfs
Summary: Host file system access VFS for VirtualBox
Host file system access VFS for VirtualBox.
%description -n kernel%{_alt_kernel}-misc-vboxvfs -l pl.UTF-8
-Moduł jądra Linuksa dla VirtualBoksa - dostęp do plików
-systemu głównego z poziomu systemu gościa.
+Moduł jądra Linuksa dla VirtualBoksa - dostęp do plików systemu
+głównego z poziomu systemu gościa.
%package -n xorg-driver-input-vboxmouse
Summary: X.org mouse driver for VirtualBox guest OS
cat <<'EOF' > udev.conf
KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
KERNEL=="vboxadd", NAME="%k", GROUP="vbox", MODE="0660"
+KERNEL=="vboxnetctl", NAME="%k", GROUP="vbox", MODE="0660"
EOF
install %{SOURCE1} .
-sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE8} > VirtualBox-wrapper.sh
+sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE9} > VirtualBox-wrapper.sh
rm -rf PLD-MODULE-BUILD && mkdir PLD-MODULE-BUILD && cd PLD-MODULE-BUILD
cp -rdf ../src/* ./
sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxdrv/Makefile
+sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxnetadp/Makefile
sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxnetflt/Makefile
%build
%if %{with kernel}
cd PLD-MODULE-BUILD
%build_kernel_modules -m vboxdrv -C vboxdrv
+cp -a vboxdrv/Module.symvers vboxnetadp/
+%build_kernel_modules -m vboxnetadp -C vboxnetadp
cp -a vboxdrv/Module.symvers vboxnetflt/
%build_kernel_modules -m vboxnetflt -C vboxnetflt
cd ..
$RPM_BUILD_ROOT%{_libdir}/VirtualBox/components
install VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/VirtualBox
-for f in {VBox{Headless,Manage,Net{AdpCtl,DHCP},SDL,SysInfo.sh,SVC,Tunctl,XPCOMIPCD,.sh},VirtualBox,rdesktop-vrdp,vboxwebsrv,webtest}; do
+for f in {VBox{Headless,Manage,Net{AdpCtl,DHCP},SDL,SysInfo.sh,SVC,TestOGL,Tunctl,XPCOMIPCD,.sh},VirtualBox,rdesktop-vrdp,vboxwebsrv,webtest}; do
install $f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
done
install License-7.html $RPM_BUILD_ROOT%{_libdir}/VirtualBox
install VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
-install %{SOURCE7} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
+install %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
install VirtualBox.chm $RPM_BUILD_ROOT%{_libdir}/VirtualBox
%if %{with kernel}
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetadp
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt
%install_kernel_modules -m PLD-MODULE-BUILD/vboxdrv/vboxdrv -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/vboxnetadp/vboxnetadp -d misc
%install_kernel_modules -m PLD-MODULE-BUILD/vboxnetflt/vboxnetflt -d misc
%endif
/sbin/chkconfig --del vboxdrv
fi
+%post -n kernel%{_alt_kernel}-misc-vboxnetadp
+%depmod %{_kernel_ver}
+/sbin/chkconfig --add vboxnetadp
+%service vboxnetadp restart "VirtualBox Network Adapter driver"
+
+%postun -n kernel%{_alt_kernel}-misc-vboxnetadp
+%depmod %{_kernel_ver}
+
+%preun -n kernel%{_alt_kernel}-misc-vboxnetadp
+if [ "$1" = "0" ]; then
+ %service vboxnetadp stop
+ /sbin/chkconfig --del vboxnetadp
+fi
+
%post -n kernel%{_alt_kernel}-misc-vboxnetflt
%depmod %{_kernel_ver}
/sbin/chkconfig --add vboxnetflt
%attr(4755,root,root) %{_libdir}/VirtualBox/VBoxNetAdpCtl
%attr(4755,root,root) %{_libdir}/VirtualBox/VBoxNetDHCP
%attr(4755,root,root) %{_libdir}/VirtualBox/VBoxSDL
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxTestOGL
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxTunctl
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxXPCOMIPCD
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxDbg.so
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxPython2_6.so
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxPython.so
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxREM.so
+%ifarch %{ix86}
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxREM32.so
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxREM64.so
+%endif
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxRT.so
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxSDL.so
%attr(755,root,root) %{_libdir}/VirtualBox/VBoxSettings.so
%attr(754,root,root) /etc/rc.d/init.d/vboxdrv
/lib/modules/%{_kernel_ver}/misc/vboxdrv.ko*
+%files -n kernel%{_alt_kernel}-misc-vboxnetadp
+%defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/vboxnetadp
+/lib/modules/%{_kernel_ver}/misc/vboxnetadp.ko*
+
%files -n kernel%{_alt_kernel}-misc-vboxnetflt
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/vboxnetflt
projects / packages / VirtualBox-bin.git / blobdiff