Fix userpriv problems by adding chmod.

Fix ${ROOT} usage.

svn path=/trunk/; revision=8

4 files changed, 58 insertions, 54 deletions

diff --git a/app-emulation/vmware-server-console/Manifest b/app-emulation/vmware-server-console/Manifest
index 34dd667..722b954 100644
--- a/app-emulation/vmware-server-console/Manifest
+++ b/app-emulation/vmware-server-console/Manifest
@@ -7,6 +7,6 @@ SHA256 fa2d858dc5fb5349991ec500529a742cae6b2c9652938dad3352187c311e4842 files/di
 MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592
 SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592
-MD5 42ddcc1cf40e1cddd1e0f0b689eab136 vmware-server-console-1.0.0.22088.ebuild 5073
-RMD160 b26a4a758dc3061c8f7b480e3b2015ac4e64430c vmware-server-console-1.0.0.22088.ebuild 5073
-SHA256 e20fac674345645d3c0360b549445d2471d8d230016e839e1da70844e8c5ea18 vmware-server-console-1.0.0.22088.ebuild 5073
+MD5 bf79772e43fdc14e656d1444f0b56dee vmware-server-console-1.0.0.22088.ebuild 5179
+RMD160 c0de01d6b521a755038c549b64158b10519455c9 vmware-server-console-1.0.0.22088.ebuild 5179
+SHA256 c3a54a10ae0b4c680c0809312f67640a3f708d34f83e86cbbf091a2ca89de3c8 vmware-server-console-1.0.0.22088.ebuild 5179
diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild
index 7839f85..53e46a5 100644
--- a/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild
+++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild
@@ -33,25 +33,26 @@ DEPEND=">=sys-libs/glibc-2.3.5
 # precompiled binary package thats linked to glibc.
 RDEPEND=">=sys-libs/glibc-2.3.5
 		 amd64? ( app-emulation/emul-linux-x86-gtklibs )
-		 || ( ( x11-libs/libSM
-				x11-libs/libICE
-				x11-libs/libX11
-				x11-libs/libXau
-				x11-libs/libXcursor
-				x11-libs/libXdmcp
-				x11-libs/libXext
-				x11-libs/libXfixes
-				x11-libs/libXft
-				x11-libs/libXi
-				x11-libs/libXrandr
-				x11-libs/libXrender
-				x11-libs/libXt
-				x11-libs/libXtst
-	     	  )
-			  virtual/x11
-	        )
+		 !amd64 ( || ( ( x11-libs/libSM
+						 x11-libs/libICE
+						 x11-libs/libX11
+						 x11-libs/libXau
+						 x11-libs/libXcursor
+						 x11-libs/libXdmcp
+						 x11-libs/libXext
+						 x11-libs/libXfixes
+						 x11-libs/libXft
+						 x11-libs/libXi
+						 x11-libs/libXrandr
+						 x11-libs/libXrender
+						 x11-libs/libXt
+						 x11-libs/libXtst
+	     	  		   )
+			  		   virtual/x11
+	        		 )
+				)
 		 >=dev-lang/perl-5
-		"
+		 "
 
 dir=/opt/vmware/server/console
 Ddir=${D}/${dir}
@@ -140,21 +141,21 @@ pkg_preinst() {
 }
 
 pkg_config() {
-	einfo "Running ${dir}/bin/vmware-config-console.pl"
-	${dir}/bin/vmware-config-console.pl
+	einfo "Running ${ROOT}${dir}/bin/vmware-config-console.pl"
+	${ROOT}${dir}/bin/vmware-config-console.pl
 }
 
 pkg_postinst() {
-	update-mime-database /usr/share/mime
+	update-mime-database "${ROOT}/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-console.pl script it can delete it.
 	einfo "Updating /etc/vmware-console/locations"
-	for x in /etc/vmware-console/._cfg????_locations ; do
+	for x in "${ROOT}/etc/vmware-console/._cfg????_locations" ; do
 		if [ -f $x ] ; then
-			cat $x >> /etc/vmware-console/locations
-			rm -f $x
+			cat $x >> "${ROOT}/etc/vmware-console/locations"
+			rm $x
 		fi
 	done
 
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index ea9527c..901df27 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -31,6 +31,6 @@ SHA256 408be40a1e176ef2c74fae1e9cc9dcd716ece187b6b2bcf037892a4f5ae1394b files/vm
 MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592
 SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592
-MD5 cb06fb49270cc79cb26a1478aca17529 vmware-server-1.0.0.22088.ebuild 9104
-RMD160 321cfcb4c149caf8c4d33ce3888290d9263ad6da vmware-server-1.0.0.22088.ebuild 9104
-SHA256 4deacdc0e7c6995e14c9a0bb7d44a2012d390195156afc1f9463b2bd0b6f4e43 vmware-server-1.0.0.22088.ebuild 9104
+MD5 2d182d0443410c122d5ec3fd79d1b55a vmware-server-1.0.0.22088.ebuild 9259
+RMD160 754f663e73912f031d40c3a20c81c2da24ca1d6c vmware-server-1.0.0.22088.ebuild 9259
+SHA256 14780b5acf95891ebcb2a78ba4c744db272faeb527bd1cc8a6249f0f36fa6441 vmware-server-1.0.0.22088.ebuild 9259
diff --git a/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild b/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild
index cc6d8c5..7dd3591 100644
--- a/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild
+++ b/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild
@@ -35,23 +35,24 @@ RDEPEND=">=sys-libs/glibc-2.3.5
 	amd64? ( app-emulation/emul-linux-x86-baselibs
 	         app-emulation/emul-linux-x86-gtklibs 
 		   )
-		|| ( ( x11-libs/libXrandr
-			   x11-libs/libXcursor
-			   x11-libs/libXinerama
-			   x11-libs/libXi 
-			   x11-libs/libXft
-			 )
-			 ( virtual/x11 
-			   virtual/xft
-			 )
-		   )
-	>=dev-lang/perl-5
-	!app-emulation/vmware-player
-	!app-emulation/vmware-workstation
-	sys-apps/pciutils
-	sys-apps/xinetd
-	>=sys-apps/baselayout-1.11.14
-	~app-emulation/${PN}-modules-${PV}"
+	!amd64 ( || ( ( x11-libs/libXrandr
+					x11-libs/libXcursor
+					x11-libs/libXinerama
+					x11-libs/libXi 
+					x11-libs/libXft
+				  )
+				  ( virtual/x11 
+					virtual/xft
+				  )
+				)
+		    )
+			>=dev-lang/perl-5
+			!app-emulation/vmware-player
+			!app-emulation/vmware-workstation
+			sys-apps/pciutils
+			sys-apps/xinetd
+			>=sys-apps/baselayout-1.11.14
+			~app-emulation/${PN}-modules-${PV}"
 
 dir=/opt/vmware/server
 Ddir=${D}/${dir}
@@ -86,8 +87,10 @@ src_unpack() {
 
 	for sobj in `find ${S}/lib/perl5/site_perl/5.005/ -name *.so -and ! -name PAM.so -and ! -name POSIX.so`;
 	do
-		# echo $sobj
+		# Change the permissions for FEATURES="userpriv"
+		chmod u+w $sobj
 		chrpath -d $sobj
+		chmod u-w $sobj
 	done
 }
 
@@ -218,21 +221,21 @@ pkg_preinst() {
 }
 
 pkg_config() {
-	einfo "Running ${dir}/bin/vmware-config.pl"
-	${dir}/bin/vmware-config.pl
+	einfo "Running ${ROOT}${dir}/bin/vmware-config.pl"
+	${ROOT}${dir}/bin/vmware-config.pl
 }
 
 pkg_postinst() {
-	update-mime-database /usr/share/mime
-	[ -d /etc/vmware ] && chown -R root:${VMWARE_GROUP} /etc/vmware
+	update-mime-database ${ROOT}/usr/share/mime
+	[ -d ${ROOT}/etc/vmware ] && chown -R root:${VMWARE_GROUP} ${ROOT}/etc/vmware
 
 	# 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
+	for x in "${ROOT}/etc/vmware/._cfg????_locations" ; do
 		if [ -f $x ] ; then
-			cat $x >> /etc/vmware/locations
+			cat $x >> "${ROOT}/etc/vmware/locations"
 			rm $x
 		fi
 	done