git: 569c6bfe8bd4 - main - devel/gitolite: Add support of all security key type ssh keys

From: Li-Wen Hsu <lwhsu_at_FreeBSD.org>
Date: Fri, 21 Mar 2025 09:02:14 UTC
The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=569c6bfe8bd4250ac206d38b53624886ac816dbf

commit 569c6bfe8bd4250ac206d38b53624886ac816dbf
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2025-03-21 09:02:11 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2025-03-21 09:02:11 +0000

    devel/gitolite: Add support of all security key type ssh keys
    
    PR:             269088
    Approved by:    mat (maintainer)
    Co-Developed-by:        Philip Paeps <philip@FreeBSD.org>
    Co-Developed-by:        Christian Weisgerber <naddy@FreeBSD.org>
---
 devel/gitolite/Makefile                                           | 2 +-
 devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile
index 5772a35a698a..85553041c69f 100644
--- a/devel/gitolite/Makefile
+++ b/devel/gitolite/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitolite
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.6.13
-PORTREVISION=	1
+PORTREVISION=	2
 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 7de5937f5325..7dff7469c6ff 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|(sk-)?ssh)-/ ? " " : "," ) . $line[0];
++        ($line[0] =~ /^(sk-)?(ecdsa|ssh)-/ ? " " : "," ) . $line[0];
  }