Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mpl/bind merge conflicts, adjust build.



details:   https://anonhg.NetBSD.org/src/rev/06a353a2af1e
branches:  trunk
changeset: 959578:06a353a2af1e
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 19 16:42:08 2021 +0000

description:
merge conflicts, adjust build.

diffstat:

 external/mpl/bind/Makefile.inc                                                       |     6 +-
 external/mpl/bind/bin/named/Makefile                                                 |     3 +-
 external/mpl/bind/dist/Makefile.in                                                   |     3 +
 external/mpl/bind/dist/bin/check/check-tool.c                                        |     4 +-
 external/mpl/bind/dist/bin/check/check-tool.h                                        |     4 +-
 external/mpl/bind/dist/bin/check/named-checkconf.c                                   |    14 +-
 external/mpl/bind/dist/bin/check/named-checkzone.c                                   |     4 +-
 external/mpl/bind/dist/bin/confgen/ddns-confgen.c                                    |     4 +-
 external/mpl/bind/dist/bin/confgen/include/confgen/os.h                              |     4 +-
 external/mpl/bind/dist/bin/confgen/keygen.c                                          |     4 +-
 external/mpl/bind/dist/bin/confgen/keygen.h                                          |     4 +-
 external/mpl/bind/dist/bin/confgen/rndc-confgen.c                                    |     4 +-
 external/mpl/bind/dist/bin/confgen/unix/os.c                                         |     4 +-
 external/mpl/bind/dist/bin/confgen/util.c                                            |     4 +-
 external/mpl/bind/dist/bin/confgen/util.h                                            |     4 +-
 external/mpl/bind/dist/bin/confgen/win32/os.c                                        |     4 +-
 external/mpl/bind/dist/bin/delv/delv.c                                               |    16 +-
 external/mpl/bind/dist/bin/dig/dig.c                                                 |    61 +-
 external/mpl/bind/dist/bin/dig/dighost.c                                             |    43 +-
 external/mpl/bind/dist/bin/dig/host.c                                                |     4 +-
 external/mpl/bind/dist/bin/dig/include/dig/dig.h                                     |    10 +-
 external/mpl/bind/dist/bin/dig/nslookup.c                                            |    12 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-cds.c                                       |     4 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c                                 |     4 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-importkey.c                                 |     4 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-keyfromlabel.c                              |     4 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-keygen.c                                    |    12 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-revoke.c                                    |     4 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-settime.c                                   |    69 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-signzone.c                                  |    44 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-verify.c                                    |     9 +-
 external/mpl/bind/dist/bin/dnssec/dnssectool.c                                       |     4 +-
 external/mpl/bind/dist/bin/dnssec/dnssectool.h                                       |     8 +-
 external/mpl/bind/dist/bin/named/bind9.xsl.h                                         |     4 +-
 external/mpl/bind/dist/bin/named/builtin.c                                           |     4 +-
 external/mpl/bind/dist/bin/named/config.c                                            |    88 +-
 external/mpl/bind/dist/bin/named/control.c                                           |     4 +-
 external/mpl/bind/dist/bin/named/controlconf.c                                       |    33 +-
 external/mpl/bind/dist/bin/named/fuzz.c                                              |     4 +-
 external/mpl/bind/dist/bin/named/geoip.c                                             |     4 +-
 external/mpl/bind/dist/bin/named/include/dlz/dlz_dlopen_driver.h                     |     4 +-
 external/mpl/bind/dist/bin/named/include/named/builtin.h                             |     4 +-
 external/mpl/bind/dist/bin/named/include/named/config.h                              |    10 +-
 external/mpl/bind/dist/bin/named/include/named/control.h                             |     4 +-
 external/mpl/bind/dist/bin/named/include/named/fuzz.h                                |     4 +-
 external/mpl/bind/dist/bin/named/include/named/geoip.h                               |     4 +-
 external/mpl/bind/dist/bin/named/include/named/globals.h                             |     5 +-
 external/mpl/bind/dist/bin/named/include/named/log.h                                 |     4 +-
 external/mpl/bind/dist/bin/named/include/named/logconf.h                             |     4 +-
 external/mpl/bind/dist/bin/named/include/named/main.h                                |     4 +-
 external/mpl/bind/dist/bin/named/include/named/server.h                              |    12 +-
 external/mpl/bind/dist/bin/named/include/named/smf_globals.h                         |     4 +-
 external/mpl/bind/dist/bin/named/include/named/statschannel.h                        |     4 +-
 external/mpl/bind/dist/bin/named/include/named/tkeyconf.h                            |     4 +-
 external/mpl/bind/dist/bin/named/include/named/tsigconf.h                            |     4 +-
 external/mpl/bind/dist/bin/named/include/named/types.h                               |     4 +-
 external/mpl/bind/dist/bin/named/include/named/zoneconf.h                            |    17 +-
 external/mpl/bind/dist/bin/named/log.c                                               |     4 +-
 external/mpl/bind/dist/bin/named/logconf.c                                           |     4 +-
 external/mpl/bind/dist/bin/named/main.c                                              |    10 +-
 external/mpl/bind/dist/bin/named/server.c                                            |   865 ++-
 external/mpl/bind/dist/bin/named/statschannel.c                                      |     8 +-
 external/mpl/bind/dist/bin/named/tkeyconf.c                                          |     4 +-
 external/mpl/bind/dist/bin/named/tsigconf.c                                          |     4 +-
 external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c                            |     4 +-
 external/mpl/bind/dist/bin/named/unix/include/named/os.h                             |     4 +-
 external/mpl/bind/dist/bin/named/unix/os.c                                           |     4 +-
 external/mpl/bind/dist/bin/named/win32/dlz_dlopen_driver.c                           |     4 +-
 external/mpl/bind/dist/bin/named/win32/include/named/ntservice.h                     |     4 +-
 external/mpl/bind/dist/bin/named/win32/include/named/os.h                            |     4 +-
 external/mpl/bind/dist/bin/named/win32/ntservice.c                                   |     4 +-
 external/mpl/bind/dist/bin/named/win32/os.c                                          |     4 +-
 external/mpl/bind/dist/bin/named/zoneconf.c                                          |   204 +-
 external/mpl/bind/dist/bin/nsupdate/nsupdate.c                                       |    67 +-
 external/mpl/bind/dist/bin/pkcs11/pkcs11-list.c                                      |     4 +-
 external/mpl/bind/dist/bin/pkcs11/pkcs11-tokens.c                                    |     4 +-
 external/mpl/bind/dist/bin/plugins/filter-aaaa.c                                     |     6 +-
 external/mpl/bind/dist/bin/rndc/include/rndc/os.h                                    |     4 +-
 external/mpl/bind/dist/bin/rndc/rndc.c                                               |    15 +-
 external/mpl/bind/dist/bin/rndc/util.c                                               |     4 +-
 external/mpl/bind/dist/bin/rndc/util.h                                               |     4 +-
 external/mpl/bind/dist/bin/tests/cfg_test.c                                          |     4 +-
 external/mpl/bind/dist/bin/tests/makejournal.c                                       |     4 +-
 external/mpl/bind/dist/bin/tests/optional/adb_test.c                                 |     4 +-
 external/mpl/bind/dist/bin/tests/optional/backtrace_test.c                           |     4 +-
 external/mpl/bind/dist/bin/tests/optional/byaddr_test.c                              |     4 +-
 external/mpl/bind/dist/bin/tests/optional/byname_test.c                              |     4 +-
 external/mpl/bind/dist/bin/tests/optional/db_test.c                                  |     4 +-
 external/mpl/bind/dist/bin/tests/optional/fsaccess_test.c                            |     4 +-
 external/mpl/bind/dist/bin/tests/optional/gsstest.c                                  |    28 +-
 external/mpl/bind/dist/bin/tests/optional/inter_test.c                               |     4 +-
 external/mpl/bind/dist/bin/tests/optional/lex_test.c                                 |     4 +-
 external/mpl/bind/dist/bin/tests/optional/lfsr_test.c                                |     4 +-
 external/mpl/bind/dist/bin/tests/optional/log_test.c                                 |    11 +-
 external/mpl/bind/dist/bin/tests/optional/master_test.c                              |     4 +-
 external/mpl/bind/dist/bin/tests/optional/mempool_test.c                             |     4 +-
 external/mpl/bind/dist/bin/tests/optional/name_test.c                                |     4 +-
 external/mpl/bind/dist/bin/tests/optional/nsecify.c                                  |     4 +-
 external/mpl/bind/dist/bin/tests/optional/ratelimiter_test.c                         |     4 +-
 external/mpl/bind/dist/bin/tests/optional/rbt_test.c                                 |     4 +-
 external/mpl/bind/dist/bin/tests/optional/rwlock_test.c                              |     4 +-
 external/mpl/bind/dist/bin/tests/optional/serial_test.c                              |     4 +-
 external/mpl/bind/dist/bin/tests/optional/shutdown_test.c                            |     4 +-
 external/mpl/bind/dist/bin/tests/optional/sig0_test.c                                |    14 +-
 external/mpl/bind/dist/bin/tests/optional/sock_test.c                                |     4 +-
 external/mpl/bind/dist/bin/tests/optional/sym_test.c                                 |     4 +-
 external/mpl/bind/dist/bin/tests/optional/task_test.c                                |     4 +-
 external/mpl/bind/dist/bin/tests/optional/timer_test.c                               |     4 +-
 external/mpl/bind/dist/bin/tests/optional/zone_test.c                                |     6 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/create.c                          |     4 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/find.c                            |     4 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/genrsa.c                          |     4 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/login.c                           |     4 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/privrsa.c                         |     4 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/pubrsa.c                          |     4 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/session.c                         |     4 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/sha1.c                            |     4 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/sign.c                            |     4 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/verify.c                          |     4 +-
 external/mpl/bind/dist/bin/tests/system/addzone/ns1/inlineslave.db                   |    24 -
 external/mpl/bind/dist/bin/tests/system/delzone/ns1/inlineslave.db                   |    24 -
 external/mpl/bind/dist/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1 |     4 +-
 external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c                         |     4 +-
 external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.h                         |     4 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/db.c                            |     7 +-
 external/mpl/bind/dist/bin/tests/system/feature-test.c                               |   109 +-
 external/mpl/bind/dist/bin/tests/system/forward/ns1/root.db                          |    31 -
 external/mpl/bind/dist/bin/tests/system/forward/ns3/named.conf.in                    |    52 -
 external/mpl/bind/dist/bin/tests/system/ixfr/ns3/mytest0.db                          |    26 -
 external/mpl/bind/dist/bin/tests/system/ixfr/ns3/mytest1.db                          |    26 -
 external/mpl/bind/dist/bin/tests/system/ixfr/ns3/mytest2.db                          |    26 -
 external/mpl/bind/dist/bin/tests/system/ixfr/ns3/subtest0.db                         |    22 -
 external/mpl/bind/dist/bin/tests/system/ixfr/ns3/subtest1.db                         |    22 -
 external/mpl/bind/dist/bin/tests/system/kasp/ns3/policies/autosign.conf              |   131 -
 external/mpl/bind/dist/bin/tests/system/kasp/ns3/policies/kasp.conf                  |    78 -
 external/mpl/bind/dist/bin/tests/system/kasp/ns6/policies/csk1.conf                  |    29 -
 external/mpl/bind/dist/bin/tests/system/kasp/ns6/policies/csk2.conf                  |    29 -
 external/mpl/bind/dist/bin/tests/system/kasp/ns6/policies/kasp.conf                  |   103 -
 external/mpl/bind/dist/bin/tests/system/pipelined/pipequeries.c                      |    14 +-
 external/mpl/bind/dist/bin/tests/system/rndc/gencheck.c                              |     4 +-
 external/mpl/bind/dist/bin/tests/system/rpz/ckdnsrps.sh                              |   166 -
 external/mpl/bind/dist/bin/tests/system/rpz/dnsrps.c                                 |     4 +-
 external/mpl/bind/dist/bin/tests/system/rsabigexponent/bigkey.c                      |     4 +-
 external/mpl/bind/dist/bin/tests/system/tkey/keycreate.c                             |    14 +-
 external/mpl/bind/dist/bin/tests/system/tkey/keydelete.c                             |    14 +-
 external/mpl/bind/dist/bin/tests/system/xfer/ns2/slave.db.in                         |    17 -
 external/mpl/bind/dist/bin/tests/wire_test.c                                         |    15 +-
 external/mpl/bind/dist/bin/tools/arpaname.c                                          |     4 +-
 external/mpl/bind/dist/bin/tools/dnstap-read.c                                       |     6 +-
 external/mpl/bind/dist/bin/tools/mdig.c                                              |    91 +-
 external/mpl/bind/dist/bin/tools/named-journalprint.c                                |     4 +-
 external/mpl/bind/dist/bin/tools/named-nzd2nzf.c                                     |     4 +-
 external/mpl/bind/dist/bin/tools/named-rrchecker.c                                   |     4 +-
 external/mpl/bind/dist/bin/tools/nsec3hash.c                                         |     4 +-
 external/mpl/bind/dist/bin/win32/BINDInstall/AccountInfo.h                           |     4 +-
 external/mpl/bind/dist/bin/win32/BINDInstall/BINDInstall.h                           |     4 +-
 external/mpl/bind/dist/bin/win32/BINDInstall/BINDInstallDlg.h                        |     4 +-
 external/mpl/bind/dist/bin/win32/BINDInstall/DirBrowse.h                             |     4 +-
 external/mpl/bind/dist/config.h.in                                                   |    15 +-
 external/mpl/bind/dist/configure                                                     |   504 +-
 external/mpl/bind/dist/doc/arm/isc-logo.pdf                                          |   Bin 
 external/mpl/bind/dist/doc/misc/masters.grammar.rst                                  |     6 -
 external/mpl/bind/dist/fuzz/dns_name_fromtext_target.c                               |     4 +-
 external/mpl/bind/dist/fuzz/dns_rdata_fromwire_text.c                                |    46 +-
 external/mpl/bind/dist/fuzz/fuzz.h                                                   |     6 +-
 external/mpl/bind/dist/fuzz/main.c                                                   |    10 +-
 external/mpl/bind/dist/lib/bind9/api                                                 |    15 -
 external/mpl/bind/dist/lib/bind9/check.c                                             |   257 +-
 external/mpl/bind/dist/lib/bind9/getaddresses.c                                      |     4 +-
 external/mpl/bind/dist/lib/bind9/include/bind9/check.h                               |     4 +-
 external/mpl/bind/dist/lib/bind9/include/bind9/getaddresses.h                        |     4 +-
 external/mpl/bind/dist/lib/bind9/include/bind9/version.h                             |     8 +-
 external/mpl/bind/dist/lib/bind9/version.c                                           |     8 +-
 external/mpl/bind/dist/lib/bind9/win32/DLLMain.c                                     |     4 +-
 external/mpl/bind/dist/lib/bind9/win32/version.c                                     |     8 +-
 external/mpl/bind/dist/lib/dns/acl.c                                                 |     4 +-
 external/mpl/bind/dist/lib/dns/adb.c                                                 |     9 +-
 external/mpl/bind/dist/lib/dns/api                                                   |    15 -
 external/mpl/bind/dist/lib/dns/badcache.c                                            |    19 +-
 external/mpl/bind/dist/lib/dns/byaddr.c                                              |     4 +-
 external/mpl/bind/dist/lib/dns/cache.c                                               |    32 +-
 external/mpl/bind/dist/lib/dns/callbacks.c                                           |     4 +-
 external/mpl/bind/dist/lib/dns/catz.c                                                |     4 +-
 external/mpl/bind/dist/lib/dns/client.c                                              |    58 +-
 external/mpl/bind/dist/lib/dns/clientinfo.c                                          |     4 +-
 external/mpl/bind/dist/lib/dns/compress.c                                            |     4 +-
 external/mpl/bind/dist/lib/dns/db.c                                                  |    37 +-
 external/mpl/bind/dist/lib/dns/dbiterator.c                                          |     4 +-
 external/mpl/bind/dist/lib/dns/dbtable.c                                             |     4 +-
 external/mpl/bind/dist/lib/dns/diff.c                                                |     4 +-
 external/mpl/bind/dist/lib/dns/dispatch.c                                            |    35 +-
 external/mpl/bind/dist/lib/dns/dlz.c                                                 |     4 +-
 external/mpl/bind/dist/lib/dns/dns64.c                                               |     4 +-
 external/mpl/bind/dist/lib/dns/dnsrps.c                                              |     9 +-
 external/mpl/bind/dist/lib/dns/dnssec.c                                              |   169 +-
 external/mpl/bind/dist/lib/dns/dnstap.c                                              |    10 +-
 external/mpl/bind/dist/lib/dns/ds.c                                                  |     4 +-
 external/mpl/bind/dist/lib/dns/dst_api.c                                             |    28 +-
 external/mpl/bind/dist/lib/dns/dst_internal.h                                        |     5 +-
 external/mpl/bind/dist/lib/dns/dst_openssl.h                                         |     4 +-
 external/mpl/bind/dist/lib/dns/dst_parse.c                                           |     4 +-
 external/mpl/bind/dist/lib/dns/dst_parse.h                                           |     4 +-
 external/mpl/bind/dist/lib/dns/dst_pkcs11.h                                          |     4 +-
 external/mpl/bind/dist/lib/dns/dst_result.c                                          |     4 +-
 external/mpl/bind/dist/lib/dns/dyndb.c                                               |     4 +-
 external/mpl/bind/dist/lib/dns/ecdb.c                                                |     4 +-
 external/mpl/bind/dist/lib/dns/ecs.c                                                 |     4 +-
 external/mpl/bind/dist/lib/dns/fixedname.c                                           |     4 +-
 external/mpl/bind/dist/lib/dns/forward.c                                             |     4 +-
 external/mpl/bind/dist/lib/dns/gen-unix.h                                            |     4 +-
 external/mpl/bind/dist/lib/dns/gen-win32.h                                           |     4 +-
 external/mpl/bind/dist/lib/dns/gen.c                                                 |     5 +-
 external/mpl/bind/dist/lib/dns/geoip2.c                                              |     4 +-
 external/mpl/bind/dist/lib/dns/gssapi_link.c                                         |     4 +-
 external/mpl/bind/dist/lib/dns/gssapictx.c                                           |     4 +-
 external/mpl/bind/dist/lib/dns/hmac_link.c                                           |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/acl.h                                     |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/adb.h                                     |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/badcache.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/bit.h                                     |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/byaddr.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/cache.h                                   |    26 +-
 external/mpl/bind/dist/lib/dns/include/dns/callbacks.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/catz.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/cert.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/client.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/clientinfo.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/compress.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/db.h                                      |    93 +-
 external/mpl/bind/dist/lib/dns/include/dns/dbiterator.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/dbtable.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/diff.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/dispatch.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/dlz.h                                     |     8 +-
 external/mpl/bind/dist/lib/dns/include/dns/dlz_dlopen.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/dns64.h                                   |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/dnsrps.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/dnssec.h                                  |    23 +-
 external/mpl/bind/dist/lib/dns/include/dns/dnstap.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/ds.h                                      |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/dsdigest.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/dyndb.h                                   |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/ecdb.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/ecs.h                                     |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/edns.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/events.h                                  |     5 +-
 external/mpl/bind/dist/lib/dns/include/dns/fixedname.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/forward.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/geoip.h                                   |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/ipkeylist.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/iptable.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/journal.h                                 |    12 +-
 external/mpl/bind/dist/lib/dns/include/dns/kasp.h                                    |   114 +-
 external/mpl/bind/dist/lib/dns/include/dns/keydata.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/keyflags.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/keymgr.h                                  |    63 +-
 external/mpl/bind/dist/lib/dns/include/dns/keytable.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/keyvalues.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/lib.h                                     |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/librpz.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/lmdb.h                                    |     2 +-
 external/mpl/bind/dist/lib/dns/include/dns/log.h                                     |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/lookup.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/master.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/masterdump.h                              |    14 +-
 external/mpl/bind/dist/lib/dns/include/dns/message.h                                 |    68 +-
 external/mpl/bind/dist/lib/dns/include/dns/name.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/ncache.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/nsec.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/nsec3.h                                   |    11 +-
 external/mpl/bind/dist/lib/dns/include/dns/nta.h                                     |    12 +-
 external/mpl/bind/dist/lib/dns/include/dns/opcode.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/order.h                                   |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/peer.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/portlist.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/private.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/rbt.h                                     |    58 +-
 external/mpl/bind/dist/lib/dns/include/dns/rcode.h                                   |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdata.h                                   |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdataclass.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdatalist.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdataset.h                                |     6 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdatasetiter.h                            |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdataslab.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdatatype.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/request.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/resolver.h                                |    11 +-
 external/mpl/bind/dist/lib/dns/include/dns/result.h                                  |    13 +-
 external/mpl/bind/dist/lib/dns/include/dns/rootns.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/rpz.h                                     |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/rriterator.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/rrl.h                                     |     6 +-
 external/mpl/bind/dist/lib/dns/include/dns/sdb.h                                     |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/sdlz.h                                    |    16 +-
 external/mpl/bind/dist/lib/dns/include/dns/secalg.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/secproto.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/soa.h                                     |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/ssu.h                                     |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/stats.h                                   |   563 +-
 external/mpl/bind/dist/lib/dns/include/dns/tcpmsg.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/time.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/timer.h                                   |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/tkey.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/tsec.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/tsig.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/ttl.h                                     |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/types.h                                   |    36 +-
 external/mpl/bind/dist/lib/dns/include/dns/update.h                                  |    18 +-
 external/mpl/bind/dist/lib/dns/include/dns/validator.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/version.h                                 |     8 +-
 external/mpl/bind/dist/lib/dns/include/dns/view.h                                    |    14 +-
 external/mpl/bind/dist/lib/dns/include/dns/xfrin.h                                   |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/zone.h                                    |    87 +-
 external/mpl/bind/dist/lib/dns/include/dns/zonekey.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/zoneverify.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/zt.h                                      |     4 +-
 external/mpl/bind/dist/lib/dns/include/dst/dst.h                                     |    16 +-
 external/mpl/bind/dist/lib/dns/include/dst/gssapi.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dst/result.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/ipkeylist.c                                           |     4 +-
 external/mpl/bind/dist/lib/dns/iptable.c                                             |     4 +-
 external/mpl/bind/dist/lib/dns/journal.c                                             |    71 +-
 external/mpl/bind/dist/lib/dns/kasp.c                                                |    91 +-
 external/mpl/bind/dist/lib/dns/key.c                                                 |     4 +-
 external/mpl/bind/dist/lib/dns/keydata.c                                             |     4 +-
 external/mpl/bind/dist/lib/dns/keymgr.c                                              |   673 ++-
 external/mpl/bind/dist/lib/dns/keytable.c                                            |    34 +-
 external/mpl/bind/dist/lib/dns/lib.c                                                 |     4 +-
 external/mpl/bind/dist/lib/dns/log.c                                                 |     4 +-
 external/mpl/bind/dist/lib/dns/lookup.c                                              |     4 +-
 external/mpl/bind/dist/lib/dns/master.c                                              |     4 +-
 external/mpl/bind/dist/lib/dns/masterdump.c                                          |    43 +-
 external/mpl/bind/dist/lib/dns/message.c                                             |    95 +-
 external/mpl/bind/dist/lib/dns/name.c                                                |    10 +-
 external/mpl/bind/dist/lib/dns/ncache.c                                              |     4 +-
 external/mpl/bind/dist/lib/dns/nsec.c                                                |     4 +-
 external/mpl/bind/dist/lib/dns/nsec3.c                                               |    15 +-
 external/mpl/bind/dist/lib/dns/nta.c                                                 |    53 +-
 external/mpl/bind/dist/lib/dns/openssl_link.c                                        |     4 +-
 external/mpl/bind/dist/lib/dns/openssldh_link.c                                      |     4 +-
 external/mpl/bind/dist/lib/dns/opensslecdsa_link.c                                   |   276 +-
 external/mpl/bind/dist/lib/dns/openssleddsa_link.c                                   |     4 +-
 external/mpl/bind/dist/lib/dns/opensslrsa_link.c                                     |     4 +-
 external/mpl/bind/dist/lib/dns/order.c                                               |     7 +-
 external/mpl/bind/dist/lib/dns/peer.c                                                |     4 +-
 external/mpl/bind/dist/lib/dns/pkcs11.c                                              |     4 +-
 external/mpl/bind/dist/lib/dns/pkcs11ecdsa_link.c                                    |     4 +-
 external/mpl/bind/dist/lib/dns/pkcs11eddsa_link.c                                    |     4 +-
 external/mpl/bind/dist/lib/dns/pkcs11rsa_link.c                                      |    83 +-
 external/mpl/bind/dist/lib/dns/portlist.c                                            |     4 +-
 external/mpl/bind/dist/lib/dns/private.c                                             |     4 +-
 external/mpl/bind/dist/lib/dns/rbt.c                                                 |   180 +-
 external/mpl/bind/dist/lib/dns/rbtdb.c                                               |   571 +-
 external/mpl/bind/dist/lib/dns/rbtdb.h                                               |     4 +-
 external/mpl/bind/dist/lib/dns/rcode.c                                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata.c                                               |     9 +-
 external/mpl/bind/dist/lib/dns/rdata/any_255/tsig_250.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/any_255/tsig_250.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/ch_3/a_1.c                                      |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/ch_3/a_1.h                                      |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/afsdb_18.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/afsdb_18.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/amtrelay_260.c                          |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/amtrelay_260.h                          |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/avc_258.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/avc_258.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/caa_257.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/caa_257.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cdnskey_60.c                            |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cdnskey_60.h                            |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cds_59.c                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cds_59.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cert_37.c                               |     6 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cert_37.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cname_5.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cname_5.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/csync_62.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/csync_62.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/dlv_32769.c                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/dlv_32769.h                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/dname_39.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/dname_39.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/dnskey_48.c                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/dnskey_48.h                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/doa_259.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/doa_259.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ds_43.c                                 |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ds_43.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/eui48_108.c                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/eui48_108.h                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/eui64_109.c                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/eui64_109.h                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/gpos_27.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/gpos_27.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/hinfo_13.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/hinfo_13.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/hip_55.c                                |    10 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/hip_55.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ipseckey_45.c                           |    14 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ipseckey_45.h                           |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/isdn_20.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/isdn_20.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/key_25.c                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/key_25.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/keydata_65533.c                         |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/keydata_65533.h                         |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/l32_105.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/l32_105.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/l64_106.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/l64_106.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/loc_29.c                                |   761 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/loc_29.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/lp_107.c                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/lp_107.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mb_7.c                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mb_7.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/md_3.c                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/md_3.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mf_4.c                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mf_4.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mg_8.c                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mg_8.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/minfo_14.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/minfo_14.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mr_9.c                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mr_9.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mx_15.c                                 |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mx_15.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/naptr_35.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/naptr_35.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nid_104.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nid_104.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ninfo_56.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ninfo_56.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ns_2.c                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ns_2.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nsec3_50.c                              |     6 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nsec3_50.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nsec3param_51.c                         |     6 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nsec3param_51.h                         |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nsec_47.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nsec_47.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/null_10.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/null_10.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nxt_30.c                                |     8 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nxt_30.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/openpgpkey_61.c                         |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/openpgpkey_61.h                         |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/opt_41.c                                |     8 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/opt_41.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/proforma.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/proforma.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ptr_12.c                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ptr_12.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rkey_57.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rkey_57.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rp_17.c                                 |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rp_17.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rrsig_46.c                              |     7 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rrsig_46.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rt_21.c                                 |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rt_21.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sig_24.c                                |     7 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sig_24.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sink_40.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sink_40.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/smimea_53.c                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/smimea_53.h                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/soa_6.c                                 |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/soa_6.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/spf_99.c                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/spf_99.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sshfp_44.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sshfp_44.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ta_32768.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ta_32768.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/talink_58.c                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/talink_58.h                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/tkey_249.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/tkey_249.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/tlsa_52.c                               |     7 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/tlsa_52.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/txt_16.c                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/txt_16.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/uri_256.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/uri_256.h                               |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/x25_19.c                                |    12 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/x25_19.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/zonemd_63.c                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/zonemd_63.h                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/hs_4/a_1.c                                      |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/hs_4/a_1.h                                      |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/a6_38.c                                    |     8 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/a6_38.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/a_1.c                                      |    40 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/a_1.h                                      |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/aaaa_28.c                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/aaaa_28.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/apl_42.c                                   |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/apl_42.h                                   |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/atma_34.c                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/atma_34.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/dhcid_49.c                                 |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/dhcid_49.h                                 |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/eid_31.c                                   |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/eid_31.h                                   |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/kx_36.c                                    |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/kx_36.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/nimloc_32.c                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/nimloc_32.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/nsap-ptr_23.c                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/nsap-ptr_23.h                              |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/nsap_22.c                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/nsap_22.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/px_26.c                                    |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/px_26.h                                    |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/srv_33.c                                   |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/srv_33.h                                   |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.c                                   |     7 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.h                                   |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/rdatastructpre.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/rdatastructsuf.h                                |     4 +-
 external/mpl/bind/dist/lib/dns/rdatalist.c                                           |     4 +-
 external/mpl/bind/dist/lib/dns/rdatalist_p.h                                         |     4 +-
 external/mpl/bind/dist/lib/dns/rdataset.c                                            |     4 +-
 external/mpl/bind/dist/lib/dns/rdatasetiter.c                                        |     4 +-
 external/mpl/bind/dist/lib/dns/rdataslab.c                                           |     4 +-
 external/mpl/bind/dist/lib/dns/request.c                                             |     7 +-
 external/mpl/bind/dist/lib/dns/resolver.c                                            |   780 ++-
 external/mpl/bind/dist/lib/dns/result.c                                              |    20 +-
 external/mpl/bind/dist/lib/dns/rootns.c                                              |     4 +-
 external/mpl/bind/dist/lib/dns/rpz.c                                                 |    57 +-
 external/mpl/bind/dist/lib/dns/rriterator.c                                          |     4 +-
 external/mpl/bind/dist/lib/dns/rrl.c                                                 |     6 +-
 external/mpl/bind/dist/lib/dns/sdb.c                                                 |     9 +-
 external/mpl/bind/dist/lib/dns/sdlz.c                                                |    15 +-
 external/mpl/bind/dist/lib/dns/soa.c                                                 |     4 +-
 external/mpl/bind/dist/lib/dns/spnego.c                                              |    40 +-
 external/mpl/bind/dist/lib/dns/spnego.h                                              |     4 +-
 external/mpl/bind/dist/lib/dns/spnego_asn1.c                                         |    26 +-
 external/mpl/bind/dist/lib/dns/ssu.c                                                 |     4 +-
 external/mpl/bind/dist/lib/dns/ssu_external.c                                        |     4 +-
 external/mpl/bind/dist/lib/dns/stats.c                                               |     8 +-
 external/mpl/bind/dist/lib/dns/tcpmsg.c                                              |     4 +-
 external/mpl/bind/dist/lib/dns/tests/acl_test.c                                      |     4 +-
 external/mpl/bind/dist/lib/dns/tests/db_test.c                                       |     4 +-
 external/mpl/bind/dist/lib/dns/tests/dbdiff_test.c                                   |     4 +-
 external/mpl/bind/dist/lib/dns/tests/dbiterator_test.c                               |     4 +-
 external/mpl/bind/dist/lib/dns/tests/dbversion_test.c                                |     4 +-
 external/mpl/bind/dist/lib/dns/tests/dh_test.c                                       |     4 +-
 external/mpl/bind/dist/lib/dns/tests/dispatch_test.c                                 |    22 +-
 external/mpl/bind/dist/lib/dns/tests/dnstap_test.c                                   |     4 +-
 external/mpl/bind/dist/lib/dns/tests/dnstest.c                                       |     4 +-
 external/mpl/bind/dist/lib/dns/tests/dnstest.h                                       |     4 +-
 external/mpl/bind/dist/lib/dns/tests/dst_test.c                                      |     4 +-
 external/mpl/bind/dist/lib/dns/tests/geoip_test.c                                    |    12 +-
 external/mpl/bind/dist/lib/dns/tests/keytable_test.c                                 |     8 +-
 external/mpl/bind/dist/lib/dns/tests/master_test.c                                   |     4 +-
 external/mpl/bind/dist/lib/dns/tests/name_test.c                                     |     8 +-
 external/mpl/bind/dist/lib/dns/tests/nsec3_test.c                                    |     4 +-
 external/mpl/bind/dist/lib/dns/tests/nsec3param_test.c                               |     2 +-
 external/mpl/bind/dist/lib/dns/tests/peer_test.c                                     |     4 +-
 external/mpl/bind/dist/lib/dns/tests/private_test.c                                  |    12 +-
 external/mpl/bind/dist/lib/dns/tests/rbt_serialize_test.c                            |     4 +-
 external/mpl/bind/dist/lib/dns/tests/rbt_test.c                                      |     4 +-
 external/mpl/bind/dist/lib/dns/tests/rdata_test.c                                    |   209 +-
 external/mpl/bind/dist/lib/dns/tests/rdataset_test.c                                 |     4 +-
 external/mpl/bind/dist/lib/dns/tests/rdatasetstats_test.c                            |     4 +-
 external/mpl/bind/dist/lib/dns/tests/resolver_test.c                                 |     4 +-
 external/mpl/bind/dist/lib/dns/tests/result_test.c                                   |     4 +-
 external/mpl/bind/dist/lib/dns/tests/rsa_test.c                                      |     4 +-
 external/mpl/bind/dist/lib/dns/tests/sigs_test.c                                     |     4 +-
 external/mpl/bind/dist/lib/dns/tests/time_test.c                                     |     4 +-
 external/mpl/bind/dist/lib/dns/tests/tsig_test.c                                     |    29 +-
 external/mpl/bind/dist/lib/dns/tests/update_test.c                                   |    34 +-
 external/mpl/bind/dist/lib/dns/tests/zonemgr_test.c                                  |     4 +-
 external/mpl/bind/dist/lib/dns/tests/zt_test.c                                       |     4 +-
 external/mpl/bind/dist/lib/dns/time.c                                                |     4 +-
 external/mpl/bind/dist/lib/dns/timer.c                                               |     4 +-
 external/mpl/bind/dist/lib/dns/tkey.c                                                |     4 +-
 external/mpl/bind/dist/lib/dns/tsec.c                                                |     4 +-
 external/mpl/bind/dist/lib/dns/tsig.c                                                |     6 +-
 external/mpl/bind/dist/lib/dns/tsig_p.h                                              |     4 +-
 external/mpl/bind/dist/lib/dns/ttl.c                                                 |     4 +-
 external/mpl/bind/dist/lib/dns/update.c                                              |    81 +-
 external/mpl/bind/dist/lib/dns/validator.c                                           |    19 +-
 external/mpl/bind/dist/lib/dns/version.c                                             |     8 +-
 external/mpl/bind/dist/lib/dns/view.c                                                |    69 +-
 external/mpl/bind/dist/lib/dns/win32/DLLMain.c                                       |     4 +-
 external/mpl/bind/dist/lib/dns/win32/version.c                                       |     8 +-
 external/mpl/bind/dist/lib/dns/xfrin.c                                               |    20 +-
 external/mpl/bind/dist/lib/dns/zone.c                                                |  1301 ++++-
 external/mpl/bind/dist/lib/dns/zone_p.h                                              |     9 +-
 external/mpl/bind/dist/lib/dns/zonekey.c                                             |     4 +-
 external/mpl/bind/dist/lib/dns/zoneverify.c                                          |    92 +-
 external/mpl/bind/dist/lib/dns/zt.c                                                  |     8 +-
 external/mpl/bind/dist/lib/irs/api                                                   |    15 -
 external/mpl/bind/dist/lib/irs/context.c                                             |     4 +-
 external/mpl/bind/dist/lib/irs/dnsconf.c                                             |     4 +-
 external/mpl/bind/dist/lib/irs/gai_strerror.c                                        |     4 +-
 external/mpl/bind/dist/lib/irs/getaddrinfo.c                                         |     7 +-
 external/mpl/bind/dist/lib/irs/getnameinfo.c                                         |     4 +-
 external/mpl/bind/dist/lib/irs/include/irs/context.h                                 |     4 +-
 external/mpl/bind/dist/lib/irs/include/irs/dnsconf.h                                 |     4 +-
 external/mpl/bind/dist/lib/irs/include/irs/resconf.h                                 |     4 +-
 external/mpl/bind/dist/lib/irs/include/irs/types.h                                   |     4 +-
 external/mpl/bind/dist/lib/irs/include/irs/version.h                                 |     8 +-
 external/mpl/bind/dist/lib/irs/resconf.c                                             |     4 +-
 external/mpl/bind/dist/lib/irs/tests/resconf_test.c                                  |     4 +-
 external/mpl/bind/dist/lib/irs/version.c                                             |     8 +-
 external/mpl/bind/dist/lib/irs/win32/DLLMain.c                                       |     4 +-
 external/mpl/bind/dist/lib/irs/win32/include/irs/netdb.h                             |     4 +-
 external/mpl/bind/dist/lib/irs/win32/include/irs/platform.h                          |     4 +-
 external/mpl/bind/dist/lib/irs/win32/resconf.c                                       |     4 +-
 external/mpl/bind/dist/lib/irs/win32/version.c                                       |     8 +-
 external/mpl/bind/dist/lib/isc/aes.c                                                 |     4 +-
 external/mpl/bind/dist/lib/isc/api                                                   |    15 -
 external/mpl/bind/dist/lib/isc/app.c                                                 |     4 +-
 external/mpl/bind/dist/lib/isc/assertions.c                                          |     4 +-
 external/mpl/bind/dist/lib/isc/astack.c                                              |     4 +-
 external/mpl/bind/dist/lib/isc/backtrace-emptytbl.c                                  |     4 +-
 external/mpl/bind/dist/lib/isc/backtrace.c                                           |    10 +-
 external/mpl/bind/dist/lib/isc/base32.c                                              |     6 +-
 external/mpl/bind/dist/lib/isc/base64.c                                              |     4 +-
 external/mpl/bind/dist/lib/isc/bind9.c                                               |     4 +-
 external/mpl/bind/dist/lib/isc/buffer.c                                              |     4 +-
 external/mpl/bind/dist/lib/isc/bufferlist.c                                          |     4 +-
 external/mpl/bind/dist/lib/isc/commandline.c                                         |     4 +-
 external/mpl/bind/dist/lib/isc/counter.c                                             |     4 +-
 external/mpl/bind/dist/lib/isc/crc64.c                                               |     4 +-
 external/mpl/bind/dist/lib/isc/entropy.c                                             |     4 +-
 external/mpl/bind/dist/lib/isc/entropy_private.h                                     |     4 +-
 external/mpl/bind/dist/lib/isc/error.c                                               |     4 +-
 external/mpl/bind/dist/lib/isc/event.c                                               |     4 +-
 external/mpl/bind/dist/lib/isc/fsaccess.c                                            |     4 +-
 external/mpl/bind/dist/lib/isc/hash.c                                                |    45 +-
 external/mpl/bind/dist/lib/isc/heap.c                                                |     4 +-
 external/mpl/bind/dist/lib/isc/hex.c                                                 |     4 +-
 external/mpl/bind/dist/lib/isc/hmac.c                                                |     4 +-
 external/mpl/bind/dist/lib/isc/hp.c                                                  |     4 +-
 external/mpl/bind/dist/lib/isc/ht.c                                                  |     4 +-
 external/mpl/bind/dist/lib/isc/httpd.c                                               |     6 +-
 external/mpl/bind/dist/lib/isc/include/isc/aes.h                                     |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/app.h                                     |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/assertions.h                              |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/astack.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/atomic.h                                  |     6 +-
 external/mpl/bind/dist/lib/isc/include/isc/backtrace.h                               |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/base32.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/base64.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/bind9.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/buffer.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/bufferlist.h                              |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/cmocka.h                                  |     2 +-
 external/mpl/bind/dist/lib/isc/include/isc/commandline.h                             |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/counter.h                                 |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/crc64.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/deprecated.h                              |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/endian.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/errno.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/error.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/event.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/eventclass.h                              |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/file.h                                    |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/formatcheck.h                             |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/fsaccess.h                                |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/fuzz.h                                    |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/hash.h                                    |    18 +-
 external/mpl/bind/dist/lib/isc/include/isc/heap.h                                    |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/hex.h                                     |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/hmac.h                                    |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/hp.h                                      |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/ht.h                                      |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/httpd.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/interfaceiter.h                           |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/iterated_hash.h                           |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/lang.h                                    |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/lex.h                                     |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/lfsr.h                                    |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/lib.h                                     |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/likely.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/list.h                                    |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/log.h                                     |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/magic.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/md.h                                      |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/mem.h                                     |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/meminfo.h                                 |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/mutexatomic.h                             |    88 +-
 external/mpl/bind/dist/lib/isc/include/isc/mutexblock.h                              |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/netaddr.h                                 |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/netmgr.h                                  |   275 +-
 external/mpl/bind/dist/lib/isc/include/isc/netscope.h                                |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/nonce.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/os.h                                      |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/parseint.h                                |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/pool.h                                    |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/portset.h                                 |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/print.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/queue.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/quota.h                                   |     7 +-
 external/mpl/bind/dist/lib/isc/include/isc/radix.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/random.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/ratelimiter.h                             |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/refcount.h                                |    26 +-
 external/mpl/bind/dist/lib/isc/include/isc/regex.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/region.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/resource.h                                |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/result.h                                  |     7 +-
 external/mpl/bind/dist/lib/isc/include/isc/resultclass.h                             |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/rwlock.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/safe.h                                    |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/serial.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/siphash.h                                 |    10 +-
 external/mpl/bind/dist/lib/isc/include/isc/sockaddr.h                                |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/socket.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/stats.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/stdio.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/strerr.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/string.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/symtab.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/task.h                                    |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/taskpool.h                                |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/timer.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/tm.h                                      |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/types.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/utf8.h                                    |     2 +-
 external/mpl/bind/dist/lib/isc/include/isc/util.h                                    |     8 +-
 external/mpl/bind/dist/lib/isc/include/isc/version.h                                 |     8 +-
 external/mpl/bind/dist/lib/isc/include/pk11/constants.h                              |     4 +-
 external/mpl/bind/dist/lib/isc/include/pk11/internal.h                               |     8 +-
 external/mpl/bind/dist/lib/isc/include/pk11/pk11.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/include/pk11/result.h                                 |     4 +-
 external/mpl/bind/dist/lib/isc/include/pk11/site.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/iterated_hash.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/lex.c                                                 |     4 +-
 external/mpl/bind/dist/lib/isc/lfsr.c                                                |     4 +-
 external/mpl/bind/dist/lib/isc/lib.c                                                 |     4 +-
 external/mpl/bind/dist/lib/isc/log.c                                                 |    99 +-
 external/mpl/bind/dist/lib/isc/md.c                                                  |     4 +-
 external/mpl/bind/dist/lib/isc/mem.c                                                 |     8 +-
 external/mpl/bind/dist/lib/isc/mem_p.h                                               |     4 +-
 external/mpl/bind/dist/lib/isc/mutexblock.c                                          |     4 +-
 external/mpl/bind/dist/lib/isc/netaddr.c                                             |     4 +-
 external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h                                   |  1082 +++-
 external/mpl/bind/dist/lib/isc/netmgr/netmgr.c                                       |  1546 +++++-
 external/mpl/bind/dist/lib/isc/netmgr/tcp.c                                          |  1579 ++++--
 external/mpl/bind/dist/lib/isc/netmgr/tcpdns.c                                       |  1875 ++++++-
 external/mpl/bind/dist/lib/isc/netmgr/tls.c                                          |     2 +-
 external/mpl/bind/dist/lib/isc/netmgr/tlsdns.c                                       |     2 +-
 external/mpl/bind/dist/lib/isc/netmgr/udp.c                                          |  1286 ++++-
 external/mpl/bind/dist/lib/isc/netmgr/uv-compat.c                                    |   233 +-
 external/mpl/bind/dist/lib/isc/netmgr/uv-compat.h                                    |    59 +-
 external/mpl/bind/dist/lib/isc/netmgr/uverr2result.c                                 |    21 +-
 external/mpl/bind/dist/lib/isc/netscope.c                                            |    11 +-
 external/mpl/bind/dist/lib/isc/nonce.c                                               |     4 +-
 external/mpl/bind/dist/lib/isc/openssl_shim.c                                        |     4 +-
 external/mpl/bind/dist/lib/isc/openssl_shim.h                                        |     4 +-
 external/mpl/bind/dist/lib/isc/parseint.c                                            |     4 +-
 external/mpl/bind/dist/lib/isc/pk11.c                                                |    38 +-
 external/mpl/bind/dist/lib/isc/pk11_result.c                                         |     4 +-
 external/mpl/bind/dist/lib/isc/pool.c                                                |     4 +-
 external/mpl/bind/dist/lib/isc/portset.c                                             |     4 +-
 external/mpl/bind/dist/lib/isc/pthreads/condition.c                                  |     4 +-
 external/mpl/bind/dist/lib/isc/pthreads/include/isc/condition.h                      |     4 +-
 external/mpl/bind/dist/lib/isc/pthreads/include/isc/mutex.h                          |     7 +-
 external/mpl/bind/dist/lib/isc/pthreads/include/isc/once.h                           |     4 +-
 external/mpl/bind/dist/lib/isc/pthreads/include/isc/thread.h                         |     4 +-
 external/mpl/bind/dist/lib/isc/pthreads/mutex.c                                      |     4 +-
 external/mpl/bind/dist/lib/isc/pthreads/thread.c                                     |   106 +-
 external/mpl/bind/dist/lib/isc/queue.c                                               |     4 +-
 external/mpl/bind/dist/lib/isc/quota.c                                               |    46 +-
 external/mpl/bind/dist/lib/isc/radix.c                                               |     4 +-
 external/mpl/bind/dist/lib/isc/random.c                                              |     4 +-
 external/mpl/bind/dist/lib/isc/ratelimiter.c                                         |    13 +-
 external/mpl/bind/dist/lib/isc/regex.c                                               |    18 +-
 external/mpl/bind/dist/lib/isc/region.c                                              |    10 +-
 external/mpl/bind/dist/lib/isc/result.c                                              |     6 +-
 external/mpl/bind/dist/lib/isc/rwlock.c                                              |     4 +-
 external/mpl/bind/dist/lib/isc/safe.c                                                |     4 +-
 external/mpl/bind/dist/lib/isc/serial.c                                              |     4 +-
 external/mpl/bind/dist/lib/isc/siphash.c                                             |   159 +-
 external/mpl/bind/dist/lib/isc/sockaddr.c                                            |    15 +-
 external/mpl/bind/dist/lib/isc/stats.c                                               |     4 +-
 external/mpl/bind/dist/lib/isc/string.c                                              |     4 +-
 external/mpl/bind/dist/lib/isc/symtab.c                                              |     4 +-
 external/mpl/bind/dist/lib/isc/task.c                                                |     4 +-
 external/mpl/bind/dist/lib/isc/task_p.h                                              |     4 +-
 external/mpl/bind/dist/lib/isc/taskpool.c                                            |     4 +-
 external/mpl/bind/dist/lib/isc/tests/aes_test.c                                      |     4 +-
 external/mpl/bind/dist/lib/isc/tests/buffer_test.c                                   |     4 +-
 external/mpl/bind/dist/lib/isc/tests/counter_test.c                                  |     4 +-
 external/mpl/bind/dist/lib/isc/tests/crc64_test.c                                    |     4 +-
 external/mpl/bind/dist/lib/isc/tests/errno_test.c                                    |     4 +-
 external/mpl/bind/dist/lib/isc/tests/file_test.c                                     |     4 +-
 external/mpl/bind/dist/lib/isc/tests/hash_test.c                                     |     4 +-
 external/mpl/bind/dist/lib/isc/tests/heap_test.c                                     |     6 +-
 external/mpl/bind/dist/lib/isc/tests/hmac_test.c                                     |     4 +-
 external/mpl/bind/dist/lib/isc/tests/ht_test.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/tests/isctest.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/tests/isctest.h                                       |     4 +-
 external/mpl/bind/dist/lib/isc/tests/lex_test.c                                      |     4 +-
 external/mpl/bind/dist/lib/isc/tests/md_test.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/tests/mem_test.c                                      |     4 +-
 external/mpl/bind/dist/lib/isc/tests/netaddr_test.c                                  |     4 +-
 external/mpl/bind/dist/lib/isc/tests/parse_test.c                                    |     4 +-
 external/mpl/bind/dist/lib/isc/tests/pool_test.c                                     |     4 +-
 external/mpl/bind/dist/lib/isc/tests/quota_test.c                                    |    50 +-
 external/mpl/bind/dist/lib/isc/tests/radix_test.c                                    |     6 +-
 external/mpl/bind/dist/lib/isc/tests/random_test.c                                   |     4 +-
 external/mpl/bind/dist/lib/isc/tests/regex_test.c                                    |  2374 ++++++++++
 external/mpl/bind/dist/lib/isc/tests/result_test.c                                   |     4 +-
 external/mpl/bind/dist/lib/isc/tests/safe_test.c                                     |     4 +-
 external/mpl/bind/dist/lib/isc/tests/siphash_test.c                                  |   800 +--
 external/mpl/bind/dist/lib/isc/tests/sockaddr_test.c                                 |     4 +-
 external/mpl/bind/dist/lib/isc/tests/socket_test.c                                   |     4 +-
 external/mpl/bind/dist/lib/isc/tests/symtab_test.c                                   |     4 +-
 external/mpl/bind/dist/lib/isc/tests/task_test.c                                     |    55 +-
 external/mpl/bind/dist/lib/isc/tests/taskpool_test.c                                 |     4 +-
 external/mpl/bind/dist/lib/isc/tests/tcp_quota_test.c                                |     2 +-
 external/mpl/bind/dist/lib/isc/tests/tcp_test.c                                      |     2 +-
 external/mpl/bind/dist/lib/isc/tests/tcpdns_test.c                                   |     2 +-
 external/mpl/bind/dist/lib/isc/tests/time_test.c                                     |    79 +-
 external/mpl/bind/dist/lib/isc/tests/timer_test.c                                    |     4 +-
 external/mpl/bind/dist/lib/isc/tests/udp_test.c                                      |     2 +-
 external/mpl/bind/dist/lib/isc/tests/uv_wrap.h                                       |     2 +-
 external/mpl/bind/dist/lib/isc/timer.c                                               |     4 +-
 external/mpl/bind/dist/lib/isc/timer_p.h                                             |     4 +-
 external/mpl/bind/dist/lib/isc/tm.c                                                  |     4 +-
 external/mpl/bind/dist/lib/isc/unix/dir.c                                            |     4 +-
 external/mpl/bind/dist/lib/isc/unix/errno.c                                          |     4 +-
 external/mpl/bind/dist/lib/isc/unix/errno2result.c                                   |     4 +-
 external/mpl/bind/dist/lib/isc/unix/errno2result.h                                   |     4 +-
 external/mpl/bind/dist/lib/isc/unix/file.c                                           |     4 +-
 external/mpl/bind/dist/lib/isc/unix/fsaccess.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/unix/ifiter_getifaddrs.c                              |     4 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/align.h                              |     4 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/dir.h                                |     4 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/net.h                                |     4 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/netdb.h                              |     4 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/offset.h                             |     4 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/stat.h                               |     4 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/stdatomic.h                          |    55 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/stdtime.h                            |     4 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/syslog.h                             |     4 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/time.h                               |    32 +-
 external/mpl/bind/dist/lib/isc/unix/interfaceiter.c                                  |     4 +-
 external/mpl/bind/dist/lib/isc/unix/meminfo.c                                        |    13 +-
 external/mpl/bind/dist/lib/isc/unix/net.c                                            |     4 +-
 external/mpl/bind/dist/lib/isc/unix/os.c                                             |     4 +-
 external/mpl/bind/dist/lib/isc/unix/pk11_api.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/unix/resource.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/unix/socket.c                                         |   134 +-
 external/mpl/bind/dist/lib/isc/unix/socket_p.h                                       |     4 +-
 external/mpl/bind/dist/lib/isc/unix/stdio.c                                          |     4 +-
 external/mpl/bind/dist/lib/isc/unix/stdtime.c                                        |     4 +-
 external/mpl/bind/dist/lib/isc/unix/syslog.c                                         |     4 +-
 external/mpl/bind/dist/lib/isc/unix/time.c                                           |    45 +-
 external/mpl/bind/dist/lib/isc/utf8.c                                                |     2 +-
 external/mpl/bind/dist/lib/isc/version.c                                             |     8 +-
 external/mpl/bind/dist/lib/isc/win32/DLLMain.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/win32/condition.c                                     |     4 +-
 external/mpl/bind/dist/lib/isc/win32/dir.c                                           |     4 +-
 external/mpl/bind/dist/lib/isc/win32/errno.c                                         |     4 +-
 external/mpl/bind/dist/lib/isc/win32/errno2result.c                                  |     4 +-
 external/mpl/bind/dist/lib/isc/win32/errno2result.h                                  |     4 +-
 external/mpl/bind/dist/lib/isc/win32/file.c                                          |     4 +-
 external/mpl/bind/dist/lib/isc/win32/fsaccess.c                                      |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/align.h                             |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/bind_registry.h                     |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/bindevt.h                           |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/condition.h                         |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/dir.h                               |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/ipv6.h                              |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/mutex.h                             |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/net.h                               |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/netdb.h                             |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/ntgroups.h                          |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/ntpaths.h                           |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/offset.h                            |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/once.h                              |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/stat.h                              |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/stdatomic.h                         |   244 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/stdtime.h                           |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/syslog.h                            |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/thread.h                            |     4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/time.h                              |    32 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/win32os.h                           |     4 +-
 external/mpl/bind/dist/lib/isc/win32/interfaceiter.c                                 |     4 +-
 external/mpl/bind/dist/lib/isc/win32/ipv6.c                                          |     4 +-
 external/mpl/bind/dist/lib/isc/win32/libgen.h                                        |     4 +-
 external/mpl/bind/dist/lib/isc/win32/meminfo.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/win32/net.c                                           |     4 +-
 external/mpl/bind/dist/lib/isc/win32/netdb.h                                         |     4 +-
 external/mpl/bind/dist/lib/isc/win32/ntgroups.c                                      |     4 +-
 external/mpl/bind/dist/lib/isc/win32/ntpaths.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/win32/once.c                                          |     4 +-
 external/mpl/bind/dist/lib/isc/win32/os.c                                            |     4 +-
 external/mpl/bind/dist/lib/isc/win32/pk11_api.c                                      |     4 +-
 external/mpl/bind/dist/lib/isc/win32/resource.c                                      |     4 +-
 external/mpl/bind/dist/lib/isc/win32/socket.c                                        |    25 +-
 external/mpl/bind/dist/lib/isc/win32/stdio.c                                         |     4 +-
 external/mpl/bind/dist/lib/isc/win32/stdtime.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/win32/syslog.c                                        |     4 +-
 external/mpl/bind/dist/lib/isc/win32/syslog.h                                        |     4 +-
 external/mpl/bind/dist/lib/isc/win32/thread.c                                        |     4 +-
 external/mpl/bind/dist/lib/isc/win32/time.c                                          |    62 +-
 external/mpl/bind/dist/lib/isc/win32/unistd.h                                        |     4 +-
 external/mpl/bind/dist/lib/isc/win32/version.c                                       |     8 +-
 external/mpl/bind/dist/lib/isc/win32/win32os.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/xoshiro128starstar.c                                  |     4 +-
 external/mpl/bind/dist/lib/isccc/alist.c                                             |     4 +-
 external/mpl/bind/dist/lib/isccc/api                                                 |    15 -
 external/mpl/bind/dist/lib/isccc/base64.c                                            |     4 +-
 external/mpl/bind/dist/lib/isccc/cc.c                                                |     4 +-
 external/mpl/bind/dist/lib/isccc/ccmsg.c                                             |     4 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/alist.h                               |     4 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/base64.h                              |     4 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/cc.h                                  |     4 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/ccmsg.h                               |     4 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/events.h                              |     4 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/result.h                              |     4 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/sexpr.h                               |     4 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/symtab.h                              |     4 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/symtype.h                             |     4 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/types.h                               |     4 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/util.h                                |     4 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/version.h                             |     8 +-
 external/mpl/bind/dist/lib/isccc/result.c                                            |     4 +-
 external/mpl/bind/dist/lib/isccc/sexpr.c                                             |     4 +-
 external/mpl/bind/dist/lib/isccc/symtab.c                                            |     4 +-
 external/mpl/bind/dist/lib/isccc/tests/result_test.c                                 |     4 +-
 external/mpl/bind/dist/lib/isccc/version.c                                           |     8 +-
 external/mpl/bind/dist/lib/isccc/win32/DLLMain.c                                     |     4 +-
 external/mpl/bind/dist/lib/isccc/win32/version.c                                     |     8 +-
 external/mpl/bind/dist/lib/isccfg/aclconf.c                                          |     5 +-
 external/mpl/bind/dist/lib/isccfg/api                                                |    15 -
 external/mpl/bind/dist/lib/isccfg/dnsconf.c                                          |     4 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/aclconf.h                           |     8 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/cfg.h                               |     4 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/dnsconf.h                           |     4 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/grammar.h                           |     4 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/kaspconf.h                          |    21 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/log.h                               |     4 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/namedconf.h                         |     4 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/version.h                           |     8 +-
 external/mpl/bind/dist/lib/isccfg/kaspconf.c                                         |   143 +-
 external/mpl/bind/dist/lib/isccfg/log.c                                              |     4 +-
 external/mpl/bind/dist/lib/isccfg/namedconf.c                                        |   143 +-
 external/mpl/bind/dist/lib/isccfg/parser.c                                           |     4 +-
 external/mpl/bind/dist/lib/isccfg/tests/duration_test.c                              |     4 +-
 external/mpl/bind/dist/lib/isccfg/tests/parser_test.c                                |     4 +-
 external/mpl/bind/dist/lib/isccfg/version.c                                          |     8 +-
 external/mpl/bind/dist/lib/isccfg/win32/DLLMain.c                                    |     4 +-
 external/mpl/bind/dist/lib/isccfg/win32/version.c                                    |     8 +-
 external/mpl/bind/dist/lib/ns/Makefile.in                                            |     7 +-
 external/mpl/bind/dist/lib/ns/api                                                    |    15 -
 external/mpl/bind/dist/lib/ns/client.c                                               |   148 +-
 external/mpl/bind/dist/lib/ns/hooks.c                                                |     4 +-
 external/mpl/bind/dist/lib/ns/include/ns/client.h                                    |    32 +-
 external/mpl/bind/dist/lib/ns/include/ns/hooks.h                                     |     4 +-
 external/mpl/bind/dist/lib/ns/include/ns/interfacemgr.h                              |     4 +-
 external/mpl/bind/dist/lib/ns/include/ns/lib.h                                       |     4 +-
 external/mpl/bind/dist/lib/ns/include/ns/listenlist.h                                |     4 +-
 external/mpl/bind/dist/lib/ns/include/ns/log.h                                       |     4 +-
 external/mpl/bind/dist/lib/ns/include/ns/notify.h                                    |     6 +-
 external/mpl/bind/dist/lib/ns/include/ns/query.h                                     |    36 +-
 external/mpl/bind/dist/lib/ns/include/ns/server.h                                    |     4 +-
 external/mpl/bind/dist/lib/ns/include/ns/sortlist.h                                  |     4 +-
 external/mpl/bind/dist/lib/ns/include/ns/stats.h                                     |   143 +-
 external/mpl/bind/dist/lib/ns/include/ns/types.h                                     |     4 +-
 external/mpl/bind/dist/lib/ns/include/ns/update.h                                    |     7 +-
 external/mpl/bind/dist/lib/ns/include/ns/version.h                                   |     8 +-
 external/mpl/bind/dist/lib/ns/include/ns/xfrout.h                                    |     4 +-
 external/mpl/bind/dist/lib/ns/interfacemgr.c                                         |     8 +-
 external/mpl/bind/dist/lib/ns/lib.c                                                  |     4 +-
 external/mpl/bind/dist/lib/ns/listenlist.c                                           |     4 +-
 external/mpl/bind/dist/lib/ns/log.c                                                  |     4 +-
 external/mpl/bind/dist/lib/ns/notify.c                                               |    15 +-
 external/mpl/bind/dist/lib/ns/query.c                                                |   687 ++-
 external/mpl/bind/dist/lib/ns/server.c                                               |     6 +-
 external/mpl/bind/dist/lib/ns/sortlist.c                                             |     4 +-
 external/mpl/bind/dist/lib/ns/stats.c                                                |     4 +-
 external/mpl/bind/dist/lib/ns/tests/listenlist_test.c                                |     4 +-
 external/mpl/bind/dist/lib/ns/tests/notify_test.c                                    |    22 +-
 external/mpl/bind/dist/lib/ns/tests/nstest.c                                         |    84 +-
 external/mpl/bind/dist/lib/ns/tests/nstest.h                                         |     4 +-
 external/mpl/bind/dist/lib/ns/tests/plugin_test.c                                    |     4 +-
 external/mpl/bind/dist/lib/ns/tests/query_test.c                                     |     4 +-
 external/mpl/bind/dist/lib/ns/tests/wrap.c                                           |    42 -
 external/mpl/bind/dist/lib/ns/update.c                                               |    44 +-
 external/mpl/bind/dist/lib/ns/version.c                                              |     8 +-
 external/mpl/bind/dist/lib/ns/win32/DLLMain.c                                        |     4 +-
 external/mpl/bind/dist/lib/ns/win32/version.c                                        |     8 +-
 external/mpl/bind/dist/lib/ns/xfrout.c                                               |   124 +-
 external/mpl/bind/dist/lib/samples/nsprobe.c                                         |    23 +-
 external/mpl/bind/dist/lib/samples/resolve.c                                         |     4 +-
 external/mpl/bind/dist/lib/samples/sample-async.c                                    |     4 +-
 external/mpl/bind/dist/lib/samples/sample-gai.c                                      |     4 +-
 external/mpl/bind/dist/lib/samples/sample-request.c                                  |    21 +-
 external/mpl/bind/dist/lib/samples/sample-update.c                                   |     4 +-
 external/mpl/bind/dist/lib/win32/bindevt/bindevt.c                                   |     4 +-
 external/mpl/bind/include/config.h                                                   |    19 +-
 external/mpl/bind/include/dns/code.h                                                 |     7 +-
 external/mpl/bind/include/dns/enumclass.h                                            |     2 +-
 external/mpl/bind/include/dns/enumtype.h                                             |     2 +-
 external/mpl/bind/include/dns/rdatastruct.h                                          |   334 +-
 external/mpl/bind/include/irs/netdb.h                                                |     2 +-
 external/mpl/bind/include/irs/platform.h                                             |     2 +-
 external/mpl/bind/include/isc/atomic.h                                               |     6 +-
 external/mpl/bind/include/isc/platform.h                                             |     2 +-
 external/mpl/bind/include/isc/stdatomic.h                                            |    55 +-
 external/mpl/bind/lib/libbind9/Makefile                                              |     3 +-
 external/mpl/bind/lib/libbind9/shlib_version                                         |     4 +-
 external/mpl/bind/lib/libdns/Makefile                                                |     3 +-
 external/mpl/bind/lib/libdns/shlib_version                                           |     4 +-
 external/mpl/bind/lib/libirs/Makefile                                                |     3 +-
 external/mpl/bind/lib/libirs/shlib_version                                           |     4 +-
 external/mpl/bind/lib/libisc/Makefile                                                |     5 +-
 external/mpl/bind/lib/libisc/shlib_version                                           |     4 +-
 external/mpl/bind/lib/libisccc/Makefile                                              |     3 +-
 external/mpl/bind/lib/libisccc/shlib_version                                         |     4 +-
 external/mpl/bind/lib/libisccfg/Makefile                                             |     3 +-
 external/mpl/bind/lib/libisccfg/shlib_version                                        |     4 +-
 external/mpl/bind/lib/libns/Makefile                                                 |     3 +-
 external/mpl/bind/lib/libns/shlib_version                                            |     4 +-
 1025 files changed, 19639 insertions(+), 9954 deletions(-)

diffs (truncated from 56459 to 300 lines):

diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/Makefile.inc
--- a/external/mpl/bind/Makefile.inc    Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/Makefile.inc    Fri Feb 19 16:42:08 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.9 2020/06/15 01:57:31 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.10 2021/02/19 16:42:08 christos Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -124,8 +124,8 @@
 .endif
 .endif
 .if !defined (LIB) || empty(LIB)
-LDADD+= -lcrypto -lcrypt
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+= -lssl -lcrypto -lcrypt
+DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBCRYPT}
 .else
 LIBDPLIBS+=    crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
 .endif
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/bin/named/Makefile
--- a/external/mpl/bind/bin/named/Makefile      Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/bin/named/Makefile      Fri Feb 19 16:42:08 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2020/08/03 17:23:35 christos Exp $
+#      $NetBSD: Makefile,v 1.5 2021/02/19 16:42:08 christos Exp $
 
 LDADD+=-lns
 DPADD+=${LIBNS}
@@ -11,6 +11,7 @@
 
 DIST=${IDIST}/bin/named
 CPPFLAGS+=-I${DIST}/include -I${DIST}/unix/include -DCONFIGARGS=\"defaults\"
+CPPFLAGS+=-I${LIBUVDIR}/dist/include
 CPPFLAGS+=-DNO_VERSION_DATE -DPRODUCT=\"BIND\" -DSRCID=\"${SRCID}\"
 CPPFLAGS+=-DDESCRIPTION=\"\(Extended\ Support\ Version\)\"
 CPPFLAGS+=-DBUILDER=\"make\"   # I am tempted to say Bob
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/Makefile.in
--- a/external/mpl/bind/dist/Makefile.in        Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/Makefile.in        Fri Feb 19 16:42:08 2021 +0000
@@ -12,6 +12,9 @@
 top_srcdir =   @top_srcdir@
 top_builddir =  @top_builddir@
 
+PANDOC = @PANDOC@
+W3M = @W3M@
+
 VERSION=@BIND9_VERSION@
 
 SUBDIRS =      make lib fuzz bin doc
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/check/check-tool.c
--- a/external/mpl/bind/dist/bin/check/check-tool.c     Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/check/check-tool.c     Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: check-tool.c,v 1.5 2020/05/24 19:46:10 christos Exp $  */
+/*     $NetBSD: check-tool.c,v 1.6 2021/02/19 16:42:09 christos Exp $  */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/check/check-tool.h
--- a/external/mpl/bind/dist/bin/check/check-tool.h     Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/check/check-tool.h     Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: check-tool.h,v 1.4 2020/05/24 19:46:10 christos Exp $  */
+/*     $NetBSD: check-tool.h,v 1.5 2021/02/19 16:42:09 christos Exp $  */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/check/named-checkconf.c
--- a/external/mpl/bind/dist/bin/check/named-checkconf.c        Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/check/named-checkconf.c        Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: named-checkconf.c,v 1.5 2020/05/24 19:46:10 christos Exp $     */
+/*     $NetBSD: named-checkconf.c,v 1.6 2021/02/19 16:42:09 christos Exp $     */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
@@ -186,7 +186,7 @@
        const char *zname;
        const char *zfile = NULL;
        const cfg_obj_t *maps[4];
-       const cfg_obj_t *mastersobj = NULL;
+       const cfg_obj_t *primariesobj = NULL;
        const cfg_obj_t *inviewobj = NULL;
        const cfg_obj_t *zoptions = NULL;
        const cfg_obj_t *classobj = NULL;
@@ -280,8 +280,12 @@
         * Is the redirect zone configured as a slave?
         */
        if (strcasecmp(cfg_obj_asstring(typeobj), "redirect") == 0) {
-               cfg_map_get(zoptions, "masters", &mastersobj);
-               if (mastersobj != NULL) {
+               cfg_map_get(zoptions, "primaries", &primariesobj);
+               if (primariesobj == NULL) {
+                       cfg_map_get(zoptions, "masters", &primariesobj);
+               }
+
+               if (primariesobj != NULL) {
                        return (ISC_R_SUCCESS);
                }
        }
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/check/named-checkzone.c
--- a/external/mpl/bind/dist/bin/check/named-checkzone.c        Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/check/named-checkzone.c        Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: named-checkzone.c,v 1.5 2020/08/03 17:23:36 christos Exp $     */
+/*     $NetBSD: named-checkzone.c,v 1.6 2021/02/19 16:42:09 christos Exp $     */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/confgen/ddns-confgen.c
--- a/external/mpl/bind/dist/bin/confgen/ddns-confgen.c Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/confgen/ddns-confgen.c Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: ddns-confgen.c,v 1.4 2020/05/24 19:46:11 christos Exp $        */
+/*     $NetBSD: ddns-confgen.c,v 1.5 2021/02/19 16:42:09 christos Exp $        */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/confgen/include/confgen/os.h
--- a/external/mpl/bind/dist/bin/confgen/include/confgen/os.h   Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/confgen/include/confgen/os.h   Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: os.h,v 1.3 2020/05/24 19:46:11 christos Exp $  */
+/*     $NetBSD: os.h,v 1.4 2021/02/19 16:42:09 christos Exp $  */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/confgen/keygen.c
--- a/external/mpl/bind/dist/bin/confgen/keygen.c       Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/confgen/keygen.c       Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: keygen.c,v 1.4 2020/05/24 19:46:11 christos Exp $      */
+/*     $NetBSD: keygen.c,v 1.5 2021/02/19 16:42:09 christos Exp $      */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/confgen/keygen.h
--- a/external/mpl/bind/dist/bin/confgen/keygen.h       Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/confgen/keygen.h       Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: keygen.h,v 1.4 2020/05/24 19:46:11 christos Exp $      */
+/*     $NetBSD: keygen.h,v 1.5 2021/02/19 16:42:09 christos Exp $      */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/confgen/rndc-confgen.c
--- a/external/mpl/bind/dist/bin/confgen/rndc-confgen.c Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/confgen/rndc-confgen.c Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: rndc-confgen.c,v 1.4 2020/05/24 19:46:11 christos Exp $        */
+/*     $NetBSD: rndc-confgen.c,v 1.5 2021/02/19 16:42:09 christos Exp $        */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/confgen/unix/os.c
--- a/external/mpl/bind/dist/bin/confgen/unix/os.c      Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/confgen/unix/os.c      Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: os.c,v 1.3 2020/05/24 19:46:11 christos Exp $  */
+/*     $NetBSD: os.c,v 1.4 2021/02/19 16:42:09 christos Exp $  */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/confgen/util.c
--- a/external/mpl/bind/dist/bin/confgen/util.c Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/confgen/util.c Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: util.c,v 1.4 2020/05/24 19:46:11 christos Exp $        */
+/*     $NetBSD: util.c,v 1.5 2021/02/19 16:42:09 christos Exp $        */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/confgen/util.h
--- a/external/mpl/bind/dist/bin/confgen/util.h Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/confgen/util.h Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: util.h,v 1.3 2020/05/24 19:46:11 christos Exp $        */
+/*     $NetBSD: util.h,v 1.4 2021/02/19 16:42:09 christos Exp $        */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/confgen/win32/os.c
--- a/external/mpl/bind/dist/bin/confgen/win32/os.c     Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/confgen/win32/os.c     Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: os.c,v 1.3 2020/05/24 19:46:11 christos Exp $  */
+/*     $NetBSD: os.c,v 1.4 2021/02/19 16:42:09 christos Exp $  */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff -r 33e09b43f3b6 -r 06a353a2af1e external/mpl/bind/dist/bin/delv/delv.c
--- a/external/mpl/bind/dist/bin/delv/delv.c    Fri Feb 19 16:37:01 2021 +0000
+++ b/external/mpl/bind/dist/bin/delv/delv.c    Fri Feb 19 16:42:08 2021 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: delv.c,v 1.7 2020/08/03 17:23:36 christos Exp $        */



Home | Main Index | Thread Index | Old Index