From nobody Thu Mar 03 19:37:10 2022 X-Original-To: dev-commits-ports-main@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 D251F19E1204; Thu, 3 Mar 2022 19:37:10 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K8h863BjCz3DSp; Thu, 3 Mar 2022 19:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646336230; 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=K//NSy01nLT8R2bxIAyvZZow2fk1vS3HV1QuXxs7JQY=; b=LT2xsbeoprnpSlR+/RZxupgPMfdVKCJO3B/eFfAr6PAlZW5Y1qLyHAHDdAHRDX4PzUnAwZ pbhNHmUCJiDg47b3DQ5VVY3n1fWUy/yeEsIqLwqnZydrsUDgaUfHHkk8Tc3Q/v+GQiULEd 6j7UPNXKa+KfvVCKKV4nUinL+JwcW6ZKSClrtEqBCaW638J9nnQeKzsJnc3QVEePjW1Ei9 sWMmiuqW9YOQ6/kQrvoNqwRJyX21Dc1IRBbjaECAn0YSLKJuPDkrzoIIDLZpctfop9yF1w anLC/Pbk1CQ3ZaszsgLaacdgzWL0JETkbgT3jZQvl4KNm/FQbG1buufiglmbsA== 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 4239E1DC57; Thu, 3 Mar 2022 19:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 223JbAMZ018728; Thu, 3 Mar 2022 19:37:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223JbAiI018727; Thu, 3 Mar 2022 19:37:10 GMT (envelope-from git) Date: Thu, 3 Mar 2022 19:37:10 GMT Message-Id: <202203031937.223JbAiI018727@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: 1249b096fa52 - main - security/openssh-portable: Tweak new rc var names List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1249b096fa52847f13a956ee0364b2a14c60e9b5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646336230; 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=K//NSy01nLT8R2bxIAyvZZow2fk1vS3HV1QuXxs7JQY=; b=Xvm450lE2Go9fWIboAf5M3LEQPH/ePUzH7GTj3jGptoyh/l5KQpEHIlChTDeUP7t44kmeT awg/K5xjXK9zzaM8zledHoPTcezh/yCBi7Wk+awjWwrr7ykm7oEu633mp7DoMYXfImkhJy 0gD9fkxtdg4kWyxglnuZbOv//QHYfs4UjZ62zqtV0ePdoXPLGoaYP3ga/EoH3aF9YqQ06g MAEn1c24UL7wSbHNJMOMakba4vpd+F0AhRz84Apte3qNKilknY7ZMUzCkCGOH9d9tj1SV2 CFy/Z2tnTrKs7nlYR/nLYEHd+qpJacZleJ85BoM/Clp+EM4sAqhTRBhxopuSEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646336230; a=rsa-sha256; cv=none; b=LRQTCUvfL25UNRKqBGTRw+d9YZVfm66Zjv1Qv/ZKt90byFS7ROH07oGBAJfjy1kWD0d8hV 239EcuJjQkgt/QqBMizMgJh1PylNzseeXdtbRtrxHNsiZJeoU1hsq8y5lPPl3tJ9V67DG5 /ibsKW5koHwfmS4/gpTFTo9u+bPLZxTtgO7vHbU+rdBnBq3RzfQ10VnhO0N2RoHiKhR0jH ZOhNxIBcGuDd9auAENi6s/+oWpvfGcPfDkO9pvAQqW2y6m0kKnsVr+mQABy0pZMxczgIaU gCL7X0f8hhd7Gvwki9xcPePppoQfIBx222uxK3YDa3K36oL+fI6I9GThkBa8mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=1249b096fa52847f13a956ee0364b2a14c60e9b5 commit 1249b096fa52847f13a956ee0364b2a14c60e9b5 Author: Bryan Drewery AuthorDate: 2022-03-03 19:35:43 +0000 Commit: Bryan Drewery CommitDate: 2022-03-03 19:37:07 +0000 security/openssh-portable: Tweak new rc var names Commit ae66cffc19f357cbd5 added new rc vars to control generating of host keys [1]. Rename these to more closely match the base version before it becomes widely adopted. PR: 202169 [1] PR: 209948 [FYI] --- security/openssh-portable/files/openssh.in | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/security/openssh-portable/files/openssh.in b/security/openssh-portable/files/openssh.in index fc9e5f26402a..663915f1f931 100644 --- a/security/openssh-portable/files/openssh.in +++ b/security/openssh-portable/files/openssh.in @@ -22,14 +22,14 @@ load_rc_config ${name} : ${openssh_enable:="NO"} : ${openssh_skipportscheck="NO"} -: ${openssh_dsa_keygen_enable="YES"} -: ${openssh_dsa_keygen_flags=""} -: ${openssh_rsa_keygen_enable="YES"} -: ${openssh_rsa_keygen_flags=""} -: ${openssh_ecdsa_keygen_enable="YES"} -: ${openssh_ecdsa_keygen_flags=""} -: ${openssh_ed25519_keygen_enable="YES"} -: ${openssh_ed25519_keygen_flags=""} +: ${openssh_dsa_enable="YES"} +: ${openssh_dsa_flags=""} +: ${openssh_rsa_enable="YES"} +: ${openssh_rsa_flags=""} +: ${openssh_ecdsa_enable="YES"} +: ${openssh_ecdsa_flags=""} +: ${openssh_ed25519_enable="YES"} +: ${openssh_ed25519_flags=""} command=%%PREFIX%%/sbin/sshd extra_commands="configtest reload keygen" @@ -43,10 +43,10 @@ pidfile=${openssh_pidfile:="/var/run/sshd.pid"} openssh_keygen() { local skip_dsa= skip_rsa= skip_ecdsa= skip_ed25519= - checkyesno openssh_dsa_keygen_enable || skip_dsa=y - checkyesno openssh_rsa_keygen_enable || skip_rsa=y - checkyesno openssh_ecdsa_keygen_enable || skip_ecdsa=y - checkyesno openssh_ed25519_keygen_enable || skip_ed25519=y + checkyesno openssh_dsa_enable || skip_dsa=y + checkyesno openssh_rsa_enable || skip_rsa=y + checkyesno openssh_ecdsa_enable || skip_ecdsa=y + checkyesno openssh_ed25519_enable || skip_ed25519=y if [ \( -n "$skip_dsa" -o -f %%ETCDIR%%/ssh_host_dsa_key \) -a \ \( -n "$skip_rsa" -o -f %%ETCDIR%%/ssh_host_rsa_key \) -a \ @@ -65,8 +65,8 @@ openssh_keygen() echo "You already have a DSA host key" \ "in %%ETCDIR%%/ssh_host_dsa_key" echo "Skipping protocol version 2 DSA Key Generation" - elif checkyesno openssh_dsa_keygen_enable; then - %%PREFIX%%/bin/ssh-keygen -t dsa $openssh_dsa_keygen_flags \ + elif checkyesno openssh_dsa_enable; then + %%PREFIX%%/bin/ssh-keygen -t dsa $openssh_dsa_flags \ -f %%ETCDIR%%/ssh_host_dsa_key -N '' fi @@ -74,8 +74,8 @@ openssh_keygen() echo "You already have a RSA host key" \ "in %%ETCDIR%%/ssh_host_rsa_key" echo "Skipping protocol version 2 RSA Key Generation" - elif checkyesno openssh_rsa_keygen_enable; then - %%PREFIX%%/bin/ssh-keygen -t rsa $openssh_rsa_keygen_flags \ + elif checkyesno openssh_rsa_enable; then + %%PREFIX%%/bin/ssh-keygen -t rsa $openssh_rsa_flags \ -f %%ETCDIR%%/ssh_host_rsa_key -N '' fi @@ -83,8 +83,8 @@ openssh_keygen() echo "You already have a Elliptic Curve DSA host key" \ "in %%ETCDIR%%/ssh_host_ecdsa_key" echo "Skipping protocol version 2 Elliptic Curve DSA Key Generation" - elif checkyesno openssh_ecdsa_keygen_enable; then - %%PREFIX%%/bin/ssh-keygen -t ecdsa $openssh_ecdsa_keygen_flags \ + elif checkyesno openssh_ecdsa_enable; then + %%PREFIX%%/bin/ssh-keygen -t ecdsa $openssh_ecdsa_flags \ -f %%ETCDIR%%/ssh_host_ecdsa_key -N '' fi @@ -92,8 +92,8 @@ openssh_keygen() echo "You already have a Elliptic Curve ED25519 host key" \ "in %%ETCDIR%%/ssh_host_ed25519_key" echo "Skipping protocol version 2 Elliptic Curve ED25519 Key Generation" - elif checkyesno openssh_ed25519_keygen_enable; then - %%PREFIX%%/bin/ssh-keygen -t ed25519 $openssh_ed22519_keygen_flags \ + elif checkyesno openssh_ed25519_enable; then + %%PREFIX%%/bin/ssh-keygen -t ed25519 $openssh_ed22519_flags \ -f %%ETCDIR%%/ssh_host_ed25519_key -N '' fi }