Module Name: src Committed By: christos Date: Sun Feb 24 20:01:33 UTC 2019
Modified Files: src/external/mpl/bind: bind2netbsd src/external/mpl/bind/dist: config.h.in configure isc-config.sh.1 src/external/mpl/bind/dist/bin/check: named-checkconf.8 named-checkzone.8 src/external/mpl/bind/dist/bin/confgen: ddns-confgen.8 rndc-confgen.8 src/external/mpl/bind/dist/bin/delv: delv.1 delv.c src/external/mpl/bind/dist/bin/dig: dig.1 dighost.c host.1 nslookup.1 nslookup.c src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.8 dnssec-cds.c dnssec-dsfromkey.8 dnssec-dsfromkey.c dnssec-importkey.8 dnssec-keyfromlabel.8 dnssec-keyfromlabel.c dnssec-keygen.8 dnssec-keygen.c dnssec-revoke.8 dnssec-revoke.c dnssec-settime.8 dnssec-signzone.8 dnssec-verify.8 src/external/mpl/bind/dist/bin/named: config.c control.c main.c named.8 named.conf.5 server.c src/external/mpl/bind/dist/bin/named/include/named: globals.h server.h src/external/mpl/bind/dist/bin/named/unix: dlz_dlopen_driver.c src/external/mpl/bind/dist/bin/named/win32: os.c src/external/mpl/bind/dist/bin/nsupdate: nsupdate.1 src/external/mpl/bind/dist/bin/pkcs11: pkcs11-destroy.8 pkcs11-keygen.8 pkcs11-list.8 pkcs11-tokens.8 src/external/mpl/bind/dist/bin/plugins: filter-aaaa.8 filter-aaaa.c src/external/mpl/bind/dist/bin/python: dnssec-checkds.8 dnssec-coverage.8 dnssec-keymgr.8 src/external/mpl/bind/dist/bin/rndc: rndc.8 rndc.conf.5 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: arpaname.1 dnstap-read.1 mdig.1 named-journalprint.8 named-nzd2nzf.8 named-rrchecker.1 nsec3hash.8 src/external/mpl/bind/dist/bin/win32/BINDInstall: StdAfx.h src/external/mpl/bind/dist/contrib/dlz/drivers: dlz_stub_driver.c sdlz_helper.c src/external/mpl/bind/dist/contrib/dlz/drivers/include/dlz: sdlz_helper.h src/external/mpl/bind/dist/contrib/dlz/modules/common: dlz_dbi.c src/external/mpl/bind/dist/contrib/dlz/modules/filesystem: dir.c src/external/mpl/bind/dist/lib/bind9: check.c src/external/mpl/bind/dist/lib/dns: catz.c dnssec.c dnstap.c ds.c dst_api.c dst_parse.c dst_parse.h dst_result.c dyndb.c gssapictx.c key.c lib.c masterdump.c message.c ncache.c nsec3.c opensslrsa_link.c pkcs11ecdsa_link.c pkcs11rsa_link.c rbtdb.c rcode.c rdata.c resolver.c result.c spnego_asn1.c tkey.c tsig.c validator.c xfrin.c zone.c zt.c src/external/mpl/bind/dist/lib/dns/include/dns: dnssec.h ds.h keyvalues.h lib.h message.h rdata.h rdataset.h resolver.h src/external/mpl/bind/dist/lib/dns/include/dst: dst.h src/external/mpl/bind/dist/lib/dns/rdata/generic: cert_37.c ds_43.c ipseckey_45.c key_25.c keydata_65533.c nsec_47.c openpgpkey_61.c rrsig_46.c sig_24.c sshfp_44.c tlsa_52.c src/external/mpl/bind/dist/lib/dns/rdata/in_1: dhcid_49.c eid_31.c nimloc_32.c src/external/mpl/bind/dist/lib/dns/tests: dbversion_test.c dnstest.c dst_test.c rdata_test.c rsa_test.c src/external/mpl/bind/dist/lib/irs: getaddrinfo.c src/external/mpl/bind/dist/lib/isc: assertions.c base32.c base64.c commandline.c counter.c error.c hex.c lex.c lib.c log.c mem.c netaddr.c pk11_result.c quota.c result.c rwlock.c sockaddr.c task.c timer.c src/external/mpl/bind/dist/lib/isc/include/isc: assertions.h atomic.h base32.h base64.h hex.h lib.h log.h quota.h result.h types.h util.h src/external/mpl/bind/dist/lib/isc/include/pk11: result.h src/external/mpl/bind/dist/lib/isc/pthreads: condition.c src/external/mpl/bind/dist/lib/isc/tests: socket_test.c src/external/mpl/bind/dist/lib/isc/unix: app.c ifiter_getifaddrs.c interfaceiter.c net.c socket.c src/external/mpl/bind/dist/lib/isc/win32: app.c net.c ntpaths.c socket.c src/external/mpl/bind/dist/lib/isc/win32/include/isc: ntpaths.h stdatomic.h src/external/mpl/bind/dist/lib/isccc: result.c src/external/mpl/bind/dist/lib/isccc/tests: result_test.c src/external/mpl/bind/dist/lib/isccfg: namedconf.c parser.c src/external/mpl/bind/dist/lib/isccfg/include/isccfg: cfg.h grammar.h src/external/mpl/bind/dist/lib/isccfg/tests: parser_test.c src/external/mpl/bind/dist/lib/ns: client.c hooks.c lib.c query.c update.c xfrout.c src/external/mpl/bind/dist/lib/ns/include/ns: client.h hooks.h lib.h src/external/mpl/bind/include/dns: code.h enumtype.h rdatastruct.h src/external/mpl/bind/include/isc: atomic.h stdatomic.h src/external/mpl/bind/lib/libbind9: shlib_version src/external/mpl/bind/lib/libdns: Makefile 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: Makefile 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/optional: dst_test.c src/external/mpl/bind/dist/bin/tests/system/digdelv/ns2: example.db src/external/mpl/bind/dist/bin/tests/system/dnssec/ns5: trusted.conf.bad src/external/mpl/bind/dist/bin/tests/system/inline/ns2: nsec3-loop.db src/external/mpl/bind/dist/bin/tests/system/sfcache: prereq.sh src/external/mpl/bind/dist/bin/tests/system/sfcache/ns5: trusted.conf.bad src/external/mpl/bind/dist/contrib/sdb/bdb: README bdb.c bdb.h zone2bdb.c src/external/mpl/bind/dist/contrib/sdb/dir: dirdb.c dirdb.h src/external/mpl/bind/dist/contrib/sdb/ldap: INSTALL.ldap README.ldap README.zone2ldap ldapdb.c ldapdb.h zone2ldap.1 zone2ldap.c src/external/mpl/bind/dist/contrib/sdb/pgsql: pgsqldb.c pgsqldb.h zonetodb.c src/external/mpl/bind/dist/contrib/sdb/sqlite: README.sdb_sqlite sqlitedb.c sqlitedb.h zone2sqlite.c src/external/mpl/bind/dist/contrib/sdb/tcl: lookup.tcl tcldb.c tcldb.h src/external/mpl/bind/dist/contrib/sdb/time: timedb.c timedb.h src/external/mpl/bind/dist/doc/misc: sdb src/external/mpl/bind/dist/lib/dns: dst_lib.c src/external/mpl/bind/dist/lib/dns/include/dst: lib.h src/external/mpl/bind/dist/lib/isc/include/isc: msgcat.h msgs.h stdatomic.h src/external/mpl/bind/dist/lib/isc/nls: Makefile.in msgcat.c src/external/mpl/bind/dist/lib/isccc: lib.c src/external/mpl/bind/dist/lib/isccc/include/isccc: lib.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/bind2netbsd cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/config.h.in \ src/external/mpl/bind/dist/configure cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/isc-config.sh.1 cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/check/named-checkconf.8 cvs rdiff -u -r1.2 -r1.3 \ src/external/mpl/bind/dist/bin/check/named-checkzone.8 cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/confgen/ddns-confgen.8 \ src/external/mpl/bind/dist/bin/confgen/rndc-confgen.8 cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/bin/delv/delv.1 cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/delv/delv.c cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/dig/dig.1 \ src/external/mpl/bind/dist/bin/dig/dighost.c \ src/external/mpl/bind/dist/bin/dig/host.1 \ src/external/mpl/bind/dist/bin/dig/nslookup.1 \ src/external/mpl/bind/dist/bin/dig/nslookup.c cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/dnssec/dnssec-cds.8 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-cds.c \ src/external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.8 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c \ src/external/mpl/bind/dist/bin/dnssec/dnssec-keyfromlabel.8 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-keyfromlabel.c \ src/external/mpl/bind/dist/bin/dnssec/dnssec-keygen.8 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-keygen.c \ src/external/mpl/bind/dist/bin/dnssec/dnssec-revoke.c \ src/external/mpl/bind/dist/bin/dnssec/dnssec-signzone.8 cvs rdiff -u -r1.2 -r1.3 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-importkey.8 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-revoke.8 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-settime.8 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-verify.8 cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/named/config.c \ src/external/mpl/bind/dist/bin/named/control.c \ src/external/mpl/bind/dist/bin/named/main.c \ src/external/mpl/bind/dist/bin/named/named.conf.5 \ src/external/mpl/bind/dist/bin/named/server.c cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/bin/named/named.8 cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/named/include/named/globals.h \ src/external/mpl/bind/dist/bin/named/include/named/server.h cvs rdiff -u -r1.3 -r1.4 \ 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/os.c cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/nsupdate/nsupdate.1 cvs rdiff -u -r1.2 -r1.3 \ src/external/mpl/bind/dist/bin/pkcs11/pkcs11-destroy.8 \ src/external/mpl/bind/dist/bin/pkcs11/pkcs11-keygen.8 \ src/external/mpl/bind/dist/bin/pkcs11/pkcs11-list.8 \ src/external/mpl/bind/dist/bin/pkcs11/pkcs11-tokens.8 cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/bin/plugins/filter-aaaa.8 \ src/external/mpl/bind/dist/bin/plugins/filter-aaaa.c cvs rdiff -u -r1.2 -r1.3 \ src/external/mpl/bind/dist/bin/python/dnssec-checkds.8 \ src/external/mpl/bind/dist/bin/python/dnssec-coverage.8 cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/python/dnssec-keymgr.8 cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/rndc/rndc.8 cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/bin/rndc/rndc.conf.5 cvs rdiff -u -r1.3 -r0 \ src/external/mpl/bind/dist/bin/tests/optional/dst_test.c cvs rdiff -u -r1.3 -r1.4 \ 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/digdelv/ns2/example.db cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/system/dnssec/ns5/trusted.conf.bad cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/system/inline/ns2/nsec3-loop.db cvs rdiff -u -r1.1.1.2 -r0 \ src/external/mpl/bind/dist/bin/tests/system/sfcache/prereq.sh cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/system/sfcache/ns5/trusted.conf.bad cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/bin/tools/arpaname.1 \ src/external/mpl/bind/dist/bin/tools/dnstap-read.1 \ src/external/mpl/bind/dist/bin/tools/named-journalprint.8 \ src/external/mpl/bind/dist/bin/tools/named-nzd2nzf.8 \ src/external/mpl/bind/dist/bin/tools/named-rrchecker.1 \ src/external/mpl/bind/dist/bin/tools/nsec3hash.8 cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/tools/mdig.1 cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/win32/BINDInstall/StdAfx.h cvs rdiff -u -r1.2 -r1.3 \ src/external/mpl/bind/dist/contrib/dlz/drivers/dlz_stub_driver.c cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/contrib/dlz/drivers/sdlz_helper.c cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/contrib/dlz/drivers/include/dlz/sdlz_helper.h cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/contrib/dlz/modules/common/dlz_dbi.c cvs rdiff -u -r1.2 -r1.3 \ src/external/mpl/bind/dist/contrib/dlz/modules/filesystem/dir.c cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/bind/dist/contrib/sdb/bdb/README cvs rdiff -u -r1.3 -r0 src/external/mpl/bind/dist/contrib/sdb/bdb/bdb.c \ src/external/mpl/bind/dist/contrib/sdb/bdb/zone2bdb.c cvs rdiff -u -r1.2 -r0 src/external/mpl/bind/dist/contrib/sdb/bdb/bdb.h cvs rdiff -u -r1.2 -r0 src/external/mpl/bind/dist/contrib/sdb/dir/dirdb.c \ src/external/mpl/bind/dist/contrib/sdb/dir/dirdb.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/contrib/sdb/ldap/INSTALL.ldap \ src/external/mpl/bind/dist/contrib/sdb/ldap/README.ldap \ src/external/mpl/bind/dist/contrib/sdb/ldap/README.zone2ldap cvs rdiff -u -r1.2 -r0 src/external/mpl/bind/dist/contrib/sdb/ldap/ldapdb.c \ src/external/mpl/bind/dist/contrib/sdb/ldap/ldapdb.h \ src/external/mpl/bind/dist/contrib/sdb/ldap/zone2ldap.1 cvs rdiff -u -r1.3 -r0 \ src/external/mpl/bind/dist/contrib/sdb/ldap/zone2ldap.c cvs rdiff -u -r1.2 -r0 src/external/mpl/bind/dist/contrib/sdb/pgsql/pgsqldb.c \ src/external/mpl/bind/dist/contrib/sdb/pgsql/pgsqldb.h cvs rdiff -u -r1.3 -r0 \ src/external/mpl/bind/dist/contrib/sdb/pgsql/zonetodb.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/contrib/sdb/sqlite/README.sdb_sqlite cvs rdiff -u -r1.2 -r0 \ src/external/mpl/bind/dist/contrib/sdb/sqlite/sqlitedb.c \ src/external/mpl/bind/dist/contrib/sdb/sqlite/sqlitedb.h cvs rdiff -u -r1.3 -r0 \ src/external/mpl/bind/dist/contrib/sdb/sqlite/zone2sqlite.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/contrib/sdb/tcl/lookup.tcl cvs rdiff -u -r1.2 -r0 src/external/mpl/bind/dist/contrib/sdb/tcl/tcldb.c \ src/external/mpl/bind/dist/contrib/sdb/tcl/tcldb.h cvs rdiff -u -r1.2 -r0 src/external/mpl/bind/dist/contrib/sdb/time/timedb.c \ src/external/mpl/bind/dist/contrib/sdb/time/timedb.h cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/bind/dist/doc/misc/sdb cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/bind9/check.c cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/dns/catz.c \ src/external/mpl/bind/dist/lib/dns/dnssec.c \ 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/dst_api.c \ src/external/mpl/bind/dist/lib/dns/dst_parse.c \ src/external/mpl/bind/dist/lib/dns/dst_parse.h \ src/external/mpl/bind/dist/lib/dns/dyndb.c \ src/external/mpl/bind/dist/lib/dns/gssapictx.c \ src/external/mpl/bind/dist/lib/dns/key.c \ src/external/mpl/bind/dist/lib/dns/lib.c \ src/external/mpl/bind/dist/lib/dns/masterdump.c \ src/external/mpl/bind/dist/lib/dns/message.c \ src/external/mpl/bind/dist/lib/dns/ncache.c \ src/external/mpl/bind/dist/lib/dns/nsec3.c \ src/external/mpl/bind/dist/lib/dns/opensslrsa_link.c \ src/external/mpl/bind/dist/lib/dns/pkcs11ecdsa_link.c \ src/external/mpl/bind/dist/lib/dns/pkcs11rsa_link.c \ src/external/mpl/bind/dist/lib/dns/rbtdb.c \ src/external/mpl/bind/dist/lib/dns/rcode.c \ src/external/mpl/bind/dist/lib/dns/rdata.c \ src/external/mpl/bind/dist/lib/dns/resolver.c \ src/external/mpl/bind/dist/lib/dns/result.c \ src/external/mpl/bind/dist/lib/dns/spnego_asn1.c \ src/external/mpl/bind/dist/lib/dns/tkey.c \ src/external/mpl/bind/dist/lib/dns/tsig.c \ src/external/mpl/bind/dist/lib/dns/validator.c \ src/external/mpl/bind/dist/lib/dns/xfrin.c \ src/external/mpl/bind/dist/lib/dns/zone.c \ src/external/mpl/bind/dist/lib/dns/zt.c cvs rdiff -u -r1.2 -r0 src/external/mpl/bind/dist/lib/dns/dst_lib.c cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/dns/dst_result.c cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/lib/dns/include/dns/dnssec.h \ src/external/mpl/bind/dist/lib/dns/include/dns/keyvalues.h \ src/external/mpl/bind/dist/lib/dns/include/dns/message.h \ src/external/mpl/bind/dist/lib/dns/include/dns/rdata.h \ src/external/mpl/bind/dist/lib/dns/include/dns/rdataset.h \ src/external/mpl/bind/dist/lib/dns/include/dns/resolver.h cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/dns/include/dns/ds.h \ src/external/mpl/bind/dist/lib/dns/include/dns/lib.h cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/dns/include/dst/dst.h cvs rdiff -u -r1.2 -r0 src/external/mpl/bind/dist/lib/dns/include/dst/lib.h cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/lib/dns/rdata/generic/cert_37.c \ src/external/mpl/bind/dist/lib/dns/rdata/generic/ds_43.c \ src/external/mpl/bind/dist/lib/dns/rdata/generic/ipseckey_45.c \ src/external/mpl/bind/dist/lib/dns/rdata/generic/key_25.c \ src/external/mpl/bind/dist/lib/dns/rdata/generic/keydata_65533.c \ src/external/mpl/bind/dist/lib/dns/rdata/generic/nsec_47.c \ src/external/mpl/bind/dist/lib/dns/rdata/generic/openpgpkey_61.c \ src/external/mpl/bind/dist/lib/dns/rdata/generic/rrsig_46.c \ src/external/mpl/bind/dist/lib/dns/rdata/generic/sig_24.c \ src/external/mpl/bind/dist/lib/dns/rdata/generic/sshfp_44.c \ src/external/mpl/bind/dist/lib/dns/rdata/generic/tlsa_52.c cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/lib/dns/rdata/in_1/dhcid_49.c cvs rdiff -u -r1.2 -r1.3 \ 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/dbversion_test.c \ src/external/mpl/bind/dist/lib/dns/tests/dnstest.c \ src/external/mpl/bind/dist/lib/dns/tests/rdata_test.c \ src/external/mpl/bind/dist/lib/dns/tests/rsa_test.c cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/dns/tests/dst_test.c cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/irs/getaddrinfo.c cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/isc/assertions.c \ src/external/mpl/bind/dist/lib/isc/error.c cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isc/base32.c \ src/external/mpl/bind/dist/lib/isc/base64.c \ src/external/mpl/bind/dist/lib/isc/commandline.c \ src/external/mpl/bind/dist/lib/isc/counter.c \ src/external/mpl/bind/dist/lib/isc/hex.c \ src/external/mpl/bind/dist/lib/isc/lex.c \ src/external/mpl/bind/dist/lib/isc/lib.c \ src/external/mpl/bind/dist/lib/isc/log.c \ src/external/mpl/bind/dist/lib/isc/mem.c \ src/external/mpl/bind/dist/lib/isc/netaddr.c \ src/external/mpl/bind/dist/lib/isc/pk11_result.c \ src/external/mpl/bind/dist/lib/isc/quota.c \ src/external/mpl/bind/dist/lib/isc/result.c \ src/external/mpl/bind/dist/lib/isc/sockaddr.c \ src/external/mpl/bind/dist/lib/isc/task.c \ src/external/mpl/bind/dist/lib/isc/timer.c cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/rwlock.c cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/lib/isc/include/isc/assertions.h \ src/external/mpl/bind/dist/lib/isc/include/isc/log.h \ 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/types.h \ src/external/mpl/bind/dist/lib/isc/include/isc/util.h cvs rdiff -u -r1.2 -r1.3 \ src/external/mpl/bind/dist/lib/isc/include/isc/atomic.h \ src/external/mpl/bind/dist/lib/isc/include/isc/base32.h \ src/external/mpl/bind/dist/lib/isc/include/isc/base64.h \ src/external/mpl/bind/dist/lib/isc/include/isc/hex.h \ src/external/mpl/bind/dist/lib/isc/include/isc/lib.h cvs rdiff -u -r1.2 -r0 \ src/external/mpl/bind/dist/lib/isc/include/isc/msgcat.h \ src/external/mpl/bind/dist/lib/isc/include/isc/msgs.h \ src/external/mpl/bind/dist/lib/isc/include/isc/stdatomic.h cvs rdiff -u -r1.2 -r1.3 \ src/external/mpl/bind/dist/lib/isc/include/pk11/result.h cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/bind/dist/lib/isc/nls/Makefile.in cvs rdiff -u -r1.2 -r0 src/external/mpl/bind/dist/lib/isc/nls/msgcat.c cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/lib/isc/pthreads/condition.c cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/lib/isc/tests/socket_test.c cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isc/unix/app.c \ src/external/mpl/bind/dist/lib/isc/unix/ifiter_getifaddrs.c \ src/external/mpl/bind/dist/lib/isc/unix/interfaceiter.c \ src/external/mpl/bind/dist/lib/isc/unix/net.c cvs rdiff -u -r1.7 -r1.8 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/app.c \ src/external/mpl/bind/dist/lib/isc/win32/net.c \ src/external/mpl/bind/dist/lib/isc/win32/socket.c cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/isc/win32/ntpaths.c cvs rdiff -u -r1.2 -r1.3 \ src/external/mpl/bind/dist/lib/isc/win32/include/isc/ntpaths.h \ src/external/mpl/bind/dist/lib/isc/win32/include/isc/stdatomic.h cvs rdiff -u -r1.2 -r0 src/external/mpl/bind/dist/lib/isccc/lib.c cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/isccc/result.c cvs rdiff -u -r1.2 -r0 \ src/external/mpl/bind/dist/lib/isccc/include/isccc/lib.h cvs rdiff -u -r1.2 -r1.3 \ 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/namedconf.c \ 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/cfg.h \ src/external/mpl/bind/dist/lib/isccfg/include/isccfg/grammar.h cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/lib/isccfg/tests/parser_test.c cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/ns/client.c \ src/external/mpl/bind/dist/lib/ns/lib.c \ src/external/mpl/bind/dist/lib/ns/query.c \ src/external/mpl/bind/dist/lib/ns/update.c \ src/external/mpl/bind/dist/lib/ns/xfrout.c cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/ns/hooks.c cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/lib/ns/include/ns/client.h cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/ns/include/ns/hooks.h \ src/external/mpl/bind/dist/lib/ns/include/ns/lib.h cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/include/dns/code.h \ src/external/mpl/bind/include/dns/enumtype.h \ src/external/mpl/bind/include/dns/rdatastruct.h cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/include/isc/atomic.h cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/include/isc/stdatomic.h cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/lib/libbind9/shlib_version cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/lib/libdns/Makefile \ src/external/mpl/bind/lib/libdns/shlib_version cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/lib/libirs/shlib_version cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/lib/libisc/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/lib/libisc/shlib_version cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/lib/libisccc/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/lib/libisccc/shlib_version cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/lib/libisccfg/shlib_version cvs rdiff -u -r1.2 -r1.3 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.