Source-Changes-HG archive

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

[src/trunk]: src/external/bsd/bind merge conflicts



details:   https://anonhg.NetBSD.org/src/rev/ed1a9541d7fc
branches:  trunk
changeset: 815574:ed1a9541d7fc
user:      christos <christos%NetBSD.org@localhost>
date:      Thu May 26 16:49:55 2016 +0000

description:
merge conflicts

diffstat:

 external/bsd/bind/bind2netbsd                                              |      4 +-
 external/bsd/bind/dist/CHANGES                                             |    378 +-
 external/bsd/bind/dist/Makefile.in                                         |      7 +-
 external/bsd/bind/dist/README                                              |     36 +-
 external/bsd/bind/dist/acconfig.h                                          |      7 +-
 external/bsd/bind/dist/bin/check/named-checkconf.8                         |     94 +-
 external/bsd/bind/dist/bin/check/named-checkconf.c                         |     48 +-
 external/bsd/bind/dist/bin/check/named-checkzone.8                         |    184 +-
 external/bsd/bind/dist/bin/check/named-checkzone.c                         |      4 +-
 external/bsd/bind/dist/bin/confgen/ddns-confgen.8                          |    108 +-
 external/bsd/bind/dist/bin/confgen/rndc-confgen.8                          |    126 +-
 external/bsd/bind/dist/bin/delv/delv.c                                     |      9 +-
 external/bsd/bind/dist/bin/dig/dig.1                                       |    379 +-
 external/bsd/bind/dist/bin/dig/dig.c                                       |     51 +-
 external/bsd/bind/dist/bin/dig/dighost.c                                   |    141 +-
 external/bsd/bind/dist/bin/dig/host.1                                      |    134 +-
 external/bsd/bind/dist/bin/dig/nslookup.1                                  |    131 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.8                       |    112 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-importkey.8                       |     92 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8                    |    206 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-keygen.8                          |    246 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-revoke.8                          |     66 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-revoke.c                          |      5 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-settime.8                         |    106 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-settime.c                         |      5 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-signzone.8                        |    294 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c                        |     18 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-verify.8                          |     82 +-
 external/bsd/bind/dist/bin/named/bind9.xsl.h                               |      4 +-
 external/bsd/bind/dist/bin/named/client.c                                  |     38 +-
 external/bsd/bind/dist/bin/named/config.c                                  |      8 +-
 external/bsd/bind/dist/bin/named/control.c                                 |    111 +-
 external/bsd/bind/dist/bin/named/controlconf.c                             |      8 +-
 external/bsd/bind/dist/bin/named/include/named/log.h                       |      6 +-
 external/bsd/bind/dist/bin/named/include/named/query.h                     |      5 +-
 external/bsd/bind/dist/bin/named/include/named/server.h                    |     47 +-
 external/bsd/bind/dist/bin/named/lwdgrbn.c                                 |      6 +-
 external/bsd/bind/dist/bin/named/lwresd.8                                  |    152 +-
 external/bsd/bind/dist/bin/named/main.c                                    |     34 +-
 external/bsd/bind/dist/bin/named/named.8                                   |    233 +-
 external/bsd/bind/dist/bin/named/named.conf.5                              |    252 +-
 external/bsd/bind/dist/bin/named/named.conf.docbook                        |    146 +-
 external/bsd/bind/dist/bin/named/named.conf.html                           |     91 +-
 external/bsd/bind/dist/bin/named/query.c                                   |    174 +-
 external/bsd/bind/dist/bin/named/server.c                                  |    407 +-
 external/bsd/bind/dist/bin/named/statschannel.c                            |     10 +-
 external/bsd/bind/dist/bin/named/unix/include/named/os.h                   |      9 +-
 external/bsd/bind/dist/bin/named/unix/os.c                                 |     39 +-
 external/bsd/bind/dist/bin/named/win32/include/named/os.h                  |      9 +-
 external/bsd/bind/dist/bin/named/win32/os.c                                |     81 +-
 external/bsd/bind/dist/bin/named/xfrout.c                                  |     16 +-
 external/bsd/bind/dist/bin/named/zoneconf.c                                |      9 +-
 external/bsd/bind/dist/bin/nsupdate/nsupdate.1                             |    288 +-
 external/bsd/bind/dist/bin/nsupdate/nsupdate.c                             |     34 +-
 external/bsd/bind/dist/bin/pkcs11/openssl-0.9.8ze-patch                    |  15909 ----------
 external/bsd/bind/dist/bin/pkcs11/openssl-1.0.0q-patch                     |  15889 ---------
 external/bsd/bind/dist/bin/pkcs11/openssl-1.0.1l-patch                     |  15784 ---------
 external/bsd/bind/dist/bin/python/dnssec-checkds.8                         |     68 +-
 external/bsd/bind/dist/bin/python/dnssec-checkds.docbook                   |     73 +-
 external/bsd/bind/dist/bin/rndc/rndc.8                                     |    269 +-
 external/bsd/bind/dist/bin/rndc/rndc.conf.5                                |    133 +-
 external/bsd/bind/dist/bin/tests/atomic/t_atomic.c                         |    177 +-
 external/bsd/bind/dist/bin/tests/db_test.c                                 |      7 +-
 external/bsd/bind/dist/bin/tests/nsecify.c                                 |      8 +-
 external/bsd/bind/dist/bin/tests/rbt_test.c                                |      4 +-
 external/bsd/bind/dist/bin/tests/system/delv/clean.sh                      |     19 -
 external/bsd/bind/dist/bin/tests/system/delv/ns1/named.conf                |     37 -
 external/bsd/bind/dist/bin/tests/system/delv/ns1/root.db                   |     29 -
 external/bsd/bind/dist/bin/tests/system/delv/ns2/example.db                |     39 -
 external/bsd/bind/dist/bin/tests/system/delv/ns2/named.conf                |     40 -
 external/bsd/bind/dist/bin/tests/system/delv/ns3/named.conf                |     36 -
 external/bsd/bind/dist/bin/tests/system/delv/tests.sh                      |     72 -
 external/bsd/bind/dist/bin/tests/system/dnssec/ns3/keyless.example.db.in   |     29 -
 external/bsd/bind/dist/bin/tests/wire_test.c                               |      4 +-
 external/bsd/bind/dist/bin/tools/arpaname.1                                |     42 +-
 external/bsd/bind/dist/bin/tools/genrandom.8                               |     46 +-
 external/bsd/bind/dist/bin/tools/isc-hmac-fixup.8                          |     54 +-
 external/bsd/bind/dist/bin/tools/named-journalprint.8                      |     56 +-
 external/bsd/bind/dist/bin/tools/nsec3hash.8                               |     50 +-
 external/bsd/bind/dist/bin/win32/BINDInstall/BINDInstallDlg.h              |      7 +-
 external/bsd/bind/dist/config.h.in                                         |      8 +-
 external/bsd/bind/dist/configure                                           |    292 +-
 external/bsd/bind/dist/configure.in                                        |    148 +-
 external/bsd/bind/dist/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c |     13 +-
 external/bsd/bind/dist/contrib/perftcpdns/perftcpdns.c                     |     11 +-
 external/bsd/bind/dist/contrib/query-loc-0.4.0/loc.c                       |     14 +-
 external/bsd/bind/dist/contrib/query-loc-0.4.0/loc.h                       |      5 +-
 external/bsd/bind/dist/contrib/sdb/ldap/zone2ldap.c                        |    123 +-
 external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html                            |   1310 +-
 external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html                            |   5436 +-
 external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html                            |     85 +-
 external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html                            |     43 +-
 external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html                            |    173 +-
 external/bsd/bind/dist/doc/arm/Bv9ARM.html                                 |    331 +-
 external/bsd/bind/dist/doc/arm/Bv9ARM.pdf                                  |    Bin 
 external/bsd/bind/dist/doc/arm/html-fixup.pl                               |     20 -
 external/bsd/bind/dist/doc/arm/latex-fixup.pl                              |     51 -
 external/bsd/bind/dist/doc/arm/man.arpaname.html                           |     24 +-
 external/bsd/bind/dist/doc/arm/man.ddns-confgen.html                       |     66 +-
 external/bsd/bind/dist/doc/arm/man.delv.html                               |    109 +-
 external/bsd/bind/dist/doc/arm/man.dig.html                                |    148 +-
 external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html                     |     40 +-
 external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html                    |     38 +-
 external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html                   |     46 +-
 external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html                   |     42 +-
 external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html                |     60 +-
 external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html                      |     66 +-
 external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html                      |     34 +-
 external/bsd/bind/dist/doc/arm/man.dnssec-settime.html                     |     58 +-
 external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html                    |    108 +-
 external/bsd/bind/dist/doc/arm/man.dnssec-verify.html                      |     38 +-
 external/bsd/bind/dist/doc/arm/man.genrandom.html                          |     30 +-
 external/bsd/bind/dist/doc/arm/man.host.html                               |     73 +-
 external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html                     |     32 +-
 external/bsd/bind/dist/doc/arm/man.named-checkconf.html                    |     50 +-
 external/bsd/bind/dist/doc/arm/man.named-checkzone.html                    |    168 +-
 external/bsd/bind/dist/doc/arm/man.named-journalprint.html                 |     40 +-
 external/bsd/bind/dist/doc/arm/man.named-rrchecker.html                    |     21 +-
 external/bsd/bind/dist/doc/arm/man.named.html                              |     89 +-
 external/bsd/bind/dist/doc/arm/man.nsec3hash.html                          |     30 +-
 external/bsd/bind/dist/doc/arm/man.nsupdate.html                           |    135 +-
 external/bsd/bind/dist/doc/arm/man.rndc-confgen.html                       |     92 +-
 external/bsd/bind/dist/doc/arm/man.rndc.conf.html                          |     52 +-
 external/bsd/bind/dist/doc/arm/man.rndc.html                               |    170 +-
 external/bsd/bind/dist/doc/misc/options                                    |     82 +-
 external/bsd/bind/dist/doc/xsl/isc-docbook-latex-mappings.xml              |     37 -
 external/bsd/bind/dist/doc/xsl/isc-docbook-latex.xsl.in                    |    205 -
 external/bsd/bind/dist/doc/xsl/isc-notes-latex.xsl.in                      |    104 -
 external/bsd/bind/dist/isc-config.sh.1                                     |     76 +-
 external/bsd/bind/dist/lib/bind9/check.c                                   |     36 +-
 external/bsd/bind/dist/lib/dns/acache.c                                    |     12 +-
 external/bsd/bind/dist/lib/dns/api                                         |      8 +-
 external/bsd/bind/dist/lib/dns/cache.c                                     |     21 +-
 external/bsd/bind/dist/lib/dns/client.c                                    |     10 +-
 external/bsd/bind/dist/lib/dns/db.c                                        |      8 +-
 external/bsd/bind/dist/lib/dns/dst_api.c                                   |     17 +-
 external/bsd/bind/dist/lib/dns/dst_openssl.h                               |      4 +-
 external/bsd/bind/dist/lib/dns/forward.c                                   |      7 +-
 external/bsd/bind/dist/lib/dns/gen.c                                       |     10 +-
 external/bsd/bind/dist/lib/dns/include/dns/db.h                            |     10 +-
 external/bsd/bind/dist/lib/dns/include/dns/dbiterator.h                    |      8 +-
 external/bsd/bind/dist/lib/dns/include/dns/forward.h                       |      7 +-
 external/bsd/bind/dist/lib/dns/include/dns/message.h                       |     13 +-
 external/bsd/bind/dist/lib/dns/include/dns/name.h                          |     16 +-
 external/bsd/bind/dist/lib/dns/include/dns/rbt.h                           |     64 +-
 external/bsd/bind/dist/lib/dns/include/dns/view.h                          |     10 +-
 external/bsd/bind/dist/lib/dns/journal.c                                   |     11 +-
 external/bsd/bind/dist/lib/dns/master.c                                    |     59 +-
 external/bsd/bind/dist/lib/dns/message.c                                   |    102 +-
 external/bsd/bind/dist/lib/dns/name.c                                      |    231 +-
 external/bsd/bind/dist/lib/dns/openssl_link.c                              |     25 +-
 external/bsd/bind/dist/lib/dns/openssldh_link.c                            |      8 +-
 external/bsd/bind/dist/lib/dns/openssldsa_link.c                           |      8 +-
 external/bsd/bind/dist/lib/dns/opensslrsa_link.c                           |      7 +-
 external/bsd/bind/dist/lib/dns/rbt.c                                       |    457 +-
 external/bsd/bind/dist/lib/dns/rbtdb.c                                     |    212 +-
 external/bsd/bind/dist/lib/dns/rcode.c                                     |     12 +-
 external/bsd/bind/dist/lib/dns/rdata.c                                     |    237 +-
 external/bsd/bind/dist/lib/dns/rdata/any_255/tsig_250.c                    |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/ch_3/a_1.c                            |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/afsdb_18.c                    |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/cname_5.c                     |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/dlv_32769.c                   |    207 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/dlv_32769.h                   |     14 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/dname_39.c                    |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/dnskey_48.c                   |    243 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/dnskey_48.h                   |     20 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/ds_43.c                       |     81 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/hip_55.c                      |      6 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/ipseckey_45.c                 |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/key_25.c                      |    155 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/key_25.h                      |     20 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/mb_7.c                        |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/md_3.c                        |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/mf_4.c                        |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/mg_8.c                        |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/minfo_14.c                    |      6 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/mr_9.c                        |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/mx_15.c                       |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/ns_2.c                        |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/nsec3_50.c                    |    136 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/nsec_47.c                     |    130 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/nxt_30.c                      |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/opt_41.c                      |     30 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/ptr_12.c                      |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/rp_17.c                       |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/rrsig_46.c                    |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/rt_21.c                       |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/sig_24.c                      |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/soa_6.c                       |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/spf_99.c                      |     97 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/tkey_249.c                    |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/txt_16.c                      |    141 +-
 external/bsd/bind/dist/lib/dns/rdata/in_1/a6_38.c                          |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/in_1/kx_36.c                          |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/in_1/nsap-ptr_23.c                    |      5 +-
 external/bsd/bind/dist/lib/dns/rdata/in_1/px_26.c                          |      7 +-
 external/bsd/bind/dist/lib/dns/rdata/in_1/srv_33.c                         |      5 +-
 external/bsd/bind/dist/lib/dns/resolver.c                                  |    148 +-
 external/bsd/bind/dist/lib/dns/rootns.c                                    |      6 +-
 external/bsd/bind/dist/lib/dns/tests/Makefile.in                           |     10 +-
 external/bsd/bind/dist/lib/dns/tests/dnstest.h                             |      5 +-
 external/bsd/bind/dist/lib/dns/tests/rdata_test.c                          |    256 +-
 external/bsd/bind/dist/lib/dns/tkey.c                                      |     11 +-
 external/bsd/bind/dist/lib/dns/update.c                                    |     11 +-
 external/bsd/bind/dist/lib/dns/view.c                                      |     21 +-
 external/bsd/bind/dist/lib/dns/xfrin.c                                     |     21 +-
 external/bsd/bind/dist/lib/dns/zone.c                                      |     79 +-
 external/bsd/bind/dist/lib/irs/resconf.c                                   |      7 +-
 external/bsd/bind/dist/lib/isc/base32.c                                    |      6 +-
 external/bsd/bind/dist/lib/isc/base64.c                                    |      6 +-
 external/bsd/bind/dist/lib/isc/buffer.c                                    |      6 +-
 external/bsd/bind/dist/lib/isc/commandline.c                               |      4 +-
 external/bsd/bind/dist/lib/isc/hash.c                                      |    153 +-
 external/bsd/bind/dist/lib/isc/hex.c                                       |      6 +-
 external/bsd/bind/dist/lib/isc/httpd.c                                     |    100 +-
 external/bsd/bind/dist/lib/isc/include/isc/assertions.h                    |     12 +-
 external/bsd/bind/dist/lib/isc/include/isc/error.h                         |      6 +-
 external/bsd/bind/dist/lib/isc/include/isc/file.h                          |      8 +-
 external/bsd/bind/dist/lib/isc/include/isc/hash.h                          |     43 +-
 external/bsd/bind/dist/lib/isc/include/isc/magic.h                         |     10 +-
 external/bsd/bind/dist/lib/isc/include/isc/netaddr.h                       |     10 +-
 external/bsd/bind/dist/lib/isc/include/isc/result.h                        |      7 +-
 external/bsd/bind/dist/lib/isc/include/isc/sockaddr.h                      |     10 +-
 external/bsd/bind/dist/lib/isc/include/isc/socket.h                        |      8 +-
 external/bsd/bind/dist/lib/isc/include/isc/util.h                          |     15 +-
 external/bsd/bind/dist/lib/isc/md5.c                                       |      6 +-
 external/bsd/bind/dist/lib/isc/mem.c                                       |     62 +-
 external/bsd/bind/dist/lib/isc/netaddr.c                                   |     20 +-
 external/bsd/bind/dist/lib/isc/result.c                                    |      3 +-
 external/bsd/bind/dist/lib/isc/sockaddr.c                                  |     27 +-
 external/bsd/bind/dist/lib/isc/stats.c                                     |     86 +-
 external/bsd/bind/dist/lib/isc/string.c                                    |      8 +-
 external/bsd/bind/dist/lib/isc/task.c                                      |      6 +-
 external/bsd/bind/dist/lib/isc/unix/file.c                                 |     20 +-
 external/bsd/bind/dist/lib/isc/unix/net.c                                  |     32 +-
 external/bsd/bind/dist/lib/isc/unix/socket.c                               |     95 +-
 external/bsd/bind/dist/lib/isc/win32/file.c                                |     18 +-
 external/bsd/bind/dist/lib/isc/win32/include/isc/atomic.h                  |     16 +-
 external/bsd/bind/dist/lib/isc/win32/socket.c                              |     25 +-
 external/bsd/bind/dist/lib/isc/x86_32/include/isc/atomic.h                 |     28 +-
 external/bsd/bind/dist/lib/isc/x86_64/include/isc/atomic.h                 |     37 +-
 external/bsd/bind/dist/lib/isccc/cc.c                                      |     43 +-
 external/bsd/bind/dist/lib/isccc/sexpr.c                                   |     58 +-
 external/bsd/bind/dist/lib/isccfg/aclconf.c                                |     44 +-
 external/bsd/bind/dist/lib/isccfg/namedconf.c                              |    145 +-
 external/bsd/bind/dist/lib/isccfg/parser.c                                 |     11 +-
 external/bsd/bind/dist/lib/lwres/man/lwres.3                               |    128 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_buffer.3                        |    176 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_config.3                        |     75 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_context.3                       |    112 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_gabn.3                          |    117 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_gai_strerror.3                  |     54 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_getaddrinfo.3                   |    113 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_gethostent.3                    |    155 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_getipnode.3                     |    103 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_getnameinfo.3                   |     79 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_getrrsetbyname.3                |     77 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_gnba.3                          |    114 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_hstrerror.3                     |     54 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_inetntop.3                      |     54 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_noop.3                          |    114 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_packet.3                        |     99 +-
 external/bsd/bind/dist/lib/lwres/man/lwres_resutil.3                       |    104 +-
 external/bsd/bind/dist/make/rules.in                                       |      4 +-
 external/bsd/bind/dist/srcid                                               |      2 +-
 external/bsd/bind/dist/version                                             |      4 +-
 external/bsd/bind/include/config.h                                         |     10 +-
 external/bsd/bind/include/dns/code.h                                       |    152 +-
 external/bsd/bind/include/dns/enumtype.h                                   |     16 +
 external/bsd/bind/include/dns/rdatastruct.h                                |    310 +-
 external/bsd/bind/include/isc/atomic.h                                     |     11 +
 external/bsd/bind/include/isc/platform.h                                   |     12 +-
 273 files changed, 13476 insertions(+), 58193 deletions(-)

diffs (truncated from 97193 to 300 lines):

diff -r 4143692db84b -r ed1a9541d7fc external/bsd/bind/bind2netbsd
--- a/external/bsd/bind/bind2netbsd     Thu May 26 15:45:39 2016 +0000
+++ b/external/bsd/bind/bind2netbsd     Thu May 26 16:49:55 2016 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#      $NetBSD: bind2netbsd,v 1.3 2015/12/17 04:00:21 christos Exp $
+#      $NetBSD: bind2netbsd,v 1.4 2016/05/26 16:49:55 christos Exp $
 #
 # Copyright (c) 2000 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -38,7 +38,7 @@
 #      $ cd src/external/bsd/bind/dist
 #      $ cvs -d cvs.netbsd.org:/cvsroot import -m "Import bind 9.x.y" src/external/bsd/bind/dist ISC bind-9-x-y
 #      $ cd ../../../../../bind-9.x.y
-#      $ run ./configure
+#      $ run ./configure --enable-fetchlimit --enable-sit --enable-fixed-rrset --enable-querytrace
 #      $ run make
 #      - use the binclude4netbsd to create and import the new headers in
 #        /usr/src/external/bsd/bind/include
diff -r 4143692db84b -r ed1a9541d7fc external/bsd/bind/dist/CHANGES
--- a/external/bsd/bind/dist/CHANGES    Thu May 26 15:45:39 2016 +0000
+++ b/external/bsd/bind/dist/CHANGES    Thu May 26 16:49:55 2016 +0000
@@ -1,10 +1,99 @@
-
-       --- 9.10.3-P4 released ---
+       --- 9.10.4-P1 released ---
+
+4368.  [bug]           Fix a crash when calling "rndc stats" on some
+                       Windows builds because some Visual Studio compilers
+                       generated crashing code for the "%z" printf()
+                       format specifier. [RT #42380]
+
+4366.  [bug]           Address race condition when updating rbtnode bit
+                       fields. [RT #42379]
+
+4363.  [port]          win32: Disable explicit triggering UAC when running
+                       BINDInstall.
+
+       --- 9.10.4 released ---
+
+       --- 9.10.4rc1 released ---
+
+4347.  [port]          Corrected a build error on x86_64 Solaris. [RT #42150]
+
+4346.  [bug]           Fixed a regression introduced in change #4337 which
+                       caused signed domains with revoked KSKs to fail
+                       validation. [RT #42147]
+
+4345.  [contrib]       perftcpdns mishandled the return values from
+                       clock_nanosleep. [RT #42131]
+
+4344.  [port]          Address openssl version differences. [RT #42059]
+
+       --- 9.10.4b3 released ---
+
+4342.  [bug]           'rndc flushtree' could fail to clean the tree if there
+                       wasn't a node at the specified name. [RT #41846]
+
+4341.  [bug]           Correct the handling of ECS options with
+                       address family 0. [RT #41377]
+
+4338.  [bug]           Reimplement change 4324 as it wasn't properly doing
+                       all the required book keeping. [RT #41941]
+
+4337.  [bug]           The previous change exposed a latent flaw in
+                       key refresh queries for managed-keys when
+                       a cached DNSKEY had TTL 0. [RT #41986]
+
+4336.  [bug]           Don't emit records with zero ttl unless the records
+                       were learnt with a zero ttl. [RT #41687]
+
+4335.  [bug]           zone->view could be detached too early. [RT #41942]
+
+4333.  [maint]         L.ROOT-SERVERS.NET is now 199.7.83.42 and
+                       2001:500:9f::42.
+
+       --- 9.10.4b2 released ---
+
+4332.  [bug]           Windows SIT -> COOKIE configuration support was
+                       accidentally back ported to 9.10 breaking existing
+                       configurations. [RT #41905]
+
+4331.  [func]          When loading managed signed zones detect if the
+                       RRSIG's inception time is in the future and regenerate
+                       the RRSIG immediately. [RT #41808]
+
+4330.  [protocol]      Identify the PAD option as "PAD" when printing out
+                       a message.
+
+       --- 9.10.4b1 released ---
+
+4329.  [func]          Warn about a common misconfiguration when forwarding
+                       RFC 1918 zones. [RT #41441]
+
+4328.  [performance]   Add dns_name_fromwire() benchmark test. [RT #41694]
+
+4327.  [func]          Log query and depth counters during fetches when
+                       querytrace (./configure --enable-querytrace) is
+                       enabled (helps in diagnosing).  [RT #41787]
+
+4326.  [protocol]      Add support for AVC. [RT #41819]
+
+4324.  [bug]           When deleting records from a zone database, interior
+                       nodes could be left empty but not deleted, damaging
+                       search performance afterward. [RT #40997]
+
+4323.  [bug]           Improve HTTP header processing on statschannel.
+                       [RT #41674]
 
 4322.  [security]      Duplicate EDNS COOKIE options in a response could
                        trigger an assertion failure. (CVE-2016-2088)
                        [RT #41809]
 
+4321.  [bug]           Zones using mapped files containing out-of-zone data
+                       could return SERVFAIL instead of the expected NODATA
+                       or NXDOMAIN results. [RT #41596]
+
+4320.  [bug]           Insufficient memory allocation when handling
+                       "none" ACL could cause an assertion failure in
+                       named when parsing ACL configuration. [RT #41745]
+
 4319.  [security]      Fix resolver assertion failure due to improper
                        DNAME handling when parsing fetch reply messages.
                        (CVE-2016-1286) [RT #41753]
@@ -12,12 +101,85 @@
 4318.  [security]      Malformed control messages can trigger assertions
                        in named and rndc. (CVE-2016-1285) [RT #41666]
 
-       --- 9.10.3-P3 released ---
+4317.  [bug]           Age all unused servers on fetch timeout. [RT #41597]
+
+4315.  [bug]           Check that configured view class isn't a meta class.
+                       [RT #41572].
+
+4314.  [contrib]       Added 'dnsperf-2.1.0.0-1', a set of performance
+                       testing tools provided by Nominum, Inc.
+
+4313.  [bug]           Handle ns_client_replace failures in test mode.
+                       [RT #41190]
+
+4312.  [bug]           dig's unknown DNS and EDNS flags (MBZ value) logging
+                       was not consistent. [RT #41600]
+
+4311.  [bug]           Prevent "rndc delzone" from being used on
+                       response-policy zones. [RT #41593]
+
+4310.  [performance]   Use __builtin_expect() where available to annotate
+                       conditions with known behavior. [RT #41411]
+
+4308.  [func]          Added operating system details to "named -V"
+                       output. [RT #41452]
+
+4307.  [bug]           "dig +subnet" could send incorrectly-formatted
+                       Client Subnet options if the prefix length was
+                       not divisible by 8. [RT #45178]
+
+4306.  [maint]         Added a PKCS#11 openssl patch supporting
+                       version 1.0.2f [RT #38312]
+
+4305.  [bug]           dnssec-signzone was not removing unnecessary rrsigs
+                       from the zone's apex. [RT #41483]
+
+4304.  [port]          xfer system test failed as 'tail -n +value' is not
+                       portable. [RT #41315]
+
+4303.  [bug]           "dig +subnet" was unable to send a prefix length of
+                       zero, as it was incorrectly changed to 32 for v4
+                       prefixes or 128 for v6 prefixes. In addition to
+                       fixing this, "dig +subnet=0" has been added as a
+                       short form for 0.0.0.0/0. [RT #41553]
+
+4302.  [port]          win32: fixed a build error in VS 2015. [RT #41426]
+
+4300.  [cleanup]       Added new querytrace logging. [RT #41155]
+
+4299.  [bug]           Check that exactly totallen bytes are read when
+                       reading a RRset from raw files in both single read
+                       and incremental modes. [RT #41402]
+
+4298.  [bug]           dns_rpz_add errors in loadzone were not being
+                       propagated up the call stack. [RT #41425]
+
+4297.  [test]          Ensure delegations in RPZ zones fail robustly.
+                       [RT #41518]
+
+4295.  [bug]           An unchecked result in dns_message_pseudosectiontotext()
+                       could allow incorrect text formatting of EDNS EXPIRE
+                       options. [RT #41437]
+
+4294.  [bug]           Fixed a regression in which "rndc stop -p" failed
+                       to print the PID. [RT #41513]
+
+4293.  [bug]           Address memory leak on priming query creation failure.
+                       [RT #41512]
+
+4291.  [cleanup]       Added a required include to dns/forward.h. [RT #41474]
+
+4289.  [bug]           The server could crash due to memory being used
+                       after it was freed if a zone transfer timed out.
+                       [RT #41297]
 
 4288.  [bug]           Fixed a regression in resolver.c:possibly_mark()
                        which caused known-bogus servers to be queried
                        anyway. [RT #41321]
 
+4287.  [bug]           Silence an overly noisy log message when message
+                       parsing fails. [RT #41374]
+
 4286.  [security]      render_ecs errors were mishandled when printing out
                        a OPT record resulting in a assertion failure.
                        (CVE-2015-8705) [RT #41397]
@@ -25,11 +187,67 @@
 4285.  [security]      Specific APL data could trigger a INSIST.
                        (CVE-2015-8704) [RT #41396]
 
-       --- 9.10.3-P2 released ---
+4284.  [bug]           Some GeoIP options were incorrectly documented
+                       using abbreviated forms which were not accepted by
+                       named.  The code has been updated to allow both
+                       long and abbreviated forms. [RT #41381]
+
+4283.  [bug]           OPENSSL_config is no longer re-callable. [RT #41348]
+
+4281.  [bug]           Teach dns_message_totext about BADCOOKIE. [RT #41257]
+
+4280.  [performance]   Use optimal message sizes to improve compression
+                       in AXFRs. This reduces network traffic. [RT #40996]
+
+4279.  [test]          Don't use fixed ports when unit testing. [RT #41194]
+
+4278.  [bug]           'delv +short +[no]split[=##]' didn't work as expected.
+                       [RT #41238]
+
+4277.  [performance]   Improve performance of the RBT, the central zone
+                       datastructure: The aux hashtable was improved,
+                       hash function was updated to perform more
+                       uniform mapping, uppernode was added to
+                       dns_rbtnode, and other cleanups and performance
+                       improvements were made. [RT #41165]
+
+4276.  [protocol]      Add support for SMIMEA. [RT #40513]
+
+4274.  [performance]   Speed up typemap processing from text. [RT #41196]
+
+4273.  [bug]           Only call dns_test_begin() and dns_test_end() once each
+                       in nsec3_test as it fails with GOST if called multiple
+                       times.
+
+4272.  [bug]           dig: the +norrcomments option didn't work with +multi.
+                       [RT #41234]
+
+4271.  [test]          Unit tests could deadlock in isc__taskmgr_pause().
+                       [RT #41235]
 
 4270.  [security]      Update allowed OpenSSL versions as named is
                        potentially vulnerable to CVE-2015-3193.
 
+4269.  [bug]           Zones using "map" format master files currently
+                       don't work as policy zones.  This limitation has
+                       now been documented; attempting to use such zones
+                       in "response-policy" statements is now a
+                       configuration error.  [RT #38321]
+
+4267.  [test]          Check sdlz error handling. [RT #41142]
+
+4265.  [bug]           Address unchecked isc_mem_get calls. [RT #41187]
+
+4264.  [bug]           Check const of strchr/strrchr assignments match
+                       argument's const status. [RT #41150]
+
+4262.  [bug]           Fixed a bug in epoll socket code that caused
+                       sockets to not be registered for ready
+                       notification in some cases, causing named to not
+                       read from or write to them, resulting in what
+                       appear to the user as blocked connections.
+                       [RT #41067]
+
 4261.  [maint]         H.ROOT-SERVERS.NET is 198.97.190.53 and 2001:500:1::53.
                        [RT #40556]
 
@@ -38,10 +256,154 @@
                        triggering a REQUIRE failure when those records
                        were subsequently cached. (CVE-2015-8000) [RT #40987]
 
+4258.  [bug]           Limit rndc query message sizes to 32 KiB. This should
+                       not break any legitimate rndc commands, but will
+                       prevent a rogue rndc query from allocating too
+                       much memory. [RT #41073]
+
+4257.  [cleanup]       Python scripts reported incorrect version. [RT #41080]
+
+4256.  [bug]           Allow rndc command arguments to be quoted so as
+                       to allow spaces. [RT #36665]
+
+4254.  [bug]           Address missing lock when getting zone's serial.
+                       [RT #41072]
+
 4253.  [security]      Address fetch context reference count handling error
-                       on socket error. (CVE-2015-8461) [RT#40945]



Home | Main Index | Thread Index | Old Index