From nobody Mon Jan 12 19:18:20 2026 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 4dqhxF5Yykz6Nyhj for ; Mon, 12 Jan 2026 19:18:25 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dqhxF53Gbz3STG for ; Mon, 12 Jan 2026 19:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768245505; 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=ZthL43FKEEh7AuyPmJZFi3zJxaEvTheNT6C+3MXi49E=; b=ht8FJloVyurF+myJ29+OkAjwErf4SUAW71hOy3GuJM+x/jM+ZHiUhy0inkBPcMa3ll1H36 cMvcb7eRojql9Zi7oiJ5t0jp2A2u50P8na0eTes7ggesUe2fasSvEID/NO/Jj5bqljgj61 GldrZx5E7Fp/pPz0ZeEsvuXI6KdkemREZotBTQqZgfBBVEL3x9U1FKM1p3dupcDZJY4DHk sQXPyVU2ee1lrxJF+NGfl6FLz08VgixGiK+35YpqPcdyXekz0khfnjqCD0y2pKE5WusUQp BRvAdQNKRx6FWM7WKIELN7k2W+4fLH+X+lOnqkNX8ZerKGOS1wyKFLsTqvydQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768245505; 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=ZthL43FKEEh7AuyPmJZFi3zJxaEvTheNT6C+3MXi49E=; b=dcr/gUpzdimxpi7Uwo4IvOL2of2TlSSfq1JR+4Dy2/iD7qsX517YKZcVgfg69pT5Ud3SxX mS4nuvTJfN89hPXSK4WVRNC7APLdI5eeQi3eDdKkXOil6oOx0/DsOaOV3Ut2ksq16cu4Ey Zmq6iKQU/rKN6PP+fY3W1xdxR9nCb8rfPPRrnUdwR74xOmLD3JINxvvpsH77bYOjPAslg5 KoBYV+snAHg6MKPgXVwZBELtNDAXoZYm0l3hQVQsRNQsTZAG2ZhqQS2K96/WoiLyuG6YXa EfxIsy6+i7CCDH02JBipgnDVvoLf4CDK4oGZWeVaKJOWBVm5kKC+rLBpJ5fUjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768245505; a=rsa-sha256; cv=none; b=T2RT5VwCvB8L1rkCpnsbTgB4pykqf7B+p8AFNGvBX8auS3CudwU1oEn2uGwSnPpY5okh2a QmWz0QOe84c/nY9ZKOThd2mUNCS2bAwMwbN/txt50z2NHS99Q5K2cMy6uw3b0ID7z4kA1f XurI0H7kFtHJsPCL21EKcDwCY5dFdRw/U+wwuyIBkWhXZcjwVWtpAMJ3th00RM5P/vbJbH tJ4MGUKQXMstW5mxs6arz0y7aKOjs2HFldC9wJfozrvGpNhwHA0n27pJ45difQM/u5wt5W nNvZ95RgQEnjmAUkGTCjEEJo0ada5zquNFCZ2DlfqijBYt3hCN7yUwxN+Ft58g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dqhxF3ymJzgQQ for ; Mon, 12 Jan 2026 19:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4377c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 19:18:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 215d16e4102b - stable/14 - openssh: Add detail on client side VersionAddendum 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 215d16e4102b3c03c6bde13c78f57922b94ad74e Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 19:18:20 +0000 Message-Id: <696548fc.4377c.727d0694@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=215d16e4102b3c03c6bde13c78f57922b94ad74e commit 215d16e4102b3c03c6bde13c78f57922b94ad74e Author: Ed Maste AuthorDate: 2025-08-26 20:29:28 +0000 Commit: Ed Maste CommitDate: 2026-01-12 19:17:58 +0000 openssh: Add detail on client side VersionAddendum FreeBSD introduced VersionAddendum for the server as a local change in 2001 in commit 933ca70f8f88 and later extended it to the client in commit 9e2cbe04ff4f. In 2012 upstream added support for server VersionAddendum, in commit 23528816dc10. They did not add client support. We removed the client support from main in commit bffe60ead024 ("ssh: retire client VersionAddendum"). As of the 10.0p2 release upstream has added client-side VersionAddendum. Make note of this in FREEBSD-upgrade's patches section. Sponsored by: The FreeBSD Foundation (cherry picked from commit b55439338dc40d1954fd37281d48786148483190) --- crypto/openssh/FREEBSD-upgrade | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index d8fc986b71ca..fde25bf7d6f9 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -166,8 +166,15 @@ 9) Retired patches - We no longer have client-side VersionAddendum, but we recognize and ignore - the configuration options to avoid breaking existing configurations. + We added support for client-side VersionAddendum in 2002 (commit + 9e2cbe04ff4f) and provided a default value (e.g. FreeBSD-20220415). + Support was removed in commit bffe60ead024 ("ssh: retire client + VersionAddendum") to reduce the size of our patch set. Upstream later + added the same functionality in the 10.0p2 release. We have not restored + setting a default value on FreeBSD. + + We recognize and ignore the configuration options to avoid breaking + existing configurations. 10) PrintLastLog bugfix