Date: Wednesday, April 1, 2020 @ 11:57:37 Author: eworm Revision: 608825
archrelease: copy trunk to community-x86_64 Added: virtualbox/repos/community-x86_64/001-disable-update.patch (from rev 608824, virtualbox/trunk/001-disable-update.patch) virtualbox/repos/community-x86_64/005-gsoap-build.patch (from rev 608824, virtualbox/trunk/005-gsoap-build.patch) virtualbox/repos/community-x86_64/006-rdesktop-vrdp-keymap-path.patch (from rev 608824, virtualbox/trunk/006-rdesktop-vrdp-keymap-path.patch) virtualbox/repos/community-x86_64/008-no-vboxvideo.patch (from rev 608824, virtualbox/trunk/008-no-vboxvideo.patch) virtualbox/repos/community-x86_64/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch (from rev 608824, virtualbox/trunk/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch) virtualbox/repos/community-x86_64/013-Makefile.patch (from rev 608824, virtualbox/trunk/013-Makefile.patch) virtualbox/repos/community-x86_64/014-vboxclient.patch (from rev 608824, virtualbox/trunk/014-vboxclient.patch) virtualbox/repos/community-x86_64/015-linux-5.6.patch (from rev 608824, virtualbox/trunk/015-linux-5.6.patch) virtualbox/repos/community-x86_64/101-vboxsf-automount.patch (from rev 608824, virtualbox/trunk/101-vboxsf-automount.patch) virtualbox/repos/community-x86_64/60-vboxdrv.rules (from rev 608824, virtualbox/trunk/60-vboxdrv.rules) virtualbox/repos/community-x86_64/60-vboxguest.rules (from rev 608824, virtualbox/trunk/60-vboxguest.rules) virtualbox/repos/community-x86_64/LocalConfig.kmk (from rev 608824, virtualbox/trunk/LocalConfig.kmk) virtualbox/repos/community-x86_64/PKGBUILD (from rev 608824, virtualbox/trunk/PKGBUILD) virtualbox/repos/community-x86_64/build.sh (from rev 608824, virtualbox/trunk/build.sh) virtualbox/repos/community-x86_64/mount.vboxsf (from rev 608824, virtualbox/trunk/mount.vboxsf) virtualbox/repos/community-x86_64/vboxreload (from rev 608824, virtualbox/trunk/vboxreload) virtualbox/repos/community-x86_64/vboxservice-nox.service (from rev 608824, virtualbox/trunk/vboxservice-nox.service) virtualbox/repos/community-x86_64/vboxservice.service (from rev 608824, virtualbox/trunk/vboxservice.service) virtualbox/repos/community-x86_64/vboxweb.service (from rev 608824, virtualbox/trunk/vboxweb.service) virtualbox/repos/community-x86_64/virtualbox-ext-vnc.install (from rev 608824, virtualbox/trunk/virtualbox-ext-vnc.install) virtualbox/repos/community-x86_64/virtualbox-guest-dkms.conf (from rev 608824, virtualbox/trunk/virtualbox-guest-dkms.conf) virtualbox/repos/community-x86_64/virtualbox-guest-dkms.install (from rev 608824, virtualbox/trunk/virtualbox-guest-dkms.install) virtualbox/repos/community-x86_64/virtualbox-guest-utils.sysusers (from rev 608824, virtualbox/trunk/virtualbox-guest-utils.sysusers) virtualbox/repos/community-x86_64/virtualbox-host-dkms.conf (from rev 608824, virtualbox/trunk/virtualbox-host-dkms.conf) virtualbox/repos/community-x86_64/virtualbox-host-dkms.install (from rev 608824, virtualbox/trunk/virtualbox-host-dkms.install) virtualbox/repos/community-x86_64/virtualbox-vboxsf-dkms.conf (from rev 608824, virtualbox/trunk/virtualbox-vboxsf-dkms.conf) virtualbox/repos/community-x86_64/virtualbox.install (from rev 608824, virtualbox/trunk/virtualbox.install) virtualbox/repos/community-x86_64/virtualbox.sysusers (from rev 608824, virtualbox/trunk/virtualbox.sysusers) Deleted: virtualbox/repos/community-x86_64/001-disable-update.patch virtualbox/repos/community-x86_64/005-gsoap-build.patch virtualbox/repos/community-x86_64/006-rdesktop-vrdp-keymap-path.patch virtualbox/repos/community-x86_64/008-no-vboxvideo.patch virtualbox/repos/community-x86_64/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch virtualbox/repos/community-x86_64/013-Makefile.patch virtualbox/repos/community-x86_64/014-vboxclient.patch virtualbox/repos/community-x86_64/101-vboxsf-automount.patch virtualbox/repos/community-x86_64/60-vboxdrv.rules virtualbox/repos/community-x86_64/60-vboxguest.rules virtualbox/repos/community-x86_64/LocalConfig.kmk virtualbox/repos/community-x86_64/PKGBUILD virtualbox/repos/community-x86_64/build.sh virtualbox/repos/community-x86_64/mount.vboxsf virtualbox/repos/community-x86_64/vboxreload virtualbox/repos/community-x86_64/vboxservice-nox.service virtualbox/repos/community-x86_64/vboxservice.service virtualbox/repos/community-x86_64/vboxweb.service virtualbox/repos/community-x86_64/virtualbox-ext-vnc.install virtualbox/repos/community-x86_64/virtualbox-guest-dkms.conf virtualbox/repos/community-x86_64/virtualbox-guest-dkms.install virtualbox/repos/community-x86_64/virtualbox-guest-utils.sysusers virtualbox/repos/community-x86_64/virtualbox-host-dkms.conf virtualbox/repos/community-x86_64/virtualbox-host-dkms.install virtualbox/repos/community-x86_64/virtualbox-vboxsf-dkms.conf virtualbox/repos/community-x86_64/virtualbox.install virtualbox/repos/community-x86_64/virtualbox.sysusers -----------------------------------------------------+ 001-disable-update.patch | 26 005-gsoap-build.patch | 22 006-rdesktop-vrdp-keymap-path.patch | 24 008-no-vboxvideo.patch | 24 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch | 28 013-Makefile.patch | 88 - 014-vboxclient.patch | 140 +-- 015-linux-5.6.patch | 229 +++++ 101-vboxsf-automount.patch | 40 60-vboxdrv.rules | 16 60-vboxguest.rules | 4 LocalConfig.kmk | 72 - PKGBUILD | 794 +++++++++--------- build.sh | 6 mount.vboxsf | 34 vboxreload | 74 - vboxservice-nox.service | 22 vboxservice.service | 24 vboxweb.service | 22 virtualbox-ext-vnc.install | 54 - virtualbox-guest-dkms.conf | 68 - virtualbox-guest-dkms.install | 24 virtualbox-guest-utils.sysusers | 2 virtualbox-host-dkms.conf | 62 - virtualbox-host-dkms.install | 24 virtualbox-vboxsf-dkms.conf | 20 virtualbox.install | 24 virtualbox.sysusers | 2 28 files changed, 1100 insertions(+), 869 deletions(-) Deleted: 001-disable-update.patch =================================================================== --- 001-disable-update.patch 2020-04-01 11:57:10 UTC (rev 608824) +++ 001-disable-update.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,13 +0,0 @@ -diff --git a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp -index da373c92..18fb69a7 100644 ---- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp -@@ -2349,7 +2349,7 @@ QString UIExtraDataManager::preventBetaBuildWarningForVersion() - bool UIExtraDataManager::applicationUpdateEnabled() - { - /* 'True' unless 'restriction' feature allowed: */ -- return !isFeatureAllowed(GUI_PreventApplicationUpdate); -+ return false; - } - - QString UIExtraDataManager::applicationUpdateData() Copied: virtualbox/repos/community-x86_64/001-disable-update.patch (from rev 608824, virtualbox/trunk/001-disable-update.patch) =================================================================== --- 001-disable-update.patch (rev 0) +++ 001-disable-update.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -0,0 +1,13 @@ +diff --git a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +index da373c92..18fb69a7 100644 +--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +@@ -2349,7 +2349,7 @@ QString UIExtraDataManager::preventBetaBuildWarningForVersion() + bool UIExtraDataManager::applicationUpdateEnabled() + { + /* 'True' unless 'restriction' feature allowed: */ +- return !isFeatureAllowed(GUI_PreventApplicationUpdate); ++ return false; + } + + QString UIExtraDataManager::applicationUpdateData() Deleted: 005-gsoap-build.patch =================================================================== --- 005-gsoap-build.patch 2020-04-01 11:57:10 UTC (rev 608824) +++ 005-gsoap-build.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,11 +0,0 @@ ---- 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-x86_64/005-gsoap-build.patch (from rev 608824, virtualbox/trunk/005-gsoap-build.patch) =================================================================== --- 005-gsoap-build.patch (rev 0) +++ 005-gsoap-build.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -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" Deleted: 006-rdesktop-vrdp-keymap-path.patch =================================================================== --- 006-rdesktop-vrdp-keymap-path.patch 2020-04-01 11:57:10 UTC (rev 608824) +++ 006-rdesktop-vrdp-keymap-path.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,12 +0,0 @@ -# 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-x86_64/006-rdesktop-vrdp-keymap-path.patch (from rev 608824, virtualbox/trunk/006-rdesktop-vrdp-keymap-path.patch) =================================================================== --- 006-rdesktop-vrdp-keymap-path.patch (rev 0) +++ 006-rdesktop-vrdp-keymap-path.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -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 Deleted: 008-no-vboxvideo.patch =================================================================== --- 008-no-vboxvideo.patch 2020-04-01 11:57:10 UTC (rev 608824) +++ 008-no-vboxvideo.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,12 +0,0 @@ -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 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-x86_64/008-no-vboxvideo.patch (from rev 608824, virtualbox/trunk/008-no-vboxvideo.patch) =================================================================== --- 008-no-vboxvideo.patch (rev 0) +++ 008-no-vboxvideo.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -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 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 := \ Deleted: 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch =================================================================== --- 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch 2020-04-01 11:57:10 UTC (rev 608824) +++ 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,14 +0,0 @@ -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-x86_64/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch (from rev 608824, virtualbox/trunk/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch) =================================================================== --- 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch (rev 0) +++ 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -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 Deleted: 013-Makefile.patch =================================================================== --- 013-Makefile.patch 2020-04-01 11:57:10 UTC (rev 608824) +++ 013-Makefile.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,44 +0,0 @@ -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-x86_64/013-Makefile.patch (from rev 608824, virtualbox/trunk/013-Makefile.patch) =================================================================== --- 013-Makefile.patch (rev 0) +++ 013-Makefile.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -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 Deleted: 014-vboxclient.patch =================================================================== --- 014-vboxclient.patch 2020-04-01 11:57:10 UTC (rev 608824) +++ 014-vboxclient.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,70 +0,0 @@ ---- a/src/VBox/Additions/x11/VBoxClient/clipboard.cpp -+++ b/src/VBox/Additions/x11/VBoxClient/clipboard.cpp -@@ -107,7 +107,7 @@ - else - #endif - { -- uint32_t cbData = _4K; /** @ŧodo Make this dynamic. */ -+ uint32_t cbData = _4K; /** @todo Make this dynamic. */ - void *pvData = RTMemAlloc(cbData); - if (pvData) - { -@@ -215,7 +215,6 @@ - * - * @returns VBox status code. - */ --#if 0 - static int vboxClipboardConnect(void) - { - LogFlowFuncEnter(); -@@ -245,7 +244,6 @@ - LogFlowFuncLeaveRC(rc); - return rc; - } --#endif - - /** - * The main loop of our clipboard reader. -@@ -469,7 +467,7 @@ - RT_NOREF(ppInterface, fDaemonised); - - /* Initialise the guest library. */ -- int rc = 0; //vboxClipboardConnect(); -+ int rc = vboxClipboardConnect(); - if (RT_SUCCESS(rc)) - { - #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE -@@ -477,10 +475,8 @@ - if (RT_SUCCESS(rc)) - { - #endif -- RTThreadSleep(60 * 1000); -+ rc = vboxClipboardMain(); - -- //rc = vboxClipboardMain(); -- - #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE - int rc2 = vboxClipboardFUSEStop(); - if (RT_SUCCESS(rc)) ---- a/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp -+++ b/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp -@@ -100,16 +100,19 @@ static void x11Connect(struct X11CONTEXT - { - XCloseDisplay(pContext->pDisplay); - pContext->pDisplay = NULL; -+ return; - } - if (!XRRQueryExtension(pContext->pDisplay, &pContext->hRandREventBase, &pContext->hRandRErrorBase)) - { - XCloseDisplay(pContext->pDisplay); - pContext->pDisplay = NULL; -+ return; - } - if (!XRRQueryVersion(pContext->pDisplay, &pContext->hRandRMajor, &pContext->hRandRMinor)) - { - XCloseDisplay(pContext->pDisplay); - pContext->pDisplay = NULL; -+ return; - } - pContext->rootWindow = DefaultRootWindow(pContext->pDisplay); - } Copied: virtualbox/repos/community-x86_64/014-vboxclient.patch (from rev 608824, virtualbox/trunk/014-vboxclient.patch) =================================================================== --- 014-vboxclient.patch (rev 0) +++ 014-vboxclient.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -0,0 +1,70 @@ +--- a/src/VBox/Additions/x11/VBoxClient/clipboard.cpp ++++ b/src/VBox/Additions/x11/VBoxClient/clipboard.cpp +@@ -107,7 +107,7 @@ + else + #endif + { +- uint32_t cbData = _4K; /** @ŧodo Make this dynamic. */ ++ uint32_t cbData = _4K; /** @todo Make this dynamic. */ + void *pvData = RTMemAlloc(cbData); + if (pvData) + { +@@ -215,7 +215,6 @@ + * + * @returns VBox status code. + */ +-#if 0 + static int vboxClipboardConnect(void) + { + LogFlowFuncEnter(); +@@ -245,7 +244,6 @@ + LogFlowFuncLeaveRC(rc); + return rc; + } +-#endif + + /** + * The main loop of our clipboard reader. +@@ -469,7 +467,7 @@ + RT_NOREF(ppInterface, fDaemonised); + + /* Initialise the guest library. */ +- int rc = 0; //vboxClipboardConnect(); ++ int rc = vboxClipboardConnect(); + if (RT_SUCCESS(rc)) + { + #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE +@@ -477,10 +475,8 @@ + if (RT_SUCCESS(rc)) + { + #endif +- RTThreadSleep(60 * 1000); ++ rc = vboxClipboardMain(); + +- //rc = vboxClipboardMain(); +- + #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE + int rc2 = vboxClipboardFUSEStop(); + if (RT_SUCCESS(rc)) +--- a/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp ++++ b/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp +@@ -100,16 +100,19 @@ static void x11Connect(struct X11CONTEXT + { + XCloseDisplay(pContext->pDisplay); + pContext->pDisplay = NULL; ++ return; + } + if (!XRRQueryExtension(pContext->pDisplay, &pContext->hRandREventBase, &pContext->hRandRErrorBase)) + { + XCloseDisplay(pContext->pDisplay); + pContext->pDisplay = NULL; ++ return; + } + if (!XRRQueryVersion(pContext->pDisplay, &pContext->hRandRMajor, &pContext->hRandRMinor)) + { + XCloseDisplay(pContext->pDisplay); + pContext->pDisplay = NULL; ++ return; + } + pContext->rootWindow = DefaultRootWindow(pContext->pDisplay); + } Copied: virtualbox/repos/community-x86_64/015-linux-5.6.patch (from rev 608824, virtualbox/trunk/015-linux-5.6.patch) =================================================================== --- 015-linux-5.6.patch (rev 0) +++ 015-linux-5.6.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -0,0 +1,229 @@ +Index: a/include/iprt/time.h +=================================================================== +--- a/include/iprt/time.h (revision 82968) ++++ a/include/iprt/time.h (revision 83471) +@@ -359,6 +359,12 @@ + /* PORTME: Add struct timeval guard macro here. */ + #if defined(RTTIME_INCL_TIMEVAL) || defined(_STRUCT_TIMEVAL) || defined(_SYS__TIMEVAL_H_) || defined(_SYS_TIME_H) || defined(_TIMEVAL) || defined(_LINUX_TIME_H) \ + || (defined(RT_OS_NETBSD) && defined(_SYS_TIME_H_)) ++/* ++ * Starting with Linux kernel version 5.6-rc3, the struct timeval is no longer ++ * available to kernel code and must not be used in kernel code. ++ * Only 64-bit time-interfaces are allowed into the kernel. ++ */ ++# if defined(RT_OS_LINUX) && (!defined(__KERNEL__) || !defined(_LINUX_TIME64_H)) + /** + * Gets the time as POSIX timeval. + * +@@ -392,6 +398,7 @@ + { + return RTTimeSpecAddMicro(RTTimeSpecSetSeconds(pTime, pTimeval->tv_sec), pTimeval->tv_usec); + } ++# endif /* RT_OS_LINUX ... */ + #endif /* various ways of detecting struct timeval */ + + +@@ -431,15 +438,19 @@ + { + return RTTimeSpecAddNano(RTTimeSpecSetSeconds(pTime, pTimespec->tv_sec), pTimespec->tv_nsec); + } +- +- +-# ifdef _LINUX_TIME64_H ++#endif /* various ways of detecting struct timespec */ ++ ++#if defined(RT_OS_LINUX) && defined(_LINUX_TIME64_H) ++/* ++ * Starting with Linux kernel version 5.6-rc3, the _STRUCT_TIMESPEC is only defined ++ * under !__KERNEL__ guard and _LINUX_TIME64_H does not define a corresponding ++ * _STRUCT_TIMESPEC64. Only 64-bit time-interfaces are now allowed into the kernel. ++ */ + DECLINLINE(PRTTIMESPEC) RTTimeSpecSetTimespec64(PRTTIMESPEC pTime, const struct timespec64 *pTimeval) + { + return RTTimeSpecAddNano(RTTimeSpecSetSeconds(pTime, pTimeval->tv_sec), pTimeval->tv_nsec); + } +-# endif +-#endif /* various ways of detecting struct timespec */ ++#endif /* RT_OS_LINUX && _LINUX_TIME64_H */ + + + +Index: a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +=================================================================== +--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (revision 82968) ++++ a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (revision 83471) +@@ -1461,9 +1461,19 @@ + * MMIO / physical memory. + */ + Assert(pMemLnxToMap->Core.enmType == RTR0MEMOBJTYPE_PHYS && !pMemLnxToMap->Core.u.Phys.fAllocated); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) ++ /* ++ * ioremap() defaults to no caching since the 2.6 kernels. ++ * ioremap_nocache() has been removed finally in 5.6-rc1. ++ */ ++ pMemLnx->Core.pv = pMemLnxToMap->Core.u.Phys.uCachePolicy == RTMEM_CACHE_POLICY_MMIO ++ ? ioremap(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub) ++ : ioremap_cache(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub); ++#else /* KERNEL_VERSION < 2.6.25 */ + pMemLnx->Core.pv = pMemLnxToMap->Core.u.Phys.uCachePolicy == RTMEM_CACHE_POLICY_MMIO + ? ioremap_nocache(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub) + : ioremap(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub); ++#endif /* KERNEL_VERSION < 2.6.25 */ + if (pMemLnx->Core.pv) + { + /** @todo fix protection. */ +Index: a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c +=================================================================== +--- a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c (revision 82968) ++++ a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c (revision 83471) +@@ -38,12 +38,24 @@ + + DECLINLINE(uint64_t) rtTimeGetSystemNanoTS(void) + { +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16) /* This must match timer-r0drv-linux.c! */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ /* ++ * Starting with kernel version 5.6-rc3 only 64-bit time interfaces ++ * are allowed in the kernel. ++ */ ++ uint64_t u64; ++ struct timespec64 Ts = { 0, 0 }; ++ ++ ktime_get_ts64(&Ts); ++ u64 = Ts.tv_sec * RT_NS_1SEC_64 + Ts.tv_nsec; ++ return u64; ++ ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16) /* This must match timer-r0drv-linux.c! */ + /* + * Use ktime_get_ts, this is also what clock_gettime(CLOCK_MONOTONIC,) is using. + */ + uint64_t u64; +- struct timespec Ts; ++ struct timespec Ts = { 0, 0 }; + ktime_get_ts(&Ts); + u64 = Ts.tv_sec * RT_NS_1SEC_64 + Ts.tv_nsec; + return u64; +Index: a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +=================================================================== +--- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c (revision 82968) ++++ a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c (revision 83471) +@@ -842,15 +842,27 @@ + rcLnx = pci_request_region(pPciDev, iRegion, "vboxpci"); + if (!rcLnx) + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) ++ /* ++ * ioremap() defaults to no caching since the 2.6 kernels. ++ * ioremap_nocache() has been removed finally in 5.6-rc1. ++ */ ++ RTR0PTR R0PtrMapping = ioremap(pci_resource_start(pPciDev, iRegion), ++ pci_resource_len(pPciDev, iRegion)); ++#else /* KERNEL_VERSION < 2.6.25 */ + /* For now no caching, try to optimize later. */ + RTR0PTR R0PtrMapping = ioremap_nocache(pci_resource_start(pPciDev, iRegion), + pci_resource_len(pPciDev, iRegion)); +- ++#endif /* KERNEL_VERSION < 2.6.25 */ + if (R0PtrMapping != NIL_RTR0PTR) + pIns->aRegionR0Mapping[iRegion] = R0PtrMapping; + else + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) ++ vbpci_printk(KERN_DEBUG, pPciDev, "ioremap() failed\n"); ++#else + vbpci_printk(KERN_DEBUG, pPciDev, "ioremap_nocache() failed\n"); ++#endif + pci_release_region(pPciDev, iRegion); + rc = VERR_MAP_FAILED; + } +Index: a/include/iprt/time.h +=================================================================== +--- a/include/iprt/time.h (revision 83471) ++++ a/include/iprt/time.h (revision 83473) +@@ -357,14 +357,18 @@ + + + /* PORTME: Add struct timeval guard macro here. */ +-#if defined(RTTIME_INCL_TIMEVAL) || defined(_STRUCT_TIMEVAL) || defined(_SYS__TIMEVAL_H_) || defined(_SYS_TIME_H) || defined(_TIMEVAL) || defined(_LINUX_TIME_H) \ +- || (defined(RT_OS_NETBSD) && defined(_SYS_TIME_H_)) + /* + * Starting with Linux kernel version 5.6-rc3, the struct timeval is no longer + * available to kernel code and must not be used in kernel code. + * Only 64-bit time-interfaces are allowed into the kernel. + */ +-# if defined(RT_OS_LINUX) && (!defined(__KERNEL__) || !defined(_LINUX_TIME64_H)) ++#if defined(RT_OS_LINUX) && (defined(__KERNEL__) || defined(_LINUX_TIME64_H)) ++#define RTTIME_NO_TIMEVAL ++#endif ++#if !defined(RTTIME_NO_TIMEVAL) \ ++ && (defined(RTTIME_INCL_TIMEVAL) || defined(_STRUCT_TIMEVAL) || defined(_SYS__TIMEVAL_H_) \ ++ || defined(_SYS_TIME_H) || defined(_TIMEVAL) || defined(_LINUX_TIME_H) \ ++ || (defined(RT_OS_NETBSD) && defined(_SYS_TIME_H_))) + /** + * Gets the time as POSIX timeval. + * +@@ -398,7 +402,6 @@ + { + return RTTimeSpecAddMicro(RTTimeSpecSetSeconds(pTime, pTimeval->tv_sec), pTimeval->tv_usec); + } +-# endif /* RT_OS_LINUX ... */ + #endif /* various ways of detecting struct timeval */ + + +Index: a/include/iprt/time.h +=================================================================== +--- a/include/iprt/time.h (revision 83473) ++++ a/include/iprt/time.h (revision 83484) +@@ -406,8 +406,20 @@ + + + /* PORTME: Add struct timespec guard macro here. */ +-#if defined(RTTIME_INCL_TIMESPEC) || defined(_STRUCT_TIMESPEC) || defined(_SYS__TIMESPEC_H_) || defined(TIMEVAL_TO_TIMESPEC) || defined(_TIMESPEC) \ +- || (defined(RT_OS_NETBSD) && defined(_SYS_TIME_H_)) ++/* ++ * Starting with Linux kernel version 5.6-rc3, the _STRUCT_TIMESPEC is only defined ++ * under !__KERNEL__ guard and _LINUX_TIME64_H does not define a corresponding ++ * _STRUCT_TIMESPEC64. Only 64-bit time-interfaces are now allowed into the kernel. ++ * We have to keep it for __KERNEL__ though to support older guest kernels (2.6.X) ++ * without _LINUX_TIME64_H. ++ */ ++#if defined(RT_OS_LINUX) && defined(_LINUX_TIME64_H) ++#define RTTIME_NO_TIMESPEC ++#endif ++#if !defined(RTTIME_NO_TIMESPEC) \ ++ && (defined(RTTIME_INCL_TIMESPEC) || defined(_STRUCT_TIMESPEC) || defined(_SYS__TIMESPEC_H_) \ ++ || defined(TIMEVAL_TO_TIMESPEC) || defined(_TIMESPEC) \ ++ || (defined(RT_OS_NETBSD) && defined(_SYS_TIME_H_))) + /** + * Gets the time as POSIX timespec. + * +@@ -443,12 +455,7 @@ + } + #endif /* various ways of detecting struct timespec */ + +-#if defined(RT_OS_LINUX) && defined(_LINUX_TIME64_H) +-/* +- * Starting with Linux kernel version 5.6-rc3, the _STRUCT_TIMESPEC is only defined +- * under !__KERNEL__ guard and _LINUX_TIME64_H does not define a corresponding +- * _STRUCT_TIMESPEC64. Only 64-bit time-interfaces are now allowed into the kernel. +- */ ++#if defined(RTTIME_NO_TIMESPEC) + DECLINLINE(PRTTIMESPEC) RTTimeSpecSetTimespec64(PRTTIMESPEC pTime, const struct timespec64 *pTimeval) + { + return RTTimeSpecAddNano(RTTimeSpecSetSeconds(pTime, pTimeval->tv_sec), pTimeval->tv_nsec); +Index: a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c +=================================================================== +--- a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c (revision 83471) ++++ a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c (revision 83484) +@@ -194,9 +194,9 @@ + IPRT_LINUX_RESTORE_EFL_AC(); + # ifdef _LINUX_TIME64_H + return RTTimeSpecSetTimespec64(pTime, &Ts); +-#else ++# else + return RTTimeSpecSetTimespec(pTime, &Ts); +-#endif ++# endif + #else /* < 2.6.16 */ + struct timeval Tv; + do_gettimeofday(&Tv); Deleted: 101-vboxsf-automount.patch =================================================================== --- 101-vboxsf-automount.patch 2020-04-01 11:57:10 UTC (rev 608824) +++ 101-vboxsf-automount.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,20 +0,0 @@ -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-x86_64/101-vboxsf-automount.patch (from rev 608824, virtualbox/trunk/101-vboxsf-automount.patch) =================================================================== --- 101-vboxsf-automount.patch (rev 0) +++ 101-vboxsf-automount.patch 2020-04-01 11:57:37 UTC (rev 608825) @@ -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); Deleted: 60-vboxdrv.rules =================================================================== --- 60-vboxdrv.rules 2020-04-01 11:57:10 UTC (rev 608824) +++ 60-vboxdrv.rules 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,8 +0,0 @@ -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-x86_64/60-vboxdrv.rules (from rev 608824, virtualbox/trunk/60-vboxdrv.rules) =================================================================== --- 60-vboxdrv.rules (rev 0) +++ 60-vboxdrv.rules 2020-04-01 11:57:37 UTC (rev 608825) @@ -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" Deleted: 60-vboxguest.rules =================================================================== --- 60-vboxguest.rules 2020-04-01 11:57:10 UTC (rev 608824) +++ 60-vboxguest.rules 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,2 +0,0 @@ -ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" -ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" Copied: virtualbox/repos/community-x86_64/60-vboxguest.rules (from rev 608824, virtualbox/trunk/60-vboxguest.rules) =================================================================== --- 60-vboxguest.rules (rev 0) +++ 60-vboxguest.rules 2020-04-01 11:57:37 UTC (rev 608825) @@ -0,0 +1,2 @@ +ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" +ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" Deleted: LocalConfig.kmk =================================================================== --- LocalConfig.kmk 2020-04-01 11:57:10 UTC (rev 608824) +++ LocalConfig.kmk 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,36 +0,0 @@ -# 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-x86_64/LocalConfig.kmk (from rev 608824, virtualbox/trunk/LocalConfig.kmk) =================================================================== --- LocalConfig.kmk (rev 0) +++ LocalConfig.kmk 2020-04-01 11:57:37 UTC (rev 608825) @@ -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 Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-04-01 11:57:10 UTC (rev 608824) +++ PKGBUILD 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,396 +0,0 @@ -# Maintainer: Sébastien "Seblu" Luttringer -# Contributor: Ionut Biru <ib...@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.1.4 -pkgrel=3 -_vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30' -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' - 'xorgproto' - 'xorg-server-devel') -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' - '001-disable-update.patch' - '005-gsoap-build.patch' - '006-rdesktop-vrdp-keymap-path.patch' - '008-no-vboxvideo.patch' - '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch' - '013-Makefile.patch' - '014-vboxclient.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=('59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99' - 'SKIP' - '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db' - 'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c' - 'e37712bcbbafbdee47230a962446d63b0ae882801a89931d93ad9e704e70ad4b' - '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c' - 'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e' - '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e' - '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95' - '2be313b98bffde482aad93b00c419f1d5f7645fd9e6053175ffb0d925067f96a' - '94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21' - '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce' - 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f' - '4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d' - '9ee947c9b5ec5b25f52d3e72340fc3a57ca6e65a604e15b669ac582a3fb0dc1b' - '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46' - '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab' - '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491' - '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024' - 'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9' - 'db617a3e7a3a94b96d5c3fe771d31c927242ef4f2cb265a22e4d5d64560a910a' - '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 - echo "Applying patch ${filename##*/}" - patch -p1 -N -i "$srcdir/${filename##*/}" - fi - done - - echo 'Applying local config' - cp "$srcdir/LocalConfig.kmk" . - - echo 'Use our CFLAGS' - echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk -} - -build() { - cd "VirtualBox-$pkgver" - - echo 'Build virtualbox' - ./configure \ - --disable-docs \ - --disable-kmods \ - --disable-vmmraw \ - --enable-vde \ - --enable-vnc \ - --enable-webservice \ - --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 - - echo 'Build rdesktop-vrdp' - kmk -C src/VBox/RDP/client-1.8.4 - - echo '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 *.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" - rm components/VBoxREM.so # TODO: remove when dead link is fixed - 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\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,@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,@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,@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 -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" -} Copied: virtualbox/repos/community-x86_64/PKGBUILD (from rev 608824, virtualbox/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-04-01 11:57:37 UTC (rev 608825) @@ -0,0 +1,398 @@ +# Maintainer: Sébastien "Seblu" Luttringer +# Contributor: Ionut Biru <ib...@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.1.4 +pkgrel=4 +_vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30' +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' + 'xorgproto' + 'xorg-server-devel') +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' + '001-disable-update.patch' + '005-gsoap-build.patch' + '006-rdesktop-vrdp-keymap-path.patch' + '008-no-vboxvideo.patch' + '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch' + '013-Makefile.patch' + '014-vboxclient.patch' + '015-linux-5.6.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=('59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99' + 'SKIP' + '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db' + 'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c' + 'e37712bcbbafbdee47230a962446d63b0ae882801a89931d93ad9e704e70ad4b' + '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c' + 'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e' + '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e' + '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95' + '2be313b98bffde482aad93b00c419f1d5f7645fd9e6053175ffb0d925067f96a' + '94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21' + '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce' + 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f' + '4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d' + '9ee947c9b5ec5b25f52d3e72340fc3a57ca6e65a604e15b669ac582a3fb0dc1b' + '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46' + '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab' + '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491' + '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024' + 'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9' + 'db617a3e7a3a94b96d5c3fe771d31c927242ef4f2cb265a22e4d5d64560a910a' + '7787d241e4948866b0a3f33a45fc638665b4a3e83e64c33bdf085d0043732d6b' + '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 + echo "Applying patch ${filename##*/}" + patch -p1 -N -i "$srcdir/${filename##*/}" + fi + done + + echo 'Applying local config' + cp "$srcdir/LocalConfig.kmk" . + + echo 'Use our CFLAGS' + echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk +} + +build() { + cd "VirtualBox-$pkgver" + + echo 'Build virtualbox' + ./configure \ + --disable-docs \ + --disable-kmods \ + --disable-vmmraw \ + --enable-vde \ + --enable-vnc \ + --enable-webservice \ + --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 + + echo 'Build rdesktop-vrdp' + kmk -C src/VBox/RDP/client-1.8.4 + + echo '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 *.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" + rm components/VBoxREM.so # TODO: remove when dead link is fixed + 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\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,@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,@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,@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 -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" +} Deleted: build.sh =================================================================== --- build.sh 2020-04-01 11:57:10 UTC (rev 608824) +++ build.sh 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,3 +0,0 @@ -#!/bin/bash - -multilib-build "$@" && extra-i686-build "$@" Copied: virtualbox/repos/community-x86_64/build.sh (from rev 608824, virtualbox/trunk/build.sh) =================================================================== --- build.sh (rev 0) +++ build.sh 2020-04-01 11:57:37 UTC (rev 608825) @@ -0,0 +1,3 @@ +#!/bin/bash + +multilib-build "$@" && extra-i686-build "$@" Deleted: mount.vboxsf =================================================================== --- mount.vboxsf 2020-04-01 11:57:10 UTC (rev 608824) +++ mount.vboxsf 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,17 +0,0 @@ -#!/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-x86_64/mount.vboxsf (from rev 608824, virtualbox/trunk/mount.vboxsf) =================================================================== --- mount.vboxsf (rev 0) +++ mount.vboxsf 2020-04-01 11:57:37 UTC (rev 608825) @@ -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" "$@" Deleted: vboxreload =================================================================== --- vboxreload 2020-04-01 11:57:10 UTC (rev 608824) +++ vboxreload 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,37 +0,0 @@ -#!/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 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-x86_64/vboxreload (from rev 608824, virtualbox/trunk/vboxreload) =================================================================== --- vboxreload (rev 0) +++ vboxreload 2020-04-01 11:57:37 UTC (rev 608825) @@ -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 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: Deleted: vboxservice-nox.service =================================================================== --- vboxservice-nox.service 2020-04-01 11:57:10 UTC (rev 608824) +++ vboxservice-nox.service 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,11 +0,0 @@ -[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-x86_64/vboxservice-nox.service (from rev 608824, virtualbox/trunk/vboxservice-nox.service) =================================================================== --- vboxservice-nox.service (rev 0) +++ vboxservice-nox.service 2020-04-01 11:57:37 UTC (rev 608825) @@ -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 Deleted: vboxservice.service =================================================================== --- vboxservice.service 2020-04-01 11:57:10 UTC (rev 608824) +++ vboxservice.service 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,12 +0,0 @@ -[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-x86_64/vboxservice.service (from rev 608824, virtualbox/trunk/vboxservice.service) =================================================================== --- vboxservice.service (rev 0) +++ vboxservice.service 2020-04-01 11:57:37 UTC (rev 608825) @@ -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 Deleted: vboxweb.service =================================================================== --- vboxweb.service 2020-04-01 11:57:10 UTC (rev 608824) +++ vboxweb.service 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,11 +0,0 @@ -[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-x86_64/vboxweb.service (from rev 608824, virtualbox/trunk/vboxweb.service) =================================================================== --- vboxweb.service (rev 0) +++ vboxweb.service 2020-04-01 11:57:37 UTC (rev 608825) @@ -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 Deleted: virtualbox-ext-vnc.install =================================================================== --- virtualbox-ext-vnc.install 2020-04-01 11:57:10 UTC (rev 608824) +++ virtualbox-ext-vnc.install 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,27 +0,0 @@ -#!/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-x86_64/virtualbox-ext-vnc.install (from rev 608824, virtualbox/trunk/virtualbox-ext-vnc.install) =================================================================== --- virtualbox-ext-vnc.install (rev 0) +++ virtualbox-ext-vnc.install 2020-04-01 11:57:37 UTC (rev 608825) @@ -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: Deleted: virtualbox-guest-dkms.conf =================================================================== --- virtualbox-guest-dkms.conf 2020-04-01 11:57:10 UTC (rev 608824) +++ virtualbox-guest-dkms.conf 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,34 +0,0 @@ -## @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@_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-x86_64/virtualbox-guest-dkms.conf (from rev 608824, virtualbox/trunk/virtualbox-guest-dkms.conf) =================================================================== --- virtualbox-guest-dkms.conf (rev 0) +++ virtualbox-guest-dkms.conf 2020-04-01 11:57:37 UTC (rev 608825) @@ -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@_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" Deleted: virtualbox-guest-dkms.install =================================================================== --- virtualbox-guest-dkms.install 2020-04-01 11:57:10 UTC (rev 608824) +++ virtualbox-guest-dkms.install 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,12 +0,0 @@ -#!/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-x86_64/virtualbox-guest-dkms.install (from rev 608824, virtualbox/trunk/virtualbox-guest-dkms.install) =================================================================== --- virtualbox-guest-dkms.install (rev 0) +++ virtualbox-guest-dkms.install 2020-04-01 11:57:37 UTC (rev 608825) @@ -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: Deleted: virtualbox-guest-utils.sysusers =================================================================== --- virtualbox-guest-utils.sysusers 2020-04-01 11:57:10 UTC (rev 608824) +++ virtualbox-guest-utils.sysusers 2020-04-01 11:57:37 UTC (rev 608825) @@ -1 +0,0 @@ -g vboxsf 109 - Copied: virtualbox/repos/community-x86_64/virtualbox-guest-utils.sysusers (from rev 608824, virtualbox/trunk/virtualbox-guest-utils.sysusers) =================================================================== --- virtualbox-guest-utils.sysusers (rev 0) +++ virtualbox-guest-utils.sysusers 2020-04-01 11:57:37 UTC (rev 608825) @@ -0,0 +1 @@ +g vboxsf 109 - Deleted: virtualbox-host-dkms.conf =================================================================== --- virtualbox-host-dkms.conf 2020-04-01 11:57:10 UTC (rev 608824) +++ virtualbox-host-dkms.conf 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,31 +0,0 @@ -## @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@_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" Copied: virtualbox/repos/community-x86_64/virtualbox-host-dkms.conf (from rev 608824, virtualbox/trunk/virtualbox-host-dkms.conf) =================================================================== --- virtualbox-host-dkms.conf (rev 0) +++ virtualbox-host-dkms.conf 2020-04-01 11:57:37 UTC (rev 608825) @@ -0,0 +1,31 @@ +## @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@_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" Deleted: virtualbox-host-dkms.install =================================================================== --- virtualbox-host-dkms.install 2020-04-01 11:57:10 UTC (rev 608824) +++ virtualbox-host-dkms.install 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,12 +0,0 @@ -#!/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-x86_64/virtualbox-host-dkms.install (from rev 608824, virtualbox/trunk/virtualbox-host-dkms.install) =================================================================== --- virtualbox-host-dkms.install (rev 0) +++ virtualbox-host-dkms.install 2020-04-01 11:57:37 UTC (rev 608825) @@ -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: Deleted: virtualbox-vboxsf-dkms.conf =================================================================== --- virtualbox-vboxsf-dkms.conf 2020-04-01 11:57:10 UTC (rev 608824) +++ virtualbox-vboxsf-dkms.conf 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,10 +0,0 @@ -PACKAGE_NAME="vboxsf" -PACKAGE_VERSION=@VERSION@_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-x86_64/virtualbox-vboxsf-dkms.conf (from rev 608824, virtualbox/trunk/virtualbox-vboxsf-dkms.conf) =================================================================== --- virtualbox-vboxsf-dkms.conf (rev 0) +++ virtualbox-vboxsf-dkms.conf 2020-04-01 11:57:37 UTC (rev 608825) @@ -0,0 +1,10 @@ +PACKAGE_NAME="vboxsf" +PACKAGE_VERSION=@VERSION@_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" Deleted: virtualbox.install =================================================================== --- virtualbox.install 2020-04-01 11:57:10 UTC (rev 608824) +++ virtualbox.install 2020-04-01 11:57:37 UTC (rev 608825) @@ -1,12 +0,0 @@ -#!/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-x86_64/virtualbox.install (from rev 608824, virtualbox/trunk/virtualbox.install) =================================================================== --- virtualbox.install (rev 0) +++ virtualbox.install 2020-04-01 11:57:37 UTC (rev 608825) @@ -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: Deleted: virtualbox.sysusers =================================================================== --- virtualbox.sysusers 2020-04-01 11:57:10 UTC (rev 608824) +++ virtualbox.sysusers 2020-04-01 11:57:37 UTC (rev 608825) @@ -1 +0,0 @@ -g vboxusers 108 - Copied: virtualbox/repos/community-x86_64/virtualbox.sysusers (from rev 608824, virtualbox/trunk/virtualbox.sysusers) =================================================================== --- virtualbox.sysusers (rev 0) +++ virtualbox.sysusers 2020-04-01 11:57:37 UTC (rev 608825) @@ -0,0 +1 @@ +g vboxusers 108 -