Updated to version 6.0.8

4 files changed, 62 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48d1f77d5811..7611b38684ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = virtualbox-bin
 	pkgdesc = Oracle VM VirtualBox Binary Edition (Oracle branded non-OSE version)
-	pkgver = 6.0.6
+	pkgver = 6.0.8
 	pkgrel = 1
 	url = https://www.virtualbox.org/
 	install = virtualbox-bin.install
@@ -20,7 +20,7 @@ pkgbase = virtualbox-bin
 	optdepends = virtualbox-ext-oracle: for Oracle extensions
 	optdepends = linux-headers: build the module for Arch kernel
 	optdepends = linux-lts-headers: build the module for LTS Arch kernel
-	provides = virtualbox=6.0.6
+	provides = virtualbox=6.0.8
 	provides = virtualbox-sdk
 	provides = VIRTUALBOX-HOST-MODULES
 	provides = virtualbox-host-dkms
@@ -31,13 +31,13 @@ pkgbase = virtualbox-bin
 	conflicts = virtualbox-host-modules-arch
 	replaces = virtualbox_bin
 	replaces = virtualbox-sun
-	noextract = VirtualBoxSDK-6.0.6-130049.zip
+	noextract = VirtualBoxSDK-6.0.8-130520.zip
 	options = !strip
 	options = !emptydirs
 	backup = etc/vbox/vbox.cfg
 	backup = etc/conf.d/vboxweb
-	source = http://download.virtualbox.org/virtualbox/6.0.6/VirtualBox-6.0.6-130049-Linux_amd64.run
-	source = https://download.virtualbox.org/virtualbox/6.0.6/VirtualBoxSDK-6.0.6-130049.zip
+	source = http://download.virtualbox.org/virtualbox/6.0.8/VirtualBox-6.0.8-130520-Linux_amd64.run
+	source = https://download.virtualbox.org/virtualbox/6.0.8/VirtualBoxSDK-6.0.8-130520.zip
 	source = VBoxAuth-r78150.h::https://www.virtualbox.org/svn/vbox/trunk/include/VBox/VBoxAuth.h?p=78150
 	source = VBoxAuthPAM-r78150.c::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c?p=78150
 	source = VBoxAuthSimple-r78150.cpp::https://www.virtualbox.org/svn/vbox/trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.cpp?p=78150
@@ -47,9 +47,9 @@ pkgbase = virtualbox-bin
 	source = vboxweb.conf
 	source = do_dkms
 	source = dkms.conf
-	source = 009-include-path.patch
-	sha256sums = 4e721f4a1c07bec4b81af0cfc6b15ba06b974e34909532b7a79de8c4b0b36719
-	sha256sums = c418865976c518e2c60bc66f9b6479850b432f4e58ab4be4b36a41078efec845
+	source = 013-Makefile.patch
+	sha256sums = 7066da71dd4079ead37ef9cbb309dfbaa3620a71ac710d1cb119ccba2b4a0153
+	sha256sums = b3f38221437a5a5e91b9d2d1fdb1243cccc7f270dc2bfe4d463b5328766c4440
 	sha256sums = 584f02a2a1e83b9cabd7b7e3b00a0515b118e040160eb46c014ea6fd3a16586e
 	sha256sums = 600df773fca199dc21acde10c95a4733b03b3efd8ffaef3a9fb9da363a9cd114
 	sha256sums = 452351c15d97aeda29e45dbcb0da69412dc3a615c9aece43a424af3639368d49
@@ -59,7 +59,7 @@ pkgbase = virtualbox-bin
 	sha256sums = 12dbba3b59991f2b68cddeeeda20236aeff63e11b7e2d1b08d9d6a82225f6651
 	sha256sums = cc1c0500ab07bc13563d99037f776bf64bdc90bb521e31e2e0b04e42ea5bb36a
 	sha256sums = e9df0fff15184d0a90abe17707bdbe1931582433bbc14ded4fb3b0252653c801
-	sha256sums = f3aa4efcee92868867876728b6e3b0b828593e26e6eefc2dd4adb0d5e78e2776
+	sha256sums = 268e794de9d66a2751006b2ca3810fc6a05da4af2ffa8b58c56c94b292f1f424
 
 pkgname = virtualbox-bin
 
diff --git a/009-include-path.patch b/009-include-path.patch
deleted file mode 100644
index 1679d8fbc832..000000000000
--- a/009-include-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/vboxhost/vboxnetadp/Makefile b/src/vboxhost/vboxnetadp/Makefile
-index 623485e9..5068906f 100644
---- a/src/vboxhost/vboxnetadp/Makefile
-+++ b/src/vboxhost/vboxnetadp/Makefile
-@@ -58,7 +58,7 @@ VBOXMOD_DEFS = \
- 	RT_WITH_VBOX \
- 	VBOX_WITH_HARDENING \
- 	VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
--VBOXMOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
-+VBOXMOD_CFLAGS = -include $(VBOXNETADPT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
- 
- include $(obj)/Makefile-footer.gmk
- 
diff --git a/013-Makefile.patch b/013-Makefile.patch
new file mode 100644
index 000000000000..351f2f36a3fd
--- /dev/null
+++ b/013-Makefile.patch
@@ -0,0 +1,44 @@
+diff --git a/src/vboxhost/Makefile b/src/vboxhost/Makefile
+index 18466b48..7c7de4e5 100644
+--- a/src/vboxhost/Makefile
++++ b/src/vboxhost/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
diff --git a/PKGBUILD b/PKGBUILD
index 497067048f64..a68845c1393f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: M0Rf30
 
 pkgname=virtualbox-bin
-pkgver=6.0.6
-_build=130049
+pkgver=6.0.8
+_build=130520
 _rev=78150
 pkgrel=1
 pkgdesc='Oracle VM VirtualBox Binary Edition (Oracle branded non-OSE version)'
@@ -37,10 +37,10 @@ source=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver
         'vboxweb.conf'
         'do_dkms'
         'dkms.conf'
-        '009-include-path.patch')
+        '013-Makefile.patch')
 noextract=("VirtualBoxSDK-${pkgver}-${_build}.zip")
-sha256sums=('4e721f4a1c07bec4b81af0cfc6b15ba06b974e34909532b7a79de8c4b0b36719'
-            'c418865976c518e2c60bc66f9b6479850b432f4e58ab4be4b36a41078efec845'
+sha256sums=('7066da71dd4079ead37ef9cbb309dfbaa3620a71ac710d1cb119ccba2b4a0153'
+            'b3f38221437a5a5e91b9d2d1fdb1243cccc7f270dc2bfe4d463b5328766c4440'
             '584f02a2a1e83b9cabd7b7e3b00a0515b118e040160eb46c014ea6fd3a16586e'
             '600df773fca199dc21acde10c95a4733b03b3efd8ffaef3a9fb9da363a9cd114'
             '452351c15d97aeda29e45dbcb0da69412dc3a615c9aece43a424af3639368d49'
@@ -50,7 +50,7 @@ sha256sums=('4e721f4a1c07bec4b81af0cfc6b15ba06b974e34909532b7a79de8c4b0b36719'
             '12dbba3b59991f2b68cddeeeda20236aeff63e11b7e2d1b08d9d6a82225f6651'
             'cc1c0500ab07bc13563d99037f776bf64bdc90bb521e31e2e0b04e42ea5bb36a'
             'e9df0fff15184d0a90abe17707bdbe1931582433bbc14ded4fb3b0252653c801'
-            'f3aa4efcee92868867876728b6e3b0b828593e26e6eefc2dd4adb0d5e78e2776')
+            '268e794de9d66a2751006b2ca3810fc6a05da4af2ffa8b58c56c94b292f1f424')
 
 prepare() {
     mkdir -p "${pkgname}-${pkgver}"
@@ -75,10 +75,10 @@ package() {
     install -d "${pkgdir}/${_installdir}"
     tar -jxf "${srcdir}/${pkgname}-${pkgver}/VirtualBox.tar.bz2" -C "${pkgdir}/${_installdir}"
     
-    # apply patch 009-include-path (thanks to Christian Hesse)
-    printf '%s\n' "  -> Applying patch '009-includepath.patch'..."
+    # fix dkms build
+    printf '%s\n' "  -> Fixing DKMS build..."
     cd "${pkgdir}/${_installdir}"
-    patch -Np1 -i "${srcdir}/009-include-path.patch"
+    patch -Np1 -i "${srcdir}/013-Makefile.patch"
     
     # hardened build: mark binaries suid root, and make sure the
     # directory is only writable by the user