rpms/keychain/devel README.Fedora, NONE, 1.1 keychain-manpage.patch, NONE, 1.1 keychain.csh, NONE, 1.1 keychain.sh, NONE, 1.1 keychain.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Alexander Dalloz (adalloz) fedora-extras-commits at redhat.com
Fri Aug 5 02:55:45 UTC 2005 

Author: adalloz

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

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora keychain-manpage.patch keychain.csh keychain.sh 
	keychain.spec 
Log Message:
auto-import keychain-2.5.5-1 on branch devel from keychain-2.5.5-1.src.rpm


--- NEW FILE README.Fedora ---
README.Fedora - keychain opt-in

keychain is a manager for both ssh-agent and gpg-agent. It allows your shells
and cron jobs to share a single ssh-agent or gpg-agent process. keychain
typically runs from the login shell environment setting, i.e. ~/.bash_profile
when using bash or ~/.login when running a tcsh shell. It's general usage and
different options are documented in keychain(1).

Installed from Fedora Extras keychain can be easily activated by simply
touching an empty ~/.keychainrc file when using either bash, sh, ksh, csh or
tcsh. zsh shell users will have to add a `/etc/profile.d/keychain.sh' call to
their ~/.zlogin file.
This will let the user's shell invoke a default setup of keychain where it
loads all user's ssh keys from ~/.ssh/ to an ssh-agent process. gpg keys are
not loaded by default as the necessary gpg-agent is not part of the Fedora
Core gnupg package, but provided by the additional gnupg2 package of Fedora
Extras. The default setup starts keychain in quiet mode, so only messages are
printed out in case of warnings, errors or if interactivity is required.

To override the default settings with which keychain is activated when
the shell environment finds a ~/.keychainrc, the user can customize following
variables by setting them inside the ~/.keychainrc.

KCHOPTS=""
    This variable takes options for keychain like "--nocolor" or "--noask".
    Please see the keychain manpage for a full list.
SSHKEYS=""
    Instead of loading all keys the user can list those keys to be loaded by
    their file names. The key list has to be space separated.
GPGKEYS=""
    gpg keys to be loaded by keychain have to be specified by their key ID.
    The user can get a full list of keys and IDs in his secret keyring by
    running `gpg --list-secret-keys'. GPGKEYS defines a single key ID or a
    space separated list of key IDs.

Please be aware that you still need to source the keychain file with the
ssh-agent environment variables along with the crontab entry when you want
to make use of ssh public key auth or of gpg signing through cron jobs,
because cron uses a non-interactive shell and has a limited environment set.

Note: This opt-in is not part of keychain, which is originally written by
Daniel Robbins <drobbins at gentoo.org>, but added to the Fedora Extras package
of keychain to allow Fedora users an overall ease of use.


keychain-manpage.patch:

--- NEW FILE keychain-manpage.patch ---
diff -Naru keychain-2.5.0.orig/keychain.1 keychain-2.5.0/keychain.1
--- keychain-2.5.0.orig/keychain.1	2005-01-08 04:02:36.000000000 +0200
+++ keychain-2.5.0/keychain.1	2005-01-08 13:49:25.542402807 +0200
@@ -291,9 +291,11 @@
 .SH "EXAMPLES"
 .IX Header "EXAMPLES"
 This snippet would work in .bash_profile (for bash) or .zlogin (for
-zsh) to load two ssh keys and one gpg key:
+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID
+0123ABCD):
 .PP
 .Vb 5
+\&    which keychain &>/dev/null && \e
 \&    keychain id_rsa id_dsa 0123ABCD
 \&        [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \e
 \&                source $HOME/.keychain/$HOSTNAME-sh
@@ -305,6 +307,7 @@
 \&.profile:
 .PP
 .Vb 6
+\&    which keychain >/dev/null 2>/dev/null && \e
 \&    keychain id_rsa id_dsa 0123ABCD
 \&        host=`uname -n`
 \&        [ -f $HOME/.keychain/$host-sh ] && \e
@@ -316,6 +319,7 @@
 This snippet would work in .login for tcsh:
 .PP
 .Vb 7
+\&    which keychain >& /dev/null && \e
 \&    keychain id_rsa id_dsa 0123ABCD
 \&        if (-f $HOME/.keychain/$HOST-csh) then
 \&                source $HOME/.keychain/$HOST-csh
@@ -328,6 +332,7 @@
 This snippet would work in .login for csh:
 .PP
 .Vb 8
+\&    which keychain >& /dev/null && \e
 \&    keychain id_rsa id_dsa 0123ABCD
 \&        host=`uname -n`
 \&        if (-f $HOME/.keychain/$host-csh) then
diff -Naru keychain-2.5.0.orig/keychain.pod keychain-2.5.0/keychain.pod
--- keychain-2.5.0.orig/keychain.pod	2005-01-08 04:02:36.000000000 +0200
+++ keychain-2.5.0/keychain.pod	2005-01-08 13:49:44.002694389 +0200
@@ -193,8 +193,10 @@
 =head1 EXAMPLES
 
 This snippet would work in .bash_profile (for bash) or .zlogin (for
-zsh) to load two ssh keys and one gpg key:
+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID
+0123ABCD):
 
+    which keychain &>/dev/null && \
     keychain id_rsa id_dsa 0123ABCD
 	[[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \
 		source $HOME/.keychain/$HOSTNAME-sh
@@ -204,6 +206,7 @@
 For other Bourne-compatible shells such as sh, you can use this in
 .profile:
 
+    which keychain >/dev/null 2>/dev/null && \
     keychain id_rsa id_dsa 0123ABCD
 	host=`uname -n`
 	[ -f $HOME/.keychain/$host-sh ] && \
@@ -213,6 +216,7 @@
 
 This snippet would work in .login for tcsh:
 
+    which keychain >& /dev/null && \
     keychain id_rsa id_dsa 0123ABCD
 	if (-f $HOME/.keychain/$HOST-csh) then
 		source $HOME/.keychain/$HOST-csh
@@ -223,6 +227,7 @@
 
 This snippet would work in .login for csh:
 
+    which keychain >& /dev/null && \
     keychain id_rsa id_dsa 0123ABCD
 	host=`uname -n`
 	if (-f $HOME/.keychain/$host-csh) then


--- NEW FILE keychain.csh ---
# /etc/profile.d/keychain.csh - calling keychain the Fedora way
# read in user's keychain settings or use defaults running keychain

if (-f $HOME/.keychainrc) then

    eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \
	sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'`

    if (! $?KCHOPTS) then
	set KCHOPTS = "--quiet"
    endif
    if (! $?SSHKEYS) then
	set SSHKEYS = `grep -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*`
    endif
    if (! $?GPGKEYS ) then
	set GPGKEYS = ""
    endif

    keychain $KCHOPTS $SSHKEYS $GPGKEYS

    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
    endif

endif



--- NEW FILE keychain.sh ---
# /etc/profile.d/keychain.sh - calling keychain the Fedora way
# read in user's keychain settings or use defaults running keychain

if [ -f $HOME/.keychainrc ]; then

    source $HOME/.keychainrc

    [ -n "$KCHOPTS" ] || KCHOPTS="--quiet"
    [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \
							   $HOME/.ssh/*`
    [ -n "$GPGKEYS" ] || GPGKEYS=""

    keychain $KCHOPTS $SSHKEYS $GPGKEYS

    HOST=`uname -n`
    [ -f $HOME/.keychain/$HOST-sh ] && \
	. $HOME/.keychain/$HOST-sh
    [ -f $HOME/.keychain/$HOST-sh-gpg ] && \
	. $HOME/.keychain/$HOST-sh-gpg

fi



--- NEW FILE keychain.spec ---
Name:		keychain
Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
Version:	2.5.5
Release:	1
License:	GPL
Group:		Applications/Internet
URL:		http://www.gentoo.org/proj/en/keychain/
Source0:	http://dev.gentoo.org/~agriffis/keychain/%{name}-%{version}.tar.bz2
Source1:	keychain.sh
Source2:	keychain.csh
Source3:	README.Fedora
Patch0:		keychain-manpage.patch
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Keychain is a manager for OpenSSH, ssh.com, Sun SSH and GnuPG agents.
It acts as a front-end to the agents, allowing you to easily have one
long-running agent process per system, rather than per login session.
This dramatically reduces the number of times you need to enter your
passphrase from once per new login session to once every time your
local machine is rebooted.

%prep
%setup -q
%patch0 -p1
sed -i -e 's|/usr/ucb:||' keychain

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
mkdir -p %{buildroot}%{_mandir}/man1
install -m 755 keychain %{buildroot}%{_bindir}/keychain
install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh
install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh
install -m 644 keychain.1 %{buildroot}%{_mandir}/man1
install -m 644 %{SOURCE3} README.Fedora

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc COPYING ChangeLog README README.Fedora
%doc %{_mandir}/man1/keychain.1.gz
%{_bindir}/keychain
%config(noreplace) %{_sysconfdir}/profile.d/keychain.sh
%config(noreplace) %{_sysconfdir}/profile.d/keychain.csh

%changelog
* Fri Aug 05 2005  Alexander Dalloz <alex {%} dalloz {*} de> - 2.5.5-1
- Updated to new upstream version
- Removed keychain.pod from %%doc.

* Wed Jul 27 2005 Alexander Dalloz <alex {%} dalloz {*} de> - 2.5.4.1-2
- Added manpage patch and %%prep removal of non existing path
  (thanks Ville Skyttä)
- Added opt-in mechanism through profile.d scripts for all
  login shells Fedora ships.

* Sun Jul 10 2005 Alexander Dalloz <alex {%} dalloz {*} de> - 2.5.4.1-1
- Initial build, based on upstream .spec by Aron Griffis.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Aug 2005 02:54:42 -0000	1.1
+++ .cvsignore	5 Aug 2005 02:55:43 -0000	1.2
@@ -0,0 +1 @@
+keychain-2.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Aug 2005 02:54:42 -0000	1.1
+++ sources	5 Aug 2005 02:55:43 -0000	1.2
@@ -0,0 +1 @@
+3afa5ce32a5c57e43caac82db3396aac  keychain-2.5.5.tar.bz2

More information about the fedora-extras-commits mailing list