FreeBSD Bugzilla – Attachment 245214 Details for
Bug 274024
Enable ecdsa-sk and ed25519-sk SSH keys for git@gitrepo.freebsd.org
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch to devel/gitolite port
0001-devel-gitolite-support-sk-ssh-style-keys.patch (text/plain), 2.87 KB, created by
Philip Paeps
on 2023-09-25 12:45:32 UTC
(
hide
)
Description:
Proposed patch to devel/gitolite port
Filename:
MIME Type:
Creator:
Philip Paeps
Created:
2023-09-25 12:45:32 UTC
Size:
2.87 KB
patch
obsolete
>From 856ac2dd66db9f3f420ac5657a4a3909dacd81f7 Mon Sep 17 00:00:00 2001 >From: Philip Paeps <philip@FreeBSD.org> >Date: Mon, 25 Sep 2023 20:34:42 +0800 >Subject: [PATCH] devel/gitolite: support sk-ssh-* style keys > >Update the patch introduced in aa882815d81c48204ff116daafc8d9c0a9dd3dff >to support sk-ssh-* style keys. > >Reported by: naddy >Tested by: lwhsu (on git.FreeBSD.org) >--- > devel/gitolite/Makefile | 1 + > ...tch-src_triggers_post-compile_ssh-authkeys | 27 ++----------------- > 2 files changed, 3 insertions(+), 25 deletions(-) > >diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile >index dd3d734f2f13..eec76da9a8ea 100644 >--- a/devel/gitolite/Makefile >+++ b/devel/gitolite/Makefile >@@ -1,6 +1,7 @@ > PORTNAME= gitolite > DISTVERSIONPREFIX= v > DISTVERSION= 3.6.12 >+PORTREVISION= 1 > PORTEPOCH= 1 > CATEGORIES= devel > >diff --git a/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys b/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys >index aff4b7d52192..37b91819856c 100644 >--- a/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys >+++ b/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys >@@ -1,27 +1,4 @@ >-From 7db6332d9be1879d97c57c35d53d97c4b15663d5 Mon Sep 17 00:00:00 2001 >-From: Gleb Smirnoff <glebius@FreeBSD.org> >-Date: Thu, 13 Feb 2020 09:38:33 -0800 >-Subject: [PATCH] When prepending our options to a key, check if key file >- already has any options. In this case put comma after end of our options >- instead of space. >-MIME-Version: 1.0 >-Content-Type: text/plain; charset=UTF-8 >-Content-Transfer-Encoding: 8bit >- >-To tell key with options against bare key we check if key starts >-with (ecdsa|ssh)-. At the moment of this commit OpenSSH supports >-the following algorithms âecdsa-sha2-nistp256â, âecdsa-sha2-nistp384â, >-âecdsa-sha2-nistp521â, âssh-ed25519â, âssh-dssâ or âssh-rsaâ. If >-a different algorithm to be introduce to OpenSSH in future, this >-code would be broken. However, adding a full key parser to this >-subroutine seems to be overkill now. >---- >- src/triggers/post-compile/ssh-authkeys | 3 ++- >- 1 file changed, 2 insertions(+), 1 deletion(-) >- >-diff --git a/src/triggers/post-compile/ssh-authkeys b/src/triggers/post-compile/ssh-authkeys >-index cd59aec83..6325373d7 100755 >---- src/triggers/post-compile/ssh-authkeys >+--- src/triggers/post-compile/ssh-authkeys.orig 2020-08-04 13:30:21 UTC > +++ src/triggers/post-compile/ssh-authkeys > @@ -137,6 +137,7 @@ sub optionise { > return ''; >@@ -29,6 +6,6 @@ index cd59aec83..6325373d7 100755 > chomp(@line); > - return "command=\"$glshell $user" . ( $kfn ? " $f" : "" ) . "\",$auth_options $line[0]"; > + return "command=\"$glshell $user" . ( $kfn ? " $f" : "" ) . "\",$auth_options" . >-+ ($line[0] =~ /^(ecdsa|ssh)-/ ? " " : "," ) . $line[0]; >++ ($line[0] =~ /^(ecdsa|(sk-)?ssh)-/ ? " " : "," ) . $line[0]; > } > >-- >2.41.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
philip
:
maintainer-approval?
(
mat
)
Actions:
View
|
Diff
Attachments on
bug 274024
:
245206
| 245214