git: 070044555540 - main - devel/gitolite: support all sk- key types
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 20 Mar 2025 21:04:40 UTC
The branch main has been updated by mat:
URL: https://cgit.FreeBSD.org/ports/commit/?id=070044555540bac853b948624c232063becc5d5e
commit 070044555540bac853b948624c232063becc5d5e
Author: Philip Paeps <philip@FreeBSD.org>
AuthorDate: 2025-03-20 20:29:16 +0000
Commit: Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2025-03-20 21:00:47 +0000
devel/gitolite: support all sk- key types
PR: 269088
---
devel/gitolite/Makefile | 1 +
devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile
index 1fe50b059777..5772a35a698a 100644
--- a/devel/gitolite/Makefile
+++ b/devel/gitolite/Makefile
@@ -1,6 +1,7 @@
PORTNAME= gitolite
DISTVERSIONPREFIX= v
DISTVERSION= 3.6.13
+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..7de5937f5325 100644
--- a/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys
+++ b/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys
@@ -29,6 +29,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];
}