Revbump to include upstream commit for new openssh-6.8 fingerprint format

Package-Manager: portage-2.2.18/cvs/Linux x86_64

4 files changed, 90 insertions, 13 deletions

diff --git a/net-misc/keychain/ChangeLog b/net-misc/keychain/ChangeLog
index 8ad21d827ee8..4fc4f7661bf9 100644
--- a/net-misc/keychain/ChangeLog
+++ b/net-misc/keychain/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/keychain
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.110 2013/05/24 20:30:30 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.111 2015/03/20 09:24:36 hwoarang Exp $
+
+*keychain-2.7.1-r2 (20 Mar 2015)
+
+  20 Mar 2015; Markos Chandras <hwoarang@gentoo.org> +keychain-2.7.1-r2.ebuild,
+  +files/keychain-2.7.1-openssh-6.8.patch:
+  Revbump to include upstream commit for new openssh-6.8 fingerprint format
 
   24 May 2013; Alexis Ballier <aballier@gentoo.org> keychain-2.7.1-r1.ebuild:
   keyword ~amd64-fbsd thanks to Yuta SATOH, bug #432410
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index aee56dae9683..f68eca129e68 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX keychain-2.7.1-openssh-6.8.patch 1829 SHA256 e09ccc20882c736e0eb71124871f8210fa9b8279991a71f15d0ae036e24a5ce3 SHA512 990353e6764f105c8a4167ac444f75a39ce4d839b4a4f2756a766ed2aefcab2e5b72f7799a4cf7b4d321ed09af0558818227811102da16b9e5ea7986ba56da39 WHIRLPOOL 6d7e0d3c2fdcc7b669daefccd1957fd73dc0d00eb6a7444a860a16a8a7b999975c0cccb0f80039e4e9631cbe6f7d6f28082f287ee88e0078cbbef0364f04a3bc
 DIST keychain-2.7.1.tar.bz2 51379 SHA256 1107fe3f78f6429d4861d64c5666f068f159326d22ab80a8ed0948cb25375191 SHA512 03cbf86d39964266c0ad53cec6ac48ecb478b49b3b9a1de7c29ec13179af8dc0f4679a5ed6e52ed1fbe087d4d3a5d31174f7f793aa23c3c04fce8a3f51d13168 WHIRLPOOL 3b2051f695e888419596b352e8bad6e986d2088d651f260d63abf3ff7da2e116aee6fb8c1d6036780e6dca9be951b2c4ac122f715ed4c1b1f93547971cdece2f
 EBUILD keychain-2.7.1-r1.ebuild 880 SHA256 fff6f980baad96447da52130619aa0e0adcae3b6a6e114157504618b8a61406a SHA512 01ec95c5e715131c354e53c778c06dc7d87b9acd132c7eaa7f1c39f0c9a3bca2283313050473286010dc817a64b4ba8640ac05d3bdc8648f08d997d13ef39b60 WHIRLPOOL 9b809053ce9084d37e944b8c474b92fd02a90332f5814d442e3df29b12a3caa12b7562ea13e9aa9642d436dbfe4d481be4f819da0531edf9bbe8adf305430ea8
+EBUILD keychain-2.7.1-r2.ebuild 970 SHA256 c4423817527226539c6be1070598a866d3f7ac5d309a517afe3c5be030d45dce SHA512 f30464c88e93c161782568e05c3b83fce126c97860fe9557c4873c445de99b837d88e4474ca9f72aa6b3cbcf4c52d3614fabdf8d48101f4273d98ff9a89cf067 WHIRLPOOL f5127c2e70743c00823daf1c96545268e75f7d0df997b50df0ff92a8eae75177fe853ad4a69d8e0cc531d59f264eda89c422e0b477f91e18578dff1c51de346b
 EBUILD keychain-2.7.1.ebuild 958 SHA256 9a8414f8ade346dfe02aea64c564a4fd9a6cafaa08478cc9d2294031c669bf89 SHA512 a663ced0f459e27356dcef13d32967b6ef7da3cb63e01c4cf198804347dbb658cb2829d9915c6ac23f6da822bc646563e2dd0c5513e171e1db58902cd1eb26af WHIRLPOOL f83159ede771aa7070716dca943c9e1a58be51a5bc2c916e97e352ffe59dac42ec91f827ab6cc96c0e999fde8ae88f7f5f9e3e8bd7c9d9461934c2594f2db4f7
-MISC ChangeLog 17377 SHA256 da3961b00c37211e7a5267a1e2037e507032bb6f8ce9fac74ef8edace5214658 SHA512 68301d63b0cbceec7fb303724c329e80790559df3e105b954c8280b65f59ddc0bdf80120f31f2f51b151fc4fc07eb38d5acc145e5b8b484e5b854453cad2a21f WHIRLPOOL a09bbfd01eeef95c59385ee5f14d827ff670f817c7994a845da803ff4b20ac74eaa5050981a5e36c3ecdd56e7204aeec4de07bc12303371d4c7675e465cf2ef6
+MISC ChangeLog 17611 SHA256 41eff693c35b235c96000cdb0064e347e3cef4d4bca0b4561ee0ec6b4296df78 SHA512 cb25450f014e725e54f88c2839b2a6bebcf3164b9e5bae2c70961a98a42ea9eff982a411ddc1bf25b320f2f4d74830044d6332147c1e9218f03a2c25c35bb556 WHIRLPOOL c8508826497268a4c06890866c8342e744fcba3dead1aac872165c4c0885e6f1bff267a79538886283c7b06e6f650c0e202a7d11110e73813676c935d353f517
 MISC metadata.xml 351 SHA256 b5aafb27cf1a947008c9406e95358ced320c95a9719179ae9948916a3f862bd0 SHA512 a8244763dfdb3aa322e5ad544400b0bc14c8ae1c0e2c2c867d38ccbd77124db5348e586cd0333b7d517593c7e64d39edf7eb70b6e1b76f0ad6a7158e6c7dea4b WHIRLPOOL 89017a3bb6fe865393f6c9769d3d232a88c9a36cb3e788c5466ea9e75fb09511ddeee1aa874bce690b80fa52c85b707f40330a1ed4eb1615c980022f42b73556
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iEYEAREIAAYFAlGfzecACgkQvFcC4BYPU0pvbQCgpreM9Eard7mvhQmrCuZbmtve
-dcQAnAyhyqJIzY6f+ipaxOBP2Myz1KW4
-=oYwD
------END PGP SIGNATURE-----
diff --git a/net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch b/net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch
new file mode 100644
index 000000000000..6b652a02927e
--- /dev/null
+++ b/net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch
@@ -0,0 +1,47 @@
+Backported from d76c2e9aa1c05ceac1c2d06a29783ee95e876a37 upstream commit
+
+OpenSSH 6.8, which was just released, includes the following change:
+
+http://www.openssh.com/txt/release-6.8
+
+Fingerprints now have the hash algorithm prepended. An example of
+the new format: SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE
+Please note that visual host keys will also be different.
+
+(Previous versions always dumped in MD5 with no prefix.)
+
+The pattern match that keychain uses doesn't work with the new
+fingerprint format. The patch below takes care of it.
+
+I used shopt extglob so I could use @( ) for the alternative. I'm not
+a bash pattern whiz; there may be a better way to do that.
+
+Upstream commit by Daniel Robbins
+Link: https://github.com/funtoo/keychain/commit/d76c2e9aa1c05ceac1c2d06a29783ee95e876a37
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+
+Index: keychain-2.7.1/keychain
+===================================================================
+--- keychain-2.7.1.orig/keychain
++++ keychain-2.7.1/keychain
+@@ -50,6 +50,8 @@ confirmopt=false
+ unset ssh_confirm
+ unset GREP_OPTIONS
+ 
++shopt -s extglob
++
+ BLUE=""
+ CYAN=""
+ CYANN=""
+@@ -671,6 +673,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' '
+                 ;;
++            *\ @(SHA256|MD5):[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
diff --git a/net-misc/keychain/keychain-2.7.1-r2.ebuild b/net-misc/keychain/keychain-2.7.1-r2.ebuild
new file mode 100644
index 000000000000..936db83a451f
--- /dev/null
+++ b/net-misc/keychain/keychain-2.7.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.7.1-r2.ebuild,v 1.1 2015/03/20 09:24:36 hwoarang Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner. Frontend for ssh-agent/ssh-add"
+HOMEPAGE="http://www.funtoo.org/wiki/Keychain"
+SRC_URI="http://www.funtoo.org/archive/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash
+	virtual/ssh"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-openssh-6.8.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog README.rst
+}