diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,3 +1,4 @@ +libGL.so.1 libQt5Core.so.5 libQt5Gui.so.5 libQt5OpenGL.so.5 @@ -6,11 +7,8 @@ libQt5X11Extras.so.5 libSDL-1.2.so.0 libX11.so.6 -libXcomposite.so.1 libXcursor.so.1 -libXdamage.so.1 libXext.so.6 -libXfixes.so.3 libXmu.so.6 libXrandr.so.2 libXt.so.6 diff --git a/files/0001-Patch-out-notify-send-call.patch b/files/0001-Patch-out-notify-send-call.patch --- a/files/0001-Patch-out-notify-send-call.patch +++ b/files/0001-Patch-out-notify-send-call.patch @@ -1,12 +1,13 @@ -From d17ca1acbb0ab61dc546c671f09572d23a5fee8f Mon Sep 17 00:00:00 2001 -From: Joshua Strobl -Date: Thu, 2 May 2019 16:29:11 +0300 -Subject: [PATCH 1/1] Patch out notify-send call +From 9b46acd3a0cf988dea810829036adc592c67a553 Mon Sep 17 00:00:00 2001 +From: Pierre-Yves +Date: Fri, 13 Dec 2019 19:10:28 +0100 +Subject: [PATCH] Patch out notify-send call +Signed-off-by: Pierre-Yves --- - .../Additions/x11/Installer/98vboxadd-xclient | 7 +------ - src/VBox/Additions/x11/VBoxClient/main.cpp | 21 ------------------- - 2 files changed, 1 insertion(+), 27 deletions(-) + .../Additions/x11/Installer/98vboxadd-xclient | 7 +---- + src/VBox/Additions/x11/VBoxClient/main.cpp | 28 +------------------ + 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Additions/x11/Installer/98vboxadd-xclient index dcad1ce8..a4f5df7f 100755 @@ -27,19 +28,23 @@ # what we had in mind, so we do not start VBoxClient in that case. We do # not use "exit" here as this script is "source"d, not executed. diff --git a/src/VBox/Additions/x11/VBoxClient/main.cpp b/src/VBox/Additions/x11/VBoxClient/main.cpp -index b5429fbc..219cba0c 100644 +index daaed569..41b7293b 100644 --- a/src/VBox/Additions/x11/VBoxClient/main.cpp +++ b/src/VBox/Additions/x11/VBoxClient/main.cpp -@@ -83,27 +83,6 @@ void vbclFatalError(char *pszMessage) - { - char *pszCommand; - int status; -- if (pszMessage && cRespawn == 0) -- { -- pszCommand = RTStrAPrintf2("notify-send \"VBoxClient: %s\"", pszMessage); +@@ -113,34 +113,8 @@ int vbclLogNotify(const char *pszMessage) + + int rc = VINF_SUCCESS; + +- if (g_cRespawn == 0) ++ if (g_cRespawn != 0) + { +- char *pszCommand = RTStrAPrintf2("notify-send \"VBoxClient: %s\"", pszMessage); - if (pszCommand) - { -- status = system(pszCommand); +- int status = system(pszCommand); +- +- RTStrFree(pszCommand); +- - if (WEXITSTATUS(status) != 0) /* Utility or extension not available. */ - { - pszCommand = RTStrAPrintf2("xmessage -buttons OK:0 -center \"VBoxClient: %s\"", @@ -51,13 +56,17 @@ - { - RTPrintf("VBoxClient: %s", pszMessage); - } +- +- RTStrFree(pszCommand); - } +- else +- rc = VERR_NO_MEMORY; - } - } -- } - _exit(RTEXITCODE_FAILURE); - } +- else + rc = VERR_NO_MEMORY; + } -- -2.21.0 +2.24.1 diff --git a/files/linux-5.4.patch b/files/linux-5.4.patch deleted file mode 100644 --- a/files/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/files/series b/files/series --- a/files/series +++ b/files/series @@ -1,4 +1,3 @@ Disable-automatic-check-for-updates.patch 0001-Fix-rdesktop-vrdp-keymaps-path.patch 0001-Patch-out-notify-send-call.patch -linux-5.4.patch diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,9 +1,9 @@ name : virtualbox -version : 6.0.14 -release : 132 +version : 6.1.0 +release : 133 source : - - https://download.virtualbox.org/virtualbox/6.0.14/VirtualBox-6.0.14.tar.bz2 : 5e12b14f0c38bf195d9592d76a9e0a128df2d38cd77c26ce5b5488397715dd0c - - git|https://github.com/jwrdegoede/vboxsf.git : 83b9657878a229c83e4ce652af809bdc18a3a327 + - https://download.virtualbox.org/virtualbox/6.1.0/VirtualBox-6.1.0.tar.bz2 : 49005ed94454f893fc3955e1e2b9607e85c300235cb983b39d1df2cfcf29f039 + - git|https://github.com/jwrdegoede/vboxsf.git : 5aba938bcabd978e4615186ad7d8617d633e6f30 license : GPL-2.0-only component : - virt @@ -160,7 +160,7 @@ # libraries install -d -m 00755 $installdir/%libdir%/virtualbox install -m 00755 *.so -t $installdir/%libdir%/virtualbox - install -m 00644 *.rc *.r0 VBoxEFI*.fd -t $installdir/%libdir%/virtualbox + install -m 00644 *.r0 VBoxEFI*.fd -t $installdir/%libdir%/virtualbox # binaries & scripts install -m 00755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl -t $installdir/%libdir%/virtualbox @@ -171,6 +171,10 @@ install -m 04755 VBoxSDL VBoxVolInfo VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t $installdir/%libdir%/virtualbox # components + + ### TEMP: workaround dead link in 6.1.0 + rm components/VBoxREM.so + install -d -m 00755 $installdir/%libdir%/virtualbox/components install -m 00755 components/* -t $installdir/%libdir%/virtualbox/components @@ -229,7 +233,6 @@ install -D -m 00644 $workdir/src/VBox/Additions/x11/Installer/vboxclient.desktop $installdir/usr/share/xdg/autostart/vboxclient.desktop install -D -m 00755 pam_vbox.so -t $installdir/lib/security - install -D -m 00755 VBoxOGL*.so -t $installdir/%libdir%/vboxguestadditions # lts kernel modules pushd %kernel_version_lts% diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ virtualbox - Joshua Strobl - joshua@stroblindustries.com + Pierre-Yves + pyu@riseup.net GPL-2.0-only virt @@ -23,13 +23,12 @@ virt - virtualbox-common + virtualbox-common /lib/modules/4.9.205-147.lts/extra/vboxdrv.ko /lib/modules/4.9.205-147.lts/extra/vboxnetadp.ko /lib/modules/4.9.205-147.lts/extra/vboxnetflt.ko - /lib/modules/4.9.205-147.lts/extra/vboxpci.ko @@ -58,6 +57,7 @@ /usr/lib64/sysusers.d/virtualbox.conf /usr/lib64/udev/rules.d/60-vboxdrv.rules /usr/lib64/virtualbox/DbgPlugInDiggers.so + /usr/lib64/virtualbox/UICommon.so /usr/lib64/virtualbox/VBoxAuth.so /usr/lib64/virtualbox/VBoxAuthSimple.so /usr/lib64/virtualbox/VBoxAutostart @@ -68,14 +68,12 @@ /usr/lib64/virtualbox/VBoxDD.so /usr/lib64/virtualbox/VBoxDD2.so /usr/lib64/virtualbox/VBoxDDR0.r0 - /usr/lib64/virtualbox/VBoxDDRC.rc /usr/lib64/virtualbox/VBoxDDU.so /usr/lib64/virtualbox/VBoxDbg.so /usr/lib64/virtualbox/VBoxDragAndDropSvc.so /usr/lib64/virtualbox/VBoxEFI32.fd /usr/lib64/virtualbox/VBoxEFI64.fd /usr/lib64/virtualbox/VBoxExtPackHelperApp - /usr/lib64/virtualbox/VBoxGlobal.so /usr/lib64/virtualbox/VBoxGuestControlSvc.so /usr/lib64/virtualbox/VBoxGuestPropSvc.so /usr/lib64/virtualbox/VBoxHeadless @@ -90,14 +88,12 @@ /usr/lib64/virtualbox/VBoxNetNAT.so /usr/lib64/virtualbox/VBoxPython.so /usr/lib64/virtualbox/VBoxPython3_6m.so - /usr/lib64/virtualbox/VBoxREM.so /usr/lib64/virtualbox/VBoxRT.so /usr/lib64/virtualbox/VBoxSDL /usr/lib64/virtualbox/VBoxSDL.so /usr/lib64/virtualbox/VBoxSVC /usr/lib64/virtualbox/VBoxSVGA3D.so /usr/lib64/virtualbox/VBoxSharedClipboard.so - /usr/lib64/virtualbox/VBoxSharedCrOpenGL.so /usr/lib64/virtualbox/VBoxSharedFolders.so /usr/lib64/virtualbox/VBoxSysInfo.sh /usr/lib64/virtualbox/VBoxTestOGL @@ -109,13 +105,11 @@ /usr/lib64/virtualbox/VBoxXPCOMC.so /usr/lib64/virtualbox/VBoxXPCOMIPCD /usr/lib64/virtualbox/VMMR0.r0 - /usr/lib64/virtualbox/VMMRC.rc /usr/lib64/virtualbox/VirtualBox /usr/lib64/virtualbox/VirtualBoxVM /usr/lib64/virtualbox/VirtualBoxVM.so /usr/lib64/virtualbox/components/VBoxC.so /usr/lib64/virtualbox/components/VBoxDDU.so - /usr/lib64/virtualbox/components/VBoxREM.so /usr/lib64/virtualbox/components/VBoxRT.so /usr/lib64/virtualbox/components/VBoxSVCM.so /usr/lib64/virtualbox/components/VBoxVMM.so @@ -345,13 +339,12 @@ virt - virtualbox-common + virtualbox-common /lib/modules/5.3.15-138.current/extra/vboxdrv.ko /lib/modules/5.3.15-138.current/extra/vboxnetadp.ko /lib/modules/5.3.15-138.current/extra/vboxnetflt.ko - /lib/modules/5.3.15-138.current/extra/vboxpci.ko @@ -363,8 +356,8 @@ programming.devel - virtualbox - virtualbox-common + virtualbox + virtualbox-common /usr/lib/python3.6/site-packages/vboxapi-1.0-py3.6.egg-info @@ -816,7 +809,7 @@ virt - virtualbox-guest-common + virtualbox-guest-common /lib/modules/4.9.205-147.lts/misc/vboxguest.ko @@ -843,7 +836,6 @@ /usr/lib64/systemd/system/vboxservice.service /usr/lib64/sysusers.d/vboxguest.conf /usr/lib64/udev/rules.d/60-vboxguest.rules - /usr/lib64/vboxguestadditions/VBoxOGL.so /usr/sbin/VBoxService /usr/share/xdg/autostart/vboxclient.desktop @@ -857,19 +849,19 @@ virt - virtualbox-guest-common + virtualbox-guest-common /lib/modules/5.3.15-138.current/misc/vboxsf.ko - - 2019-12-09 - 6.0.14 + + 2019-12-13 + 6.1.0 Packaging update - Joshua Strobl - joshua@stroblindustries.com + Pierre-Yves + pyu@riseup.net \ No newline at end of file