Module Name: src
Committed By: christos
Date: Thu Dec 17 04:00:22 UTC 2015
Modified Files:
src/external/bsd/bind: bind2netbsd
src/external/bsd/bind/include: config.h
src/external/bsd/bind/include/isc: platform.h
src/external/bsd/bind/include/lwres: platform.h
src/external/bsd/bind/lib/libbind9: shlib_version
src/external/bsd/bind/lib/libdns: shlib_version
src/external/bsd/bind/lib/libirs: shlib_version
src/external/bsd/bind/lib/libisc: shlib_version
src/external/bsd/bind/lib/libisccc: shlib_version
src/external/bsd/bind/lib/libisccfg: shlib_version
src/external/bsd/bind/lib/liblwres: shlib_version
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/bind2netbsd
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/include/config.h
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/include/isc/platform.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/include/lwres/platform.h
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/lib/libbind9/shlib_version
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/lib/libdns/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/lib/libirs/shlib_version
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/lib/libisc/shlib_version
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/lib/libisccc/shlib_version
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/lib/libisccfg/shlib_version
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/lib/liblwres/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/bind2netbsd
diff -u src/external/bsd/bind/bind2netbsd:1.2 src/external/bsd/bind/bind2netbsd:1.3
--- src/external/bsd/bind/bind2netbsd:1.2 Wed Mar 5 21:12:56 2014
+++ src/external/bsd/bind/bind2netbsd Wed Dec 16 23:00:21 2015
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: bind2netbsd,v 1.2 2014/03/06 02:12:56 christos Exp $
+# $NetBSD: bind2netbsd,v 1.3 2015/12/17 04:00:21 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,7 +34,7 @@
#
# $ cd /some/where/temporary
# $ tar xpfz /new/bind/release/tar/file
-# $ sh /usr/src/external/bsd/bind/dist/bind2netbsd bind-9.x.y `pwd`
+# $ sh /usr/src/external/bsd/bind/bind2netbsd bind-9.x.y `pwd`
# $ cd src/external/bsd/bind/dist
# $ cvs -d cvs.netbsd.org:/cvsroot import -m "Import bind 9.x.y" src/external/bsd/bind/dist ISC bind-9-x-y
# $ cd ../../../../../bind-9.x.y
Index: src/external/bsd/bind/include/config.h
diff -u src/external/bsd/bind/include/config.h:1.16 src/external/bsd/bind/include/config.h:1.17
--- src/external/bsd/bind/include/config.h:1.16 Wed Jul 8 13:29:00 2015
+++ src/external/bsd/bind/include/config.h Wed Dec 16 23:00:21 2015
@@ -181,15 +181,16 @@ int sigwait(const unsigned int *set, int
/* Define to enable "rrset-order fixed" syntax. */
#define DNS_RDATASET_FIXED 1
+/* Define to enable the "fetches-per-server" and "fetches-per-zone" options.
+ */
+#define ENABLE_FETCHLIMIT 1
+
/* Define to enable rpz-nsdname rules. */
#define ENABLE_RPZ_NSDNAME 1
/* Define to enable rpz-nsip rules. */
#define ENABLE_RPZ_NSIP 1
-/* Define to enable 'sit' support. */
-#define ENABLE_SIT 1
-
/* Solaris hack to get select_large_fdset. */
/* #undef FD_SETSIZE */
@@ -202,9 +203,6 @@ int sigwait(const unsigned int *set, int
MSVC and with C++ compilers. */
#define FLEXIBLE_ARRAY_MEMBER /**/
-/* Define to 1 if you have the `AES_encrypt' function. */
-#define HAVE_AES_ENCRYPT 1
-
/* Define to 1 if you have the `chroot' function. */
#define HAVE_CHROOT 1
@@ -277,6 +275,9 @@ int sigwait(const unsigned int *set, int
/* Define if libjson was found */
/* #undef HAVE_JSON */
+/* Define if json-c was found */
+/* #undef HAVE_JSON_C */
+
/* Define to 1 if you have the <kerberosv5/krb5.h> header file. */
/* #undef HAVE_KERBEROSV5_KRB5_H */
@@ -353,7 +354,7 @@ int sigwait(const unsigned int *set, int
#define HAVE_NET_ROUTE_H 1
/* Define if your OpenSSL version supports AES */
-#define HAVE_OPENSSL_AES 1
+/* #undef HAVE_OPENSSL_AES */
/* Define if your OpenSSL version supports ECDSA. */
#define HAVE_OPENSSL_ECDSA 1
@@ -380,7 +381,7 @@ int sigwait(const unsigned int *set, int
/* #undef HAVE_PTHREAD_YIELD_NP */
/* Define to 1 if you have the `readline' function. */
-/* #undef HAVE_READLINE */
+#define HAVE_READLINE 1
/* Define to 1 if you have the <regex.h> header file. */
#define HAVE_REGEX_H 1
@@ -545,6 +546,9 @@ int sigwait(const unsigned int *set, int
non-blocking. */
/* #undef USE_FIONBIO_IOCTL */
+/* Define to enable very verbose query trace logging. */
+#define WANT_QUERYTRACE 1
+
/* define if idnkit support is to be included. */
/* #undef WITH_IDN */
Index: src/external/bsd/bind/include/isc/platform.h
diff -u src/external/bsd/bind/include/isc/platform.h:1.19 src/external/bsd/bind/include/isc/platform.h:1.20
--- src/external/bsd/bind/include/isc/platform.h:1.19 Wed Jul 8 13:29:00 2015
+++ src/external/bsd/bind/include/isc/platform.h Wed Dec 16 23:00:21 2015
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2010, 2013, 2014 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010, 2013-2015 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: platform.h.in,v 1.56 2010/12/18 01:56:23 each Exp */
-
#ifndef ISC_PLATFORM_H
#define ISC_PLATFORM_H 1
@@ -174,6 +172,16 @@
#undef ISC_PLATFORM_NEEDSPRINTF
/*! \brief
+ * If this system need a modern printf() that format size %z (size_t).
+ */
+#undef ISC_PLATFORM_NEEDPRINTF
+
+/*! \brief
+ * If this system need a modern fprintf() that format size %z (size_t).
+ */
+#undef ISC_PLATFORM_NEEDFPRINTF
+
+/*! \brief
* The printf format string modifier to use with isc_uint64_t values.
*/
#define ISC_PLATFORM_QUADFORMAT "ll"
@@ -275,15 +283,15 @@
* If the "xadd" operation is available on this architecture,
* ISC_PLATFORM_HAVEXADD will be defined.
*/
+#ifdef __HAVE_ATOMIC64_OPS
#define ISC_PLATFORM_HAVEXADD 1
+#endif
/*
* If the "xaddq" operation (64bit xadd) is available on this architecture,
* ISC_PLATFORM_HAVEXADDQ will be defined.
*/
-#ifdef __HAVE_ATOMIC64_OPS
#define ISC_PLATFORM_HAVEXADDQ 1
-#endif
/*
* If the "atomic swap" operation is available on this architecture,
@@ -310,7 +318,7 @@
/*
* Define if the standard __asm function must be used.
*/
-
+#undef ISC_PLATFORM_USESTDASM
/*
* Define if the platform has <strings.h>.
@@ -323,11 +331,6 @@
#undef ISC_PLATFORM_OPENSSLHASH
/*
- * Define if AES must be provided by OpenSSL.
- */
-#define ISC_PLATFORM_OPENSSLAES 1
-
-/*
* Define if AES support is wanted
*/
#define ISC_PLATFORM_WANTAES 1
@@ -341,7 +344,7 @@
/*
* Defined if we are enabling SIT (Source Identity Token).
*/
-#define ISC_PLATFORM_USESIT 1
+#undef ISC_PLATFORM_USESIT
/***
*** Windows dll support.
@@ -351,7 +354,7 @@
* Define if MacOS style of PPC assembly must be used.
* e.g. "r6", not "6", for register six.
*/
-
+#undef ISC_PLATFORM_USEMACASM
#ifndef ISC_PLATFORM_USEDECLSPEC
#define LIBISC_EXTERNAL_DATA
Index: src/external/bsd/bind/include/lwres/platform.h
diff -u src/external/bsd/bind/include/lwres/platform.h:1.6 src/external/bsd/bind/include/lwres/platform.h:1.7
--- src/external/bsd/bind/include/lwres/platform.h:1.6 Tue Dec 9 23:38:04 2014
+++ src/external/bsd/bind/include/lwres/platform.h Wed Dec 16 23:00:21 2015
@@ -88,7 +88,7 @@
/*
* If this system need a modern sprintf() that returns (int) not (char*).
*/
-#undef LWRES_PLATFORM_NEEDSPRINTF
+
/*
* The printf format string modifier to use with lwres_uint64_t values.
Index: src/external/bsd/bind/lib/libbind9/shlib_version
diff -u src/external/bsd/bind/lib/libbind9/shlib_version:1.14 src/external/bsd/bind/lib/libbind9/shlib_version:1.15
--- src/external/bsd/bind/lib/libbind9/shlib_version:1.14 Wed Jul 8 13:29:00 2015
+++ src/external/bsd/bind/lib/libbind9/shlib_version Wed Dec 16 23:00:21 2015
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.14 2015/07/08 17:29:00 christos Exp $
+# $NetBSD: shlib_version,v 1.15 2015/12/17 04:00:21 christos Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=8
-minor=2
+minor=3
Index: src/external/bsd/bind/lib/libdns/shlib_version
diff -u src/external/bsd/bind/lib/libdns/shlib_version:1.16 src/external/bsd/bind/lib/libdns/shlib_version:1.17
--- src/external/bsd/bind/lib/libdns/shlib_version:1.16 Wed Jul 8 13:29:00 2015
+++ src/external/bsd/bind/lib/libdns/shlib_version Wed Dec 16 23:00:21 2015
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.16 2015/07/08 17:29:00 christos Exp $
+# $NetBSD: shlib_version,v 1.17 2015/12/17 04:00:21 christos Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=8
-minor=2
+minor=3
Index: src/external/bsd/bind/lib/libirs/shlib_version
diff -u src/external/bsd/bind/lib/libirs/shlib_version:1.3 src/external/bsd/bind/lib/libirs/shlib_version:1.4
--- src/external/bsd/bind/lib/libirs/shlib_version:1.3 Wed Jul 8 13:29:00 2015
+++ src/external/bsd/bind/lib/libirs/shlib_version Wed Dec 16 23:00:21 2015
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.3 2015/07/08 17:29:00 christos Exp $
+# $NetBSD: shlib_version,v 1.4 2015/12/17 04:00:21 christos Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=8
-minor=2
+minor=3
Index: src/external/bsd/bind/lib/libisc/shlib_version
diff -u src/external/bsd/bind/lib/libisc/shlib_version:1.16 src/external/bsd/bind/lib/libisc/shlib_version:1.17
--- src/external/bsd/bind/lib/libisc/shlib_version:1.16 Wed Jul 8 13:29:00 2015
+++ src/external/bsd/bind/lib/libisc/shlib_version Wed Dec 16 23:00:21 2015
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.16 2015/07/08 17:29:00 christos Exp $
+# $NetBSD: shlib_version,v 1.17 2015/12/17 04:00:21 christos Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=8
-minor=2
+minor=3
Index: src/external/bsd/bind/lib/libisccc/shlib_version
diff -u src/external/bsd/bind/lib/libisccc/shlib_version:1.14 src/external/bsd/bind/lib/libisccc/shlib_version:1.15
--- src/external/bsd/bind/lib/libisccc/shlib_version:1.14 Wed Jul 8 13:29:01 2015
+++ src/external/bsd/bind/lib/libisccc/shlib_version Wed Dec 16 23:00:21 2015
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.14 2015/07/08 17:29:01 christos Exp $
+# $NetBSD: shlib_version,v 1.15 2015/12/17 04:00:21 christos Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=8
-minor=2
+minor=3
Index: src/external/bsd/bind/lib/libisccfg/shlib_version
diff -u src/external/bsd/bind/lib/libisccfg/shlib_version:1.14 src/external/bsd/bind/lib/libisccfg/shlib_version:1.15
--- src/external/bsd/bind/lib/libisccfg/shlib_version:1.14 Wed Jul 8 13:29:01 2015
+++ src/external/bsd/bind/lib/libisccfg/shlib_version Wed Dec 16 23:00:22 2015
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.14 2015/07/08 17:29:01 christos Exp $
+# $NetBSD: shlib_version,v 1.15 2015/12/17 04:00:22 christos Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=8
-minor=2
+minor=3
Index: src/external/bsd/bind/lib/liblwres/shlib_version
diff -u src/external/bsd/bind/lib/liblwres/shlib_version:1.14 src/external/bsd/bind/lib/liblwres/shlib_version:1.15
--- src/external/bsd/bind/lib/liblwres/shlib_version:1.14 Wed Jul 8 13:29:01 2015
+++ src/external/bsd/bind/lib/liblwres/shlib_version Wed Dec 16 23:00:22 2015
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.14 2015/07/08 17:29:01 christos Exp $
+# $NetBSD: shlib_version,v 1.15 2015/12/17 04:00:22 christos Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=8
-minor=2
+minor=3
