Module Name: src
Committed By: christos
Date: Sat Apr 7 00:19:54 UTC 2018
Modified Files:
src/external/bsd/ntp: importdate ntp2netbsd
src/external/bsd/ntp/dist/include: ntp.h ntp_calendar.h ntp_config.h
ntp_fp.h ntp_keyacc.h ntp_request.h ntp_stdlib.h ntpd.h recvbuff.h
ssl_applink.c
src/external/bsd/ntp/dist/libntp: a_md5encrypt.c adjtime.c authkeys.c
authreadkeys.c libssl_compat.c ntp_calendar.c ssl_init.c statestr.c
systime.c work_thread.c
src/external/bsd/ntp/dist/ntpd: keyword-gen.c ntp_config.c
ntp_control.c ntp_crypto.c ntp_io.c ntp_keyword.h ntp_leapsec.c
ntp_parser.y ntp_peer.c ntp_proto.c ntp_refclock.c ntp_request.c
ntp_restrict.c ntp_scanner.c ntp_util.c ntpd-opts.c ntpd-opts.h
ntpd.c ntpsim.c refclock_gpsdjson.c refclock_jjy.c
refclock_palisade.c refclock_parse.c
src/external/bsd/ntp/dist/ntpdc: ntpdc-opts.c ntpdc-opts.h ntpdc.c
ntpdc_ops.c
src/external/bsd/ntp/dist/ntpq: ntpq-opts.c ntpq-opts.h ntpq-subs.c
ntpq.c
src/external/bsd/ntp/dist/ntpsnmpd: netsnmp_daemonize.c ntpsnmpd-opts.c
ntpsnmpd-opts.h
src/external/bsd/ntp/dist/sntp: crypto.c crypto.h main.c networking.c
sntp-opts.c sntp-opts.h utilities.c version.c
src/external/bsd/ntp/dist/sntp/tests: crypto.c keyFile.c
packetHandling.c packetProcessing.c run-crypto.c run-keyFile.c
run-kodDatabase.c run-kodFile.c run-networking.c
run-packetHandling.c run-packetProcessing.c run-t-log.c
run-utilities.c
src/external/bsd/ntp/dist/tests/bug-2803: run-bug-2803.c
src/external/bsd/ntp/dist/tests/libntp: a_md5encrypt.c authkeys.c
run-a_md5encrypt.c run-atoint.c run-atouint.c run-authkeys.c
run-buftvtots.c run-calendar.c run-caljulian.c run-caltontp.c
run-calyearstart.c run-clocktime.c run-decodenetnum.c
run-hextoint.c run-hextolfp.c run-humandate.c run-lfpfunc.c
run-lfptostr.c run-modetoa.c run-msyslog.c run-netof.c run-numtoa.c
run-numtohost.c run-octtoint.c run-prettydate.c run-recvbuff.c
run-refidsmear.c run-refnumtoa.c run-sfptostr.c run-socktoa.c
run-ssl_init.c run-statestr.c run-strtolfp.c run-timespecops.c
run-timevalops.c run-tsafememcmp.c run-tstotv.c run-tvtots.c
run-uglydate.c run-vi64ops.c run-ymd2yd.c ssl_init.c timespecops.c
timevalops.c
src/external/bsd/ntp/dist/tests/ntpd: leapsec.c ntp_prio_q.c
ntp_restrict.c rc_cmdlength.c run-leapsec.c run-ntp_prio_q.c
run-ntp_restrict.c run-rc_cmdlength.c run-t-ntp_scanner.c
run-t-ntp_signd.c t-ntp_scanner.c
src/external/bsd/ntp/dist/tests/ntpq: run-t-ntpq.c
src/external/bsd/ntp/dist/tests/sandbox: run-modetoa.c run-uglydate.c
run-ut-2803.c
src/external/bsd/ntp/dist/tests/sec-2853: run-sec-2853.c
src/external/bsd/ntp/dist/util: ntp-keygen-opts.c ntp-keygen-opts.h
src/external/bsd/ntp/include: config.h
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/importdate
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/ntp2netbsd
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/include/ntp.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/include/ntp_calendar.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/include/ntp_config.h \
src/external/bsd/ntp/dist/include/ntpd.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/include/ntp_fp.h
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ntp/dist/include/ntp_keyacc.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/include/ntp_request.h
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/include/ntp_stdlib.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/include/recvbuff.h \
src/external/bsd/ntp/dist/include/ssl_applink.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/libntp/a_md5encrypt.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/libntp/adjtime.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/libntp/authkeys.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/libntp/authreadkeys.c \
src/external/bsd/ntp/dist/libntp/ntp_calendar.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/ntp/dist/libntp/libssl_compat.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/libntp/ssl_init.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/libntp/statestr.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/libntp/systime.c \
src/external/bsd/ntp/dist/libntp/work_thread.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/ntpd/keyword-gen.c \
src/external/bsd/ntp/dist/ntpd/ntp_peer.c \
src/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/ntp/dist/ntpd/ntp_config.c
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/ntp/dist/ntpd/ntp_control.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/ntpd/ntp_crypto.c \
src/external/bsd/ntp/dist/ntpd/ntp_request.c \
src/external/bsd/ntp/dist/ntpd/ntpd.c
cvs rdiff -u -r1.25 -r1.26 src/external/bsd/ntp/dist/ntpd/ntp_io.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/ntpd/ntp_keyword.h \
src/external/bsd/ntp/dist/ntpd/ntp_scanner.c \
src/external/bsd/ntp/dist/ntpd/refclock_jjy.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/ntpd/ntp_leapsec.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/dist/ntpd/ntp_parser.y
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/ntpd/ntp_proto.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpd/ntp_refclock.c \
src/external/bsd/ntp/dist/ntpd/ntpd-opts.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/ntpd/ntp_restrict.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpd/ntp_util.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpd/ntpd-opts.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/ntpd/ntpsim.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpd/refclock_palisade.c
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/ntp/dist/ntpd/refclock_parse.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c \
src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/ntpdc/ntpdc.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/ntpdc/ntpdc_ops.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpq/ntpq-opts.c \
src/external/bsd/ntp/dist/ntpq/ntpq-opts.h
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/ntpq/ntpq-subs.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/dist/ntpq/ntpq.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/ntp/dist/ntpsnmpd/netsnmp_daemonize.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c \
src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/sntp/crypto.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/sntp/crypto.h
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/sntp/main.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/sntp/networking.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/sntp/sntp-opts.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/sntp/sntp-opts.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/sntp/utilities.c
cvs rdiff -u -r1.1.1.10 -r1.2 src/external/bsd/ntp/dist/sntp/version.c
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/ntp/dist/sntp/tests/crypto.c \
src/external/bsd/ntp/dist/sntp/tests/keyFile.c \
src/external/bsd/ntp/dist/sntp/tests/packetHandling.c
cvs rdiff -u -r1.1.1.8 -r1.2 \
src/external/bsd/ntp/dist/sntp/tests/packetProcessing.c \
src/external/bsd/ntp/dist/sntp/tests/run-packetProcessing.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/ntp/dist/sntp/tests/run-crypto.c \
src/external/bsd/ntp/dist/sntp/tests/run-keyFile.c \
src/external/bsd/ntp/dist/sntp/tests/run-kodDatabase.c \
src/external/bsd/ntp/dist/sntp/tests/run-kodFile.c \
src/external/bsd/ntp/dist/sntp/tests/run-networking.c \
src/external/bsd/ntp/dist/sntp/tests/run-packetHandling.c \
src/external/bsd/ntp/dist/sntp/tests/run-utilities.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/ntp/dist/sntp/tests/run-t-log.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/ntp/dist/tests/bug-2803/run-bug-2803.c
cvs rdiff -u -r1.1.1.7 -r1.2 \
src/external/bsd/ntp/dist/tests/libntp/a_md5encrypt.c \
src/external/bsd/ntp/dist/tests/libntp/authkeys.c \
src/external/bsd/ntp/dist/tests/libntp/run-authkeys.c \
src/external/bsd/ntp/dist/tests/libntp/run-calendar.c \
src/external/bsd/ntp/dist/tests/libntp/run-decodenetnum.c \
src/external/bsd/ntp/dist/tests/libntp/run-lfpfunc.c \
src/external/bsd/ntp/dist/tests/libntp/run-socktoa.c \
src/external/bsd/ntp/dist/tests/libntp/run-timevalops.c \
src/external/bsd/ntp/dist/tests/libntp/ssl_init.c \
src/external/bsd/ntp/dist/tests/libntp/timespecops.c \
src/external/bsd/ntp/dist/tests/libntp/timevalops.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/ntp/dist/tests/libntp/run-a_md5encrypt.c \
src/external/bsd/ntp/dist/tests/libntp/run-atoint.c \
src/external/bsd/ntp/dist/tests/libntp/run-atouint.c \
src/external/bsd/ntp/dist/tests/libntp/run-buftvtots.c \
src/external/bsd/ntp/dist/tests/libntp/run-caljulian.c \
src/external/bsd/ntp/dist/tests/libntp/run-caltontp.c \
src/external/bsd/ntp/dist/tests/libntp/run-calyearstart.c \
src/external/bsd/ntp/dist/tests/libntp/run-clocktime.c \
src/external/bsd/ntp/dist/tests/libntp/run-hextoint.c \
src/external/bsd/ntp/dist/tests/libntp/run-hextolfp.c \
src/external/bsd/ntp/dist/tests/libntp/run-humandate.c \
src/external/bsd/ntp/dist/tests/libntp/run-lfptostr.c \
src/external/bsd/ntp/dist/tests/libntp/run-modetoa.c \
src/external/bsd/ntp/dist/tests/libntp/run-msyslog.c \
src/external/bsd/ntp/dist/tests/libntp/run-netof.c \
src/external/bsd/ntp/dist/tests/libntp/run-numtoa.c \
src/external/bsd/ntp/dist/tests/libntp/run-numtohost.c \
src/external/bsd/ntp/dist/tests/libntp/run-octtoint.c \
src/external/bsd/ntp/dist/tests/libntp/run-prettydate.c \
src/external/bsd/ntp/dist/tests/libntp/run-recvbuff.c \
src/external/bsd/ntp/dist/tests/libntp/run-refidsmear.c \
src/external/bsd/ntp/dist/tests/libntp/run-refnumtoa.c \
src/external/bsd/ntp/dist/tests/libntp/run-sfptostr.c \
src/external/bsd/ntp/dist/tests/libntp/run-ssl_init.c \
src/external/bsd/ntp/dist/tests/libntp/run-statestr.c \
src/external/bsd/ntp/dist/tests/libntp/run-strtolfp.c \
src/external/bsd/ntp/dist/tests/libntp/run-timespecops.c \
src/external/bsd/ntp/dist/tests/libntp/run-tstotv.c \
src/external/bsd/ntp/dist/tests/libntp/run-tvtots.c \
src/external/bsd/ntp/dist/tests/libntp/run-uglydate.c \
src/external/bsd/ntp/dist/tests/libntp/run-vi64ops.c \
src/external/bsd/ntp/dist/tests/libntp/run-ymd2yd.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/ntp/dist/tests/libntp/run-tsafememcmp.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/ntp/dist/tests/ntpd/leapsec.c \
src/external/bsd/ntp/dist/tests/ntpd/ntp_prio_q.c \
src/external/bsd/ntp/dist/tests/ntpd/ntp_restrict.c \
src/external/bsd/ntp/dist/tests/ntpd/rc_cmdlength.c \
src/external/bsd/ntp/dist/tests/ntpd/run-leapsec.c \
src/external/bsd/ntp/dist/tests/ntpd/run-ntp_prio_q.c \
src/external/bsd/ntp/dist/tests/ntpd/run-ntp_restrict.c \
src/external/bsd/ntp/dist/tests/ntpd/run-rc_cmdlength.c \
src/external/bsd/ntp/dist/tests/ntpd/run-t-ntp_scanner.c \
src/external/bsd/ntp/dist/tests/ntpd/run-t-ntp_signd.c \
src/external/bsd/ntp/dist/tests/ntpd/t-ntp_scanner.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/ntp/dist/tests/ntpq/run-t-ntpq.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/ntp/dist/tests/sandbox/run-modetoa.c \
src/external/bsd/ntp/dist/tests/sandbox/run-uglydate.c \
src/external/bsd/ntp/dist/tests/sandbox/run-ut-2803.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/ntp/dist/tests/sec-2853/run-sec-2853.c
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/util/ntp-keygen-opts.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/util/ntp-keygen-opts.h
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/ntp/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
