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