Version bump, to fix bug 213548.

(Portage version: 2.1.4.4)
 (Signed Manifest commit)

8 files changed, 139 insertions, 4 deletions

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index a249dd7fbf3c..2562181eef6a 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -28,6 +28,13 @@ AUX 6.0.2.59824/004_all_do-not-build-modules.patch 654 RMD160 dd279f8043ab99b033
 AUX 6.0.2.59824/007_all_use-modprobe-over-insmod.patch 448 RMD160 136dfcfe2df7a7ebf2844749f473a6c6d0bb3084 SHA1 0ad152b3cb738521296322b56e9f247926690e67 SHA256 9497f8ad6acb2460e27bd5430670e79129ec2ffbf6f5b8dae62084e5e56059ee
 AUX 6.0.2.59824/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
 AUX 6.0.2.59824/011_all_legit-modules-only.patch 646 RMD160 484d15ebc05fb93d69866987cf805afdbba019c9 SHA1 f36a8b4b7153cfe213ee7cd1e82c871f3c9efa90 SHA256 b66a534d93ae7dc76b54631cbbaccc751691941ab704a9c1e566a9c866b15729
+AUX 6.0.3.80004/000_all_initd-location.patch 1133 RMD160 63a226ee89922fc7d1cc4de75e80ee0befb13bb2 SHA1 64d7d8e7218fa34e798ea1e9cdafe0085bbee0fa SHA256 f5a9aab71e5cd04292d0a37812505e08f0d7860399ab0dd35cccae9bfbb665be
+AUX 6.0.3.80004/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
+AUX 6.0.3.80004/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
+AUX 6.0.3.80004/004_all_do-not-build-modules.patch 654 RMD160 dd279f8043ab99b033b6ce74b2cbfc31cf6c1578 SHA1 19052ac7558b101616cecb05bf7fcae23251ea03 SHA256 694f953e64972fd81804748d7c2736934169c75e4454d3862f0a948db48ba284
+AUX 6.0.3.80004/007_all_use-modprobe-over-insmod.patch 448 RMD160 136dfcfe2df7a7ebf2844749f473a6c6d0bb3084 SHA1 0ad152b3cb738521296322b56e9f247926690e67 SHA256 9497f8ad6acb2460e27bd5430670e79129ec2ffbf6f5b8dae62084e5e56059ee
+AUX 6.0.3.80004/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
+AUX 6.0.3.80004/011_all_legit-modules-only.patch 646 RMD160 484d15ebc05fb93d69866987cf805afdbba019c9 SHA1 f36a8b4b7153cfe213ee7cd1e82c871f3c9efa90 SHA256 b66a534d93ae7dc76b54631cbbaccc751691941ab704a9c1e566a9c866b15729
 AUX 90vmware-workstation 106 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a SHA1 3db7ec2a3b37a84328bf3d481a58b42499ef520b SHA256 c8f7143551f516b901143e60fc74e822ca3d235477d1c2a135bb36cbc639cf1e
 AUX vmware-workstation.rc 1862 RMD160 000c71ee5c62edc27d3df3f23286e1fe8490516e SHA1 cf1db60598d0d2fe44260f7387537ec1babf3a52 SHA256 76e6ea8c199a4dced79a75a0346360714941ef192b61e4610c6229e071d64782
 AUX vmware-workstation.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
@@ -37,6 +44,8 @@ DIST VMware-workstation-6.0.1-55017.i386.tar.gz 219089234 RMD160 e33d271019ee897
 DIST VMware-workstation-6.0.1-55017.x86_64.tar.gz 196577425 RMD160 6ae105b93e2434a3909adcc1a93545c51b2a855e SHA1 5361042412d3745f7f2d5e005dcc1f361a25bf81 SHA256 3e2c102eaedb652291c44fafd3e022c90cc8eca9f591d06e625f20f04f7015ff
 DIST VMware-workstation-6.0.2-59824.i386.tar.gz 219077421 RMD160 4e0f9aff3507cb3a9695172c9875d374c0dbab1d SHA1 aff0553ced9687176f6e4eb4db2f00f4bce8a91b SHA256 506fc1c8215b6a606a2d47231c1eed830acf98b2f79240c6ec7cb4e13370880f
 DIST VMware-workstation-6.0.2-59824.x86_64.tar.gz 196567485 RMD160 a7625f679b36d22f88f0b3d9d8c9e9f064015dc5 SHA1 5e014cdd5cf0d70cd4c78175ca7db5ce3c0fe9c0 SHA256 d656421e596f79fc872771ac63bd19c834c8ae98cb95a948bdf2090597393a95
+DIST VMware-workstation-6.0.3-80004.i386.tar.gz 222622982 RMD160 84aec387b91442774aa00dda959db2370fcca9e6 SHA1 be21aaa0961f863067e640c5ebb0479115acb7c4 SHA256 6be2c2d92c47d371b0c533b7edbcebc61a19279fa24905df3bf3f762d14e2885
+DIST VMware-workstation-6.0.3-80004.x86_64.tar.gz 199349808 RMD160 c49340796824dbec67d61f0da0b6533ef368c714 SHA1 e54a659e8937135c2a7e7bb1aa5c65ae4e326aec SHA256 050d6ca278b2ea269a03af8417eb35c0402222be0e855445ef3339c602b74c51
 DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
 DIST vmware-libcrypto.so.0.9.7l.tar.bz2 412159 RMD160 89282ae9fc6e8921a47704bc9cd23cf70a6870e8 SHA1 f86c4cb076fe1764975e9243dc0fae763f2b589a SHA256 fae52acf61415959cca763a715a2b61ec49f161a416d418d6a1faffce531db12
 DIST vmware-libssl.so.0.9.7l.tar.bz2 78244 RMD160 195dd4808e60f81621e6ed12b843ded49c0fa747 SHA1 5fe729a1e49e77afd83b408845833174e1296e39 SHA256 3e1e13196066dc5b77d3ef6b5df55a29156eba1f39661e40cd617b538220d089
@@ -45,12 +54,13 @@ EBUILD vmware-workstation-4.5.3.19414-r7.ebuild 3213 RMD160 83e65f05d2bddac0164b
 EBUILD vmware-workstation-5.5.5.56455.ebuild 3096 RMD160 c60e664a6bd748250c8bb98ad3b3638a1f409325 SHA1 5240e326dd74dc15ad3291faa19898fdb825fada SHA256 6392e9a41d599096742f4ffa55b0e81508dddd80cb9d2d4dc2e65394c07cce22
 EBUILD vmware-workstation-6.0.1.55017.ebuild 4069 RMD160 3f8a506169ec0682772b15ea295be3eb0b84e0f1 SHA1 f9b946a24f4d22570741a64da7031dbe0266194e SHA256 5e0518b3519ef9ae36d7967f626ebbbcfe1750a282e5728a8c18d9cdab6c1aed
 EBUILD vmware-workstation-6.0.2.59824.ebuild 4069 RMD160 b1d79f0ffd803f9c6d8b0669d9abaca7bbc66996 SHA1 ebebedb6f44e3152cbf5d05f8f8a620b3ee3fdf4 SHA256 141d279b01acff8b722c03afaa75687c29cd75462af7f9c553c2cbdc9836ce0b
-MISC ChangeLog 19853 RMD160 c5a0ed78a505b3923674a57670ee1bd245e2197d SHA1 fb6f2c191e9a99f95de67174837ba4de56cbe328 SHA256 ac31a63c54934f1ab0926b2ea31fdfc444280e763acde0474f02d4d1364103ef
+EBUILD vmware-workstation-6.0.3.80004.ebuild 3735 RMD160 aeae5e9d1e8409b8e3fa42c4111000121f164e66 SHA1 adb1faccb248dd62fcccb9912117a51aa840efb4 SHA256 57e87716146de1137586cbc0be5d3aaa7b5fdb653f6ce6b0a0c0316573a5eef2
+MISC ChangeLog 20418 RMD160 71abb26f20668b47a5e030bd4e077cc037a60828 SHA1 fc07aef16520a382ad081929661cd99627820b13 SHA256 69b213c937591583222f4ae462e9113def89583b682ceaec00e0ff39bc02b6f0
 MISC metadata.xml 339 RMD160 9f4931e525280fd376eb7ac3e42c369acd23a33e SHA1 3948dcc9a9b7dc585f1783e0419b313084a231c0 SHA256 bb60a871a58964feaa59ec824a5d511455054461f0394a57a8c9ca019a0f4593
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHoeLpu7rWomwgFXoRAh6cAJ0ZF2W81ZoCXRlD06Yq5jheAAvFWwCeOIm9
-IF2lnOqr0nYXCVZghlSjZCo=
-=+XVg
+iD8DBQFH5NRQu7rWomwgFXoRAqlwAJ9w7qJ1tFulpa8DdMBjGhC21MJ2rACeIQIM
+5X3YlB/wL0VDHUI7TGvT3zc=
+=jAvU
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-workstation/files/6.0.3.80004/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/000_all_initd-location.patch
new file mode 100644
index 000000000000..6eb6619d2b8e
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/6.0.3.80004/000_all_initd-location.patch
@@ -0,0 +1,31 @@
+--- vmware-distrib/bin/vmware-config.pl.ori	2005-11-09 01:45:08.000000000 +0000
++++ vmware-distrib/bin/vmware-config.pl	2005-11-09 01:48:21.000000000 +0000
+@@ -8433,7 +8433,7 @@
+          error('Please shut down any running VMs and run this script again.' .
+                "\n\n");
+       } else {
+-         if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware')
++         if (system(shell_string('/etc/init.d' . '/vmware')
+                     . ' stop')) {
+             error('Unable to stop services for ' . vmware_product_name() .
+                   "\n\n");
+@@ -8463,8 +8463,8 @@
+   }
+   if (vmware_product() ne 'server') {
+     configure_gtk2();
+-    createMimePackageFile();
+-    configureDesktopFiles();
++#   createMimePackageFile();
++#   configureDesktopFiles();
+     configure_mon();
+     configure_pp();
+     configure_net();
+@@ -8532,7 +8532,7 @@
+   db_save();
+   # Then start VMware's services
+   if (!$gOption{'skip-stop-start'}) {
+-    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/6.0.3.80004/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/001_all_fix-permissions.patch
new file mode 100644
index 000000000000..e646b7b2da5c
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/6.0.3.80004/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/6.0.3.80004/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/002_all_pagebreak-detection-fix.patch
new file mode 100644
index 000000000000..fd3fc76ca679
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/6.0.3.80004/002_all_pagebreak-detection-fix.patch
@@ -0,0 +1,15 @@
+diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
+--- vmware-distrib.orig/bin/vmware-config.pl	2006-03-24 23:13:05.000000000 +0100
++++ vmware-distrib/bin/vmware-config.pl	2006-03-24 23:26:40.000000000 +0100
+@@ -2015,9 +2015,9 @@
+       . shell_string($pattern));
+     chomp($header_page_offset);
+     # Ignore PAGE_OFFSET if we cannot parse it.
+-    if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) {
++    if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) {
+       # We found a valid page offset
+-      $header_page_offset = $1;
++      $header_page_offset = $2;
+       if (defined($gSystem{'page_offset'}) and
+           not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) {
+         if ($source eq 'user') {
diff --git a/app-emulation/vmware-workstation/files/6.0.3.80004/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/004_all_do-not-build-modules.patch
new file mode 100644
index 000000000000..e2649c0af27b
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/6.0.3.80004/004_all_do-not-build-modules.patch
@@ -0,0 +1,21 @@
+diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl
+--- vmware-server-distrib.orig/bin/vmware-config.pl	2006-02-18 18:12:26.000000000 +0000
++++ vmware-server-distrib/bin/vmware-config.pl	2006-02-18 18:14:17.000000000 +0000
+@@ -10158,13 +10158,13 @@
+     configure_gtk2();
+ #   createMimePackageFile();
+ #   configureDesktopFiles();
+-    configure_mon();
++#   configure_mon();
+     if (isDesktopProduct()) {
+-      build_vmblock();
++#     build_vmblock();
+     }
+-    configure_pp();
++#   configure_pp();
+     configure_net();
+-    build_vmnet();
++#   build_vmnet();
+   }
+ 
+    configure_eclipse_plugin();
diff --git a/app-emulation/vmware-workstation/files/6.0.3.80004/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/007_all_use-modprobe-over-insmod.patch
new file mode 100644
index 000000000000..c29a87e8f226
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/6.0.3.80004/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
+ }
+ 
diff --git a/app-emulation/vmware-workstation/files/6.0.3.80004/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/009_all_init.d-modules-warning.patch
new file mode 100644
index 000000000000..4eab043af8dc
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/6.0.3.80004/009_all_init.d-modules-warning.patch
@@ -0,0 +1,19 @@
+diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh
+--- vmware-server-distrib.orig/installer/services.sh	2006-07-01 03:14:16.000000000 +0000
++++ vmware-server-distrib/installer/services.sh	2006-07-14 11:59:28.000000000 +0000
+@@ -606,8 +606,13 @@
+    start)
+       if [ -e "$vmware_etc_dir"/not_configured ]; then
+          echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured'
+-         echo 'for the running kernel. To (re-)configure it, invoke the'
+-         echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.'
++         echo 'for the running kernel.'
++         echo 
++         echo 'Please ensure that the modules have been compiled for this kernel:'
++         echo '  emerge --oneshot vmware-modules'
++         echo
++         echo 'Also ensure '"`vmware_product_name`"' has been configured:'
++         echo '  '"$vmdb_answer_BINDIR"'/vmware-config.pl'
+          echo
+ 
+          exit 1
diff --git a/app-emulation/vmware-workstation/files/6.0.3.80004/011_all_legit-modules-only.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/011_all_legit-modules-only.patch
new file mode 100644
index 000000000000..9e453ed1e2ee
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/6.0.3.80004/011_all_legit-modules-only.patch
@@ -0,0 +1,12 @@
+diff -uNr vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
+--- vmware-distrib.orig/bin/vmware-config.pl	2007-08-22 02:58:41.000000000 +0100
++++ vmware-distrib/bin/vmware-config.pl	2007-09-19 20:04:57.000000000 +0100
+@@ -10127,7 +10127,7 @@
+    }
+ 
+    my @modules = non_vmware_modules_installed();
+-   if (scalar(@modules) > 0) {
++   if (scalar(@modules) < 0) {
+       error("The following VMware kernel modules have been found on your system that " .
+             "were not installed by the VMware Installer.  Please remove them then run " .
+             "this installer again.\n\n" . join("\n", @modules) . "\n\n");