From nobody Mon Oct 05 14:16:55 2026 X-Original-To: dev-commits-src-branches@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 4hz1fj172dz6jwLg for ; Mon, 05 Oct 2026 14:17:01 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hz1fh69Krz3GW1 for ; Mon, 05 Oct 2026 14:17:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791209820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j5ayKOOhvrjKNcG3866DFEuDzl3ueRcN3AMY+TC4WNo=; b=AyJRY4igZkBNMnkOXvC/A4HQyOZcDdJTKwxFk82zr2BIqJWl0wxWA7277AVywVAZFPK0/K uXpsiWFipPZv4/twOqPwZOvrdAC+D7jPj86IMBQzSizVyab9qXT2C7kNIKWGLHlxS1wa9q bcwlRiLyqfAxxgrhzkQJwECbqml4dF10vFle5fYvgH0WDZRxVaBph3s+u2Hj0efB+xquTv FNZ7enNEC+xUpzqkf5srZqcJJYt/65XNS/LZP0L31objKhOFQUUKZVqWHN8Jpju8ftiQHg CwID/G2UIilD+oVzLPF9mbAVzW2vTToBFrrTt0Kmtt/1qposJgMm0d/eXXLscg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791209820; b=ypi8LXbH8N5uLGCMPyHKWcOyw9V7Bbh7oNcaE25/q7gP+tOvdAssefvSF2eenvjnauDYkL ajMAnrHC1ATcW5qMvAB7jjX9ONudD9jAIW58uxrATnQbl90VQqSmLxlV5TFkSGHOhF4Lfz ptU6b87cJK677RUmkBNhQjjh6qn+wyKgfOwSzP0FtB/Wu84l6/wDDe5qPn18iAxRPaugBg L/wu8IFYjcTtpqukvw9rpHiOpW2B9fvxg65f6AP7hFzDEnm6pYDuMqDtkoHsnS5AQyPHpH /FB/Xe2O/Utb37wbnI2qoLl16feduW46Y3vwtdeOX61kd5Vn/66pa4bK/LXLFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791209820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j5ayKOOhvrjKNcG3866DFEuDzl3ueRcN3AMY+TC4WNo=; b=yN059/sb8NbyQW5ZQcMIZ7yqCn6SKX5/FkpzGUxj/X7ApLyRHaYYLrB+t+k3MgvOCSuAgB Wzr4pbEftKzSf2z2qEQPZihQWjYKWhglUmsmyftI4VGSrVVr8beDWBiy+9IO8VycD3JK7C wHjO19wfZwv9IaNdOmQDnMP3eh53K8CFSUg5ZoYEg3dKT2huW6wu7oriP0f0b2dB/WDi3N d9qiccDOQ0a1zFUW3XiFdnBiOxEPQ5wZme10pQ9M4ylbMXpJ3Z1ag4shoZQKLPlyMmiKlt XZLeErCgtyBvW/E4eO9e0jfdw/VXFXrehoKaUU6w3GRVVNWkn2ianJH+uTvpgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hz1fh4mhSzN00 for ; Mon, 05 Oct 2026 14:17:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 475fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Oct 2026 14:16:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jose Luis Duran From: Ed Maste Subject: git: dcab58551115 - stable/14 - secure: Rearrange Makefile SRCS to match upstream Makefile.in List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dcab58551115b2299e4b0f23e26fc0b763d7cf32 Auto-Submitted: auto-generated Date: Mon, 05 Oct 2026 14:16:55 +0000 Message-Id: <6ac3b157.475fd.7aa07851@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=dcab58551115b2299e4b0f23e26fc0b763d7cf32 commit dcab58551115b2299e4b0f23e26fc0b763d7cf32 Author: Jose Luis Duran AuthorDate: 2025-04-17 18:56:00 +0000 Commit: Ed Maste 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 .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