update by lilac

3 files changed, 4 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7146506631d..f5aa52da2866 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = virtualbox-svn
 	pkgver = 77588
-	pkgrel = 1
+	pkgrel = 2
 	url = http://virtualbox.org
 	arch = x86_64
 	license = GPL
@@ -84,7 +84,7 @@ pkgbase = virtualbox-svn
 	sha256sums = 7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46
 	sha256sums = 13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab
 	sha256sums = 8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc
-	sha256sums = 3b3242a1701e4d48f78d026bc038c623bfdea1a8b79e0ead0743162d1dc925e4
+	sha256sums = 0993f4832442341399b1cb908ec11d3e3a87d3b9d5e7e1be37b0ba0b96606f4e
 	sha256sums = 55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d
 	sha256sums = 06485dce54a5f21b85f4360db884d98c1ab091d3f2535881ec9fcd82feb06b7e
 	sha256sums = a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4
diff --git a/109-include-path.patch1 b/109-include-path.patch1
index ea76b4520a86..2b0d516f3016 100644
--- a/109-include-path.patch1
+++ b/109-include-path.patch1
@@ -1,34 +1,6 @@
-diff -rupN src_orig/VBox/HostDrivers/Support/linux/Makefile src/VBox/HostDrivers/Support/linux/Makefile
---- src_orig/VBox/HostDrivers/Support/linux/Makefile	2019-03-11 11:47:24.057144874 +0800
-+++ src/VBox/HostDrivers/Support/linux/Makefile	2019-03-11 11:49:12.474003711 +0800
-@@ -137,6 +137,7 @@ VBOXMOD_OBJS += SUPDrvDTrace.o
- endif
- VBOXMOD_INCL  = \
- 	$(VBOXDRV_DIR) \
-+	$(VBOXDRV_DIR)vboxdrv \
- 	$(VBOXDRV_DIR)include \
- 	$(VBOXDRV_DIR)r0drv/linux
- ifdef VBOX_WITH_NATIVE_DTRACE
-@@ -165,7 +166,7 @@ endif
- ifdef VBOX_WITH_TEXT_MODMEM_HACK
- VBOXMOD_DEFS += RTMEMALLOC_EXEC_HEAP VBOX_WITH_TEXT_MODMEM_HACK
- endif
--VBOXMOD_CFLAGS = -include $(VBOXDRV_DIR)include/VBox/SUPDrvMangling.h \
-+VBOXMOD_CFLAGS = -include $(VBOXDRV_DIR)vboxdrv/include/VBox/SUPDrvMangling.h \
- 	-fno-omit-frame-pointer -fno-pie -Wno-declaration-after-statement
- 
- 
 diff -rupN src_orig/VBox/HostDrivers/VBoxNetAdp/linux/Makefile src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
 --- src_orig/VBox/HostDrivers/VBoxNetAdp/linux/Makefile	2019-03-11 11:47:24.053811535 +0800
 +++ src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile	2019-03-11 11:50:09.534104474 +0800
-@@ -47,6 +47,7 @@ VBOXMOD_OBJS += \
- endif
- VBOXMOD_INCL = \
- 	$(VBOXNETADPT_DIR) \
-+	$(VBOXNETADPT_DIR)vboxnetadp \
- 	$(VBOXNETADPT_DIR)include \
- 	$(VBOXNETADPT_DIR)r0drv/linux
- VBOXMOD_DEFS = \
 @@ -58,7 +59,7 @@ VBOXMOD_DEFS = \
  	RT_WITH_VBOX \
  	VBOX_WITH_HARDENING \
@@ -37,43 +9,3 @@ diff -rupN src_orig/VBox/HostDrivers/VBoxNetAdp/linux/Makefile src/VBox/HostDriv
 +VBOXMOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxnetadp/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
  
  include $(obj)/Makefile-footer.gmk
- 
-diff -rupN src_orig/VBox/HostDrivers/VBoxNetFlt/linux/Makefile src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
---- src_orig/VBox/HostDrivers/VBoxNetFlt/linux/Makefile	2019-03-11 11:47:24.053811535 +0800
-+++ src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile	2019-03-11 11:50:49.124174253 +0800
-@@ -50,6 +50,7 @@ VBOXMOD_OBJS += \
- endif
- VBOXMOD_INCL = \
- 	$(VBOXNETFLT_DIR) \
-+	$(VBOXNETFLT_DIR)vboxnetflt \
- 	$(VBOXNETFLT_DIR)include \
- 	$(VBOXNETFLT_DIR)r0drv/linux
- VBOXMOD_DEFS = \
-@@ -61,7 +62,7 @@ VBOXMOD_DEFS = \
- 	RT_WITH_VBOX \
- 	VBOX_WITH_HARDENING \
- 	VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
--VBOXMOD_CFLAGS = -include $(VBOXNETFLT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
-+VBOXMOD_CFLAGS = -include $(VBOXNETFLT_DIR)vboxnetflt/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
- 
- include $(obj)/Makefile-footer.gmk
- 
-diff -rupN src_orig/VBox/HostDrivers/VBoxPci/linux/Makefile src/VBox/HostDrivers/VBoxPci/linux/Makefile
---- src_orig/VBox/HostDrivers/VBoxPci/linux/Makefile	2019-03-11 11:47:24.053811535 +0800
-+++ src/VBox/HostDrivers/VBoxPci/linux/Makefile	2019-03-11 11:51:22.547566408 +0800
-@@ -51,6 +51,7 @@ VBOXMOD_OBJS += \
- endif
- VBOXMOD_INCL = \
- 	$(VBOXPCI_DIR) \
-+	$(VBOXPCI_DIR)vboxpci \
- 	$(VBOXPCI_DIR)include \
- 	$(VBOXPCI_DIR)r0drv/linux
- VBOXMOD_DEFS = \
-@@ -61,6 +62,6 @@ VBOXMOD_DEFS = \
- 	VBOX \
- 	RT_WITH_VBOX \
- 	VBOX_WITH_HARDENING
--VBOXMOD_CFLAGS = -include $(VBOXPCI_DIR)include/VBox/SUPDrvMangling.h -fno-pie
-+VBOXMOD_CFLAGS = -include $(VBOXPCI_DIR)vboxpci/include/VBox/SUPDrvMangling.h -fno-pie
- 
- include $(obj)/Makefile-footer.gmk
diff --git a/PKGBUILD b/PKGBUILD
index 060dcc3df5ba..70a4183fbb00 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=('virtualbox-svn'
          'virtualbox-guest-utils-nox-svn'
          'virtualbox-ext-vnc-svn')
 pkgver=77588
-pkgrel=1
+pkgrel=2
 _vboxsf_commit='6738af37c935f3d9b0db138678c2cd3d8bc1fc99'
 arch=('x86_64')
 url='http://virtualbox.org'
@@ -100,7 +100,7 @@ sha256sums=('SKIP'
             '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
             '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab'
             '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
-            '3b3242a1701e4d48f78d026bc038c623bfdea1a8b79e0ead0743162d1dc925e4'
+            '0993f4832442341399b1cb908ec11d3e3a87d3b9d5e7e1be37b0ba0b96606f4e'
             '55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d'
             '06485dce54a5f21b85f4360db884d98c1ab091d3f2535881ec9fcd82feb06b7e'
             'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'