[Midnightbsd-cvs] src [9225] trunk/secure: update build

[laffer1 at midnightbsd.org]

Revision: 9225
          http://svnweb.midnightbsd.org/src/?rev=9225
Author:   laffer1
Date:     2016-11-05 17:17:29 -0400 (Sat, 05 Nov 2016)
Log Message:
-----------
update build

Modified Paths:
--------------
    trunk/secure/lib/libssh/Makefile
    trunk/secure/usr.sbin/sshd/Makefile

Modified: trunk/secure/lib/libssh/Makefile
===================================================================
--- trunk/secure/lib/libssh/Makefile	2016-11-05 20:57:07 UTC (rev 9224)
+++ trunk/secure/lib/libssh/Makefile	2016-11-05 21:17:29 UTC (rev 9225)
@@ -1,33 +1,35 @@
-# $MidnightBSD$
+# $FreeBSD: head/secure/lib/libssh/Makefile 291941 2015-12-07 16:08:09Z bdrewery $
 
 .include <bsd.own.mk>
 
 LIB=	ssh
 SHLIB_MAJOR=	5
-
 SRCS=	authfd.c authfile.c bufaux.c bufbn.c buffer.c \
 	canohost.c channels.c cipher.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 \
-	krl.c log.c match.c md-sha256.c moduli.c nchan.c packet.c \
+	log.c match.c md-sha256.c moduli.c nchan.c packet.c \
 	readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \
 	atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
 	monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c \
 	kexdh.c kexgex.c kexdhc.c kexgexc.c bufec.c kexecdh.c kexecdhc.c \
 	msg.c progressmeter.c dns.c entropy.c umac.c umac128.c \
-	ssh-pkcs11.c kexc25519.c kexc25519c.c kexc25519s.c \
-	poly1305.c chacha.c cipher-chachapoly.c \
+	ssh-pkcs11.c krl.c smult_curve25519_ref.c \
+	kexc25519.c kexc25519c.c poly1305.c chacha.c cipher-chachapoly.c \
 	ssh-ed25519.c digest-openssl.c hmac.c \
-	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c \
-	smult_curve25519_ref.c
+	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c
+
 # gss-genr.c should be in $SRCS but causes linking problems, so it is
 # compiled directly into sshd instead.
 
 # Portability layer
-SRCS+=	bsd-misc.c explicit_bzero.c fmt_scaled.c getrrsetbyname.c glob.c \
-	openssl-compat.c port-tun.c strtonum.c timingsafe_bcmp.c \
-	vis.c xcrypt.c xmmap.c bcrypt_pbkdf.c
+SRCS+=	bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c fmt_scaled.c \
+	glob.c openssl-compat.c port-tun.c strtonum.c timingsafe_bcmp.c \
+	vis.c xcrypt.c xmmap.c
 
+# DNS
+SRCS+=	getrrsetbyname.c
+
 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
 
 .if ${MK_KERBEROS_SUPPORT} != "no"

Modified: trunk/secure/usr.sbin/sshd/Makefile
===================================================================
--- trunk/secure/usr.sbin/sshd/Makefile	2016-11-05 20:57:07 UTC (rev 9224)
+++ trunk/secure/usr.sbin/sshd/Makefile	2016-11-05 21:17:29 UTC (rev 9225)
@@ -4,19 +4,19 @@
 
 PROG=	sshd
 SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
+	audit.c audit-bsm.c audit-linux.c platform.c \
 	sshpty.c sshlogin.c servconf.c serverloop.c \
 	auth.c auth1.c auth2.c auth-options.c session.c \
 	auth-chall.c auth2-chall.c groupaccess.c \
 	auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
 	auth2-none.c auth2-passwd.c auth2-pubkey.c \
-	monitor_mm.c monitor.c monitor_wrap.c kexdhs.c kexgexs.c \
-	auth-krb5.c \
+	monitor_mm.c monitor.c monitor_wrap.c auth-krb5.c \
 	auth2-gss.c gss-serv.c gss-serv-krb5.c \
 	loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \
-	audit.c audit-bsm.c audit-linux.c platform.c sftp-server.c sftp-common.c \
-	roaming_serv.c roaming_common.c kexecdhs.c \
+	sftp-server.c sftp-common.c \
 	sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c \
-	sandbox-seccomp-filter.c
+	sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-pledge.c \
+	sandbox-solaris.c
 
 # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
 SRCS+=	gss-genr.c