From nobody Tue Aug 06 19:36:44 2024 X-Original-To: dev-commits-src-main@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 4Wdk8D29sCz5SWxJ; Tue, 06 Aug 2024 19:36:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wdk8D1Kt0z4LjS; Tue, 6 Aug 2024 19:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722973004; 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=CrUgcXXkE7c9RDpBFTpG+dWQS/8MknWIXRZakJTq9NE=; b=q02PZGXcslNPi3Jt10KcTKJeZy0wlHf+YJRwa+NA+b+H93w/p2n7waJKVOh72ayzrofvzG p+MoCiuGZiEOdDHNWIhxhj5j4mYhhdMfW3c/ftd8Plskc4RGzfoFHU3kn+jxHIy0K6TrtK rMSQ6WFsWHLpZfxlVMbW3HZPj5fHHcGc7gyGe+6Ju3KfRppp8tOpc5leC2FZBiTpntm13R Iak/lWwMstD/cVB7NkYO9b+PV4EeqWkCNQktyD8AiIpDOacE+BXix0i+E9p1u8FJ19+/U3 7KC3nZpYr3dJgNzmZpuZU3b07ZRd5tDnm32BQuzUQ40MwArk43abIDIbyrWoZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722973004; a=rsa-sha256; cv=none; b=i7V6+m9VlyQDZLlH1kl4jAwyfKQhYhNDWv80z8vsYL6hfQ3pwB3+Tmb4AgB+Zj6cde9n6j eVXlfZSfBBP4avj9VdMJUiFs8f4I/Ty6C2AsfFMmg3Sj+3E9wr0M9WA0u3uvta9xAVP8l9 4nSrTILRbDSBVt23INVrs2FVQdb2P8mUN48VUCKlP1GCXj2IjZkSylJuSdDExa/yvWPRwk 8VQlFIMWMgRsAXEHVu7Jc5GiojGv+u1AXXMycfycNvBuINObuV+zzpgkH7kVnY/xtxa6B8 S0/bNFGYMYrkE3rD6msOzI4EnEXdTtuC7mhWCP7B4Rs+c0ObaFUbzM9N7+dgTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722973004; 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=CrUgcXXkE7c9RDpBFTpG+dWQS/8MknWIXRZakJTq9NE=; b=EwpPd1tOn+ucB59x60JLvw5lQHZD3NWWaNnJJSVH5unWJ0sy8oC/MkdtwWBQYJZ8MGUMBi WrIFINDF7edgELcifzub2pPHvznnDEwraRvN1sCwDdHUqb7bSIT1V+ySp8L2+2izHestCU LGZRyF4kfcGxXGpTF5d2M68slYu2zVcmEEGCPWJOb86RgsyEDeCDSG7dHn3pu/IhmipV8c pZC9TCQghFIcoy+jAmccMpEKap3ZdqDu0XDY/Zr5kG26ecAtR0M/uEbWSKKrwgM410dcLD 0TW/WfJhNLNA/SB4nCVQMPHM9cNxmZg8juHx7tvnMQuQROaG57ZXKQYPLjF39g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wdk8D0t4KzKrQ; Tue, 6 Aug 2024 19:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 476JaiIp079405; Tue, 6 Aug 2024 19:36:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 476JaiwS079402; Tue, 6 Aug 2024 19:36:44 GMT (envelope-from git) Date: Tue, 6 Aug 2024 19:36:44 GMT Message-Id: <202408061936.476JaiwS079402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3d3bae9b9538 - main - sshd: bump VersionAddendum for 2739a6845031 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3d3bae9b95388169d396adc8007585699c5a23e0 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3d3bae9b95388169d396adc8007585699c5a23e0 commit 3d3bae9b95388169d396adc8007585699c5a23e0 Author: Ed Maste AuthorDate: 2024-08-06 19:22:53 +0000 Commit: Ed Maste 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"