Merge head from 7/28

2 files changed, 32 insertions, 10 deletions

diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile
index eab23e19fdd6..c6bbedead598 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>
diff --git a/lib/libunbound/Makefile.depend b/lib/libunbound/Makefile.depend
index 44c5fdc3413a..2dac9b8fcc8f 100644
--- a/lib/libunbound/Makefile.depend
+++ b/lib/libunbound/Makefile.depend
@@ -21,4 +21,16 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
+config_file.So: configparser.h
+config_file.o: configparser.h
+config_file.po: configparser.h
+configlexer.So: configlexer.c
+configlexer.So: configparser.h
+configlexer.o: configlexer.c
+configlexer.o: configparser.h
+configlexer.po: configlexer.c
+configlexer.po: configparser.h
+configparser.So: configparser.c
+configparser.o: configparser.c
+configparser.po: configparser.c
 .endif