X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=blobdiff_plain;f=VirtualBox.spec;h=cfdd337af9ab2e45f1160664b6ac059e2e71ec23;hp=c787c28e70203566f61e08035293e17583a578df;hb=5a7612655114c1f0439c62f8ce3db10716e185a4;hpb=4c9a69b23c75bf10b1880425871d4a936bf5eb6e diff --git a/VirtualBox.spec b/VirtualBox.spec index c787c28..cfdd337 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -40,21 +40,21 @@ exit 1 %define _enable_debug_packages 0 %endif -%define qtver 5.3.2 +%define qtver 5.6.0 -%define rel 1 +%define rel 4 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} -Version: 5.1.14 +Version: 6.0.8 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} License: GPL v2 Group: Applications/Emulators Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2 -# Source0-md5: 21eaec9f21477d555559a63761779880 +# Source0-md5: 8f703ae98002f9e11dcb29eb01f87718 Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: 25576fe3fae42e51ea4766781c3100d2 +# Source1-md5: 7fab0b92e88b57c19bcc9aa081de245f Source2: vboxservice.init Source3: vboxservice.service Source4: vboxservice.sysconfig @@ -64,6 +64,8 @@ Source7: %{pname}-virtualbox-host-modules-load.conf Source8: %{pname}-virtualbox-guest-modules-load.conf Source9: vboxautostart.init Source10: autostart.cfg +Source11: vboxclient-vmsvga.service +Source12: udev-guest.rules Patch0: %{pname}-version-error.patch Patch1: %{pname}-VBoxSysInfo.patch Patch2: %{pname}-warning_workaround.patch @@ -75,13 +77,13 @@ Patch7: lightdm-greeter-makefile.patch Patch8: lightdm-greeter-g++-link.patch Patch9: pld-guest.patch Patch10: 16-no-update.patch -Patch11: 18-system-xorg.patch -Patch12: %{pname}-all-translations.patch -Patch13: x32.patch -Patch14: %{pname}-no-scrextend.patch -Patch15: %{pname}-multipython.patch -Patch16: %{pname}-lightdm-1.19.2.patch -Patch17: %{pname}-no-vboxvideo.patch +Patch11: %{pname}-all-translations.patch +Patch12: x32.patch +Patch13: %{pname}-no-scrextend.patch +Patch14: %{pname}-multipython.patch +Patch15: %{pname}-lightdm-1.19.2.patch +Patch16: %{pname}-no-vboxvideo.patch +Patch17: qt5-gl.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -104,6 +106,7 @@ BuildRequires: xorg-lib-libXrandr-devel BuildRequires: xorg-proto-glproto-devel BuildRequires: xorg-xserver-server-devel %endif +BuildRequires: EGL-devel BuildRequires: OpenGL-GLU-devel BuildRequires: OpenGL-devel BuildRequires: Qt5Core-devel >= %{qtver} @@ -129,7 +132,7 @@ BuildRequires: fakeroot BuildRequires: gcc >= 5:3.2.3 %{?with_webservice:BuildRequires: gsoap-devel} BuildRequires: issue -BuildRequires: kBuild >= 0.1.9998.2814 +BuildRequires: kBuild >= 0.1.9998.3093 BuildRequires: libIDL-devel BuildRequires: libcap-static BuildRequires: libdrm-devel @@ -145,7 +148,7 @@ BuildRequires: libxslt-progs >= 1.1.17 %{?with_lightdm:BuildRequires: lightdm-libs-qt5-devel} BuildRequires: makeself BuildRequires: mkisofs -BuildRequires: openssl-devel >= 0.9.8 +BuildRequires: openssl-devel >= 1.0.1 BuildRequires: pam-devel BuildRequires: pixman-devel BuildRequires: pkgconfig @@ -191,6 +194,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define outdir out/%{vbox_platform}/release/bin %define objdir out/%{vbox_platform}/release/obj +%define filterout -Werror=format-security + %description Oracle VirtualBox is a general-purpose full virtualizer for x86 hardware. Targeted at server, desktop and embedded use, it is now the @@ -474,10 +479,15 @@ gospodarzem sprzętu PCI.\ %if %{with kernel}\ %files -n kernel%{_alt_kernel}-virtualbox-guest\ %defattr(644,root,root,755)\ +%if %{_kernel_version_code} >= %{_kernel_version_magic 4 16 0}\ +%config(noreplace) %verify(not md5 mtime size) /etc/depmod.d/%{_kernel_ver}/vboxguest.conf\ +%endif\ %config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-guest.conf\ /lib/modules/%{_kernel_ver}/misc/vboxguest.ko*\ /lib/modules/%{_kernel_ver}/misc/vboxsf.ko*\ +%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\ /lib/modules/%{_kernel_ver}/misc/vboxvideo.ko*\ +%endif\ \ %files -n kernel%{_alt_kernel}-virtualbox-host\ %config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-host.conf\ @@ -504,16 +514,29 @@ gospodarzem sprzętu PCI.\ export KERN_DIR=%{_kernelsrcdir}\ cd PLD-MODULE-BUILD/HostDrivers\ %build_kernel_modules -m vboxdrv -C vboxdrv\ -%build_kernel_modules -m vboxnetadp -C vboxnetadp\ -%build_kernel_modules -m vboxnetflt -C vboxnetflt\ -%build_kernel_modules -m vboxpci -C vboxpci\ +%build_kernel_modules -m vboxnetadp -C vboxnetadp KBUILD_EXTRA_SYMBOLS=$PWD/../vboxdrv/Module.symvers\ +%build_kernel_modules -m vboxnetflt -C vboxnetflt KBUILD_EXTRA_SYMBOLS=$PWD/../vboxdrv/Module.symvers\ +%build_kernel_modules -m vboxpci -C vboxpci KBUILD_EXTRA_SYMBOLS=$PWD/../vboxdrv/Module.symvers\ cd ../GuestDrivers\ %build_kernel_modules -m vboxguest -C vboxguest\ cp -a vboxguest/Module.symvers vboxsf\ %build_kernel_modules -m vboxsf -C vboxsf -c\ +%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\ %build_kernel_modules -m vboxvideo -C vboxvideo\ +%endif\ cd ../..\ -%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/HostDrivers/vboxdrv/vboxdrv,PLD-MODULE-BUILD/HostDrivers/vboxnetadp/vboxnetadp,PLD-MODULE-BUILD/HostDrivers/vboxnetflt/vboxnetflt,PLD-MODULE-BUILD/HostDrivers/vboxpci/vboxpci,PLD-MODULE-BUILD/GuestDrivers/vboxguest/vboxguest,PLD-MODULE-BUILD/GuestDrivers/vboxsf/vboxsf,PLD-MODULE-BUILD/GuestDrivers/vboxvideo/vboxvideo -d misc\ +%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/HostDrivers/vboxdrv/vboxdrv,PLD-MODULE-BUILD/HostDrivers/vboxnetadp/vboxnetadp,PLD-MODULE-BUILD/HostDrivers/vboxnetflt/vboxnetflt,PLD-MODULE-BUILD/HostDrivers/vboxpci/vboxpci,PLD-MODULE-BUILD/GuestDrivers/vboxsf/vboxsf -d misc\ +%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/GuestDrivers/vboxguest/vboxguest -d misc\ +%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\ +%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/GuestDrivers/vboxvideo/vboxvideo -d misc\ +%endif\ +%{nil} + +%define install_kernel_pkg()\ +%if %{_kernel_version_code} >= %{_kernel_version_magic 4 16 0}\ +install -d PLD-MODULE-BUILD/installed/etc/depmod.d/%{_kernel_ver}\ +echo override vboxguest %{_kernel_ver} misc > PLD-MODULE-BUILD/installed/etc/depmod.d/%{_kernel_ver}/vboxguest.conf\ +%endif\ %{nil} %{?with_kernel:%{expand:%create_kernel_packages}} @@ -531,15 +554,15 @@ cd ../..\ %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 %if %{with all_langs} -%patch12 -p0 +%patch11 -p0 %endif +%patch12 -p1 %patch13 -p1 -%patch14 -p1 +%patch14 -p0 %patch15 -p0 %patch16 -p0 -%patch17 -p0 +%patch17 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in @@ -553,10 +576,10 @@ cd ../..\ %if %{with kernel} install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers} cd PLD-MODULE-BUILD -../src/VBox/Additions/linux/export_modules guest-modules.tar.gz +../src/VBox/Additions/linux/export_modules.sh guest-modules.tar.gz tar -zxf guest-modules.tar.gz -C GuestDrivers -../src/VBox/HostDrivers/linux/export_modules host-modules.tar.gz --without-hardening +../src/VBox/HostDrivers/linux/export_modules.sh --file host-modules.tar.gz --without-hardening tar -zxf host-modules.tar.gz -C HostDrivers cd - %endif @@ -580,6 +603,7 @@ VBOX_BUILD_PUBLISHER=_PLD VBOX_VERSION_STRING=$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)_PLD XSERVER_VERSION=%(rpm -q --queryformat '%{V}\n' xorg-xserver-server-devel | awk -F. '{ print $1 $2 }' 2>/dev/null || echo ERROR) VBOX_USE_SYSTEM_XORG_HEADERS=1 +VBOX_USE_SYSTEM_GL_HEADERS=1 %if %{with lightdm} VBOX_WITH_LIGHTDM_GREETER=1 VBOX_WITH_LIGHTDM_GREETER_PACKING=1 @@ -626,6 +650,7 @@ kmk %{?_smp_mflags} %endif %{?with_kernel:%{expand:%build_kernel_packages}} +%{?with_kernel:%{expand:%install_kernel_packages}} %install rm -rf $RPM_BUILD_ROOT @@ -679,6 +704,8 @@ install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxservice cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/vboxservice.service cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/vboxservice +cp -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}/vboxclient-vmsvga.service + install -p %{SOURCE9} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxautostart %{__sed} -i -e 's#@INSTALL_DIR@#%{_libdir}/%{pname}#' $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxautostart cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/vbox @@ -686,7 +713,7 @@ cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/vbox %if %{with lightdm} install -d $RPM_BUILD_ROOT%{_datadir}/xgreeters %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_sbindir}}/vbox-greeter -cp -p %{objdir}/Additions/Installer/linux/share/VBoxGuestAdditions/vbox-greeter.desktop $RPM_BUILD_ROOT%{_datadir}/xgreeters +cp -p %{objdir}/Additions/Installer/linux/other/vbox-greeter.desktop $RPM_BUILD_ROOT%{_datadir}/xgreeters %endif %if %{with dkms} @@ -707,11 +734,6 @@ install -p %{SOURCE5} $RPM_BUILD_ROOT/sbin/mount.vdi %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/autorun.sh %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/runasroot.sh -# scripts to setup modules, x11 and service. we have covered that in our packages -%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd -%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd-service -%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd-x11 - # unknown - checkme %if 1 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPInstall @@ -763,6 +785,7 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname},/lib/udev}/VBoxCreateUSBNode.sh cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxdrv.rules +cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxguest.rules %if %{with dkms} mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/src $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}-%{rel} @@ -854,6 +877,7 @@ fi %update_mime_database %pre guest +%useradd -u 336 -d /usr/share/empty -s /bin/false -c "VirtualBox guest additions" -g nobody vboxadd # Add a group "vboxsf" for Shared Folders access # All users which want to access the auto-mounted Shared Folders have to be added to this group. %groupadd -g 266 -r -f vboxsf @@ -861,17 +885,18 @@ fi %post guest /sbin/chkconfig --add vboxservice %service vboxservice restart -%systemd_post vboxservice.service +%systemd_post vboxservice.service vboxclient-vmsvga.service %preun guest if [ "$1" = "0" ]; then /sbin/chkconfig --del vboxservice %service vboxservice -q stop fi -%systemd_preun vboxservice.service +%systemd_preun vboxservice.service vboxclient-vmsvga.service %postun guest if [ "$1" = "0" ]; then + %userremove vboxadd %groupremove vboxsf fi %systemd_reload @@ -923,6 +948,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %attr(755,root,root) %{_libdir}/%{pname}/VBoxDD2.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxDDU.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxDragAndDropSvc.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxGlobal.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestControlSvc.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestPropSvc.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxHostChannel.so @@ -933,6 +959,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %attr(755,root,root) %{_libdir}/%{pname}/VBoxPython*.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxREM.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxRT.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxSVGA3D.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedClipboard.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedCrOpenGL.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedFolders.so @@ -961,20 +988,33 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %attr(755,root,root) %{_libdir}/%{pname}/VBoxVMMPreload %attr(755,root,root) %{_libdir}/%{pname}/VBoxVolInfo %attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMIPCD +%attr(755,root,root) %{_libdir}/%{pname}/VirtualBoxVM +%attr(755,root,root) %{_libdir}/%{pname}/bldRTLdrCheckImports %attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin %if %{with doc} %attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp %endif %dir %{_libdir}/%{pname}/tools +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTCat +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTChMod +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTCp %attr(755,root,root) %{_libdir}/%{pname}/tools/RTDbgSymCache +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzMaster %attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip %attr(755,root,root) %{_libdir}/%{pname}/tools/RTHttp +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTIsoMaker +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTKrnlModInfo +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTLdrCheckImports %attr(755,root,root) %{_libdir}/%{pname}/tools/RTLdrFlt +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTLs %attr(755,root,root) %{_libdir}/%{pname}/tools/RTManifest +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTMkDir %attr(755,root,root) %{_libdir}/%{pname}/tools/RTRm +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTRmDir %attr(755,root,root) %{_libdir}/%{pname}/tools/RTShutdown %attr(755,root,root) %{_libdir}/%{pname}/tools/RTSignTool %attr(755,root,root) %{_libdir}/%{pname}/tools/RTTar +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTTraceLogTool %attr(755,root,root) %{_libdir}/%{pname}/tools/RTUnzip %attr(755,root,root) %{_libdir}/%{pname}/tools/scm @@ -990,11 +1030,8 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux*/VBoxDTraceR0.debug %{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux*/VBoxDTraceR0.r0 +%{_libdir}/%{pname}/VBoxBugReport %{_libdir}/%{pname}/VBoxCpuReport -%{_libdir}/%{pname}/VBoxDD2R0.debug -%{_libdir}/%{pname}/VBoxDD2R0.r0 -%{_libdir}/%{pname}/VBoxDD2RC.debug -%{_libdir}/%{pname}/VBoxDD2RC.rc %{_libdir}/%{pname}/VBoxDDRC.debug %{_libdir}/%{pname}/VBoxDDRC.rc %{_libdir}/%{pname}/VBoxDDR0.debug @@ -1014,9 +1051,11 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %attr(755,root,root) %{_libdir}/%{pname}/components/VBoxXPCOMIPCC.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxSysInfo.sh +%{_libdir}/%{pname}/UnattendedTemplates + %dir %{_datadir}/%{pname} -%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/*.rules +%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/60-vboxdrv.rules %attr(755,root,root) /lib/udev/VBoxCreateUSBNode.sh %if %{with gui} @@ -1037,10 +1076,10 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %lang(en) %{_datadir}/%{pname}/nls/*_en.qm %lang(es) %{_datadir}/%{pname}/nls/*_es.qm %lang(eu) %{_datadir}/%{pname}/nls/*_eu.qm -%lang(fi) %{_datadir}/%{pname}/nls/*_fa_IR.qm +%lang(fa) %{_datadir}/%{pname}/nls/*_fa.qm %lang(fi) %{_datadir}/%{pname}/nls/*_fi.qm %lang(fr) %{_datadir}/%{pname}/nls/*_fr.qm -%lang(gl_ES) %{_datadir}/%{pname}/nls/*_gl_ES.qm +%lang(gl) %{_datadir}/%{pname}/nls/*_gl.qm %lang(he) %{_datadir}/%{pname}/nls/*_he.qm %lang(hu) %{_datadir}/%{pname}/nls/*_hu.qm %lang(id) %{_datadir}/%{pname}/nls/*_id.qm @@ -1059,6 +1098,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %lang(sk) %{_datadir}/%{pname}/nls/*_sl.qm %lang(sr) %{_datadir}/%{pname}/nls/*_sr.qm %lang(sv) %{_datadir}/%{pname}/nls/*_sv.qm +%lang(th) %{_datadir}/%{pname}/nls/*_th.qm %lang(tr) %{_datadir}/%{pname}/nls/*_tr.qm %lang(uk) %{_datadir}/%{pname}/nls/*_uk.qm %lang(zh_CN) %{_datadir}/%{pname}/nls/*_zh_CN.qm @@ -1081,8 +1121,10 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %attr(754,root,root) /etc/rc.d/init.d/vboxservice %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vboxservice %{systemdunitdir}/vboxservice.service +%{systemdunitdir}/vboxclient-vmsvga.service %attr(755,root,root) %{_bindir}/VBoxControl %attr(755,root,root) %{_bindir}/VBoxService +%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/60-vboxguest.rules %files guest-x11 %defattr(644,root,root,755)