Added some more patches from 5.5 to hopefully resolve bug #122322.

Package-Manager: portage-2.1.2_pre1-r4

6 files changed, 133 insertions, 8 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 8b57bba5cc5b..f2f40e25e9ad 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.137 2006/09/28 18:22:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.138 2006/09/29 13:43:56 wolf31o2 Exp $
+
+  29 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/4.5.3.19414/000_all_initd-location.patch,
+  +files/4.5.3.19414/001_all_fix-permissions.patch,
+  +files/4.5.3.19414/004_all_do-not-build-modules.patch,
+  +files/4.5.3.19414/007_all_use-modprobe-over-insmod.patch:
+  Added some more patches from 5.5 to hopefully resolve bug #122322.
 
 *vmware-workstation-5.5.2.29772 (28 Sep 2006)
 
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index ab17e89c36a9..8ec68e71db1d 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -17,14 +17,30 @@ AUX 3.2.1.2242/vmware-glibc-2.3.2-compat.c 1039 RMD160 44d68670a7f0221668e9a2bef
 MD5 b95a250f31a6d2005176b27b8d48c182 files/3.2.1.2242/vmware-glibc-2.3.2-compat.c 1039
 RMD160 44d68670a7f0221668e9a2bef94591bd25d48ce4 files/3.2.1.2242/vmware-glibc-2.3.2-compat.c 1039
 SHA256 8193b9526bc7dce4e24169ba4fc69fdbff8cd3a77e1127538f82a4ab520b9717 files/3.2.1.2242/vmware-glibc-2.3.2-compat.c 1039
+AUX 4.5.3.19414/000_all_initd-location.patch 1678 RMD160 179cf5d4386034f451d93e30f8f440f91775949f SHA1 10602340c4591adf454deedf932495fbf05bfef4 SHA256 c43f07518e28c9f938fbf345ebbb9201c5f707a743aeb61a104ed377bd8b60a8
+MD5 5710ea1b55fab63f86f87adfb5eb5f06 files/4.5.3.19414/000_all_initd-location.patch 1678
+RMD160 179cf5d4386034f451d93e30f8f440f91775949f files/4.5.3.19414/000_all_initd-location.patch 1678
+SHA256 c43f07518e28c9f938fbf345ebbb9201c5f707a743aeb61a104ed377bd8b60a8 files/4.5.3.19414/000_all_initd-location.patch 1678
 AUX 4.5.3.19414/000_all_librarypath.patch 807 RMD160 91085288d7199624ef867c63ad6322c1ec8074dc SHA1 bba14592ccfbe1fbb96aa2928bf0973140641ea4 SHA256 10093b2adcc98d5c6be0624945f4d2cfdbb6489fbdda4c0df088a08c69f2da91
 MD5 87e9f24e29aaec45c84f7e57a50f96f2 files/4.5.3.19414/000_all_librarypath.patch 807
 RMD160 91085288d7199624ef867c63ad6322c1ec8074dc files/4.5.3.19414/000_all_librarypath.patch 807
 SHA256 10093b2adcc98d5c6be0624945f4d2cfdbb6489fbdda4c0df088a08c69f2da91 files/4.5.3.19414/000_all_librarypath.patch 807
+AUX 4.5.3.19414/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
+MD5 3df74f4dfaa783b6a2f9eba3f0030afa files/4.5.3.19414/001_all_fix-permissions.patch 647
+RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 files/4.5.3.19414/001_all_fix-permissions.patch 647
+SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391 files/4.5.3.19414/001_all_fix-permissions.patch 647
 AUX 4.5.3.19414/002_all_pagebreak-detection-fix.patch 671 RMD160 9e8a46b76621b67be28cba60524bc4dea0dbd068 SHA1 9ff01452cc40dc0570e727b75f415b5c779e9086 SHA256 df96cf12b9e7ab2578c134c94e43f11fb8a187a3a0ddf8f645a8aa126020caab
 MD5 c97a07443c0b9124d7cecec1e15bee07 files/4.5.3.19414/002_all_pagebreak-detection-fix.patch 671
 RMD160 9e8a46b76621b67be28cba60524bc4dea0dbd068 files/4.5.3.19414/002_all_pagebreak-detection-fix.patch 671
 SHA256 df96cf12b9e7ab2578c134c94e43f11fb8a187a3a0ddf8f645a8aa126020caab files/4.5.3.19414/002_all_pagebreak-detection-fix.patch 671
+AUX 4.5.3.19414/004_all_do-not-build-modules.patch 922 RMD160 0e9496f6aeec71d875b7063e59319c4741f5ed0d SHA1 5012cb9945d018878224aa73bb9ca9c3fea9e610 SHA256 fea0624d56f545eb9c11ea7f437067ab331f8f5ed1780e55e17e2181917d111a
+MD5 551d032b36024c3209e28f2021a97c04 files/4.5.3.19414/004_all_do-not-build-modules.patch 922
+RMD160 0e9496f6aeec71d875b7063e59319c4741f5ed0d files/4.5.3.19414/004_all_do-not-build-modules.patch 922
+SHA256 fea0624d56f545eb9c11ea7f437067ab331f8f5ed1780e55e17e2181917d111a files/4.5.3.19414/004_all_do-not-build-modules.patch 922
+AUX 4.5.3.19414/007_all_use-modprobe-over-insmod.patch 448 RMD160 136dfcfe2df7a7ebf2844749f473a6c6d0bb3084 SHA1 0ad152b3cb738521296322b56e9f247926690e67 SHA256 9497f8ad6acb2460e27bd5430670e79129ec2ffbf6f5b8dae62084e5e56059ee
+MD5 f5a4bba93e2ef942332dbe7105f2b204 files/4.5.3.19414/007_all_use-modprobe-over-insmod.patch 448
+RMD160 136dfcfe2df7a7ebf2844749f473a6c6d0bb3084 files/4.5.3.19414/007_all_use-modprobe-over-insmod.patch 448
+SHA256 9497f8ad6acb2460e27bd5430670e79129ec2ffbf6f5b8dae62084e5e56059ee files/4.5.3.19414/007_all_use-modprobe-over-insmod.patch 448
 AUX 4.5.3.19414/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
 MD5 9689ef9d197dcc43dc2f390e6de4ec21 files/4.5.3.19414/009_all_init.d-modules-warning.patch 991
 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d files/4.5.3.19414/009_all_init.d-modules-warning.patch 991
@@ -123,10 +139,10 @@ EBUILD vmware-workstation-5.5.2.29772.ebuild 2906 RMD160 985158f7df7e93533daecd5
 MD5 68e2b10f527f8d5ce6655762a5e56080 vmware-workstation-5.5.2.29772.ebuild 2906
 RMD160 985158f7df7e93533daecd51468a6afb366eccba vmware-workstation-5.5.2.29772.ebuild 2906
 SHA256 02e0f0ae3ca962d1b8db72f906e72e890e52e53dd6f8a50abc983b48da5075de vmware-workstation-5.5.2.29772.ebuild 2906
-MISC ChangeLog 8611 RMD160 5b8cef8eed78f11680fe648f5fc2296a267a76f9 SHA1 19991b8bdbc1dda84ff0261293f585757101ceff SHA256 550111e7104caa1a9cda1eef720f86c67b0577993967957b4b231cc7a2319397
-MD5 2a710dacf7dd78551221616981406354 ChangeLog 8611
-RMD160 5b8cef8eed78f11680fe648f5fc2296a267a76f9 ChangeLog 8611
-SHA256 550111e7104caa1a9cda1eef720f86c67b0577993967957b4b231cc7a2319397 ChangeLog 8611
+MISC ChangeLog 8956 RMD160 8a4201e5f52a450360a04d9b0c6cfd690ea3e720 SHA1 7765f9347c87b77ee783fc3eff2511a2d36a4485 SHA256 865d9493d584a447a7849d013c6de621af79b843edff57487d7c3321873392ef
+MD5 c697abaa7a6f34752606747d9036ae3e ChangeLog 8956
+RMD160 8a4201e5f52a450360a04d9b0c6cfd690ea3e720 ChangeLog 8956
+SHA256 865d9493d584a447a7849d013c6de621af79b843edff57487d7c3321873392ef ChangeLog 8956
 MISC metadata.xml 339 RMD160 9f4931e525280fd376eb7ac3e42c369acd23a33e SHA1 3948dcc9a9b7dc585f1783e0419b313084a231c0 SHA256 bb60a871a58964feaa59ec824a5d511455054461f0394a57a8c9ca019a0f4593
 MD5 a4e5ebe5e931d6196fd49550e067b078 metadata.xml 339
 RMD160 9f4931e525280fd376eb7ac3e42c369acd23a33e metadata.xml 339
@@ -155,7 +171,7 @@ SHA256 a72416ea87fdc8e7613484a5d562511d40e29a4f9d8253cf44ad066bda3e57dc files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFHBL+kT4lNIS36YERAlyOAJ96SKmQMjNiMaUWfqh8mCjGGTiAiACfRibh
-cDEjy9dJkO5e6ZzNYAAThQc=
-=WFKp
+iD4DBQFFHSM+kT4lNIS36YERAuOHAJieEZmV8lTGWlv5e8/5e71doOX4AKCWByUu
+hb1OY7s33bWGEW0+1I6Dnw==
+=dnWJ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-workstation/files/4.5.3.19414/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/4.5.3.19414/000_all_initd-location.patch
new file mode 100644
index 000000000000..7e13eb4dceb6
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/4.5.3.19414/000_all_initd-location.patch
@@ -0,0 +1,47 @@
+--- vmware-distrib/bin/vmware-config.pl.ori	2006-09-29 09:14:36.000000000 -0400
++++ vmware-distrib/bin/vmware-config.pl	2006-09-29 09:20:06.000000000 -0400
+@@ -3738,7 +3738,7 @@
+       internal_sed($mouse_file . $cBackupExtension,
+                    $mouse_file, 0, \%p);
+       if (!$gOption{'skipstopstart'}) {
+-        system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/gpm')
++        system(shell_string('/etc/init.d/gpm')
+                . ' restart');
+       }
+     }
+@@ -5425,7 +5425,7 @@
+ 
+ # Restart the inetd service
+ sub restart_inetd {
+-  my $inetd_restart = db_get_answer('INITSCRIPTSDIR') . '/inetd';
++  my $inetd_restart = '/etc/init.d/inetd';
+   if (-e $inetd_restart) {
+     if (!system(shell_string($inetd_restart) . ' restart')) {
+       return;
+@@ -5532,7 +5532,7 @@
+ 
+ #Restart xinetd
+ sub restart_xinetd {
+-  my $xinetd_restart = db_get_answer('INITSCRIPTSDIR') . '/xinetd';
++  my $xinetd_restart = '/etc/init.d/xinetd';
+   if (-e $xinetd_restart) {
+     if (!system(shell_string($xinetd_restart) . ' restart')) {
+       return;
+@@ -7383,7 +7383,7 @@
+           . 'a /proc/vmware directory.' . "\n\n");
+   }
+   if (!$gOption{'skipstopstart'} &&
+-      system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware')
++      system(shell_string('/etc/init.d/vmware')
+              . ' stop')) {
+     error('Unable to stop services for ' . vmware_product_name() . "\n\n");
+   }
+@@ -7473,7 +7473,7 @@
+   db_save();
+   # Then start VMware's services
+   if (!$gOption{'skipstopstart'}) {
+-    system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
++    system(shell_string('/etc/init.d/vmware') . ' start');
+     print "\n";
+   }
+ 
diff --git a/app-emulation/vmware-workstation/files/4.5.3.19414/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/4.5.3.19414/001_all_fix-permissions.patch
new file mode 100644
index 000000000000..e646b7b2da5c
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/4.5.3.19414/001_all_fix-permissions.patch
@@ -0,0 +1,15 @@
+diff -urN vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
+--- vmware-distrib.orig/bin/vmware-config.pl	2005-12-16 00:51:03.000000000 -0500
++++ vmware-distrib/bin/vmware-config.pl	2005-12-21 14:34:03.000000000 -0500
+@@ -7327,7 +7327,10 @@
+     error('Unable to write configuration file "' . $name . '".' . "\n\n");
+   }
+   db_add_file($name, 0x1);
+-  safe_chmod(0644, $name);
++  safe_chmod(0664, $name);
++  my $gid = (getgrnam('vmware'))[2];
++  my $uid = (stat($name))[4];
++  safe_chown($uid,$gid,$name);
+ 
+   # Append the promotional configuration if it exists
+   $promoconfig = $libdir . '/configurator/PROMOCONFIG';
diff --git a/app-emulation/vmware-workstation/files/4.5.3.19414/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/4.5.3.19414/004_all_do-not-build-modules.patch
new file mode 100644
index 000000000000..2144f412f09d
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/4.5.3.19414/004_all_do-not-build-modules.patch
@@ -0,0 +1,28 @@
+--- vmware-distrib/bin/vmware-config.pl.ori	2006-09-29 09:33:55.000000000 -0400
++++ vmware-distrib/bin/vmware-config.pl	2006-09-29 09:38:07.000000000 -0400
+@@ -5980,9 +5980,9 @@
+   # Get this set up even if the user doesn't want networking.  The
+   # reason is that samba may turn on networking and it needs this
+   # module to use networking.
+-  if (configure_module('vmnet') eq 'no') {
+-    module_error();
+-  }
++#  if (configure_module('vmnet') eq 'no') {
++#    module_error();
++#  }
+ 
+   # Fix for bug 15842.  Always regenerate the network settings because an
+   # upgrade leaves us in an inconsistent state.  The database will have
+@@ -7410,9 +7410,9 @@
+   }
+   if (vmware_product() eq 'server') {
+     configure_vmkernel();
+-  } else {
+-    configure_mon();
+-    configure_pp();
++#  } else {
++#    configure_mon();
++#    configure_pp();
+   }
+   configure_net();
+   # Create the directory for the UNIX domain sockets
diff --git a/app-emulation/vmware-workstation/files/4.5.3.19414/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/4.5.3.19414/007_all_use-modprobe-over-insmod.patch
new file mode 100644
index 000000000000..c29a87e8f226
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/4.5.3.19414/007_all_use-modprobe-over-insmod.patch
@@ -0,0 +1,12 @@
+diff -uNr vmware-server-distrib/installer/services.sh vmware-server-distrib.new/installer/services.sh
+--- vmware-server-distrib/installer/services.sh	2006-02-05 00:21:25.000000000 +0000
++++ vmware-server-distrib.new/installer/services.sh	2006-02-20 23:48:07.000000000 +0000
+@@ -538,7 +538,7 @@
+ }
+ 
+ vmware_load_module() {
+-   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
++   /sbin/modprobe -s -f "$1" || exit 1
+    exit 0
+ }
+