diff options
author | green <green@FreeBSD.org> | 2001-05-04 04:21:25 +0000 |
---|---|---|
committer | green <green@FreeBSD.org> | 2001-05-04 04:21:25 +0000 |
commit | a0c1c483e2651d7b85873c3a6599bafc7469bc27 (patch) | |
tree | 2cab75efee64ef1c83bac4691e7c66ab036d9d59 /secure/usr.bin | |
parent | d1f65ecd2b799f3d348c74c4a9a2fc670a82107a (diff) | |
download | FreeBSD-src-a0c1c483e2651d7b85873c3a6599bafc7469bc27.zip FreeBSD-src-a0c1c483e2651d7b85873c3a6599bafc7469bc27.tar.gz |
Follow the OpenSSH 2.9 upgrade with the infrastructure. Two new
programs are now included: sftp(1) and ssh-keyscan(1).
Diffstat (limited to 'secure/usr.bin')
-rw-r--r-- | secure/usr.bin/Makefile | 2 | ||||
-rw-r--r-- | secure/usr.bin/scp/Makefile | 1 | ||||
-rw-r--r-- | secure/usr.bin/sftp/Makefile | 12 | ||||
-rw-r--r-- | secure/usr.bin/ssh-add/Makefile | 6 | ||||
-rw-r--r-- | secure/usr.bin/ssh-agent/Makefile | 6 | ||||
-rw-r--r-- | secure/usr.bin/ssh-keygen/Makefile | 6 | ||||
-rw-r--r-- | secure/usr.bin/ssh-keyscan/Makefile | 12 | ||||
-rw-r--r-- | secure/usr.bin/ssh/Makefile | 4 |
8 files changed, 37 insertions, 12 deletions
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile index fd67fd8..42b8aa2 100644 --- a/secure/usr.bin/Makefile +++ b/secure/usr.bin/Makefile @@ -7,7 +7,7 @@ SUBDIR+=telnet .if !defined(NO_OPENSSL) SUBDIR+=openssl .if !defined(NO_OPENSSH) -SUBDIR+=scp ssh ssh-add ssh-agent ssh-keygen +SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan .endif .endif diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index c4cfac2..7a27bf4 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -2,6 +2,7 @@ # PROG= scp +SRCS= scp.c scp-common.c LDADD+= ${LIBSSH} -lcrypto -lutil -lz DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile new file mode 100644 index 0000000..db988ab --- /dev/null +++ b/secure/usr.bin/sftp/Makefile @@ -0,0 +1,12 @@ +# $FreeBSD$ +# + +PROG= sftp +SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c scp-common.c + +LDADD+= ${LIBSSH} -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} + +.include <bsd.prog.mk> + +.PATH: ${SSHDIR} diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index fb657da..10627d8 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -2,10 +2,10 @@ # PROG= ssh-add -SRCS= ssh-add.c log-client.c +SRCS= ssh-add.c -LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} +LDADD+= ${LIBSSH} -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index bf9cfd6..f00acd0 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -2,10 +2,10 @@ # PROG= ssh-agent -SRCS= ssh-agent.c log-client.c +SRCS= ssh-agent.c -LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} +LDADD+= ${LIBSSH} -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index b53e164..bd193dd 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -2,10 +2,10 @@ # PROG= ssh-keygen -SRCS= key.c log-client.c ssh-keygen.c +SRCS= ssh-keygen.c -LDADD+= ${LIBSSH} -lcrypto -lcrypt -lutil -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} +LDADD+= ${LIBSSH} -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile new file mode 100644 index 0000000..7a8c675 --- /dev/null +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -0,0 +1,12 @@ +# $FreeBSD$ +# + +PROG= ssh-keyscan +SRCS= ssh-keyscan.c + +LDADD+= ${LIBSSH} -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} + +.include <bsd.prog.mk> + +.PATH: ${SSHDIR} diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index fcb95d9..66494a9 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -8,8 +8,8 @@ BINMODE=4555 LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MLINKS= ssh.1 slogin.1 -SRCS= ssh.c log-client.c readconf.c clientloop.c sshconnect.c \ - sshconnect1.c sshconnect2.c +SRCS= ssh.c readconf.c clientloop.c sshtty.c \ + sshconnect.c sshconnect1.c sshconnect2.c .if defined(MAKE_KERBEROS4) && \ ((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES")) |