git: 3d3bae9b9538 - main - sshd: bump VersionAddendum for 2739a6845031
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 06 Aug 2024 19:36:44 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=3d3bae9b95388169d396adc8007585699c5a23e0
commit 3d3bae9b95388169d396adc8007585699c5a23e0
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-08-06 19:22:53 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-08-06 19:23:33 +0000
sshd: bump VersionAddendum for 2739a6845031
Reported by: markj
Fixes: 2739a6845031 ("sshd: remove blacklist call from grace_alarm_...")
Sponsored by: The FreeBSD Foundation
---
crypto/openssh/sshd_config | 2 +-
crypto/openssh/sshd_config.5 | 2 +-
crypto/openssh/version.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index a06f8fcc13d1..7f559775e3b3 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -105,7 +105,7 @@ AuthorizedKeysFile .ssh/authorized_keys
#PermitTunnel no
#ChrootDirectory none
#UseBlacklist no
-#VersionAddendum FreeBSD-20240318
+#VersionAddendum FreeBSD-20240806
# no default banner path
#Banner none
diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5
index 0715b1f9d581..4de510ac8795 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -1944,7 +1944,7 @@ The default is
Optionally specifies additional text to append to the SSH protocol banner
sent by the server upon connection.
The default is
-.Qq FreeBSD-20240318 .
+.Qq FreeBSD-20240806 .
The value
.Cm none
may be used to disable this.
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index 836b5650b247..82be0be8498f 100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@ -5,4 +5,4 @@
#define SSH_PORTABLE "p1"
#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
-#define SSH_VERSION_FREEBSD "FreeBSD-20240701"
+#define SSH_VERSION_FREEBSD "FreeBSD-20240806"