From owner-svn-ports-head@freebsd.org Wed Apr 22 08:23:44 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 942082AB2AA; Wed, 22 Apr 2020 08:23:44 +0000 (UTC) (envelope-from mat@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 496YNw3MW8z3Pxh; Wed, 22 Apr 2020 08:23:44 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6E866FE13; Wed, 22 Apr 2020 08:23:44 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03M8NinW081232; Wed, 22 Apr 2020 08:23:44 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03M8NiUh081229; Wed, 22 Apr 2020 08:23:44 GMT (envelope-from mat@FreeBSD.org) Message-Id: <202004220823.03M8NiUh081229@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 22 Apr 2020 08:23:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532452 - in head/devel/gitolite: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/devel/gitolite: . files X-SVN-Commit-Revision: 532452 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2020 08:23:44 -0000 Author: mat Date: Wed Apr 22 08:23:43 2020 New Revision: 532452 URL: https://svnweb.freebsd.org/changeset/ports/532452 Log: Allow using keys with existing options. Submitted by: bapt Differential Revision: https://reviews.freebsd.org/D24529 Added: head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys (contents, props changed) Modified: head/devel/gitolite/Makefile Modified: head/devel/gitolite/Makefile ============================================================================== --- head/devel/gitolite/Makefile Wed Apr 22 08:20:11 2020 (r532451) +++ head/devel/gitolite/Makefile Wed Apr 22 08:23:43 2020 (r532452) @@ -3,6 +3,7 @@ PORTNAME= gitolite DISTVERSIONPREFIX=v DISTVERSION= 3.6.11 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel Added: head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys Wed Apr 22 08:23:43 2020 (r532452) @@ -0,0 +1,34 @@ +From 7db6332d9be1879d97c57c35d53d97c4b15663d5 Mon Sep 17 00:00:00 2001 +From: Gleb Smirnoff +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 +@@ -137,6 +137,7 @@ sub optionise { + return ''; + } + 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]; + } +