From owner-svn-src-head@FreeBSD.ORG Mon Mar 19 15:55:45 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 D1E4A106566C for ; Mon, 19 Mar 2012 15:55:45 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 548808FC15 for ; Mon, 19 Mar 2012 15:55:44 +0000 (UTC) Received: by wern13 with SMTP id n13so7886285wer.13 for ; Mon, 19 Mar 2012 08:55:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=kCVkR7GKZV6TaeyPBcj+uJK9Cp3AwfhPtKL0XbJqdeA=; b=aYiSXUVNVRRNdGYilv88zDhCKNral5V3PbwzljO82qa5r8E+HqLDR6Nk5lf1WnQpHR ZNj7oY2/Yk96ZIJQdOIxBHMA5po0NO/BNrwh2xGoixKZ/ndcoxIoT6EiQv2b7oHiLuK3 cjZ0Z+5/csY9YuN0Txr9moiJvlbDq4VBDpz8s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :content-transfer-encoding:x-gm-message-state; bh=kCVkR7GKZV6TaeyPBcj+uJK9Cp3AwfhPtKL0XbJqdeA=; b=m46ltf0q2Az5fFqYTPvwP1oZsCvbA9+ls7+1sH5vyyqgMGdkBZKhnUfT7GS4iJjttB G3VEJ16Cbmwwox9Liqao0+96aNjwtDcySiiEDq76KuhzGj0FDPZUYBNvT4hbn5ZoouL8 X9tMML8upV+MRbU5Ydvq8A37QjN10ytK4xBEjI7QIfuU8c+NpKYOYbI5uVHCaHvw8F12 hwcyjPsFZg75kYPI00vfG8IrHzDlG0lBR9O5iB042Rh2bYYfLydvp4frh+TCVan3A9wo eivk0izkNuAqbF6LTFFfiTK7AlYlkerkutJZmpynG44yLz94/4xQJE0Kc9ZvsYRcLS3M Lhiw== Received: by 10.216.136.131 with SMTP id w3mr7564200wei.15.1332172544299; Mon, 19 Mar 2012 08:55:44 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.223.63.4 with HTTP; Mon, 19 Mar 2012 08:55:12 -0700 (PDT) In-Reply-To: References: <201203190041.q2J0femX042684@svn.freebsd.org> <201203190835.27561.jhb@freebsd.org> From: Eitan Adler Date: Mon, 19 Mar 2012 11:55:12 -0400 X-Google-Sender-Auth: Nzt1ao-iEJrYMdc1x6ENQEzpxm0 Message-ID: To: John Baldwin , Colin Percival Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Gm-Message-State: ALoCoQmSStexXTakzzq80ysxHWbuPFWHEFmFawuPqMP71Ux0KKHOHFvJbPYOWHvuexkY3R86387O 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 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 15:55:45 -0000 >> 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 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