From owner-svn-src-all@freebsd.org  Thu Jan 21 10:57:46 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77517A8AC55;
 Thu, 21 Jan 2016 10:57:46 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 45A9C1DD4;
 Thu, 21 Jan 2016 10:57:46 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LAvjhD078596;
 Thu, 21 Jan 2016 10:57:45 GMT (envelope-from des@FreeBSD.org)
Received: (from des@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LAvjR2078595;
 Thu, 21 Jan 2016 10:57:45 GMT (envelope-from des@FreeBSD.org)
Message-Id: <201601211057.u0LAvjR2078595@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org
 using -f
From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org>
Date: Thu, 21 Jan 2016 10:57:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294494 - head/crypto/openssh
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jan 2016 10:57:46 -0000

Author: des
Date: Thu Jan 21 10:57:45 2016
New Revision: 294494
URL: https://svnweb.freebsd.org/changeset/base/294494

Log:
  Take care not to pick up the wrong version of OpenSSL when running in an
  environment that has OpenSSL from ports in addition to the base version.

Modified:
  head/crypto/openssh/freebsd-configure.sh

Modified: head/crypto/openssh/freebsd-configure.sh
==============================================================================
--- head/crypto/openssh/freebsd-configure.sh	Thu Jan 21 08:58:39 2016	(r294493)
+++ head/crypto/openssh/freebsd-configure.sh	Thu Jan 21 10:57:45 2016	(r294494)
@@ -7,6 +7,7 @@ configure_args="
     --prefix=/usr
     --sysconfdir=/etc/ssh
     --with-pam
+    --with-ssl-dir=/usr
     --with-tcp-wrappers
     --with-libedit
     --with-ssl-engine
@@ -18,11 +19,16 @@ set -e
 # make sure configure uses the correct compiler
 export CC=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCC)
 export CPP=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCPP)
+unset CFLAGS CPPFLAGS LDFLAGS LIBS
 
 # regenerate configure and config.h.in
 autoheader
 autoconf
 
+# reset PATH to avoid picking up the wrong libraries
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+unset LD_LIBRARY_PATH
+
 # generate config.h with krb5 and stash it
 sh configure $configure_args --with-kerberos5
 mv config.log config.log.orig