From nobody Mon Dec 20 16:12:18 2021 X-Original-To: dev-commits-src-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 2EA9418EB1BD; Mon, 20 Dec 2021 16:12:19 +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 4JHl3Q6bZPz3nnW; Mon, 20 Dec 2021 16:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C273919534; Mon, 20 Dec 2021 16:12:18 +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 1BKGCIuE015333; Mon, 20 Dec 2021 16:12:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BKGCIig015332; Mon, 20 Dec 2021 16:12:18 GMT (envelope-from git) Date: Mon, 20 Dec 2021 16:12:18 GMT Message-Id: <202112201612.1BKGCIig015332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2ffb13149c8e - main - nanobsd: sync base system ssh config files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2ffb13149c8e46cb7d7e891b237255615906dc60 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640016738; 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=2k4lW6XRMF9G8o4Q39HXFWmI98aDHOEY01iDYw+VnhE=; b=kAAGALlwtZaR2yFUE2hxudS1gRD86kiuV0gOdvtuqaAr07KVex9CuQELWcUpJ8hAvFhFNX eTsy8g2l2eJrzVYJCkXfYYwYiAdOcdwWrk0hxwI0d0nFJK3188I3QKMXvvyy4QHTe5qqH/ Hy1/niScgy+MNMJjqP92FXESFcP5YocYWIAfcncylYt9j3sRqzru3lhGzNXAj5g5jrDe7W QHCny2BiYTk+aFuwYMdegs97QhhH6SPRv5OG1L8LEWwFSZiSVn/nnvJdWrT3wKrUsEvNZR NxuISB/9U+4POLFfEyVSYMSX6T7FRbDV7ZPA4LUiWtrQQGlj0MNFjy0V/fPvWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640016738; a=rsa-sha256; cv=none; b=F2P0ZKvEdv7VhH8GMKwsplHkZpIFz08YPBjZJKFrK2MR9/9FMeteTDIzRbBGGqxq2kAu5X 3rgk9CDGIitfFbpjZd30rZ7s7hfMxRY5fXl54ywrilTUoJeapMWbS2De1EMvc0G28H2wLw JJO6I1CzP9ueE6Lru/3NUPOsve59/JJYHybtu08ePSNDJUtbT2Ck0BOJg/0ZLeaAH3bXz6 eQiYm4SbYBR8tPAbvOTI+qhVSubz2PLy/iocb3qABuS8lifqmJSccN96EJvz9To9rbq+Oo jCARXEKYhPgnbvjJy/AeD4FpOdkeifSQBbx2zcaZaz359mTXJsxWFDBZxwFqgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2ffb13149c8e46cb7d7e891b237255615906dc60 commit 2ffb13149c8e46cb7d7e891b237255615906dc60 Author: Ed Maste AuthorDate: 2021-12-20 16:11:00 +0000 Commit: Ed Maste CommitDate: 2021-12-20 16:11:00 +0000 nanobsd: sync base system ssh config files Fixes: e9e8876a4d6a ("ssh: update to OpenSSH v8.8p1") Sponsored by: The FreeBSD Foundation --- tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config | 2 +- tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config b/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config index d2a1db35d42e..3b2ca9aa6d8d 100644 --- a/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config +++ b/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config @@ -46,4 +46,4 @@ # RekeyLimit 1G 1h # UserKnownHostsFile ~/.ssh/known_hosts.d/%k # VerifyHostKeyDNS yes -# VersionAddendum FreeBSD-20210907 +# VersionAddendum FreeBSD-20211221 diff --git a/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config b/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config index e3020bbfcacf..81ff5a66d22c 100644 --- a/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config +++ b/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config @@ -105,7 +105,7 @@ AuthorizedKeysFile .ssh/authorized_keys #PermitTunnel no #ChrootDirectory none #UseBlacklist no -#VersionAddendum FreeBSD-20210907 +#VersionAddendum FreeBSD-20211221 # no default banner path #Banner none