Update for 3.6.1p1; also remove Kerberos IV shims.

4 files changed, 6 insertions, 22 deletions

diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index c9311a5..6415f58 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -7,9 +7,10 @@ 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 xmmap.c
+	kexdhc.c kexgexc.c scard.c msg.c progressmeter.c \
+	entropy.c
 # Portability layer
-SRCS+=	bsd-misc.c entropy.c
+SRCS+=	bsd-misc.c vis.c xmmap.c
 # FreeBSD additions
 SRCS+=	version.c
 
@@ -18,9 +19,6 @@ 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
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index 1b046ad..e37f8f5 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=   sftp-server
-SRCS=   sftp-server.c sftp-common.c
+SRCS=   sftp-common.c sftp-server.c
 MAN=	sftp-server.8
 CFLAGS+=-I${SSHDIR}
 
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 204e95a..2bbd56f 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -10,13 +10,6 @@ MLINKS=	ssh.1 slogin.1
 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)
-DISTRIBUTION=krb4
-CFLAGS+= -DKRB4
-LDADD+=	 -lkrb -lcom_err
-DPADD+=	 ${LIBKRB} ${LIBCOM_ERR}
-.endif
-
 .if defined(MAKE_KERBEROS5)
 DISTRIBUTION=krb5
 CFLAGS+= -DKRB5 -DHEIMDAL
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 386acdf..23e8714 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -9,20 +9,13 @@ 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 \
-	auth2-pam-freebsd.c monitor_wrap.c monitor_fdpass.c
+	auth2-pam-freebsd.c monitor_wrap.c monitor_fdpass.c \
+	kexdhs.c kexgexs.c
 # Portability layer
 SRCS+=	loginrec.c
 MAN=	sshd.8 sshd_config.5
 CFLAGS+=-I${SSHDIR}
 
-.if defined(MAKE_KERBEROS4)
-DISTRIBUTION=krb4
-CFLAGS+= -DKRB4
-SRCS+=	auth-krb4.c
-LDADD+=	 -lkrb -lcom_err
-DPADD+=	 ${LIBKRB} ${LIBCOM_ERR}
-.endif
-
 .if defined(MAKE_KERBEROS5)
 DISTRIBUTION=krb5
 CFLAGS+= -DKRB5 -DHEIMDAL