From owner-cvs-src@FreeBSD.ORG  Wed Mar  5 20:58:15 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 80EFD106566C;
	Wed,  5 Mar 2008 20:58:15 +0000 (UTC)
	(envelope-from kris@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 76FB28FC16;
	Wed,  5 Mar 2008 20:58:15 +0000 (UTC)
	(envelope-from kris@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m25KwFF9099382;
	Wed, 5 Mar 2008 20:58:15 GMT (envelope-from kris@repoman.freebsd.org)
Received: (from kris@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m25KwFP6099381;
	Wed, 5 Mar 2008 20:58:15 GMT (envelope-from kris)
Message-Id: <200803052058.m25KwFP6099381@repoman.freebsd.org>
From: Kris Kennaway <kris@FreeBSD.org>
Date: Wed, 5 Mar 2008 20:58:15 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/secure/usr.bin/ssh Makefile src/secure/usr.sbin/sshd
 Makefile
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Mar 2008 20:58:15 -0000

kris        2008-03-05 20:58:15 UTC

  FreeBSD src repository

  Modified files:
    secure/usr.bin/ssh   Makefile 
    secure/usr.sbin/sshd Makefile 
  Log:
  For users of FreeBSD <= 6.2 we recommend during the x.org 7.x upgrade
  that they add X11BASE=${LOCALBASE} to /etc/make.conf since X11BASE was
  hard-wired to the now-wrong location in old releases.
  
  However, both X11BASE and LOCALBASE have moved out of scope of src/
  into ports/ now, which causes problems for upgraded users who have old
  make.conf files still containing the above setting.  X11BASE becomes
  null and we instruct ssh and sshd to look for xauth in /bin/xauth
  where it is unlikely to be found.
  
  Instead, provide a copy of the default LOCALBASE?=/usr/local setting
  here.
  
  We also have to deal with the case where the user only overrides
  LOCALBASE and doesn't set an explicit X11BASE (in ports it will be set
  implicitly but not here), which will also move the location of xauth.
  
  MFC after:       3 days
  Reported by:     rwatson
  
  Revision  Changes    Path
  1.36      +10 -1     src/secure/usr.bin/ssh/Makefile
  1.51      +9 -0      src/secure/usr.sbin/sshd/Makefile