diff options
author | Mike Auty <ikelos@gentoo.org> | 2008-11-09 20:23:55 +0000 |
---|---|---|
committer | Mike Auty <ikelos@gentoo.org> | 2008-11-09 20:23:55 +0000 |
commit | ab2f748503a802c23d050ff570fe447bc5eb260f (patch) | |
tree | 93bcc5d1ab8dbb9a37c72b96df3e6b6386d34dca /app-emulation/vmware-player | |
parent | Add in vmware-modules-1.0.0.23 for vmware-workstation-6.5 and vmware-player-2.5. (diff) | |
download | historical-ab2f748503a802c23d050ff570fe447bc5eb260f.tar.gz historical-ab2f748503a802c23d050ff570fe447bc5eb260f.tar.bz2 historical-ab2f748503a802c23d050ff570fe447bc5eb260f.zip |
Bump to 1.0.9 and introduce 2.5.0 for bug 245941.
Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-gentoo-r1 i686
Diffstat (limited to 'app-emulation/vmware-player')
15 files changed, 667 insertions, 5 deletions
diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog index 93056bc07ad9..1d34bf670c11 100644 --- a/app-emulation/vmware-player/ChangeLog +++ b/app-emulation/vmware-player/ChangeLog @@ -1,6 +1,24 @@ # ChangeLog for app-emulation/vmware-player # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.57 2008/09/30 16:00:24 ikelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.58 2008/11/09 20:23:54 ikelos Exp $ + +*vmware-player-2.5.0.118166 (09 Nov 2008) +*vmware-player-1.0.9.126128 (09 Nov 2008) + + 09 Nov 2008; Mike Auty <ikelos@gentoo.org> + +files/1.0.9.126128/000_all_initd-location.patch, + +files/1.0.9.126128/007_all_use-modprobe-over-insmod.patch, + +files/1.0.9.126128/001_all_fix-permissions.patch, + +files/1.0.9.126128/009_all_init.d-modules-warning.patch, + +files/vmware-player-2.5.0.118166-installer.patch, + +files/1.0.9.126128/002_all_pagebreak-detection-fix.patch, + +files/2.5.0.118166/vmware-player.py.patch, +files/vmware-player-2.5.rc, + +files/1.0.9.126128/004_all_do-not-build-modules.patch, + +files/2.5.0.118166/vmware-player-extras.py.patch, + +files/helpers/module_patcher.sh, +files/helpers/unbundler.sh, + +files/helpers/vmware-config.sh, +vmware-player-1.0.9.126128.ebuild, + +vmware-player-2.5.0.118166.ebuild: + Bump to 1.0.9 and introduce 2.5.0 for bug 245941. *vmware-player-2.0.5.109488 (30 Sep 2008) *vmware-player-1.0.8.108000 (30 Sep 2008) diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest index 9a02530f9c6f..6511632b96ff 100644 --- a/app-emulation/vmware-player/Manifest +++ b/app-emulation/vmware-player/Manifest @@ -13,6 +13,12 @@ AUX 1.0.8.108000/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025 AUX 1.0.8.108000/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e AUX 1.0.8.108000/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630 AUX 1.0.8.108000/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498 +AUX 1.0.9.126128/000_all_initd-location.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62 +AUX 1.0.9.126128/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391 +AUX 1.0.9.126128/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d +AUX 1.0.9.126128/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e +AUX 1.0.9.126128/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630 +AUX 1.0.9.126128/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498 AUX 2.0.4.93057/000_all_initd-location.patch 1133 RMD160 63a226ee89922fc7d1cc4de75e80ee0befb13bb2 SHA1 64d7d8e7218fa34e798ea1e9cdafe0085bbee0fa SHA256 f5a9aab71e5cd04292d0a37812505e08f0d7860399ab0dd35cccae9bfbb665be AUX 2.0.4.93057/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391 AUX 2.0.4.93057/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d @@ -27,11 +33,21 @@ AUX 2.0.5.109488/004_all_do-not-build-modules.patch 654 RMD160 dd279f8043ab99b03 AUX 2.0.5.109488/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630 AUX 2.0.5.109488/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498 AUX 2.0.5.109488/011_all_legit-modules-only.patch 646 RMD160 484d15ebc05fb93d69866987cf805afdbba019c9 SHA1 f36a8b4b7153cfe213ee7cd1e82c871f3c9efa90 SHA256 b66a534d93ae7dc76b54631cbbaccc751691941ab704a9c1e566a9c866b15729 +AUX 2.5.0.118166/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb +AUX 2.5.0.118166/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c AUX 90vmware-player 91 RMD160 025ff93348f5a838183e4f6108d7030168ca5ed5 SHA1 54c316adaafce41771eb26513c960dabbed61ce9 SHA256 9aee16313163bd9e161e81ef2876d086fb8972489100c4f8f0a4695ff16578f9 +AUX helpers/module_patcher.sh 174 RMD160 0b2d1ee14443ec188546b090ae2c5e6efd132026 SHA1 f00ea5d03430be4969834bda822ed2865ef6e079 SHA256 1e63240f7e21e119c8e0b083f540fdde83fc22d781f3abe43927713a464898ea +AUX helpers/unbundler.sh 1828 RMD160 d5bb43628d105c4372fa1fe7e7ebac29300fa91f SHA1 ed4b2645369b63e1cb6e322d412eb2ede1cbbdcd SHA256 4e71dd96f5136c1eb98be5e1184b9ec48ed9ac7935fa1defd94d501cef05eb78 +AUX helpers/vmware-config.sh 495 RMD160 abe3462c7b909d7280d6a7991b4cf34b4473a859 SHA1 43f7d5385b06617de4ad5bab0606fa2e6632e08c SHA256 f868a5df5485ad894ab948d8c574f77c0cec2676c67e6d9ecab12953447de44a +AUX vmware-player-2.5.0.118166-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858 +AUX vmware-player-2.5.rc 1434 RMD160 7bcf047a381e553cab882db6ab42b28903f972f9 SHA1 c668713f6d1fc61c226207b7176f106ac692454e SHA256 ef245385f56b2863580c0c6c00e470118ddc4cf364c818092568891ebba75429 AUX vmware-player.rc 1852 RMD160 e3cc563af38ef690b16bfbdcc0080156af2eab37 SHA1 5436cfd0e75ab842b86826b0abc298a2b9433963 SHA256 ef77428df2608613860cd79683648a45d99657150e7c901d7f449b8df4528fee AUX vmware-player.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d +DIST VMware-Player-2.5.0-118166.i386.bundle 99282834 RMD160 a24f1b10a3a104191b973ee488625464d3de175d SHA1 e2552d1213e9a7af9115b358724109c0fd10a1fb SHA256 10e0cd9ef407bed7851ee3198d93a6741aa492416b86dc14c5a39b4ea4f834e6 +DIST VMware-Player-2.5.0-118166.x86_64.bundle 63035915 RMD160 a29b3c45e5bca07ef8d725b71ead7a9f222be405 SHA1 38e5cac90c83dcdf91ece6616ddae3a0b40dc3d4 SHA256 1592d9b067273384f8b61e56eb23fccd2a5ef876b60d3fc25821c97d20732c9e DIST VMware-player-1.0.7-91707.tar.gz 38904271 RMD160 8f0756e9b8fdc808308794df5c076e846ab0281f SHA1 497f0121edc0c3ce4e73c1a784c7567bb3d208af SHA256 fee3732232c5129f67d030e76ca9794bedf21c44cd0e8084f452249cda9901d8 DIST VMware-player-1.0.8-108000.tar.gz 38962788 RMD160 25cb6942b9de77a1c818e4be178a6a7f745a6878 SHA1 2c642116813c59198f6c71394f6c94a591f5e3ca SHA256 a84ea7056fff5433f3cea243082055e9815a4cc0b951afd57cc0779bed5e1d7d +DIST VMware-player-1.0.9-126128.tar.gz 38963760 RMD160 ed54df1e097894f11b7bbce8215d1f314df03217 SHA1 701ca338ec52dcb60db26908de8e0b5bfd981fb7 SHA256 3fae981892437ec1804a2171b701ca33000405fbd799fb06112fd70c939d8d75 DIST VMware-player-2.0.4-93057.i386.tar.gz 68617186 RMD160 b0e7934ca27573aac74b4ce5275c207ed0db0661 SHA1 7ae213660f05e7c1e8fa3dd177a8ebe71478b9ac SHA256 59045fa684754b95e3928fbdb9f30c7df25dff4f273e8a235b58edc16d7fafe5 DIST VMware-player-2.0.4-93057.x86_64.tar.gz 33315373 RMD160 5ec83275723067f4a0b554924efaf0ee04346c37 SHA1 edbdfb9e8b25e487b9354583c59e59b293a59719 SHA256 e9e2be069171f33365cba964e966aab7c78b7b6ee551905c62ee1326e867e3e2 DIST VMware-player-2.0.5-109488.i386.tar.gz 68597946 RMD160 4277dd999081756512f91382dd1245585848bc90 SHA1 5bb6c0c2f9ef46651998a27a435bd176d6305129 SHA256 adcda2151465fb6f21b4579fb63d4badeb1e29a024f982fd7561562a07369955 @@ -39,14 +55,16 @@ DIST VMware-player-2.0.5-109488.x86_64.tar.gz 33383867 RMD160 de53fd58eb3fbe6b86 DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1 EBUILD vmware-player-1.0.7.91707.ebuild 2660 RMD160 675a7da05b9fed679733d076ad4bff92e7dc97fd SHA1 25cb65e64be40f1209734b778f0bd1002eea7c62 SHA256 159067125d6fbd5ee857ed47f74a87c8ef344d7934776e962c57a7d43dae29df EBUILD vmware-player-1.0.8.108000.ebuild 2664 RMD160 84ce6a44efde98f128d1424f13a7c5a899ca91c5 SHA1 00d03cd7fa316d79c796cacee218d69726bdcd4b SHA256 2263335b24c337cb1d3746219501f3e7b469a19daa44acb94d6dd1895895592e +EBUILD vmware-player-1.0.9.126128.ebuild 2652 RMD160 d2b167c4846468fb97920a9ec83d39b74e33a72e SHA1 9a8e27e0f11b72d9f8fa93a65d4a2ef2cf08cefb SHA256 2a460d96c4fc354fe16c62c6a5c63428ebdf4d175b39e573ca24289a3ab45bde EBUILD vmware-player-2.0.4.93057.ebuild 2914 RMD160 38b491d7971f49e4951e0577ac5099040a20f062 SHA1 3ab9c59a08da0a6098697f1c9a9583c1232197cb SHA256 5999086a5dba2aaccaad7ea1960e1265363617447d448dfd4a952ee12b472eb0 EBUILD vmware-player-2.0.5.109488.ebuild 2915 RMD160 407d9960e3386dedec63426418a02d7e9368dc94 SHA1 038f6a5caf2a919ecbcf116a9aba95090982f675 SHA256 fdda217060c60496007919180afb12df98b1a4e2bc8553915de62415eb6d9199 -MISC ChangeLog 19105 RMD160 2a5d788091c295350f1987aacc1fb804ae064292 SHA1 5d1467bd8d86b22b309dd145405dca41aa8839bd SHA256 8c5ad84f918b9650112174e6b9f22d19adc478d607cb62816d877d3660bcac0f +EBUILD vmware-player-2.5.0.118166.ebuild 5130 RMD160 9a8404d78d1e26feee58bad590098563c033dba4 SHA1 a97d042288d368703499b5174c685c168c9e99aa SHA256 ee61699df3d56bd3d99fee1eacb93b9969ace7b7edca970cadd8982ff2ae74cc +MISC ChangeLog 19989 RMD160 cfff22ab2e3c7a456729a79bdca998396f4c4cd6 SHA1 16e6d7d0fba6a0d5f7e0c6559cd7eb3d4ccd9d80 SHA256 14bb4e13f4f149420ae948df88e831d94bdd5d65f90a889a1025d29f3f37c105 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkjiTTAACgkQu7rWomwgFXpMrgCeI7z9itCJukChX5HAksEbG1xC -1jAAn33JMmd8m44zg1AmYfhA+7FA6NFq -=LBo4 +iEYEARECAAYFAkkXRu0ACgkQu7rWomwgFXrLdQCgocwfKCGskQh51+ZmV69FZSWL +vlYAnjAbuI/REuQRLh7Y82qJcYrM5Nf7 +=ztqN -----END PGP SIGNATURE----- diff --git a/app-emulation/vmware-player/files/1.0.9.126128/000_all_initd-location.patch b/app-emulation/vmware-player/files/1.0.9.126128/000_all_initd-location.patch new file mode 100644 index 000000000000..1d864f7e0dd7 --- /dev/null +++ b/app-emulation/vmware-player/files/1.0.9.126128/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{'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-player/files/1.0.9.126128/001_all_fix-permissions.patch b/app-emulation/vmware-player/files/1.0.9.126128/001_all_fix-permissions.patch new file mode 100644 index 000000000000..e646b7b2da5c --- /dev/null +++ b/app-emulation/vmware-player/files/1.0.9.126128/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-player/files/1.0.9.126128/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-player/files/1.0.9.126128/002_all_pagebreak-detection-fix.patch new file mode 100644 index 000000000000..fd3fc76ca679 --- /dev/null +++ b/app-emulation/vmware-player/files/1.0.9.126128/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-player/files/1.0.9.126128/004_all_do-not-build-modules.patch b/app-emulation/vmware-player/files/1.0.9.126128/004_all_do-not-build-modules.patch new file mode 100644 index 000000000000..cec3b3ee4c1d --- /dev/null +++ b/app-emulation/vmware-player/files/1.0.9.126128/004_all_do-not-build-modules.patch @@ -0,0 +1,17 @@ +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 +@@ -8571,10 +8571,10 @@ + configure_gtk2(); + # createMimePackageFile(); + # configureDesktopFiles(); +- configure_mon(); +- configure_pp(); ++# configure_mon(); ++# configure_pp(); + configure_net(); +- build_vmnet(); ++# build_vmnet(); + } + + # Create the directory for the UNIX domain sockets diff --git a/app-emulation/vmware-player/files/1.0.9.126128/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-player/files/1.0.9.126128/007_all_use-modprobe-over-insmod.patch new file mode 100644 index 000000000000..5509d249f19a --- /dev/null +++ b/app-emulation/vmware-player/files/1.0.9.126128/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 "$1" || exit 1 + exit 0 + } + diff --git a/app-emulation/vmware-player/files/1.0.9.126128/009_all_init.d-modules-warning.patch b/app-emulation/vmware-player/files/1.0.9.126128/009_all_init.d-modules-warning.patch new file mode 100644 index 000000000000..4eab043af8dc --- /dev/null +++ b/app-emulation/vmware-player/files/1.0.9.126128/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-player/files/helpers/module_patcher.sh b/app-emulation/vmware-player/files/helpers/module_patcher.sh new file mode 100755 index 000000000000..03c490a73959 --- /dev/null +++ b/app-emulation/vmware-player/files/helpers/module_patcher.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +MY_BASE=$(basename $1) +if [ -f ${FILESDIR}/${PV}/${MY_BASE}.patch ]; +then + echo -n "Module Patcher: " + patch -f -p1 ${1} < ${FILESDIR}/${PV}/${MY_BASE}.patch +fi diff --git a/app-emulation/vmware-player/files/helpers/unbundler.sh b/app-emulation/vmware-player/files/helpers/unbundler.sh new file mode 100755 index 000000000000..b19b587c2af5 --- /dev/null +++ b/app-emulation/vmware-player/files/helpers/unbundler.sh @@ -0,0 +1,91 @@ +#!/bin/bash + +ORIGFILE="$1" + +is_relative() { + local path="$1" + shift + + [ "${path:0:1}" != "/" ] + return +} + +set_offsets() { + # This won't work with non-GNU stat. + FILE_SIZE=`stat -L --format "%s" "$1"` + local offset=$(($FILE_SIZE - 4)) + + MAGIC_OFFSET=$offset + offset=$(($offset - 4)) + + CHECKSUM_OFFSET=$offset + offset=$(($offset - 4)) + + VERSION_OFFSET=$offset + offset=$(($offset - 4)) + + PREPAYLOAD_OFFSET=$offset + offset=$(($offset - 4)) + + PREPAYLOAD_SIZE_OFFSET=$offset + offset=$(($offset - 4)) + + LAUNCHER_SIZE_OFFSET=$offset + offset=$(($offset - 4)) + + PAYLOAD_OFFSET=$offset + offset=$(($offset - 4)) + + PAYLOAD_SIZE_OFFSET=$offset + offset=$(($offset - 4)) +} + +set_lengths() { + local file="$1" + if [ ! -s "$file" ]; then + echo "$file does not exist" + exit 1 + fi + + # XXX: put extraction in its own function + MAGIC_NUMBER=`od -An -t u4 -N 4 -j $MAGIC_OFFSET "$file" | tr -d ' '` + + if [ "$MAGIC_NUMBER" != "907380241" ]; then + echo "magic number does not match" + exit 1 + fi + + LAUNCHER_SIZE=`od -An -t u4 -N 4 -j $LAUNCHER_SIZE_OFFSET "$file" | tr -d ' '` + PAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PAYLOAD_SIZE_OFFSET "$file" | tr -d ' '` + PREPAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PREPAYLOAD_SIZE_OFFSET "$file" | tr -d ' '` + + SKIP_BYTES=$(($PREPAYLOAD_SIZE + $LAUNCHER_SIZE)) + + return 0 +} + +if is_relative "${ORIGFILE}"; then + ORIGFILE="`pwd`/${ORIGFILE}" +fi + + +set_offsets ${ORIGFILE} +set_lengths ${ORIGFILE} + +echo "Unbundling" ${ORIGFILE} + +PREPAYLOAD="prepayload" +PAYLOAD="payload" + +# Unpack the pre-payload file +mkdir ${PREPAYLOAD} +cd ${PREPAYLOAD} +dd if="${ORIGFILE}" ibs=$LAUNCHER_SIZE obs=1024 skip=1 | tar -xzf - 2> /dev/null +cd .. + +# Unpack the main file +mkdir ${PAYLOAD} +cd ${PAYLOAD} +dd if="${ORIGFILE}" ibs=$SKIP_BYTES obs=1024 skip=1 | tar -xzf - 2> /dev/null +cd .. + diff --git a/app-emulation/vmware-player/files/helpers/vmware-config.sh b/app-emulation/vmware-player/files/helpers/vmware-config.sh new file mode 100755 index 000000000000..d97a542d5ec1 --- /dev/null +++ b/app-emulation/vmware-player/files/helpers/vmware-config.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +CONFIG_FILE="${D}/etc/vmware/config" + +remove_key() { + local key=${1} + grep -v "${key} =" ${CONFIG_FILE} + grep -v "${key} =" ${CONFIG_FILE} > ${CONFIG_FILE}.tmp + mv ${CONFIG_FILE}.tmp ${CONFIG_FILE} +} + +add_key() { + local key=${1} + local value=${2} + echo "${1} = \"${2}\"" >> ${CONFIG_FILE} +} + +mkdir -p $(dirname ${CONFIG_FILE}) +touch ${CONFIG_FILE} + +if [ "${1}" == "-s" ]; then + remove_key ${2} + add_key ${2} ${3/${D}/} +fi + +if [ "${1}" == "-d" ]; then + remove_key ${2} +fi + diff --git a/app-emulation/vmware-player/files/vmware-player-2.5.0.118166-installer.patch b/app-emulation/vmware-player/files/vmware-player-2.5.0.118166-installer.patch new file mode 100644 index 000000000000..80a301e5c183 --- /dev/null +++ b/app-emulation/vmware-player/files/vmware-player-2.5.0.118166-installer.patch @@ -0,0 +1,64 @@ +diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py +index 7a46312..e1dbff1 100644 +--- a/payload/install/vmware-installer/vmis/__init__.py ++++ b/payload/install/vmware-installer/vmis/__init__.py +@@ -12,5 +12,5 @@ VERSION_INFO = (1,0) + VERSION = '.'.join([str(x) for x in VERSION_INFO]) + MAJOR_VERSION = VERSION_INFO[0] + +-CONFDIR = path(u'/etc/vmware') ++CONFDIR = path(u'./vmware-confdir') + DATABASE_PATH = CONFDIR/'database' +diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py +index e7abc2e..81c4a2b 100644 +--- a/payload/install/vmware-installer/vmis/core/env.py ++++ b/payload/install/vmware-installer/vmis/core/env.py +@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath): + # Python will interrept as being a module separator + moduleName = component.name.replace('.', '') + fileObj, pathName, description = imp.find_module(moduleName, [loadPath]) ++ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1], ++ fileObj = file(pathName) + + try: + # XXX: db.config cannot be set at the module level because this +diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py +index 2be10de..f92ecff 100644 +--- a/payload/install/vmware-installer/vmis/core/questions.py ++++ b/payload/install/vmware-installer/vmis/core/questions.py +@@ -139,6 +139,9 @@ class InitDir(Directory): + """ + super(InitDir, self).Validate(answer) + ++ ### GENTOO PATCH ### Finish early ++ return True ++ + rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d') + answer = path(answer) + +diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py +index 525df75..abb81b3 100644 +--- a/payload/install/vmware-installer/vmis/ui/console.py ++++ b/payload/install/vmware-installer/vmis/ui/console.py +@@ -148,7 +148,7 @@ class Wizard(object): + wrapper = TextWrapper() + wrapper.width = 79 + wrapper.replace_whitespace = False # Needed to preserve paragraph spacing. +- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text)) ++ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text)) + except IOError: # RHEL4 appears to close stdin while we still expect it to be open + pass + +diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py +index 4f609c4..b07b89d 100644 +--- a/payload/install/vmware-installer/vmis/util/log.py ++++ b/payload/install/vmware-installer/vmis/util/log.py +@@ -22,6 +22,8 @@ else: + # running a build) + LOG_FILE = '/tmp/vmware-installer.log' + ++LOG_FILE = './vmware-installer.log' ++ + if level <= logging.DEBUG: + MAX_BYTES = 0 + BACKUP_COUNT = 0 diff --git a/app-emulation/vmware-player/files/vmware-player-2.5.rc b/app-emulation/vmware-player/files/vmware-player-2.5.rc new file mode 100644 index 000000000000..6edba1627c73 --- /dev/null +++ b/app-emulation/vmware-player/files/vmware-player-2.5.rc @@ -0,0 +1,74 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/files/vmware-player-2.5.rc,v 1.1 2008/11/09 20:23:55 ikelos Exp $ + +depend() { + need localmount + use logger net hald + after samba +} + +vmware_prettify() { + # Yea, the code is ugly but the output is pretty + state=$1 + waserror=0 + msgtype=0 + while read line + do + [ "${line}" = "" ] && continue + if [ ${msgtype} -le 0 ] + then + if [ ${msgtype} -eq -1 ] + then + ewarn ${line} + continue + fi + case ${line} in + *:*) + einfon ${line} + echo + eend 0 + msgtype=1;; + *) + ewarn ${line} + msgtype=-1 + waserror=1;; + esac + continue + fi + + # Strip out anything after the <esc> code + message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"` + einfon " ${message}" + echo + + echo ${line} | grep -q done + status=$? + eend ${status} + + if [ ${status} -eq 0 ] + then + logger -p local0.err -t vmware-${state} "${line}" + waserror=${status} + fi + done + if [ "${msgtype}" = "-1" ] + then + eend 1 "VMware is not properly configured! See above." + fi + return ${waserror} +} + +start() { + test -x /etc/vmware/init.d/vmware || \ + eend 1 "vmware init script not found. Aborting" || return 1 + + /etc/vmware/init.d/vmware start | vmware_prettify start + return $? +} + +stop() { + /etc/vmware/init.d/vmware stop | vmware_prettify stop + return $? +} diff --git a/app-emulation/vmware-player/vmware-player-1.0.9.126128.ebuild b/app-emulation/vmware-player/vmware-player-1.0.9.126128.ebuild new file mode 100644 index 000000000000..56cd11607af1 --- /dev/null +++ b/app-emulation/vmware-player/vmware-player-1.0.9.126128.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-1.0.9.126128.ebuild,v 1.1 2008/11/09 20:23:54 ikelos Exp $ + +inherit eutils vmware versionator + +S=${WORKDIR}/vmware-player-distrib +MY_P="VMware-player-$(get_version_component_range 1-3)-$(get_version_component_range 4)" +DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" +HOMEPAGE="http://www.vmware.com/products/player/" +SRC_URI="mirror://vmware/software/vmplayer/${MY_P}.tar.gz + http://platan.vc.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz + http://platan.vc.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz + http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz + http://ftp.cvut.cz/vmware/obsolete/${ANY_ANY}.tar.gz + http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz + http://knihovny.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz" + +LICENSE="vmware" +IUSE="" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +RESTRICT="strip" + +DEPEND="${RDEPEND} virtual/os-headers + !app-emulation/vmware-workstation" +# vmware-player should not use virtual/libc as this is a +# precompiled binary package thats linked to glibc. +RDEPEND="sys-libs/glibc + amd64? ( + app-emulation/emul-linux-x86-gtklibs ) + x86? ( + x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXinerama + x11-libs/libXi + virtual/xft ) + >=dev-lang/perl-5 + !app-emulation/vmware-workstation + !app-emulation/vmware-server + ~app-emulation/vmware-modules-1.0.0.15 + !<app-emulation/vmware-modules-1.0.0.15 + !>=app-emulation/vmware-modules-1.0.0.16 + sys-apps/pciutils" + +RUN_UPDATE="no" + +dir=/opt/vmware/player +Ddir=${D}/${dir} + +QA_TEXTRELS_x86="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0" +QA_EXECSTACK_x86="${dir:1}/bin/vmnet-bridge + ${dir:1}/bin/vmnet-dhcpd + ${dir:1}/bin/vmnet-natd + ${dir:1}/bin/vmnet-netifup + ${dir:1}/bin/vmnet-sniffer + ${dir:1}/bin/vmware-ping + ${dir:1}/lib/bin/vmware-vmx + ${dir:1}/lib/bin/vmrun + ${dir:1}/lib/bin/vmplayer + ${dir:1}/lib/bin-debug/vmware-vmx + ${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1" + +QA_TEXTRELS_amd64="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0" +QA_EXECSTACK_amd64="${dir:1}/bin/vmnet-bridge + ${dir:1}/bin/vmnet-dhcpd + ${dir:1}/bin/vmnet-natd + ${dir:1}/bin/vmnet-netifup + ${dir:1}/bin/vmnet-sniffer + ${dir:1}/bin/vmware-ping + ${dir:1}/lib/bin/vmware-vmx + ${dir:1}/lib/bin/vmrun + ${dir:1}/lib/bin/vmplayer + ${dir:1}/lib/bin-debug/vmware-vmx + ${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1" + +src_install() { + vmware_src_install + + make_desktop_entry vmplayer "VMware Player" ${PN}.png System +} diff --git a/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild b/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild new file mode 100644 index 000000000000..72a815f86614 --- /dev/null +++ b/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild,v 1.1 2008/11/09 20:23:54 ikelos Exp $ + +inherit eutils versionator fdo-mime gnome2-utils + +MY_PN="VMware-Player-$(replace_version_separator 3 - $PV)" + +DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" +HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html" +SRC_URI=" + x86? ( + mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle + http://download.softpedia.ro/linux/${MY_PN}.i386.bundle ) + amd64? ( + mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle + http://download.softpedia.ro/linux/${MY_PN}.x86_64.bundle ) + " + +LICENSE="vmware" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="" +RESTRICT="strip binchecks" + +# vmware-workstation should not use virtual/libc as this is a +# precompiled binary package thats linked to glibc. +DEPEND=">=dev-lang/python-2.5 + dev-python/lxml" +RDEPEND="sys-libs/glibc + x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXinerama + x11-libs/libXi + x11-libs/libview + dev-cpp/libsexymm + dev-cpp/cairomm + dev-cpp/libgnomecanvasmm + virtual/xft + !app-emulation/vmware-player + !app-emulation/vmware-server + ~app-emulation/vmware-modules-1.0.0.23 + !<app-emulation/vmware-modules-1.0.0.23 + !>=app-emulation/vmware-modules-1.0.0.24 + sys-apps/pciutils" + +S=${WORKDIR}/vmware-distrib +VM_INSTALL_DIR="/opt/vmware/player" + +pkg_setup() { + if use x86; then + MY_P="${MY_PN}.i386" + elif use amd64; then + MY_P="${MY_PN}.x86_64" + fi + + if ! built_with_use ">=dev-cpp/gtkmm-2.4" accessibility ; then + eerror "Rebuild dev-cpp/gtkmm with USE=\"accessibility\"" + die "VMware workstation only works with gtkmm built with USE=\"accessibility\"." + fi + + if ! built_with_use '>=dev-lang/python-2.5' sqlite; then + eerror "You need build dev-lang/python with \"sqlite\" USE flag!" + die "Please rebuild dev-lang/python with sqlite USE flag!" + fi + + if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "" ]; then + die "Please emerge this package using a different terminal" + fi +} + +pkg_nofetch() { + if use x86; then + MY_P="${MY_PN}.i386" + elif use amd64; then + MY_P="${MY_PN}.x86_64" + fi + + einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}" +} + +src_unpack() { + # Unbundle the bundle + cp "${FILESDIR}"/helpers/* "${WORKDIR}" + chmod a+x "${WORKDIR}"/*.sh + "${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle + + # Patch up the installer + epatch "${FILESDIR}/${P}-installer.patch" + + mkdir "${WORKDIR}/vmware-confdir" +} + +src_install() { + dodir /etc/init.d + + #Run the installer + local INSTALLER="${WORKDIR}/payload/install/vmware-installer" + local PYOPTS="-W ignore::DeprecationWarning" + export VMWARE_SKIP_NETWORKING="true" + python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \ + --set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \ + --set-setting initdir "${T}" \ + --set-setting initscriptdir "${D}/etc/init.d" \ + --set-setting prefix "${D}${VM_INSTALL_DIR}" \ + --set-setting sysconfdir "${D}/etc" \ + --install-component "${INSTALLER}" \ + --install-bundle "${DISTDIR}/${MY_P}.bundle" \ + --console --required + + rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary" + + # Redirect all the ${D} paths to / paths" + sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap + + # Fix up icons/mime/desktop handlers + dodir /usr/share/ + mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/ + rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme} + mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/ + dodir /usr/share/mime + mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime + sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop + + # Copy across the temporary /etc/vmware directory + dodir /etc/vmware/init.d + cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware" + mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d" + newinitd "${FILESDIR}/${PN}"-2.5.rc vmware + touch "${D}"/etc/vmware/networking + + # Setup the path environment + insinto /etc/env.d + doins "${FILESDIR}/90${PN}" + + # Fix some paths to allow included gtk to work + for i in "/etc/pango/pangorc" \ + "/etc/pango/pango.modules" \ + "/etc/gtk-2.0/gtk.immodules" \ + "/etc/gtk-2.0/gdk-pixbuf.loaders" ; do + sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ; + sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ; + done + + # No idea why this happens, but it seems to happen all the time + ewarn "The following installation segment takes a *very* long time." + ewarn "Please be patient." +} + +pkg_config() { + ${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + + ewarn "Before you can use vmware-player, you must configure a default + network setup." + ewarn "You can do this by running 'emerge --config ${PN}'." +} + +pkg_postrm() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} |