On Monday, March 19, 2012 11:55:12 am Eitan Adler wrote:
> >> This looks wrong. While X11BASE is certainly dead, LOCALBASE is not, so
the
> >> existing code should have been changed, but not removed.
>
> Does this look good?
> Build tested only.
Hmm, I will defer to Des. Previously the make glue did not hardcode
/usr/local as the default LOCALBASE, instead it only modfied CFLAGS if
LOCALBASE was defined. (And presumably the openssh code has its own
hardcoded copy of XAUTH_PATH as /usr/local/bin/xauth.) It's not clear if it
is better in the case that LOCALBASE is not defined to rely on openssh's
hardcoded default or to hardcode the default in our bmake glue. I would lean
towards the former since it matches the previous behavior, or in shorter form:
.ifdef LOCALBASE
CFLAGS+= /* blah bblah */
.endif
And not do anything if LOCALBASE is not set. Also, the original commit
touched two Makefiles, this patch only fixes one of them.
> commit 271b766fdbd907be040767f2387b4d5fbb6425f7
> Author: Eitan Adler <li...@eitanadler.com>
> Date: Mon Mar 19 11:52:31 2012 -0400
>
> Restore the ability to use a non-standard LOCALBASE
>
> Submitted by: jhb
> Approved by: cperciva
> MFC after: 0 days (with r233136)
>
> diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
> index 0120771..6426ff3 100644
> --- a/secure/usr.sbin/sshd/Makefile
> +++ b/secure/usr.sbin/sshd/Makefile
> @@ -40,6 +40,9 @@ DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5}
${LIBASN1}
> LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lasn1
> .endif
>
> +LOCALBASE?= /usr/local
> +CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
> +
> DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
> LDADD+= -lcrypto -lcrypt
>
>
>
> --
> Eitan Adler
> Source & Ports committer
> X11, Bugbusting teams
>
--
John Baldwin
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
