Page MenuHomeFreeBSD

ssh: Move XAUTH_PATH setting to ssh.mk
ClosedPublic

Authored by emaste on Feb 9 2025, 11:42 PM.
Tags
None
Referenced Files
F139406345: D48907.id150760.diff
Thu, Dec 11, 6:06 PM
Unknown Object (File)
Wed, Dec 3, 4:08 AM
Unknown Object (File)
Fri, Nov 28, 6:55 AM
Unknown Object (File)
Thu, Nov 27, 6:53 PM
Unknown Object (File)
Thu, Nov 27, 1:42 PM
Unknown Object (File)
Thu, Nov 27, 1:48 AM
Unknown Object (File)
Tue, Nov 25, 9:28 PM
Unknown Object (File)
Tue, Nov 25, 2:33 PM
Subscribers

Details

Summary
XAUTH_PATH is normally set (in the upstream build infrastructure) in
config.h.  We previously set it in ssh and sshd's Makefiles if LOCALBASE
is set, and over time have occasionally defined it in config.h.

Leave it unset in config.h and move the CFLAGS logic to to ssh.mk so
that it will be set when building all ssh libraries and programs but
still be set by LOCALBASE.

Diff Detail

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

Event Timeline

emaste created this revision.
crypto/openssh/config.h
2018

Note that crypto/openssh/freebsd-configure.sh runs configure with --without-xauth so this is more consistent with the way we generate config.h.

secure/ssh.mk
12

Or ${LOCALBASE:U/usr/local}

This revision is now accepted and ready to land.Feb 10 2025, 2:57 AM

Use /usr/local by default if LOCALBASE not set

This revision now requires review to proceed.Feb 10 2025, 1:08 PM
jlduran added inline comments.
secure/ssh.mk
12

With this approach, LOCALBASE and XAUTH_PATH will always be defined (and therefore _PATH_XAUTH).
I guess this is what is desired.

This revision is now accepted and ready to land.Feb 10 2025, 4:13 PM
This revision was automatically updated to reflect the committed changes.