summaryrefslogtreecommitdiffstats
path: root/lib/libunbound
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2014-07-29 20:57:38 +0000
committerdes <des@FreeBSD.org>2014-07-29 20:57:38 +0000
commitfe6d9379787eb938c503444ce243caa89cc7b08c (patch)
tree5cc01e837e3c2f3dfb21ef0136ca69be1f957059 /lib/libunbound
parent1f52ac9340be3979c9bf100fe65c551bcd870cc6 (diff)
downloadFreeBSD-src-fe6d9379787eb938c503444ce243caa89cc7b08c.zip
FreeBSD-src-fe6d9379787eb938c503444ce243caa89cc7b08c.tar.gz
MFH (r266114, r266138): upgrade to latest ldns and unbound
MFH (r266139-r266143, r266145, r266149, r266150): fix props MFH (r266179, r266180, r266193, r266238, r266777): misc cleanup MFH (r266863): create and use /var/unbound/conf.d MFH (r268839): import unblock-lan-zones patch from upstream MFH (r268840): fix reverse lookups on private networks MFH (r268883): avoid spamming source tree during build PR: 190739 (for r268883)
Diffstat (limited to 'lib/libunbound')
-rw-r--r--lib/libunbound/Makefile30
1 files changed, 20 insertions, 10 deletions
diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile
index eab23e1..c6bbede 100644
--- a/lib/libunbound/Makefile
+++ b/lib/libunbound/Makefile
@@ -5,29 +5,39 @@ LDNSDIR= ${.CURDIR}/../../contrib/ldns
UNBOUNDDIR= ${.CURDIR}/../../contrib/unbound
# Hold my beer and watch this
-.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/iterator ${UNBOUNDDIR}/libunbound ${UNBOUNDDIR}/services ${UNBOUNDDIR}/services/cache ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/data ${UNBOUNDDIR}/util/storage ${UNBOUNDDIR}/validator
+.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/iterator ${UNBOUNDDIR}/ldns ${UNBOUNDDIR}/libunbound ${UNBOUNDDIR}/services ${UNBOUNDDIR}/services/cache ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/data ${UNBOUNDDIR}/util/storage ${UNBOUNDDIR}/validator
LIB= unbound
PRIVATELIB=
-CFLAGS= -I${LDNSDIR} -I${UNBOUNDDIR}
+CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR}
-SRCS= alloc.c autotrust.c config_file.c configlexer.c configparser.c \
+SRCS= alloc.c autotrust.c config_file.c configlexer.l configparser.y \
context.c dname.c dns.c dnstree.c fptr_wlist.c infra.c \
iter_delegpt.c iter_donotq.c iter_fwd.c iter_hints.c iter_priv.c \
- iter_resptype.c iter_scrub.c iter_utils.c iterator.c libunbound.c \
- libworker.c listen_dnsport.c localzone.c locks.c log.c lookup3.c \
- lruhash.c mesh.c mini_event.c modstack.c module.c msgencode.c \
- msgparse.c msgreply.c net_help.c netevent.c outbound_list.c \
- outside_network.c packed_rrset.c random.c rbtree.c regional.c \
- rrset.c rtt.c slabhash.c timehist.c tube.c val_anchor.c \
+ iter_resptype.c iter_scrub.c iter_utils.c iterator.c keyraw.c \
+ libunbound.c libworker.c listen_dnsport.c localzone.c locks.c log.c \
+ lookup3.c lruhash.c mesh.c mini_event.c modstack.c module.c \
+ msgencode.c msgparse.c msgreply.c net_help.c netevent.c \
+ outbound_list.c outside_network.c packed_rrset.c parse.c \
+ parseutil.c random.c rbtree.c regional.c rrdef.c rrset.c rtt.c \
+ sbuffer.c slabhash.c str2wire.c timehist.c tube.c val_anchor.c \
val_kcache.c val_kentry.c val_neg.c val_nsec.c val_nsec3.c \
val_secalgo.c val_sigcrypt.c val_utils.c validator.c \
- winsock_event.c
+ winsock_event.c wire2str.c
WARNS?= 3
DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD}
LDADD+= -lssl -lcrypto -lpthread
+# Misnamed file in upstream source
+configlexer.l: configlexer.lex
+ cp -p ${.ALLSRC} ${.TARGET}
+CLEANFILES+= configlexer.l
+
+# Symbol prefix for lex and yacc
+LFLAGS= -Pub_c_
+YFLAGS= -pub_c_ -d
+
.include <bsd.lib.mk>
OpenPOWER on IntegriCloud