Add patches for -r1 ebuilds to ensure they work on 2.6.25 and older kernels.

Package-Manager: portage-2.1.5_rc6

2 files changed, 97 insertions, 5 deletions

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 250c4499085b..e71014e22d4b 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -4,8 +4,11 @@ Hash: SHA1
 AUX 1.0.0.17-update115-nasty-hack.patch 550 RMD160 851d4e52c09b93c084e13b659e8d6a6ead61c020 SHA1 614d0207291d40ecd211b345e587cb1081deccc0 SHA256 fc90a3ebc43419b1e01c4cb4ecea85698112b4818158ebaf9c50b2fc50d0e46c
 AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 SHA1 be4f203063e676dc022ce600e15479b6ea56b954 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db
 AUX patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1ef97639351d82141 SHA1 d0a40f0483a144fc98d02213c6c63b2e2ddb9f66 SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521
+AUX patches/vmblock/010_all_kernel-2.6.25.patch 2398 RMD160 d0a3464f03486eda983b230d0bd90bca8a5d7ed3 SHA1 b5de035a7d1f0051a76512be7e25b04ff3d0dbdd SHA256 4036d37415cad6109e95e82c3789f32ea2c4901961612fb158d5f7148671b32e
 AUX patches/vmmon/030_all_fix-linux-headers.patch 472 RMD160 164b926b0cf53c1a695e7d9ee3e52c5bc1305443 SHA1 b2e485bd21c4106cccc00293df20bce6917e62a4 SHA256 092254308afc9848fd5cc63fb691ee67103fe6413a20e01a568278153d5e876c
+AUX patches/vmmon/035_all_kernel-2.6.25.patch 541 RMD160 fb0ec4af96238541ef3d5c6d28436166ccacfe7d SHA1 87b1226bc6b74e35c2945c65c7902c03eafa5058 SHA256 e6bba380c0943ee02b3c19cae340238b0a40614b3f5f840a40516ed05e1d964c
 AUX patches/vmnet/021_all_wireless_fix.patch 668 RMD160 dbcd47fc4749b36417d028a5701b831035853d9e SHA1 a3e714383be2e0abbc434d5f3ef5253b72978c81 SHA256 231e4c15eb67753da10c01cfebecd851a01f6956263df69e4fb5a9a42957ff60
+AUX patches/vmnet/025_all_kernel-2.6.25.patch 939 RMD160 c7f9f0b9e7bf98b4b37db70926c1c463874e8458 SHA1 43f8f9a5a0b9a28223ad901afd5b45749447bdc4 SHA256 a3247b261376f7cde78724d5704c4ea2511d54644f9c2b776b41f19d261cba17
 DIST VMware-player-2.0.2-59824.i386.tar.gz 67762051 RMD160 bdf0375045aa2702f0c19cf755e019307316db2e SHA1 52a9018438746ac88e965ae081120da6f8e9fbf5 SHA256 2fcaca511c0344333d9f306bab09507573c17cc4d71807a545624953cc68e138
 DIST VMware-player-2.0.2-59824.x86_64.tar.gz 33049210 RMD160 1d4351d7cc8bec4d4fe492c46656807ac2220717 SHA1 a7aace822f5a730ec7d289d074c607832abd8c72 SHA256 b0fce2e1552070d492e04ab684aa32fecf587ec06e3ab802373d5e94e0e9f72b
 DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
@@ -15,12 +18,12 @@ EBUILD vmware-modules-1.0.0.15-r1.ebuild 311 RMD160 910dd70caac0af5c1bdb6d714b96
 EBUILD vmware-modules-1.0.0.16-r1.ebuild 350 RMD160 1be5daf6e1bbf0a83dace59330e327d628624cde SHA1 5c77c28e8449d3c1a9be5fef18a3f0efafcfbd51 SHA256 191e9998c8351111566e9e2dc68ac5e20f6dd48b6ad1998eb60403b7334158bc
 EBUILD vmware-modules-1.0.0.17-r1.ebuild 459 RMD160 2ef0f8d190cec299cccf440e7cc53aea95000f1d SHA1 86d85a23f0574a33da06309e8d470b89ceff5fac SHA256 0701e46f0b3cf2fb1bbc20d3b3eb8a6be680889ed3bcc8c06aa8e905a9be74fb
 EBUILD vmware-modules-1.0.0.17.ebuild 631 RMD160 ff0c15ea2f767f35d7ffa7a611f931ced71eff47 SHA1 dcd2851c5e6c591772dd7fa75ac4ce2f857d69df SHA256 d4514fc8c500f87342fa9cd971400919c3b727d71581ab9d6c85e9859036f8ae
-MISC ChangeLog 6579 RMD160 d2bbaaf6d735200112585d61dc67495a3d96493b SHA1 ed66d34270058fbf695643f4b8d75d89fcc562a7 SHA256 67eb5a75d2a4d4531cf5795594b42413a7c067a21fadb857782787d6ed4d427b
+MISC ChangeLog 6864 RMD160 b3f571e77abd056de7cce6ebec775dde80cd7220 SHA1 54b388262824c527afe4edca93d2b1ce392fba82 SHA256 38010e06f7308f2ec4914740d1a21d187220a700fcb318945d207ed06bc1e925
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFHoeAPu7rWomwgFXoRAiE5AJ9tzlrAiN1k7JseBcOsSAK/lAFWZgCfZd5K
-xZCml+Ln4VgHg35yelvi8qQ=
-=yS06
+iEYEARECAAYFAkgTPpsACgkQu7rWomwgFXqhegCfZW8XbTNSSHpf+TAa0ZyIEe1f
+cFsAnR3tZaevCf04Bsq8xaRxfi1D3r7J
+=aBXX
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/patches/vmblock/010_all_kernel-2.6.25.patch b/app-emulation/vmware-modules/files/patches/vmblock/010_all_kernel-2.6.25.patch
new file mode 100644
index 000000000000..6b1d58fc28b9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/patches/vmblock/010_all_kernel-2.6.25.patch
@@ -0,0 +1,89 @@
+diff --git a/linux/dentry.c b/linux/dentry.c
+index a39bb76..07c6296 100644
+--- a/linux/dentry.c
++++ b/linux/dentry.c
+@@ -112,7 +112,7 @@ DentryOpRevalidate(struct dentry *dentry,  // IN: dentry revalidating
+       LOG(4, "DentryOpRevalidate: [%s] no longer exists\n", iinfo->name);
+       return 0;
+    }
+-   ret = actualNd.dentry && actualNd.dentry->d_inode;
++   ret = nd_dentry(&actualNd) && nd_dentry(&actualNd)->d_inode;
+    path_release(&actualNd);
+ 
+    LOG(8, "DentryOpRevalidate: [%s] %s revalidated\n",
+diff --git a/linux/filesystem.c b/linux/filesystem.c
+index fb6d0bf..e979072 100644
+--- a/linux/filesystem.c
++++ b/linux/filesystem.c
+@@ -273,7 +273,7 @@ Iget(struct super_block *sb,    // IN: file system superblock object
+
+    ASSERT(sb);
+
+-   inode = iget(sb, ino);
++   inode = iget_locked(sb, ino);
+    if (!inode) {
+       return NULL;
+    }
+@@ -301,7 +301,7 @@ Iget(struct super_block *sb,    // IN: file system superblock object
+       return inode;
+    }
+ 
+-   iinfo->actualDentry = actualNd.dentry;
++   iinfo->actualDentry = nd_dentry(&actualNd);
+    path_release(&actualNd);
+ 
+    return inode;
+@@ -307,7 +307,7 @@ Iget(struct super_block *sb,    // IN: file system superblock object
+    return inode;
+
+ error_inode:
+-   iput(inode);
++   iget_failed(inode);
+    return NULL;
+ }
+
+diff --git a/linux/filesystem.h b/linux/filesystem.h
+index 697d112..0f5f32f 100644
+--- a/linux/filesystem.h
++++ b/linux/filesystem.h
+@@ -51,6 +51,27 @@
+ 
+ #include "vm_basic_types.h"
+ 
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 24)
++#define nd_dentry(nd)  (nd)->path.dentry
++#define nd_mnt(nd)     (nd)->path.mnt
++
++static inline void path_release(struct nameidata *nd)
++{
++       path_put(&nd->path);
++}
++
++#else
++#define nd_dentry(nd)  (nd)->dentry
++#define nd_mnt(nd)     (nd)->mnt
++
++static inline void iget_failed(struct inode *inode)
++{
++	make_bad_inode(inode);
++	unlock_new_inode(inode);
++	iput(inode);
++}
++#endif
++
+ #ifndef container_of
+ #define container_of(ptr, type, memb)   ((type *)((char *)(ptr) - offsetof(type, memb)))
+ #endif
+diff --git a/linux/super.c b/linux/super.c
+index 2f2a9aa..697917d 100644
+--- a/linux/super.c
++++ b/linux/super.c
+@@ -52,7 +52,7 @@ struct super_operations VMBlockSuperOps = {
+ #else
+    .clear_inode   = SuperOpClearInode,
+ #endif
+-   .read_inode    = SuperOpReadInode,
++//   .read_inode    = SuperOpReadInode,
+    .statfs        = SuperOpStatfs,
+ };
+