X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=blobdiff_plain;f=VirtualBox.spec;h=7759386eaa78b991ef71d636b7d5aaf41fbe5aa8;hp=ebb6bca889f68becda0accc2ad7ef82d31909e8f;hb=54f42b3a194591331d7450e7ee25f63fee58e7cb;hpb=281cfbade7ff89a550a0e316990640b91876801b

diff --git a/VirtualBox.spec b/VirtualBox.spec
index ebb6bca..7759386 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		2
+%define		rel		3
 %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.4
+Version:	5.2.18
 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:	e25a6a1f3c113c373dc0433f9c2526f3
+# Source0-md5:	d8e291525b84569356773eef507c49ce
 Source1:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5:	c24e2057a7dbc7d63e859c32638c321d
+# Source1-md5:	a263141eabce4bd1e537665104f7c1e4
 Source2:	vboxservice.init
 Source3:	vboxservice.service
 Source4:	vboxservice.sysconfig
@@ -75,10 +75,15 @@ 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
+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:	%{pname}-kerndir.patch
+Patch18:	kernel-4.18.patch
+Patch19:	gcc8.patch
 URL:		http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -101,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}
@@ -126,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
@@ -188,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
@@ -238,6 +246,7 @@ Summary:	Qt GUI part for VirtualBox
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
 Requires:	Qt5Core >= %{qtver}
+Requires:	Qt5Gui-platform-xcb >= %{qtver}
 Requires:	desktop-file-utils
 Requires:	desktop-file-utils
 Requires:	fontconfig
@@ -245,6 +254,8 @@ Requires:	fonts-Type1-urw
 Requires:	gtk-update-icon-cache
 Requires:	hicolor-icon-theme
 Requires:	shared-mime-info
+Suggests:	Qt5Gui-platform-xcb-glx >= %{qtver}
+Suggests:	Qt5Gui-platform-xcb-egl >= %{qtver}
 Suggests:	gxmessage
 Conflicts:	%{name} < 4.3.8-3
 
@@ -301,7 +312,7 @@ Group:		X11/Applications
 Requires:	%{name}-guest = %{version}-%{release}
 Requires:	xorg-app-xrandr
 Requires:	xorg-driver-video-vboxvideo = %{version}-%{release}
-Suggests:	kernel(vboxvideo)
+Requires:	kernel(vboxvideo)
 Obsoletes:	xorg-driver-input-vboxmouse < %{version}-%{release}
 
 %description guest-x11
@@ -348,12 +359,12 @@ Summary:	X.org video driver for VirtualBox guest OS
 Summary(pl.UTF-8):	Sterownik grafiki dla systemu gościa w VirtualBoksie
 Group:		X11/Applications
 Requires:	Mesa-dri-driver-swrast
+Requires:	xorg-driver-video-modesetting
 Requires:	xorg-xserver-libdri >= 1.7.4
 Requires:	xorg-xserver-server >= 1.0.99.901
 %{?requires_xorg_xserver_videodrv}
 Provides:	OpenGL = 2.1
 Provides:	OpenGL-GLX = 1.3
-Provides:	xorg-driver-video
 Provides:	xorg-xserver-module(glx)
 
 %description -n xorg-driver-video-vboxvideo
@@ -471,7 +482,9 @@ gospodarzem sprzętu PCI.\
 %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\
@@ -505,9 +518,15 @@ 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}
 
 %{?with_kernel:%{expand:%create_kernel_packages}}
@@ -525,12 +544,17 @@ 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 -p1
+%patch18 -p1
+%patch19 -p0
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
 	-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -544,10 +568,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 host-modules.tar.gz --without-hardening
 tar -zxf host-modules.tar.gz -C HostDrivers
 cd -
 %endif
@@ -567,10 +591,11 @@ cp -p src/VBox/Frontends/VirtualBox/images/os_{linux26,pld}_64.png
 cat <<'EOF'>> LocalConfig.kmk
 %{?with_verbose:KBUILD_VERBOSE=3}
 USERNAME=%(id -un)
-__VBOX_BUILD_PUBLISHER=_PLD
+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
@@ -592,6 +617,7 @@ VBOX_WITH_TESTCASES :=
 VBOX_WITH_TESTSUITE :=
 
 VBOX_WITH_VRDP_RDESKTOP=
+VBOX_WITH_MULTIVERSION_PYTHON=0
 EOF
 
 %undefine	filterout_c
@@ -648,7 +674,6 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso
 
 # vboxvideo
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_system.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
 # XXX: where else to install them that vboxvideo_dri.so finds them? patch with rpath?
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxEGL.so
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLarrayspu.so
@@ -677,7 +702,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}
@@ -698,11 +723,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
@@ -725,7 +745,6 @@ ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxAutostart
 ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
 ln -sf %{_libdir}/%{pname}/vbox-img $RPM_BUILD_ROOT%{_bindir}/vbox-img
 ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxDTrace
-ln -sf %{_libdir}/%{pname}/rdesktop-vrdp $RPM_BUILD_ROOT%{_bindir}/rdesktop-vrd
 cp -p $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons/128x128/virtualbox.png $RPM_BUILD_ROOT%{_pixmapsdir}/virtualbox.png
 mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.desktop $RPM_BUILD_ROOT%{_desktopdir}/virtualbox.desktop
 mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/virtualbox.xml
@@ -751,7 +770,7 @@ cd -
 done
 )
 
-rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons	
+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
@@ -904,6 +923,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %attr(755,root,root) %{_bindir}/VBoxHeadless
 %attr(755,root,root) %{_bindir}/VBoxManage
 %attr(755,root,root) %{_bindir}/VBoxSDL
+%attr(755,root,root) %{_bindir}/VBoxVRDP
 %attr(755,root,root) %{_bindir}/vbox-img
 %dir %{_libdir}/%{pname}
 # libraries
@@ -957,15 +977,23 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %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/RTDbgSymCache
 %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/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
 
@@ -981,6 +1009,7 @@ 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
@@ -1005,6 +1034,8 @@ 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
@@ -1013,9 +1044,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %if %{with gui}
 %files gui
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/VBoxVRDP
 %attr(755,root,root) %{_bindir}/VirtualBox
-%attr(755,root,root) %{_bindir}/rdesktop-vrd
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDbg.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxTestOGL
 %attr(755,root,root) %{_libdir}/%{pname}/VirtualBox
@@ -1030,10 +1059,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
@@ -1052,6 +1081,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
@@ -1119,7 +1149,6 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 
 %files -n xorg-driver-video-vboxvideo
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/vboxvideo_dri.so
 # vboxvideo_dri.so deps
 %attr(755,root,root) %{_libdir}/VBoxEGL.so