diff options
| -rw-r--r-- | security/hpn-ssh/Makefile | 2 | ||||
| -rw-r--r-- | security/hpn-ssh/files/patch-regress-Makefile | 19 | ||||
| -rw-r--r-- | security/hpn-ssh/files/patch-regress-test-exec.sh | 11 | ||||
| -rw-r--r-- | security/openssh-portable/Makefile | 2 | ||||
| -rw-r--r-- | security/openssh-portable/files/patch-regress-Makefile | 19 | ||||
| -rw-r--r-- | security/openssh-portable/files/patch-regress-test-exec.sh | 11 |
6 files changed, 62 insertions, 2 deletions
diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile index a62daa89755b..90c74c77a357 100644 --- a/security/hpn-ssh/Makefile +++ b/security/hpn-ssh/Makefile @@ -136,7 +136,7 @@ post-install: test: (cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} \ - PATH=${PREFIX}/bin:${PREFIX}/sbin:${PATH} \ + PATH=${WRKSRC}:${PREFIX}/bin:${PREFIX}/sbin:${PATH} \ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ) .include <bsd.port.pre.mk> diff --git a/security/hpn-ssh/files/patch-regress-Makefile b/security/hpn-ssh/files/patch-regress-Makefile new file mode 100644 index 000000000000..1c22e2d7446e --- /dev/null +++ b/security/hpn-ssh/files/patch-regress-Makefile @@ -0,0 +1,19 @@ +--- regress/Makefile.orig Wed Jan 22 07:53:17 2003 ++++ regress/Makefile Tue Apr 1 05:28:43 2003 +@@ -1,6 +1,6 @@ + # $OpenBSD: Makefile,v 1.20 2003/01/08 23:54:22 djm Exp $ + +-REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 ++REGRESSTARGETS= t1 t2 t3 t4 t5 t6 t7 + + CLEANFILES+= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 + +@@ -71,7 +71,7 @@ + ssh-keygen -Bf t7.out > /dev/null + + .for t in ${LTESTS} +-REGRESS_TARGETS+=t-${t} ++REGRESSTARGETS+=t-${t} + t-${t}: + sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/${t}.sh + .endfor diff --git a/security/hpn-ssh/files/patch-regress-test-exec.sh b/security/hpn-ssh/files/patch-regress-test-exec.sh new file mode 100644 index 000000000000..4632f3bb78c7 --- /dev/null +++ b/security/hpn-ssh/files/patch-regress-test-exec.sh @@ -0,0 +1,11 @@ +--- regress/test-exec.sh.orig Wed May 1 05:17:35 2002 ++++ regress/test-exec.sh Tue Apr 1 06:03:11 2003 +@@ -130,6 +130,8 @@ + PidFile $PIDFILE + AuthorizedKeysFile $OBJ/authorized_keys_%u + LogLevel QUIET ++ PermitRootLogin yes ++ UsePrivilegeSeparation no + EOF + + # server config for proxy connects diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index a62daa89755b..90c74c77a357 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -136,7 +136,7 @@ post-install: test: (cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} \ - PATH=${PREFIX}/bin:${PREFIX}/sbin:${PATH} \ + PATH=${WRKSRC}:${PREFIX}/bin:${PREFIX}/sbin:${PATH} \ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ) .include <bsd.port.pre.mk> diff --git a/security/openssh-portable/files/patch-regress-Makefile b/security/openssh-portable/files/patch-regress-Makefile new file mode 100644 index 000000000000..1c22e2d7446e --- /dev/null +++ b/security/openssh-portable/files/patch-regress-Makefile @@ -0,0 +1,19 @@ +--- regress/Makefile.orig Wed Jan 22 07:53:17 2003 ++++ regress/Makefile Tue Apr 1 05:28:43 2003 +@@ -1,6 +1,6 @@ + # $OpenBSD: Makefile,v 1.20 2003/01/08 23:54:22 djm Exp $ + +-REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 ++REGRESSTARGETS= t1 t2 t3 t4 t5 t6 t7 + + CLEANFILES+= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 + +@@ -71,7 +71,7 @@ + ssh-keygen -Bf t7.out > /dev/null + + .for t in ${LTESTS} +-REGRESS_TARGETS+=t-${t} ++REGRESSTARGETS+=t-${t} + t-${t}: + sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/${t}.sh + .endfor diff --git a/security/openssh-portable/files/patch-regress-test-exec.sh b/security/openssh-portable/files/patch-regress-test-exec.sh new file mode 100644 index 000000000000..4632f3bb78c7 --- /dev/null +++ b/security/openssh-portable/files/patch-regress-test-exec.sh @@ -0,0 +1,11 @@ +--- regress/test-exec.sh.orig Wed May 1 05:17:35 2002 ++++ regress/test-exec.sh Tue Apr 1 06:03:11 2003 +@@ -130,6 +130,8 @@ + PidFile $PIDFILE + AuthorizedKeysFile $OBJ/authorized_keys_%u + LogLevel QUIET ++ PermitRootLogin yes ++ UsePrivilegeSeparation no + EOF + + # server config for proxy connects |