Date: Thu, 21 Jan 2016 10:57:45 +0000 (UTC) From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r294494 - head/crypto/openssh Message-ID: <201601211057.u0LAvjR2078595@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601211057.u0LAvjR2078595>