Update glue for BIND 9.4.2

7 files changed, 34 insertions, 9 deletions

diff --git a/lib/bind/bind/Makefile b/lib/bind/bind/Makefile
index ed32090..7f3bd82 100644
--- a/lib/bind/bind/Makefile
+++ b/lib/bind/bind/Makefile
@@ -59,10 +59,11 @@ SRCS+=		ns_date.c ns_name.c ns_netint.c \
 		ns_sign.c ns_ttl.c ns_verify.c
 
 .PATH:		${SRCDIR}/resolv
-SRCS+=		herror.c res_comp.c res_data.c \
-		res_debug.c res_findzonecut.c res_init.c \
-		res_mkquery.c res_mkupdate.c res_query.c \
-		res_send.c res_sendsigned.c res_update.c
+SRCS+=		herror.c mtctxres.c res_comp.c \
+		res_data.c res_debug.c res_findzonecut.c \
+		res_init.c res_mkquery.c res_mkupdate.c \
+		res_query.c res_send.c res_sendsigned.c \
+		res_update.c
 
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}
diff --git a/lib/bind/bind/config.h b/lib/bind/bind/config.h
index 18c2c39..71eef86 100644
--- a/lib/bind/bind/config.h
+++ b/lib/bind/bind/config.h
@@ -14,6 +14,8 @@
 /* #undef POSIX_GETPWNAM_R */
 /* #undef POSIX_GETGRGID_R */
 /* #undef POSIX_GETGRNAM_R */
+#define HAVE_MEMMOVE 1
+#define HAVE_MEMCHR 1
 
 /* #undef NEED_SETGROUPENT */
 /* #undef NEED_GETGROUPLIST */
@@ -41,6 +43,7 @@
 
 #define HAS_PW_CLASS 1
 
+/* #undef ssize_t */
 /* #undef uintptr_t */
 
 /* Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */
diff --git a/lib/bind/bind/port_before.h b/lib/bind/bind/port_before.h
index 2edd09a..e6571e9 100644
--- a/lib/bind/bind/port_before.h
+++ b/lib/bind/bind/port_before.h
@@ -14,6 +14,16 @@ struct timezone;        /* silence warning */
 #endif
 #include <limits.h>
 
+#ifdef ISC_PLATFORM_NEEDTIMESPEC
+#include <time.h>		/* For time_t */
+struct timespec {
+        time_t  tv_sec;         /* seconds */
+        long    tv_nsec;        /* nanoseconds */
+};
+#endif
+#ifndef HAVE_MEMMOVE
+#define memmove(a,b,c) bcopy(b,a,c)
+#endif
 
 #undef WANT_IRS_GR
 #undef WANT_IRS_NIS
diff --git a/lib/bind/config.h b/lib/bind/config.h
index b248f94..cffb26c 100644
--- a/lib/bind/config.h
+++ b/lib/bind/config.h
@@ -1,6 +1,6 @@
 /* $FreeBSD$ */
 
-/* config.h.  Generated by configure.  */
+/* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 /*
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
@@ -118,7 +118,7 @@ int sigwait(const unsigned int *set, int *sig);
  * The silly continuation line is to keep configure from
  * commenting out the #undef.
  */
-
+ 
 #undef \
 	va_start
 #define	va_start(ap, last) \
@@ -160,6 +160,9 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define if you cannot bind() before connect() for TCP sockets. */
 /* #undef BROKEN_TCP_BIND_BEFORE_CONNECT */
 
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
@@ -299,7 +302,7 @@ int sigwait(const unsigned int *set, int *sig);
 #define inline 
 #endif
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
 /* Define to `int' if <sys/types.h> does not define. */
diff --git a/lib/bind/config.mk b/lib/bind/config.mk
index edbb489..92cfbec 100644
--- a/lib/bind/config.mk
+++ b/lib/bind/config.mk
@@ -10,6 +10,7 @@ CFLAGS+=	-DVERSION='"${BIND_VERSION}"'
 .endif
 
 CFLAGS+=	-DHAVE_CONFIG_H
+CFLAGS+=	-D_REENTRANT -D_THREAD_SAFE
 
 # Get version numbers (for libraries)
 .if defined(SRCDIR) && exists(${SRCDIR}/api)
diff --git a/lib/bind/isc/isc/platform.h b/lib/bind/isc/isc/platform.h
index 0548b97..d0f9f25 100644
--- a/lib/bind/isc/isc/platform.h
+++ b/lib/bind/isc/isc/platform.h
@@ -4,7 +4,7 @@
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h.in,v 1.34.18.7 2007/02/13 00:04:50 marka Exp $ */
+/* $Id: platform.h.in,v 1.34.18.9 2007/09/13 05:04:01 each Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1
@@ -28,6 +28,11 @@
  ***** Platform-dependent defines.
  *****/
 
+/*
+ * Define if the platform has <strings.h>.
+ */
+#define ISC_PLATFORM_HAVESTRINGSH 1
+
 /***
  *** Network.
  ***/
diff --git a/lib/bind/lwres/Makefile b/lib/bind/lwres/Makefile
index 09b7991..1dd4bc3 100644
--- a/lib/bind/lwres/Makefile
+++ b/lib/bind/lwres/Makefile
@@ -26,6 +26,8 @@ SRCS+=		context.c gai_strerror.c getaddrinfo.c gethost.c \
 CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
+CFLAGS+=	-I${BIND_DIR}/lib/isc/include
+CFLAGS+=	-I${BIND_DIR}/lib/isc/unix/include
 
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}