[arch-commits] Commit in virtualbox/trunk (009-include-path.patch PKGBUILD)

[Christian Hesse]

    Date: Wednesday, April 17, 2019 @ 07:44:49
  Author: eworm
Revision: 451849

upgpkg: virtualbox 6.0.6-1

new upstream release

Modified:
  virtualbox/trunk/009-include-path.patch
  virtualbox/trunk/PKGBUILD

------------------------+
 009-include-path.patch |   88 ++++-------------------------------------------
 PKGBUILD               |   10 ++---
 2 files changed, 13 insertions(+), 85 deletions(-)

Modified: 009-include-path.patch
===================================================================
--- 009-include-path.patch	2019-04-17 07:27:25 UTC (rev 451848)
+++ 009-include-path.patch	2019-04-17 07:44:49 UTC (rev 451849)
@@ -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
+@@ -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
  
--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
+ include $(obj)/Makefile-footer.gmk
  
- # 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
- 
- # 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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-17 07:27:25 UTC (rev 451848)
+++ PKGBUILD	2019-04-17 07:44:49 UTC (rev 451849)
@@ -9,9 +9,9 @@
          'virtualbox-guest-utils'
          'virtualbox-guest-utils-nox'
          'virtualbox-ext-vnc')
-pkgver=6.0.4
-pkgrel=4
-_vboxsf_commit='6738af37c935f3d9b0db138678c2cd3d8bc1fc99'
+pkgver=6.0.6
+pkgrel=1
+_vboxsf_commit='8dd4b8bd5cfe6ddae8fe7056dff790013b985d22'
 arch=('x86_64')
 url='https://virtualbox.org/'
 license=('GPL' 'custom')
@@ -80,7 +80,7 @@
         # once support for mainline-style options string gets upstreamed
         '101-vboxsf-automount.patch'
         'mount.vboxsf')
-sha256sums=('f80b0c68182c946fb74ada8034960c38159ad91085b153da1277e4f191af6e1f'
+sha256sums=('3419c49a90cef7f0a5781426259d47d7871457ab0fd201ec0fca83321441e552'
             'SKIP'
             'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
             'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
@@ -98,7 +98,7 @@
             '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
             '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab'
             '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
-            '1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
+            '7055014fde94a41f20d9581615c818fd1f2d249a06864585f562b0a677131e70'
             '55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d'
             '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
             'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'