From nobody Fri Mar 21 09:02:14 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJxKM1cP7z5qtZN; Fri, 21 Mar 2025 09:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJxKM15RBz3P2Z; Fri, 21 Mar 2025 09:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742547735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vKc8O6JVGG80MGeGne4+0XNUcCGF+HlwI/jEdKjzeF4=; b=afPZbVUe3IV8jypPWqNwdLnfKUoxvYWSSXOwPpyhVHd9WiycG15H9SitiOtk5w5HnuKaGx yrOnz3y0UErsXZa59ODSxtacSR4jOEAgTnBMj4fDbCeEfGj9PvPZDVGpsPJuxvkbYHoMci 9W+S8Kff4RD1nvBkLlvkYlGYUbtCyYCvMUllFN8J9vgeq4sW46/0z3ncIddmHZaSrEbaYa k1RFO7R4xR/OKAS0TNQVsA9Sbk4y92rJ68M+YIIcUQycABxgzECFMxxA3dYCqGiirTkzn2 Qrs06Ouh7PuAL369uK5n6xXeyhdbtTplTMt8W5jsWX7UzaaXb/Bpmkt3Nk7yGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742547735; a=rsa-sha256; cv=none; b=c4wVYzLRCbziLNMk2bjzM89bLyqHtfJ2BaZxF+DO295/chzgs20Y7eMB8w95utFt8FSnwv HsCxotlbmzBVut071I8b2RSWilVZ83vo1IgCr3KBmu16iwVhRzqivgCYsiuShWHBmKE0cJ J+BrrOoJzSS77ycjx8Wh5+LlPfhtdES1MrP/wYWTLSkf7/wDXLVYF/oJcqVrLsJinPOzb8 iDAS+WrnzAYu/pFl5EjstmQxrrJ/YPpr17SivlGZT13PvWF00diHGKEF8q17vs8swgTVlJ T3nowlRVYBATyQ+zxR6/TFSEd44okmjsTGfPLH/mv7D3W4M0Lv8AXoUU+7huyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742547735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vKc8O6JVGG80MGeGne4+0XNUcCGF+HlwI/jEdKjzeF4=; b=xH7cECuqx+m/8zi15s2UwQEbEj7I5wLN0AeiZ4cASnEd43gyGfMcWKtUQxiR/jW0inTcDY 1THu9a0+C665sYlBuPQnXlIwNHt+wtpQBNFx+9ZAqYajjlZnse4Ou4Y+DfB/p31HdOvU7E j0+JaTUk3zZj+a+tvUrEKMEkoL0kpJv64Fnq3VPxv3FLDBTzAPC2le1WYZU0a+/vTPIVCd fMvgbtCVaS4XUbL7vSQ/tJ10aikPWS5t8EYudK5PZXmTDsmQ6hVcb52wxJCn10DQSpDsYo xEZJDmzzmFheiv38i2xlx2tjhGuyiJjeqri3dHcxK/f97Js7CVogMWv6rg9wnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJxKM0fmpzDNL; Fri, 21 Mar 2025 09:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52L92EkQ043146; Fri, 21 Mar 2025 09:02:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52L92EC4043143; Fri, 21 Mar 2025 09:02:14 GMT (envelope-from git) Date: Fri, 21 Mar 2025 09:02:14 GMT Message-Id: <202503210902.52L92EC4043143@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 569c6bfe8bd4 - main - devel/gitolite: Add support of all security key type ssh keys List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 569c6bfe8bd4250ac206d38b53624886ac816dbf Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=569c6bfe8bd4250ac206d38b53624886ac816dbf commit 569c6bfe8bd4250ac206d38b53624886ac816dbf Author: Li-Wen Hsu AuthorDate: 2025-03-21 09:02:11 +0000 Commit: Li-Wen Hsu 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 Co-Developed-by: Christian Weisgerber --- 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]; }