Date: Thursday, December 12, 2019 @ 21:20:34 Author: eworm Revision: 537477
upgpkg: virtualbox 6.1.0-1 new upstream release Modified: virtualbox/trunk/008-no-vboxvideo.patch virtualbox/trunk/PKGBUILD virtualbox/trunk/vboxreload virtualbox/trunk/virtualbox-host-dkms.conf Deleted: virtualbox/trunk/002-dri-driver-path.patch virtualbox/trunk/011-python-3-8.patch virtualbox/trunk/014-iasl.patch virtualbox/trunk/015-libglvnd-headers.patch virtualbox/trunk/016-linux-5-4.patch ----------------------------+ 002-dri-driver-path.patch | 30 ---- 008-no-vboxvideo.patch | 2 011-python-3-8.patch | 13 - 014-iasl.patch | 73 ---------- 015-libglvnd-headers.patch | 32 ---- 016-linux-5-4.patch | 289 ------------------------------------------- PKGBUILD | 31 +--- vboxreload | 2 virtualbox-host-dkms.conf | 4 9 files changed, 11 insertions(+), 465 deletions(-) Deleted: 002-dri-driver-path.patch =================================================================== --- 002-dri-driver-path.patch 2019-12-12 20:57:25 UTC (rev 537476) +++ 002-dri-driver-path.patch 2019-12-12 21:20:34 UTC (rev 537477) @@ -1,30 +0,0 @@ -diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c -index 92b4ffc..1a1c467 100644 ---- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c -+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c -@@ -56,24 +56,8 @@ typedef enum { - - //#define DEBUG_DRI_CALLS - --/// @todo this could be different... --#ifdef RT_ARCH_AMD64 --# 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/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/" --# 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" - # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" --# endif --#endif - - #ifdef DEBUG_DRI_CALLS - #define SWDRI_SHOWNAME(pext, func) \ Modified: 008-no-vboxvideo.patch =================================================================== --- 008-no-vboxvideo.patch 2019-12-12 20:57:25 UTC (rev 537476) +++ 008-no-vboxvideo.patch 2019-12-12 21:20:34 UTC (rev 537477) @@ -1,5 +1,5 @@ Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7 ---- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2016-10-11 02:49:23.184986182 +0100 +--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:23.184986182 +0100 +++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:39.879176964 +0100 @@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo Deleted: 011-python-3-8.patch =================================================================== --- 011-python-3-8.patch 2019-12-12 20:57:25 UTC (rev 537476) +++ 011-python-3-8.patch 2019-12-12 21:20:34 UTC (rev 537477) @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index 128da55c..c4bb08c4 100755 ---- a/configure -+++ b/configure -@@ -1969,7 +1969,7 @@ extern "C" int main(void) - } - EOF - found= -- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m" -+ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8" - for p in $PYTHONDIR; do - for d in $SUPPYTHONLIBS; do - for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do Deleted: 014-iasl.patch =================================================================== --- 014-iasl.patch 2019-12-12 20:57:25 UTC (rev 537476) +++ 014-iasl.patch 2019-12-12 21:20:34 UTC (rev 537477) @@ -1,73 +0,0 @@ ---- "a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl" -+++ "a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl" -@@ -95,38 +95,38 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", - } \ - } \ - -- GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0, "SCK0-CPU0") -- GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1, "SCK1-CPU0") -- GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2, "SCK2-CPU0") -- GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3, "SCK3-CPU0") -- GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4, "SCK4-CPU0") -- GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5, "SCK5-CPU0") -- GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6, "SCK6-CPU0") -- GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7, "SCK7-CPU0") -- GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8, "SCK8-CPU0") -- GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9, "SCK9-CPU0") -- GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA, "SCKA-CPU0") -- GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB, "SCKB-CPU0") -- GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC, "SCKC-CPU0") -- GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD, "SCKD-CPU0") -- GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE, "SCKE-CPU0") -- GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF, "SCKF-CPU0") -- GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG, "SCKG-CPU0") -- GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH, "SCKH-CPU0") -- GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI, "SCKI-CPU0") -- GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ, "SCKJ-CPU0") -- GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK, "SCKK-CPU0") -- GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL, "SCKL-CPU0") -- GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM, "SCKM-CPU0") -- GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN, "SCKN-CPU0") -- GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO, "SCKO-CPU0") -- GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP, "SCKP-CPU0") -- GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ, "SCKQ-CPU0") -- GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR, "SCKR-CPU0") -- GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS, "SCKS-CPU0") -- GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT, "SCKT-CPU0") -- GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU, "SCKU-CPU0") -- GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV, "SCKV-CPU0") -+ GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0, 0) -+ GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1, 1) -+ GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2, 2) -+ GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3, 3) -+ GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4, 4) -+ GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5, 5) -+ GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6, 6) -+ GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7, 7) -+ GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8, 8) -+ GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9, 9) -+ GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA, 10) -+ GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB, 11) -+ GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC, 12) -+ GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD, 13) -+ GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE, 14) -+ GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF, 15) -+ GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG, 16) -+ GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH, 17) -+ GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI, 18) -+ GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ, 19) -+ GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK, 20) -+ GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL, 21) -+ GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM, 22) -+ GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN, 23) -+ GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO, 24) -+ GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP, 25) -+ GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ, 26) -+ GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR, 27) -+ GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS, 28) -+ GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT, 29) -+ GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU, 30) -+ GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV, 31) - - #undef GENERATE_CPU_OBJECT - } Deleted: 015-libglvnd-headers.patch =================================================================== --- 015-libglvnd-headers.patch 2019-12-12 20:57:25 UTC (rev 537476) +++ 015-libglvnd-headers.patch 2019-12-12 21:20:34 UTC (rev 537477) @@ -1,32 +0,0 @@ ---- VirtualBox-6.0.14/src/VBox/Additions/common/crOpenGL/dri_glx.h.orig 2019-10-26 13:39:24.704688716 +0000 -+++ VirtualBox-6.0.14/src/VBox/Additions/common/crOpenGL/dri_glx.h 2019-10-26 13:40:40.635814833 +0000 -@@ -114,7 +114,7 @@ - extern DECLEXPORT(GLXPbufferSGIX) VBOXGLXTAG(glXCreateGLXPbufferSGIX) - (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list); - --extern DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX) -+extern DECLEXPORT(void) VBOXGLXTAG(glXQueryGLXPbufferSGIX) - (Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value); - - extern DECLEXPORT(GLXFBConfigSGIX *) VBOXGLXTAG(glXChooseFBConfigSGIX) ---- VirtualBox-6.0.14/src/VBox/Additions/common/crOpenGL/glx.c.orig 2019-10-26 13:47:03.041385389 +0000 -+++ VirtualBox-6.0.14/src/VBox/Additions/common/crOpenGL/glx.c 2019-10-26 13:47:57.958842175 +0000 -@@ -763,7 +763,7 @@ - (void) mask; - } - --DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf, -+DECLEXPORT(void) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf, - int attribute, unsigned int *value) - { - (void) dpy; -@@ -771,7 +771,7 @@ - (void) attribute; - (void) value; - crWarning("glXQueryGLXPbufferSGIX not implemented by Chromium"); -- return 0; -+ return; - } - - DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config, - Deleted: 016-linux-5-4.patch =================================================================== --- 016-linux-5-4.patch 2019-12-12 20:57:25 UTC (rev 537476) +++ 016-linux-5-4.patch 2019-12-12 21:20:34 UTC (rev 537477) @@ -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 <iprt/errcore.h> - #include "internal/thread.h" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+ #include <uapi/linux/sched/types.h> -+#endif /* >= KERNEL_VERSION(4, 11, 0) */ - - RTDECL(RTTHREAD) RTThreadSelf(void) - { Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-12-12 20:57:25 UTC (rev 537476) +++ PKGBUILD 2019-12-12 21:20:34 UTC (rev 537477) @@ -9,8 +9,8 @@ 'virtualbox-guest-utils' 'virtualbox-guest-utils-nox' 'virtualbox-ext-vnc') -pkgver=6.0.14 -pkgrel=4 +pkgver=6.1.0 +pkgrel=1 _vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30' arch=('x86_64') url='https://virtualbox.org/' @@ -68,23 +68,18 @@ 'vboxservice-nox.service' 'vboxweb.service' 'vboxreload' - '002-dri-driver-path.patch' '005-gsoap-build.patch' '006-rdesktop-vrdp-keymap-path.patch' '008-no-vboxvideo.patch' - '011-python-3-8.patch' '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch' '013-Makefile.patch' - '014-iasl.patch' - '015-libglvnd-headers.patch' - '016-linux-5-4.patch' # The following patch and mount.vboxsf wrapper should be removed # once support for mainline-style options string gets upstreamed '101-vboxsf-automount.patch' 'mount.vboxsf') -sha256sums=('5e12b14f0c38bf195d9592d76a9e0a128df2d38cd77c26ce5b5488397715dd0c' +sha256sums=('49005ed94454f893fc3955e1e2b9607e85c300235cb983b39d1df2cfcf29f039' 'SKIP' - 'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec' + '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db' 'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c' 'e37712bcbbafbdee47230a962446d63b0ae882801a89931d93ad9e704e70ad4b' '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c' @@ -95,17 +90,12 @@ '94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21' '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce' 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f' - '2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac' - 'f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0' + '4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d' '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46' '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab' - '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc' - '3dccf97c482d3a0ba0f0aea82bd9cdbd53235bfd48f0178ff52cb98c2f8491f0' + '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491' '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024' 'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9' - '5ad14bd587031ac3dcadaeca2cc4d7b48a59ff09b03884b4fc2be5b1432a8237' - 'c756a8492750fef099c2c2df1d444e1b47368f91caf30612cc4287c55e408f4e' - 'e8736c0d7b19c9f8515a91ad9a2c31cb112dafc0e13128badd655f6bb1ce5ccb' 'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4' 'f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947') @@ -182,7 +172,7 @@ # libraries install -dm0755 "$pkgdir/usr/lib/virtualbox" install -m0755 *.so "$pkgdir/usr/lib/virtualbox" - install -m0644 *.rc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox" + install -m0644 *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox" ## setuid root binaries install -m4755 VBoxSDL VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox" ## other binaries @@ -190,6 +180,7 @@ # components install -dm0755 "$pkgdir/usr/lib/virtualbox/components" + rm components/VBoxREM.so # TODO: remove when dead link is fixed install -m0755 components/* -t "$pkgdir/usr/lib/virtualbox/components" # extensions packs @@ -290,7 +281,7 @@ # module loading local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf" install -Dm0644 /dev/null "$_p" - printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" > "$_p" + printf "vboxdrv\nvboxnetadp\nvboxnetflt\n" > "$_p" # starting vbox 5.1, dkms.conf file was dropped local _p="$pkgdir/usr/src/vboxhost-${pkgver}_OSE/dkms.conf" install -Dm0644 "$srcdir/$pkgname.conf" "$_p" @@ -354,8 +345,6 @@ install -m0644 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \ "$pkgdir"/etc/xdg/autostart/vboxclient.desktop install -d "$pkgdir/usr/lib/xorg/modules/dri" - install -m0755 VBoxOGL*.so "$pkgdir/usr/lib" - ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" install -m0755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so" popd # systemd stuff @@ -400,5 +389,3 @@ install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } - -# vim:set ts=4 sw=4 et: Modified: vboxreload =================================================================== --- vboxreload 2019-12-12 20:57:25 UTC (rev 537476) +++ vboxreload 2019-12-12 21:20:34 UTC (rev 537477) @@ -20,7 +20,7 @@ (( UID > 0 )) && { echo 'You must be root' >&2; exit 1; } -modules=(vboxnetadp vboxnetflt vboxpci vboxdrv) +modules=(vboxnetadp vboxnetflt vboxdrv) echo -n 'Unloading modules: ' for _m in "${modules[@]}"; do Modified: virtualbox-host-dkms.conf =================================================================== --- virtualbox-host-dkms.conf 2019-12-12 20:57:25 UTC (rev 537476) +++ virtualbox-host-dkms.conf 2019-12-12 21:20:34 UTC (rev 537477) @@ -29,7 +29,3 @@ BUILT_MODULE_NAME[2]="vboxnetadp" BUILT_MODULE_LOCATION[2]="vboxnetadp" DEST_MODULE_LOCATION[2]="/kernel/misc" - -BUILT_MODULE_NAME[3]="vboxpci" -BUILT_MODULE_LOCATION[3]="vboxpci" -DEST_MODULE_LOCATION[3]="/kernel/misc"