git: dcab58551115 - stable/14 - secure: Rearrange Makefile SRCS to match upstream Makefile.in

The branch stable/14 has been updated by emaste:

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

commit dcab58551115b2299e4b0f23e26fc0b763d7cf32
Author:     Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2025-04-17 18:56:00 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2026-10-05 14:14:44 +0000

    secure: Rearrange Makefile SRCS to match upstream Makefile.in
    
    SRCS entries are kept in the same order and with the same line breaks as
    upstream, to make comparison easier.
    
    No functional change intended.
    
    Reviewed by:    emaste
    Approved by:    emaste (mentor)
    Differential Revision:  https://reviews.freebsd.org/D49793
    
    (cherry picked from commit 9440aad19dca73fdd224b128ac2dc2e78191ff15)
---
 secure/lib/libssh/Makefile                | 23 ++++++++++++++++-------
 secure/libexec/sftp-server/Makefile       |  4 ++--
 secure/libexec/ssh-pkcs11-helper/Makefile |  2 +-
 secure/ssh.mk                             |  2 ++
 secure/usr.bin/scp/Makefile               |  2 +-
 secure/usr.bin/sftp/Makefile              |  3 +--
 secure/usr.bin/ssh-add/Makefile           |  2 +-
 7 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 1917e0a58e31..0a95c401c52f 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -5,10 +5,22 @@
 LIB=	ssh
 PRIVATELIB=	true
 SHLIB_MAJOR=	5
-SRCS=	ssh_api.c ssherr.c \
-	sshbuf.c sshkey.c sshbuf-getput-basic.c \
-	sshbuf-misc.c sshbuf-getput-crypto.c krl.c bitmap.c
-SRCS+=	authfd.c authfile.c \
+
+LIBOPENSSH_SRCS=\
+	ssh_api.c \
+	ssherr.c \
+	sshbuf.c \
+	sshkey.c \
+	sshbuf-getput-basic.c \
+	sshbuf-misc.c \
+	sshbuf-getput-crypto.c \
+	krl.c \
+	bitmap.c
+
+# gss-genr.c should be in $SRCS but causes linking problems, so it is
+# compiled directly into sshd instead.
+SRCS=	${LIBOPENSSH_SRCS} \
+	authfd.c authfile.c \
 	canohost.c channels.c cipher.c cipher-aes.c cipher-aesctr.c \
 	cleanup.c \
 	compat.c fatal.c hostfile.c \
@@ -31,9 +43,6 @@ SRCS+=	ssh-sk-client.c
 
 PACKAGE=	ssh
 
-# gss-genr.c should be in $SRCS but causes linking problems, so it is
-# compiled directly into sshd instead.
-
 # Portability layer
 SRCS+=	bcrypt_pbkdf.c blowfish.c bsd-misc.c bsd-signal.c explicit_bzero.c \
 	fmt_scaled.c freezero.c glob.c \
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index 4aac86ac01bf..00570268ffe6 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -2,8 +2,8 @@
 .include <src.opts.mk>
 .include "${SRCTOP}/secure/ssh.mk"
 
-PROG=   sftp-server
-SRCS=   sftp-server.c sftp-common.c sftp-server-main.c
+PROG=	sftp-server
+SRCS=	sftp-common.c sftp-server.c sftp-server-main.c
 MAN=	sftp-server.8
 
 LIBADD=	ssh
diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile
index 506697531965..34fb59381305 100644
--- a/secure/libexec/ssh-pkcs11-helper/Makefile
+++ b/secure/libexec/ssh-pkcs11-helper/Makefile
@@ -3,7 +3,7 @@
 .include "${SRCTOP}/secure/ssh.mk"
 
 PROG=	ssh-pkcs11-helper
-SRCS=	ssh-pkcs11.c ssh-pkcs11-helper.c
+SRCS=	ssh-pkcs11-helper.c ssh-pkcs11.c
 MAN=	ssh-pkcs11-helper.8
 
 LIBADD=	crypto ssh
diff --git a/secure/ssh.mk b/secure/ssh.mk
index f522e1a927fc..641343ac993a 100644
--- a/secure/ssh.mk
+++ b/secure/ssh.mk
@@ -4,6 +4,8 @@
 
 SSHDIR=		${SRCTOP}/crypto/openssh
 
+SFTP_CLIENT_SRCS=sftp-common.c sftp-client.c sftp-glob.c
+
 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
 
 .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index a8d5eac77397..2a79fa3773f8 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -3,7 +3,7 @@
 .include "${SRCTOP}/secure/ssh.mk"
 
 PROG=	scp
-SRCS=	scp.c sftp-common.c sftp-client.c sftp-glob.c progressmeter.c
+SRCS=	scp.c progressmeter.c $(SFTP_CLIENT_SRCS)
 PACKAGE=	ssh
 
 LIBADD=	ssh
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index 2f51bf524c6b..fe59af49f3ba 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -3,8 +3,7 @@
 .include "${SRCTOP}/secure/ssh.mk"
 
 PROG=	sftp
-SRCS=   sftp.c sftp-client.c sftp-common.c sftp-glob.c sftp-usergroup.c \
-	progressmeter.c
+SRCS=	sftp.c sftp-usergroup.c progressmeter.c $(SFTP_CLIENT_SRCS)
 PACKAGE=	ssh
 
 LIBADD=	ssh edit
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
index ddde52130027..504c65ff043e 100644
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -3,7 +3,7 @@
 .include "${SRCTOP}/secure/ssh.mk"
 
 PROG=	ssh-add
-SRCS+=	ssh-add.c ssh-sk-client.c
+SRCS=	ssh-add.c ssh-sk-client.c
 PACKAGE=	ssh
 
 LIBADD=	ssh