Import of ISC BIND version 8.3.6.

Version 8.3.5 was skipped due to bugs fixed in this version.

2 files changed, 30 insertions, 2 deletions

diff --git a/contrib/bind/port/freebsd/bin/probe_ipv6 b/contrib/bind/port/freebsd/bin/probe_ipv6
index ba7135d..993cabd 100755
--- a/contrib/bind/port/freebsd/bin/probe_ipv6
+++ b/contrib/bind/port/freebsd/bin/probe_ipv6
@@ -2,7 +2,7 @@
 
 set -e
 PATH=/bin:/usr/bin:$PATH; export PATH
-trap "rm -f tmp$$a.c tmp$$b.c tmp$$a.o tmp$$b.o" 0
+trap "rm -f tmp$$[abc].[oc]" 0 1 2 15
 target=port_ipv6
 new=new_${target}.h
 old=${target}.h
@@ -19,6 +19,13 @@ cat > tmp$$b.c <<EOF
 struct in6_addr xx;
 EOF
 
+cat > tmp$$c.c <<EOF
+#include <sys/types.h>
+#include <netinet/in.h>
+struct sockaddr_in6 xx;
+main() { xx.sin6_scope_id = 0; }
+EOF
+
 cat > ${new} <<EOF
 
 /* This file is automatically generated. Do Not Edit. */
@@ -37,6 +44,12 @@ then
 	else
                 echo "#define in6_addr in_addr6" >> ${new}
         fi
+	if ${CC} -c tmp$$c.c > /dev/null 2>&1
+	then
+		echo "#define HAVE_SIN6_SCOPE_ID" >> ${new}
+	else
+		echo "#undef HAVE_SIN6_SCOPE_ID" >> ${new}
+	fi
 else
         echo "#undef HAS_INET6_STRUCTS" >> ${new}
 fi
diff --git a/contrib/bind/port/freebsd/include/port_after.h b/contrib/bind/port/freebsd/include/port_after.h
index 6207f82..566113b 100644
--- a/contrib/bind/port/freebsd/include/port_after.h
+++ b/contrib/bind/port/freebsd/include/port_after.h
@@ -6,12 +6,20 @@
 #define USE_WAITPID
 #define HAVE_GETRUSAGE
 #define HAVE_FCHMOD
-#define NEED_PSELECT
 #define HAVE_SA_LEN
 #define HAVE_MINIMUM_IFREQ
 #define USE_LOG_CONS
 #define HAVE_CHROOT
 #define CAN_CHANGE_ID
+#define USE_IFNAMELINKID
+#if __FreeBSD_version >= 330000
+#define HAVE_STRLCPY
+#define HAVE_STRLCAT
+#endif
+
+#define DIG_PING "/sbin/ping"
+#define DIG_TAIL "/usr/bin/tail"
+#define DIG_PINGFMT "%s -q -c 3 %s | %s -3"
 
 #define _TIMEZONE timezone
 
@@ -22,6 +30,13 @@
 #define KMEM		"/dev/kmem"
 #define UDPSUM		"udpcksum"
 
+#if defined(__FreeBSD_version) && __FreeBSD_version >= 500041
+#undef NEED_PSELECT
+#include <sys/select.h>
+#else
+#define NEED_PSELECT
+#endif
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/param.h>