git: a466cc55373f - main - ntp: import ntp-4.2.8p16

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Thu, 01 Jun 2023 14:30:30 UTC
The branch main has been updated by cy:

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

commit a466cc55373fc3cf86837f09da729535b57e69a1
Merge: e32221a15f08 26fd3d5616df
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-06-01 14:04:37 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-06-01 14:04:37 +0000

    ntp: import ntp-4.2.8p16
    
    Security:       NtpBUg3767, NtpBug3808, NtpBug3807 (CVE-2023-26555)
    MFC after:      immediately

 contrib/ntp/COPYRIGHT                              |   201 +-
 contrib/ntp/ChangeLog                              |   114 +-
 contrib/ntp/CommitLog                              |  5757 +++++-
 contrib/ntp/Makefile.am                            |     1 -
 contrib/ntp/Makefile.in                            |    51 +-
 contrib/ntp/NEWS                                   |   123 +
 contrib/ntp/aclocal.m4                             |   340 +-
 contrib/ntp/adjtimed/Makefile.am                   |     3 +-
 contrib/ntp/adjtimed/Makefile.in                   |    96 +-
 contrib/ntp/check-libntp.mf                        |    14 +
 contrib/ntp/check-libntpd.mf                       |    19 +
 contrib/ntp/check-libunity.mf                      |    13 +
 contrib/ntp/check-scm-rev.mf                       |     8 +
 contrib/ntp/clockstuff/Makefile.am                 |     3 +-
 contrib/ntp/clockstuff/Makefile.in                 |   103 +-
 contrib/ntp/config.h.in                            |   141 +-
 contrib/ntp/configure                              | 17430 ++++++++++---------
 contrib/ntp/configure.ac                           |    70 +-
 contrib/ntp/deps-ver                               |     2 +-
 contrib/ntp/depsver.mf                             |     9 +-
 contrib/ntp/html/authentic.html                    |    15 +-
 contrib/ntp/html/clockopt.html                     |    39 +
 contrib/ntp/html/copyright.html                    |     9 +-
 contrib/ntp/html/drivers/driver20.html             |    11 +-
 contrib/ntp/html/drivers/driver46.html             |    31 +-
 contrib/ntp/html/miscopt.html                      |     9 +-
 contrib/ntp/html/ntpdc.html                        |     3 +-
 contrib/ntp/html/ntpq.html                         |     3 +-
 contrib/ntp/html/scripts/clockopt.txt              |     1 +
 contrib/ntp/include/Makefile.in                    |    28 +-
 contrib/ntp/include/isc/Makefile.in                |    26 +-
 contrib/ntp/include/ntp.h                          |     1 +
 contrib/ntp/include/ntp_config.h                   |     1 +
 contrib/ntp/include/ntp_fp.h                       |     4 +-
 contrib/ntp/include/ntp_random.h                   |     1 +
 contrib/ntp/include/ntp_refclock.h                 |    13 +-
 contrib/ntp/include/ntp_stdlib.h                   |    15 +-
 contrib/ntp/include/ntp_types.h                    |    11 +-
 contrib/ntp/include/ntpd.h                         |     1 +
 contrib/ntp/include/ssl_applink.c                  |     2 +-
 contrib/ntp/include/vint64ops.h                    |     2 +-
 contrib/ntp/includes.mf                            |     6 +-
 contrib/ntp/kernel/Makefile.in                     |    28 +-
 contrib/ntp/kernel/sys/Makefile.in                 |    26 +-
 contrib/ntp/lib/isc/Atffile                        |     5 -
 contrib/ntp/lib/isc/alpha/include/isc/atomic.h     |   184 -
 contrib/ntp/lib/isc/api                            |     8 -
 contrib/ntp/lib/isc/app_api.c                      |   136 -
 contrib/ntp/lib/isc/base32.c                       |   373 -
 contrib/ntp/lib/isc/base64.c                       |   252 -
 contrib/ntp/lib/isc/bitstring.c                    |   127 -
 contrib/ntp/lib/isc/bufferlist.c                   |    64 -
 contrib/ntp/lib/isc/commandline.c                  |   225 -
 contrib/ntp/lib/isc/entropy.c                      |  1277 --
 contrib/ntp/lib/isc/fsaccess.c                     |   102 -
 contrib/ntp/lib/isc/hash.c                         |   404 -
 contrib/ntp/lib/isc/heap.c                         |   265 -
 contrib/ntp/lib/isc/hex.c                          |   201 -
 contrib/ntp/lib/isc/hmacmd5.c                      |   149 -
 contrib/ntp/lib/isc/hmacsha.c                      |   594 -
 contrib/ntp/lib/isc/httpd.c                        |  1028 --
 contrib/ntp/lib/isc/ia64/include/isc/atomic.h      |   100 -
 contrib/ntp/lib/isc/include/isc/base32.h           |   128 -
 contrib/ntp/lib/isc/include/isc/base64.h           |    99 -
 contrib/ntp/lib/isc/include/isc/bitstring.h        |   157 -
 contrib/ntp/lib/isc/include/isc/bufferlist.h       |    86 -
 contrib/ntp/lib/isc/include/isc/commandline.h      |    50 -
 contrib/ntp/lib/isc/include/isc/entropy.h          |   314 -
 contrib/ntp/lib/isc/include/isc/fsaccess.h         |   178 -
 contrib/ntp/lib/isc/include/isc/heap.h             |   170 -
 contrib/ntp/lib/isc/include/isc/hex.h              |    98 -
 contrib/ntp/lib/isc/include/isc/hmacmd5.h          |    72 -
 contrib/ntp/lib/isc/include/isc/hmacsha.h          |   169 -
 contrib/ntp/lib/isc/include/isc/httpd.h            |    64 -
 contrib/ntp/lib/isc/include/isc/ipv6.h             |   148 -
 contrib/ntp/lib/isc/include/isc/iterated_hash.h    |    47 -
 contrib/ntp/lib/isc/include/isc/lex.h              |   431 -
 contrib/ntp/lib/isc/include/isc/lfsr.h             |   130 -
 contrib/ntp/lib/isc/include/isc/mem.h              |   750 -
 contrib/ntp/lib/isc/include/isc/mutexblock.h       |    71 -
 contrib/ntp/lib/isc/include/isc/os.h               |    38 -
 contrib/ntp/lib/isc/include/isc/parseint.h         |    64 -
 contrib/ntp/lib/isc/include/isc/platform.h.in      |   367 -
 contrib/ntp/lib/isc/include/isc/portset.h          |   141 -
 contrib/ntp/lib/isc/include/isc/queue.h            |   100 -
 contrib/ntp/lib/isc/include/isc/quota.h            |   119 -
 contrib/ntp/lib/isc/include/isc/radix.h            |   240 -
 contrib/ntp/lib/isc/include/isc/ratelimiter.h      |   134 -
 contrib/ntp/lib/isc/include/isc/refcount.h         |   233 -
 contrib/ntp/lib/isc/include/isc/resource.h         |    97 -
 contrib/ntp/lib/isc/include/isc/rwlock.h           |   135 -
 contrib/ntp/lib/isc/include/isc/serial.h           |    75 -
 contrib/ntp/lib/isc/include/isc/sha2.h             |   145 -
 contrib/ntp/lib/isc/include/isc/stats.h            |   121 -
 contrib/ntp/lib/isc/include/isc/stdlib.h           |    40 -
 contrib/ntp/lib/isc/include/isc/symtab.h           |   139 -
 contrib/ntp/lib/isc/include/isc/taskpool.h         |   157 -
 contrib/ntp/lib/isc/include/isc/version.h          |    28 -
 contrib/ntp/lib/isc/inet_aton.c                    |   195 -
 contrib/ntp/lib/isc/iterated_hash.c                |    48 -
 contrib/ntp/lib/isc/lex.c                          |   959 -
 contrib/ntp/lib/isc/lfsr.c                         |   161 -
 contrib/ntp/lib/isc/mem.c                          |  2477 ---
 contrib/ntp/lib/isc/mem_api.c                      |   303 -
 contrib/ntp/lib/isc/mips/include/isc/atomic.h      |    98 -
 contrib/ntp/lib/isc/mutexblock.c                   |    58 -
 contrib/ntp/lib/isc/noatomic/include/isc/atomic.h  |    24 -
 contrib/ntp/lib/isc/nothreads/mutex.c              |    25 -
 contrib/ntp/lib/isc/parseint.c                     |    72 -
 contrib/ntp/lib/isc/portset.c                      |   143 -
 contrib/ntp/lib/isc/powerpc/include/isc/atomic.h   |   197 -
 contrib/ntp/lib/isc/print.c                        |   624 -
 contrib/ntp/lib/isc/quota.c                        |   101 -
 contrib/ntp/lib/isc/radix.c                        |   706 -
 contrib/ntp/lib/isc/ratelimiter.c                  |   328 -
 contrib/ntp/lib/isc/refcount.c                     |    37 -
 contrib/ntp/lib/isc/region.c                       |    45 -
 contrib/ntp/lib/isc/rwlock.c                       |   809 -
 contrib/ntp/lib/isc/serial.c                       |    59 -
 contrib/ntp/lib/isc/sha2.c                         |  1449 --
 contrib/ntp/lib/isc/socket_api.c                   |   231 -
 contrib/ntp/lib/isc/sparc64/include/isc/atomic.h   |   127 -
 contrib/ntp/lib/isc/stats.c                        |   326 -
 contrib/ntp/lib/isc/string.c                       |   271 -
 contrib/ntp/lib/isc/strtoul.c                      |   129 -
 contrib/ntp/lib/isc/symtab.c                       |   301 -
 contrib/ntp/lib/isc/task_api.c                     |   244 -
 contrib/ntp/lib/isc/taskpool.c                     |   185 -
 contrib/ntp/lib/isc/tests/Atffile                  |     5 -
 contrib/ntp/lib/isc/tests/hash_test.c              |  1805 --
 contrib/ntp/lib/isc/tests/isctest.c                |   178 -
 contrib/ntp/lib/isc/tests/isctest.h                |    57 -
 contrib/ntp/lib/isc/tests/queue_test.c             |   144 -
 contrib/ntp/lib/isc/tests/socket_test.c            |   255 -
 contrib/ntp/lib/isc/tests/symtab_test.c            |   147 -
 contrib/ntp/lib/isc/tests/task_test.c              |   416 -
 contrib/ntp/lib/isc/tests/taskpool_test.c          |   211 -
 contrib/ntp/lib/isc/timer.c                        |  1072 --
 contrib/ntp/lib/isc/timer_api.c                    |   144 -
 contrib/ntp/lib/isc/timer_p.h                      |    31 -
 contrib/ntp/lib/isc/unix/app.c                     |   946 -
 contrib/ntp/lib/isc/unix/entropy.c                 |   605 -
 contrib/ntp/lib/isc/unix/fsaccess.c                |    93 -
 contrib/ntp/lib/isc/unix/include/isc/keyboard.h    |    52 -
 contrib/ntp/lib/isc/unix/include/isc/netdb.h       |    57 -
 contrib/ntp/lib/isc/unix/include/isc/syslog.h      |    47 -
 contrib/ntp/lib/isc/unix/ipv6.c                    |    27 -
 contrib/ntp/lib/isc/unix/keyboard.c                |   126 -
 contrib/ntp/lib/isc/unix/os.c                      |    94 -
 contrib/ntp/lib/isc/unix/resource.c                |   231 -
 contrib/ntp/lib/isc/unix/socket.c                  |  6011 -------
 contrib/ntp/lib/isc/unix/socket_p.h                |    33 -
 contrib/ntp/lib/isc/unix/syslog.c                  |    84 -
 contrib/ntp/lib/isc/version.c                      |    28 -
 contrib/ntp/lib/isc/win32/DLLMain.c                |    58 -
 contrib/ntp/lib/isc/win32/app.c                    |   260 -
 contrib/ntp/lib/isc/win32/dir.c                    |   312 -
 contrib/ntp/lib/isc/win32/entropy.c                |   307 -
 contrib/ntp/lib/isc/win32/errno2result.c           |   113 -
 contrib/ntp/lib/isc/win32/errno2result.h           |    40 -
 contrib/ntp/lib/isc/win32/file.c                   |   619 -
 contrib/ntp/lib/isc/win32/fsaccess.c               |   375 -
 .../ntp/lib/isc/win32/include/isc/bind_registry.h  |    50 -
 contrib/ntp/lib/isc/win32/include/isc/bindevt.h    |    91 -
 contrib/ntp/lib/isc/win32/include/isc/keyboard.h   |    47 -
 contrib/ntp/lib/isc/win32/include/isc/netdb.h      |    54 -
 contrib/ntp/lib/isc/win32/include/isc/ntgroups.h   |    35 -
 contrib/ntp/lib/isc/win32/include/isc/ntpaths.h    |    72 -
 contrib/ntp/lib/isc/win32/include/isc/syslog.h     |    45 -
 contrib/ntp/lib/isc/win32/ipv6.c                   |    27 -
 contrib/ntp/lib/isc/win32/keyboard.c               |    89 -
 contrib/ntp/lib/isc/win32/libgen.h                 |    25 -
 contrib/ntp/lib/isc/win32/libisc.def               |   583 -
 contrib/ntp/lib/isc/win32/libisc.dsp               |   802 -
 contrib/ntp/lib/isc/win32/libisc.dsw               |    29 -
 contrib/ntp/lib/isc/win32/libisc.mak               |  2055 ---
 contrib/ntp/lib/isc/win32/netdb.h                  |   187 -
 contrib/ntp/lib/isc/win32/ntgroups.c               |   186 -
 contrib/ntp/lib/isc/win32/ntpaths.c                |   147 -
 contrib/ntp/lib/isc/win32/os.c                     |    45 -
 contrib/ntp/lib/isc/win32/resource.c               |    72 -
 contrib/ntp/lib/isc/win32/socket.c                 |  3967 -----
 contrib/ntp/lib/isc/win32/stdio.c                  |   117 -
 contrib/ntp/lib/isc/win32/syslog.c                 |   181 -
 contrib/ntp/lib/isc/win32/syslog.h                 |    76 -
 contrib/ntp/lib/isc/win32/unistd.h                 |    60 -
 contrib/ntp/lib/isc/win32/version.c                |    28 -
 contrib/ntp/lib/isc/x86_32/include/isc/atomic.h    |   176 -
 contrib/ntp/lib/isc/x86_64/include/isc/atomic.h    |   123 -
 contrib/ntp/libntp/Makefile.am                     |   195 +-
 contrib/ntp/libntp/Makefile.in                     |  1526 +-
 contrib/ntp/libntp/a_md5encrypt.c                  |    32 +-
 contrib/ntp/libntp/authkeys.c                      |   112 +-
 contrib/ntp/libntp/authreadkeys.c                  |    79 +-
 contrib/ntp/libntp/authusekey.c                    |    16 +-
 contrib/ntp/libntp/caltontp.c                      |    34 +-
 contrib/ntp/{ => libntp}/lib/isc/assertions.c      |     0
 .../ntp/{ => libntp}/lib/isc/backtrace-emptytbl.c  |     0
 contrib/ntp/{ => libntp}/lib/isc/backtrace.c       |     0
 contrib/ntp/{ => libntp}/lib/isc/buffer.c          |     0
 contrib/ntp/{ => libntp}/lib/isc/error.c           |     0
 contrib/ntp/{ => libntp}/lib/isc/event.c           |     0
 contrib/ntp/{ => libntp}/lib/isc/include/isc/app.h |     0
 .../{ => libntp}/lib/isc/include/isc/assertions.h  |     0
 .../{ => libntp}/lib/isc/include/isc/backtrace.h   |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/bind9.h   |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/boolean.h |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/buffer.h  |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/error.h   |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/event.h   |     0
 .../{ => libntp}/lib/isc/include/isc/eventclass.h  |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/file.h    |     0
 .../{ => libntp}/lib/isc/include/isc/formatcheck.h |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/hash.h    |     0
 .../lib/isc/include/isc/interfaceiter.h            |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/lang.h    |     0
 contrib/ntp/{ => libntp}/lib/isc/include/isc/lib.h |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/list.h    |     0
 contrib/ntp/{ => libntp}/lib/isc/include/isc/log.h |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/magic.h   |     0
 contrib/ntp/{ => libntp}/lib/isc/include/isc/md5.h |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/msgcat.h  |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/msgs.h    |     0
 .../{ => libntp}/lib/isc/include/isc/namespace.h   |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/netaddr.h |     0
 .../{ => libntp}/lib/isc/include/isc/netscope.h    |     0
 .../{ => libntp}/lib/isc/include/isc/ondestroy.h   |     0
 .../{ => libntp}/lib/isc/include/isc/platform.h    |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/print.h   |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/random.h  |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/region.h  |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/result.h  |     0
 .../{ => libntp}/lib/isc/include/isc/resultclass.h |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/sha1.h    |     0
 .../{ => libntp}/lib/isc/include/isc/sockaddr.h    |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/socket.h  |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/stdio.h   |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/string.h  |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/task.h    |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/timer.h   |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/types.h   |     0
 .../ntp/{ => libntp}/lib/isc/include/isc/util.h    |     0
 contrib/ntp/{ => libntp}/lib/isc/include/isc/xml.h |     0
 contrib/ntp/{ => libntp}/lib/isc/inet_ntop.c       |     0
 contrib/ntp/{ => libntp}/lib/isc/inet_pton.c       |     0
 contrib/ntp/{ => libntp}/lib/isc/lib.c             |     0
 contrib/ntp/{ => libntp}/lib/isc/log.c             |     0
 contrib/ntp/{ => libntp}/lib/isc/md5.c             |     0
 contrib/ntp/{ => libntp}/lib/isc/netaddr.c         |     0
 contrib/ntp/{ => libntp}/lib/isc/netscope.c        |     0
 contrib/ntp/{ => libntp}/lib/isc/nls/msgcat.c      |     0
 .../ntp/{ => libntp}/lib/isc/nothreads/condition.c |     0
 .../lib/isc/nothreads/include/isc/condition.h      |     0
 .../lib/isc/nothreads/include/isc/mutex.h          |     0
 .../lib/isc/nothreads/include/isc/once.h           |     0
 .../lib/isc/nothreads/include/isc/thread.h         |     0
 .../ntp/{ => libntp}/lib/isc/nothreads/thread.c    |     0
 contrib/ntp/{ => libntp}/lib/isc/ondestroy.c       |     0
 .../ntp/{ => libntp}/lib/isc/pthreads/condition.c  |     0
 .../lib/isc/pthreads/include/isc/condition.h       |     0
 .../lib/isc/pthreads/include/isc/mutex.h           |     0
 .../lib/isc/pthreads/include/isc/once.h            |     0
 .../lib/isc/pthreads/include/isc/thread.h          |     0
 contrib/ntp/{ => libntp}/lib/isc/pthreads/mutex.c  |     0
 contrib/ntp/{ => libntp}/lib/isc/pthreads/thread.c |     0
 contrib/ntp/{ => libntp}/lib/isc/random.c          |     0
 contrib/ntp/{ => libntp}/lib/isc/result.c          |     0
 contrib/ntp/{ => libntp}/lib/isc/sha1.c            |     0
 contrib/ntp/{ => libntp}/lib/isc/sockaddr.c        |     0
 contrib/ntp/{ => libntp}/lib/isc/task.c            |     0
 contrib/ntp/{ => libntp}/lib/isc/task_p.h          |     0
 contrib/ntp/{ => libntp}/lib/isc/tsmemcmp.c        |     0
 contrib/ntp/{ => libntp}/lib/isc/unix/dir.c        |     0
 .../ntp/{ => libntp}/lib/isc/unix/errno2result.c   |     0
 .../ntp/{ => libntp}/lib/isc/unix/errno2result.h   |     0
 contrib/ntp/{ => libntp}/lib/isc/unix/file.c       |     0
 .../{ => libntp}/lib/isc/unix/ifiter_getifaddrs.c  |     0
 .../ntp/{ => libntp}/lib/isc/unix/ifiter_ioctl.c   |     0
 .../ntp/{ => libntp}/lib/isc/unix/ifiter_sysctl.c  |     0
 .../{ => libntp}/lib/isc/unix/include/isc/dir.h    |     0
 .../{ => libntp}/lib/isc/unix/include/isc/int.h    |     0
 .../{ => libntp}/lib/isc/unix/include/isc/net.h    |     0
 .../{ => libntp}/lib/isc/unix/include/isc/offset.h |     0
 .../{ => libntp}/lib/isc/unix/include/isc/stat.h   |     0
 .../lib/isc/unix/include/isc/stdtime.h             |     0
 .../lib/isc/unix/include/isc/strerror.h            |     0
 .../{ => libntp}/lib/isc/unix/include/isc/time.h   |     0
 .../ntp/{ => libntp}/lib/isc/unix/interfaceiter.c  |     0
 contrib/ntp/{ => libntp}/lib/isc/unix/net.c        |     0
 contrib/ntp/{ => libntp}/lib/isc/unix/stdio.c      |     0
 contrib/ntp/{ => libntp}/lib/isc/unix/stdtime.c    |     0
 contrib/ntp/{ => libntp}/lib/isc/unix/strerror.c   |     0
 contrib/ntp/{ => libntp}/lib/isc/unix/time.c       |     0
 contrib/ntp/{ => libntp}/lib/isc/win32/condition.c |     0
 .../lib/isc/win32/include/isc/condition.h          |     0
 .../{ => libntp}/lib/isc/win32/include/isc/dir.h   |     0
 .../{ => libntp}/lib/isc/win32/include/isc/int.h   |     0
 .../{ => libntp}/lib/isc/win32/include/isc/ipv6.h  |     0
 .../{ => libntp}/lib/isc/win32/include/isc/mutex.h |     0
 .../{ => libntp}/lib/isc/win32/include/isc/net.h   |     0
 .../lib/isc/win32/include/isc/offset.h             |     0
 .../{ => libntp}/lib/isc/win32/include/isc/once.h  |     0
 .../lib/isc/win32/include/isc/platform.h           |     0
 .../{ => libntp}/lib/isc/win32/include/isc/stat.h  |     0
 .../lib/isc/win32/include/isc/stdtime.h            |     0
 .../lib/isc/win32/include/isc/strerror.h           |     0
 .../lib/isc/win32/include/isc/thread.h             |     0
 .../{ => libntp}/lib/isc/win32/include/isc/time.h  |     0
 .../lib/isc/win32/include/isc/win32os.h            |     0
 .../ntp/{ => libntp}/lib/isc/win32/interfaceiter.c |     0
 contrib/ntp/{ => libntp}/lib/isc/win32/net.c       |     0
 contrib/ntp/{ => libntp}/lib/isc/win32/once.c      |     0
 contrib/ntp/{ => libntp}/lib/isc/win32/stdtime.c   |     0
 contrib/ntp/{ => libntp}/lib/isc/win32/strerror.c  |     2 +-
 contrib/ntp/{ => libntp}/lib/isc/win32/thread.c    |     0
 contrib/ntp/{ => libntp}/lib/isc/win32/time.c      |     0
 contrib/ntp/{ => libntp}/lib/isc/win32/win32os.c   |     0
 contrib/ntp/libntp/mktime.c                        |     4 +-
 contrib/ntp/libntp/mstolfp.c                       |   110 +-
 contrib/ntp/libntp/msyslog.c                       |     2 +-
 contrib/ntp/libntp/ntp_crypto_rnd.c                |    81 +-
 contrib/ntp/libntp/ntp_random.c                    |    15 +
 contrib/ntp/libntp/ntp_realpath.c                  |   279 +
 contrib/ntp/libntp/numtoa.c                        |    16 +
 contrib/ntp/libntp/recvbuff.c                      |     9 +-
 contrib/ntp/libntp/refnumtoa.c                     |     2 +-
 contrib/ntp/libntp/socktoa.c                       |     2 +-
 contrib/ntp/libntp/systime.c                       |     5 +-
 contrib/ntp/libntp/vint64ops.c                     |    27 +-
 contrib/ntp/libntp/work_thread.c                   |    35 +-
 contrib/ntp/libntp/xsbprintf.c                     |     6 +-
 contrib/ntp/libparse/Makefile.am                   |     7 +-
 contrib/ntp/libparse/Makefile.in                   |   246 +-
 contrib/ntp/libparse/clk_wharton.c                 |     7 -
 contrib/ntp/ntpd/Makefile.am                       |   112 +-
 contrib/ntp/ntpd/Makefile.in                       |   672 +-
 contrib/ntp/ntpd/cmd_args.c                        |     6 +-
 contrib/ntp/ntpd/invoke-ntp.conf.texi              |    32 +-
 contrib/ntp/ntpd/invoke-ntp.keys.texi              |     2 +-
 contrib/ntp/ntpd/invoke-ntpd.texi                  |     8 +-
 contrib/ntp/ntpd/keyword-gen-utd                   |     2 +-
 contrib/ntp/ntpd/keyword-gen.c                     |     4 +
 contrib/ntp/ntpd/ntp.conf.5man                     |    38 +-
 contrib/ntp/ntpd/ntp.conf.5mdoc                    |    40 +-
 contrib/ntp/ntpd/ntp.conf.def                      |    32 +-
 contrib/ntp/ntpd/ntp.conf.html                     |   219 +-
 contrib/ntp/ntpd/ntp.conf.man.in                   |    38 +-
 contrib/ntp/ntpd/ntp.conf.mdoc.in                  |    40 +-
 contrib/ntp/ntpd/ntp.keys.5man                     |     8 +-
 contrib/ntp/ntpd/ntp.keys.5mdoc                    |    10 +-
 contrib/ntp/ntpd/ntp.keys.html                     |    66 +-
 contrib/ntp/ntpd/ntp.keys.man.in                   |     8 +-
 contrib/ntp/ntpd/ntp.keys.mdoc.in                  |    10 +-
 contrib/ntp/ntpd/ntp_clockdev.c                    |   187 +
 contrib/ntp/ntpd/ntp_clockdev.h                    |    25 +
 contrib/ntp/ntpd/ntp_config.c                      |   222 +-
 contrib/ntp/ntpd/ntp_control.c                     |    14 +-
 contrib/ntp/ntpd/ntp_crypto.c                      |     8 +-
 contrib/ntp/ntpd/ntp_io.c                          |    58 +-
 contrib/ntp/ntpd/ntp_keyword.h                     |  2051 +--
 contrib/ntp/ntpd/ntp_leapsec.c                     |    15 +-
 contrib/ntp/ntpd/ntp_loopfilter.c                  |    12 +-
 contrib/ntp/ntpd/ntp_monitor.c                     |     8 +-
 contrib/ntp/ntpd/ntp_parser.c                      |  4281 ++---
 contrib/ntp/ntpd/ntp_parser.h                      |   823 +-
 contrib/ntp/ntpd/ntp_ppsdev.c                      |   459 +
 contrib/ntp/ntpd/ntp_proto.c                       |   124 +-
 contrib/ntp/ntpd/ntp_refclock.c                    |   136 +-
 contrib/ntp/ntpd/ntp_request.c                     |     2 +-
 contrib/ntp/ntpd/ntp_util.c                        |    90 +-
 contrib/ntp/ntpd/ntpd-opts.c                       |   251 +-
 contrib/ntp/ntpd/ntpd-opts.h                       |    21 +-
 contrib/ntp/ntpd/ntpd.1ntpdman                     |     8 +-
 contrib/ntp/ntpd/ntpd.1ntpdmdoc                    |     8 +-
 contrib/ntp/ntpd/ntpd.c                            |    13 +-
 contrib/ntp/ntpd/ntpd.html                         |   420 +-
 contrib/ntp/ntpd/ntpd.man.in                       |     8 +-
 contrib/ntp/ntpd/ntpd.mdoc.in                      |     8 +-
 contrib/ntp/ntpd/refclock_acts.c                   |    30 +-
 contrib/ntp/ntpd/refclock_arbiter.c                |    38 +-
 contrib/ntp/ntpd/refclock_arc.c                    |     2 +-
 contrib/ntp/ntpd/refclock_as2201.c                 |     7 +-
 contrib/ntp/ntpd/refclock_chronolog.c              |     2 +-
 contrib/ntp/ntpd/refclock_chu.c                    |     4 +-
 contrib/ntp/ntpd/refclock_dumbclock.c              |    10 +-
 contrib/ntp/ntpd/refclock_fg.c                     |     6 +-
 contrib/ntp/ntpd/refclock_gpsdjson.c               |    47 +-
 contrib/ntp/ntpd/refclock_heath.c                  |     4 +-
 contrib/ntp/ntpd/refclock_hopfser.c                |     8 +-
 contrib/ntp/ntpd/refclock_hpgps.c                  |    18 +-
 contrib/ntp/ntpd/refclock_jjy.c                    |     2 +-
 contrib/ntp/ntpd/refclock_jupiter.c                |     2 +-
 contrib/ntp/ntpd/refclock_leitch.c                 |     2 +-
 contrib/ntp/ntpd/refclock_mx4200.c                 |     2 +-
 contrib/ntp/ntpd/refclock_neoclock4x.c             |     2 +-
 contrib/ntp/ntpd/refclock_nmea.c                   |    71 +-
 contrib/ntp/ntpd/refclock_oncore.c                 |    25 +-
 contrib/ntp/ntpd/refclock_palisade.c               |    52 +-
 contrib/ntp/ntpd/refclock_parse.c                  |    20 +-
 contrib/ntp/ntpd/refclock_pst.c                    |     2 +-
 contrib/ntp/ntpd/refclock_ripencc.c                |     2 +-
 contrib/ntp/ntpd/refclock_true.c                   |    10 +-
 contrib/ntp/ntpd/refclock_ulink.c                  |     2 +-
 contrib/ntp/ntpd/refclock_wwvb.c                   |     2 +-
 contrib/ntp/ntpd/refclock_zyfer.c                  |     2 +-
 contrib/ntp/ntpdate/Makefile.am                    |    22 +-
 contrib/ntp/ntpdate/Makefile.in                    |   131 +-
 contrib/ntp/ntpdc/Makefile.am                      |    52 +-
 contrib/ntp/ntpdc/Makefile.in                      |   168 +-
 contrib/ntp/ntpdc/invoke-ntpdc.texi                |    17 +-
 contrib/ntp/ntpdc/ntpdc-opts.c                     |   351 +-
 contrib/ntp/ntpdc/ntpdc-opts.def                   |    10 +
 contrib/ntp/ntpdc/ntpdc-opts.h                     |    40 +-
 contrib/ntp/ntpdc/ntpdc.1ntpdcman                  |    14 +-
 contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc                 |    13 +-
 contrib/ntp/ntpdc/ntpdc.c                          |    26 +-
 contrib/ntp/ntpdc/ntpdc.html                       |   220 +-
 contrib/ntp/ntpdc/ntpdc.man.in                     |    14 +-
 contrib/ntp/ntpdc/ntpdc.mdoc.in                    |    13 +-
 contrib/ntp/ntpq/Makefile.am                       |    38 +-
 contrib/ntp/ntpq/Makefile.in                       |   190 +-
 contrib/ntp/ntpq/invoke-ntpq.texi                  |    20 +-
 contrib/ntp/ntpq/ntpq-opts.c                       |   367 +-
 contrib/ntp/ntpq/ntpq-opts.def                     |    10 +
 contrib/ntp/ntpq/ntpq-opts.h                       |    42 +-
 contrib/ntp/ntpq/ntpq-subs.c                       |    65 +-
 contrib/ntp/ntpq/ntpq.1ntpqman                     |    14 +-
 contrib/ntp/ntpq/ntpq.1ntpqmdoc                    |    13 +-
 contrib/ntp/ntpq/ntpq.c                            |   211 +-
 contrib/ntp/ntpq/ntpq.html                         |   379 +-
 contrib/ntp/ntpq/ntpq.man.in                       |    14 +-
 contrib/ntp/ntpq/ntpq.mdoc.in                      |    13 +-
 contrib/ntp/ntpsnmpd/Makefile.am                   |    12 +-
 contrib/ntp/ntpsnmpd/Makefile.in                   |   120 +-
 contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi          |     8 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c               |   251 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h               |    21 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman         |     8 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc        |     8 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd.c                    |     2 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd.html                 |    43 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd.man.in               |     8 +-
 contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in              |     8 +-
 contrib/ntp/packageinfo.sh                         |     2 +-
 contrib/ntp/parseutil/Makefile.in                  |   111 +-
 contrib/ntp/parseutil/dcfd.c                       |     8 +-
 contrib/ntp/ports/winnt/vs2015/mkver.props         |    25 +
 contrib/ntp/scripts/Makefile.am                    |    18 +-
 contrib/ntp/scripts/Makefile.in                    |    46 +-
 contrib/ntp/scripts/build/Makefile.in              |    24 +-
 contrib/ntp/scripts/calc_tickadj/Makefile.am       |    10 +-
 contrib/ntp/scripts/calc_tickadj/Makefile.in       |    39 +-
 contrib/ntp/scripts/calc_tickadj/calc_tickadj-opts |     4 +-
 .../calc_tickadj/calc_tickadj.1calc_tickadjman     |     4 +-
 .../calc_tickadj/calc_tickadj.1calc_tickadjmdoc    |     4 +-
 contrib/ntp/scripts/calc_tickadj/calc_tickadj.html |    83 +-
 .../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  |     4 +-
 contrib/ntp/scripts/invoke-plot_summary.texi       |     4 +-
 contrib/ntp/scripts/invoke-summary.texi            |     4 +-
 contrib/ntp/scripts/lib/Makefile.in                |    24 +-
 contrib/ntp/scripts/ntp-wait/Makefile.am           |    10 +-
 contrib/ntp/scripts/ntp-wait/Makefile.in           |    34 +-
 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         |   100 +-
 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.am           |    10 +-
 contrib/ntp/scripts/ntpsweep/Makefile.in           |    34 +-
 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         |   104 +-
 contrib/ntp/scripts/ntpsweep/ntpsweep.man.in       |     4 +-
 contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in      |     4 +-
 contrib/ntp/scripts/ntptrace/Makefile.am           |    10 +-
 contrib/ntp/scripts/ntptrace/Makefile.in           |    34 +-
 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         |    95 +-
 contrib/ntp/scripts/ntptrace/ntptrace.man.in       |     4 +-
 contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in      |     4 +-
 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              |   119 +-
 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                   |   107 +-
 contrib/ntp/scripts/summary.man.in                 |     4 +-
 contrib/ntp/scripts/summary.mdoc.in                |     4 +-
 contrib/ntp/scripts/update-leap/Makefile.am        |    10 +-
 contrib/ntp/scripts/update-leap/Makefile.in        |    34 +-
 .../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   |   128 +-
 contrib/ntp/scripts/update-leap/update-leap.man.in |     4 +-
 .../ntp/scripts/update-leap/update-leap.mdoc.in    |     4 +-
 contrib/ntp/scripts/update-leap/update-leap.sh     |     0
 contrib/ntp/sntp/COPYRIGHT                         |   201 +-
 contrib/ntp/sntp/Makefile.am                       |    54 +-
 contrib/ntp/sntp/Makefile.in                       |   233 +-
 contrib/ntp/sntp/aclocal.m4                        |   338 +-
 contrib/ntp/sntp/check-libntp.mf                   |    13 +-
 contrib/ntp/sntp/check-libsntp.mf                  |    13 +
 contrib/ntp/sntp/check-libunity.mf                 |    15 +
 contrib/ntp/sntp/config.h.in                       |   120 +-
 contrib/ntp/sntp/configure                         | 13036 +++++++-------
 contrib/ntp/sntp/configure.ac                      |    15 +-
 contrib/ntp/sntp/crypto.c                          |    26 +-
 contrib/ntp/sntp/deps-ver                          |     2 +-
 contrib/ntp/sntp/depsver.mf                        |     9 +-
 contrib/ntp/sntp/include/Makefile.in               |    17 +-
 contrib/ntp/sntp/include/autogen-version.def       |     2 +-
 contrib/ntp/sntp/include/copyright.def             |     4 +-
 contrib/ntp/sntp/include/version.def               |     2 +-
 contrib/ntp/sntp/include/version.texi              |     6 +-
 contrib/ntp/sntp/includes.mf                       |     6 +-
 contrib/ntp/sntp/invoke-sntp.texi                  |     8 +-
 contrib/ntp/sntp/libevent/CMakeLists.txt           |  1575 ++
 contrib/ntp/sntp/libevent/ChangeLog                |   760 +
 contrib/ntp/sntp/libevent/ChangeLog-1.4            |     2 +-
 contrib/ntp/sntp/libevent/ChangeLog-2.0            |     2 +-
 contrib/ntp/sntp/libevent/Doxyfile                 |    46 +-
 contrib/ntp/sntp/libevent/Makefile.am              |    79 +-
 contrib/ntp/sntp/libevent/Makefile.in              |  1747 +-
 contrib/ntp/sntp/libevent/README.md                |   487 +
 contrib/ntp/sntp/libevent/WIN32-Code/getopt.c      |   149 +
 contrib/ntp/sntp/libevent/WIN32-Code/getopt.h      |    33 +
 contrib/ntp/sntp/libevent/WIN32-Code/getopt_long.c |   234 +
 .../WIN32-Code/nmake/event2/event-config.h         |    26 +-
 contrib/ntp/sntp/libevent/aclocal.m4               |   224 +-
 contrib/ntp/sntp/libevent/arc4random.c             |    40 +-
 contrib/ntp/sntp/libevent/autogen.sh               |     7 +
 contrib/ntp/sntp/libevent/buffer.c                 |    90 +-
 contrib/ntp/sntp/libevent/buffer_iocp.c            |     1 +
 contrib/ntp/sntp/libevent/bufferevent-internal.h   |    76 +-
 contrib/ntp/sntp/libevent/bufferevent.c            |   149 +-
 contrib/ntp/sntp/libevent/bufferevent_async.c      |    66 +-
 contrib/ntp/sntp/libevent/bufferevent_filter.c     |   102 +-
 contrib/ntp/sntp/libevent/bufferevent_openssl.c    |   338 +-
 contrib/ntp/sntp/libevent/bufferevent_pair.c       |    19 +-
 contrib/ntp/sntp/libevent/bufferevent_ratelim.c    |     9 +-
 contrib/ntp/sntp/libevent/bufferevent_sock.c       |   176 +-
 contrib/ntp/sntp/libevent/build-aux/ltmain.sh      |     0
 .../ntp/sntp/libevent/cmake/AddCompilerFlags.cmake |    13 +
 .../ntp/sntp/libevent/cmake/AddEventLibrary.cmake  |   193 +
 .../ntp/sntp/libevent/cmake/COPYING-CMAKE-SCRIPTS  |    22 +
 .../ntp/sntp/libevent/cmake/CheckConstExists.cmake |    25 +
 .../ntp/sntp/libevent/cmake/CheckFileOffsetBits.c  |    14 +
 .../sntp/libevent/cmake/CheckFileOffsetBits.cmake  |    43 +
 .../libevent/cmake/CheckFunctionKeywords.cmake     |    14 +
 .../libevent/cmake/CheckPrototypeDefinition.c.in   |    29 +
 .../libevent/cmake/CheckPrototypeDefinition.cmake  |    82 +
 .../sntp/libevent/cmake/CheckWorkingKqueue.cmake   |    52 +
 contrib/ntp/sntp/libevent/cmake/CodeCoverage.cmake |   165 +
 contrib/ntp/sntp/libevent/cmake/Copyright.txt      |    57 +
 .../sntp/libevent/cmake/LibeventConfig.cmake.in    |   183 +
 .../libevent/cmake/LibeventConfigVersion.cmake.in  |    11 +
 contrib/ntp/sntp/libevent/cmake/Macros.cmake       |    36 +
 contrib/ntp/sntp/libevent/cmake/Uninstall.cmake.in |    23 +
 contrib/ntp/sntp/libevent/cmake/UseDoxygen.cmake   |   111 +
 .../ntp/sntp/libevent/cmake/VersionViaGit.cmake    |    66 +
 contrib/ntp/sntp/libevent/compile                  |   347 +
 contrib/ntp/sntp/libevent/config.guess             |  1433 ++
 contrib/ntp/sntp/libevent/config.h.in              |   168 +-
 contrib/ntp/sntp/libevent/config.sub               |  1804 ++
 contrib/ntp/sntp/libevent/configure                | 11159 ++++++++----
 contrib/ntp/sntp/libevent/configure.ac             |   337 +-
 contrib/ntp/sntp/libevent/defer-internal.h         |     5 +-
 contrib/ntp/sntp/libevent/depcomp                  |   791 +
 contrib/ntp/sntp/libevent/doxygen.am               |    55 +
 contrib/ntp/sntp/libevent/epoll.c                  |    54 +-
 contrib/ntp/sntp/libevent/epolltable-internal.h    |     2 +-
 contrib/ntp/sntp/libevent/evbuffer-internal.h      |     2 +-
 contrib/ntp/sntp/libevent/evconfig-private.h       |    49 -
 contrib/ntp/sntp/libevent/evconfig-private.h.cmake |    40 +
 contrib/ntp/sntp/libevent/evconfig-private.h.in    |     7 +
 contrib/ntp/sntp/libevent/evdns.c                  |   239 +-
 contrib/ntp/sntp/libevent/event-config.h.cmake     |   513 +
 contrib/ntp/sntp/libevent/event-internal.h         |    24 +-
 contrib/ntp/sntp/libevent/event.c                  |   488 +-
 contrib/ntp/sntp/libevent/event_iocp.c             |     2 +-
 contrib/ntp/sntp/libevent/event_rpcgen.py          |  2057 ++-
 contrib/ntp/sntp/libevent/event_tagging.c          |     9 +-
 contrib/ntp/sntp/libevent/evmap.c                  |    43 +-
 contrib/ntp/sntp/libevent/evrpc.c                  |     6 +-
 contrib/ntp/sntp/libevent/evthread-internal.h      |    16 +-
 contrib/ntp/sntp/libevent/evthread.c               |    48 +-
 contrib/ntp/sntp/libevent/evutil.c                 |   214 +-
 contrib/ntp/sntp/libevent/evutil_rand.c            |     6 +-
 contrib/ntp/sntp/libevent/evutil_time.c            |    93 +-
 contrib/ntp/sntp/libevent/http-internal.h          |    34 +-
 contrib/ntp/sntp/libevent/http.c                   |   605 +-
 contrib/ntp/sntp/libevent/include/event.h          |     2 -
 contrib/ntp/sntp/libevent/include/event2/buffer.h  |     3 +-
 .../sntp/libevent/include/event2/buffer_compat.h   |     5 +-
 .../ntp/sntp/libevent/include/event2/bufferevent.h |    37 +-
 .../libevent/include/event2/bufferevent_compat.h   |     4 +
 contrib/ntp/sntp/libevent/include/event2/dns.h     |    46 +-
 .../ntp/sntp/libevent/include/event2/dns_compat.h  |    24 +-
 contrib/ntp/sntp/libevent/include/event2/event.h   |    81 +-
 contrib/ntp/sntp/libevent/include/event2/http.h    |    54 +-
 .../ntp/sntp/libevent/include/event2/http_compat.h |    10 +-
 .../ntp/sntp/libevent/include/event2/listener.h    |    12 +
 contrib/ntp/sntp/libevent/include/event2/rpc.h     |    48 +-
 .../ntp/sntp/libevent/include/event2/rpc_struct.h  |    14 +
 contrib/ntp/sntp/libevent/include/event2/util.h    |    63 +-
 .../ntp/sntp/libevent/include/event2/visibility.h  |    48 +-
 contrib/ntp/sntp/libevent/include/include.am       |     7 +-
 contrib/ntp/sntp/libevent/iocp-internal.h          |    14 +
 contrib/ntp/sntp/libevent/kqueue.c                 |    24 +-
 contrib/ntp/sntp/libevent/libevent_core.pc.in      |    16 +
 contrib/ntp/sntp/libevent/libevent_extra.pc.in     |    16 +
 contrib/ntp/sntp/libevent/listener.c               |    30 +-
 contrib/ntp/sntp/libevent/log-internal.h           |    25 +-
 contrib/ntp/sntp/libevent/log.c                    |    11 +-
 contrib/ntp/sntp/libevent/ltmain.sh                | 11147 ++++++++++++
 contrib/ntp/sntp/libevent/m4/ax_check_funcs_ex.m4  |    22 +
 contrib/ntp/sntp/libevent/m4/ax_prog_doxygen.m4    |   600 +
 contrib/ntp/sntp/libevent/m4/libevent_openssl.m4   |    26 +-
 contrib/ntp/sntp/libevent/make-event-config.sed    |    10 +-
 contrib/ntp/sntp/libevent/minheap-internal.h       |     6 +-
 contrib/ntp/sntp/libevent/missing                  |   215 +
 contrib/ntp/sntp/libevent/mm-internal.h            |     5 +
 contrib/ntp/sntp/libevent/openssl-compat.h         |    47 +
 contrib/ntp/sntp/libevent/poll.c                   |    27 +-
 contrib/ntp/sntp/libevent/sample/dns-example.c     |   264 +
 contrib/ntp/sntp/libevent/sample/event-read-fifo.c |   162 +
 contrib/ntp/sntp/libevent/sample/hello-world.c     |   140 +
 contrib/ntp/sntp/libevent/sample/hostcheck.c       |   217 +
 contrib/ntp/sntp/libevent/sample/hostcheck.h       |    30 +
 contrib/ntp/sntp/libevent/sample/http-connect.c    |   131 +
 contrib/ntp/sntp/libevent/sample/http-server.c     |   582 +
 contrib/ntp/sntp/libevent/sample/https-client.c    |   544 +
 contrib/ntp/sntp/libevent/sample/include.am        |    56 +
 contrib/ntp/sntp/libevent/sample/le-proxy.c        |   305 +
 .../libevent/sample/openssl_hostname_validation.c  |   178 +
 .../libevent/sample/openssl_hostname_validation.h  |    56 +
 contrib/ntp/sntp/libevent/sample/signal-test.c     |    83 +
 contrib/ntp/sntp/libevent/sample/time-test.c       |   110 +
 contrib/ntp/sntp/libevent/select.c                 |     2 +-
 contrib/ntp/sntp/libevent/signal.c                 |     2 +
 contrib/ntp/sntp/libevent/strlcpy-internal.h       |     2 +
 contrib/ntp/sntp/libevent/test/bench.c             |    62 +-
 contrib/ntp/sntp/libevent/test/bench_cascade.c     |     8 +-
 contrib/ntp/sntp/libevent/test/bench_http.c        |     7 +-
 contrib/ntp/sntp/libevent/test/bench_httpclient.c  |    20 +-
 contrib/ntp/sntp/libevent/test/check-dumpevents.py |    10 +-
 contrib/ntp/sntp/libevent/test/include.am          |    46 +-
 .../ntp/sntp/libevent/test/print-winsock-errors.c  |    86 +
 contrib/ntp/sntp/libevent/test/regress.c           |   505 +-
 contrib/ntp/sntp/libevent/test/regress.gen.c       |   103 +-
 contrib/ntp/sntp/libevent/test/regress.gen.h       |     5 +-
 contrib/ntp/sntp/libevent/test/regress.h           |    13 +
 contrib/ntp/sntp/libevent/test/regress_buffer.c    |   677 +-
 .../ntp/sntp/libevent/test/regress_bufferevent.c   |   527 +-
 contrib/ntp/sntp/libevent/test/regress_dns.c       |   710 +-
 contrib/ntp/sntp/libevent/test/regress_et.c        |   150 +-
 contrib/ntp/sntp/libevent/test/regress_finalize.c  |    48 +
 contrib/ntp/sntp/libevent/test/regress_http.c      |  1382 +-
 contrib/ntp/sntp/libevent/test/regress_listener.c  |   142 +-
 contrib/ntp/sntp/libevent/test/regress_main.c      |    74 +-
 contrib/ntp/sntp/libevent/test/regress_minheap.c   |     1 -
 contrib/ntp/sntp/libevent/test/regress_rpc.c       |    49 +-
 contrib/ntp/sntp/libevent/test/regress_ssl.c       |   802 +-
 contrib/ntp/sntp/libevent/test/regress_testutils.c |    22 +-
 contrib/ntp/sntp/libevent/test/regress_testutils.h |     1 +
 contrib/ntp/sntp/libevent/test/regress_thread.c    |    15 +-
 contrib/ntp/sntp/libevent/test/regress_thread.h    |    34 +-
 contrib/ntp/sntp/libevent/test/regress_util.c      |   272 +-
 contrib/ntp/sntp/libevent/test/regress_zlib.c      |     8 +-
 contrib/ntp/sntp/libevent/test/rpcgen_wrapper.sh   |    11 +-
 contrib/ntp/sntp/libevent/test/test-changelist.c   |     4 +-
 contrib/ntp/sntp/libevent/test/test-closed.c       |    12 +-
 contrib/ntp/sntp/libevent/test/test-eof.c          |    15 +-
 contrib/ntp/sntp/libevent/test/test-fdleak.c       |    15 +-
 contrib/ntp/sntp/libevent/test/test-init.c         |     2 +-
 contrib/ntp/sntp/libevent/test/test-ratelim.c      |    93 +-
 contrib/ntp/sntp/libevent/test/test-time.c         |    28 +-
 contrib/ntp/sntp/libevent/test/test-weof.c         |     9 +-
 contrib/ntp/sntp/libevent/test/test.sh             |    70 +-
 contrib/ntp/sntp/libevent/test/tinytest.c          |   169 +-
 contrib/ntp/sntp/libevent/test/tinytest.h          |     5 +-
 contrib/ntp/sntp/libevent/test/tinytest_macros.h   |    18 +-
 contrib/ntp/sntp/libevent/time-internal.h          |     3 +
 contrib/ntp/sntp/libevent/util-internal.h          |    86 +-
 contrib/ntp/sntp/libevent/whatsnew-2.1.txt         |    88 +-
 contrib/ntp/sntp/libevent/win32select.c            |     5 +-
 contrib/ntp/sntp/libopts/COPYING.gplv3             |     2 +-
 contrib/ntp/sntp/libopts/COPYING.lgplv3            |     6 +-
 contrib/ntp/sntp/libopts/COPYING.mbsd              |     2 +-
 contrib/ntp/sntp/libopts/Makefile.am               |    36 +-
 contrib/ntp/sntp/libopts/Makefile.in               |   116 +-
 contrib/ntp/sntp/libopts/README                    |     2 +-
 contrib/ntp/sntp/libopts/{compat => }/_Noreturn.h  |     0
 contrib/ntp/sntp/libopts/ag-char-map.h             |     4 +-
 contrib/ntp/sntp/libopts/alias.c                   |     4 +-
 contrib/ntp/sntp/libopts/ao-strs.c                 |   281 +-
 contrib/ntp/sntp/libopts/ao-strs.h                 |   296 +-
 contrib/ntp/sntp/libopts/autoopts.c                |    22 +-
 contrib/ntp/sntp/libopts/autoopts.h                |    12 +-
 contrib/ntp/sntp/libopts/autoopts/options.h        |    16 +-
 contrib/ntp/sntp/libopts/autoopts/project.h        |    12 +-
 contrib/ntp/sntp/libopts/autoopts/usage-txt.h      |   504 +-
 contrib/ntp/sntp/libopts/boolean.c                 |     4 +-
 contrib/ntp/sntp/libopts/check.c                   |     4 +-
 contrib/ntp/sntp/libopts/compat/compat.h           |     8 +-
 contrib/ntp/sntp/libopts/compat/pathfind.c         |    13 +-
 contrib/ntp/sntp/libopts/compat/windows-config.h   |     2 +-
 contrib/ntp/sntp/libopts/configfile.c              |   166 +-
 contrib/ntp/sntp/libopts/cook.c                    |    53 +-
 contrib/ntp/sntp/libopts/enum.c                    |    44 +-
 contrib/ntp/sntp/libopts/env.c                     |    12 +-
 contrib/ntp/sntp/libopts/file.c                    |     2 +-
 contrib/ntp/sntp/libopts/find.c                    |    63 +-
 contrib/ntp/sntp/libopts/genshell.c                |   227 +-
 contrib/ntp/sntp/libopts/genshell.h                |    21 +-
 contrib/ntp/sntp/libopts/gettext.h                 |    20 +-
 contrib/ntp/sntp/libopts/init.c                    |    18 +-
 contrib/ntp/sntp/libopts/intprops.h                |   267 +-
 contrib/ntp/sntp/libopts/libopts.c                 |     6 +-
 contrib/ntp/sntp/libopts/load.c                    |    68 +-
 contrib/ntp/sntp/libopts/m4/libopts.m4             |    26 +-
 contrib/ntp/sntp/libopts/m4/liboptschk.m4          |     2 +-
 contrib/ntp/sntp/libopts/m4/stdnoreturn.m4         |    66 +-
 contrib/ntp/sntp/libopts/makeshell.c               |    70 +-
 contrib/ntp/sntp/libopts/nested.c                  |    81 +-
 contrib/ntp/sntp/libopts/numeric.c                 |    17 +-
 contrib/ntp/sntp/libopts/option-value-type.c       |    10 +-
 contrib/ntp/sntp/libopts/option-xat-attribute.c    |    10 +-
 contrib/ntp/sntp/libopts/parse-duration.c          |    14 +-
 contrib/ntp/sntp/libopts/parse-duration.h          |     6 +-
 contrib/ntp/sntp/libopts/pgusage.c                 |     2 +-
 contrib/ntp/sntp/libopts/proto.h                   |   508 +-
 contrib/ntp/sntp/libopts/putshell.c                |    42 +-
 contrib/ntp/sntp/libopts/reset.c                   |     4 +-
 contrib/ntp/sntp/libopts/restore.c                 |     2 +-
 contrib/ntp/sntp/libopts/save-flags.c              |   248 +
 contrib/ntp/sntp/libopts/save-flags.h              |    68 +
 contrib/ntp/sntp/libopts/save.c                    |   555 +-
 contrib/ntp/sntp/libopts/sort.c                    |    18 +-
 contrib/ntp/sntp/libopts/stack.c                   |     4 +-
 contrib/ntp/sntp/libopts/stdnoreturn.in.h          |    32 +-
 contrib/ntp/sntp/libopts/streqvcmp.c               |     4 +-
 contrib/ntp/sntp/libopts/text_mmap.c               |    15 +-
 contrib/ntp/sntp/libopts/time.c                    |     8 +-
 contrib/ntp/sntp/libopts/tokenize.c                |    21 +-
 contrib/ntp/sntp/libopts/usage.c                   |    83 +-
 contrib/ntp/sntp/libopts/version.c                 |    11 +-
 contrib/ntp/sntp/log.c                             |     2 +-
 contrib/ntp/sntp/m4/ntp_cacheversion.m4            |     9 +-
 contrib/ntp/sntp/m4/ntp_compiler.m4                |    30 +-
 contrib/ntp/sntp/m4/ntp_crypto_rand.m4             |     5 +-
 contrib/ntp/sntp/m4/ntp_googletest.m4              |    53 -
 contrib/ntp/sntp/m4/realpath.m4                    |    49 +
 contrib/ntp/sntp/m4/version.m4                     |     2 +-
 contrib/ntp/sntp/main.c                            |     1 +
 contrib/ntp/sntp/scm-rev                           |     2 +-
 contrib/ntp/sntp/scripts/Makefile.in               |    17 +-
 contrib/ntp/sntp/sntp-opts.c                       |   252 +-
 contrib/ntp/sntp/sntp-opts.h                       |    21 +-
 contrib/ntp/sntp/sntp.1sntpman                     |    10 +-
 contrib/ntp/sntp/sntp.1sntpmdoc                    |     8 +-
 contrib/ntp/sntp/sntp.c                            |     2 +
 contrib/ntp/sntp/sntp.html                         |   246 +-
 contrib/ntp/sntp/sntp.man.in                       |    10 +-
 contrib/ntp/sntp/sntp.mdoc.in                      |    10 +-
 contrib/ntp/sntp/tests/Makefile.am                 |    73 +-
 contrib/ntp/sntp/tests/Makefile.in                 |   385 +-
 contrib/ntp/sntp/tests/packetProcessing.c          |     2 -
 contrib/ntp/sntp/tests/sntptest.c                  |     4 +-
 contrib/ntp/sntp/tests/sntptest.h                  |     1 +
 contrib/ntp/sntp/tests/t-log.c                     |     1 -
 contrib/ntp/sntp/tests/utilities.c                 |     3 -
 contrib/ntp/sntp/unity/Makefile.am                 |     4 +-
 contrib/ntp/sntp/unity/Makefile.in                 |   138 +-
 contrib/ntp/sntp/unity/auto/parseOutput.rb         |     0
 contrib/ntp/sntp/unity/auto/type_sanitizer.rb      |     0
 contrib/ntp/sntp/unity/auto/unity_test_summary.py  |     0
 contrib/ntp/sntp/unity/libpkgver-colcomp.c         |     1 +
 contrib/ntp/sntp/unity/unity_internals.h           |     2 +-
 contrib/ntp/sntp/utilities.c                       |    25 +-
 contrib/ntp/sntp/version.c                         |     5 -
 contrib/ntp/tests/libntp/realpath.c                |    94 +
 contrib/ntp/tests/libntp/run-realpath.c            |    70 +
 contrib/ntp/tests/ntpd/test-libntp.c               |     2 +
 contrib/ntp/util/Makefile.am                       |    24 +-
 contrib/ntp/util/Makefile.in                       |   211 +-
 contrib/ntp/util/invoke-ntp-keygen.texi            |    10 +-
 contrib/ntp/util/ntp-keygen-opts.c                 |   254 +-
 contrib/ntp/util/ntp-keygen-opts.def               |     2 +-
 contrib/ntp/util/ntp-keygen-opts.h                 |    21 +-
 contrib/ntp/util/ntp-keygen.1ntp-keygenman         |    10 +-
 contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc        |    10 +-
 contrib/ntp/util/ntp-keygen.c                      |    20 +-
 contrib/ntp/util/ntp-keygen.html                   |   396 +-
 contrib/ntp/util/ntp-keygen.man.in                 |    10 +-
 contrib/ntp/util/ntp-keygen.mdoc.in                |    10 +-
 usr.sbin/ntp/libntp/Makefile                       |    17 +-
 usr.sbin/ntp/libparse/Makefile                     |     4 +-
 usr.sbin/ntp/ntp-keygen/Makefile                   |     8 +-
 usr.sbin/ntp/ntpd/Makefile                         |    11 +-
 usr.sbin/ntp/ntpdate/Makefile                      |     6 +-
 usr.sbin/ntp/ntpdc/Makefile                        |     6 +-
 usr.sbin/ntp/ntpq/Makefile                         |     8 +-
 usr.sbin/ntp/ntptime/Makefile                      |     6 +-
 usr.sbin/ntp/sntp/Makefile                         |     6 +-
 820 files changed, 80389 insertions(+), 79821 deletions(-)

diff --cc contrib/ntp/check-libntp.mf
index 000000000000,07c855b4be78..07c855b4be78
mode 000000,100644..100644
--- a/contrib/ntp/check-libntp.mf
+++ b/contrib/ntp/check-libntp.mf
diff --cc contrib/ntp/check-libntpd.mf
index 000000000000,46304dd5f236..46304dd5f236
mode 000000,100644..100644
--- a/contrib/ntp/check-libntpd.mf
+++ b/contrib/ntp/check-libntpd.mf
diff --cc contrib/ntp/check-libunity.mf
index 000000000000,4e052058c0c3..4e052058c0c3
mode 000000,100644..100644
--- a/contrib/ntp/check-libunity.mf
+++ b/contrib/ntp/check-libunity.mf
diff --cc contrib/ntp/check-scm-rev.mf
index 000000000000,e2abbf0e452c..e2abbf0e452c
mode 000000,100644..100644
--- a/contrib/ntp/check-scm-rev.mf
+++ b/contrib/ntp/check-scm-rev.mf
diff --cc contrib/ntp/libntp/Makefile.in
index beea4982abb8,000000000000..75d6b2abf8bc
mode 100644,000000..100644
--- a/contrib/ntp/libntp/Makefile.in
+++ b/contrib/ntp/libntp/Makefile.in
@@@ -1,1650 -1,0 +1,1700 @@@
- # Makefile.in generated by automake 1.15.1 from Makefile.am.
++# Makefile.in generated by automake 1.16.5 from Makefile.am.
 +# @configure_input@
 +
- # Copyright (C) 1994-2017 Free Software Foundation, Inc.
++# 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@
- @PTHREADS_TRUE@am__append_1 = $(srcdir)/../lib/isc/pthreads/mutex.c
++
++# 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 \
*** 21598 LINES SKIPPED ***