diff options
-rw-r--r-- | app-emulation/vmware-player/ChangeLog | 20 | ||||
-rw-r--r-- | app-emulation/vmware-player/files/1.0.1.19317/000_all_initd-location.patch | 31 | ||||
-rw-r--r-- | app-emulation/vmware-player/files/1.0.1.19317/001_all_fix-permissions.patch | 15 | ||||
-rw-r--r-- | app-emulation/vmware-player/files/1.0.1.19317/002_all_pagebreak-detection-fix.patch | 12 | ||||
-rw-r--r-- | app-emulation/vmware-player/files/1.0.1.19317/004_all_do-not-build-modules.patch | 17 | ||||
-rw-r--r-- | app-emulation/vmware-player/files/1.0.1.19317/007_all_use-modprobe-over-insmod.patch | 12 | ||||
-rw-r--r-- | app-emulation/vmware-player/files/1.0.1.19317/009_all_init.d-modules-warning.patch | 19 | ||||
-rw-r--r-- | app-emulation/vmware-player/files/digest-vmware-player-1.0.3.34682-r1 (renamed from app-emulation/vmware-player/files/digest-vmware-player-1.0.3.34682) | 0 | ||||
-rw-r--r-- | app-emulation/vmware-player/vmware-player-1.0.3.34682-r1.ebuild (renamed from app-emulation/vmware-player/vmware-player-1.0.3.34682.ebuild) | 4 |
9 files changed, 21 insertions, 109 deletions
diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog index d2786f688316..a9e888461aba 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-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.33 2007/04/28 09:55:51 ikelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.34 2007/06/16 12:57:54 ikelos Exp $ + +*vmware-player-1.0.3.34682-r1 (16 Jun 2007) + + 16 Jun 2007; Mike Auty <ikelos@gentoo.org> + -files/1.0.1.19317/000_all_initd-location.patch, + -files/1.0.1.19317/002_all_pagebreak-detection-fix.patch, + +files/1.0.3.34682/000_all_initd-location.patch, + -files/1.0.1.19317/001_all_fix-permissions.patch, + -files/1.0.1.19317/004_all_do-not-build-modules.patch, + -files/1.0.1.19317/007_all_use-modprobe-over-insmod.patch, + -files/1.0.1.19317/009_all_init.d-modules-warning.patch, + +files/1.0.3.34682/001_all_fix-permissions.patch, + +files/1.0.3.34682/002_all_pagebreak-detection-fix.patch, + +files/1.0.3.34682/004_all_do-not-build-modules.patch, + +files/1.0.3.34682/007_all_use-modprobe-over-insmod.patch, + +files/1.0.3.34682/009_all_init.d-modules-warning.patch, + -vmware-player-1.0.3.34682.ebuild, +vmware-player-1.0.3.34682-r1.ebuild: + Version bump to fix missing patchset, bug 175778. 28 Apr 2007; Mike Auty <ikelos@gentoo.org> files/vmware-player.rc: Redigest for vmware-any-any109, and fix rc file for baselayout-2. diff --git a/app-emulation/vmware-player/files/1.0.1.19317/000_all_initd-location.patch b/app-emulation/vmware-player/files/1.0.1.19317/000_all_initd-location.patch deleted file mode 100644 index 1d864f7e0dd7..000000000000 --- a/app-emulation/vmware-player/files/1.0.1.19317/000_all_initd-location.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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.1.19317/001_all_fix-permissions.patch b/app-emulation/vmware-player/files/1.0.1.19317/001_all_fix-permissions.patch deleted file mode 100644 index e646b7b2da5c..000000000000 --- a/app-emulation/vmware-player/files/1.0.1.19317/001_all_fix-permissions.patch +++ /dev/null @@ -1,15 +0,0 @@ -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.1.19317/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-player/files/1.0.1.19317/002_all_pagebreak-detection-fix.patch deleted file mode 100644 index f700f5df9d32..000000000000 --- a/app-emulation/vmware-player/files/1.0.1.19317/002_all_pagebreak-detection-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 -@@ -1969,7 +1969,7 @@ - . ' -E - | ' . shell_string($gHelper{'grep'}) . ' ' - . shell_string($pattern)); - chomp($header_page_offset); -- $header_page_offset =~ s/^$pattern \(?0x([0-9a-fA-F]{8,}).*$/$1/; -+ $header_page_offset =~ s/^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/$2/; - if ($header_page_offset =~ /[0-9a-fA-F]{8,}/) { - # We found a valid page offset - if (defined($gSystem{'page_offset'}) and diff --git a/app-emulation/vmware-player/files/1.0.1.19317/004_all_do-not-build-modules.patch b/app-emulation/vmware-player/files/1.0.1.19317/004_all_do-not-build-modules.patch deleted file mode 100644 index cec3b3ee4c1d..000000000000 --- a/app-emulation/vmware-player/files/1.0.1.19317/004_all_do-not-build-modules.patch +++ /dev/null @@ -1,17 +0,0 @@ -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.1.19317/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-player/files/1.0.1.19317/007_all_use-modprobe-over-insmod.patch deleted file mode 100644 index c29a87e8f226..000000000000 --- a/app-emulation/vmware-player/files/1.0.1.19317/007_all_use-modprobe-over-insmod.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-player/files/1.0.1.19317/009_all_init.d-modules-warning.patch b/app-emulation/vmware-player/files/1.0.1.19317/009_all_init.d-modules-warning.patch deleted file mode 100644 index 4eab043af8dc..000000000000 --- a/app-emulation/vmware-player/files/1.0.1.19317/009_all_init.d-modules-warning.patch +++ /dev/null @@ -1,19 +0,0 @@ -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/digest-vmware-player-1.0.3.34682 b/app-emulation/vmware-player/files/digest-vmware-player-1.0.3.34682-r1 index d3219989cb71..d3219989cb71 100644 --- a/app-emulation/vmware-player/files/digest-vmware-player-1.0.3.34682 +++ b/app-emulation/vmware-player/files/digest-vmware-player-1.0.3.34682-r1 diff --git a/app-emulation/vmware-player/vmware-player-1.0.3.34682.ebuild b/app-emulation/vmware-player/vmware-player-1.0.3.34682-r1.ebuild index b60bec8ee09b..1b286306a0c6 100644 --- a/app-emulation/vmware-player/vmware-player-1.0.3.34682.ebuild +++ b/app-emulation/vmware-player/vmware-player-1.0.3.34682-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.3.34682.ebuild,v 1.1 2006/12/14 18:38:51 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-1.0.3.34682-r1.ebuild,v 1.1 2007/06/16 12:57:54 ikelos Exp $ inherit eutils vmware |