summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2002-06-23 16:09:29 +0000
committerdes <des@FreeBSD.org>2002-06-23 16:09:29 +0000
commit8577d3fa572c66eefc1fa1cf4492e8230fa0b937 (patch)
tree67e1be073601faab2fd6a60ec54ca7c7b3508dab
parentfa8aa6dfe7e9aaab9f8fa1e3290e7242fc12d83d (diff)
downloadFreeBSD-src-8577d3fa572c66eefc1fa1cf4492e8230fa0b937.zip
FreeBSD-src-8577d3fa572c66eefc1fa1cf4492e8230fa0b937.tar.gz
Update Makefiles for OpenSSH 3.3.
-rw-r--r--secure/lib/libssh/Makefile7
-rw-r--r--secure/usr.bin/Makefile2
-rw-r--r--secure/usr.bin/ssh-keysign/Makefile13
-rw-r--r--secure/usr.sbin/sshd/Makefile9
4 files changed, 24 insertions, 7 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 076e666..e5146bb 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -2,13 +2,14 @@
#
LIB= ssh
-SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
+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 uidswap.c xmalloc.c atomicio.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 \
- version.c
+ scard.c monitor_wrap.c monitor_fdpass.c msg.c \
+ uidswap.c version.c
.if defined(COMPAT_GETADDRINFO)
SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index 42b8aa2..bcc8aa2 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 sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
+SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan ssh-keysign
.endif
.endif
diff --git a/secure/usr.bin/ssh-keysign/Makefile b/secure/usr.bin/ssh-keysign/Makefile
new file mode 100644
index 0000000..58a85030
--- /dev/null
+++ b/secure/usr.bin/ssh-keysign/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+#
+
+PROG= ssh-keysign
+SRCS= ssh-keysign.c
+MAN= ssh-keysign.8
+
+LDADD+= -lssh -lcrypto
+DPADD+= ${LIBSSH} ${LIBCRYPTO}
+
+.include <bsd.prog.mk>
+
+.PATH: ${SSHDIR}
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 66635c4..b94785d 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -3,10 +3,13 @@
PROG= sshd
SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
- sshpty.c sshlogin.c servconf.c serverloop.c \
+ sshpty.c sshlogin.c servconf.c serverloop.c uidswap.c \
auth.c auth1.c auth2.c auth-options.c session.c \
- auth-chall.c auth2-chall.c auth-skey.c auth-pam.c auth2-pam.c \
- groupaccess.c
+ auth-chall.c auth2-chall.c groupaccess.c \
+ auth-skey.c auth-bsdauth.c monitor_mm.c monitor.c \
+ auth2-none.c auth2-passwd.c auth2-pubkey.c \
+ auth2-hostbased.c auth2-kbdint.c \
+ auth-pam.c auth2-pam.c
MAN= sshd.8
CFLAGS+= -DLIBWRAP -DHAVE_LOGIN_CAP -DUSE_PAM -DHAVE_PAM_GETENVLIST
OpenPOWER on IntegriCloud