From nobody Sun Feb 5 18:18:41 2023 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 4P8yM60mhZz3kgs6; Sun, 5 Feb 2023 18:18:42 +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 4P8yM60B2vz4FP5; Sun, 5 Feb 2023 18:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675621122; 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=I+dPMpHwz695YtC3b2H+8Dt8XyT6wKprkZz2P4pt8II=; b=WHPGoCoz/YItxyG4Zi73xblMFuqd5xOkFPmEstynwlZDj+qvGrFPtFthOfgtIwo7xRXmeK DCzldZ79uI8C84JO+R4d5LLuIipZmbs454YjEnlCBOlv6BJh7mDcG3jQkBE69H4fyIJZD4 VRcmlN3jTwOF2/DrbvTU3uWJKul8HMHrzlvMYc4uCK4Ua752qA5zSr+4496RFKexgs2c+b HvowDWWCxLKcKx5ck1a7fWtExTfECUBhJ2GKt5KG+gv6MUPLgBOVfREU37Q7z32G9fm1ao J864joV8yvp6+omMoIXZs+6DpG7haYVEP4zsu3CuIFm8OVom+cYJhSa7is2UPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675621122; 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=I+dPMpHwz695YtC3b2H+8Dt8XyT6wKprkZz2P4pt8II=; b=JpPmyzgfNsOeC3sRKkF50sXfCgAUBXsBzjp03KIQkSY/yRFctiZWzaVVJNtDZHToTRQcNP RGBGTDYuU/Kt1xMleKSDoBcXE6LGzbdOfmVRkupQ4hQjDkeWJe2vwL4mm7F3iZ0A5WxY1N Z8eE3wxmFabaAQCPh1eEswX6rtgxim/dMBvwZMcj13jbwIc6Ke3q/29Kl4zOawwuUMd12Q ZJRLx74CIgYI3b3Rp76v6NnbPPrd124zhAgA9d1dwUiVF0gHGjstKRuvwBwV+b2lMoCUPp KBDuSupMl2Y0h1TEmqoTz7lX7KhwlwzJd870ZdH3tKY2bU8D+ExLpHyhXQRoew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675621122; a=rsa-sha256; cv=none; b=e8cOA+f/SkDrPls/wyFZ2e3SSIDQJDMCl5oKvjatdAzm+wr0b7UtvgQKmVPV5Qt+pIQ0FL 2dMQMPkluRZpHHxkTfD4kCY9pkqMMtX/blIN8C4159m1tndI1PCVMVcz+hAYdhXlZ4TUmd zNsJzxCU/2jOq1wZZYAdNbgoWW5XYO1Xld0fO/J2EycMyhB26D2z171l8/BA0zxniplFIf bvH10EcVkxL1Ui5yiqzw7Zgnh5hdV22mD8GWXjNUcQpD1eFYLVJ2xZa65NAYyjAeIE8fa5 9U8sS/CO1N3umFIkREauCgVae/7/uFV517+9h2WkXYbsLl+J9w8OTp7R5QUSUA== 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 4P8yM56KSLz147K; Sun, 5 Feb 2023 18:18:41 +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 315IIf7Z048804; Sun, 5 Feb 2023 18:18:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 315IIfXu048803; Sun, 5 Feb 2023 18:18:41 GMT (envelope-from git) Date: Sun, 5 Feb 2023 18:18:41 GMT Message-Id: <202302051818.315IIfXu048803@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: c755a7cc1ede - main - ssh: remove old reference from update instructions 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: c755a7cc1edea3875ae6910226e0bee0f0edb170 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c755a7cc1edea3875ae6910226e0bee0f0edb170 commit c755a7cc1edea3875ae6910226e0bee0f0edb170 Author: Ed Maste AuthorDate: 2023-02-05 18:15:29 +0000 Commit: Ed Maste CommitDate: 2023-02-05 18:17:46 +0000 ssh: remove old reference from update instructions ssh_config and ssh_config.5 no longer contain the VersionAddendum, so remove instructions to update these files. Fixes: bffe60ead024 ("ssh: retire client VersionAddendum") Sponsored By: The FreeBSD Foundation --- crypto/openssh/FREEBSD-upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 9f6f3d577e01..f4be34754af7 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -66,8 +66,8 @@ (leaving them deleted). 10) Resolve conflicts. Remember to bump the version addendum in - version.h, and update the default value in ssh{,d}_config and - ssh{,d}_config.5. + version.h, and update the default value in sshd_config and + sshd_config.5. 11) Diff against the vendor branch: