From owner-svn-src-head@FreeBSD.ORG Mon Mar 19 20:41:48 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0916C1065675; Mon, 19 Mar 2012 20:41:48 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id CDBEE8FC14; Mon, 19 Mar 2012 20:41:47 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) by cyrus.watson.org (Postfix) with ESMTPSA id 8763046B1A; Mon, 19 Mar 2012 16:41:47 -0400 (EDT) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id AC7C1B963; Mon, 19 Mar 2012 16:41:46 -0400 (EDT) From: John Baldwin To: Eitan Adler Date: Mon, 19 Mar 2012 13:59:33 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p10; KDE/4.5.5; amd64; ; ) References: <201203190041.q2J0femX042684@svn.freebsd.org> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201203191359.34178.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 19 Mar 2012 16:41:46 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, des@freebsd.org, Colin Percival Subject: Re: svn commit: r233136 - in head/secure: usr.bin/ssh usr.sbin/sshd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Mar 2012 20:41:48 -0000 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 > 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