Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 12 Jan 2026 19:18:20 +0000
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 215d16e4102b - stable/14 - openssh: Add detail on client side VersionAddendum
Message-ID:  <696548fc.4377c.727d0694@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch stable/14 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=215d16e4102b3c03c6bde13c78f57922b94ad74e

commit 215d16e4102b3c03c6bde13c78f57922b94ad74e
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-08-26 20:29:28 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
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
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?696548fc.4377c.727d0694>