3 files changed, 3 insertions, 89 deletions

diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index 28d39916f99d..51869e5022c2 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	keychain
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.7
 CATEGORIES=	security
 MASTER_SITES=	http://www.ibiblio.org/gentoo/distfiles/
 
-MAINTAINER=	wjv@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	pidof:${PORTSDIR}/sysutils/psmisc
 
diff --git a/security/keychain/distinfo b/security/keychain/distinfo
index 7eae24e2c984..e92573fbb601 100644
--- a/security/keychain/distinfo
+++ b/security/keychain/distinfo
@@ -1 +1 @@
-MD5 (keychain-1.2.tar.bz2) = 506755c48f886d3de6a0498125473680
+MD5 (keychain-1.7.tar.bz2) = af62d8d31a73ae6df1d57ff71da22aeb
diff --git a/security/keychain/files/patch-keychain b/security/keychain/files/patch-keychain
deleted file mode 100644
index 77d5fee12b95..000000000000
--- a/security/keychain/files/patch-keychain
+++ /dev/null
@@ -1,85 +0,0 @@
---- keychain.orig	Mon Sep 10 06:42:47 2001
-+++ keychain	Tue Sep 11 13:55:58 2001
-@@ -9,6 +9,7 @@
- trap "" INT
- PATH="/sbin:/usr/sbin:${PATH}"; export PATH;
- KEYCHAIN_KEYS=""
-+SHORTHOSTNAME=`hostname -s`
- for x in ${*}
- do
- 	# if it's not an --option, add it to our list of keys
-@@ -46,20 +47,20 @@
- 
-  Keychain is an OpenSSH key manager, typically run from ~/.bash_profile.  When
-  run, it will make sure ssh-agent is running; if not, it will start ssh-agent.
-- It will redirect ssh-agent's output to ~/.ssh-agent, so that cron jobs that
-- need to use ssh-agent keys can simply source this file and make the necessary
-- passwordless ssh connections.  In addition, when keychain runs, it will check
-- with ssh-agent and make sure that the ssh RSA/DSA keys that you specified on
-- the keychain command line have actually been added to ssh-agent.  If not, you
-- are prompted for the appropriate passphrases so that they can be added by
-- keychain.
-+ It will redirect ssh-agent's output to ~/.ssh-agent-HOSTNAME, so that cron
-+ jobs that need to use ssh-agent keys can simply source this file and make the
-+ necessary passwordless ssh connections.  In addition, when keychain runs, it
-+ will check with ssh-agent and make sure that the ssh RSA/DSA keys that you
-+ specified on the keychain command line have actually been added to ssh-agent.
-+ If not, you are prompted for the appropriate passphrases so that they can be
-+ added by keychain.
- 
-  Typically, one uses keychain by adding the following to the top of their
-  ~/.bash_profile (or ~/.zshrc, in case of zsh):
- 
- EOHELP
- echo -e "  ${CYAN}keychain ~/.ssh/id_rsa ~/.ssh/id_dsa"
--echo -e "  source ~/.ssh-agent > /dev/null${OFF}"
-+echo -e "  . ~/.ssh-agent-HOSTNAME > /dev/null${OFF}"
- echo -e "  # the > /dev/null eliminates the redundant agent PID output"
- echo
- cat <<EOHELP
-@@ -86,8 +87,9 @@
- echo
- cat <<EOHELP
-  This option tells keychain do everything it normally does (ensure ssh-agent is
-- running, set up the ~/.ssh-agent file) except that it will not prompt you to
-- add any of the keys you specified if they haven't yet been added to ssh-agent.
-+ running, set up the ~/.ssh-agent-HOSTNAME file) except that it will not prompt
-+ you to add any of the keys you specified if they haven't yet been added to
-+ ssh-agent.
- 
- EOHELP
- echo -e " ${GREEN}--stop${OFF}"
-@@ -102,14 +104,14 @@
- fi
- 
- 
--if [ ! -f ~/.ssh-agent ]
-+if [ ! -f ~/.ssh-agent-${SHORTHOSTNAME} ]
- then
--	echo -e " ${GREEN}*${OFF} Initializing ~/.ssh-agent file..."
--	touch ~/.ssh-agent || ( echo "$0: Cannot create ~/.ssh-agent, exiting." 1>&2 && exit 1 )
--	chmod 0600 ~/.ssh-agent
-+	echo -e " ${GREEN}*${OFF} Initializing ~/.ssh-agent-HOSTNAME file..."
-+	touch ~/.ssh-agent-${SHORTHOSTNAME} || ( echo "$0: Cannot create ~/.ssh-agent-HOSTNAME, exiting." 1>&2 && exit 1 )
-+	chmod 0600 ~/.ssh-agent-${SHORTHOSTNAME}
- 	SSH_AGENT_PID="NULL"
- else
--	source ~/.ssh-agent > /dev/null
-+	. ~/.ssh-agent-${SHORTHOSTNAME} > /dev/null
- fi
- 
- match="no"
-@@ -127,10 +129,10 @@
- 
- if [ "$match" = "no" ]
- then
--	chmod 0600 ~/.ssh-agent
-+	chmod 0600 ~/.ssh-agent-${SHORTHOSTNAME}
- 	echo -e " ${GREEN}*${OFF} starting new ssh-agent"
--	nohup ssh-agent > ~/.ssh-agent
--	source ~/.ssh-agent > /dev/null
-+	nohup ssh-agent > ~/.ssh-agent-${SHORTHOSTNAME}
-+	. ~/.ssh-agent-${SHORTHOSTNAME} > /dev/null
- fi
- 
- if [ -n "`echo $* | grep '\-\-clear'`" ]