Update security/keychain to 2.8.2.

* keychain 2.8.2 (06 Nov 2015)

  Summary: Support new ssh features, bug fix release.

  Support for new hash algorithms (Ben Boeckel)

  Remove bashisms (Daniel Hertz)

  Various optimizations (Daniel Hahler)

  --timeout option now gets passed to agent, doc fixes (Andrew Bezella, Emil
  Lundberg)

  RPM, Makefile fixes (Mike Frysinger)

* keychain 2.8.1 (29 May 2015)

  Summary: POSIX compatibility and bug fix release.

  Only set PATH to a standard value if PATH is not set. Otherwise, do not
  modify.

  Makefile Cygwin and RPM spec fixes (thanks Luke Bakken and Ricardo Silva)

  Confhost fixes. Deprecate in_path. Use command -v instead.

  Find_pids: Modify "ps" call to work with non-GNU ps. (Bryan Drewery)

  Re-introduce POSIX compatibility (remove shopt.) (vaeth)

* keychain 2.8.0 (21 Mar 2015)

  Support for OpenSSH 6.8 fingerprints.
  Support for GnuPG 2.1.0.

  Handle private keys that are symlinks, even if the associated public key is
  in the target directory rather than alongside the symlink.

  Allow private keys to have extensions, such as foo.priv. When looking for
  matching public keys, look for foo.priv.pub, but also strip extension and
  look for foo.pub if foo.priv.pub doesn't exist.

  Initial support for --list/-l option to list SSH keys.

  Updated docs for fish shell usage.

* keychain 2.7.2_beta1 (07 July 2014)

  Various changes and updates:

  Fixes for fish from Marc Joliet.

  Keychain will default to start only ssh-agent unless GPG is explicitly
  updated using --agents.

  Write ~/.gpg-agent-info when launching gpg-agent - fix from Thomas Spura.

  Add support for injecting agents into systemd (Ben Boeckel)

  Add support for --query option (Ben Boeckel)

  Add --absolute flag, allowing user to set a full path without getting a
  .keychain suffix automatically appended.

  Add --confhost option to scan ~/.ssh/config file to locate private key
  path specified there.

4 files changed, 10 insertions, 30 deletions

diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index 5284eb74caf..c5458a76f44 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2015/05/04 21:02:58 roy Exp $
+# $NetBSD: Makefile,v 1.34 2016/08/18 06:09:01 nonaka Exp $
 
-DISTNAME=	keychain-2.7.1
-PKGREVISION=	3
+DISTNAME=	keychain-2.8.2
 CATEGORIES=	security
 MASTER_SITES=	http://www.funtoo.org/archive/keychain/
 EXTRACT_SUFX=	.tar.bz2
@@ -23,7 +22,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/keychain ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/keychain.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC}/README.rst \
+	${INSTALL_DATA} ${WRKSRC}/README.md \
 		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/keychain/PLIST b/security/keychain/PLIST
index 059f6e761b4..811a35f683d 100644
--- a/security/keychain/PLIST
+++ b/security/keychain/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2010/05/18 06:29:32 pettai Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/08/18 06:09:01 nonaka Exp $
 bin/keychain
 man/man1/keychain.1
-share/doc/keychain/README.rst
+share/doc/keychain/README.md
diff --git a/security/keychain/distinfo b/security/keychain/distinfo
index 584450d467f..c69d35bae82 100644
--- a/security/keychain/distinfo
+++ b/security/keychain/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.19 2015/11/04 01:17:47 agc Exp $
+$NetBSD: distinfo,v 1.20 2016/08/18 06:09:01 nonaka Exp $
 
-SHA1 (keychain-2.7.1.tar.bz2) = e7ad7da374ba81e57792bb2695eb6c352f769de7
-RMD160 (keychain-2.7.1.tar.bz2) = bbeaf7f8c1c6dc0b3847aa9b7fc272ebb0743482
-SHA512 (keychain-2.7.1.tar.bz2) = 03cbf86d39964266c0ad53cec6ac48ecb478b49b3b9a1de7c29ec13179af8dc0f4679a5ed6e52ed1fbe087d4d3a5d31174f7f793aa23c3c04fce8a3f51d13168
-Size (keychain-2.7.1.tar.bz2) = 51379 bytes
-SHA1 (patch-keychain) = 0e1b2ecabbbbef53dacbd8d141ea3ea7f3e8d08b
+SHA1 (keychain-2.8.2.tar.bz2) = 6cc9d2e2980ba5fc9c948c04a94e452e47435501
+RMD160 (keychain-2.8.2.tar.bz2) = 76f27996fa8a9f905844d69b9cfef8c4d03f0488
+SHA512 (keychain-2.8.2.tar.bz2) = 39170d6f43a5303539e6c8feb98a5eabc2782ef58d75f385fbd14c36a158e505385eeed7380b848f802551d74a4e4b5ccfb04c402ef329ec0f818b10119f80e1
+Size (keychain-2.8.2.tar.bz2) = 34187 bytes
diff --git a/security/keychain/patches/patch-keychain b/security/keychain/patches/patch-keychain
deleted file mode 100644
index 338c2566981..00000000000
--- a/security/keychain/patches/patch-keychain
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-keychain,v 1.1 2015/05/04 21:02:59 roy Exp $
-
-Add OpenSSH 6.8+ support.
-
---- keychain.orig	2015-05-04 20:56:00.000000000 +0000
-+++ keychain
-@@ -812,6 +812,11 @@ extract_fingerprints() {
-                 #   1024 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 /home/barney/.ssh/id_dsa (DSA)
-                 echo "$ef_line" | cut -f2 -d' '
-                 ;;
-+	    *\ MD5:[0-9a-zA-Z\+\/=]*|*\ SHA256:[0-9a-zA-Z\+\/=]*)
-+		# The new OpenSSH 6.8+ format,
-+		#   1024 SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE /home/barney/.ssh/id_dsa (DSA)
-+		echo "$ef_line" | cut -f2 -d' '
-+		;;
-             *)
-                 # Fall back to filename.  Note that commercial ssh is handled
-                 # explicitly in ssh_l and ssh_f, so hopefully this rule will