Page MenuHomeFreeBSD

secure: Rearrange Makefile SRCS to match upstream Makefile.in
ClosedPublic

Authored by jlduran on Apr 12 2025, 2:34 AM.
Tags
None
Referenced Files
F130821673: D49793.id153574.diff
Thu, Oct 2, 1:54 PM
Unknown Object (File)
Fri, Sep 26, 10:15 AM
Unknown Object (File)
Sat, Sep 20, 11:54 PM
Unknown Object (File)
Fri, Sep 5, 2:12 PM
Unknown Object (File)
Aug 18 2025, 5:37 PM
Unknown Object (File)
Aug 14 2025, 10:39 PM
Unknown Object (File)
Aug 14 2025, 7:58 PM
Unknown Object (File)
Aug 13 2025, 11:02 PM
Subscribers

Details

Summary

SRCS entries are kept in the same order and with the same line breaks as
upstream, to make comparison easier.

No functional change intended.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 63474
Build 60358: arc lint + arc unit

Event Timeline

Hopefully this revision stack helps facilitate adapting OpenSSH 10.0p2 changes, and the new sshd-auth binary.

Match upstream Makefile.in as close as possible.

LGTM, with a couple of small notes you could incorporate

secure/libexec/sftp-server/Makefile
4–6

Spaces rendering strangely in Phab - maybe one line is spaces and one is a tab?

secure/usr.bin/scp/Makefile
5–6

We could move this line to ssh.mk to share it between scp and sftp.

secure/usr.bin/ssh-add/Makefile
5–6

This is fine, or we could add ${SKSRCS}

This revision is now accepted and ready to land.Apr 17 2025, 6:37 PM
This revision was automatically updated to reflect the committed changes.
jlduran marked 3 inline comments as done.
secure/libexec/sftp-server/Makefile
4–6

They are both tabs. It should be a Phab quirk.

secure/usr.bin/scp/Makefile
5–6

That idea crossed my mind.
Note to self: If two or more files share the same options, move it to the common place.
Will do when committing.
Thank you!

secure/usr.bin/ssh-add/Makefile
5–6

This is done later in D49795.