Update for 3.8p1, including workaround for a bug in gss-genr.c.

4 files changed, 14 insertions, 11 deletions

diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 3931c86..3fe9175 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,17 +1,18 @@
 # $FreeBSD$
 
 LIB=	ssh
-SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
-	cipher.c cipher-aes.c cipher-bf1.c cipher-ctr.c cipher-3des1.c \
-	compat.c compress.c crc32.c deattack.c fatal.c \
-	hostfile.c log.c match.c moduli.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 \
+SRCS=	acss.c authfd.c authfile.c bufaux.c buffer.c \
+	canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \
+	cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \
+	compat.c compress.c crc32.c deattack.c fatal.c hostfile.c \
+	log.c match.c moduli.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 dns.c \
-	entropy.c scard-opensc.c gss-genr.c
+	entropy.c scard-opensc.c
 # Portability layer
-SRCS+=	bsd-misc.c vis.c xcrypt.c xmmap.c
+SRCS+=	bsd-misc.c getrrsetbyname.c vis.c xcrypt.c xmmap.c
 # FreeBSD additions
 SRCS+=	version.c
 
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index e421123..9a2bef7 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	sftp
-SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
+SRCS=   sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
 CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 2eeb6d3..ef5f0c9 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -8,7 +8,8 @@ MAN=	ssh.1 ssh_config.5
 MLINKS=	ssh.1 slogin.1
 
 SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
-	sshconnect.c sshconnect1.c sshconnect2.c
+	sshconnect.c sshconnect1.c sshconnect2.c \
+	gss-genr.c
 
 DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ}
 LDADD=	-lssh -lutil -lz
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index b4ef025..fcfd989 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -12,7 +12,8 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 	kexdhs.c kexgexs.c \
 	auth-krb5.c \
 	auth2-gss.c gss-serv.c gss-serv-krb5.c \
-	loginrec.c auth-pam.c auth-sia.c md5crypt.c
+	loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \
+	gss-genr.c
 MAN=	sshd.8 sshd_config.5
 CFLAGS+=-I${SSHDIR}