From nobody Fri Mar 04 01:30:07 2022 X-Original-To: dev-commits-src-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 9D8EB19FD6F9; Fri, 4 Mar 2022 01:30:07 +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 4K8qzM45Rjz4kb5; Fri, 4 Mar 2022 01:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646357407; 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=Pjs9HqyEtTWTZBQkBRWl3vYdn7GljlbuzdtP4QDd/pY=; b=Hf6GeWuLCdgo7gKC/hAbRO5tsSsVo2u91anwOs7ytIrcxxLVCiwHOyx/264z4FiGhm0rMs 4qkJEKPGVymew1KkUsTN/KYPAdjQiKzblqtHts9Rt05AjGfmBtQqkNPdUrcx34R3lWndUW Dfd3EGke3bHv2y/pmRpqZo3Ld+W3kRyg6S0yl/nlaIpvFLPHle0El//nwjLo/cSUN3ISwy Db+Amf0Qg02l0RzgTVsylyTV1t4R0lQC5bdRFxeZo+RaTW1Sr6uxEMAeQaSvEZAqeoSvhz BSxJUgNN9d5TWp4TalVTmw5Yzy7XEf8jry7h8QvdqkdD9lW7PIH+hFZvmSBLfA== 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 6CC1C22BA6; Fri, 4 Mar 2022 01:30:07 +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 2241U7B3091284; Fri, 4 Mar 2022 01:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2241U7gT091281; Fri, 4 Mar 2022 01:30:07 GMT (envelope-from git) Date: Fri, 4 Mar 2022 01:30:07 GMT Message-Id: <202203040130.2241U7gT091281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: aec30b5b2dcf - stable/12 - ssh: correct configure option name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: aec30b5b2dcf67046d3a9c97049c871115f5cdfc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646357407; 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=Pjs9HqyEtTWTZBQkBRWl3vYdn7GljlbuzdtP4QDd/pY=; b=sBOEm3uOXEb1IOEYTvhegxRwsn/UjyvOhkTu5B1KqZI0I14XYOGoTMeOOkockMckuf/9SM DbJFUuCUzvy9zNDXwlyeOa6yrQWKNacorsJewOCoqzend2T5a6Lz3wGs2NosM27cRnkEpg qs0g7J5evBdJq48+EOYZrN8QZ7dkRrm8AV25t7gNONIpGNfx60+bo108SLWmhTMB/ukfWV fcck8sI4A0aAFbfPFbynh9il8NwulmgVAaADFQJhEi7NXX5Fa9vj8B2UY7d0NC1mXdev/7 gWYFZFyt2pjxGF2Pjr8p9/EzIbZR+38eKSJ1AUyq0hmgnnfEehKbYjFWkfvyjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646357407; a=rsa-sha256; cv=none; b=Gm8vt+ZNXflDDfCaeD2MceX/OC0uMlQeZqYMjXbF0Gx39lzvaqJeSs81PkI6Lsw1oqZ7Fm RP5zfllEAbPI1IT1Oa+in/mDl4W1R8eakhNm9Ga/4jEeu/syfkr9ptwNqFf/1Yg/ukdEsJ FYSKqRakqOIrWLfj72HV1dfh5F5BcGhdKGRFX6B1DSyOhMwAMiZndkW3mYVIUvjjTz/2SD 7DuBNIYV4d+3ZxjzBzEZNBdVzJ73CQrAlN20X6/rga+HqIFsAXQuqfNh1p2FMDossaPgY1 dsOWueEt5UoSYPfwH8VBoC9ZBpjtr6LczZw46LBifVMDmacVMJCxsHqBB4fcHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=aec30b5b2dcf67046d3a9c97049c871115f5cdfc commit aec30b5b2dcf67046d3a9c97049c871115f5cdfc Author: Ed Maste AuthorDate: 2022-03-01 14:35:46 +0000 Commit: Ed Maste CommitDate: 2022-03-04 01:29:00 +0000 ssh: correct configure option name The option is security-key-builtin not security-key-internal. There is no change to the generated config.h because the option defaults off anyway. MFC after: 3 days Fixes: 87152f340549 ("ssh: disble internal security key...") Sponsored by: The FreeBSD Foundation (cherry picked from commit f1421a8972a2c8babfacfd1270258492579e0208) --- crypto/openssh/freebsd-configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/openssh/freebsd-configure.sh b/crypto/openssh/freebsd-configure.sh index 8df468e5eb1c..4d405a0ffacb 100755 --- a/crypto/openssh/freebsd-configure.sh +++ b/crypto/openssh/freebsd-configure.sh @@ -12,7 +12,7 @@ configure_args=" --with-libedit --with-ssl-engine --without-xauth - --without-security-key-internal + --without-security-key-builtin " set -e