Commit d75f2d39 authored by Peter Pentchev's avatar Peter Pentchev

New upstream version 2.8.4

parent d774eefe
/keychain /keychain.1.orig
/keychain.1 .idea/
/keychain.spec keychain.iml
/keychain.txt
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# Copyright 2002-2006 Gentoo Foundation http://www.gentoo.org/ # Copyright 2002-2006 Gentoo Foundation http://www.gentoo.org/
# Copyright 2007 Aron Griffis <agriffis@n01se.net> # Copyright 2007 Aron Griffis <agriffis@n01se.net>
# Copyright 2009-2015 Funtoo Solutions, Inc. # Copyright 2009-2017 Funtoo Solutions, Inc.
# lockfile() Copyright 2009 Parallels, Inc. # lockfile() Copyright 2009 Parallels, Inc.
# Distributed under the GNU General Public License version 2 # Distributed under the GNU General Public License version 2
...@@ -10,7 +10,16 @@ ...@@ -10,7 +10,16 @@
# Originally authored by Daniel Robbins <drobbins@gentoo.org> # Originally authored by Daniel Robbins <drobbins@gentoo.org>
# Maintained August 2002 - April 2003 by Seth Chandler <sethbc@gentoo.org> # Maintained August 2002 - April 2003 by Seth Chandler <sethbc@gentoo.org>
# Maintained and rewritten April 2004 - July 2007 by Aron Griffis <agriffis@n01se.net> # Maintained and rewritten April 2004 - July 2007 by Aron Griffis <agriffis@n01se.net>
# Maintained July 2009 - present by Daniel Robbins <drobbins@funtoo.org> # Maintained July 2009 - September 2017 by Daniel Robbins <drobbins@funtoo.org>
# Maintained September 2017 - present by Ryan Harris <x48rph@gmail.com>
* keychain 2.8.4 (19 Oct 2017)
Summary: Support to GPG2 (Ryan Harris)
Support busybox ps (Alastair Hughes)
Various optimizations
* keychain 2.8.3 (24 Jun 2016) * keychain 2.8.3 (24 Jun 2016)
...@@ -67,9 +76,9 @@ ...@@ -67,9 +76,9 @@
Various changes and updates: Various changes and updates:
Fixes for fish from Marc Joliet. Fixes for fish from Marc Joliet.
Keychain will default to start only ssh-agent unless GPG is explicitly Keychain will default to start only ssh-agent unless GPG is explicitly
updated using --agents. updated using --agents.
Write ~/.gpg-agent-info when launching gpg-agent - fix from Thomas Spura. Write ~/.gpg-agent-info when launching gpg-agent - fix from Thomas Spura.
...@@ -122,7 +131,7 @@ ...@@ -122,7 +131,7 @@
29 Sep 2009; Daniel Robbins <drobbins@funtoo.org>: disable "Identity added" 29 Sep 2009; Daniel Robbins <drobbins@funtoo.org>: disable "Identity added"
messages when --quiet is specified (Gentoo bug #250328, thanks to Richard messages when --quiet is specified (Gentoo bug #250328, thanks to Richard
Laager,) --help will print output to stdout (Gentoo bug #196060, thanks to Laager,) --help will print output to stdout (Gentoo bug #196060, thanks to
Elan Ruusamäe,) output cleanup and colorization changes - moving away from Elan Ruusam�e,) output cleanup and colorization changes - moving away from
blue and over to cyan as it displays better terminals with black background. blue and over to cyan as it displays better terminals with black background.
Also some additional colorization. Version bump to 2.6.10. Also some additional colorization. Version bump to 2.6.10.
...@@ -166,9 +175,9 @@ ...@@ -166,9 +175,9 @@
Add validinherit function so that validity of SSH_AUTH_SOCK and friends can be Add validinherit function so that validity of SSH_AUTH_SOCK and friends can be
validated from startagent rather than up front. The advantage is that warning validated from startagent rather than up front. The advantage is that warning
messages aren't emitted unnecessarily when --inherit *-once. messages aren't emitted unnecessarily when --inherit *-once.
Fix --eval for fish, and add new testcases: Fix --eval for fish, and add new testcases:
053_start_with_--eval_ksh 053_start_with_--eval_ksh
054_start_with_--eval_fish 054_start_with_--eval_fish
055_start_with_--eval_csh 055_start_with_--eval_csh
* keychain 2.6.3 (07 Sep 2006) * keychain 2.6.3 (07 Sep 2006)
...@@ -374,7 +383,7 @@ ...@@ -374,7 +383,7 @@
* keychain 2.0.3 (06 Apr 2003) * keychain 2.0.3 (06 Apr 2003)
06 Apr 2003; Seth Chandler <sethbc@gentoo.org>: 06 Apr 2003; Seth Chandler <sethbc@gentoo.org>:
Added keychain man page, fixed bugs with displaying colors for keychain Added keychain man page, fixed bugs with displaying colors for keychain
--help. Also added a $grepopts to fix the grepping for a pid on cygwin --help. Also added a $grepopts to fix the grepping for a pid on cygwin
Also added a TODO document Also added a TODO document
color fix based on submission by Luke Holden <email@alterself.org> color fix based on submission by Luke Holden <email@alterself.org>
...@@ -401,13 +410,13 @@ ...@@ -401,13 +410,13 @@
adding the missingkeys via "ssh-add ${missingkeys}" (at line 454 of version adding the missingkeys via "ssh-add ${missingkeys}" (at line 454 of version
2.0) so that it reads: "ssh-add ${missingkeys} < /dev/null" then users can 2.0) so that it reads: "ssh-add ${missingkeys} < /dev/null" then users can
use program like x11-ssh-askpass in xfree to type in their passphrase. It use program like x11-ssh-askpass in xfree to type in their passphrase. It
then still works for users on shell, depending if $DISPLAY is set." Added. then still works for users on shell, depending if $DISPLAY is set." Added.
24 Aug 2002; A fix to calling "tail" that *should* fix things for Tru64 Unix; 24 Aug 2002; A fix to calling "tail" that *should* fix things for Tru64 Unix;
unfortunately, I have no way to test but the solution should be portable to unfortunately, I have no way to test but the solution should be portable to
all other flavors of systems. Thanks to Mark Scarborough all other flavors of systems. Thanks to Mark Scarborough
<Mark.Scarborough@broadwing.com> for reporting the issue. <Mark.Scarborough@broadwing.com> for reporting the issue.
24 Aug 2002; Changed around the psopts detection stuff so that "-x -u $me f" 24 Aug 2002; Changed around the psopts detection stuff so that "-x -u $me f"
is used; this is needed on MacOS X. Thanks to Brian Bergstrand is used; this is needed on MacOS X. Thanks to Brian Bergstrand
<brian@classicalguitar.net>, others for reporting this issue. <brian@classicalguitar.net>, others for reporting this issue.
...@@ -416,17 +425,17 @@ ...@@ -416,17 +425,17 @@
17 Aug 2002; (Many submitters): A fix for keychain when running on HP-UX 17 Aug 2002; (Many submitters): A fix for keychain when running on HP-UX
10.20. 10.20.
17 Aug 2002; Patrice DUMAS - DOCT <dumas@centre-cired.fr>: Now perform help 17 Aug 2002; Patrice DUMAS - DOCT <dumas@centre-cired.fr>: Now perform help
early on to avoid unnecessary processing. Also added --dir option to allow early on to avoid unnecessary processing. Also added --dir option to allow
keychain to look in an alternate location for the .keychain directory (use keychain to look in an alternate location for the .keychain directory (use
like this: "keychain --dir /var/foo") like this: "keychain --dir /var/foo")
17 Aug 2002; Martial MICHEL <martial@users.sourceforge.net>: Martial also 17 Aug 2002; Martial MICHEL <martial@users.sourceforge.net>: Martial also
suggested moving help processing to earlier in the script. He also submitted suggested moving help processing to earlier in the script. He also submitted
a patch to place .ssh-agent-* files in a ~/.keychain/ directory, which makes a patch to place .ssh-agent-* files in a ~/.keychain/ directory, which makes
sense particularly for NFS users so I integrated the concept into the code. sense particularly for NFS users so I integrated the concept into the code.
17 Aug 2002; Fred Carter <fred.carter@amberpoint.com>: Cygwin fix to use 17 Aug 2002; Fred Carter <fred.carter@amberpoint.com>: Cygwin fix to use
proper "ps" options. proper "ps" options.
...@@ -450,12 +459,12 @@ ...@@ -450,12 +459,12 @@
* keychain 1.9 (04 Mar 2002) * keychain 1.9 (04 Mar 2002)
04 Mar 2002; changed license from "GPL, v2 or later" to "GPL v2". 04 Mar 2002; changed license from "GPL, v2 or later" to "GPL v2".
04 Mar 2002; added "keychain.cygwin" for Cygwin systems. It may be time to 04 Mar 2002; added "keychain.cygwin" for Cygwin systems. It may be time to
follow this pattern and start building separate, optimized scripts for each follow this pattern and start building separate, optimized scripts for each
platform so they don't get too sluggish. Maybe I could use a C preprocessor platform so they don't get too sluggish. Maybe I could use a C preprocessor
for this. for this.
06 Dec 2001; several people: Solaris doesn't like '-e' comparisons; switched 06 Dec 2001; several people: Solaris doesn't like '-e' comparisons; switched
to '-f' to '-f'
...@@ -464,11 +473,11 @@ ...@@ -464,11 +473,11 @@
29 Nov 2001; Philip Hallstrom (philip@adhesivemedia.com) Added a "--local" 29 Nov 2001; Philip Hallstrom (philip@adhesivemedia.com) Added a "--local"
option for removing the ${HOSTNAME} from the various files that keychain option for removing the ${HOSTNAME} from the various files that keychain
creates. Handy for non-NFS users. creates. Handy for non-NFS users.
29 Nov 2001; Aron Griffis (agriffis@gentoo.org) Using the Bourne shell "type" 29 Nov 2001; Aron Griffis (agriffis@gentoo.org) Using the Bourne shell "type"
builtin rather than using the external "which" command. Should make things a builtin rather than using the external "which" command. Should make things a
lot more robust and slightly faster. lot more robust and slightly faster.
09 Nov 2001; Mike Briseno (mike@radik.com) Solaris' "which" command outputs 09 Nov 2001; Mike Briseno (mike@radik.com) Solaris' "which" command outputs
"no lockfile in..." to stdout rather than stderr. A one-line fix (test the "no lockfile in..." to stdout rather than stderr. A one-line fix (test the
error condition) has been applied. error condition) has been applied.
...@@ -486,15 +495,15 @@ ...@@ -486,15 +495,15 @@
09 Nov 2001; Victor Leitman (vleitman@yahoo.com) CYAN color misdefined; 09 Nov 2001; Victor Leitman (vleitman@yahoo.com) CYAN color misdefined;
fixed. fixed.
27 Oct 2001; Brian Wellington (bwelling@xbill.org) A "quiet mode" (--quiet) 27 Oct 2001; Brian Wellington (bwelling@xbill.org) A "quiet mode" (--quiet)
fix; I missed an "echo". fix; I missed an "echo".
27 Oct 2001; J.A. Neitzel (jan@belvento.org) Missed another "kill -9"; it's 27 Oct 2001; J.A. Neitzel (jan@belvento.org) Missed another "kill -9"; it's
now gone. now gone.
* keychain 1.7 (21 Oct 2001) * keychain 1.7 (21 Oct 2001)
21 Oct 2001; Frederic Gobry (frederic.gobry@smartdata.ch) Frederic suggested 21 Oct 2001; Frederic Gobry (frederic.gobry@smartdata.ch) Frederic suggested
using procmail's lockfile to serialize the execution of critical parts of using procmail's lockfile to serialize the execution of critical parts of
keychain, thus avoiding multiple ssh-agent processes being started if you keychain, thus avoiding multiple ssh-agent processes being started if you
...@@ -502,20 +511,20 @@ ...@@ -502,20 +511,20 @@
Initially, I didn't think I could add this, since systems may not have the Initially, I didn't think I could add this, since systems may not have the
lockfile command; however, keychain will now auto-detect whether lockfile is lockfile command; however, keychain will now auto-detect whether lockfile is
installed; if it is, keychain will automatically use it, thus preventing installed; if it is, keychain will automatically use it, thus preventing
multiple ssh-agent processes from being spawned. multiple ssh-agent processes from being spawned.
21 Oct 2001; Raymond Wu (ursus@usa.net): --nocolor test is no longer inside 21 Oct 2001; Raymond Wu (ursus@usa.net): --nocolor test is no longer inside
the test for whether "echo -e" works. According to Raymond, this works the test for whether "echo -e" works. According to Raymond, this works
optimally on his Solaris box. optimally on his Solaris box.
21 Oct 2001; J.A. Neitzel (jan@belvento.org): No longer "kill -9" our 21 Oct 2001; J.A. Neitzel (jan@belvento.org): No longer "kill -9" our
ssh-agent processes. SIGTERM should be sufficient and will allow ssh-agent to ssh-agent processes. SIGTERM should be sufficient and will allow ssh-agent to
clean up after itself (this reverses a previously-applied patch). clean up after itself (this reverses a previously-applied patch).
21 Oct 2001; Thomas Finneid (tfinneid@online.no): Added argument "--quiet | 21 Oct 2001; Thomas Finneid (tfinneid@online.no): Added argument "--quiet |
-q" to make the program less intrusive to the user; with it, only error and -q" to make the program less intrusive to the user; with it, only error and
interactive messages will appear. interactive messages will appear.
21 Oct 2001; Thomas Finneid (tfinneid@online.no): Changed the format of some 21 Oct 2001; Thomas Finneid (tfinneid@online.no): Changed the format of some
arguments to bring them more in line with common *nix programs: added "-h" as arguments to bring them more in line with common *nix programs: added "-h" as
alias for "--help"; added "-k" as alias for "--stop" alias for "--help"; added "-k" as alias for "--stop"
...@@ -523,7 +532,7 @@ ...@@ -523,7 +532,7 @@
21 Oct 2001; Mark Stosberg (mark@summersault.com): $pidf to "$pidf" fixes to 21 Oct 2001; Mark Stosberg (mark@summersault.com): $pidf to "$pidf" fixes to
allow keychain to work with paths that include spaces (for Darwin and MacOS X allow keychain to work with paths that include spaces (for Darwin and MacOS X
in particular). in particular).
21 Oct 2001; Jonathan Wakely (redi@redi.uklinux.net): Small patch to convert 21 Oct 2001; Jonathan Wakely (redi@redi.uklinux.net): Small patch to convert
"echo -n -e" to "echo -e "\c"" for FreeBSD compatibility. "echo -n -e" to "echo -e "\c"" for FreeBSD compatibility.
...@@ -531,7 +540,7 @@ ...@@ -531,7 +540,7 @@
13 Oct 2001; Ralf Horstmann (ralf.horstmann@webwasher.com): Add /usr/ucb to 13 Oct 2001; Ralf Horstmann (ralf.horstmann@webwasher.com): Add /usr/ucb to
path for Solaris systems. path for Solaris systems.
11 Oct 2001; Idea from Joe Reid (jreid@vnet.net): Try to add multiple keys 11 Oct 2001; Idea from Joe Reid (jreid@vnet.net): Try to add multiple keys
using ssh-add; avoid typing in identical passphrases more than once. Good using ssh-add; avoid typing in identical passphrases more than once. Good
idea! idea!
...@@ -540,7 +549,7 @@ ...@@ -540,7 +549,7 @@
21 Sep 2001; David Hull (hull@paracel.com): misc. compatibility, signal 21 Sep 2001; David Hull (hull@paracel.com): misc. compatibility, signal
handling, cleanup fixes handling, cleanup fixes
21 Sep 2001; "ps" test to find the right one for your OS. 21 Sep 2001; "ps" test to find the right one for your OS.
20 Sep 2001; Marko Myllynen (myllynen@lut.fi): "grep [s]sh-agent" to "grep 20 Sep 2001; Marko Myllynen (myllynen@lut.fi): "grep [s]sh-agent" to "grep
...@@ -558,17 +567,17 @@ ...@@ -558,17 +567,17 @@
20 Sep 2001; Hans Peter Verne (h.p.verne@usit.uio.no); "echo -e" to "echo $E" 20 Sep 2001; Hans Peter Verne (h.p.verne@usit.uio.no); "echo -e" to "echo $E"
(for IRIX compatibility with --nocolor), optimization of grep ("grep (for IRIX compatibility with --nocolor), optimization of grep ("grep
[s]sh-agent") [s]sh-agent")
17 Sep 2001; Marko Myllynen (myllynen@lut.fi): Various fixes: trap signal 2 17 Sep 2001; Marko Myllynen (myllynen@lut.fi): Various fixes: trap signal 2
if signal INT not supported (NetBSD); handle invalid keys correctly; ancient if signal INT not supported (NetBSD); handle invalid keys correctly; ancient
version of ash didn't support ~, so using $HOME; correct zsh instruction; version of ash didn't support ~, so using $HOME; correct zsh instruction;
minor cleanups minor cleanups
*keychain 1.3 (12 Sep 2001) *keychain 1.3 (12 Sep 2001)
12 Sep 2001; Minor color changes; the cyan was hard to read on xterm-colored 12 Sep 2001; Minor color changes; the cyan was hard to read on xterm-colored
terms so it was switched to bold. Additional --help text added. terms so it was switched to bold. Additional --help text added.
10 Sep 2001; We now use .ssh-agent-[hostname] instead of .ssh-agent. We now 10 Sep 2001; We now use .ssh-agent-[hostname] instead of .ssh-agent. We now
create a .ssh-agent-csh-[hostname] file that can be sourced by csh-compatible create a .ssh-agent-csh-[hostname] file that can be sourced by csh-compatible
shells. We also now kill all our existing ssh-agent processes before shells. We also now kill all our existing ssh-agent processes before
...@@ -584,13 +593,13 @@ ...@@ -584,13 +593,13 @@
10 Sep 2001; Marko Myllynen (myllynen@lut.fi): rm -f $pidf after stopping 10 Sep 2001; Marko Myllynen (myllynen@lut.fi): rm -f $pidf after stopping
ssh-agent fix ssh-agent fix
*keychain 1.2 *keychain 1.2
09 Sep 2001; README updates to reflect new changes. 09 Sep 2001; README updates to reflect new changes.
09 Sep 2001; Marko Myllynen (myllynen@lut.fi): bash 1/zsh/sh compatibility; 09 Sep 2001; Marko Myllynen (myllynen@lut.fi): bash 1/zsh/sh compatibility;
now only tries to kill *your* ssh-agent processes, version fix, .ssh-agent now only tries to kill *your* ssh-agent processes, version fix, .ssh-agent
file creation error detection. Thanks! file creation error detection. Thanks!
*keychain 1.1; fixes for calling "pidof"; README; ChangeLog *keychain 1.1; fixes for calling "pidof"; README; ChangeLog
...@@ -599,10 +608,10 @@ ...@@ -599,10 +608,10 @@
07 Sep 2001; Explicitly added /sbin and /usr/sbin to path, and then called 07 Sep 2001; Explicitly added /sbin and /usr/sbin to path, and then called
"pidof". I think that this is a bit more robust. "pidof". I think that this is a bit more robust.
06 Sep 2001; from John Ellson (ellson@lucent.com): "pidof" changed to 06 Sep 2001; from John Ellson (ellson@lucent.com): "pidof" changed to
"/sbin/pidof", since it's probably not in $PATH "/sbin/pidof", since it's probably not in $PATH
06 Sep 2001; New ChangeLog! :) 06 Sep 2001; New ChangeLog! :)
*keychain 1.0; initial release (Aug 2001) *keychain 1.0; initial release (Aug 2001)
Introduction to Keychain IMPORTANT - GitHub Contributors
===============================
Please apply your patches to `keychain.sh`, *not* the generated `keychain`
script, which we are now including in the git repo to facilitate the
distribution of release archives direct from GitHub. The file `keychain` and
related generated file (man pages, spec file) may be out-of-date during active
development. We will regenerate them for official release archives only (those
tagged with the release version.) Thanks!
Please submit Introduction to Keychain
======================== ========================
**Official documentation for Keychain can be found on [the official Keychain **Official documentation for Keychain can be found on [the official Keychain
...@@ -15,3 +25,4 @@ time your local machine is rebooted. `Keychain` also makes it easy for remote ...@@ -15,3 +25,4 @@ time your local machine is rebooted. `Keychain` also makes it easy for remote
cron jobs to securely "hook in" to a long running `ssh-agent` process, cron jobs to securely "hook in" to a long running `ssh-agent` process,
allowing your scripts to take advantage of key-based logins. allowing your scripts to take advantage of key-based logins.
This diff is collapsed.
This diff is collapsed.
...@@ -4,7 +4,7 @@ keychain - re-use ssh-agent and/or gpg-agent between logins ...@@ -4,7 +4,7 @@ keychain - re-use ssh-agent and/or gpg-agent between logins
=head1 SYNOPSIS =head1 SYNOPSIS
S<keychain [ -hklQqV ] [ --clear --confhost --help --ignore-missing --list --noask> S<keychain [ -hklQqV ] [ --clear --confhost --gpg2 --help --ignore-missing --list --noask>
S<--nocolor --nogui --nolock --quick --quiet --version ]> S<--nocolor --nogui --nolock --quick --quiet --version ]>
S<[ --agents I<list> ] [ --attempts I<num> ] [ --dir I<dirname> ]> S<[ --agents I<list> ] [ --attempts I<num> ] [ --dir I<dirname> ]>
S<[ --host I<name> ] [ --lockwait I<seconds> ]> S<[ --host I<name> ] [ --lockwait I<seconds> ]>
...@@ -118,6 +118,11 @@ alternatively ~/.keychain/env. The purpose of this file is to ...@@ -118,6 +118,11 @@ alternatively ~/.keychain/env. The purpose of this file is to
override settings such as PATH, in case ssh is stored in override settings such as PATH, in case ssh is stored in
a non-standard place. a non-standard place.
=item B<--gpg2>
This option changes the default gpg calls to use gpg2 instead to support
distributions such as Ubuntu which has both gpg and gpg2
=item B<-h --help> =item B<-h --help>
Show help that looks remarkably like this man-page. As of 2.6.10, Show help that looks remarkably like this man-page. As of 2.6.10,
...@@ -171,6 +176,10 @@ want the older behavior. ...@@ -171,6 +176,10 @@ want the older behavior.
List signatures of all active SSH keys, and exit, similar to "ssh-add -l". List signatures of all active SSH keys, and exit, similar to "ssh-add -l".
=item B<-L --list-fp>
List fingerprints of all active SSH keys, and exit, similar to "ssh-add -L".
=item B<--lockwait> I<seconds> =item B<--lockwait> I<seconds>
How long to wait for the lock to become available. Defaults to 5 How long to wait for the lock to become available. Defaults to 5
......
This diff is collapsed.
Name: keychain
Version: 2.8.4
Release: 1
Summary: agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
Packager: Daniel Robbins <drobbins@funtoo.org>
URL: http://www.funtoo.org
Source0: %{name}-%{version}.tar.bz2
License: GPL v2
Group: Applications/Internet
BuildArch: noarch
Requires: /bin/sh sh-utils
Prefix: /usr/bin
BuildRoot: %{_tmppath}/%{name}-root
%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 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
%build
%install
[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir} $RPM_BUILD_ROOT/%{_mandir}/man1
install -m0755 keychain $RPM_BUILD_ROOT/%{_bindir}/keychain
install -m0644 keychain.1 $RPM_BUILD_ROOT/%{_mandir}/man1
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{_bindir}/*
%doc %{_mandir}/*/*
%doc ChangeLog COPYING.txt keychain.pod README.md
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment