From nobody Thu Apr 17 19:19:48 2025 X-Original-To: dev-commits-src-main@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 4ZdnlT2K3rz5sdgQ; Thu, 17 Apr 2025 19:19:49 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZdnlS6wD1z3Wqp; Thu, 17 Apr 2025 19:19:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744917589; 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=NwsejIAejOmaJg4kSV+4y51Yx8tL1i0Nj8mDdYgC0Mc=; b=qONAAXZvRqlm0JCkqZ/9nt8yq4SnWU7Y36YgVaknVKmY1AM2MJzR2pPYgCwDyiNUrp6D0+ sLT4j+EIZ53YS4BgHUjAW6WwgOi/opQ+rAi+wZIgjsspjQ/3C23Ghkdm3rmqTiMpLIloUi Y8KcGQ1H/c0ad6Ha+fQkfoJn0QnJmpplOEVSDL+u1CRe4YpPo4E558GneWB8ySx1RF/pT1 eTCiB2oIZAdMcTuwmSo7BmXu3jvlw+ZTLFUsbaGCAEOKuo/wcNqNEjNnYeYxDurLgxKFfW 4mDlpVxXeuD2pVM88apWQBzCqOj8a3+mYc6q9s30SNebt6Z8Ab/gleZElGD4uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744917589; a=rsa-sha256; cv=none; b=ZJzZeXtePbCKZ3GAksxDKakxtUkZU/bd3PQCrNpERwKMoiDJlROvjkOkuXDrcHlb3ae9I+ aP94AYk/SFfiWOQDq7tkZfeINYp1dO+4z/278QLoqaEDDKu/34C4Z3Oz0j11aTac6rlPuo ka9nSdj60aJ7gOsgAEeS1Sua1z5FQvXUyEgJnjT+Cvrijfr6Jz+4MTPfLp/Fn7aVjGsmsn upe6e6wYZK5QcPOjaPJdeT24AuLYeKFP0WHJmGpEOgP0FbUp/mWUJ6ab1Z75EtxP8kJScq dx0LKFJtgUoOEi/MynOLwgf7yAu85g33VUrBYk4Dj7Z9fP/+so7jIN1M5KzQRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744917589; 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=NwsejIAejOmaJg4kSV+4y51Yx8tL1i0Nj8mDdYgC0Mc=; b=mKBgg7UlCSrpcP/VyzG7/RakJ4p82fQiOTyGJGh/G9JXHgdd8P0HXo/dDNW3eZUWrHd0s7 ooY2sIFNW2VquU4LKTj2tUpaWGKJzObg/2PF8uYsdcr27ACrE7wIF0Gg20WqypwAu3q8bz O2I44LN+t7ijb7AlMAzXw4+NV1Fpt6MQEYhTLX4t0b14NE2j/2kn3BVzOllsnxW/+wGoVA YIhzTJRaudk1oGDeo7NoSmsKdqEMBU6K8YdwAaoJyyxlHsYsVlJXQgePiCMMIGp/uSpITh JoquYUJv28TsY3/DkZTkxvrdFh8Z6/XXldAXXQsjSFFpHmgYBwdh9Iao6PJEmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZdnlS5x1Dz11Mp; Thu, 17 Apr 2025 19:19:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53HJJmeA004326; Thu, 17 Apr 2025 19:19:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53HJJmag004323; Thu, 17 Apr 2025 19:19:48 GMT (envelope-from git) Date: Thu, 17 Apr 2025 19:19:48 GMT Message-Id: <202504171919.53HJJmag004323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 9440aad19dca - main - secure: Rearrange Makefile SRCS to match upstream Makefile.in List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9440aad19dca73fdd224b128ac2dc2e78191ff15 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=9440aad19dca73fdd224b128ac2dc2e78191ff15 commit 9440aad19dca73fdd224b128ac2dc2e78191ff15 Author: Jose Luis Duran AuthorDate: 2025-04-17 18:56:00 +0000 Commit: Jose Luis Duran CommitDate: 2025-04-17 19:12:05 +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 --- 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 d5292be88a4b..f4c60c02c9eb 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -4,10 +4,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 \ @@ -30,9 +42,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 29f7a8df9fdd..0673e1e5613e 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -1,8 +1,8 @@ .include .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 84374fdca43b..90b15eef26d8 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -2,7 +2,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 2ecea0ef52da..8d38d815d3fb 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -2,7 +2,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 f903f5e611d5..cc13a86794c5 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -2,8 +2,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 8df3789534af..8de508bd6c12 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -2,7 +2,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