[arch-commits] Commit in virtualbox/repos (29 files)

Christian Hesse eworm at archlinux.org
Wed Sep 4 12:46:17 UTC 2019


    Date: Wednesday, September 4, 2019 @ 12:46:17
  Author: eworm
Revision: 508019

archrelease: copy trunk to community-testing-x86_64

Added:
  virtualbox/repos/community-testing-x86_64/
  virtualbox/repos/community-testing-x86_64/002-dri-driver-path.patch
    (from rev 508018, virtualbox/trunk/002-dri-driver-path.patch)
  virtualbox/repos/community-testing-x86_64/005-gsoap-build.patch
    (from rev 508018, virtualbox/trunk/005-gsoap-build.patch)
  virtualbox/repos/community-testing-x86_64/006-rdesktop-vrdp-keymap-path.patch
    (from rev 508018, virtualbox/trunk/006-rdesktop-vrdp-keymap-path.patch)
  virtualbox/repos/community-testing-x86_64/008-no-vboxvideo.patch
    (from rev 508018, virtualbox/trunk/008-no-vboxvideo.patch)
  virtualbox/repos/community-testing-x86_64/011-python-3-7.patch
    (from rev 508018, virtualbox/trunk/011-python-3-7.patch)
  virtualbox/repos/community-testing-x86_64/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch
    (from rev 508018, virtualbox/trunk/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch)
  virtualbox/repos/community-testing-x86_64/013-Makefile.patch
    (from rev 508018, virtualbox/trunk/013-Makefile.patch)
  virtualbox/repos/community-testing-x86_64/014-iasl.patch
    (from rev 508018, virtualbox/trunk/014-iasl.patch)
  virtualbox/repos/community-testing-x86_64/101-vboxsf-automount.patch
    (from rev 508018, virtualbox/trunk/101-vboxsf-automount.patch)
  virtualbox/repos/community-testing-x86_64/60-vboxdrv.rules
    (from rev 508018, virtualbox/trunk/60-vboxdrv.rules)
  virtualbox/repos/community-testing-x86_64/60-vboxguest.rules
    (from rev 508018, virtualbox/trunk/60-vboxguest.rules)
  virtualbox/repos/community-testing-x86_64/LocalConfig.kmk
    (from rev 508018, virtualbox/trunk/LocalConfig.kmk)
  virtualbox/repos/community-testing-x86_64/PKGBUILD
    (from rev 508018, virtualbox/trunk/PKGBUILD)
  virtualbox/repos/community-testing-x86_64/build.sh
    (from rev 508018, virtualbox/trunk/build.sh)
  virtualbox/repos/community-testing-x86_64/mount.vboxsf
    (from rev 508018, virtualbox/trunk/mount.vboxsf)
  virtualbox/repos/community-testing-x86_64/vboxreload
    (from rev 508018, virtualbox/trunk/vboxreload)
  virtualbox/repos/community-testing-x86_64/vboxservice-nox.service
    (from rev 508018, virtualbox/trunk/vboxservice-nox.service)
  virtualbox/repos/community-testing-x86_64/vboxservice.service
    (from rev 508018, virtualbox/trunk/vboxservice.service)
  virtualbox/repos/community-testing-x86_64/vboxweb.service
    (from rev 508018, virtualbox/trunk/vboxweb.service)
  virtualbox/repos/community-testing-x86_64/virtualbox-ext-vnc.install
    (from rev 508018, virtualbox/trunk/virtualbox-ext-vnc.install)
  virtualbox/repos/community-testing-x86_64/virtualbox-guest-dkms.conf
    (from rev 508018, virtualbox/trunk/virtualbox-guest-dkms.conf)
  virtualbox/repos/community-testing-x86_64/virtualbox-guest-dkms.install
    (from rev 508018, virtualbox/trunk/virtualbox-guest-dkms.install)
  virtualbox/repos/community-testing-x86_64/virtualbox-guest-utils.sysusers
    (from rev 508018, virtualbox/trunk/virtualbox-guest-utils.sysusers)
  virtualbox/repos/community-testing-x86_64/virtualbox-host-dkms.conf
    (from rev 508018, virtualbox/trunk/virtualbox-host-dkms.conf)
  virtualbox/repos/community-testing-x86_64/virtualbox-host-dkms.install
    (from rev 508018, virtualbox/trunk/virtualbox-host-dkms.install)
  virtualbox/repos/community-testing-x86_64/virtualbox-vboxsf-dkms.conf
    (from rev 508018, virtualbox/trunk/virtualbox-vboxsf-dkms.conf)
  virtualbox/repos/community-testing-x86_64/virtualbox.install
    (from rev 508018, virtualbox/trunk/virtualbox.install)
  virtualbox/repos/community-testing-x86_64/virtualbox.sysusers
    (from rev 508018, virtualbox/trunk/virtualbox.sysusers)

-----------------------------------------------------+
 002-dri-driver-path.patch                           |   30 +
 005-gsoap-build.patch                               |   11 
 006-rdesktop-vrdp-keymap-path.patch                 |   12 
 008-no-vboxvideo.patch                              |   12 
 011-python-3-7.patch                                |   13 
 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch |   14 
 013-Makefile.patch                                  |   44 +
 014-iasl.patch                                      |   73 +++
 101-vboxsf-automount.patch                          |   20 
 60-vboxdrv.rules                                    |    8 
 60-vboxguest.rules                                  |    2 
 LocalConfig.kmk                                     |   36 +
 PKGBUILD                                            |  401 ++++++++++++++++++
 build.sh                                            |    3 
 mount.vboxsf                                        |   17 
 vboxreload                                          |   37 +
 vboxservice-nox.service                             |   11 
 vboxservice.service                                 |   12 
 vboxweb.service                                     |   11 
 virtualbox-ext-vnc.install                          |   27 +
 virtualbox-guest-dkms.conf                          |   34 +
 virtualbox-guest-dkms.install                       |   12 
 virtualbox-guest-utils.sysusers                     |    1 
 virtualbox-host-dkms.conf                           |   35 +
 virtualbox-host-dkms.install                        |   12 
 virtualbox-vboxsf-dkms.conf                         |   10 
 virtualbox.install                                  |   12 
 virtualbox.sysusers                                 |    1 
 28 files changed, 911 insertions(+)

Copied: virtualbox/repos/community-testing-x86_64/002-dri-driver-path.patch (from rev 508018, virtualbox/trunk/002-dri-driver-path.patch)
===================================================================
--- community-testing-x86_64/002-dri-driver-path.patch	                        (rev 0)
+++ community-testing-x86_64/002-dri-driver-path.patch	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,30 @@
+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) \

Copied: virtualbox/repos/community-testing-x86_64/005-gsoap-build.patch (from rev 508018, virtualbox/trunk/005-gsoap-build.patch)
===================================================================
--- community-testing-x86_64/005-gsoap-build.patch	                        (rev 0)
+++ community-testing-x86_64/005-gsoap-build.patch	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,11 @@
+--- a/src/VBox/Main/webservice/Makefile.kmk	2013-11-21 19:00:46.812761628 +0100
++++ b/src/VBox/Main/webservice/Makefile.kmk	2016-08-18 15:16:05.803599026 +0100
+@@ -724,7 +724,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \
+ 		$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
+ 	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
+ 	$(RM) -f $@
+-	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
++	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
+ ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
+ 	$(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
+ 	$(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"

Copied: virtualbox/repos/community-testing-x86_64/006-rdesktop-vrdp-keymap-path.patch (from rev 508018, virtualbox/trunk/006-rdesktop-vrdp-keymap-path.patch)
===================================================================
--- community-testing-x86_64/006-rdesktop-vrdp-keymap-path.patch	                        (rev 0)
+++ community-testing-x86_64/006-rdesktop-vrdp-keymap-path.patch	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,12 @@
+# 2015 © Sébastien Luttringer
+--- a/src/VBox/RDP/client-1.8.4/Makefile.kmk
++++ b/src/VBox/RDP/client-1.8.4/Makefile.kmk
+@@ -41,7 +41,7 @@
+ 	EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \
+ 	HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \
+ 	HAVE_SYS_PARAM_H=1 HAVE_SYS_MOUNT_H=1 HAVE_STRUCT_STATVFS_F_NAMEMAX=1 \
+-	KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\" \
++	KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\" \
+ 	RDESKTOP=1
+ ifdef WITH_BIRD_VD_HACKS
+  rdesktop-vrdp_DEFS += WITH_BIRD_VD_HACKS

Copied: virtualbox/repos/community-testing-x86_64/008-no-vboxvideo.patch (from rev 508018, virtualbox/trunk/008-no-vboxvideo.patch)
===================================================================
--- community-testing-x86_64/008-no-vboxvideo.patch	                        (rev 0)
+++ community-testing-x86_64/008-no-vboxvideo.patch	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,12 @@
+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:39.879176964 +0100
+@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
+ 
+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
+  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
+- DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
++ DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS))
+  SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
+  vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+  vboxvideo_drv_system_CFLAGS := \

Copied: virtualbox/repos/community-testing-x86_64/011-python-3-7.patch (from rev 508018, virtualbox/trunk/011-python-3-7.patch)
===================================================================
--- community-testing-x86_64/011-python-3-7.patch	                        (rev 0)
+++ community-testing-x86_64/011-python-3-7.patch	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,13 @@
+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"
+   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

Copied: virtualbox/repos/community-testing-x86_64/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch (from rev 508018, virtualbox/trunk/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch)
===================================================================
--- community-testing-x86_64/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch	                        (rev 0)
+++ community-testing-x86_64/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,14 @@
+diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
+index 6ad7df3e..2f12c277 100644
+--- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
++++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
+@@ -162,6 +162,9 @@ static int vbglR3GuestCtrlMsgWaitFor(uint32_t idClient, uint32_t *pidMsg, uint32
+  */
+ DECL_NO_INLINE(static, bool) vbglR3GuestCtrlDetectPeekGetCancelSupport(uint32_t idClient)
+ {
++
++    return false;
++
+     /*
+      * Seems we get VINF_SUCCESS back from the host if we try unsupported
+      * guest control functions, so we need to supply some random message

Copied: virtualbox/repos/community-testing-x86_64/013-Makefile.patch (from rev 508018, virtualbox/trunk/013-Makefile.patch)
===================================================================
--- community-testing-x86_64/013-Makefile.patch	                        (rev 0)
+++ community-testing-x86_64/013-Makefile.patch	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,44 @@
+diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile
+index 18466b48..7c7de4e5 100644
+--- a/src/VBox/HostDrivers/linux/Makefile
++++ b/src/VBox/HostDrivers/linux/Makefile
+@@ -23,25 +23,25 @@
+ # terms and conditions of either the GPL or the CDDL or both.
+ #
+ 
+-ifneq ($(KERNELRELEASE),)
++ifneq ($(KBUILD_EXTMOD),)
+ 
+-# Building from kBuild (make -C <kernel_directory> M=`pwd`),
+-# or inside a kernel source tree.
++# Building from kBuild (make -C <kernel_directory> M=`pwd`).
++# KBUILD_EXTMOD is set to $(M) in this case.
+ 
+ obj-m = vboxdrv/
+-ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),)
++ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetflt/Makefile),)
+  obj-m += vboxnetflt/
+ endif
+-ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
++ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetadp/Makefile),)
+  obj-m += vboxnetadp/
+ endif
+-ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
++ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxpci/Makefile),)
+  obj-m += vboxpci/
+ endif
+ 
+-else # ! KERNELRELEASE
++else # ! KBUILD_EXTMOD
+ 
+-# convenience Makefile without KERNELRELEASE
++# convenience Makefile without KBUILD_EXTMOD
+ 
+ KBUILD_VERBOSE ?=
+ KERN_VER ?= $(shell uname -r)
+@@ -146,4 +146,4 @@ load: unload
+ 		fi; \
+ 	done
+ 
+-endif # ! KERNELRELEASE
++endif # ! KBUILD_EXTMOD

Copied: virtualbox/repos/community-testing-x86_64/014-iasl.patch (from rev 508018, virtualbox/trunk/014-iasl.patch)
===================================================================
--- community-testing-x86_64/014-iasl.patch	                        (rev 0)
+++ community-testing-x86_64/014-iasl.patch	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,73 @@
+--- "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
+     }

Copied: virtualbox/repos/community-testing-x86_64/101-vboxsf-automount.patch (from rev 508018, virtualbox/trunk/101-vboxsf-automount.patch)
===================================================================
--- community-testing-x86_64/101-vboxsf-automount.patch	                        (rev 0)
+++ community-testing-x86_64/101-vboxsf-automount.patch	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,20 @@
+This ghetto patch attempts to fix shared folder automounting for guests running
+Linux 4.16, and also suggests an alternative to mount.vboxsf.
+
+diff -uprb VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
+--- VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp	2018-02-26 17:57:30.000000000 +0200
++++ VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp	2018-04-07 21:00:05.785735622 +0300
+@@ -346,6 +346,13 @@ static int vbsvcAutoMountSharedFolder(co
+                       "vboxsf",
+                       fFlags,
+                       &mntinf);
++        if (r == -1 && errno == EINVAL)
++        {
++            /* Mainline vboxsf accepts regular mount opts. */
++            char mount_opts[1024];
++            snprintf(mount_opts, 1024, "gid=%d,dmode=0770,fmode=0770", mntinf.gid);
++            r = mount(pszShareName, pszMountPoint, "vboxsf", fFlags, mount_opts);
++        }
+         if (r == 0)
+         {
+             VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);

Copied: virtualbox/repos/community-testing-x86_64/60-vboxdrv.rules (from rev 508018, virtualbox/trunk/60-vboxdrv.rules)
===================================================================
--- community-testing-x86_64/60-vboxdrv.rules	                        (rev 0)
+++ community-testing-x86_64/60-vboxdrv.rules	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,8 @@
+KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
+KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0666"
+KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root", MODE="0600"
+
+SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"

Copied: virtualbox/repos/community-testing-x86_64/60-vboxguest.rules (from rev 508018, virtualbox/trunk/60-vboxguest.rules)
===================================================================
--- community-testing-x86_64/60-vboxguest.rules	                        (rev 0)
+++ community-testing-x86_64/60-vboxguest.rules	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,2 @@
+ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
+ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"

Copied: virtualbox/repos/community-testing-x86_64/LocalConfig.kmk (from rev 508018, virtualbox/trunk/LocalConfig.kmk)
===================================================================
--- community-testing-x86_64/LocalConfig.kmk	                        (rev 0)
+++ community-testing-x86_64/LocalConfig.kmk	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,36 @@
+# do not build test cases
+VBOX_WITH_TESTCASES :=
+VBOX_WITH_TESTSUITE :=
+VBOX_WITH_VALIDATIONKIT :=
+
+# no legacy X.org - use KMS
+VBOX_USE_SYSTEM_XORG_HEADERS = 1
+VBOX_NO_LEGACY_XORG_X11 = 1
+
+# archlinux path
+VBOX_WITH_ORIGIN :=
+VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
+VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
+VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox
+VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
+VBOX_BLD_PYTHON = python
+VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
+
+# do not fail on warning
+VBOX_GCC_WERR =
+VBOX_GCC_WARN =
+
+# fix gsoap missing zlib include and produce errors with --as-needed
+VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
+
+# use system xorg and gl headers
+VBOX_USE_SYSTEM_XORG_HEADERS = 1
+VBOX_USE_SYSTEM_GL_HEADERS = 1
+
+# no update request. update are handled via pacman
+VBOX_WITH_UPDATE_REQUEST := 0
+
+# build shared library
+VBOX_GUI_WITH_SHARED_LIBRARY = 1

Copied: virtualbox/repos/community-testing-x86_64/PKGBUILD (from rev 508018, virtualbox/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,401 @@
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=virtualbox
+pkgname=('virtualbox'
+         'virtualbox-host-dkms'
+         'virtualbox-guest-dkms'
+         'virtualbox-sdk'
+         'virtualbox-guest-utils'
+         'virtualbox-guest-utils-nox'
+         'virtualbox-ext-vnc')
+pkgver=6.0.12
+pkgrel=1
+_vboxsf_commit='87b9015c57dd7f226c768131bf8b4c0249de9835'
+arch=('x86_64')
+url='https://virtualbox.org/'
+license=('GPL' 'custom')
+makedepends=('alsa-lib'
+             'bin86'
+             'cdrkit'
+             'curl'
+             'dev86'
+             'device-mapper'
+             'git'
+             'glu'
+             'gsoap'
+             'iasl'
+             'jdk7-openjdk'
+             'libidl2'
+             'libpulse'
+             'libstdc++5'
+             'libvncserver'
+             'libvpx'
+             'libxcomposite'
+             'libxcursor'
+             'libxinerama'
+             'libxml2'
+             'libxmu'
+             'libxrandr'
+             'libxslt'
+             'libxtst'
+             'linux-headers'
+             'mesa'
+             'opus'
+             'python'
+             'qt5-base'
+             'qt5-x11extras'
+             'qt5-tools'
+             'sdl'
+             'sdl_ttf'
+             'vde2'
+             'xalan-c'
+             'xf86driproto'
+             'xorg-server-devel')
+makedepends_x86_64=('gcc-multilib' 'lib32-glibc')
+source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2"
+        # We need to build a modified version of vboxsf for Linux 4.16
+        # https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
+        "git+https://github.com/jwrdegoede/vboxsf#commit=$_vboxsf_commit"
+        'virtualbox-host-dkms.conf'
+        'virtualbox-guest-dkms.conf'
+        'virtualbox-vboxsf-dkms.conf'
+        'virtualbox.sysusers'
+        'virtualbox-guest-utils.sysusers'
+        '60-vboxdrv.rules'
+        '60-vboxguest.rules'
+        'LocalConfig.kmk'
+        'vboxservice.service'
+        '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-7.patch'
+        '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
+        '013-Makefile.patch'
+        '014-iasl.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=('c8878d1ad867461e6adfb82c22f15bf5d284e214e75f7b2c6bcd81854edeabc3'
+            'SKIP'
+            'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
+            'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
+            'e37712bcbbafbdee47230a962446d63b0ae882801a89931d93ad9e704e70ad4b'
+            '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
+            'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e'
+            '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
+            '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95'
+            '2be313b98bffde482aad93b00c419f1d5f7645fd9e6053175ffb0d925067f96a'
+            '94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21'
+            '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce'
+            'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
+            '2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac'
+            'f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0'
+            '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
+            '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab'
+            '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
+            '55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d'
+            '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
+            'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
+            '5ad14bd587031ac3dcadaeca2cc4d7b48a59ff09b03884b4fc2be5b1432a8237'
+            'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'
+            'f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947')
+
+prepare() {
+    cd "VirtualBox-$pkgver"
+
+    # apply patch from the source array (should be a pacman feature)
+    local filename
+    for filename in "${source[@]}"; do
+        if [[ "$filename" =~ \.patch$ ]]; then
+            msg2 "Applying patch ${filename##*/}"
+            patch -p1 -N -i "$srcdir/${filename##*/}"
+        fi
+    done
+
+    msg2 'Applying local config'
+    cp "$srcdir/LocalConfig.kmk" .
+
+    msg2 'Use our CFLAGS'
+    echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk
+}
+
+build() {
+    cd "VirtualBox-$pkgver"
+
+    msg2 'Build virtualbox'
+    ./configure \
+        --disable-docs \
+        --enable-webservice \
+        --enable-vde \
+        --enable-vnc \
+        --disable-kmods \
+        --with-makeself=/usr/bin/echo
+    # fake makeself binary to compile without nofatal
+    # makeself is used by linux installer. we don't need it.
+    source ./env.sh
+    kmk
+
+    msg2 'Build rdesktop-vrdp'
+    kmk -C src/VBox/RDP/client-1.8.4
+
+    msg2 'Build VNC extension pack'
+    kmk -C src/VBox/ExtPacks/VNC packing
+}
+
+package_virtualbox() {
+    pkgdesc='Powerful x86 virtualization for enterprise as well as home use'
+    depends=('glibc' 'openssl' 'curl' 'gcc-libs' 'libpng' 'python' 'sdl'
+             'libvpx' 'libxml2' 'procps-ng' 'shared-mime-info' 'zlib'
+             'libxcursor' 'libxinerama' 'libx11' 'libxext' 'libxmu' 'libxt'
+             'opus' 'qt5-base' 'qt5-x11extras' 'VIRTUALBOX-HOST-MODULES')
+    optdepends=('vde2: Virtual Distributed Ethernet support'
+                'virtualbox-guest-iso: Guest Additions CD image'
+                'virtualbox-ext-vnc: VNC server support'
+                'virtualbox-sdk: Developer kit')
+    backup=('etc/vbox/vbox.cfg')
+    replaces=('virtualbox-ose')
+    conflicts=('virtualbox-ose')
+    install=virtualbox.install
+
+    source "VirtualBox-$pkgver/env.sh"
+    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+
+    # binaries
+    install -dm0755 "$pkgdir/usr/bin"
+    install -m0755 VBox.sh "$pkgdir/usr/bin/VBox"
+    for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do
+        ln -sf VBox "$pkgdir/usr/bin/$i"
+        ln -sf VBox "$pkgdir/usr/bin/${i,,}"
+    done
+    install -m0755 VBoxTunctl "$pkgdir/usr/bin"
+    install -m0755 rdesktop-vrdp "$pkgdir/usr/bin"
+
+    # libraries
+    install -dm0755 "$pkgdir/usr/lib/virtualbox"
+    install -m0755 *.so "$pkgdir/usr/lib/virtualbox"
+    install -m0644 *.rc *.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
+    install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
+
+    # components
+    install -dm0755 "$pkgdir/usr/lib/virtualbox/components"
+    install -m0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
+
+    # extensions packs
+    ## as virtualbox install itself stuff in this directory, move it to /var and
+    ## trick it with a symlink
+    ## FIXME: trick is disabled for now
+    #install -dm0755 "$pkgdir/var/lib/virtualbox/extensions"
+    #install -dm0755 "$pkgdir/usr/share/virtualbox/extensions"
+    #ln -s ../../../var/lib/virtualbox/extensions "$pkgdir/usr/lib/virtualbox/ExtensionPacks"
+    install -dm0755 "$pkgdir/usr/lib/virtualbox/ExtensionPacks"
+
+    # languages
+    install -dm0755 "$pkgdir/usr/share/virtualbox/nls"
+    install -m0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
+
+    # rdesktop keymaps
+    install -dm0755 "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
+    install -m0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
+
+    # useless scripts
+    install -m0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
+
+    # icons
+    install -Dm0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
+
+    pushd icons >/dev/null
+    for i in *; do
+        install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
+        cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
+    done
+    popd >/dev/null
+
+    #desktop
+    install -Dm0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
+    install -Dm0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
+
+    #install configuration
+    install -dm0755 "$pkgdir/etc/vbox"
+    echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
+
+    # back to srcdir
+    cd "$srcdir"
+
+    #licence
+    install -Dm0644 VirtualBox-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+    # install systemd stuff
+    install -Dm0644 60-vboxdrv.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxdrv.rules"
+    install -Dm0644 vboxweb.service "$pkgdir/usr/lib/systemd/system/vboxweb.service"
+    install -Dm0644 virtualbox.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox.conf"
+
+    # install module reloading shortcut (with a symlink with default helper)
+    install -Dm0755 vboxreload "$pkgdir/usr/bin"
+    ln -s vboxreload "$pkgdir/usr/bin/rcvboxdrv"
+}
+
+package_virtualbox-sdk() {
+    pkgdesc='VirtualBox Software Developer Kit (SDK)'
+    depends=('python')
+
+    install -dm0755 "$pkgdir/usr/lib/virtualbox"
+
+    source "VirtualBox-$pkgver/env.sh"
+    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+
+    install -Dm0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
+    # python sdk
+    pushd sdk/installer
+    VBOX_INSTALL_PATH="/usr/lib/virtualbox" python vboxapisetup.py install --root "$pkgdir"
+    popd
+    cp -r sdk "$pkgdir/usr/lib/virtualbox"
+    rm -r "$pkgdir/usr/lib/virtualbox/sdk/installer"
+    # licence
+    install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+        "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_virtualbox-host-dkms() {
+    pkgdesc='VirtualBox Host kernel modules sources'
+    depends=('dkms' 'gcc' 'make')
+    replaces=('virtualbox-source'
+              'virtualbox-host-source'
+              'virtualbox-host-modules-lts')
+    conflicts=('virtualbox-source' 'virtualbox-host-source')
+    provides=('VIRTUALBOX-HOST-MODULES')
+    optdepends=('linux-headers: build modules against Arch kernel'
+                'linux-lts-headers: build modules against LTS kernel'
+                'linux-zen-headers: build modules against ZEN kernel')
+    install=virtualbox-host-dkms.install
+
+    install -dm0755 "$pkgdir/usr/src"
+    source "VirtualBox-$pkgver/env.sh"
+    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+    cp -r src "$pkgdir/usr/src/vboxhost-${pkgver}_OSE"
+    # licence
+    install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+        "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    # module loading
+    local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+    install -Dm0644 /dev/null "$_p"
+    printf "vboxdrv\nvboxpci\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"
+    sed -i "s, at VERSION@,$pkgver," "$_p"
+}
+
+package_virtualbox-guest-dkms() {
+    pkgdesc='VirtualBox Guest kernel modules sources'
+    depends=('dkms' 'gcc' 'make')
+    replaces=('virtualbox-archlinux-source'
+              'virtualbox-guest-source'
+              'virtualbox-guest-modules-lts')
+    provides=('VIRTUALBOX-GUEST-MODULES')
+    conflicts=('virtualbox-archlinux-source' 'virtualbox-guest-source')
+    optdepends=('linux-headers: build modules against Arch kernel'
+                'linux-lts-headers: build modules against LTS kernel'
+                'linux-zen-headers: build modules against ZEN kernel')
+    install=virtualbox-guest-dkms.install
+
+    install -dm0755 "$pkgdir/usr/src"
+    source "VirtualBox-$pkgver/env.sh"
+    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+    cp -r src "$pkgdir/usr/src/vboxguest-${pkgver}_OSE"
+    # licence
+    install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+        "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    # module loading
+    local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+    install -Dm0644 /dev/null "$_p"
+    printf "vboxguest\nvboxsf\nvboxvideo\n" > "$_p"
+    # starting vbox 5.1, dkms.conf file was dropped
+    local _p="$pkgdir/usr/src/vboxguest-${pkgver}_OSE/dkms.conf"
+    install -Dm0644 "$srcdir/$pkgname.conf" "$_p"
+    sed -i "s, at VERSION@,$pkgver," "$_p"
+
+    # vboxsf module for Linux 4.16 and later
+    install -d "$pkgdir/usr/src/vboxsf-${pkgver}_OSE"
+    cp -rT "$srcdir/vboxsf" "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf"
+    rm -rf "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf/.git"
+    echo "obj-m = vboxsf/" >"$pkgdir/usr/src/vboxsf-${pkgver}_OSE/Makefile"
+    local _p="$pkgdir/usr/src/vboxsf-${pkgver}_OSE/dkms.conf"
+    install -Dm0644 "$srcdir/virtualbox-vboxsf-dkms.conf" "$_p"
+    sed -i "s, at VERSION@,$pkgver," "$_p"
+}
+
+package_virtualbox-guest-utils() {
+    pkgdesc='VirtualBox Guest userspace utilities'
+    depends=('glibc' 'pam' 'libx11' 'libxcomposite'
+             'libxdamage' 'libxext' 'libxfixes' 'libxmu' 'libxt' 'xorg-xrandr'
+             'VIRTUALBOX-GUEST-MODULES')
+    replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
+    conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions' 'virtualbox-guest-utils-nox')
+
+    source "VirtualBox-$pkgver/env.sh"
+    pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+    install -d "$pkgdir/usr/bin"
+    install -m0755 VBoxClient VBoxControl VBoxService "$srcdir/mount.vboxsf" "$pkgdir/usr/bin"
+    install -Dm0755 mount.vboxsf "$pkgdir/usr/lib/virtualbox/mount.vboxsf"
+    install -m0755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+        "$pkgdir"/usr/bin/VBoxClient-all
+    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
+    install -Dm0644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
+    install -Dm0644 vboxservice.service "$pkgdir/usr/lib/systemd/system/vboxservice.service"
+    install -Dm0644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
+    # licence
+    install -Dm0644 VirtualBox-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_virtualbox-guest-utils-nox() {
+    pkgdesc='VirtualBox Guest userspace utilities without X support'
+    depends=('glibc' 'pam' 'VIRTUALBOX-GUEST-MODULES')
+    conflicts=('virtualbox-guest-utils')
+
+    source "VirtualBox-$pkgver/env.sh"
+    pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+    install -d "$pkgdir/usr/bin"
+    install -m0755 VBoxControl VBoxService "$srcdir/mount.vboxsf" "$pkgdir/usr/bin"
+    install -Dm0755 mount.vboxsf "$pkgdir/usr/lib/virtualbox/mount.vboxsf"
+    install -m0755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
+    popd
+    # systemd stuff
+    install -Dm0644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
+    install -Dm0644 vboxservice-nox.service "$pkgdir/usr/lib/systemd/system/vboxservice.service"
+    install -Dm0644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
+    # licence
+    install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+        "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_virtualbox-ext-vnc() {
+    pkgdesc='VirtualBox VNC extension pack'
+    depends=('virtualbox' 'libvncserver')
+    optdepends=('tigervnc: vnc client')
+    install=virtualbox-ext-vnc.install
+
+    source "VirtualBox-$pkgver/env.sh"
+    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages"
+    install -Dm0644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack"
+    # licence
+    install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+        "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=4 sw=4 et:

Copied: virtualbox/repos/community-testing-x86_64/build.sh (from rev 508018, virtualbox/trunk/build.sh)
===================================================================
--- community-testing-x86_64/build.sh	                        (rev 0)
+++ community-testing-x86_64/build.sh	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+multilib-build "$@" && extra-i686-build "$@"

Copied: virtualbox/repos/community-testing-x86_64/mount.vboxsf (from rev 508018, virtualbox/trunk/mount.vboxsf)
===================================================================
--- community-testing-x86_64/mount.vboxsf	                        (rev 0)
+++ community-testing-x86_64/mount.vboxsf	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Hopefully this works as intented, supporting both pre-4.16 and newer kernels
+# https://bugs.archlinux.org/task/58272#comment168687
+
+kver_major=$(uname -r | cut -d. -f1)
+kver_minor=$(uname -r | cut -d. -f2)
+
+if ((kver_major * 100 + kver_minor < 416)); then
+	exec /usr/lib/virtualbox/mount.vboxsf "$@"
+fi
+
+# mount(1) annoyingly prepends the current directory to the source
+name=${1#$PWD/}; shift
+
+# Mainline vboxsf accepts regular mount opts
+exec /usr/bin/mount -cit vboxsf "$name" "$@"

Copied: virtualbox/repos/community-testing-x86_64/vboxreload (from rev 508018, virtualbox/trunk/vboxreload)
===================================================================
--- community-testing-x86_64/vboxreload	                        (rev 0)
+++ community-testing-x86_64/vboxreload	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# vboxreload: shortcut to reload virtualbox host modules
+#
+# Copyright © 2016 Sébastien Luttringer
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+(( UID > 0 )) && { echo 'You must be root' >&2; exit 1; }
+
+modules=(vboxnetadp vboxnetflt vboxpci vboxdrv)
+
+echo -n 'Unloading modules: '
+for _m in "${modules[@]}"; do
+  lsmod|grep -q "$_m" && rmmod "$_m" && echo -n "$_m "
+done
+echo
+
+echo -n 'Loading modules: '
+for _m in "${modules[@]}"; do
+  modprobe "$_m" && echo -n "$_m "
+done
+echo
+
+# vim:set ts=2 sw=2 ai et:

Copied: virtualbox/repos/community-testing-x86_64/vboxservice-nox.service (from rev 508018, virtualbox/trunk/vboxservice-nox.service)
===================================================================
--- community-testing-x86_64/vboxservice-nox.service	                        (rev 0)
+++ community-testing-x86_64/vboxservice-nox.service	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,11 @@
+[Unit]
+Description=VirtualBox Guest Service
+ConditionVirtualization=oracle
+
+[Service]
+ExecStartPre=-/usr/bin/modprobe vboxguest
+ExecStartPre=-/usr/bin/modprobe vboxsf
+ExecStart=/usr/bin/VBoxService -f
+
+[Install]
+WantedBy=multi-user.target

Copied: virtualbox/repos/community-testing-x86_64/vboxservice.service (from rev 508018, virtualbox/trunk/vboxservice.service)
===================================================================
--- community-testing-x86_64/vboxservice.service	                        (rev 0)
+++ community-testing-x86_64/vboxservice.service	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,12 @@
+[Unit]
+Description=VirtualBox Guest Service
+ConditionVirtualization=oracle
+
+[Service]
+ExecStartPre=-/usr/bin/modprobe vboxguest
+ExecStartPre=-/usr/bin/modprobe vboxvideo
+ExecStartPre=-/usr/bin/modprobe vboxsf
+ExecStart=/usr/bin/VBoxService -f
+
+[Install]
+WantedBy=multi-user.target

Copied: virtualbox/repos/community-testing-x86_64/vboxweb.service (from rev 508018, virtualbox/trunk/vboxweb.service)
===================================================================
--- community-testing-x86_64/vboxweb.service	                        (rev 0)
+++ community-testing-x86_64/vboxweb.service	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,11 @@
+[Unit]
+Description=VirtualBox Web Service
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/vboxweb.pid
+ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid  --background
+
+[Install]
+WantedBy=multi-user.target

Copied: virtualbox/repos/community-testing-x86_64/virtualbox-ext-vnc.install (from rev 508018, virtualbox/trunk/virtualbox-ext-vnc.install)
===================================================================
--- community-testing-x86_64/virtualbox-ext-vnc.install	                        (rev 0)
+++ community-testing-x86_64/virtualbox-ext-vnc.install	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# arg 1:  the new package version
+post_install() {
+  EXTPACK="/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack"
+  ACCEPT="$(bsdtar --to-stdout -xf "${EXTPACK}" ./ExtPack-license.txt | sha256sum | head --bytes=64)"
+  VBoxManage extpack install "${EXTPACK}" --accept-license="${ACCEPT}" >/dev/null
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_upgrade() {
+  pre_remove "$2"
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install "$1"
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  VBoxManage extpack uninstall 'VNC' >/dev/null
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Copied: virtualbox/repos/community-testing-x86_64/virtualbox-guest-dkms.conf (from rev 508018, virtualbox/trunk/virtualbox-guest-dkms.conf)
===================================================================
--- community-testing-x86_64/virtualbox-guest-dkms.conf	                        (rev 0)
+++ community-testing-x86_64/virtualbox-guest-dkms.conf	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,34 @@
+## @file
+# Linux DKMS config script for the VirtualBox guest kernel modules
+#
+
+#
+# Copyright (C) 2006-2015 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PACKAGE_NAME="vboxguest"
+PACKAGE_VERSION=@VERSION at _OSE
+AUTOINSTALL=yes
+
+# Build only for kernels before Linux 4.16
+BUILD_EXCLUSIVE_KERNEL="^(4\.[0-9]\..*|4\.1[0-5]\..*|3\..*)"
+
+BUILT_MODULE_NAME[0]="vboxguest"
+BUILT_MODULE_LOCATION[0]="vboxguest"
+DEST_MODULE_LOCATION[0]="/kernel/misc"
+
+BUILT_MODULE_NAME[1]="vboxsf"
+BUILT_MODULE_LOCATION[1]="vboxsf"
+DEST_MODULE_LOCATION[1]="/kernel/misc"
+
+BUILT_MODULE_NAME[2]="vboxvideo"
+BUILT_MODULE_LOCATION[2]="vboxvideo"
+DEST_MODULE_LOCATION[2]="/kernel/misc"

Copied: virtualbox/repos/community-testing-x86_64/virtualbox-guest-dkms.install (from rev 508018, virtualbox/trunk/virtualbox-guest-dkms.install)
===================================================================
--- community-testing-x86_64/virtualbox-guest-dkms.install	                        (rev 0)
+++ community-testing-x86_64/virtualbox-guest-dkms.install	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if (( $(vercmp $2 5.0.16-3) < 0 )); then
+    echo '==> Since version 5.0.16-2 kernel modules are loaded at boot by systemd-modules-load.'
+    echo '==> Read modules-load.d man page to disable them.'
+  fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Copied: virtualbox/repos/community-testing-x86_64/virtualbox-guest-utils.sysusers (from rev 508018, virtualbox/trunk/virtualbox-guest-utils.sysusers)
===================================================================
--- community-testing-x86_64/virtualbox-guest-utils.sysusers	                        (rev 0)
+++ community-testing-x86_64/virtualbox-guest-utils.sysusers	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1 @@
+g vboxsf 109 -

Copied: virtualbox/repos/community-testing-x86_64/virtualbox-host-dkms.conf (from rev 508018, virtualbox/trunk/virtualbox-host-dkms.conf)
===================================================================
--- community-testing-x86_64/virtualbox-host-dkms.conf	                        (rev 0)
+++ community-testing-x86_64/virtualbox-host-dkms.conf	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,35 @@
+## @file
+# Linux DKMS config script for the VirtualBox guest kernel modules
+#
+
+#
+# Copyright (C) 2006-2015 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PACKAGE_NAME="vboxhost"
+PACKAGE_VERSION=@VERSION at _OSE
+AUTOINSTALL=yes
+
+BUILT_MODULE_NAME[0]="vboxdrv"
+BUILT_MODULE_LOCATION[0]="vboxdrv"
+DEST_MODULE_LOCATION[0]="/kernel/misc"
+
+BUILT_MODULE_NAME[1]="vboxnetflt"
+BUILT_MODULE_LOCATION[1]="vboxnetflt"
+DEST_MODULE_LOCATION[1]="/kernel/misc"
+
+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"

Copied: virtualbox/repos/community-testing-x86_64/virtualbox-host-dkms.install (from rev 508018, virtualbox/trunk/virtualbox-host-dkms.install)
===================================================================
--- community-testing-x86_64/virtualbox-host-dkms.install	                        (rev 0)
+++ community-testing-x86_64/virtualbox-host-dkms.install	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if (( $(vercmp $2 5.0.16-3) < 0 )); then
+    echo '==> Since version 5.0.16-2 kernel modules are loaded at boot by systemd-modules-load.'
+    echo '==> Read modules-load.d man page to disable them.'
+  fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Copied: virtualbox/repos/community-testing-x86_64/virtualbox-vboxsf-dkms.conf (from rev 508018, virtualbox/trunk/virtualbox-vboxsf-dkms.conf)
===================================================================
--- community-testing-x86_64/virtualbox-vboxsf-dkms.conf	                        (rev 0)
+++ community-testing-x86_64/virtualbox-vboxsf-dkms.conf	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,10 @@
+PACKAGE_NAME="vboxsf"
+PACKAGE_VERSION=@VERSION at _OSE
+AUTOINSTALL=yes
+
+# Build only for Linux 4.16 and later (until it gets upstreamed...)
+BUILD_EXCLUSIVE_KERNEL="^(4\.(1[6-9]|2[0-9])\..*|5\..*)"
+
+BUILT_MODULE_NAME[0]="vboxsf"
+BUILT_MODULE_LOCATION[0]="vboxsf"
+DEST_MODULE_LOCATION[0]="/kernel/misc"

Copied: virtualbox/repos/community-testing-x86_64/virtualbox.install (from rev 508018, virtualbox/trunk/virtualbox.install)
===================================================================
--- community-testing-x86_64/virtualbox.install	                        (rev 0)
+++ community-testing-x86_64/virtualbox.install	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if (( $(vercmp $2 5.0.16-1) < 0 )); then
+    echo '==> Since version 5.0.14-2 kernel modules are provided via dkms'
+    echo '==> Check you have the headers matching your kernel installed'
+  fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Copied: virtualbox/repos/community-testing-x86_64/virtualbox.sysusers (from rev 508018, virtualbox/trunk/virtualbox.sysusers)
===================================================================
--- community-testing-x86_64/virtualbox.sysusers	                        (rev 0)
+++ community-testing-x86_64/virtualbox.sysusers	2019-09-04 12:46:17 UTC (rev 508019)
@@ -0,0 +1 @@
+g vboxusers 108 -


More information about the arch-commits mailing list