5.2 Inital Commit

3 files changed, 104 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d96d74256973..9eee08f0fcf7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = virtualbox-bin
 	pkgdesc = Oracle VM VirtualBox Binary Edition (Oracle branded non-OSE version)
-	pkgver = 5.1.28
+	pkgver = 5.2.0
 	pkgrel = 1
 	url = http://virtualbox.org/
 	install = install
@@ -19,7 +19,7 @@ pkgbase = virtualbox-bin
 	depends = python2
 	depends = sdl
 	optdepends = virtualbox-ext-oracle: for Oracle extensions
-	provides = virtualbox=5.1.28
+	provides = virtualbox=5.2.0
 	conflicts = virtualbox
 	conflicts = virtualbox-host-dkms
 	conflicts = virtualbox-host-modules-arch
@@ -28,20 +28,22 @@ pkgbase = virtualbox-bin
 	options = !strip
 	backup = etc/vbox/vbox.cfg
 	backup = etc/conf.d/vboxweb
-	source = VirtualBox-5.1.28-117968-Linux_amd64.run::http://download.virtualbox.org/virtualbox/5.1.28/VirtualBox-5.1.28-117968-Linux_amd64.run
+	source = VirtualBox-5.2.0-118431-Linux_amd64.run::http://download.virtualbox.org/virtualbox/5.2.0/VirtualBox-5.2.0-118431-Linux_amd64.run
 	source = VBoxFixUSB
 	source = 10-vboxdrv.rules
 	source = vboxweb.rc
 	source = vboxweb.conf
 	source = do_dkms
 	source = dkms.conf
-	md5sums = 35ef4877738ebf6de7eb578eb855cd4a
+	source = 009-include-path.patch
+	md5sums = 4c1cf7f3ca99b3a2f820b2a55b3eee72
 	md5sums = 2d04c2e2d8c71558c910a51ec773731a
 	md5sums = fe60f9510502bea67383d9198ae8c13c
 	md5sums = c159d683ba1947290fc2ad2c64194150
 	md5sums = 3ac185709bfe688bb753c46e170d0546
 	md5sums = 31144fa409c0d7c6b464d44b2140b521
 	md5sums = 05175249e1206c491b2b36670e8db9ec
+	md5sums = c32a61f3a1611e184098cc9b0d6765bb
 
 pkgname = virtualbox-bin
 
diff --git a/009-include-path.patch b/009-include-path.patch
new file mode 100644
index 000000000000..845ae9df92e4
--- /dev/null
+++ b/009-include-path.patch
@@ -0,0 +1,85 @@
+diff --git a/src/VBox/HostDrivers/Support/vboxdrv/Makefile b/src/VBox/HostDrivers/Support/vboxdrv/Makefile
+index d199047..34d895f 100644
+--- a/src/VBox/HostDrivers/Support/vboxdrv/Makefile
++++ b/src/VBox/HostDrivers/Support/vboxdrv/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/Support/vboxnetadp/Makefile b/src/VBox/HostDrivers/Support/vboxnetadp/Makefile
+index 694cb5c..8487820 100644
+--- a/src/VBox/HostDrivers/Support/vboxnetadp/Makefile
++++ b/src/VBox/HostDrivers/Support/vboxnetadp/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/Support/vboxnetflt/Makefile b/src/VBox/HostDrivers/Support/vboxnetflt/Makefile
+index e262c61..ca956d5 100644
+--- a/src/VBox/HostDrivers/Support/vboxnetflt/Makefile
++++ b/src/VBox/HostDrivers/Support/vboxnetflt/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/Support/vboxpci/Makefile b/src/VBox/HostDrivers/Support/vboxpci/Makefile
+index 6b3878a..7b8a8a2 100644
+--- a/src/VBox/HostDrivers/Support/vboxpci/Makefile
++++ b/src/VBox/HostDrivers/Support/vboxpci/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
+ 
+ # 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.include.footer
diff --git a/PKGBUILD b/PKGBUILD
index d57749473848..e102c0ea4a35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Original script by: M0Rf30
 
 pkgname=virtualbox-bin
-pkgver=5.1.28
-_build=117968
+pkgver=5.2.0
+_build=118431
 pkgrel=1
 pkgdesc='Oracle VM VirtualBox Binary Edition (Oracle branded non-OSE version)'
 arch=('i686' 'x86_64')
@@ -44,16 +44,20 @@ source=(
   'vboxweb.conf'
   'do_dkms'
   'dkms.conf'
+  '009-include-path.patch'
 )
 
+#35ef4877738ebf6de7eb578eb855cd4a'
 
-md5sums=('35ef4877738ebf6de7eb578eb855cd4a'
+
+md5sums=('4c1cf7f3ca99b3a2f820b2a55b3eee72'
          '2d04c2e2d8c71558c910a51ec773731a'
          'fe60f9510502bea67383d9198ae8c13c'
          'c159d683ba1947290fc2ad2c64194150'
          '3ac185709bfe688bb753c46e170d0546'
          '31144fa409c0d7c6b464d44b2140b521'
-         '05175249e1206c491b2b36670e8db9ec')
+         '05175249e1206c491b2b36670e8db9ec'
+         'c32a61f3a1611e184098cc9b0d6765bb')
 
 _installdir='/opt/VirtualBox'
 
@@ -66,6 +70,11 @@ package() {
   install -d "$pkgdir/$_installdir"
   tar -jxf "$srcdir/VirtualBox.tar.bz2" -C "$pkgdir/$_installdir"
 
+	# Patch 009-includepath Thanks Christian Hesse
+	cp 009-include-path.patch "${pkgdir}/${_installdir}/src/vboxhost/"
+	cd "${pkgdir}/${_installdir}/src/vboxhost/"
+	patch -p5 < 009-include-path.patch
+	rm 009-include-path.patch
   # Hardened build: Mark binaries suid root, create symlinks for working around
   #                 unsupported $ORIGIN/.. in VBoxC.so and make sure the
   #                 directory is only writable by the user (paranoid).