Added patch for vmware-config.pl to allow for 2G/2G from 2.6.16 and closing bug #127661 and bug #127023.

(Portage version: 2.1_pre7-r2)

4 files changed, 277 insertions, 1 deletions

diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index c761ba6ce74f..f36a2332eba5 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/vmware-player
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.9 2006/03/20 19:25:53 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.10 2006/03/30 23:29:46 wolf31o2 Exp $
+
+*vmware-player-1.0.1.19317-r2 (30 Mar 2006)
+
+  30 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/vmware-player-1.0.1.19317-config3.patch,
+  +vmware-player-1.0.1.19317-r2.ebuild:
+  Added patch for vmware-config.pl to allow for 2G/2G from 2.6.16 and closing
+  bug #127661 and bug #127023.
 
 *vmware-player-1.0.1.19317-r1 (20 Mar 2006)
 
diff --git a/app-emulation/vmware-player/files/digest-vmware-player-1.0.1.19317-r2 b/app-emulation/vmware-player/files/digest-vmware-player-1.0.1.19317-r2
new file mode 100644
index 000000000000..0c4ae7d284e7
--- /dev/null
+++ b/app-emulation/vmware-player/files/digest-vmware-player-1.0.1.19317-r2
@@ -0,0 +1,9 @@
+MD5 58d0aab1f3303dfb5354a929bcf1b0e9 VMware-player-1.0.1-19317.tar.gz 35786922
+RMD160 7ba3c6cefaf6fb98cc932d0974206b6b0f408a29 VMware-player-1.0.1-19317.tar.gz 35786922
+SHA256 c4b0e43ef7e56803e8bc822f2ab240bd2911019dca2d6a615e76dc41642cb4bf VMware-player-1.0.1-19317.tar.gz 35786922
+MD5 d60f09d1cd01e119a600f5e16f637dd4 vmware-any-any-update99.tar.gz 296093
+RMD160 e22e0530d248dde2922283683573eaa02cdbc567 vmware-any-any-update99.tar.gz 296093
+SHA256 21f1fd021f0c13dfd2279a1df9a3ac386c150fbbc29239834399e471c99fd07b vmware-any-any-update99.tar.gz 296093
+MD5 7ca1ec14670b51d8cf824a58bc8d6621 vmware.png 470
+RMD160 759a5530b3bb605e6bc2c1e203490163d320485d vmware.png 470
+SHA256 9bec91ecc32fa913141ca303abf1abec988ebc7fb4f27389f173bf3493bffb9b vmware.png 470
diff --git a/app-emulation/vmware-player/files/vmware-player-1.0.1.19317-config3.patch b/app-emulation/vmware-player/files/vmware-player-1.0.1.19317-config3.patch
new file mode 100644
index 000000000000..f700f5df9d32
--- /dev/null
+++ b/app-emulation/vmware-player/files/vmware-player-1.0.1.19317-config3.patch
@@ -0,0 +1,12 @@
+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/vmware-player-1.0.1.19317-r2.ebuild b/app-emulation/vmware-player/vmware-player-1.0.1.19317-r2.ebuild
new file mode 100644
index 000000000000..685f85280d52
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-1.0.1.19317-r2.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2006 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.1.19317-r2.ebuild,v 1.1 2006/03/30 23:29:46 wolf31o2 Exp $
+
+# Unlike many other binary packages the user doesn't need to agree to a licence
+# to download VMWare. The agreeing to a licence is part of the configure step
+# which the user must run manually.
+
+inherit eutils
+
+S=${WORKDIR}/vmware-player-distrib
+ANY_ANY="vmware-any-any-update99"
+NP="VMware-player-1.0.1-19317"
+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="http://download3.vmware.com/software/vmplayer/${NP}.tar.gz
+	http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz
+	http://ftp.cvut.cz/vmware/obselete/${ANY_ANY}.tar.gz
+	http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
+	http://knihovny.cvut.cz/ftp/pub/vmware/obselete/${ANY_ANY}.tar.gz
+	mirror://gentoo/vmware.png"
+
+LICENSE="vmware"
+IUSE=""
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="nostrip" # fetch"
+
+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/x11 )
+		virtual/xft )
+	>=dev-lang/perl-5
+	!app-emulation/vmware-workstation
+	sys-apps/pciutils"
+
+dir=/opt/vmware/player
+Ddir=${D}/${dir}
+VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+pkg_setup() {
+	# This is due to both bugs #104480 and #106170
+	enewgroup "${VMWARE_GROUP}"
+}
+src_unpack() {
+	unpack ${NP}.tar.gz
+	cd ${S}
+	# patch the config to not install desktop/icon files and proper gentoo init
+	epatch ${FILESDIR}/${P}-config.patch
+	epatch ${FILESDIR}/${P}-config2.patch
+	epatch ${FILESDIR}/${P}-config3.patch
+	unpack ${ANY_ANY}.tar.gz
+	mv -f ${ANY_ANY}/*.tar ${S}/lib/modules/source/
+	cd ${S}/${ANY_ANY}
+	chmod 755 ../lib/bin/vmplayer ../bin/vmnet-bridge ../lib/bin/vmware-vmx \
+		../lib/bin-debug/vmware-vmx
+	# vmware any98 still doesn't patch the vmware binary
+#	./update vmware ../lib/bin/vmware || die
+#	./update bridge ../bin/vmnet-bridge || die
+#	./update vmx ../lib/bin/vmware-vmx || die
+#	./update vmxdebug ../lib/bin-debug/vmware-vmx || die
+
+}
+
+src_install() {
+	dodir ${dir}/bin
+	cp -pPR bin/* ${Ddir}/bin
+
+	dodir ${dir}/lib
+	cp -dr lib/* ${Ddir}/lib
+
+	# Since with Gentoo we compile everthing it doesn't make sense to keep
+	# the precompiled modules arround. Saves about 4 megs of disk space too.
+	rm -rf ${Ddir}/lib/modules/binary
+	# We also don't need to keep the icons around
+	rm -rf ${Ddir}/lib/share/icons
+	# We set vmware-vmx and vmware-ping suid
+	chmod u+s ${Ddir}/bin/vmware-ping
+	chmod u+s ${Ddir}/lib/bin/vmware-vmx
+
+	dodoc doc/* || die "dodoc"
+	# Fix for bug #91191
+	dodir ${dir}/doc
+	insinto ${dir}/doc
+	doins doc/EULA || die "copying EULA"
+
+	# vmware service loader
+	newinitd ${FILESDIR}/vmware.rc vmware || die "newinitd"
+
+	# vmware enviroment
+	doenvd ${FILESDIR}/90vmware-player || die "doenvd"
+
+	dodir /etc/vmware/
+	cp -pPR etc/* ${D}/etc/vmware/
+
+	dodir /etc/vmware/init.d
+	dodir /etc/vmware/init.d/rc0.d
+	dodir /etc/vmware/init.d/rc1.d
+	dodir /etc/vmware/init.d/rc2.d
+	dodir /etc/vmware/init.d/rc3.d
+	dodir /etc/vmware/init.d/rc4.d
+	dodir /etc/vmware/init.d/rc5.d
+	dodir /etc/vmware/init.d/rc6.d
+	cp -pPR installer/services.sh ${D}/etc/vmware/init.d/vmware || die
+	dosed 's/mknod -m 600/mknod -m 660/' /etc/vmware/init.d/vmware || die
+	dosed '/c 119 "$vHubNr"/ a\
+			chown root:vmware /dev/vmnet*\
+			' /etc/vmware/init.d/vmware || die
+
+	# This is to fix a problem where if someone merges vmware and then
+	# before configuring vmware they upgrade or re-merge the vmware
+	# package which would rmdir the /etc/vmware/init.d/rc?.d directories.
+	keepdir /etc/vmware/init.d/rc{0,1,2,3,4,5,6}.d
+
+	insinto ${dir}/lib/icon
+	doins ${S}/lib/share/icons/48x48/apps/${PN}.png || die
+	doicon ${S}/lib/share/icons/48x48/apps/${PN}.png || die
+	insinto /usr/share/mime/packages
+	doins ${FILESDIR}/vmware.xml
+
+	make_desktop_entry vmplayer "VMWare Player" ${PN}.png
+
+	dodir /usr/bin
+	dosym ${dir}/bin/vmplayer /usr/bin/vmplayer
+
+	# this removes the user/group warnings
+	chown -R root:0 ${D} || die
+
+	dodir /etc/vmware
+	# this makes the vmware-vmx executable only executable by vmware group
+	fowners root:vmware ${dir}/lib/bin{,-debug}/vmware-vmx /etc/vmware \
+		|| die "Changing permissions"
+	fperms 4750 ${dir}/lib/bin{,-debug}/vmware-vmx || die
+	fperms 770 /etc/vmware || die
+
+	# this adds udev rules for vmmon*
+	dodir /etc/udev/rules.d
+	echo 'KERNEL=="vmmon*", GROUP="vmware" MODE=660' > \
+			${D}/etc/udev/rules.d/60-vmware.rules || die
+
+	# Questions:
+	einfo "Adding answers to /etc/vmware/locations"
+	locations="${D}/etc/vmware/locations"
+	echo "answer BINDIR ${dir}/bin" >> ${locations}
+	echo "answer LIBDIR ${dir}/lib" >> ${locations}
+	echo "answer MANDIR ${dir}/man" >> ${locations}
+	echo "answer DOCDIR ${dir}/doc" >> ${locations}
+	echo "answer RUN_CONFIGURATOR no" >> ${locations}
+	echo "answer INITDIR /etc/vmware/init.d" >> ${locations}
+	echo "answer INITSCRIPTSDIR /etc/vmware/init.d" >> ${locations}
+}
+
+pkg_preinst() {
+	# This must be done after the install to get the mtimes on each file
+	# right. This perl snippet gets the /etc/vmware/locations file code:
+	# perl -e "@a = stat('bin/vmware'); print \$a[9]"
+	# The above perl line and the find line below output the same thing.
+	# I would think the find line is faster to execute.
+	# find /opt/vmware/bin/vmware -printf %T@
+
+	#Note: it's a bit weird to use ${D} in a preinst script but it should work
+	#(drobbins, 1 Feb 2002)
+
+	einfo "Generating /etc/vmware/locations file."
+	d=`echo ${D} | wc -c`
+	for x in `find ${Ddir} ${D}/etc/vmware` ; do
+		x="`echo ${x} | cut -c ${d}-`"
+		if [ -d ${D}/${x} ] ; then
+			echo "directory ${x}" >> ${D}/etc/vmware/locations
+		else
+			echo -n "file ${x}" >> ${D}/etc/vmware/locations
+			if [ "${x}" == "/etc/vmware/locations" ] ; then
+				echo "" >> ${D}/etc/vmware/locations
+			elif [ "${x}" == "/etc/vmware/not_configured" ] ; then
+				echo "" >> ${D}/etc/vmware/locations
+			else
+				echo -n " " >> ${D}/etc/vmware/locations
+				#perl -e "@a = stat('${D}${x}'); print \$a[9]" >> ${D}/etc/vmware/locations
+				find ${D}${x} -printf %T@ >> ${D}/etc/vmware/locations
+				echo "" >> ${D}/etc/vmware/locations
+			fi
+		fi
+	done
+}
+
+pkg_config() {
+	einfo "Running ${dir}/bin/vmware-config.pl"
+	${dir}/bin/vmware-config.pl
+}
+
+pkg_postinst() {
+	update-mime-database /usr/share/mime
+
+	# This is to fix the problem where the not_configured file doesn't get
+	# removed when the configuration is run. This doesn't remove the file
+	# It just tells the vmware-config.pl script it can delete it.
+	einfo "Updating /etc/vmware/locations"
+	for x in /etc/vmware/._cfg????_locations ; do
+		if [ -f $x ] ; then
+			cat $x >> /etc/vmware/locations
+			rm $x
+		fi
+	done
+
+	einfo
+	einfo "You need to run ${dir}/bin/vmware-config.pl to complete the install."
+	einfo
+	einfo "For VMware Add-Ons just visit"
+	einfo "http://www.vmware.com/download/downloadaddons.html"
+	einfo
+	einfo "After configuring, type 'vmplayer' to launch"
+	einfo
+	einfo "Also note that when you reboot you should run:"
+	einfo "/etc/init.d/vmware start"
+	einfo "before trying to run vmplayer.  Or you could just add"
+	einfo "it to the default run level:"
+	einfo "rc-update add vmware default"
+	echo
+	ewarn "Remember, in order to run vmplayer, you have to"
+	ewarn "be in the '${VMWARE_GROUP}' group."
+	echo
+	ewarn "VMWare allows for the potential of overwriting files as root.  Only"
+	ewarn "give VMWare access to trusted individuals."
+
+	#ewarn "For users of glibc-2.3.x, vmware-nat support is *still* broken on 2.6.x"
+}
+
+pkg_postrm() {
+	einfo
+	einfo "To remove all traces of vmware you will need to remove the files"
+	einfo "in /etc/vmware/, /etc/init.d/vmware, /lib/modules/*/misc/vm*.o,"
+	einfo "and .vmware/ in each users home directory. Don't forget to rmmod the"
+	einfo "vm* modules, either."
+	einfo
+}