git: e600fc7295a7 - main - ssh: remove deprecated client VersionAddendum

The branch main has been updated by emaste:

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

commit e600fc7295a7082041388113a5d677f6c4cf7ce7
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-03-18 14:15:27 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-03-18 14:20:18 +0000

    ssh: remove deprecated client VersionAddendum
    
    Support for a client VersionAddendum was removed in bffe60ead024, but
    the option was retained (as oDeprecated) as a transition aid.
    Sufficient time has passed that it can be removed.
    
    Sponsored by:   The FreeBSD Foundation
---
 crypto/openssh/FREEBSD-upgrade | 3 +--
 crypto/openssh/readconf.c      | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index 2950731c7401..ef05c55a37e3 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -173,8 +173,7 @@
 
 10) Retired patches
 
-   We no longer have client-side VersionAddendum, but we recognize and ignore
-   the configuration options to avoid breaking existing configurations.
+   We no longer have client-side VersionAddendum.
 
 11) PrintLastLog bugfix
 
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index 20a769061a0d..3a64a0441641 100644
--- a/crypto/openssh/readconf.c
+++ b/crypto/openssh/readconf.c
@@ -330,9 +330,6 @@ static struct {
 	{ "obscurekeystroketiming", oObscureKeystrokeTiming },
 	{ "channeltimeout", oChannelTimeout },
 
-	/* Client VersionAddendum - retired in bffe60ead024 */
-	{ "versionaddendum", oDeprecated },
-
 	{ NULL, oBadOption }
 };