From d57a76eec557a9ff43764f2fffdf994e0141ce5b Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 18 Jun 2003 22:32:51 +1000
Subject:  - (dtucker) OpenBSD CVS Sync (regress/)    - markus@cvs.openbsd.org
 2003/04/02 12:21:13      [Makefile]      enable rekey test

---
 regress/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'regress/Makefile')

diff --git a/regress/Makefile b/regress/Makefile
index 6e2029348..938b7d3de 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.20 2003/01/08 23:54:22 djm Exp $
+#	$OpenBSD: Makefile,v 1.21 2003/04/02 12:21:13 markus Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7
 
@@ -11,6 +11,7 @@ LTESTS= 	connect \
 		proto-mismatch \
 		exit-status \
 		transfer \
+		rekey \
 		stderr-data \
 		stderr-after-eof \
 		broken-pipe \
-- 
cgit v1.2.3


From a4040f5904b2f7adc5fcf1656bf47a202b54ca45 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 18 Jun 2003 22:35:11 +1000
Subject:  - (dtucker) OpenBSD CVS Sync (regress/)    - djm@cvs.openbsd.org
 2003/04/04 09:34:22      [Makefile sftp-cmds.sh]      More regression tests,
 including recent directory rename bug; ok markus@

---
 ChangeLog            |  5 ++++-
 regress/Makefile     |  3 ++-
 regress/sftp-cmds.sh | 13 ++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index b1d1e92fa..b9cb8da0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,9 @@
    - markus@cvs.openbsd.org 2003/04/02 12:21:13
      [Makefile]
      enable rekey test
+   - djm@cvs.openbsd.org 2003/04/04 09:34:22
+     [Makefile sftp-cmds.sh]
+     More regression tests, including recent directory rename bug; ok markus@
 
 20030614
  - (djm) Update license on fake-rfc2553.[ch]; ok itojun@
@@ -545,4 +548,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2811 2003/06/18 12:32:51 dtucker Exp $
+$Id: ChangeLog,v 1.2812 2003/06/18 12:35:11 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 938b7d3de..2b8dbd6f6 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.21 2003/04/02 12:21:13 markus Exp $
+#	$OpenBSD: Makefile,v 1.22 2003/04/04 09:34:22 djm Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7
 
@@ -25,6 +25,7 @@ LTESTS= 	connect \
 		keygen-change \
 		sftp \
 		sftp-cmds \
+		sftp-badcmds \
 		sftp-batch \
 		forwarding
 
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index 462c6802f..987887ff0 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: sftp-cmds.sh,v 1.2 2003/01/10 07:52:41 djm Exp $
+#	$OpenBSD: sftp-cmds.sh,v 1.3 2003/04/04 09:34:22 djm Exp $
 #	Placed in the Public Domain.
 
 # XXX - TODO: 
@@ -11,7 +11,7 @@ tid="sftp commands"
 DATA=/bin/ls
 COPY=${OBJ}/copy
 
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
+rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.*
 
 verbose "$tid: lls"
 echo "lls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
@@ -66,6 +66,13 @@ echo "rename $COPY ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
 test -f ${COPY}.1 || fail "missing file after rename"
 cmp $DATA ${COPY}.1 >/dev/null 2>&1 || fail "corrupted copy after rename"
 
+mkdir ${COPY}.dd
+verbose "$tid: rename directory"
+echo "rename ${COPY}.dd ${COPY}.dd2" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
+	|| fail "rename directory failed"
+test -d ${COPY}.dd && fail "oldname exists after rename directory"
+test -d ${COPY}.dd2 || fail "missing newname after rename directory"
+
 verbose "$tid: ln"
 echo "ln ${COPY}.1 ${COPY}.2" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 || fail "ln failed"
 test -L ${COPY}.2 || fail "missing file after ln"
@@ -95,6 +102,6 @@ verbose "$tid: lchdir"
 echo "lchdir ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
 	|| fail "lchdir failed"
 
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
+rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.*
 
 
-- 
cgit v1.2.3


From 50cea67222ce5d5d5d334c8dd8eb5885d056ba04 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 18 Jun 2003 22:45:34 +1000
Subject:  - (dtucker) OpenBSD CVS Sync (regress/)    - markus@cvs.openbsd.org
 2003/06/12 15:43:32      [Makefile]      test -HUP; dtucker at zip.com.au

---
 ChangeLog        | 5 ++++-
 regress/Makefile | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index 6bd455c2d..184b747d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,9 @@
    - markus@cvs.openbsd.org 2003/06/12 15:40:01
      [try-ciphers.sh]
      add ctr
+   - markus@cvs.openbsd.org 2003/06/12 15:43:32
+     [Makefile]
+     test -HUP; dtucker at zip.com.au
 
 20030614
  - (djm) Update license on fake-rfc2553.[ch]; ok itojun@
@@ -557,4 +560,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2815 2003/06/18 12:43:13 dtucker Exp $
+$Id: ChangeLog,v 1.2816 2003/06/18 12:45:34 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 2b8dbd6f6..7b67ad314 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.22 2003/04/04 09:34:22 djm Exp $
+#	$OpenBSD: Makefile,v 1.23 2003/06/12 15:43:32 markus Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7
 
@@ -27,6 +27,7 @@ LTESTS= 	connect \
 		sftp-cmds \
 		sftp-badcmds \
 		sftp-batch \
+		reconfigure \
 		forwarding
 
 USER!=		id -un
-- 
cgit v1.2.3


From e2f2be7a3abd4176baded47da1d1d02de3ed1984 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 3 Jul 2003 20:27:55 +1000
Subject:    - markus@cvs.openbsd.org 2003/07/03 08:24:13     
 [regress/Makefile]      enable tests for dynamic fwd via socks (-D), uses
 nc(1)

---
 ChangeLog        | 5 ++++-
 regress/Makefile | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index a25c622c8..513b0f109 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
    - markus@cvs.openbsd.org 2003/07/03 08:21:46
      [regress/dynamic-forward.sh]
      add socks5; speedup; reformat; based on patch from dtucker@zip.com.au
+   - markus@cvs.openbsd.org 2003/07/03 08:24:13
+     [regress/Makefile]
+     enable tests for dynamic fwd via socks (-D), uses nc(1)
 
 20030630
  - (djm) Search for support functions necessary to build our 
@@ -647,4 +650,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2842 2003/07/03 10:26:04 dtucker Exp $
+$Id: ChangeLog,v 1.2843 2003/07/03 10:27:55 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 7b67ad314..c3baf78a1 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.23 2003/06/12 15:43:32 markus Exp $
+#	$OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7
 
@@ -28,6 +28,7 @@ LTESTS= 	connect \
 		sftp-badcmds \
 		sftp-batch \
 		reconfigure \
+		dynamic-forward \
 		forwarding
 
 USER!=		id -un
-- 
cgit v1.2.3


From ebc3c13d40f36d0772ee8d204a19a1def0190754 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 4 Sep 2003 15:37:58 +1000
Subject:    - [regress/Makefile] Remove BSDisms.

---
 ChangeLog        |  3 ++-
 regress/Makefile | 29 +++++++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index f8c93d16e..858e595c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@
    - [regress/sftp-cmds.sh] Use portable "test" option.
    - [regress/test-exec.sh] Use sudo, search for "whoami" equivalent, always
      use Strictmodes no, wait longer for sshd startup.
+   - [regress/Makefile] Remove BSDisms.
 
 20030903
  - (djm) OpenBSD CVS Sync
@@ -1013,4 +1014,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2956 2003/09/04 05:35:48 dtucker Exp $
+$Id: ChangeLog,v 1.2957 2003/09/04 05:37:58 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index c3baf78a1..3e6a2483e 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,8 +1,14 @@
 #	$OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $
 
-REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7
+OBJ ?= `pwd`
+
+REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
+tests:		$(REGRESS_TARGETS)
 
 CLEANFILES+=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2
+clean:
+	@for F in $(CLEANFILES); do rm -f $(OBJ)/$${F}; done
+distclean:	clean
 
 LTESTS= 	connect \
 		proxy-connect \
@@ -36,7 +42,7 @@ CLEANFILES+=	authorized_keys_${USER} known_hosts pidfile \
 		ssh_config ssh_proxy sshd_config sshd_proxy \
 		rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
 		rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
-		ls.copy
+		ls.copy remote_pid
 
 #LTESTS+=	ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
 
@@ -49,9 +55,9 @@ t2:
 	ssh-keygen -yf t2.out | diff - ${.CURDIR}/rsa_openssh.pub
 
 t3:
-	ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub |\
-		ssh-keygen -if /dev/stdin |\
-		diff - ${.CURDIR}/rsa_openssh.pub
+	ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub
+	ssh-keygen -if $(OBJ)/rsa_secsh.pub | diff - ${.CURDIR}/rsa_openssh.pub
+	rm -f ${.CURDIR}/rsa_secsh.pub
 
 t4:
 	ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\
@@ -74,10 +80,9 @@ t7: t7.out
 	ssh-keygen -lf t7.out > /dev/null
 	ssh-keygen -Bf t7.out > /dev/null
 
-.for t in ${LTESTS}
-REGRESS_TARGETS+=t-${t}
-t-${t}:
-	sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/${t}.sh
-.endfor
-
-.include "bsd.regress.mk"
+t-exec:	${LTESTS:=.sh}
+	@if [ "x$?" = "x" ]; then exit 0; fi; \
+	for TEST in ""$?; do \
+		echo "run test $${TEST}" ... 1>&2; \
+		(sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+	done
-- 
cgit v1.2.3


From 8b2157d86ae1e9a36f200d61597b84322857db8e Mon Sep 17 00:00:00 2001
From: Tim Rice <tim@multitalents.net>
Date: Tue, 9 Sep 2003 06:07:10 -0700
Subject: [regress/Makefile] Fixes for building outside of a read-only source
 tree.

---
 ChangeLog        |  6 +++++-
 regress/Makefile | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index f352a38de..c796e53bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030909
+ - (tim) [regress/Makefile] Fixes for building outside of a read-only
+   source tree.
+
 20030908
  - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and
    _getlong in #ifndef
@@ -1044,4 +1048,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2972 2003/09/08 23:11:33 tim Exp $
+$Id: ChangeLog,v 1.2973 2003/09/09 13:07:10 tim Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 3e6a2483e..ce876d483 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -50,9 +50,9 @@ t1:
 	ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
 
 t2:
-	cat ${.CURDIR}/rsa_openssh.prv > t2.out
-	chmod 600 t2.out
-	ssh-keygen -yf t2.out | diff - ${.CURDIR}/rsa_openssh.pub
+	cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out
+	chmod 600 $(OBJ)/t2.out
+	ssh-keygen -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub
 
 t3:
 	ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub
@@ -68,17 +68,17 @@ t5:
 		awk '{print $$2}' | diff - ${.CURDIR}/t5.ok
 
 t6:
-	ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > t6.out1
-	ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > t6.out2
-	chmod 600 t6.out1
-	ssh-keygen -yf t6.out1 | diff - t6.out2
+	ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1
+	ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2
+	chmod 600 $(OBJ)/t6.out1
+	ssh-keygen -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2
 
-t7.out:
+$(OBJ)/t7.out:
 	ssh-keygen -q -t rsa -N '' -f $@
 
-t7: t7.out
-	ssh-keygen -lf t7.out > /dev/null
-	ssh-keygen -Bf t7.out > /dev/null
+t7: $(OBJ)/t7.out
+	ssh-keygen -lf $(OBJ)/t7.out > /dev/null
+	ssh-keygen -Bf $(OBJ)/t7.out > /dev/null
 
 t-exec:	${LTESTS:=.sh}
 	@if [ "x$?" = "x" ]; then exit 0; fi; \
-- 
cgit v1.2.3


From b12d16fd003a62c564290f7b6ef44d68934823e3 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 14 Sep 2003 11:40:35 +1000
Subject:  - (dtucker) [Makefile regress/Makefile] Fix portability issues
 preventing    the regression tests from running with Solaris' make.  Patch
 from Brian    Poole (raj at cerias.purdue.edu).

Further info:  Solaris' /usr/ccs/bin/make
* requires a space before "+=" (but not "=")
* does not like @for

The bit that relies on a trailing "/" on $OBJ so "rm ${OBJ}$$F works in the
current dir if OBJ isn't set is my fault.  Nasty but it works.
---
 ChangeLog        |  7 ++++++-
 Makefile.in      |  4 ++--
 regress/Makefile | 10 ++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index c76e1fc29..6b32f7b41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20030914
+ - (dtucker) [Makefile regress/Makefile] Fix portability issues preventing
+   the regression tests from running with Solaris' make.  Patch from Brian
+   Poole (raj at cerias.purdue.edu).
+
 20030913
  - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for
    slower hosts, increase to 10 sec.
@@ -1086,4 +1091,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2989 2003/09/13 12:02:05 dtucker Exp $
+$Id: ChangeLog,v 1.2990 2003/09/14 01:40:35 dtucker Exp $
diff --git a/Makefile.in b/Makefile.in
index c10b1e779..8a8774461 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.248 2003/09/12 20:02:16 tim Exp $
+# $Id: Makefile.in,v 1.249 2003/09/14 01:40:36 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -386,7 +386,7 @@ tests:	$(TARGETS)
 		.OBJDIR="$${BUILDDIR}/regress" \
 		.CURDIR="`pwd`" \
 		BUILDDIR="$${BUILDDIR}" \
-		OBJ="$${BUILDDIR}/regress" \
+		OBJ="$${BUILDDIR}/regress/" \
 		PATH="$${BUILDDIR}:$${PATH}" \
 		TEST_SSH_SSH="$${TEST_SSH_SSH}" \
 		TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \
diff --git a/regress/Makefile b/regress/Makefile
index ce876d483..c08201632 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,13 +1,11 @@
 #	$OpenBSD: Makefile,v 1.24 2003/07/03 08:24:13 markus Exp $
 
-OBJ ?= `pwd`
-
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
 
-CLEANFILES+=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2
+CLEANFILES +=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2
 clean:
-	@for F in $(CLEANFILES); do rm -f $(OBJ)/$${F}; done
+	for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done
 distclean:	clean
 
 LTESTS= 	connect \
@@ -38,13 +36,13 @@ LTESTS= 	connect \
 		forwarding
 
 USER!=		id -un
-CLEANFILES+=	authorized_keys_${USER} known_hosts pidfile \
+CLEANFILES +=	authorized_keys_${USER} known_hosts pidfile \
 		ssh_config ssh_proxy sshd_config sshd_proxy \
 		rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
 		rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
 		ls.copy remote_pid
 
-#LTESTS+=	ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
+#LTESTS +=	ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
 
 t1:
 	ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
-- 
cgit v1.2.3


From 7b6cb5c5ef9ddd12e7cb695357209f1c08a57fc5 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 14 Sep 2003 13:16:55 +1000
Subject:  - (dtucker) [regress/Makefile] AIX's make doesn't like " +=", so
 replace    with vanilla "=".

Hopefully everybody's "make" will be happy with that.
---
 ChangeLog        | 4 +++-
 regress/Makefile | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index 6b32f7b41..3f1a4cfec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
  - (dtucker) [Makefile regress/Makefile] Fix portability issues preventing
    the regression tests from running with Solaris' make.  Patch from Brian
    Poole (raj at cerias.purdue.edu).
+ - (dtucker) [regress/Makefile] AIX's make doesn't like " +=", so replace
+   with vanilla "=".
 
 20030913
  - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for
@@ -1091,4 +1093,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2990 2003/09/14 01:40:35 dtucker Exp $
+$Id: ChangeLog,v 1.2991 2003/09/14 03:16:55 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index c08201632..623be8d82 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -3,7 +3,6 @@
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
 
-CLEANFILES +=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2
 clean:
 	for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done
 distclean:	clean
@@ -36,7 +35,8 @@ LTESTS= 	connect \
 		forwarding
 
 USER!=		id -un
-CLEANFILES +=	authorized_keys_${USER} known_hosts pidfile \
+CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
+		authorized_keys_${USER} known_hosts pidfile \
 		ssh_config ssh_proxy sshd_config sshd_proxy \
 		rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
 		rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
-- 
cgit v1.2.3