From nobody Tue Aug 15 13:31:18 2023 X-Original-To: dev-commits-src-all@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 4RQBxM0F45z4mPZh; Tue, 15 Aug 2023 13:31:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQBxL6mjFz4DKp; Tue, 15 Aug 2023 13:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692106279; 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=KDV1imXUWRLQCSx9wRPXPCKjZ80Fy5Q/p8/WuBUwdAE=; b=fDdFnfZluaY1EYR6+UPWMr6wQkQ2/tK3KkE2p0AP6YwhlofKrnXZXmHvP+n7hj6crAbTXf K6ZvlVe5iU0eATnrAu2N1w+icMjNR8g67mYoBbe5BigF3fUYa3s8pO5AkErR6qsMl8lCRT wLU21J9iuSkAmAZGJWmB3VTulodfsMO5QwdUaIndzGWnooprC6oJBaFPFzHYARmEA5IL21 c6x5NEPcJ3cFocTumdyapBeuFBogY4AJgew0FBTdEZ3B3fZNy9WJm0cioDWpD8FxN9lsLO xblTooaV0B/2qGn+MaqocEhmqyqDPifIUhcxyvq25AdMB0W/q8R/9mGu+PnVhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692106278; 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=KDV1imXUWRLQCSx9wRPXPCKjZ80Fy5Q/p8/WuBUwdAE=; b=XRvWvnn9eKfYaRG3XZT0bMJI2nrnQC7wu2T+Cgh13jU34AmwdZsz2bFjHH39O+hxv+IaxO qZ8rtV9IPSHD+qYo+AeCLQ1xS3qaZoXDG7YzsAwGHQhH7a/lmHhjdT0PxuOileljSPy5X8 ZrH8WfVOthkjoAWM5sRZXPWmgR6XY0bhgAtKjTIF/Yj0LFKxYo+j1Y0KCao5fR+EgesU7j JsG282Qknk9kzsJ1eNL02xkP25NGmmNFMj6+R7jSGmCtDY1wRxog/j4xi2cUIsLeHBBeCZ 5waTrHR18YVuMhpRnsKqtQxiXlpkBRAgIE7SEBwsy0Ho6MX90zhzR/Tp6MGO+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692106278; a=rsa-sha256; cv=none; b=id5PorYFXsrrYyS3QQ4rphIwqfCQPg/WoSF+XmJI9XZOCZOTYEJClhwI43V/e0h/M2hAbi a3L5XX6ntzjmAJubXzi7jjdSpL+a/ThlgB2i+KwL0jALSJ17xAYlZXMtpAJZiQsQhVfqQ/ npiBmYXRDidR1NOvAFX715ByMoTZE86LQDQqNQaGdSZjwHQojWZ7ujHNd06Q9GIrBc5j4w ccMDEFSKFnhkQxPzQy9ad38CuVuACPo+sEViVI8CLdJjHei/68PkKcVkQttnVKsJRPoBQq r+//ZO9PhQPWq6VRvyr/ldFjQ8xpC3A2DXI50AlHLFTOtXWdL8bje2Nc+030Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQBxL5t6qz1BYv; Tue, 15 Aug 2023 13:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FDVIgB020472; Tue, 15 Aug 2023 13:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FDVItx020469; Tue, 15 Aug 2023 13:31:18 GMT (envelope-from git) Date: Tue, 15 Aug 2023 13:31:18 GMT Message-Id: <202308151331.37FDVItx020469@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: 33a23ef2878f - main - ssh: correct VersionAddendum date List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 33a23ef2878fe525700983fb754f6f9f9f8fc4b7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=33a23ef2878fe525700983fb754f6f9f9f8fc4b7 commit 33a23ef2878fe525700983fb754f6f9f9f8fc4b7 Author: Ed Maste AuthorDate: 2023-08-15 13:29:06 +0000 Commit: Ed Maste CommitDate: 2023-08-15 13:30:31 +0000 ssh: correct VersionAddendum date Reported by: Herbert J. Skuhra Fixes: 535af610a4fd ("ssh: Update to OpenSSH 9.4p1") 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 523da42f8d12..b73f21e0c9c8 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-20230910 +#VersionAddendum FreeBSD-20230810 # no default banner path #Banner none diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index 211938369b27..06385c648f3d 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -1927,7 +1927,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-20230910 . +.Qq FreeBSD-20230810 . The value .Cm none may be used to disable this. diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index fc40cf1cdccd..44109aba3c80 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-20230910" +#define SSH_VERSION_FREEBSD "FreeBSD-20230810"