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

(Portage version: 2.1.2_pre1-r4)

5 files changed, 110 insertions, 1 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/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
+ }
+