diff options
| author | roy <roy> | 2015-05-04 21:02:58 +0000 |
|---|---|---|
| committer | roy <roy> | 2015-05-04 21:02:58 +0000 |
| commit | 786681187b9786bd6c8bf6e750befedf0b559ad3 (patch) | |
| tree | e25e26ff3dd3c6762e19f07d823375fe10cac5c2 | |
| parent | 14f86aa171722a6257bc7c7eff0d2a294175709e (diff) | |
| download | pkgsrc-786681187b9786bd6c8bf6e750befedf0b559ad3.tar.gz | |
Add patch to work with OpenSSH 6.8+ format.
| -rw-r--r-- | security/keychain/Makefile | 4 | ||||
| -rw-r--r-- | security/keychain/distinfo | 3 | ||||
| -rw-r--r-- | security/keychain/patches/patch-keychain | 18 |
3 files changed, 22 insertions, 3 deletions
diff --git a/security/keychain/Makefile b/security/keychain/Makefile index 63c0e088db4..5284eb74caf 100644 --- a/security/keychain/Makefile +++ b/security/keychain/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2015/03/13 11:29:33 roy Exp $ +# $NetBSD: Makefile,v 1.33 2015/05/04 21:02:58 roy Exp $ DISTNAME= keychain-2.7.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= security MASTER_SITES= http://www.funtoo.org/archive/keychain/ EXTRACT_SUFX= .tar.bz2 diff --git a/security/keychain/distinfo b/security/keychain/distinfo index 53940e7cbb7..24cdd64d258 100644 --- a/security/keychain/distinfo +++ b/security/keychain/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.17 2010/05/18 06:29:32 pettai Exp $ +$NetBSD: distinfo,v 1.18 2015/05/04 21:02:58 roy Exp $ SHA1 (keychain-2.7.1.tar.bz2) = e7ad7da374ba81e57792bb2695eb6c352f769de7 RMD160 (keychain-2.7.1.tar.bz2) = bbeaf7f8c1c6dc0b3847aa9b7fc272ebb0743482 Size (keychain-2.7.1.tar.bz2) = 51379 bytes +SHA1 (patch-keychain) = 0e1b2ecabbbbef53dacbd8d141ea3ea7f3e8d08b diff --git a/security/keychain/patches/patch-keychain b/security/keychain/patches/patch-keychain new file mode 100644 index 00000000000..338c2566981 --- /dev/null +++ b/security/keychain/patches/patch-keychain @@ -0,0 +1,18 @@ +$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 |