diff options
| author | martti <martti> | 2002-01-03 14:29:53 +0000 |
|---|---|---|
| committer | martti <martti> | 2002-01-03 14:29:53 +0000 |
| commit | 6b2a2da50ea1282b9232cc7a3dc998edff787308 (patch) | |
| tree | 884f83fb779c450a6dcb60360ff513e1d78590fc /security | |
| parent | b62ac97a2216466a5153d7d9d20c7003c28c3003 (diff) | |
| download | pkgsrc-6b2a2da50ea1282b9232cc7a3dc998edff787308.tar.gz | |
Updated to 1.8
* Added a "--local" option for removing the ${HOSTNAME} from the various
files that keychain creates. Handy for non-NFS users.
* Using the Bourne shell "type" builtin rather than using the external
"which" command. Should make things a lot more robust and slightly
faster.
* Solaris' "which" command outputs "no lockfile in..." to stdout rather
than stderr. A one-line fix (test the error condition) has been
applied.
* lockfile settings tweak
* If you stop making progress providing valid passphrases, it's three
strikes and you're out.
* Some private keys can't be "ssh-keygen -l -f"'d; this patch causes
keychain to look for the corresponding public key if the private
key doesn't work. Thanks Constantine!
* CYAN color misdefined; fixed.
* A "quiet mode" (--quiet) fix; I missed an "echo".
* Missed another "kill -9"; it's now gone.
Diffstat (limited to 'security')
| -rw-r--r-- | security/keychain/Makefile | 6 | ||||
| -rw-r--r-- | security/keychain/distinfo | 8 | ||||
| -rw-r--r-- | security/keychain/patches/patch-aa | 25 |
3 files changed, 15 insertions, 24 deletions
diff --git a/security/keychain/Makefile b/security/keychain/Makefile index 3e341c38d64..6d2eccd57f9 100644 --- a/security/keychain/Makefile +++ b/security/keychain/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.4 2001/11/09 09:56:27 martti Exp $ +# $NetBSD: Makefile,v 1.5 2002/01/03 14:29:53 martti Exp $ -DISTNAME= keychain-1.7 +DISTNAME= keychain-1.8 PKGNAME= ${DISTNAME} CATEGORIES= security MASTER_SITES= http://www.ibiblio.org/gentoo/distfiles/ EXTRACT_SUFX= .tar.bz2 -MAINTAINER= packages@netbsd.org +MAINTAINER= martti@netbsd.org HOMEPAGE= http://www.gentoo.org/projects/keychain/ COMMENT= Nice ssh-agent front-end diff --git a/security/keychain/distinfo b/security/keychain/distinfo index 10e2a45f2e4..bb59bb39dc7 100644 --- a/security/keychain/distinfo +++ b/security/keychain/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/11/09 09:56:27 martti Exp $ +$NetBSD: distinfo,v 1.4 2002/01/03 14:29:53 martti Exp $ -SHA1 (keychain-1.7.tar.bz2) = a2acc49a3f1872fa22aead37fb4635e2f836bbf2 -Size (keychain-1.7.tar.bz2) = 6290 bytes -SHA1 (patch-aa) = b9736c89148872a1ae19aa2462a9b4724b1f9d98 +SHA1 (keychain-1.8.tar.bz2) = 49c834fa3357507cfbf014356b4ad3163f0ed5e4 +Size (keychain-1.8.tar.bz2) = 7327 bytes +SHA1 (patch-aa) = d2a73c493cf53ee67279e8211e37daeb023306c5 diff --git a/security/keychain/patches/patch-aa b/security/keychain/patches/patch-aa index c802e196b2a..bff5f446185 100644 --- a/security/keychain/patches/patch-aa +++ b/security/keychain/patches/patch-aa @@ -1,36 +1,27 @@ -$NetBSD: patch-aa,v 1.3 2001/11/09 09:56:28 martti Exp $ +$NetBSD: patch-aa,v 1.4 2002/01/03 14:29:54 martti Exp $ ---- keychain.orig Mon Oct 22 17:19:57 2001 -+++ keychain Fri Nov 9 10:42:37 2001 +--- keychain.orig Thu Nov 29 08:11:08 2001 ++++ keychain Thu Jan 3 15:23:21 2002 @@ -6,7 +6,7 @@ - version=1.7 + version=1.8 -trap "" INT || { echo "$0: warning: trapping signal 2 instead of INT" 1>&2; trap "" 2; } +trap "" 2 PATH="/sbin:/usr/sbin:${PATH}:/usr/ucb"; export PATH; KEYCHAIN_KEYS="" -@@ -24,7 +24,7 @@ - lockf="${HOME}/.keychain-lock-${hostname}" - - # perform lock if we have lockfile available --[ -z "$lockfile" ] || $lockfile -1 "$lockf" -+[ -x "$lockfile" ] && $lockfile -1 "$lockf" - - for x in ${@} - do -@@ -53,6 +53,9 @@ - CYAN="\033[01m" +@@ -65,6 +65,9 @@ + CYAN="\033[36;01m" fi +# Don't use colors in NetBSD +unset BLUE GREEN OFF CYAN + quiet_mode="no" - if [ -n "`echo $* | grep '\-\-quiet'`" ] || [ -n "`echo $* | grep '\-q'`" ] ; + if [ -n "`echo ${@} | grep '\-\-quiet'`" ] || [ -n "`echo $* | grep '\-q'`" ] ; then -@@ -246,7 +249,7 @@ +@@ -259,7 +262,7 @@ fi #now that keys are potentially cleared, it's safe to be aborted by ^C |