Module Name: src
Committed By: christos
Date: Tue Feb 6 03:05:48 UTC 2018
Modified Files:
src/external/bsd/unbound/include: config.h
src/external/bsd/unbound/lib/libunbound: Makefile shlib_version
src/external/bsd/unbound/sbin/unbound: Makefile
Added Files:
src/external/bsd/unbound/include/dnscrypt: dnscrypt_config.h
Removed Files:
src/external/bsd/unbound/dist/testdata: 00-lint.tpkg 01-doc.tpkg
02-unittest.tpkg 03-testbound.tpkg 04-checkconf.tpkg
05-asynclook.tpkg 06-ianaports.tpkg 07-confroot.tpkg
08-host-lib.tpkg 09-unbound-control.tpkg 10-unbound-anchor.tpkg
ctrl_itr.tpkg ctrl_pipe.tpkg edns_cache.tpkg edns_lame.tpkg
fwd_ancil.tpkg fwd_bogus.tpkg fwd_capsid.tpkg
fwd_capsid_fallback.tpkg fwd_capsid_strip.tpkg
fwd_capsid_white.tpkg fwd_compress_c00c.tpkg fwd_edns_bksec.tpkg
fwd_edns_probe.tpkg fwd_no_edns.tpkg fwd_oneport.tpkg fwd_tcp.tpkg
fwd_tcp_tc.tpkg fwd_tcp_tc6.tpkg fwd_three.tpkg
fwd_three_service.tpkg fwd_ttlexpire.tpkg fwd_udp.tpkg
fwd_udptmout.tpkg fwd_waitudp.tpkg fwd_zero.tpkg hostsfileosx.tpkg
local_nodefault.tpkg local_norec.tpkg local_nosnoop.tpkg
nss_compile.tpkg pylib.tpkg pymod.tpkg pymod_thread.tpkg
remote-threaded.tpkg root_anchor.tpkg root_hints.tpkg
speed_cache.tpkg speed_local.tpkg stat_timer.tpkg stream_ssl.tpkg
stream_tcp.tpkg stub_udp.tpkg stub_udp6.tpkg tcp_sigpipe.tpkg
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/00-lint.tpkg \
src/external/bsd/unbound/dist/testdata/01-doc.tpkg \
src/external/bsd/unbound/dist/testdata/02-unittest.tpkg \
src/external/bsd/unbound/dist/testdata/03-testbound.tpkg \
src/external/bsd/unbound/dist/testdata/04-checkconf.tpkg \
src/external/bsd/unbound/dist/testdata/05-asynclook.tpkg \
src/external/bsd/unbound/dist/testdata/06-ianaports.tpkg \
src/external/bsd/unbound/dist/testdata/07-confroot.tpkg \
src/external/bsd/unbound/dist/testdata/08-host-lib.tpkg \
src/external/bsd/unbound/dist/testdata/09-unbound-control.tpkg \
src/external/bsd/unbound/dist/testdata/10-unbound-anchor.tpkg \
src/external/bsd/unbound/dist/testdata/ctrl_itr.tpkg \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tpkg \
src/external/bsd/unbound/dist/testdata/edns_cache.tpkg \
src/external/bsd/unbound/dist/testdata/edns_lame.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_ancil.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_bogus.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_capsid.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_capsid_fallback.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_capsid_strip.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_capsid_white.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_compress_c00c.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_edns_bksec.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_edns_probe.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_no_edns.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_oneport.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_tcp.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_tcp_tc.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_tcp_tc6.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_three.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_three_service.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_ttlexpire.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_udp.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_udptmout.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_waitudp.tpkg \
src/external/bsd/unbound/dist/testdata/fwd_zero.tpkg \
src/external/bsd/unbound/dist/testdata/hostsfileosx.tpkg \
src/external/bsd/unbound/dist/testdata/local_nodefault.tpkg \
src/external/bsd/unbound/dist/testdata/local_norec.tpkg \
src/external/bsd/unbound/dist/testdata/local_nosnoop.tpkg \
src/external/bsd/unbound/dist/testdata/nss_compile.tpkg \
src/external/bsd/unbound/dist/testdata/pylib.tpkg \
src/external/bsd/unbound/dist/testdata/pymod.tpkg \
src/external/bsd/unbound/dist/testdata/pymod_thread.tpkg \
src/external/bsd/unbound/dist/testdata/remote-threaded.tpkg \
src/external/bsd/unbound/dist/testdata/root_anchor.tpkg \
src/external/bsd/unbound/dist/testdata/root_hints.tpkg \
src/external/bsd/unbound/dist/testdata/speed_cache.tpkg \
src/external/bsd/unbound/dist/testdata/speed_local.tpkg \
src/external/bsd/unbound/dist/testdata/stat_timer.tpkg \
src/external/bsd/unbound/dist/testdata/stream_ssl.tpkg \
src/external/bsd/unbound/dist/testdata/stream_tcp.tpkg \
src/external/bsd/unbound/dist/testdata/stub_udp.tpkg \
src/external/bsd/unbound/dist/testdata/stub_udp6.tpkg \
src/external/bsd/unbound/dist/testdata/tcp_sigpipe.tpkg
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/unbound/include/config.h
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/unbound/include/dnscrypt/dnscrypt_config.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/unbound/lib/libunbound/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/unbound/lib/libunbound/shlib_version
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/unbound/sbin/unbound/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
