summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 225eff6cc..88b46a19d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
5 - (djm) [atomicio.c configure.ac] Disable poll() fallback in atomiciov for 5 - (djm) [atomicio.c configure.ac] Disable poll() fallback in atomiciov for
6 Tru64. readv doesn't seem to be a comparable object there. 6 Tru64. readv doesn't seem to be a comparable object there.
7 bz#1386, patch from dtucker@ ok me 7 bz#1386, patch from dtucker@ ok me
8 - (djm) [Makefile.in] Pass though pass to conch for interop tests
8 - (djm) OpenBSD CVS Sync 9 - (djm) OpenBSD CVS Sync
9 - djm@cvs.openbsd.org 2008/07/04 23:08:25 10 - djm@cvs.openbsd.org 2008/07/04 23:08:25
10 [packet.c] 11 [packet.c]
@@ -4590,4 +4591,4 @@
4590 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4591 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4591 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4592 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4592 4593
4593$Id: ChangeLog,v 1.5062 2008/07/04 23:44:53 djm Exp $ 4594$Id: ChangeLog,v 1.5063 2008/07/04 23:50:23 djm Exp $
diff --git a/Makefile.in b/Makefile.in
index dd26ae0e7..5b63d896e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.295 2008/06/26 05:59:32 djm Exp $ 1# $Id: Makefile.in,v 1.296 2008/07/04 23:50:24 djm 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@
@@ -396,6 +396,7 @@ tests interop-tests: $(TARGETS)
396 TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ 396 TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
397 TEST_SSH_PLINK="plink"; \ 397 TEST_SSH_PLINK="plink"; \
398 TEST_SSH_PUTTYGEN="puttygen"; \ 398 TEST_SSH_PUTTYGEN="puttygen"; \
399 TEST_SSH_CONCH="conch"; \
399 TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ 400 TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
400 cd $(srcdir)/regress || exit $$?; \ 401 cd $(srcdir)/regress || exit $$?; \
401 $(MAKE) \ 402 $(MAKE) \
@@ -415,6 +416,7 @@ tests interop-tests: $(TARGETS)
415 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ 416 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
416 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ 417 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
417 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ 418 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
419 TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
418 TEST_SSH_IPV6="@TEST_SSH_IPV6@" \ 420 TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
419 EXEEXT="$(EXEEXT)" \ 421 EXEEXT="$(EXEEXT)" \
420 $@ 422 $@