CVSROOT:        /cvs
Module name:    src
Changes by:     st...@cvs.openbsd.org   2014/03/16 05:43:29

Modified files:
        usr.sbin/unbound: Makefile.bsd-wrapper Makefile.in configure 
                          configure.ac 
        usr.sbin/unbound/daemon: remote.c remote.h unbound.c worker.c 
                                 worker.h 
        usr.sbin/unbound/doc: Changelog unbound-host.1 
        usr.sbin/unbound/iterator: iter_hints.c 
        usr.sbin/unbound/libunbound: libworker.c 
        usr.sbin/unbound/services: listen_dnsport.c listen_dnsport.h 
        usr.sbin/unbound/smallapp: worker_cb.c 
        usr.sbin/unbound/util: fptr_wlist.c fptr_wlist.h netevent.c 
                               netevent.h 
Removed files:
        usr.sbin/unbound/ldns: Changelog LICENSE Makefile.in README 
                               README.git README.snapshots aclocal.m4 
                               acx_nlnetlabs.m4 ax_pkg_swig.m4 
                               ax_python_devel.m4 buffer.c config.guess 
                               config.sub configure configure.ac dane.c 
                               dname.c dnssec.c dnssec_sign.c 
                               dnssec_verify.c dnssec_zone.c duration.c 
                               error.c higher.c host2str.c host2wire.c 
                               install-sh keys.c libdns.doxygen 
                               libdns.vim linktest.c ltmain.sh net.c 
                               packet.c radix.c rbtree.c rdata.c 
                               resolver.c rr.c rr_functions.c sha1.c 
                               sha2.c str2host.c tsig.c update.c util.c 
                               wire2host.c zone.c 
        usr.sbin/unbound/ldns/compat: b64_ntop.c b64_pton.c calloc.c 
                                      ctime_r.c fake-rfc2553.c 
                                      fake-rfc2553.h gmtime_r.c 
                                      inet_aton.c inet_ntop.c 
                                      inet_pton.c isascii.c isblank.c 
                                      localtime_r.c malloc.c memmove.c 
                                      realloc.c snprintf.c strlcpy.c 
                                      timegm.c 
        usr.sbin/unbound/ldns/doc: API-header.xml API.xml CodingStyle 
                                   TODO design.dox 
                                   dns-lib-implementations doxyparse.pl 
                                   function_manpages header.html 
                                   libdns.css tutorial1_mx.dox 
                                   tutorial2_zone.dox 
                                   tutorial3_signzone.dox 
        usr.sbin/unbound/ldns/drill: ChangeLog.22-nov-2005 Makefile.in 
                                     README REGRESSIONS chasetrace.c 
                                     config.h.in configure configure.ac 
                                     dnssec.c drill.1.in drill.c drill.h 
                                     drill_util.c drill_util.h error.c 
                                     install-sh root.c securetrace.c 
                                     work.c 
        usr.sbin/unbound/ldns/ldns: buffer.h common.h.in config.h.in 
                                    dane.h dname.h dnssec.h 
                                    dnssec_sign.h dnssec_verify.h 
                                    dnssec_zone.h duration.h error.h 
                                    higher.h host2str.h host2wire.h 
                                    keys.h ldns.h net.h.in packet.h 
                                    parse.h radix.h rbtree.h rdata.h 
                                    resolver.h rr.h rr_functions.h 
                                    sha1.h sha2.h str2host.h tsig.h 
                                    update.h util.h.in wire2host.h 
                                    zone.h 
        usr.sbin/unbound/ldns/packaging: ldns-config.1 ldns-config.in 
                                         libldns.pc.in 

Log message:
merge conflicts, remove old libldns files

Reply via email to