RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [configure.ac] Recursively expand $(bindir) to ensure it has no 

unexpanded $(prefix) embedded. bz#2007 patch from nix-corp AT
   esperi.org.uk; ok dtucker@
This commit is contained in:
Damien Miller 2012-07-06 11:49:28 +10:00
parent a0433a7096
commit 77eab7b024
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@
- (djm) [sandbox-seccomp-filter.c] fallback to rlimit if seccomp filter is - (djm) [sandbox-seccomp-filter.c] fallback to rlimit if seccomp filter is
not available. Allows use of sshd compiled on host with a filter-capable not available. Allows use of sshd compiled on host with a filter-capable
kernel on hosts that lack the support. bz#2011 ok dtucker@ kernel on hosts that lack the support. bz#2011 ok dtucker@
- (djm) [configure.ac] Recursively expand $(bindir) to ensure it has no
unexpanded $(prefix) embedded. bz#2007 patch from nix-corp AT
esperi.org.uk; ok dtucker@
20120704 20120704
- (dtucker) [configure.ac openbsd-compat/bsd-misc.h] Add setlinebuf for - (dtucker) [configure.ac openbsd-compat/bsd-misc.h] Add setlinebuf for

21
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.495 2012/07/03 22:50:10 dtucker Exp $ # $Id: configure.ac,v 1.496 2012/07/06 01:49:29 djm Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
AC_REVISION($Revision: 1.495 $) AC_REVISION($Revision: 1.496 $)
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C]) AC_LANG([C])
@ -4005,13 +4005,16 @@ otherwise scp will not work.])
[ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ] [ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ]
) )
# make sure $bindir is in USER_PATH so scp will work # make sure $bindir is in USER_PATH so scp will work
t_bindir=`eval echo ${bindir}` t_bindir="${bindir}"
case $t_bindir in while echo "${t_bindir}" | egrep '\$\{|NONE/' >/dev/null 2>&1; do
NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$prefix~"` ;; t_bindir=`eval echo ${t_bindir}`
esac case $t_bindir in
case $t_bindir in NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$prefix~"` ;;
NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$ac_default_prefix~"` ;; esac
esac case $t_bindir in
NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$ac_default_prefix~"` ;;
esac
done
echo $user_path | grep ":$t_bindir" > /dev/null 2>&1 echo $user_path | grep ":$t_bindir" > /dev/null 2>&1
if test $? -ne 0 ; then if test $? -ne 0 ; then
echo $user_path | grep "^$t_bindir" > /dev/null 2>&1 echo $user_path | grep "^$t_bindir" > /dev/null 2>&1