Fix up PAM issues on amd64, add vmware-modules blockers and fix init script for baselayout-2 and dash.

Package-Manager: portage-2.1.3.9

5 files changed, 51 insertions, 44 deletions

diff --git a/app-emulation/vmware-server/ChangeLog b/app-emulation/vmware-server/ChangeLog
index 70875fab56ac..99cdd7464dc6 100644
--- a/app-emulation/vmware-server/ChangeLog
+++ b/app-emulation/vmware-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/vmware-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.26 2007/07/28 17:40:56 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.27 2007/09/16 15:36:50 ikelos Exp $
+
+  16 Sep 2007; Mike Auty <ikelos@gentoo.org> files/vmware-authd,
+  files/vmware-server.rc, vmware-server-1.0.3.44356.ebuild:
+  Fix up PAM issues on amd64, add vmware-modules blockers and fix init script
+  for baselayout-2 and dash.
 
   28 Jul 2007; Mike Auty <ikelos@gentoo.org>
   files/digest-vmware-server-1.0.3.44356, Manifest:
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index 411e19f5a87b..08a6359d192f 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -37,14 +37,14 @@ AUX general/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5
 MD5 9689ef9d197dcc43dc2f390e6de4ec21 files/general/009_all_init.d-modules-warning.patch 991
 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d files/general/009_all_init.d-modules-warning.patch 991
 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498 files/general/009_all_init.d-modules-warning.patch 991
-AUX vmware-authd 315 RMD160 3624da708d60aa1c1319278553cc96ac07324bb4 SHA1 91bb3c7dd6651ac81765e23d4f83fcbd5ae9af0e SHA256 490794ea4c6e35fb4113c8cf17d3872ae5877ddec5f8e0164203e96cf48f5ef2
-MD5 a237d4e862ce8615d286c979dd9fd2fd files/vmware-authd 315
-RMD160 3624da708d60aa1c1319278553cc96ac07324bb4 files/vmware-authd 315
-SHA256 490794ea4c6e35fb4113c8cf17d3872ae5877ddec5f8e0164203e96cf48f5ef2 files/vmware-authd 315
-AUX vmware-server.rc 1596 RMD160 86297a51765d38cb8b9ac6ad79b4e9ad66e1f28d SHA1 29bcc1a0591b1bdb6cd3dfea2e37deaa9589776c SHA256 28a68c790c22e8364e7f78a9ebeb1aa6393d307b601b8d9533c5f2b742c1ed55
-MD5 75f4a89a01529e3b222b81c81529f406 files/vmware-server.rc 1596
-RMD160 86297a51765d38cb8b9ac6ad79b4e9ad66e1f28d files/vmware-server.rc 1596
-SHA256 28a68c790c22e8364e7f78a9ebeb1aa6393d307b601b8d9533c5f2b742c1ed55 files/vmware-server.rc 1596
+AUX vmware-authd 211 RMD160 1bd60030f6f7bb78c0fd3b6d156498121d4be5d4 SHA1 514538222dc4e665e1d450e1bf9bf1d8e03a2b61 SHA256 3eafe9ac10aeac852faa1fbbccb5c525560e358f69964995c5cfb86c53af6b54
+MD5 11c744974bab5acd3c31d1e709bd7578 files/vmware-authd 211
+RMD160 1bd60030f6f7bb78c0fd3b6d156498121d4be5d4 files/vmware-authd 211
+SHA256 3eafe9ac10aeac852faa1fbbccb5c525560e358f69964995c5cfb86c53af6b54 files/vmware-authd 211
+AUX vmware-server.rc 1540 RMD160 430155211a17e56e3394670ff4bab14ec4c8b534 SHA1 ea63af764d1b893736870356e88145d063cabf20 SHA256 3ec3e3605348fc094b005d8e92118042bf01af370681b9c40aafab42184768ec
+MD5 3b5b19c50ff38e65c675ce2abaaa10f7 files/vmware-server.rc 1540
+RMD160 430155211a17e56e3394670ff4bab14ec4c8b534 files/vmware-server.rc 1540
+SHA256 3ec3e3605348fc094b005d8e92118042bf01af370681b9c40aafab42184768ec files/vmware-server.rc 1540
 AUX vmware-server.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
 MD5 aa1b576735134579f04b29763901dc4f files/vmware-server.xml 1592
 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware-server.xml 1592
@@ -54,14 +54,14 @@ DIST vmware-any-any-update113.tar.gz 469321 RMD160 a4de5c17489dffade015f5bc3036f
 DIST vmware-libcrypto.so.0.9.7l.tar.bz2 412159 RMD160 89282ae9fc6e8921a47704bc9cd23cf70a6870e8 SHA1 f86c4cb076fe1764975e9243dc0fae763f2b589a SHA256 fae52acf61415959cca763a715a2b61ec49f161a416d418d6a1faffce531db12
 DIST vmware-libssl.so.0.9.7l.tar.bz2 78244 RMD160 195dd4808e60f81621e6ed12b843ded49c0fa747 SHA1 5fe729a1e49e77afd83b408845833174e1296e39 SHA256 3e1e13196066dc5b77d3ef6b5df55a29156eba1f39661e40cd617b538220d089
 DIST vmware-server-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA1 9d696750ca3ec92b31ca8112fd80dcd832494044 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b
-EBUILD vmware-server-1.0.3.44356.ebuild 3370 RMD160 df97d7a21f2c23c1d0bded1b41cd24339271febb SHA1 061453a71bfef9bf0fac6f151838a1a967978c17 SHA256 c10ecf83db73ac53bb69729e5306b060f134b00339a1b066b5d15d3a017873b6
-MD5 bcdfe531471e8a705c8ebd7f8a110729 vmware-server-1.0.3.44356.ebuild 3370
-RMD160 df97d7a21f2c23c1d0bded1b41cd24339271febb vmware-server-1.0.3.44356.ebuild 3370
-SHA256 c10ecf83db73ac53bb69729e5306b060f134b00339a1b066b5d15d3a017873b6 vmware-server-1.0.3.44356.ebuild 3370
-MISC ChangeLog 5351 RMD160 72ab19ea68b056ca990149afb55ab071a015d598 SHA1 d0387a832d43d2871328f76347004bfca05dc5a6 SHA256 d95b1a47e76bc1c687db1c69f0f8b7643438c3efff8f40eb44ec05b10a2508a1
-MD5 16ac81e61beb54479c5ec24829bccaeb ChangeLog 5351
-RMD160 72ab19ea68b056ca990149afb55ab071a015d598 ChangeLog 5351
-SHA256 d95b1a47e76bc1c687db1c69f0f8b7643438c3efff8f40eb44ec05b10a2508a1 ChangeLog 5351
+EBUILD vmware-server-1.0.3.44356.ebuild 3593 RMD160 da3a831eb53798972ac4e537d02c293a9e5b19bc SHA1 62643f33b18f5637a94a374f9131bd1f89d44885 SHA256 2bf76ce4613768b576fa9c7b608592f204815d9d092adfb2b2e58344d78192aa
+MD5 998f7979c5ef96df97a4dfb04178e8bf vmware-server-1.0.3.44356.ebuild 3593
+RMD160 da3a831eb53798972ac4e537d02c293a9e5b19bc vmware-server-1.0.3.44356.ebuild 3593
+SHA256 2bf76ce4613768b576fa9c7b608592f204815d9d092adfb2b2e58344d78192aa vmware-server-1.0.3.44356.ebuild 3593
+MISC ChangeLog 5584 RMD160 0b03d9487d654e594e0f68f4993936fed3ccd067 SHA1 8580c5f89d28cfdc8b76822b85dae9586332c227 SHA256 fd9c0a6ed7eb507cdf8deff1e64bad5d1d68e648d5dd1859e2282794eed3ea15
+MD5 86de3d30c1143dbfe3a5ed5dbf27ef8a ChangeLog 5584
+RMD160 0b03d9487d654e594e0f68f4993936fed3ccd067 ChangeLog 5584
+SHA256 fd9c0a6ed7eb507cdf8deff1e64bad5d1d68e648d5dd1859e2282794eed3ea15 ChangeLog 5584
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 MD5 7cc95faad4185e8ed375248bc73a17fc metadata.xml 159
 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 metadata.xml 159
@@ -70,9 +70,9 @@ MD5 823004454c8d0fb0eaa5182c9b13597b files/digest-vmware-server-1.0.3.44356 1421
 RMD160 b9354bd8b5330b1d53ff93d1a104076871eb1adb files/digest-vmware-server-1.0.3.44356 1421
 SHA256 2f652902212a6e4ab02af4c7144d13e0a60713f440b68672f14c01db2b5a3f79 files/digest-vmware-server-1.0.3.44356 1421
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG0zJDu7rWomwgFXoRAkczAKCLNrOcIvzlfWRayRon0WSrrZumQgCfbeIk
-pzNJa/prNENLizpC0bFClQY=
-=YU8l
+iD8DBQFG7U2hu7rWomwgFXoRAqynAJ94XjTkbNFoSzCBAv0zXHuAUZDrugCgoBAt
+WBjocjqXPYEWlHayX28pCv0=
+=4bwI
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-server/files/vmware-authd b/app-emulation/vmware-server/files/vmware-authd
index fce8f64a7810..ca1291b2cf68 100644
--- a/app-emulation/vmware-server/files/vmware-authd
+++ b/app-emulation/vmware-server/files/vmware-authd
@@ -1,6 +1,4 @@
 #%PAM-1.0
-auth       sufficient       pam_unix.so shadow nullok
-auth       required         pam_unix_auth.so shadow nullok
+auth       required         pam_unix.so shadow nullok
 account    required         pam_listfile.so item=group sense=allow file=/etc/vmware/vmwaregroup onerr=fail
-account    sufficient       pam_unix.so
-account    required         pam_unix_acct.so
+account    required         pam_unix.so
diff --git a/app-emulation/vmware-server/files/vmware-server.rc b/app-emulation/vmware-server/files/vmware-server.rc
index 465cfed187c2..5defcc5f8788 100644
--- a/app-emulation/vmware-server/files/vmware-server.rc
+++ b/app-emulation/vmware-server/files/vmware-server.rc
@@ -1,7 +1,7 @@
 #!/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-server/files/vmware-server.rc,v 1.4 2007/04/28 10:00:58 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc,v 1.5 2007/09/16 15:36:51 ikelos Exp $
 
 depend() {
 	need localmount xinetd
@@ -16,28 +16,28 @@ vmware_prettify() {
 	msgtype=0
 	while read line
 	do
-		[[ "${line}" == "" ]] && continue
-		if [[ "${msgtype}" -le "0" ]]
+		[ "$line" = "" ] && continue
+		if [ ${msgtype} -le 0 ]
 		then
-			if [[ "${msgtype}" == "-1" ]]
+			if [ ${msgtype} -eq -1 ]
 			then
-				ewarn ${line}
+				ewarn $line
 				continue
 			fi
-			if [[ "${line/*:*/}" == "" ]]
+			if echo ${line} | fgrep -q :
 			then
-				einfon ${line}
+				einfon $line
 				echo
 				eend 0
 				msgtype=1
-			elif [ "${line/*Stopping VMware virtual machines*/}" == "" ]
+			elif echo $line | grep -q "Stopping VMware virtual machines"
 			then
 				einfon $line
 				echo
 				eend 0
 				msgtype=0
 			else
-				ewarn ${line}
+				ewarn $line
 				msgtype=-1
 				waserror=1
 			fi
@@ -45,25 +45,25 @@ vmware_prettify() {
 		fi
 
 		# Strip out anything after the <esc> code
-		message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
-		einfon "  ${message}"
+		message=`echo $line | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  $message"
 		echo
 
-		echo ${line} | grep done > /dev/null
+		echo ${line} | grep -q done
 		status=$?
-		eend ${status}
+		eend $status
 
-		if [[ "${status}" != "0" ]]
+		if [ $status -eq 0 ]
 		then
-			logger -p local0.err -t vmware-${state} "${line}"
-			waserror=${status}
+			logger -p local0.err -t vmware-${state} "$line"
+			waserror=$status
 		fi
 	done
-	if [[ "${msgtype}" == "-1" ]]
+	if [ "$msgtype" = "-1" ]
 	then
 		eend 1 "VMware is not properly configured! See above."
 	fi
-	return ${waserror}
+	return $waserror
 }
 
 start() {
diff --git a/app-emulation/vmware-server/vmware-server-1.0.3.44356.ebuild b/app-emulation/vmware-server/vmware-server-1.0.3.44356.ebuild
index b454812a2fbe..e6a66a474f8c 100644
--- a/app-emulation/vmware-server/vmware-server-1.0.3.44356.ebuild
+++ b/app-emulation/vmware-server/vmware-server-1.0.3.44356.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/vmware-server-1.0.3.44356.ebuild,v 1.6 2007/07/13 00:36:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/vmware-server-1.0.3.44356.ebuild,v 1.7 2007/09/16 15:36:50 ikelos 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
@@ -58,6 +58,8 @@ RDEPEND=">=sys-libs/glibc-2.3.5
 	!app-emulation/vmware-player
 	!app-emulation/vmware-workstation
 	~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
 	virtual/pam
 	sys-apps/xinetd"
@@ -83,6 +85,8 @@ src_install() {
 
 	# Fix the amd64 emulation pam stuff
 	use amd64 && dosed "s:pam_:/lib32/security/pam_:" ${config_dir}/pam.d/vmware-authd
+	  # Remove libpam on amd64 because it's linked against the wrong paths
+	use adm64 && rm ${D}/opt/vmware/server/lib/lib/libpam.so.0/libpam.so
 
 	echo "${VMWARE_GROUP}" > ${D}${config_dir}/vmwaregroup