[Midnightbsd-cvs] src [11658] trunk/secure/lib/libssh/Makefile: use ldns

[laffer1 at midnightbsd.org]

Revision: 11658
          http://svnweb.midnightbsd.org/src/?rev=11658
Author:   laffer1
Date:     2018-07-08 16:02:28 -0400 (Sun, 08 Jul 2018)
Log Message:
-----------
use ldns

Modified Paths:
--------------
    trunk/secure/lib/libssh/Makefile

Modified: trunk/secure/lib/libssh/Makefile
===================================================================
--- trunk/secure/lib/libssh/Makefile	2018-07-08 19:27:06 UTC (rev 11657)
+++ trunk/secure/lib/libssh/Makefile	2018-07-08 20:02:28 UTC (rev 11658)
@@ -1,29 +1,30 @@
-# $FreeBSD: head/secure/lib/libssh/Makefile 291941 2015-12-07 16:08:09Z bdrewery $
+# $MidnightBSD$
+# $FreeBSD: stable/10/secure/lib/libssh/Makefile 323124 2017-09-01 22:52:18Z des $
 
 .include <bsd.own.mk>
 
 LIB=	ssh
+PRIVATELIB=	true
 SHLIB_MAJOR=	5
-SRCS=	authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c \
+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 \
 	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 kex.c mac.c uidswap.c uuencode.c misc.c utf8.c \
+	atomicio.c key.c dispatch.c mac.c uidswap.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 krl.c smult_curve25519_ref.c \
+	ssh-pkcs11.c smult_curve25519_ref.c \
 	poly1305.c chacha.c cipher-chachapoly.c \
-	kexc25519.c kexc25519c.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 \
 	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 \
-	ssh_api.c ssherr.c sshbuf.c sshkey.c sshbuf-getput-basic.c sshbuf-misc.c \
-	sshbuf-getput-crypto.c krl.c bitmap.c
+	platform-pledge.c platform-tracing.c
 
 # gss-genr.c should be in $SRCS but causes linking problems, so it is
 # compiled directly into sshd instead.
@@ -30,16 +31,26 @@
 
 # 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 realpath.c strtonum.c timingsafe_bcmp.c \
-	vis.c xcrypt.c xmmap.c 
+	glob.c openssl-compat.c port-tun.c reallocarray.c realpath.c strtonum.c \
+	timingsafe_bcmp.c vis.c xcrypt.c xmmap.c
 
-# DNS
+.if ${MK_LDNS} == "no"
 SRCS+=	getrrsetbyname.c
+.else
+LDNSDIR=	${.CURDIR}/../../../contrib/ldns
+CFLAGS+=	-DHAVE_LDNS=1 -I${LDNSDIR}
+SRCS+=	getrrsetbyname-ldns.c
+DPADD+=	${LIBLDNS}
+LDADD+=	-lldns
+USEPRIVATELIB+= ldns
+.endif
 
 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
+SRCS+=	 ssh_namespace.h
 
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
+SRCS+=	 krb5_config.h
 DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
 LDADD+=	-lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken
 .endif
@@ -52,8 +63,3 @@
 .include <bsd.lib.mk>
 
 .PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
-.if ${MK_KERBEROS_SUPPORT} != "no"
-${OBJS} ${POBJS} ${SOBJS}: krb5_config.h
-.endif