diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-03-15 12:40:53 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-03-15 12:40:53 -0400 |
| commit | a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15 (patch) | |
| tree | ba2c4880e3f4ce6509ff219d0fd646493d085e1d /gnu/packages/patches | |
| parent | 2c9f0b077018d2cac599bd2f466769cd5ffd3adc (diff) | |
| parent | 20095cc5139666fe67b3ae76b3f46ff85e4956bb (diff) | |
| download | gnu-guix-a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15.tar gnu-guix-a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15.tar.gz | |
Merge branch 'master' into security-updates
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/gitolite-openssh-6.8-compat.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/gnu/packages/patches/gitolite-openssh-6.8-compat.patch b/gnu/packages/patches/gitolite-openssh-6.8-compat.patch deleted file mode 100644 index d7fc2e6b12..0000000000 --- a/gnu/packages/patches/gitolite-openssh-6.8-compat.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ed807a40c6683960e357bc995b3acf721ec088b4 Mon Sep 17 00:00:00 2001 -From: Sitaram Chamarty <sitaram@atc.tcs.com> -Date: Thu, 19 Mar 2015 05:17:59 +0530 -Subject: [PATCH] openssh 6.8 compat - ---- - src/triggers/post-compile/ssh-authkeys | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/triggers/post-compile/ssh-authkeys b/src/triggers/post-compile/ssh-authkeys -index 84dda73..d5f5d8b 100755 ---- a/src/triggers/post-compile/ssh-authkeys -+++ b/src/triggers/post-compile/ssh-authkeys -@@ -115,7 +115,7 @@ sub fp_file { - my $f = shift; - my $fp = `ssh-keygen -l -f '$f'`; - chomp($fp); -- _die "fingerprinting failed for '$f'" unless $fp =~ /([0-9a-f][0-9a-f](:[0-9a-f][0-9a-f])+)/; -+ _die "fingerprinting failed for '$f'" unless $fp =~ /([0-9a-f][0-9a-f](:[0-9a-f][0-9a-f])+)/ or $fp =~ m(SHA256:([A-ZA-z0-9+/]+)); - $fp = $1; - return $fp; - } --- -2.2.1 - |