Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/ntp Merge conflicts



details:   https://anonhg.NetBSD.org/src/rev/054b1ae433b8
branches:  trunk
changeset: 805131:054b1ae433b8
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Dec 19 20:43:14 2014 +0000

description:
Merge conflicts

diffstat:

 external/bsd/ntp/bin/ntpd/Makefile                                         |      3 +-
 external/bsd/ntp/dist/adjtimed/adjtimed.c                                  |      2 +-
 external/bsd/ntp/dist/clockstuff/chutest.c                                 |      2 +-
 external/bsd/ntp/dist/clockstuff/propdelay.c                               |      2 +-
 external/bsd/ntp/dist/include/adjtime.h                                    |      2 +-
 external/bsd/ntp/dist/include/ascii.h                                      |      2 +-
 external/bsd/ntp/dist/include/audio.h                                      |      2 +-
 external/bsd/ntp/dist/include/binio.h                                      |      2 +-
 external/bsd/ntp/dist/include/declcond.h                                   |      2 +-
 external/bsd/ntp/dist/include/gps.h                                        |      2 +-
 external/bsd/ntp/dist/include/hopf6039.h                                   |      2 +-
 external/bsd/ntp/dist/include/icom.h                                       |      2 +-
 external/bsd/ntp/dist/include/ieee754io.h                                  |      2 +-
 external/bsd/ntp/dist/include/intreswork.h                                 |      2 +-
 external/bsd/ntp/dist/include/iosignal.h                                   |      2 +-
 external/bsd/ntp/dist/include/isc/mem.h                                    |      2 +-
 external/bsd/ntp/dist/include/l_stdlib.h                                   |      2 +-
 external/bsd/ntp/dist/include/lib_strbuf.h                                 |      2 +-
 external/bsd/ntp/dist/include/libntp.h                                     |      2 +-
 external/bsd/ntp/dist/include/mbg_gps166.h                                 |      2 +-
 external/bsd/ntp/dist/include/mx4200.h                                     |      2 +-
 external/bsd/ntp/dist/include/ntif.h                                       |      2 +-
 external/bsd/ntp/dist/include/ntp.h                                        |      2 +-
 external/bsd/ntp/dist/include/ntp_assert.h                                 |      2 +-
 external/bsd/ntp/dist/include/ntp_calendar.h                               |      2 +-
 external/bsd/ntp/dist/include/ntp_cmdargs.h                                |      2 +-
 external/bsd/ntp/dist/include/ntp_config.h                                 |      2 +-
 external/bsd/ntp/dist/include/ntp_control.h                                |      2 +-
 external/bsd/ntp/dist/include/ntp_crypto.h                                 |      2 +-
 external/bsd/ntp/dist/include/ntp_datum.h                                  |      2 +-
 external/bsd/ntp/dist/include/ntp_debug.h                                  |      2 +-
 external/bsd/ntp/dist/include/ntp_filegen.h                                |      2 +-
 external/bsd/ntp/dist/include/ntp_fp.h                                     |      8 +-
 external/bsd/ntp/dist/include/ntp_if.h                                     |      2 +-
 external/bsd/ntp/dist/include/ntp_intres.h                                 |      2 +-
 external/bsd/ntp/dist/include/ntp_io.h                                     |      2 +-
 external/bsd/ntp/dist/include/ntp_libopts.h                                |      2 +-
 external/bsd/ntp/dist/include/ntp_lineedit.h                               |      2 +-
 external/bsd/ntp/dist/include/ntp_lists.h                                  |      2 +-
 external/bsd/ntp/dist/include/ntp_machine.h                                |      2 +-
 external/bsd/ntp/dist/include/ntp_malloc.h                                 |      2 +-
 external/bsd/ntp/dist/include/ntp_md5.h                                    |      2 +-
 external/bsd/ntp/dist/include/ntp_net.h                                    |      2 +-
 external/bsd/ntp/dist/include/ntp_prio_q.h                                 |      2 +-
 external/bsd/ntp/dist/include/ntp_proto.h                                  |      2 +-
 external/bsd/ntp/dist/include/ntp_random.h                                 |      2 +-
 external/bsd/ntp/dist/include/ntp_refclock.h                               |      2 +-
 external/bsd/ntp/dist/include/ntp_request.h                                |      2 +-
 external/bsd/ntp/dist/include/ntp_rfc2553.h                                |      2 +-
 external/bsd/ntp/dist/include/ntp_select.h                                 |      2 +-
 external/bsd/ntp/dist/include/ntp_stdlib.h                                 |      2 +-
 external/bsd/ntp/dist/include/ntp_string.h                                 |      2 +-
 external/bsd/ntp/dist/include/ntp_syscall.h                                |      2 +-
 external/bsd/ntp/dist/include/ntp_syslog.h                                 |      2 +-
 external/bsd/ntp/dist/include/ntp_tty.h                                    |      2 +-
 external/bsd/ntp/dist/include/ntp_types.h                                  |      2 +-
 external/bsd/ntp/dist/include/ntp_unixtime.h                               |      2 +-
 external/bsd/ntp/dist/include/ntp_worker.h                                 |      2 +-
 external/bsd/ntp/dist/include/ntp_workimpl.h                               |      2 +-
 external/bsd/ntp/dist/include/ntpd.h                                       |      6 +-
 external/bsd/ntp/dist/include/ntpsim.h                                     |      2 +-
 external/bsd/ntp/dist/include/parse.h                                      |      2 +-
 external/bsd/ntp/dist/include/parse_conf.h                                 |      2 +-
 external/bsd/ntp/dist/include/recvbuff.h                                   |      2 +-
 external/bsd/ntp/dist/include/refclock_atom.h                              |      2 +-
 external/bsd/ntp/dist/include/ssl_applink.c                                |      2 +-
 external/bsd/ntp/dist/include/timepps-SCO.h                                |      2 +-
 external/bsd/ntp/dist/include/timepps-Solaris.h                            |      2 +-
 external/bsd/ntp/dist/include/timepps-SunOS.h                              |      2 +-
 external/bsd/ntp/dist/include/timespecops.h                                |      2 +-
 external/bsd/ntp/dist/include/timetoa.h                                    |      2 +-
 external/bsd/ntp/dist/include/timevalops.h                                 |      2 +-
 external/bsd/ntp/dist/include/trimble.h                                    |      2 +-
 external/bsd/ntp/dist/include/vint64ops.h                                  |      2 +-
 external/bsd/ntp/dist/kernel/sys/bsd_audioirig.h                           |      2 +-
 external/bsd/ntp/dist/kernel/sys/i8253.h                                   |      2 +-
 external/bsd/ntp/dist/kernel/sys/parsestreams.h                            |      2 +-
 external/bsd/ntp/dist/kernel/sys/pcl720.h                                  |      2 +-
 external/bsd/ntp/dist/kernel/sys/ppsclock.h                                |      2 +-
 external/bsd/ntp/dist/kernel/sys/timex.h                                   |      2 +-
 external/bsd/ntp/dist/kernel/sys/tpro.h                                    |      2 +-
 external/bsd/ntp/dist/kernel/sys/tt560_api.h                               |      2 +-
 external/bsd/ntp/dist/lib/isc/alpha/include/isc/atomic.h                   |      2 +-
 external/bsd/ntp/dist/lib/isc/app_api.c                                    |      2 +-
 external/bsd/ntp/dist/lib/isc/assertions.c                                 |      2 +-
 external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c                         |      2 +-
 external/bsd/ntp/dist/lib/isc/backtrace.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/base32.c                                     |      2 +-
 external/bsd/ntp/dist/lib/isc/base64.c                                     |      2 +-
 external/bsd/ntp/dist/lib/isc/bitstring.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/buffer.c                                     |      2 +-
 external/bsd/ntp/dist/lib/isc/bufferlist.c                                 |      2 +-
 external/bsd/ntp/dist/lib/isc/commandline.c                                |      2 +-
 external/bsd/ntp/dist/lib/isc/entropy.c                                    |      2 +-
 external/bsd/ntp/dist/lib/isc/error.c                                      |      2 +-
 external/bsd/ntp/dist/lib/isc/event.c                                      |      2 +-
 external/bsd/ntp/dist/lib/isc/fsaccess.c                                   |      2 +-
 external/bsd/ntp/dist/lib/isc/hash.c                                       |      2 +-
 external/bsd/ntp/dist/lib/isc/heap.c                                       |      2 +-
 external/bsd/ntp/dist/lib/isc/hex.c                                        |      2 +-
 external/bsd/ntp/dist/lib/isc/hmacmd5.c                                    |      2 +-
 external/bsd/ntp/dist/lib/isc/hmacsha.c                                    |      2 +-
 external/bsd/ntp/dist/lib/isc/httpd.c                                      |      2 +-
 external/bsd/ntp/dist/lib/isc/ia64/include/isc/atomic.h                    |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/Makefile                         |    439 -
 external/bsd/ntp/dist/lib/isc/include/isc/app.h                            |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/assertions.h                     |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/backtrace.h                      |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/base32.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/base64.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/bind9.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/bitstring.h                      |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/boolean.h                        |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/buffer.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/bufferlist.h                     |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/commandline.h                    |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/entropy.h                        |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/error.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/event.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/eventclass.h                     |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/file.h                           |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/formatcheck.h                    |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/fsaccess.h                       |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/hash.h                           |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/heap.h                           |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/hex.h                            |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/hmacmd5.h                        |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/hmacsha.h                        |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/httpd.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/interfaceiter.h                  |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/ipv6.h                           |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/iterated_hash.h                  |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/lang.h                           |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/lex.h                            |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/lfsr.h                           |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/lib.h                            |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/list.h                           |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/log.h                            |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/magic.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/md5.h                            |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/mem.h                            |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/msgcat.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/msgs.h                           |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/mutexblock.h                     |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/namespace.h                      |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/netaddr.h                        |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/netscope.h                       |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/ondestroy.h                      |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/os.h                             |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/parseint.h                       |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/platform.h                       |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/portset.h                        |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/print.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/queue.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/quota.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/radix.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/random.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/ratelimiter.h                    |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/refcount.h                       |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/region.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/resource.h                       |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/result.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/resultclass.h                    |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/rwlock.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/serial.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/sha1.h                           |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/sha2.h                           |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/sockaddr.h                       |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/socket.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/stats.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/stdio.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/stdlib.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/string.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/symtab.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/task.h                           |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/taskpool.h                       |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/timer.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/types.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/util.h                           |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/version.h                        |      2 +-
 external/bsd/ntp/dist/lib/isc/include/isc/xml.h                            |      2 +-
 external/bsd/ntp/dist/lib/isc/inet_aton.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/inet_ntop.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/inet_pton.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/iterated_hash.c                              |      2 +-
 external/bsd/ntp/dist/lib/isc/lex.c                                        |      2 +-
 external/bsd/ntp/dist/lib/isc/lfsr.c                                       |      2 +-
 external/bsd/ntp/dist/lib/isc/lib.c                                        |      2 +-
 external/bsd/ntp/dist/lib/isc/log.c                                        |      2 +-
 external/bsd/ntp/dist/lib/isc/md5.c                                        |      2 +-
 external/bsd/ntp/dist/lib/isc/mem.c                                        |      2 +-
 external/bsd/ntp/dist/lib/isc/mem_api.c                                    |      2 +-
 external/bsd/ntp/dist/lib/isc/mips/include/isc/atomic.h                    |      2 +-
 external/bsd/ntp/dist/lib/isc/mutexblock.c                                 |      2 +-
 external/bsd/ntp/dist/lib/isc/netaddr.c                                    |      2 +-
 external/bsd/ntp/dist/lib/isc/netscope.c                                   |      2 +-
 external/bsd/ntp/dist/lib/isc/nls/msgcat.c                                 |      2 +-
 external/bsd/ntp/dist/lib/isc/noatomic/include/isc/atomic.h                |      2 +-
 external/bsd/ntp/dist/lib/isc/nothreads/condition.c                        |      2 +-
 external/bsd/ntp/dist/lib/isc/nothreads/include/isc/condition.h            |      2 +-
 external/bsd/ntp/dist/lib/isc/nothreads/include/isc/mutex.h                |      2 +-
 external/bsd/ntp/dist/lib/isc/nothreads/include/isc/once.h                 |      2 +-
 external/bsd/ntp/dist/lib/isc/nothreads/include/isc/thread.h               |      2 +-
 external/bsd/ntp/dist/lib/isc/nothreads/mutex.c                            |      2 +-
 external/bsd/ntp/dist/lib/isc/nothreads/thread.c                           |      2 +-
 external/bsd/ntp/dist/lib/isc/ondestroy.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/parseint.c                                   |      2 +-
 external/bsd/ntp/dist/lib/isc/portset.c                                    |      2 +-
 external/bsd/ntp/dist/lib/isc/powerpc/include/isc/atomic.h                 |      2 +-
 external/bsd/ntp/dist/lib/isc/print.c                                      |      2 +-
 external/bsd/ntp/dist/lib/isc/pthreads/condition.c                         |      2 +-
 external/bsd/ntp/dist/lib/isc/pthreads/include/isc/condition.h             |      2 +-
 external/bsd/ntp/dist/lib/isc/pthreads/include/isc/mutex.h                 |      2 +-
 external/bsd/ntp/dist/lib/isc/pthreads/include/isc/once.h                  |      2 +-
 external/bsd/ntp/dist/lib/isc/pthreads/include/isc/thread.h                |      2 +-
 external/bsd/ntp/dist/lib/isc/pthreads/mutex.c                             |      2 +-
 external/bsd/ntp/dist/lib/isc/pthreads/thread.c                            |      2 +-
 external/bsd/ntp/dist/lib/isc/quota.c                                      |      2 +-
 external/bsd/ntp/dist/lib/isc/radix.c                                      |      2 +-
 external/bsd/ntp/dist/lib/isc/random.c                                     |      2 +-
 external/bsd/ntp/dist/lib/isc/ratelimiter.c                                |      2 +-
 external/bsd/ntp/dist/lib/isc/refcount.c                                   |      2 +-
 external/bsd/ntp/dist/lib/isc/region.c                                     |      2 +-
 external/bsd/ntp/dist/lib/isc/result.c                                     |      2 +-
 external/bsd/ntp/dist/lib/isc/rwlock.c                                     |      2 +-
 external/bsd/ntp/dist/lib/isc/serial.c                                     |      2 +-
 external/bsd/ntp/dist/lib/isc/sha1.c                                       |      2 +-
 external/bsd/ntp/dist/lib/isc/sha2.c                                       |      2 +-
 external/bsd/ntp/dist/lib/isc/sockaddr.c                                   |      2 +-
 external/bsd/ntp/dist/lib/isc/socket_api.c                                 |      2 +-
 external/bsd/ntp/dist/lib/isc/sparc64/include/isc/atomic.h                 |      2 +-
 external/bsd/ntp/dist/lib/isc/stats.c                                      |      2 +-
 external/bsd/ntp/dist/lib/isc/string.c                                     |      2 +-
 external/bsd/ntp/dist/lib/isc/strtoul.c                                    |      2 +-
 external/bsd/ntp/dist/lib/isc/symtab.c                                     |      2 +-
 external/bsd/ntp/dist/lib/isc/task.c                                       |      2 +-
 external/bsd/ntp/dist/lib/isc/task_api.c                                   |      2 +-
 external/bsd/ntp/dist/lib/isc/task_p.h                                     |      2 +-
 external/bsd/ntp/dist/lib/isc/taskpool.c                                   |      2 +-
 external/bsd/ntp/dist/lib/isc/tests/hash_test.c                            |      2 +-
 external/bsd/ntp/dist/lib/isc/tests/isctest.c                              |      2 +-
 external/bsd/ntp/dist/lib/isc/tests/isctest.h                              |      2 +-
 external/bsd/ntp/dist/lib/isc/tests/queue_test.c                           |      2 +-
 external/bsd/ntp/dist/lib/isc/tests/socket_test.c                          |      2 +-
 external/bsd/ntp/dist/lib/isc/tests/symtab_test.c                          |      2 +-
 external/bsd/ntp/dist/lib/isc/tests/task_test.c                            |      2 +-
 external/bsd/ntp/dist/lib/isc/tests/taskpool_test.c                        |      2 +-
 external/bsd/ntp/dist/lib/isc/timer.c                                      |      2 +-
 external/bsd/ntp/dist/lib/isc/timer_api.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/timer_p.h                                    |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/app.c                                   |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/dir.c                                   |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/entropy.c                               |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/errno2result.c                          |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/errno2result.h                          |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/file.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/fsaccess.c                              |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c                     |     14 +-
 external/bsd/ntp/dist/lib/isc/unix/ifiter_ioctl.c                          |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/ifiter_sysctl.c                         |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/include/isc/Makefile                    |    415 -
 external/bsd/ntp/dist/lib/isc/unix/include/isc/dir.h                       |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/include/isc/int.h                       |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/include/isc/keyboard.h                  |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/include/isc/net.h                       |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/include/isc/netdb.h                     |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/include/isc/offset.h                    |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/include/isc/stat.h                      |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/include/isc/stdtime.h                   |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/include/isc/strerror.h                  |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/include/isc/syslog.h                    |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/include/isc/time.h                      |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/interfaceiter.c                         |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/ipv6.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/keyboard.c                              |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/net.c                                   |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/os.c                                    |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/resource.c                              |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/socket.c                                |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/socket_p.h                              |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/stdio.c                                 |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/stdtime.c                               |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/strerror.c                              |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/syslog.c                                |      2 +-
 external/bsd/ntp/dist/lib/isc/unix/time.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/version.c                                    |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/DLLMain.c                              |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/app.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/condition.c                            |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/dir.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/entropy.c                              |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/errno2result.c                         |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/errno2result.h                         |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/file.c                                 |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/fsaccess.c                             |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/bind_registry.h            |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/bindevt.h                  |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/condition.h                |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/dir.h                      |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/int.h                      |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/ipv6.h                     |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/keyboard.h                 |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/mutex.h                    |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/net.h                      |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/netdb.h                    |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/ntgroups.h                 |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/ntpaths.h                  |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/offset.h                   |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/once.h                     |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/platform.h                 |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/stat.h                     |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/stdtime.h                  |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/strerror.h                 |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/syslog.h                   |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/thread.h                   |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/time.h                     |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/include/isc/win32os.h                  |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/interfaceiter.c                        |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/ipv6.c                                 |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/keyboard.c                             |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/libgen.h                               |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/net.c                                  |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/netdb.h                                |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/ntgroups.c                             |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/ntpaths.c                              |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/once.c                                 |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/os.c                                   |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/resource.c                             |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/socket.c                               |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/stdio.c                                |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/stdtime.c                              |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/strerror.c                             |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/syslog.c                               |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/syslog.h                               |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/thread.c                               |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/time.c                                 |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/unistd.h                               |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/version.c                              |      2 +-
 external/bsd/ntp/dist/lib/isc/win32/win32os.c                              |      2 +-
 external/bsd/ntp/dist/lib/isc/x86_32/include/isc/atomic.h                  |      2 +-
 external/bsd/ntp/dist/lib/isc/x86_64/include/isc/atomic.h                  |      2 +-
 external/bsd/ntp/dist/libjsmn/jsmn.c                                       |      4 +-
 external/bsd/ntp/dist/libjsmn/jsmn.h                                       |      2 +-
 external/bsd/ntp/dist/libjsmn/jsmn_test.c                                  |      2 +-
 external/bsd/ntp/dist/libntp/a_md5encrypt.c                                |      2 +-
 external/bsd/ntp/dist/libntp/adjtime.c                                     |      2 +-
 external/bsd/ntp/dist/libntp/adjtimex.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/atoint.c                                      |      2 +-
 external/bsd/ntp/dist/libntp/atolfp.c                                      |      2 +-
 external/bsd/ntp/dist/libntp/atouint.c                                     |      2 +-
 external/bsd/ntp/dist/libntp/audio.c                                       |      2 +-
 external/bsd/ntp/dist/libntp/authkeys.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/authreadkeys.c                                |      6 +-
 external/bsd/ntp/dist/libntp/authusekey.c                                  |      2 +-
 external/bsd/ntp/dist/libntp/bsd_strerror.c                                |      2 +-
 external/bsd/ntp/dist/libntp/buftvtots.c                                   |      2 +-
 external/bsd/ntp/dist/libntp/caljulian.c                                   |      2 +-
 external/bsd/ntp/dist/libntp/caltontp.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/calyearstart.c                                |      2 +-
 external/bsd/ntp/dist/libntp/clocktime.c                                   |      2 +-
 external/bsd/ntp/dist/libntp/clocktypes.c                                  |      2 +-
 external/bsd/ntp/dist/libntp/decodenetnum.c                                |      2 +-
 external/bsd/ntp/dist/libntp/dofptoa.c                                     |      2 +-
 external/bsd/ntp/dist/libntp/dolfptoa.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/emalloc.c                                     |      2 +-
 external/bsd/ntp/dist/libntp/findconfig.c                                  |      2 +-
 external/bsd/ntp/dist/libntp/getopt.c                                      |      2 +-
 external/bsd/ntp/dist/libntp/hextoint.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/hextolfp.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/humandate.c                                   |      2 +-
 external/bsd/ntp/dist/libntp/icom.c                                        |      2 +-
 external/bsd/ntp/dist/libntp/iosignal.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/lib_strbuf.c                                  |      2 +-
 external/bsd/ntp/dist/libntp/machines.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/mktime.c                                      |      2 +-
 external/bsd/ntp/dist/libntp/modetoa.c                                     |      2 +-
 external/bsd/ntp/dist/libntp/mstolfp.c                                     |      2 +-
 external/bsd/ntp/dist/libntp/msyslog.c                                     |      2 +-
 external/bsd/ntp/dist/libntp/netof.c                                       |      2 +-
 external/bsd/ntp/dist/libntp/ntp_calendar.c                                |    110 +-
 external/bsd/ntp/dist/libntp/ntp_crypto_rnd.c                              |      3 +-
 external/bsd/ntp/dist/libntp/ntp_intres.c                                  |      2 +-
 external/bsd/ntp/dist/libntp/ntp_libopts.c                                 |      2 +-
 external/bsd/ntp/dist/libntp/ntp_lineedit.c                                |      2 +-
 external/bsd/ntp/dist/libntp/ntp_random.c                                  |      2 +-
 external/bsd/ntp/dist/libntp/ntp_rfc2553.c                                 |      2 +-
 external/bsd/ntp/dist/libntp/ntp_worker.c                                  |      2 +-
 external/bsd/ntp/dist/libntp/numtoa.c                                      |      2 +-
 external/bsd/ntp/dist/libntp/numtohost.c                                   |      2 +-
 external/bsd/ntp/dist/libntp/octtoint.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/prettydate.c                                  |      2 +-
 external/bsd/ntp/dist/libntp/recvbuff.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/refnumtoa.c                                   |      2 +-
 external/bsd/ntp/dist/libntp/snprintf.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/socket.c                                      |      2 +-
 external/bsd/ntp/dist/libntp/socktoa.c                                     |      2 +-
 external/bsd/ntp/dist/libntp/socktohost.c                                  |      2 +-
 external/bsd/ntp/dist/libntp/ssl_init.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/statestr.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/strdup.c                                      |      2 +-
 external/bsd/ntp/dist/libntp/strl_obsd.c                                   |      2 +-
 external/bsd/ntp/dist/libntp/syssignal.c                                   |      2 +-
 external/bsd/ntp/dist/libntp/systime.c                                     |      2 +-
 external/bsd/ntp/dist/libntp/systime_s.c                                   |      2 +-
 external/bsd/ntp/dist/libntp/timetoa.c                                     |      2 +-
 external/bsd/ntp/dist/libntp/timevalops.c                                  |      2 +-
 external/bsd/ntp/dist/libntp/uglydate.c                                    |      2 +-
 external/bsd/ntp/dist/libntp/vint64ops.c                                   |      2 +-
 external/bsd/ntp/dist/libntp/work_fork.c                                   |      2 +-
 external/bsd/ntp/dist/libntp/work_thread.c                                 |      2 +-
 external/bsd/ntp/dist/libntp/ymd2yd.c                                      |      2 +-
 external/bsd/ntp/dist/libparse/binio.c                                     |      2 +-
 external/bsd/ntp/dist/libparse/clk_computime.c                             |      2 +-
 external/bsd/ntp/dist/libparse/clk_dcf7000.c                               |      2 +-
 external/bsd/ntp/dist/libparse/clk_hopf6021.c                              |      2 +-
 external/bsd/ntp/dist/libparse/clk_meinberg.c                              |      2 +-
 external/bsd/ntp/dist/libparse/clk_rawdcf.c                                |      2 +-
 external/bsd/ntp/dist/libparse/clk_rcc8000.c                               |      2 +-
 external/bsd/ntp/dist/libparse/clk_schmid.c                                |      2 +-
 external/bsd/ntp/dist/libparse/clk_sel240x.c                               |      2 +-
 external/bsd/ntp/dist/libparse/clk_trimtaip.c                              |      2 +-
 external/bsd/ntp/dist/libparse/clk_trimtsip.c                              |      2 +-
 external/bsd/ntp/dist/libparse/clk_varitext.c                              |      2 +-
 external/bsd/ntp/dist/libparse/clk_wharton.c                               |      2 +-
 external/bsd/ntp/dist/libparse/data_mbg.c                                  |      2 +-
 external/bsd/ntp/dist/libparse/gpstolfp.c                                  |      2 +-
 external/bsd/ntp/dist/libparse/ieee754io.c                                 |      2 +-
 external/bsd/ntp/dist/libparse/info_trimble.c                              |      6 +-
 external/bsd/ntp/dist/libparse/mfp_mul.c                                   |      2 +-
 external/bsd/ntp/dist/libparse/parse.c                                     |      2 +-
 external/bsd/ntp/dist/libparse/parse_conf.c                                |      2 +-
 external/bsd/ntp/dist/libparse/parsesolaris.c                              |      2 +-
 external/bsd/ntp/dist/libparse/parsestreams.c                              |      2 +-
 external/bsd/ntp/dist/libparse/trim_info.c                                 |      2 +-
 external/bsd/ntp/dist/ntpd/check_y2k.c                                     |      2 +-
 external/bsd/ntp/dist/ntpd/cmd_args.c                                      |      2 +-
 external/bsd/ntp/dist/ntpd/declcond.h                                      |      2 +-
 external/bsd/ntp/dist/ntpd/jupiter.h                                       |      2 +-
 external/bsd/ntp/dist/ntpd/keyword-gen.c                                   |      2 +-
 external/bsd/ntp/dist/ntpd/ntp_config.c                                    |    254 +-
 external/bsd/ntp/dist/ntpd/ntp_control.c                                   |     50 +-
 external/bsd/ntp/dist/ntpd/ntp_crypto.c                                    |    161 +-
 external/bsd/ntp/dist/ntpd/ntp_filegen.c                                   |      2 +-
 external/bsd/ntp/dist/ntpd/ntp_io.c                                        |     82 +-
 external/bsd/ntp/dist/ntpd/ntp_leapsec.c                                   |      4 +-
 external/bsd/ntp/dist/ntpd/ntp_leapsec.h                                   |      2 +-
 external/bsd/ntp/dist/ntpd/ntp_loopfilter.c                                |    166 +-
 external/bsd/ntp/dist/ntpd/ntp_monitor.c                                   |      2 +-
 external/bsd/ntp/dist/ntpd/ntp_parser.c                                    |   5543 +-
 external/bsd/ntp/dist/ntpd/ntp_parser.h                                    |    444 +-
 external/bsd/ntp/dist/ntpd/ntp_parser.y                                    |     38 +-
 external/bsd/ntp/dist/ntpd/ntp_peer.c                                      |      2 +-
 external/bsd/ntp/dist/ntpd/ntp_prio_q.c                                    |      2 +-
 external/bsd/ntp/dist/ntpd/ntp_proto.c                                     |     19 +-
 external/bsd/ntp/dist/ntpd/ntp_refclock.c                                  |     18 +-
 external/bsd/ntp/dist/ntpd/ntp_request.c                                   |      4 +-
 external/bsd/ntp/dist/ntpd/ntp_restrict.c                                  |      2 +-
 external/bsd/ntp/dist/ntpd/ntp_scanner.c                                   |     32 +-
 external/bsd/ntp/dist/ntpd/ntp_scanner.h                                   |      2 +-
 external/bsd/ntp/dist/ntpd/ntp_signd.c                                     |      2 +-
 external/bsd/ntp/dist/ntpd/ntp_timer.c                                     |      2 +-
 external/bsd/ntp/dist/ntpd/ntp_util.c                                      |    143 +-
 external/bsd/ntp/dist/ntpd/ntpd-opts.c                                     |      2 +-
 external/bsd/ntp/dist/ntpd/ntpd-opts.h                                     |     25 +-
 external/bsd/ntp/dist/ntpd/ntpd.c                                          |    125 +-
 external/bsd/ntp/dist/ntpd/ntpsim.c                                        |      2 +-
 external/bsd/ntp/dist/ntpd/ppsapi_timepps.h                                |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_acts.c                                 |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_arbiter.c                              |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_arc.c                                  |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_as2201.c                               |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_atom.c                                 |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_bancomm.c                              |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_chronolog.c                            |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_chu.c                                  |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_conf.c                                 |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_datum.c                                |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_dumbclock.c                            |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_fg.c                                   |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c                             |      8 +-
 external/bsd/ntp/dist/ntpd/refclock_gpsvme.c                               |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_heath.c                                |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_hopfpci.c                              |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_hopfser.c                              |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_hpgps.c                                |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_irig.c                                 |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_jjy.c                                  |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_jupiter.c                              |      4 +-
 external/bsd/ntp/dist/ntpd/refclock_leitch.c                               |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_local.c                                |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_msfees.c                               |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_mx4200.c                               |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_neoclock4x.c                           |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_nmea.c                                 |    211 +-
 external/bsd/ntp/dist/ntpd/refclock_oncore.c                               |      7 +-
 external/bsd/ntp/dist/ntpd/refclock_palisade.c                             |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_palisade.h                             |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_parse.c                                |      6 +-
 external/bsd/ntp/dist/ntpd/refclock_pcf.c                                  |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_pst.c                                  |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_ripencc.c                              |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_shm.c                                  |    374 +-
 external/bsd/ntp/dist/ntpd/refclock_tpro.c                                 |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_true.c                                 |    155 +-
 external/bsd/ntp/dist/ntpd/refclock_tsyncpci.c                             |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_tt560.c                                |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_ulink.c                                |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_wwv.c                                  |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_wwvb.c                                 |      2 +-
 external/bsd/ntp/dist/ntpd/refclock_zyfer.c                                |      2 +-
 external/bsd/ntp/dist/ntpdate/ntpdate.c                                    |      2 +-
 external/bsd/ntp/dist/ntpdate/ntpdate.h                                    |      2 +-
 external/bsd/ntp/dist/ntpdc/nl_in.c                                        |      2 +-
 external/bsd/ntp/dist/ntpdc/ntpdc-layout.c                                 |      2 +-
 external/bsd/ntp/dist/ntpdc/ntpdc-opts.c                                   |      2 +-
 external/bsd/ntp/dist/ntpdc/ntpdc-opts.h                                   |      2 +-
 external/bsd/ntp/dist/ntpdc/ntpdc.c                                        |      2 +-
 external/bsd/ntp/dist/ntpdc/ntpdc.h                                        |      2 +-
 external/bsd/ntp/dist/ntpdc/ntpdc_ops.c                                    |      2 +-
 external/bsd/ntp/dist/ntpq/libntpq.c                                       |      2 +-
 external/bsd/ntp/dist/ntpq/libntpq.h                                       |      2 +-
 external/bsd/ntp/dist/ntpq/libntpq_subs.c                                  |      2 +-
 external/bsd/ntp/dist/ntpq/ntpq-opts.c                                     |      2 +-
 external/bsd/ntp/dist/ntpq/ntpq-opts.h                                     |      2 +-
 external/bsd/ntp/dist/ntpq/ntpq-subs.c                                     |     20 +-
 external/bsd/ntp/dist/ntpq/ntpq.c                                          |     22 +-
 external/bsd/ntp/dist/ntpq/ntpq.h                                          |      2 +-
 external/bsd/ntp/dist/ntpsnmpd/netsnmp_daemonize.c                         |      2 +-
 external/bsd/ntp/dist/ntpsnmpd/ntpSnmpSubagentObject.c                     |      2 +-
 external/bsd/ntp/dist/ntpsnmpd/ntpSnmpSubagentObject.h                     |      2 +-
 external/bsd/ntp/dist/ntpsnmpd/ntp_snmp.h                                  |      2 +-
 external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c                             |      2 +-
 external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h                             |      2 +-
 external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.c                                  |      2 +-
 external/bsd/ntp/dist/parseutil/dcfd.c                                     |      2 +-
 external/bsd/ntp/dist/parseutil/testdcf.c                                  |      2 +-
 external/bsd/ntp/dist/sntp/ag-tpl/Mdoc.pm                                  |    515 -
 external/bsd/ntp/dist/sntp/ag-tpl/Old/agman-file.tpl                       |     86 -
 external/bsd/ntp/dist/sntp/ag-tpl/Old/agmdoc-file.tpl                      |     73 -
 external/bsd/ntp/dist/sntp/ag-tpl/Old/agtexi-cmd.tpl                       |    884 -
 external/bsd/ntp/dist/sntp/ag-tpl/Old/cmd-doc.tlib                         |   1003 -
 external/bsd/ntp/dist/sntp/ag-tpl/Old/mdoc2man                             |    308 -
 external/bsd/ntp/dist/sntp/ag-tpl/agman-cmd.tpl                            |     58 -
 external/bsd/ntp/dist/sntp/ag-tpl/agmdoc-cmd.tpl                           |     46 -
 external/bsd/ntp/dist/sntp/ag-tpl/cmd-doc.tlib                             |   1079 -
 external/bsd/ntp/dist/sntp/ag-tpl/mdoc-synopsis.tlib                       |     92 -
 external/bsd/ntp/dist/sntp/ag-tpl/mdoc2man                                 |    181 -
 external/bsd/ntp/dist/sntp/ag-tpl/mdoc2texi                                |    150 -
 external/bsd/ntp/dist/sntp/ag-tpl/perlopt.tpl                              |    176 -
 external/bsd/ntp/dist/sntp/crypto.c                                        |      2 +-
 external/bsd/ntp/dist/sntp/crypto.h                                        |      2 +-
 external/bsd/ntp/dist/sntp/data_formats.h                                  |      2 +-
 external/bsd/ntp/dist/sntp/kod_management.c                                |      2 +-
 external/bsd/ntp/dist/sntp/kod_management.h                                |      2 +-
 external/bsd/ntp/dist/sntp/libevent/CommitLog                              |  18291 ----------
 external/bsd/ntp/dist/sntp/libevent/WIN32-Code/evconfig-private.h          |      8 -
 external/bsd/ntp/dist/sntp/libevent/WIN32-Code/event2/event-config.h       |    365 -
 external/bsd/ntp/dist/sntp/libevent/WIN32-Code/nmake/evconfig-private.h    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/WIN32-Code/nmake/event2/event-config.h |      2 +-
 external/bsd/ntp/dist/sntp/libevent/WIN32-Code/tree.h                      |      2 +-
 external/bsd/ntp/dist/sntp/libevent/arc4random.c                           |      2 +-
 external/bsd/ntp/dist/sntp/libevent/buffer.c                               |      2 +-
 external/bsd/ntp/dist/sntp/libevent/buffer_iocp.c                          |      2 +-
 external/bsd/ntp/dist/sntp/libevent/bufferevent-internal.h                 |      2 +-
 external/bsd/ntp/dist/sntp/libevent/bufferevent.c                          |      2 +-
 external/bsd/ntp/dist/sntp/libevent/bufferevent_async.c                    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/bufferevent_filter.c                   |      2 +-
 external/bsd/ntp/dist/sntp/libevent/bufferevent_openssl.c                  |      2 +-
 external/bsd/ntp/dist/sntp/libevent/bufferevent_pair.c                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/bufferevent_ratelim.c                  |      2 +-
 external/bsd/ntp/dist/sntp/libevent/bufferevent_sock.c                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/changelist-internal.h                  |      2 +-
 external/bsd/ntp/dist/sntp/libevent/compat/sys/queue.h                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/defer-internal.h                       |      2 +-
 external/bsd/ntp/dist/sntp/libevent/devpoll.c                              |      2 +-
 external/bsd/ntp/dist/sntp/libevent/epoll.c                                |      2 +-
 external/bsd/ntp/dist/sntp/libevent/epoll_sub.c                            |      2 +-
 external/bsd/ntp/dist/sntp/libevent/epolltable-internal.h                  |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evbuffer-internal.h                    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evconfig-private.h                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evdns.3                                |    322 -
 external/bsd/ntp/dist/sntp/libevent/evdns.c                                |      2 +-
 external/bsd/ntp/dist/sntp/libevent/event-internal.h                       |      2 +-
 external/bsd/ntp/dist/sntp/libevent/event.3                                |    624 -
 external/bsd/ntp/dist/sntp/libevent/event.c                                |      2 +-
 external/bsd/ntp/dist/sntp/libevent/event_iocp.c                           |      2 +-
 external/bsd/ntp/dist/sntp/libevent/event_tagging.c                        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evmap-internal.h                       |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evmap.c                                |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evport.c                               |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evrpc-internal.h                       |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evrpc.c                                |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evsignal-internal.h                    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evthread-internal.h                    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evthread.c                             |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evthread_pthread.c                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evthread_win32.c                       |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evutil.c                               |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evutil_rand.c                          |      2 +-
 external/bsd/ntp/dist/sntp/libevent/evutil_time.c                          |      2 +-
 external/bsd/ntp/dist/sntp/libevent/ht-internal.h                          |      2 +-
 external/bsd/ntp/dist/sntp/libevent/http-internal.h                        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/http.c                                 |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/Makefile.in                    |    561 -
 external/bsd/ntp/dist/sntp/libevent/include/evdns.h                        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event.h                        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/buffer.h                |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/buffer_compat.h         |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent.h           |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_compat.h    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_ssl.h       |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_struct.h    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/dns.h                   |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/dns_compat.h            |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/dns_struct.h            |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/event.h                 |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/event_compat.h          |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/event_struct.h          |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/http.h                  |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/http_compat.h           |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/http_struct.h           |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/keyvalq_struct.h        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/listener.h              |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/rpc.h                   |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/rpc_compat.h            |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/rpc_struct.h            |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/tag.h                   |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/tag_compat.h            |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/thread.h                |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/util.h                  |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/event2/visibility.h            |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/evhttp.h                       |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/evrpc.h                        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/include/evutil.h                       |      2 +-
 external/bsd/ntp/dist/sntp/libevent/iocp-internal.h                        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/ipv6-internal.h                        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/kqueue-internal.h                      |      2 +-
 external/bsd/ntp/dist/sntp/libevent/kqueue.c                               |      2 +-
 external/bsd/ntp/dist/sntp/libevent/listener.c                             |      2 +-
 external/bsd/ntp/dist/sntp/libevent/log-internal.h                         |      2 +-
 external/bsd/ntp/dist/sntp/libevent/log.c                                  |      2 +-
 external/bsd/ntp/dist/sntp/libevent/m4/LICENSE-OPENLDAP                    |     47 -
 external/bsd/ntp/dist/sntp/libevent/make_epoll_table.py                    |     57 -
 external/bsd/ntp/dist/sntp/libevent/minheap-internal.h                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/mm-internal.h                          |      2 +-
 external/bsd/ntp/dist/sntp/libevent/poll.c                                 |      2 +-
 external/bsd/ntp/dist/sntp/libevent/ratelim-internal.h                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/sample/Makefile.in                     |    566 -
 external/bsd/ntp/dist/sntp/libevent/sample/dns-example.c                   |      2 +-
 external/bsd/ntp/dist/sntp/libevent/sample/event-read-fifo.c               |      2 +-
 external/bsd/ntp/dist/sntp/libevent/sample/hello-world.c                   |      2 +-
 external/bsd/ntp/dist/sntp/libevent/sample/hostcheck.c                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/sample/hostcheck.h                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/sample/http-server.c                   |      2 +-
 external/bsd/ntp/dist/sntp/libevent/sample/https-client.c                  |      2 +-
 external/bsd/ntp/dist/sntp/libevent/sample/le-proxy.c                      |      2 +-
 external/bsd/ntp/dist/sntp/libevent/sample/openssl_hostname_validation.c   |      2 +-
 external/bsd/ntp/dist/sntp/libevent/sample/openssl_hostname_validation.h   |      2 +-
 external/bsd/ntp/dist/sntp/libevent/sample/signal-test.c                   |      2 +-
 external/bsd/ntp/dist/sntp/libevent/sample/time-test.c                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/select.c                               |      2 +-
 external/bsd/ntp/dist/sntp/libevent/signal.c                               |      2 +-
 external/bsd/ntp/dist/sntp/libevent/strlcpy-internal.h                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/strlcpy.c                              |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/Makefile.in                       |   1137 -
 external/bsd/ntp/dist/sntp/libevent/test/bench.c                           |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/bench_cascade.c                   |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/bench_http.c                      |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/bench_httpclient.c                |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/print-winsock-errors.c            |     86 -
 external/bsd/ntp/dist/sntp/libevent/test/regress.c                         |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress.gen.c                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress.gen.h                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress.h                         |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_buffer.c                  |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_bufferevent.c             |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_dns.c                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_et.c                      |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_finalize.c                |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_http.c                    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_iocp.c                    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_listener.c                |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_main.c                    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_minheap.c                 |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_rpc.c                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_ssl.c                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_testutils.c               |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_testutils.h               |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_thread.c                  |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_thread.h                  |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_util.c                    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/regress_zlib.c                    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/test-changelist.c                 |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/test-closed.c                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/test-dumpevents.c                 |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/test-eof.c                        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/test-fdleak.c                     |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/test-init.c                       |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/test-ratelim.c                    |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/test-ratelim.sh                   |     88 -
 external/bsd/ntp/dist/sntp/libevent/test/test-time.c                       |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/test-weof.c                       |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/tinytest.c                        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/tinytest.h                        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/tinytest_demo.c                   |    259 -
 external/bsd/ntp/dist/sntp/libevent/test/tinytest_local.h                  |      2 +-
 external/bsd/ntp/dist/sntp/libevent/test/tinytest_macros.h                 |      2 +-
 external/bsd/ntp/dist/sntp/libevent/time-internal.h                        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/util-internal.h                        |      2 +-
 external/bsd/ntp/dist/sntp/libevent/win32select.c                          |      2 +-
 external/bsd/ntp/dist/sntp/libopts/ag-char-map.h                           |      2 +-
 external/bsd/ntp/dist/sntp/libopts/alias.c                                 |      2 +-
 external/bsd/ntp/dist/sntp/libopts/ao-strs.c                               |      2 +-
 external/bsd/ntp/dist/sntp/libopts/ao-strs.h                               |      2 +-
 external/bsd/ntp/dist/sntp/libopts/autoopts.c                              |      4 +-
 external/bsd/ntp/dist/sntp/libopts/autoopts.h                              |     15 +-
 external/bsd/ntp/dist/sntp/libopts/autoopts/options.h                      |     41 +-
 external/bsd/ntp/dist/sntp/libopts/autoopts/project.h                      |      2 +-
 external/bsd/ntp/dist/sntp/libopts/autoopts/usage-txt.h                    |      2 +-
 external/bsd/ntp/dist/sntp/libopts/boolean.c                               |      2 +-
 external/bsd/ntp/dist/sntp/libopts/check.c                                 |      2 +-
 external/bsd/ntp/dist/sntp/libopts/compat/_Noreturn.h                      |      2 +-
 external/bsd/ntp/dist/sntp/libopts/compat/compat.h                         |      2 +-
 external/bsd/ntp/dist/sntp/libopts/compat/pathfind.c                       |      2 +-
 external/bsd/ntp/dist/sntp/libopts/compat/snprintf.c                       |      2 +-
 external/bsd/ntp/dist/sntp/libopts/compat/strchr.c                         |      2 +-
 external/bsd/ntp/dist/sntp/libopts/compat/strdup.c                         |      2 +-
 external/bsd/ntp/dist/sntp/libopts/compat/windows-config.h                 |      2 +-
 external/bsd/ntp/dist/sntp/libopts/configfile.c                            |      4 +-
 external/bsd/ntp/dist/sntp/libopts/cook.c                                  |      2 +-
 external/bsd/ntp/dist/sntp/libopts/enum.c                                  |      4 +-
 external/bsd/ntp/dist/sntp/libopts/env.c                                   |      2 +-
 external/bsd/ntp/dist/sntp/libopts/file.c                                  |      4 +-
 external/bsd/ntp/dist/sntp/libopts/find.c                                  |      4 +-
 external/bsd/ntp/dist/sntp/libopts/genshell.c                              |      2 +-
 external/bsd/ntp/dist/sntp/libopts/genshell.h                              |      2 +-
 external/bsd/ntp/dist/sntp/libopts/gettext.h                               |      2 +-
 external/bsd/ntp/dist/sntp/libopts/init.c                                  |      4 +-
 external/bsd/ntp/dist/sntp/libopts/intprops.h                              |      2 +-
 external/bsd/ntp/dist/sntp/libopts/libopts.c                               |      2 +-
 external/bsd/ntp/dist/sntp/libopts/load.c                                  |      4 +-
 external/bsd/ntp/dist/sntp/libopts/makeshell.c                             |     10 +-
 external/bsd/ntp/dist/sntp/libopts/nested.c                                |    129 +-
 external/bsd/ntp/dist/sntp/libopts/numeric.c                               |     11 +-
 external/bsd/ntp/dist/sntp/libopts/option-value-type.c                     |      2 +-
 external/bsd/ntp/dist/sntp/libopts/option-value-type.h                     |      2 +-
 external/bsd/ntp/dist/sntp/libopts/option-xat-attribute.c                  |      2 +-
 external/bsd/ntp/dist/sntp/libopts/option-xat-attribute.h                  |      2 +-
 external/bsd/ntp/dist/sntp/libopts/parse-duration.c                        |     13 +-
 external/bsd/ntp/dist/sntp/libopts/parse-duration.h                        |      2 +-
 external/bsd/ntp/dist/sntp/libopts/pgusage.c                               |      4 +-
 external/bsd/ntp/dist/sntp/libopts/proto.h                                 |      2 +-
 external/bsd/ntp/dist/sntp/libopts/putshell.c                              |      4 +-
 external/bsd/ntp/dist/sntp/libopts/reset.c                                 |      4 +-
 external/bsd/ntp/dist/sntp/libopts/restore.c                               |      2 +-
 external/bsd/ntp/dist/sntp/libopts/save.c                                  |      4 +-
 external/bsd/ntp/dist/sntp/libopts/sort.c                                  |      2 +-
 external/bsd/ntp/dist/sntp/libopts/stack.c                                 |     89 +-
 external/bsd/ntp/dist/sntp/libopts/stdnoreturn.in.h                        |      2 +-
 external/bsd/ntp/dist/sntp/libopts/streqvcmp.c                             |      4 +-
 external/bsd/ntp/dist/sntp/libopts/text_mmap.c                             |      2 +-
 external/bsd/ntp/dist/sntp/libopts/time.c                                  |      2 +-
 external/bsd/ntp/dist/sntp/libopts/tokenize.c                              |      4 +-
 external/bsd/ntp/dist/sntp/libopts/usage.c                                 |      4 +-
 external/bsd/ntp/dist/sntp/libopts/version.c                               |      2 +-
 external/bsd/ntp/dist/sntp/log.c                                           |      2 +-
 external/bsd/ntp/dist/sntp/log.h                                           |      2 +-
 external/bsd/ntp/dist/sntp/main.c                                          |      4 +-
 external/bsd/ntp/dist/sntp/main.h                                          |      2 +-
 external/bsd/ntp/dist/sntp/networking.c                                    |     69 +-
 external/bsd/ntp/dist/sntp/networking.h                                    |      2 +-
 external/bsd/ntp/dist/sntp/sntp-opts.c                                     |    409 +-
 external/bsd/ntp/dist/sntp/sntp-opts.h                                     |      2 +-
 external/bsd/ntp/dist/sntp/sntp.c                                          |      2 +-
 external/bsd/ntp/dist/sntp/tests/fileHandlingTest.h                        |      2 +-
 external/bsd/ntp/dist/sntp/tests/sntptest.h                                |      2 +-
 external/bsd/ntp/dist/sntp/tests_main.h                                    |      2 +-
 external/bsd/ntp/dist/sntp/utilities.c                                     |      2 +-
 external/bsd/ntp/dist/sntp/utilities.h                                     |      2 +-
 external/bsd/ntp/dist/tests/libntp/lfptest.h                               |      2 +-
 external/bsd/ntp/dist/tests/libntp/libntptest.h                            |      2 +-
 external/bsd/ntp/dist/tests/libntp/sockaddrtest.h                          |      2 +-
 external/bsd/ntp/dist/tests/libntp/timestructs.h                           |      2 +-
 external/bsd/ntp/dist/tests/ntpd/ntpdtest.h                                |      2 +-
 external/bsd/ntp/dist/util/audio-pcm.c                                     |      2 +-
 external/bsd/ntp/dist/util/byteorder.c                                     |      2 +-
 external/bsd/ntp/dist/util/hist.c                                          |      2 +-
 external/bsd/ntp/dist/util/jitter.c                                        |      2 +-
 external/bsd/ntp/dist/util/jitter.h                                        |      2 +-
 external/bsd/ntp/dist/util/kern.c                                          |      2 +-
 external/bsd/ntp/dist/util/longsize.c                                      |      2 +-
 external/bsd/ntp/dist/util/ntp-keygen-opts.c                               |    499 +-
 external/bsd/ntp/dist/util/ntp-keygen-opts.h                               |      2 +-
 external/bsd/ntp/dist/util/ntp-keygen.c                                    |     26 +-
 external/bsd/ntp/dist/util/ntptime.c                                       |      2 +-
 external/bsd/ntp/dist/util/pps-api.c                                       |      2 +-
 external/bsd/ntp/dist/util/precision.c                                     |      2 +-
 external/bsd/ntp/dist/util/sht.c                                           |      2 +-
 external/bsd/ntp/dist/util/testrs6000.c                                    |      2 +-
 external/bsd/ntp/dist/util/tg.c                                            |      2 +-
 external/bsd/ntp/dist/util/tg2.c                                           |      2 +-
 external/bsd/ntp/dist/util/tickadj.c                                       |      2 +-
 external/bsd/ntp/dist/util/timetrim.c                                      |      2 +-
 external/bsd/ntp/include/config.h                                          |     38 +-
 external/bsd/ntp/lib/libiscntp/Makefile                                    |      3 +-
 external/bsd/ntp/lib/libntp/Makefile                                       |      4 +-
 806 files changed, 6695 insertions(+), 32142 deletions(-)

diffs (truncated from 47778 to 300 lines):

diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/bin/ntpd/Makefile
--- a/external/bsd/ntp/bin/ntpd/Makefile        Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/bin/ntpd/Makefile        Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2014/01/20 01:52:54 christos Exp $
+#      $NetBSD: Makefile,v 1.17 2014/12/19 20:43:14 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -41,6 +41,7 @@
        refclock_datum.c                        \
        refclock_dumbclock.c                    \
        refclock_fg.c                           \
+       refclock_gpsdjson.c                     \
        refclock_gpsvme.c                       \
        refclock_heath.c                        \
        refclock_hopfpci.c                      \
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/adjtimed/adjtimed.c
--- a/external/bsd/ntp/dist/adjtimed/adjtimed.c Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/adjtimed/adjtimed.c Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: adjtimed.c,v 1.1.1.1 2009/12/13 16:53:40 kardel Exp $  */
+/*     $NetBSD: adjtimed.c,v 1.2 2014/12/19 20:43:14 christos Exp $    */
 
 /*************************************************************************/
 /* (c) Copyright Tai Jin, 1988.  All Rights Reserved.                    */
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/clockstuff/chutest.c
--- a/external/bsd/ntp/dist/clockstuff/chutest.c        Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/clockstuff/chutest.c        Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chutest.c,v 1.1.1.2 2013/12/27 23:30:33 christos Exp $ */
+/*     $NetBSD: chutest.c,v 1.2 2014/12/19 20:43:14 christos Exp $     */
 
 /* chutest.c,v 3.1 1993/07/06 01:05:21 jbj Exp
  * chutest - test the CHU clock
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/clockstuff/propdelay.c
--- a/external/bsd/ntp/dist/clockstuff/propdelay.c      Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/clockstuff/propdelay.c      Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: propdelay.c,v 1.1.1.2 2013/12/27 23:30:33 christos Exp $       */
+/*     $NetBSD: propdelay.c,v 1.2 2014/12/19 20:43:14 christos Exp $   */
 
 /* propdelay.c,v 3.1 1993/07/06 01:05:24 jbj Exp
  * propdelay - compute propagation delays
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/adjtime.h
--- a/external/bsd/ntp/dist/include/adjtime.h   Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/adjtime.h   Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: adjtime.h,v 1.1.1.1 2009/12/13 16:54:48 kardel Exp $   */
+/*     $NetBSD: adjtime.h,v 1.2 2014/12/19 20:43:14 christos Exp $     */
 
 /*************************************************************************/
 /* (c) Copyright Tai Jin, 1988.  All Rights Reserved.                    */
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ascii.h
--- a/external/bsd/ntp/dist/include/ascii.h     Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ascii.h     Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ascii.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $   */
+/*     $NetBSD: ascii.h,v 1.2 2014/12/19 20:43:14 christos Exp $       */
 
 /*
  * /src/NTP/ntp4-dev/include/ascii.h,v 4.4 2005/04/16 17:32:10 kardel RELEASE_20050508_A
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/audio.h
--- a/external/bsd/ntp/dist/include/audio.h     Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/audio.h     Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.h,v 1.2 2010/12/04 23:08:33 christos Exp $       */
+/*     $NetBSD: audio.h,v 1.3 2014/12/19 20:43:14 christos Exp $       */
 
 /*
  * Header file for audio drivers
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/binio.h
--- a/external/bsd/ntp/dist/include/binio.h     Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/binio.h     Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: binio.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $   */
+/*     $NetBSD: binio.h,v 1.2 2014/12/19 20:43:14 christos Exp $       */
 
 /*
  * /src/NTP/ntp4-dev/include/binio.h,v 4.5 2005/04/16 17:32:10 kardel RELEASE_20050508_A
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/declcond.h
--- a/external/bsd/ntp/dist/include/declcond.h  Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/declcond.h  Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: declcond.h,v 1.1.1.1 2013/12/27 23:30:46 christos Exp $        */
+/*     $NetBSD: declcond.h,v 1.2 2014/12/19 20:43:14 christos Exp $    */
 
 /*
  * declcond.h - declarations conditionalized for ntpd
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/gps.h
--- a/external/bsd/ntp/dist/include/gps.h       Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/gps.h       Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gps.h,v 1.1.1.1 2009/12/13 16:54:48 kardel Exp $       */
+/*     $NetBSD: gps.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */
 
 /****************************************************************************/
 /*      gps.h                                                            */     
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/hopf6039.h
--- a/external/bsd/ntp/dist/include/hopf6039.h  Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/hopf6039.h  Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hopf6039.h,v 1.1.1.1 2009/12/13 16:54:48 kardel Exp $  */
+/*     $NetBSD: hopf6039.h,v 1.2 2014/12/19 20:43:14 christos Exp $    */
 
 /****************************************************************************/
 /*      hopf6039.h                                                          */     
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/icom.h
--- a/external/bsd/ntp/dist/include/icom.h      Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/icom.h      Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: icom.h,v 1.2 2010/12/04 23:08:33 christos Exp $        */
+/*     $NetBSD: icom.h,v 1.3 2014/12/19 20:43:14 christos Exp $        */
 
 /*
  * Header file for ICOM radios
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ieee754io.h
--- a/external/bsd/ntp/dist/include/ieee754io.h Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ieee754io.h Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee754io.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $       */
+/*     $NetBSD: ieee754io.h,v 1.2 2014/12/19 20:43:14 christos Exp $   */
 
 /*
  * /src/NTP/ntp4-dev/include/ieee754io.h,v 4.3 2005/04/16 17:32:10 kardel RELEASE_20050508_A
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/intreswork.h
--- a/external/bsd/ntp/dist/include/intreswork.h        Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/intreswork.h        Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intreswork.h,v 1.1.1.1 2013/12/27 23:30:45 christos Exp $      */
+/*     $NetBSD: intreswork.h,v 1.2 2014/12/19 20:43:14 christos Exp $  */
 
 /*
  * intreswork.h -- declarations private to ntp_intres.c, ntp_worker.c.
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/iosignal.h
--- a/external/bsd/ntp/dist/include/iosignal.h  Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/iosignal.h  Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iosignal.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $        */
+/*     $NetBSD: iosignal.h,v 1.2 2014/12/19 20:43:14 christos Exp $    */
 
 #ifndef IOSIGNAL_H
 #define IOSIGNAL_H
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/isc/mem.h
--- a/external/bsd/ntp/dist/include/isc/mem.h   Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/isc/mem.h   Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem.h,v 1.1.1.3 2013/12/27 23:30:46 christos Exp $     */
+/*     $NetBSD: mem.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */
 
 /*
  * libntp local override of isc/mem.h to stub it out.
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/l_stdlib.h
--- a/external/bsd/ntp/dist/include/l_stdlib.h  Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/l_stdlib.h  Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: l_stdlib.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $        */
+/*     $NetBSD: l_stdlib.h,v 1.2 2014/12/19 20:43:14 christos Exp $    */
 
 /*
  * Proto types for machines that are not ANSI and POSIX         compliant.
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/lib_strbuf.h
--- a/external/bsd/ntp/dist/include/lib_strbuf.h        Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/lib_strbuf.h        Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lib_strbuf.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $      */
+/*     $NetBSD: lib_strbuf.h,v 1.2 2014/12/19 20:43:14 christos Exp $  */
 
 /*
  * lib_strbuf.h - definitions for routines which use the common string buffers
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/libntp.h
--- a/external/bsd/ntp/dist/include/libntp.h    Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/libntp.h    Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: libntp.h,v 1.1.1.1 2013/12/27 23:30:46 christos Exp $  */
+/*     $NetBSD: libntp.h,v 1.2 2014/12/19 20:43:14 christos Exp $      */
 
 /* libntp.h */
 
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/mbg_gps166.h
--- a/external/bsd/ntp/dist/include/mbg_gps166.h        Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/mbg_gps166.h        Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbg_gps166.h,v 1.1.1.3 2013/12/27 23:30:45 christos Exp $      */
+/*     $NetBSD: mbg_gps166.h,v 1.2 2014/12/19 20:43:14 christos Exp $  */
 
 /*
  * /src/NTP/REPOSITORY/ntp4-dev/include/mbg_gps166.h,v 4.7 2006/06/22 18:41:43 kardel RELEASE_20060622_A
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/mx4200.h
--- a/external/bsd/ntp/dist/include/mx4200.h    Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/mx4200.h    Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mx4200.h,v 1.1.1.1 2009/12/13 16:54:49 kardel Exp $    */
+/*     $NetBSD: mx4200.h,v 1.2 2014/12/19 20:43:14 christos Exp $      */
 
 
 /* records transmitted from extern CDU to MX 4200 */
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ntif.h
--- a/external/bsd/ntp/dist/include/ntif.h      Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ntif.h      Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntif.h,v 1.1.1.1 2009/12/13 16:54:49 kardel Exp $      */
+/*     $NetBSD: ntif.h,v 1.2 2014/12/19 20:43:14 christos Exp $        */
 
 /* this is a hacked version of if.h from unix to contain the stuff we need only to build named (bind) with
    the minimal amount of changes... by l. kahn */
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ntp.h
--- a/external/bsd/ntp/dist/include/ntp.h       Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ntp.h       Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp.h,v 1.1.1.4 2014/12/19 20:37:38 christos Exp $     */
+/*     $NetBSD: ntp.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */
 
 /*
  * ntp.h - NTP definitions for the masses
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ntp_assert.h
--- a/external/bsd/ntp/dist/include/ntp_assert.h        Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ntp_assert.h        Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_assert.h,v 1.1.1.4 2014/12/19 20:37:38 christos Exp $      */
+/*     $NetBSD: ntp_assert.h,v 1.2 2014/12/19 20:43:14 christos Exp $  */
 
 /*
  * ntp_assert.h - design by contract stuff
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ntp_calendar.h
--- a/external/bsd/ntp/dist/include/ntp_calendar.h      Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ntp_calendar.h      Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_calendar.h,v 1.1.1.3 2014/12/19 20:37:38 christos Exp $    */
+/*     $NetBSD: ntp_calendar.h,v 1.2 2014/12/19 20:43:14 christos Exp $        */
 
 /*
  * ntp_calendar.h - definitions for the calendar time-of-day routine
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ntp_cmdargs.h
--- a/external/bsd/ntp/dist/include/ntp_cmdargs.h       Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ntp_cmdargs.h       Fri Dec 19 20:43:14 2014 +0000
@@ -1,3 +1,3 @@
-/*     $NetBSD: ntp_cmdargs.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $     */
+/*     $NetBSD: ntp_cmdargs.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */
 
 extern void    getCmdOpts(int, char **);
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ntp_config.h
--- a/external/bsd/ntp/dist/include/ntp_config.h        Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ntp_config.h        Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_config.h,v 1.5 2013/12/30 17:42:19 christos Exp $  */
+/*     $NetBSD: ntp_config.h,v 1.6 2014/12/19 20:43:14 christos Exp $  */
 
 #ifndef NTP_CONFIG_H
 #define NTP_CONFIG_H
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ntp_control.h
--- a/external/bsd/ntp/dist/include/ntp_control.h       Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ntp_control.h       Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_control.h,v 1.1.1.3 2013/12/27 23:30:45 christos Exp $     */
+/*     $NetBSD: ntp_control.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */
 
 /*
  * ntp_control.h - definitions related to NTP mode 6 control messages
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ntp_crypto.h
--- a/external/bsd/ntp/dist/include/ntp_crypto.h        Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ntp_crypto.h        Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_crypto.h,v 1.1.1.3 2014/12/19 20:37:38 christos Exp $      */
+/*     $NetBSD: ntp_crypto.h,v 1.2 2014/12/19 20:43:14 christos Exp $  */
 
 /*
  * ntp_crypto.h - definitions for cryptographic operations
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ntp_datum.h
--- a/external/bsd/ntp/dist/include/ntp_datum.h Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ntp_datum.h Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_datum.h,v 1.1.1.1 2009/12/13 16:54:50 kardel Exp $ */
+/*     $NetBSD: ntp_datum.h,v 1.2 2014/12/19 20:43:14 christos Exp $   */
 
 struct btfp_time                /* Structure for reading 5 time words   */
                                 /* in one ioctl(2) operation.           */
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ntp_debug.h
--- a/external/bsd/ntp/dist/include/ntp_debug.h Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ntp_debug.h Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_debug.h,v 1.1.1.3 2013/12/27 23:30:46 christos Exp $       */
+/*     $NetBSD: ntp_debug.h,v 1.2 2014/12/19 20:43:14 christos Exp $   */
 
 /*
  * Header
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ntp_filegen.h
--- a/external/bsd/ntp/dist/include/ntp_filegen.h       Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ntp_filegen.h       Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_filegen.h,v 1.3 2013/12/28 03:20:13 christos Exp $ */
+/*     $NetBSD: ntp_filegen.h,v 1.4 2014/12/19 20:43:14 christos Exp $ */
 
 /*
  * ntp_filegen.h,v 3.9 1996/12/01 16:02:45 kardel Exp
diff -r 44b6bc835f9e -r 054b1ae433b8 external/bsd/ntp/dist/include/ntp_fp.h
--- a/external/bsd/ntp/dist/include/ntp_fp.h    Fri Dec 19 20:37:31 2014 +0000
+++ b/external/bsd/ntp/dist/include/ntp_fp.h    Fri Dec 19 20:43:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_fp.h,v 1.4 2013/12/28 03:20:13 christos Exp $      */



Home | Main Index | Thread Index | Old Index