Date: Sat, 12 May 2018 11:55:18 +0000 (UTC) From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r333541 - in vendor/unbound/dist: . cachedb contrib daemon dns64 dnscrypt dnscrypt/testdata dnscrypt/testdata/keys1 dnscrypt/testdata/keys2 doc iterator libunbound pythonmod/doc/example... Message-ID: <201805121155.w4CBtIir019777@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Sat May 12 11:55:17 2018 New Revision: 333541 URL: https://svnweb.freebsd.org/changeset/base/333541 Log: Vendor import of Unbound 1.6.6. Added: vendor/unbound/dist/dnscrypt/testdata/ vendor/unbound/dist/dnscrypt/testdata/gencert.sh (contents, props changed) vendor/unbound/dist/dnscrypt/testdata/keys1/ vendor/unbound/dist/dnscrypt/testdata/keys1/public.key (contents, props changed) vendor/unbound/dist/dnscrypt/testdata/keys1/secret.key (contents, props changed) vendor/unbound/dist/dnscrypt/testdata/keys2/ vendor/unbound/dist/dnscrypt/testdata/keys2/public.key (contents, props changed) vendor/unbound/dist/dnscrypt/testdata/keys2/secret.key (contents, props changed) vendor/unbound/dist/testcode/mini_tdir.sh (contents, props changed) vendor/unbound/dist/testdata/00-lint.tdir/ vendor/unbound/dist/testdata/00-lint.tdir/00-lint.dsc vendor/unbound/dist/testdata/00-lint.tdir/00-lint.test vendor/unbound/dist/testdata/01-doc.tdir/ vendor/unbound/dist/testdata/01-doc.tdir/01-doc.dsc vendor/unbound/dist/testdata/01-doc.tdir/01-doc.test vendor/unbound/dist/testdata/02-unittest.tdir/ vendor/unbound/dist/testdata/02-unittest.tdir/02-unittest.dsc vendor/unbound/dist/testdata/02-unittest.tdir/02-unittest.test vendor/unbound/dist/testdata/03-testbound.tdir/ vendor/unbound/dist/testdata/03-testbound.tdir/03-testbound.dsc vendor/unbound/dist/testdata/03-testbound.tdir/03-testbound.test vendor/unbound/dist/testdata/04-checkconf.tdir/ vendor/unbound/dist/testdata/04-checkconf.tdir/04-checkconf.dsc vendor/unbound/dist/testdata/04-checkconf.tdir/04-checkconf.test vendor/unbound/dist/testdata/04-checkconf.tdir/bad.badfwd vendor/unbound/dist/testdata/04-checkconf.tdir/bad.badif vendor/unbound/dist/testdata/04-checkconf.tdir/bad.badip vendor/unbound/dist/testdata/04-checkconf.tdir/bad.bind vendor/unbound/dist/testdata/04-checkconf.tdir/bad.user vendor/unbound/dist/testdata/04-checkconf.tdir/good.all vendor/unbound/dist/testdata/04-checkconf.tdir/good.ifport vendor/unbound/dist/testdata/04-checkconf.tdir/good.include vendor/unbound/dist/testdata/04-checkconf.tdir/warn.algo vendor/unbound/dist/testdata/05-asynclook.tdir/ vendor/unbound/dist/testdata/05-asynclook.tdir/05-asynclook.dsc vendor/unbound/dist/testdata/05-asynclook.tdir/05-asynclook.hosts vendor/unbound/dist/testdata/05-asynclook.tdir/05-asynclook.post vendor/unbound/dist/testdata/05-asynclook.tdir/05-asynclook.pre vendor/unbound/dist/testdata/05-asynclook.tdir/05-asynclook.test vendor/unbound/dist/testdata/05-asynclook.tdir/05-asynclook.testns vendor/unbound/dist/testdata/06-ianaports.tdir/ vendor/unbound/dist/testdata/06-ianaports.tdir/06-ianaports.dsc vendor/unbound/dist/testdata/06-ianaports.tdir/06-ianaports.test vendor/unbound/dist/testdata/07-confroot.tdir/ vendor/unbound/dist/testdata/07-confroot.tdir/07-confroot.dsc vendor/unbound/dist/testdata/07-confroot.tdir/07-confroot.test vendor/unbound/dist/testdata/08-host-lib.tdir/ vendor/unbound/dist/testdata/08-host-lib.tdir/08-host-lib.dsc vendor/unbound/dist/testdata/08-host-lib.tdir/08-host-lib.hosts vendor/unbound/dist/testdata/08-host-lib.tdir/08-host-lib.post vendor/unbound/dist/testdata/08-host-lib.tdir/08-host-lib.pre vendor/unbound/dist/testdata/08-host-lib.tdir/08-host-lib.test vendor/unbound/dist/testdata/08-host-lib.tdir/08-host-lib.testns vendor/unbound/dist/testdata/09-unbound-control.tdir/ vendor/unbound/dist/testdata/09-unbound-control.tdir/09-unbound-control.conf vendor/unbound/dist/testdata/09-unbound-control.tdir/09-unbound-control.dsc vendor/unbound/dist/testdata/09-unbound-control.tdir/09-unbound-control.post vendor/unbound/dist/testdata/09-unbound-control.tdir/09-unbound-control.pre vendor/unbound/dist/testdata/09-unbound-control.tdir/09-unbound-control.test vendor/unbound/dist/testdata/09-unbound-control.tdir/09-unbound-control.testns vendor/unbound/dist/testdata/09-unbound-control.tdir/bad_control.key vendor/unbound/dist/testdata/09-unbound-control.tdir/bad_control.pem vendor/unbound/dist/testdata/09-unbound-control.tdir/bad_server.key vendor/unbound/dist/testdata/09-unbound-control.tdir/bad_server.pem vendor/unbound/dist/testdata/09-unbound-control.tdir/local_data vendor/unbound/dist/testdata/09-unbound-control.tdir/local_data_remove vendor/unbound/dist/testdata/09-unbound-control.tdir/local_zones vendor/unbound/dist/testdata/09-unbound-control.tdir/local_zones_remove vendor/unbound/dist/testdata/09-unbound-control.tdir/unbound_control.key vendor/unbound/dist/testdata/09-unbound-control.tdir/unbound_control.pem vendor/unbound/dist/testdata/09-unbound-control.tdir/unbound_server.key vendor/unbound/dist/testdata/09-unbound-control.tdir/unbound_server.pem vendor/unbound/dist/testdata/10-unbound-anchor.tdir/ vendor/unbound/dist/testdata/10-unbound-anchor.tdir/10-unbound-anchor.conf vendor/unbound/dist/testdata/10-unbound-anchor.tdir/10-unbound-anchor.dsc vendor/unbound/dist/testdata/10-unbound-anchor.tdir/10-unbound-anchor.post vendor/unbound/dist/testdata/10-unbound-anchor.tdir/10-unbound-anchor.pre vendor/unbound/dist/testdata/10-unbound-anchor.tdir/10-unbound-anchor.test vendor/unbound/dist/testdata/10-unbound-anchor.tdir/10-unbound-anchor.testns vendor/unbound/dist/testdata/10-unbound-anchor.tdir/127.0.0.1/ vendor/unbound/dist/testdata/10-unbound-anchor.tdir/127.0.0.1/bad.p7s (contents, props changed) vendor/unbound/dist/testdata/10-unbound-anchor.tdir/127.0.0.1/bad.xml vendor/unbound/dist/testdata/10-unbound-anchor.tdir/127.0.0.1/no_more_keys.p7s (contents, props changed) vendor/unbound/dist/testdata/10-unbound-anchor.tdir/127.0.0.1/no_more_keys.xml vendor/unbound/dist/testdata/10-unbound-anchor.tdir/127.0.0.1/root.p7s (contents, props changed) vendor/unbound/dist/testdata/10-unbound-anchor.tdir/127.0.0.1/root.xml vendor/unbound/dist/testdata/10-unbound-anchor.tdir/K.+005+37348.ds vendor/unbound/dist/testdata/10-unbound-anchor.tdir/K.+005+37348.key vendor/unbound/dist/testdata/10-unbound-anchor.tdir/K.+005+37348.private vendor/unbound/dist/testdata/10-unbound-anchor.tdir/keys/ vendor/unbound/dist/testdata/10-unbound-anchor.tdir/keys/test_cert.key vendor/unbound/dist/testdata/10-unbound-anchor.tdir/keys/test_cert.pem vendor/unbound/dist/testdata/10-unbound-anchor.tdir/keys/unbound-control-setup (contents, props changed) vendor/unbound/dist/testdata/10-unbound-anchor.tdir/keys/unbound_control.key vendor/unbound/dist/testdata/10-unbound-anchor.tdir/keys/unbound_control.pem vendor/unbound/dist/testdata/10-unbound-anchor.tdir/keys/unbound_server.key vendor/unbound/dist/testdata/10-unbound-anchor.tdir/keys/unbound_server.pem vendor/unbound/dist/testdata/10-unbound-anchor.tdir/petal.key vendor/unbound/dist/testdata/10-unbound-anchor.tdir/petal.pem vendor/unbound/dist/testdata/10-unbound-anchor.tdir/signit vendor/unbound/dist/testdata/10-unbound-anchor.tdir/test_cert.key vendor/unbound/dist/testdata/10-unbound-anchor.tdir/test_cert.pem vendor/unbound/dist/testdata/ctrl_itr.tdir/ vendor/unbound/dist/testdata/ctrl_itr.tdir/bad_control.key vendor/unbound/dist/testdata/ctrl_itr.tdir/bad_control.pem vendor/unbound/dist/testdata/ctrl_itr.tdir/bad_server.key vendor/unbound/dist/testdata/ctrl_itr.tdir/bad_server.pem vendor/unbound/dist/testdata/ctrl_itr.tdir/ctrl_itr.conf vendor/unbound/dist/testdata/ctrl_itr.tdir/ctrl_itr.dsc vendor/unbound/dist/testdata/ctrl_itr.tdir/ctrl_itr.post vendor/unbound/dist/testdata/ctrl_itr.tdir/ctrl_itr.pre vendor/unbound/dist/testdata/ctrl_itr.tdir/ctrl_itr.test vendor/unbound/dist/testdata/ctrl_itr.tdir/ctrl_itr.testns vendor/unbound/dist/testdata/ctrl_itr.tdir/unbound_control.key vendor/unbound/dist/testdata/ctrl_itr.tdir/unbound_control.pem vendor/unbound/dist/testdata/ctrl_itr.tdir/unbound_server.key vendor/unbound/dist/testdata/ctrl_itr.tdir/unbound_server.pem vendor/unbound/dist/testdata/ctrl_pipe.tdir/ vendor/unbound/dist/testdata/ctrl_pipe.tdir/._bad_control.key (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._bad_control.pem (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._bad_server.key (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._bad_server.pem (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.conf (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.dsc (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.post (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.pre (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.test (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.testns (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_control.key (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_control.pem (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_server.key (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_server.pem (contents, props changed) vendor/unbound/dist/testdata/ctrl_pipe.tdir/bad_control.key vendor/unbound/dist/testdata/ctrl_pipe.tdir/bad_control.pem vendor/unbound/dist/testdata/ctrl_pipe.tdir/bad_server.key vendor/unbound/dist/testdata/ctrl_pipe.tdir/bad_server.pem vendor/unbound/dist/testdata/ctrl_pipe.tdir/ctrl_pipe.conf vendor/unbound/dist/testdata/ctrl_pipe.tdir/ctrl_pipe.dsc vendor/unbound/dist/testdata/ctrl_pipe.tdir/ctrl_pipe.post vendor/unbound/dist/testdata/ctrl_pipe.tdir/ctrl_pipe.pre vendor/unbound/dist/testdata/ctrl_pipe.tdir/ctrl_pipe.test vendor/unbound/dist/testdata/ctrl_pipe.tdir/ctrl_pipe.testns vendor/unbound/dist/testdata/ctrl_pipe.tdir/unbound_control.key vendor/unbound/dist/testdata/ctrl_pipe.tdir/unbound_control.pem vendor/unbound/dist/testdata/ctrl_pipe.tdir/unbound_server.key vendor/unbound/dist/testdata/ctrl_pipe.tdir/unbound_server.pem vendor/unbound/dist/testdata/dnscrypt_cert.tdir/ vendor/unbound/dist/testdata/dnscrypt_cert.tdir/1.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert.tdir/1.key (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert.tdir/1_chacha.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert.tdir/1_salsa.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert.tdir/2.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert.tdir/2.key (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert.tdir/2_chacha.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert.tdir/2_salsa.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert.tdir/dnscrypt_cert.conf vendor/unbound/dist/testdata/dnscrypt_cert.tdir/dnscrypt_cert.dsc vendor/unbound/dist/testdata/dnscrypt_cert.tdir/dnscrypt_cert.post vendor/unbound/dist/testdata/dnscrypt_cert.tdir/dnscrypt_cert.pre vendor/unbound/dist/testdata/dnscrypt_cert.tdir/dnscrypt_cert.test vendor/unbound/dist/testdata/dnscrypt_cert.tdir/dnscrypt_cert.testns vendor/unbound/dist/testdata/dnscrypt_cert.tdir/precheck.sh vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/ vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/1.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/1.key (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/1_chacha.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/1_salsa.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/2.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/2.key (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/2_chacha.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/2_salsa.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/dnscrypt_cert_chacha.conf vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/dnscrypt_cert_chacha.dsc vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/dnscrypt_cert_chacha.post vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/dnscrypt_cert_chacha.pre vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/dnscrypt_cert_chacha.test vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/dnscrypt_cert_chacha.testns vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/precheck.sh vendor/unbound/dist/testdata/dnscrypt_queries.tdir/ vendor/unbound/dist/testdata/dnscrypt_queries.tdir/1.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries.tdir/1.key (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries.tdir/1_chacha.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries.tdir/1_salsa.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries.tdir/2.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries.tdir/2.key (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries.tdir/2_chacha.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries.tdir/2_salsa.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries.tdir/dnscrypt_queries.conf vendor/unbound/dist/testdata/dnscrypt_queries.tdir/dnscrypt_queries.dsc vendor/unbound/dist/testdata/dnscrypt_queries.tdir/dnscrypt_queries.post vendor/unbound/dist/testdata/dnscrypt_queries.tdir/dnscrypt_queries.pre vendor/unbound/dist/testdata/dnscrypt_queries.tdir/dnscrypt_queries.test vendor/unbound/dist/testdata/dnscrypt_queries.tdir/dnscrypt_queries.testns vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/ vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/1.key (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/1_chacha.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/1_salsa.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/2.key (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/2_chacha.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/2_salsa.cert (contents, props changed) vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/dnscrypt_queries_chacha.conf vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/dnscrypt_queries_chacha.dsc vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/dnscrypt_queries_chacha.post vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/dnscrypt_queries_chacha.pre vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/dnscrypt_queries_chacha.test vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/dnscrypt_queries_chacha.testns vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tdir/precheck.sh vendor/unbound/dist/testdata/edns_cache.tdir/ vendor/unbound/dist/testdata/edns_cache.tdir/edns_cache.conf vendor/unbound/dist/testdata/edns_cache.tdir/edns_cache.dsc vendor/unbound/dist/testdata/edns_cache.tdir/edns_cache.post vendor/unbound/dist/testdata/edns_cache.tdir/edns_cache.pre vendor/unbound/dist/testdata/edns_cache.tdir/edns_cache.stub1 vendor/unbound/dist/testdata/edns_cache.tdir/edns_cache.stub2 vendor/unbound/dist/testdata/edns_cache.tdir/edns_cache.test vendor/unbound/dist/testdata/edns_lame.tdir/ vendor/unbound/dist/testdata/edns_lame.tdir/edns_lame.conf vendor/unbound/dist/testdata/edns_lame.tdir/edns_lame.dsc vendor/unbound/dist/testdata/edns_lame.tdir/edns_lame.post vendor/unbound/dist/testdata/edns_lame.tdir/edns_lame.pre vendor/unbound/dist/testdata/edns_lame.tdir/edns_lame.test vendor/unbound/dist/testdata/edns_lame.tdir/edns_lame.testns vendor/unbound/dist/testdata/fwd_ancil.tdir/ vendor/unbound/dist/testdata/fwd_ancil.tdir/fwd_ancil.conf vendor/unbound/dist/testdata/fwd_ancil.tdir/fwd_ancil.dsc vendor/unbound/dist/testdata/fwd_ancil.tdir/fwd_ancil.post vendor/unbound/dist/testdata/fwd_ancil.tdir/fwd_ancil.pre vendor/unbound/dist/testdata/fwd_ancil.tdir/fwd_ancil.test vendor/unbound/dist/testdata/fwd_ancil.tdir/fwd_ancil.testns vendor/unbound/dist/testdata/fwd_bogus.tdir/ vendor/unbound/dist/testdata/fwd_bogus.tdir/fwd_bogus.conf vendor/unbound/dist/testdata/fwd_bogus.tdir/fwd_bogus.dsc vendor/unbound/dist/testdata/fwd_bogus.tdir/fwd_bogus.post vendor/unbound/dist/testdata/fwd_bogus.tdir/fwd_bogus.pre vendor/unbound/dist/testdata/fwd_bogus.tdir/fwd_bogus.test vendor/unbound/dist/testdata/fwd_bogus.tdir/fwd_bogus.testns vendor/unbound/dist/testdata/fwd_bogus.tdir/unbound_control.key vendor/unbound/dist/testdata/fwd_bogus.tdir/unbound_control.pem vendor/unbound/dist/testdata/fwd_bogus.tdir/unbound_server.key vendor/unbound/dist/testdata/fwd_bogus.tdir/unbound_server.pem vendor/unbound/dist/testdata/fwd_capsid.tdir/ vendor/unbound/dist/testdata/fwd_capsid.tdir/fwd_capsid.conf vendor/unbound/dist/testdata/fwd_capsid.tdir/fwd_capsid.dsc vendor/unbound/dist/testdata/fwd_capsid.tdir/fwd_capsid.post vendor/unbound/dist/testdata/fwd_capsid.tdir/fwd_capsid.pre vendor/unbound/dist/testdata/fwd_capsid.tdir/fwd_capsid.test vendor/unbound/dist/testdata/fwd_capsid.tdir/fwd_capsid.testns vendor/unbound/dist/testdata/fwd_capsid_fallback.tdir/ vendor/unbound/dist/testdata/fwd_capsid_fallback.tdir/fwd_capsid_fallback.conf vendor/unbound/dist/testdata/fwd_capsid_fallback.tdir/fwd_capsid_fallback.dsc vendor/unbound/dist/testdata/fwd_capsid_fallback.tdir/fwd_capsid_fallback.post vendor/unbound/dist/testdata/fwd_capsid_fallback.tdir/fwd_capsid_fallback.pre vendor/unbound/dist/testdata/fwd_capsid_fallback.tdir/fwd_capsid_fallback.test vendor/unbound/dist/testdata/fwd_capsid_fallback.tdir/fwd_capsid_fallback.testns vendor/unbound/dist/testdata/fwd_capsid_strip.tdir/ vendor/unbound/dist/testdata/fwd_capsid_strip.tdir/fwd_capsid_strip.conf vendor/unbound/dist/testdata/fwd_capsid_strip.tdir/fwd_capsid_strip.dsc vendor/unbound/dist/testdata/fwd_capsid_strip.tdir/fwd_capsid_strip.post vendor/unbound/dist/testdata/fwd_capsid_strip.tdir/fwd_capsid_strip.pre vendor/unbound/dist/testdata/fwd_capsid_strip.tdir/fwd_capsid_strip.test vendor/unbound/dist/testdata/fwd_capsid_strip.tdir/fwd_capsid_strip.testns vendor/unbound/dist/testdata/fwd_capsid_strip.tdir/fwd_capsid_strip.testns2 vendor/unbound/dist/testdata/fwd_capsid_white.tdir/ vendor/unbound/dist/testdata/fwd_capsid_white.tdir/fwd_capsid_white.conf vendor/unbound/dist/testdata/fwd_capsid_white.tdir/fwd_capsid_white.dsc vendor/unbound/dist/testdata/fwd_capsid_white.tdir/fwd_capsid_white.post vendor/unbound/dist/testdata/fwd_capsid_white.tdir/fwd_capsid_white.pre vendor/unbound/dist/testdata/fwd_capsid_white.tdir/fwd_capsid_white.test vendor/unbound/dist/testdata/fwd_capsid_white.tdir/fwd_capsid_white.testns vendor/unbound/dist/testdata/fwd_capsid_white.tdir/fwd_capsid_white.testns2 vendor/unbound/dist/testdata/fwd_compress_c00c.tdir/ vendor/unbound/dist/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.conf vendor/unbound/dist/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.dsc vendor/unbound/dist/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.good vendor/unbound/dist/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.post vendor/unbound/dist/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.pre vendor/unbound/dist/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.test vendor/unbound/dist/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.testns vendor/unbound/dist/testdata/fwd_edns_bksec.tdir/ vendor/unbound/dist/testdata/fwd_edns_bksec.tdir/fwd_edns_bksec.conf vendor/unbound/dist/testdata/fwd_edns_bksec.tdir/fwd_edns_bksec.dsc vendor/unbound/dist/testdata/fwd_edns_bksec.tdir/fwd_edns_bksec.post vendor/unbound/dist/testdata/fwd_edns_bksec.tdir/fwd_edns_bksec.pre vendor/unbound/dist/testdata/fwd_edns_bksec.tdir/fwd_edns_bksec.test vendor/unbound/dist/testdata/fwd_edns_bksec.tdir/fwd_edns_bksec.testns vendor/unbound/dist/testdata/fwd_edns_probe.tdir/ vendor/unbound/dist/testdata/fwd_edns_probe.tdir/fwd_edns_probe.conf vendor/unbound/dist/testdata/fwd_edns_probe.tdir/fwd_edns_probe.dsc vendor/unbound/dist/testdata/fwd_edns_probe.tdir/fwd_edns_probe.post vendor/unbound/dist/testdata/fwd_edns_probe.tdir/fwd_edns_probe.pre vendor/unbound/dist/testdata/fwd_edns_probe.tdir/fwd_edns_probe.test vendor/unbound/dist/testdata/fwd_edns_probe.tdir/fwd_edns_probe.testns vendor/unbound/dist/testdata/fwd_malformed.tdir/ vendor/unbound/dist/testdata/fwd_malformed.tdir/fwd_malformed.conf vendor/unbound/dist/testdata/fwd_malformed.tdir/fwd_malformed.dsc vendor/unbound/dist/testdata/fwd_malformed.tdir/fwd_malformed.post vendor/unbound/dist/testdata/fwd_malformed.tdir/fwd_malformed.pre vendor/unbound/dist/testdata/fwd_malformed.tdir/fwd_malformed.test vendor/unbound/dist/testdata/fwd_malformed.tdir/fwd_malformed.testns vendor/unbound/dist/testdata/fwd_no_edns.tdir/ vendor/unbound/dist/testdata/fwd_no_edns.tdir/fwd_no_edns.conf vendor/unbound/dist/testdata/fwd_no_edns.tdir/fwd_no_edns.dsc vendor/unbound/dist/testdata/fwd_no_edns.tdir/fwd_no_edns.post vendor/unbound/dist/testdata/fwd_no_edns.tdir/fwd_no_edns.pre vendor/unbound/dist/testdata/fwd_no_edns.tdir/fwd_no_edns.test vendor/unbound/dist/testdata/fwd_no_edns.tdir/fwd_no_edns.testns vendor/unbound/dist/testdata/fwd_oneport.tdir/ vendor/unbound/dist/testdata/fwd_oneport.tdir/fwd_oneport.conf vendor/unbound/dist/testdata/fwd_oneport.tdir/fwd_oneport.dsc vendor/unbound/dist/testdata/fwd_oneport.tdir/fwd_oneport.post vendor/unbound/dist/testdata/fwd_oneport.tdir/fwd_oneport.pre vendor/unbound/dist/testdata/fwd_oneport.tdir/fwd_oneport.test vendor/unbound/dist/testdata/fwd_oneport.tdir/fwd_oneport.testns vendor/unbound/dist/testdata/fwd_tcp.tdir/ vendor/unbound/dist/testdata/fwd_tcp.tdir/fwd_tcp.conf vendor/unbound/dist/testdata/fwd_tcp.tdir/fwd_tcp.dsc vendor/unbound/dist/testdata/fwd_tcp.tdir/fwd_tcp.post vendor/unbound/dist/testdata/fwd_tcp.tdir/fwd_tcp.pre vendor/unbound/dist/testdata/fwd_tcp.tdir/fwd_tcp.test vendor/unbound/dist/testdata/fwd_tcp.tdir/fwd_tcp.testns vendor/unbound/dist/testdata/fwd_tcp_tc.tdir/ vendor/unbound/dist/testdata/fwd_tcp_tc.tdir/fwd_tcp_tc.conf vendor/unbound/dist/testdata/fwd_tcp_tc.tdir/fwd_tcp_tc.dsc vendor/unbound/dist/testdata/fwd_tcp_tc.tdir/fwd_tcp_tc.post vendor/unbound/dist/testdata/fwd_tcp_tc.tdir/fwd_tcp_tc.pre vendor/unbound/dist/testdata/fwd_tcp_tc.tdir/fwd_tcp_tc.test vendor/unbound/dist/testdata/fwd_tcp_tc.tdir/fwd_tcp_tc.testns vendor/unbound/dist/testdata/fwd_tcp_tc6.tdir/ vendor/unbound/dist/testdata/fwd_tcp_tc6.tdir/fwd_tcp_tc6.conf vendor/unbound/dist/testdata/fwd_tcp_tc6.tdir/fwd_tcp_tc6.dsc vendor/unbound/dist/testdata/fwd_tcp_tc6.tdir/fwd_tcp_tc6.post vendor/unbound/dist/testdata/fwd_tcp_tc6.tdir/fwd_tcp_tc6.pre vendor/unbound/dist/testdata/fwd_tcp_tc6.tdir/fwd_tcp_tc6.test vendor/unbound/dist/testdata/fwd_tcp_tc6.tdir/fwd_tcp_tc6.testns vendor/unbound/dist/testdata/fwd_three.tdir/ vendor/unbound/dist/testdata/fwd_three.tdir/fwd_three.conf vendor/unbound/dist/testdata/fwd_three.tdir/fwd_three.dsc vendor/unbound/dist/testdata/fwd_three.tdir/fwd_three.post vendor/unbound/dist/testdata/fwd_three.tdir/fwd_three.pre vendor/unbound/dist/testdata/fwd_three.tdir/fwd_three.test vendor/unbound/dist/testdata/fwd_three.tdir/fwd_three.testns vendor/unbound/dist/testdata/fwd_three_service.tdir/ vendor/unbound/dist/testdata/fwd_three_service.tdir/fwd_three_service.conf vendor/unbound/dist/testdata/fwd_three_service.tdir/fwd_three_service.dsc vendor/unbound/dist/testdata/fwd_three_service.tdir/fwd_three_service.post vendor/unbound/dist/testdata/fwd_three_service.tdir/fwd_three_service.pre vendor/unbound/dist/testdata/fwd_three_service.tdir/fwd_three_service.test vendor/unbound/dist/testdata/fwd_three_service.tdir/fwd_three_service.testns vendor/unbound/dist/testdata/fwd_ttlexpire.tdir/ vendor/unbound/dist/testdata/fwd_ttlexpire.tdir/fwd_ttlexpire.conf vendor/unbound/dist/testdata/fwd_ttlexpire.tdir/fwd_ttlexpire.dsc vendor/unbound/dist/testdata/fwd_ttlexpire.tdir/fwd_ttlexpire.post vendor/unbound/dist/testdata/fwd_ttlexpire.tdir/fwd_ttlexpire.pre vendor/unbound/dist/testdata/fwd_ttlexpire.tdir/fwd_ttlexpire.test vendor/unbound/dist/testdata/fwd_ttlexpire.tdir/fwd_ttlexpire.testns vendor/unbound/dist/testdata/fwd_udp.tdir/ vendor/unbound/dist/testdata/fwd_udp.tdir/fwd_udp.conf vendor/unbound/dist/testdata/fwd_udp.tdir/fwd_udp.dsc vendor/unbound/dist/testdata/fwd_udp.tdir/fwd_udp.post vendor/unbound/dist/testdata/fwd_udp.tdir/fwd_udp.pre vendor/unbound/dist/testdata/fwd_udp.tdir/fwd_udp.test vendor/unbound/dist/testdata/fwd_udp.tdir/fwd_udp.testns vendor/unbound/dist/testdata/fwd_udptmout.tdir/ vendor/unbound/dist/testdata/fwd_udptmout.tdir/fwd_udptmout.conf vendor/unbound/dist/testdata/fwd_udptmout.tdir/fwd_udptmout.dsc vendor/unbound/dist/testdata/fwd_udptmout.tdir/fwd_udptmout.post vendor/unbound/dist/testdata/fwd_udptmout.tdir/fwd_udptmout.pre vendor/unbound/dist/testdata/fwd_udptmout.tdir/fwd_udptmout.test vendor/unbound/dist/testdata/fwd_udptmout.tdir/fwd_udptmout.testns vendor/unbound/dist/testdata/fwd_waitudp.tdir/ vendor/unbound/dist/testdata/fwd_waitudp.tdir/fwd_waitudp.conf vendor/unbound/dist/testdata/fwd_waitudp.tdir/fwd_waitudp.dsc vendor/unbound/dist/testdata/fwd_waitudp.tdir/fwd_waitudp.post vendor/unbound/dist/testdata/fwd_waitudp.tdir/fwd_waitudp.pre vendor/unbound/dist/testdata/fwd_waitudp.tdir/fwd_waitudp.test vendor/unbound/dist/testdata/fwd_waitudp.tdir/fwd_waitudp.testns vendor/unbound/dist/testdata/fwd_zero.tdir/ vendor/unbound/dist/testdata/fwd_zero.tdir/fwd_zero.conf vendor/unbound/dist/testdata/fwd_zero.tdir/fwd_zero.dsc vendor/unbound/dist/testdata/fwd_zero.tdir/fwd_zero.post vendor/unbound/dist/testdata/fwd_zero.tdir/fwd_zero.pre vendor/unbound/dist/testdata/fwd_zero.tdir/fwd_zero.test vendor/unbound/dist/testdata/fwd_zero.tdir/fwd_zero.testns vendor/unbound/dist/testdata/hostsfileosx.tdir/ vendor/unbound/dist/testdata/hostsfileosx.tdir/hostsfileosx.dsc vendor/unbound/dist/testdata/hostsfileosx.tdir/hostsfileosx.hosts vendor/unbound/dist/testdata/hostsfileosx.tdir/hostsfileosx.post vendor/unbound/dist/testdata/hostsfileosx.tdir/hostsfileosx.pre vendor/unbound/dist/testdata/hostsfileosx.tdir/hostsfileosx.test vendor/unbound/dist/testdata/hostsfileosx.tdir/hostsfileosx.testns vendor/unbound/dist/testdata/local_ds.rpl vendor/unbound/dist/testdata/local_nodefault.tdir/ vendor/unbound/dist/testdata/local_nodefault.tdir/local_nodefault.conf vendor/unbound/dist/testdata/local_nodefault.tdir/local_nodefault.dsc vendor/unbound/dist/testdata/local_nodefault.tdir/local_nodefault.post vendor/unbound/dist/testdata/local_nodefault.tdir/local_nodefault.pre vendor/unbound/dist/testdata/local_nodefault.tdir/local_nodefault.test vendor/unbound/dist/testdata/local_nodefault.tdir/local_nodefault.testns vendor/unbound/dist/testdata/local_norec.tdir/ vendor/unbound/dist/testdata/local_norec.tdir/local_norec.conf vendor/unbound/dist/testdata/local_norec.tdir/local_norec.dsc vendor/unbound/dist/testdata/local_norec.tdir/local_norec.post vendor/unbound/dist/testdata/local_norec.tdir/local_norec.pre vendor/unbound/dist/testdata/local_norec.tdir/local_norec.test vendor/unbound/dist/testdata/local_norec.tdir/local_norec.testns vendor/unbound/dist/testdata/local_nosnoop.tdir/ vendor/unbound/dist/testdata/local_nosnoop.tdir/local_nosnoop.conf vendor/unbound/dist/testdata/local_nosnoop.tdir/local_nosnoop.dsc vendor/unbound/dist/testdata/local_nosnoop.tdir/local_nosnoop.post vendor/unbound/dist/testdata/local_nosnoop.tdir/local_nosnoop.pre vendor/unbound/dist/testdata/local_nosnoop.tdir/local_nosnoop.test vendor/unbound/dist/testdata/local_nosnoop.tdir/local_nosnoop.testns vendor/unbound/dist/testdata/nss_compile.tdir/ vendor/unbound/dist/testdata/nss_compile.tdir/nss_compile.dsc vendor/unbound/dist/testdata/nss_compile.tdir/nss_compile.test vendor/unbound/dist/testdata/pylib.tdir/ vendor/unbound/dist/testdata/pylib.tdir/pylib.conf vendor/unbound/dist/testdata/pylib.tdir/pylib.dsc vendor/unbound/dist/testdata/pylib.tdir/pylib.lookup.py (contents, props changed) vendor/unbound/dist/testdata/pylib.tdir/pylib.post vendor/unbound/dist/testdata/pylib.tdir/pylib.pre vendor/unbound/dist/testdata/pylib.tdir/pylib.py vendor/unbound/dist/testdata/pylib.tdir/pylib.test vendor/unbound/dist/testdata/pylib.tdir/pylib.testns vendor/unbound/dist/testdata/pymod.tdir/ vendor/unbound/dist/testdata/pymod.tdir/pymod.conf vendor/unbound/dist/testdata/pymod.tdir/pymod.dsc vendor/unbound/dist/testdata/pymod.tdir/pymod.post vendor/unbound/dist/testdata/pymod.tdir/pymod.pre vendor/unbound/dist/testdata/pymod.tdir/pymod.py vendor/unbound/dist/testdata/pymod.tdir/pymod.test vendor/unbound/dist/testdata/pymod.tdir/pymod.testns vendor/unbound/dist/testdata/pymod_thread.tdir/ vendor/unbound/dist/testdata/pymod_thread.tdir/pymod_thread.conf vendor/unbound/dist/testdata/pymod_thread.tdir/pymod_thread.dsc vendor/unbound/dist/testdata/pymod_thread.tdir/pymod_thread.post vendor/unbound/dist/testdata/pymod_thread.tdir/pymod_thread.pre vendor/unbound/dist/testdata/pymod_thread.tdir/pymod_thread.py vendor/unbound/dist/testdata/pymod_thread.tdir/pymod_thread.test vendor/unbound/dist/testdata/pymod_thread.tdir/pymod_thread.testns vendor/unbound/dist/testdata/remote-threaded.tdir/ vendor/unbound/dist/testdata/remote-threaded.tdir/bad_control.key vendor/unbound/dist/testdata/remote-threaded.tdir/bad_control.pem vendor/unbound/dist/testdata/remote-threaded.tdir/bad_server.key vendor/unbound/dist/testdata/remote-threaded.tdir/bad_server.pem vendor/unbound/dist/testdata/remote-threaded.tdir/remote-threaded.conf vendor/unbound/dist/testdata/remote-threaded.tdir/remote-threaded.dsc vendor/unbound/dist/testdata/remote-threaded.tdir/remote-threaded.post vendor/unbound/dist/testdata/remote-threaded.tdir/remote-threaded.pre vendor/unbound/dist/testdata/remote-threaded.tdir/remote-threaded.test vendor/unbound/dist/testdata/remote-threaded.tdir/remote-threaded.testns vendor/unbound/dist/testdata/remote-threaded.tdir/unbound_control.key vendor/unbound/dist/testdata/remote-threaded.tdir/unbound_control.pem vendor/unbound/dist/testdata/remote-threaded.tdir/unbound_server.key vendor/unbound/dist/testdata/remote-threaded.tdir/unbound_server.pem vendor/unbound/dist/testdata/root_anchor.tdir/ vendor/unbound/dist/testdata/root_anchor.tdir/root_anchor.dsc vendor/unbound/dist/testdata/root_anchor.tdir/root_anchor.test vendor/unbound/dist/testdata/root_hints.tdir/ vendor/unbound/dist/testdata/root_hints.tdir/root_hints.dsc vendor/unbound/dist/testdata/root_hints.tdir/root_hints.test vendor/unbound/dist/testdata/speed_cache.tdir/ vendor/unbound/dist/testdata/speed_cache.tdir/makeqs.c vendor/unbound/dist/testdata/speed_cache.tdir/makeqs.sh vendor/unbound/dist/testdata/speed_cache.tdir/speed_cache.conf vendor/unbound/dist/testdata/speed_cache.tdir/speed_cache.dsc vendor/unbound/dist/testdata/speed_cache.tdir/speed_cache.post vendor/unbound/dist/testdata/speed_cache.tdir/speed_cache.pre vendor/unbound/dist/testdata/speed_cache.tdir/speed_cache.test vendor/unbound/dist/testdata/speed_cache.tdir/speed_cache.testns vendor/unbound/dist/testdata/speed_local.tdir/ vendor/unbound/dist/testdata/speed_local.tdir/speed_local.conf vendor/unbound/dist/testdata/speed_local.tdir/speed_local.dsc vendor/unbound/dist/testdata/speed_local.tdir/speed_local.post vendor/unbound/dist/testdata/speed_local.tdir/speed_local.pre vendor/unbound/dist/testdata/speed_local.tdir/speed_local.test vendor/unbound/dist/testdata/speed_local.tdir/speed_local.testns vendor/unbound/dist/testdata/stat_timer.tdir/ vendor/unbound/dist/testdata/stat_timer.tdir/stat_timer.conf vendor/unbound/dist/testdata/stat_timer.tdir/stat_timer.dsc vendor/unbound/dist/testdata/stat_timer.tdir/stat_timer.post vendor/unbound/dist/testdata/stat_timer.tdir/stat_timer.pre vendor/unbound/dist/testdata/stat_timer.tdir/stat_timer.test vendor/unbound/dist/testdata/stat_timer.tdir/stat_timer.testns vendor/unbound/dist/testdata/stream_ssl.tdir/ vendor/unbound/dist/testdata/stream_ssl.tdir/stream_ssl.clie.conf vendor/unbound/dist/testdata/stream_ssl.tdir/stream_ssl.dsc vendor/unbound/dist/testdata/stream_ssl.tdir/stream_ssl.post vendor/unbound/dist/testdata/stream_ssl.tdir/stream_ssl.pre vendor/unbound/dist/testdata/stream_ssl.tdir/stream_ssl.serv.conf vendor/unbound/dist/testdata/stream_ssl.tdir/stream_ssl.test vendor/unbound/dist/testdata/stream_ssl.tdir/unbound_control.key vendor/unbound/dist/testdata/stream_ssl.tdir/unbound_control.pem vendor/unbound/dist/testdata/stream_ssl.tdir/unbound_server.key vendor/unbound/dist/testdata/stream_ssl.tdir/unbound_server.pem vendor/unbound/dist/testdata/stream_tcp.tdir/ vendor/unbound/dist/testdata/stream_tcp.tdir/stream_tcp.conf vendor/unbound/dist/testdata/stream_tcp.tdir/stream_tcp.dsc vendor/unbound/dist/testdata/stream_tcp.tdir/stream_tcp.post vendor/unbound/dist/testdata/stream_tcp.tdir/stream_tcp.pre vendor/unbound/dist/testdata/stream_tcp.tdir/stream_tcp.test vendor/unbound/dist/testdata/stream_tcp.tdir/stream_tcp.testns vendor/unbound/dist/testdata/stub_udp.tdir/ vendor/unbound/dist/testdata/stub_udp.tdir/stub_udp.conf vendor/unbound/dist/testdata/stub_udp.tdir/stub_udp.dsc vendor/unbound/dist/testdata/stub_udp.tdir/stub_udp.post vendor/unbound/dist/testdata/stub_udp.tdir/stub_udp.pre vendor/unbound/dist/testdata/stub_udp.tdir/stub_udp.test vendor/unbound/dist/testdata/stub_udp.tdir/stub_udp.testns vendor/unbound/dist/testdata/stub_udp6.tdir/ vendor/unbound/dist/testdata/stub_udp6.tdir/stub_udp6.conf vendor/unbound/dist/testdata/stub_udp6.tdir/stub_udp6.dsc vendor/unbound/dist/testdata/stub_udp6.tdir/stub_udp6.post vendor/unbound/dist/testdata/stub_udp6.tdir/stub_udp6.pre vendor/unbound/dist/testdata/stub_udp6.tdir/stub_udp6.test vendor/unbound/dist/testdata/stub_udp6.tdir/stub_udp6.testns vendor/unbound/dist/testdata/tcp_sigpipe.tdir/ vendor/unbound/dist/testdata/tcp_sigpipe.tdir/tcp_sigpipe.conf vendor/unbound/dist/testdata/tcp_sigpipe.tdir/tcp_sigpipe.dsc vendor/unbound/dist/testdata/tcp_sigpipe.tdir/tcp_sigpipe.post vendor/unbound/dist/testdata/tcp_sigpipe.tdir/tcp_sigpipe.pre vendor/unbound/dist/testdata/tcp_sigpipe.tdir/tcp_sigpipe.test vendor/unbound/dist/testdata/tcp_sigpipe.tdir/tcp_sigpipe.testns Deleted: vendor/unbound/dist/testdata/00-lint.tpkg vendor/unbound/dist/testdata/01-doc.tpkg vendor/unbound/dist/testdata/02-unittest.tpkg vendor/unbound/dist/testdata/03-testbound.tpkg vendor/unbound/dist/testdata/04-checkconf.tpkg vendor/unbound/dist/testdata/05-asynclook.tpkg vendor/unbound/dist/testdata/06-ianaports.tpkg vendor/unbound/dist/testdata/07-confroot.tpkg vendor/unbound/dist/testdata/08-host-lib.tpkg vendor/unbound/dist/testdata/09-unbound-control.tpkg vendor/unbound/dist/testdata/10-unbound-anchor.tpkg vendor/unbound/dist/testdata/ctrl_itr.tpkg vendor/unbound/dist/testdata/ctrl_pipe.tpkg vendor/unbound/dist/testdata/dnscrypt_cert.tpkg vendor/unbound/dist/testdata/dnscrypt_cert_chacha.tpkg vendor/unbound/dist/testdata/dnscrypt_queries.tpkg vendor/unbound/dist/testdata/dnscrypt_queries_chacha.tpkg vendor/unbound/dist/testdata/edns_cache.tpkg vendor/unbound/dist/testdata/edns_lame.tpkg vendor/unbound/dist/testdata/fwd_ancil.tpkg vendor/unbound/dist/testdata/fwd_bogus.tpkg vendor/unbound/dist/testdata/fwd_capsid.tpkg vendor/unbound/dist/testdata/fwd_capsid_fallback.tpkg vendor/unbound/dist/testdata/fwd_capsid_strip.tpkg vendor/unbound/dist/testdata/fwd_capsid_white.tpkg vendor/unbound/dist/testdata/fwd_compress_c00c.tpkg vendor/unbound/dist/testdata/fwd_edns_bksec.tpkg vendor/unbound/dist/testdata/fwd_edns_probe.tpkg vendor/unbound/dist/testdata/fwd_malformed.tpkg vendor/unbound/dist/testdata/fwd_no_edns.tpkg vendor/unbound/dist/testdata/fwd_oneport.tpkg vendor/unbound/dist/testdata/fwd_tcp.tpkg vendor/unbound/dist/testdata/fwd_tcp_tc.tpkg vendor/unbound/dist/testdata/fwd_tcp_tc6.tpkg vendor/unbound/dist/testdata/fwd_three.tpkg vendor/unbound/dist/testdata/fwd_three_service.tpkg vendor/unbound/dist/testdata/fwd_ttlexpire.tpkg vendor/unbound/dist/testdata/fwd_udp.tpkg vendor/unbound/dist/testdata/fwd_udptmout.tpkg vendor/unbound/dist/testdata/fwd_waitudp.tpkg vendor/unbound/dist/testdata/fwd_zero.tpkg vendor/unbound/dist/testdata/hostsfileosx.tpkg vendor/unbound/dist/testdata/local_nodefault.tpkg vendor/unbound/dist/testdata/local_norec.tpkg vendor/unbound/dist/testdata/local_nosnoop.tpkg vendor/unbound/dist/testdata/nss_compile.tpkg vendor/unbound/dist/testdata/pylib.tpkg vendor/unbound/dist/testdata/pymod.tpkg vendor/unbound/dist/testdata/pymod_thread.tpkg vendor/unbound/dist/testdata/remote-threaded.tpkg vendor/unbound/dist/testdata/root_anchor.tpkg vendor/unbound/dist/testdata/root_hints.tpkg vendor/unbound/dist/testdata/speed_cache.tpkg vendor/unbound/dist/testdata/speed_local.tpkg vendor/unbound/dist/testdata/stat_timer.tpkg vendor/unbound/dist/testdata/stream_ssl.tpkg vendor/unbound/dist/testdata/stream_tcp.tpkg vendor/unbound/dist/testdata/stub_udp.tpkg vendor/unbound/dist/testdata/stub_udp6.tpkg vendor/unbound/dist/testdata/tcp_sigpipe.tpkg Modified: vendor/unbound/dist/Makefile.in vendor/unbound/dist/acx_nlnetlabs.m4 vendor/unbound/dist/cachedb/cachedb.c vendor/unbound/dist/config.h.in vendor/unbound/dist/configure vendor/unbound/dist/configure.ac vendor/unbound/dist/contrib/fastrpz.patch vendor/unbound/dist/daemon/daemon.c vendor/unbound/dist/daemon/remote.c vendor/unbound/dist/daemon/stats.c vendor/unbound/dist/daemon/unbound.c vendor/unbound/dist/daemon/worker.c vendor/unbound/dist/dns64/dns64.c vendor/unbound/dist/dnscrypt/dnscrypt.c vendor/unbound/dist/dnscrypt/dnscrypt.h vendor/unbound/dist/doc/Changelog vendor/unbound/dist/doc/README vendor/unbound/dist/doc/example.conf.in vendor/unbound/dist/doc/libunbound.3.in vendor/unbound/dist/doc/unbound-anchor.8.in vendor/unbound/dist/doc/unbound-checkconf.8.in vendor/unbound/dist/doc/unbound-control.8.in vendor/unbound/dist/doc/unbound-host.1.in vendor/unbound/dist/doc/unbound.8.in vendor/unbound/dist/doc/unbound.conf.5.in vendor/unbound/dist/iterator/iterator.c vendor/unbound/dist/iterator/iterator.h vendor/unbound/dist/libunbound/libworker.c vendor/unbound/dist/libunbound/unbound.h vendor/unbound/dist/pythonmod/doc/examples/example0-1.py vendor/unbound/dist/pythonmod/doc/examples/example0.rst vendor/unbound/dist/services/authzone.c vendor/unbound/dist/services/cache/dns.c vendor/unbound/dist/services/cache/infra.c vendor/unbound/dist/services/listen_dnsport.c vendor/unbound/dist/services/localzone.c vendor/unbound/dist/services/localzone.h vendor/unbound/dist/services/outside_network.c vendor/unbound/dist/sldns/parseutil.c vendor/unbound/dist/sldns/str2wire.c vendor/unbound/dist/sldns/wire2str.c vendor/unbound/dist/smallapp/unbound-anchor.c vendor/unbound/dist/smallapp/unbound-checkconf.c vendor/unbound/dist/smallapp/unbound-control.c vendor/unbound/dist/testcode/do-tests.sh vendor/unbound/dist/testcode/fake_event.c vendor/unbound/dist/testcode/petal.c vendor/unbound/dist/testcode/run_vm.sh vendor/unbound/dist/testcode/streamtcp.c vendor/unbound/dist/testcode/unitverify.c vendor/unbound/dist/testdata/common.sh vendor/unbound/dist/testdata/local_nodefault.rpl vendor/unbound/dist/util/config_file.c vendor/unbound/dist/util/config_file.h vendor/unbound/dist/util/configlexer.c vendor/unbound/dist/util/configlexer.lex vendor/unbound/dist/util/configparser.c vendor/unbound/dist/util/configparser.h vendor/unbound/dist/util/configparser.y vendor/unbound/dist/util/data/msgreply.c vendor/unbound/dist/util/fptr_wlist.c vendor/unbound/dist/util/iana_ports.inc vendor/unbound/dist/util/net_help.c vendor/unbound/dist/util/net_help.h vendor/unbound/dist/util/netevent.c vendor/unbound/dist/util/shm_side/shm_main.c vendor/unbound/dist/util/storage/lookup3.c vendor/unbound/dist/validator/val_secalgo.c vendor/unbound/dist/validator/val_utils.c Modified: vendor/unbound/dist/Makefile.in ============================================================================== --- vendor/unbound/dist/Makefile.in Sat May 12 11:54:52 2018 (r333540) +++ vendor/unbound/dist/Makefile.in Sat May 12 11:55:17 2018 (r333541) @@ -426,7 +426,7 @@ libunbound/python/libunbound_wrap.c: $(srcdir)/libunbo # Pyunbound python unbound wrapper _unbound.la: libunbound_wrap.lo libunbound.la - $(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -avoid-version -no-undefined -shared -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) L. -L.libs -lunbound + $(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -avoid-version -no-undefined -shared -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) -L. -L.libs -lunbound util/config_file.c: util/configparser.h util/configlexer.c: $(srcdir)/util/configlexer.lex util/configparser.h @@ -735,9 +735,9 @@ iter_utils.lo iter_utils.o: $(srcdir)/iterator/iter_ut $(srcdir)/sldns/str2wire.h listen_dnsport.lo listen_dnsport.o: $(srcdir)/services/listen_dnsport.c config.h \ $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/services/outside_network.h \ - $(srcdir)/util/rbtree.h $(srcdir)/util/log.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/net_help.h $(srcdir)/sldns/sbuffer.h + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h \ + $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/sldns/sbuffer.h localzone.lo localzone.o: $(srcdir)/services/localzone.c config.h $(srcdir)/services/localzone.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h \ @@ -749,8 +749,8 @@ localzone.lo localzone.o: $(srcdir)/services/localzone $(srcdir)/util/as112.h mesh.lo mesh.o: $(srcdir)/services/mesh.c config.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/modstack.h \ $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/dns.h $(srcdir)/util/net_help.h \ $(srcdir)/util/regional.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/timehist.h $(srcdir)/util/fptr_wlist.h \ @@ -777,12 +777,12 @@ view.lo view.o: $(srcdir)/services/view.c config.h $(s outbound_list.lo outbound_list.o: $(srcdir)/services/outbound_list.c config.h \ $(srcdir)/services/outbound_list.h $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h outside_network.lo outside_network.o: $(srcdir)/services/outside_network.c config.h \ $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h $(srcdir)/util/netevent.h \ $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ - $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/infra.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h \ + $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/rtt.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgencode.h \ $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/fptr_wlist.h \ @@ -830,7 +830,7 @@ authzone.lo authzone.o: $(srcdir)/services/authzone.c $(srcdir)/validator/val_secalgo.h fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.c config.h $(srcdir)/util/fptr_wlist.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \ $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/util/mini_event.h \ @@ -851,8 +851,8 @@ locks.lo locks.o: $(srcdir)/util/locks.c config.h $(sr log.lo log.o: $(srcdir)/util/log.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/sldns/sbuffer.h mini_event.lo mini_event.o: $(srcdir)/util/mini_event.c config.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ $(srcdir)/services/modstack.h @@ -860,8 +860,8 @@ module.lo module.o: $(srcdir)/util/module.c config.h $ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h netevent.lo netevent.o: $(srcdir)/util/netevent.c config.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/util/ub_event.h $(srcdir)/util/log.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/ub_event.h $(srcdir)/util/net_help.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \ $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/sldns/sbuffer.h \ @@ -876,7 +876,7 @@ net_help.lo net_help.o: $(srcdir)/util/net_help.c conf random.lo random.o: $(srcdir)/util/random.c config.h $(srcdir)/util/random.h $(srcdir)/util/log.h rbtree.lo rbtree.o: $(srcdir)/util/rbtree.c config.h $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \ $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h @@ -897,19 +897,19 @@ slabhash.lo slabhash.o: $(srcdir)/util/storage/slabhas timehist.lo timehist.o: $(srcdir)/util/timehist.c config.h $(srcdir)/util/timehist.h $(srcdir)/util/log.h tube.lo tube.o: $(srcdir)/util/tube.c config.h $(srcdir)/util/tube.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/services/mesh.h \ $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/util/ub_event.h ub_event.lo ub_event.o: $(srcdir)/util/ub_event.c config.h $(srcdir)/util/ub_event.h $(srcdir)/util/log.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/util/tube.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/tube.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h ub_event_pluggable.lo ub_event_pluggable.o: $(srcdir)/util/ub_event_pluggable.c config.h $(srcdir)/util/ub_event.h \ $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ $(srcdir)/services/modstack.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h winsock_event.lo winsock_event.o: $(srcdir)/util/winsock_event.c config.h autotrust.lo autotrust.o: $(srcdir)/validator/autotrust.c config.h $(srcdir)/validator/autotrust.h \ @@ -1040,7 +1040,9 @@ checklocks.lo checklocks.o: $(srcdir)/testcode/checklo $(srcdir)/testcode/checklocks.h dnscrypt.lo dnscrypt.o: $(srcdir)/dnscrypt/dnscrypt.c config.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/locks.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/util/storage/lookup3.h ipsecmod.lo ipsecmod.o: $(srcdir)/ipsecmod/ipsecmod.c config.h $(srcdir)/ipsecmod/ipsecmod.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ @@ -1174,9 +1176,10 @@ stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $( $(srcdir)/daemon/daemon.h $(srcdir)/services/modstack.h \ $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/outside_network.h \ $(srcdir)/services/listen_dnsport.h $(srcdir)/util/config_file.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h \ - $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h + $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/iterator/iterator.h \ + $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h \ + $(srcdir)/validator/val_kcache.h unbound.lo unbound.o: $(srcdir)/daemon/unbound.c config.h $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h \ $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ $(srcdir)/daemon/remote.h \ @@ -1207,16 +1210,15 @@ worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/libunbound/libworker.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h testbound.lo testbound.o: $(srcdir)/testcode/testbound.c config.h $(srcdir)/testcode/testpkts.h \ $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/util/rbtree.h \ - $(srcdir)/testcode/fake_event.h $(srcdir)/daemon/remote.h \ - $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c $(srcdir)/util/log.h \ - $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/util/rtt.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \ - $(srcdir)/services/mesh.h $(srcdir)/util/net_help.h $(srcdir)/util/ub_event.h + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h $(srcdir)/daemon/remote.h \ + $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c $(srcdir)/daemon/daemon.h \ + $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/fptr_wlist.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/net_help.h $(srcdir)/util/ub_event.h testpkts.lo testpkts.o: $(srcdir)/testcode/testpkts.c config.h $(srcdir)/testcode/testpkts.h \ $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h @@ -1266,17 +1268,19 @@ stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $( $(srcdir)/daemon/daemon.h $(srcdir)/services/modstack.h \ $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/outside_network.h \ $(srcdir)/services/listen_dnsport.h $(srcdir)/util/config_file.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h \ - $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h + $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/iterator/iterator.h \ + $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h \ + $(srcdir)/validator/val_kcache.h replay.lo replay.o: $(srcdir)/testcode/replay.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ $(srcdir)/util/config_file.h $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/testcode/testpkts.h \ - $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h \ + $(srcdir)/testcode/testpkts.h $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h $(srcdir)/sldns/str2wire.h \ + $(srcdir)/sldns/rrdef.h fake_event.lo fake_event.o: $(srcdir)/testcode/fake_event.c config.h $(srcdir)/testcode/fake_event.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgencode.h \ $(srcdir)/util/data/dname.h $(srcdir)/util/config_file.h $(srcdir)/services/listen_dnsport.h \ $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h \ @@ -1309,7 +1313,8 @@ unbound-checkconf.lo unbound-checkconf.o: $(srcdir)/sm $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_fwd.h \ $(srcdir)/util/rbtree.h $(srcdir)/iterator/iter_hints.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/services/localzone.h \ - $(srcdir)/services/view.h $(srcdir)/respip/respip.h $(srcdir)/sldns/sbuffer.h $(PYTHONMOD_HEADER) + $(srcdir)/services/view.h $(srcdir)/respip/respip.h $(srcdir)/sldns/sbuffer.h $(PYTHONMOD_HEADER) \ + $(srcdir)/edns-subnet/subnet-whitelist.h worker_cb.lo worker_cb.o: $(srcdir)/smallapp/worker_cb.c config.h $(srcdir)/libunbound/context.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \ $(srcdir)/libunbound/unbound.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ Modified: vendor/unbound/dist/acx_nlnetlabs.m4 ============================================================================== --- vendor/unbound/dist/acx_nlnetlabs.m4 Sat May 12 11:54:52 2018 (r333540) +++ vendor/unbound/dist/acx_nlnetlabs.m4 Sat May 12 11:55:17 2018 (r333541) @@ -688,8 +688,8 @@ AC_DEFUN([ACX_SSL_CHECKS], [ # check if -lwsock32 or -lgdi32 are needed. BAKLIBS="$LIBS" BAKSSLLIBS="$LIBSSL_LIBS" - LIBS="$LIBS -lgdi32" - LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32" + LIBS="$LIBS -lgdi32 -lws2_32" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32" AC_MSG_CHECKING([if -lcrypto needs -lgdi32]) AC_TRY_LINK([], [ int HMAC_Update(void); @@ -839,7 +839,11 @@ dnl see if on windows if test "$ac_cv_header_windows_h" = "yes"; then AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used]) USE_WINSOCK="1" - LIBS="$LIBS -lws2_32" + if echo $LIBS | grep 'lws2_32' >/dev/null; then + : + else + LIBS="$LIBS -lws2_32" + fi fi ], dnl no quick getaddrinfo, try mingw32 and winsock2 library. Modified: vendor/unbound/dist/cachedb/cachedb.c ============================================================================== --- vendor/unbound/dist/cachedb/cachedb.c Sat May 12 11:54:52 2018 (r333540) +++ vendor/unbound/dist/cachedb/cachedb.c Sat May 12 11:55:17 2018 (r333541) @@ -61,6 +61,8 @@ /** the unit test testframe for cachedb, its module state contains * a cache for a couple queries (in memory). */ struct testframe_moddata { + /** lock for mutex */ + lock_basic_type lock; /** key for single stored data element, NULL if none */ char* stored_key; /** data for single stored data element, NULL if none */ @@ -72,14 +74,18 @@ struct testframe_moddata { static int testframe_init(struct module_env* env, struct cachedb_env* cachedb_env) { + struct testframe_moddata* d; (void)env; verbose(VERB_ALGO, "testframe_init"); - cachedb_env->backend_data = (void*)calloc(1, + d = (struct testframe_moddata*)calloc(1, sizeof(struct testframe_moddata)); + cachedb_env->backend_data = (void*)d; if(!cachedb_env->backend_data) { log_err("out of memory"); return 0; } + lock_basic_init(&d->lock); + lock_protect(&d->lock, d, sizeof(*d)); return 1; } @@ -92,6 +98,7 @@ testframe_deinit(struct module_env* env, struct cached verbose(VERB_ALGO, "testframe_deinit"); if(!d) return; + lock_basic_destroy(&d->lock); free(d->stored_key); free(d->stored_data); free(d); @@ -105,17 +112,22 @@ testframe_lookup(struct module_env* env, struct cached cachedb_env->backend_data; (void)env; verbose(VERB_ALGO, "testframe_lookup of %s", key); + lock_basic_lock(&d->lock); if(d->stored_key && strcmp(d->stored_key, key) == 0) { - if(d->stored_datalen > sldns_buffer_capacity(result_buffer)) + if(d->stored_datalen > sldns_buffer_capacity(result_buffer)) { + lock_basic_unlock(&d->lock); return 0; /* too large */ + } verbose(VERB_ALGO, "testframe_lookup found %d bytes", (int)d->stored_datalen); sldns_buffer_clear(result_buffer); sldns_buffer_write(result_buffer, d->stored_data, d->stored_datalen); sldns_buffer_flip(result_buffer); + lock_basic_unlock(&d->lock); return 1; } + lock_basic_unlock(&d->lock); return 0; } @@ -126,6 +138,7 @@ testframe_store(struct module_env* env, struct cachedb struct testframe_moddata* d = (struct testframe_moddata*) cachedb_env->backend_data; (void)env; + lock_basic_lock(&d->lock); verbose(VERB_ALGO, "testframe_store %s (%d bytes)", key, (int)data_len); /* free old data element (if any) */ @@ -137,6 +150,7 @@ testframe_store(struct module_env* env, struct cachedb d->stored_data = memdup(data, data_len); if(!d->stored_data) { + lock_basic_unlock(&d->lock); log_err("out of memory"); return; } @@ -146,8 +160,10 @@ testframe_store(struct module_env* env, struct cachedb free(d->stored_data); d->stored_data = NULL; d->stored_datalen = 0; + lock_basic_unlock(&d->lock); return; } + lock_basic_unlock(&d->lock); /* (key,data) successfully stored */ } @@ -170,16 +186,17 @@ cachedb_find_backend(const char* str) static int cachedb_apply_cfg(struct cachedb_env* cachedb_env, struct config_file* cfg) { - const char* backend_str = "testframe"; /* TODO get from cfg */ - (void)cfg; /* need this until the TODO is implemented */ - if(backend_str && backend_str[0]) { - cachedb_env->backend = cachedb_find_backend(backend_str); - if(!cachedb_env->backend) { - log_err("cachedb: cannot find backend name '%s", - backend_str); - return 0; - } + const char* backend_str = cfg->cachedb_backend; + + /* If unspecified we use the in-memory test DB. */ + if(!backend_str) + backend_str = "testframe"; + cachedb_env->backend = cachedb_find_backend(backend_str); + if(!cachedb_env->backend) { + log_err("cachedb: cannot find backend name '%s'", backend_str); + return 0; } + /* TODO see if more configuration needs to be applied or not */ return 1; } @@ -277,9 +294,10 @@ calc_hash(struct module_qstate* qstate, char* buf, siz size_t clen = 0; uint8_t hash[CACHEDB_HASHSIZE/8]; const char* hex = "0123456789ABCDEF"; - const char* secret = "default"; /* TODO: from qstate->env->cfg */ + const char* secret = qstate->env->cfg->cachedb_secret ? + qstate->env->cfg->cachedb_secret : "default"; size_t i; - + /* copy the hash info into the clear buffer */ if(clen + qstate->qinfo.qname_len < sizeof(clear)) { memmove(clear+clen, qstate->qinfo.qname, Modified: vendor/unbound/dist/config.h.in ============================================================================== --- vendor/unbound/dist/config.h.in Sat May 12 11:54:52 2018 (r333540) +++ vendor/unbound/dist/config.h.in Sat May 12 11:55:17 2018 (r333541) @@ -296,6 +296,9 @@ /* 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 Modified: vendor/unbound/dist/configure ============================================================================== --- vendor/unbound/dist/configure Sat May 12 11:54:52 2018 (r333540) +++ vendor/unbound/dist/configure Sat May 12 11:55:17 2018 (r333541) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.6.5. +# Generated by GNU Autoconf 2.69 for unbound 1.6.6. # # Report bugs to <unbound-bugs@nlnetlabs.nl>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.6.5' -PACKAGE_STRING='unbound 1.6.5' +PACKAGE_VERSION='1.6.6' +PACKAGE_STRING='unbound 1.6.6' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl' PACKAGE_URL='' @@ -1437,7 +1437,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.6.5 to adapt to many kinds of systems. +\`configure' configures unbound 1.6.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.6.5:";; + short | recursive ) echo "Configuration of unbound 1.6.6:";; esac cat <<\_ACEOF @@ -1714,7 +1714,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.6.5 +unbound configure 1.6.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2423,7 +2423,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.6.5, which was +It was created by unbound $as_me 1.6.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2775,11 +2775,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=6 -UNBOUND_VERSION_MICRO=5 +UNBOUND_VERSION_MICRO=6 LIBUNBOUND_CURRENT=7 -LIBUNBOUND_REVISION=4 +LIBUNBOUND_REVISION=5 LIBUNBOUND_AGE=5 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2835,6 +2835,7 @@ LIBUNBOUND_AGE=5 # 1.6.3 had 7:2:5 # 1.6.4 had 7:3:5 # 1.6.5 had 7:4:5 +# 1.6.6 had 7:5:5 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -16464,7 +16465,9 @@ if test x"$ax_pthread_ok" = xyes; then $as_echo "#define HAVE_PTHREAD 1" >>confdefs.h - LIBS="$PTHREAD_LIBS $LIBS" + if test -n "$PTHREAD_LIBS"; then + LIBS="$PTHREAD_LIBS $LIBS" + fi CFLAGS="$CFLAGS $PTHREAD_CFLAGS" CC="$PTHREAD_CC" ub_have_pthreads=yes @@ -16894,8 +16897,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu $as_echo "#define HAVE_PYTHON 1" >>confdefs.h - LIBS="$PYTHON_LDFLAGS $LIBS" - CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" + if test -n "$LIBS"; then + LIBS="$PYTHON_LDFLAGS $LIBS" + else + LIBS="$PYTHON_LDFLAGS" + fi + if test -n "$CPPFLAGS"; then + CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" + else + CPPFLAGS="$PYTHON_CPPFLAGS" + fi ub_have_python=yes PC_PY_DEPENDENCY="python" @@ -17250,8 +17261,8 @@ $as_echo "no" >&6; } # check if -lwsock32 or -lgdi32 are needed. BAKLIBS="$LIBS" BAKSSLLIBS="$LIBSSL_LIBS" - LIBS="$LIBS -lgdi32" - LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32" + LIBS="$LIBS -lgdi32 -lws2_32" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -lgdi32" >&5 $as_echo_n "checking if -lcrypto needs -lgdi32... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18053,6 +18064,7 @@ case "$enable_dsa" in ;; *) # detect if DSA is supported, and turn it off if not. + if test $USE_NSS = "no" -a $USE_NETTLE = "no"; then ac_fn_c_check_func "$LINENO" "DSA_SIG_new" "ac_cv_func_DSA_SIG_new" if test "x$ac_cv_func_DSA_SIG_new" = xyes; then : @@ -18067,6 +18079,13 @@ else fi fi + else + +cat >>confdefs.h <<_ACEOF +#define USE_DSA 1 +_ACEOF + + fi ;; esac @@ -18096,11 +18115,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF if test $ac_have_decl = 1; then : - -cat >>confdefs.h <<_ACEOF -#define USE_ED25519 1 -_ACEOF - use_ed25519="yes" else @@ -18109,6 +18123,28 @@ else fi fi + if test $USE_NETTLE = "yes"; then + for ac_header in nettle/eddsa.h +do : + ac_fn_c_check_header_compile "$LINENO" "nettle/eddsa.h" "ac_cv_header_nettle_eddsa_h" "$ac_includes_default +" +if test "x$ac_cv_header_nettle_eddsa_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NETTLE_EDDSA_H 1 +_ACEOF + use_ed25519="yes" +fi + +done + + fi + if test $use_ed25519 = "yes"; then + +cat >>confdefs.h <<_ACEOF +#define USE_ED25519 1 +_ACEOF + + fi ;; esac @@ -18621,7 +18657,12 @@ if test x_$enable_static_exe = x_yes; then if test "$on_mingw" = yes; then staticexe="-all-static" # for static compile, include gdi32 and zlib here. - LIBS="$LIBS -lgdi32 -lz" + if echo $LIBS | grep 'lgdi32' >/dev/null; then + : + else + LIBS="$LIBS -lgdi32" + fi + LIBS="$LIBS -lz" fi fi @@ -18979,7 +19020,11 @@ if test "$ac_cv_header_windows_h" = "yes"; then $as_echo "#define USE_WINSOCK 1" >>confdefs.h USE_WINSOCK="1" - LIBS="$LIBS -lws2_32" + if echo $LIBS | grep 'lws2_32' >/dev/null; then + : + else + LIBS="$LIBS -lws2_32" + fi fi else @@ -20633,7 +20678,12 @@ $as_echo "#define OMITTED__D_LARGEFILE_SOURCE_1 1" >>c fi -LDFLAGS="$LATE_LDFLAGS $LDFLAGS" +if test -n "$LATE_LDFLAGS"; then + LDFLAGS="$LATE_LDFLAGS $LDFLAGS" +fi +# remove start spaces +LDFLAGS=`echo "$LDFLAGS"|sed -e 's/^ *//'` +LIBS=`echo "$LIBS"|sed -e 's/^ *//'` cat >>confdefs.h <<_ACEOF @@ -20643,7 +20693,7 @@ _ACEOF -version=1.6.5 +version=1.6.6 date=`date +'%b %e, %Y'` @@ -21162,7 +21212,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.6.5, which was +This file was extended by unbound $as_me 1.6.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21228,7 +21278,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unbound config.status 1.6.5 +unbound config.status 1.6.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Modified: vendor/unbound/dist/configure.ac ============================================================================== --- vendor/unbound/dist/configure.ac Sat May 12 11:54:52 2018 (r333540) +++ vendor/unbound/dist/configure.ac Sat May 12 11:55:17 2018 (r333541) @@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[6]) -m4_define([VERSION_MICRO],[5]) +m4_define([VERSION_MICRO],[6]) AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl, unbound) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=7 -LIBUNBOUND_REVISION=4 +LIBUNBOUND_REVISION=5 LIBUNBOUND_AGE=5 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -74,6 +74,7 @@ LIBUNBOUND_AGE=5 # 1.6.3 had 7:2:5 # 1.6.4 had 7:3:5 # 1.6.5 had 7:4:5 +# 1.6.6 had 7:5:5 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -456,7 +457,9 @@ ub_have_pthreads=no if test x_$withval != x_no; then AX_PTHREAD([ AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]) - LIBS="$PTHREAD_LIBS $LIBS" + if test -n "$PTHREAD_LIBS"; then + LIBS="$PTHREAD_LIBS $LIBS" + fi CFLAGS="$CFLAGS $PTHREAD_CFLAGS" CC="$PTHREAD_CC" ub_have_pthreads=yes @@ -558,8 +561,16 @@ if test x_$ub_test_python != x_no; then AC_SUBST(PY_MAJOR_VERSION) # Have Python AC_DEFINE(HAVE_PYTHON,1,[Define if you have Python libraries and header files.]) - LIBS="$PYTHON_LDFLAGS $LIBS" - CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" + if test -n "$LIBS"; then + LIBS="$PYTHON_LDFLAGS $LIBS" + else + LIBS="$PYTHON_LDFLAGS" + fi + if test -n "$CPPFLAGS"; then + CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" + else + CPPFLAGS="$PYTHON_CPPFLAGS" + fi ub_have_python=yes PC_PY_DEPENDENCY="python" AC_SUBST(PC_PY_DEPENDENCY) @@ -912,10 +923,14 @@ case "$enable_dsa" in ;; *) # detect if DSA is supported, and turn it off if not. + if test $USE_NSS = "no" -a $USE_NETTLE = "no"; then AC_CHECK_FUNC(DSA_SIG_new, [ AC_DEFINE_UNQUOTED([USE_DSA], [1], [Define this to enable DSA support.]) ], [if test "x$enable_dsa" = "xyes"; then AC_MSG_ERROR([OpenSSL does not support DSA and you used --enable-dsa.]) fi ]) + else + AC_DEFINE_UNQUOTED([USE_DSA], [1], [Define this to enable DSA support.]) + fi ;; esac @@ -927,13 +942,18 @@ case "$enable_ed25519" in *) if test $USE_NSS = "no" -a $USE_NETTLE = "no"; then AC_CHECK_DECLS([NID_ED25519], [ - AC_DEFINE_UNQUOTED([USE_ED25519], [1], [Define this to enable ED25519 support.]) use_ed25519="yes" ], [ if test "x$enable_ed25519" = "xyes"; then AC_MSG_ERROR([OpenSSL does not support ED25519 and you used --enable-ed25519.]) fi ], [AC_INCLUDES_DEFAULT #include <openssl/evp.h> ]) fi + if test $USE_NETTLE = "yes"; then + AC_CHECK_HEADERS([nettle/eddsa.h], use_ed25519="yes",, [AC_INCLUDES_DEFAULT]) + fi + if test $use_ed25519 = "yes"; then + AC_DEFINE_UNQUOTED([USE_ED25519], [1], [Define this to enable ED25519 support.]) + fi ;; esac @@ -1106,7 +1126,12 @@ if test x_$enable_static_exe = x_yes; then if test "$on_mingw" = yes; then staticexe="-all-static" # for static compile, include gdi32 and zlib here. - LIBS="$LIBS -lgdi32 -lz" + if echo $LIBS | grep 'lgdi32' >/dev/null; then + : + else + LIBS="$LIBS -lgdi32" + fi + LIBS="$LIBS -lz" fi fi @@ -1448,7 +1473,12 @@ AC_SUBST(ALLTARGET) AC_SUBST(INSTALLTARGET) ACX_STRIP_EXT_FLAGS -LDFLAGS="$LATE_LDFLAGS $LDFLAGS" +if test -n "$LATE_LDFLAGS"; then + LDFLAGS="$LATE_LDFLAGS $LDFLAGS" +fi +# remove start spaces +LDFLAGS=`echo "$LDFLAGS"|sed -e 's/^ *//'` +LIBS=`echo "$LIBS"|sed -e 's/^ *//'` AC_DEFINE_UNQUOTED([MAXSYSLOGMSGLEN], [10240], [Define to the maximum message length to pass to syslog.]) Modified: vendor/unbound/dist/contrib/fastrpz.patch ============================================================================== --- vendor/unbound/dist/contrib/fastrpz.patch Sat May 12 11:54:52 2018 (r333540) +++ vendor/unbound/dist/contrib/fastrpz.patch Sat May 12 11:55:17 2018 (r333541) @@ -3263,15 +3263,15 @@ diff -u --unidirectional-new-file -r1.1 ./util/configp %token VAR_RESPONSE_IP_TAG VAR_RESPONSE_IP VAR_RESPONSE_IP_DATA %token VAR_HARDEN_ALGO_DOWNGRADE VAR_IP_TRANSPARENT %token VAR_DISABLE_DNSSEC_LAME_CHECK -@@ -150,7 +151,7 @@ +@@ -153,7 +154,7 @@ toplevelvar: serverstart contents_server | stubstart contents_stub | forwardstart contents_forward | pythonstart contents_py | rcstart contents_rc | dtstart contents_dt | viewstart - contents_view | + contents_view | rpzstart contents_rpz | - dnscstart contents_dnsc + dnscstart contents_dnsc | + cachedbstart contents_cachedb ; - @@ -2160,6 +2161,50 @@ (strcmp($2, "yes")==0); } Modified: vendor/unbound/dist/daemon/daemon.c ============================================================================== --- vendor/unbound/dist/daemon/daemon.c Sat May 12 11:54:52 2018 (r333540) +++ vendor/unbound/dist/daemon/daemon.c Sat May 12 11:55:17 2018 (r333541) @@ -221,7 +221,9 @@ daemon_init(void) # ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS ERR_load_crypto_strings(); # endif +#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL) ERR_load_SSL_strings(); +#endif # ifdef USE_GOST (void)sldns_key_EVP_load_gost_id(); # endif @@ -239,7 +241,7 @@ daemon_init(void) # if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL) (void)SSL_library_init(); # else - (void)OPENSSL_init_ssl(0, NULL); + (void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL); # endif # if defined(HAVE_SSL) && defined(OPENSSL_THREADS) && !defined(THREADS_DISABLED) if(!ub_openssl_lock_init()) @@ -421,8 +423,8 @@ daemon_create_workers(struct daemon* daemon) daemon->rand = ub_initstate(seed, NULL); if(!daemon->rand) fatal_exit("could not init random generator"); + hash_set_raninit((uint32_t)ub_random(daemon->rand)); } - hash_set_raninit((uint32_t)ub_random(daemon->rand)); shufport = (int*)calloc(65536, sizeof(int)); if(!shufport) fatal_exit("out of memory during daemon init"); @@ -690,6 +692,9 @@ daemon_cleanup(struct daemon* daemon) daemon->num = 0; #ifdef USE_DNSTAP dt_delete(daemon->dtenv); +#endif +#ifdef USE_DNSCRYPT + dnsc_delete(daemon->dnscenv); #endif daemon->cfg = NULL; } Modified: vendor/unbound/dist/daemon/remote.c ============================================================================== --- vendor/unbound/dist/daemon/remote.c Sat May 12 11:54:52 2018 (r333540) +++ vendor/unbound/dist/daemon/remote.c Sat May 12 11:55:17 2018 (r333541) @@ -229,42 +229,10 @@ daemon_remote_create(struct config_file* cfg) free(rc); return NULL; } - /* no SSLv2, SSLv3 because has defects */ - if((SSL_CTX_set_options(rc->ctx, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2) - != SSL_OP_NO_SSLv2){ - log_crypto_err("could not set SSL_OP_NO_SSLv2"); + if(!listen_sslctx_setup(rc->ctx)) { daemon_remote_delete(rc); return NULL; } - if((SSL_CTX_set_options(rc->ctx, SSL_OP_NO_SSLv3) & SSL_OP_NO_SSLv3) - != SSL_OP_NO_SSLv3){ - log_crypto_err("could not set SSL_OP_NO_SSLv3"); - daemon_remote_delete(rc); - return NULL; - } -#if defined(SSL_OP_NO_TLSv1) && defined(SSL_OP_NO_TLSv1_1) - /* if we have tls 1.1 disable 1.0 */ - if((SSL_CTX_set_options(rc->ctx, SSL_OP_NO_TLSv1) & SSL_OP_NO_TLSv1) - != SSL_OP_NO_TLSv1){ - log_crypto_err("could not set SSL_OP_NO_TLSv1"); - daemon_remote_delete(rc); - return NULL; - } -#endif -#if defined(SSL_OP_NO_TLSv1_1) && defined(SSL_OP_NO_TLSv1_2) - /* if we have tls 1.2 disable 1.1 */ - if((SSL_CTX_set_options(rc->ctx, SSL_OP_NO_TLSv1_1) & SSL_OP_NO_TLSv1_1) - != SSL_OP_NO_TLSv1_1){ - log_crypto_err("could not set SSL_OP_NO_TLSv1_1"); - daemon_remote_delete(rc); - return NULL; - } -#endif -#if defined(SHA256_DIGEST_LENGTH) && defined(USE_ECDSA) - /* if we have sha256, set the cipher list to have no known vulns */ - if(!SSL_CTX_set_cipher_list(rc->ctx, "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256")) - log_crypto_err("could not set cipher list with SSL_CTX_set_cipher_list"); -#endif if (cfg->remote_control_use_cert == 0) { /* No certificates are requested */ @@ -314,23 +282,7 @@ daemon_remote_create(struct config_file* cfg) log_crypto_err("Error in SSL_CTX check_private_key"); goto setup_error; } -#if HAVE_DECL_SSL_CTX_SET_ECDH_AUTO - if(!SSL_CTX_set_ecdh_auto(rc->ctx,1)) { - log_crypto_err("Error in SSL_CTX_ecdh_auto, not enabling ECDHE"); - } -#elif defined(USE_ECDSA) - if(1) { - EC_KEY *ecdh = EC_KEY_new_by_curve_name (NID_X9_62_prime256v1); - if (!ecdh) { - log_crypto_err("could not find p256, not enabling ECDHE"); - } else { - if (1 != SSL_CTX_set_tmp_ecdh (rc->ctx, ecdh)) { - log_crypto_err("Error in SSL_CTX_set_tmp_ecdh, not enabling ECDHE"); - } - EC_KEY_free (ecdh); - } - } -#endif + listen_sslctx_setup_2(rc->ctx); if(!SSL_CTX_load_verify_locations(rc->ctx, s_cert, NULL)) { log_crypto_err("Error setting up SSL_CTX verify locations"); setup_error: @@ -415,7 +367,7 @@ add_open(const char* ip, int nr, struct listen_port** if (cfg->username && cfg->username[0] && cfg_uid != (uid_t)-1) { if(chown(ip, cfg_uid, cfg_gid) == -1) - log_err("cannot chown %u.%u %s: %s", + verbose(VERB_QUERY, "cannot chown %u.%u %s: %s", (unsigned)cfg_uid, (unsigned)cfg_gid, ip, strerror(errno)); } @@ -841,7 +793,7 @@ print_stats(SSL* ssl, const char* nm, struct ub_stats_ static int print_thread_stats(SSL* ssl, int i, struct ub_stats_info* s) { - char nm[16]; + char nm[32]; snprintf(nm, sizeof(nm), "thread%d", i); nm[sizeof(nm)-1]=0; return print_stats(ssl, nm, s); @@ -873,6 +825,9 @@ print_mem(SSL* ssl, struct worker* worker, struct daem #ifdef USE_IPSECMOD size_t ipsecmod = 0; #endif /* USE_IPSECMOD */ +#ifdef USE_DNSCRYPT + size_t dnscrypt_shared_secret = 0; +#endif /* USE_DNSCRYPT */ msg = slabhash_get_mem(daemon->env->msg_cache); rrset = slabhash_get_mem(&daemon->env->rrset_cache->table); val = mod_get_mem(&worker->env, "validator"); @@ -884,6 +839,12 @@ print_mem(SSL* ssl, struct worker* worker, struct daem #ifdef USE_IPSECMOD ipsecmod = mod_get_mem(&worker->env, "ipsecmod"); #endif /* USE_IPSECMOD */ +#ifdef USE_DNSCRYPT + if(daemon->dnscenv) { + dnscrypt_shared_secret = slabhash_get_mem( + daemon->dnscenv->shared_secrets_cache); + } +#endif /* USE_DNSCRYPT */ if(!print_longnum(ssl, "mem.cache.rrset"SQ, rrset)) return 0; @@ -903,6 +864,11 @@ print_mem(SSL* ssl, struct worker* worker, struct daem if(!print_longnum(ssl, "mem.mod.ipsecmod"SQ, ipsecmod)) return 0; #endif /* USE_IPSECMOD */ +#ifdef USE_DNSCRYPT + if(!print_longnum(ssl, "mem.cache.dnscrypt_shared_secret"SQ, + dnscrypt_shared_secret)) + return 0; +#endif /* USE_DNSCRYPT */ return 1; } @@ -1065,6 +1031,9 @@ print_ext(SSL* ssl, struct ub_stats_info* s) if(!ssl_printf(ssl, "num.answer.rcode.nodata"SQ"%lu\n", (unsigned long)s->svr.ans_rcode_nodata)) return 0; } + /* iteration */ + if(!ssl_printf(ssl, "num.query.ratelimited"SQ"%lu\n", + (unsigned long)s->svr.queries_ratelimited)) return 0; /* validation */ if(!ssl_printf(ssl, "num.answer.secure"SQ"%lu\n", (unsigned long)s->svr.ans_secure)) return 0; @@ -1086,6 +1055,12 @@ print_ext(SSL* ssl, struct ub_stats_info* s) (unsigned)s->svr.infra_cache_count)) return 0; if(!ssl_printf(ssl, "key.cache.count"SQ"%u\n", (unsigned)s->svr.key_cache_count)) return 0; +#ifdef USE_DNSCRYPT + if(!ssl_printf(ssl, "dnscrypt_shared_secret.cache.count"SQ"%u\n", + (unsigned)s->svr.shared_secret_cache_count)) return 0; + if(!ssl_printf(ssl, "num.query.dnscrypt.shared_secret.cachemiss"SQ"%lu\n", + (unsigned long)s->svr.num_query_dnscrypt_secret_missed_cache)) return 0; +#endif /* USE_DNSCRYPT */ return 1; } @@ -2389,10 +2364,16 @@ dump_infra_host(struct lruhash_entry* e, void* arg) struct infra_data* d = (struct infra_data*)e->data; char ip_str[1024]; char name[257]; + int port; if(a->ssl_failed) return; addr_to_str(&k->addr, k->addrlen, ip_str, sizeof(ip_str)); dname_str(k->zonename, name); + port = (int)ntohs(((struct sockaddr_in*)&k->addr)->sin_port); + if(port != UNBOUND_DNS_PORT) { + snprintf(ip_str+strlen(ip_str), sizeof(ip_str)-strlen(ip_str), + "@%d", port); + } /* skip expired stuff (only backed off) */ if(d->ttl < a->now) { if(d->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT) { Modified: vendor/unbound/dist/daemon/stats.c ============================================================================== --- vendor/unbound/dist/daemon/stats.c Sat May 12 11:54:52 2018 (r333540) +++ vendor/unbound/dist/daemon/stats.c Sat May 12 11:55:17 2018 (r333541) @@ -56,6 +56,7 @@ #include "util/timehist.h" #include "util/net_help.h" #include "validator/validator.h" +#include "iterator/iterator.h" #include "sldns/sbuffer.h" #include "services/cache/rrset.h" #include "services/cache/infra.h" @@ -123,7 +124,7 @@ void server_stats_log(struct ub_server_stats* stats, s /** get rrsets bogus number from validator */ static size_t -get_rrset_bogus(struct worker* worker) +get_rrset_bogus(struct worker* worker, int reset) { int m = modstack_find(&worker->env.mesh->mods, "validator"); struct val_env* ve; @@ -133,12 +134,48 @@ get_rrset_bogus(struct worker* worker) ve = (struct val_env*)worker->env.modinfo[m]; lock_basic_lock(&ve->bogus_lock); r = ve->num_rrset_bogus; - if(!worker->env.cfg->stat_cumulative) + if(reset && !worker->env.cfg->stat_cumulative) ve->num_rrset_bogus = 0; lock_basic_unlock(&ve->bogus_lock); return r; } *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805121155.w4CBtIir019777>