[src/trunk]: src/external/bsd/unbound/include merge conflicts

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e62051c5ee03
branches:  trunk
changeset: 993276:e62051c5ee03
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Sep 03 14:36:04 2018 +0000

description:
merge conflicts

diffstat:

 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_control.key     |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_control.pem     |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_server.key      |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_server.pem      |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.conf      |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.dsc       |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.post      |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.pre       |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.test      |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.testns    |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_control.key |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_control.pem |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_server.key  |  Bin 
 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_server.pem  |  Bin 
 external/bsd/unbound/include/config-1.0.h                               |   41 +++++++++-
 external/bsd/unbound/include/config-1.1.h                               |   42 +++++++++-
 16 files changed, 79 insertions(+), 4 deletions(-)

diffs (truncated from 306 to 300 lines):

diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_control.key
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_control.key has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_control.pem
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_control.pem has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_server.key
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_server.key has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_server.pem
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_server.pem has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.conf
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.conf has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.dsc
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.dsc has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.post
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.post has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.pre
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.pre has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.test
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.test has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.testns
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.testns has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_control.key
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_control.key has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_control.pem
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_control.pem has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_server.key
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_server.key has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_server.pem
Binary file external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_server.pem has changed
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/include/config-1.0.h
--- a/external/bsd/unbound/include/config-1.0.h Mon Sep 03 14:08:55 2018 +0000
+++ b/external/bsd/unbound/include/config-1.0.h Mon Sep 03 14:36:04 2018 +0000
@@ -31,6 +31,9 @@
    internal symbols */
 /* #undef EXPORT_ALL_SYMBOLS */
 
+/* Define to 1 if you have the `accept4' function. */
+#define HAVE_ACCEPT4 1
+
 /* Define to 1 if you have the `arc4random' function. */
 #define HAVE_ARC4RANDOM 1
 
@@ -84,6 +87,10 @@
    don't. */
 #define HAVE_DECL_NID_ED25519 0
 
+/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you
+   don't. */
+#define HAVE_DECL_NID_ED448 0
+
 /* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you
    don't. */
 #define HAVE_DECL_NID_SECP384R1 1
@@ -96,6 +103,10 @@
    don't. */
 /* #undef HAVE_DECL_REALLOCARRAY */
 
+/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you
+   don't. */
+/* #undef HAVE_DECL_REDISCONNECT */
+
 /* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0
    if you don't. */
 #define HAVE_DECL_SK_SSL_COMP_POP_FREE 1
@@ -234,6 +245,9 @@
 /* Define to 1 if you have the <grp.h> header file. */
 #define HAVE_GRP_H 1
 
+/* Define to 1 if you have the <hiredis/hiredis.h> header file. */
+/* #undef HAVE_HIREDIS_HIREDIS_H */
+
 /* If you have HMAC_Update */
 #define HAVE_HMAC_UPDATE 1
 
@@ -264,6 +278,9 @@
 /* Define to 1 if you have the `kill' function. */
 #define HAVE_KILL 1
 
+/* Define to 1 if you have the <libkern/OSByteOrder.h> header file. */
+/* #undef HAVE_LIBKERN_OSBYTEORDER_H */
+
 /* Define if we have LibreSSL */
 /* #undef HAVE_LIBRESSL */
 
@@ -426,6 +443,12 @@
 /* Define to 1 if you have the `SSL_CTX_set_security_level' function. */
 /* #undef HAVE_SSL_CTX_SET_SECURITY_LEVEL */
 
+/* Define to 1 if you have the `SSL_get0_peername' function. */
+/* #undef HAVE_SSL_GET0_PEERNAME */
+
+/* Define to 1 if you have the `SSL_set1_host' function. */
+/* #undef HAVE_SSL_SET1_HOST */
+
 /* Define to 1 if you have the <stdarg.h> header file. */
 #define HAVE_STDARG_H 1
 
@@ -474,6 +497,9 @@
 /* Define to 1 if systemd should be used */
 /* #undef HAVE_SYSTEMD */
 
+/* Define to 1 if you have the <sys/endian.h> header file. */
+#define HAVE_SYS_ENDIAN_H 1
+
 /* Define to 1 if you have the <sys/ipc.h> header file. */
 #define HAVE_SYS_IPC_H 1
 
@@ -605,7 +631,7 @@
 #define PACKAGE_NAME "unbound"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "unbound 1.6.8"
+#define PACKAGE_STRING "unbound 1.7.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "unbound"
@@ -614,7 +640,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.6.8"
+#define PACKAGE_VERSION "1.7.3"
 
 /* default pidfile location */
 #define PIDFILE "/var/run/unbound.pid"
@@ -647,6 +673,9 @@
 /* define if (v)snprintf does not return length needed, (but length used) */
 /* #undef SNPRINTF_RET_BROKEN */
 
+/* Define to 1 if libsodium supports sodium_set_misuse_handler */
+/* #undef SODIUM_MISUSE_HANDLER */
+
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
@@ -695,6 +724,9 @@
 /* Define this to enable ED25519 support. */
 /* #undef USE_ED25519 */
 
+/* Define this to enable ED448 support. */
+/* #undef USE_ED448 */
+
 /* Define this to enable GOST support. */
 #define USE_GOST 1
 
@@ -710,6 +742,9 @@
 /* Define this to enable client TCP Fast Open. */
 /* #undef USE_OSX_MSG_FASTOPEN */
 
+/* Define this to use hiredis client. */
+/* #undef USE_REDIS */
+
 /* Define this to enable SHA1 support. */
 #define USE_SHA1 1
 
@@ -1213,6 +1248,8 @@
 
 /** default port for DNS traffic. */
 #define UNBOUND_DNS_PORT 53
+/** default port for DNS over TLS traffic. */
+#define UNBOUND_DNS_OVER_TLS_PORT 853
 /** default port for unbound control traffic, registered port with IANA,
     ub-dns-control  8953/tcp    unbound dns nameserver control */
 #define UNBOUND_CONTROL_PORT 8953
diff -r 4be3d1a3c092 -r e62051c5ee03 external/bsd/unbound/include/config-1.1.h
--- a/external/bsd/unbound/include/config-1.1.h Mon Sep 03 14:08:55 2018 +0000
+++ b/external/bsd/unbound/include/config-1.1.h Mon Sep 03 14:36:04 2018 +0000
@@ -31,6 +31,9 @@
    internal symbols */
 /* #undef EXPORT_ALL_SYMBOLS */
 
+/* Define to 1 if you have the `accept4' function. */
+#define HAVE_ACCEPT4 1
+
 /* Define to 1 if you have the `arc4random' function. */
 #define HAVE_ARC4RANDOM 1
 
@@ -84,6 +87,10 @@
    don't. */
 #define HAVE_DECL_NID_ED25519 0
 
+/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you
+   don't. */
+#define HAVE_DECL_NID_ED448 0
+
 /* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you
    don't. */
 #define HAVE_DECL_NID_SECP384R1 1
@@ -96,6 +103,10 @@
    don't. */
 /* #undef HAVE_DECL_REALLOCARRAY */
 
+/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you
+   don't. */
+/* #undef HAVE_DECL_REDISCONNECT */
+
 /* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0
    if you don't. */
 #define HAVE_DECL_SK_SSL_COMP_POP_FREE 1
@@ -234,6 +245,9 @@
 /* Define to 1 if you have the <grp.h> header file. */
 #define HAVE_GRP_H 1
 
+/* Define to 1 if you have the <hiredis/hiredis.h> header file. */
+/* #undef HAVE_HIREDIS_HIREDIS_H */
+
 /* If you have HMAC_Update */
 #define HAVE_HMAC_UPDATE 1
 
@@ -264,6 +278,9 @@
 /* Define to 1 if you have the `kill' function. */
 #define HAVE_KILL 1
 
+/* Define to 1 if you have the <libkern/OSByteOrder.h> header file. */
+/* #undef HAVE_LIBKERN_OSBYTEORDER_H */
+
 /* Define if we have LibreSSL */
 /* #undef HAVE_LIBRESSL */
 
@@ -426,6 +443,12 @@
 /* Define to 1 if you have the `SSL_CTX_set_security_level' function. */
 #define HAVE_SSL_CTX_SET_SECURITY_LEVEL 1
 
+/* Define to 1 if you have the `SSL_get0_peername' function. */
+#define HAVE_SSL_GET0_PEERNAME 1
+
+/* Define to 1 if you have the `SSL_set1_host' function. */
+#define HAVE_SSL_SET1_HOST 1
+
 /* Define to 1 if you have the <stdarg.h> header file. */
 #define HAVE_STDARG_H 1
 
@@ -474,6 +497,9 @@
 /* Define to 1 if systemd should be used */
 /* #undef HAVE_SYSTEMD */
 
+/* Define to 1 if you have the <sys/endian.h> header file. */
+#define HAVE_SYS_ENDIAN_H 1
+
 /* Define to 1 if you have the <sys/ipc.h> header file. */
 #define HAVE_SYS_IPC_H 1
 
@@ -605,7 +631,7 @@
 #define PACKAGE_NAME "unbound"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "unbound 1.6.8"
+#define PACKAGE_STRING "unbound 1.7.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "unbound"
@@ -614,7 +640,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.6.8"
+#define PACKAGE_VERSION "1.7.3"
 
 /* default pidfile location */
 #define PIDFILE "/var/run/unbound.pid"
@@ -647,6 +673,9 @@
 /* define if (v)snprintf does not return length needed, (but length used) */
 /* #undef SNPRINTF_RET_BROKEN */
 
+/* Define to 1 if libsodium supports sodium_set_misuse_handler */
+/* #undef SODIUM_MISUSE_HANDLER */
+
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
@@ -695,6 +724,9 @@
 /* Define this to enable ED25519 support. */
 /* #undef USE_ED25519 */
 
+/* Define this to enable ED448 support. */
+/* #undef USE_ED448 */
+
 /* Define this to enable GOST support. */
 /* #undef USE_GOST */
 
@@ -710,6 +742,9 @@
 /* Define this to enable client TCP Fast Open. */
 /* #undef USE_OSX_MSG_FASTOPEN */
 
+/* Define this to use hiredis client. */
+/* #undef USE_REDIS */
+
 /* Define this to enable SHA1 support. */
 #define USE_SHA1 1
 
@@ -1148,6 +1183,7 @@
 void arc4random_buf(void* buf, size_t n);
 void _ARC4_LOCK(void);
 void _ARC4_UNLOCK(void);
+void _ARC4_LOCK_DESTROY(void);
 #endif
 #ifndef HAVE_ARC4RANDOM_UNIFORM
 uint32_t arc4random_uniform(uint32_t upper_bound);
@@ -1213,6 +1249,8 @@
 
 /** default port for DNS traffic. */