MFC: OpenSSH 3.5p1, with all FreeBSD patches.

4 files changed, 21 insertions, 6 deletions

diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 7bfbdc31789b..c9311a50deaf 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,5 +1,4 @@
 # $FreeBSD$
-#
 
 LIB=	ssh
 SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
@@ -8,20 +7,29 @@ SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.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 \
-	scard.c monitor_wrap.c monitor_fdpass.c msg.c
+	scard.c monitor_wrap.c monitor_fdpass.c msg.c xmmap.c
 # Portability layer
 SRCS+=	bsd-misc.c entropy.c
 # FreeBSD additions
 SRCS+=	version.c
-CFLAGS+=-I${SSHDIR}
 
 .if defined(COMPAT_GETADDRINFO)
 SRCS+=	getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
 .endif
 
+CFLAGS+= -I${SSHDIR}
+.if defined(MAKE_KERBEROS4)
+CFLAGS+= -DKRB4
+.endif
+.if defined(MAKE_KERBEROS5)
+CFLAGS+= -DKRB5 -DHEIMDAL
+.endif
+
+NOLINT=	true
+
 DPADD=	${LIBCRYPTO} ${LIBZ}
 LDADD=	-lcrypto -lz
 
 .include <bsd.lib.mk>
 
-.PATH:	${SSHDIR} ${SSHDIR}/openbsd-compat
+.PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat
diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 7a21e596cb1f..1f74eacf5f45 100644
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ssh-keysign
+SRCS=	ssh-keysign.c msg.c readconf.c
 MAN=	ssh-keysign.8
 CFLAGS+=-I${SSHDIR}
 .if defined(ENABLE_SUID_SSH)
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 42964ca52b10..204e95a131e6 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -7,7 +7,7 @@ LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
 MAN=	ssh.1 ssh_config.5
 MLINKS=	ssh.1 slogin.1
 
-SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
+SRCS=	ssh.c authfd.c hostfile.c msg.c readconf.c clientloop.c sshtty.c \
 	sshconnect.c sshconnect1.c sshconnect2.c
 
 .if defined(MAKE_KERBEROS4)
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 6cc3478b9bf4..386acdf7f64c 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -9,7 +9,7 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.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 auth2-pam-freebsd.c
+	auth2-pam-freebsd.c monitor_wrap.c monitor_fdpass.c
 # Portability layer
 SRCS+=	loginrec.c
 MAN=	sshd.8 sshd_config.5
@@ -41,6 +41,12 @@ CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
 LDADD+=	-lssh -lcrypt -lcrypto -lutil -lz -lwrap ${MINUSLPAM}
 DPADD+=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
 
+.if defined(OPENSSH_USE_POSIX_THREADS) && !defined(NOLIBC_R)
+CFLAGS+=-DUSE_POSIX_THREADS
+LDADD+= -lc_r
+DPADD+= ${LIBC_R}
+.endif
+
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}