From: Mike Frysinger Date: Sat, 4 Apr 2015 22:30:04 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6926a311611f77ff4148a0b0553e305577763f0e;p=gentoo.git Version bump. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- diff --git a/net-misc/keychain/ChangeLog b/net-misc/keychain/ChangeLog index 4fc4f7661bf9..ed9cf0d463cc 100644 --- a/net-misc/keychain/ChangeLog +++ b/net-misc/keychain/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/keychain # 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 $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.112 2015/04/04 22:30:03 vapier Exp $ + +*keychain-2.8.0 (04 Apr 2015) + + 04 Apr 2015; Mike Frysinger + +files/keychain-2.8.0-posix-sh.patch, +keychain-2.8.0.ebuild: + Version bump. *keychain-2.7.1-r2 (20 Mar 2015) diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest index f68eca129e68..96c3a64bdf7e 100644 --- a/net-misc/keychain/Manifest +++ b/net-misc/keychain/Manifest @@ -1,7 +1,30 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX keychain-2.7.1-openssh-6.8.patch 1829 SHA256 e09ccc20882c736e0eb71124871f8210fa9b8279991a71f15d0ae036e24a5ce3 SHA512 990353e6764f105c8a4167ac444f75a39ce4d839b4a4f2756a766ed2aefcab2e5b72f7799a4cf7b4d321ed09af0558818227811102da16b9e5ea7986ba56da39 WHIRLPOOL 6d7e0d3c2fdcc7b669daefccd1957fd73dc0d00eb6a7444a860a16a8a7b999975c0cccb0f80039e4e9631cbe6f7d6f28082f287ee88e0078cbbef0364f04a3bc +AUX keychain-2.8.0-posix-sh.patch 1195 SHA256 51673bb69d198a9a4fea35658d1fa3adbb63725d0eb0f568b0a3f528b79825eb SHA512 cf786dc9902c42378d8a5120b9b7f581243ae83c0ba0fc0a0e3fea1f0916416a6977d71f2709def12991bfe57fe47c44597d4c8ef48a5a32ce2d83c4b0d06893 WHIRLPOOL cacbc169e131d271a3b78b5f18899577f01b2435b22f02e0f2c8a253cedb9b1470b13f379cf2c4d119bf6009cf729f5ca7c48a5c706883639d752a24efd1303b DIST keychain-2.7.1.tar.bz2 51379 SHA256 1107fe3f78f6429d4861d64c5666f068f159326d22ab80a8ed0948cb25375191 SHA512 03cbf86d39964266c0ad53cec6ac48ecb478b49b3b9a1de7c29ec13179af8dc0f4679a5ed6e52ed1fbe087d4d3a5d31174f7f793aa23c3c04fce8a3f51d13168 WHIRLPOOL 3b2051f695e888419596b352e8bad6e986d2088d651f260d63abf3ff7da2e116aee6fb8c1d6036780e6dca9be951b2c4ac122f715ed4c1b1f93547971cdece2f +DIST keychain-2.8.0.tar.gz 43855 SHA256 f6cc957b7a2942fb3975383f4bb97311956db586502fe4deb39b0a8cf0652ced SHA512 229c8fd417ba7d41f8c0310ab6a60e11978852046c36431bbd9a6587d50f1daec9550a02e6bcd82ddfde6bfeb929d10985f5041e30ec2e18b6f0138d526c24c9 WHIRLPOOL 699457c878eaf197e43f979c17ebcb415618fdf207a40fd3152156261ddbc881c3c340d8e8ff233540aea72c436e156ced4bef9c7fe47af3ad7018f20fd43919 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 17611 SHA256 41eff693c35b235c96000cdb0064e347e3cef4d4bca0b4561ee0ec6b4296df78 SHA512 cb25450f014e725e54f88c2839b2a6bebcf3164b9e5bae2c70961a98a42ea9eff982a411ddc1bf25b320f2f4d74830044d6332147c1e9218f03a2c25c35bb556 WHIRLPOOL c8508826497268a4c06890866c8342e744fcba3dead1aac872165c4c0885e6f1bff267a79538886283c7b06e6f650c0e202a7d11110e73813676c935d353f517 +EBUILD keychain-2.8.0.ebuild 909 SHA256 d3d6aae7fe804d3767378b0ebaec4bd52a7b4e17fe8cbce5dc3bd5c43fea167a SHA512 509d40065f28f9296268b793a8ffe886a2d546f5db007e371cb402d18ebd134fb99d8a5d4d99768c39bbcc7f41a33d61fcca632c01e89b00837b4e2e96064b51 WHIRLPOOL f741832fb6340c9d72698e87440828438d33265ad5ba92cb0029baede7cce20950e238f85bc50e97a19242bfba7162b9c98b3711ddcf5922dff6d70d97d57ea0 +MISC ChangeLog 17771 SHA256 18c5a7ced8845474fec254aaad34c3cfab81f79b874b6f729784aaaf6f091a75 SHA512 e526d5eb9fe12e8159deecce479c070e9f57c1254d2070ac5b4c5fb6345a91e5f9a5758395a5e9461acee7dae0181b48645cc73e87763fd73710cbad1bb38df0 WHIRLPOOL 9b4c0061aa90b187c8d2feb4bc31da6f39a35d74d25257bb8289bfd1a376476b114325086f9f6abacf0c94c67046f78f43bfd9e972bbaf3da2f5b498ffc876dd MISC metadata.xml 351 SHA256 b5aafb27cf1a947008c9406e95358ced320c95a9719179ae9948916a3f862bd0 SHA512 a8244763dfdb3aa322e5ad544400b0bc14c8ae1c0e2c2c867d38ccbd77124db5348e586cd0333b7d517593c7e64d39edf7eb70b6e1b76f0ad6a7158e6c7dea4b WHIRLPOOL 89017a3bb6fe865393f6c9769d3d232a88c9a36cb3e788c5466ea9e75fb09511ddeee1aa874bce690b80fa52c85b707f40330a1ed4eb1615c980022f42b73556 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAEBCAAGBQJVIGXsAAoJEPGu1DbS6WIAV2EP/0vNW/7IcANLDfWeYjikEgDF +0Rtrz35x4Cc0V/VBKd99ydPt7sXcJnJ3GFNw5aeXwo00F6nY7W3h7shw08ZMeqGa +qg2K+lUY9X+YQmscyY4av9AntAWQ/wR32S36fV0VveYXSgjrNjhHXu6YWMKYFVD1 +cEpdDoF51R1geIav2+Me69c2ObNp1PZwjPuRTHsXpmBJcGXIfhfPzWkDN9ure9et +GDiXPjHh25KOS02VJraUmzE9JNK8xuDHQg1M25DmoECkF6quFn8UVjkEPiMJm1TT +lRnJnfoOtNTDKKXuwUWCfjoG77XcBULwXqEzTcv5mWp4o+yGAP5kIO23oewVWNg5 +Ap7UPLg/DPvWHPvrZRnysWzgXTBsKKjKt0QGrMeTbmQMxOXlOM+mW1Dd/eMV9Cm+ +vOj3DmhIHyOTVVxXeZ4ABgHMLs9W60STmUam/fk4I5q1yi8nSmbj0H/sB53Pp4Rc +Je9RZEhAHot0DWnkowkt5yiJGT+Ig56TIO0Rd9xupwjhrEL84yS1vZfIa+98J6MB +P9rorWrvxEeuZtrfkkTu6eXPSKGACScTP1eVTC4mQ4SwbMYxH3AEWXjyePVbeOV8 +rZGzUvLms0YxB23gZ9fw3lGerkGTRIR2vDUhUxRyIUtn031mdY1ssRhavMquZSeD +jqSIO6RZ/nUhg1GinxTR +=X43Y +-----END PGP SIGNATURE----- diff --git a/net-misc/keychain/files/keychain-2.8.0-posix-sh.patch b/net-misc/keychain/files/keychain-2.8.0-posix-sh.patch new file mode 100644 index 000000000000..70b093b923cc --- /dev/null +++ b/net-misc/keychain/files/keychain-2.8.0-posix-sh.patch @@ -0,0 +1,35 @@ +From 6052ce29af20d237f6fe6f044e9f4110e053c763 Mon Sep 17 00:00:00 2001 +From: vaeth +Date: Sat, 21 Mar 2015 20:14:13 +0100 +Subject: [PATCH] Re-introduce POSIX compatibility + +By making the openssh 6.8 format match slightly more verbose, one can make it POSIX compatible again and remove the bashism "shopt". This way, the script works (again) if /bin/sh is a symlink to dash. +--- + keychain.sh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/keychain.sh b/keychain.sh +index 6dae912..1ab79ba 100755 +--- a/keychain.sh ++++ b/keychain.sh +@@ -56,8 +56,6 @@ unset ssh_confirm + unset GREP_OPTIONS + realpath_bin="`command -v realpath`" + +-shopt -s extglob +- + BLUE="" + CYAN="" + CYANN="" +@@ -683,7 +681,7 @@ 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\+\/=]*) ++ *\ SHA256:[0-9a-zA-Z\+\/=]*|*\ 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' ' +-- +2.3.5 + diff --git a/net-misc/keychain/keychain-2.8.0.ebuild b/net-misc/keychain/keychain-2.8.0.ebuild new file mode 100644 index 000000000000..957d639a321d --- /dev/null +++ b/net-misc/keychain/keychain-2.8.0.ebuild @@ -0,0 +1,29 @@ +# 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.8.0.ebuild,v 1.1 2015/04/04 22:30:03 vapier Exp $ + +EAPI=5 + +inherit eutils + +DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner" +HOMEPAGE="http://www.funtoo.org/Keychain" +SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz" + +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="dev-lang/perl" +RDEPEND="" + +src_prepare() { + epatch "${FILESDIR}"/${P}-posix-sh.patch +} + +src_install() { + dobin ${PN} + doman ${PN}.1 + dodoc ChangeLog README.md +}