git: 6fcdc18bdfb1 - main - OpenSSH: Update to 10.6p2

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Tue, 10 Nov 2026 14:25:42 UTC
The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=6fcdc18bdfb17c43eb05eb6289732e6adceb481a

commit 6fcdc18bdfb17c43eb05eb6289732e6adceb481a
Merge: 6dd16be872c6 aa5bef3e5025
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2026-11-10 14:23:50 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2026-11-10 14:23:50 +0000

    OpenSSH: Update to 10.6p2
    
    Full release notes are available at
    https://www.openssh.org/txt/release-10.6p2 .
    
    Selected items from the upstream release notes:
    
    Future deprecation notice
    -------------------------
    
     * scp(1): begin deprecating the -R flag, which is used to perform a
       remote-to-remote copy by executing scp on a remote host. This
       option is a fragile optimisation that is difficult to use because
       it requires credentials on the remote host. It also creates
       security risks if the shell quoting rules on the remote system
       where the copy is performed differ from the client's expectations.
    
       From OpenSSH 10.6, this option will continue to work but will
       cause a deprecation warning to be emitted to standard error. In
       a future release, the option will be ignored and will leave in
       place the default remote-to-remote copy behaviour (copy via the
       host running scp).
    
    Reviewed by:    jlduran
    Sponsored by:   The FreeBSD Foundation

 crypto/openssh/.depend                          |  2 +-
 crypto/openssh/.github/workflows/selfhosted.yml |  3 ++-
 crypto/openssh/.github/workflows/vm.yml         |  2 +-
 crypto/openssh/auth-passwd.c                    | 17 +++++++++++++----
 crypto/openssh/channels.c                       |  7 +++----
 crypto/openssh/contrib/redhat/openssh.spec      |  2 +-
 crypto/openssh/contrib/suse/openssh.spec        |  2 +-
 crypto/openssh/misc.c                           |  4 +++-
 crypto/openssh/myproposal.h                     |  5 +++--
 crypto/openssh/openbsd-compat/port-uw.c         | 16 ++++++++--------
 crypto/openssh/openbsd-compat/readpassphrase.c  | 10 +++++-----
 crypto/openssh/openbsd-compat/xcrypt.c          | 18 +++++++++++++-----
 crypto/openssh/sandbox-seccomp-filter.c         |  3 +++
 crypto/openssh/servconf.c                       |  2 +-
 crypto/openssh/sshd_config                      |  2 +-
 crypto/openssh/sshd_config.5                    |  2 +-
 crypto/openssh/utf8.c                           |  2 +-
 crypto/openssh/version.h                        |  4 ++--
 18 files changed, 63 insertions(+), 40 deletions(-)

diff --cc crypto/openssh/sshd_config
index 1f3200898af1,57ecabb8641e..a37152282783
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@@ -108,8 -103,7 +108,8 @@@ AuthorizedKeysFile	.ssh/authorized_key
  #MaxStartups 10:30:100
  #PermitTunnel no
  #ChrootDirectory none
 -#VersionAddendum none
 +#UseBlocklist no
- #VersionAddendum FreeBSD-20261109
++#VersionAddendum FreeBSD-20261110
  
  # no default banner path
  #Banner none
diff --cc crypto/openssh/sshd_config.5
index f4c1963d3271,3560ec8b87af..f410c88b89e9
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@@ -2174,10 -2147,7 +2174,10 @@@ The default i
  Optionally specifies additional text to append to the SSH protocol banner
  sent by the server upon connection.
  The default is
- .Qq FreeBSD-20261109 .
 -.Cm none .
++.Qq FreeBSD-20261110 .
 +The value
 +.Cm none
 +may be used to disable this.
  .It Cm WarnWeakCrypto
  Controls whether warnings are logged when the cryptographic algorithms
  negotiated for the connection are weak or otherwise recommended against.
diff --cc crypto/openssh/version.h
index a4f7c1d631af,000000000000..ba7cc3493474
mode 100644,000000..100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@@ -1,8 -1,0 +1,8 @@@
 +/* $OpenBSD: version.h,v 1.111 2026/10/05 09:54:05 djm Exp $ */
 +
 +#define SSH_VERSION	"OpenSSH_10.6"
 +
- #define SSH_PORTABLE	"p1"
++#define SSH_PORTABLE	"p2"
 +#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
 +
- #define SSH_VERSION_FREEBSD	"FreeBSD-20261109"
++#define SSH_VERSION_FREEBSD	"FreeBSD-20261110"