diff options
author | Mike Auty <ikelos@gentoo.org> | 2007-09-16 15:36:51 +0000 |
---|---|---|
committer | Mike Auty <ikelos@gentoo.org> | 2007-09-16 15:36:51 +0000 |
commit | f9c89e1b0db9a22ef01801023f0eb628868637db (patch) | |
tree | 1d8e6e36200dc71290e0f3c7da2d8046a5d6da65 /app-emulation | |
parent | Alter init script to interoperate with baselayout-2 and unusual shells such a... (diff) | |
download | gentoo-2-f9c89e1b0db9a22ef01801023f0eb628868637db.tar.gz gentoo-2-f9c89e1b0db9a22ef01801023f0eb628868637db.tar.bz2 gentoo-2-f9c89e1b0db9a22ef01801023f0eb628868637db.zip |
Fix up PAM issues on amd64, add vmware-modules blockers and fix init script for baselayout-2 and dash.
(Portage version: 2.1.3.9)
Diffstat (limited to 'app-emulation')
4 files changed, 31 insertions, 24 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/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 |