From: Jan Palus Date: Thu, 12 Dec 2019 00:56:44 +0000 (+0100) Subject: initial update to 6.1.0 X-Git-Tag: auto/th/VirtualBox-6.1.0-1~4 X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=commitdiff_plain;h=e313de71c7eb37bd07d779e2c550d66cbbe194e5 initial update to 6.1.0 - xorg-driver-video-vboxvideo is now gone completely (vboxvideo driver replaced by modesetting some time ago, custom opengl provider dropped upstream in favor of VMWare SVGA driver stack) - removed obsolete patches - patch for updating var from which svn revision is extracted in extract_modules.sh --- diff --git a/VirtualBox-dri.patch b/VirtualBox-dri.patch deleted file mode 100644 index bd237b9..0000000 --- a/VirtualBox-dri.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- VirtualBox-4.3.0/src/VBox/Additions/common/crOpenGL/fakedri_drv.c~ 2011-06-30 18:33:33.000000000 +0200 -+++ VirtualBox-4.3.0/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 21:58:45.900949411 +0200 -@@ -37,15 +37,15 @@ - # define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri" - # define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/" - # else --# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri" --# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" -+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/xorg/modules/dri:/usr/lib/xorg/modules/dri:/usr/lib/xorg/modules/x86_64-linux-gnu/dri" -+# define DRI_XORG_DRV_DIR "/usr/lib64/xorg/modules/drivers/" - # endif - #else - # ifdef RT_OS_FREEBSD - # define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri" - # define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/" - # else --# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri" -+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri:/usr/lib/xorg/modules/i386-linux-gnu/dri" - # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" - # endif - #endif diff --git a/VirtualBox.spec b/VirtualBox.spec index 34efdab..3bc7a28 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -42,19 +42,19 @@ exit 1 %define qtver 5.6.0 -%define rel 2 +%define rel 0.1 %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: 6.0.14 +Version: 6.1.0 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: 2766d6f628dcd8f0bc216d0f8a2abc8e +# Source0-md5: 484b550f4692c9d61896b08bb0a1be7f Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: b6992ff74c65b964ddfe1ce951467493 +# Source1-md5: 24e170ad35727712a53d191b806428f5 Source2: vboxservice.init Source3: vboxservice.service Source4: vboxservice.sysconfig @@ -69,9 +69,8 @@ Source12: udev-guest.rules Patch0: %{pname}-version-error.patch Patch1: %{pname}-VBoxSysInfo.patch Patch2: %{pname}-warning_workaround.patch -Patch3: %{pname}-dri.patch +Patch3: svn_rev.patch Patch4: wrapper.patch -Patch5: xserver-1.12.patch Patch6: hardening-shared.patch Patch7: lightdm-greeter-makefile.patch Patch8: lightdm-greeter-g++-link.patch @@ -84,7 +83,6 @@ Patch14: %{pname}-multipython.patch Patch15: %{pname}-lightdm-1.19.2.patch Patch16: %{pname}-no-vboxvideo.patch Patch17: qt5-gl.patch -Patch18: linux-5.4.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -312,9 +310,9 @@ Summary: VirtualBox Guest X11 Additions Group: X11/Applications Requires: %{name}-guest = %{version}-%{release} Requires: xorg-app-xrandr -Requires: xorg-driver-video-vboxvideo = %{version}-%{release} Requires: kernel(vboxvideo) Obsoletes: xorg-driver-input-vboxmouse < %{version}-%{release} +Obsoletes: xorg-driver-video-vboxvideo < %{version}-%{release} %description guest-x11 Tools for X11 session that utilize kernel modules for supporting @@ -355,25 +353,6 @@ Group: Base PAM module (Pluggable Authentication Module) which can be used to perform automated guest logons. -%package -n xorg-driver-video-vboxvideo -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-xserver-module(glx) - -%description -n xorg-driver-video-vboxvideo -X.org video driver for VirtualBox guest OS. - -%description -n xorg-driver-video-vboxvideo -l pl.UTF-8 -Sterownik grafiki dla systemu gościa w VirtualBoksie. - %package -n dkms-vboxguest Summary: VirtualBox kernel modules source for Linux Guest Summary(pl.UTF-8): Moduły VirtualBoksa do jądra Linuksa dla systemu gościa @@ -435,7 +414,9 @@ Requires: %{releq_kernel -n drm}\ Requires(postun): %releq_kernel\ Provides: kernel(vboxguest) = %{version}-%{rel}\ Provides: kernel(vboxsf) = %{version}-%{rel}\ +%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\ Provides: kernel(vboxvideo) = %{version}-%{rel}\ +%endif\ Obsoletes: kernel-init-guest\ Conflicts: kernel%{_alt_kernel}-virtualbox-host\ \ @@ -549,7 +530,6 @@ echo override vboxguest %{_kernel_ver} misc > PLD-MODULE-BUILD/installed/etc/dep %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 @@ -564,7 +544,6 @@ echo override vboxguest %{_kernel_ver} misc > PLD-MODULE-BUILD/installed/etc/dep %patch15 -p0 %patch16 -p0 %patch17 -p1 -%patch18 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in @@ -683,11 +662,6 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.xml %endif -# vboxvideo -%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.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 - # Guest Only Tools %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxClient %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxControl @@ -791,7 +765,6 @@ mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/src $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{v %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/{sdk,testcase} %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxkeyboard.tar.bz2 -%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/tst* %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/generated.sh %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack-license.* @@ -944,17 +917,14 @@ 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 %attr(755,root,root) %{_libdir}/%{pname}/VBoxKeyboard.so %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 %attr(755,root,root) %{_libdir}/%{pname}/VBoxVMM.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOM.so @@ -992,6 +962,8 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %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/RTEfiFatExtract +%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzClient %attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzMaster %attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip %attr(755,root,root) %{_libdir}/%{pname}/tools/RTHttp @@ -1025,14 +997,10 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %{_libdir}/%{pname}/VBoxBugReport %{_libdir}/%{pname}/VBoxCpuReport -%{_libdir}/%{pname}/VBoxDDRC.debug -%{_libdir}/%{pname}/VBoxDDRC.rc %{_libdir}/%{pname}/VBoxDDR0.debug %{_libdir}/%{pname}/VBoxDDR0.r0 %{_libdir}/%{pname}/VBoxEFI32.fd %{_libdir}/%{pname}/VBoxEFI64.fd -%{_libdir}/%{pname}/VMMRC.debug -%{_libdir}/%{pname}/VMMRC.rc %{_libdir}/%{pname}/VMMR0.debug %{_libdir}/%{pname}/VMMR0.r0 @@ -1055,6 +1023,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %files gui %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/VirtualBox +%attr(755,root,root) %{_libdir}/%{pname}/UICommon.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxDbg.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxTestOGL %attr(755,root,root) %{_libdir}/%{pname}/VirtualBox @@ -1159,12 +1128,6 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %endif %endif -%files -n xorg-driver-video-vboxvideo -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/xorg/modules/dri/vboxvideo_dri.so -# vboxvideo_dri.so deps -%attr(755,root,root) %{_libdir}/VBoxEGL.so - %if %{with dkms} %files -n dkms-vboxguest %defattr(644,root,root,755) diff --git a/linux-5.4.patch b/linux-5.4.patch deleted file mode 100644 index a61e587..0000000 --- a/linux-5.4.patch +++ /dev/null @@ -1,289 +0,0 @@ -https://www.virtualbox.org/changeset/81586/vbox -https://www.virtualbox.org/changeset/81587/vbox -https://www.virtualbox.org/changeset/81649/vbox - -diff -u -r VirtualBox-6.0.14/include/iprt/cdefs.h VirtualBox-6.0.14-5.4/include/iprt/cdefs.h ---- VirtualBox-6.0.14/include/iprt/cdefs.h 2019-10-10 18:25:42.000000000 +0000 -+++ VirtualBox-6.0.14-5.4/include/iprt/cdefs.h 2019-11-26 10:08:56.314644140 +0000 -@@ -1166,7 +1166,7 @@ - * Tell the compiler that we're falling through to the next case in a switch. - * @sa RT_FALL_THRU */ - #if RT_GNUC_PREREQ(7, 0) --# define RT_FALL_THROUGH() __attribute__((fallthrough)) -+# define RT_FALL_THROUGH() __attribute__((__fallthrough__)) - #else - # define RT_FALL_THROUGH() (void)0 - #endif -diff -u -r VirtualBox-6.0.14/src/VBox/Additions/linux/drm/vbox_drv.c VirtualBox-6.0.14-5.4/src/VBox/Additions/linux/drm/vbox_drv.c ---- VirtualBox-6.0.14/src/VBox/Additions/linux/drm/vbox_drv.c 2019-10-10 18:28:09.000000000 +0000 -+++ VirtualBox-6.0.14-5.4/src/VBox/Additions/linux/drm/vbox_drv.c 2019-11-26 10:08:56.324644270 +0000 -@@ -270,12 +270,16 @@ - } - - static struct drm_driver driver = { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) - .driver_features = - DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ | --#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81) -+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81) - DRIVER_IRQ_SHARED | --#endif -+# endif /* < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81) */ - DRIVER_PRIME, -+#else /* >= KERNEL_VERSION(5, 4, 0) */ -+ .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ, -+#endif /* < KERNEL_VERSION(5, 4, 0) */ - .dev_priv_size = 0, - - .load = vbox_driver_load, -diff -u -r VirtualBox-6.0.14/src/VBox/Additions/linux/drm/vbox_main.c VirtualBox-6.0.14-5.4/src/VBox/Additions/linux/drm/vbox_main.c ---- VirtualBox-6.0.14/src/VBox/Additions/linux/drm/vbox_main.c 2019-10-10 18:28:09.000000000 +0000 -+++ VirtualBox-6.0.14-5.4/src/VBox/Additions/linux/drm/vbox_main.c 2019-11-26 10:08:56.324644270 +0000 -@@ -616,11 +616,13 @@ - - static inline u64 vbox_bo_mmap_offset(struct vbox_bo *bo) - { --#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_70) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) -+ return drm_vma_node_offset_addr(&bo->bo.base.vma_node); -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_70) - return bo->bo.addr_space_offset; - #else - return drm_vma_node_offset_addr(&bo->bo.vma_node); --#endif -+#endif /* >= KERNEL_VERSION(5, 4, 0) */ - } - - int -diff -u -r VirtualBox-6.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c VirtualBox-6.0.14-5.4/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ---- VirtualBox-6.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c 2019-10-10 18:35:33.000000000 +0000 -+++ VirtualBox-6.0.14-5.4/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c 2019-11-26 10:08:56.321310893 +0000 -@@ -924,8 +924,13 @@ - for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++) - { - skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i]; -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) -+ pSG->aSegs[iSeg].cb = pFrag->bv_len; -+ pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; -+# else /* < KERNEL_VERSION(5, 4, 0) */ - pSG->aSegs[iSeg].cb = pFrag->size; - pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset; -+# endif /* >= KERNEL_VERSION(5, 4, 0) */ - Log6((" %p", pSG->aSegs[iSeg].pv)); - pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS; - Assert(iSeg <= pSG->cSegsAlloc); -@@ -940,8 +945,13 @@ - for (i = 0; i < skb_shinfo(pFragBuf)->nr_frags; i++) - { - skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i]; -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) -+ pSG->aSegs[iSeg].cb = pFrag->bv_len; -+ pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; -+# else /* < KERNEL_VERSION(5, 4, 0) */ - pSG->aSegs[iSeg].cb = pFrag->size; - pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset; -+# endif /* >= KERNEL_VERSION(5, 4, 0) */ - Log6((" %p", pSG->aSegs[iSeg].pv)); - pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS; - Assert(iSeg <= pSG->cSegsAlloc); -diff -u -r VirtualBox-6.0.14/src/VBox/Runtime/common/fs/ntfsvfs.cpp VirtualBox-6.0.14-5.4/src/VBox/Runtime/common/fs/ntfsvfs.cpp ---- VirtualBox-6.0.14/src/VBox/Runtime/common/fs/ntfsvfs.cpp 2019-10-10 18:36:03.000000000 +0000 -+++ VirtualBox-6.0.14-5.4/src/VBox/Runtime/common/fs/ntfsvfs.cpp 2019-11-26 10:08:56.317977517 +0000 -@@ -1052,7 +1052,7 @@ - case 4: cClustersInRun |= (uint32_t)pbPairs[offPairs + 3] << 24; RT_FALL_THRU(); - case 3: cClustersInRun |= (uint32_t)pbPairs[offPairs + 2] << 16; RT_FALL_THRU(); - case 2: cClustersInRun |= (uint16_t)pbPairs[offPairs + 1] << 8; RT_FALL_THRU(); -- case 1: cClustersInRun |= (uint16_t)pbPairs[offPairs + 0] << 0; RT_FALL_THRU(); -+ case 1: cClustersInRun |= (uint16_t)pbPairs[offPairs + 0] << 0; - } - offPairs += cbRunField; - AssertBreakStmt(cClustersInRun <= cMaxClustersInRun, -diff -u -r VirtualBox-6.0.14/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c VirtualBox-6.0.14-5.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c ---- VirtualBox-6.0.14/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c 2019-10-10 18:36:16.000000000 +0000 -+++ VirtualBox-6.0.14-5.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c 2019-11-26 10:24:51.692930759 +0000 -@@ -443,9 +443,6 @@ - } - - SetPageReserved(&paPages[iPage]); --#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */ -- MY_SET_PAGES_EXEC(&paPages[iPage], 1); --#endif - } - *pPhys = page_to_phys(paPages); - pvRet = phys_to_virt(page_to_phys(paPages)); -@@ -491,9 +488,6 @@ - for (iPage = 0; iPage < cPages; iPage++) - { - ClearPageReserved(&paPages[iPage]); --#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */ -- MY_SET_PAGES_NOEXEC(&paPages[iPage], 1); --#endif - } - __free_pages(paPages, cOrder); - IPRT_LINUX_RESTORE_EFL_AC(); -diff -u -r VirtualBox-6.0.14/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c VirtualBox-6.0.14-5.4/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c ---- VirtualBox-6.0.14/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c 2019-10-10 18:36:16.000000000 +0000 -+++ VirtualBox-6.0.14-5.4/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c 2019-11-26 10:09:28.805069152 +0000 -@@ -86,6 +86,8 @@ - /** Set if the allocation is contiguous. - * This means it has to be given back as one chunk. */ - bool fContiguous; -+ /** Set if executable allocation. */ -+ bool fExecutable; - /** Set if we've vmap'ed the memory into ring-0. */ - bool fMappedToRing0; - /** The pages in the apPages array. */ -@@ -289,10 +291,11 @@ - * Only valid if fContiguous == true, ignored otherwise. - * @param fFlagsLnx The page allocation flags (GPFs). - * @param fContiguous Whether the allocation must be contiguous. -+ * @param fExecutable Whether the memory must be executable. - * @param rcNoMem What to return when we're out of pages. - */ - static int rtR0MemObjLinuxAllocPages(PRTR0MEMOBJLNX *ppMemLnx, RTR0MEMOBJTYPE enmType, size_t cb, -- size_t uAlignment, gfp_t fFlagsLnx, bool fContiguous, int rcNoMem) -+ size_t uAlignment, gfp_t fFlagsLnx, bool fContiguous, bool fExecutable, int rcNoMem) - { - size_t iPage; - size_t const cPages = cb >> PAGE_SHIFT; -@@ -371,7 +374,8 @@ - for (iPage = 0; iPage < cPages; iPage++) - { - pMemLnx->apPages[iPage] = &paPages[iPage]; -- MY_SET_PAGES_EXEC(pMemLnx->apPages[iPage], 1); -+ if (fExecutable) -+ MY_SET_PAGES_EXEC(pMemLnx->apPages[iPage], 1); - if (PageHighMem(pMemLnx->apPages[iPage])) - BUG(); - } -@@ -379,6 +383,7 @@ - fContiguous = true; - #endif /* < 2.4.22 */ - pMemLnx->fContiguous = fContiguous; -+ pMemLnx->fExecutable = fExecutable; - - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) - /* -@@ -409,7 +414,7 @@ - * This should never happen! - */ - printk("rtR0MemObjLinuxAllocPages(cb=0x%lx, uAlignment=0x%lx): alloc_pages(..., %d) returned physical memory at 0x%lx!\n", -- (unsigned long)cb, (unsigned long)uAlignment, rtR0MemObjLinuxOrder(cPages), (unsigned long)page_to_phys(pMemLnx->apPages[0])); -+ (unsigned long)cb, (unsigned long)uAlignment, rtR0MemObjLinuxOrder(cPages), (unsigned long)page_to_phys(pMemLnx->apPages[0])); - rtR0MemObjLinuxFreePages(pMemLnx); - return rcNoMem; - } -@@ -438,14 +443,12 @@ - while (iPage-- > 0) - { - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) -- /* -- * See SetPageReserved() in rtR0MemObjLinuxAllocPages() -- */ -+ /* See SetPageReserved() in rtR0MemObjLinuxAllocPages() */ - ClearPageReserved(pMemLnx->apPages[iPage]); - #endif --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 22) --#else -- MY_SET_PAGES_NOEXEC(pMemLnx->apPages[iPage], 1); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 22) -+ if (pMemLnx->fExecutable) -+ MY_SET_PAGES_NOEXEC(pMemLnx->apPages[iPage], 1); - #endif - } - -@@ -662,10 +665,10 @@ - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 22) - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_PAGE, cb, PAGE_SIZE, GFP_HIGHUSER, -- false /* non-contiguous */, VERR_NO_MEMORY); -+ false /* non-contiguous */, fExecutable, VERR_NO_MEMORY); - #else - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_PAGE, cb, PAGE_SIZE, GFP_USER, -- false /* non-contiguous */, VERR_NO_MEMORY); -+ false /* non-contiguous */, fExecutable, VERR_NO_MEMORY); - #endif - if (RT_SUCCESS(rc)) - { -@@ -696,19 +699,19 @@ - #if (defined(RT_ARCH_AMD64) || defined(CONFIG_X86_PAE)) && defined(GFP_DMA32) - /* ZONE_DMA32: 0-4GB */ - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_DMA32, -- false /* non-contiguous */, VERR_NO_LOW_MEMORY); -+ false /* non-contiguous */, fExecutable, VERR_NO_LOW_MEMORY); - if (RT_FAILURE(rc)) - #endif - #ifdef RT_ARCH_AMD64 - /* ZONE_DMA: 0-16MB */ - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_DMA, -- false /* non-contiguous */, VERR_NO_LOW_MEMORY); -+ false /* non-contiguous */, fExecutable, VERR_NO_LOW_MEMORY); - #else - # ifdef CONFIG_X86_PAE - # endif - /* ZONE_NORMAL: 0-896MB */ - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_USER, -- false /* non-contiguous */, VERR_NO_LOW_MEMORY); -+ false /* non-contiguous */, fExecutable, VERR_NO_LOW_MEMORY); - #endif - if (RT_SUCCESS(rc)) - { -@@ -738,17 +741,17 @@ - #if (defined(RT_ARCH_AMD64) || defined(CONFIG_X86_PAE)) && defined(GFP_DMA32) - /* ZONE_DMA32: 0-4GB */ - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_DMA32, -- true /* contiguous */, VERR_NO_CONT_MEMORY); -+ true /* contiguous */, fExecutable, VERR_NO_CONT_MEMORY); - if (RT_FAILURE(rc)) - #endif - #ifdef RT_ARCH_AMD64 - /* ZONE_DMA: 0-16MB */ - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_DMA, -- true /* contiguous */, VERR_NO_CONT_MEMORY); -+ true /* contiguous */, fExecutable, VERR_NO_CONT_MEMORY); - #else - /* ZONE_NORMAL (32-bit hosts): 0-896MB */ - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_USER, -- true /* contiguous */, VERR_NO_CONT_MEMORY); -+ true /* contiguous */, fExecutable, VERR_NO_CONT_MEMORY); - #endif - if (RT_SUCCESS(rc)) - { -@@ -795,7 +798,7 @@ - - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, enmType, cb, uAlignment, fGfp, - enmType == RTR0MEMOBJTYPE_PHYS /* contiguous / non-contiguous */, -- VERR_NO_PHYS_MEMORY); -+ false /*fExecutable*/, VERR_NO_PHYS_MEMORY); - if (RT_FAILURE(rc)) - return rc; - -diff -u -r VirtualBox-6.0.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h VirtualBox-6.0.14-5.4/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h ---- VirtualBox-6.0.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h 2019-10-10 18:36:16.000000000 +0000 -+++ VirtualBox-6.0.14-5.4/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h 2019-11-26 10:09:39.218538652 +0000 -@@ -337,8 +337,10 @@ - #endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) --# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages) --# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages) -+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) /* The interface was removed, but we only need it for < 2.4.22, so who cares. */ -+# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages) -+# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages) -+# endif - #else - # define MY_SET_PAGES_EXEC(pPages, cPages) \ - do { \ -diff -u -r VirtualBox-6.0.14/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c VirtualBox-6.0.14-5.4/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c ---- VirtualBox-6.0.14/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c 2019-10-10 18:36:16.000000000 +0000 -+++ VirtualBox-6.0.14-5.4/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c 2019-11-26 10:08:56.321310893 +0000 -@@ -36,6 +36,9 @@ - #include - #include "internal/thread.h" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+ #include -+#endif /* >= KERNEL_VERSION(4, 11, 0) */ - - RTDECL(RTTHREAD) RTThreadSelf(void) - { diff --git a/pld-guest.patch b/pld-guest.patch index c00812c..9ffa761 100644 --- a/pld-guest.patch +++ b/pld-guest.patch @@ -12,13 +12,13 @@ +++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2013-05-13 15:51:14.323890458 +0300 @@ -26,6 +26,8 @@ images/os_netware.png - images/os_openbsd_64.png images/os_openbsd.png + images/os_openbsd_64.png + images/os_pld.png + images/os_pld_64.png - images/os_opensuse_64.png images/os_opensuse.png - images/os_oracle_64.png + images/os_opensuse_64.png + images/os_oracle.png --- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc~ 2013-04-12 13:37:50.000000000 +0300 +++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2013-05-13 15:51:14.323890458 +0300 @@ -26,6 +26,8 @@ diff --git a/svn_rev.patch b/svn_rev.patch new file mode 100644 index 0000000..eedb586 --- /dev/null +++ b/svn_rev.patch @@ -0,0 +1,24 @@ +diff -urN VirtualBox-6.1.0.orig/src/VBox/Additions/linux/export_modules.sh VirtualBox-6.1.0/src/VBox/Additions/linux/export_modules.sh +--- VirtualBox-6.1.0.orig/src/VBox/Additions/linux/export_modules.sh 2019-12-10 18:45:30.000000000 +0100 ++++ VirtualBox-6.1.0/src/VBox/Additions/linux/export_modules.sh 2019-12-12 01:14:57.529314700 +0100 +@@ -46,7 +46,7 @@ + VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk` + VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk` + VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk` +-VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk` ++VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_CONFIG_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk` + VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` + VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` + VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` +diff -urN VirtualBox-6.1.0.orig/src/VBox/HostDrivers/linux/export_modules.sh VirtualBox-6.1.0/src/VBox/HostDrivers/linux/export_modules.sh +--- VirtualBox-6.1.0.orig/src/VBox/HostDrivers/linux/export_modules.sh 2019-12-10 18:52:40.000000000 +0100 ++++ VirtualBox-6.1.0/src/VBox/HostDrivers/linux/export_modules.sh 2019-12-12 01:15:07.499246825 +0100 +@@ -100,7 +100,7 @@ + VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk` + VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk` + VBOX_VERSION_STRING=$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD +-VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_C_YEAR=`date +%Y` ++VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_CONFIG_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_C_YEAR=`date +%Y` + + . $PATH_VBOXDRV/linux/files_vboxdrv + . $PATH_VBOXNET/linux/files_vboxnetflt diff --git a/xserver-1.12.patch b/xserver-1.12.patch deleted file mode 100644 index f908a79..0000000 --- a/xserver-1.12.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- VirtualBox-4.1.8_OSE/src/VBox/Additions/common/crOpenGL/glx_c_exports.c~ 2011-12-19 13:58:54.000000000 +0100 -+++ VirtualBox-4.1.8_OSE/src/VBox/Additions/common/crOpenGL/glx_c_exports.c 2012-03-20 19:23:14.921396646 +0100 -@@ -16,6 +16,7 @@ - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - -+#include "xorg/xorg-server.h" - #include "stub.h" - #include "dri_glx.h" - #include "fakedri_drv.h" ---- VirtualBox-4.1.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c~ 2012-03-20 18:05:06.047425764 +0100 -+++ VirtualBox-4.1.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2012-03-20 19:26:39.608072546 +0100 -@@ -18,6 +18,7 @@ - - #define _GNU_SOURCE 1 - -+#include "xorg/xorg-server.h" - #include "cr_error.h" - #include "cr_gl.h" - #include "cr_mem.h"