Page MenuHomeFreeBSD

openssh: consolidate some globally-applicable flags
Needs ReviewPublic

Authored by emaste on Sep 10 2021, 5:22 AM.
Tags
None
Referenced Files
F108095818: D31896.id104903.diff
Tue, Jan 21, 8:25 AM
F108091774: D31896.id104902.diff
Tue, Jan 21, 7:36 AM
F108022972: D31896.diff
Mon, Jan 20, 3:32 PM
Unknown Object (File)
Sat, Jan 18, 10:13 PM
Unknown Object (File)
Sat, Jan 18, 9:31 PM
Unknown Object (File)
Dec 4 2024, 7:45 PM
Unknown Object (File)
Nov 25 2024, 12:29 PM
Unknown Object (File)
Nov 23 2024, 1:10 PM
Subscribers

Details

Reviewers
des
kevans
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

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 41456
Build 38345: arc lint + arc unit

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

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

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