Add patch to fix vmhgfs in linux-3.11, bug 488648.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 56 insertions, 10 deletions

diff --git a/app-emulation/open-vm-tools-kmod/ChangeLog b/app-emulation/open-vm-tools-kmod/ChangeLog
index 152f5ec48054..cb23ed663c8c 100644
--- a/app-emulation/open-vm-tools-kmod/ChangeLog
+++ b/app-emulation/open-vm-tools-kmod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/open-vm-tools-kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.40 2013/10/19 23:14:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.41 2013/10/21 22:19:08 floppym Exp $
+
+  21 Oct 2013; Mike Gilbert <floppym@gentoo.org> +files/vmhgfs-linux-3.11.patch,
+  open-vm-tools-kmod-2013.09.16.1328054.ebuild:
+  Add patch to fix vmhgfs in linux-3.11, bug 488648.
 
 *open-vm-tools-kmod-9.4.0.1280544 (19 Oct 2013)
 
diff --git a/app-emulation/open-vm-tools-kmod/Manifest b/app-emulation/open-vm-tools-kmod/Manifest
index ed2641fb4506..7cd800b737f5 100644
--- a/app-emulation/open-vm-tools-kmod/Manifest
+++ b/app-emulation/open-vm-tools-kmod/Manifest
@@ -6,18 +6,19 @@ AUX 60-vmware.rules 42 SHA256 5e2a610bd563961d45fd20cbc6f832898006fdf74cf73cf1d4
 AUX fragsize.patch 4543 SHA256 fee39ad39fb9d3d84bfa09b7a51096ffc7d1f65f78a227ab591c0c006eef9f8e SHA512 96566f82bf7b0fa78444823062d847e73a9b3020c6b873a6c838efe8ad2b1a317f7b1acaf55bb4f24d1d4974dd78f4baf2091d3dac6a4dfad6172af7a4188c82 WHIRLPOOL 762534c4b1c088df67dfc0f1ae6fdf0c3b5014bc2946a50d0571a5df14d726e25f056f9bf670142240885d307e82fe0d5b3a0b14dd41e67a6b7cc04662677a67
 AUX frozen.patch 1155 SHA256 5997f5aa4d1d2bb262b9ef24888d4706f1227af4d359862d3d49b4e6c961d193 SHA512 5dbee1a119d6abd13b8217d66b8f611fee92c863b0d48029b1c05f33a06f6a20f35eaf6f01fb268a811270c6c799a1fef26939f7bfc97a42421e7f14b4cfa46d WHIRLPOOL 34244123ac2eebe6aa9d144f2af12304c1355f455b4b04b15ff5f949ffa0b23c62d40436b16371e3c5055b94afd51b2dd9ea3f92864d4f597c9b568814e3fa48
 AUX putname.patch 430 SHA256 dccba065f71f7a27dd7d38e3eb7d1de9e87b82a18db618538054043829c5d961 SHA512 4a6da3c33bdd4b03ed7cf536c40c18d76a902687378e85cce08cf9ef9b23ae6ccedb0d334f69daee3588e6e83c080adce456f36fad69848e7089401052c4d2c2 WHIRLPOOL 7b81aae3e2f4cab193cffcb1f07122b7d030110b94532af15ba373a38b1e963510958de85f301a543cd0df5d91fa7bc4794b5fc5af01d23988df423378ebaabf
+AUX vmhgfs-linux-3.11.patch 1399 SHA256 e4b1100ebf2928d4c503b36fa9a83f42bc5ca91bd7ef57d43de5511a7eb35069 SHA512 aa2de071205419d2fca9e76a4d1004241200a8f2f89157e0f08b04f74eafcabde254b706da6c3745fb44d389b1b094019857786351a07599ff9d28f8a47be0f8 WHIRLPOOL 2c2b86973ba13d01d3582f7d374936da9c210358c27e78adb3bf302c9a19c83ddf1eaa8b8e48d4c66a309c7841b893264a396f6134ee1fcf464e9cf2956f7331
 DIST open-vm-tools-2013.04.16-1098359.tar.gz 3737845 SHA256 fc939de4133d66c0cced8d0a7b5d87edcad3f598393b71c341e66bfec5087960 SHA512 682c25e315e3108617fd4d419f5bba8bf45f4966f13fa60944650390f63af2a7e4fcf740052106693403fcc2ec6f8b126e9911cbba044fc227f0c663e19f68e0 WHIRLPOOL eb13974f1e0a837617fad8c49f45e73570b343071c0619cc8408b5b9812e135cd9eafffc35a761740a58875c3e5583c625300398346d5863a2fa468044f6dd5f
 DIST open-vm-tools-2013.09.16-1328054.tar.gz 3793719 SHA256 470a6ea3ce14c2c5ea6b7bc59745eccbacc8d88a3f343e712312786435975d13 SHA512 7ae62d5411b4bdefd0e8db5f0a81bb357bfd4a624af06bf9a5a74f49ede0b7051b41dfe548c758fd7e73cded34af983c8aa0c412e65343092e05ae9b997895cb WHIRLPOOL 688fb4e494fb7aab7d0eb09189afff95ec8727bcc1893a4ec632bb8198661a1a55d58a813d2d56a3ac330fd7a55afc1fa7dc11f1d60c06c91ecf6a0bf866b249
 DIST open-vm-tools-9.4.0-1280544.tar.gz 3659504 SHA256 5d30652eb0f6dc5e930781029c184837e700be5543b6a7116db4c62a6f3ca399 SHA512 07b36f49713140606f74864b59c2e01c9ed83a960dd3f5d172b84fc75e760f7370065774a0e26897924af60454c86b682ca0fd32276b0e9fb17b268247f8cbdf WHIRLPOOL 88533768cf718de3b5f64e688597209fa2029d02cdf350d7fd05ec8dd8ca0f0c125a8d1445c1ec9287bc486076d5c335f3cc615c3f0b9aa7bac84e921da4c9e6
 EBUILD open-vm-tools-kmod-2013.04.16.1098359.ebuild 1805 SHA256 904f03a7e1c24db74076a5661305910115350a86c0738a72f628f1414bc5e842 SHA512 ed8bc3f4292a34ffb0a9690d1e39daba9f3a6f2637a5a5d958d7fdf8671f2634745f081d01e05d53ae2f33abe91d231be42f6497a6833ca6bebf9b2ed6d7ff28 WHIRLPOOL cc66d89cd8a419d95dbe83081791bd0a7a1534ff7ba68d159df6507e19ee8ae0facf8ee2438406c578f746e515cbe09800b06ddcb01d360c85e0d63511a47227
-EBUILD open-vm-tools-kmod-2013.09.16.1328054.ebuild 1430 SHA256 309d123d02357d99da8833aafad6eb8f045ac7e754877f0b77437fd6df077bf6 SHA512 fea0e855d4a01677c74ba8be2c68712e11aa99d005f8f6647fc8a2576969bb66aec39226d4d10e08ad293ee3a6cbf970a6fc8a831816bbae97ce6a6dfea0ea38 WHIRLPOOL 806d1787718937fe0ea6f6ea5860c136c8cd291c1dad35ee487d049e32fc9d4e01ba92b8d565aaaadddf5231550d606f49fcf50bd9adf3e7aa1ebf16bbe5fe11
+EBUILD open-vm-tools-kmod-2013.09.16.1328054.ebuild 1404 SHA256 0589316ad08633473b935e44271c6f32b64b44b519fe897cb7697d18a635d573 SHA512 69bbe3eb8dd956676022fc39daafff6553df684b04c5432e3ac5823e3e5cc39bb3332ab24f1e7870ce9dfe0c31dfc67cb2e0e02da3629d4707f73a1114b87b08 WHIRLPOOL bd70b50adf9a161fa6cc9624151c1fe2240aa77fd602c2f5619a6dbf79d28ca4b901b679e00f77581ac764b5a1083b251f5bfdcd1c6891bdb429a9216f443afd
 EBUILD open-vm-tools-kmod-9.4.0.1280544.ebuild 1425 SHA256 2b3ed6c81f0bf13b23ecccc8989940b5f9f8e40c2545a028563791a1dec10ed8 SHA512 71675e4651ac93f095c4e1356fdb379bdd259c4302bb07251037564821b8b3356dd284097a1e218ef86274a4395f7531548f980bd6cdd4e50c8d09b0595d3c1a WHIRLPOOL 0d122370b02f48738ee51b658a67d15c9bc1e113afe7dc7a05e45d4f4095e13fe87263282ada1a89bbc2e93e551f9f49f223619e81df9b76e1ecc76690ba7923
-MISC ChangeLog 8385 SHA256 e8ce053522ca9ef07a1cf5744294e925a6c2c9ff953a632bdd8d6bc442e9e38b SHA512 c289f41c9ec3dfd5626735ec63acc3985475cc72d26c3c0ce674ad376584b95d030e39e45be37c3b0ea16f336edac5bc204e757e4af9fd457bea80612ddfe524 WHIRLPOOL 5d6e01c481199641a5da0793850176634a7a6c6231b5549b7c5220e40c6deca39fecb73d315b378205b8bdc01208a64d3cfd84788882f56104f16be5eb693f4b
+MISC ChangeLog 8568 SHA256 e8d1f623c985c58d161a66b2d6700bbcf8896adb4711ac9ac01064f89a8664b6 SHA512 f69ec0ef474b700f4408b6790858651f5c8caf28e79018efa57b60830612a21604f3990d5aa55e8c7f4a3e820066973611395c0880f6a63ef73a1b6d303b57dd WHIRLPOOL 6f7b4aecb95b270bab7b9701fd69a19ecade81b01e579e5ce849666a1a5de1ff1895622046dc489c2e4c34d44ef35081baa011e6c294a02e08caf6fc9e2b0d8e
 MISC metadata.xml 439 SHA256 0d83c61a0bd4e45720f5c6052187d0aa236c246c330934533e7dffcc7668b2c6 SHA512 4080043ebdc6e0a172cd290a7c59dd2482a2bae3b00fc1d845b58e7e390d80e8db9d5311e473e1e384560026b6bc6c1dfcec84785b145047e08ed56c05829112 WHIRLPOOL 81b28c9e864047c0fccc948ac2f256546677b934d44830d084d3174458ffcbf8e092617b289af650840bfb1c66e4d8a8d246c1794b031aee84318ea1c846079b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJjEjwACgkQC77qH+pIQ6TChwEArjzraUtjPqpv7FS8iHPIeuZ8
-Ut96QvN96Yf8x4VR89YA/0cDUyYDPadjlI5WuFi6d8oLrsU+s/3hKc/aGO8nx9gt
-=6BtB
+iF4EAREIAAYFAlJlqF4ACgkQC77qH+pIQ6Tx/gD7Blo35AcmM8ndpY4UoJgtH8uX
+xhBO/1S4/YULRlX1MgEA/iLYux500q6GOJeIcqvkD+oxJEULC0IAEn2QI8qwqN/3
+=kgxa
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/open-vm-tools-kmod/files/vmhgfs-linux-3.11.patch b/app-emulation/open-vm-tools-kmod/files/vmhgfs-linux-3.11.patch
new file mode 100644
index 000000000000..3918162a7057
--- /dev/null
+++ b/app-emulation/open-vm-tools-kmod/files/vmhgfs-linux-3.11.patch
@@ -0,0 +1,42 @@
+Source: https://github.com/rasa/vmware-tools-patches/
+
+--- a/modules/linux/vmhgfs/inode.c
++++ b/modules/linux/vmhgfs/inode.c
+@@ -31,6 +31,9 @@
+ #include <linux/namei.h>
+ #endif
+ #include <linux/highmem.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
++#include <linux/dcache.h>
++#endif
+
+ #include "compat_cred.h"
+ #include "compat_fs.h"
+@@ -1890,7 +1893,11 @@
+ #endif
+                            &inode->i_dentry,
+                            d_alias) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
++         int dcount = d_count(dentry);
++#else
+          int dcount = dentry->d_count;
++#endif
+          if (dcount) {
+             LOG(4, ("Found %s %d \n", dentry->d_name.name, dcount));
+             return HgfsAccessInt(dentry, mask & (MAY_READ | MAY_WRITE | MAY_EXEC));
+@@ -1943,10 +1950,12 @@
+       list_for_each(pos, &inode->i_dentry) {
+          int dcount;
+          struct dentry *dentry = list_entry(pos, struct dentry, d_alias);
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
+-         dcount = atomic_read(&dentry->d_count);
+-#else
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
++         dcount = d_count(dentry);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+          dcount = dentry->d_count;
++#else
++         dcount = atomic_read(&dentry->d_count);
+ #endif
+          if (dcount) {
+             LOG(4, ("Found %s %d \n", (dentry)->d_name.name, dcount));
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild
index 326561a30a99..dffb3bbc4507 100644
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild
+++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild,v 1.3 2013/10/19 17:02:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild,v 1.4 2013/10/21 22:19:08 floppym Exp $
 
 EAPI="5"
 
@@ -30,7 +30,7 @@ pkg_setup() {
 	if kernel_is -lt 3 9; then
 		MODULES+=" vmci vsock"
 	else
-		CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
+		CONFIG_CHECK+=" VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
 	fi
 
 	if kernel_is -lt 3; then
@@ -48,8 +48,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/frozen.patch"
-	epatch "${FILESDIR}/putname.patch"
+	epatch "${FILESDIR}/vmhgfs-linux-3.11.patch"
 	epatch_user
 }