From nobody Mon Jan 12 19:18:20 2026 X-Original-To: dev-commits-src-branches@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 4dqhx85QBkz6NyYy for ; Mon, 12 Jan 2026 19:18:20 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dqhx84w80z3SY0 for ; Mon, 12 Jan 2026 19:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768245500; 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=ZthL43FKEEh7AuyPmJZFi3zJxaEvTheNT6C+3MXi49E=; b=P2rUAR5hncQwJ+1CZbt0VpPoK69jzQVm43G8L5vfx+V0MgZW/zGPGc3oNpPSx/fLSxsKqp EOxNe60T38ETvbbAXmn4BRDIAJeKeg2M2MdqSICYZGEBUW1kf15rbCZx06u4W1GCuO4ElR 8P197q7nK0fGsaQrmueYmvSFy+RqFQPj5L6fe/V2jmq/nZnO18Oejdjq1Nx02QQuWnA+y1 z80YQ9H3Iy+ZYA4CSOJlsYWlV7zfxo543Hl7OUPPYGrUX/cTw0pVaCn03z56aZ3qxbUOv0 8wc4whEAADa5BqzATkN5gUZdzshVifh+hpsRJNgXHQnw999byXNfM90FEEpeuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768245500; 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=ZthL43FKEEh7AuyPmJZFi3zJxaEvTheNT6C+3MXi49E=; b=gxdqJSUoDXU9C2aMU2ghseTLABmzXnePznCa2EK54VVmCrUc5HDIxyOo5emgC86JX3IxtJ wqe5hHUt6Cb23lUiivhk/tRxLL+6lsEMqI3ygx+do+i2IZMULMrcEz+a8lo+mx8lxzCq4K H2omhBk7fNjgYbVSqXEpffoZcQ376iMYoqNN9R7Zbm6KfqDo+sisFUU03CUh6KA3oYjxDa Ij/mnDwAik23JKyxToCYk8OQxvGnhDkjwWD73O1I15oMmhJTggGDC7w2SzALI14+n4TGSP S5goYRrZju7lAgoPKew04CA7lWyYCQoTeIZNhGDlmHl2SiEKD1exIVg+AcpP2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768245500; a=rsa-sha256; cv=none; b=XUhE/lg7kCnM7a0ezijKIQxrMno+ay+LK/0xHRqv4TH0Y4523pt1RSy26bFp77tg5MxG8V ZCYOMVgQGB6RBBCSSubdSaCoYDCPkQJjIwss1OauPbQqUdR2pxu7ZtMvxI9QoCuv7j7AoB vUlQLIYKVKZcSrknlbYIQyDqHSGrrbK+r03AiMBmkItHZgKbcLqS1rlUUrVPgEp6AF6YA1 BKZl3FgEavm3atnXv+ERlULb5wRWsbhiJC4DCUsw3jFm1BMpsz+rxA8NFax5ETSCpgvhWe d/q/rns7jrE6Fx1xKnKfGHklHFXkDnmr/43a+ktj6VwJs4Zt/Jk/zjG4uaD3Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dqhx843dczgW5 for ; Mon, 12 Jan 2026 19:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4377c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 19:18:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 215d16e4102b - stable/14 - openssh: Add detail on client side VersionAddendum List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 215d16e4102b3c03c6bde13c78f57922b94ad74e Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 19:18:20 +0000 Message-Id: <696548fc.4377c.727d0694@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=215d16e4102b3c03c6bde13c78f57922b94ad74e commit 215d16e4102b3c03c6bde13c78f57922b94ad74e Author: Ed Maste AuthorDate: 2025-08-26 20:29:28 +0000 Commit: Ed Maste CommitDate: 2026-01-12 19:17:58 +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 from main 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 (cherry picked from commit b55439338dc40d1954fd37281d48786148483190) --- crypto/openssh/FREEBSD-upgrade | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index d8fc986b71ca..fde25bf7d6f9 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -166,8 +166,15 @@ 9) Retired patches - We no longer have client-side VersionAddendum, but we recognize and ignore - the configuration options to avoid breaking existing configurations. + 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. + + We recognize and ignore the configuration options to avoid breaking + existing configurations. 10) PrintLastLog bugfix