git: f5f40dd63bc7 - main - ntp: Vendor import of ntp-4.2.8p18

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Mon, 27 May 2024 02:02:04 UTC
The branch main has been updated by cy:

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

commit f5f40dd63bc7acbb5312b26ac1ea1103c12352a6
Merge: a8f86ecd6104 1f833b3fc996
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-05-27 01:41:22 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-05-27 01:41:22 +0000

    ntp: Vendor import of ntp-4.2.8p18
    
    MFC:    3 days
    
    Merge commit '1f833b3fc9968c3dd7ed79ccf0525ebf16c891ad' into main

 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 --cc contrib/ntp/html/.datecheck
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/ntp/html/.datecheck
diff --cc contrib/ntp/include/c99_snprintf.h
index 000000000000,f5c1bf0e117c..f5c1bf0e117c
mode 000000,100644..100644
--- a/contrib/ntp/include/c99_snprintf.h
+++ b/contrib/ntp/include/c99_snprintf.h
diff --cc contrib/ntp/libntp/Makefile.in
index 75d6b2abf8bc,000000000000..69805f7ddca2
mode 100644,000000..100644
--- a/contrib/ntp/libntp/Makefile.in
+++ b/contrib/ntp/libntp/Makefile.in
@@@ -1,1700 -1,0 +1,1696 @@@
 +# Makefile.in generated by automake 1.16.5 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 +
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +@SET_MAKE@
 +
 +
 +VPATH = @srcdir@
 +am__is_gnu_make = { \
 +  if test -z '$(MAKELEVEL)'; then \
 +    false; \
 +  elif test -n '$(MAKE_HOST)'; then \
 +    true; \
 +  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
 +    true; \
 +  else \
 +    false; \
 +  fi; \
 +}
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
 +      *) echo "am__make_running_with_option: internal error: invalid" \
 +              "target option '$${target_option-}' specified" >&2; \
 +         exit 1;; \
 +  esac; \
 +  has_opt=no; \
 +  sane_makeflags=$$MAKEFLAGS; \
 +  if $(am__is_gnu_make); then \
 +    sane_makeflags=$$MFLAGS; \
 +  else \
 +    case $$MAKEFLAGS in \
 +      *\\[\ \	]*) \
 +        bs=\\; \
 +        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
 +          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
 +    esac; \
 +  fi; \
 +  skip_next=no; \
 +  strip_trailopt () \
 +  { \
 +    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
 +  }; \
 +  for flg in $$sane_makeflags; do \
 +    test $$skip_next = yes && { skip_next=no; continue; }; \
 +    case $$flg in \
 +      *=*|--*) continue;; \
 +        -*I) strip_trailopt 'I'; skip_next=yes;; \
 +      -*I?*) strip_trailopt 'I';; \
 +        -*O) strip_trailopt 'O'; skip_next=yes;; \
 +      -*O?*) strip_trailopt 'O';; \
 +        -*l) strip_trailopt 'l'; skip_next=yes;; \
 +      -*l?*) strip_trailopt 'l';; \
 +      -[dEDm]) skip_next=yes;; \
 +      -[JT]) skip_next=yes;; \
 +    esac; \
 +    case $$flg in \
 +      *$$target_option*) has_opt=yes; break;; \
 +    esac; \
 +  done; \
 +  test $$has_opt = yes
 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
 +
 +# ntp_crypto_rnd.c includes libevent headers for use when
 +# neither OpenSSL nor arc4random_buf are available.  Those
 +# include event2/event-config.h which is built, so if we
 +# are building our libevent tearoff, build it before this.
 +@BUILD_LIBEVENT_TRUE@am__append_1 = libevent_first
 +@BUILD_LIBEVENT_TRUE@am__append_2 = libevent_first
 +@PTHREADS_TRUE@am__append_3 = \
 +@PTHREADS_TRUE@	lib/isc/pthreads/condition.c			\
 +@PTHREADS_TRUE@	lib/isc/pthreads/mutex.c			\
 +@PTHREADS_TRUE@	lib/isc/pthreads/thread.c			\
 +@PTHREADS_TRUE@	$(NULL)
 +
 +@PTHREADS_FALSE@am__append_4 = \
 +@PTHREADS_FALSE@	lib/isc/nothreads/condition.c			\
 +@PTHREADS_FALSE@	lib/isc/nothreads/thread.c			\
 +@PTHREADS_FALSE@	$(NULL)
 +
 +subdir = libntp
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 +	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
 +	$(top_srcdir)/sntp/m4/ax_c99_struct_init.m4 \
 +	$(top_srcdir)/sntp/m4/define_dir.m4 \
 +	$(top_srcdir)/sntp/m4/hms_search_lib.m4 \
 +	$(top_srcdir)/sntp/m4/libtool.m4 \
 +	$(top_srcdir)/sntp/m4/ltoptions.m4 \
 +	$(top_srcdir)/sntp/m4/ltsugar.m4 \
 +	$(top_srcdir)/sntp/m4/ltversion.m4 \
 +	$(top_srcdir)/sntp/m4/lt~obsolete.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_af_unspec.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_compiler.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_crypto_rand.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_debug.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_dir_sep.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_facilitynames.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_harden.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_ipv6.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_lib_m.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_libevent.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_libntp.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_lineeditlibs.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_problemtests.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 +	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 +	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
 +	$(top_srcdir)/sntp/m4/openldap.m4 \
 +	$(top_srcdir)/sntp/m4/os_cflags.m4 \
 +	$(top_srcdir)/sntp/m4/realpath.m4 \
 +	$(top_srcdir)/sntp/m4/snprintf.m4 \
 +	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
 +	$(am__DIST_COMMON)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/config.h
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
 +LIBRARIES = $(noinst_LIBRARIES)
 +ARFLAGS = @ARFLAGS@
 +AM_V_AR = $(am__v_AR_@AM_V@)
 +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
 +am__v_AR_0 = @echo "  AR      " $@;
 +am__v_AR_1 = 
 +libntp_a_AR = $(AR) $(ARFLAGS)
 +libntp_a_LIBADD =
 +am__libntp_a_SOURCES_DIST = systime.c a_md5encrypt.c adjtime.c \
 +	atoint.c atolfp.c atouint.c audio.c authkeys.c authreadkeys.c \
 +	authusekey.c bsd_strerror.c buftvtots.c caljulian.c caltontp.c \
 +	calyearstart.c clocktime.c clocktypes.c decodenetnum.c \
 +	dofptoa.c dolfptoa.c emalloc.c findconfig.c getopt.c \
 +	hextoint.c hextolfp.c humandate.c icom.c iosignal.c \
 +	is_ip_address.c lib_strbuf.c libssl_compat.c machines.c \
 +	mktime.c modetoa.c mstolfp.c msyslog.c netof.c ntp_calendar.c \
 +	ntp_calgps.c ntp_crypto_rnd.c ntp_intres.c ntp_libopts.c \
 +	ntp_lineedit.c ntp_random.c ntp_realpath.c ntp_rfc2553.c \
- 	ntp_worker.c numtoa.c numtohost.c octtoint.c prettydate.c \
- 	refidsmear.c recvbuff.c refnumtoa.c snprintf.c socket.c \
- 	socktoa.c socktohost.c ssl_init.c statestr.c strdup.c \
- 	strl_obsd.c syssignal.c timespecops.c timetoa.c timevalops.c \
- 	timexsup.c uglydate.c vint64ops.c work_fork.c work_thread.c \
- 	xsbprintf.c ymd2yd.c lib/isc/assertions.c lib/isc/buffer.c \
++	ntp_worker.c numtoa.c octtoint.c prettydate.c refidsmear.c \
++	recvbuff.c refnumtoa.c snprintf.c socket.c socktoa.c \
++	socktohost.c ssl_init.c statestr.c strdup.c strl_obsd.c \
++	syssignal.c timespecops.c timetoa.c timevalops.c timexsup.c \
++	uglydate.c vint64ops.c work_fork.c work_thread.c xsbprintf.c \
++	ymd2yd.c lib/isc/assertions.c lib/isc/buffer.c \
 +	lib/isc/backtrace-emptytbl.c lib/isc/backtrace.c \
 +	lib/isc/unix/dir.c lib/isc/error.c lib/isc/unix/errno2result.c \
 +	lib/isc/event.c lib/isc/unix/file.c lib/isc/inet_ntop.c \
 +	lib/isc/inet_pton.c lib/isc/unix/interfaceiter.c lib/isc/lib.c \
 +	lib/isc/log.c lib/isc/md5.c lib/isc/nls/msgcat.c \
 +	lib/isc/unix/net.c lib/isc/netaddr.c lib/isc/netscope.c \
 +	lib/isc/ondestroy.c lib/isc/random.c lib/isc/result.c \
 +	lib/isc/unix/stdio.c lib/isc/unix/stdtime.c \
 +	lib/isc/unix/strerror.c lib/isc/task.c lib/isc/unix/time.c \
 +	lib/isc/sha1.c lib/isc/sockaddr.c lib/isc/tsmemcmp.c \
 +	lib/isc/pthreads/condition.c lib/isc/pthreads/mutex.c \
 +	lib/isc/pthreads/thread.c lib/isc/nothreads/condition.c \
 +	lib/isc/nothreads/thread.c
 +am__dirstamp = $(am__leading_dot)dirstamp
 +am__objects_1 =
 +@PTHREADS_TRUE@am__objects_2 = lib/isc/pthreads/condition.$(OBJEXT) \
 +@PTHREADS_TRUE@	lib/isc/pthreads/mutex.$(OBJEXT) \
 +@PTHREADS_TRUE@	lib/isc/pthreads/thread.$(OBJEXT) \
 +@PTHREADS_TRUE@	$(am__objects_1)
 +@PTHREADS_FALSE@am__objects_3 = lib/isc/nothreads/condition.$(OBJEXT) \
 +@PTHREADS_FALSE@	lib/isc/nothreads/thread.$(OBJEXT) \
 +@PTHREADS_FALSE@	$(am__objects_1)
 +am__objects_4 = lib/isc/assertions.$(OBJEXT) lib/isc/buffer.$(OBJEXT) \
 +	lib/isc/backtrace-emptytbl.$(OBJEXT) \
 +	lib/isc/backtrace.$(OBJEXT) lib/isc/unix/dir.$(OBJEXT) \
 +	lib/isc/error.$(OBJEXT) lib/isc/unix/errno2result.$(OBJEXT) \
 +	lib/isc/event.$(OBJEXT) lib/isc/unix/file.$(OBJEXT) \
 +	lib/isc/inet_ntop.$(OBJEXT) lib/isc/inet_pton.$(OBJEXT) \
 +	lib/isc/unix/interfaceiter.$(OBJEXT) lib/isc/lib.$(OBJEXT) \
 +	lib/isc/log.$(OBJEXT) lib/isc/md5.$(OBJEXT) \
 +	lib/isc/nls/msgcat.$(OBJEXT) lib/isc/unix/net.$(OBJEXT) \
 +	lib/isc/netaddr.$(OBJEXT) lib/isc/netscope.$(OBJEXT) \
 +	lib/isc/ondestroy.$(OBJEXT) lib/isc/random.$(OBJEXT) \
 +	lib/isc/result.$(OBJEXT) lib/isc/unix/stdio.$(OBJEXT) \
 +	lib/isc/unix/stdtime.$(OBJEXT) lib/isc/unix/strerror.$(OBJEXT) \
 +	lib/isc/task.$(OBJEXT) lib/isc/unix/time.$(OBJEXT) \
 +	lib/isc/sha1.$(OBJEXT) lib/isc/sockaddr.$(OBJEXT) \
 +	lib/isc/tsmemcmp.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
 +	$(am__objects_3)
 +am__objects_5 = a_md5encrypt.$(OBJEXT) adjtime.$(OBJEXT) \
 +	atoint.$(OBJEXT) atolfp.$(OBJEXT) atouint.$(OBJEXT) \
 +	audio.$(OBJEXT) authkeys.$(OBJEXT) authreadkeys.$(OBJEXT) \
 +	authusekey.$(OBJEXT) bsd_strerror.$(OBJEXT) \
 +	buftvtots.$(OBJEXT) caljulian.$(OBJEXT) caltontp.$(OBJEXT) \
 +	calyearstart.$(OBJEXT) clocktime.$(OBJEXT) \
 +	clocktypes.$(OBJEXT) decodenetnum.$(OBJEXT) dofptoa.$(OBJEXT) \
 +	dolfptoa.$(OBJEXT) emalloc.$(OBJEXT) findconfig.$(OBJEXT) \
 +	getopt.$(OBJEXT) hextoint.$(OBJEXT) hextolfp.$(OBJEXT) \
 +	humandate.$(OBJEXT) icom.$(OBJEXT) iosignal.$(OBJEXT) \
 +	is_ip_address.$(OBJEXT) lib_strbuf.$(OBJEXT) \
 +	libssl_compat.$(OBJEXT) machines.$(OBJEXT) mktime.$(OBJEXT) \
 +	modetoa.$(OBJEXT) mstolfp.$(OBJEXT) msyslog.$(OBJEXT) \
 +	netof.$(OBJEXT) ntp_calendar.$(OBJEXT) ntp_calgps.$(OBJEXT) \
 +	ntp_crypto_rnd.$(OBJEXT) ntp_intres.$(OBJEXT) \
 +	ntp_libopts.$(OBJEXT) ntp_lineedit.$(OBJEXT) \
 +	ntp_random.$(OBJEXT) ntp_realpath.$(OBJEXT) \
 +	ntp_rfc2553.$(OBJEXT) ntp_worker.$(OBJEXT) numtoa.$(OBJEXT) \
- 	numtohost.$(OBJEXT) octtoint.$(OBJEXT) prettydate.$(OBJEXT) \
- 	refidsmear.$(OBJEXT) recvbuff.$(OBJEXT) refnumtoa.$(OBJEXT) \
- 	snprintf.$(OBJEXT) socket.$(OBJEXT) socktoa.$(OBJEXT) \
- 	socktohost.$(OBJEXT) ssl_init.$(OBJEXT) statestr.$(OBJEXT) \
- 	strdup.$(OBJEXT) strl_obsd.$(OBJEXT) syssignal.$(OBJEXT) \
- 	timespecops.$(OBJEXT) timetoa.$(OBJEXT) timevalops.$(OBJEXT) \
- 	timexsup.$(OBJEXT) uglydate.$(OBJEXT) vint64ops.$(OBJEXT) \
- 	work_fork.$(OBJEXT) work_thread.$(OBJEXT) xsbprintf.$(OBJEXT) \
- 	ymd2yd.$(OBJEXT) $(am__objects_4) $(am__objects_1)
++	octtoint.$(OBJEXT) prettydate.$(OBJEXT) refidsmear.$(OBJEXT) \
++	recvbuff.$(OBJEXT) refnumtoa.$(OBJEXT) snprintf.$(OBJEXT) \
++	socket.$(OBJEXT) socktoa.$(OBJEXT) socktohost.$(OBJEXT) \
++	ssl_init.$(OBJEXT) statestr.$(OBJEXT) strdup.$(OBJEXT) \
++	strl_obsd.$(OBJEXT) syssignal.$(OBJEXT) timespecops.$(OBJEXT) \
++	timetoa.$(OBJEXT) timevalops.$(OBJEXT) timexsup.$(OBJEXT) \
++	uglydate.$(OBJEXT) vint64ops.$(OBJEXT) work_fork.$(OBJEXT) \
++	work_thread.$(OBJEXT) xsbprintf.$(OBJEXT) ymd2yd.$(OBJEXT) \
++	$(am__objects_4) $(am__objects_1)
 +am_libntp_a_OBJECTS = systime.$(OBJEXT) $(am__objects_5)
 +libntp_a_OBJECTS = $(am_libntp_a_OBJECTS)
 +libntpsim_a_AR = $(AR) $(ARFLAGS)
 +libntpsim_a_LIBADD =
 +am__libntpsim_a_SOURCES_DIST = systime_s.c a_md5encrypt.c adjtime.c \
 +	atoint.c atolfp.c atouint.c audio.c authkeys.c authreadkeys.c \
 +	authusekey.c bsd_strerror.c buftvtots.c caljulian.c caltontp.c \
 +	calyearstart.c clocktime.c clocktypes.c decodenetnum.c \
 +	dofptoa.c dolfptoa.c emalloc.c findconfig.c getopt.c \
 +	hextoint.c hextolfp.c humandate.c icom.c iosignal.c \
 +	is_ip_address.c lib_strbuf.c libssl_compat.c machines.c \
 +	mktime.c modetoa.c mstolfp.c msyslog.c netof.c ntp_calendar.c \
 +	ntp_calgps.c ntp_crypto_rnd.c ntp_intres.c ntp_libopts.c \
 +	ntp_lineedit.c ntp_random.c ntp_realpath.c ntp_rfc2553.c \
- 	ntp_worker.c numtoa.c numtohost.c octtoint.c prettydate.c \
- 	refidsmear.c recvbuff.c refnumtoa.c snprintf.c socket.c \
- 	socktoa.c socktohost.c ssl_init.c statestr.c strdup.c \
- 	strl_obsd.c syssignal.c timespecops.c timetoa.c timevalops.c \
- 	timexsup.c uglydate.c vint64ops.c work_fork.c work_thread.c \
- 	xsbprintf.c ymd2yd.c lib/isc/assertions.c lib/isc/buffer.c \
++	ntp_worker.c numtoa.c octtoint.c prettydate.c refidsmear.c \
++	recvbuff.c refnumtoa.c snprintf.c socket.c socktoa.c \
++	socktohost.c ssl_init.c statestr.c strdup.c strl_obsd.c \
++	syssignal.c timespecops.c timetoa.c timevalops.c timexsup.c \
++	uglydate.c vint64ops.c work_fork.c work_thread.c xsbprintf.c \
++	ymd2yd.c lib/isc/assertions.c lib/isc/buffer.c \
 +	lib/isc/backtrace-emptytbl.c lib/isc/backtrace.c \
 +	lib/isc/unix/dir.c lib/isc/error.c lib/isc/unix/errno2result.c \
 +	lib/isc/event.c lib/isc/unix/file.c lib/isc/inet_ntop.c \
 +	lib/isc/inet_pton.c lib/isc/unix/interfaceiter.c lib/isc/lib.c \
 +	lib/isc/log.c lib/isc/md5.c lib/isc/nls/msgcat.c \
 +	lib/isc/unix/net.c lib/isc/netaddr.c lib/isc/netscope.c \
 +	lib/isc/ondestroy.c lib/isc/random.c lib/isc/result.c \
 +	lib/isc/unix/stdio.c lib/isc/unix/stdtime.c \
 +	lib/isc/unix/strerror.c lib/isc/task.c lib/isc/unix/time.c \
 +	lib/isc/sha1.c lib/isc/sockaddr.c lib/isc/tsmemcmp.c \
 +	lib/isc/pthreads/condition.c lib/isc/pthreads/mutex.c \
 +	lib/isc/pthreads/thread.c lib/isc/nothreads/condition.c \
 +	lib/isc/nothreads/thread.c
 +am_libntpsim_a_OBJECTS = systime_s.$(OBJEXT) $(am__objects_5)
 +libntpsim_a_OBJECTS = $(am_libntpsim_a_OBJECTS)
 +AM_V_P = $(am__v_P_@AM_V@)
 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 +am__v_P_0 = false
 +am__v_P_1 = :
 +AM_V_GEN = $(am__v_GEN_@AM_V@)
 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 +am__v_GEN_0 = @echo "  GEN     " $@;
 +am__v_GEN_1 = 
 +AM_V_at = $(am__v_at_@AM_V@)
 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 +am__v_at_0 = @
 +am__v_at_1 = 
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 +depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
 +am__maybe_remake_depfiles = depfiles
 +am__depfiles_remade = ./$(DEPDIR)/a_md5encrypt.Po \
 +	./$(DEPDIR)/adjtime.Po ./$(DEPDIR)/adjtimex.Po \
 +	./$(DEPDIR)/atoint.Po ./$(DEPDIR)/atolfp.Po \
 +	./$(DEPDIR)/atouint.Po ./$(DEPDIR)/audio.Po \
 +	./$(DEPDIR)/authkeys.Po ./$(DEPDIR)/authreadkeys.Po \
 +	./$(DEPDIR)/authusekey.Po ./$(DEPDIR)/bsd_strerror.Po \
 +	./$(DEPDIR)/buftvtots.Po ./$(DEPDIR)/caljulian.Po \
 +	./$(DEPDIR)/caltontp.Po ./$(DEPDIR)/calyearstart.Po \
 +	./$(DEPDIR)/clocktime.Po ./$(DEPDIR)/clocktypes.Po \
 +	./$(DEPDIR)/decodenetnum.Po ./$(DEPDIR)/dofptoa.Po \
 +	./$(DEPDIR)/dolfptoa.Po ./$(DEPDIR)/emalloc.Po \
 +	./$(DEPDIR)/findconfig.Po ./$(DEPDIR)/getopt.Po \
 +	./$(DEPDIR)/hextoint.Po ./$(DEPDIR)/hextolfp.Po \
 +	./$(DEPDIR)/humandate.Po ./$(DEPDIR)/icom.Po \
 +	./$(DEPDIR)/iosignal.Po ./$(DEPDIR)/is_ip_address.Po \
 +	./$(DEPDIR)/lib_strbuf.Po ./$(DEPDIR)/libssl_compat.Po \
 +	./$(DEPDIR)/machines.Po ./$(DEPDIR)/mktime.Po \
 +	./$(DEPDIR)/modetoa.Po ./$(DEPDIR)/mstolfp.Po \
 +	./$(DEPDIR)/msyslog.Po ./$(DEPDIR)/netof.Po \
 +	./$(DEPDIR)/ntp_calendar.Po ./$(DEPDIR)/ntp_calgps.Po \
 +	./$(DEPDIR)/ntp_crypto_rnd.Po ./$(DEPDIR)/ntp_intres.Po \
 +	./$(DEPDIR)/ntp_libopts.Po ./$(DEPDIR)/ntp_lineedit.Po \
 +	./$(DEPDIR)/ntp_random.Po ./$(DEPDIR)/ntp_realpath.Po \
 +	./$(DEPDIR)/ntp_rfc2553.Po ./$(DEPDIR)/ntp_worker.Po \
- 	./$(DEPDIR)/numtoa.Po ./$(DEPDIR)/numtohost.Po \
- 	./$(DEPDIR)/octtoint.Po ./$(DEPDIR)/prettydate.Po \
- 	./$(DEPDIR)/recvbuff.Po ./$(DEPDIR)/refidsmear.Po \
- 	./$(DEPDIR)/refnumtoa.Po ./$(DEPDIR)/snprintf.Po \
- 	./$(DEPDIR)/socket.Po ./$(DEPDIR)/socktoa.Po \
- 	./$(DEPDIR)/socktohost.Po ./$(DEPDIR)/ssl_init.Po \
- 	./$(DEPDIR)/statestr.Po ./$(DEPDIR)/strdup.Po \
- 	./$(DEPDIR)/strl_obsd.Po ./$(DEPDIR)/syssignal.Po \
- 	./$(DEPDIR)/systime.Po ./$(DEPDIR)/systime_s.Po \
- 	./$(DEPDIR)/timespecops.Po ./$(DEPDIR)/timetoa.Po \
- 	./$(DEPDIR)/timevalops.Po ./$(DEPDIR)/timexsup.Po \
- 	./$(DEPDIR)/uglydate.Po ./$(DEPDIR)/vint64ops.Po \
- 	./$(DEPDIR)/work_fork.Po ./$(DEPDIR)/work_thread.Po \
- 	./$(DEPDIR)/xsbprintf.Po ./$(DEPDIR)/ymd2yd.Po \
- 	lib/isc/$(DEPDIR)/assertions.Po \
++	./$(DEPDIR)/numtoa.Po ./$(DEPDIR)/octtoint.Po \
++	./$(DEPDIR)/prettydate.Po ./$(DEPDIR)/recvbuff.Po \
++	./$(DEPDIR)/refidsmear.Po ./$(DEPDIR)/refnumtoa.Po \
++	./$(DEPDIR)/snprintf.Po ./$(DEPDIR)/socket.Po \
++	./$(DEPDIR)/socktoa.Po ./$(DEPDIR)/socktohost.Po \
++	./$(DEPDIR)/ssl_init.Po ./$(DEPDIR)/statestr.Po \
++	./$(DEPDIR)/strdup.Po ./$(DEPDIR)/strl_obsd.Po \
++	./$(DEPDIR)/syssignal.Po ./$(DEPDIR)/systime.Po \
++	./$(DEPDIR)/systime_s.Po ./$(DEPDIR)/timespecops.Po \
++	./$(DEPDIR)/timetoa.Po ./$(DEPDIR)/timevalops.Po \
++	./$(DEPDIR)/timexsup.Po ./$(DEPDIR)/uglydate.Po \
++	./$(DEPDIR)/vint64ops.Po ./$(DEPDIR)/work_fork.Po \
++	./$(DEPDIR)/work_thread.Po ./$(DEPDIR)/xsbprintf.Po \
++	./$(DEPDIR)/ymd2yd.Po lib/isc/$(DEPDIR)/assertions.Po \
 +	lib/isc/$(DEPDIR)/backtrace-emptytbl.Po \
 +	lib/isc/$(DEPDIR)/backtrace.Po lib/isc/$(DEPDIR)/buffer.Po \
 +	lib/isc/$(DEPDIR)/error.Po lib/isc/$(DEPDIR)/event.Po \
 +	lib/isc/$(DEPDIR)/inet_ntop.Po lib/isc/$(DEPDIR)/inet_pton.Po \
 +	lib/isc/$(DEPDIR)/lib.Po lib/isc/$(DEPDIR)/log.Po \
 +	lib/isc/$(DEPDIR)/md5.Po lib/isc/$(DEPDIR)/netaddr.Po \
 +	lib/isc/$(DEPDIR)/netscope.Po lib/isc/$(DEPDIR)/ondestroy.Po \
 +	lib/isc/$(DEPDIR)/random.Po lib/isc/$(DEPDIR)/result.Po \
 +	lib/isc/$(DEPDIR)/sha1.Po lib/isc/$(DEPDIR)/sockaddr.Po \
 +	lib/isc/$(DEPDIR)/task.Po lib/isc/$(DEPDIR)/tsmemcmp.Po \
 +	lib/isc/nls/$(DEPDIR)/msgcat.Po \
 +	lib/isc/nothreads/$(DEPDIR)/condition.Po \
 +	lib/isc/nothreads/$(DEPDIR)/thread.Po \
 +	lib/isc/pthreads/$(DEPDIR)/condition.Po \
 +	lib/isc/pthreads/$(DEPDIR)/mutex.Po \
 +	lib/isc/pthreads/$(DEPDIR)/thread.Po \
 +	lib/isc/unix/$(DEPDIR)/dir.Po \
 +	lib/isc/unix/$(DEPDIR)/errno2result.Po \
 +	lib/isc/unix/$(DEPDIR)/file.Po \
 +	lib/isc/unix/$(DEPDIR)/interfaceiter.Po \
 +	lib/isc/unix/$(DEPDIR)/net.Po lib/isc/unix/$(DEPDIR)/stdio.Po \
 +	lib/isc/unix/$(DEPDIR)/stdtime.Po \
 +	lib/isc/unix/$(DEPDIR)/strerror.Po \
 +	lib/isc/unix/$(DEPDIR)/time.Po
 +am__mv = mv -f
 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 +AM_V_lt = $(am__v_lt_@AM_V@)
 +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 +am__v_lt_0 = --silent
 +am__v_lt_1 = 
 +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 +	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 +	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 +	$(AM_CFLAGS) $(CFLAGS)
 +AM_V_CC = $(am__v_CC_@AM_V@)
 +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 +am__v_CC_0 = @echo "  CC      " $@;
 +am__v_CC_1 = 
 +CCLD = $(CC)
 +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 +	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 +am__v_CCLD_0 = @echo "  CCLD    " $@;
 +am__v_CCLD_1 = 
 +SOURCES = $(libntp_a_SOURCES) $(EXTRA_libntp_a_SOURCES) \
 +	$(libntpsim_a_SOURCES)
 +DIST_SOURCES = $(am__libntp_a_SOURCES_DIST) $(EXTRA_libntp_a_SOURCES) \
 +	$(am__libntpsim_a_SOURCES_DIST)
 +am__can_run_installinfo = \
 +  case $$AM_UPDATE_INFO_DIR in \
 +    n|no|NO) false;; \
 +    *) (install-info --version) >/dev/null 2>&1;; \
 +  esac
 +HEADERS = $(noinst_HEADERS)
 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 +# Read a list of newline-separated strings from the standard input,
 +# and print each of them once, without duplicates.  Input order is
 +# *not* preserved.
 +am__uniquify_input = $(AWK) '\
 +  BEGIN { nonempty = 0; } \
 +  { items[$$0] = 1; nonempty = 1; } \
 +  END { if (nonempty) { for (i in items) print i; }; } \
 +'
 +# Make sure the list of sources is unique.  This is necessary because,
 +# e.g., the same source file might be shared among _SOURCES variables
 +# for different programs/libraries.
 +am__define_uniq_tagged_files = \
 +  list='$(am__tagged_files)'; \
 +  unique=`for i in $$list; do \
 +    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +  done | $(am__uniquify_input)`
 +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \
 +	$(top_srcdir)/includes.mf \
 +	$(top_srcdir)/sntp/libevent/build-aux/depcomp README
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +ALLOCA = @ALLOCA@
 +AMTAR = @AMTAR@
 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 +AR = @AR@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AWK = @AWK@
 +BUILD_THREAD = @BUILD_THREAD@
 +CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
 +CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
 +CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
 +CALC_TICKADJ_MS = @CALC_TICKADJ_MS@
 +CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
 +CC = @CC@
 +CCDEPMODE = @CCDEPMODE@
 +CC_NOFORMAT = @CC_NOFORMAT@
 +CFLAGS = @CFLAGS@
 +CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@
 +CFLAGS_NTP = @CFLAGS_NTP@
 +CHUTEST = @CHUTEST@
 +CONFIG_SHELL = @CONFIG_SHELL@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CPPFLAGS_LIBEVENT = @CPPFLAGS_LIBEVENT@
 +CPPFLAGS_NTP = @CPPFLAGS_NTP@
 +CSCOPE = @CSCOPE@
 +CTAGS = @CTAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DCFD = @DCFD@
 +DEFS = @DEFS@
 +DEPDIR = @DEPDIR@
 +DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EDITLINE_LIBS = @EDITLINE_LIBS@
 +EGREP = @EGREP@
 +ETAGS = @ETAGS@
 +EXEEXT = @EXEEXT@
 +FGREP = @FGREP@
 +GREP = @GREP@
 +HAVE_INLINE = @HAVE_INLINE@
 +HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 +HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 +HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +LD = @LD@
 +LDADD_LIBEVENT = @LDADD_LIBEVENT@
 +LDADD_LIBNTP = @LDADD_LIBNTP@
 +LDADD_LIBUTIL = @LDADD_LIBUTIL@
 +LDADD_NLIST = @LDADD_NLIST@
 +LDADD_NTP = @LDADD_NTP@
 +LDFLAGS = @LDFLAGS@
 +LDFLAGS_NTP = @LDFLAGS_NTP@
 +LIBISC_PTHREADS_NOTHREADS = @LIBISC_PTHREADS_NOTHREADS@
 +LIBM = @LIBM@
 +LIBOBJS = @LIBOBJS@
 +LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@
 +LIBOPTS_DIR = @LIBOPTS_DIR@
 +LIBOPTS_LDADD = @LIBOPTS_LDADD@
 +LIBPARSE = @LIBPARSE@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIBTOOL_DEPS = @LIBTOOL_DEPS@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LSCF = @LSCF@
 +LTHREAD_LIBS = @LTHREAD_LIBS@
 +LTLIBOBJS = @LTLIBOBJS@
 +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAKEINFO = @MAKEINFO@
 +MAKE_ADJTIMED = @MAKE_ADJTIMED@
 +MAKE_CHECK_LAYOUT = @MAKE_CHECK_LAYOUT@
 +MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 +MAKE_LIBNTPSIM = @MAKE_LIBNTPSIM@
 +MAKE_LIBPARSE = @MAKE_LIBPARSE@
 +MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 +MAKE_NTPDSIM = @MAKE_NTPDSIM@
 +MAKE_NTPSNMPD = @MAKE_NTPSNMPD@
 +MAKE_NTPTIME = @MAKE_NTPTIME@
 +MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 +MAKE_TICKADJ = @MAKE_TICKADJ@
 +MAKE_TIMETRIM = @MAKE_TIMETRIM@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
 +MANTAGFMT = @MANTAGFMT@
 +MKDIR_P = @MKDIR_P@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +NTPDATE_DB = @NTPDATE_DB@
 +NTPDATE_DL = @NTPDATE_DL@
 +NTPDATE_DS = @NTPDATE_DS@
 +NTPDATE_MS = @NTPDATE_MS@
 +NTPDATE_NI = @NTPDATE_NI@
 +NTPDC_DB = @NTPDC_DB@
 +NTPDC_DL = @NTPDC_DL@
 +NTPDC_DS = @NTPDC_DS@
 +NTPDC_MS = @NTPDC_MS@
 +NTPDC_NI = @NTPDC_NI@
 +NTPDSIM_DB = @NTPDSIM_DB@
 +NTPDSIM_DL = @NTPDSIM_DL@
 +NTPDSIM_DS = @NTPDSIM_DS@
 +NTPDSIM_MS = @NTPDSIM_MS@
 +NTPDSIM_NI = @NTPDSIM_NI@
 +NTPD_DB = @NTPD_DB@
 +NTPD_DL = @NTPD_DL@
 +NTPD_DS = @NTPD_DS@
 +NTPD_MS = @NTPD_MS@
 +NTPD_NI = @NTPD_NI@
 +NTPQ_DB = @NTPQ_DB@
 +NTPQ_DL = @NTPQ_DL@
 +NTPQ_DS = @NTPQ_DS@
 +NTPQ_MS = @NTPQ_MS@
 +NTPQ_NI = @NTPQ_NI@
 +NTPSNMPD_DB = @NTPSNMPD_DB@
 +NTPSNMPD_DL = @NTPSNMPD_DL@
 +NTPSNMPD_DS = @NTPSNMPD_DS@
 +NTPSNMPD_MS = @NTPSNMPD_MS@
 +NTPSNMPD_NI = @NTPSNMPD_NI@
 +NTPSWEEP_DB = @NTPSWEEP_DB@
 +NTPSWEEP_DL = @NTPSWEEP_DL@
 +NTPSWEEP_DS = @NTPSWEEP_DS@
 +NTPSWEEP_MS = @NTPSWEEP_MS@
 +NTPSWEEP_NI = @NTPSWEEP_NI@
 +NTPTIME_DB = @NTPTIME_DB@
 +NTPTIME_DL = @NTPTIME_DL@
 +NTPTIME_DS = @NTPTIME_DS@
 +NTPTIME_MS = @NTPTIME_MS@
 +NTPTIME_NI = @NTPTIME_NI@
 +NTPTRACE_DB = @NTPTRACE_DB@
 +NTPTRACE_DL = @NTPTRACE_DL@
 +NTPTRACE_DS = @NTPTRACE_DS@
 +NTPTRACE_MS = @NTPTRACE_MS@
 +NTPTRACE_NI = @NTPTRACE_NI@
 +NTP_HARD_CFLAGS = @NTP_HARD_CFLAGS@
 +NTP_HARD_CPPFLAGS = @NTP_HARD_CPPFLAGS@
 +NTP_HARD_LDFLAGS = @NTP_HARD_LDFLAGS@
 +NTP_KEYGEN_DB = @NTP_KEYGEN_DB@
 +NTP_KEYGEN_DL = @NTP_KEYGEN_DL@
 +NTP_KEYGEN_DS = @NTP_KEYGEN_DS@
 +NTP_KEYGEN_MS = @NTP_KEYGEN_MS@
 +NTP_KEYGEN_NI = @NTP_KEYGEN_NI@
 +NTP_KEYSDIR = @NTP_KEYSDIR@
*** 7236 LINES SKIPPED ***