Page MenuHomeFreeBSD

openssh: consolidate some globally-applicable flags
ClosedPublic

Authored by emaste on Sep 10 2021, 5:22 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Feb 21, 3:56 AM
Unknown Object (File)
Thu, Feb 20, 11:34 PM
Unknown Object (File)
Sat, Feb 15, 1:32 PM
Unknown Object (File)
Fri, Feb 7, 4:24 PM
Unknown Object (File)
Tue, Feb 4, 7:25 PM
Unknown Object (File)
Tue, Feb 4, 4:03 AM
Unknown Object (File)
Tue, Feb 4, 3:58 AM
Unknown Object (File)
Tue, Feb 4, 1:27 AM
Subscribers

Details

Summary

Pretty much all applications/libs built out of openssh define a common
set of options:

  • HAVE_LDNS is only relevant for applications that build readconf.c and

libssh, which builds getrrsetbyname off of ldns, but defining it is more
future-proof.

  • All of them include ssh_namespace.h, and include out of

crypto/openssh.

Moving these into crypto/openssh reduces the boilerplate and gives us
a central place if we run into other options like HAVE_LDNS.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

Moving these into crypto/openssh

Yes, although it is somewhat odd that the build infrastructure is now split between secure/* and crypto/openssh/

crypto/openssh/Makefile.freebsd
12–13 ↗(On Diff #94938)

I think the real reason is to accommodate WITH_/WITHOUT_LDNS src.conf setting. Perhaps we should do the same with LIBWRAP from secure/usr.sbin/sshd/Makefile?

crypto/openssh/Makefile.freebsd
12–13 ↗(On Diff #94938)

Ah, good point; will do. I'll move this guy to secure/Makefile.openssh or something as well...

It seems I did something similar, in 9d63429fa16352f58037ac2aa6ddc734b25e8331
I think it still makes sense to move the HAVE_LDNS / LIBWRAP flags (and anything else left) there.

emaste updated this revision to Diff 104902.
emaste edited reviewers, added: kevans; removed: emaste.

move to ssh.mk, rebase after 9d63429fa163

I completely forgot about this... LGTM.

This revision is now accepted and ready to land.Tue, Feb 11, 8:41 PM

I completely forgot about this... LGTM.

I did too -- I just found it again while trying to rebase my WIP tree over the 9.8 and 9.9 updates :)