From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 04FDE15807B for ; Fri, 18 Oct 2024 17:54:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BFF5E0872; Fri, 18 Oct 2024 17:54:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E30E8E0872 for ; Fri, 18 Oct 2024 17:54:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E97DC3430D1 for ; Fri, 18 Oct 2024 17:54:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 884951E06 for ; Fri, 18 Oct 2024 17:54:48 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1729274075.2a3ae6dbbbf9f6ffbefa0c140b41fdcd1863fa2f.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/cvs.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 2a3ae6dbbbf9f6ffbefa0c140b41fdcd1863fa2f X-VCS-Branch: master Date: Fri, 18 Oct 2024 17:54:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b7cebf31-accd-4582-9099-6b30f7b36979 X-Archives-Hash: dc953e79398a7270bebae2a5be49d99e commit: 2a3ae6dbbbf9f6ffbefa0c140b41fdcd1863fa2f Author: Ulrich Müller gentoo org> AuthorDate: Mon Oct 14 10:45:24 2024 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Oct 18 17:54:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a3ae6db cvs.eclass: New eclass variable ECVS_SSH_EXTRA_OPTS This allows passing additional options to ssh. Signed-off-by: Ulrich Müller gentoo.org> eclass/cvs.eclass | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass index 1289ee54cc3b..007240e6ba25 100644 --- a/eclass/cvs.eclass +++ b/eclass/cvs.eclass @@ -174,6 +174,12 @@ _CVS_ECLASS=1 # WARNING: If a SSH host key is not specified using this variable, the # remote host key will not be verified. +# @ECLASS_VARIABLE: ECVS_SSH_EXTRA_OPTS +# @DEFAULT_UNSET +# @DESCRIPTION: +# If SSH is used for "ext" authentication, this array variable can be +# used to pass additional options to the SSH command. + # @ECLASS_VARIABLE: ECVS_CLEAN # @DEFAULT_UNSET # @DESCRIPTION: @@ -376,6 +382,11 @@ cvs_fetch() { echo "${ECVS_SSH_HOST_KEY}" > "${known_hosts_file}" || die fi + local i quoted_opts=() + for i in "${!ECVS_SSH_EXTRA_OPTS[@]}"; do + printf -v "quoted_opts[i]" "%q" "${ECVS_SSH_EXTRA_OPTS[i]}" + done + # Create a wrapper script to pass additional options to SSH # Disable X11 forwarding which causes .xauth access violations @@ -387,6 +398,7 @@ cvs_fetch() { -oUserKnownHostsFile="${known_hosts_file}" \\ -oForwardX11=no \\ -oClearAllForwardings=yes \\ + ${quoted_opts[*]} \\ "\$@" EOF chmod a+x "${CVS_RSH}" || die