Merge head

5 files changed, 40 insertions, 1 deletions

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index a7c72a8..09fb97c 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -262,6 +262,10 @@ SUBDIR+=        truss
 SUBDIR+=	compile_et
 .endif
 
+.if ${MK_LDNS_UTILS} != "no"
+SUBDIR+=	host
+.endif
+
 .if ${MK_LIBTHR} != "no"
 SUBDIR+=	csup
 .endif
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
index 4129552..ed3751e 100644
--- a/usr.bin/bmake/Makefile
+++ b/usr.bin/bmake/Makefile
@@ -167,6 +167,7 @@ accept test:
 # override some simple things
 BINDIR= /usr/bin
 MANDIR= /usr/share/man/man
+DEFAULT_SYS_PATH= /usr/share/mk
 
 # make sure we get this
 CFLAGS+= ${COPTS.${.IMPSRC:T}}
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index d168a92..25dfd2d 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,5 +1,29 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
+.if ${MK_LDNS_UTILS} != "no"
+
+LDNSDIR=	${.CURDIR}/../../contrib/ldns
+LDNSHOSTDIR=	${.CURDIR}/../../contrib/ldns-host
+
+.PATH:		${LDNSHOSTDIR}
+
+PROG=		host
+SRCS=		ldns-host.c
+MAN=		host.1
+
+host.1: ldns-host.1
+	sed -e 's/ldns-//gI' <${.ALLSRC} >${.TARGET} || \
+		(rm -rf ${.TARGET} ; false)
+
+CFLAGS+=	-I${LDNSDIR}
+DPADD+=		${LIBLDNS} ${LIBCRYPTO}
+LDADD+=		-lldns -lcrypto
+USEPRIVATELIB=	ldns
+
+.else
+
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -20,4 +44,6 @@ WARNS?=		0
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/kdump/mksubr b/usr.bin/kdump/mksubr
index 676e9e2..2a16e37 100644
--- a/usr.bin/kdump/mksubr
+++ b/usr.bin/kdump/mksubr
@@ -497,6 +497,10 @@ egrep "^#[[:space:]]*define[[:space:]]+MAP_[A-Z_]+[[:space:]]+0x[0-9A-Fa-f]+[[:s
 		++i; \
 		printf "\tif (!((flags > 0) ^ ((%s) > 0)))\n\t\tif_print_or(flags, %s, or);\n", $i, $i }'
 cat <<_EOF_
+#ifdef MAP_32BIT
+	if (!((flags > 0) ^ ((MAP_32BIT) > 0)))
+		if_print_or(flags, MAP_32BIT, or);
+#endif
 	align = flags & MAP_ALIGNMENT_MASK;
 	if (align != 0) {
 		if (align == MAP_ALIGNED_SUPER)
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index f5e2c46..99a377f 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -296,7 +296,11 @@ static struct xlat mmap_flags[] = {
 	X(MAP_SHARED) X(MAP_PRIVATE) X(MAP_FIXED) X(MAP_RENAME)
 	X(MAP_NORESERVE) X(MAP_RESERVED0080) X(MAP_RESERVED0100)
 	X(MAP_HASSEMAPHORE) X(MAP_STACK) X(MAP_NOSYNC) X(MAP_ANON)
-	X(MAP_NOCORE) X(MAP_PREFAULT_READ) XEND
+	X(MAP_NOCORE) X(MAP_PREFAULT_READ)
+#ifdef MAP_32BIT
+	X(MAP_32BIT)
+#endif
+	XEND
 };
 
 static struct xlat mprot_flags[] = {