rpms/keychain/devel keychain.sh,1.4,1.5 keychain.spec,1.9,1.10

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/keychain/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9090

Modified Files:
	keychain.sh keychain.spec 
Log Message:
* 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 internval variables.
- License: GPLv2.
- Update URLs.



Index: keychain.sh
===================================================================
RCS file: /cvs/pkgs/rpms/keychain/devel/keychain.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- keychain.sh	4 Nov 2006 22:34:33 -0000	1.4
+++ keychain.sh	6 Apr 2008 16:09:07 -0000	1.5
@@ -1,6 +1,9 @@
 # /etc/profile.d/keychain.sh - calling keychain the Fedora way
 # read in user's keychain settings or use defaults running keychain
 
+# 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
 
@@ -27,5 +30,9 @@
     [ -f $HOME/.keychain/$HOST-sh-gpg ] && \
 	. $HOME/.keychain/$HOST-sh-gpg
 
+    unset KCHOPTS SSHKEYS GPGKEYS HOST
+
+    KEYCHAIN_DONE=1
 fi
 
+unset USERHOME


Index: keychain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keychain/devel/keychain.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- keychain.spec	17 Feb 2008 10:36:37 -0000	1.9
+++ keychain.spec	6 Apr 2008 16:09:07 -0000	1.10
@@ -1,12 +1,11 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 Version:	2.6.8
-Release:	2%{?dist}
-License:	GPL
+Release:	3%{?dist}
+License:	GPLv2
 Group:		Applications/Internet
-URL:		http://www.gentoo.org/proj/en/keychain/
-# Source0 MIA: https://bugs.gentoo.org/show_bug.cgi?id=208372
-Source0:	http://dev.gentoo.org/~agriffis/keychain/%{name}-%{version}.tar.bz2
+URL:		http://agriffis.n01se.net/keychain/
+Source0:	http://agriffis.n01se.net/keychain/%{name}-%{version}.tar.bz2
 Source1:	keychain.sh
 Source2:	keychain.csh
 Source3:	README.Fedora
@@ -50,6 +49,12 @@
 %{_mandir}/man1/keychain.1*
 
 %changelog
+* 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 internval variables.
+- License: GPLv2.
+- Update URLs.
+
 * Sat Nov 04 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 2.6.8-2
 - Fix #212190.