From nobody Thu Feb 20 18:00:47 2025 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 4YzLf96qtDz5pD88; Thu, 20 Feb 2025 18:00:49 +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 4YzLf82SD0z3FJ3; Thu, 20 Feb 2025 18:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740074448; 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=qA3XdGEd+jqH5fNFa9MviLlrOdBpm0q6ldQyVJrhqvw=; b=yiCfM9F9HV2KeohuxgnpM5gmhl2FUy6T59Lbfm+18QaWiIHYN/jjSanM0/XYUmDVogDX6M 8dk/+Uxpy7ZNttUOnb5yJjO9vDZaGJL+XVSQgvUfGTxsTgtau0OtntFD1xbNP/WbZ3UpeV yhbM5XQyV9DzsmurPGXZOAHpJGRnvRC6YUydYyBAwJ5V4UY0DuSFYnsaf7qZ7MKCwIieYk 7sQJtNoENpK1Z0GjER1drFImbC0Otpp7Q4Ewuqkxq2xWUAY6rgW/lgiWgGWYVFxJBnkAPv J5Qc/HyWvueOvMBVXDZ6T/CTRj5jjCvt+4SAjYq32LKCRoK0ETja1wu9QtfdFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740074448; a=rsa-sha256; cv=none; b=eKRo5QliRvAysla4ZmNsCiHpEQE8ZQuM+vlXF1+mLbXRRR1P1MiBrryQ9S932x/vs96ESS brpYsuhR/0kd0Xpb3I1VzQ3FGuTvCsnofA9sxlwTL8AAsGBLX2MvMYfYNYSszWZV/+16Kc lvvPEZqAvCnuK0koxeiiy6DZa49u8aBVuf9AuP9vA6w6SfwkXCFhOd0S2jO+9FqA542MzP dPbVwvcYbgIy/IVmC+OeYncRe96vgDWrgZTMTjhQN1ah8RuSWOc5I8DgphDqTPkgcAm1CU rZOAwIbrRfGnVNeUuGejf/nh0Ijaj9xGUT6x/jGkb+0ZxBNdGXCk9bP9R60/HA== 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=1740074448; 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=qA3XdGEd+jqH5fNFa9MviLlrOdBpm0q6ldQyVJrhqvw=; b=TpAvE8xUljoS+SOqJU4+vEPOs120upYecJydGR27/4LtEqjFozU8GRhhxaZDfwQP8ZD82F byG7TWumVUG52tN+uRLs0+0fyz2coXbxFA66VIijXQY3apYLZicnwJfvSm02P0Hh3nVREz xvaQR6BOYoMTKyj0QJiXA942+5EMH8cgSfR3+IyljlFaIVbCVkDw5o7Y/29CFtn22uJXkL a8x45N2bVS+Ebw6hk3fzZS1S9BPupTyfYovyzM/0teJ+mG3h7KeRlkFwZcJ9+rV5v7/GDU YAFOp/EwCEKHoNMHTdB8dCsZs+ivKvpPPKQd2vm9QfFgsJ2YxDsjN6bvFdBUVw== 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 4YzLf767FSz12Rn; Thu, 20 Feb 2025 18:00:47 +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 51KI0lfD079309; Thu, 20 Feb 2025 18:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KI0lb2079306; Thu, 20 Feb 2025 18:00:47 GMT (envelope-from git) Date: Thu, 20 Feb 2025 18:00:47 GMT Message-Id: <202502201800.51KI0lb2079306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 78b4f775184c - releng/13.5 - ssh: Bump VersionAddendum for CVE fixes 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 78b4f775184c368821586565dde4b9ab7f08c00c Auto-Submitted: auto-generated The branch releng/13.5 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=78b4f775184c368821586565dde4b9ab7f08c00c commit 78b4f775184c368821586565dde4b9ab7f08c00c Author: Ed Maste AuthorDate: 2025-02-19 14:00:42 +0000 Commit: Ed Maste CommitDate: 2025-02-20 18:00:27 +0000 ssh: Bump VersionAddendum for CVE fixes Approved by: so Sponsored by: The FreeBSD Foundation (cherry picked from commit 62df41ae0a71e77ccb1e8fae06d82eec5dff441a) (cherry picked from commit 24ce323f020fb1ee1b463e524a7a6c15f47ec2a4) (cherry picked from commit 2fc62d0bd4f7ca90d7abdfaf076dd49022bf7d54) Approved by: re (implicit) --- crypto/openssh/ssh_config | 2 +- crypto/openssh/ssh_config.5 | 2 +- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 2 +- crypto/openssh/version.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index a047ce2deb93..518edcd2a01a 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -44,4 +44,4 @@ # ProxyCommand ssh -q -W %h:%p gateway.example.com # RekeyLimit 1G 1h # UserKnownHostsFile ~/.ssh/known_hosts.d/%k -# VersionAddendum FreeBSD-20240806 +# VersionAddendum FreeBSD-20250219 diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5 index de1903ba43a2..60e4b31a2de5 100644 --- a/crypto/openssh/ssh_config.5 +++ b/crypto/openssh/ssh_config.5 @@ -2137,7 +2137,7 @@ in Specifies a string to append to the regular version string to identify OS- or site-specific modifications. The default is -.Dq FreeBSD-20240806 . +.Dq FreeBSD-20250219 . The value .Cm none may be used to disable this. diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index 866e905d9515..fddc6fee17e3 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-20240806 +#VersionAddendum FreeBSD-20250219 # no default banner path #Banner none diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index a354c1ef2b0a..a5d6ef07c83f 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -1947,7 +1947,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-20240806 . +.Qq FreeBSD-20250219 . The value .Cm none may be used to disable this. diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index 82be0be8498f..f3fb7fe333eb 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-20240806" +#define SSH_VERSION_FREEBSD "FreeBSD-20250219"