[src/trunk]: src/usr.bin/ssh Use the public libssh that's now available.

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

details:   https://anonhg.NetBSD.org/src/rev/3b7cce6eccf3
branches:  trunk
changeset: 572448:3b7cce6eccf3
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jan 03 06:04:08 2005 +0000

description:
Use the public libssh that's now available.

diffstat:

 usr.bin/ssh/Makefile        |   4 ++--
 usr.bin/ssh/Makefile.inc    |   9 +++------
 usr.bin/ssh/libssh/Makefile |  29 -----------------------------
 3 files changed, 5 insertions(+), 37 deletions(-)

diffs (72 lines):

diff -r 71004c9fbe28 -r 3b7cce6eccf3 usr.bin/ssh/Makefile
--- a/usr.bin/ssh/Makefile      Mon Jan 03 06:00:12 2005 +0000
+++ b/usr.bin/ssh/Makefile      Mon Jan 03 06:04:08 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.19 2004/05/16 09:53:10 lukem Exp $
+#      $NetBSD: Makefile,v 1.20 2005/01/03 06:04:08 lukem Exp $
 
 .include <bsd.own.mk>
 
 SSHDIST?= ${NETBSDSRCDIR}/crypto/dist/ssh
 
-SUBDIR=        libssh .WAIT ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
+SUBDIR=        ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
        ssh-keysign ssh-keyscan sftp
 #SUBDIR+=scard
 
diff -r 71004c9fbe28 -r 3b7cce6eccf3 usr.bin/ssh/Makefile.inc
--- a/usr.bin/ssh/Makefile.inc  Mon Jan 03 06:00:12 2005 +0000
+++ b/usr.bin/ssh/Makefile.inc  Mon Jan 03 06:04:08 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.6 2002/09/18 14:00:41 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2005/01/03 06:04:08 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -7,11 +7,8 @@
 CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP
 .PATH: ${SSHDIST}
 
-.if defined(PROG)
-LIBSSHOBJDIR != cd ${.CURDIR}/../libssh && ${PRINTOBJDIR}
-LDADD+= -L${LIBSSHOBJDIR} -lssh
-DPADD+= ${LIBSSHOBJDIR}/libssh.a
-.endif
+LDADD+=        -lssh -lcrypto -lz
+DPADD+=        ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff -r 71004c9fbe28 -r 3b7cce6eccf3 usr.bin/ssh/libssh/Makefile
--- a/usr.bin/ssh/libssh/Makefile       Mon Jan 03 06:00:12 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#      $NetBSD: Makefile,v 1.20 2004/05/23 02:24:51 lukem Exp $
-
-MKPRIVATELIB=  yes
-
-.include <bsd.own.mk>
-
-# Prevent recursion.
-LIBSSHOBJDIR=${.OBJDIR}
-
-LIB=   ssh
-SRCS=  authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
-       cipher.c compat.c compress.c crc32.c deattack.c fatal.c \
-       hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \
-       rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
-       key.c dispatch.c kex.c mac.c uuencode.c misc.c \
-       rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
-       kexdhc.c kexgexc.c scard.c msg.c progressmeter.c
-SRCS+= random.c
-SRCS+= readpassphrase.c getpeereid.c
-
-.if (${USE_KERBEROS} != "no")
-CPPFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/krb5
-.if (${USE_KERBEROS4} != "no")
-SRCS+= radix.c
-CPPFLAGS+= -DKRB4 -DAFS -I${DESTDIR}/usr/include/kerberosIV
-.endif # ${USE_KERBEROS4} != "no"
-.endif # ${USE_KERBEROS} != "no"
-
-.include <bsd.lib.mk>