[src/netbsd-1-5]: src/usr.bin/ssh/ssh Pull up revisions 1.2, 1.4-1.5 (requeste...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d473e65a9079
branches:  netbsd-1-5
changeset: 490722:d473e65a9079
user:      he <he%NetBSD.org@localhost>
date:      Mon Feb 26 20:53:27 2001 +0000

description:
Pull up revisions 1.2,1.4-1.5 (requested by itojun):
  Update SSH to version found on trunk as of 26 Feb 2001.
  Note that /dev/random is now mandatory for ssh.
  Ssh no longer setuid root.

diffstat:

 usr.bin/ssh/ssh/Makefile |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (39 lines):

diff -r f257de330250 -r d473e65a9079 usr.bin/ssh/ssh/Makefile
--- a/usr.bin/ssh/ssh/Makefile  Mon Feb 26 20:49:23 2001 +0000
+++ b/usr.bin/ssh/ssh/Makefile  Mon Feb 26 20:53:27 2001 +0000
@@ -1,14 +1,14 @@
-#      $NetBSD: Makefile,v 1.1.2.2 2000/10/18 04:17:34 tv Exp $
+#      $NetBSD: Makefile,v 1.1.2.3 2001/02/26 20:53:27 he Exp $
 
 .include <bsd.own.mk>
 
 PROG=  ssh
 
 BINOWN=        root
-BINMODE=4555
+BINMODE=0555
 
-SRCS=  ssh.c log-client.c readconf.c clientloop.c sshconnect.c \
-       sshconnect1.c sshconnect2.c
+SRCS=  ssh.c log-client.c readconf.c clientloop.c \
+       sshconnect.c sshconnect1.c sshconnect2.c
 
 LINKS= ${BINDIR}/ssh ${BINDIR}/slogin
 MLINKS=        ssh.1 slogin.1
@@ -16,7 +16,7 @@
 .if (${MKKERBEROS} != "no")
 # XXX Needs krb5
 #CPPFLAGS+=-DAFS
-#LDADD+=       -lkafs
+#LDADD+=       -lkrb5 -lkafs -lasn1
 #DPADD+=       ${LIBKAFS}
 
 CPPFLAGS+=-DKRB4 -I${DESTDIR}/usr/include/kerberosIV
@@ -26,5 +26,5 @@
 
 .include <bsd.prog.mk>
 
-LDADD+=        -lcrypto -lutil -lz
-DPADD+=        ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
+LDADD+=        -lutil -lz -lcrypto
+DPADD+=        ${LIBUTIL} ${LIBZ} ${LIBCRYPTO}