CVS commit: src/external/mpl/bind

To: source-changes%NetBSD.org@localhost
Subject: CVS commit: src/external/mpl/bind
From: "Christos Zoulas" <christos%netbsd.org@localhost>
Date: Thu, 5 Sep 2019 15:33:02 -0400
Module Name:    src
Committed By:   christos
Date:           Thu Sep  5 19:33:01 UTC 2019

Modified Files:
        src/external/mpl/bind/dist: Makefile.in config.h.in configure
        src/external/mpl/bind/dist/bin/dig: dig.1 dig.c dighost.c
        src/external/mpl/bind/dist/bin/named: bind9.xsl.h config.c fuzz.c
            geoip.c named.conf.5 server.c statschannel.c zoneconf.c
        src/external/mpl/bind/dist/bin/named/include/named: geoip.h globals.h
        src/external/mpl/bind/dist/bin/named/unix: dlz_dlopen_driver.c
        src/external/mpl/bind/dist/bin/named/win32: ntservice.c os.c
        src/external/mpl/bind/dist/bin/pkcs11: pkcs11-keygen.c
        src/external/mpl/bind/dist/bin/plugins: filter-aaaa.c
        src/external/mpl/bind/dist/bin/rndc: rndc.8
        src/external/mpl/bind/dist/bin/tests/system: feature-test.c
        src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c
        src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: driver.c
        src/external/mpl/bind/dist/bin/tools: dnstap-read.c mdig.c
        src/external/mpl/bind/dist/contrib/dlz/modules/common: dlz_dbi.c
        src/external/mpl/bind/dist/fuzz: dns_rdata_fromwire_text.c
        src/external/mpl/bind/dist/lib/bind9: check.c
        src/external/mpl/bind/dist/lib/dns: acl.c client.c dispatch.c dnstap.c
            gen-unix.h gen.c geoip2.c master.c masterdump.c message.c name.c
            openssleddsa_link.c rbtdb.c rdata.c resolver.c rpz.c stats.c
            update.c view.c zone.c
        src/external/mpl/bind/dist/lib/dns/include/dns: acl.h clientinfo.h
            ecs.h geoip.h message.h resolver.h rpz.h stats.h types.h view.h
            zone.h
        src/external/mpl/bind/dist/lib/dns/rdata/generic: ds_43.c key_25.c
            opt_41.c sshfp_44.c
        src/external/mpl/bind/dist/lib/dns/tests: acl_test.c db_test.c
            dbdiff_test.c dbiterator_test.c dbversion_test.c dh_test.c
            dispatch_test.c dnstap_test.c dnstest.c dst_test.c geoip_test.c
            keytable_test.c master_test.c name_test.c nsec3_test.c peer_test.c
            private_test.c rbt_serialize_test.c rbt_test.c rdata_test.c
            rdataset_test.c rdatasetstats_test.c resolver_test.c result_test.c
            rsa_test.c sigs_test.c time_test.c tkey_test.c tsig_test.c
            update_test.c zonemgr_test.c zt_test.c
        src/external/mpl/bind/dist/lib/irs/tests: resconf_test.c
        src/external/mpl/bind/dist/lib/isc: hash.c ht.c mem.c rwlock.c
            siphash.c sockaddr.c stats.c task.c
        src/external/mpl/bind/dist/lib/isc/include/isc: endian.h hash.h
            siphash.h util.h
        src/external/mpl/bind/dist/lib/isc/tests: aes_test.c buffer_test.c
            counter_test.c crc64_test.c errno_test.c hash_test.c heap_test.c
            hmac_test.c ht_test.c lex_test.c mem_test.c netaddr_test.c
            parse_test.c pool_test.c queue_test.c radix_test.c random_test.c
            regex_test.c result_test.c safe_test.c siphash_test.c
            sockaddr_test.c socket_test.c symtab_test.c task_test.c
            taskpool_test.c time_test.c timer_test.c
        src/external/mpl/bind/dist/lib/isc/unix: socket.c
        src/external/mpl/bind/dist/lib/isccc/tests: result_test.c
        src/external/mpl/bind/dist/lib/isccfg: aclconf.c namedconf.c parser.c
        src/external/mpl/bind/dist/lib/isccfg/include/isccfg: aclconf.h
        src/external/mpl/bind/dist/lib/isccfg/tests: parser_test.c
        src/external/mpl/bind/dist/lib/ns: client.c interfacemgr.c query.c
            xfrout.c
        src/external/mpl/bind/dist/lib/ns/include/ns: client.h interfacemgr.h
            types.h
        src/external/mpl/bind/dist/lib/ns/tests: listenlist_test.c
            notify_test.c plugin_test.c query_test.c
        src/external/mpl/bind/include: config.h
        src/external/mpl/bind/include/dns: code.h enumtype.h rdatastruct.h
        src/external/mpl/bind/lib/libbind9: shlib_version
        src/external/mpl/bind/lib/libdns: shlib_version
        src/external/mpl/bind/lib/libirs: shlib_version
        src/external/mpl/bind/lib/libisc: Makefile shlib_version
        src/external/mpl/bind/lib/libisccc: shlib_version
        src/external/mpl/bind/lib/libisccfg: shlib_version
        src/external/mpl/bind/lib/libns: shlib_version
Removed Files:
        src/external/mpl/bind/dist/bin/tests/system/wildcard/ns2: hints
        src/external/mpl/bind/dist/bin/tests/system/wildcard/ns3: hints
        src/external/mpl/bind/dist/bin/tests/system/wildcard/ns5: hints
        src/external/mpl/bind/dist/lib/dns/rdata/generic: unspec_103.c
            unspec_103.h

Log Message:
Merge conflicts and fix the build.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/Makefile.in
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/config.h.in \
    src/external/mpl/bind/dist/configure
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/dig/dig.1 \
    src/external/mpl/bind/dist/bin/dig/dighost.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/dig/dig.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/named/bind9.xsl.h \
    src/external/mpl/bind/dist/bin/named/fuzz.c \
    src/external/mpl/bind/dist/bin/named/statschannel.c \
    src/external/mpl/bind/dist/bin/named/zoneconf.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/named/config.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/bin/named/geoip.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/named/named.conf.5
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/bin/named/server.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/mpl/bind/dist/bin/named/include/named/geoip.h
cvs rdiff -u -r1.4 -r1.5 \
    src/external/mpl/bind/dist/bin/named/include/named/globals.h
cvs rdiff -u -r1.4 -r1.5 \
    src/external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/mpl/bind/dist/bin/named/win32/ntservice.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/named/win32/os.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/mpl/bind/dist/bin/pkcs11/pkcs11-keygen.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/plugins/filter-aaaa.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/rndc/rndc.8
cvs rdiff -u -r1.5 -r1.6 \
    src/external/mpl/bind/dist/bin/tests/system/feature-test.c
cvs rdiff -u -r1.5 -r1.6 \
    src/external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/mpl/bind/dist/bin/tests/system/dyndb/driver/driver.c
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/mpl/bind/dist/bin/tests/system/wildcard/ns2/hints
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/mpl/bind/dist/bin/tests/system/wildcard/ns3/hints
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/mpl/bind/dist/bin/tests/system/wildcard/ns5/hints
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/tools/dnstap-read.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/tools/mdig.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/mpl/bind/dist/contrib/dlz/modules/common/dlz_dbi.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/mpl/bind/dist/fuzz/dns_rdata_fromwire_text.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/bind9/check.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/dns/acl.c \
    src/external/mpl/bind/dist/lib/dns/dispatch.c \
    src/external/mpl/bind/dist/lib/dns/gen-unix.h \
    src/external/mpl/bind/dist/lib/dns/master.c \
    src/external/mpl/bind/dist/lib/dns/name.c \
    src/external/mpl/bind/dist/lib/dns/openssleddsa_link.c \
    src/external/mpl/bind/dist/lib/dns/stats.c \
    src/external/mpl/bind/dist/lib/dns/update.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/dns/client.c \
    src/external/mpl/bind/dist/lib/dns/gen.c \
    src/external/mpl/bind/dist/lib/dns/masterdump.c \
    src/external/mpl/bind/dist/lib/dns/rbtdb.c \
    src/external/mpl/bind/dist/lib/dns/rdata.c \
    src/external/mpl/bind/dist/lib/dns/rpz.c \
    src/external/mpl/bind/dist/lib/dns/view.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/dns/dnstap.c \
    src/external/mpl/bind/dist/lib/dns/message.c \
    src/external/mpl/bind/dist/lib/dns/resolver.c \
    src/external/mpl/bind/dist/lib/dns/zone.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mpl/bind/dist/lib/dns/geoip2.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/dns/include/dns/acl.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/clientinfo.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/geoip.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/stats.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/types.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/view.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/zone.h
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/dns/include/dns/ecs.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/message.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/resolver.h \
    src/external/mpl/bind/dist/lib/dns/include/dns/rpz.h
cvs rdiff -u -r1.4 -r1.5 \
    src/external/mpl/bind/dist/lib/dns/rdata/generic/ds_43.c \
    src/external/mpl/bind/dist/lib/dns/rdata/generic/key_25.c \
    src/external/mpl/bind/dist/lib/dns/rdata/generic/sshfp_44.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/mpl/bind/dist/lib/dns/rdata/generic/opt_41.c
cvs rdiff -u -r1.3 -r0 \
    src/external/mpl/bind/dist/lib/dns/rdata/generic/unspec_103.c \
    src/external/mpl/bind/dist/lib/dns/rdata/generic/unspec_103.h
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/dns/tests/acl_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/db_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/dbdiff_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/dbiterator_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/dh_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/geoip_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/keytable_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/master_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/name_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/nsec3_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/peer_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/private_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/rbt_serialize_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/rbt_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/rdatasetstats_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/resolver_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/result_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/sigs_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/time_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/tsig_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/zonemgr_test.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/mpl/bind/dist/lib/dns/tests/dbversion_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/dispatch_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/dnstap_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/dnstest.c \
    src/external/mpl/bind/dist/lib/dns/tests/rdataset_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/rsa_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/update_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/zt_test.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/dns/tests/dst_test.c \
    src/external/mpl/bind/dist/lib/dns/tests/rdata_test.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/dns/tests/tkey_test.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/mpl/bind/dist/lib/irs/tests/resconf_test.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isc/hash.c \
    src/external/mpl/bind/dist/lib/isc/ht.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/mem.c \
    src/external/mpl/bind/dist/lib/isc/sockaddr.c \
    src/external/mpl/bind/dist/lib/isc/stats.c \
    src/external/mpl/bind/dist/lib/isc/task.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isc/rwlock.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mpl/bind/dist/lib/isc/siphash.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/mpl/bind/dist/lib/isc/include/isc/endian.h \
    src/external/mpl/bind/dist/lib/isc/include/isc/siphash.h
cvs rdiff -u -r1.3 -r1.4 \
    src/external/mpl/bind/dist/lib/isc/include/isc/hash.h
cvs rdiff -u -r1.5 -r1.6 \
    src/external/mpl/bind/dist/lib/isc/include/isc/util.h
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isc/tests/aes_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/errno_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/hash_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/ht_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/mem_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/parse_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/queue_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/radix_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/random_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/safe_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/sockaddr_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/symtab_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/task_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/time_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/timer_test.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/mpl/bind/dist/lib/isc/tests/buffer_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/counter_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/heap_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/lex_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/netaddr_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/pool_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/socket_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/taskpool_test.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/mpl/bind/dist/lib/isc/tests/crc64_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/hmac_test.c
cvs rdiff -u -r1.5 -r1.6 \
    src/external/mpl/bind/dist/lib/isc/tests/regex_test.c \
    src/external/mpl/bind/dist/lib/isc/tests/result_test.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/mpl/bind/dist/lib/isc/tests/siphash_test.c
cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/lib/isc/unix/socket.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/mpl/bind/dist/lib/isccc/tests/result_test.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isccfg/aclconf.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isccfg/namedconf.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isccfg/parser.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/mpl/bind/dist/lib/isccfg/include/isccfg/aclconf.h
cvs rdiff -u -r1.4 -r1.5 \
    src/external/mpl/bind/dist/lib/isccfg/tests/parser_test.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/ns/client.c \
    src/external/mpl/bind/dist/lib/ns/query.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/ns/interfacemgr.c \
    src/external/mpl/bind/dist/lib/ns/xfrout.c
cvs rdiff -u -r1.5 -r1.6 \
    src/external/mpl/bind/dist/lib/ns/include/ns/client.h
cvs rdiff -u -r1.4 -r1.5 \
    src/external/mpl/bind/dist/lib/ns/include/ns/interfacemgr.h
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/ns/include/ns/types.h
cvs rdiff -u -r1.3 -r1.4 \
    src/external/mpl/bind/dist/lib/ns/tests/listenlist_test.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/mpl/bind/dist/lib/ns/tests/notify_test.c \
    src/external/mpl/bind/dist/lib/ns/tests/query_test.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
    src/external/mpl/bind/dist/lib/ns/tests/plugin_test.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/include/config.h
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/include/dns/code.h \
    src/external/mpl/bind/include/dns/enumtype.h
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/include/dns/rdatastruct.h
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/lib/libbind9/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/lib/libdns/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/lib/libirs/shlib_version
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/lib/libisc/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/lib/libisc/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/lib/libisccc/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/lib/libisccfg/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/lib/libns/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Prev by Date: CVS import: src/external/mpl/bind/dist
Next by Date: CVS commit: src/doc
Previous by Thread: CVS import: src/external/mpl/bind/dist
Next by Thread: CVS commit: src/doc
Indexes:
Home | Main Index | Thread Index | Old Index