git: 1c99af1ebe61 - main - libssh: Rearrange Makefile SRCS to match upstream Makefile.in

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Wed, 20 Oct 2021 00:11:17 UTC
The branch main has been updated by emaste:

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

commit 1c99af1ebe61cbaf633792941640dcd254acf921
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-10-20 00:09:46 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-10-20 00:10:56 +0000

    libssh: 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.
    
    Reported by:    des
---
 secure/lib/libssh/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index e835ef3c1b2a..49b5319d2b54 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -5,7 +5,7 @@
 LIB=	ssh
 PRIVATELIB=	true
 SHLIB_MAJOR=	5
-SRCS=	ssh_api.c ssh-sk-client.c ssh-ecdsa-sk.c ssh-ed25519-sk.c ssherr.c \
+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 \
@@ -15,17 +15,20 @@ SRCS+=	authfd.c authfile.c \
 	log.c match.c moduli.c nchan.c packet.c \
 	readpass.c ttymodes.c xmalloc.c addr.c addrmatch.c \
 	atomicio.c dispatch.c mac.c misc.c utf8.c \
-	monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c \
+	monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-ecdsa-sk.c \
+	ssh-ed25519-sk.c ssh-rsa.c dh.c \
 	msg.c progressmeter.c dns.c entropy.c umac.c umac128.c \
 	ssh-pkcs11.c smult_curve25519_ref.c \
 	poly1305.c chacha.c cipher-chachapoly.c cipher-chachapoly-libcrypto.c \
-	ssh-ed25519.c digest-openssl.c digest-libc.c hmac.c \
-	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c \
+	ssh-ed25519.c digest-openssl.c digest-libc.c \
+	hmac.c sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c \
 	kex.c kexdh.c kexgex.c kexecdh.c kexc25519.c \
 	kexgexc.c kexgexs.c \
 	kexsntrup761x25519.c sntrup761.c kexgen.c \
 	sftp-realpath.c platform-pledge.c platform-tracing.c platform-misc.c \
 	sshbuf-io.c
+SRCS+=	ssh-sk-client.c
+
 PACKAGE=	ssh
 
 # gss-genr.c should be in $SRCS but causes linking problems, so it is