CVSROOT: /cvs
Module name: src
Changes by: [email protected] 2015/11/05 14:28:02
Log message:
update to unbound 1.5.6, ok millert@ florian@
Status:
Vendor Tag: NLNETLABS
Release Tags: UNBOUND_1_5_6
N src/usr.sbin/nsd/aclocal.m4
U src/usr.sbin/nsd/LICENSE
N src/usr.sbin/nsd/config.sub
C src/usr.sbin/nsd/configure.ac
N src/usr.sbin/nsd/ltmain.sh
N src/usr.sbin/nsd/ac_pkg_swig.m4
C src/usr.sbin/nsd/Makefile.in
C src/usr.sbin/nsd/configure
N src/usr.sbin/nsd/ax_pthread.m4
N src/usr.sbin/nsd/config.guess
U src/usr.sbin/nsd/install-sh
N src/usr.sbin/nsd/acx_python.m4
C src/usr.sbin/nsd/config.h.in
N src/usr.sbin/nsd/README
U src/usr.sbin/nsd/acx_nlnetlabs.m4
N src/usr.sbin/nsd/doc/Changelog
N src/usr.sbin/nsd/doc/TODO
N src/usr.sbin/nsd/doc/unbound-checkconf.8.in
N src/usr.sbin/nsd/doc/control_proto_spec.txt
N src/usr.sbin/nsd/doc/LICENSE
N src/usr.sbin/nsd/doc/unbound.doxygen
N src/usr.sbin/nsd/doc/ietf67-design-02.pdf
N src/usr.sbin/nsd/doc/ietf67-design-02.odp
N src/usr.sbin/nsd/doc/FEATURES
N src/usr.sbin/nsd/doc/unbound-host.1.in
N src/usr.sbin/nsd/doc/libunbound.3.in
N src/usr.sbin/nsd/doc/README.tests
N src/usr.sbin/nsd/doc/README.DNS64
N src/usr.sbin/nsd/doc/unbound.8.in
N src/usr.sbin/nsd/doc/unbound.conf.5.in
N src/usr.sbin/nsd/doc/README.svn
N src/usr.sbin/nsd/doc/requirements.txt
N src/usr.sbin/nsd/doc/example.conf.in
N src/usr.sbin/nsd/doc/README
N src/usr.sbin/nsd/doc/unbound-control.8.in
N src/usr.sbin/nsd/doc/CREDITS
N src/usr.sbin/nsd/doc/unbound-anchor.8.in
N src/usr.sbin/nsd/util/alloc.c
N src/usr.sbin/nsd/util/net_help.h
N src/usr.sbin/nsd/util/log.c
N src/usr.sbin/nsd/util/config_file.c
N src/usr.sbin/nsd/util/rtt.c
N src/usr.sbin/nsd/util/locks.c
N src/usr.sbin/nsd/util/iana_ports.inc
N src/usr.sbin/nsd/util/tube.c
N src/usr.sbin/nsd/util/config_file.h
N src/usr.sbin/nsd/util/random.h
N src/usr.sbin/nsd/util/tube.h
N src/usr.sbin/nsd/util/random.c
N src/usr.sbin/nsd/util/winsock_event.c
N src/usr.sbin/nsd/util/mini_event.h
N src/usr.sbin/nsd/util/configyyrename.h
N src/usr.sbin/nsd/util/configparser.y
N src/usr.sbin/nsd/util/rtt.h
N src/usr.sbin/nsd/util/locks.h
N src/usr.sbin/nsd/util/regional.h
N src/usr.sbin/nsd/util/module.h
N src/usr.sbin/nsd/util/winsock_event.h
N src/usr.sbin/nsd/util/netevent.h
N src/usr.sbin/nsd/util/rbtree.h
N src/usr.sbin/nsd/util/mini_event.c
N src/usr.sbin/nsd/util/regional.c
N src/usr.sbin/nsd/util/netevent.c
N src/usr.sbin/nsd/util/log.h
N src/usr.sbin/nsd/util/timehist.h
N src/usr.sbin/nsd/util/fptr_wlist.c
N src/usr.sbin/nsd/util/timehist.c
N src/usr.sbin/nsd/util/fptr_wlist.h
N src/usr.sbin/nsd/util/alloc.h
N src/usr.sbin/nsd/util/net_help.c
N src/usr.sbin/nsd/util/configlexer.lex
N src/usr.sbin/nsd/util/module.c
N src/usr.sbin/nsd/util/rbtree.c
N src/usr.sbin/nsd/util/data/msgreply.c
N src/usr.sbin/nsd/util/data/msgencode.c
N src/usr.sbin/nsd/util/data/msgparse.h
N src/usr.sbin/nsd/util/data/msgreply.h
N src/usr.sbin/nsd/util/data/packed_rrset.c
N src/usr.sbin/nsd/util/data/dname.h
N src/usr.sbin/nsd/util/data/msgencode.h
N src/usr.sbin/nsd/util/data/dname.c
N src/usr.sbin/nsd/util/data/packed_rrset.h
N src/usr.sbin/nsd/util/data/msgparse.c
N src/usr.sbin/nsd/util/storage/slabhash.h
N src/usr.sbin/nsd/util/storage/lruhash.h
N src/usr.sbin/nsd/util/storage/dnstree.h
N src/usr.sbin/nsd/util/storage/slabhash.c
N src/usr.sbin/nsd/util/storage/lruhash.c
N src/usr.sbin/nsd/util/storage/dnstree.c
N src/usr.sbin/nsd/util/storage/lookup3.c
N src/usr.sbin/nsd/util/storage/lookup3.h
N src/usr.sbin/nsd/iterator/iterator.h
N src/usr.sbin/nsd/iterator/iter_delegpt.c
N src/usr.sbin/nsd/iterator/iter_priv.c
N src/usr.sbin/nsd/iterator/iter_utils.h
N src/usr.sbin/nsd/iterator/iter_donotq.c
N src/usr.sbin/nsd/iterator/iter_priv.h
N src/usr.sbin/nsd/iterator/iterator.c
N src/usr.sbin/nsd/iterator/iter_hints.c
N src/usr.sbin/nsd/iterator/iter_scrub.c
N src/usr.sbin/nsd/iterator/iter_delegpt.h
N src/usr.sbin/nsd/iterator/iter_resptype.c
N src/usr.sbin/nsd/iterator/iter_fwd.h
N src/usr.sbin/nsd/iterator/iter_fwd.c
N src/usr.sbin/nsd/iterator/iter_scrub.h
N src/usr.sbin/nsd/iterator/iter_donotq.h
N src/usr.sbin/nsd/iterator/iter_hints.h
N src/usr.sbin/nsd/iterator/iter_resptype.h
N src/usr.sbin/nsd/iterator/iter_utils.c
N src/usr.sbin/nsd/smallapp/unbound-control.c
N src/usr.sbin/nsd/smallapp/unbound-host.c
N src/usr.sbin/nsd/smallapp/worker_cb.c
N src/usr.sbin/nsd/smallapp/unbound-checkconf.c
N src/usr.sbin/nsd/smallapp/unbound-control-setup.sh.in
N src/usr.sbin/nsd/smallapp/unbound-anchor.c
N src/usr.sbin/nsd/sldns/parseutil.h
N src/usr.sbin/nsd/sldns/keyraw.c
N src/usr.sbin/nsd/sldns/str2wire.h
N src/usr.sbin/nsd/sldns/rrdef.h
N src/usr.sbin/nsd/sldns/parse.h
N src/usr.sbin/nsd/sldns/parseutil.c
N src/usr.sbin/nsd/sldns/str2wire.c
N src/usr.sbin/nsd/sldns/rrdef.c
N src/usr.sbin/nsd/sldns/keyraw.h
N src/usr.sbin/nsd/sldns/pkthdr.h
N src/usr.sbin/nsd/sldns/wire2str.h
N src/usr.sbin/nsd/sldns/sbuffer.h
N src/usr.sbin/nsd/sldns/sbuffer.c
N src/usr.sbin/nsd/sldns/parse.c
N src/usr.sbin/nsd/sldns/wire2str.c
N src/usr.sbin/nsd/dns64/dns64.c
N src/usr.sbin/nsd/dns64/dns64.h
N src/usr.sbin/nsd/dnstap/dnstap_config.h.in
N src/usr.sbin/nsd/dnstap/dnstap.m4
N src/usr.sbin/nsd/dnstap/dnstap.h
N src/usr.sbin/nsd/dnstap/dnstap.c
N src/usr.sbin/nsd/dnstap/dnstap.proto
N src/usr.sbin/nsd/services/modstack.h
N src/usr.sbin/nsd/services/listen_dnsport.h
N src/usr.sbin/nsd/services/localzone.h
N src/usr.sbin/nsd/services/outbound_list.h
N src/usr.sbin/nsd/services/localzone.c
N src/usr.sbin/nsd/services/listen_dnsport.c
N src/usr.sbin/nsd/services/outbound_list.c
N src/usr.sbin/nsd/services/outside_network.h
N src/usr.sbin/nsd/services/mesh.c
N src/usr.sbin/nsd/services/outside_network.c
N src/usr.sbin/nsd/services/modstack.c
N src/usr.sbin/nsd/services/mesh.h
N src/usr.sbin/nsd/services/cache/rrset.h
N src/usr.sbin/nsd/services/cache/infra.h
N src/usr.sbin/nsd/services/cache/dns.c
N src/usr.sbin/nsd/services/cache/dns.h
N src/usr.sbin/nsd/services/cache/rrset.c
N src/usr.sbin/nsd/services/cache/infra.c
N src/usr.sbin/nsd/validator/val_anchor.h
N src/usr.sbin/nsd/validator/validator.c
N src/usr.sbin/nsd/validator/val_anchor.c
N src/usr.sbin/nsd/validator/autotrust.h
N src/usr.sbin/nsd/validator/val_neg.c
N src/usr.sbin/nsd/validator/val_utils.c
N src/usr.sbin/nsd/validator/val_nsec.h
N src/usr.sbin/nsd/validator/val_kcache.c
N src/usr.sbin/nsd/validator/val_neg.h
N src/usr.sbin/nsd/validator/val_sigcrypt.c
N src/usr.sbin/nsd/validator/val_kcache.h
N src/usr.sbin/nsd/validator/val_nsec.c
N src/usr.sbin/nsd/validator/val_secalgo.h
N src/usr.sbin/nsd/validator/validator.h
N src/usr.sbin/nsd/validator/val_nsec3.h
N src/usr.sbin/nsd/validator/val_kentry.h
N src/usr.sbin/nsd/validator/val_utils.h
N src/usr.sbin/nsd/validator/val_kentry.c
N src/usr.sbin/nsd/validator/val_sigcrypt.h
N src/usr.sbin/nsd/validator/autotrust.c
N src/usr.sbin/nsd/validator/val_secalgo.c
N src/usr.sbin/nsd/validator/val_nsec3.c
N src/usr.sbin/nsd/daemon/worker.c
N src/usr.sbin/nsd/daemon/worker.h
N src/usr.sbin/nsd/daemon/remote.h
N src/usr.sbin/nsd/daemon/remote.c
N src/usr.sbin/nsd/daemon/stats.c
N src/usr.sbin/nsd/daemon/stats.h
N src/usr.sbin/nsd/daemon/cachedump.h
N src/usr.sbin/nsd/daemon/daemon.h
N src/usr.sbin/nsd/daemon/unbound.c
N src/usr.sbin/nsd/daemon/acl_list.h
N src/usr.sbin/nsd/daemon/acl_list.c
N src/usr.sbin/nsd/daemon/daemon.c
N src/usr.sbin/nsd/daemon/cachedump.c
N src/usr.sbin/nsd/libunbound/ubsyms.def
N src/usr.sbin/nsd/libunbound/worker.h
N src/usr.sbin/nsd/libunbound/unbound.h
N src/usr.sbin/nsd/libunbound/libworker.h
N src/usr.sbin/nsd/libunbound/libunbound.c
N src/usr.sbin/nsd/libunbound/context.c
N src/usr.sbin/nsd/libunbound/unbound-event.h
N src/usr.sbin/nsd/libunbound/libworker.c
N src/usr.sbin/nsd/libunbound/context.h
4 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jNLNETLABS:yesterday -jNLNETLABS src/usr.sbin/nsd
