Module Name: src Committed By: christos Date: Thu Oct 17 16:47:02 UTC 2019
Modified Files: src/external/mpl/bind: bind2netbsd src/external/mpl/bind/dist: config.h.in configure src/external/mpl/bind/dist/bin/dig: dighost.c src/external/mpl/bind/dist/bin/dnssec: dnssec-dsfromkey.c src/external/mpl/bind/dist/bin/named: config.c main.c server.c statschannel.c zoneconf.c src/external/mpl/bind/dist/bin/named/win32: os.c src/external/mpl/bind/dist/bin/tests/optional: nsecify.c src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: create.c find.c genrsa.c login.c privrsa.c pubrsa.c session.c sha1.c sign.c verify.c src/external/mpl/bind/dist/bin/tools: mdig.c src/external/mpl/bind/dist/bin/win32/BINDInstall: resource.h src/external/mpl/bind/dist/contrib/dlz/modules/mysqldyn: dlz_mysqldyn_mod.c src/external/mpl/bind/dist/doc/arm: Bv9ARM.pdf src/external/mpl/bind/dist/fuzz: dns_rdata_fromwire_text.c src/external/mpl/bind/dist/lib/dns: dnssec.c dst_api.c ecdb.c message.c name.c nsec.c openssldh_link.c opensslrsa_link.c rbt.c rcode.c resolver.c rpz.c sdb.c ttl.c zone.c zoneverify.c src/external/mpl/bind/dist/lib/dns/include/dns: message.h src/external/mpl/bind/dist/lib/dns/rdata/generic: opt_41.c src/external/mpl/bind/dist/lib/dns/tests: rbt_serialize_test.c src/external/mpl/bind/dist/lib/irs/win32: resconf.c src/external/mpl/bind/dist/lib/isc: lex.c ratelimiter.c siphash.c sockaddr.c src/external/mpl/bind/dist/lib/isc/include/isc: siphash.h socket.h src/external/mpl/bind/dist/lib/isc/tests: hmac_test.c md_test.c queue_test.c random_test.c siphash_test.c task_test.c src/external/mpl/bind/dist/lib/isc/unix: resource.c socket.c src/external/mpl/bind/dist/lib/isc/win32: file.c ntgroups.c socket.c time.c src/external/mpl/bind/dist/lib/isc/win32/include/isc: stdatomic.h src/external/mpl/bind/dist/lib/isccfg: namedconf.c parser.c src/external/mpl/bind/dist/lib/ns: client.c src/external/mpl/bind/include: config.h Removed Files: src/external/mpl/bind/dist/bin/pkcs11: Makefile src/external/mpl/bind/dist/bin/tests/pkcs11: Makefile src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: Makefile src/external/mpl/bind/dist/bin/tests/system/dlzexternal/ns1: dlzs.conf src/external/mpl/bind/dist/bin/tests/system/glue: xx.good yy.good src/external/mpl/bind/dist/bin/tests/system/glue/ns1: cache.in mil.db src/external/mpl/bind/dist/bin/tests/virtual-time: Makefile conf.sh src/external/mpl/bind/dist/contrib/scripts: check-secure-delegation.pl zone-edit.sh src/external/mpl/bind/dist/lib/dns/tests: tkey_test.c src/external/mpl/bind/dist/lib/samples: Makefile-postinstall src/external/mpl/bind/dist/unit: unittest.sh Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/bind2netbsd cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/config.h.in \ src/external/mpl/bind/dist/configure cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/dig/dighost.c cvs rdiff -u -r1.5 -r1.6 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/named/config.c \ src/external/mpl/bind/dist/bin/named/main.c cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/bin/named/server.c cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/named/statschannel.c \ src/external/mpl/bind/dist/bin/named/zoneconf.c cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/named/win32/os.c cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/bind/dist/bin/pkcs11/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/tests/optional/nsecify.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/pkcs11/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/create.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/find.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/genrsa.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/login.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/privrsa.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/pubrsa.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/session.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/sha1.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/sign.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/verify.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/system/dlzexternal/ns1/dlzs.conf cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/system/glue/xx.good \ src/external/mpl/bind/dist/bin/tests/system/glue/yy.good cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/system/glue/ns1/cache.in \ src/external/mpl/bind/dist/bin/tests/system/glue/ns1/mil.db cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/virtual-time/Makefile \ src/external/mpl/bind/dist/bin/tests/virtual-time/conf.sh cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/tools/mdig.c cvs rdiff -u -r1.2 -r1.3 \ src/external/mpl/bind/dist/bin/win32/BINDInstall/resource.h cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/contrib/scripts/check-secure-delegation.pl \ src/external/mpl/bind/dist/contrib/scripts/zone-edit.sh cvs rdiff -u -r1.1.1.6 -r1.2 src/external/mpl/bind/dist/doc/arm/Bv9ARM.pdf cvs rdiff -u -r1.2 -r1.3 \ src/external/mpl/bind/dist/fuzz/dns_rdata_fromwire_text.c cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/dns/dnssec.c \ src/external/mpl/bind/dist/lib/dns/dst_api.c \ src/external/mpl/bind/dist/lib/dns/name.c \ src/external/mpl/bind/dist/lib/dns/opensslrsa_link.c \ src/external/mpl/bind/dist/lib/dns/rcode.c cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/dns/ecdb.c \ src/external/mpl/bind/dist/lib/dns/nsec.c \ src/external/mpl/bind/dist/lib/dns/openssldh_link.c \ src/external/mpl/bind/dist/lib/dns/rbt.c \ src/external/mpl/bind/dist/lib/dns/sdb.c \ src/external/mpl/bind/dist/lib/dns/ttl.c cvs rdiff -u -r1.6 -r1.7 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.5 -r1.6 src/external/mpl/bind/dist/lib/dns/rpz.c cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/dns/zoneverify.c cvs rdiff -u -r1.5 -r1.6 \ src/external/mpl/bind/dist/lib/dns/include/dns/message.h cvs rdiff -u -r1.4 -r1.5 \ src/external/mpl/bind/dist/lib/dns/rdata/generic/opt_41.c cvs rdiff -u -r1.4 -r1.5 \ src/external/mpl/bind/dist/lib/dns/tests/rbt_serialize_test.c cvs rdiff -u -r1.3 -r0 src/external/mpl/bind/dist/lib/dns/tests/tkey_test.c cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/irs/win32/resconf.c cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/lex.c \ src/external/mpl/bind/dist/lib/isc/sockaddr.c cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isc/ratelimiter.c \ src/external/mpl/bind/dist/lib/isc/siphash.c cvs rdiff -u -r1.2 -r1.3 \ src/external/mpl/bind/dist/lib/isc/include/isc/siphash.h cvs rdiff -u -r1.4 -r1.5 \ src/external/mpl/bind/dist/lib/isc/include/isc/socket.h cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isc/tests/hmac_test.c cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/isc/tests/md_test.c \ src/external/mpl/bind/dist/lib/isc/tests/siphash_test.c cvs rdiff -u -r1.4 -r1.5 \ src/external/mpl/bind/dist/lib/isc/tests/queue_test.c \ src/external/mpl/bind/dist/lib/isc/tests/random_test.c \ src/external/mpl/bind/dist/lib/isc/tests/task_test.c cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isc/unix/resource.c cvs rdiff -u -r1.11 -r1.12 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/file.c \ src/external/mpl/bind/dist/lib/isc/win32/ntgroups.c \ src/external/mpl/bind/dist/lib/isc/win32/time.c cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/win32/socket.c cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/lib/isc/win32/include/isc/stdatomic.h cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isccfg/namedconf.c cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isccfg/parser.c cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/ns/client.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/lib/samples/Makefile-postinstall cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/bind/dist/unit/unittest.sh cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.