From owner-svn-src-all@FreeBSD.ORG Thu Mar 29 01:46:57 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A62CB1065703; Thu, 29 Mar 2012 01:46:57 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 777AB8FC24; Thu, 29 Mar 2012 01:46:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2T1kvd3069356; Thu, 29 Mar 2012 01:46:57 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2T1kv7F069353; Thu, 29 Mar 2012 01:46:57 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201203290146.q2T1kv7F069353@svn.freebsd.org> From: Eitan Adler Date: Thu, 29 Mar 2012 01:46:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233634 - in stable/7/secure: usr.bin/ssh usr.sbin/sshd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2012 01:46:57 -0000 Author: eadler Date: Thu Mar 29 01:46:56 2012 New Revision: 233634 URL: http://svn.freebsd.org/changeset/base/233634 Log: MFC r233136, r233432: Restore the ability to use a non-standard LOCALBASE to sshd Add the ability to use a non-standard LOCALBASE to ssh Approved by: cperciva (implicit) Modified: stable/7/secure/usr.bin/ssh/Makefile stable/7/secure/usr.sbin/sshd/Makefile Directory Properties: stable/7/secure/usr.bin/ssh/ (props changed) stable/7/secure/usr.sbin/sshd/ (props changed) Modified: stable/7/secure/usr.bin/ssh/Makefile ============================================================================== --- stable/7/secure/usr.bin/ssh/Makefile Thu Mar 29 01:46:30 2012 (r233633) +++ stable/7/secure/usr.bin/ssh/Makefile Thu Mar 29 01:46:56 2012 (r233634) @@ -22,22 +22,13 @@ DPADD+= ${LIBGSSAPI} LDADD+= -lgssapi .endif -.if defined(X11BASE) || defined(LOCALBASE) -# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org -# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/ -# so we need to provide the default for users with old make.conf -# settings. -LOCALBASE?= /usr/local - -# Users may override either LOCALBASE or X11BASE to move the location -# of xauth -X11BASE?= ${LOCALBASE} -CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\" -.endif - DPADD+= ${LIBCRYPT} ${LIBCRYPTO} LDADD+= -lcrypt -lcrypto +.if defined(LOCALBASE) +CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" +.endif + .include .PATH: ${SSHDIR} Modified: stable/7/secure/usr.sbin/sshd/Makefile ============================================================================== --- stable/7/secure/usr.sbin/sshd/Makefile Thu Mar 29 01:46:30 2012 (r233633) +++ stable/7/secure/usr.sbin/sshd/Makefile Thu Mar 29 01:46:56 2012 (r233634) @@ -37,22 +37,13 @@ DPADD+= ${LIBGSSAPI} ${LIBGSSAPI_KRB5} LDADD+= -lgssapi -lgssapi_krb5 .endif -.if defined(X11BASE) -# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org -# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/ -# so we need to provide the default for users with old make.conf -# settings. -LOCALBASE?= /usr/local - -# Users may override either LOCALBASE or X11BASE to move the location -# of xauth -X11BASE?= ${LOCALBASE} -CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\" -.endif - DPADD+= ${LIBCRYPTO} ${LIBCRYPT} LDADD+= -lcrypto -lcrypt +.if defined(LOCALBASE) +CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" +.endif + .include .PATH: ${SSHDIR}