ssh: Consolidate HAVE_LDNS / LIBWRAP in ssh.mk

Commit 9d63429fa1 ("ssh: move common Makefile boilerplate to a new
ssh.mk") introduced ssh.mk for common OpenSSH paths and flags, as part
of enabling FIDO/U2F.  Move duplicated MK_LDNS and MK_TCP_WRAPPERS
handling there.

Reviewed by:	kevans
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D31896

(cherry picked from commit d71e7e57fc)

secure/lib/libssh/Makefile

@@ -46,7 +46,7 @@ SRCS+=	bcrypt_pbkdf.c blowfish.c bsd-misc.c bsd-signal.c explicit_bzero.c \
 SRCS+=	getrrsetbyname.c
 .else
 LDNSDIR=	${SRCTOP}/contrib/ldns
-CFLAGS+=	-DHAVE_LDNS=1 -I${LDNSDIR}
+CFLAGS+=	-I${LDNSDIR}
 SRCS+=	getrrsetbyname-ldns.c
 LIBADD+=	ldns
 .endif

secure/libexec/sftp-server/Makefile

@@ -8,12 +8,6 @@ MAN=	sftp-server.8
 
 LIBADD=	ssh
 
-.if ${MK_LDNS} != "no"
-CFLAGS+=	-DHAVE_LDNS=1
-#DPADD+=	${LIBLDNS}
-#LDADD+=	-lldns
-.endif
-
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}

secure/libexec/ssh-keysign/Makefile

@@ -7,15 +7,7 @@ SRCS=	ssh-keysign.c readconf.c uidswap.c
 MAN=	ssh-keysign.8
 BINMODE=4555
 
-LIBADD=	ssh
-
-.if ${MK_LDNS} != "no"
-CFLAGS+=	-DHAVE_LDNS=1
-#DPADD+=	${LIBLDNS}
-#LDADD+=	-lldns
-.endif
-
-LIBADD+=	crypto
+LIBADD=	crypto ssh
 
 .include <bsd.prog.mk>
 

secure/libexec/ssh-pkcs11-helper/Makefile

@@ -6,15 +6,7 @@ PROG=	ssh-pkcs11-helper
 SRCS=	ssh-pkcs11.c ssh-pkcs11-helper.c
 MAN=	ssh-pkcs11-helper.8
 
-LIBADD=	ssh
-
-.if ${MK_LDNS} != "no"
-CFLAGS+=	-DHAVE_LDNS=1
-#DPADD+=	${LIBLDNS}
-#LDADD+=	-lldns
-.endif
-
-LIBADD+=	crypto
+LIBADD=	crypto ssh
 
 .include <bsd.prog.mk>
 

secure/libexec/sshd-session/Makefile

@@ -26,12 +26,6 @@ MAN=
 # pam should always happen before ssh here for static linking
 LIBADD=	pam ssh util
 
-.if ${MK_LDNS} != "no"
-CFLAGS+=	-DHAVE_LDNS=1
-#DPADD+=	${LIBLDNS}
-#LDADD+=	-lldns
-.endif
-
 .if ${MK_AUDIT} != "no"
 CFLAGS+= -DUSE_BSM_AUDIT=1 -DHAVE_GETAUDIT_ADDR=1
 LIBADD+=	bsm

secure/ssh.mk

@@ -12,6 +12,14 @@ CFLAGS+= -include krb5_config.h
 
 CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE:U/usr/local}/bin/xauth\"
 
+.if ${MK_LDNS} != "no"
+CFLAGS+= -DHAVE_LDNS=1
+.endif
+
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+= -DLIBWRAP=1
+.endif
+
 .if ${MK_USB} != "no"
 # Built-in security key support
 CFLAGS+= -include sk_config.h

secure/usr.bin/scp/Makefile

@@ -8,12 +8,6 @@ PACKAGE=	ssh
 
 LIBADD=	ssh
 
-.if ${MK_LDNS} != "no"
-CFLAGS+=	-DHAVE_LDNS=1
-#DPADD+=	${LIBLDNS}
-#LDADD+=	-lldns
-.endif
-
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}

secure/usr.bin/sftp/Makefile

@@ -9,12 +9,6 @@ PACKAGE=	ssh
 
 LIBADD=	ssh edit
 
-.if ${MK_LDNS} != "no"
-CFLAGS+=	-DHAVE_LDNS=1
-#DPADD+=	${LIBLDNS}
-#LDADD+=	-lldns
-.endif
-
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}

secure/usr.bin/ssh-add/Makefile

@@ -8,12 +8,6 @@ PACKAGE=	ssh
 
 LIBADD=	ssh
 
-.if ${MK_LDNS} != "no"
-CFLAGS+=	-DHAVE_LDNS=1
-#DPADD+=	${LIBLDNS}
-#LDADD+=	-lldns
-.endif
-
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}

secure/usr.bin/ssh-agent/Makefile

@@ -6,20 +6,12 @@ PROG=	ssh-agent
 SRCS=	ssh-agent.c ssh-pkcs11-client.c
 PACKAGE=	ssh
 
-LIBADD=	ssh
-
-.if ${MK_LDNS} != "no"
-CFLAGS+=	-DHAVE_LDNS=1
-#DPADD+=	${LIBLDNS}
-#LDADD+=	-lldns
-.endif
+LIBADD=	crypto ssh
 
 .if defined(LOCALBASE)
 CFLAGS+= -DDEFAULT_PKCS11_WHITELIST='"/usr/lib*/*,${LOCALBASE}/lib*/*"'
 .endif
 
-LIBADD+=	crypto
-
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}

secure/usr.bin/ssh-keygen/Makefile

@@ -7,13 +7,7 @@ PROG=	ssh-keygen
 SRCS=	ssh-keygen.c sshsig.c ssh-sk-client.c
 PACKAGE=	ssh
 
-LIBADD=	ssh
-
-.if ${MK_LDNS} != "no"
-CFLAGS+=	-DHAVE_LDNS=1
-.endif
-
-LIBADD+=	crypto
+LIBADD=	crypto ssh
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-keyscan/Makefile

@@ -8,12 +8,6 @@ PACKAGE=	ssh
 
 LIBADD=	ssh
 
-.if ${MK_LDNS} != "no"
-CFLAGS+=	-DHAVE_LDNS=1
-#DPADD+=	${LIBLDNS}
-#LDADD+=	-lldns
-.endif
-
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}

secure/usr.bin/ssh/Makefile

@@ -18,10 +18,6 @@ SRCS+=	gss-genr.c
 
 LIBADD=	ssh
 
-.if ${MK_LDNS} != "no"
-CFLAGS+=	-DHAVE_LDNS=1
-.endif
-
 .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 LIBADD+=	gssapi
 .endif

secure/usr.sbin/sshd/Makefile

@@ -22,7 +22,6 @@ LIBADD+=	gssapi_krb5 gssapi krb5
 .endif
 
 .if ${MK_TCP_WRAPPERS} != "no"
-CFLAGS+=	-DLIBWRAP=1
 LIBADD+=	wrap
 .endif