update by lilac

7 files changed, 126 insertions, 89 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f51e47438023..5c0204619f2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = virtualbox-svn
-	pkgver = 76342
-	pkgrel = 1
+	pkgver = 77065
+	pkgrel = 3
 	url = http://virtualbox.org
 	arch = x86_64
 	license = GPL
@@ -62,31 +62,31 @@ pkgbase = virtualbox-svn
 	source = 006-rdesktop-vrdp-keymap-path.patch
 	source = 008-no-vboxvideo.patch
 	source = 009-include-path.patch
-	source = 010-qt-5.11.patch
 	source = 011-python-3-7.patch
-	source = 012-vboxsf-automount.patch
+	source = 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch
+	source = 101-vboxsf-automount.patch
 	source = mount.vboxsf
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec
 	sha256sums = c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c
-	sha256sums = 43a97d07edd6f3f0e1181e84483759ad0a20c4e57ee93ca1a18530918979f9d8
+	sha256sums = e37712bcbbafbdee47230a962446d63b0ae882801a89931d93ad9e704e70ad4b
 	sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c
 	sha256sums = da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e
 	sha256sums = 9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e
 	sha256sums = 033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95
-	sha256sums = 918fe3ae7d60550181bcefedb55621f2c824087062c0df6ad03d148ed3f2ba01
+	sha256sums = 2be313b98bffde482aad93b00c419f1d5f7645fd9e6053175ffb0d925067f96a
 	sha256sums = 94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21
 	sha256sums = 01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce
 	sha256sums = e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f
 	sha256sums = 2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac
 	sha256sums = f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0
 	sha256sums = 7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46
-	sha256sums = 5d5af2de5b1f1c61ec793503350f2440661cf8fd640f11b8a86f10bce499c0dc
+	sha256sums = 13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab
 	sha256sums = 8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc
 	sha256sums = 1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4
-	sha256sums = c6ef35e6893d557c7c2269ff79bc299fe9058cfb2c933a7efdc7a8a7b6d9c5da
 	sha256sums = 55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d
+	sha256sums = 06485dce54a5f21b85f4360db884d98c1ab091d3f2535881ec9fcd82feb06b7e
 	sha256sums = a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4
 	sha256sums = f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947
 	makedepends_x86_64 = gcc-multilib
@@ -113,6 +113,9 @@ pkgname = virtualbox-svn
 	depends = libxext
 	depends = libxmu
 	depends = libxt
+	depends = opus
+	depends = desktop-file-utils
+	depends = hicolor-icon-theme
 	depends = qt5-base
 	depends = qt5-x11extras
 	depends = VIRTUALBOX-HOST-MODULES-SVN
@@ -173,6 +176,7 @@ pkgname = virtualbox-guest-utils-svn
 	depends = libx11
 	depends = libxcomposite
 	depends = libxdamage
+	depends = libxrandr
 	depends = libxext
 	depends = libxfixes
 	depends = libxmu
diff --git a/006-rdesktop-vrdp-keymap-path.patch b/006-rdesktop-vrdp-keymap-path.patch
index 46c72c1ccf87..3acf8a04b2ea 100644
--- a/006-rdesktop-vrdp-keymap-path.patch
+++ b/006-rdesktop-vrdp-keymap-path.patch
@@ -1,6 +1,6 @@
 # 2015 © Sébastien Luttringer
---- a/src/VBox/RDP/client-1.8.3/Makefile.kmk 2013-02-19 23:12:20.207464901 +0100
-+++ b/src/VBox/RDP/client-1.8.3/Makefile.kmk 2014-01-04 04:17:26.700618600 +0100
+--- 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 \
diff --git a/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch b/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch
new file mode 100644
index 000000000000..e73c25af0105
--- /dev/null
+++ b/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch
@@ -0,0 +1,15 @@
+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
+
diff --git a/101-vboxsf-automount.patch b/101-vboxsf-automount.patch
new file mode 100644
index 000000000000..5c665e722c83
--- /dev/null
+++ b/101-vboxsf-automount.patch
@@ -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);
diff --git a/LocalConfig.kmk b/LocalConfig.kmk
index 88fda19b0264..b413859931a9 100644
--- a/LocalConfig.kmk
+++ b/LocalConfig.kmk
@@ -25,8 +25,12 @@ VBOX_GCC_WARN =
 # fix gsoap missing zlib include and produce errors with --as-needed
 VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
 
-# use system xorg
+# 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
diff --git a/PKGBUILD b/PKGBUILD
index b0f589fba490..3d18fd38c4d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@ pkgname=('virtualbox-svn'
          'virtualbox-guest-utils-svn'
          'virtualbox-guest-utils-nox-svn'
          'virtualbox-ext-vnc-svn')
-pkgver=76342
-pkgrel=1
+pkgver=77065
+pkgrel=3
 _vboxsf_commit='9451f61e6787e95aa51e42b6381db6b059bc49da'
 arch=('x86_64')
 url='http://virtualbox.org'
@@ -76,36 +76,36 @@ source=("VirtualBox::svn+http://www.virtualbox.org/svn/vbox/trunk"
         '006-rdesktop-vrdp-keymap-path.patch'
         '008-no-vboxvideo.patch'
         '009-include-path.patch'
-        '010-qt-5.11.patch'
         '011-python-3-7.patch'
+        '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
         # The following patch and mount.vboxsf wrapper should be removed
         # once support for mainline-style options string gets upstreamed
-        '012-vboxsf-automount.patch'
+        '101-vboxsf-automount.patch'
         'mount.vboxsf')
 sha256sums=('SKIP'
             'SKIP'
             'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
             'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
-            '43a97d07edd6f3f0e1181e84483759ad0a20c4e57ee93ca1a18530918979f9d8'
+            'e37712bcbbafbdee47230a962446d63b0ae882801a89931d93ad9e704e70ad4b'
             '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
             'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e'
             '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
             '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95'
-            '918fe3ae7d60550181bcefedb55621f2c824087062c0df6ad03d148ed3f2ba01'
+            '2be313b98bffde482aad93b00c419f1d5f7645fd9e6053175ffb0d925067f96a'
             '94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21'
             '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce'
             'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
             '2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac'
             'f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0'
             '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
-            '5d5af2de5b1f1c61ec793503350f2440661cf8fd640f11b8a86f10bce499c0dc'
+            '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab'
             '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
             '1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
-            'c6ef35e6893d557c7c2269ff79bc299fe9058cfb2c933a7efdc7a8a7b6d9c5da'
             '55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d'
+            '06485dce54a5f21b85f4360db884d98c1ab091d3f2535881ec9fcd82feb06b7e'
             'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'
             'f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947')
-            
+
 pkgver() {
   cd "VirtualBox"
   local ver="$(svnversion)"
@@ -129,12 +129,6 @@ prepare() {
 
     msg2 'Use our CFLAGS'
     echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk
-
-    msg2 'Use system GL headers'
-    echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-
-    msg2 'Remove gcc version censorship'
-    sed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 build() {
@@ -154,7 +148,7 @@ build() {
     kmk
 
     msg2 'Build rdesktop-vrdp'
-    kmk -C src/VBox/RDP/client-1.8.3
+    kmk -C src/VBox/RDP/client-1.8.4
 
     msg2 'Build VNC extension pack'
     kmk -C src/VBox/ExtPacks/VNC packing
@@ -165,7 +159,7 @@ package_virtualbox-svn() {
     depends=('glibc' 'openssl' 'curl' 'gcc-libs' 'libpng' 'python' 'sdl'
              'libvpx' 'libxml2' 'procps-ng' 'shared-mime-info' 'zlib'
              'libxcursor' 'libxinerama' 'libx11' 'libxext' 'libxmu' 'libxt'
-             'qt5-base' 'qt5-x11extras' 'VIRTUALBOX-HOST-MODULES-SVN')
+             'opus' 'desktop-file-utils' 'hicolor-icon-theme' 'qt5-base' 'qt5-x11extras' 'VIRTUALBOX-HOST-MODULES-SVN')
     optdepends=('vde2: Virtual Distributed Ethernet support'
                 'virtualbox-guest-iso: Guest Additions CD image'
                 'virtualbox-ext-vnc: VNC server support'
@@ -180,50 +174,50 @@ package_virtualbox-svn() {
     cd "VirtualBox/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
 
     # binaries
-    install -dm755 "$pkgdir/usr/bin"
-    install -m755 VBox.sh "$pkgdir/usr/bin/VBox"
+    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 -m755 VBoxTunctl "$pkgdir/usr/bin"
-    install -m755 rdesktop-vrdp "$pkgdir/usr/bin"
+    install -m0755 VBoxTunctl "$pkgdir/usr/bin"
+    install -m0755 rdesktop-vrdp "$pkgdir/usr/bin"
 
     # libraries
-    install -dm755 "$pkgdir/usr/lib/virtualbox"
-    install -m755 *.so "$pkgdir/usr/lib/virtualbox"
-    install -m644 *.rc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
+    install -dm0755 "$pkgdir/usr/lib/virtualbox"
+    install -m0755 *.so "$pkgdir/usr/lib/virtualbox"
+    install -m0644 *.rc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
     ## setuid root binaries
-    install -m4755 VirtualBox VBoxSDL VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox"
+    install -m4755 VBoxSDL VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox"
     ## other binaries
-    install -m755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
+    install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
 
     # components
-    install -dm755 "$pkgdir/usr/lib/virtualbox/components"
-    install -m755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
+    install -dm0755 "$pkgdir/usr/lib/virtualbox/components"
+    install -m0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
 
     # extensions packs
     ## as virtualbox install itself stuff in this directory, move it to /var and
     ## trick it with a symlink
     ## FIXME: trick is disabled for now
-    #install -dm755 "$pkgdir/var/lib/virtualbox/extensions"
-    #install -dm755 "$pkgdir/usr/share/virtualbox/extensions"
+    #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 -dm755 "$pkgdir/usr/lib/virtualbox/ExtensionPacks"
+    install -dm0755 "$pkgdir/usr/lib/virtualbox/ExtensionPacks"
 
     # languages
-    install -dm755 "$pkgdir/usr/share/virtualbox/nls"
-    install -m755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
+    install -dm0755 "$pkgdir/usr/share/virtualbox/nls"
+    install -m0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
 
     # rdesktop keymaps
-    install -dm755 "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
-    install -m644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-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 -m755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
+    install -m0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
 
     # icons
-    install -Dm644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
+    install -Dm0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
 
     pushd icons >/dev/null
     for i in *; do
@@ -233,26 +227,26 @@ package_virtualbox-svn() {
     popd >/dev/null
 
     #desktop
-    install -Dm644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
-    install -Dm644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
+    install -Dm0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
+    install -Dm0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
 
     #install configuration
-    install -dm755 "$pkgdir/etc/vbox"
+    install -dm0755 "$pkgdir/etc/vbox"
     echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
 
     # back to srcdir
     cd "$srcdir"
 
     #licence
-    install -Dm644 VirtualBox/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm0644 VirtualBox/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
     # install systemd stuff
-    install -Dm644 60-vboxdrv.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxdrv.rules"
-    install -Dm644 vboxweb.service "$pkgdir/usr/lib/systemd/system/vboxweb.service"
-    install -Dm644 virtualbox.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox.conf"
+    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 -Dm755 vboxreload "$pkgdir/usr/bin"
+    install -Dm0755 vboxreload "$pkgdir/usr/bin"
     ln -s vboxreload "$pkgdir/usr/bin/rcvboxdrv"
 }
 
@@ -262,12 +256,12 @@ package_virtualbox-sdk-svn() {
     provides=('virtualbox-sdk')
     conflicts=('virtualbox-sdk')
 
-    install -dm755 "$pkgdir/usr/lib/virtualbox"
+    install -dm0755 "$pkgdir/usr/lib/virtualbox"
 
     source "VirtualBox/env.sh"
     cd "VirtualBox/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
 
-    install -Dm755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
+    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"
@@ -275,7 +269,7 @@ package_virtualbox-sdk-svn() {
     cp -r sdk "$pkgdir/usr/lib/virtualbox"
     rm -r "$pkgdir/usr/lib/virtualbox/sdk/installer"
     # licence
-    install -Dm644 "$srcdir/VirtualBox/COPYING" \
+    install -Dm0644 "$srcdir/VirtualBox/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
@@ -292,20 +286,20 @@ package_virtualbox-host-dkms-svn() {
                 'linux-zen-headers: build modules against ZEN kernel')
     install=virtualbox-host-dkms.install
 
-    install -dm755 "$pkgdir/usr/src"
+    install -dm0755 "$pkgdir/usr/src"
     source "VirtualBox/env.sh"
     cd "VirtualBox/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
     cp -r src "$pkgdir/usr/src/vboxhost-svn_OSE"
     # licence
-    install -Dm644 "$srcdir/VirtualBox/COPYING" \
+    install -Dm0644 "$srcdir/VirtualBox/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
     # module loading
     local _p="$pkgdir/usr/lib/modules-load.d/virtualbox-host-dkms.conf"
-    install -Dm644 /dev/null "$_p"
+    install -Dm0644 /dev/null "$_p"
     printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" > "$_p"
     # starting vbox 5.1, dkms.conf file was dropped
     local _p="$pkgdir/usr/src/vboxhost-svn_OSE/dkms.conf"
-    install -Dm644 "$srcdir/virtualbox-host-dkms.conf" "$_p"
+    install -Dm0644 "$srcdir/virtualbox-host-dkms.conf" "$_p"
     sed -i "s,@VERSION@,svn," "$_p"
 }
 
@@ -322,20 +316,20 @@ package_virtualbox-guest-dkms-svn() {
                 'linux-zen-headers: build modules against ZEN kernel')
     install=virtualbox-guest-dkms.install
 
-    install -dm755 "$pkgdir/usr/src"
+    install -dm0755 "$pkgdir/usr/src"
     source "VirtualBox/env.sh"
     cd "VirtualBox/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
     cp -r src "$pkgdir/usr/src/vboxguest-svn_OSE"
     # licence
-    install -Dm644 "$srcdir/VirtualBox/COPYING" \
+    install -Dm0644 "$srcdir/VirtualBox/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
     # module loading
     local _p="$pkgdir/usr/lib/modules-load.d/virtualbox-guest-dkms.conf"
-    install -Dm644 /dev/null "$_p"
+    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-svn_OSE/dkms.conf"
-    install -Dm644 "$srcdir/virtualbox-guest-dkms.conf" "$_p"
+    install -Dm0644 "$srcdir/virtualbox-guest-dkms.conf" "$_p"
     sed -i "s,@VERSION@,svn," "$_p"
 
     # vboxsf module for Linux 4.16 and later
@@ -344,14 +338,14 @@ package_virtualbox-guest-dkms-svn() {
     rm -rf "$pkgdir/usr/src/vboxsf-svn_OSE/vboxsf/.git"
     echo "obj-m = vboxsf/" >"$pkgdir/usr/src/vboxsf-svn_OSE/Makefile"
     local _p="$pkgdir/usr/src/vboxsf-svn_OSE/dkms.conf"
-    install -Dm644 "$srcdir/virtualbox-vboxsf-dkms.conf" "$_p"
+    install -Dm0644 "$srcdir/virtualbox-vboxsf-dkms.conf" "$_p"
     sed -i "s,@VERSION@,svn," "$_p"
 }
 
 package_virtualbox-guest-utils-svn() {
     pkgdesc='VirtualBox Guest userspace utilities'
     depends=('glibc' 'pam' 'libx11' 'libxcomposite'
-             'libxdamage' 'libxext' 'libxfixes' 'libxmu' 'libxt' 'xorg-xrandr'
+             'libxdamage' 'libxrandr' 'libxext' 'libxfixes' 'libxmu' 'libxt' 'xorg-xrandr'
              'VIRTUALBOX-GUEST-MODULES-SVN')
     replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
     provides=('virtualbox-guest-utils')
@@ -360,23 +354,23 @@ package_virtualbox-guest-utils-svn() {
     source "VirtualBox/env.sh"
     pushd "VirtualBox/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
     install -d "$pkgdir/usr/bin"
-    install -m755 VBoxClient VBoxControl VBoxService "$srcdir/mount.vboxsf" "$pkgdir/usr/bin"
-    install -Dm755 mount.vboxsf "$pkgdir/usr/lib/virtualbox/mount.vboxsf"
-    install -m755 -D "$srcdir"/VirtualBox/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+    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/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
         "$pkgdir"/usr/bin/VBoxClient-all
-    install -m644 -D "$srcdir"/VirtualBox/src/VBox/Additions/x11/Installer/vboxclient.desktop \
+    install -m0644 -D "$srcdir"/VirtualBox/src/VBox/Additions/x11/Installer/vboxclient.desktop \
         "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
     install -d "$pkgdir/usr/lib/xorg/modules/dri"
-    install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
+    install -m0755 VBoxOGL*.so "$pkgdir/usr/lib"
     ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
-    install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
+    install -m0755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
     popd
     # systemd stuff
-    install -Dm644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
-    install -Dm644 vboxservice.service "$pkgdir/usr/lib/systemd/system/vboxservice.service"
-    install -Dm644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
+    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 -Dm644 VirtualBox/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm0644 VirtualBox/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_virtualbox-guest-utils-nox-svn() {
@@ -388,16 +382,16 @@ package_virtualbox-guest-utils-nox-svn() {
     source "VirtualBox/env.sh"
     pushd "VirtualBox/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
     install -d "$pkgdir/usr/bin"
-    install -m755 VBoxControl VBoxService "$srcdir/mount.vboxsf" "$pkgdir/usr/bin"
-    install -Dm755 mount.vboxsf "$pkgdir/usr/lib/virtualbox/mount.vboxsf"
-    install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
+    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 -Dm644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
-    install -Dm644 vboxservice-nox.service "$pkgdir/usr/lib/systemd/system/vboxservice.service"
-    install -Dm644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
+    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 -Dm644 "$srcdir/VirtualBox/COPYING" \
+    install -Dm0644 "$srcdir/VirtualBox/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
@@ -411,9 +405,9 @@ package_virtualbox-ext-vnc-svn() {
 
     source "VirtualBox/env.sh"
     cd "VirtualBox/out/linux.$BUILD_PLATFORM_ARCH/release/packages"
-    install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-svn.vbox-extpack"
+    install -Dm0644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-svn.vbox-extpack"
     # licence
-    install -Dm644 "$srcdir/VirtualBox/COPYING" \
+    install -Dm0644 "$srcdir/VirtualBox/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
diff --git a/virtualbox-vboxsf-dkms.conf b/virtualbox-vboxsf-dkms.conf
index 4e062a539bcd..c1f43b3469f0 100644
--- a/virtualbox-vboxsf-dkms.conf
+++ b/virtualbox-vboxsf-dkms.conf
@@ -3,7 +3,7 @@ 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]\..*|5\..*)"
+BUILD_EXCLUSIVE_KERNEL="^(4\.(1[6-9]|2[0-9])\..*|5\..*)"
 
 BUILT_MODULE_NAME[0]="vboxsf"
 BUILT_MODULE_LOCATION[0]="vboxsf"