Author: glebius
Date: Mon Jan 11 01:09:50 2016
New Revision: 293650
URL: https://svnweb.freebsd.org/changeset/base/293650

Log:
  Merge r293423, r293469:
  
    ntp 4.2.8p5
  
  Relnotes:     yes

Added:
  stable/10/contrib/ntp/include/safecast.h
     - copied unchanged from r293423, head/contrib/ntp/include/safecast.h
Modified:
  stable/10/contrib/ntp/ChangeLog
  stable/10/contrib/ntp/CommitLog
  stable/10/contrib/ntp/NEWS
  stable/10/contrib/ntp/configure
  stable/10/contrib/ntp/html/miscopt.html
  stable/10/contrib/ntp/include/Makefile.am
  stable/10/contrib/ntp/include/Makefile.in
  stable/10/contrib/ntp/include/ntp_refclock.h
  stable/10/contrib/ntp/include/ntp_stdlib.h
  stable/10/contrib/ntp/include/ntp_worker.h
  stable/10/contrib/ntp/include/ntpd.h
  stable/10/contrib/ntp/lib/isc/backtrace.c
  stable/10/contrib/ntp/lib/isc/buffer.c
  stable/10/contrib/ntp/lib/isc/inet_aton.c
  stable/10/contrib/ntp/lib/isc/inet_pton.c
  stable/10/contrib/ntp/lib/isc/log.c
  stable/10/contrib/ntp/lib/isc/netaddr.c
  stable/10/contrib/ntp/lib/isc/sockaddr.c
  stable/10/contrib/ntp/lib/isc/task.c
  stable/10/contrib/ntp/lib/isc/win32/interfaceiter.c
  stable/10/contrib/ntp/lib/isc/win32/net.c
  stable/10/contrib/ntp/libntp/a_md5encrypt.c
  stable/10/contrib/ntp/libntp/atolfp.c
  stable/10/contrib/ntp/libntp/authkeys.c
  stable/10/contrib/ntp/libntp/authreadkeys.c
  stable/10/contrib/ntp/libntp/authusekey.c
  stable/10/contrib/ntp/libntp/dolfptoa.c
  stable/10/contrib/ntp/libntp/hextolfp.c
  stable/10/contrib/ntp/libntp/mstolfp.c
  stable/10/contrib/ntp/libntp/msyslog.c
  stable/10/contrib/ntp/libntp/ntp_crypto_rnd.c
  stable/10/contrib/ntp/libntp/ntp_lineedit.c
  stable/10/contrib/ntp/libntp/ntp_rfc2553.c
  stable/10/contrib/ntp/libntp/ntp_worker.c
  stable/10/contrib/ntp/libntp/snprintf.c
  stable/10/contrib/ntp/libntp/socktohost.c
  stable/10/contrib/ntp/libntp/systime.c
  stable/10/contrib/ntp/libntp/work_thread.c
  stable/10/contrib/ntp/libparse/clk_computime.c
  stable/10/contrib/ntp/libparse/clk_dcf7000.c
  stable/10/contrib/ntp/libparse/clk_hopf6021.c
  stable/10/contrib/ntp/libparse/clk_meinberg.c
  stable/10/contrib/ntp/libparse/clk_rawdcf.c
  stable/10/contrib/ntp/libparse/clk_rcc8000.c
  stable/10/contrib/ntp/libparse/clk_schmid.c
  stable/10/contrib/ntp/libparse/clk_trimtaip.c
  stable/10/contrib/ntp/libparse/clk_varitext.c
  stable/10/contrib/ntp/libparse/clk_wharton.c
  stable/10/contrib/ntp/libparse/parse.c
  stable/10/contrib/ntp/ntpd/invoke-ntp.conf.texi
  stable/10/contrib/ntp/ntpd/invoke-ntp.keys.texi
  stable/10/contrib/ntp/ntpd/invoke-ntpd.texi
  stable/10/contrib/ntp/ntpd/ntp.conf.5man
  stable/10/contrib/ntp/ntpd/ntp.conf.5mdoc
  stable/10/contrib/ntp/ntpd/ntp.conf.html
  stable/10/contrib/ntp/ntpd/ntp.conf.man.in
  stable/10/contrib/ntp/ntpd/ntp.conf.mdoc.in
  stable/10/contrib/ntp/ntpd/ntp.keys.5man
  stable/10/contrib/ntp/ntpd/ntp.keys.5mdoc
  stable/10/contrib/ntp/ntpd/ntp.keys.html
  stable/10/contrib/ntp/ntpd/ntp.keys.man.in
  stable/10/contrib/ntp/ntpd/ntp.keys.mdoc.in
  stable/10/contrib/ntp/ntpd/ntp_control.c
  stable/10/contrib/ntp/ntpd/ntp_crypto.c
  stable/10/contrib/ntp/ntpd/ntp_io.c
  stable/10/contrib/ntp/ntpd/ntp_loopfilter.c
  stable/10/contrib/ntp/ntpd/ntp_parser.c
  stable/10/contrib/ntp/ntpd/ntp_proto.c
  stable/10/contrib/ntp/ntpd/ntp_refclock.c
  stable/10/contrib/ntp/ntpd/ntp_request.c
  stable/10/contrib/ntp/ntpd/ntp_restrict.c
  stable/10/contrib/ntp/ntpd/ntp_signd.c
  stable/10/contrib/ntp/ntpd/ntp_timer.c
  stable/10/contrib/ntp/ntpd/ntp_util.c
  stable/10/contrib/ntp/ntpd/ntpd-opts.c
  stable/10/contrib/ntp/ntpd/ntpd-opts.h
  stable/10/contrib/ntp/ntpd/ntpd.1ntpdman
  stable/10/contrib/ntp/ntpd/ntpd.1ntpdmdoc
  stable/10/contrib/ntp/ntpd/ntpd.c
  stable/10/contrib/ntp/ntpd/ntpd.html
  stable/10/contrib/ntp/ntpd/ntpd.man.in
  stable/10/contrib/ntp/ntpd/ntpd.mdoc.in
  stable/10/contrib/ntp/ntpd/refclock_local.c
  stable/10/contrib/ntp/ntpd/refclock_parse.c
  stable/10/contrib/ntp/ntpd/refclock_shm.c
  stable/10/contrib/ntp/ntpd/refclock_true.c
  stable/10/contrib/ntp/ntpd/refclock_tsyncpci.c
  stable/10/contrib/ntp/ntpdate/ntpdate.c
  stable/10/contrib/ntp/ntpdc/invoke-ntpdc.texi
  stable/10/contrib/ntp/ntpdc/ntpdc-opts.c
  stable/10/contrib/ntp/ntpdc/ntpdc-opts.h
  stable/10/contrib/ntp/ntpdc/ntpdc.1ntpdcman
  stable/10/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
  stable/10/contrib/ntp/ntpdc/ntpdc.c
  stable/10/contrib/ntp/ntpdc/ntpdc.h
  stable/10/contrib/ntp/ntpdc/ntpdc.html
  stable/10/contrib/ntp/ntpdc/ntpdc.man.in
  stable/10/contrib/ntp/ntpdc/ntpdc.mdoc.in
  stable/10/contrib/ntp/ntpdc/ntpdc_ops.c
  stable/10/contrib/ntp/ntpq/invoke-ntpq.texi
  stable/10/contrib/ntp/ntpq/libntpq.c
  stable/10/contrib/ntp/ntpq/libntpq.h
  stable/10/contrib/ntp/ntpq/libntpq_subs.c
  stable/10/contrib/ntp/ntpq/ntpq-opts.c
  stable/10/contrib/ntp/ntpq/ntpq-opts.h
  stable/10/contrib/ntp/ntpq/ntpq-subs.c
  stable/10/contrib/ntp/ntpq/ntpq.1ntpqman
  stable/10/contrib/ntp/ntpq/ntpq.1ntpqmdoc
  stable/10/contrib/ntp/ntpq/ntpq.c
  stable/10/contrib/ntp/ntpq/ntpq.h
  stable/10/contrib/ntp/ntpq/ntpq.html
  stable/10/contrib/ntp/ntpq/ntpq.man.in
  stable/10/contrib/ntp/ntpq/ntpq.mdoc.in
  stable/10/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.html
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
  stable/10/contrib/ntp/packageinfo.sh
  stable/10/contrib/ntp/scripts/calc_tickadj/Makefile.am
  stable/10/contrib/ntp/scripts/calc_tickadj/Makefile.in
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
  stable/10/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
  stable/10/contrib/ntp/scripts/invoke-plot_summary.texi
  stable/10/contrib/ntp/scripts/invoke-summary.texi
  stable/10/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
  stable/10/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
  stable/10/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
  stable/10/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
  stable/10/contrib/ntp/scripts/ntp-wait/ntp-wait.html
  stable/10/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
  stable/10/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
  stable/10/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
  stable/10/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
  stable/10/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
  stable/10/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
  stable/10/contrib/ntp/scripts/ntpsweep/ntpsweep.html
  stable/10/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
  stable/10/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
  stable/10/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
  stable/10/contrib/ntp/scripts/ntptrace/ntptrace-opts
  stable/10/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
  stable/10/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
  stable/10/contrib/ntp/scripts/ntptrace/ntptrace.html
  stable/10/contrib/ntp/scripts/ntptrace/ntptrace.man.in
  stable/10/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
  stable/10/contrib/ntp/scripts/plot_summary-opts
  stable/10/contrib/ntp/scripts/plot_summary.1plot_summaryman
  stable/10/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
  stable/10/contrib/ntp/scripts/plot_summary.html
  stable/10/contrib/ntp/scripts/plot_summary.man.in
  stable/10/contrib/ntp/scripts/plot_summary.mdoc.in
  stable/10/contrib/ntp/scripts/summary-opts
  stable/10/contrib/ntp/scripts/summary.1summaryman
  stable/10/contrib/ntp/scripts/summary.1summarymdoc
  stable/10/contrib/ntp/scripts/summary.html
  stable/10/contrib/ntp/scripts/summary.man.in
  stable/10/contrib/ntp/scripts/summary.mdoc.in
  stable/10/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
  stable/10/contrib/ntp/scripts/update-leap/update-leap-opts
  stable/10/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
  stable/10/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
  stable/10/contrib/ntp/scripts/update-leap/update-leap.html
  stable/10/contrib/ntp/scripts/update-leap/update-leap.man.in
  stable/10/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
  stable/10/contrib/ntp/sntp/configure
  stable/10/contrib/ntp/sntp/include/version.def
  stable/10/contrib/ntp/sntp/include/version.texi
  stable/10/contrib/ntp/sntp/invoke-sntp.texi
  stable/10/contrib/ntp/sntp/m4/ntp_libevent.m4
  stable/10/contrib/ntp/sntp/m4/ntp_problemtests.m4
  stable/10/contrib/ntp/sntp/m4/version.m4
  stable/10/contrib/ntp/sntp/networking.c
  stable/10/contrib/ntp/sntp/sntp-opts.c
  stable/10/contrib/ntp/sntp/sntp-opts.h
  stable/10/contrib/ntp/sntp/sntp.1sntpman
  stable/10/contrib/ntp/sntp/sntp.1sntpmdoc
  stable/10/contrib/ntp/sntp/sntp.html
  stable/10/contrib/ntp/sntp/sntp.man.in
  stable/10/contrib/ntp/sntp/sntp.mdoc.in
  stable/10/contrib/ntp/sntp/tests/keyFile.c
  stable/10/contrib/ntp/sntp/tests/kodDatabase.c
  stable/10/contrib/ntp/sntp/tests/kodFile.c
  stable/10/contrib/ntp/sntp/tests/run-kodDatabase.c
  stable/10/contrib/ntp/sntp/tests/run-t-log.c
  stable/10/contrib/ntp/sntp/tests/t-log.c
  stable/10/contrib/ntp/sntp/tests/utilities.c
  stable/10/contrib/ntp/sntp/unity/unity_internals.h
  stable/10/contrib/ntp/sntp/version.c
  stable/10/contrib/ntp/tests/bug-2803/bug-2803.c
  stable/10/contrib/ntp/tests/bug-2803/run-bug-2803.c
  stable/10/contrib/ntp/tests/libntp/a_md5encrypt.c
  stable/10/contrib/ntp/tests/libntp/authkeys.c
  stable/10/contrib/ntp/tests/libntp/buftvtots.c
  stable/10/contrib/ntp/tests/libntp/calendar.c
  stable/10/contrib/ntp/tests/libntp/caljulian.c
  stable/10/contrib/ntp/tests/libntp/clocktime.c
  stable/10/contrib/ntp/tests/libntp/decodenetnum.c
  stable/10/contrib/ntp/tests/libntp/humandate.c
  stable/10/contrib/ntp/tests/libntp/lfpfunc.c
  stable/10/contrib/ntp/tests/libntp/lfptostr.c
  stable/10/contrib/ntp/tests/libntp/modetoa.c
  stable/10/contrib/ntp/tests/libntp/msyslog.c
  stable/10/contrib/ntp/tests/libntp/netof.c
  stable/10/contrib/ntp/tests/libntp/numtoa.c
  stable/10/contrib/ntp/tests/libntp/numtohost.c
  stable/10/contrib/ntp/tests/libntp/octtoint.c
  stable/10/contrib/ntp/tests/libntp/prettydate.c
  stable/10/contrib/ntp/tests/libntp/recvbuff.c
  stable/10/contrib/ntp/tests/libntp/refidsmear.c
  stable/10/contrib/ntp/tests/libntp/refnumtoa.c
  stable/10/contrib/ntp/tests/libntp/run-a_md5encrypt.c
  stable/10/contrib/ntp/tests/libntp/run-calendar.c
  stable/10/contrib/ntp/tests/libntp/run-decodenetnum.c
  stable/10/contrib/ntp/tests/libntp/run-humandate.c
  stable/10/contrib/ntp/tests/libntp/run-lfpfunc.c
  stable/10/contrib/ntp/tests/libntp/run-lfptostr.c
  stable/10/contrib/ntp/tests/libntp/run-modetoa.c
  stable/10/contrib/ntp/tests/libntp/run-msyslog.c
  stable/10/contrib/ntp/tests/libntp/run-netof.c
  stable/10/contrib/ntp/tests/libntp/run-numtoa.c
  stable/10/contrib/ntp/tests/libntp/run-numtohost.c
  stable/10/contrib/ntp/tests/libntp/run-prettydate.c
  stable/10/contrib/ntp/tests/libntp/run-refnumtoa.c
  stable/10/contrib/ntp/tests/libntp/run-sfptostr.c
  stable/10/contrib/ntp/tests/libntp/run-socktoa.c
  stable/10/contrib/ntp/tests/libntp/run-statestr.c
  stable/10/contrib/ntp/tests/libntp/run-strtolfp.c
  stable/10/contrib/ntp/tests/libntp/run-timespecops.c
  stable/10/contrib/ntp/tests/libntp/run-timevalops.c
  stable/10/contrib/ntp/tests/libntp/run-uglydate.c
  stable/10/contrib/ntp/tests/libntp/sfptostr.c
  stable/10/contrib/ntp/tests/libntp/socktoa.c
  stable/10/contrib/ntp/tests/libntp/statestr.c
  stable/10/contrib/ntp/tests/libntp/strtolfp.c
  stable/10/contrib/ntp/tests/libntp/timespecops.c
  stable/10/contrib/ntp/tests/libntp/timevalops.c
  stable/10/contrib/ntp/tests/libntp/uglydate.c
  stable/10/contrib/ntp/tests/ntpd/leapsec.c
  stable/10/contrib/ntp/tests/ntpd/ntp_prio_q.c
  stable/10/contrib/ntp/tests/ntpd/ntp_restrict.c
  stable/10/contrib/ntp/tests/ntpd/rc_cmdlength.c
  stable/10/contrib/ntp/tests/ntpd/run-leapsec.c
  stable/10/contrib/ntp/tests/ntpd/run-ntp_restrict.c
  stable/10/contrib/ntp/tests/ntpd/run-rc_cmdlength.c
  stable/10/contrib/ntp/tests/ntpd/run-t-ntp_signd.c
  stable/10/contrib/ntp/tests/ntpd/t-ntp_scanner.c
  stable/10/contrib/ntp/tests/ntpd/t-ntp_signd.c
  stable/10/contrib/ntp/tests/sandbox/run-uglydate.c
  stable/10/contrib/ntp/tests/sandbox/smeartest.c
  stable/10/contrib/ntp/tests/sandbox/uglydate.c
  stable/10/contrib/ntp/tests/sec-2853/sec-2853.c
  stable/10/contrib/ntp/util/invoke-ntp-keygen.texi
  stable/10/contrib/ntp/util/ntp-keygen-opts.c
  stable/10/contrib/ntp/util/ntp-keygen-opts.h
  stable/10/contrib/ntp/util/ntp-keygen.1ntp-keygenman
  stable/10/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
  stable/10/contrib/ntp/util/ntp-keygen.c
  stable/10/contrib/ntp/util/ntp-keygen.html
  stable/10/contrib/ntp/util/ntp-keygen.man.in
  stable/10/contrib/ntp/util/ntp-keygen.mdoc.in
  stable/10/usr.sbin/ntp/config.h
  stable/10/usr.sbin/ntp/doc/ntp-keygen.8
  stable/10/usr.sbin/ntp/doc/ntp.conf.5
  stable/10/usr.sbin/ntp/doc/ntp.keys.5
  stable/10/usr.sbin/ntp/doc/ntpd.8
  stable/10/usr.sbin/ntp/doc/ntpdc.8
  stable/10/usr.sbin/ntp/doc/ntpq.8
  stable/10/usr.sbin/ntp/doc/sntp.8
  stable/10/usr.sbin/ntp/scripts/mkver
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/ntp/ChangeLog
==============================================================================
--- stable/10/contrib/ntp/ChangeLog     Mon Jan 11 00:43:50 2016        
(r293649)
+++ stable/10/contrib/ntp/ChangeLog     Mon Jan 11 01:09:50 2016        
(r293650)
@@ -1,4 +1,61 @@
 ---
+(4.2.8p5) 2016/01/07 Released by Harlan Stenn <st...@ntp.org>
+
+* [Sec 2956] small-step/big-step.  Close the panic gate earlier.  HStenn.
+* CID 1339955: Free allocated memory in caljulian test.  HStenn.
+* CID 1339962: Explicitly initialize variable in caljulian test.  HStenn.
+* CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c.  HStenn.
+* CID 1341533: Missing assertion in sntp/tests/t-log.c.  HStenn.
+* CID 1341534: Resource leak in tests/ntpd/t-ntp_signd.c.  HStenn.
+* CID 1341535: Resource leak in tests/ntpd/t-ntp_signd.c.  HStenn.
+* CID 1341536: Resource leak in tests/ntpd/t-ntp_signd.c.  HStenn.
+* CID 1341537: Resource leak in tests/ntpd/t-ntp_signd.c.  HStenn.
+* CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262.  HStenn.
+* CID 1341677: Nits in sntp/tests/keyFile.c.  HStenn.
+* CID 1341678: Nits in sntp/tests/keyFile.c.  HStenn.
+* CID 1341679: Nits in sntp/tests/keyFile.c.  HStenn.
+* CID 1341680: Nits in sntp/tests/keyFile.c.  HStenn.
+* CID 1341681: Nits in sntp/tests/keyFile.c.  HStenn.
+* CID 1341682: Nit in libntp/authreadkeys.c.  HStenn.
+* CID 1341684: Nit in tests/ntpd/t-ntp_signd.c.  HStenn.
+* [Bug 2829] Look at pipe_fds in ntpd.c  (did so. perlin...@ntp.org)
+* [Bug 2887] stratum -1 config results as showing value 99
+  - fudge stratum should only accept values [0..16]. perlin...@ntp.org
+* [Bug 2932] Update leapsecond file info in miscopt.html.  CWoodbury, HStenn.
+* [Bug 2934] tests/ntpd/t-ntp_scanner.c has a magic constant wired in.  HMurray
+* [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
+  - applied patch by Christos Zoulas.  perlin...@ntp.org
+* [Bug 2952] Symmetric active/passive mode is broken.  HStenn.
+* [Bug 2954] Version 4.2.8p4 crashes on startup with sig fault
+  - fixed data race conditions in threaded DNS worker. perlin...@ntp.org
+  - limit threading warm-up to linux; FreeBSD bombs on it. perlin...@ntp.org
+* [Bug 2957] 'unsigned int' vs 'size_t' format clash. perlin...@ntp.org
+  - accept key file only if there are no parsing errors
+  - fixed size_t/u_int format clash
+  - fixed wrong use of 'strlcpy'
+* [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+* [Bug 2962] truncation of size_t/ptrdiff_t on 64bit targets. perlin...@ntp.org
+  - fixed several other warnings (cast-alignment, missing const, missing 
prototypes)
+  - promote use of 'size_t' for values that express a size
+  - use ptr-to-const for read-only arguments
+  - make sure SOCKET values are not truncated (win32-specific)
+  - format string fixes
+* [Bug 2965] Local clock didn't work since 4.2.8p4.  Martin Burnicki.
+* [Bug 2967] ntpdate command suffers an assertion failure
+  - fixed ntp_rfc2553.c to return proper address length. perlin...@ntp.org
+* [Bug 2969]  Seg fault from ntpq/mrulist when looking at server with
+              lots of clients. perlin...@ntp.org
+* [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call
+  - changed stacked/nested handling of CTRL-C. perlin...@ntp.org
+* Unity cleanup for FreeBSD-6.4.  Harlan Stenn.
+* Unity test cleanup.  Harlan Stenn.
+* Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.
+* Header cleanup in tests/sandbox/uglydate.c.  Harlan Stenn.
+* Header cleanup in tests/libntp/sfptostr.c.  Harlan Stenn.
+* Quiet a warning from clang.  Harlan Stenn.
+* Update the NEWS file.  Harlan Stenn.
+* Update scripts/calc_tickadj/Makefile.am.  Harlan Stenn.
+---
 (4.2.8p4) 2015/10/21 Released by Harlan Stenn <st...@ntp.org>
 (4.2.8p4-RC1) 2015/10/06 Released by Harlan Stenn <st...@ntp.org>
 

Modified: stable/10/contrib/ntp/CommitLog
==============================================================================
--- stable/10/contrib/ntp/CommitLog     Mon Jan 11 00:43:50 2016        
(r293649)
+++ stable/10/contrib/ntp/CommitLog     Mon Jan 11 01:09:50 2016        
(r293650)
@@ -1,3 +1,1480 @@
+ChangeSet@1.3623, 2016-01-07 23:33:11+00:00, st...@deacon.udel.edu
+  NTP_4_2_8P5
+  TAG: NTP_4_2_8P5
+
+  ChangeLog@1.1791 +1 -0
+    NTP_4_2_8P5
+
+  ntpd/invoke-ntp.conf.texi@1.194 +1 -1
+    NTP_4_2_8P5
+
+  ntpd/invoke-ntp.keys.texi@1.186 +1 -1
+    NTP_4_2_8P5
+
+  ntpd/invoke-ntpd.texi@1.503 +2 -2
+    NTP_4_2_8P5
+
+  ntpd/ntp.conf.5man@1.228 +3 -3
+    NTP_4_2_8P5
+
+  ntpd/ntp.conf.5mdoc@1.228 +2 -2
+    NTP_4_2_8P5
+
+  ntpd/ntp.conf.html@1.182 +1 -1
+    NTP_4_2_8P5
+
+  ntpd/ntp.conf.man.in@1.228 +3 -3
+    NTP_4_2_8P5
+
+  ntpd/ntp.conf.mdoc.in@1.228 +2 -2
+    NTP_4_2_8P5
+
+  ntpd/ntp.keys.5man@1.220 +2 -2
+    NTP_4_2_8P5
+
+  ntpd/ntp.keys.5mdoc@1.220 +2 -2
+    NTP_4_2_8P5
+
+  ntpd/ntp.keys.html@1.182 +1 -1
+    NTP_4_2_8P5
+
+  ntpd/ntp.keys.man.in@1.220 +2 -2
+    NTP_4_2_8P5
+
+  ntpd/ntp.keys.mdoc.in@1.220 +2 -2
+    NTP_4_2_8P5
+
+  ntpd/ntpd-opts.c@1.525 +7 -7
+    NTP_4_2_8P5
+
+  ntpd/ntpd-opts.h@1.524 +3 -3
+    NTP_4_2_8P5
+
+  ntpd/ntpd.1ntpdman@1.332 +3 -3
+    NTP_4_2_8P5
+
+  ntpd/ntpd.1ntpdmdoc@1.332 +2 -2
+    NTP_4_2_8P5
+
+  ntpd/ntpd.html@1.176 +2 -2
+    NTP_4_2_8P5
+
+  ntpd/ntpd.man.in@1.332 +3 -3
+    NTP_4_2_8P5
+
+  ntpd/ntpd.mdoc.in@1.332 +2 -2
+    NTP_4_2_8P5
+
+  ntpdc/invoke-ntpdc.texi@1.500 +2 -2
+    NTP_4_2_8P5
+
+  ntpdc/ntpdc-opts.c@1.518 +7 -7
+    NTP_4_2_8P5
+
+  ntpdc/ntpdc-opts.h@1.517 +3 -3
+    NTP_4_2_8P5
+
+  ntpdc/ntpdc.1ntpdcman@1.331 +3 -3
+    NTP_4_2_8P5
+
+  ntpdc/ntpdc.1ntpdcmdoc@1.331 +2 -2
+    NTP_4_2_8P5
+
+  ntpdc/ntpdc.html@1.344 +2 -2
+    NTP_4_2_8P5
+
+  ntpdc/ntpdc.man.in@1.331 +3 -3
+    NTP_4_2_8P5
+
+  ntpdc/ntpdc.mdoc.in@1.331 +2 -2
+    NTP_4_2_8P5
+
+  ntpq/invoke-ntpq.texi@1.507 +2 -2
+    NTP_4_2_8P5
+
+  ntpq/ntpq-opts.c@1.524 +7 -7
+    NTP_4_2_8P5
+
+  ntpq/ntpq-opts.h@1.522 +3 -3
+    NTP_4_2_8P5
+
+  ntpq/ntpq.1ntpqman@1.335 +3 -3
+    NTP_4_2_8P5
+
+  ntpq/ntpq.1ntpqmdoc@1.335 +2 -2
+    NTP_4_2_8P5
+
+  ntpq/ntpq.html@1.173 +2 -2
+    NTP_4_2_8P5
+
+  ntpq/ntpq.man.in@1.335 +3 -3
+    NTP_4_2_8P5
+
+  ntpq/ntpq.mdoc.in@1.335 +2 -2
+    NTP_4_2_8P5
+
+  ntpsnmpd/invoke-ntpsnmpd.texi@1.502 +2 -2
+    NTP_4_2_8P5
+
+  ntpsnmpd/ntpsnmpd-opts.c@1.520 +7 -7
+    NTP_4_2_8P5
+
+  ntpsnmpd/ntpsnmpd-opts.h@1.519 +3 -3
+    NTP_4_2_8P5
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.331 +3 -3
+    NTP_4_2_8P5
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.331 +2 -2
+    NTP_4_2_8P5
+
+  ntpsnmpd/ntpsnmpd.html@1.171 +1 -1
+    NTP_4_2_8P5
+
+  ntpsnmpd/ntpsnmpd.man.in@1.331 +3 -3
+    NTP_4_2_8P5
+
+  ntpsnmpd/ntpsnmpd.mdoc.in@1.331 +2 -2
+    NTP_4_2_8P5
+
+  packageinfo.sh@1.522 +2 -2
+    NTP_4_2_8P5
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.92 +3 -3
+    NTP_4_2_8P5
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.93 +2 -2
+    NTP_4_2_8P5
+
+  scripts/calc_tickadj/calc_tickadj.html@1.94 +1 -1
+    NTP_4_2_8P5
+
+  scripts/calc_tickadj/calc_tickadj.man.in@1.91 +3 -3
+    NTP_4_2_8P5
+
+  scripts/calc_tickadj/calc_tickadj.mdoc.in@1.93 +2 -2
+    NTP_4_2_8P5
+
+  scripts/calc_tickadj/invoke-calc_tickadj.texi@1.96 +1 -1
+    NTP_4_2_8P5
+
+  scripts/invoke-plot_summary.texi@1.113 +2 -2
+    NTP_4_2_8P5
+
+  scripts/invoke-summary.texi@1.113 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntp-wait/invoke-ntp-wait.texi@1.323 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntp-wait/ntp-wait-opts@1.59 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitman@1.320 +3 -3
+    NTP_4_2_8P5
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.321 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntp-wait/ntp-wait.html@1.340 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntp-wait/ntp-wait.man.in@1.320 +3 -3
+    NTP_4_2_8P5
+
+  scripts/ntp-wait/ntp-wait.mdoc.in@1.321 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntpsweep/invoke-ntpsweep.texi@1.111 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntpsweep/ntpsweep-opts@1.61 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepman@1.99 +3 -3
+    NTP_4_2_8P5
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.99 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntpsweep/ntpsweep.html@1.112 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntpsweep/ntpsweep.man.in@1.99 +3 -3
+    NTP_4_2_8P5
+
+  scripts/ntpsweep/ntpsweep.mdoc.in@1.100 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntptrace/invoke-ntptrace.texi@1.112 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntptrace/ntptrace-opts@1.61 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntptrace/ntptrace.1ntptraceman@1.99 +3 -3
+    NTP_4_2_8P5
+
+  scripts/ntptrace/ntptrace.1ntptracemdoc@1.100 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntptrace/ntptrace.html@1.113 +2 -2
+    NTP_4_2_8P5
+
+  scripts/ntptrace/ntptrace.man.in@1.99 +3 -3
+    NTP_4_2_8P5
+
+  scripts/ntptrace/ntptrace.mdoc.in@1.101 +2 -2
+    NTP_4_2_8P5
+
+  scripts/plot_summary-opts@1.61 +2 -2
+    NTP_4_2_8P5
+
+  scripts/plot_summary.1plot_summaryman@1.111 +3 -3
+    NTP_4_2_8P5
+
+  scripts/plot_summary.1plot_summarymdoc@1.111 +2 -2
+    NTP_4_2_8P5
+
+  scripts/plot_summary.html@1.114 +2 -2
+    NTP_4_2_8P5
+
+  scripts/plot_summary.man.in@1.111 +3 -3
+    NTP_4_2_8P5
+
+  scripts/plot_summary.mdoc.in@1.111 +2 -2
+    NTP_4_2_8P5
+
+  scripts/summary-opts@1.61 +2 -2
+    NTP_4_2_8P5
+
+  scripts/summary.1summaryman@1.111 +3 -3
+    NTP_4_2_8P5
+
+  scripts/summary.1summarymdoc@1.111 +2 -2
+    NTP_4_2_8P5
+
+  scripts/summary.html@1.114 +2 -2
+    NTP_4_2_8P5
+
+  scripts/summary.man.in@1.111 +3 -3
+    NTP_4_2_8P5
+
+  scripts/summary.mdoc.in@1.111 +2 -2
+    NTP_4_2_8P5
+
+  scripts/update-leap/invoke-update-leap.texi@1.12 +1 -1
+    NTP_4_2_8P5
+
+  scripts/update-leap/update-leap-opts@1.12 +2 -2
+    NTP_4_2_8P5
+
+  scripts/update-leap/update-leap.1update-leapman@1.12 +3 -3
+    NTP_4_2_8P5
+
+  scripts/update-leap/update-leap.1update-leapmdoc@1.12 +2 -2
+    NTP_4_2_8P5
+
+  scripts/update-leap/update-leap.html@1.12 +1 -1
+    NTP_4_2_8P5
+
+  scripts/update-leap/update-leap.man.in@1.12 +3 -3
+    NTP_4_2_8P5
+
+  scripts/update-leap/update-leap.mdoc.in@1.12 +2 -2
+    NTP_4_2_8P5
+
+  sntp/invoke-sntp.texi@1.500 +2 -2
+    NTP_4_2_8P5
+
+  sntp/sntp-opts.c@1.519 +7 -7
+    NTP_4_2_8P5
+
+  sntp/sntp-opts.h@1.517 +3 -3
+    NTP_4_2_8P5
+
+  sntp/sntp.1sntpman@1.335 +3 -3
+    NTP_4_2_8P5
+
+  sntp/sntp.1sntpmdoc@1.335 +2 -2
+    NTP_4_2_8P5
+
+  sntp/sntp.html@1.515 +2 -2
+    NTP_4_2_8P5
+
+  sntp/sntp.man.in@1.335 +3 -3
+    NTP_4_2_8P5
+
+  sntp/sntp.mdoc.in@1.335 +2 -2
+    NTP_4_2_8P5
+
+  util/invoke-ntp-keygen.texi@1.503 +2 -2
+    NTP_4_2_8P5
+
+  util/ntp-keygen-opts.c@1.521 +7 -7
+    NTP_4_2_8P5
+
+  util/ntp-keygen-opts.h@1.519 +3 -3
+    NTP_4_2_8P5
+
+  util/ntp-keygen.1ntp-keygenman@1.331 +3 -3
+    NTP_4_2_8P5
+
+  util/ntp-keygen.1ntp-keygenmdoc@1.331 +2 -2
+    NTP_4_2_8P5
+
+  util/ntp-keygen.html@1.177 +2 -2
+    NTP_4_2_8P5
+
+  util/ntp-keygen.man.in@1.331 +3 -3
+    NTP_4_2_8P5
+
+  util/ntp-keygen.mdoc.in@1.331 +2 -2
+    NTP_4_2_8P5
+
+ChangeSet@1.3622, 2016-01-07 17:52:24-05:00, st...@deacon.udel.edu
+  ntp-4.2.8p5
+
+  packageinfo.sh@1.521 +1 -1
+    ntp-4.2.8p5
+
+ChangeSet@1.3621, 2016-01-07 22:20:05+00:00, st...@psp-at1.ntp.org
+  cleanup
+
+  NEWS@1.152 +2 -2
+    cleanup
+
+ChangeSet@1.3620, 2016-01-07 09:33:11+00:00, st...@psp-at1.ntp.org
+  typo in ntp_proto.c - leap smear.  Reported by Martin Burnicki
+
+  ntpd/ntp_proto.c@1.371 +1 -1
+    typo in ntp_proto.c - leap smear.  Reported by Martin Burnicki
+
+ChangeSet@1.3619, 2016-01-07 06:33:08+00:00, st...@psp-at1.ntp.org
+  Update scripts/calc_tickadj/Makefile.am.  Harlan Stenn.
+
+  ChangeLog@1.1790 +1 -0
+    Update scripts/calc_tickadj/Makefile.am.  Harlan Stenn.
+
+  scripts/calc_tickadj/Makefile.am@1.11 +2 -0
+    Update scripts/calc_tickadj/Makefile.am.  Harlan Stenn.
+
+ChangeSet@1.3616.1.1, 2016-01-05 10:57:45+00:00, st...@psp-at1.ntp.org
+  Bug 2952 fixes
+
+  ChangeLog@1.1787.1.1 +1 -0
+    Bug 2952 fixes
+
+  ntpd/ntp_proto.c@1.370 +165 -152
+    Bug 2952 fixes
+
+ChangeSet@1.3617, 2016-01-05 09:56:31+00:00, st...@psp-at1.ntp.org
+  ntp-4.2.8p5 prep
+
+  ChangeLog@1.1788 +2 -1
+    ntp-4.2.8p5 prep
+
+  NEWS@1.151 +104 -3
+    ntp-4.2.8p5 prep
+
+ChangeSet@1.3616, 2015-12-06 11:20:02+00:00, st...@psp-deb1.ntp.org
+  Quiet a warning from clang.  Harlan Stenn.
+
+  ChangeLog@1.1787 +1 -0
+    Quiet a warning from clang.  Harlan Stenn.
+
+  libntp/ntp_rfc2553.c@1.50 +3 -2
+    Quiet a warning from clang.  Harlan Stenn.
+
+ChangeSet@1.3615, 2015-12-05 10:41:51+00:00, st...@psp-at1.ntp.org
+  CID 1341677: Nits in sntp/tests/keyFile.c.  HStenn.
+
+  ChangeLog@1.1786 +1 -0
+    CID 1341677: Nits in sntp/tests/keyFile.c.  HStenn.
+
+  sntp/tests/keyFile.c@1.12 +5 -2
+    CID 1341677: Nits in sntp/tests/keyFile.c.  HStenn.
+
+ChangeSet@1.3614, 2015-12-05 10:38:28+00:00, st...@psp-at1.ntp.org
+  CID 1341678: Nits in sntp/tests/keyFile.c.  HStenn.
+
+  ChangeLog@1.1785 +1 -0
+    CID 1341678: Nits in sntp/tests/keyFile.c.  HStenn.
+
+  sntp/tests/keyFile.c@1.11 +5 -1
+    CID 1341678: Nits in sntp/tests/keyFile.c.  HStenn.
+
+ChangeSet@1.3613, 2015-12-05 10:31:39+00:00, st...@psp-at1.ntp.org
+  CID 1341679: Nits in sntp/tests/keyFile.c.  HStenn.
+
+  ChangeLog@1.1784 +1 -0
+    CID 1341679: Nits in sntp/tests/keyFile.c.  HStenn.
+
+  sntp/tests/keyFile.c@1.10 +4 -2
+    CID 1341679: Nits in sntp/tests/keyFile.c.  HStenn.
+
+ChangeSet@1.3612, 2015-12-05 10:27:40+00:00, st...@psp-at1.ntp.org
+  CID 1341680: Nits in sntp/tests/keyFile.c.  HStenn.
+
+  ChangeLog@1.1783 +1 -0
+    CID 1341680: Nits in sntp/tests/keyFile.c.  HStenn.
+
+  sntp/tests/keyFile.c@1.9 +4 -2
+    CID 1341680: Nits in sntp/tests/keyFile.c.  HStenn.
+
+ChangeSet@1.3611, 2015-12-05 10:21:07+00:00, st...@psp-at1.ntp.org
+  CID 1341681: Nits in sntp/tests/keyFile.c.  HStenn.
+
+  ChangeLog@1.1782 +1 -0
+    CID 1341681: Nits in sntp/tests/keyFile.c.  HStenn.
+
+ChangeSet@1.3610, 2015-12-05 10:18:23+00:00, st...@psp-at1.ntp.org
+  sntp/tests/keyFile.c lint
+
+  sntp/tests/keyFile.c@1.8 +4 -2
+    sntp/tests/keyFile.c lint
+
+ChangeSet@1.3609, 2015-12-05 10:01:47+00:00, st...@psp-at1.ntp.org
+  CID 1341682: Nit in libntp/authreadkeys.c.  HStenn.
+
+  ChangeLog@1.1781 +1 -0
+    CID 1341682: Nit in libntp/authreadkeys.c.  HStenn.
+
+  libntp/authreadkeys.c@1.24 +3 -4
+    CID 1341682: Nit in libntp/authreadkeys.c.  HStenn.
+
+ChangeSet@1.3608, 2015-12-05 09:40:44+00:00, st...@psp-at1.ntp.org
+  CID 1341684: Nit in tests/ntpd/t-ntp_signd.c.  HStenn.
+
+  ChangeLog@1.1780 +1 -0
+    CID 1341684: Nit in tests/ntpd/t-ntp_signd.c.  HStenn.
+
+  tests/ntpd/t-ntp_signd.c@1.15 +4 -0
+    CID 1341684: Nit in tests/ntpd/t-ntp_signd.c.  HStenn.
+
+ChangeSet@1.3607, 2015-12-03 12:07:30+00:00, st...@psp-at1.ntp.org
+  Update some test runners
+
+  tests/libntp/run-sfptostr.c@1.7 +9 -8
+    update
+
+  tests/sandbox/run-uglydate.c@1.7 +2 -1
+    update
+
+ChangeSet@1.3606, 2015-12-03 03:28:15-08:00, cov-bu...@cov7.ntfo.org
+  Header cleanup in tests/libntp/sfptostr.c.  Harlan Stenn.
+
+  ChangeLog@1.1779 +1 -0
+    Header cleanup in tests/libntp/sfptostr.c.  Harlan Stenn.
+
+  tests/libntp/sfptostr.c@1.5 +1 -0
+    Header cleanup in tests/libntp/sfptostr.c.  Harlan Stenn.
+
+ChangeSet@1.3605, 2015-12-03 03:26:50-08:00, cov-bu...@cov7.ntfo.org
+  Header cleanup in tests/sandbox/uglydate.c.  Harlan Stenn.
+
+  ChangeLog@1.1778 +1 -0
+    Header cleanup in tests/sandbox/uglydate.c.  Harlan Stenn.
+
+  tests/sandbox/uglydate.c@1.6 +2 -1
+    Header cleanup in tests/sandbox/uglydate.c.  Harlan Stenn.
+
+ChangeSet@1.3604, 2015-12-03 02:16:02-08:00, cov-bu...@cov7.ntfo.org
+  CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c.  HStenn.
+
+  ChangeLog@1.1777 +1 -0
+    CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c.  HStenn.
+
+  sntp/tests/t-log.c@1.7 +1 -1
+    CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c.  HStenn.
+
+ChangeSet@1.3603, 2015-12-03 02:00:58-08:00, cov-bu...@cov7.ntfo.org
+  CID 1341533: Missing assertion in sntp/tests/t-log.c.  HStenn.
+
+  ChangeLog@1.1776 +1 -0
+    CID 1341533: Missing assertion in sntp/tests/t-log.c.  HStenn.
+
+  sntp/tests/t-log.c@1.6 +2 -0
+    CID 1341533: Missing assertion in sntp/tests/t-log.c.  HStenn.
+
+ChangeSet@1.3602, 2015-12-03 01:50:11-08:00, cov-bu...@cov7.ntfo.org
+  CID 134534-134537: Resource leaks in tests/ntpd/t-ntp_signd.c.  HStenn.
+
+  ChangeLog@1.1775 +4 -0
+    CID 134534-134537: Resource leaks in tests/ntpd/t-ntp_signd.c.  HStenn.
+
+  tests/ntpd/t-ntp_signd.c@1.14 +9 -0
+    CID 134534-134537: Resource leaks in tests/ntpd/t-ntp_signd.c.  HStenn.
+
+ChangeSet@1.3601, 2015-12-03 01:22:22-08:00, cov-bu...@cov7.ntfo.org
+  CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262.  HStenn.
+
+  ChangeLog@1.1774 +1 -0
+    CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262.  HStenn.
+
+  tests/ntpd/ntp_prio_q.c@1.3 +1 -0
+    CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262.  HStenn.
+
+ChangeSet@1.3597.4.1, 2015-11-30 06:03:47+01:00, jnperlin@hydra.localnet
+  [Bug 2829] Look at pipe_fds in ntpd.c (initial value issue)
+
+  ChangeLog@1.1770.4.1 +1 -0
+    [Bug 2829] Look at pipe_fds in ntpd.c
+
+  ntpd/ntpd.c@1.167 +3 -0
+    [Bug 2829] Look at pipe_fds in ntpd.c (initial value issue)
+
+ChangeSet@1.3597.3.1, 2015-11-29 13:03:58+01:00, jnperlin@hydra.localnet
+  [Bug 2887] stratum -1 config results as showing value 99
+   - fudge stratum only accepts values [0..16].
+
+  ChangeLog@1.1770.3.1 +2 -0
+    [Bug 2887] stratum -1 config results as showing value 99
+     - fudge stratum only accepts values [0..16].
+
+  ntpd/ntp_parser.c@1.100 +178 -171
+    [Bug 2887] stratum -1 config results as showing value 99
+     - fudge stratum only accepts values [0..16]. (file regenerated by bison & 
trimmed manually)
+
+  ntpd/ntp_parser.y@1.90 +8 -1
+    [Bug 2887] stratum -1 config results as showing value 99
+     - fudge stratum only accepts values [0..16], gives error otherwise
+
+ChangeSet@1.3597.2.1, 2015-11-28 22:59:39+01:00, jnperlin@hydra.localnet
+  [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
+   - applied patch by Christos Zoulas.
+
+  ChangeLog@1.1770.2.1 +2 -0
+    [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
+     - applied patch by Christos Zoulas.
+
+  libntp/socktohost.c@1.16 +10 -2
+    [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
+     - save errno around calls to getnameinfo/getaddrinfo (patch by Christos 
Zoulas)
+
+ChangeSet@1.3597.1.4, 2015-11-28 19:09:53+01:00, jnperlin@hydra.localnet
+  Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+   - changed stacked/nested handling of CTRL-C.
+
+  ChangeLog@1.1770.1.2 +2 -0
+    Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+     - changed stacked/nested handling of CTRL-C.
+
+  ntpq/ntpq-subs.c@1.114 +11 -8
+    Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+     - changed stacked/nested handling of CTRL-C.
+
+  ntpq/ntpq.c@1.165 +57 -8
+    Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+     - changed stacked/nested handling of CTRL-C.
+
+  ntpq/ntpq.h@1.31 +4 -0
+    Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+     - changed stacked/nested handling of CTRL-C.
+
+ChangeSet@1.3597.1.3, 2015-11-25 22:10:45-08:00, har...@max.pfcs.com
+  Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.
+
+  ChangeLog@1.1770.1.1 +1 -0
+    Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.
+
+  sntp/m4/ntp_libevent.m4@1.16 +2 -1
+    Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.
+
+ChangeSet@1.3597.1.2, 2015-11-25 12:23:40+00:00, st...@psp-at1.ntp.org
+  Unity test cleanup.  Harlan Stenn.
+
+  tests/ntpd/run-t-ntp_signd.c@1.11 +6 -6
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/ntpd/t-ntp_signd.c@1.13 +19 -5
+    Unity test cleanup.  Harlan Stenn.
+
+ChangeSet@1.3597.1.1, 2015-11-25 11:50:51+00:00, st...@psp-at1.ntp.org
+  Unity test cleanup.  Harlan Stenn.
+
+  sntp/unity/unity_internals.h@1.5 +13 -1
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/calendar.c@1.12 +8 -3
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/ntpd/leapsec.c@1.4 +241 -82
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/ntpd/run-leapsec.c@1.6 +33 -33
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/ntpd/run-t-ntp_signd.c@1.10 +6 -6
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/ntpd/t-ntp_signd.c@1.12 +40 -13
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/sandbox/smeartest.c@1.10 +3 -0
+    Unity test cleanup.  Harlan Stenn.
+
+ChangeSet@1.3598, 2015-11-24 08:06:41+01:00, jnperlin@hydra.localnet
+  [Bug 2967] ntpdate command suffers an assertion failure
+    - fixed ntp_rfc2553.c to return proper address length.
+
+  ChangeLog@1.1771 +2 -0
+    [Bug 2967] ntpdate command suffers an assertion failure
+      - fixed ntp_rfc2553.c to return proper address length.
+
+  libntp/ntp_rfc2553.c@1.49 +2 -1
+    [Bug 2967] ntpdate command suffers an assertion failure
+      - fix do_nodename() to return the proper address length when name is 
NULL.
+
+ChangeSet@1.3597, 2015-11-23 10:55:16+00:00, st...@psp-at1.ntp.org
+  ChangeLog, caljulian.c:
+    * CID 1339955: Free allocated memory in caljulian test.  HStenn.
+    * CID 1339962: Explicitly initialize variable in caljulian test.  HStenn.
+
+  ChangeLog@1.1770 +2 -0
+    * CID 1339955: Free allocated memory in caljulian test.  HStenn.
+    * CID 1339962: Explicitly initialize variable in caljulian test.  HStenn.
+
+  tests/libntp/caljulian.c@1.14 +16 -10
+    * CID 1339955: Free allocated memory in caljulian test.  HStenn.
+    * CID 1339962: Explicitly initialize variable in caljulian test.  HStenn.
+
+ChangeSet@1.3596, 2015-11-20 20:16:24-08:00, har...@hms-mbp11.pfcs.com
+  Unity test cleanup.  Harlan Stenn.
+
+  sntp/tests/kodDatabase.c@1.9 +0 -4
+    Unity test cleanup.  Harlan Stenn.
+
+  sntp/tests/run-kodDatabase.c@1.9 +5 -5
+    Unity test cleanup.  Harlan Stenn.
+
+ChangeSet@1.3595, 2015-11-20 19:41:16-08:00, har...@hms-mbp11.pfcs.com
+  Unity test cleanup.  Harlan Stenn.
+
+  sntp/tests/kodDatabase.c@1.8 +6 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  sntp/tests/kodFile.c@1.9 +1 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  sntp/tests/run-kodDatabase.c@1.8 +6 -5
+    Unity test cleanup.  Harlan Stenn.
+
+  sntp/tests/run-t-log.c@1.5 +3 -3
+    Unity test cleanup.  Harlan Stenn.
+
+  sntp/tests/t-log.c@1.5 +32 -16
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/calendar.c@1.11 +11 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/caljulian.c@1.13 +1 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/decodenetnum.c@1.10 +10 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/humandate.c@1.7 +10 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/lfptostr.c@1.8 +9 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/modetoa.c@1.8 +10 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/msyslog.c@1.7 +10 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/netof.c@1.9 +10 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/numtoa.c@1.7 +11 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/numtohost.c@1.7 +11 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/prettydate.c@1.6 +10 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/recvbuff.c@1.7 +3 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/refidsmear.c@1.7 +10 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/refnumtoa.c@1.7 +10 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-calendar.c@1.11 +15 -15
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-decodenetnum.c@1.10 +6 -6
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-humandate.c@1.7 +2 -2
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-lfptostr.c@1.8 +11 -11
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-modetoa.c@1.12 +2 -2
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-msyslog.c@1.9 +8 -8
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-netof.c@1.8 +4 -4
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-numtoa.c@1.11 +2 -2
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-numtohost.c@1.11 +1 -1
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-prettydate.c@1.6 +1 -1
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-refidsmear.c@1.8 +1 -1
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-refnumtoa.c@1.9 +2 -2
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-sfptostr.c@1.6 +8 -8
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-socktoa.c@1.13 +6 -6
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-statestr.c@1.11 +4 -4
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-strtolfp.c@1.6 +7 -7
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-timespecops.c@1.11 +28 -28
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-timevalops.c@1.13 +28 -28
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-uglydate.c@1.11 +1 -1
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/sfptostr.c@1.4 +10 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/socktoa.c@1.11 +11 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/statestr.c@1.6 +11 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/strtolfp.c@1.7 +10 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/timespecops.c@1.10 +10 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/timevalops.c@1.13 +10 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/uglydate.c@1.10 +13 -1
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/sandbox/run-uglydate.c@1.6 +1 -1
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/sandbox/smeartest.c@1.9 +2 -0
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/sandbox/uglydate.c@1.5 +11 -0
+    Unity test cleanup.  Harlan Stenn.
+
+ChangeSet@1.3594, 2015-11-20 07:40:57+00:00, st...@psp-at1.ntp.org
+  [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+
+  ChangeLog@1.1769 +1 -0
+    [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+
+  ntpq/ntpq.c@1.164 +1 -1
+    [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+
+ChangeSet@1.3593, 2015-11-20 07:27:27+00:00, st...@psp-at1.ntp.org
+  Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/authkeys.c@1.13 +36 -10
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/buftvtots.c@1.6 +18 -6
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/calendar.c@1.10 +100 -47
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/caljulian.c@1.12 +27 -9
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/clocktime.c@1.9 +48 -24
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/humandate.c@1.6 +6 -2
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/lfpfunc.c@1.15 +113 -69
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/netof.c@1.8 +22 -7
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/numtohost.c@1.6 +1 -1
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/octtoint.c@1.7 +36 -14
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/refidsmear.c@1.6 +1 -4
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/refnumtoa.c@1.6 +5 -5
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-lfpfunc.c@1.18 +9 -9
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/run-refidsmear.c@1.7 +1 -1
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/timespecops.c@1.9 +173 -48
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/timestructs.h@1.3 +22 -22
+    Unity test cleanup.  Harlan Stenn.
+
+  tests/libntp/timevalops.c@1.12 +168 -52
+    Unity test cleanup.  Harlan Stenn.
+
+ChangeSet@1.3592, 2015-11-20 02:57:37+01:00, jnperlin@nemesis.localnet
+  [Bug 2969] Seg fault from ntpq/mrulist when looking at server with lots of 
clients
+
+  ChangeLog@1.1768 +2 -0
+    [Bug 2969] Seg fault from ntpq/mrulist when looking at server with lots of 
clients
+
+  lib/isc/sockaddr.c@1.14 +1 -1
+    [Bug 2969] Seg fault from ntpq/mrulist when looking at server with lots of 
clients
+     - cast fro size_t to u_int (no overflow danger); not related the bug, 
found while double-checking changes
+
+  ntpq/ntpq-subs.c@1.113 +1 -1
+    [Bug 2969] Seg fault from ntpq/mrulist when looking at server with lots of 
clients
+     - make end-of-buffer test unsigned-safe
+
+ChangeSet@1.3591, 2015-11-17 11:12:02+00:00, st...@psp-at1.ntp.org
+  [Bug 2932] Update leapsecond file info in miscopt.html.  CWoodbury, HStenn.
+
+  ChangeLog@1.1767 +1 -0
+    [Bug 2932] Update leapsecond file info in miscopt.html.  CWoodbury, HStenn.
+
+  html/miscopt.html@1.84 +3 -3
+    [Bug 2932] Update leapsecond file info in miscopt.html.  CWoodbury, HStenn.
+
+ChangeSet@1.3588, 2015-11-17 05:02:10+00:00, st...@psp-at1.ntp.org
+  Credit Martin for 2965
+
+  ChangeLog@1.1764.1.3 +1 -1
+    Credit Martin for 2965
+
+ChangeSet@1.3587, 2015-11-17 04:53:39+00:00, st...@psp-at1.ntp.org
+  cleanup
+
+  ChangeLog@1.1764.1.2 +1 -1
+    cleanup
+
+ChangeSet@1.3584.2.1, 2015-11-16 11:59:55+01:00, burnicki@pc-martin4.
+  [Bug 2965] Local clock didn't work since 4.2.8p4
+
+  ChangeLog@1.1764.1.1 +1 -0
+    [Bug 2965] Local clock didn't work since 4.2.8p4
+
+  ntpd/refclock_local.c@1.22 +1 -0
+    [Bug 2965] Local clock didn't work since 4.2.8p4
+
+ChangeSet@1.3584.1.2, 2015-11-14 01:01:05+01:00, jnperlin@hydra.localnet
+  [Bug 2962] truncation of size_t/ptrdiff_t on 64bit targets
+   - fix warnings in test cases
+
+  tests/libntp/a_md5encrypt.c@1.14 +23 -15
+    [Bug 2962] truncation of size_t/ptrdiff_t on 64bit targets
+     - fix terrible const/noconst and alignment mess 
+
+  tests/libntp/authkeys.c@1.12 +1 -1
+    [Bug 2962] truncation of size_t/ptrdiff_t on 64bit targets
+     - fixed cast to const cast
+
+  tests/libntp/run-a_md5encrypt.c@1.15 +5 -5
+    [Bug 2962] truncation of size_t/ptrdiff_t on 64bit targets
+     - update generated file
+
+  tests/ntpd/rc_cmdlength.c@1.3 +1 -0
+    [Bug 2962] truncation of size_t/ptrdiff_t on 64bit targets
+     - add header to get prototype
+
+  tests/ntpd/run-rc_cmdlength.c@1.4 +2 -1
+    [Bug 2962] truncation of size_t/ptrdiff_t on 64bit targets
+
+ChangeSet@1.3584.1.1, 2015-11-13 22:54:35+01:00, jnperlin@hydra.localnet
+  [Bug 2962] truncation of size_t/ptrdiff_t on 64bit targets
+   - fixed several other warnings (cast-alignment, missing const, missing 
prorotypes)
+   - promote use of 'size_t' for values that express a size
+   - use ptr-to-const for read-only arguments
+   - make sure SOCKET values are not truncated (win32-specific)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to