5.1.14-3: Merge [community] changes

3 files changed, 33 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da75b64a9769..af2248130f88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Feb  7 00:08:17 UTC 2017
+# Mon Feb 27 21:31:10 UTC 2017
 pkgbase = virtualbox-headless
 	pkgdesc = Powerful x86 virtualization for enterprise as well as home use. Headless build (no GUI, no Java).
 	pkgver = 5.1.14
-	pkgrel = 2
+	pkgrel = 3
 	url = http://virtualbox.org
 	install = virtualbox.install
 	arch = i686
@@ -48,6 +48,7 @@ pkgbase = virtualbox-headless
 	source = 006-rdesktop-vrdp-keymap-path.patch
 	source = 007-python2-path.patch
 	source = 008-no-vboxvideo.patch
+	source = 009-linux-4-10.patch
 	md5sums = 21eaec9f21477d555559a63761779880
 	md5sums = 984412a63aa9c07ddc3cfd970381d5df
 	md5sums = 6e2722bfd7013c1b0174382626ac1b8d
@@ -63,6 +64,7 @@ pkgbase = virtualbox-headless
 	md5sums = d82a6f19be739341ed7f1cf4ee8070ca
 	md5sums = 188ea65918309f737ce28216c2b07c3b
 	md5sums = 8e369367001e2ed3c1e3d23ac474fa33
+	md5sums = 22ac21e608eed91463309edf47be4982
 	makedepends_x86_64 = gcc-multilib
 
 pkgname = virtualbox-headless
diff --git a/009-linux-4-10.patch b/009-linux-4-10.patch
new file mode 100644
index 000000000000..b5fc2d135270
--- /dev/null
+++ b/009-linux-4-10.patch
@@ -0,0 +1,24 @@
+From d9bd947b1fa1d7c47cd1cdb894dadfa07f51e446 Mon Sep 17 00:00:00 2001
+From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
+Date: Tue, 24 Jan 2017 08:13:25 +0000
+Subject: [PATCH] Additions/linux/sharedfolders: Linux 4.10 fix
+
+git-svn-id: http://www.virtualbox.org/svn/vbox@65409 cfe28804-0f27-0410-a406-dd0f0b0b656f
+---
+ trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/VBox/Additions/linux/sharedfolders/lnkops.c b/src/VBox/Additions/linux/sharedfolders/lnkops.c
+index 66ddecd..e43b84c 100644
+--- a/src/VBox/Additions/linux/sharedfolders/lnkops.c
++++ b/src/VBox/Additions/linux/sharedfolders/lnkops.c
+@@ -90,7 +90,9 @@ static const char *sf_get_link(struct dentry *dentry, struct inode *inode,
+ 
+ struct inode_operations sf_lnk_iops =
+ {
++# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+     .readlink       = generic_readlink,
++# endif
+ # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+     .get_link       = sf_get_link
+ # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
diff --git a/PKGBUILD b/PKGBUILD
index f36a61d85a12..e9eef72c9fb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=virtualbox-headless
 pkgver=5.1.14
-pkgrel=2
+pkgrel=3
 pkgdesc='Powerful x86 virtualization for enterprise as well as home use. Headless build (no GUI, no Java).'
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
@@ -37,6 +37,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         '006-rdesktop-vrdp-keymap-path.patch'
         '007-python2-path.patch'
         '008-no-vboxvideo.patch'
+        '009-linux-4-10.patch'
         )
 md5sums=('21eaec9f21477d555559a63761779880'
          '984412a63aa9c07ddc3cfd970381d5df'
@@ -52,7 +53,9 @@ md5sums=('21eaec9f21477d555559a63761779880'
          'e8a0b47e61ddcffdeed71086585a1ef3'
          'd82a6f19be739341ed7f1cf4ee8070ca'
          '188ea65918309f737ce28216c2b07c3b'
-         '8e369367001e2ed3c1e3d23ac474fa33')
+         '8e369367001e2ed3c1e3d23ac474fa33'
+         '22ac21e608eed91463309edf47be4982'
+         )
 
 prepare() {
     cd "VirtualBox-$pkgver"