From nobody Tue Aug 26 20:32:47 2025 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 4cBK9D0kZjz66508; Tue, 26 Aug 2025 20:32:48 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBK9D0BTwz3FFk; Tue, 26 Aug 2025 20:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756240368; 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=mqb4e1G+mQjNT1xNFezrhzUtXPIMGt+5LEcjL+HSuU8=; b=Gu+sSUAemlQaDOWTO7usLa0tPuOsrFaQFXE10CAuKLBrXbelCZeQuJQkOy2BJOOZG73Y0e X/O9Le3UobKofRXE799JTRoELj5p0qRDnkvyHhusPPrTLglsgP73PpS+h8hRZRAViQtF+8 8sq0Fv2wVjJDYP2FK/zB0KPQRVr6UMd9dXHoG1PUmybUPS6v9mdoQIO1oQqZE7MAaTG0hM p6dBMS1s3Pna0S5tbHsOO9QjRrtIcJCe7DExSkFQvQdxYP7Pu7D9WGsVAPTXFDyq+iyW4u R26hGl5hajiHdLMmtV6cwwknskxv+Vtwl3REpH7VcQfFJk+WgxTGbytjR0BXFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756240368; 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=mqb4e1G+mQjNT1xNFezrhzUtXPIMGt+5LEcjL+HSuU8=; b=nvZMglpNhGguJv9olnQpcyk4qaBOu80RkPiTWpGUCppYg+5wBxDCQaUDZhgckf4g28dp8w QvdIehUjTDnA66vR4ARtjWheHdttu23JXpp8KEsUCLwU8j+oDeoz22PsY9kUD5JxaK7NXP G2Cf8u1E/IX0jRubaEMuKple+a/z2QSzQ39FchhEFq8GCSz6F8z+BthSnYe9OiIyFYQVFy X8CisDn8bDJtDLS+2TxS38GTTvPxukGL+cRBDt3wAZDs1bblQ/6mtEEQllwXMnGcZf0SVp N/D4/U1WutGcZbeUL0mF8Y0iGrGevdiF/Tx2vxZSaijHCn7Y2rgJz8Prx4G4Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756240368; a=rsa-sha256; cv=none; b=OcVxNF0b8Dalb/k+sYqefANX+JNvCmHqAkaJf/pL/KIFdQfeBvpahObfYmaGkhXPiJA8ob mcw3RpeqyhkbcZznFySexWR0IYleV+E93f7LYfijUIAEDv0P/IKxvaidK8jveKE4bdq/+X lGe7XLa69PnvfF4mIYdL67aRjhWT8lE8Pk5NUwuVP6hj36FTHMqvH0CbB/akCKQ5YIQQtc vJlMQsOmXhz1QvAcHkjDpWEPcxdrZOKPTh3wCfjiEA112b6UVoNEwTfZLYfj4pjmkBUP0C Oot9Y7ZVOw32V1LUL2gop5cOuI+WV16/xIryyxpgnAQ1SoKUc45jtM3YEX0pxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cBK9C6sthzrrq; Tue, 26 Aug 2025 20:32:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57QKWlM4056007; Tue, 26 Aug 2025 20:32:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57QKWlWK056003; Tue, 26 Aug 2025 20:32:47 GMT (envelope-from git) Date: Tue, 26 Aug 2025 20:32:47 GMT Message-Id: <202508262032.57QKWlWK056003@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: b55439338dc4 - main - openssh: Add detail on client side VersionAddendum 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: b55439338dc40d1954fd37281d48786148483190 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b55439338dc40d1954fd37281d48786148483190 commit b55439338dc40d1954fd37281d48786148483190 Author: Ed Maste AuthorDate: 2025-08-26 20:29:28 +0000 Commit: Ed Maste CommitDate: 2025-08-26 20:32:27 +0000 openssh: Add detail on client side VersionAddendum FreeBSD introduced VersionAddendum for the server as a local change in 2001 in commit 933ca70f8f88 and later extended it to the client in commit 9e2cbe04ff4f. In 2012 upstream added support for server VersionAddendum, in commit 23528816dc10. They did not add client support. We removed the client support in commit bffe60ead024 ("ssh: retire client VersionAddendum"). As of the 10.0p2 release upstream has added client-side VersionAddendum. Make note of this in FREEBSD-upgrade's patches section. Sponsored by: The FreeBSD Foundation --- crypto/openssh/FREEBSD-upgrade | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 2d0a4e61289b..98503de12ddb 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -166,7 +166,12 @@ 9) Retired patches - We no longer have client-side VersionAddendum. + We added support for client-side VersionAddendum in 2002 (commit + 9e2cbe04ff4f) and provided a default value (e.g. FreeBSD-20220415). + Support was removed in commit bffe60ead024 ("ssh: retire client + VersionAddendum") to reduce the size of our patch set. Upstream later + added the same functionality in the 10.0p2 release. We have not restored + setting a default value on FreeBSD. 10) PrintLastLog bugfix