[Midnightbsd-cvs] src [12236] trunk/secure: update config for ssh builds

[laffer1 at midnightbsd.org]

Revision: 12236
          http://svnweb.midnightbsd.org/src/?rev=12236
Author:   laffer1
Date:     2019-08-08 21:06:10 -0400 (Thu, 08 Aug 2019)
Log Message:
-----------
update config for ssh builds

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

Modified: trunk/secure/lib/libssh/Makefile
===================================================================
--- trunk/secure/lib/libssh/Makefile	2019-08-09 00:35:38 UTC (rev 12235)
+++ trunk/secure/lib/libssh/Makefile	2019-08-09 01:06:10 UTC (rev 12236)
@@ -8,31 +8,35 @@
 SHLIB_MAJOR=	5
 SRCS=	ssh_api.c ssherr.c sshbuf.c sshkey.c sshbuf-getput-basic.c \
 	sshbuf-misc.c sshbuf-getput-crypto.c krl.c bitmap.c
-SRCS+=	authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c \
+SRCS+=	authfd.c authfile.c \
 	canohost.c channels.c cipher.c cipher-aes.c cipher-aesctr.c \
-	cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \
-	compat.c crc32.c deattack.c fatal.c hostfile.c \
-	log.c match.c md-sha256.c moduli.c nchan.c packet.c opacket.c \
-	readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \
-	atomicio.c key.c dispatch.c mac.c uidswap.c uuencode.c misc.c utf8.c \
+	cipher-ctr.c cleanup.c \
+	compat.c crc32.c fatal.c hostfile.c \
+	log.c match.c moduli.c nchan.c packet.c opacket.c \
+	readpass.c ttymodes.c xmalloc.c addrmatch.c \
+	atomicio.c dispatch.c mac.c uuencode.c misc.c utf8.c \
 	monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c \
 	msg.c progressmeter.c dns.c entropy.c umac.c umac128.c \
 	ssh-pkcs11.c smult_curve25519_ref.c \
 	poly1305.c chacha.c cipher-chachapoly.c \
 	ssh-ed25519.c digest-openssl.c digest-libc.c hmac.c \
-	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c \
+	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c \
 	kex.c kexdh.c kexgex.c kexecdh.c kexc25519.c \
 	kexdhc.c kexgexc.c kexecdhc.c kexc25519c.c \
 	kexdhs.c kexgexs.c kexecdhs.c kexc25519s.c \
-	platform-pledge.c platform-tracing.c
+	platform-pledge.c platform-tracing.c platform-misc.c \
+	md5crypt.c
+PACKAGE=	ssh
 
 # gss-genr.c should be in $SRCS but causes linking problems, so it is
 # compiled directly into sshd instead.
 
 # Portability layer
-SRCS+=	bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c fmt_scaled.c \
-	glob.c openssl-compat.c port-tun.c reallocarray.c realpath.c strtonum.c \
-	timingsafe_bcmp.c vis.c xcrypt.c xmmap.c
+SRCS+=	bcrypt_pbkdf.c blowfish.c bsd-misc.c bsd-signal.c explicit_bzero.c \
+	fmt_scaled.c freezero.c glob.c \
+	libressl-api-compat.c \
+	openssl-compat.c port-net.c \
+	realpath.c recallocarray.c strtonum.c timingsafe_bcmp.c vis.c xcrypt.c
 
 .if ${MK_LDNS} == "no"
 SRCS+=	getrrsetbyname.c

Modified: trunk/secure/usr.bin/ssh/Makefile
===================================================================
--- trunk/secure/usr.bin/ssh/Makefile	2019-08-09 00:35:38 UTC (rev 12235)
+++ trunk/secure/usr.bin/ssh/Makefile	2019-08-09 01:06:10 UTC (rev 12236)
@@ -9,7 +9,7 @@
 MLINKS=	ssh.1 slogin.1
 
 SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
-	sshconnect.c sshconnect1.c sshconnect2.c mux.c
+	sshconnect.c sshconnect2.c mux.c
 
 # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
 SRCS+=	gss-genr.c

Modified: trunk/secure/usr.sbin/sshd/Makefile
===================================================================
--- trunk/secure/usr.sbin/sshd/Makefile	2019-08-09 00:35:38 UTC (rev 12235)
+++ trunk/secure/usr.sbin/sshd/Makefile	2019-08-09 01:06:10 UTC (rev 12236)
@@ -3,21 +3,24 @@
 
 .include <bsd.own.mk>
 
+CONFS=	moduli sshd_config
+CONFSDIR=	/etc/ssh
 PROG=	sshd
-SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
+SRCS=	sshd.c auth-rhosts.c auth-passwd.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 \
+	auth.c auth2.c auth-options.c session.c \
+	auth2-chall.c groupaccess.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 auth-krb5.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 \
 	sftp-server.c sftp-common.c \
 	sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c \
 	sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-pledge.c \
-	sandbox-solaris.c
+	sandbox-solaris.c uidswap.c
+PACKAGE=	ssh
 
 # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
 SRCS+=	gss-genr.c
@@ -38,7 +41,7 @@
 .endif
 
 .if ${MK_AUDIT} != "no"
-CFLAGS+= -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR
+CFLAGS+= -DUSE_BSM_AUDIT=1 -DHAVE_GETAUDIT_ADDR=1
 DPADD+=  ${LIBBSM}
 LDADD+=  -lbsm
 .endif