git: openssh: Update and refactor makefiles for 10.6p1 import

[Aaron LI]

commit 6152f8961809c0c4d7ced69e7db30f8a11d9a784
Author: Aaron LI <aly at aaronly.me>
Date:   Sun Oct 18 21:09:48 2026 +0800

    openssh: Update and refactor makefiles for 10.6p1 import
    
    Highlights:
    * New components: /usr/libexec/ssh-sk-helper and /usr/libexec/sshd-auth.
    * Enabled the security key helper for the later FIDO/U2F support.
      NOTE: That requires to import the libfido2 and libcbor libraries.
    * Removed libprivate_ssh library; it has been refactored as an internal
      library.
    
    Major changes:
    * Refactor lib/libssh to make it an internal library, rather than
      previously as a private library.
    * Sync the libssh.a source list with the vendor's makefile.
    * The auto-generated config.h is copied as lib/libssh/config.h.auto, and
      the final config.h is created with the makefile to apply our
      corrections.
    * Add the lib/libssh/Makefile.common to reduce duplicate code among all
      the OpenSSH components.

Summary of changes:
 Makefile_upgrade.inc                            |    4 +
 initrd/rescue/Makefile                          |    9 +-
 lib/libssh/Makefile                             |  200 +++--
 lib/libssh/Makefile.common                      |   20 +
 lib/libssh/Makefile.etc                         |    2 +-
 lib/libssh/{config.h => config.h.auto}          |  248 +++---
 lib/libssh/openbsd-compat/bcrypt_pbkdf.c        |  188 ----
 lib/libssh/openbsd-compat/blf.h                 |   85 --
 lib/libssh/openbsd-compat/blowfish.c            |  693 ---------------
 lib/libssh/openbsd-compat/bsd-misc.c            |  460 ----------
 lib/libssh/openbsd-compat/bsd-misc.h            |  193 ----
 lib/libssh/openbsd-compat/bsd-nextstep.h        |   57 --
 lib/libssh/openbsd-compat/bsd-signal.h          |   36 -
 lib/libssh/openbsd-compat/charclass.h           |   31 -
 lib/libssh/openbsd-compat/fmt_scaled.c          |  309 -------
 lib/libssh/openbsd-compat/getrrsetbyname-ldns.c |  284 ------
 lib/libssh/openbsd-compat/getrrsetbyname.h      |  110 ---
 lib/libssh/openbsd-compat/glob.c                | 1079 -----------------------
 lib/libssh/openbsd-compat/glob.h                |  108 ---
 lib/libssh/openbsd-compat/openbsd-compat.h      |  356 --------
 lib/libssh/openbsd-compat/openssl-compat.c      |   96 --
 lib/libssh/openbsd-compat/openssl-compat.h      |  212 -----
 lib/libssh/openbsd-compat/port-net.c            |  379 --------
 lib/libssh/openbsd-compat/port-net.h            |   48 -
 lib/libssh/openbsd-compat/sys-queue.h           |  628 -------------
 lib/libssh/openbsd-compat/sys-tree.h            |  755 ----------------
 lib/libssh/openbsd-compat/xcrypt.c              |  156 ----
 libexec/Makefile                                |    2 +
 libexec/sftp-server/Makefile                    |   16 +-
 libexec/ssh-keysign/Makefile                    |   23 +-
 libexec/ssh-pkcs11-helper/Makefile              |   20 +-
 libexec/ssh-sk-helper/Makefile                  |   18 +
 libexec/sshd-auth/Makefile                      |   37 +
 libexec/sshd-session/Makefile                   |   67 +-
 share/mk/bsd.libnames.mk                        |    1 -
 usr.bin/scp/Makefile                            |   18 +-
 usr.bin/sftp/Makefile                           |   19 +-
 usr.bin/ssh-add/Makefile                        |   21 +-
 usr.bin/ssh-agent/Makefile                      |   21 +-
 usr.bin/ssh-copy-id/Makefile                    |    5 +-
 usr.bin/ssh-keygen/Makefile                     |   20 +-
 usr.bin/ssh-keyscan/Makefile                    |   20 +-
 usr.bin/ssh/Makefile                            |   27 +-
 usr.sbin/sshd/Makefile                          |   57 +-
 usr.sbin/sshd/Makefile.etc                      |    5 +-
 45 files changed, 473 insertions(+), 6670 deletions(-)
 create mode 100644 lib/libssh/Makefile.common
 rename lib/libssh/{config.h => config.h.auto} (93%)
 delete mode 100644 lib/libssh/openbsd-compat/bcrypt_pbkdf.c
 delete mode 100644 lib/libssh/openbsd-compat/blf.h
 delete mode 100644 lib/libssh/openbsd-compat/blowfish.c
 delete mode 100644 lib/libssh/openbsd-compat/bsd-misc.c
 delete mode 100644 lib/libssh/openbsd-compat/bsd-misc.h
 delete mode 100644 lib/libssh/openbsd-compat/bsd-nextstep.h
 delete mode 100644 lib/libssh/openbsd-compat/bsd-signal.h
 delete mode 100644 lib/libssh/openbsd-compat/charclass.h
 delete mode 100644 lib/libssh/openbsd-compat/fmt_scaled.c
 delete mode 100644 lib/libssh/openbsd-compat/getrrsetbyname-ldns.c
 delete mode 100644 lib/libssh/openbsd-compat/getrrsetbyname.h
 delete mode 100644 lib/libssh/openbsd-compat/glob.c
 delete mode 100644 lib/libssh/openbsd-compat/glob.h
 delete mode 100644 lib/libssh/openbsd-compat/openbsd-compat.h
 delete mode 100644 lib/libssh/openbsd-compat/openssl-compat.c
 delete mode 100644 lib/libssh/openbsd-compat/openssl-compat.h
 delete mode 100644 lib/libssh/openbsd-compat/port-net.c
 delete mode 100644 lib/libssh/openbsd-compat/port-net.h
 delete mode 100644 lib/libssh/openbsd-compat/sys-queue.h
 delete mode 100644 lib/libssh/openbsd-compat/sys-tree.h
 delete mode 100644 lib/libssh/openbsd-compat/xcrypt.c
 create mode 100644 libexec/ssh-sk-helper/Makefile
 create mode 100644 libexec/sshd-auth/Makefile

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/6152f8961809c0c4d7ced69e7db30f8a11d9a784


-- 
DragonFly BSD source repository