Updated vmware ebuilds to now require users be in the vmware group. Also, added better udev handling. Closing bug #104480 and #106170.

Package-Manager: portage-2.0.52-r1

8 files changed, 103 insertions, 13 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 57c3b9c186c7..e74fa8303106 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.93 2005/08/29 14:50:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.94 2005/09/16 19:07:23 wolf31o2 Exp $
+
+*vmware-workstation-5.0.0.13124-r2 (16 Sep 2005)
+*vmware-workstation-4.5.2.8848-r7 (16 Sep 2005)
+*vmware-workstation-3.2.1.2242-r4 (16 Sep 2005)
+
+  16 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -vmware-workstation-3.2.1.2242-r3.ebuild,
+  +vmware-workstation-3.2.1.2242-r4.ebuild,
+  -vmware-workstation-4.5.2.8848-r6.ebuild,
+  +vmware-workstation-4.5.2.8848-r7.ebuild,
+  -vmware-workstation-5.0.0.13124-r1.ebuild,
+  +vmware-workstation-5.0.0.13124-r2.ebuild:
+  Updated vmware ebuilds to now require users be in the vmware group. Also,
+  added better udev handling. Closing bug #104480 and #106170.
 
   29 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   vmware-workstation-3.2.1.2242-r3.ebuild,
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 2690e91998ea..16c4c43d9be9 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,14 +1,14 @@
-MD5 7734373bf6242c8585779790291bbb97 vmware-workstation-5.0.0.13124-r1.ebuild 7390
-MD5 7a5626658b733845c94ab3b3db39f31d vmware-workstation-3.2.1.2242-r3.ebuild 7026
-MD5 2ac4e6b70d40f8be9db91f3bbc8bc69a ChangeLog 20944
+MD5 f269179d8c630203e67429824c870466 vmware-workstation-3.2.1.2242-r4.ebuild 7988
+MD5 5b4c2ad414b81516e77eb26cbd1f8cad vmware-workstation-4.5.2.8848-r7.ebuild 8333
+MD5 5cbc0d6ca2405863328a14323fc47484 ChangeLog 21550
 MD5 a4e5ebe5e931d6196fd49550e067b078 metadata.xml 339
-MD5 f2d7cbe4b96fba695c48d4dc8e6dbf75 vmware-workstation-4.5.2.8848-r6.ebuild 7439
+MD5 fcbc8bc3b0d19f6ed961a5aeb2343763 vmware-workstation-5.0.0.13124-r2.ebuild 8284
 MD5 48c1667773503fee21a1068da07440b9 files/90vmware 70
-MD5 a8ae04f7bee54ce69773f34652ff7abe files/digest-vmware-workstation-4.5.2.8848-r6 210
-MD5 92f8c8e12ca49c290fafd664a86d1fc6 files/digest-vmware-workstation-3.2.1.2242-r3 210
+MD5 a8ae04f7bee54ce69773f34652ff7abe files/digest-vmware-workstation-4.5.2.8848-r7 210
+MD5 92f8c8e12ca49c290fafd664a86d1fc6 files/digest-vmware-workstation-3.2.1.2242-r4 210
 MD5 c2dc0111fb5bf45ff99578b57d349cb3 files/vmware.rc 1417
 MD5 55441829b237e3efd78d06a1b1a73035 files/vmware-workstation-5.0.0.13124-config.patch 443
-MD5 d5b81b6cb710cbb9e1dc2284cab9d096 files/digest-vmware-workstation-5.0.0.13124-r1 159
+MD5 d5b81b6cb710cbb9e1dc2284cab9d096 files/digest-vmware-workstation-5.0.0.13124-r2 159
 MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
 MD5 87e9f24e29aaec45c84f7e57a50f96f2 files/vmware-workstation-4.5.2.8848-librarypath.patch 807
 MD5 48c1667773503fee21a1068da07440b9 files/3.2.1.2242/90vmware 70
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.2.1.2242-r3 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.2.1.2242-r4
index 622091a92e03..622091a92e03 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.2.1.2242-r3
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.2.1.2242-r4
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r6 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r7
index 322a216cd764..322a216cd764 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r6
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r7
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124-r1 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124-r2
index 09fc3b1d5ef9..09fc3b1d5ef9 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124-r1
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124-r2
diff --git a/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r3.ebuild b/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r4.ebuild
index 79495d1c191e..d5ca332b1576 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r3.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r3.ebuild,v 1.10 2005/08/29 14:50:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r4.ebuild,v 1.1 2005/09/16 19:07:24 wolf31o2 Exp $
 
 # Unlike many other binary packages the user doesn't need to agree to a licence
 # to download VM Ware.  The agreeing to a licence is part of the configure step
@@ -41,6 +41,12 @@ RDEPEND="sys-libs/glibc
 
 dir=/opt/vmware
 Ddir=${D}/${dir}
+VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+pkg_setup() {
+	# This is due to both bugs #104480 and #106170
+	enewgroup "${VMWARE_GROUP}"
+}
 
 src_unpack() {
 	check_KV
@@ -109,6 +115,10 @@ src_install() {
 	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
+	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
@@ -122,6 +132,18 @@ src_install() {
 
 	make_desktop_entry vmware "VMWare Workstation" vmware.png
 
+	# this removes the user/group warnings
+	chown -R root:0 ${D} || die
+
+	# this makes the vmware-vmx executable only executable by vmware group
+	fowners root:vmware ${dir}/lib/bin{,-debug}/vmware-vmx || die
+	fperms 750 ${dir}/lib/bin{,-debug}/vmware-vmx || 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"
@@ -203,6 +225,12 @@ pkg_postinst() {
 	einfo "before trying to run vmware.  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 vmware, 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."
 }
 
 pkg_postrm() {
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r6.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r7.ebuild
index ae7b719c8a88..7562af1a2c55 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r6.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r6.ebuild,v 1.7 2005/08/29 14:50:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r7.ebuild,v 1.1 2005/09/16 19:07:24 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
@@ -45,6 +45,12 @@ RDEPEND=">=dev-lang/perl-5
 
 dir=/opt/vmware
 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
@@ -106,6 +112,10 @@ src_install() {
 	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
@@ -123,7 +133,16 @@ src_install() {
 	dosym ${dir}/bin/vmware /usr/bin/vmware
 
 	# this removes the user/group warnings
-	chown -R root:0 ${D}
+	chown -R root:0 ${D} || die
+
+	# this makes the vmware-vmx executable only executable by vmware group
+	fowners root:vmware ${dir}/lib/bin{,-debug}/vmware-vmx || die
+	fperms 750 ${dir}/lib/bin{,-debug}/vmware-vmx || 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"
@@ -201,6 +220,11 @@ pkg_postinst() {
 	einfo "it to the default run level:"
 	einfo "rc-update add vmware default"
 	echo
+	ewarn "Remember, in order to run vmware, 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"
 }
 
diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r2.ebuild
index b4b236f132ab..462d7fc812ae 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r1.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r1.ebuild,v 1.5 2005/08/29 14:50:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r2.ebuild,v 1.1 2005/09/16 19:07:24 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
@@ -44,6 +44,12 @@ RDEPEND="sys-libs/glibc
 
 dir=/opt/vmware
 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
@@ -103,6 +109,10 @@ src_install() {
 	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
@@ -121,7 +131,16 @@ src_install() {
 	dosym ${dir}/bin/vmware /usr/bin/vmware
 
 	# this removes the user/group warnings
-	chown -R root:0 ${D}
+	chown -R root:0 ${D} || die
+
+	# this makes the vmware-vmx executable only executable by vmware group
+	fowners root:vmware ${dir}/lib/bin{,-debug}/vmware-vmx || die
+	fperms 750 ${dir}/lib/bin{,-debug}/vmware-vmx || 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"
@@ -201,6 +220,11 @@ pkg_postinst() {
 	einfo "it to the default run level:"
 	einfo "rc-update add vmware default"
 	echo
+	ewarn "Remember, in order to run vmware, 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"
 }