MFC

5 files changed, 58 insertions, 25 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 1447002..7a0ec02 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -82,6 +82,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libipx} \
 	libjail \
 	libkiconv \
+	${_libldns} \
 	liblzma \
 	libmagic \
 	libmandoc \
@@ -177,6 +178,10 @@ _libiconv_modules=	libiconv_modules
 _libipx=	libipx
 .endif
 
+.if ${MK_LDNS} != "no"
+_libldns=	libldns
+.endif
+
 .if ${MK_LIBCPLUSPLUS} != "no"
 _libcxxrt=	libcxxrt
 _libcplusplus=	libc++
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index b09c068..3419809 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -18,7 +18,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 6, 2009
+.Dd February 14, 2013
 .Dt GETADDRINFO 3
 .Os
 .Sh NAME
@@ -339,7 +339,7 @@ hints.ai_socktype = SOCK_STREAM;
 error = getaddrinfo("www.kame.net", "http", &hints, &res0);
 if (error) {
 	errx(1, "%s", gai_strerror(error));
-	/*NOTREACHED*/
+	/* NOTREACHED */
 }
 s = -1;
 for (res = res0; res; res = res->ai_next) {
@@ -361,7 +361,7 @@ for (res = res0; res; res = res->ai_next) {
 }
 if (s < 0) {
 	err(1, "%s", cause);
-	/*NOTREACHED*/
+	/* NOTREACHED */
 }
 freeaddrinfo(res0);
 .Ed
@@ -383,7 +383,7 @@ hints.ai_flags = AI_PASSIVE;
 error = getaddrinfo(NULL, "http", &hints, &res0);
 if (error) {
 	errx(1, "%s", gai_strerror(error));
-	/*NOTREACHED*/
+	/* NOTREACHED */
 }
 nsock = 0;
 for (res = res0; res && nsock < MAXSOCK; res = res->ai_next) {
@@ -405,7 +405,7 @@ for (res = res0; res && nsock < MAXSOCK; res = res->ai_next) {
 }
 if (nsock == 0) {
 	err(1, "%s", cause);
-	/*NOTREACHED*/
+	/* NOTREACHED */
 }
 freeaddrinfo(res0);
 .Ed
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index 327c135..e508e5d 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -18,7 +18,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 28, 2007
+.Dd February 14, 2013
 .Dt GETNAMEINFO 3
 .Os
 .Sh NAME
@@ -157,7 +157,7 @@ char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
 if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), sbuf,
     sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
 	errx(1, "could not get numeric hostname");
-	/*NOTREACHED*/
+	/* NOTREACHED */
 }
 printf("host=%s, serv=%s\en", hbuf, sbuf);
 .Ed
@@ -170,7 +170,7 @@ char hbuf[NI_MAXHOST];
 if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), NULL, 0,
     NI_NAMEREQD)) {
 	errx(1, "could not resolve hostname");
-	/*NOTREACHED*/
+	/* NOTREACHED */
 }
 printf("host=%s\en", hbuf);
 .Ed
diff --git a/lib/libc/stdio/setbuf.3 b/lib/libc/stdio/setbuf.3
index 2eda0e6..337a7c5 100644
--- a/lib/libc/stdio/setbuf.3
+++ b/lib/libc/stdio/setbuf.3
@@ -32,7 +32,7 @@
 .\"     @(#)setbuf.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 4, 1993
+.Dd February 15, 2013
 .Dt SETBUF 3
 .Os
 .Sh NAME
@@ -195,19 +195,3 @@ and
 functions
 conform to
 .St -isoC .
-.Sh BUGS
-The
-.Fn setbuffer
-and
-.Fn setlinebuf
-functions are not portable to versions of
-.Bx
-before
-.Bx 4.2 .
-On
-.Bx 4.2
-and
-.Bx 4.3
-systems,
-.Fn setbuf
-always uses a suboptimal buffer size and should be avoided.
diff --git a/lib/libldns/Makefile b/lib/libldns/Makefile
new file mode 100644
index 0000000..268939e
--- /dev/null
+++ b/lib/libldns/Makefile
@@ -0,0 +1,44 @@
+# $FreeBSD$
+
+# Vendor sources and generated files
+LDNSDIR = ${.CURDIR}/../../contrib/ldns
+
+.PATH: ${LDNSDIR}
+
+LIB = ldns
+INTERNALLIB = true
+
+CFLAGS += -I${LDNSDIR}
+
+SRCS +=	buffer.c
+SRCS +=	dname.c
+SRCS +=	dnssec.c
+SRCS +=	dnssec_sign.c
+SRCS +=	dnssec_verify.c
+SRCS +=	dnssec_zone.c
+SRCS +=	duration.c
+SRCS +=	error.c
+SRCS +=	higher.c
+SRCS +=	host2str.c
+SRCS +=	host2wire.c
+SRCS +=	keys.c
+SRCS +=	net.c
+SRCS +=	packet.c
+SRCS +=	parse.c
+SRCS +=	rbtree.c
+SRCS +=	rdata.c
+SRCS +=	resolver.c
+SRCS +=	rr.c
+SRCS +=	rr_functions.c
+SRCS +=	sha1.c
+SRCS +=	sha2.c
+SRCS +=	str2host.c
+SRCS +=	tsig.c
+SRCS +=	update.c
+SRCS +=	util.c
+SRCS +=	wire2host.c
+SRCS +=	zone.c
+
+WARNS ?= 3
+
+.include <bsd.lib.mk>