[lilac] updated to 88654-2

3 files changed, 49 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7d6524f4364..f0bc710d78f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = virtualbox-svn
-	pkgver = 87670
+	pkgver = 88654
 	pkgrel = 2
 	url = http://virtualbox.org
 	arch = x86_64
@@ -67,7 +67,6 @@ pkgbase = virtualbox-svn
 	source = 013-Makefile.patch
 	source = 017-fix-narrowing-conversion.patch
 	source = 018-xclient.patch
-	source = 020-linux-5-11.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db
@@ -88,10 +87,9 @@ pkgbase = virtualbox-svn
 	sha256sums = 13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab
 	sha256sums = 053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491
 	sha256sums = 81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024
-	sha256sums = da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9
+	sha256sums = baafc9aa33b7022f7e7f6af16f75621dc311abbea538bf953c227e040006fb3f
 	sha256sums = 5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99
 	sha256sums = cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3
-	sha256sums = a8fb9e4d0bb662a60953c17df79f60f225aaebf192bbd2319aa2b5d7a8a28bbc
 
 pkgname = virtualbox-svn
 	pkgdesc = Powerful x86 virtualization for enterprise as well as home use
diff --git a/013-Makefile.patch b/013-Makefile.patch
index 30b44c7259fd..95e247fd9ca8 100644
--- a/013-Makefile.patch
+++ b/013-Makefile.patch
@@ -5,40 +5,56 @@ index 18466b48..7c7de4e5 100644
 @@ -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.
- 
+
+ # Building from kBuild (make -C <kernel_directory> M=`pwd`),
+ # or inside a kernel source tree.
+
  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
- 
+- 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
+
+ ifndef SUDO
+  ifneq ($(shell id -u),0)
+@@ -123,7 +123,7 @@ install-vboxpci:
+ install: install-vboxdrv install-vboxnetflt install-vboxnetadp install-vboxpci
+
+ # Look for wrapper modules, sorting them so vmmr0 is first.
+-VBOX_WRAPPER_DIRS := $(notdir $(wildcard $(CURDIR)/vbox_*))
++VBOX_WRAPPER_DIRS := $(notdir $(wildcard $(KBUILD_EXTMOD)/vbox_*))
+   ifneq ($(VBOX_WRAPPER_DIRS),)
+ VBOX_WRAPPER_DIRS := $(filter vbox_vmmr0,$(VBOX_WRAPPER_DIRS)) $(sort $(filter-out vbox_vmmr0,$(VBOX_WRAPPER_DIRS)))
+   endif
+@@ -166,7 +166,7 @@ buildid:
+ 		buildid=`readelf -n $${module} | sed -ne 's/^.*Build ID: *\([[:xdigit:]][[:xdigit:]]\)\(.*\)$$/\1\/\2/p' `; \
+ 		if [ -n "$${buildid}" ]; then \
+ 			mkdir -p ~/.debug/.build-id/`dirname $${buildid}`; \
+-			ln -sfn -- "$(CURDIR)/$${module}" ~/.debug/.build-id/$${buildid}; \
++			ln -sfn -- "$(KERNEL_EXTMOD)/$${module}" ~/.debug/.build-id/$${buildid}; \
+ 		else \
+ 			echo "warning: No build ID for $${module}"; \
+ 		fi \
+@@ -234,5 +234,5 @@ load: unload
  		fi; \
  	done
- 
+
 -endif # ! KERNELRELEASE
-+endif # ! KBUILD_EXTMOD
++endif # ! KERNEL_EXTMOD
diff --git a/PKGBUILD b/PKGBUILD
index 91dcc9742c77..c8e792ed2f34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('virtualbox-svn'
          'virtualbox-guest-utils-svn'
          'virtualbox-guest-utils-nox-svn'
          'virtualbox-ext-vnc-svn')
-pkgver=87670
+pkgver=88654
 pkgrel=2
 _vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30'
 arch=('x86_64')
@@ -79,8 +79,7 @@ source=("VirtualBox::svn+http://www.virtualbox.org/svn/vbox/trunk"
         '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
         '013-Makefile.patch'
         '017-fix-narrowing-conversion.patch'
-        '018-xclient.patch'
-        '020-linux-5-11.patch')
+        '018-xclient.patch')
 
 pkgver() {
   cd "VirtualBox"
@@ -409,7 +408,6 @@ sha256sums=('SKIP'
             '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab'
             '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491'
             '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
-            'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
+            'baafc9aa33b7022f7e7f6af16f75621dc311abbea538bf953c227e040006fb3f'
             '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99'
-            'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3'
-            'a8fb9e4d0bb662a60953c17df79f60f225aaebf192bbd2319aa2b5d7a8a28bbc')
+            'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3')