Date: Tuesday, March 24, 2015 @ 21:08:09 Author: eric Revision: 234653
upgpkg: keychain 2.8.0-1 Upstream update, Remove old patch Modified: keychain/trunk/PKGBUILD Deleted: keychain/trunk/keychain-openssh68.patch --------------------------+ PKGBUILD | 20 +++--------------- keychain-openssh68.patch | 49 --------------------------------------------- 2 files changed, 4 insertions(+), 65 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-24 20:07:52 UTC (rev 234652) +++ PKGBUILD 2015-03-24 20:08:09 UTC (rev 234653) @@ -2,28 +2,16 @@ # Maintainer: Eric Bélanger <[email protected]> pkgname=keychain -pkgver=2.7.1 -pkgrel=4 +pkgver=2.8.0 +pkgrel=1 pkgdesc="A front-end to ssh-agent, allowing one long-running ssh-agent process per system, rather than per login" arch=('any') url="http://www.funtoo.org/Keychain"; license=('GPL2') depends=('sh') -source=(http://www.funtoo.org/archive/keychain/${pkgname}-${pkgver}.tar.bz2 - keychain-openssh68.patch) -sha1sums=('e7ad7da374ba81e57792bb2695eb6c352f769de7' - '339005a006e70f2bb52d19f1f61dc0e6fb1f59bc') +source=(http://www.funtoo.org/archive/keychain/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('411bfe6a3ac9daca1c35f9a56828f03cc8474e8a668e122773397deb8f7a0799') -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/keychain-openssh68.patch" -} - -build() { - cd ${pkgname}-${pkgver} - make -} - package() { cd ${pkgname}-${pkgver} install -Dm755 keychain "${pkgdir}/usr/bin/keychain" Deleted: keychain-openssh68.patch =================================================================== --- keychain-openssh68.patch 2015-03-24 20:07:52 UTC (rev 234652) +++ keychain-openssh68.patch 2015-03-24 20:08:09 UTC (rev 234653) @@ -1,49 +0,0 @@ -From d76c2e9aa1c05ceac1c2d06a29783ee95e876a37 Mon Sep 17 00:00:00 2001 -From: Daniel Robbins <[email protected]> -Date: Wed, 18 Mar 2015 11:20:58 -0600 -Subject: [PATCH] FL-2195: From Todd Eigenschink <[email protected]>: - -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. ---- - keychain.sh | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/keychain.sh b/keychain.sh -index 1834c85..c9a25d5 100755 ---- a/keychain.sh -+++ b/keychain.sh -@@ -55,6 +55,8 @@ systemdopt=false - unset ssh_confirm - unset GREP_OPTIONS - -+shopt -s extglob -+ - BLUE="[34;01m" - CYAN="[36;01m" - CYANN="[36m" -@@ -671,6 +673,11 @@ - # 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
