Module Name: src
Committed By: christos
Date: Sun Apr 28 00:01:16 UTC 2019
Modified Files:
src/external/mpl/bind/dist: bind.keys.h config.h.in configure
src/external/mpl/bind/dist/bin/check: named-checkconf.c
src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.c dnssec-dsfromkey.c
dnssec-keygen.8 dnssec-keygen.c
src/external/mpl/bind/dist/bin/named: named.conf.5 server.c
src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c
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/tools: dnstap-read.c
src/external/mpl/bind/dist/contrib/dlz/drivers: dlz_filesystem_driver.c
src/external/mpl/bind/dist/contrib/dlz/modules/filesystem:
dlz_filesystem_dynamic.c
src/external/mpl/bind/dist/lib/bind9: check.c
src/external/mpl/bind/dist/lib/dns: byaddr.c client.c dnstap.c ds.c
gen.c message.c resolver.c rpz.c sdlz.c validator.c zone.c
src/external/mpl/bind/dist/lib/dns/include/dns: dnstap.h ds.h ecs.h
rpz.h
src/external/mpl/bind/dist/lib/dns/rdata/generic: ds_43.h key_25.h
keydata_65533.h
src/external/mpl/bind/dist/lib/dns/rdata/in_1: eid_31.c nimloc_32.c
src/external/mpl/bind/dist/lib/dns/tests: dnstap_test.c rdata_test.c
result_test.c
src/external/mpl/bind/dist/lib/isc: lex.c quota.c result.c
src/external/mpl/bind/dist/lib/isc/include/isc: quota.h result.h util.h
src/external/mpl/bind/dist/lib/isc/tests: netaddr_test.c result_test.c
src/external/mpl/bind/dist/lib/isc/unix: errno2result.c socket.c
src/external/mpl/bind/dist/lib/isc/win32: errno2result.c
src/external/mpl/bind/dist/lib/isccc/tests: result_test.c
src/external/mpl/bind/dist/lib/isccfg: namedconf.c
src/external/mpl/bind/dist/lib/ns: client.c hooks.c interfacemgr.c
query.c
src/external/mpl/bind/dist/lib/ns/include/ns: client.h hooks.h
interfacemgr.h
src/external/mpl/bind/include: config.h
src/external/mpl/bind/include/dns: 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: Makefile shlib_version
Removed Files:
src/external/mpl/bind/dist/bin/tests/system/checkconf:
bad-allow-update-forwarding-view.conf
bad-allow-update-forwarding.conf bad-allow-update-view.conf
bad-allow-update.conf
src/external/mpl/bind/dist/bin/tests/system/dlz: prereq.sh.in
Log Message:
merge conflicts, bump versions, sync includes
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bind.keys.h
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/config.h.in \
src/external/mpl/bind/dist/configure
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/bin/check/named-checkconf.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/dnssec/dnssec-cds.c \
src/external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c \
src/external/mpl/bind/dist/bin/dnssec/dnssec-keygen.8 \
src/external/mpl/bind/dist/bin/dnssec/dnssec-keygen.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/named/named.conf.5 \
src/external/mpl/bind/dist/bin/named/server.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/nsupdate/nsupdate.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/bind/dist/bin/tests/system/feature-test.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mpl/bind/dist/bin/tests/system/checkconf/bad-allow-update-forwarding-view.conf
\
src/external/mpl/bind/dist/bin/tests/system/checkconf/bad-allow-update-forwarding.conf
\
src/external/mpl/bind/dist/bin/tests/system/checkconf/bad-allow-update-view.conf
\
src/external/mpl/bind/dist/bin/tests/system/checkconf/bad-allow-update.conf
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mpl/bind/dist/bin/tests/system/dlz/prereq.sh.in
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/tools/dnstap-read.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/contrib/dlz/drivers/dlz_filesystem_driver.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/bind9/check.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/dns/byaddr.c \
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/rpz.c \
src/external/mpl/bind/dist/lib/dns/sdlz.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/dns/dnstap.c \
src/external/mpl/bind/dist/lib/dns/ds.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/validator.c \
src/external/mpl/bind/dist/lib/dns/zone.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/lib/dns/include/dns/dnstap.h \
src/external/mpl/bind/dist/lib/dns/include/dns/ds.h \
src/external/mpl/bind/dist/lib/dns/include/dns/ecs.h \
src/external/mpl/bind/dist/lib/dns/include/dns/rpz.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/lib/dns/rdata/generic/ds_43.h \
src/external/mpl/bind/dist/lib/dns/rdata/generic/key_25.h \
src/external/mpl/bind/dist/lib/dns/rdata/generic/keydata_65533.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/lib/dns/rdata/in_1/eid_31.c \
src/external/mpl/bind/dist/lib/dns/rdata/in_1/nimloc_32.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/lib/dns/tests/dnstap_test.c
cvs rdiff -u -r1.4 -r1.5 \
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/result_test.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/lex.c \
src/external/mpl/bind/dist/lib/isc/quota.c \
src/external/mpl/bind/dist/lib/isc/result.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/bind/dist/lib/isc/include/isc/quota.h \
src/external/mpl/bind/dist/lib/isc/include/isc/result.h \
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/netaddr_test.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/bind/dist/lib/isc/tests/result_test.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/lib/isc/unix/errno2result.c
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/isc/unix/socket.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/lib/isc/win32/errno2result.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/lib/isccc/tests/result_test.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isccfg/namedconf.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/ns/client.c \
src/external/mpl/bind/dist/lib/ns/query.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/ns/hooks.c \
src/external/mpl/bind/dist/lib/ns/interfacemgr.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/bind/dist/lib/ns/include/ns/client.h
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/ns/include/ns/hooks.h \
src/external/mpl/bind/dist/lib/ns/include/ns/interfacemgr.h
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/include/config.h
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/include/dns/rdatastruct.h
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/lib/libbind9/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/lib/libdns/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/lib/libirs/shlib_version
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/lib/libisc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/lib/libisc/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/lib/libisccc/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/lib/libisccfg/shlib_version
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/lib/libns/Makefile
cvs rdiff -u -r1.3 -r1.4 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.
