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 for bind-9.9.3-P2
details: https://anonhg.NetBSD.org/src/rev/0f4fafbb7cc1
branches: trunk
changeset: 788890:0f4fafbb7cc1
user: christos <christos%NetBSD.org@localhost>
date: Sat Jul 27 19:23:09 2013 +0000
description:
merge conflicts for bind-9.9.3-P2
diffstat:
external/bsd/bind/Makefile.inc | 8 +-
external/bsd/bind/bin/named/Makefile | 7 +-
external/bsd/bind/dist/CHANGES | 546 +-
external/bsd/bind/dist/REDIRECT-NOTES | 35 -
external/bsd/bind/dist/bin/check/check-tool.c | 13 +-
external/bsd/bind/dist/bin/check/named-checkconf.c | 17 +-
external/bsd/bind/dist/bin/check/named-checkzone.8 | 18 +-
external/bsd/bind/dist/bin/check/named-checkzone.c | 23 +-
external/bsd/bind/dist/bin/confgen/keygen.c | 14 +-
external/bsd/bind/dist/bin/confgen/rndc-confgen.c | 6 +-
external/bsd/bind/dist/bin/dig/dig.1 | 23 +-
external/bsd/bind/dist/bin/dig/dig.c | 29 +-
external/bsd/bind/dist/bin/dig/dighost.c | 86 +-
external/bsd/bind/dist/bin/dig/host.c | 20 +-
external/bsd/bind/dist/bin/dig/include/dig/dig.h | 6 +-
external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.c | 6 +-
external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.c | 4 +-
external/bsd/bind/dist/bin/dnssec/dnssec-keygen.c | 14 +-
external/bsd/bind/dist/bin/dnssec/dnssec-revoke.c | 5 +-
external/bsd/bind/dist/bin/dnssec/dnssec-settime.c | 37 +-
external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c | 98 +-
external/bsd/bind/dist/bin/dnssec/dnssec-verify.c | 5 +-
external/bsd/bind/dist/bin/dnssec/dnssectool.c | 130 +-
external/bsd/bind/dist/bin/named/client.c | 17 +-
external/bsd/bind/dist/bin/named/config.c | 25 +-
external/bsd/bind/dist/bin/named/control.c | 4 +-
external/bsd/bind/dist/bin/named/controlconf.c | 9 +-
external/bsd/bind/dist/bin/named/include/named/client.h | 19 +-
external/bsd/bind/dist/bin/named/include/named/globals.h | 9 +-
external/bsd/bind/dist/bin/named/include/named/server.h | 8 +-
external/bsd/bind/dist/bin/named/interfacemgr.c | 14 +-
external/bsd/bind/dist/bin/named/log.c | 6 +-
external/bsd/bind/dist/bin/named/logconf.c | 16 +-
external/bsd/bind/dist/bin/named/lwresd.c | 6 +-
external/bsd/bind/dist/bin/named/main.c | 30 +-
external/bsd/bind/dist/bin/named/named.8 | 12 +-
external/bsd/bind/dist/bin/named/named.conf.5 | 6 +-
external/bsd/bind/dist/bin/named/named.conf.docbook | 3 +-
external/bsd/bind/dist/bin/named/named.conf.html | 32 +-
external/bsd/bind/dist/bin/named/query.c | 242 +-
external/bsd/bind/dist/bin/named/server.c | 532 +-
external/bsd/bind/dist/bin/named/statschannel.c | 517 +-
external/bsd/bind/dist/bin/named/tkeyconf.c | 10 +-
external/bsd/bind/dist/bin/named/tsigconf.c | 6 +-
external/bsd/bind/dist/bin/named/unix/dlz_dlopen_driver.c | 18 +-
external/bsd/bind/dist/bin/named/update.c | 7 +-
external/bsd/bind/dist/bin/named/xfrout.c | 40 +-
external/bsd/bind/dist/bin/named/zoneconf.c | 80 +-
external/bsd/bind/dist/bin/nsupdate/nsupdate.c | 6 +-
external/bsd/bind/dist/bin/pkcs11/openssl-0.9.8s-patch | 15768 ---------
external/bsd/bind/dist/bin/pkcs11/openssl-1.0.0f-patch | 15789 ----------
external/bsd/bind/dist/bin/python/dnssec-checkds.8 | 94 +-
external/bsd/bind/dist/bin/python/dnssec-checkds.docbook | 13 +-
external/bsd/bind/dist/bin/rndc/rndc.c | 3 +-
external/bsd/bind/dist/bin/tests/adb_test.c | 8 +-
external/bsd/bind/dist/bin/tests/byaddr_test.c | 12 +-
external/bsd/bind/dist/bin/tests/byname_test.c | 6 +-
external/bsd/bind/dist/bin/tests/db/t_db.c | 6 +-
external/bsd/bind/dist/bin/tests/db_test.c | 20 +-
external/bsd/bind/dist/bin/tests/dst/Kdh.+002+18602.key | 1 -
external/bsd/bind/dist/bin/tests/dst/Kdh.+002+18602.private | 6 -
external/bsd/bind/dist/bin/tests/dst/Kdh.+002+48957.key | 1 -
external/bsd/bind/dist/bin/tests/dst/Kdh.+002+48957.private | 6 -
external/bsd/bind/dist/bin/tests/dst/Ktest.+001+00002.key | 1 -
external/bsd/bind/dist/bin/tests/dst/Ktest.+001+54622.key | 1 -
external/bsd/bind/dist/bin/tests/dst/Ktest.+001+54622.private | 10 -
external/bsd/bind/dist/bin/tests/dst/Ktest.+003+23616.key | 1 -
external/bsd/bind/dist/bin/tests/dst/Ktest.+003+23616.private | 7 -
external/bsd/bind/dist/bin/tests/dst/Ktest.+003+49667.key | 1 -
external/bsd/bind/dist/bin/tests/dst/dst_2_data | 16 -
external/bsd/bind/dist/bin/tests/dst/dst_test.c | 10 +-
external/bsd/bind/dist/bin/tests/dst/t2_data_1 | 3077 -
external/bsd/bind/dist/bin/tests/dst/t2_data_2 | 3077 -
external/bsd/bind/dist/bin/tests/dst/t2_dsasig | 3 -
external/bsd/bind/dist/bin/tests/dst/t2_rsasig | 6 -
external/bsd/bind/dist/bin/tests/dst/t_dst.c | 73 +-
external/bsd/bind/dist/bin/tests/fsaccess_test.c | 28 +-
external/bsd/bind/dist/bin/tests/names/t_names.c | 255 +-
external/bsd/bind/dist/bin/tests/rbt/t_rbt.c | 16 +-
external/bsd/bind/dist/bin/tests/rdata_test.c | 192 +-
external/bsd/bind/dist/bin/tests/resolver/t_resolver.c | 4 +-
external/bsd/bind/dist/bin/tests/shutdown_test.c | 12 +-
external/bsd/bind/dist/bin/tests/sig0_test.c | 6 +-
external/bsd/bind/dist/bin/tests/sock_test.c | 18 +-
external/bsd/bind/dist/bin/tests/system/checkconf/bad.conf | 52 -
external/bsd/bind/dist/bin/tests/system/checkconf/badtsig.conf | 22 -
external/bsd/bind/dist/bin/tests/system/lwresd/lwtest.c | 8 +-
external/bsd/bind/dist/bin/tests/system/redirect/ns2/redirect.db | 25 -
external/bsd/bind/dist/bin/tests/system/rpz/rpz.c | 7 +-
external/bsd/bind/dist/bin/tests/system/rsabigexponent/bigkey.c | 4 +-
external/bsd/bind/dist/bin/tests/system/tkey/keycreate.c | 8 +-
external/bsd/bind/dist/bin/tests/task_test.c | 13 +-
external/bsd/bind/dist/bin/tests/timer_test.c | 13 +-
external/bsd/bind/dist/bin/tests/zone_test.c | 14 +-
external/bsd/bind/dist/bin/tools/genrandom.c | 5 +-
external/bsd/bind/dist/bin/tools/isc-hmac-fixup.8 | 8 +-
external/bsd/bind/dist/config.h.in | 10 +
external/bsd/bind/dist/contrib/dbus/GetForwarders | 31 -
external/bsd/bind/dist/contrib/dbus/INSTALL | 9 -
external/bsd/bind/dist/contrib/dbus/Makefile.9.3.2b1 | 20 -
external/bsd/bind/dist/contrib/dbus/Makefile.9.3.3rc2 | 20 -
external/bsd/bind/dist/contrib/dbus/README.DBUS | 259 -
external/bsd/bind/dist/contrib/dbus/SetForwarders | 52 -
external/bsd/bind/dist/contrib/dbus/bind-9.3.2b1-dbus.patch | 713 -
external/bsd/bind/dist/contrib/dbus/bind-9.3.3rc2-dbus.patch | 778 -
external/bsd/bind/dist/contrib/dbus/dbus_mgr.c | 2460 -
external/bsd/bind/dist/contrib/dbus/dbus_mgr.h | 39 -
external/bsd/bind/dist/contrib/dbus/dbus_service.c | 1163 -
external/bsd/bind/dist/contrib/dbus/dbus_service.h | 289 -
external/bsd/bind/dist/contrib/dbus/named-dbus-system.conf | 20 -
external/bsd/bind/dist/contrib/dbus/named-dbus.service | 3 -
external/bsd/bind/dist/contrib/dlz/drivers/dlz_filesystem_driver.c | 115 +-
external/bsd/bind/dist/contrib/dlz/drivers/dlz_ldap_driver.c | 13 +-
external/bsd/bind/dist/contrib/dlz/drivers/dlz_mysql_driver.c | 5 +-
external/bsd/bind/dist/contrib/dlz/drivers/sdlz_helper.c | 16 +-
external/bsd/bind/dist/contrib/dlz/example/dlz_example.c | 220 +-
external/bsd/bind/dist/contrib/dlz/example/dlz_minimal.h | 240 -
external/bsd/bind/dist/contrib/query-loc-0.4.0/loc.c | 8 +-
external/bsd/bind/dist/contrib/queryperf/queryperf.c | 191 +-
external/bsd/bind/dist/contrib/sdb/sqlite/zone2sqlite.c | 8 +-
external/bsd/bind/dist/contrib/zkt/dki.c | 4 +-
external/bsd/bind/dist/contrib/zkt/zkt-soaserial.c | 12 +-
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf | Bin
external/bsd/bind/dist/doc/misc/options | 16 +-
external/bsd/bind/dist/lib/bind9/check.c | 102 +-
external/bsd/bind/dist/lib/dns/acache.c | 56 +-
external/bsd/bind/dist/lib/dns/acl.c | 11 +-
external/bsd/bind/dist/lib/dns/adb.c | 31 +-
external/bsd/bind/dist/lib/dns/byaddr.c | 11 +-
external/bsd/bind/dist/lib/dns/cache.c | 21 +-
external/bsd/bind/dist/lib/dns/client.c | 36 +-
external/bsd/bind/dist/lib/dns/db.c | 9 +-
external/bsd/bind/dist/lib/dns/dbtable.c | 11 +-
external/bsd/bind/dist/lib/dns/diff.c | 14 +-
external/bsd/bind/dist/lib/dns/dispatch.c | 429 +-
external/bsd/bind/dist/lib/dns/dlz.c | 24 +-
external/bsd/bind/dist/lib/dns/dnssec.c | 17 +-
external/bsd/bind/dist/lib/dns/dst_api.c | 45 +-
external/bsd/bind/dist/lib/dns/dst_internal.h | 3 +-
external/bsd/bind/dist/lib/dns/dst_openssl.h | 7 +-
external/bsd/bind/dist/lib/dns/ecdb.c | 11 +-
external/bsd/bind/dist/lib/dns/gen.c | 188 +-
external/bsd/bind/dist/lib/dns/gssapictx.c | 14 +-
external/bsd/bind/dist/lib/dns/include/dns/acache.h | 19 +-
external/bsd/bind/dist/lib/dns/include/dns/adb.h | 6 +-
external/bsd/bind/dist/lib/dns/include/dns/cache.h | 14 +-
external/bsd/bind/dist/lib/dns/include/dns/db.h | 12 +-
external/bsd/bind/dist/lib/dns/include/dns/dispatch.h | 57 +-
external/bsd/bind/dist/lib/dns/include/dns/message.h | 28 +-
external/bsd/bind/dist/lib/dns/include/dns/name.h | 24 +-
external/bsd/bind/dist/lib/dns/include/dns/ncache.h | 9 +-
external/bsd/bind/dist/lib/dns/include/dns/nsec.h | 15 +-
external/bsd/bind/dist/lib/dns/include/dns/nsec3.h | 12 +-
external/bsd/bind/dist/lib/dns/include/dns/rdata.h | 3 +-
external/bsd/bind/dist/lib/dns/include/dns/resolver.h | 13 +-
external/bsd/bind/dist/lib/dns/include/dns/result.h | 7 +-
external/bsd/bind/dist/lib/dns/include/dns/rpz.h | 25 +-
external/bsd/bind/dist/lib/dns/include/dns/types.h | 9 +-
external/bsd/bind/dist/lib/dns/include/dns/validator.h | 8 +-
external/bsd/bind/dist/lib/dns/include/dns/view.h | 8 +-
external/bsd/bind/dist/lib/dns/include/dns/zone.h | 64 +-
external/bsd/bind/dist/lib/dns/include/dst/dst.h | 8 +-
external/bsd/bind/dist/lib/dns/iptable.c | 9 +-
external/bsd/bind/dist/lib/dns/journal.c | 11 +-
external/bsd/bind/dist/lib/dns/keytable.c | 12 +-
external/bsd/bind/dist/lib/dns/lookup.c | 13 +-
external/bsd/bind/dist/lib/dns/master.c | 25 +-
external/bsd/bind/dist/lib/dns/message.c | 165 +-
external/bsd/bind/dist/lib/dns/name.c | 26 +-
external/bsd/bind/dist/lib/dns/ncache.c | 26 +-
external/bsd/bind/dist/lib/dns/nsec.c | 163 +-
external/bsd/bind/dist/lib/dns/nsec3.c | 292 +-
external/bsd/bind/dist/lib/dns/openssl_link.c | 64 +-
external/bsd/bind/dist/lib/dns/openssldsa_link.c | 21 +-
external/bsd/bind/dist/lib/dns/opensslecdsa_link.c | 26 +-
external/bsd/bind/dist/lib/dns/opensslgost_link.c | 5 +-
external/bsd/bind/dist/lib/dns/opensslrsa_link.c | 35 +-
external/bsd/bind/dist/lib/dns/peer.c | 6 +-
external/bsd/bind/dist/lib/dns/private.c | 10 +-
external/bsd/bind/dist/lib/dns/rbt.c | 15 +-
external/bsd/bind/dist/lib/dns/rbtdb.c | 82 +-
external/bsd/bind/dist/lib/dns/rdata.c | 103 +-
external/bsd/bind/dist/lib/dns/rdata/any_255/tsig_250.c | 13 +-
external/bsd/bind/dist/lib/dns/rdata/generic/dlv_32769.c | 6 +-
external/bsd/bind/dist/lib/dns/rdata/generic/keydata_65533.c | 4 +-
external/bsd/bind/dist/lib/dns/rdata/generic/mx_15.c | 5 +-
external/bsd/bind/dist/lib/dns/rdata/generic/nsec3_50.c | 6 +-
external/bsd/bind/dist/lib/dns/rdata/generic/sshfp_44.c | 5 +-
external/bsd/bind/dist/lib/dns/rdata/generic/txt_16.c | 11 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/nsap_22.c | 5 +-
external/bsd/bind/dist/lib/dns/request.c | 10 +-
external/bsd/bind/dist/lib/dns/resolver.c | 573 +-
external/bsd/bind/dist/lib/dns/result.c | 10 +-
external/bsd/bind/dist/lib/dns/rootns.c | 7 +-
external/bsd/bind/dist/lib/dns/rpz.c | 42 +-
external/bsd/bind/dist/lib/dns/sdb.c | 6 +-
external/bsd/bind/dist/lib/dns/sdlz.c | 6 +-
external/bsd/bind/dist/lib/dns/spnego.c | 36 +-
external/bsd/bind/dist/lib/dns/spnego_asn1.c | 54 +-
external/bsd/bind/dist/lib/dns/ssu.c | 9 +-
external/bsd/bind/dist/lib/dns/ssu_external.c | 4 +-
external/bsd/bind/dist/lib/dns/tests/Makefile.in | 19 +-
external/bsd/bind/dist/lib/dns/tests/master_test.c | 96 +-
external/bsd/bind/dist/lib/dns/tkey.c | 13 +-
external/bsd/bind/dist/lib/dns/tsig.c | 46 +-
external/bsd/bind/dist/lib/dns/validator.c | 546 +-
external/bsd/bind/dist/lib/dns/view.c | 67 +-
external/bsd/bind/dist/lib/dns/xfrin.c | 12 +-
external/bsd/bind/dist/lib/dns/zone.c | 821 +-
external/bsd/bind/dist/lib/export/samples/nsprobe.c | 30 +-
external/bsd/bind/dist/lib/export/samples/sample-async.c | 6 +-
external/bsd/bind/dist/lib/export/samples/sample-gai.c | 8 +-
external/bsd/bind/dist/lib/export/samples/sample-request.c | 14 +-
external/bsd/bind/dist/lib/export/samples/sample-update.c | 8 +-
external/bsd/bind/dist/lib/export/samples/sample.c | 26 +-
external/bsd/bind/dist/lib/irs/dnsconf.c | 8 +-
external/bsd/bind/dist/lib/irs/getaddrinfo.c | 30 +-
external/bsd/bind/dist/lib/irs/getnameinfo.c | 7 +-
external/bsd/bind/dist/lib/irs/resconf.c | 4 +-
external/bsd/bind/dist/lib/isc/buffer.c | 6 +-
external/bsd/bind/dist/lib/isc/include/isc/buffer.h | 20 +-
external/bsd/bind/dist/lib/isc/include/isc/file.h | 22 +-
external/bsd/bind/dist/lib/isc/include/isc/list.h | 6 +-
external/bsd/bind/dist/lib/isc/include/isc/mem.h | 21 +-
external/bsd/bind/dist/lib/isc/include/isc/namespace.h | 3 +-
external/bsd/bind/dist/lib/isc/include/isc/queue.h | 14 +-
external/bsd/bind/dist/lib/isc/include/isc/radix.h | 40 +-
external/bsd/bind/dist/lib/isc/include/isc/region.h | 13 +-
external/bsd/bind/dist/lib/isc/include/isc/sockaddr.h | 5 +-
external/bsd/bind/dist/lib/isc/include/isc/socket.h | 4 +-
external/bsd/bind/dist/lib/isc/include/isc/task.h | 4 +-
external/bsd/bind/dist/lib/isc/include/isc/timer.h | 19 +-
external/bsd/bind/dist/lib/isc/inet_aton.c | 6 +-
external/bsd/bind/dist/lib/isc/log.c | 11 +-
external/bsd/bind/dist/lib/isc/mem.c | 209 +-
external/bsd/bind/dist/lib/isc/parseint.c | 15 +-
external/bsd/bind/dist/lib/isc/pthreads/thread.c | 6 +-
external/bsd/bind/dist/lib/isc/radix.c | 39 +-
external/bsd/bind/dist/lib/isc/ratelimiter.c | 19 +-
external/bsd/bind/dist/lib/isc/sockaddr.c | 9 +-
external/bsd/bind/dist/lib/isc/socket_api.c | 46 +-
external/bsd/bind/dist/lib/isc/sparc64/include/isc/atomic.h | 23 +-
external/bsd/bind/dist/lib/isc/symtab.c | 12 +-
external/bsd/bind/dist/lib/isc/task.c | 100 +-
external/bsd/bind/dist/lib/isc/taskpool.c | 12 +-
external/bsd/bind/dist/lib/isc/tests/isctest.h | 6 +-
external/bsd/bind/dist/lib/isc/timer.c | 12 +-
external/bsd/bind/dist/lib/isc/timer_api.c | 8 +-
external/bsd/bind/dist/lib/isc/unix/entropy.c | 7 +-
external/bsd/bind/dist/lib/isc/unix/file.c | 23 +-
external/bsd/bind/dist/lib/isc/unix/include/isc/time.h | 8 +-
external/bsd/bind/dist/lib/isc/unix/net.c | 5 +-
external/bsd/bind/dist/lib/isc/unix/socket.c | 222 +-
external/bsd/bind/dist/lib/isc/unix/time.c | 10 +-
external/bsd/bind/dist/lib/isc/win32/dir.c | 7 +-
external/bsd/bind/dist/lib/isc/win32/entropy.c | 7 +-
external/bsd/bind/dist/lib/isc/win32/file.c | 27 +-
external/bsd/bind/dist/lib/isc/win32/fsaccess.c | 15 +-
external/bsd/bind/dist/lib/isc/win32/include/isc/time.h | 8 +-
external/bsd/bind/dist/lib/isc/win32/net.c | 5 +-
external/bsd/bind/dist/lib/isc/win32/ntgroups.c | 6 +-
external/bsd/bind/dist/lib/isc/win32/os.c | 8 +-
external/bsd/bind/dist/lib/isc/win32/socket.c | 177 +-
external/bsd/bind/dist/lib/isc/win32/time.c | 16 +-
external/bsd/bind/dist/lib/isc/win32/win32os.c | 8 +-
external/bsd/bind/dist/lib/isccc/cc.c | 49 +-
external/bsd/bind/dist/lib/isccfg/aclconf.c | 4 +-
external/bsd/bind/dist/lib/isccfg/include/isccfg/cfg.h | 8 +-
external/bsd/bind/dist/lib/isccfg/namedconf.c | 41 +-
external/bsd/bind/dist/lib/isccfg/parser.c | 21 +-
external/bsd/bind/dist/lib/lwres/context.c | 5 +-
external/bsd/bind/dist/lib/lwres/getaddrinfo.c | 18 +-
external/bsd/bind/dist/lib/lwres/getipnode.c | 16 +-
external/bsd/bind/dist/lib/lwres/getnameinfo.c | 6 +-
external/bsd/bind/dist/lib/lwres/getrrset.c | 56 +-
external/bsd/bind/dist/lib/lwres/lwinetaton.c | 8 +-
external/bsd/bind/dist/lib/lwres/print.c | 6 +-
external/bsd/bind/dist/lib/lwres/win32/lwconfig.c | 19 +-
external/bsd/bind/dist/lib/tests/t_api.c | 14 +-
external/bsd/bind/dist/libtool.m4 | 6656 ----
external/bsd/bind/dist/ltmain.sh | 10426 ++++--
external/bsd/bind/dist/make/rules.in | 10 +-
external/bsd/bind/dist/o | 1 -
external/bsd/bind/dist/srcid | 3 +-
external/bsd/bind/dist/version | 6 +-
external/bsd/bind/include/config.h | 9 +-
external/bsd/bind/include/dns/code.h | 112 +-
external/bsd/bind/include/dns/enumclass.h | 2 +-
external/bsd/bind/include/dns/enumtype.h | 14 +-
external/bsd/bind/include/dns/rdatastruct.h | 283 +-
external/bsd/bind/lib/libbind9/shlib_version | 4 +-
external/bsd/bind/lib/libdns/Makefile | 4 +-
external/bsd/bind/lib/libdns/shlib_version | 4 +-
external/bsd/bind/lib/libisc/Makefile | 5 +-
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 +-
298 files changed, 14258 insertions(+), 58164 deletions(-)
diffs (truncated from 88925 to 300 lines):
diff -r f56c118ac563 -r 0f4fafbb7cc1 external/bsd/bind/Makefile.inc
--- a/external/bsd/bind/Makefile.inc Sat Jul 27 19:22:10 2013 +0000
+++ b/external/bsd/bind/Makefile.inc Sat Jul 27 19:23:09 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2012/05/09 21:59:10 christos Exp $
+# $NetBSD: Makefile.inc,v 1.14 2013/07/27 19:23:09 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -89,10 +89,10 @@
.endif
.if ${NAMED_USE_OPENSSL} == "yes"
-CPPFLAGS+=-DOPENSSL
+CPPFLAGS+=-DOPENSSL -DGSSAPI -DUSE_ISC_SPNEGO
.if !defined (LIB) || empty(LIB)
-LDADD+= -lcrypto
-DPADD+= ${LIBCRYPTO}
+LDADD+= -lgssapi -lkrb5 -lcrypto
+DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBCRYPTO}
.else
.if exists(${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto)
LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
diff -r f56c118ac563 -r 0f4fafbb7cc1 external/bsd/bind/bin/named/Makefile
--- a/external/bsd/bind/bin/named/Makefile Sat Jul 27 19:22:10 2013 +0000
+++ b/external/bsd/bind/bin/named/Makefile Sat Jul 27 19:23:09 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/09/23 17:22:22 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2013/07/27 19:23:09 christos Exp $
.include <bsd.own.mk>
@@ -11,7 +11,10 @@
DIST=${IDIST}/bin/named
CPPFLAGS+=-I${DIST}/include -I${DIST}/unix/include -DCONFIGARGS=\"defaults\"
-CPPFLAGS+=-DNO_VERSION_DATE
+CPPFLAGS+=-DNO_VERSION_DATE -DPRODUCT=\"BIND\" -DSRCID=\"${SRCID}\"
+CPPFLAGS+=-DDESCRIPTION=\"\(Extended\ Support\ Version\)\"
+
+.include "${IDIST}/srcid"
.if defined(HAVE_GCC) || defined(HAVE_LLVM)
.for f in client
diff -r f56c118ac563 -r 0f4fafbb7cc1 external/bsd/bind/dist/CHANGES
--- a/external/bsd/bind/dist/CHANGES Sat Jul 27 19:22:10 2013 +0000
+++ b/external/bsd/bind/dist/CHANGES Sat Jul 27 19:23:09 2013 +0000
@@ -1,13 +1,499 @@
- --- 9.9.2-P1 released ---
-
-3407. [security] Named could die on specific queries with dns64 enabled.
- [Addressed in change #3388 for BIND 9.8.5 and 9.9.3.]
+ --- 9.9.3-P2 released ---
+
+3621. [security] Incorrect bounds checking on private type 'keydata'
+ can lead to a remotely triggerable REQUIRE failure
+ (CVE-2013-4854). [RT #34238]
+
+ --- 9.9.3-P1 released ---
+
+3584. [security] Caching data from an incompletely signed zone could
+ trigger an assertion failure in resolver.c [RT #33690]
+
+ --- 9.9.3 released ---
+
+3568. [cleanup] Add a product description line to the version file,
+ to be reported by named -v/-V. [RT #33366]
+
+3567. [bug] Silence clang static analyzer warnings. [RT #33365]
+
+3563. [contrib] zone2sqlite failed with some table names. [RT #33375]
+
+3561. [bug] dig: issue a warning if an EDNS query returns FORMERR
+ or NOTIMP. Adjust usage message. [RT #33363]
+
+ --- 9.9.3rc2 released ---
+
+3560. [bug] isc-config.sh did not honor includedir and libdir
+ when set via configure. [RT #33345]
+
+3559. [func] Check that both forms of Sender Policy Framework
+ records exist or do not exist. [RT #33355]
+
+3558. [bug] IXFR of a DLZ stored zone was broken. [RT #33331]
+
+3557. [bug] Reloading redirect zones was broken. [RT #33292]
+
+3556. [maint] Added AAAA for D.ROOT-SERVERS.NET.
+
+3555. [bug] Address theoretical race conditions in acache.c
+ (change #3553 was incomplete). [RT #33252]
+
+3553. [bug] Address suspected double free in acache. [RT #33252]
+
+3552. [bug] Wrong getopt option string for 'nsupdate -r'.
+ [RT #33280]
+
+3549. [doc] Documentation for "request-nsid" was missing.
+ [RT #33153]
+
+3548. [bug] The NSID request code in resolver.c was broken
+ resulting in invalid EDNS options being sent.
+ [RT #33153]
+
+3547. [bug] Some malformed unknown rdata records were not properly
+ detected and rejected. [RT #33129]
+
+ --- 9.9.3rc1 released ---
+
+3546. [func] Add EUI48 and EUI64 types. [RT #33082]
+
+3544. [contrib] check5011.pl: Script to report the status of
+ managed keys as recorded in managed-keys.bind.
+ Contributed by Tony Finch <dot%dotat.at@localhost>
+
+3543. [bug] Update socket structure before attaching to socket
+ manager after accept. [RT #33084]
+
+3541. [bug] Parts of libdns were not properly initialized when
+ built in libexport mode. [RT #33028]
+
+3540. [test] libt_api: t_info and t_assert were not thread safe.
+
+3539. [port] win32: timestamp format didn't match other platforms.
+
+3538. [test] Running "make test" now requires loopback interfaces
+ to be set up. [RT #32452]
+
+3537. [tuning] Slave zones, when updated, now send NOTIFY messages
+ to peers before being dumped to disk rather than
+ after. [RT #27242]
+
+3535. [bug] Minor win32 cleanups. [RT #32962]
+
+3534. [bug] Extra text after an embedded NULL was ignored when
+ parsing zone files. [RT #32699]
+
+3533. [contrib] query-loc-0.4.0: memory leaks. [RT #32960]
+
+3532. [contrib] zkt: fixed buffer overrun, resource leaks. [RT #32960]
+
+3531. [bug] win32: A uninitialized value could be returned on out
+ of memory. [RT #32960]
+
+3530. [contrib] Better RTT tracking in queryperf. [RT #30128]
+
+3528. [func] New "dnssec-coverage" command scans the timing
+ metadata for a set of DNSSEC keys and reports if a
+ lapse in signing coverage has been scheduled
+ inadvertently. (Note: This tool depends on python;
+ it will not be built or installed on systems that
+ do not have a python interpreter.) [RT #28098]
+
+3527. [compat] Add a URI to allow applications to explicitly
+ request a particular XML schema from the statistics
+ channel, returning 404 if not supported. [RT #32481]
+
+3526. [cleanup] Set up dependencies for unit tests correctly during
+ build. [RT #32803]
+
+3521. [bug] Address memory leak in opensslecdsa_link.c. [RT #32249]
+
+3520. [bug] 'mctx' was not being referenced counted in some places
+ where it should have been. [RT #32794]
+
+ --- 9.9.3b2 released ---
+
+3517. [bug] Reorder destruction to avoid shutdown race. [RT #32777]
+
+3515. [port] '%T' is not portable in strftime(). [RT #32763]
+
+3514. [bug] The ranges for valid key sizes in ddns-confgen and
+ rndc-confgen were too constrained. Keys up to 512
+ bits are now allowed for most algorithms, and up
+ to 1024 bits for hmac-sha384 and hmac-sha512.
+ [RT #32753]
+
+3511. [doc] Improve documentation of redirect zones. [RT #32756]
+
+3509. [cleanup] Added a product line to version file to allow for
+ easy naming of different products (BIND
+ vs BIND ESV, for example). [RT #32755]
+
+3508. [contrib] queryperf was incorrectly rejecting the -T option.
+ [RT #32338]
+
+3507. [bug] Statistics channel XSL (when built with
+ --enable-newstats) had a glitch when attempting
+ to chart query data before any queries had been
+ received. [RT #32620]
+
+3505. [bug] When setting "max-cache-size" and "max-acache-size",
+ larger values than 4 gigabytes could not be set
+ explicitly, though larger sizes were available
+ when setting cache size to 0. This has been
+ corrected; the full range is now available.
+ [RT #32358]
+
+3503. [doc] Clarify size_spec syntax. [RT #32449]
+
+3501. [func] zone-statistics now takes three options: full,
+ terse, and none. "yes" and "no" are retained as
+ synonyms for full and terse, respectively. [RT #29165]
+
+3500. [security] Support NAPTR regular expression validation on
+ all platforms without using libregex, which
+ can be vulnerable to memory exhaustion attack
+ (CVE-2013-2266). [RT #32688]
+
+3499. [doc] Corrected ARM documentation of built-in zones.
+ [RT #32694]
+
+3498. [bug] zone statistics for zones which matched a potential
+ empty zone could have their zone-statistics setting
+ overridden.
+
+3496. [func] Improvements to RPZ performance. The "response-policy"
+ syntax now includes a "min-ns-dots" clause, with
+ default 1, to exclude top-level domains from
+ NSIP and NSDNAME checking. --enable-rpz-nsip and
+ --enable-rpz-nsdname are now the default. [RT #32251]
+
+3493. [contrib] Added BDBHPT dynamically-lodable DLZ module,
+ contributed by Mark Goldfinch. [RT #32549]
+
+3492. [bug] Fixed a regression in zone loading performance
+ due to lock contention. [RT #30399]
+
+3491. [bug] Slave zones using inline-signing must specify a
+ file name. [RT #31946]
+
+3489. [bug] --enable-developer now turns on ISC_LIST_CHECKINIT.
+ When cloning a rdataset do not copy the link contents.
+ [RT #32651]
+
+3488. [bug] Use after free error with DH generated keys. [RT #32649]
+
+3487. [bug] Change 3444 was not complete. There was a additional
+ place where the NOQNAME proof needed to be saved.
+ [RT #32629]
+
+3486. [bug] named could crash when using TKEY-negotiated keys
+ that had been deleted and then recreated. [RT #32506]
+
+3485. [cleanup] Only compile openssl_gostlink.c if we support GOST.
+
+3483. [bug] Corrected XSL code in use with --enable-newstats.
+ [RT #32587]
+
+3481. [cleanup] Removed use of const const in atf.
+
+3480. [bug] Silence logging noise when setting up zone
+ statistics. [RT #32525]
+
+3479. [bug] Address potential memory leaks in gssapi support
+ code. [RT #32405]
+
+3478. [port] Fix a build failure in strict C99 environments
+ [RT #32475]
+
+3474. [bug] nsupdate could assert when the local and remote
+ address families didn't match. [RT #22897]
+
+3473. [bug] dnssec-signzone/verify could incorrectly report
+ an error condition due to an empty node above an
+ opt-out delegation lacking an NSEC3. [RT #32072]
+
+3471. [bug] The number of UDP dispatches now defaults to
+ the number of CPUs even if -n has been set to
+ a higher value. [RT #30964]
+
+3470. [bug] Slave zones could fail to dump when successfully
+ refreshing after an initial failure. [RT #31276]
+
+ --- 9.9.3b1 released ---
+
+3468. [security] RPZ rules to generate A records (but not AAAA records)
+ could trigger an assertion failure when used in
+ conjunction with DNS64 (CVE-2012-5689). [RT #32141]
+
+3467. [bug] Added checks in dnssec-keygen and dnssec-settime
+ to check for delete date < inactive date. [RT #31719]
+
+3466. [contrib] Corrected the DNS_CLIENTINFOMETHODS_VERSION check
+ in DLZ example driver. [RT #32275]
+
+3465. [bug] Handle isolated reserved ports. [RT #31778]
+
+3464. [maint] Updates to PKCS#11 openssl patches, supporting
+ versions 0.9.8x, 1.0.0j, 1.0.1c [RT #29749]
+
+3463. [doc] Clarify managed-keys syntax in ARM. [RT #32232]
+
+3462. [doc] Clarify server selection behavior of dig when using
+ -4 or -6 options. [RT #32181]
+
+3461. [bug] Negative responses could incorrectly have AD=1
+ set. [RT #32237]
+
+3460. [bug] Only link against readline where needed. [RT #29810]
Home |
Main Index |
Thread Index |
Old Index