Date: Mon, 19 Mar 2012 11:55:12 -0400 From: Eitan Adler <eadler@freebsd.org> To: John Baldwin <jhb@freebsd.org>, Colin Percival <cperciva@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r233136 - in head/secure: usr.bin/ssh usr.sbin/sshd Message-ID: <CAF6rxg=0BPZ_w2debm_D_bD-d2NM%2BA5F4yL6=BCj6ADStCFH9A@mail.gmail.com> In-Reply-To: <CAF6rxgk1zfS8hDQPmFWEYZEFehvxyjUSZhbH-WXMLn3rLc754w@mail.gmail.com> References: <201203190041.q2J0femX042684@svn.freebsd.org> <201203190835.27561.jhb@freebsd.org> <CAF6rxgk1zfS8hDQPmFWEYZEFehvxyjUSZhbH-WXMLn3rLc754w@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
>> This looks wrong. =C2=A0While X11BASE is certainly dead, LOCALBASE is no=
t, so the
>> existing code should have been changed, but not removed.
Does this look good?
Build tested only.
commit 271b766fdbd907be040767f2387b4d5fbb6425f7
Author: Eitan Adler <lists@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+=3D ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LI=
BASN1}
LDADD+=3D -lgssapi_krb5 -lgssapi -lkrb5 -lasn1
.endif
+LOCALBASE?=3D /usr/local
+CFLAGS+=3D -DXAUTH_PATH=3D\"${LOCALBASE}/bin/xauth\"
+
DPADD+=3D ${LIBCRYPTO} ${LIBCRYPT}
LDADD+=3D -lcrypto -lcrypt
--=20
Eitan Adler
Source & Ports committer
X11, Bugbusting teams
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxg=0BPZ_w2debm_D_bD-d2NM%2BA5F4yL6=BCj6ADStCFH9A>