6.0.6-1: Bumped version

3 files changed, 16 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9bad8a7fb30..aff50578ecf2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = virtualbox-headless
 	pkgdesc = Powerful x86 virtualization for enterprise as well as home use. Headless build (no GUI, no Java).
-	pkgver = 6.0.4
+	pkgver = 6.0.6
 	pkgrel = 1
 	url = https://virtualbox.org
 	install = virtualbox.install
@@ -27,13 +27,13 @@ pkgbase = virtualbox-headless
 	optdepends = virtualbox-guest-iso: Guest Additions CD image
 	optdepends = virtualbox-ext-vnc: VNC server support
 	optdepends = virtualbox-sdk: Developer kit
-	provides = virtualbox=6.0.4
+	provides = virtualbox=6.0.6
 	conflicts = virtualbox-ose
 	conflicts = virtualbox
 	replaces = virtualbox-ose
 	replaces = virtualbox
 	backup = etc/vbox/vbox.cfg
-	source = https://download.virtualbox.org/virtualbox/6.0.4/VirtualBox-6.0.4.tar.bz2
+	source = https://download.virtualbox.org/virtualbox/6.0.6/VirtualBox-6.0.6.tar.bz2
 	source = virtualbox.sysusers
 	source = 60-vboxdrv.rules
 	source = 60-vboxguest.rules
@@ -48,7 +48,7 @@ pkgbase = virtualbox-headless
 	source = 009-include-path.patch
 	source = 011-python-3-7.patch
 	source = 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch
-	sha256sums = f80b0c68182c946fb74ada8034960c38159ad91085b153da1277e4f191af6e1f
+	sha256sums = 3419c49a90cef7f0a5781426259d47d7871457ab0fd201ec0fca83321441e552
 	sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c
 	sha256sums = 9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e
 	sha256sums = 033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95
@@ -60,7 +60,7 @@ pkgbase = virtualbox-headless
 	sha256sums = f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0
 	sha256sums = 7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46
 	sha256sums = 8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc
-	sha256sums = 1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4
+	sha256sums = 7055014fde94a41f20d9581615c818fd1f2d249a06864585f562b0a677131e70
 	sha256sums = 55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d
 	sha256sums = 81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024
 	makedepends_x86_64 = gcc-multilib
diff --git a/009-include-path.patch b/009-include-path.patch
index c23217414aba..985a30cd04c6 100644
--- a/009-include-path.patch
+++ b/009-include-path.patch
@@ -1,85 +1,13 @@
-diff --git a/src/VBox/HostDrivers/Support/linux/Makefile b/src/VBox/HostDrivers/Support/linux/Makefile
-index d199047..34d895f 100644
---- a/src/VBox/HostDrivers/Support/linux/Makefile
-+++ b/src/VBox/HostDrivers/Support/linux/Makefile
-@@ -131,7 +131,7 @@ ifdef VBOX_WITH_NATIVE_DTRACE
-  MOD_OBJS += SUPDrvDTrace.o
- endif
- 
--MOD_INCL  = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
-+MOD_INCL  = $(addprefix -I$(KBUILD_EXTMOD)/vboxdrv,/ /include /r0drv/linux)
- ifdef VBOX_WITH_NATIVE_DTRACE
-  MOD_INCL += -I/usr/include/linux -I/usr/include
- endif
-@@ -157,7 +157,7 @@ ifdef VBOX_WITH_TEXT_MODMEM_HACK
- endif
- 
- # build defs
--MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h \
-+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxdrv/include/VBox/SUPDrvMangling.h \
- 	-fno-omit-frame-pointer -fno-pie
- 
- include $(obj)/Makefile.include.footer
 diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-index 694cb5c..8487820 100644
+index 623485e9..5068906f 100644
 --- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
 +++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-@@ -34,7 +34,7 @@ MOD_OBJS += math/gcc/divdi3.o \
- 	math/gcc/umoddi3.o
- endif
- 
--MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
-+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetadp,/ /include /r0drv/linux)
- MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
- 	    -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
- 	    -Wno-declaration-after-statement
-@@ -59,6 +59,6 @@ ifdef VBOX_USE_INSERT_PAGE
- endif
- 
- # build defs
--MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
-+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxnetadp/include/VBox/SUPDrvMangling.h -fno-pie
- 
- include $(obj)/Makefile.include.footer
-diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
-index e262c61..ca956d5 100644
---- a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
-+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
-@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \
- 	math/gcc/umoddi3.o
- endif
- 
--MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
-+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetflt,/ /include /r0drv/linux)
- MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
- 	-DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
- 	-Wno-declaration-after-statement
-@@ -63,6 +63,6 @@ ifdef VBOX_USE_INSERT_PAGE
- endif
- 
- # build defs
--MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
-+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxnetflt/include/VBox/SUPDrvMangling.h -fno-pie
- 
- include $(obj)/Makefile.include.footer
-diff --git a/src/VBox/HostDrivers/VBoxPci/linux/Makefile b/src/VBox/HostDrivers/VBoxPci/linux/Makefile
-index 6b3878a..7b8a8a2 100644
---- a/src/VBox/HostDrivers/VBoxPci/linux/Makefile
-+++ b/src/VBox/HostDrivers/VBoxPci/linux/Makefile
-@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o       \
- 	math/gcc/umoddi3.o
- endif
- 
--MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
-+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxpci,/ /include /r0drv/linux)
- MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
- 	-DRT_WITH_VBOX -DVBOX_WITH_HARDENING
- ifeq ($(BUILD_TARGET_ARCH),amd64)
-@@ -60,6 +60,6 @@ ifdef VBOX_USE_INSERT_PAGE
- endif
+@@ -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
  
- # build defs
--MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
-+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxpci/include/VBox/SUPDrvMangling.h -fno-pie
+ include $(obj)/Makefile-footer.gmk
  
- include $(obj)/Makefile.include.footer
diff --git a/PKGBUILD b/PKGBUILD
index 9d808c744fb1..5f52a16eb0ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=virtualbox-headless
-pkgver=6.0.4
+pkgver=6.0.6
 _tarver=${pkgver}
 pkgrel=1
 pkgdesc='Powerful x86 virtualization for enterprise as well as home use. Headless build (no GUI, no Java).'
@@ -39,7 +39,7 @@ source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${_tarv
         '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
         )
 sha256sums=(
-    'f80b0c68182c946fb74ada8034960c38159ad91085b153da1277e4f191af6e1f'
+    '3419c49a90cef7f0a5781426259d47d7871457ab0fd201ec0fca83321441e552'
     '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
     '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
     '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95'
@@ -51,7 +51,7 @@ sha256sums=(
     'f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0'
     '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
     '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
-    '1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
+    '7055014fde94a41f20d9581615c818fd1f2d249a06864585f562b0a677131e70'
     '55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d'
     '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
 )