The branch main has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b55439338dc40d1954fd37281d48786148483190
commit b55439338dc40d1954fd37281d48786148483190
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2025-08-26 20:29:28 +0000
Commit: Ed Maste <ema...@freebsd.org>
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
