git: 6f3fd5d45e98 - stable/13 - ntp: Vendor import of ntp-4.2.8p18

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Thu, 30 May 2024 01:43:06 UTC
The branch stable/13 has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=6f3fd5d45e98738a3035abc2d179d457f29bc541

commit 6f3fd5d45e98738a3035abc2d179d457f29bc541
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-05-27 01:41:22 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-05-30 01:42:54 +0000

    ntp: Vendor import of ntp-4.2.8p18
    
    Merge commit '1f833b3fc9968c3dd7ed79ccf0525ebf16c891ad' into main
    
    (cherry picked from commit f5f40dd63bc7acbb5312b26ac1ea1103c12352a6)
---
 contrib/ntp/COPYRIGHT                              |     4 +-
 contrib/ntp/ChangeLog                              |   120 +-
 contrib/ntp/CommitLog                              |  3221 ++++
 contrib/ntp/Makefile.am                            |     6 +-
 contrib/ntp/Makefile.in                            |     7 +-
 contrib/ntp/NEWS                                   |  3902 ++++
 contrib/ntp/adjtimed/Makefile.in                   |    13 +-
 contrib/ntp/check-libntp.mf                        |    10 +-
 contrib/ntp/check-libntpd.mf                       |    13 +-
 contrib/ntp/check-libunity.mf                      |     4 +-
 contrib/ntp/check-scm-rev.mf                       |     6 +-
 contrib/ntp/clockstuff/Makefile.in                 |    13 +-
 contrib/ntp/config.h.in                            |    44 +-
 contrib/ntp/configure                              |  2726 +--
 contrib/ntp/configure.ac                           |    81 +-
 contrib/ntp/flock-build                            |    22 +-
 contrib/ntp/html/.datecheck                        |     0
 contrib/ntp/html/clockopt.html                     |     9 +-
 contrib/ntp/html/copyright.html                    |     4 +-
 contrib/ntp/html/release.html                      |     2 +-
 contrib/ntp/include/Makefile.am                    |     1 +
 contrib/ntp/include/Makefile.in                    |     2 +
 contrib/ntp/include/c99_snprintf.h                 |    28 +
 contrib/ntp/include/isc/Makefile.in                |     1 +
 contrib/ntp/include/lib_strbuf.h                   |    30 +-
 contrib/ntp/include/ntp.h                          |    73 +-
 contrib/ntp/include/ntp_config.h                   |    13 +-
 contrib/ntp/include/ntp_control.h                  |     2 +-
 contrib/ntp/include/ntp_lists.h                    |     4 +-
 contrib/ntp/include/ntp_md5.h                      |    25 +-
 contrib/ntp/include/ntp_net.h                      |    13 +-
 contrib/ntp/include/ntp_psl.h                      |    11 +-
 contrib/ntp/include/ntp_stdlib.h                   |    20 +-
 contrib/ntp/include/ntp_tty.h                      |     5 +
 contrib/ntp/include/ntp_types.h                    |    10 -
 contrib/ntp/include/ntpd.h                         |    80 +-
 contrib/ntp/include/vint64ops.h                    |     2 +-
 contrib/ntp/kernel/Makefile.in                     |     1 +
 contrib/ntp/kernel/sys/Makefile.in                 |     1 +
 contrib/ntp/libntp/Makefile.am                     |     1 -
 contrib/ntp/libntp/Makefile.in                     |    76 +-
 contrib/ntp/libntp/a_md5encrypt.c                  |   169 +-
 contrib/ntp/libntp/adjtime.c                       |     2 +-
 contrib/ntp/libntp/audio.c                         |     2 +-
 contrib/ntp/libntp/authkeys.c                      |     4 +
 contrib/ntp/libntp/authreadkeys.c                  |    12 +-
 contrib/ntp/libntp/bsd_strerror.c                  |     2 +-
 contrib/ntp/libntp/clocktypes.c                    |     1 -
 contrib/ntp/libntp/dofptoa.c                       |     2 -
 contrib/ntp/libntp/dolfptoa.c                      |     2 -
 contrib/ntp/libntp/humandate.c                     |     1 -
 contrib/ntp/libntp/lib/isc/win32/strerror.c        |    64 +-
 contrib/ntp/libntp/lib_strbuf.c                    |    51 +-
 contrib/ntp/libntp/machines.c                      |    60 +-
 contrib/ntp/libntp/modetoa.c                       |     1 -
 contrib/ntp/libntp/msyslog.c                       |     6 +-
 contrib/ntp/libntp/netof.c                         |    24 +-
 contrib/ntp/libntp/ntp_calendar.c                  |     1 -
 contrib/ntp/libntp/ntp_intres.c                    |     6 -
 contrib/ntp/libntp/ntp_realpath.c                  |    43 +-
 contrib/ntp/libntp/numtoa.c                        |    64 +-
 contrib/ntp/libntp/numtohost.c                     |    43 -
 contrib/ntp/libntp/prettydate.c                    |     1 -
 contrib/ntp/libntp/recvbuff.c                      |    39 +-
 contrib/ntp/libntp/refnumtoa.c                     |     1 -
 contrib/ntp/libntp/snprintf.c                      |     2 +-
 contrib/ntp/libntp/socket.c                        |    16 +-
 contrib/ntp/libntp/socktoa.c                       |     1 -
 contrib/ntp/libntp/socktohost.c                    |     1 -
 contrib/ntp/libntp/ssl_init.c                      |    74 +-
 contrib/ntp/libntp/statestr.c                      |     1 -
 contrib/ntp/libntp/systime.c                       |     1 -
 contrib/ntp/libntp/timexsup.c                      |    22 +-
 contrib/ntp/libntp/uglydate.c                      |     1 -
 contrib/ntp/libntp/vint64ops.c                     |    21 +-
 contrib/ntp/libntp/work_thread.c                   |    17 +-
 contrib/ntp/libparse/Makefile.am                   |    15 +-
 contrib/ntp/libparse/Makefile.in                   |    30 +-
 contrib/ntp/libparse/clk_computime.c               |     2 +-
 contrib/ntp/libparse/clk_dcf7000.c                 |     2 +-
 contrib/ntp/libparse/clk_hopf6021.c                |     2 +-
 contrib/ntp/libparse/clk_meinberg.c                |     2 +-
 contrib/ntp/libparse/clk_rawdcf.c                  |     2 +-
 contrib/ntp/libparse/clk_rcc8000.c                 |     2 +-
 contrib/ntp/libparse/clk_schmid.c                  |     2 +-
 contrib/ntp/libparse/clk_sel240x.c                 |     2 +-
 contrib/ntp/libparse/clk_trimtaip.c                |     2 +-
 contrib/ntp/libparse/clk_trimtsip.c                |     2 +-
 contrib/ntp/libparse/clk_varitext.c                |     2 +-
 contrib/ntp/libparse/clk_wharton.c                 |     2 +-
 contrib/ntp/libparse/ieee754io.c                   |    25 +-
 contrib/ntp/libparse/parse.c                       |     2 +-
 contrib/ntp/libparse/parse_conf.c                  |     2 +-
 contrib/ntp/ntpd/Makefile.in                       |    20 +-
 contrib/ntp/ntpd/cmd_args.c                        |    18 +-
 contrib/ntp/ntpd/complete.conf.in                  |    43 +-
 contrib/ntp/ntpd/invoke-ntp.conf.texi              |    99 +-
 contrib/ntp/ntpd/invoke-ntp.keys.texi              |     2 +-
 contrib/ntp/ntpd/invoke-ntpd.texi                  |     4 +-
 contrib/ntp/ntpd/keyword-gen-utd                   |     2 +-
 contrib/ntp/ntpd/keyword-gen.c                     |     2 +-
 contrib/ntp/ntpd/ntp.conf.5man                     |   106 +-
 contrib/ntp/ntpd/ntp.conf.5mdoc                    |   106 +-
 contrib/ntp/ntpd/ntp.conf.def                      |   100 +-
 contrib/ntp/ntpd/ntp.conf.html                     |   102 +-
 contrib/ntp/ntpd/ntp.conf.man.in                   |   106 +-
 contrib/ntp/ntpd/ntp.conf.mdoc.in                  |   106 +-
 contrib/ntp/ntpd/ntp.keys.5man                     |     6 +-
 contrib/ntp/ntpd/ntp.keys.5mdoc                    |     6 +-
 contrib/ntp/ntpd/ntp.keys.html                     |     2 +-
 contrib/ntp/ntpd/ntp.keys.man.in                   |     6 +-
 contrib/ntp/ntpd/ntp.keys.mdoc.in                  |     6 +-
 contrib/ntp/ntpd/ntp_config.c                      |   696 +-
 contrib/ntp/ntpd/ntp_control.c                     |    68 +-
 contrib/ntp/ntpd/ntp_crypto.c                      |   134 +-
 contrib/ntp/ntpd/ntp_io.c                          |   927 +-
 contrib/ntp/ntpd/ntp_keyword.h                     |  2078 +--
 contrib/ntp/ntpd/ntp_leapsec.c                     |    78 +-
 contrib/ntp/ntpd/ntp_loopfilter.c                  |    16 +
 contrib/ntp/ntpd/ntp_monitor.c                     |    21 +-
 contrib/ntp/ntpd/ntp_parser.c                      |  3279 ++--
 contrib/ntp/ntpd/ntp_parser.h                      |   752 +-
 contrib/ntp/ntpd/ntp_peer.c                        |   202 +-
 contrib/ntp/ntpd/ntp_proto.c                       |   334 +-
 contrib/ntp/ntpd/ntp_refclock.c                    |    58 +-
 contrib/ntp/ntpd/ntp_request.c                     |    15 +-
 contrib/ntp/ntpd/ntp_restrict.c                    |   725 +-
 contrib/ntp/ntpd/ntp_scanner.c                     |    22 +-
 contrib/ntp/ntpd/ntp_timer.c                       |   303 +-
 contrib/ntp/ntpd/ntp_util.c                        |   249 +-
 contrib/ntp/ntpd/ntpd-opts.c                       |    20 +-
 contrib/ntp/ntpd/ntpd-opts.h                       |     8 +-
 contrib/ntp/ntpd/ntpd.1ntpdman                     |     6 +-
 contrib/ntp/ntpd/ntpd.1ntpdmdoc                    |     6 +-
 contrib/ntp/ntpd/ntpd.c                            |   101 +-
 contrib/ntp/ntpd/ntpd.html                         |     4 +-
 contrib/ntp/ntpd/ntpd.man.in                       |     6 +-
 contrib/ntp/ntpd/ntpd.mdoc.in                      |     6 +-
 contrib/ntp/ntpd/refclock_acts.c                   |     2 +-
 contrib/ntp/ntpd/refclock_arbiter.c                |     2 +-
 contrib/ntp/ntpd/refclock_arc.c                    |    13 +-
 contrib/ntp/ntpd/refclock_as2201.c                 |     2 +-
 contrib/ntp/ntpd/refclock_atom.c                   |     2 +-
 contrib/ntp/ntpd/refclock_bancomm.c                |     2 +-
 contrib/ntp/ntpd/refclock_chronolog.c              |     2 +-
 contrib/ntp/ntpd/refclock_conf.c                   |     2 +-
 contrib/ntp/ntpd/refclock_dumbclock.c              |     2 +-
 contrib/ntp/ntpd/refclock_fg.c                     |     2 +-
 contrib/ntp/ntpd/refclock_gpsvme.c                 |     2 +-
 contrib/ntp/ntpd/refclock_heath.c                  |     2 +-
 contrib/ntp/ntpd/refclock_hopfpci.c                |     2 +-
 contrib/ntp/ntpd/refclock_hopfser.c                |     2 +-
 contrib/ntp/ntpd/refclock_hpgps.c                  |     2 +-
 contrib/ntp/ntpd/refclock_irig.c                   |     2 +-
 contrib/ntp/ntpd/refclock_jjy.c                    |     2 +-
 contrib/ntp/ntpd/refclock_jupiter.c                |     2 +-
 contrib/ntp/ntpd/refclock_local.c                  |     2 +-
 contrib/ntp/ntpd/refclock_mx4200.c                 |     2 +-
 contrib/ntp/ntpd/refclock_neoclock4x.c             |     2 +-
 contrib/ntp/ntpd/refclock_nmea.c                   |     2 +
 contrib/ntp/ntpd/refclock_oncore.c                 |     2 +-
 contrib/ntp/ntpd/refclock_palisade.c               |     2 +-
 contrib/ntp/ntpd/refclock_pcf.c                    |     2 +-
 contrib/ntp/ntpd/refclock_pst.c                    |     2 +-
 contrib/ntp/ntpd/refclock_ripencc.c                |     2 +-
 contrib/ntp/ntpd/refclock_tpro.c                   |     2 +-
 contrib/ntp/ntpd/refclock_true.c                   |     2 +-
 contrib/ntp/ntpd/refclock_tsyncpci.c               |     2 +-
 contrib/ntp/ntpd/refclock_tt560.c                  |     2 +-
 contrib/ntp/ntpd/refclock_ulink.c                  |     2 +-
 contrib/ntp/ntpd/refclock_wwv.c                    |     2 +-
 contrib/ntp/ntpd/refclock_wwvb.c                   |     2 +-
 contrib/ntp/ntpd/refclock_zyfer.c                  |     2 +-
 contrib/ntp/ntpdate/Makefile.in                    |    18 +-
 contrib/ntp/ntpdc/Makefile.in                      |    18 +-
 contrib/ntp/ntpdc/invoke-ntpdc.texi                |     4 +-
 contrib/ntp/ntpdc/nl.pl                            |     1 +
 contrib/ntp/ntpdc/nl.pl.in                         |     1 +
 contrib/ntp/ntpdc/ntpdc-opts.c                     |    20 +-
 contrib/ntp/ntpdc/ntpdc-opts.h                     |     8 +-
 contrib/ntp/ntpdc/ntpdc.1ntpdcman                  |     6 +-
 contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc                 |     6 +-
 contrib/ntp/ntpdc/ntpdc.html                       |     4 +-
 contrib/ntp/ntpdc/ntpdc.man.in                     |     6 +-
 contrib/ntp/ntpdc/ntpdc.mdoc.in                    |     6 +-
 contrib/ntp/ntpq/Makefile.in                       |    18 +-
 contrib/ntp/ntpq/invoke-ntpq.texi                  |     4 +-
 contrib/ntp/ntpq/ntpq-opts.c                       |    20 +-
 contrib/ntp/ntpq/ntpq-opts.h                       |     8 +-
 contrib/ntp/ntpq/ntpq-subs.c                       |    41 +-
 contrib/ntp/ntpq/ntpq.1ntpqman                     |     6 +-
 contrib/ntp/ntpq/ntpq.1ntpqmdoc                    |     6 +-
 contrib/ntp/ntpq/ntpq.c                            |    25 +-
 contrib/ntp/ntpq/ntpq.h                            |     1 -
 contrib/ntp/ntpq/ntpq.html                         |     4 +-
 contrib/ntp/ntpq/ntpq.man.in                       |     6 +-
 contrib/ntp/ntpq/ntpq.mdoc.in                      |     6 +-
 contrib/ntp/ntpsnmpd/Makefile.am                   |     8 +-
 contrib/ntp/ntpsnmpd/Makefile.in                   |    22 +-
 contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi          |     4 +-
 contrib/ntp/ntpsnmpd/netsnmp_daemonize.c           |    18 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c               |    20 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h               |     8 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman         |     6 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc        |     6 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd.html                 |     2 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd.man.in               |     6 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in              |     6 +-
 contrib/ntp/packageinfo.sh                         |     4 +-
 contrib/ntp/parseutil/Makefile.in                  |     1 +
 contrib/ntp/scripts/Makefile.in                    |     1 +
 contrib/ntp/scripts/build/Makefile.in              |     1 +
 contrib/ntp/scripts/build/checkHtmlFileDates       |    24 +-
 contrib/ntp/scripts/build/genAuthors.in            |     1 +
 contrib/ntp/scripts/build/mkver.in                 |     2 +
 contrib/ntp/scripts/calc_tickadj/Makefile.in       |     1 +
 .../calc_tickadj/calc_tickadj.1calc_tickadjman     |     4 +-
 .../calc_tickadj/calc_tickadj.1calc_tickadjmdoc    |     4 +-
 contrib/ntp/scripts/calc_tickadj/calc_tickadj.html |     2 +-
 contrib/ntp/scripts/calc_tickadj/calc_tickadj.in   |     1 +
 .../ntp/scripts/calc_tickadj/calc_tickadj.man.in   |     4 +-
 .../ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in  |     4 +-
 .../scripts/calc_tickadj/invoke-calc_tickadj.texi  |     2 +-
 contrib/ntp/scripts/invoke-plot_summary.texi       |     4 +-
 contrib/ntp/scripts/invoke-summary.texi            |     4 +-
 contrib/ntp/scripts/lib/Makefile.in                |     1 +
 contrib/ntp/scripts/ntp-wait/Makefile.in           |     1 +
 contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi  |     4 +-
 contrib/ntp/scripts/ntp-wait/ntp-wait-opts         |     4 +-
 contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman |     4 +-
 .../ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc    |     4 +-
 contrib/ntp/scripts/ntp-wait/ntp-wait.html         |     4 +-
 contrib/ntp/scripts/ntp-wait/ntp-wait.in           |     1 +
 contrib/ntp/scripts/ntp-wait/ntp-wait.man.in       |     4 +-
 contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in      |     4 +-
 contrib/ntp/scripts/ntpsweep/Makefile.in           |     1 +
 contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi  |     4 +-
 contrib/ntp/scripts/ntpsweep/ntpsweep-opts         |     4 +-
 contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman |     4 +-
 .../ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc    |     4 +-
 contrib/ntp/scripts/ntpsweep/ntpsweep.html         |     4 +-
 contrib/ntp/scripts/ntpsweep/ntpsweep.in           |     1 +
 contrib/ntp/scripts/ntpsweep/ntpsweep.man.in       |     4 +-
 contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in      |     4 +-
 contrib/ntp/scripts/ntptrace/Makefile.in           |     1 +
 contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi  |     4 +-
 contrib/ntp/scripts/ntptrace/ntptrace-opts         |     4 +-
 contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman |     4 +-
 .../ntp/scripts/ntptrace/ntptrace.1ntptracemdoc    |     4 +-
 contrib/ntp/scripts/ntptrace/ntptrace.html         |     4 +-
 contrib/ntp/scripts/ntptrace/ntptrace.in           |    11 +
 contrib/ntp/scripts/ntptrace/ntptrace.man.in       |     4 +-
 contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in      |     4 +-
 contrib/ntp/scripts/ntpver.in                      |     3 +-
 contrib/ntp/scripts/plot_summary-opts              |     4 +-
 contrib/ntp/scripts/plot_summary.1plot_summaryman  |     4 +-
 contrib/ntp/scripts/plot_summary.1plot_summarymdoc |     4 +-
 contrib/ntp/scripts/plot_summary.html              |     4 +-
 contrib/ntp/scripts/plot_summary.in                |     1 +
 contrib/ntp/scripts/plot_summary.man.in            |     4 +-
 contrib/ntp/scripts/plot_summary.mdoc.in           |     4 +-
 contrib/ntp/scripts/summary-opts                   |     4 +-
 contrib/ntp/scripts/summary.1summaryman            |     4 +-
 contrib/ntp/scripts/summary.1summarymdoc           |     4 +-
 contrib/ntp/scripts/summary.html                   |     4 +-
 contrib/ntp/scripts/summary.in                     |     1 +
 contrib/ntp/scripts/summary.man.in                 |     4 +-
 contrib/ntp/scripts/summary.mdoc.in                |     4 +-
 contrib/ntp/scripts/update-leap/Makefile.in        |     1 +
 .../scripts/update-leap/invoke-update-leap.texi    |     2 +-
 contrib/ntp/scripts/update-leap/update-leap-opts   |     4 +-
 .../update-leap/update-leap.1update-leapman        |     4 +-
 .../update-leap/update-leap.1update-leapmdoc       |     4 +-
 contrib/ntp/scripts/update-leap/update-leap.html   |     2 +-
 contrib/ntp/scripts/update-leap/update-leap.in     |     1 +
 contrib/ntp/scripts/update-leap/update-leap.man.in |     4 +-
 .../ntp/scripts/update-leap/update-leap.mdoc.in    |     4 +-
 contrib/ntp/sntp/COPYRIGHT                         |     4 +-
 contrib/ntp/sntp/Makefile.am                       |     3 +-
 contrib/ntp/sntp/Makefile.in                       |    17 +-
 contrib/ntp/sntp/aclocal.m4                        |     1 +
 contrib/ntp/sntp/check-libntp.mf                   |    10 +-
 contrib/ntp/sntp/check-libsntp.mf                  |     8 +-
 contrib/ntp/sntp/check-libunity.mf                 |     3 +-
 contrib/ntp/sntp/config.h.in                       |    41 +-
 contrib/ntp/sntp/configure                         | 18356 ++++++++++---------
 contrib/ntp/sntp/configure.ac                      |     8 +-
 contrib/ntp/sntp/crypto.c                          |    72 +-
 contrib/ntp/sntp/crypto.h                          |    15 +-
 contrib/ntp/sntp/include/Makefile.in               |     2 +
 contrib/ntp/sntp/include/copyright.def             |     2 +-
 contrib/ntp/sntp/include/version.def               |     2 +-
 contrib/ntp/sntp/include/version.texi              |     6 +-
 contrib/ntp/sntp/invoke-sntp.texi                  |     4 +-
 contrib/ntp/sntp/libevent/Makefile.in              |     3 +
 contrib/ntp/sntp/libevent/configure                |     8 +-
 contrib/ntp/sntp/libevent/configure.ac             |     7 +-
 contrib/ntp/sntp/libevent/kqueue.c                 |     2 +-
 contrib/ntp/sntp/libevent/m4/acx_pthread.m4        |     2 +-
 contrib/ntp/sntp/libopts/Makefile.am               |     4 +-
 contrib/ntp/sntp/libopts/Makefile.in               |    23 +-
 contrib/ntp/sntp/m4/ntp_compiler.m4                |    68 +-
 contrib/ntp/sntp/m4/ntp_crypto_rand.m4             |    37 +-
 contrib/ntp/sntp/m4/ntp_facilitynames.m4           |    33 +-
 contrib/ntp/sntp/m4/ntp_libevent.m4                |    10 +-
 contrib/ntp/sntp/m4/ntp_libntp.m4                  |    89 +-
 contrib/ntp/sntp/m4/ntp_openssl.m4                 |   827 +-
 contrib/ntp/sntp/m4/version.m4                     |     2 +-
 contrib/ntp/sntp/main.c                            |    20 +-
 contrib/ntp/sntp/scm-rev                           |     2 +-
 contrib/ntp/sntp/scripts/Makefile.in               |     2 +
 contrib/ntp/sntp/scripts/cvo.sh                    |     8 +-
 contrib/ntp/sntp/sntp-opts.c                       |    20 +-
 contrib/ntp/sntp/sntp-opts.h                       |     8 +-
 contrib/ntp/sntp/sntp.1sntpman                     |     6 +-
 contrib/ntp/sntp/sntp.1sntpmdoc                    |     6 +-
 contrib/ntp/sntp/sntp.html                         |     4 +-
 contrib/ntp/sntp/sntp.man.in                       |     6 +-
 contrib/ntp/sntp/sntp.mdoc.in                      |     6 +-
 contrib/ntp/sntp/tests/Makefile.in                 |    23 +-
 contrib/ntp/sntp/tests/crypto.c                    |   235 +-
 contrib/ntp/sntp/tests/fileHandlingTest.h.in       |     8 +-
 contrib/ntp/sntp/tests/packetHandling.c            |    50 +-
 contrib/ntp/sntp/tests/packetProcessing.c          |   168 +-
 contrib/ntp/sntp/tests/run-crypto.c                |    20 +-
 contrib/ntp/sntp/tests/run-packetProcessing.c      |    40 +-
 contrib/ntp/sntp/unity/Makefile.in                 |     2 +
 contrib/ntp/sntp/unity/unity_internals.h           |    10 +-
 contrib/ntp/sntp/utilities.h                       |     1 -
 contrib/ntp/tests/libntp/data/ntp.keys             |    23 +-
 contrib/ntp/tests/libntp/digests.c                 |   125 +-
 contrib/ntp/tests/libntp/run-digests.c             |     6 +
 contrib/ntp/util/Makefile.am                       |     4 +-
 contrib/ntp/util/Makefile.in                       |    62 +-
 contrib/ntp/util/invoke-ntp-keygen.texi            |     4 +-
 contrib/ntp/util/lsf-times.c                       |   220 +
 contrib/ntp/util/ntp-keygen-opts.c                 |    20 +-
 contrib/ntp/util/ntp-keygen-opts.h                 |     8 +-
 contrib/ntp/util/ntp-keygen.1ntp-keygenman         |     6 +-
 contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc        |     6 +-
 contrib/ntp/util/ntp-keygen.c                      |    55 +-
 contrib/ntp/util/ntp-keygen.html                   |     4 +-
 contrib/ntp/util/ntp-keygen.man.in                 |     6 +-
 contrib/ntp/util/ntp-keygen.mdoc.in                |     6 +-
 usr.sbin/ntp/config.h                              |   545 +-
 usr.sbin/ntp/libntp/Makefile                       |     2 +-
 usr.sbin/ntp/ntpd/Makefile                         |     4 +-
 usr.sbin/ntp/ntpdate/Makefile                      |     4 +-
 usr.sbin/ntp/ntpdc/Makefile                        |     4 +-
 usr.sbin/ntp/ntpq/Makefile                         |     4 +-
 usr.sbin/ntp/sntp/Makefile                         |     4 +-
 351 files changed, 26986 insertions(+), 17542 deletions(-)

diff --git a/contrib/ntp/COPYRIGHT b/contrib/ntp/COPYRIGHT
index 013202c0fb09..0cb57168ebfc 100644
--- a/contrib/ntp/COPYRIGHT
+++ b/contrib/ntp/COPYRIGHT
@@ -3,7 +3,7 @@ This file is automatically generated from html/copyright.html
 
    jpg "Clone me," says Dolly sheepishly.
 
-   Last update: 2-Mar-2023 05:21 UTC
+   Last update: 7-Jan-2024 00:29 UTC
      __________________________________________________________________
 
    The following copyright notice applies to all files collectively called
@@ -32,7 +32,7 @@ This file is automatically generated from html/copyright.html
    Hart, Danny Mayer, Martin Burnicki, and possibly others is:
 ***********************************************************************
 *                                                                     *
-* Copyright (c) Network Time Foundation 2011-2023                     *
+* Copyright (c) Network Time Foundation 2011-2024                     *
 *                                                                     *
 * All Rights Reserved                                                 *
 *                                                                     *
diff --git a/contrib/ntp/ChangeLog b/contrib/ntp/ChangeLog
index 93cdab8b94eb..f4a196aa57cd 100644
--- a/contrib/ntp/ChangeLog
+++ b/contrib/ntp/ChangeLog
@@ -1,3 +1,121 @@
+---
+(4.2.8p18) 2024/05/25 Released by Harlan Stenn <stenn@ntp.org>
+
+* [Bug 3918] Tweak openssl header/library handling. <stenn@ntp.org>
+* [Bug 3914] Spurious "Unexpected origin timestamp" logged after time
+             stepped. <hart@ntp.org>
+* [Bug 3913] Avoid duplicate IPv6 link-local manycast associations.
+             <hart@ntp.org>
+* [Bug 3912] Avoid rare math errors in ntptrace.  <brian.utterback@oracle.com>
+* [Bug 3910] Memory leak using openssl-3 <hart@ntp.org>
+* [Bug 3909] Do not select multicast local address for unicast peer.
+             <hart@ntp.org>
+* [Bug 3903] lib/isc/win32/strerror.c NTstrerror() is not thread-safe.
+             <hart@ntp.org>
+* [Bug 3901] LIB_GETBUF isn't thread-safe. <hart@ntp.org>
+* [Bug 3900] fast_xmit() selects wrong local addr responding to mcast on
+             Windows. <hart@ntp.org>
+* [Bug 3888] ntpd with multiple same-subnet IPs using manycastclient creates
+             duplicate associations. <hart@ntp.org>
+* [Bug 3872] Ignore restrict mask for hostname. <hart@ntp.org>
+* [Bug 3871] 4.2.8p17 build without hopf6021 refclock enabled fails.
+             Reported by Hans Mayer.  Moved NONEMPTY_TRANSLATION_UNIT
+             declaration from ntp_types.h to config.h.  <hart@ntp.org>
+* [Bug 3870] Server drops client packets with ppoll < 4.  <stenn@ntp.org>
+* [Bug 3869] Remove long-gone "calldelay" & "crypto sign" from docs.
+             Reported by PoolMUC@web.de. <hart@ntp.org>
+* [Bug 3868] Cannot restrict a pool peer. <hart@ntp.org>  Thanks to
+             Edward McGuire for tracking down the deficiency.
+* [Bug 3864] ntpd IPv6 refid different for big-endian and little-endian.
+             <hart@ntp.org>
+* [Bug 3859] Use NotifyIpInterfaceChange on Windows ntpd. <hart@ntp.org>
+* [Bug 3856] Enable Edit & Continue debugging with Visual Studio.
+             <hart@ntp.org>
+* [Bug 3855] ntpq lacks an equivalent to ntpdc's delrestrict. <hart@ntp.org>
+* [Bug 3854] ntpd 4.2.8p17 corrupts rawstats file with space in refid.
+             <hart@ntp.org>
+* [Bug 3853] Clean up warnings with modern compilers. <hart@ntp.org>
+* [Bug 3852] check-libntp.mf and friends are not triggering rebuilds as
+             intended. <hart@ntp.org>
+* [Bug 3851] Drop pool server when no local address can reach it.
+             <hart@ntp.org>
+* [Bug 3850] ntpq -c apeers breaks column formatting s2 w/refclock refid.
+             <hart@ntp.org>
+* [Bug 3849] ntpd --wait-sync times out. <hart@ntp.org>
+* [Bug 3847] SSL detection in configure should run-test if runpath is needed.
+             <hart@ntp.org>
+* [Bug 3846] Use -Wno-format-truncation by default. <hart@ntp.org>
+* [Bug 3845] accelerate pool clock_sync when IPv6 has only link-local access.
+             <hart@ntp.org>
+* [Bug 3842] Windows ntpd PPSAPI DLL load failure crashes. <hart@ntp.org>
+* [Bug 3841] 4.2.8p17 build break w/ gcc 12 -Wformat-security without -Wformat
+             Need to remove --Wformat-security when removing -Wformat to
+             silence numerous libopts warnings.  <hart@ntp.org>
+* [Bug 3837] NULL pointer deref crash when ntpd deletes last interface.
+             Reported by renmingshuai.  Correct UNLINK_EXPR_SLIST() when the
+             list is empty. <hart@ntp.org>
+* [Bug 3835] NTP_HARD_*FLAGS not used by libevent tearoff. <hart@ntp.org>
+* [Bug 3831] pollskewlist zeroed on runtime configuration. <hart@ntp.org>
+* [Bug 3830] configure libevent check intersperses output with answer. <stenn@>
+* [Bug 3828] BK should ignore a git repo in the same directory.
+             <burnicki@ntp.org>
+* [Bug 3827] Fix build in case CLOCK_HOPF6021 or CLOCK_WHARTON_400A
+             is disabled.  <burnicki@ntp.org>
+* [Bug 3825] Don't touch HTML files unless building inside a BK repo.
+             Fix the script checkHtmlFileDates.  <burnicki@ntp.org>
+* [Bug 3756] Improve OpenSSL library/header detection.
+* [Bug 3753] ntpd fails to start with FIPS-enabled OpenSSL 3. <hart@ntp.org>
+* [Bug 2734] TEST3 prevents initial interleave sync.  Fix from <PoolMUC@web.de>
+* Log failures to allocate receive buffers.  <hart@ntp.org>
+* Remove extraneous */ from libparse/ieee754io.c
+* Fix .datecheck target line in Makefile.am.  <stenn@ntp.org>
+* Update the copyright year.  <stenn@ntp.org>
+* Update ntp.conf documentation to add "delrestrict" and correct information
+  about KoD rate limiting.  <hart@ntp.org>
+* html/clockopt.html cleanup.  <stenn@ntp.org>
+* util/lsf-times - added.  <stenn@ntp.org>
+* Add DSA, DSA-SHA, and SHA to tests/libntp/digests.c. <hart@ntp.org>
+* Provide ntpd thread names to debugger on Windows. <hart@ntp.org>
+* Remove dead code libntp/numtohost.c and its unit tests. <hart@ntp.org>
+* Remove class A, B, C IPv4 distinctions in netof(). <hart@ntp.org>
+* Use @configure_input@ in various *.in files to include a comment that
+  the file is generated from another pointing to the *.in. <hart@ntp.org>
+* Correct underquoting, indents in ntp_facilitynames.m4. <hart@ntp.org>
+* Clean up a few warnings seen building with older gcc. <hart@ntp.org>
+* Fix build on older FreeBSD lacking sys/procctl.h. <hart@ntp.org>
+* Disable [Bug 3627] workaround on newer FreeBSD which has the kernel fix
+  that makes it unnecessary, re-enabling ASLR stack gap. <hart@ntp.org>
+* Use NONEMPTY_COMPILATION_UNIT in more conditionally-compiled files.
+* Remove useless pointer to Windows Help from system error messages.
+* Avoid newlines within Windows error messages. <hart@ntp.org>
+* Ensure unique association IDs if wrapped. <hart@ntp.org>
+* Simplify calc_addr_distance(). <hart@ntp.org>
+* Clamp min/maxpoll in edge cases in newpeer(). <hart@ntp.org>
+* Quiet local addr change logging when unpeering. <hart@ntp.org>
+* Correct missing arg for %s printf specifier in 
+  send_blocking_resp_internal(). <hart@ntp.org>
+* Suppress OpenSSL 3 deprecation warning clutter. <hart@ntp.org>
+* Correct OpenSSL usage in Autokey code to avoid warnings about
+  discarding const qualifiers with OpenSSL 3. <hart@ntp.org>
+* Display KoD refid as text in recently added message. <hart@ntp.org>
+* Avoid running checkHtmlFileDates script repeatedly when no html/*.html
+    files have changed. <hart@ntp.org>
+* Abort configure if --enable-crypto-rand given & unavailable. <hart@ntp.org>
+* Add configure --enable-verbose-ssl to trace SSL detection. <hart@ntp.org>
+* Add build test coverage for --disable-saveconfig to flock-build script.
+  <hart@ntp.org>
+* Remove deprecated configure --with-arlib option. <hart@ntp.org>
+* Remove configure support for ISC UNIX ca. 1998. <hart@ntp.org>
+* Move NTP_OPENSSL and NTP_CRYPTO_RAND invocations from configure.ac files
+  to NTP_LIBNTP. <hart@ntp.org>
+* Remove dead code: HAVE_U_INT32_ONLY_WITH_DNS. <hart@ntp.org>
+* Eliminate [v]snprintf redefinition warnings on macOS. <hart@ntp.org>
+* Fix clang 14 cast increases alignment warning on Linux. <hart@ntp.org>
+* Move ENABLE_CMAC to ntp_openssl.m4, reviving sntp/tests CMAC unit tests.
+  <hart@ntp.org>
+* Use NTP_HARD_CPPFLAGS in libopts tearoff. <hart@ntp.org>
+* wire in --enable-build-framework-help
+
 ---
 (4.2.8p17) 2023/06/06 Released by Harlan Stenn <stenn@ntp.org>
 
@@ -10,7 +128,7 @@
 	     Miroslav Lichvar and Matt for rapid testing and identifying the
 	     problem. <hart@ntp.org>
 * Add tests/libntp/digests.c to catch regressions reading keys file or with
-  symmetric authentication digest output.
+  symmetric authentication digest output. <hart@ntp.org>
 
 ---
 (4.2.8p16) 2023/05/31 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/contrib/ntp/CommitLog b/contrib/ntp/CommitLog
index adeda2c60402..49952cfaef0d 100644
--- a/contrib/ntp/CommitLog
+++ b/contrib/ntp/CommitLog
@@ -1,3 +1,3224 @@
+ChangeSet@1.4062, 2024-05-25 00:06:49-07:00, ntpreleng@ntp-build.tal1.ntfo.org
+  NTP_4_2_8P18
+  TAG: NTP_4_2_8P18
+
+  ChangeLog@1.2103 +1 -0
+    NTP_4_2_8P18
+
+  ntpd/invoke-ntp.conf.texi@1.231 +1 -1
+    NTP_4_2_8P18
+
+  ntpd/invoke-ntp.keys.texi@1.214 +1 -1
+    NTP_4_2_8P18
+
+  ntpd/invoke-ntpd.texi@1.528 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntp.conf.5man@1.265 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntp.conf.5mdoc@1.265 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntp.conf.html@1.213 +1 -1
+    NTP_4_2_8P18
+
+  ntpd/ntp.conf.man.in@1.265 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntp.conf.mdoc.in@1.265 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntp.keys.5man@1.248 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntp.keys.5mdoc@1.248 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntp.keys.html@1.208 +1 -1
+    NTP_4_2_8P18
+
+  ntpd/ntp.keys.man.in@1.248 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntp.keys.mdoc.in@1.248 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntpd-opts.c@1.553 +245 -245
+    NTP_4_2_8P18
+
+  ntpd/ntpd-opts.h@1.552 +3 -3
+    NTP_4_2_8P18
+
+  ntpd/ntpd.1ntpdman@1.357 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntpd.1ntpdmdoc@1.357 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntpd.html@1.202 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntpd.man.in@1.357 +2 -2
+    NTP_4_2_8P18
+
+  ntpd/ntpd.mdoc.in@1.357 +2 -2
+    NTP_4_2_8P18
+
+  ntpdc/invoke-ntpdc.texi@1.527 +2 -2
+    NTP_4_2_8P18
+
+  ntpdc/ntpdc-opts.c@1.548 +113 -113
+    NTP_4_2_8P18
+
+  ntpdc/ntpdc-opts.h@1.547 +3 -3
+    NTP_4_2_8P18
+
+  ntpdc/ntpdc.1ntpdcman@1.358 +2 -2
+    NTP_4_2_8P18
+
+  ntpdc/ntpdc.1ntpdcmdoc@1.358 +2 -2
+    NTP_4_2_8P18
+
+  ntpdc/ntpdc.html@1.372 +2 -2
+    NTP_4_2_8P18
+
+  ntpdc/ntpdc.man.in@1.358 +2 -2
+    NTP_4_2_8P18
+
+  ntpdc/ntpdc.mdoc.in@1.358 +2 -2
+    NTP_4_2_8P18
+
+  ntpq/invoke-ntpq.texi@1.537 +2 -2
+    NTP_4_2_8P18
+
+  ntpq/ntpq-opts.c@1.557 +120 -120
+    NTP_4_2_8P18
+
+  ntpq/ntpq-opts.h@1.555 +3 -3
+    NTP_4_2_8P18
+
+  ntpq/ntpq.1ntpqman@1.365 +2 -2
+    NTP_4_2_8P18
+
+  ntpq/ntpq.1ntpqmdoc@1.365 +2 -2
+    NTP_4_2_8P18
+
+  ntpq/ntpq.html@1.202 +2 -2
+    NTP_4_2_8P18
+
+  ntpq/ntpq.man.in@1.365 +2 -2
+    NTP_4_2_8P18
+
+  ntpq/ntpq.mdoc.in@1.365 +2 -2
+    NTP_4_2_8P18
+
+  ntpsnmpd/invoke-ntpsnmpd.texi@1.527 +2 -2
+    NTP_4_2_8P18
+
+  ntpsnmpd/ntpsnmpd-opts.c@1.548 +68 -68
+    NTP_4_2_8P18
+
+  ntpsnmpd/ntpsnmpd-opts.h@1.547 +3 -3
+    NTP_4_2_8P18
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.356 +2 -2
+    NTP_4_2_8P18
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.356 +2 -2
+    NTP_4_2_8P18
+
+  ntpsnmpd/ntpsnmpd.html@1.194 +1 -1
+    NTP_4_2_8P18
+
+  ntpsnmpd/ntpsnmpd.man.in@1.356 +2 -2
+    NTP_4_2_8P18
+
+  ntpsnmpd/ntpsnmpd.mdoc.in@1.356 +2 -2
+    NTP_4_2_8P18
+
+  packageinfo.sh@1.553 +2 -2
+    NTP_4_2_8P18
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.117 +2 -2
+    NTP_4_2_8P18
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.119 +2 -2
+    NTP_4_2_8P18
+
+  scripts/calc_tickadj/calc_tickadj.html@1.118 +1 -1
+    NTP_4_2_8P18
+
+  scripts/calc_tickadj/calc_tickadj.man.in@1.116 +2 -2
+    NTP_4_2_8P18
+
+  scripts/calc_tickadj/calc_tickadj.mdoc.in@1.119 +2 -2
+    NTP_4_2_8P18
+
+  scripts/calc_tickadj/invoke-calc_tickadj.texi@1.121 +1 -1
+    NTP_4_2_8P18
+
+  scripts/invoke-plot_summary.texi@1.139 +2 -2
+    NTP_4_2_8P18
+
+  scripts/invoke-summary.texi@1.138 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntp-wait/invoke-ntp-wait.texi@1.350 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntp-wait/ntp-wait-opts@1.86 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitman@1.345 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.347 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntp-wait/ntp-wait.html@1.366 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntp-wait/ntp-wait.man.in@1.345 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntp-wait/ntp-wait.mdoc.in@1.347 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntpsweep/invoke-ntpsweep.texi@1.136 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntpsweep/ntpsweep-opts@1.89 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepman@1.124 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.124 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntpsweep/ntpsweep.html@1.138 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntpsweep/ntpsweep.man.in@1.124 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntpsweep/ntpsweep.mdoc.in@1.125 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntptrace/invoke-ntptrace.texi@1.139 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntptrace/ntptrace-opts@1.89 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntptrace/ntptrace.1ntptraceman@1.124 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntptrace/ntptrace.1ntptracemdoc@1.126 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntptrace/ntptrace.html@1.139 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntptrace/ntptrace.man.in@1.124 +2 -2
+    NTP_4_2_8P18
+
+  scripts/ntptrace/ntptrace.mdoc.in@1.127 +2 -2
+    NTP_4_2_8P18
+
+  scripts/plot_summary-opts@1.90 +2 -2
+    NTP_4_2_8P18
+
+  scripts/plot_summary.1plot_summaryman@1.137 +2 -2
+    NTP_4_2_8P18
+
+  scripts/plot_summary.1plot_summarymdoc@1.137 +2 -2
+    NTP_4_2_8P18
+
+  scripts/plot_summary.html@1.141 +2 -2
+    NTP_4_2_8P18
+
+  scripts/plot_summary.man.in@1.137 +2 -2
+    NTP_4_2_8P18
+
+  scripts/plot_summary.mdoc.in@1.137 +2 -2
+    NTP_4_2_8P18
+
+  scripts/summary-opts@1.89 +2 -2
+    NTP_4_2_8P18
+
+  scripts/summary.1summaryman@1.136 +2 -2
+    NTP_4_2_8P18
+
+  scripts/summary.1summarymdoc@1.136 +2 -2
+    NTP_4_2_8P18
+
+  scripts/summary.html@1.140 +2 -2
+    NTP_4_2_8P18
+
+  scripts/summary.man.in@1.136 +2 -2
+    NTP_4_2_8P18
+
+  scripts/summary.mdoc.in@1.136 +2 -2
+    NTP_4_2_8P18
+
+  scripts/update-leap/invoke-update-leap.texi@1.37 +1 -1
+    NTP_4_2_8P18
+
+  scripts/update-leap/update-leap-opts@1.39 +2 -2
+    NTP_4_2_8P18
+
+  scripts/update-leap/update-leap.1update-leapman@1.37 +2 -2
+    NTP_4_2_8P18
+
+  scripts/update-leap/update-leap.1update-leapmdoc@1.38 +2 -2
+    NTP_4_2_8P18
+
+  scripts/update-leap/update-leap.html@1.37 +1 -1
+    NTP_4_2_8P18
+
+  scripts/update-leap/update-leap.man.in@1.37 +2 -2
+    NTP_4_2_8P18
+
+  scripts/update-leap/update-leap.mdoc.in@1.38 +2 -2
+    NTP_4_2_8P18
+
+  sntp/invoke-sntp.texi@1.527 +2 -2
+    NTP_4_2_8P18
+
+  sntp/sntp-opts.c@1.549 +161 -161
+    NTP_4_2_8P18
+
+  sntp/sntp-opts.h@1.547 +3 -3
+    NTP_4_2_8P18
+
+  sntp/sntp.1sntpman@1.362 +2 -2
+    NTP_4_2_8P18
+
+  sntp/sntp.1sntpmdoc@1.362 +2 -2
+    NTP_4_2_8P18
+
+  sntp/sntp.html@1.543 +2 -2
+    NTP_4_2_8P18
+
+  sntp/sntp.man.in@1.362 +2 -2
+    NTP_4_2_8P18
+
+  sntp/sntp.mdoc.in@1.362 +2 -2
+    NTP_4_2_8P18
+
+  util/invoke-ntp-keygen.texi@1.530 +2 -2
+    NTP_4_2_8P18
+
+  util/ntp-keygen-opts.c@1.551 +174 -174
+    NTP_4_2_8P18
+
+  util/ntp-keygen-opts.h@1.549 +3 -3
+    NTP_4_2_8P18
+
+  util/ntp-keygen.1ntp-keygenman@1.358 +2 -2
+    NTP_4_2_8P18
+
+  util/ntp-keygen.1ntp-keygenmdoc@1.358 +2 -2
+    NTP_4_2_8P18
+
+  util/ntp-keygen.html@1.203 +2 -2
+    NTP_4_2_8P18
+
+  util/ntp-keygen.man.in@1.358 +2 -2
+    NTP_4_2_8P18
+
+  util/ntp-keygen.mdoc.in@1.358 +2 -2
+    NTP_4_2_8P18
+
+ChangeSet@1.4061, 2024-05-24 23:46:58-07:00, ntpreleng@ntp-build.tal1.ntfo.org
+  ntp-4.2.8p18
+
+  ChangeLog@1.2102 +0 -2
+    ntp-4.2.8p18
+
+ChangeSet@1.4060, 2024-05-24 22:53:53-07:00, ntpreleng@ntp-build.tal1.ntfo.org
+  NTP_4_2_8P18_RCGO
+  TAG: NTP_4_2_8P18_RCGO
+
+  ChangeLog@1.2101 +1 -0
+    NTP_4_2_8P18_RCGO
+
+  ntpd/invoke-ntp.conf.texi@1.230 +1 -1
+    NTP_4_2_8P18_RCGO
+
+  ntpd/invoke-ntp.keys.texi@1.213 +1 -1
+    NTP_4_2_8P18_RCGO
+
+  ntpd/invoke-ntpd.texi@1.527 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntp.conf.5man@1.264 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntp.conf.5mdoc@1.264 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntp.conf.html@1.212 +1 -1
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntp.conf.man.in@1.264 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntp.conf.mdoc.in@1.264 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntp.keys.5man@1.247 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntp.keys.5mdoc@1.247 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntp.keys.html@1.207 +1 -1
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntp.keys.man.in@1.247 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntp.keys.mdoc.in@1.247 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntpd-opts.c@1.552 +7 -7
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntpd-opts.h@1.551 +3 -3
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntpd.1ntpdman@1.356 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntpd.1ntpdmdoc@1.356 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntpd.html@1.201 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntpd.man.in@1.356 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpd/ntpd.mdoc.in@1.356 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpdc/invoke-ntpdc.texi@1.526 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpdc/ntpdc-opts.c@1.547 +7 -7
+    NTP_4_2_8P18_RCGO
+
+  ntpdc/ntpdc-opts.h@1.546 +3 -3
+    NTP_4_2_8P18_RCGO
+
+  ntpdc/ntpdc.1ntpdcman@1.357 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpdc/ntpdc.1ntpdcmdoc@1.357 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpdc/ntpdc.html@1.371 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpdc/ntpdc.man.in@1.357 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpdc/ntpdc.mdoc.in@1.357 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpq/invoke-ntpq.texi@1.536 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpq/ntpq-opts.c@1.556 +7 -7
+    NTP_4_2_8P18_RCGO
+
+  ntpq/ntpq-opts.h@1.554 +3 -3
+    NTP_4_2_8P18_RCGO
+
+  ntpq/ntpq.1ntpqman@1.364 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpq/ntpq.1ntpqmdoc@1.364 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpq/ntpq.html@1.201 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpq/ntpq.man.in@1.364 +2 -2
+    NTP_4_2_8P18_RCGO
+
+  ntpq/ntpq.mdoc.in@1.364 +2 -2
+    NTP_4_2_8P18_RCGO
+
*** 59789 LINES SKIPPED ***