cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge two commits from upstream to accept ed25519 and support openssh 6.8

Browse Source 
from viq
This commit is contained in:
jasper 2015-04-05 21:57:40 +00:00
parent b8306fba9b
commit 350b382037
3 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/gitolite/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.9 2015/04/05 13:31:15 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2015/04/05 21:57:40 jasper Exp $
PKG_ARCH= *
COMMENT= secure hosting of Git repositories
V= 3.6.2
REVISION= 0
REVISION= 1
GH_ACCOUNT= sitaramc
GH_PROJECT= gitolite
GH_TAGNAME= v$V

37
sysutils/gitolite/patches/patch-src_commands_sshkeys-lint Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-src_commands_sshkeys-lint,v 1.1 2015/04/05 21:57:41 jasper Exp $
refactor keytype and accept ed25519
https://github.com/sitaramc/gitolite/commit/d500cb7da94ea66ddc46b5cb50bce3779684e0cf
--- src/commands/sshkeys-lint.orig Mon Nov 10 04:11:59 2014
+++ src/commands/sshkeys-lint Sun Apr 5 10:45:15 2015
@@ -17,6 +17,7 @@ $|++;
my $in_gl_section = 0;
my $warnings = 0;
+my $KEYTYPE_REGEX = qr/\b(?:ssh-(?:rsa|dss|ed25519)|ecdsa-sha2-nistp(?:256|384|521))\b/;
sub dbg {
use Data::Dumper;
@@ -126,7 +127,7 @@ sub user {
my $user = '';
$user ||= "user $1" if /^command=.*gitolite-shell (.*?)"/;
$user ||= "unknown command" if /^command/;
- $user ||= "shell access" if /^ssh-(rsa|dss)/;
+ $user ||= "shell access" if /$KEYTYPE_REGEX/;
return $user;
}
@@ -142,10 +143,10 @@ sub ak_comment {
sub fprint {
local $_ = shift;
my ( $fh, $tempfn, $in );
- if ( /ssh-(dss|rsa) / || /ecdsa-/ ) {
+ if ( /$KEYTYPE_REGEX/ ) {
# an actual key was passed. Since ssh-keygen requires an actual file,
# make a temp file to take the data and pass on to ssh-keygen
- s/^.* (ssh-dss|ssh-rsa|ecdsa-\S+)/$1/;
+ s/^.* ($KEYTYPE_REGEX)/$1/;
use File::Temp qw(tempfile);
( $fh, $tempfn ) = tempfile();
$in = $tempfn;

16
sysutils/gitolite/patches/patch-src_triggers_post-compile_ssh-authkeys Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_triggers_post-compile_ssh-authkeys,v 1.1 2015/04/05 21:57:41 jasper Exp $
openssh 6.8 compat
https://github.com/sitaramc/gitolite/commit/ed807a40c6683960e357bc995b3acf721ec088b4
--- src/triggers/post-compile/ssh-authkeys.orig Mon Nov 10 04:11:59 2014
+++ src/triggers/post-compile/ssh-authkeys Sun Apr 5 10:45:58 2015
@@ -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;
}