Module Name:    src
Committed By:   christos
Date:           Tue Feb  6 03:05:48 UTC 2018

Modified Files:
        src/external/bsd/unbound/include: config.h
        src/external/bsd/unbound/lib/libunbound: Makefile shlib_version
        src/external/bsd/unbound/sbin/unbound: Makefile
Added Files:
        src/external/bsd/unbound/include/dnscrypt: dnscrypt_config.h
Removed Files:
        src/external/bsd/unbound/dist/testdata: 00-lint.tpkg 01-doc.tpkg
            02-unittest.tpkg 03-testbound.tpkg 04-checkconf.tpkg
            05-asynclook.tpkg 06-ianaports.tpkg 07-confroot.tpkg
            08-host-lib.tpkg 09-unbound-control.tpkg 10-unbound-anchor.tpkg
            ctrl_itr.tpkg ctrl_pipe.tpkg edns_cache.tpkg edns_lame.tpkg
            fwd_ancil.tpkg fwd_bogus.tpkg fwd_capsid.tpkg
            fwd_capsid_fallback.tpkg fwd_capsid_strip.tpkg
            fwd_capsid_white.tpkg fwd_compress_c00c.tpkg fwd_edns_bksec.tpkg
            fwd_edns_probe.tpkg fwd_no_edns.tpkg fwd_oneport.tpkg fwd_tcp.tpkg
            fwd_tcp_tc.tpkg fwd_tcp_tc6.tpkg fwd_three.tpkg
            fwd_three_service.tpkg fwd_ttlexpire.tpkg fwd_udp.tpkg
            fwd_udptmout.tpkg fwd_waitudp.tpkg fwd_zero.tpkg hostsfileosx.tpkg
            local_nodefault.tpkg local_norec.tpkg local_nosnoop.tpkg
            nss_compile.tpkg pylib.tpkg pymod.tpkg pymod_thread.tpkg
            remote-threaded.tpkg root_anchor.tpkg root_hints.tpkg
            speed_cache.tpkg speed_local.tpkg stat_timer.tpkg stream_ssl.tpkg
            stream_tcp.tpkg stub_udp.tpkg stub_udp6.tpkg tcp_sigpipe.tpkg

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/bsd/unbound/dist/testdata/00-lint.tpkg \
    src/external/bsd/unbound/dist/testdata/01-doc.tpkg \
    src/external/bsd/unbound/dist/testdata/02-unittest.tpkg \
    src/external/bsd/unbound/dist/testdata/03-testbound.tpkg \
    src/external/bsd/unbound/dist/testdata/04-checkconf.tpkg \
    src/external/bsd/unbound/dist/testdata/05-asynclook.tpkg \
    src/external/bsd/unbound/dist/testdata/06-ianaports.tpkg \
    src/external/bsd/unbound/dist/testdata/07-confroot.tpkg \
    src/external/bsd/unbound/dist/testdata/08-host-lib.tpkg \
    src/external/bsd/unbound/dist/testdata/09-unbound-control.tpkg \
    src/external/bsd/unbound/dist/testdata/10-unbound-anchor.tpkg \
    src/external/bsd/unbound/dist/testdata/ctrl_itr.tpkg \
    src/external/bsd/unbound/dist/testdata/ctrl_pipe.tpkg \
    src/external/bsd/unbound/dist/testdata/edns_cache.tpkg \
    src/external/bsd/unbound/dist/testdata/edns_lame.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_ancil.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_bogus.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_capsid.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_capsid_fallback.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_capsid_strip.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_capsid_white.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_compress_c00c.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_edns_bksec.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_edns_probe.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_no_edns.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_oneport.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_tcp.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_tcp_tc.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_tcp_tc6.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_three.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_three_service.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_ttlexpire.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_udp.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_udptmout.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_waitudp.tpkg \
    src/external/bsd/unbound/dist/testdata/fwd_zero.tpkg \
    src/external/bsd/unbound/dist/testdata/hostsfileosx.tpkg \
    src/external/bsd/unbound/dist/testdata/local_nodefault.tpkg \
    src/external/bsd/unbound/dist/testdata/local_norec.tpkg \
    src/external/bsd/unbound/dist/testdata/local_nosnoop.tpkg \
    src/external/bsd/unbound/dist/testdata/nss_compile.tpkg \
    src/external/bsd/unbound/dist/testdata/pylib.tpkg \
    src/external/bsd/unbound/dist/testdata/pymod.tpkg \
    src/external/bsd/unbound/dist/testdata/pymod_thread.tpkg \
    src/external/bsd/unbound/dist/testdata/remote-threaded.tpkg \
    src/external/bsd/unbound/dist/testdata/root_anchor.tpkg \
    src/external/bsd/unbound/dist/testdata/root_hints.tpkg \
    src/external/bsd/unbound/dist/testdata/speed_cache.tpkg \
    src/external/bsd/unbound/dist/testdata/speed_local.tpkg \
    src/external/bsd/unbound/dist/testdata/stat_timer.tpkg \
    src/external/bsd/unbound/dist/testdata/stream_ssl.tpkg \
    src/external/bsd/unbound/dist/testdata/stream_tcp.tpkg \
    src/external/bsd/unbound/dist/testdata/stub_udp.tpkg \
    src/external/bsd/unbound/dist/testdata/stub_udp6.tpkg \
    src/external/bsd/unbound/dist/testdata/tcp_sigpipe.tpkg
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/unbound/include/config.h
cvs rdiff -u -r0 -r1.1 \
    src/external/bsd/unbound/include/dnscrypt/dnscrypt_config.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/unbound/lib/libunbound/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/unbound/lib/libunbound/shlib_version
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/unbound/sbin/unbound/Makefile

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/unbound/include/config.h
diff -u src/external/bsd/unbound/include/config.h:1.2 src/external/bsd/unbound/include/config.h:1.3
--- src/external/bsd/unbound/include/config.h:1.2	Tue Mar 14 17:11:12 2017
+++ src/external/bsd/unbound/include/config.h	Mon Feb  5 22:05:48 2018
@@ -4,6 +4,9 @@
 /* Directory to chroot to */
 #define CHROOT_DIR "/var/chroot/unbound"
 
+/* Define this to enable client subnet option. */
+/* #undef CLIENT_SUBNET */
+
 /* Do sha512 definitions in config.h */
 /* #undef COMPAT_SHA512 */
 
@@ -52,6 +55,9 @@
 /* Define to 1 if you have the `chroot' function. */
 #define HAVE_CHROOT 1
 
+/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */
+#define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1
+
 /* Define to 1 if you have the `ctime_r' function. */
 #define HAVE_CTIME_R 1
 
@@ -66,6 +72,18 @@
    if you don't. */
 /* #undef HAVE_DECL_ARC4RANDOM_UNIFORM */
 
+/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you
+   don't. */
+#define HAVE_DECL_INET_NTOP 1
+
+/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you
+   don't. */
+#define HAVE_DECL_INET_PTON 1
+
+/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you
+   don't. */
+#define HAVE_DECL_NID_ED25519 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
@@ -88,15 +106,15 @@
 
 /* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to
    0 if you don't. */
-#define HAVE_DECL_SSL_CTX_SET_ECDH_AUTO 0
+#define HAVE_DECL_SSL_CTX_SET_ECDH_AUTO 1
 
 /* Define to 1 if you have the declaration of `strlcat', and to 0 if you
    don't. */
-#define HAVE_DECL_STRLCAT 1
+/* #undef HAVE_DECL_STRLCAT */
 
 /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you
    don't. */
-#define HAVE_DECL_STRLCPY 1
+/* #undef HAVE_DECL_STRLCPY */
 
 /* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if
    you don't. */
@@ -105,29 +123,50 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
+/* Define to 1 if you have the `DSA_SIG_set0' function. */
+/* #undef HAVE_DSA_SIG_SET0 */
+
 /* Define to 1 if you have the <endian.h> header file. */
-/* #undef HAVE_ENDIAN_H */
+#define HAVE_ENDIAN_H 1
 
 /* Define to 1 if you have the `endprotoent' function. */
 #define HAVE_ENDPROTOENT 1
 
+/* Define to 1 if you have the `endpwent' function. */
+#define HAVE_ENDPWENT 1
+
 /* Define to 1 if you have the `endservent' function. */
 #define HAVE_ENDSERVENT 1
 
+/* Define to 1 if you have the `ERR_free_strings' function. */
+#define HAVE_ERR_FREE_STRINGS 1
+
+/* Define to 1 if you have the `ERR_load_crypto_strings' function. */
+#define HAVE_ERR_LOAD_CRYPTO_STRINGS 1
+
 /* Define to 1 if you have the `event_base_free' function. */
-#define HAVE_EVENT_BASE_FREE 1
+/* #undef HAVE_EVENT_BASE_FREE */
 
 /* Define to 1 if you have the `event_base_get_method' function. */
-#define HAVE_EVENT_BASE_GET_METHOD 1
+/* #undef HAVE_EVENT_BASE_GET_METHOD */
 
 /* Define to 1 if you have the `event_base_new' function. */
-#define HAVE_EVENT_BASE_NEW 1
+/* #undef HAVE_EVENT_BASE_NEW */
 
 /* Define to 1 if you have the `event_base_once' function. */
-#define HAVE_EVENT_BASE_ONCE 1
+/* #undef HAVE_EVENT_BASE_ONCE */
 
 /* Define to 1 if you have the <event.h> header file. */
-#define HAVE_EVENT_H 1
+/* #undef HAVE_EVENT_H */
+
+/* Define to 1 if you have the `EVP_cleanup' function. */
+#define HAVE_EVP_CLEANUP 1
+
+/* Define to 1 if you have the `EVP_DigestVerify' function. */
+/* #undef HAVE_EVP_DIGESTVERIFY */
+
+/* Define to 1 if you have the `EVP_dss1' function. */
+#define HAVE_EVP_DSS1 1
 
 /* Define to 1 if you have the `EVP_MD_CTX_new' function. */
 /* #undef HAVE_EVP_MD_CTX_NEW */
@@ -255,24 +294,51 @@
 /* Use libnettle for crypto */
 /* #undef HAVE_NETTLE */
 
+/* Define to 1 if you have the <nettle/dsa-compat.h> header file. */
+/* #undef HAVE_NETTLE_DSA_COMPAT_H */
+
+/* Define to 1 if you have the <nettle/eddsa.h> header file. */
+/* #undef HAVE_NETTLE_EDDSA_H */
+
 /* Use libnss for crypto */
 /* #undef HAVE_NSS */
 
+/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */
+#define HAVE_OPENSSL_ADD_ALL_DIGESTS 1
+
+/* Define to 1 if you have the <openssl/bn.h> header file. */
+#define HAVE_OPENSSL_BN_H 1
+
 /* Define to 1 if you have the `OPENSSL_config' function. */
 #define HAVE_OPENSSL_CONFIG 1
 
 /* Define to 1 if you have the <openssl/conf.h> header file. */
 #define HAVE_OPENSSL_CONF_H 1
 
+/* Define to 1 if you have the <openssl/dh.h> header file. */
+#define HAVE_OPENSSL_DH_H 1
+
+/* Define to 1 if you have the <openssl/dsa.h> header file. */
+#define HAVE_OPENSSL_DSA_H 1
+
 /* Define to 1 if you have the <openssl/engine.h> header file. */
 #define HAVE_OPENSSL_ENGINE_H 1
 
 /* Define to 1 if you have the <openssl/err.h> header file. */
 #define HAVE_OPENSSL_ERR_H 1
 
+/* Define to 1 if you have the `OPENSSL_init_crypto' function. */
+/* #undef HAVE_OPENSSL_INIT_CRYPTO */
+
+/* Define to 1 if you have the `OPENSSL_init_ssl' function. */
+/* #undef HAVE_OPENSSL_INIT_SSL */
+
 /* Define to 1 if you have the <openssl/rand.h> header file. */
 #define HAVE_OPENSSL_RAND_H 1
 
+/* Define to 1 if you have the <openssl/rsa.h> header file. */
+#define HAVE_OPENSSL_RSA_H 1
+
 /* Define to 1 if you have the <openssl/ssl.h> header file. */
 #define HAVE_OPENSSL_SSL_H 1
 
@@ -297,15 +363,15 @@
 /* Define to 1 if you have the `random' function. */
 #define HAVE_RANDOM 1
 
+/* Define to 1 if you have the `RAND_cleanup' function. */
+#define HAVE_RAND_CLEANUP 1
+
 /* Define to 1 if you have the `reallocarray' function. */
 #define HAVE_REALLOCARRAY 1
 
 /* Define to 1 if you have the `recvmsg' function. */
 #define HAVE_RECVMSG 1
 
-/* define if you have the sbrk() call */
-#define HAVE_SBRK 1
-
 /* Define to 1 if you have the `sendmsg' function. */
 #define HAVE_SENDMSG 1
 
@@ -333,6 +399,9 @@
 /* Define to 1 if you have the `SHA512_Update' function. */
 /* #undef HAVE_SHA512_UPDATE */
 
+/* Define to 1 if you have the `shmget' function. */
+#define HAVE_SHMGET 1
+
 /* Define to 1 if you have the `sigprocmask' function. */
 #define HAVE_SIGPROCMASK 1
 
@@ -354,6 +423,9 @@
 /* Define if you have the SSL libraries installed. */
 #define HAVE_SSL /**/
 
+/* 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 <stdarg.h> header file. */
 #define HAVE_STDARG_H 1
 
@@ -388,7 +460,7 @@
 #define HAVE_STRSEP 1
 
 /* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */
-/* #undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST */
+#define HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST 1
 
 /* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */
 #define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1
@@ -399,6 +471,12 @@
 /* Define to 1 if you have the <syslog.h> header file. */
 #define HAVE_SYSLOG_H 1
 
+/* Define to 1 if systemd should be used */
+/* #undef HAVE_SYSTEMD */
+
+/* Define to 1 if you have the <sys/ipc.h> header file. */
+#define HAVE_SYS_IPC_H 1
+
 /* Define to 1 if you have the <sys/param.h> header file. */
 #define HAVE_SYS_PARAM_H 1
 
@@ -408,6 +486,9 @@
 /* Define to 1 if you have the <sys/sha2.h> header file. */
 /* #undef HAVE_SYS_SHA2_H */
 
+/* Define to 1 if you have the <sys/shm.h> header file. */
+#define HAVE_SYS_SHM_H 1
+
 /* Define to 1 if you have the <sys/socket.h> header file. */
 #define HAVE_SYS_SOCKET_H 1
 
@@ -524,7 +605,7 @@
 #define PACKAGE_NAME "unbound"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "unbound 1.5.9"
+#define PACKAGE_STRING "unbound 1.6.8"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "unbound"
@@ -533,10 +614,10 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5.9"
+#define PACKAGE_VERSION "1.6.8"
 
 /* default pidfile location */
-#define PIDFILE "/var/run/unbound.pid"
+#define PIDFILE "/usr/local/etc/unbound/unbound.pid"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -546,19 +627,19 @@
 #define RETSIGTYPE void
 
 /* default rootkey location */
-#define ROOT_ANCHOR_FILE "/etc/unbound/root.key"
+#define ROOT_ANCHOR_FILE "/usr/local/etc/unbound/root.key"
 
 /* default rootcert location */
-#define ROOT_CERT_FILE "/etc/unbound/icannbundle.pem"
+#define ROOT_CERT_FILE "/usr/local/etc/unbound/icannbundle.pem"
 
 /* version number for resource files */
-#define RSRC_PACKAGE_VERSION 1,5,9,0
+#define RSRC_PACKAGE_VERSION 1,6,8,0
 
 /* Directory to chdir to */
-#define RUN_DIR "/var/chroot/unbound"
+#define RUN_DIR "/usr/local/etc/unbound"
 
 /* Shared data */
-#define SHARE_DIR "/etc/unbound"
+#define SHARE_DIR "/usr/local/etc/unbound"
 
 /* The size of `time_t', as computed by sizeof. */
 #define SIZEOF_TIME_T 8
@@ -576,7 +657,7 @@
 /* #undef UB_ON_WINDOWS */
 
 /* default username */
-#define UB_USERNAME "_unbound"
+#define UB_USERNAME "unbound"
 
 /* use to enable lightweight alloc assertions, for debug use */
 /* #undef UNBOUND_ALLOC_LITE */
@@ -593,6 +674,12 @@
 /* Define to 1 to use cachedb support */
 /* #undef USE_CACHEDB */
 
+/* Define to 1 to enable dnscrypt support */
+/* #undef USE_DNSCRYPT */
+
+/* Define to 1 to enable dnscrypt with xchacha20 support */
+/* #undef USE_DNSCRYPT_XCHACHA20 */
+
 /* Define to 1 to enable dnstap support */
 /* #undef USE_DNSTAP */
 
@@ -605,11 +692,26 @@
 /* Define this to enable an EVP workaround for older openssl */
 /* #undef USE_ECDSA_EVP_WORKAROUND */
 
+/* Define this to enable ED25519 support. */
+/* #undef USE_ED25519 */
+
 /* Define this to enable GOST support. */
 #define USE_GOST 1
 
+/* Define to 1 to use ipsecmod support. */
+/* #undef USE_IPSECMOD */
+
 /* Define if you want to use internal select based events */
-/* #undef USE_MINI_EVENT */
+#define USE_MINI_EVENT 1
+
+/* Define this to enable client TCP Fast Open. */
+/* #undef USE_MSG_FASTOPEN */
+
+/* Define this to enable client TCP Fast Open. */
+/* #undef USE_OSX_MSG_FASTOPEN */
+
+/* Define this to enable SHA1 support. */
+#define USE_SHA1 1
 
 /* Define this to enable SHA256 and SHA512 support. */
 #define USE_SHA2 1
@@ -636,6 +738,9 @@
 #endif
 
 
+/* Define this to enable server TCP Fast Open. */
+/* #undef USE_TCP_FASTOPEN */
+
 /* Whether the windows socket API is used */
 /* #undef USE_WINSOCK */
 
@@ -1005,6 +1110,14 @@ char *strsep(char **stringp, const char 
 int isblank(int c);
 #endif
 
+#if defined(HAVE_INET_NTOP) && !HAVE_DECL_INET_NTOP
+const char *inet_ntop(int af, const void *src, char *dst, size_t size);
+#endif
+
+#if defined(HAVE_INET_PTON) && !HAVE_DECL_INET_PTON
+int inet_pton(int af, const char* src, void* dst);
+#endif
+
 #if !defined(HAVE_STRPTIME) || !defined(STRPTIME_WORKS)
 #define strptime unbound_strptime
 struct tm;

Index: src/external/bsd/unbound/lib/libunbound/Makefile
diff -u src/external/bsd/unbound/lib/libunbound/Makefile:1.2 src/external/bsd/unbound/lib/libunbound/Makefile:1.3
--- src/external/bsd/unbound/lib/libunbound/Makefile:1.2	Sat Aug 20 11:24:29 2016
+++ src/external/bsd/unbound/lib/libunbound/Makefile	Mon Feb  5 22:05:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/08/20 15:24:29 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/02/06 03:05:48 christos Exp $
 
 .include <bsd.init.mk>
 
@@ -7,6 +7,7 @@ ${UNBOUND}/cachedb \
 ${UNBOUND}/dns64 \
 ${UNBOUND}/iterator \
 ${UNBOUND}/libunbound \
+${UNBOUND}/respip \
 ${UNBOUND}/services \
 ${UNBOUND}/services/cache \
 ${UNBOUND}/sldns \
@@ -21,6 +22,7 @@ LIB=unbound
 SRCS=\
 alloc.c \
 as112.c \
+authzone.c \
 autotrust.c \
 cachedb.c \
 config_file.c \
@@ -68,6 +70,7 @@ parseutil.c \
 random.c \
 rbtree.c \
 regional.c \
+respip.c \
 rrdef.c \
 rrset.c \
 rtt.c \
@@ -87,6 +90,7 @@ val_secalgo.c \
 val_sigcrypt.c \
 val_utils.c \
 validator.c \
+view.c \
 winsock_event.c \
 wire2str.c
 

Index: src/external/bsd/unbound/lib/libunbound/shlib_version
diff -u src/external/bsd/unbound/lib/libunbound/shlib_version:1.1 src/external/bsd/unbound/lib/libunbound/shlib_version:1.2
--- src/external/bsd/unbound/lib/libunbound/shlib_version:1.1	Sat Aug 20 07:20:31 2016
+++ src/external/bsd/unbound/lib/libunbound/shlib_version	Mon Feb  5 22:05:48 2018
@@ -1,3 +1,3 @@
-#	$NetBSD: shlib_version,v 1.1 2016/08/20 11:20:31 christos Exp $
+#	$NetBSD: shlib_version,v 1.2 2018/02/06 03:05:48 christos Exp $
 major=6
-minor=1
+minor=2

Index: src/external/bsd/unbound/sbin/unbound/Makefile
diff -u src/external/bsd/unbound/sbin/unbound/Makefile:1.1 src/external/bsd/unbound/sbin/unbound/Makefile:1.2
--- src/external/bsd/unbound/sbin/unbound/Makefile:1.1	Sat Aug 20 07:20:32 2016
+++ src/external/bsd/unbound/sbin/unbound/Makefile	Mon Feb  5 22:05:48 2018
@@ -1,5 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2016/08/20 11:20:32 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/02/06 03:05:48 christos Exp $
 
 PROG=unbound
+SRCS=shm_main.c
 
 .include <bsd.prog.mk>
+
+.PATH: ${UNBOUND}/util ${UNBOUND}/util/shm_side

Added files:

Index: src/external/bsd/unbound/include/dnscrypt/dnscrypt_config.h
diff -u /dev/null src/external/bsd/unbound/include/dnscrypt/dnscrypt_config.h:1.1
--- /dev/null	Mon Feb  5 22:05:48 2018
+++ src/external/bsd/unbound/include/dnscrypt/dnscrypt_config.h	Mon Feb  5 22:05:48 2018
@@ -0,0 +1,17 @@
+#ifndef UNBOUND_DNSCRYPT_CONFIG_H
+#define UNBOUND_DNSCRYPT_CONFIG_H
+
+/*
+ * Process this file (dnscrypt_config.h.in) with AC_CONFIG_FILES to generate
+ * dnscrypt_config.h.
+ *
+ * This file exists so that USE_DNSCRYPT can be used without including config.h.
+ */
+
+#if 0 /* ENABLE_DNSCRYPT */
+# ifndef USE_DNSCRYPT
+#  define USE_DNSCRYPT 1
+# endif
+#endif
+
+#endif /* UNBOUND_DNSCRYPT_CONFIG_H */

Reply via email to