Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Jun 2020 03:28:32 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r362716 - in stable: 11/contrib/ntp 11/contrib/ntp/html/drivers 11/contrib/ntp/include 11/contrib/ntp/lib/isc/win32/include/isc 11/contrib/ntp/libntp 11/contrib/ntp/ntpd 11/contrib/ntp/...
Message-ID:  <202006280328.05S3SWwf058643@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Sun Jun 28 03:28:28 2020
New Revision: 362716
URL: https://svnweb.freebsd.org/changeset/base/362716

Log:
  MFC r362568:
  
  MFV r362565:
  
  Update 4.2.8p14 --> 4.2.8p15
  
  Summary: Systems that use a CMAC algorithm in ntp.keys will not release
  a bit of memory on each packet that uses a CMAC keyid, eventually causing
  ntpd to run out of memory and fail. The CMAC cleanup from
  https://bugs.ntp.org/3447, part of ntp-4.2.8p11, introduced a bug whereby
  the CMAC data structure was no longer completely removed.
  
  Security:	NTP Bug 3661

Modified:
  stable/12/contrib/ntp/ChangeLog
  stable/12/contrib/ntp/CommitLog
  stable/12/contrib/ntp/NEWS
  stable/12/contrib/ntp/config.h.in
  stable/12/contrib/ntp/configure
  stable/12/contrib/ntp/configure.ac
  stable/12/contrib/ntp/html/drivers/driver40-ja.html
  stable/12/contrib/ntp/html/drivers/driver40.html
  stable/12/contrib/ntp/include/l_stdlib.h
  stable/12/contrib/ntp/include/ntp.h
  stable/12/contrib/ntp/include/ntp_config.h
  stable/12/contrib/ntp/include/recvbuff.h
  stable/12/contrib/ntp/lib/isc/win32/include/isc/int.h
  stable/12/contrib/ntp/libntp/a_md5encrypt.c
  stable/12/contrib/ntp/libntp/decodenetnum.c
  stable/12/contrib/ntp/libntp/recvbuff.c
  stable/12/contrib/ntp/libntp/strdup.c
  stable/12/contrib/ntp/libntp/timexsup.c
  stable/12/contrib/ntp/ntpd/invoke-ntp.conf.texi
  stable/12/contrib/ntp/ntpd/invoke-ntp.keys.texi
  stable/12/contrib/ntp/ntpd/invoke-ntpd.texi
  stable/12/contrib/ntp/ntpd/ntp.conf.5man
  stable/12/contrib/ntp/ntpd/ntp.conf.5mdoc
  stable/12/contrib/ntp/ntpd/ntp.conf.html
  stable/12/contrib/ntp/ntpd/ntp.conf.man.in
  stable/12/contrib/ntp/ntpd/ntp.conf.mdoc.in
  stable/12/contrib/ntp/ntpd/ntp.keys.5man
  stable/12/contrib/ntp/ntpd/ntp.keys.5mdoc
  stable/12/contrib/ntp/ntpd/ntp.keys.html
  stable/12/contrib/ntp/ntpd/ntp.keys.man.in
  stable/12/contrib/ntp/ntpd/ntp.keys.mdoc.in
  stable/12/contrib/ntp/ntpd/ntp_config.c
  stable/12/contrib/ntp/ntpd/ntp_io.c
  stable/12/contrib/ntp/ntpd/ntp_proto.c
  stable/12/contrib/ntp/ntpd/ntp_refclock.c
  stable/12/contrib/ntp/ntpd/ntp_request.c
  stable/12/contrib/ntp/ntpd/ntp_timer.c
  stable/12/contrib/ntp/ntpd/ntpd-opts.c
  stable/12/contrib/ntp/ntpd/ntpd-opts.h
  stable/12/contrib/ntp/ntpd/ntpd.1ntpdman
  stable/12/contrib/ntp/ntpd/ntpd.1ntpdmdoc
  stable/12/contrib/ntp/ntpd/ntpd.html
  stable/12/contrib/ntp/ntpd/ntpd.man.in
  stable/12/contrib/ntp/ntpd/ntpd.mdoc.in
  stable/12/contrib/ntp/ntpd/refclock_jjy.c
  stable/12/contrib/ntp/ntpd/refclock_nmea.c
  stable/12/contrib/ntp/ntpd/refclock_palisade.c
  stable/12/contrib/ntp/ntpd/refclock_parse.c
  stable/12/contrib/ntp/ntpdate/ntpdate.c
  stable/12/contrib/ntp/ntpdc/invoke-ntpdc.texi
  stable/12/contrib/ntp/ntpdc/ntpdc-opts.c
  stable/12/contrib/ntp/ntpdc/ntpdc-opts.h
  stable/12/contrib/ntp/ntpdc/ntpdc.1ntpdcman
  stable/12/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
  stable/12/contrib/ntp/ntpdc/ntpdc.html
  stable/12/contrib/ntp/ntpdc/ntpdc.man.in
  stable/12/contrib/ntp/ntpdc/ntpdc.mdoc.in
  stable/12/contrib/ntp/ntpq/invoke-ntpq.texi
  stable/12/contrib/ntp/ntpq/ntpq-opts.c
  stable/12/contrib/ntp/ntpq/ntpq-opts.h
  stable/12/contrib/ntp/ntpq/ntpq.1ntpqman
  stable/12/contrib/ntp/ntpq/ntpq.1ntpqmdoc
  stable/12/contrib/ntp/ntpq/ntpq.html
  stable/12/contrib/ntp/ntpq/ntpq.man.in
  stable/12/contrib/ntp/ntpq/ntpq.mdoc.in
  stable/12/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
  stable/12/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
  stable/12/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
  stable/12/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
  stable/12/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
  stable/12/contrib/ntp/ntpsnmpd/ntpsnmpd.html
  stable/12/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
  stable/12/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
  stable/12/contrib/ntp/packageinfo.sh
  stable/12/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
  stable/12/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
  stable/12/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
  stable/12/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
  stable/12/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
  stable/12/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
  stable/12/contrib/ntp/scripts/invoke-plot_summary.texi
  stable/12/contrib/ntp/scripts/invoke-summary.texi
  stable/12/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
  stable/12/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
  stable/12/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
  stable/12/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
  stable/12/contrib/ntp/scripts/ntp-wait/ntp-wait.html
  stable/12/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
  stable/12/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
  stable/12/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
  stable/12/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
  stable/12/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
  stable/12/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
  stable/12/contrib/ntp/scripts/ntpsweep/ntpsweep.html
  stable/12/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
  stable/12/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
  stable/12/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
  stable/12/contrib/ntp/scripts/ntptrace/ntptrace-opts
  stable/12/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
  stable/12/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
  stable/12/contrib/ntp/scripts/ntptrace/ntptrace.html
  stable/12/contrib/ntp/scripts/ntptrace/ntptrace.man.in
  stable/12/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
  stable/12/contrib/ntp/scripts/plot_summary-opts
  stable/12/contrib/ntp/scripts/plot_summary.1plot_summaryman
  stable/12/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
  stable/12/contrib/ntp/scripts/plot_summary.html
  stable/12/contrib/ntp/scripts/plot_summary.man.in
  stable/12/contrib/ntp/scripts/plot_summary.mdoc.in
  stable/12/contrib/ntp/scripts/summary-opts
  stable/12/contrib/ntp/scripts/summary.1summaryman
  stable/12/contrib/ntp/scripts/summary.1summarymdoc
  stable/12/contrib/ntp/scripts/summary.html
  stable/12/contrib/ntp/scripts/summary.man.in
  stable/12/contrib/ntp/scripts/summary.mdoc.in
  stable/12/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
  stable/12/contrib/ntp/scripts/update-leap/update-leap-opts
  stable/12/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
  stable/12/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
  stable/12/contrib/ntp/scripts/update-leap/update-leap.html
  stable/12/contrib/ntp/scripts/update-leap/update-leap.man.in
  stable/12/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
  stable/12/contrib/ntp/sntp/configure
  stable/12/contrib/ntp/sntp/crypto.c
  stable/12/contrib/ntp/sntp/include/version.def
  stable/12/contrib/ntp/sntp/include/version.texi
  stable/12/contrib/ntp/sntp/invoke-sntp.texi
  stable/12/contrib/ntp/sntp/m4/version.m4
  stable/12/contrib/ntp/sntp/sntp-opts.c
  stable/12/contrib/ntp/sntp/sntp-opts.h
  stable/12/contrib/ntp/sntp/sntp.1sntpman
  stable/12/contrib/ntp/sntp/sntp.1sntpmdoc
  stable/12/contrib/ntp/sntp/sntp.html
  stable/12/contrib/ntp/sntp/sntp.man.in
  stable/12/contrib/ntp/sntp/sntp.mdoc.in
  stable/12/contrib/ntp/sntp/version.c
  stable/12/contrib/ntp/util/invoke-ntp-keygen.texi
  stable/12/contrib/ntp/util/ntp-keygen-opts.c
  stable/12/contrib/ntp/util/ntp-keygen-opts.h
  stable/12/contrib/ntp/util/ntp-keygen.1ntp-keygenman
  stable/12/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
  stable/12/contrib/ntp/util/ntp-keygen.html
  stable/12/contrib/ntp/util/ntp-keygen.man.in
  stable/12/contrib/ntp/util/ntp-keygen.mdoc.in
  stable/12/usr.sbin/ntp/config.h
  stable/12/usr.sbin/ntp/scripts/mkver
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/contrib/ntp/ChangeLog
  stable/11/contrib/ntp/CommitLog
  stable/11/contrib/ntp/NEWS
  stable/11/contrib/ntp/config.h.in
  stable/11/contrib/ntp/configure
  stable/11/contrib/ntp/configure.ac
  stable/11/contrib/ntp/html/drivers/driver40-ja.html
  stable/11/contrib/ntp/html/drivers/driver40.html
  stable/11/contrib/ntp/include/l_stdlib.h
  stable/11/contrib/ntp/include/ntp.h
  stable/11/contrib/ntp/include/ntp_config.h
  stable/11/contrib/ntp/include/recvbuff.h
  stable/11/contrib/ntp/lib/isc/win32/include/isc/int.h
  stable/11/contrib/ntp/libntp/a_md5encrypt.c
  stable/11/contrib/ntp/libntp/decodenetnum.c
  stable/11/contrib/ntp/libntp/recvbuff.c
  stable/11/contrib/ntp/libntp/strdup.c
  stable/11/contrib/ntp/libntp/timexsup.c
  stable/11/contrib/ntp/ntpd/invoke-ntp.conf.texi
  stable/11/contrib/ntp/ntpd/invoke-ntp.keys.texi
  stable/11/contrib/ntp/ntpd/invoke-ntpd.texi
  stable/11/contrib/ntp/ntpd/ntp.conf.5man
  stable/11/contrib/ntp/ntpd/ntp.conf.5mdoc
  stable/11/contrib/ntp/ntpd/ntp.conf.html
  stable/11/contrib/ntp/ntpd/ntp.conf.man.in
  stable/11/contrib/ntp/ntpd/ntp.conf.mdoc.in
  stable/11/contrib/ntp/ntpd/ntp.keys.5man
  stable/11/contrib/ntp/ntpd/ntp.keys.5mdoc
  stable/11/contrib/ntp/ntpd/ntp.keys.html
  stable/11/contrib/ntp/ntpd/ntp.keys.man.in
  stable/11/contrib/ntp/ntpd/ntp.keys.mdoc.in
  stable/11/contrib/ntp/ntpd/ntp_config.c
  stable/11/contrib/ntp/ntpd/ntp_io.c
  stable/11/contrib/ntp/ntpd/ntp_proto.c
  stable/11/contrib/ntp/ntpd/ntp_refclock.c
  stable/11/contrib/ntp/ntpd/ntp_request.c
  stable/11/contrib/ntp/ntpd/ntp_timer.c
  stable/11/contrib/ntp/ntpd/ntpd-opts.c
  stable/11/contrib/ntp/ntpd/ntpd-opts.h
  stable/11/contrib/ntp/ntpd/ntpd.1ntpdman
  stable/11/contrib/ntp/ntpd/ntpd.1ntpdmdoc
  stable/11/contrib/ntp/ntpd/ntpd.html
  stable/11/contrib/ntp/ntpd/ntpd.man.in
  stable/11/contrib/ntp/ntpd/ntpd.mdoc.in
  stable/11/contrib/ntp/ntpd/refclock_jjy.c
  stable/11/contrib/ntp/ntpd/refclock_nmea.c
  stable/11/contrib/ntp/ntpd/refclock_palisade.c
  stable/11/contrib/ntp/ntpd/refclock_parse.c
  stable/11/contrib/ntp/ntpdate/ntpdate.c
  stable/11/contrib/ntp/ntpdc/invoke-ntpdc.texi
  stable/11/contrib/ntp/ntpdc/ntpdc-opts.c
  stable/11/contrib/ntp/ntpdc/ntpdc-opts.h
  stable/11/contrib/ntp/ntpdc/ntpdc.1ntpdcman
  stable/11/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
  stable/11/contrib/ntp/ntpdc/ntpdc.html
  stable/11/contrib/ntp/ntpdc/ntpdc.man.in
  stable/11/contrib/ntp/ntpdc/ntpdc.mdoc.in
  stable/11/contrib/ntp/ntpq/invoke-ntpq.texi
  stable/11/contrib/ntp/ntpq/ntpq-opts.c
  stable/11/contrib/ntp/ntpq/ntpq-opts.h
  stable/11/contrib/ntp/ntpq/ntpq.1ntpqman
  stable/11/contrib/ntp/ntpq/ntpq.1ntpqmdoc
  stable/11/contrib/ntp/ntpq/ntpq.html
  stable/11/contrib/ntp/ntpq/ntpq.man.in
  stable/11/contrib/ntp/ntpq/ntpq.mdoc.in
  stable/11/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
  stable/11/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
  stable/11/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
  stable/11/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
  stable/11/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
  stable/11/contrib/ntp/ntpsnmpd/ntpsnmpd.html
  stable/11/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
  stable/11/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
  stable/11/contrib/ntp/packageinfo.sh
  stable/11/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
  stable/11/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
  stable/11/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
  stable/11/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
  stable/11/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
  stable/11/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
  stable/11/contrib/ntp/scripts/invoke-plot_summary.texi
  stable/11/contrib/ntp/scripts/invoke-summary.texi
  stable/11/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
  stable/11/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
  stable/11/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
  stable/11/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
  stable/11/contrib/ntp/scripts/ntp-wait/ntp-wait.html
  stable/11/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
  stable/11/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
  stable/11/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
  stable/11/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
  stable/11/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
  stable/11/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
  stable/11/contrib/ntp/scripts/ntpsweep/ntpsweep.html
  stable/11/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
  stable/11/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
  stable/11/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
  stable/11/contrib/ntp/scripts/ntptrace/ntptrace-opts
  stable/11/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
  stable/11/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
  stable/11/contrib/ntp/scripts/ntptrace/ntptrace.html
  stable/11/contrib/ntp/scripts/ntptrace/ntptrace.man.in
  stable/11/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
  stable/11/contrib/ntp/scripts/plot_summary-opts
  stable/11/contrib/ntp/scripts/plot_summary.1plot_summaryman
  stable/11/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
  stable/11/contrib/ntp/scripts/plot_summary.html
  stable/11/contrib/ntp/scripts/plot_summary.man.in
  stable/11/contrib/ntp/scripts/plot_summary.mdoc.in
  stable/11/contrib/ntp/scripts/summary-opts
  stable/11/contrib/ntp/scripts/summary.1summaryman
  stable/11/contrib/ntp/scripts/summary.1summarymdoc
  stable/11/contrib/ntp/scripts/summary.html
  stable/11/contrib/ntp/scripts/summary.man.in
  stable/11/contrib/ntp/scripts/summary.mdoc.in
  stable/11/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
  stable/11/contrib/ntp/scripts/update-leap/update-leap-opts
  stable/11/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
  stable/11/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
  stable/11/contrib/ntp/scripts/update-leap/update-leap.html
  stable/11/contrib/ntp/scripts/update-leap/update-leap.man.in
  stable/11/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
  stable/11/contrib/ntp/sntp/configure
  stable/11/contrib/ntp/sntp/crypto.c
  stable/11/contrib/ntp/sntp/include/version.def
  stable/11/contrib/ntp/sntp/include/version.texi
  stable/11/contrib/ntp/sntp/invoke-sntp.texi
  stable/11/contrib/ntp/sntp/m4/version.m4
  stable/11/contrib/ntp/sntp/sntp-opts.c
  stable/11/contrib/ntp/sntp/sntp-opts.h
  stable/11/contrib/ntp/sntp/sntp.1sntpman
  stable/11/contrib/ntp/sntp/sntp.1sntpmdoc
  stable/11/contrib/ntp/sntp/sntp.html
  stable/11/contrib/ntp/sntp/sntp.man.in
  stable/11/contrib/ntp/sntp/sntp.mdoc.in
  stable/11/contrib/ntp/sntp/version.c
  stable/11/contrib/ntp/util/invoke-ntp-keygen.texi
  stable/11/contrib/ntp/util/ntp-keygen-opts.c
  stable/11/contrib/ntp/util/ntp-keygen-opts.h
  stable/11/contrib/ntp/util/ntp-keygen.1ntp-keygenman
  stable/11/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
  stable/11/contrib/ntp/util/ntp-keygen.html
  stable/11/contrib/ntp/util/ntp-keygen.man.in
  stable/11/contrib/ntp/util/ntp-keygen.mdoc.in
  stable/11/usr.sbin/ntp/config.h
  stable/11/usr.sbin/ntp/scripts/mkver
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/contrib/ntp/ChangeLog
==============================================================================
--- stable/12/contrib/ntp/ChangeLog	Sun Jun 28 02:38:07 2020	(r362715)
+++ stable/12/contrib/ntp/ChangeLog	Sun Jun 28 03:28:28 2020	(r362716)
@@ -1,4 +1,33 @@
 ---
+(4.2.8p15) 2020/06/23 Released by Harlan Stenn <stenn@ntp.org>
+(4.2.8p15) 2020/06/23 Released by Harlan Stenn <stenn@ntp.or>
+
+* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
+* [Bug 3670] Regression from bad merge of 3592 and 3596 <perlinger@ntp.org>
+  - fixed a bad merge that happened before 4.2.8-p14. Thanks to
+    Sylar Tao for noticing this!
+* [Bug 3667] decodenetnum fails with numeric port <perlinger@ntp.org>
+  - rewrite 'decodenetnum()' in terms of inet_pton
+* [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
+  - limit number of receive buffers, with an iron reserve for refclocks
+* [Bug 3664] Enable openSSL CMAC support on Windows <burnicki@ntp.org>
+* [Bug 3662] Fix build errors on Windows with VS2008 <burnicki@ntp.org>
+* [Bug 3660] Manycast orphan mode startup discovery problem. <stenn@ntp.org>
+  - integrated patch from Charles Claggett
+* [Bug 3659] Move definition of psl[] from ntp_config.h to
+  ntp_config.h <perlinger@ntp.org>
+* [Bug 3657] Wrong "Autokey group mismatch" debug message <perlinger@ntp.org>
+* [Bug 3655] ntpdc memstats hash counts <perlinger@ntp.org>
+  - fix by Gerry garvey
+* [Bug 3653] Refclock jitter RMS calculation <perlinger@ntp.org>
+  - thanks to Gerry Garvey
+* [Bug 3646] Avoid sync with unsync orphan <perlinger@ntp.org>
+  - patch by Gerry Garvey
+* [Bug 3644] Unsynchronized server [...] selected as candidate <perlinger@ntp.org>
+* [Bug 3639] refclock_jjy: TS-JJY0x can skip time sync depending on the STUS reply. <abe@ntp.org>
+  - applied patch by Takao Abe
+
+---
 (4.2.8p14) 2020/03/03 Released by Harlan Stenn <stenn@ntp.org>
 
 * [Sec 3610] process_control() should bail earlier on short packets. stenn@

Modified: stable/12/contrib/ntp/CommitLog
==============================================================================
--- stable/12/contrib/ntp/CommitLog	Sun Jun 28 02:38:07 2020	(r362715)
+++ stable/12/contrib/ntp/CommitLog	Sun Jun 28 03:28:28 2020	(r362716)
@@ -1,3 +1,700 @@
+ChangeSet@1.3911, 2020-06-23 02:22:19-07:00, ntpreleng@ntp-build.tal1.ntfo.org
+  NTP_4_2_8P15
+  TAG: NTP_4_2_8P15
+
+  ChangeLog@1.1985 +1 -0
+    NTP_4_2_8P15
+
+  ntpd/invoke-ntp.conf.texi@1.222 +1 -1
+    NTP_4_2_8P15
+
+  ntpd/invoke-ntp.keys.texi@1.207 +1 -1
+    NTP_4_2_8P15
+
+  ntpd/invoke-ntpd.texi@1.521 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntp.conf.5man@1.256 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntp.conf.5mdoc@1.256 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntp.conf.html@1.204 +1 -1
+    NTP_4_2_8P15
+
+  ntpd/ntp.conf.man.in@1.256 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntp.conf.mdoc.in@1.256 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntp.keys.5man@1.241 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntp.keys.5mdoc@1.241 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntp.keys.html@1.202 +1 -1
+    NTP_4_2_8P15
+
+  ntpd/ntp.keys.man.in@1.241 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntp.keys.mdoc.in@1.241 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntpd-opts.c@1.544 +7 -7
+    NTP_4_2_8P15
+
+  ntpd/ntpd-opts.h@1.543 +3 -3
+    NTP_4_2_8P15
+
+  ntpd/ntpd.1ntpdman@1.350 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntpd.1ntpdmdoc@1.350 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntpd.html@1.195 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntpd.man.in@1.350 +2 -2
+    NTP_4_2_8P15
+
+  ntpd/ntpd.mdoc.in@1.350 +2 -2
+    NTP_4_2_8P15
+
+  ntpdc/invoke-ntpdc.texi@1.518 +2 -2
+    NTP_4_2_8P15
+
+  ntpdc/ntpdc-opts.c@1.537 +7 -7
+    NTP_4_2_8P15
+
+  ntpdc/ntpdc-opts.h@1.536 +3 -3
+    NTP_4_2_8P15
+
+  ntpdc/ntpdc.1ntpdcman@1.349 +2 -2
+    NTP_4_2_8P15
+
+  ntpdc/ntpdc.1ntpdcmdoc@1.349 +2 -2
+    NTP_4_2_8P15
+
+  ntpdc/ntpdc.html@1.364 +2 -2
+    NTP_4_2_8P15
+
+  ntpdc/ntpdc.man.in@1.349 +2 -2
+    NTP_4_2_8P15
+
+  ntpdc/ntpdc.mdoc.in@1.349 +2 -2
+    NTP_4_2_8P15
+
+  ntpq/invoke-ntpq.texi@1.528 +2 -2
+    NTP_4_2_8P15
+
+  ntpq/ntpq-opts.c@1.546 +7 -7
+    NTP_4_2_8P15
+
+  ntpq/ntpq-opts.h@1.544 +3 -3
+    NTP_4_2_8P15
+
+  ntpq/ntpq.1ntpqman@1.356 +2 -2
+    NTP_4_2_8P15
+
+  ntpq/ntpq.1ntpqmdoc@1.356 +2 -2
+    NTP_4_2_8P15
+
+  ntpq/ntpq.html@1.195 +2 -2
+    NTP_4_2_8P15
+
+  ntpq/ntpq.man.in@1.356 +2 -2
+    NTP_4_2_8P15
+
+  ntpq/ntpq.mdoc.in@1.356 +2 -2
+    NTP_4_2_8P15
+
+  ntpsnmpd/invoke-ntpsnmpd.texi@1.520 +1 -1
+    NTP_4_2_8P15
+
+  ntpsnmpd/ntpsnmpd-opts.c@1.539 +7 -7
+    NTP_4_2_8P15
+
+  ntpsnmpd/ntpsnmpd-opts.h@1.538 +3 -3
+    NTP_4_2_8P15
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.349 +2 -2
+    NTP_4_2_8P15
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.349 +2 -2
+    NTP_4_2_8P15
+
+  ntpsnmpd/ntpsnmpd.html@1.188 +1 -1
+    NTP_4_2_8P15
+
+  ntpsnmpd/ntpsnmpd.man.in@1.349 +2 -2
+    NTP_4_2_8P15
+
+  ntpsnmpd/ntpsnmpd.mdoc.in@1.349 +2 -2
+    NTP_4_2_8P15
+
+  packageinfo.sh@1.546 +2 -2
+    NTP_4_2_8P15
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.110 +2 -2
+    NTP_4_2_8P15
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.111 +2 -2
+    NTP_4_2_8P15
+
+  scripts/calc_tickadj/calc_tickadj.html@1.111 +1 -1
+    NTP_4_2_8P15
+
+  scripts/calc_tickadj/calc_tickadj.man.in@1.109 +2 -2
+    NTP_4_2_8P15
+
+  scripts/calc_tickadj/calc_tickadj.mdoc.in@1.111 +2 -2
+    NTP_4_2_8P15
+
+  scripts/calc_tickadj/invoke-calc_tickadj.texi@1.114 +1 -1
+    NTP_4_2_8P15
+
+  scripts/invoke-plot_summary.texi@1.132 +2 -2
+    NTP_4_2_8P15
+
+  scripts/invoke-summary.texi@1.131 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntp-wait/invoke-ntp-wait.texi@1.342 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntp-wait/ntp-wait-opts@1.78 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitman@1.338 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.339 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntp-wait/ntp-wait.html@1.360 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntp-wait/ntp-wait.man.in@1.338 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntp-wait/ntp-wait.mdoc.in@1.339 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntpsweep/invoke-ntpsweep.texi@1.129 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntpsweep/ntpsweep-opts@1.80 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepman@1.117 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.117 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntpsweep/ntpsweep.html@1.132 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntpsweep/ntpsweep.man.in@1.117 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntpsweep/ntpsweep.mdoc.in@1.118 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntptrace/invoke-ntptrace.texi@1.131 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntptrace/ntptrace-opts@1.80 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntptrace/ntptrace.1ntptraceman@1.117 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntptrace/ntptrace.1ntptracemdoc@1.118 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntptrace/ntptrace.html@1.133 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntptrace/ntptrace.man.in@1.117 +2 -2
+    NTP_4_2_8P15
+
+  scripts/ntptrace/ntptrace.mdoc.in@1.119 +2 -2
+    NTP_4_2_8P15
+
+  scripts/plot_summary-opts@1.81 +2 -2
+    NTP_4_2_8P15
+
+  scripts/plot_summary.1plot_summaryman@1.130 +2 -2
+    NTP_4_2_8P15
+
+  scripts/plot_summary.1plot_summarymdoc@1.130 +2 -2
+    NTP_4_2_8P15
+
+  scripts/plot_summary.html@1.135 +2 -2
+    NTP_4_2_8P15
+
+  scripts/plot_summary.man.in@1.130 +2 -2
+    NTP_4_2_8P15
+
+  scripts/plot_summary.mdoc.in@1.130 +2 -2
+    NTP_4_2_8P15
+
+  scripts/summary-opts@1.80 +2 -2
+    NTP_4_2_8P15
+
+  scripts/summary.1summaryman@1.129 +2 -2
+    NTP_4_2_8P15
+
+  scripts/summary.1summarymdoc@1.129 +2 -2
+    NTP_4_2_8P15
+
+  scripts/summary.html@1.134 +2 -2
+    NTP_4_2_8P15
+
+  scripts/summary.man.in@1.129 +2 -2
+    NTP_4_2_8P15
+
+  scripts/summary.mdoc.in@1.129 +2 -2
+    NTP_4_2_8P15
+
+  scripts/update-leap/invoke-update-leap.texi@1.30 +1 -1
+    NTP_4_2_8P15
+
+  scripts/update-leap/update-leap-opts@1.31 +2 -2
+    NTP_4_2_8P15
+
+  scripts/update-leap/update-leap.1update-leapman@1.30 +2 -2
+    NTP_4_2_8P15
+
+  scripts/update-leap/update-leap.1update-leapmdoc@1.30 +2 -2
+    NTP_4_2_8P15
+
+  scripts/update-leap/update-leap.html@1.31 +1 -1
+    NTP_4_2_8P15
+
+  scripts/update-leap/update-leap.man.in@1.30 +2 -2
+    NTP_4_2_8P15
+
+  scripts/update-leap/update-leap.mdoc.in@1.30 +2 -2
+    NTP_4_2_8P15
+
+  sntp/invoke-sntp.texi@1.520 +2 -2
+    NTP_4_2_8P15
+
+  sntp/sntp-opts.c@1.540 +7 -7
+    NTP_4_2_8P15
+
+  sntp/sntp-opts.h@1.538 +3 -3
+    NTP_4_2_8P15
+
+  sntp/sntp.1sntpman@1.355 +2 -2
+    NTP_4_2_8P15
+
+  sntp/sntp.1sntpmdoc@1.355 +2 -2
+    NTP_4_2_8P15
+
+  sntp/sntp.html@1.536 +2 -2
+    NTP_4_2_8P15
+
+  sntp/sntp.man.in@1.355 +2 -2
+    NTP_4_2_8P15
+
+  sntp/sntp.mdoc.in@1.355 +2 -2
+    NTP_4_2_8P15
+
+  util/invoke-ntp-keygen.texi@1.523 +2 -2
+    NTP_4_2_8P15
+
+  util/ntp-keygen-opts.c@1.542 +7 -7
+    NTP_4_2_8P15
+
+  util/ntp-keygen-opts.h@1.540 +3 -3
+    NTP_4_2_8P15
+
+  util/ntp-keygen.1ntp-keygenman@1.351 +2 -2
+    NTP_4_2_8P15
+
+  util/ntp-keygen.1ntp-keygenmdoc@1.351 +2 -2
+    NTP_4_2_8P15
+
+  util/ntp-keygen.html@1.196 +2 -2
+    NTP_4_2_8P15
+
+  util/ntp-keygen.man.in@1.351 +2 -2
+    NTP_4_2_8P15
+
+  util/ntp-keygen.mdoc.in@1.351 +2 -2
+    NTP_4_2_8P15
+
+ChangeSet@1.3910, 2020-06-23 02:05:32-07:00, ntpreleng@ntp-build.tal1.ntfo.org
+  ntp-4.2.8p15
+
+  packageinfo.sh@1.545 +1 -1
+    ntp-4.2.8p15
+
+ChangeSet@1.3908, 2020-06-09 07:12:27-04:00, stenn@psp-deb2.ntp.org
+  p15 updates
+
+  ChangeLog@1.1983 +1 -1
+    p15 updates
+
+  NEWS@1.214 +1 -1
+    p15 updates
+
+ChangeSet@1.3896.1.22, 2020-06-09 07:09:18-04:00, stenn@psp-deb2.ntp.org
+  3670
+
+  ChangeLog@1.1974.1.14 +1 -1
+    3670
+
+  NEWS@1.205.1.7 +3 -1
+    3670
+
+ChangeSet@1.3896.1.21, 2020-06-09 08:39:26+02:00, perlinger@ntp.org
+  [Bug 3670] Deleted statements come back
+
+  ChangeLog@1.1974.1.13 +3 -0
+    [Bug 3670] Deleted statements come back
+
+  ntpd/ntp_proto.c@1.437 +4 -19
+    [Bug 3670] Deleted statements come back
+
+ChangeSet@1.3906, 2020-05-31 09:52:14+00:00, stenn@psp-deb1.ntp.org
+  update the expected releease date
+
+  NEWS@1.213 +1 -1
+    update the expected releease date
+
+ChangeSet@1.3896.9.3, 2020-05-31 09:49:39+00:00, stenn@psp-deb1.ntp.org
+  Update ChangeLog and NEWS files for 3644
+
+  ChangeLog@1.1974.1.12 +1 -3
+    Update ChangeLog and NEWS files for 3644
+
+  NEWS@1.205.1.6 +2 -1
+    Update ChangeLog and NEWS files for 3644
+
+ChangeSet@1.3896.9.2, 2020-05-31 09:47:05+00:00, stenn@psp-deb1.ntp.org
+  [Bug 3644]: Do we want to log an event in this case?
+
+  ntpd/ntp_timer.c@1.99 +2 -0
+    [Bug 3644]: Do we want to log an event in this case?
+
+ChangeSet@1.3896.9.1, 2020-05-31 11:13:45+02:00, perlinger@ntp.org
+  [Bug 3644] Unsynchronized server (minsane not satisfied) selected as candidate
+
+  ChangeLog@1.1974.1.11 +3 -0
+    [Bug 3644] Unsynchronized server (minsane not satisfied) selected as candidate
+
+  include/ntp.h@1.233 +1 -1
+    [Bug 3644] Unsynchronized server [...] selected as candidate
+     - comment typo
+
+  ntpd/ntp_proto.c@1.436 +2 -3
+    [Bug 3644] Unsynchronized server (minsane not satisfied) selected as candidate
+
+  ntpd/ntp_timer.c@1.98 +24 -9
+    [Bug 3644] Unsynchronized server (minsane not satisfied) selected as candidate
+     - according to DLM, we should go S16/UNSYNCED if we have no proper orphan config
+
+ChangeSet@1.3896.1.19, 2020-05-25 12:42:46+02:00, nb241700@md2g3rcc.ad001.siemens.net
+  [Bug 3667] decodenetnum fails with numeric port
+   - windows compilation issues
+
+  libntp/decodenetnum.c@1.21 +1 -1
+    [Bug 3667] decodenetnum fails with numeric port
+     - windows compilation issues ('sa_family_t' is POSIX, now ANSI/MSVC)
+
+  libntp/strdup.c@1.11 +3 -3
+    [Bug 3667] decodenetnum fails with numeric port
+     - windows compilation issues (typo+cast in memchr replacement)
+
+  ports/winnt/include/config.h@1.117 +2 -0
+    [Bug 3667] decodenetnum fails with numeric port
+     - windows compilation issues (have memchr() and strnlen() in MSVC)
+
+ChangeSet@1.3896.1.18, 2020-05-22 06:07:28+00:00, stenn@psp-deb1.ntp.org
+  Update NEWS file with 3667
+
+  NEWS@1.205.1.5 +3 -1
+    Update NEWS file with 3667
+
+ChangeSet@1.3896.1.17, 2020-05-22 06:05:45+00:00, stenn@psp-deb1.ntp.org
+  cleanup
+
+  ChangeLog@1.1974.1.10 +2 -4
+    cleanup
+
+ChangeSet@1.3896.1.16, 2020-05-22 06:04:57+00:00, stenn@psp-deb1.ntp.org
+  indentation tweaks
+
+  tests/libntp/sockaddrtest.c@1.5 +7 -7
+    indentation tweaks
+
+ChangeSet@1.3896.1.15, 2020-05-20 09:44:15+02:00, perlinger@ntp.org
+  [Bug 3667] decodenetnum fails with numeric port
+
+  ChangeLog@1.1974.1.9 +4 -0
+    [Bug 3667] decodenetnum fails with numeric port
+
+  configure.ac@1.619 +1 -1
+    [Bug 3667] decodenetnum fails with numeric port
+     sidekick: implement strnlen() and memchr() for ancient hosts (pogo.udel.edu...)
+
+  include/l_stdlib.h@1.21 +9 -0
+    [Bug 3667] decodenetnum fails with numeric port
+     sidekick: implement strnlen() and memchr() for ancient hosts (pogo.udel.edu...)
+
+  libntp/decodenetnum.c@1.20 +123 -77
+    [Bug 3667] decodenetnum fails with numeric port
+     - rewrite in terms of inet_pton() and strtoul(), no getaddrinfo() any more
+
+  libntp/strdup.c@1.10 +29 -3
+    [Bug 3667] decodenetnum fails with numeric port
+     sidekick: implement strnlen() and memchr() for ancient hosts (pogo.udel.edu...)
+
+  tests/libntp/decodenetnum.c@1.13 +94 -6
+    [Bug 3667] decodenetnum fails with numeric port
+     - additional tests
+
+  tests/libntp/netof.c@1.10 +2 -0
+    Bug 3667 - decodenetnum fails with numeric port
+     - clear address buffers before use
+
+  tests/libntp/run-decodenetnum.c@1.14 +8 -2
+    [Bug 3667] decodenetnum fails with numeric port
+     - regenerated
+
+  tests/libntp/sockaddrtest.c@1.4 +2 -1
+    [Bug 3667] decodenetnum fails with numeric port
+     - include scope id in IPv6 compare
+
+ChangeSet@1.3896.1.14, 2020-05-14 03:45:40-07:00, harlan@psp-at0.tal1.ntfo.org
+  Added 3660 to the NEWS file
+
+  NEWS@1.205.1.4 +3 -1
+    Added 3660 to the NEWS file
+
+ChangeSet@1.3896.8.1, 2020-05-14 03:14:44-07:00, harlan@psp-at0.tal1.ntfo.org
+  [Bug 3660] Manycast orphan mode startup discovery problem
+
+  ChangeLog@1.1974.8.1 +5 -0
+    [Bug 3660] Manycast orphan mode startup discovery problem
+
+  ntpd/ntp_proto.c@1.432.2.1 +2 -1
+    [Bug 3660] Manycast orphan mode startup discovery problem
+
+ChangeSet@1.3896.1.12, 2020-05-10 11:26:21+00:00, stenn@psp-deb1.ntp.org
+  Update NEWS
+
+  NEWS@1.205.1.3 +3 -1
+    Update NEWS
+
+ChangeSet@1.3896.1.11, 2020-05-10 09:44:50+00:00, stenn@psp-deb1.ntp.org
+  Merge cleanup
+
+  ChangeLog@1.1974.1.7 +2 -4
+    Merge cleanup
+
+ChangeSet@1.3896.1.10, 2020-05-09 08:20:44+02:00, perlinger@ntp.org
+  [Bug 3666] avoid unlimited receive buffer allocation
+
+  BitKeeper/etc/ignore@1.95 +1 -0
+    [Bug 3666] avoid unlimited receive buffer allocation
+     - (sidekick) ignore the '.vs' directory of VS2017 & above
+
+  ChangeLog@1.1974.1.6 +4 -0
+    [Bug 3666] avoid unlimited receive buffer allocation
+
+  include/recvbuff.h@1.28 +23 -7
+    [Bug 3666] avoid unlimited receive buffer allocation
+     - buffer count limit is 4096 now, always enforced
+     - API change for urgent buffers
+
+  lib/isc/win32/include/isc/int.h@1.5 +3 -1
+    [Bug 3666] avoid unlimited receive buffer allocation
+     - (sidekick) define standard reserved macros only if not yet defined!
+
+  libntp/recvbuff.c@1.44 +131 -73
+    [Bug 3666] avoid unlimited receive buffer allocation
+     - don't exceed RECV_TOOMANY allocated buffers
+     - keep emergency reserve for clocks
+
+  libntp/timexsup.c@1.3 +3 -4
+    [bug 3666] avoid unlimited receive buffer allocation
+     - (sidekick) fix some warnings of clang on lp64 targets
+
+  ntpd/ntp_io.c@1.432 +23 -13
+    [Bug 3666] avoid unlimited receive buffer allocation
+     - support urgent buffer reserve for refclocks
+
+  ntpd/refclock_parse.c@1.89 +1 -1
+    [Bug 3666] avoid unlimited receive buffer allocation
+     - support urgent buffer reserve for refclocks
+
+  ntpdate/ntpdate.c@1.106 +1 -1
+    [Bug 3666] avoid unlimited receive buffer allocation
+     - get_free_recv_buffer() API change
+
+  ports/winnt/libntp/messages.h@1.3 +1 -1
+    [Bug 3666] avoid unlimited receive buffer allocation
+     - (sidekick) regenerated
+
+  ports/winnt/ntpd/ntp_iocompletionport.c@1.81 +63 -38
+    [Bug 3666] avoid unlimited receive buffer allocation
+     - reuse last buffer ASAP if no new buffer available
+     - typos and some internal renaming
+
+  tests/libntp/recvbuff.c@1.8 +2 -2
+    [Bug 3666] avoid unlimited receive buffer allocation
+     - internal API changes
+
+ChangeSet@1.3896.1.9, 2020-05-05 03:53:50+00:00, stenn@psp-deb1.ntp.org
+  Update NEWS with 3639
+
+  NEWS@1.205.1.2 +3 -1
+    Update NEWS with 3639
+
+ChangeSet@1.3896.1.7, 2020-04-20 08:14:39+00:00, stenn@psp-deb1.ntp.org
+  NEWS and bug 3664
+
+  NEWS@1.205.1.1 +2 -1
+    NEWS and bug 3664
+
+ChangeSet@1.3896.7.1, 2020-04-16 17:50:44+02:00, burnicki@psp-deb1.ntp.org
+  Enable openSSL CMAC support on Windows.
+
+  ChangeLog@1.1974.7.1 +2 -0
+    Enable openSSL CMAC support on Windows.
+
+  ports/winnt/include/config.h@1.116 +2 -0
+    Enable openSSL CMAC support on Windows.
+
+ChangeSet@1.3899, 2020-04-11 09:59:23+00:00, stenn@psp-deb1.ntp.org
+  update
+
+  NEWS@1.206 +1 -0
+    update
+
+ChangeSet@1.3896.1.5, 2020-04-11 09:35:19+00:00, stenn@psp-deb1.ntp.org
+  update
+
+  NEWS@1.205 +2 -2
+    update
+
+ChangeSet@1.3896.1.3, 2020-04-11 08:10:59+00:00, stenn@psp-deb1.ntp.org
+  update
+
+  NEWS@1.204 +3 -1
+    update
+
+ChangeSet@1.3896.2.3, 2020-04-11 07:21:36+00:00, stenn@psp-deb1.ntp.org
+  update
+
+  NEWS@1.203 +1 -0
+    update
+
+ChangeSet@1.3896.3.3, 2020-04-11 07:12:47+00:00, stenn@psp-deb1.ntp.org
+  update
+
+  NEWS@1.202 +22 -0
+    update
+
+ChangeSet@1.3896.6.4, 2020-04-07 17:51:25+02:00, burnicki@psp-deb1.ntp.org
+  [Bug 3662] Fix build errors on Windows with VS2008.
+
+  ChangeLog@1.1974.6.1 +2 -0
+    [Bug 3662] Fix build errors on Windows with VS2008.
+
+ChangeSet@1.3896.6.3, 2020-04-07 17:49:08+02:00, burnicki@psp-deb1.ntp.org
+  Fix unused variable warning in ntpdate.c.
+
+  ntpdate/ntpdate.c@1.105 +2 -1
+    Fix unused variable warning.
+
+ChangeSet@1.3896.6.2, 2020-04-07 17:48:25+02:00, burnicki@psp-deb1.ntp.org
+  Fix compiling refclock_palisade.c   
+  Don't have variable declarations after code.
+
+  ntpd/refclock_palisade.c@1.49 +25 -23
+    Don't have variable declarations after code.
+
+ChangeSet@1.3896.6.1, 2020-04-07 17:47:02+02:00, burnicki@psp-deb1.ntp.org
+  Fix prototype in ntpd/refclock_nmea.c
+
+  ntpd/refclock_nmea.c@1.85 +1 -1
+    Fix prototype in ntpd/refclock_nmea.c
+
+ChangeSet@1.3896.5.1, 2020-04-05 10:10:12+02:00, perlinger@ntp.org
+  [Bug 3646] Avoid sync with unsync orphan
+
+  ChangeLog@1.1974.5.1 +4 -0
+    [Bug 3646] Avoid sync with unsync orphan
+
+  ntpd/ntp_proto.c@1.432.1.1 +21 -0
+    [Bug 3646] Avoid sync with unsync orphan
+
+ChangeSet@1.3896.4.1, 2020-04-05 09:53:25+02:00, perlinger@ntp.org
+  [Bug 3653] Refclock jitter RMS calculation
+
+  ChangeLog@1.1974.4.1 +4 -0
+    [Bug 3653] Refclock jitter RMS calculation
+
+  ntpd/ntp_refclock.c@1.132 +36 -36
+    [Bug 3653] Refclock jitter RMS calculation
+
+ChangeSet@1.3896.3.1, 2020-04-04 08:57:51+02:00, perlinger@ntp.org
+  [Bug 3655] ntpdc memstats hash counts
+
+  ChangeLog@1.1974.3.1 +4 -0
+    [Bug 3655] ntpdc memstats hash counts
+
+  ntpd/ntp_request.c@1.132 +1 -1
+    [Bug 3655] ntpdc memstats hash counts
+
+ChangeSet@1.3896.2.1, 2020-04-04 08:48:51+02:00, perlinger@ntp.org
+  [Bug 3657] Wrong "Autokey group mismatch" debug message
+
+  ChangeLog@1.1974.2.1 +3 -0
+    [Bug 3657] Wrong "Autokey group mismatch" debug message
+
+  ntpd/ntp_proto.c@1.433 +3 -2
+    [Bug 3657] Wrong "Autokey group mismatch" debug message
+
+ChangeSet@1.3896.1.1, 2020-04-04 08:38:06+02:00, perlinger@ntp.org
+  [Bug 3659] ntp-4.2.8p14 fails to build <perlinger@ntp.org>
+
+  ChangeLog@1.1974.1.1 +3 -0
+    [Bug 3659] ntp-4.2.8p14 fails to build <perlinger@ntp.org>
+
+  include/ntp_config.h@1.90 +0 -10
+    [Bug 3659] ntp-4.2.8p14 fails to build <perlinger@ntp.org>
+     - move global declaration of 'psl' from header to static declaration in code
+
+  ntpd/ntp_config.c@1.376 +10 -0
+    [Bug 3659] ntp-4.2.8p14 fails to build <perlinger@ntp.org>
+     - move global declaration of 'psl' from header to static declaration in code
+
+ChangeSet@1.3897, 2020-04-01 16:49:43+02:00, perlinger@ntp.org
+  [Bug 3661] memory leak with AES128CMAC keys
+
+  ChangeLog@1.1975 +3 -0
+    [Bug 3661] memory leak with AES128CMAC keys
+
+  libntp/a_md5encrypt.c@1.52 +1 -1
+    [Bug 3661] memory leak with AES128CMAC keys
+     - free context, not just cleaning up internally
+
+  sntp/crypto.c@1.40 +2 -1
+    [Bug 3661] memory leak with AES128CMAC keys
+     - free context, not just cleaning up internally
+
 ChangeSet@1.3896, 2020-03-03 17:42:43-08:00, ntpreleng@ntp-build.tal1.ntfo.org
   NTP_4_2_8P14
   TAG: NTP_4_2_8P14
@@ -675,7 +1372,7 @@ ChangeSet@1.3892, 2020-03-03 16:05:38-08:00, ntpreleng
   ntpd/ntp_config.c@1.374 +2 -2
     provide get_pollskew() for simulator
 
-ChangeSet@1.3844.24.1, 2020-03-03 03:30:13-08:00, ntpreleng@ntp-build.tal1.ntfo.org
+ChangeSet@1.3844.25.1, 2020-03-03 03:30:13-08:00, ntpreleng@ntp-build.tal1.ntfo.org
   NTP_4_2_8P13
   TAG: NTP_4_2_8P13 (currently on 1.3894)
 
@@ -933,7 +1630,7 @@ ChangeSet@1.3880, 2020-02-17 08:48:45+00:00, stenn@psp
 ChangeSet@1.3879, 2020-02-17 08:11:42+00:00, stenn@psp-deb1.ntp.org
   updates
 
-  ChangeLog@1.1968.34.1 +2 -0
+  ChangeLog@1.1968.35.1 +2 -0
 
 ChangeSet@1.3877.1.2, 2020-02-08 23:00:11+00:00, stenn@psp-deb1.ntp.org
   html/confopt.html cleanup
@@ -1288,6 +1985,22 @@ ChangeSet@1.3878, 2020-01-29 06:03:13+00:00, stenn@psp
 
   ntpd/ntp_proto.c@1.427.1.1 +8 -0
     Initial pass at fixes for bug 3596
+
+ChangeSet@1.3844.24.1, 2020-01-21 12:49:14+00:00, abe@psp-deb1.ntp.org
+  driver40.html, refclock_jjy.c, driver40-ja.html, ChangeLog:
+    refclock_jjy: TS-JJY0x can skip time sync depending on the STUS reply.
+
+  ChangeLog@1.1968.34.1 +3 -0
+    refclock_jjy: TS-JJY0x can skip time sync depending on the STUS reply.
+
+  html/drivers/driver40-ja.html@1.8 +10 -2
+    refclock_jjy: TS-JJY0x can skip time sync depending on the STUS reply.
+
+  html/drivers/driver40.html@1.23 +9 -2
+    refclock_jjy: TS-JJY0x can skip time sync depending on the STUS reply.
+
+  ntpd/refclock_jjy.c@1.37 +76 -32
+    refclock_jjy: TS-JJY0x can skip time sync depending on the STUS reply.
 
 ChangeSet@1.3873.4.2, 2020-01-18 04:46:30-05:00, stenn@psp-deb2.ntp.org
   [Bug 3637] Emit the version of ntpd in saveconfig

Modified: stable/12/contrib/ntp/NEWS
==============================================================================
--- stable/12/contrib/ntp/NEWS	Sun Jun 28 02:38:07 2020	(r362715)
+++ stable/12/contrib/ntp/NEWS	Sun Jun 28 03:28:28 2020	(r362716)
@@ -1,4 +1,42 @@
 ---
+NTP 4.2.8p15 (Harlan Stenn <stenn@ntp.org>, 2020 Jun 23)
+
+Focus: Security, Bug fixes
+
+Severity: MEDIUM
+
+This release fixes one vulnerability: Associations that use CMAC
+authentication between ntpd from versions 4.2.8p11/4.3.97 and
+4.2.8p14/4.3.100 will leak a small amount of memory for each packet.
+Eventually, ntpd will run out of memory and abort.
+
+It also fixes 13 other bugs.
+
+* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
+* [Bug 3670] Regression from bad merger between 3592 and 3596 <perlinger@>
+  - Thanks to Sylar Tao
+* [Bug 3667] decodenetnum fails with numeric port <perlinger@ntp.org>
+  - rewrite 'decodenetnum()' in terms of inet_pton
+* [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
+  - limit number of receive buffers, with an iron reserve for refclocks
+* [Bug 3664] Enable openSSL CMAC support on Windows <burnicki@ntp.org>
+* [Bug 3662] Fix build errors on Windows with VS2008 <burnicki@ntp.org>
+* [Bug 3660] Manycast orphan mode startup discovery problem. <stenn@ntp.org>
+  - integrated patch from Charles Claggett
+* [Bug 3659] Move definition of psl[] from ntp_config.h to
+  ntp_config.h <perlinger@ntp.org>
+* [Bug 3657] Wrong "Autokey group mismatch" debug message <perlinger@ntp.org>
+* [Bug 3655] ntpdc memstats hash counts <perlinger@ntp.org>
+  - fix by Gerry garvey
+* [Bug 3653] Refclock jitter RMS calculation <perlinger@ntp.org>
+  - thanks to Gerry Garvey
+* [Bug 3646] Avoid sync with unsync orphan <perlinger@ntp.org>
+  - patch by Gerry Garvey
+* [Bug 3644] Unsynchronized server [...] selected as candidate <perlinger@ntp.org>
+* [Bug 3639] refclock_jjy: TS-JJY0x can skip time sync depending on the STUS reply. <abe@ntp.org>
+  - applied patch by Takao Abe
+
+---
 NTP 4.2.8p14 (Harlan Stenn <stenn@ntp.org>, 2020 Mar 03)
 
 Focus: Security, Bug fixes, enhancements.

Modified: stable/12/contrib/ntp/config.h.in
==============================================================================
--- stable/12/contrib/ntp/config.h.in	Sun Jun 28 02:38:07 2020	(r362715)
+++ stable/12/contrib/ntp/config.h.in	Sun Jun 28 03:28:28 2020	(r362716)
@@ -583,6 +583,9 @@
 /* Define to 1 if you have the <md5.h> header file. */
 #undef HAVE_MD5_H
 
+/* Define to 1 if you have the `memchr' function. */
+#undef HAVE_MEMCHR
+
 /* Define to 1 if you have the `memlk' function. */
 #undef HAVE_MEMLK
 
@@ -894,6 +897,9 @@
 
 /* Define to 1 if you have the `strlcpy' function. */
 #undef HAVE_STRLCPY
+
+/* Define to 1 if you have the `strnlen' function. */
+#undef HAVE_STRNLEN
 
 /* Define to 1 if you have the <stropts.h> header file. */
 #undef HAVE_STROPTS_H

Modified: stable/12/contrib/ntp/configure
==============================================================================
--- stable/12/contrib/ntp/configure	Sun Jun 28 02:38:07 2020	(r362715)
+++ stable/12/contrib/ntp/configure	Sun Jun 28 03:28:28 2020	(r362716)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ntp 4.2.8p14.
+# Generated by GNU Autoconf 2.69 for ntp 4.2.8p15.
 #
 # Report bugs to <http://bugs.ntp.org./>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ntp'
 PACKAGE_TARNAME='ntp'
-PACKAGE_VERSION='4.2.8p14'
-PACKAGE_STRING='ntp 4.2.8p14'
+PACKAGE_VERSION='4.2.8p15'
+PACKAGE_STRING='ntp 4.2.8p15'
 PACKAGE_BUGREPORT='http://bugs.ntp.org./'
 PACKAGE_URL='http://www.ntp.org./'
 
@@ -1617,7 +1617,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ntp 4.2.8p14 to adapt to many kinds of systems.
+\`configure' configures ntp 4.2.8p15 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1687,7 +1687,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ntp 4.2.8p14:";;
+     short | recursive ) echo "Configuration of ntp 4.2.8p15:";;
    esac
   cat <<\_ACEOF
 
@@ -1930,7 +1930,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ntp configure 4.2.8p14
+ntp configure 4.2.8p15
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2639,7 +2639,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ntp $as_me 4.2.8p14, which was
+It was created by ntp $as_me 4.2.8p15, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3640,7 +3640,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ntp'
- VERSION='4.2.8p14'
+ VERSION='4.2.8p15'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -27308,7 +27308,7 @@ _ACEOF
 fi
 done
 
-for ac_func in strdup strerror setrlimit strchr
+for ac_func in strdup strnlen memchr strerror setrlimit strchr
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -34174,7 +34174,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ntp $as_me 4.2.8p14, which was
+This file was extended by ntp $as_me 4.2.8p15, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -34241,7 +34241,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ntp config.status 4.2.8p14
+ntp config.status 4.2.8p15
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: stable/12/contrib/ntp/configure.ac
==============================================================================
--- stable/12/contrib/ntp/configure.ac	Sun Jun 28 02:38:07 2020	(r362715)
+++ stable/12/contrib/ntp/configure.ac	Sun Jun 28 03:28:28 2020	(r362716)
@@ -912,7 +912,7 @@ case "$host" in
     ;;
 esac
 AC_CHECK_FUNCS([setlinebuf setpgid setpriority setsid setvbuf])
-AC_CHECK_FUNCS([strdup strerror setrlimit strchr])
+AC_CHECK_FUNCS([strdup strnlen memchr strerror setrlimit strchr])
 case "$host" in
  *-*-aix[[4-9]]*)
     # XXX only verified thru AIX6.

Modified: stable/12/contrib/ntp/html/drivers/driver40-ja.html
==============================================================================
Binary file (source and/or target). No diff available.

Modified: stable/12/contrib/ntp/html/drivers/driver40.html
==============================================================================
--- stable/12/contrib/ntp/html/drivers/driver40.html	Sun Jun 28 02:38:07 2020	(r362715)
+++ stable/12/contrib/ntp/html/drivers/driver40.html	Sun Jun 28 03:28:28 2020	(r362716)
@@ -52,14 +52,20 @@
 						<dl>
 							<dt>server &nbsp; 127.127.40.X &nbsp; mode 1</dt>
 							<dd><br></dd>
-							<dt>fudge &nbsp; 127.127.40.X &nbsp; time1 0.NNN &nbsp; flag1 0|1</dt>
+							<dt>fudge &nbsp; 127.127.40.X &nbsp; time1 0.NNN &nbsp; flag1 0|1 &nbsp; flag2 0|1 &nbsp; time2 H</dt>
 							<dd>
 								<p>Time1 may specify a constant to be added to the time offset for the time from the receiver, a fixed-point decimal number in seconds. You may specify the time offset from several tens of milli-seconds ( 0.0NN seconds ) to a hundred and several tens of milli-seconds  ( 0.1NN seconds ) for this clock.</p>
-								<p>Flag1 has no effect for time synchronization. When flag1 is set to 1, status commands are issued before DATE and STIM commands, and write a response text into the clockstats file.</p>
+								<p>Time2 may specify a grace period in hours after the 'adjusted' reply of the STUS command stopped coming.<br>This hours is effective when both flag1 and flag2 are set to 1.</p>
+								<p>Flag1 has no effect for time synchronization unless flag2 is set to 1.<br>When flag1 is set to 1, status commands are issued before DATE and STIM commands, and write a response text into the clockstats file.</p>
 								<table border="1" summary="fudge flag1">
 									<tr><td>0 (Default)</td><td>DCST and STUS commands are not issued</td></tr>
 									<tr><td>1</td><td>DCST and STUS commands are issued</td></tr>
 								</table>
+								<p>Flag2 enables the time synchronization only when the reply of the STUS is 'adjusted'. When this functionality is used, flag1 must be set to 1 together.</p>
+								<table border="1" summary="fudge flag2">
+									<tr><td>0 (Default)</td><td>Always</td></tr>
+									<tr><td>1</td><td>'adjusted' only</td></tr>
+								</table>
 							</dd>
 						</dl>
 						<br>
@@ -193,6 +199,7 @@
 
 			<li>
 				<p><a name="mode-4">CITIZEN T.I.C. CO.,LTD. &nbsp; JJY-200</a> &nbsp; <a href="http://www.tic-citizen.co.jp/">http://www.tic-citizen.co.jp/</a>; (Japanese only)</p><br>
+				<p>The JJY-200 became the end of sales in 2013.</p><br>
 				<dl>
 					<dt>NTP configuration ( ntp.conf )</dt>
 					<dd><br>

Modified: stable/12/contrib/ntp/include/l_stdlib.h
==============================================================================
--- stable/12/contrib/ntp/include/l_stdlib.h	Sun Jun 28 02:38:07 2020	(r362715)
+++ stable/12/contrib/ntp/include/l_stdlib.h	Sun Jun 28 03:28:28 2020	(r362716)
@@ -221,4 +221,13 @@ extern	int	errno;
 extern	int	h_errno;
 #endif
 
+#ifndef HAVE_MEMCHR
+extern void *memchr(const void *s, int c, size_t n);
+#endif
+
+#ifndef HAVE_STRNLEN
+extern size_t strnlen(const char *s, size_t n);
+#endif
+
+
 #endif	/* L_STDLIB_H */

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006280328.05S3SWwf058643>