Page MenuHomeFreeBSD
Differential D49794

secure: Match SRCS with upstream Makefile.in
ClosedPublic
Actions

Authored by jlduran on Apr 12 2025, 2:35 AM.
Tags
None
Referenced Files
F135128378: D49794.id153575.diff
Thu, Nov 6, 5:53 PM
F135116895: D49794.id153792.diff
Thu, Nov 6, 3:31 PM
F135040134: D49794.id153584.diff
Thu, Nov 6, 12:57 AM
Unknown Object (File)
Wed, Nov 5, 5:20 PM
Unknown Object (File)
Wed, Nov 5, 4:12 PM
Unknown Object (File)
Wed, Nov 5, 2:39 PM
Unknown Object (File)
Sun, Nov 2, 11:23 PM
Unknown Object (File)
Wed, Oct 22, 7:52 PM
View All 70 Files
Subscribers
imp

Details

Reviewers
emaste
Commits
rG8c6bf983a914: secure: Match SRCS with upstream Makefile.in

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

jlduran created this revision.Apr 12 2025, 2:35 AM
Herald added a subscriber: imp. · View Herald TranscriptApr 12 2025, 2:35 AM
jlduran requested review of this revision.Apr 12 2025, 2:35 AM
Harbormaster completed remote builds in B63475: Diff 153562.Apr 12 2025, 2:35 AM
jlduran added a parent revision: D49793: secure: Rearrange Makefile SRCS to match upstream Makefile.in.Apr 12 2025, 2:35 AM
jlduran added a child revision: D49795: secure: Adapt Makefile to ssh-sk-client everywhere.
jlduran updated this revision to Diff 153575.Apr 12 2025, 2:52 PM

Match upstream Makefile.in as close as possible.

emaste added a comment.Apr 12 2025, 2:56 PM

Re progressmeter.c, OpenBSD includes it only in usr.bin/ssh/scp/Makefile and usr.bin/ssh/sftp/Makefile. I think it may be a bug in the portable-ization (from d194048f573136f1c2c34d25f951b78f4ffc7d77) that we can report to openssh-portable.

jlduran added a comment.Apr 12 2025, 3:00 PM
In D49794#1135230, @emaste wrote:

Re progressmeter.c, OpenBSD includes it only in usr.bin/ssh/scp/Makefile and usr.bin/ssh/sftp/Makefile. I think it may be a bug in the portable-ization (from d194048f573136f1c2c34d25f951b78f4ffc7d77) that we can report to openssh-portable.

Excellent! I'll report it.

jlduran added a comment.EditedApr 12 2025, 3:20 PM
In D49794#1135230, @emaste wrote:

Re progressmeter.c, OpenBSD includes it only in usr.bin/ssh/scp/Makefile and usr.bin/ssh/sftp/Makefile. I think it may be a bug in the portable-ization (from d194048f573136f1c2c34d25f951b78f4ffc7d77) that we can report to openssh-portable.

Done: https://bugzilla.mindrot.org/show_bug.cgi?id=3810
EDIT: I somehow managed to make this PR private (sigh!).
I'll update the commit message. Thanks for the upstream commit ID.

jlduran updated this revision to Diff 153584.EditedApr 12 2025, 5:56 PM
jlduran edited the summary of this revision. (Show Details)
  • Remove experimental XMSS_SRCS (these should be committed separately, and guarded by WITH_XMSS)
  • Remove progressmeter.c from libssh sources, it is not needed and has been reported upstream
emaste accepted this revision.Apr 12 2025, 6:04 PM
This revision is now accepted and ready to land.Apr 12 2025, 6:04 PM
jlduran added a comment.Apr 15 2025, 9:49 PM
In D49794#1135292, @jlduran wrote:
  • Remove experimental XMSS_SRCS (these should be committed separately, and guarded by WITH_XMSS)
  • Remove progressmeter.c from libssh sources, it is not needed and has been reported upstream

Note to self for future chronology examination:
https://github.com/openbsd/src/commit/77e911c735dab739b86bb02a31350b238272b3e8

Closed by commit rG8c6bf983a914: secure: Match SRCS with upstream Makefile.in (authored by jlduran). · Explain WhyApr 17 2025, 7:20 PM
This revision was automatically updated to reflect the committed changes.
jlduran added a commit: rG8c6bf983a914: secure: Match SRCS with upstream Makefile.in.
jlduran added a comment.Apr 19 2025, 5:01 PM
In D49794#1135230, @emaste wrote:

Re progressmeter.c, OpenBSD includes it only in usr.bin/ssh/scp/Makefile and usr.bin/ssh/sftp/Makefile. I think it may be a bug in the portable-ization (from d194048f573136f1c2c34d25f951b78f4ffc7d77) that we can report to openssh-portable.

Let's wait for a response on OpenSSH PR 3810, from OpenBSD:

  • 77e911c735da ("move progressmeter.c to libssh")
  • e34d28941f95 ("ssh/lib hasn't worked towards our code-sharing goals...")

Revision Contents
Changeset List

PathSize
secure/
usr.sbin/
sshd/
3 lines

Diff 153792

View Options

secure/usr.sbin/sshd/Makefile

Loading...