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/68c7db2e1556
branches: trunk
changeset: 342335:68c7db2e1556
user: christos <christos%NetBSD.org@localhost>
date: Thu Dec 17 04:00:21 2015 +0000
description:
merge conflicts
diffstat:
external/bsd/bind/bind2netbsd | 4 +-
external/bsd/bind/dist/CHANGES | 384 +-
external/bsd/bind/dist/README | 52 +-
external/bsd/bind/dist/bin/check/check-tool.c | 5 +-
external/bsd/bind/dist/bin/check/named-checkconf.c | 5 +-
external/bsd/bind/dist/bin/check/named-checkzone.c | 5 +-
external/bsd/bind/dist/bin/confgen/keygen.c | 5 +-
external/bsd/bind/dist/bin/confgen/util.c | 5 +-
external/bsd/bind/dist/bin/dig/dig.1 | 231 +-
external/bsd/bind/dist/bin/dig/dig.c | 261 +-
external/bsd/bind/dist/bin/dig/dighost.c | 428 +-
external/bsd/bind/dist/bin/dig/include/dig/dig.h | 15 +-
external/bsd/bind/dist/bin/dig/nslookup.c | 4 +-
external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.8 | 15 +-
external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.c | 42 +-
external/bsd/bind/dist/bin/dnssec/dnssec-keygen.c | 9 +-
external/bsd/bind/dist/bin/dnssec/dnssec-revoke.c | 10 +-
external/bsd/bind/dist/bin/dnssec/dnssec-settime.c | 9 +-
external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c | 46 +-
external/bsd/bind/dist/bin/named/client.c | 44 +-
external/bsd/bind/dist/bin/named/config.c | 31 +-
external/bsd/bind/dist/bin/named/control.c | 6 +-
external/bsd/bind/dist/bin/named/include/named/lwdclient.h | 5 +-
external/bsd/bind/dist/bin/named/include/named/main.h | 11 +-
external/bsd/bind/dist/bin/named/include/named/server.h | 11 +-
external/bsd/bind/dist/bin/named/interfacemgr.c | 4 +-
external/bsd/bind/dist/bin/named/logconf.c | 5 +-
external/bsd/bind/dist/bin/named/lwdclient.c | 98 +-
external/bsd/bind/dist/bin/named/lwresd.c | 9 +-
external/bsd/bind/dist/bin/named/main.c | 64 +-
external/bsd/bind/dist/bin/named/named.8 | 14 +-
external/bsd/bind/dist/bin/named/query.c | 351 +-
external/bsd/bind/dist/bin/named/server.c | 248 +-
external/bsd/bind/dist/bin/named/statschannel.c | 83 +-
external/bsd/bind/dist/bin/named/update.c | 17 +-
external/bsd/bind/dist/bin/named/win32/ntservice.c | 9 +-
external/bsd/bind/dist/bin/named/win32/os.c | 4 +-
external/bsd/bind/dist/bin/named/xfrout.c | 7 +-
external/bsd/bind/dist/bin/nsupdate/nsupdate.1 | 253 +-
external/bsd/bind/dist/bin/nsupdate/nsupdate.c | 14 +-
external/bsd/bind/dist/bin/pkcs11/openssl-0.9.8zc-patch | 15908 ----------
external/bsd/bind/dist/bin/pkcs11/openssl-1.0.0o-patch | 15889 ---------
external/bsd/bind/dist/bin/pkcs11/openssl-1.0.1j-patch | 15784 ---------
external/bsd/bind/dist/bin/pkcs11/pkcs11-destroy.c | 5 +-
external/bsd/bind/dist/bin/pkcs11/pkcs11-keygen.c | 5 +-
external/bsd/bind/dist/bin/pkcs11/pkcs11-list.c | 5 +-
external/bsd/bind/dist/bin/rndc/rndc.8 | 482 +-
external/bsd/bind/dist/bin/rndc/rndc.c | 7 +-
external/bsd/bind/dist/bin/rndc/util.c | 9 +-
external/bsd/bind/dist/bin/tests/adb_test.c | 5 +-
external/bsd/bind/dist/bin/tests/backtrace_test.c | 5 +-
external/bsd/bind/dist/bin/tests/byaddr_test.c | 5 +-
external/bsd/bind/dist/bin/tests/byname_test.c | 5 +-
external/bsd/bind/dist/bin/tests/cfg_test.c | 5 +-
external/bsd/bind/dist/bin/tests/compress_test.c | 5 +-
external/bsd/bind/dist/bin/tests/db/t_db.c | 22 +-
external/bsd/bind/dist/bin/tests/db_test.c | 9 +-
external/bsd/bind/dist/bin/tests/dst/dst_test.c | 5 +-
external/bsd/bind/dist/bin/tests/entropy2_test.c | 19 +-
external/bsd/bind/dist/bin/tests/entropy_test.c | 21 +-
external/bsd/bind/dist/bin/tests/fsaccess_test.c | 5 +-
external/bsd/bind/dist/bin/tests/gxba_test.c | 5 +-
external/bsd/bind/dist/bin/tests/gxbn_test.c | 5 +-
external/bsd/bind/dist/bin/tests/hash_test.c | 5 +-
external/bsd/bind/dist/bin/tests/inter_test.c | 5 +-
external/bsd/bind/dist/bin/tests/keyboard_test.c | 5 +-
external/bsd/bind/dist/bin/tests/lex_test.c | 5 +-
external/bsd/bind/dist/bin/tests/lfsr_test.c | 5 +-
external/bsd/bind/dist/bin/tests/log_test.c | 5 +-
external/bsd/bind/dist/bin/tests/lwres_test.c | 5 +-
external/bsd/bind/dist/bin/tests/lwresconf_test.c | 5 +-
external/bsd/bind/dist/bin/tests/makejournal.c | 5 +-
external/bsd/bind/dist/bin/tests/master_test.c | 5 +-
external/bsd/bind/dist/bin/tests/name_test.c | 5 +-
external/bsd/bind/dist/bin/tests/names/t_names.c | 5 +-
external/bsd/bind/dist/bin/tests/net/driver.c | 5 +-
external/bsd/bind/dist/bin/tests/net/netaddr_multicast.c | 5 +-
external/bsd/bind/dist/bin/tests/printmsg.c | 242 -
external/bsd/bind/dist/bin/tests/printmsg.h | 29 -
external/bsd/bind/dist/bin/tests/ratelimiter_test.c | 5 +-
external/bsd/bind/dist/bin/tests/rbt/t_rbt.c | 7 +-
external/bsd/bind/dist/bin/tests/rbt_test.c | 5 +-
external/bsd/bind/dist/bin/tests/rdata_test.c | 5 +-
external/bsd/bind/dist/bin/tests/serial_test.c | 5 +-
external/bsd/bind/dist/bin/tests/sig0_test.c | 3 +-
external/bsd/bind/dist/bin/tests/sock_test.c | 27 +-
external/bsd/bind/dist/bin/tests/sym_test.c | 5 +-
external/bsd/bind/dist/bin/tests/system/dlzexternal/driver.c | 4 +-
external/bsd/bind/dist/bin/tests/system/lwresd/lwtest.c | 5 +-
external/bsd/bind/dist/bin/tests/system/rsabigexponent/bigkey.c | 5 +-
external/bsd/bind/dist/bin/tests/system/tkey/keycreate.c | 5 +-
external/bsd/bind/dist/bin/tests/system/tkey/keydelete.c | 5 +-
external/bsd/bind/dist/bin/tests/task_test.c | 5 +-
external/bsd/bind/dist/bin/tests/tasks/t_tasks.c | 16 +-
external/bsd/bind/dist/bin/tests/timer_test.c | 5 +-
external/bsd/bind/dist/bin/tests/wire_test.c | 226 +-
external/bsd/bind/dist/bin/tests/zone_test.c | 5 +-
external/bsd/bind/dist/bin/tools/arpaname.c | 5 +-
external/bsd/bind/dist/bin/tools/isc-hmac-fixup.c | 5 +-
external/bsd/bind/dist/bin/tools/named-journalprint.c | 5 +-
external/bsd/bind/dist/config.h.in | 10 +
external/bsd/bind/dist/configure | 360 +-
external/bsd/bind/dist/configure.in | 242 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html | 138 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html | 843 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html | 16 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html | 20 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html | 139 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.html | 114 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf | Bin
external/bsd/bind/dist/doc/arm/man.arpaname.html | 10 +-
external/bsd/bind/dist/doc/arm/man.ddns-confgen.html | 12 +-
external/bsd/bind/dist/doc/arm/man.delv.html | 16 +-
external/bsd/bind/dist/doc/arm/man.dig.html | 285 +-
external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html | 12 +-
external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html | 12 +-
external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html | 28 +-
external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html | 16 +-
external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html | 16 +-
external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html | 18 +-
external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html | 12 +-
external/bsd/bind/dist/doc/arm/man.dnssec-settime.html | 16 +-
external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html | 14 +-
external/bsd/bind/dist/doc/arm/man.dnssec-verify.html | 12 +-
external/bsd/bind/dist/doc/arm/man.genrandom.html | 12 +-
external/bsd/bind/dist/doc/arm/man.host.html | 12 +-
external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html | 12 +-
external/bsd/bind/dist/doc/arm/man.named-checkconf.html | 14 +-
external/bsd/bind/dist/doc/arm/man.named-checkzone.html | 14 +-
external/bsd/bind/dist/doc/arm/man.named-journalprint.html | 10 +-
external/bsd/bind/dist/doc/arm/man.named-rrchecker.html | 8 +-
external/bsd/bind/dist/doc/arm/man.named.html | 28 +-
external/bsd/bind/dist/doc/arm/man.nsec3hash.html | 12 +-
external/bsd/bind/dist/doc/arm/man.nsupdate.html | 748 +-
external/bsd/bind/dist/doc/arm/man.rndc-confgen.html | 14 +-
external/bsd/bind/dist/doc/arm/man.rndc.conf.html | 14 +-
external/bsd/bind/dist/doc/arm/man.rndc.html | 836 +-
external/bsd/bind/dist/lib/bind9/check.c | 8 +-
external/bsd/bind/dist/lib/dns/adb.c | 305 +-
external/bsd/bind/dist/lib/dns/api | 6 +-
external/bsd/bind/dist/lib/dns/cache.c | 28 +-
external/bsd/bind/dist/lib/dns/callbacks.c | 5 +-
external/bsd/bind/dist/lib/dns/client.c | 5 +-
external/bsd/bind/dist/lib/dns/diff.c | 12 +-
external/bsd/bind/dist/lib/dns/dispatch.c | 22 +-
external/bsd/bind/dist/lib/dns/dlz.c | 32 +-
external/bsd/bind/dist/lib/dns/dnssec.c | 10 +-
external/bsd/bind/dist/lib/dns/dst_api.c | 9 +-
external/bsd/bind/dist/lib/dns/dst_openssl.h | 19 +-
external/bsd/bind/dist/lib/dns/dst_parse.c | 7 +-
external/bsd/bind/dist/lib/dns/gssapi_link.c | 5 +-
external/bsd/bind/dist/lib/dns/gssapictx.c | 15 +-
external/bsd/bind/dist/lib/dns/hmac_link.c | 16 +-
external/bsd/bind/dist/lib/dns/include/dns/adb.h | 67 +-
external/bsd/bind/dist/lib/dns/include/dns/log.h | 7 +-
external/bsd/bind/dist/lib/dns/include/dns/message.h | 23 +-
external/bsd/bind/dist/lib/dns/include/dns/name.h | 15 +-
external/bsd/bind/dist/lib/dns/include/dns/resolver.h | 42 +-
external/bsd/bind/dist/lib/dns/include/dns/result.h | 10 +-
external/bsd/bind/dist/lib/dns/include/dns/rrl.h | 23 +-
external/bsd/bind/dist/lib/dns/include/dns/stats.h | 14 +-
external/bsd/bind/dist/lib/dns/include/dns/types.h | 10 +-
external/bsd/bind/dist/lib/dns/include/dns/zone.h | 57 +-
external/bsd/bind/dist/lib/dns/include/dst/dst.h | 4 +-
external/bsd/bind/dist/lib/dns/journal.c | 22 +-
external/bsd/bind/dist/lib/dns/keytable.c | 3 +-
external/bsd/bind/dist/lib/dns/log.c | 7 +-
external/bsd/bind/dist/lib/dns/master.c | 13 +-
external/bsd/bind/dist/lib/dns/message.c | 130 +-
external/bsd/bind/dist/lib/dns/name.c | 81 +-
external/bsd/bind/dist/lib/dns/ncache.c | 8 +-
external/bsd/bind/dist/lib/dns/nsec.c | 7 +-
external/bsd/bind/dist/lib/dns/nsec3.c | 7 +-
external/bsd/bind/dist/lib/dns/openssl_link.c | 12 +-
external/bsd/bind/dist/lib/dns/openssldh_link.c | 123 +-
external/bsd/bind/dist/lib/dns/openssldsa_link.c | 27 +-
external/bsd/bind/dist/lib/dns/opensslecdsa_link.c | 4 +-
external/bsd/bind/dist/lib/dns/opensslgost_link.c | 9 +-
external/bsd/bind/dist/lib/dns/opensslrsa_link.c | 64 +-
external/bsd/bind/dist/lib/dns/order.c | 14 +-
external/bsd/bind/dist/lib/dns/private.c | 19 +-
external/bsd/bind/dist/lib/dns/rbt.c | 8 +-
external/bsd/bind/dist/lib/dns/rbtdb.c | 343 +-
external/bsd/bind/dist/lib/dns/rcode.c | 5 +-
external/bsd/bind/dist/lib/dns/rdata.c | 55 +-
external/bsd/bind/dist/lib/dns/rdata/any_255/tsig_250.c | 52 +-
external/bsd/bind/dist/lib/dns/rdata/ch_3/a_1.c | 29 +-
external/bsd/bind/dist/lib/dns/rdata/generic/afsdb_18.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/cert_37.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/cname_5.c | 26 +-
external/bsd/bind/dist/lib/dns/rdata/generic/dlv_32769.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/dname_39.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/dnskey_48.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/ds_43.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/gpos_27.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/hinfo_13.c | 26 +-
external/bsd/bind/dist/lib/dns/rdata/generic/hip_55.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/ipseckey_45.c | 30 +-
external/bsd/bind/dist/lib/dns/rdata/generic/isdn_20.c | 26 +-
external/bsd/bind/dist/lib/dns/rdata/generic/key_25.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/keydata_65533.c | 38 +-
external/bsd/bind/dist/lib/dns/rdata/generic/loc_29.c | 41 +-
external/bsd/bind/dist/lib/dns/rdata/generic/mb_7.c | 26 +-
external/bsd/bind/dist/lib/dns/rdata/generic/md_3.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/mf_4.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/mg_8.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/minfo_14.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/mr_9.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/mx_15.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/ns_2.c | 26 +-
external/bsd/bind/dist/lib/dns/rdata/generic/nsec3_50.c | 26 +-
external/bsd/bind/dist/lib/dns/rdata/generic/nsec3param_51.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/nsec_47.c | 30 +-
external/bsd/bind/dist/lib/dns/rdata/generic/null_10.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/nxt_30.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/opt_41.c | 51 +-
external/bsd/bind/dist/lib/dns/rdata/generic/proforma.c | 36 +-
external/bsd/bind/dist/lib/dns/rdata/generic/ptr_12.c | 31 +-
external/bsd/bind/dist/lib/dns/rdata/generic/rp_17.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/rrsig_46.c | 30 +-
external/bsd/bind/dist/lib/dns/rdata/generic/rt_21.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/sig_24.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/soa_6.c | 38 +-
external/bsd/bind/dist/lib/dns/rdata/generic/spf_99.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/sshfp_44.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/tkey_249.c | 26 +-
external/bsd/bind/dist/lib/dns/rdata/generic/txt_16.c | 34 +-
external/bsd/bind/dist/lib/dns/rdata/generic/unspec_103.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/x25_19.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/hs_4/a_1.c | 48 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/a6_38.c | 52 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/a_1.c | 66 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/aaaa_28.c | 66 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/apl_42.c | 64 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/dhcid_49.c | 52 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/kx_36.c | 52 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/nsap-ptr_23.c | 52 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/nsap_22.c | 60 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/px_26.c | 52 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/srv_33.c | 50 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/wks_11.c | 52 +-
external/bsd/bind/dist/lib/dns/request.c | 76 +-
external/bsd/bind/dist/lib/dns/resolver.c | 951 +-
external/bsd/bind/dist/lib/dns/result.c | 13 +-
external/bsd/bind/dist/lib/dns/rootns.c | 6 +-
external/bsd/bind/dist/lib/dns/rpz.c | 26 +-
external/bsd/bind/dist/lib/dns/rrl.c | 17 +-
external/bsd/bind/dist/lib/dns/sdb.c | 12 +-
external/bsd/bind/dist/lib/dns/sdlz.c | 12 +-
external/bsd/bind/dist/lib/dns/spnego.c | 39 +-
external/bsd/bind/dist/lib/dns/tcpmsg.c | 5 +-
external/bsd/bind/dist/lib/dns/tests/geoip_test.c | 5 +-
external/bsd/bind/dist/lib/dns/tests/master_test.c | 6 +-
external/bsd/bind/dist/lib/dns/tkey.c | 77 +-
external/bsd/bind/dist/lib/dns/tsig.c | 15 +-
external/bsd/bind/dist/lib/dns/update.c | 1118 +-
external/bsd/bind/dist/lib/dns/view.c | 11 +-
external/bsd/bind/dist/lib/dns/xfrin.c | 22 +-
external/bsd/bind/dist/lib/dns/zone.c | 505 +-
external/bsd/bind/dist/lib/irs/getaddrinfo.c | 30 +-
external/bsd/bind/dist/lib/isc/app_api.c | 21 +-
external/bsd/bind/dist/lib/isc/assertions.c | 5 +-
external/bsd/bind/dist/lib/isc/backtrace.c | 12 +-
external/bsd/bind/dist/lib/isc/commandline.c | 5 +-
external/bsd/bind/dist/lib/isc/entropy.c | 10 +-
external/bsd/bind/dist/lib/isc/error.c | 5 +-
external/bsd/bind/dist/lib/isc/heap.c | 42 +-
external/bsd/bind/dist/lib/isc/hmacmd5.c | 6 +-
external/bsd/bind/dist/lib/isc/hmacsha.c | 14 +-
external/bsd/bind/dist/lib/isc/httpd.c | 74 +-
external/bsd/bind/dist/lib/isc/include/isc/app.h | 14 +-
external/bsd/bind/dist/lib/isc/include/isc/mem.h | 22 +-
external/bsd/bind/dist/lib/isc/include/isc/print.h | 35 +-
external/bsd/bind/dist/lib/isc/include/isc/safe.h | 16 +-
external/bsd/bind/dist/lib/isc/include/isc/util.h | 6 +-
external/bsd/bind/dist/lib/isc/lex.c | 7 +-
external/bsd/bind/dist/lib/isc/lib.c | 5 +-
external/bsd/bind/dist/lib/isc/mem.c | 70 +-
external/bsd/bind/dist/lib/isc/nothreads/include/isc/mutex.h | 6 +-
external/bsd/bind/dist/lib/isc/print.c | 331 +-
external/bsd/bind/dist/lib/isc/pthreads/mutex.c | 105 +-
external/bsd/bind/dist/lib/isc/regex.c | 5 +-
external/bsd/bind/dist/lib/isc/rwlock.c | 5 +-
external/bsd/bind/dist/lib/isc/safe.c | 35 +-
external/bsd/bind/dist/lib/isc/socket_api.c | 10 +-
external/bsd/bind/dist/lib/isc/stats.c | 9 +-
external/bsd/bind/dist/lib/isc/task.c | 34 +-
external/bsd/bind/dist/lib/isc/tests/safe_test.c | 47 +-
external/bsd/bind/dist/lib/isc/timer.c | 5 +-
external/bsd/bind/dist/lib/isc/unix/app.c | 4 +-
external/bsd/bind/dist/lib/isc/unix/file.c | 18 +-
external/bsd/bind/dist/lib/isc/unix/ifiter_ioctl.c | 6 +-
external/bsd/bind/dist/lib/isc/unix/ifiter_sysctl.c | 6 +-
external/bsd/bind/dist/lib/isc/unix/net.c | 49 +-
external/bsd/bind/dist/lib/isc/unix/socket.c | 42 +-
external/bsd/bind/dist/lib/isc/win32/interfaceiter.c | 5 +-
external/bsd/bind/dist/lib/isc/win32/net.c | 13 +-
external/bsd/bind/dist/lib/isc/win32/win32os.c | 3 +-
external/bsd/bind/dist/lib/isccc/alist.c | 7 +-
external/bsd/bind/dist/lib/isccc/cc.c | 12 +-
external/bsd/bind/dist/lib/isccc/sexpr.c | 5 +-
external/bsd/bind/dist/lib/isccfg/include/isccfg/cfg.h | 16 +-
external/bsd/bind/dist/lib/isccfg/include/isccfg/grammar.h | 12 +-
external/bsd/bind/dist/lib/isccfg/namedconf.c | 107 +-
external/bsd/bind/dist/lib/isccfg/parser.c | 88 +-
external/bsd/bind/dist/lib/lwres/herror.c | 6 +-
external/bsd/bind/dist/lib/lwres/print.c | 26 +-
external/bsd/bind/dist/lib/lwres/win32/socket.c | 9 +-
external/bsd/bind/dist/srcid | 2 +-
external/bsd/bind/dist/version | 4 +-
external/bsd/bind/include/config.h | 20 +-
external/bsd/bind/include/isc/platform.h | 29 +-
external/bsd/bind/include/lwres/platform.h | 2 +-
external/bsd/bind/lib/libbind9/shlib_version | 4 +-
external/bsd/bind/lib/libdns/shlib_version | 4 +-
external/bsd/bind/lib/libirs/shlib_version | 4 +-
external/bsd/bind/lib/libisc/shlib_version | 4 +-
external/bsd/bind/lib/libisccc/shlib_version | 4 +-
external/bsd/bind/lib/libisccfg/shlib_version | 4 +-
external/bsd/bind/lib/liblwres/shlib_version | 4 +-
320 files changed, 10300 insertions(+), 53683 deletions(-)
diffs (truncated from 83991 to 300 lines):
diff -r d34138d8c4ea -r 68c7db2e1556 external/bsd/bind/bind2netbsd
--- a/external/bsd/bind/bind2netbsd Thu Dec 17 03:21:49 2015 +0000
+++ b/external/bsd/bind/bind2netbsd Thu Dec 17 04:00:21 2015 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: bind2netbsd,v 1.2 2014/03/06 02:12:56 christos Exp $
+# $NetBSD: bind2netbsd,v 1.3 2015/12/17 04:00:21 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,7 +34,7 @@
#
# $ cd /some/where/temporary
# $ tar xpfz /new/bind/release/tar/file
-# $ sh /usr/src/external/bsd/bind/dist/bind2netbsd bind-9.x.y `pwd`
+# $ sh /usr/src/external/bsd/bind/bind2netbsd bind-9.x.y `pwd`
# $ 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
diff -r d34138d8c4ea -r 68c7db2e1556 external/bsd/bind/dist/CHANGES
--- a/external/bsd/bind/dist/CHANGES Thu Dec 17 03:21:49 2015 +0000
+++ b/external/bsd/bind/dist/CHANGES Thu Dec 17 04:00:21 2015 +0000
@@ -1,35 +1,223 @@
- --- 9.10.2-P4 released ---
+ --- 9.10.3-P2 released ---
+
+4270. [security] Update allowed OpenSSL versions as named is
+ potentially vulnerable to CVE-2015-3193.
+
+4261. [maint] H.ROOT-SERVERS.NET is 198.97.190.53 and 2001:500:1::53.
+ [RT #40556]
+
+4260. [security] Insufficient testing when parsing a message allowed
+ records with an incorrect class to be be accepted,
+ triggering a REQUIRE failure when those records
+ were subsequently cached. (CVE-2015-8000) [RT #40987]
+
+4253. [security] Address fetch context reference count handling error
+ on socket error. (CVE-2015-8461) [RT#40945]
+
+ --- 9.10.3-P1 (withdrawn) ---
+
+ --- 9.10.3 released ---
+
+ --- 9.10.3rc1 released ---
+
+4193. [bug] Handle broken servers that return BADVERS incorrectly.
+ [RT #40427]
+
+4192. [bug] The default rrset-order of random was not always being
+ applied. [RT #40456]
+
+4191. [protocol] Accept DNS-SD non LDH PTR records in reverse zones
+ as per RFC 6763. [RT #37889]
+
+4190. [protocol] Accept Active Diretory gc._msdcs.<forest> name as
+ valid with check-names. <forest> still needs to be
+ LDH. [RT #40399]
+
+4189. [cleanup] Don't exit on overly long tokens in named.conf.
+ [RT #40418]
+
+4188. [bug] Support HTTP/1.0 client properly on the statistics
+ channel. [RT #40261]
+
+4187. [func] When any RR type implementation doesn't
+ implement totext() for the RDATA's wire
+ representation and returns ISC_R_NOTIMPLEMENTED,
+ such RDATA is now printed in unknown
+ presentation format (RFC 3597). RR types affected
+ include LOC(29) and APL(42). [RT #40317].
+
+4186. [bug] Fixed an RPZ bug where a QNAME would be matched
+ against a policy RR with wildcard owner name
+ (trigger) where the QNAME was the wildcard owner
+ name's parent. For example, the bug caused a query
+ with QNAME "example.com" to match a policy RR with
+ "*.example.com" as trigger. [RT #40357]
+
+4185. [bug] Fixed an RPZ bug where a policy RR with wildcard
+ owner name (trigger) would prevent another policy RR
+ with its parent owner name from being
+ loaded. For example, the bug caused a policy RR
+ with trigger "example.com" to not have any
+ effect when a previous policy RR with trigger
+ "*.example.com" existed in that RPZ zone.
+ [RT #40357]
+
+4183. [cleanup] Use timing-safe memory comparisons in cryptographic
+ code. Also, the timing-safe comparison functions have
+ been renamed to avoid possible confusion with
+ memcmp(). Thanks to Loganaden Velvindron of
+ AFRINIC. [RT #40148]
+
+4182. [cleanup] Use mnemonics for RR class and type comparisons.
+ [RT #40297]
+
+4181. [bug] Queued notify messages could be dequeued from the
+ wrong rate limiter queue. [RT #40350]
+
+4179. [bug] Fix double frees in getaddrinfo() in libirs.
+ [RT #40209]
+
+4178. [bug] Fix assertion failure in parsing UNSPEC(103) RR from
+ text. [RT #40274]
+
+4177. [bug] Fix assertion failure in parsing NSAP records from
+ text. [RT #40285]
+
+4176. [bug] Address race issues with lwresd. [RT #40284]
+
+4175. [bug] TKEY with GSS-API keys needed bigger buffers.
+ [RT #40333]
+
+4174. [bug] "dnssec-coverage -r" didn't handle time unit
+ suffixes correctly. [RT #38444]
+
+4173. [bug] dig +sigchase was not properly matching the trusted
+ key. [RT #40188]
+
+4172. [bug] Named / named-checkconf didn't handle a view of CLASS0.
+ [RT #40265]
+
+4171. [bug] Fixed incorrect class checks in TSIG RR
+ implementation. [RT #40287]
4170. [security] An incorrect boundary check in the OPENPGPKEY
rdatatype could trigger an assertion failure.
(CVE-2015-5986) [RT #40286]
+4169. [test] Added a 'wire_test -d' option to read input as
+ raw binary data, for use as a fuzzing harness.
+ [RT #40312]
+
4168. [security] A buffer accounting error could trigger an
- assertion failure when parsing certain malformed
+ assertion failure when parsing certain malformed
DNSSEC keys. (CVE-2015-5722) [RT #40212]
- --- 9.10.2-P3 released ---
+ --- 9.10.3b1 released ---
4165. [security] A failure to reset a value to NULL in tkey.c could
result in an assertion failure. (CVE-2015-5477)
[RT #40046]
- --- 9.10.2-P2 released ---
-
-4138. [bug] An uninitialized value in validator.c could result
+4164. [bug] Don't rename slave files and journals on out of memory.
+ [RT #40033]
+
+4163. [bug] Address compiler warnings. [RT #40024]
+
+4162. [bug] httpdmgr->flags was not being initialized. [RT #40017]
+
+4161. [test] Test for consistency between "rndc stats" and the
+ XML and JSON statistics channel contents. [RT #38700]
+
+4159. [cleanup] Alphabetize dig's help output. [RT #39966]
+
+4157. [protocol] Update experimental SIT code to use the EDNS COOKIE
+ option code point (10). This is the minimal change
+ required to use the new code point. [RT #39928]
+
+4154. [bug] A OPT record should be included with the FORMERR
+ response when there is a malformed EDNS option.
+ [RT #39647]
+
+4153. [bug] Dig should zero non significant +subnet bits. Check
+ that non significant ECS bits are zero on receipt.
+ [RT #39647]
+
+4151. [bug] 'rndc flush' could cause a deadlock. [RT #39835]
+
+4150. [bug] win32: listen-on-v6 { any; }; was not working. Apply
+ minimal fix. [RT #39667]
+
+4149. [bug] Fixed a race condition in the getaddrinfo()
+ implementation in libirs, which caused the delv
+ utility to crash with an assertion failure when using
+ the '@server' syntax with a hostname argument.
+ [RT #39899]
+
+4148. [bug] Fix a bug when printing zone names with '/' character
+ in XML and JSON statistics output. [RT #39873]
+
+4147. [bug] Filter-aaaa / filter-aaaa-on-v4 / filter-aaaa-on-v6
+ was returning referrals rather than nodata responses
+ when the AAAA records were filtered. [RT #39843]
+
+4146. [bug] Address reference leak that could prevent a clean
+ shutdown. [RT #37125]
+
+4145. [bug] Not all unassociated adb entries where being printed.
+ [RT #37125]
+
+4143. [bug] serial-query-rate was not effective for notify.
+ [RT #39858]
+
+4142. [bug] rndc addzone with view specified saved NZF config
+ that could not be read back by named. This has now
+ been fixed. [RT #39845]
+
+4141. [bug] A formatting bug caused rndc zonestatus to print
+ negative numbers for large serial values. This has
+ now been fixed. [RT #39854]
+
+4139. [doc] Fix rpz-client-ip documentation. [RT #39783]
+
+4138. [security] An uninitialized value in validator.c could result
in an assertion failure. (CVE-2015-4620) [RT #39795]
- --- 9.10.2-P1 released ---
+4137. [bug] Make rndc reconfig report configuration errors the
+ same way rndc reload does. [RT #39635]
+
+4136. [bug] Stale statistics counters with the leading
+ '#' prefix (such as #NXDOMAIN) were not being
+ updated correctly. This has been fixed. [RT #39141]
4134. [cleanup] Include client-ip rules when logging the number
of RPZ rules of each type. [RT #39670]
+4133. [port] Update how various json libraries are handled.
+ [RT #39646]
+
+4132. [cleanup] dig: added +rd as a synonym for +recurse,
+ added +class as an unabbreviated alternative
+ to +cl. [RT #39686]
+
4131. [bug] Addressed further problems with reloading RPZ
zones. [RT #39649]
+4130. [bug] The compatibility shim for *printf() misprinted some
+ large numbers. [RT #39586]
+
+4129. [port] Address API changes in OpenSSL 1.1.0. [RT #39532]
+
+4128. [bug] Address issues raised by Coverity 7.6. [RT #39537]
+
+4127. [protocol] CDS and CDNSKEY need to be signed by the key signing
+ key as per RFC 7344, Section 4.1. [RT #37215]
+
4126. [bug] Addressed a regression introduced in change #4121.
[RT #39611]
+4123. [port] Added %z (size_t) format options to the portable
+ internal printf/sprintf implementation. [RT #39586]
+
4122. [bug] The server could match a shorter prefix than what was
available in CLIENT-IP policy triggers, and so, an
unexpected action could be taken. This has been
@@ -50,12 +238,149 @@
pending for RPZ processing of an active query.
[RT #39415]
+4119. [test] Allow dig to set the message opcode. [RT #39550]
+
+4118. [bug] Teach isc-config.sh about irs. [RT #39213]
+
+4117. [protocol] Add EMPTY.AS112.ARPA as per RFC 7534.
+
4116. [bug] Fix a bug in RPZ that could cause some policy
zones that did not specifically require
recursion to be treated as if they did;
consequently, setting qname-wait-recurse no; was
sometimes ineffective. [RT #39229]
+4113. [test] Check for Net::DNS is some system test
+ prerequisites. [RT #39369]
+
+4112. [bug] Named failed to load when "root-delegation-only"
+ was used without a list of domains to exclude.
+ [RT #39380]
+
+4111. [doc] Alphabetize rndc man page. [RT #39360]
+
+4110. [bug] Address memory leaks / null pointer dereferences
+ on out of memory. [RT #39310]
+
+4109. [port] linux: support reading the local port range from
+ net.ipv4.ip_local_port_range. [RT # 39379]
+
+4107. [bug] Address potential deadlock when updating zone content.
+ [RT #39269]
+
+4106. [port] Improve readline support. [RT #38938]
+
+4105. [port] Misc fixes for Microsoft Visual Studio
+ 2015 CTP6 in 64 bit mode. [RT #39308]
+
+4104. [bug] Address uninitialized elements. [RT #39252]
+
+4102. [bug] Fix a use after free bug introduced in change
+ #4094. [RT #39281]
+
+4101. [bug] dig: the +split and +rrcomments options didn't
+ work with +short. [RT #39291]
Home |
Main Index |
Thread Index |
Old Index