From 37f931c37d49fad2ab570a413663ab7e0aac09b0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 4 Sep 2014 15:31:38 +0200
Subject: [vmware] Support for 10.0.3

---
 remote/modules/vmware/module.build                 | 10 +++++++-
 remote/modules/vmware/module.conf                  |  2 +-
 .../patches/vmnet__3.13-9.9__1.0-10.0.2.patch      | 27 ----------------------
 3 files changed, 10 insertions(+), 29 deletions(-)
 delete mode 100644 remote/modules/vmware/patches/vmnet__3.13-9.9__1.0-10.0.2.patch

diff --git a/remote/modules/vmware/module.build b/remote/modules/vmware/module.build
index 094d5271..71319d3c 100644
--- a/remote/modules/vmware/module.build
+++ b/remote/modules/vmware/module.build
@@ -69,7 +69,7 @@ build() {
 			rm -rf -- "${SHORT}-only"
 			touch ".${SHORT}.patched"
 		fi
- 	done
+	done
 	cd "${MODULE_DIR}" || perror "Could not cd to '${MODULE_DIR}'"
 
 	# now build modules inside the chroot
@@ -103,6 +103,7 @@ post_copy() {
 parse_patch_name() {
 	[ $# -ne 1 ] && perror "parse_patch_name: Wrong parameter count."
 	local PATCH="$1"
+	# Kernel restriction
 	MIN_KERN=$(echo "$PATCH" | sed -r 's/^[^_]+__([0-9\.]+)-[0-9\.]+__[^_]+\.patch$/\1/g')
 	[[ "$MIN_KERN" == /* ]] && MIN_KERN=$(echo "$PATCH" | sed -r 's/^[^_]+__([0-9\.]+)__[^_]+\.patch$/\1/g')
 	MAX_KERN=$(echo "$PATCH" | sed -r 's/^[^_]+__[0-9\.]+-([0-9\.]+)__[^_]+\.patch$/\1/g')
@@ -110,5 +111,12 @@ parse_patch_name() {
 	[[ "$MIN_KERN" == /* ]] && MIN_KERN=
 	[[ "$MAX_KERN" == /* ]] && MAX_KERN=
 	# TODO: Parse min and max vmplayer/workstation version
+	# vmware restriction
+	MIN_VMWARE=$(echo "$PATCH" | sed -r 's/^[^_]+__[^_]+__([0-9\.]+)-[^_]+\.patch$/\1/g')
+	[[ "$MIN_VMWARE" == /* ]] && MIN_VMWARE=$(echo "$PATCH" | sed -r 's/^[^_]+__[^_]+__([0-9\.]+)\.patch$/\1/g')
+	MAX_VMWARE=$(echo "$PATCH" | sed -r 's/^[^_]+__[^_]+__[^_]+-([0-9\.]+)\.patch$/\1/g')
+	[[ "$MAX_VMWARE" == /* ]] && MAX_VMWARE=$(echo "$PATCH" | sed -r 's/^[^_]+__[^_]+__([0-9\.]+)\.patch$/\1/g')
+	[[ "$MIN_VMWARE" == /* ]] && MIN_VMWARE=
+	[[ "$MAX_VMWARE" == /* ]] && MAX_VMWARE=
 }
 
diff --git a/remote/modules/vmware/module.conf b/remote/modules/vmware/module.conf
index 749a0838..34d16c94 100644
--- a/remote/modules/vmware/module.conf
+++ b/remote/modules/vmware/module.conf
@@ -1,4 +1,4 @@
-REQUIRED_DOWNLOAD_BASE="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/linux/core/"
+REQUIRED_DOWNLOAD_BASE="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.3/1895310/linux/core/"
 REQUIRED_TYPE="workstation"
 REQUIRED_MODULES="kernel"
 REQUIRED_DIRECTORIES="
diff --git a/remote/modules/vmware/patches/vmnet__3.13-9.9__1.0-10.0.2.patch b/remote/modules/vmware/patches/vmnet__3.13-9.9__1.0-10.0.2.patch
deleted file mode 100644
index 54607506..00000000
--- a/remote/modules/vmware/patches/vmnet__3.13-9.9__1.0-10.0.2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/filter.c	2014-04-17 05:30:43.497846349 -0700
-+++ b/filter.c	2014-04-17 05:30:41.445846394 -0700
-@@ -203,7 +203,11 @@
- #endif
- 
- static unsigned int
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- VNetFilterHookFn(unsigned int hooknum,                 // IN:
-+#else
-+VNetFilterHookFn(const struct nf_hook_ops *ops,        // IN:
-+#endif
- #ifdef VMW_NFHOOK_USES_SKB
-                  struct sk_buff *skb,                  // IN:
- #else
-@@ -252,7 +256,11 @@
- 
-    /* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */
-    /* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */
--   transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
-+   #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+      transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
-+   #else
-+      transmit = (ops->hooknum == VMW_NF_INET_POST_ROUTING);
-+   #endif
- 
-    packetHeader = compat_skb_network_header(skb);
-    ip = (struct iphdr*)packetHeader;
-- 
cgit v1.2.3-55-g7522