* New upstream release (http://www.openssh.com/txt/release-6.3).

  - sftp(1): add support for resuming partial downloads using the "reget"
    command and on the sftp commandline or on the "get" commandline using
    the "-a" (append) option (closes: #158590).
  - ssh(1): add an "IgnoreUnknown" configuration option to selectively
    suppress errors arising from unknown configuration directives (closes:
    #436052).
  - sftp(1): update progressmeter when data is acknowledged, not when it's
    sent (partially addresses #708372).
  - ssh(1): do not fatally exit when attempting to cleanup multiplexing-
    created channels that are incompletely opened (closes: #651357).

1 files changed, 11 insertions, 9 deletions

diff --git a/Makefile.in b/Makefile.in
index 5b2431d4a..839abbd48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.336 2013/03/07 15:37:13 tim Exp $
+# $Id: Makefile.in,v 1.340 2013/06/11 01:26:10 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -125,6 +125,8 @@ PATHSUBS	= \
         -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g'
 
 FIXPATHSCMD     = $(SED) $(PATHSUBS)
+FIXALGORITHMSCMD= $(SHELL) $(srcdir)/fixalgorithms $(SED) \
+                     @UNSUPPORTED_ALGORITHMS@
 
 all: $(CONFIGFILES) $(MANPAGES) $(TARGETS)
 
@@ -191,9 +193,10 @@ $(MANPAGES): $(MANPAGES_IN)
                 manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \
         fi; \
         if test "$(MANTYPE)" = "man"; then \
-                $(FIXPATHSCMD) $${manpage} | $(AWK) -f $(srcdir)/mdoc2man.awk > $@; \
+                $(FIXPATHSCMD) $${manpage} | $(FIXALGORITHMSCMD) | \
+                    $(AWK) -f $(srcdir)/mdoc2man.awk > $@; \
         else \
-                $(FIXPATHSCMD) $${manpage} > $@; \
+                $(FIXPATHSCMD) $${manpage} | $(FIXALGORITHMSCMD) > $@; \
         fi
 
 $(CONFIGFILES): $(CONFIGFILES_IN)
@@ -394,15 +397,14 @@ uninstall:
         -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
 
 regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
-        [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress; \
-        $(CC) $(CPPFLAGS) -o $@ $? \
-        $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+        [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress
+        [ -f `pwd`/regress/Makefile ]  || \
+            ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
+        $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
+        $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
 tests interop-tests:    $(TARGETS) regress/modpipe$(EXEEXT)
         BUILDDIR=`pwd`; \
-        [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress; \
-        [ -f `pwd`/regress/Makefile ]  || \
-            ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \
         TEST_SHELL="@TEST_SHELL@"; \
         TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
         TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \