summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-09-14 23:42:11 +0100
committerColin Watson <cjwatson@debian.org>2013-09-14 23:42:11 +0100
commit327155e6824b3ee13837bdde04e4eb47e147ff46 (patch)
tree8f8743122403c7a2e6ed919156711fb1520c657f /Makefile.in
parent0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff)
parent74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff)
* 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).
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in20
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 @@
1# $Id: Makefile.in,v 1.336 2013/03/07 15:37:13 tim Exp $ 1# $Id: Makefile.in,v 1.340 2013/06/11 01:26:10 dtucker Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -125,6 +125,8 @@ PATHSUBS = \
125 -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g' 125 -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g'
126 126
127FIXPATHSCMD = $(SED) $(PATHSUBS) 127FIXPATHSCMD = $(SED) $(PATHSUBS)
128FIXALGORITHMSCMD= $(SHELL) $(srcdir)/fixalgorithms $(SED) \
129 @UNSUPPORTED_ALGORITHMS@
128 130
129all: $(CONFIGFILES) $(MANPAGES) $(TARGETS) 131all: $(CONFIGFILES) $(MANPAGES) $(TARGETS)
130 132
@@ -191,9 +193,10 @@ $(MANPAGES): $(MANPAGES_IN)
191 manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \ 193 manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \
192 fi; \ 194 fi; \
193 if test "$(MANTYPE)" = "man"; then \ 195 if test "$(MANTYPE)" = "man"; then \
194 $(FIXPATHSCMD) $${manpage} | $(AWK) -f $(srcdir)/mdoc2man.awk > $@; \ 196 $(FIXPATHSCMD) $${manpage} | $(FIXALGORITHMSCMD) | \
197 $(AWK) -f $(srcdir)/mdoc2man.awk > $@; \
195 else \ 198 else \
196 $(FIXPATHSCMD) $${manpage} > $@; \ 199 $(FIXPATHSCMD) $${manpage} | $(FIXALGORITHMSCMD) > $@; \
197 fi 200 fi
198 201
199$(CONFIGFILES): $(CONFIGFILES_IN) 202$(CONFIGFILES): $(CONFIGFILES_IN)
@@ -394,15 +397,14 @@ uninstall:
394 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 397 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
395 398
396regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c 399regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
397 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ 400 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress
398 $(CC) $(CPPFLAGS) -o $@ $? \ 401 [ -f `pwd`/regress/Makefile ] || \
399 $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) 402 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
403 $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
404 $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
400 405
401tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) 406tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT)
402 BUILDDIR=`pwd`; \ 407 BUILDDIR=`pwd`; \
403 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
404 [ -f `pwd`/regress/Makefile ] || \
405 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \
406 TEST_SHELL="@TEST_SHELL@"; \ 408 TEST_SHELL="@TEST_SHELL@"; \
407 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ 409 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
408 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ 410 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \