rpms/keychain/F-10 keychain.csh, 1.4, 1.5 keychain.sh, 1.5, 1.6 keychain.spec, 1.11, 1.12
Ville Skyttä
scop at fedoraproject.org
Mon Feb 16 18:07:25 UTC 2009
Author: scop
Update of /cvs/pkgs/rpms/keychain/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9971/F-10
Modified Files:
keychain.csh keychain.sh keychain.spec
Log Message:
* Mon Feb 16 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.6.8-4
- Don't override/unset $HOST or $USERHOME in profile.d snippets (#463913).
Index: keychain.csh
===================================================================
RCS file: /cvs/pkgs/rpms/keychain/F-10/keychain.csh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- keychain.csh 4 Nov 2006 22:34:33 -0000 1.4
+++ keychain.csh 16 Feb 2009 18:06:55 -0000 1.5
@@ -1,8 +1,8 @@
# /etc/profile.d/keychain.csh - calling keychain the Fedora way
# read in user's keychain settings or use defaults running keychain
-set USERHOME = `getent passwd $USER | cut -d: -f6`
-if ( "$HOME" == "$USERHOME" && -f "$HOME/.keychainrc" ) then
+set userhome = `getent passwd $USER | cut -d: -f6`
+if ( "$HOME" == "$userhome" && -f "$HOME/.keychainrc" ) then
eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \
sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'`
@@ -22,12 +22,12 @@
keychain $KCHOPTS $SSHKEYS $GPGKEYS
- set HOST = `uname -n`
- if (-f $HOME/.keychain/$HOST-csh) then
- source $HOME/.keychain/$HOST-csh
+ set host = `uname -n`
+ if (-f $HOME/.keychain/$host-csh) then
+ source $HOME/.keychain/$host-csh
endif
- if (-f $HOME/.keychain/$HOST-csh-gpg) then
- source $HOME/.keychain/$HOST-csh-gpg
+ if (-f $HOME/.keychain/$host-csh-gpg) then
+ source $HOME/.keychain/$host-csh-gpg
endif
endif
Index: keychain.sh
===================================================================
RCS file: /cvs/pkgs/rpms/keychain/F-10/keychain.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- keychain.sh 6 Apr 2008 16:09:07 -0000 1.5
+++ keychain.sh 16 Feb 2009 18:06:55 -0000 1.6
@@ -4,8 +4,8 @@
# Don't do anything if we're already done.
[ -n "$KEYCHAIN_DONE" ] && return
-USERHOME=`getent passwd $USER | cut -d: -f6`
-if [ "$HOME" = "$USERHOME" -a -f "$HOME/.keychainrc" ]; then
+userhome=`getent passwd $USER | cut -d: -f6`
+if [ "$HOME" = "$userhome" -a -f "$HOME/.keychainrc" ]; then
. $HOME/.keychainrc
@@ -24,15 +24,15 @@
keychain $KCHOPTS $SSHKEYS $GPGKEYS
fi
- HOST=`uname -n`
- [ -f $HOME/.keychain/$HOST-sh ] && \
- . $HOME/.keychain/$HOST-sh
- [ -f $HOME/.keychain/$HOST-sh-gpg ] && \
- . $HOME/.keychain/$HOST-sh-gpg
+ host=`uname -n`
+ [ -f $HOME/.keychain/$host-sh ] && \
+ . $HOME/.keychain/$host-sh
+ [ -f $HOME/.keychain/$host-sh-gpg ] && \
+ . $HOME/.keychain/$host-sh-gpg
- unset KCHOPTS SSHKEYS GPGKEYS HOST
+ unset KCHOPTS SSHKEYS GPGKEYS host
KEYCHAIN_DONE=1
fi
-unset USERHOME
+unset userhome
Index: keychain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keychain/F-10/keychain.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- keychain.spec 6 Apr 2008 16:10:16 -0000 1.11
+++ keychain.spec 16 Feb 2009 18:06:55 -0000 1.12
@@ -1,7 +1,7 @@
Name: keychain
Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
Version: 2.6.8
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://agriffis.n01se.net/keychain/
@@ -49,6 +49,9 @@
%{_mandir}/man1/keychain.1*
%changelog
+* Mon Feb 16 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.6.8-4
+- Don't override/unset $HOST or $USERHOME in profile.d snippets (#463913).
+
* Sun Apr 6 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.6.8-3
- Make profile.d sh snippet check if it has already run (skip if yes),
and avoid polluting the shell with its internal variables.
More information about the fedora-extras-commits
mailing list