diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index f8f4c681cb80..15e9f2b6df2f 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -99,6 +99,13 @@ OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a OLD_DIRS+=usr/lib/clang/3.6.1/lib/freebsd OLD_DIRS+=usr/lib/clang/3.6.1/lib OLD_DIRS+=usr/lib/clang/3.6.1 +# 20150705: Rename DTrace provider man pages. +OLD_FILES+=usr/share/man/man4/dtrace-io.4.gz +OLD_FILES+=usr/share/man/man4/dtrace-ip.4.gz +OLD_FILES+=usr/share/man/man4/dtrace-proc.4.gz +OLD_FILES+=usr/share/man/man4/dtrace-sched.4.gz +OLD_FILES+=usr/share/man/man4/dtrace-tcp.4.gz +OLD_FILES+=usr/share/man/man4/dtrace-udp.4.gz # 20150604: Move nvlist man pages to section 9. OLD_FILES+=usr/share/man/man3/libnv.3.gz OLD_FILES+=usr/share/man/man3/nvlist.3.gz diff --git a/UPDATING b/UPDATING index 4598fe95566d..b1cfe1490cbd 100644 --- a/UPDATING +++ b/UPDATING @@ -36,6 +36,20 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: 20141231 entry below for information about prerequisites and upgrading, if you are not already using 3.5.0 or higher. +20150706: + sendmail has been updated to 8.15.2. Starting with FreeBSD 11.0 + and sendmail 8.15, sendmail uses uncompressed IPv6 addresses by + default, i.e., they will not contain "::". For example, instead + of ::1, it will be 0:0:0:0:0:0:0:1. This permits a zero subnet + to have a more specific match, such as different map entries for + IPv6:0:0 vs IPv6:0. This change requires that configuration + data (including maps, files, classes, custom ruleset, etc.) must + use the same format, so make certain such configuration data is + upgrading. As a very simple check search for patterns like + 'IPv6:[0-9a-fA-F:]*::' and 'IPv6::'. To return to the old + behavior, set the m4 option confUSE_COMPRESSED_IPV6_ADDRESSES or + the cf option UseCompressedIPv6Addresses. + 20150630: The default kernel entropy-processing algorithm is now Fortuna, replacing Yarrow. diff --git a/contrib/ntp/ChangeLog b/contrib/ntp/ChangeLog index e75384c88fab..738ae225867d 100644 --- a/contrib/ntp/ChangeLog +++ b/contrib/ntp/ChangeLog @@ -1,8 +1,145 @@ --- +(4.2.8p3) 2015/06/29 Released by Harlan Stenn + +* [Sec 2853] Crafted remote config packet can crash some versions of + ntpd. Aleksis Kauppinen, Juergen Perlinger, Harlan Stenn. +* [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. +* [Bug 1060] Buffer overruns in libparse/clk_rawdcf.c. Helge Oldach. +* [Bug 2846] Report 'unsynchronized' status during the leap second. + Fixed in Martin's changes to Bug 2855. Martin Burnicki. +* [Bug 2859] Improve raw DCF77 robustness deconding. Frank Kardel. +* [Bug 2860] ntpq ifstats sanity check is too stringent. Frank Kardel. +* README.leapsmear added. Martin Burnicki. +* README.leapsmear edited. Harlan Stenn. +* tests/libntp/msyslog.c: fixed a gcc warning. Tomasz Flendrich. +* ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn. +* html/miscopt.html: Document leapsmearinterval, other cleanup. Harlan Stenn. +--- +(4.2.8p3-RC3) 2015/06/27 Released by Harlan Stenn + +* [Bug 2855] Parser fix for conditional leap smear code. Harlan Stenn. +* [Bug 2855] Report leap smear in the REFID. Harlan Stenn. +* [Bug 2856] ntpd should wait() on terminated child processes. Paul Green. +* [Bug 2857] Stratus VOS does not support SIGIO. Paul Green. +* html/drivers/driver22.html: typo fix. Harlan Stenn. +* refidsmear test cleanup. Tomasz Flendrich. +* refidsmear function support and tests. Harlan Stenn. +* sntp/tests/Makefile.am: remove g_nameresolution.cpp as it tested + something that was only in the 4.2.6 sntp. Harlan Stenn. +* Modified tests/bug-2803/Makefile.am so it builds Unity framework tests. + Damir Tomić +* Modified tests/libtnp/Makefile.am so it builds Unity framework tests. + Damir Tomić +* Modified sntp/tests/Makefile.am so it builds Unity framework tests. + Damir Tomić +* tests/sandbox/smeartest.c: Harlan Stenn, Damir Tomic, Juergen Perlinger. +* Converted from gtest to Unity: tests/bug-2803/. Damir Tomić +* Converted from gtest to Unity: tests/libntp/ a_md5encrypt, atoint.c, + atouint.c, authkeys.c, buftvtots.c, calendar.c, caljulian.c, + calyearstart.c, clocktime.c, hextoint.c, lfpfunc.c, modetoa.c, + numtoa.c, numtohost.c, refnumtoa.c, ssl_init.c, statestr.c, + timespecops.c, timevalops.c, uglydate.c, vi64ops.c, ymd2yd.c. + Damir Tomić +* Converted from gtest to Unity: sntp/tests/ kodDatabase.c, kodFile.c, + networking.c, keyFile.c, utilities.cpp, sntptest.h, + fileHandlingTest.h. Damir Tomić +* Converted from gtest to Unity: sntp/tests/ caltontp.c, humandate.c, + msyslog.c, prettydate.c, recvbuff.c, sfptostr.c, tstotv.c, tvtots.c, + sntp/tests/packetProcessing.c. Tomasz Flendrich +--- +(4.2.8p3-RC2) 2015/06/24 Released by Harlan Stenn + +* [Bug 2778] Implement "apeers" ntpq command to include associd. +* [Bug 2805] ntpd fails to join multicast group. +* [Bug 2824] Convert update-leap to perl. (also see 2769) +* [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + NTPD transfers the current TAI (instead of an announcement) now. + This might still needed improvement. + Update autokey data ASAP when 'sys_tai' changes. + Fix unit test that was broken by changes for autokey update. + Avoid potential signature length issue and use DPRINTF where possible + in ntp_crypto.c. +* [Bug 2832] refclock_jjy.c supports the TDC-300. +* [Bug 2834] Correct a broken html tag in html/refclock.html +* [Bug 2836] DFC77 patches from Frank Kardel to make decoding more + robust, and require 2 consecutive timestamps to be consistent. +* [Bug 2837] Allow a configurable DSCP value. +* [Bug 2837] add test for DSCP to ntpd/complete.conf.in +* [Bug 2842] Glitch in ntp.conf.def documentation stanza. +* [Bug 2842] Bug in mdoc2man. +* [Bug 2843] make check fails on 4.3.36 + Fixed compiler warnings about numeric range overflow + (The original topic was fixed in a byplay to bug#2830) +* [Bug 2845] Harden memory allocation in ntpd. +* [Bug 2852] 'make check' can't find unity.h. Hal Murray. +* [Bug 2854] Missing brace in libntp/strdup.c. Masanari Iida. +* [Bug 2855] Implement conditional leap smear code. Martin Burnicki. +* [Bug 2855] leap smear cleanup. Harlan Stenn. +* Initial support for experimental leap smear code. Harlan Stenn. +* Fixes to sntp/tests/fileHandlingTest.h.in. Harlan Stenn. +* Report select() debug messages at debug level 3 now. +* sntp/scripts/genLocInfo: treat raspbian as debian. +* Unity test framework fixes. + ** Requires ruby for changes to tests. +* Initial support for PACKAGE_VERSION tests. +* sntp/libpkgver belongs in EXTRA_DIST, not DIST_SUBDIRS. +* tests/bug-2803/Makefile.am must distribute bug-2803.h. +* automake-1.15 cleanup for sntp/tests/fileHandlingTest.h.in . Harlan Stenn. +--- +(4.2.8p3-RC1) 2015/05/12 Released by Harlan Stenn + +* CID 739725: Fix a rare resource leak in libevent/listener.c. +* CID 1295478: Quiet a pedantic potential error from the fix for Bug 2776. +* CID 1296235: Fix refclock_jjy.c and correcting type of the driver40-ja.html +* CID 1269537: Clean up a line of dead code in getShmTime(). +* [Bug 2590] autogen-5.18.5. +* [Bug 2612] restrict: Warn when 'monitor' can't be disabled because + of 'limited'. +* [Bug 2650] fix includefile processing. +* [Bug 2745] ntpd -x steps clock on leap second + Fixed an initial-value problem that caused misbehaviour in absence of + any leapsecond information. + Do leap second stepping only of the step adjustment is beyond the + proper jump distance limit and step correction is allowed at all. +* [Bug 2750] build for Win64 + Building for 32bit of loopback ppsapi needs def file +* [Bug 2776] Improve ntpq's 'help keytype'. +* [Bug 2782] Refactor refclock_shm.c, add memory barrier protection. +* [Bug 2792] If the IFF_RUNNING interface flag is supported then an + interface is ignored as long as this flag is not set since the + interface is not usable (e.g., no link). +* [Bug 2794] Clean up kernel clock status reports. +* [Bug 2800] refclock_true.c true_debug() can't open debug log because + of incompatible open/fdopen parameters. +* [Bug 2804] install-local-data assumes GNU 'find' semantics. +* [Bug 2806] refclock_jjy.c supports the Telephone JJY. +* [Bug 2808] GPSD_JSON driver enhancements, step 1. + Fix crash during cleanup if GPS device not present and char device. + Increase internal token buffer to parse all JSON data, even SKY. + Defer logging of errors during driver init until the first unit is + started, so the syslog is not cluttered when the driver is not used. + Various improvements, see http://bugs.ntp.org/2808 for details. + Changed libjsmn to a more recent version. +* [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX. +* [Bug 2813] HP-UX needs -D__STDC_VERSION__=199901L and limits.h. +* [Bug 2815] net-snmp before v5.4 has circular library dependencies. +* [Bug 2821] Add a missing NTP_PRINTF and a missing const. +* [Bug 2822] New leap column in sntp broke NTP::Util.pm. +* [Bug 2825] Quiet file installation in html/ . +* [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + NTPD transfers the current TAI (instead of an announcement) now. + This might still needed improvement. +* Add an assert to the ntpq ifstats code. +* Clean up the RLIMIT_STACK code. +* Improve the ntpq documentation around the controlkey keyid. +* ntpq.c cleanup. +* Windows port build cleanup. +--- (4.2.8p2) 2015/04/07 Released by Harlan Stenn (4.2.8p2-RC3) 2015/04/03 Released by Harlan Stenn * [Bug 2763] Fix for different thresholds for forward and backward steps. +* Initial import of the Unity test framework. --- (4.2.8p2-RC2) 2015/04/03 Released by Harlan Stenn @@ -62,6 +199,7 @@ * [Sec 2781] Authentication doesn't protect symmetric associations against DoS attacks. * [Bug 2783] Quiet autoconf warnings about missing AC_LANG_SOURCE. +* [Bug 2784] Fix for 2782 uses clock_gettime() instead of get_ostime(). * [Bug 2789] Quiet compiler warnings from libevent. * [Bug 2790] If ntpd sets the Windows MM timer highest resolution pause briefly before measuring system clock precision to yield diff --git a/contrib/ntp/CommitLog b/contrib/ntp/CommitLog index 0e87846dbfbd..b1f2a30ffe14 100644 --- a/contrib/ntp/CommitLog +++ b/contrib/ntp/CommitLog @@ -1,3 +1,6748 @@ +ChangeSet@1.3491, 2015-06-29 16:34:44-04:00, stenn@deacon.udel.edu + NTP_4_2_8P3 + TAG: NTP_4_2_8P3 + + ChangeLog@1.1680 +1 -0 + NTP_4_2_8P3 + + ntpd/invoke-ntp.conf.texi@1.188 +1 -1 + NTP_4_2_8P3 + + ntpd/invoke-ntp.keys.texi@1.182 +1 -1 + NTP_4_2_8P3 + + ntpd/invoke-ntpd.texi@1.499 +2 -2 + NTP_4_2_8P3 + + ntpd/ntp.conf.5man@1.222 +3 -3 + NTP_4_2_8P3 + + ntpd/ntp.conf.5mdoc@1.222 +1 -1 + NTP_4_2_8P3 + + ntpd/ntp.conf.html@1.177 +15 -1 + NTP_4_2_8P3 + + ntpd/ntp.conf.man.in@1.222 +3 -3 + NTP_4_2_8P3 + + ntpd/ntp.conf.mdoc.in@1.222 +1 -1 + NTP_4_2_8P3 + + ntpd/ntp.keys.5man@1.216 +2 -2 + NTP_4_2_8P3 + + ntpd/ntp.keys.5mdoc@1.216 +2 -2 + NTP_4_2_8P3 + + ntpd/ntp.keys.html@1.178 +1 -1 + NTP_4_2_8P3 + + ntpd/ntp.keys.man.in@1.216 +2 -2 + NTP_4_2_8P3 + + ntpd/ntp.keys.mdoc.in@1.216 +2 -2 + NTP_4_2_8P3 + + ntpd/ntpd-opts.c@1.521 +245 -245 + NTP_4_2_8P3 + + ntpd/ntpd-opts.h@1.520 +3 -3 + NTP_4_2_8P3 + + ntpd/ntpd.1ntpdman@1.328 +3 -3 + NTP_4_2_8P3 + + ntpd/ntpd.1ntpdmdoc@1.328 +2 -2 + NTP_4_2_8P3 + + ntpd/ntpd.html@1.172 +2 -2 + NTP_4_2_8P3 + + ntpd/ntpd.man.in@1.328 +3 -3 + NTP_4_2_8P3 + + ntpd/ntpd.mdoc.in@1.328 +2 -2 + NTP_4_2_8P3 + + ntpdc/invoke-ntpdc.texi@1.496 +2 -2 + NTP_4_2_8P3 + + ntpdc/ntpdc-opts.c@1.514 +107 -107 + NTP_4_2_8P3 + + ntpdc/ntpdc-opts.h@1.513 +3 -3 + NTP_4_2_8P3 + + ntpdc/ntpdc.1ntpdcman@1.327 +3 -3 + NTP_4_2_8P3 + + ntpdc/ntpdc.1ntpdcmdoc@1.327 +2 -2 + NTP_4_2_8P3 + + ntpdc/ntpdc.html@1.340 +2 -2 + NTP_4_2_8P3 + + ntpdc/ntpdc.man.in@1.327 +3 -3 + NTP_4_2_8P3 + + ntpdc/ntpdc.mdoc.in@1.327 +2 -2 + NTP_4_2_8P3 + + ntpq/invoke-ntpq.texi@1.503 +2 -2 + NTP_4_2_8P3 + + ntpq/ntpq-opts.c@1.520 +106 -106 + NTP_4_2_8P3 + + ntpq/ntpq-opts.h@1.518 +3 -3 + NTP_4_2_8P3 + + ntpq/ntpq.1ntpqman@1.331 +3 -3 + NTP_4_2_8P3 + + ntpq/ntpq.1ntpqmdoc@1.331 +2 -2 + NTP_4_2_8P3 + + ntpq/ntpq.html@1.169 +2 -2 + NTP_4_2_8P3 + + ntpq/ntpq.man.in@1.331 +3 -3 + NTP_4_2_8P3 + + ntpq/ntpq.mdoc.in@1.331 +2 -2 + NTP_4_2_8P3 + + ntpsnmpd/invoke-ntpsnmpd.texi@1.498 +2 -2 + NTP_4_2_8P3 + + ntpsnmpd/ntpsnmpd-opts.c@1.516 +68 -68 + NTP_4_2_8P3 + + ntpsnmpd/ntpsnmpd-opts.h@1.515 +3 -3 + NTP_4_2_8P3 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.327 +3 -3 + NTP_4_2_8P3 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.327 +2 -2 + NTP_4_2_8P3 + + ntpsnmpd/ntpsnmpd.html@1.167 +1 -1 + NTP_4_2_8P3 + + ntpsnmpd/ntpsnmpd.man.in@1.327 +3 -3 + NTP_4_2_8P3 + + ntpsnmpd/ntpsnmpd.mdoc.in@1.327 +2 -2 + NTP_4_2_8P3 + + packageinfo.sh@1.515 +2 -2 + NTP_4_2_8P3 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.88 +3 -3 + NTP_4_2_8P3 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.89 +2 -2 + NTP_4_2_8P3 + + scripts/calc_tickadj/calc_tickadj.html@1.90 +1 -1 + NTP_4_2_8P3 + + scripts/calc_tickadj/calc_tickadj.man.in@1.87 +3 -3 + NTP_4_2_8P3 + + scripts/calc_tickadj/calc_tickadj.mdoc.in@1.89 +2 -2 + NTP_4_2_8P3 + + scripts/calc_tickadj/invoke-calc_tickadj.texi@1.92 +1 -1 + NTP_4_2_8P3 + + scripts/invoke-plot_summary.texi@1.109 +2 -2 + NTP_4_2_8P3 + + scripts/invoke-summary.texi@1.109 +2 -2 + NTP_4_2_8P3 + + scripts/ntp-wait/invoke-ntp-wait.texi@1.319 +2 -2 + NTP_4_2_8P3 + + scripts/ntp-wait/ntp-wait-opts@1.55 +2 -2 + NTP_4_2_8P3 + + scripts/ntp-wait/ntp-wait.1ntp-waitman@1.316 +3 -3 + NTP_4_2_8P3 + + scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.317 +2 -2 + NTP_4_2_8P3 + + scripts/ntp-wait/ntp-wait.html@1.336 +2 -2 + NTP_4_2_8P3 + + scripts/ntp-wait/ntp-wait.man.in@1.316 +3 -3 + NTP_4_2_8P3 + + scripts/ntp-wait/ntp-wait.mdoc.in@1.317 +2 -2 + NTP_4_2_8P3 + + scripts/ntpsweep/invoke-ntpsweep.texi@1.107 +2 -2 + NTP_4_2_8P3 + + scripts/ntpsweep/ntpsweep-opts@1.57 +2 -2 + NTP_4_2_8P3 + + scripts/ntpsweep/ntpsweep.1ntpsweepman@1.95 +3 -3 + NTP_4_2_8P3 + + scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.95 +2 -2 + NTP_4_2_8P3 + + scripts/ntpsweep/ntpsweep.html@1.108 +2 -2 + NTP_4_2_8P3 + + scripts/ntpsweep/ntpsweep.man.in@1.95 +3 -3 + NTP_4_2_8P3 + + scripts/ntpsweep/ntpsweep.mdoc.in@1.96 +2 -2 + NTP_4_2_8P3 + + scripts/ntptrace/invoke-ntptrace.texi@1.108 +2 -2 + NTP_4_2_8P3 + + scripts/ntptrace/ntptrace-opts@1.57 +2 -2 + NTP_4_2_8P3 + + scripts/ntptrace/ntptrace.1ntptraceman@1.95 +3 -3 + NTP_4_2_8P3 + + scripts/ntptrace/ntptrace.1ntptracemdoc@1.96 +2 -2 + NTP_4_2_8P3 + + scripts/ntptrace/ntptrace.html@1.109 +2 -2 + NTP_4_2_8P3 + + scripts/ntptrace/ntptrace.man.in@1.95 +3 -3 + NTP_4_2_8P3 + + scripts/ntptrace/ntptrace.mdoc.in@1.97 +2 -2 + NTP_4_2_8P3 + + scripts/plot_summary-opts@1.57 +2 -2 + NTP_4_2_8P3 + + scripts/plot_summary.1plot_summaryman@1.107 +3 -3 + NTP_4_2_8P3 + + scripts/plot_summary.1plot_summarymdoc@1.107 +2 -2 + NTP_4_2_8P3 + + scripts/plot_summary.html@1.110 +2 -2 + NTP_4_2_8P3 + + scripts/plot_summary.man.in@1.107 +3 -3 + NTP_4_2_8P3 + + scripts/plot_summary.mdoc.in@1.107 +2 -2 + NTP_4_2_8P3 + + scripts/summary-opts@1.57 +2 -2 + NTP_4_2_8P3 + + scripts/summary.1summaryman@1.107 +3 -3 + NTP_4_2_8P3 + + scripts/summary.1summarymdoc@1.107 +2 -2 + NTP_4_2_8P3 + + scripts/summary.html@1.110 +2 -2 + NTP_4_2_8P3 + + scripts/summary.man.in@1.107 +3 -3 + NTP_4_2_8P3 + + scripts/summary.mdoc.in@1.107 +2 -2 + NTP_4_2_8P3 + + scripts/update-leap/invoke-update-leap.texi@1.8 +1 -1 + NTP_4_2_8P3 + + scripts/update-leap/update-leap-opts@1.8 +2 -2 + NTP_4_2_8P3 + + scripts/update-leap/update-leap.1update-leapman@1.8 +3 -3 + NTP_4_2_8P3 + + scripts/update-leap/update-leap.1update-leapmdoc@1.8 +2 -2 + NTP_4_2_8P3 + + scripts/update-leap/update-leap.html@1.8 +1 -1 + NTP_4_2_8P3 + + scripts/update-leap/update-leap.man.in@1.8 +3 -3 + NTP_4_2_8P3 + + scripts/update-leap/update-leap.mdoc.in@1.8 +2 -2 + NTP_4_2_8P3 + + sntp/invoke-sntp.texi@1.496 +2 -2 + NTP_4_2_8P3 + + sntp/sntp-opts.c@1.515 +159 -159 + NTP_4_2_8P3 + + sntp/sntp-opts.h@1.513 +3 -3 + NTP_4_2_8P3 + + sntp/sntp.1sntpman@1.331 +3 -3 + NTP_4_2_8P3 + + sntp/sntp.1sntpmdoc@1.331 +2 -2 + NTP_4_2_8P3 + + sntp/sntp.html@1.511 +2 -2 + NTP_4_2_8P3 + + sntp/sntp.man.in@1.331 +3 -3 + NTP_4_2_8P3 + + sntp/sntp.mdoc.in@1.331 +2 -2 + NTP_4_2_8P3 + + util/invoke-ntp-keygen.texi@1.499 +2 -2 + NTP_4_2_8P3 + + util/ntp-keygen-opts.c@1.517 +173 -173 + NTP_4_2_8P3 + + util/ntp-keygen-opts.h@1.515 +3 -3 + NTP_4_2_8P3 + + util/ntp-keygen.1ntp-keygenman@1.327 +3 -3 + NTP_4_2_8P3 + + util/ntp-keygen.1ntp-keygenmdoc@1.327 +2 -2 + NTP_4_2_8P3 + + util/ntp-keygen.html@1.173 +2 -2 + NTP_4_2_8P3 + + util/ntp-keygen.man.in@1.327 +3 -3 + NTP_4_2_8P3 + + util/ntp-keygen.mdoc.in@1.327 +2 -2 + NTP_4_2_8P3 + +ChangeSet@1.3490, 2015-06-29 16:11:13-04:00, stenn@deacon.udel.edu + Release ntp-4.2.8p3 + + packageinfo.sh@1.514 +1 -1 + Release ntp-4.2.8p3 + +ChangeSet@1.3489, 2015-06-29 19:33:22+00:00, stenn@psp-at1.ntp.org + NEWS file update for bug 2853 + + NEWS@1.144 +18 -3 + NEWS file update for bug 2853 + +ChangeSet@1.3473.1.40, 2015-06-29 06:00:52+00:00, stenn@psp-at1.ntp.org + html/miscopt.html: Document leapsmearinterval, other cleanup. Harlan Stenn. + + ChangeLog@1.1666.1.19 +1 -0 + html/miscopt.html: Document leapsmearinterval, other cleanup. Harlan Stenn. + + html/miscopt.html@1.82 +18 -15 + html/miscopt.html: Document leapsmearinterval, other cleanup. Harlan Stenn. + +ChangeSet@1.3473.1.39, 2015-06-29 05:28:47+00:00, stenn@psp-at1.ntp.org + ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn. + + ChangeLog@1.1666.1.18 +1 -0 + ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn. + + ntpd/invoke-ntp.conf.texi@1.187 +17 -1 + ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn. + + ntpd/ntp.conf.5man@1.221 +21 -3 + ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn. + + ntpd/ntp.conf.5mdoc@1.221 +18 -2 + ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn. + + ntpd/ntp.conf.def@1.17 +16 -0 + ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn. + + ntpd/ntp.conf.man.in@1.221 +21 -3 + ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn. + + ntpd/ntp.conf.mdoc.in@1.221 +18 -2 + ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn. + +ChangeSet@1.3486, 2015-06-29 03:39:39+00:00, stenn@psp-at1.ntp.org + Updated entry for Sec 2853 + + ChangeLog@1.1677 +2 -1 + Updated entry for Sec 2853 + +ChangeSet@1.3473.3.2, 2015-06-29 04:57:16+02:00, tomek@tomek-n56vz.(none) + ChangeLog: + moved a change to the proper place + + ChangeLog@1.1666.2.2 +1 -1 + moved a change to the proper place + +ChangeSet@1.3473.3.1, 2015-06-29 04:50:55+02:00, tomek@tomek-n56vz.(none) + ChangeLog: + updated my changes + msyslog.c: + fixed a gcc warning + run-msyslog.c: + checking in the autogenerated file + + ChangeLog@1.1666.2.1 +4 -0 + updated my changes + + tests/libntp/msyslog.c@1.3 +2 -2 + fixed a gcc warning + + tests/libntp/run-msyslog.c@1.3 +1 -0 + checking in the autogenerated file + +ChangeSet@1.3473.1.37, 2015-06-29 01:16:44+00:00, stenn@psp-at1.ntp.org + [Bug 2860] ntpq ifstats sanity check is too stringent. Frank Kardel. + + ChangeLog@1.1666.1.16 +1 -0 + [Bug 2860] ntpq ifstats sanity check is too stringent. Frank Kardel. + + NEWS@1.143 +1 -0 + [Bug 2860] ntpq ifstats sanity check is too stringent. Frank Kardel. + + ntpq/ntpq-subs.c@1.109 +1 -1 + [Bug 2860] ntpq ifstats sanity check is too stringent. Frank Kardel. + +ChangeSet@1.3473.1.36, 2015-06-29 01:13:38+00:00, stenn@psp-at1.ntp.org + Update the NEWS file with info about README.leapsmear + + NEWS@1.142 +2 -1 + Update the NEWS file with info about README.leapsmear + +ChangeSet@1.3473.1.35, 2015-06-29 00:10:53+00:00, stenn@psp-at1.ntp.org + README.leapsmear edited. Harlan Stenn. + + ChangeLog@1.1666.1.15 +1 -0 + README.leapsmear edited. Harlan Stenn. + + README.leapsmear@1.2 +240 -75 + README.leapsmear edited. Harlan Stenn. + +ChangeSet@1.3473.1.34, 2015-06-28 21:20:27+00:00, stenn@psp-at1.ntp.org + README.leapsmear added. Martin Burnicki. + + ChangeLog@1.1666.1.14 +1 -0 + README.leapsmear added. Martin Burnicki. + + Makefile.am@1.132 +1 -0 + README.leapsmear added. Martin Burnicki. + + README.leapsmear@1.1 +107 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable/README.leapsmear + + README.leapsmear@1.0 +0 -0 + +ChangeSet@1.3473.1.33, 2015-06-27 23:05:51-04:00, stenn@deacon.udel.edu + [Bug 2846] Report 'unsynchronized' status during the leap second. Fixed in Martin's changes to Bug 2855. Martin Burnicki. + + ChangeLog@1.1666.1.13 +2 -0 + [Bug 2846] Report 'unsynchronized' status during the leap second. Fixed in Martin's changes to Bug 2855. Martin Burnicki. + +ChangeSet@1.3473.1.32, 2015-06-27 21:34:55+00:00, stenn@psp-at1.ntp.org + NEWS file update + + NEWS@1.141 +12 -0 + NEWS file update + +ChangeSet@1.3473.1.31, 2015-06-27 19:25:39+00:00, stenn@psp-at1.ntp.org + [Bug 2859] Improve raw DCF77 robustness deconding. Frank Kardel. + + ChangeLog@1.1666.1.12 +4 -0 + [Bug 1060] Buffer overruns in libparse/clk_rawdcf.c. Helge Oldach. + + include/parse.h@1.13 +3 -3 + [Bug 2859] Improve raw DCF77 robustness deconding. Frank Kardel. + + libparse/clk_meinberg.c@1.15 +2 -2 + [Bug 2859] Improve raw DCF77 robustness deconding. Frank Kardel. + + libparse/clk_rawdcf.c@1.22 +100 -12 + [Bug 2859] Improve raw DCF77 robustness deconding. Frank Kardel. + + libparse/clk_schmid.c@1.14 +2 -2 + [Bug 2859] Improve raw DCF77 robustness deconding. Frank Kardel. + + ntpd/refclock_parse.c@1.80 +4 -4 + [Bug 2859] Improve raw DCF77 robustness deconding. Frank Kardel. + + parseutil/dcfd.c@1.29 +1 -1 + [Bug 2859] Improve raw DCF77 robustness deconding. Frank Kardel. + + parseutil/testdcf.c@1.11 +1 -1 + [Bug 2859] Improve raw DCF77 robustness deconding. Frank Kardel. + +ChangeSet@1.3473.1.30, 2015-06-27 05:21:56-04:00, stenn@deacon.udel.edu + NTP_4_2_8P3_RC3 + TAG: NTP_4_2_8P3_RC3 + + ChangeLog@1.1666.1.11 +1 -0 + NTP_4_2_8P3_RC3 + + ntpd/invoke-ntp.conf.texi@1.186 +1 -1 + NTP_4_2_8P3_RC3 + + ntpd/invoke-ntp.keys.texi@1.181 +1 -1 + NTP_4_2_8P3_RC3 + + ntpd/invoke-ntpd.texi@1.498 +2 -2 + NTP_4_2_8P3_RC3 + + ntpd/ntp.conf.5man@1.220 +3 -3 + NTP_4_2_8P3_RC3 + + ntpd/ntp.conf.5mdoc@1.220 +2 -2 + NTP_4_2_8P3_RC3 + + ntpd/ntp.conf.html@1.176 +1 -1 + NTP_4_2_8P3_RC3 + + ntpd/ntp.conf.man.in@1.220 +3 -3 + NTP_4_2_8P3_RC3 + + ntpd/ntp.conf.mdoc.in@1.220 +2 -2 + NTP_4_2_8P3_RC3 + + ntpd/ntp.keys.5man@1.215 +2 -2 + NTP_4_2_8P3_RC3 + + ntpd/ntp.keys.5mdoc@1.215 +2 -2 + NTP_4_2_8P3_RC3 + + ntpd/ntp.keys.html@1.177 +1 -1 + NTP_4_2_8P3_RC3 + + ntpd/ntp.keys.man.in@1.215 +2 -2 + NTP_4_2_8P3_RC3 + + ntpd/ntp.keys.mdoc.in@1.215 +2 -2 + NTP_4_2_8P3_RC3 + + ntpd/ntpd-opts.c@1.520 +7 -7 + NTP_4_2_8P3_RC3 + + ntpd/ntpd-opts.h@1.519 +3 -3 + NTP_4_2_8P3_RC3 + + ntpd/ntpd.1ntpdman@1.327 +3 -3 + NTP_4_2_8P3_RC3 + + ntpd/ntpd.1ntpdmdoc@1.327 +2 -2 + NTP_4_2_8P3_RC3 + + ntpd/ntpd.html@1.171 +2 -2 + NTP_4_2_8P3_RC3 + + ntpd/ntpd.man.in@1.327 +3 -3 + NTP_4_2_8P3_RC3 + + ntpd/ntpd.mdoc.in@1.327 +2 -2 + NTP_4_2_8P3_RC3 + + ntpdc/invoke-ntpdc.texi@1.495 +2 -2 + NTP_4_2_8P3_RC3 + + ntpdc/ntpdc-opts.c@1.513 +7 -7 + NTP_4_2_8P3_RC3 + + ntpdc/ntpdc-opts.h@1.512 +3 -3 + NTP_4_2_8P3_RC3 + + ntpdc/ntpdc.1ntpdcman@1.326 +3 -3 + NTP_4_2_8P3_RC3 + + ntpdc/ntpdc.1ntpdcmdoc@1.326 +2 -2 + NTP_4_2_8P3_RC3 + + ntpdc/ntpdc.html@1.339 +2 -2 + NTP_4_2_8P3_RC3 + + ntpdc/ntpdc.man.in@1.326 +3 -3 + NTP_4_2_8P3_RC3 + + ntpdc/ntpdc.mdoc.in@1.326 +2 -2 + NTP_4_2_8P3_RC3 + + ntpq/invoke-ntpq.texi@1.502 +2 -2 + NTP_4_2_8P3_RC3 + + ntpq/ntpq-opts.c@1.519 +7 -7 + NTP_4_2_8P3_RC3 + + ntpq/ntpq-opts.h@1.517 +3 -3 + NTP_4_2_8P3_RC3 + + ntpq/ntpq.1ntpqman@1.330 +3 -3 + NTP_4_2_8P3_RC3 + + ntpq/ntpq.1ntpqmdoc@1.330 +2 -2 + NTP_4_2_8P3_RC3 + + ntpq/ntpq.html@1.168 +2 -2 + NTP_4_2_8P3_RC3 + + ntpq/ntpq.man.in@1.330 +3 -3 + NTP_4_2_8P3_RC3 + + ntpq/ntpq.mdoc.in@1.330 +2 -2 + NTP_4_2_8P3_RC3 + + ntpsnmpd/invoke-ntpsnmpd.texi@1.497 +2 -2 + NTP_4_2_8P3_RC3 + + ntpsnmpd/ntpsnmpd-opts.c@1.515 +7 -7 + NTP_4_2_8P3_RC3 + + ntpsnmpd/ntpsnmpd-opts.h@1.514 +3 -3 + NTP_4_2_8P3_RC3 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.326 +3 -3 + NTP_4_2_8P3_RC3 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.326 +2 -2 + NTP_4_2_8P3_RC3 + + ntpsnmpd/ntpsnmpd.html@1.166 +1 -1 + NTP_4_2_8P3_RC3 + + ntpsnmpd/ntpsnmpd.man.in@1.326 +3 -3 + NTP_4_2_8P3_RC3 + + ntpsnmpd/ntpsnmpd.mdoc.in@1.326 +2 -2 + NTP_4_2_8P3_RC3 + + packageinfo.sh@1.513 +1 -1 + NTP_4_2_8P3_RC3 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.87 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.88 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/calc_tickadj/calc_tickadj.html@1.89 +1 -1 + NTP_4_2_8P3_RC3 + + scripts/calc_tickadj/calc_tickadj.man.in@1.86 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/calc_tickadj/calc_tickadj.mdoc.in@1.88 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/calc_tickadj/invoke-calc_tickadj.texi@1.91 +1 -1 + NTP_4_2_8P3_RC3 + + scripts/invoke-plot_summary.texi@1.108 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/invoke-summary.texi@1.108 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntp-wait/invoke-ntp-wait.texi@1.318 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntp-wait/ntp-wait-opts@1.54 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntp-wait/ntp-wait.1ntp-waitman@1.315 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.316 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntp-wait/ntp-wait.html@1.335 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntp-wait/ntp-wait.man.in@1.315 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/ntp-wait/ntp-wait.mdoc.in@1.316 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntpsweep/invoke-ntpsweep.texi@1.106 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntpsweep/ntpsweep-opts@1.56 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntpsweep/ntpsweep.1ntpsweepman@1.94 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.94 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntpsweep/ntpsweep.html@1.107 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntpsweep/ntpsweep.man.in@1.94 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/ntpsweep/ntpsweep.mdoc.in@1.95 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntptrace/invoke-ntptrace.texi@1.107 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntptrace/ntptrace-opts@1.56 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntptrace/ntptrace.1ntptraceman@1.94 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/ntptrace/ntptrace.1ntptracemdoc@1.95 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntptrace/ntptrace.html@1.108 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/ntptrace/ntptrace.man.in@1.94 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/ntptrace/ntptrace.mdoc.in@1.96 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/plot_summary-opts@1.56 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/plot_summary.1plot_summaryman@1.106 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/plot_summary.1plot_summarymdoc@1.106 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/plot_summary.html@1.109 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/plot_summary.man.in@1.106 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/plot_summary.mdoc.in@1.106 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/summary-opts@1.56 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/summary.1summaryman@1.106 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/summary.1summarymdoc@1.106 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/summary.html@1.109 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/summary.man.in@1.106 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/summary.mdoc.in@1.106 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/update-leap/invoke-update-leap.texi@1.7 +1 -1 + NTP_4_2_8P3_RC3 + + scripts/update-leap/update-leap-opts@1.7 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/update-leap/update-leap.1update-leapman@1.7 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/update-leap/update-leap.1update-leapmdoc@1.7 +2 -2 + NTP_4_2_8P3_RC3 + + scripts/update-leap/update-leap.html@1.7 +51 -2 + NTP_4_2_8P3_RC3 + + scripts/update-leap/update-leap.man.in@1.7 +3 -3 + NTP_4_2_8P3_RC3 + + scripts/update-leap/update-leap.mdoc.in@1.7 +2 -2 + NTP_4_2_8P3_RC3 + + sntp/invoke-sntp.texi@1.495 +2 -2 + NTP_4_2_8P3_RC3 + + sntp/sntp-opts.c@1.514 +7 -7 + NTP_4_2_8P3_RC3 + + sntp/sntp-opts.h@1.512 +3 -3 + NTP_4_2_8P3_RC3 + + sntp/sntp.1sntpman@1.330 +3 -3 + NTP_4_2_8P3_RC3 + + sntp/sntp.1sntpmdoc@1.330 +2 -2 + NTP_4_2_8P3_RC3 + + sntp/sntp.html@1.510 +2 -2 + NTP_4_2_8P3_RC3 + + sntp/sntp.man.in@1.330 +3 -3 + NTP_4_2_8P3_RC3 + + sntp/sntp.mdoc.in@1.330 +2 -2 + NTP_4_2_8P3_RC3 + + util/invoke-ntp-keygen.texi@1.498 +2 -2 + NTP_4_2_8P3_RC3 + + util/ntp-keygen-opts.c@1.516 +7 -7 + NTP_4_2_8P3_RC3 + + util/ntp-keygen-opts.h@1.514 +3 -3 + NTP_4_2_8P3_RC3 + + util/ntp-keygen.1ntp-keygenman@1.326 +3 -3 + NTP_4_2_8P3_RC3 + + util/ntp-keygen.1ntp-keygenmdoc@1.326 +2 -2 + NTP_4_2_8P3_RC3 + + util/ntp-keygen.html@1.172 +2 -2 + NTP_4_2_8P3_RC3 + + util/ntp-keygen.man.in@1.326 +3 -3 + NTP_4_2_8P3_RC3 + + util/ntp-keygen.mdoc.in@1.326 +2 -2 + NTP_4_2_8P3_RC3 + +ChangeSet@1.3473.1.29, 2015-06-27 04:45:02-04:00, stenn@deacon.udel.edu + Update the NEWS file for 4.2.8p3-RC3 + + NEWS@1.140 +26 -0 + Update the NEWS file for 4.2.8p3-RC3 + +ChangeSet@1.3473.1.28, 2015-06-27 04:20:07-04:00, stenn@deacon.udel.edu + html/drivers/driver22.html: typo fix. Harlan Stenn. + + ChangeLog@1.1666.1.10 +1 -0 + html/drivers/driver22.html: typo fix. Harlan Stenn. + + html/drivers/driver22.html@1.23 +1 -1 + html/drivers/driver22.html: typo fix. Harlan Stenn. + +ChangeSet@1.3473.1.27, 2015-06-27 02:22:09-04:00, stenn@deacon.udel.edu + [Bug 2857] Stratus VOS does not support SIGIO. Paul Green. + + ChangeLog@1.1666.1.9 +1 -0 + [Bug 2857] Stratus VOS does not support SIGIO. Paul Green. + + configure.ac@1.596.1.1 +9 -0 + [Bug 2857] Stratus VOS does not support SIGIO. Paul Green. + + sntp/m4/ntp_libntp.m4@1.30 +9 -0 + [Bug 2857] Stratus VOS does not support SIGIO. Paul Green. + +ChangeSet@1.3473.1.26, 2015-06-27 01:58:07-04:00, stenn@deacon.udel.edu + [Bug 2856] ntpd should wait() on terminated child processes. Paul Green. + + ChangeLog@1.1666.1.8 +1 -0 + [Bug 2856] ntpd should wait() on terminated child processes. Paul Green. + + libntp/work_fork.c@1.14 +23 -4 + [Bug 2856] ntpd should wait() on terminated child processes. Paul Green. + +ChangeSet@1.3473.1.25, 2015-06-27 05:12:21+00:00, stenn@psp-at1.ntp.org + [Bug 2855] Report leap smear in the REFID. Harlan Stenn. + + ChangeLog@1.1666.1.7 +1 -0 + [Bug 2855] Report leap smear in the REFID. Harlan Stenn. + + ntpd/ntp_proto.c@1.361 +8 -2 + [Bug 2855] Report leap smear in the REFID. Harlan Stenn. + +ChangeSet@1.3473.1.24, 2015-06-27 04:53:42+00:00, stenn@psp-at1.ntp.org + refidsmear test cleanup. Tomasz Flendrich. + + ChangeLog@1.1666.1.6 +1 -0 + refidsmear test cleanup. Tomasz Flendrich. + + tests/libntp/refidsmear.c@1.4 +4 -5 + refidsmear test cleanup. Tomasz Flendrich. + +ChangeSet@1.3473.1.23, 2015-06-27 06:44:17+02:00, tomek@tomek-n56vz.(none) + refidsmear.c: + moved assertions to proper places + + tests/libntp/refidsmear.c@1.3 +4 -2 + moved assertions to proper places + +ChangeSet@1.3473.1.22, 2015-06-27 04:46:21+02:00, tomek@tomek-n56vz.(none) + run-refidsmear.c: + updated autogenerated file + refidsmear.c: + added the assertions and a nice message if a test fails + + tests/libntp/refidsmear.c@1.2 +22 -9 + added the assertions and a nice message if a test fails + + tests/libntp/run-refidsmear.c@1.2 +1 -1 + updated autogenerated file + +ChangeSet@1.3473.1.21, 2015-06-27 01:16:47+00:00, stenn@psp-at1.ntp.org + refidsmear function support and tests. Harlan Stenn. + + ChangeLog@1.1666.1.5 +1 -0 + refidsmear function support and tests. Harlan Stenn. + + include/Makefile.am@1.51 +1 -0 + refidsmear function support and tests. Harlan Stenn. + + include/refidsmear.h@1.1 +3 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/include/refidsmear.h + + include/refidsmear.h@1.0 +0 -0 + + libntp/Makefile.am@1.76 +1 -0 + refidsmear function support and tests. Harlan Stenn. + + libntp/refidsmear.c@1.1 +58 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/libntp/refidsmear.c + + libntp/refidsmear.c@1.0 +0 -0 + + tests/libntp/Makefile.am@1.83 +439 -378 + refidsmear function support and tests. Harlan Stenn. + + tests/libntp/refidsmear.c@1.1 +127 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/libntp/refidsmear.c + + tests/libntp/refidsmear.c@1.0 +0 -0 + + tests/libntp/run-refidsmear.c@1.1 +52 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/libntp/run-refidsmear.c + + tests/libntp/run-refidsmear.c@1.0 +0 -0 + +ChangeSet@1.3473.1.20, 2015-06-26 22:45:16+00:00, stenn@psp-at1.ntp.org + tests/sandbox/smeartest.c: Harlan Stenn, Damir Tomic, Juergen Perlinger. + + ChangeLog@1.1666.1.4 +1 -0 + tests/sandbox/smeartest.c: Harlan Stenn, Damir Tomic, Juergen Perlinger. + +ChangeSet@1.3473.1.19, 2015-06-26 20:10:51+00:00, stenn@psp-at1.ntp.org + smeartest.c fixes from Harlan + + tests/sandbox/smeartest.c@1.5 +52 -1 + smeartest.c fixes from Harlan + +ChangeSet@1.3473.1.18, 2015-06-26 18:43:39+00:00, stenn@psp-at1.ntp.org + smeartest.c fixes from Juergen, Damir, and Harlan + + tests/sandbox/smeartest.c@1.4 +26 -17 + smeartest.c fixes from Juergen, Damir, and Harlan + +ChangeSet@1.3473.1.17, 2015-06-26 11:24:43+00:00, stenn@psp-at1.ntp.org + smeartest.c - Harlan Stenn + + tests/sandbox/smeartest.c@1.3 +2 -2 + smeartest.c - Harlan Stenn + +ChangeSet@1.3473.1.16, 2015-06-26 11:20:59+00:00, stenn@psp-at1.ntp.org + smeartest.c - Harlan Stenn + + tests/sandbox/smeartest.c@1.2 +4 -0 + smeartest.c - Harlan Stenn + +ChangeSet@1.3473.1.15, 2015-06-26 10:58:41+00:00, stenn@psp-at1.ntp.org + smeartest.c - Harlan Stenn + + tests/sandbox/Makefile.am@1.4 +1 -1 + smeartest.c - Harlan Stenn + + tests/sandbox/smeartest.c@1.1 +104 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/sandbox/smeartest.c + + tests/sandbox/smeartest.c@1.0 +0 -0 + +ChangeSet@1.3473.1.14, 2015-06-25 18:22:10+00:00, stenn@psp-at1.ntp.org + sntp/tests/Makefile.am: remove g_nameresolution.cpp as it tested something that was only in the 4.2.6 sntp. Harlan Stenn. + + ChangeLog@1.1666.1.3 +18 -8 + sntp/tests/Makefile.am: remove g_nameresolution.cpp as it tested something that was only in the 4.2.6 sntp. Harlan Stenn. + + sntp/tests/Makefile.am@1.55 +4 -2 + sntp/tests/Makefile.am: remove g_nameresolution.cpp as it tested something that was only in the 4.2.6 sntp. Harlan Stenn. + +ChangeSet@1.3473.1.13, 2015-06-25 16:34:19+02:00, viperus@ubuntu.(none) + packetProcessing.c: + fixed SetUp() -> setUp() and TearDown() -> tearDown() which seemed to work because of extern functions + + sntp/tests/packetProcessing.c@1.4 +11 -11 + fixed SetUp() -> setUp() and TearDown() -> tearDown() which seemed to work because of extern functions + + sntp/tests/run-packetProcessing.c@1.3 +6 -6 + +ChangeSet@1.3473.1.12, 2015-06-25 16:08:41+02:00, viperus@ubuntu.(none) + packetHandling.c: + put init_lib() every time. Unlike init_auth(), works every time in setUp() without causing segfault + added init_lib() in setUp(), so now stuff works! + + sntp/tests/packetHandling.c@1.3 +2 -2 + put init_lib() every time. Unlike init_auth(), works every time in setUp() without causing segfault + + sntp/tests/packetHandling.c@1.2 +19 -5 + added init_lib() in setUp(), so now stuff works! + + sntp/tests/run-packetHandling.c@1.2 +10 -10 + +ChangeSet@1.3473.1.11, 2015-06-25 14:21:11+02:00, viperus@ubuntu.(none) + sntptest.h: + added sntptest_destroy() + packetProcessing.c: + added a bunch of snptest_destroy() + + sntp/tests/packetProcessing.c@1.3 +14 -6 + added a bunch of snptest_destroy() + + sntp/tests/run-packetProcessing.c@1.2 +18 -18 + + sntp/tests/sntptest.h@1.3 +4 -5 + added sntptest_destroy() + +ChangeSet@1.3473.1.10, 2015-06-25 12:16:34+02:00, viperus@ubuntu.(none) + nameresolution.cpp~a54f29b6c06a0baf: + Delete: sntp/tests/nameresolution.cpp + + BitKeeper/deleted/a0/nameresolution.cpp~a54f29b6c06a0baf@1.3 +0 -0 + Delete: sntp/tests/nameresolution.cpp + +ChangeSet@1.3473.1.9, 2015-06-25 12:15:27+02:00, viperus@ubuntu.(none) + run-packetProcessing.c: + new file + packetHandling.cpp~39b5af94c298eb8c: + Delete: sntp/tests/packetHandling.cpp + Makefile.am: + merged lokesh and tomasz work + + BitKeeper/deleted/f3/packetHandling.cpp~39b5af94c298eb8c@1.12 +0 -0 + Delete: sntp/tests/packetHandling.cpp + + sntp/tests/Makefile.am@1.54 +6 -6 + merged lokesh and tomasz work + + sntp/tests/run-packetProcessing.c@1.1 +86 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/run-packetProcessing.c + + sntp/tests/run-packetProcessing.c@1.0 +0 -0 + +ChangeSet@1.3473.1.7, 2015-06-25 11:39:39+02:00, tomek@tomek-n56vz.(none) + Makefile.am: + added pocketProcessing.c + + sntp/tests/Makefile.am@1.52 +33 -15 + added pocketProcessing.c + +ChangeSet@1.3473.2.1, 2015-06-25 11:32:47+02:00, tomek@tomek-n56vz.(none) + packetProcessing.c: + new file + g_packetProcessing.cpp: + Rename: sntp/tests/packetProcessing.cpp -> sntp/tests/g_packetProcessing.cpp + packetProcessing.c: + fixed array size, so that it doesn't crash on 64bit integer + + sntp/tests/g_packetProcessing.cpp@1.7 +0 -0 + Rename: sntp/tests/packetProcessing.cpp -> sntp/tests/g_packetProcessing.cpp + + sntp/tests/packetProcessing.c@1.2 +1 -1 + fixed array size, so that it doesn't crash on 64bit integer + + sntp/tests/packetProcessing.c@1.1 +331 -0 + BitKeeper file /home/tomek/ntp/packetProcessing/ntp-stable-unity/sntp/tests/packetProcessing.c + + sntp/tests/packetProcessing.c@1.0 +0 -0 + +ChangeSet@1.3473.1.5, 2015-06-25 10:10:48+02:00, viperus@ubuntu.(none) + lfpfunc.c: + replaced TEST_ASSERT_EQUAL_MEMORY(&a,&b,sizeof(a)) with TEST_ASSERT_EQUAL_l_fp(a,b). It's safer this way, because structs can be compared even if they aren't initiated with memset (due to padding bytes) + + tests/libntp/lfpfunc.c@1.7 +25 -8 + replaced TEST_ASSERT_EQUAL_MEMORY(&a,&b,sizeof(a)) with TEST_ASSERT_EQUAL_l_fp(a,b). It's safer this way, because structs can be compared even if they aren't initiated with memset (due to padding bytes) + + tests/libntp/run-lfpfunc.c@1.10 +10 -9 + +ChangeSet@1.3473.1.4, 2015-06-25 09:38:11+02:00, viperus@ubuntu.(none) + ChangeLog: + added my changes + + ChangeLog@1.1666.1.2 +8 -0 + added my changes + +ChangeSet@1.3458.2.1, 2015-06-25 07:21:48+00:00, viperus@psp-fb1.ntp.org + g_crypto.cpp: + Rename: sntp/tests/crypto.cpp -> sntp/tests/g_crypto.cpp + g_crypto.cpp~cb769256579f1186: + Delete: sntp/tests/g_crypto.cpp + + BitKeeper/deleted/aa/g_crypto.cpp~cb769256579f1186@1.2, stenn@psp-at1.ntp.org +0 -0 + Delete: sntp/tests/g_crypto.cpp + + sntp/tests/g_crypto.cpp@1.6, stenn@psp-at1.ntp.org +0 -0 + Rename: sntp/tests/crypto.cpp -> sntp/tests/g_crypto.cpp + +ChangeSet@1.3473.1.2, 2015-06-25 09:19:32+02:00, viperus@ubuntu.(none) + Makefile.am: + minor fix for buildin libunity.a + minor fix for building libunity.a + crypto.c~1ed7d1829a6a73e5: + Delete: sntp/tests/crypto.c + crypto.c: + Rename: BitKeeper/deleted/23/crypto.c~1ed7d1829a6a73e5 -> sntp/tests/crypto.c + bug-2803.c: + function now returns x instead of 0 + + sntp/tests/crypto.c@1.5 +0 -0 + Rename: BitKeeper/deleted/23/crypto.c~1ed7d1829a6a73e5 -> sntp/tests/crypto.c + + BitKeeper/deleted/23/crypto.c~1ed7d1829a6a73e5@1.4 +0 -0 + Delete: sntp/tests/crypto.c + + tests/bug-2803/Makefile.am@1.12 +1 -1 + minor fix for building libunity.a + + tests/bug-2803/bug-2803.c@1.9 +7 -7 + function now returns x instead of 0 + + tests/libntp/Makefile.am@1.82 +1 -1 + minor fix for buildin libunity.a + + tests/libntp/run-sfptostr.c@1.2 +1 -0 + +ChangeSet@1.3479, 2015-06-25 04:26:18+00:00, stenn@psp-at1.ntp.org + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + + tests/sec-2853/sec-2853.c@1.4 +4 -6 + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + +ChangeSet@1.3473.1.1, 2015-06-25 04:10:56+00:00, stenn@psp-at1.ntp.org + [Bug 2855] Parser fix for conditional leap smear code. Harlan Stenn. + + ChangeLog@1.1666.1.1 +3 -0 + [Bug 2855] Parser fix for conditional leap smear code. Harlan Stenn. + + ntpd/keyword-gen-utd@1.26 +1 -1 + [Bug 2855] Parser fix for conditional leap smear code. Harlan Stenn. + + ntpd/keyword-gen.c@1.32 +0 -2 + [Bug 2855] Parser fix for conditional leap smear code. Harlan Stenn. + + ntpd/ntp_keyword.h@1.28 +446 -433 + [Bug 2855] Parser fix for conditional leap smear code. Harlan Stenn. + + ntpd/ntp_parser.c@1.97 +1397 -1147 + [Bug 2855] Parser fix for conditional leap smear code. Harlan Stenn. + + ntpd/ntp_parser.h@1.62 +230 -216 + [Bug 2855] Parser fix for conditional leap smear code. Harlan Stenn. + + ntpd/ntp_parser.y@1.87 +5 -0 + [Bug 2855] Parser fix for conditional leap smear code. Harlan Stenn. + +ChangeSet@1.3478, 2015-06-25 02:48:14+00:00, stenn@psp-at1.ntp.org + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + + tests/sec-2853/run-sec-2853.c@1.2 +2 -2 + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + + tests/sec-2853/sec-2853.c@1.3 +0 -2 + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + +ChangeSet@1.3477, 2015-06-25 02:43:46+00:00, stenn@psp-at1.ntp.org + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + + tests/sec-2853/sec-2853.c@1.2 +58 -2 + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + +ChangeSet@1.3476, 2015-06-25 02:29:11+00:00, stenn@psp-at1.ntp.org + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + + ChangeLog@1.1670 +1 -0 + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + + ntpd/Makefile.am@1.133 +1 -0 + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + + ntpd/ntp_control.c@1.200 +2 -29 + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + + ntpd/rc_cmdlength.c@1.1 +35 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2853/ntpd/rc_cmdlength.c + + ntpd/rc_cmdlength.c@1.0 +0 -0 + + tests/sec-2853/Makefile.am@1.2 +9 -3 + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + + tests/sec-2853/Makefile.in@1.2 +513 -161 + [Sec 2853] Initial work on tests/sec-2853/. Harlan Stenn. + +ChangeSet@1.3475, 2015-06-24 10:59:01-07:00, harlan@hms-mbp11.pfcs.com + [Sec 2853] FICORA #829967. Juergen Perlinger, Harlan Stenn. + + ChangeLog@1.1669 +1 -1 + [Sec 2853] FICORA #829967. Juergen Perlinger, Harlan Stenn. + + ChangeLog@1.1668 +3 -1 + merge cleanup + + configure.ac@1.597 +1 -0 + [Sec 2853] FICORA #829967. Juergen Perlinger, Harlan Stenn. + + tests/Makefile.am@1.10 +2 -0 + [Sec 2853] FICORA #829967. Juergen Perlinger, Harlan Stenn. + + tests/sec-2853/Makefile.am@1.1 +72 -0 + BitKeeper file /Users/harlan/src/ntp-stable-2853/tests/sec-2853/Makefile.am + + tests/sec-2853/Makefile.am@1.0 +0 -0 + + tests/sec-2853/Makefile.in@1.1 +918 -0 + BitKeeper file /Users/harlan/src/ntp-stable-2853/tests/sec-2853/Makefile.in + + tests/sec-2853/Makefile.in@1.0 +0 -0 + + tests/sec-2853/run-sec-2853.c@1.1 +54 -0 + BitKeeper file /Users/harlan/src/ntp-stable-2853/tests/sec-2853/run-sec-2853.c + + tests/sec-2853/run-sec-2853.c@1.0 +0 -0 + + tests/sec-2853/sec-2853.c@1.1 +68 -0 + BitKeeper file /Users/harlan/src/ntp-stable-2853/tests/sec-2853/sec-2853.c + + tests/sec-2853/sec-2853.c@1.0 +0 -0 + +ChangeSet@1.3473, 2015-06-24 11:06:56-04:00, stenn@deacon.udel.edu + NTP_4_2_8P3_RC2 + TAG: NTP_4_2_8P3_RC2 + + ChangeLog@1.1666 +1 -0 + NTP_4_2_8P3_RC2 + + ntpd/invoke-ntp.conf.texi@1.185 +1 -1 + NTP_4_2_8P3_RC2 + + ntpd/invoke-ntp.keys.texi@1.180 +1 -1 + NTP_4_2_8P3_RC2 + + ntpd/invoke-ntpd.texi@1.497 +2 -2 + NTP_4_2_8P3_RC2 + + ntpd/ntp.conf.5man@1.219 +76 -76 + NTP_4_2_8P3_RC2 + + ntpd/ntp.conf.5mdoc@1.219 +2 -2 + NTP_4_2_8P3_RC2 + + ntpd/ntp.conf.html@1.175 +2 -2 + NTP_4_2_8P3_RC2 + + ntpd/ntp.conf.man.in@1.219 +76 -76 + NTP_4_2_8P3_RC2 + + ntpd/ntp.conf.mdoc.in@1.219 +2 -2 + NTP_4_2_8P3_RC2 + + ntpd/ntp.keys.5man@1.214 +11 -11 + NTP_4_2_8P3_RC2 + + ntpd/ntp.keys.5mdoc@1.214 +2 -2 + NTP_4_2_8P3_RC2 + + ntpd/ntp.keys.html@1.176 +1 -1 + NTP_4_2_8P3_RC2 + + ntpd/ntp.keys.man.in@1.214 +11 -11 + NTP_4_2_8P3_RC2 + + ntpd/ntp.keys.mdoc.in@1.214 +2 -2 + NTP_4_2_8P3_RC2 + + ntpd/ntpd-opts.c@1.519 +7 -7 + NTP_4_2_8P3_RC2 + + ntpd/ntpd-opts.h@1.518 +3 -3 + NTP_4_2_8P3_RC2 + + ntpd/ntpd.1ntpdman@1.326 +30 -30 + NTP_4_2_8P3_RC2 + + ntpd/ntpd.1ntpdmdoc@1.326 +2 -2 + NTP_4_2_8P3_RC2 + + ntpd/ntpd.html@1.170 +2 -2 + NTP_4_2_8P3_RC2 + + ntpd/ntpd.man.in@1.326 +30 -30 + NTP_4_2_8P3_RC2 + + ntpd/ntpd.mdoc.in@1.326 +2 -2 + NTP_4_2_8P3_RC2 + + ntpdc/invoke-ntpdc.texi@1.494 +2 -2 + NTP_4_2_8P3_RC2 + + ntpdc/ntpdc-opts.c@1.512 +7 -7 + NTP_4_2_8P3_RC2 + + ntpdc/ntpdc-opts.h@1.511 +3 -3 + NTP_4_2_8P3_RC2 + + ntpdc/ntpdc.1ntpdcman@1.325 +16 -16 + NTP_4_2_8P3_RC2 + + ntpdc/ntpdc.1ntpdcmdoc@1.325 +2 -2 + NTP_4_2_8P3_RC2 + + ntpdc/ntpdc.html@1.338 +2 -2 + NTP_4_2_8P3_RC2 + + ntpdc/ntpdc.man.in@1.325 +16 -16 + NTP_4_2_8P3_RC2 + + ntpdc/ntpdc.mdoc.in@1.325 +2 -2 + NTP_4_2_8P3_RC2 + + ntpq/invoke-ntpq.texi@1.501 +2 -2 + NTP_4_2_8P3_RC2 + + ntpq/ntpq-opts.c@1.518 +7 -7 + NTP_4_2_8P3_RC2 + + ntpq/ntpq-opts.h@1.516 +3 -3 + NTP_4_2_8P3_RC2 + + ntpq/ntpq.1ntpqman@1.329 +3 -3 + NTP_4_2_8P3_RC2 + + ntpq/ntpq.1ntpqmdoc@1.329 +2 -2 + NTP_4_2_8P3_RC2 + + ntpq/ntpq.html@1.167 +14 -4 + NTP_4_2_8P3_RC2 + + ntpq/ntpq.man.in@1.329 +3 -3 + NTP_4_2_8P3_RC2 + + ntpq/ntpq.mdoc.in@1.329 +2 -2 + NTP_4_2_8P3_RC2 + + ntpsnmpd/invoke-ntpsnmpd.texi@1.496 +2 -2 + NTP_4_2_8P3_RC2 + + ntpsnmpd/ntpsnmpd-opts.c@1.514 +7 -7 + NTP_4_2_8P3_RC2 + + ntpsnmpd/ntpsnmpd-opts.h@1.513 +3 -3 + NTP_4_2_8P3_RC2 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.325 +5 -5 + NTP_4_2_8P3_RC2 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.325 +2 -2 + NTP_4_2_8P3_RC2 + + ntpsnmpd/ntpsnmpd.html@1.165 +1 -1 + NTP_4_2_8P3_RC2 + + ntpsnmpd/ntpsnmpd.man.in@1.325 +5 -5 + NTP_4_2_8P3_RC2 + + ntpsnmpd/ntpsnmpd.mdoc.in@1.325 +2 -2 + NTP_4_2_8P3_RC2 + + packageinfo.sh@1.512 +1 -1 + NTP_4_2_8P3_RC2 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.86 +3 -3 + NTP_4_2_8P3_RC2 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.87 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/calc_tickadj/calc_tickadj.html@1.88 +1 -1 + NTP_4_2_8P3_RC2 + + scripts/calc_tickadj/calc_tickadj.man.in@1.85 +3 -3 + NTP_4_2_8P3_RC2 + + scripts/calc_tickadj/calc_tickadj.mdoc.in@1.87 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/calc_tickadj/invoke-calc_tickadj.texi@1.90 +1 -1 + NTP_4_2_8P3_RC2 + + scripts/invoke-plot_summary.texi@1.107 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/invoke-summary.texi@1.107 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntp-wait/invoke-ntp-wait.texi@1.317 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntp-wait/ntp-wait-opts@1.53 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntp-wait/ntp-wait.1ntp-waitman@1.314 +5 -5 + NTP_4_2_8P3_RC2 + + scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.315 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntp-wait/ntp-wait.html@1.334 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntp-wait/ntp-wait.man.in@1.314 +5 -5 + NTP_4_2_8P3_RC2 + + scripts/ntp-wait/ntp-wait.mdoc.in@1.315 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntpsweep/invoke-ntpsweep.texi@1.105 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntpsweep/ntpsweep-opts@1.55 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntpsweep/ntpsweep.1ntpsweepman@1.93 +3 -3 + NTP_4_2_8P3_RC2 + + scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.93 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntpsweep/ntpsweep.html@1.106 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntpsweep/ntpsweep.man.in@1.93 +3 -3 + NTP_4_2_8P3_RC2 + + scripts/ntpsweep/ntpsweep.mdoc.in@1.94 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntptrace/invoke-ntptrace.texi@1.106 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntptrace/ntptrace-opts@1.55 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntptrace/ntptrace.1ntptraceman@1.93 +3 -3 + NTP_4_2_8P3_RC2 + + scripts/ntptrace/ntptrace.1ntptracemdoc@1.94 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntptrace/ntptrace.html@1.107 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/ntptrace/ntptrace.man.in@1.93 +3 -3 + NTP_4_2_8P3_RC2 + + scripts/ntptrace/ntptrace.mdoc.in@1.95 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/plot_summary-opts@1.55 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/plot_summary.1plot_summaryman@1.105 +3 -3 + NTP_4_2_8P3_RC2 + + scripts/plot_summary.1plot_summarymdoc@1.105 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/plot_summary.html@1.108 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/plot_summary.man.in@1.105 +3 -3 + NTP_4_2_8P3_RC2 + + scripts/plot_summary.mdoc.in@1.105 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/summary-opts@1.55 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/summary.1summaryman@1.105 +3 -3 + NTP_4_2_8P3_RC2 + + scripts/summary.1summarymdoc@1.105 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/summary.html@1.108 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/summary.man.in@1.105 +3 -3 + NTP_4_2_8P3_RC2 + + scripts/summary.mdoc.in@1.105 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/update-leap/invoke-update-leap.texi@1.6 +51 -2 + NTP_4_2_8P3_RC2 + + scripts/update-leap/update-leap-opts@1.6 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/update-leap/update-leap.1update-leapman@1.6 +4 -4 + NTP_4_2_8P3_RC2 + + scripts/update-leap/update-leap.1update-leapmdoc@1.6 +2 -2 + NTP_4_2_8P3_RC2 + + scripts/update-leap/update-leap.html@1.6 +1 -1 + NTP_4_2_8P3_RC2 + + scripts/update-leap/update-leap.man.in@1.6 +4 -4 + NTP_4_2_8P3_RC2 + + scripts/update-leap/update-leap.mdoc.in@1.6 +2 -2 + NTP_4_2_8P3_RC2 + + sntp/invoke-sntp.texi@1.494 +2 -2 + NTP_4_2_8P3_RC2 + + sntp/sntp-opts.c@1.513 +7 -7 + NTP_4_2_8P3_RC2 + + sntp/sntp-opts.h@1.511 +3 -3 + NTP_4_2_8P3_RC2 + + sntp/sntp.1sntpman@1.329 +7 -7 + NTP_4_2_8P3_RC2 + + sntp/sntp.1sntpmdoc@1.329 +2 -2 + NTP_4_2_8P3_RC2 + + sntp/sntp.html@1.509 +2 -2 + NTP_4_2_8P3_RC2 + + sntp/sntp.man.in@1.329 +7 -7 + NTP_4_2_8P3_RC2 + + sntp/sntp.mdoc.in@1.329 +2 -2 + NTP_4_2_8P3_RC2 + + util/invoke-ntp-keygen.texi@1.497 +2 -2 + NTP_4_2_8P3_RC2 + + util/ntp-keygen-opts.c@1.515 +7 -7 + NTP_4_2_8P3_RC2 + + util/ntp-keygen-opts.h@1.513 +3 -3 + NTP_4_2_8P3_RC2 + + util/ntp-keygen.1ntp-keygenman@1.325 +18 -18 + NTP_4_2_8P3_RC2 + + util/ntp-keygen.1ntp-keygenmdoc@1.325 +2 -2 + NTP_4_2_8P3_RC2 + + util/ntp-keygen.html@1.171 +2 -2 + NTP_4_2_8P3_RC2 + + util/ntp-keygen.man.in@1.325 +18 -18 + NTP_4_2_8P3_RC2 + + util/ntp-keygen.mdoc.in@1.325 +2 -2 + NTP_4_2_8P3_RC2 + +ChangeSet@1.3472, 2015-06-24 10:25:48-04:00, stenn@deacon.udel.edu + automake-1.15 cleanup for sntp/tests/fileHandlingTest.h.in . Harlan Stenn. + + ChangeLog@1.1665 +1 -0 + automake-1.15 cleanup for sntp/tests/fileHandlingTest.h.in . Harlan Stenn. + + sntp/tests/fileHandlingTest.h.in@1.11 +3 -3 + automake-1.15 cleanup for sntp/tests/fileHandlingTest.h.in . Harlan Stenn. + +ChangeSet@1.3471, 2015-06-24 10:22:13-04:00, stenn@deacon.udel.edu + [Bug 2855] leap smear cleanup. Harlan Stenn. + + ChangeLog@1.1664 +1 -0 + [Bug 2855] leap smear cleanup. Harlan Stenn. + + ntpd/complete.conf.in@1.30 +1 -1 + [Bug 2855] leap smear cleanup. Harlan Stenn. + + ntpd/keyword-gen-utd@1.25 +1 -1 + [Bug 2855] leap smear cleanup. Harlan Stenn. + + ntpd/ntp_keyword.h@1.27 +433 -446 + [Bug 2855] leap smear cleanup. Harlan Stenn. + + ntpd/ntp_parser.c@1.96 +147 -147 + [Bug 2855] leap smear cleanup. Harlan Stenn. + + ntpd/ntp_parser.h@1.61 +4 -4 + [Bug 2855] leap smear cleanup. Harlan Stenn. + + ntpd/ntp_proto.c@1.360 +1 -1 + [Bug 2855] leap smear cleanup. Harlan Stenn. + +ChangeSet@1.3470, 2015-06-24 10:17:03-04:00, stenn@deacon.udel.edu + Cleanup for ntp-4.2.3p8-RC2 + + ChangeLog@1.1663 +1 -1 + Cleanup for ntp-4.2.3p8-RC2 + + NEWS@1.139 +35 -1 + Cleanup for ntp-4.2.3p8-RC2 + + configure.ac@1.596 +3 -1 + Cleanup for ntp-4.2.3p8-RC2 + +ChangeSet@1.3469, 2015-06-24 11:25:11+00:00, stenn@psp-at1.ntp.org + [Bug 2855] Implement conditional leap smear code. Martin Burnicki. + + ChangeLog@1.1662 +1 -1 + [Bug 2855] Implement conditional leap smear code. Martin Burnicki. + +ChangeSet@1.3466.1.1, 2015-06-24 09:18:52+02:00, jnperlin@hydra.(none) + Bug 2853 - FICORA #829967 + + ChangeLog@1.1660.1.1 +1 -0 + Bug 2853 - FICORA #829967 + + ntpd/ntp_control.c@1.196.1.1 +56 -21 + Bug 2853 - FICORA #829967 + +ChangeSet@1.3458.1.3, 2015-06-23 12:56:23+05:30, loki@dadasgift.(none) + PacketHandling test changes + + sntp/tests/Makefile.am@1.50.1.3 +11 -11 + + sntp/tests/g_packetHandling.cpp@1.1 +264 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/sntp/tests/g_packetHandling.cpp + + sntp/tests/g_packetHandling.cpp@1.0 +0 -0 + + sntp/tests/packetHandling.c@1.1 +260 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/sntp/tests/packetHandling.c + + sntp/tests/packetHandling.c@1.0 +0 -0 + + sntp/tests/run-packetHandling.c@1.1 +70 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/sntp/tests/run-packetHandling.c + + sntp/tests/run-packetHandling.c@1.0 +0 -0 + +ChangeSet@1.3468, 2015-06-22 17:31:28+02:00, martin@pc-martin.(none) + [Bug 2855] Implement conditional leap smear feature. + + ChangeLog@1.1661 +1 -0 + [Bug 2855] Implement conditional leap smear feature. + + include/ntpd.h@1.191 +3 -0 + Protected leap smearing code by preprocessor symbol LEAP_SMEAR. + + ntpd/keyword-gen.c@1.31 +2 -0 + Protected leap smearing code by preprocessor symbol LEAP_SMEAR. + + ntpd/ntp_config.c@1.330 +2 -0 + Protected leap smearing code by preprocessor symbol LEAP_SMEAR. + + ntpd/ntp_control.c@1.198 +4 -0 + Protected leap smearing code by preprocessor symbol LEAP_SMEAR. + + ntpd/ntp_io.c@1.403 +8 -1 + Protected leap smearing code by preprocessor symbol LEAP_SMEAR. + + ntpd/ntp_leapsec.h@1.14 +5 -0 + Protected leap smearing code by preprocessor symbol LEAP_SMEAR. + + ntpd/ntp_proto.c@1.359 +30 -2 + Protected leap smearing code by preprocessor symbol LEAP_SMEAR. + + ntpd/ntp_timer.c@1.91 +21 -12 + Protected leap smearing code by preprocessor symbol LEAP_SMEAR. + +ChangeSet@1.3466, 2015-06-22 07:45:39+00:00, stenn@psp-at1.ntp.org + Initial support for experimental leap smear code. Harlan Stenn. + + ChangeLog@1.1660 +1 -0 + Initial support for experimental leap smear code. Harlan Stenn. + + configure.ac@1.595 +21 -0 + Initial support for experimental leap smear code. Harlan Stenn. + +ChangeSet@1.3458.1.2, 2015-06-22 13:06:53+05:30, loki@dadasgift.(none) + Nameresolution test + + sntp/tests/Makefile.am@1.50.1.2 +20 -0 + + sntp/tests/g_nameresolution.cpp@1.1 +171 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/sntp/tests/g_nameresolution.cpp + + sntp/tests/g_nameresolution.cpp@1.0 +0 -0 + + sntp/tests/nameresolution.c@1.1 +162 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/sntp/tests/nameresolution.c + + sntp/tests/nameresolution.c@1.0 +0 -0 + + sntp/tests/run-nameresolution.c@1.1 +51 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/sntp/tests/run-nameresolution.c + + sntp/tests/run-nameresolution.c@1.0 +0 -0 + +ChangeSet@1.3453.1.3, 2015-06-22 12:56:31+05:30, loki@dadasgift.(none) + Makefile changes + + sntp/tests/Makefile.am@1.48.1.1 +20 -0 + +ChangeSet@1.3465, 2015-06-22 06:50:39+00:00, stenn@psp-at1.ntp.org + Regenerate some unity test runners to declare resetTest() + + tests/libntp/run-caljulian.c@1.8 +1 -0 + Regenerate some unity test runners to declare resetTest() + + tests/libntp/run-decodenetnum.c@1.3 +1 -0 + Regenerate some unity test runners to declare resetTest() + + tests/libntp/run-hextolfp.c@1.4 +1 -0 + Regenerate some unity test runners to declare resetTest() + + tests/libntp/run-netof.c@1.3 +1 -0 + Regenerate some unity test runners to declare resetTest() + + tests/libntp/run-vi64ops.c@1.3 +1 -0 + Regenerate some unity test runners to declare resetTest() + +ChangeSet@1.3464, 2015-06-21 05:15:32+00:00, stenn@psp-at1.ntp.org + Fixes to sntp/tests/fileHandlingTest.h.in. Harlan Stenn. + + ChangeLog@1.1659 +1 -0 + Fixes to sntp/tests/fileHandlingTest.h.in. Harlan Stenn. + + sntp/configure.ac@1.81 +1 -0 + Fixes to sntp/tests/fileHandlingTest.h.in. Harlan Stenn. + + sntp/tests/fileHandlingTest.h.in@1.10 +3 -11 + Fixes to sntp/tests/fileHandlingTest.h.in. Harlan Stenn. + + sntp/tests/fileHandlingTest.h.in@1.9, stenn@psp-fb1.ntp.org +0 -0 + Rename: sntp/tests/fileHandlingTest.h -> sntp/tests/fileHandlingTest.h.in + +ChangeSet@1.3463, 2015-06-20 23:18:33+00:00, stenn@psp-at1.ntp.org + [Bug 2852] 'make check' can't find unity.h. Hal Murray. + + ChangeLog@1.1658 +1 -0 + [Bug 2852] 'make check' can't find unity.h. Hal Murray. + +ChangeSet@1.3462, 2015-06-20 23:12:10+00:00, stenn@psp-at1.ntp.org + [Bug 2854] Missing brace in libntp/strdup.c. Masanari Iida. + + ChangeLog@1.1657 +1 -0 + [Bug 2854] Missing brace in libntp/strdup.c. Masanari Iida. + + libntp/strdup.c@1.9 +9 -10 + [Bug 2854] Missing brace in libntp/strdup.c. Masanari Iida. + +ChangeSet@1.3461, 2015-06-20 22:41:34+00:00, stenn@psp-at1.ntp.org + gtest->Unity cleanup + + sntp/tests/Makefile.am@1.51 +10 -6 + gtest->Unity cleanup + + sntp/tests_main.cpp@1.9 +4 -0 + gtest->Unity cleanup + + tests/libntp/g_buftvtots.cpp@1.5 +1 -1 + gtest->Unity cleanup + + tests/libntp/g_decodenetnum.cpp@1.2 +1 -1 + gtest->Unity cleanup + + tests/libntp/g_hextolfp.cpp@1.2 +1 -1 + gtest->Unity cleanup + + tests/libntp/g_netof.cpp@1.2 +1 -1 + gtest->Unity cleanup + + tests/libntp/g_socktoa.cpp@1.2 +1 -1 + gtest->Unity cleanup + + tests/libntp/g_strtolfp.cpp@1.2 +1 -1 + gtest->Unity cleanup + + tests/libntp/g_tvtots.cpp@1.8 +1 -1 + gtest->Unity cleanup + +ChangeSet@1.3460, 2015-06-20 21:41:29+00:00, stenn@psp-at1.ntp.org + re-apply lost typo fix + + sntp/tests/g_crypto.cpp@1.1.1.1 +1 -1 + re-apply lost typo fix + +ChangeSet@1.3458, 2015-06-20 14:32:03+02:00, viperus@ubuntu.(none) + run-crypto.c: + new file + Makefile.am: + minor rearrange + crypto.c: + minor fix with #define, now works even without openSSL + + sntp/tests/Makefile.am@1.50 +16 -18 + minor rearrange + + sntp/tests/crypto.c@1.3 +11 -4 + minor fix with #define, now works even without openSSL + + sntp/tests/run-crypto.c@1.1 +62 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/run-crypto.c + + sntp/tests/run-crypto.c@1.0 +0 -0 + +ChangeSet@1.3456, 2015-06-20 14:14:57+02:00, viperus@ubuntu.(none) + Makefile.am: + added a few more test files to cleanfiles + g_utilities.cpp: + Rename: sntp/tests/utilities.cpp -> sntp/tests/g_utilities.cpp + bug-2803.h~e9cdd024b7db50f6: + Delete: tests/bug-2803/bug-2803.h + Many files: + new file + Makefile.am: + added utilities test, fixed a minor bug with CLEANFILES var + generate_test_runner.rb: + for now, I'm giving up on removing functions that are written twice (because of declaraion and defintion). That regex is difficult because ruby script splits with newline, ; and { and }. I just added declaration for resetTest, to avoid warnings + + BitKeeper/deleted/4b/bug-2803.h~e9cdd024b7db50f6@1.2 +0 -0 + Delete: tests/bug-2803/bug-2803.h + + sntp/tests/Makefile.am@1.46.1.2 +1 -1 + added a few more test files to cleanfiles + + sntp/tests/Makefile.am@1.46.1.1 +50 -32 + added utilities test, fixed a minor bug with CLEANFILES var + + sntp/tests/data/debug-output-lfp-bin@1.1 +3 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/data/debug-output-lfp-bin + + sntp/tests/data/debug-output-lfp-bin@1.0 +0 -0 + + sntp/tests/data/debug-output-lfp-dec@1.1 +3 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/data/debug-output-lfp-dec + + sntp/tests/data/debug-output-lfp-dec@1.0 +0 -0 + + sntp/tests/data/debug-output-pkt@1.1 +8 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/data/debug-output-pkt + + sntp/tests/data/debug-output-pkt@1.0 +0 -0 + + sntp/tests/g_utilities.cpp@1.11 +0 -0 + Rename: sntp/tests/utilities.cpp -> sntp/tests/g_utilities.cpp + + sntp/tests/run-utilities.c@1.1 +64 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/run-utilities.c + + sntp/tests/run-utilities.c@1.0 +0 -0 + + sntp/tests/utilities.c@1.1 +177 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/utilities.c + + sntp/tests/utilities.c@1.0 +0 -0 + + sntp/unity/auto/generate_test_runner.rb@1.5.1.1 +1 -0 + for now, I'm giving up on removing functions that are written twice (because of declaraion and defintion). That regex is difficult because ruby script splits with newline, ; and { and }. I just added declaration for resetTest, to avoid warnings + + tests/bug-2803/bug-2803.c@1.8 +1 -1 + + tests/bug-2803/bug-2803.c@1.7 +4 -1 + + tests/bug-2803/run-bug-2803.c@1.7 +3 -2 + +ChangeSet@1.3453.1.2, 2015-06-20 16:11:49+05:30, loki@dadasgift.(none) + Crypto test file + + sntp/tests/Makefile.am@1.48 +19 -1 + + sntp/tests/crypto.c@1.2 +1 -1 + +ChangeSet@1.3452.1.1, 2015-06-20 09:07:37+00:00, stenn@psp-at1.ntp.org + typo + + sntp/unity/auto/colour_prompt.rb@1.2 +0 -0 + Change mode to -rw-rw-r-- + + sntp/unity/auto/colour_reporter.rb@1.2 +0 -0 + Change mode to -rw-rw-r-- + + sntp/unity/auto/generate_config.yml@1.2 +0 -0 + Change mode to -rw-rw-r-- + + sntp/unity/auto/generate_module.rb@1.2 +0 -0 + Change mode to -rw-rw-r-- + + sntp/unity/auto/generate_test_runner.rb@1.6 +0 -0 + Change mode to -rw-rw-r-- + + sntp/unity/auto/test_file_filter.rb@1.2 +0 -0 + Change mode to -rw-rw-r-- + + sntp/unity/auto/unity_test_summary.rb@1.2 +0 -0 + Change mode to -rw-rw-r-- + + tests/libntp/sfptostr.c@1.2 +1 -1 + typo + +ChangeSet@1.3455, 2015-06-20 10:10:34+02:00, viperus@ubuntu.(none) + bug-2803.h: + new file + bug-2803.c: + removed declarations, and put them into bug-2803.h + + tests/bug-2803/bug-2803.c@1.6 +1 -4 + removed declarations, and put them into bug-2803.h + + tests/bug-2803/bug-2803.h@1.1 +14 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/bug-2803/bug-2803.h + + tests/bug-2803/bug-2803.h@1.0 +0 -0 + + tests/bug-2803/run-bug-2803.c@1.6 +1 -3 + +ChangeSet@1.3454, 2015-06-20 09:57:06+02:00, viperus@ubuntu.(none) + testcalshims.c~f84485d2b13cef55: + Delete: tests/libntp/testcalshims.c + testcalshims.h~5612fd527e4d6de9: + Delete: tests/libntp/testcalshims.h + + BitKeeper/deleted/3e/testcalshims.c~f84485d2b13cef55@1.5 +0 -0 + Delete: tests/libntp/testcalshims.c + + BitKeeper/deleted/ac/testcalshims.h~5612fd527e4d6de9@1.5 +0 -0 + Delete: tests/libntp/testcalshims.h + +ChangeSet@1.3453, 2015-06-20 09:19:13+02:00, viperus@ubuntu.(none) + run-buftvtots.c, buftvtots.c: + new file + Makefile.am: + minor fix to the alphabetic list + added buftvtots + + tests/libntp/Makefile.am@1.80 +2 -2 + minor fix to the alphabetic list + + tests/libntp/Makefile.am@1.79 +26 -6 + added buftvtots + + tests/libntp/buftvtots.c@1.1 +78 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/buftvtots.c + + tests/libntp/buftvtots.c@1.0 +0 -0 + + tests/libntp/run-buftvtots.c@1.1 +57 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-buftvtots.c + + tests/libntp/run-buftvtots.c@1.0 +0 -0 + +ChangeSet@1.3452, 2015-06-20 04:02:48+00:00, stenn@psp-at1.ntp.org + unity cleanup + + sntp/tests/utilities.cpp@1.10 +5 -5 + unity cleanup + +ChangeSet@1.3451, 2015-06-20 04:00:43+00:00, stenn@psp-at1.ntp.org + tests/libntp cleanup for Unity + + tests/libntp/Makefile.am@1.78 +7 -7 + tests/libntp cleanup for Unity + + tests/libntp/clocktime.c@1.3 +1 -5 + tests/libntp cleanup for Unity + + tests/libntp/decodenetnum.c@1.2 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_a_md5encrypt.cpp@1.7 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_atoint.cpp@1.4 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_atouint.cpp@1.3 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_authkeys.cpp@1.9 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_buftvtots.cpp@1.4, stenn@psp-fb1.ntp.org +0 -0 + Rename: tests/libntp/buftvtots.cpp -> tests/libntp/g_buftvtots.cpp + + tests/libntp/g_calendar.cpp@1.3 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_caljulian.cpp@1.7 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_caltontp.cpp@1.2 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_calyearstart.cpp@1.5 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_clocktime.cpp@1.6 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_hextoint.cpp@1.5 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_humandate.cpp@1.4 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_lfpfunc.cpp@1.4 +2 -2 + tests/libntp cleanup for Unity + + tests/libntp/g_lfptest.h@1.7 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_lfptest.h@1.6, stenn@psp-fb1.ntp.org +0 -0 + Rename: tests/libntp/lfptest.h -> tests/libntp/g_lfptest.h + + tests/libntp/g_lfptostr.cpp@1.2 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_libntptest.cpp@1.5 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_libntptest.cpp@1.4, stenn@psp-fb1.ntp.org +0 -0 + Rename: tests/libntp/libntptest.cpp -> tests/libntp/g_libntptest.cpp + + tests/libntp/g_libntptest.h@1.5, stenn@psp-fb1.ntp.org +0 -0 + Rename: tests/libntp/libntptest.h -> tests/libntp/g_libntptest.h + + tests/libntp/g_modetoa.cpp@1.3 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_msyslog.cpp@1.2 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_numtoa.cpp@1.4 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_numtohost.cpp@1.3 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_octtoint.cpp@1.2 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_prettydate.cpp@1.2 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_recvbuff.cpp@1.2 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_refnumtoa.cpp@1.4 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_sfptostr.cpp@1.3 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_sockaddrtest.h@1.5 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_sockaddrtest.h@1.4, stenn@psp-fb1.ntp.org +0 -0 + Rename: tests/libntp/sockaddrtest.h -> tests/libntp/g_sockaddrtest.h + + tests/libntp/g_ssl_init.cpp@1.5 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_statestr.cpp@1.4 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_timespecops.cpp@1.10 +2 -2 + tests/libntp cleanup for Unity + + tests/libntp/g_timestructs.cpp@1.6 +2 -2 + tests/libntp cleanup for Unity + + tests/libntp/g_timestructs.cpp@1.5, stenn@psp-fb1.ntp.org +0 -0 + Rename: tests/libntp/timestructs.cpp -> tests/libntp/g_timestructs.cpp + + tests/libntp/g_timestructs.h@1.5, stenn@psp-fb1.ntp.org +0 -0 + Rename: tests/libntp/timestructs.h -> tests/libntp/g_timestructs.h + + tests/libntp/g_timevalops.cpp@1.10 +2 -2 + tests/libntp cleanup for Unity + + tests/libntp/g_tstotv.cpp@1.2 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_uglydate.cpp@1.4 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_vi64ops.cpp@1.2 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/g_ymd2yd.cpp@1.3 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/hextolfp.c@1.4 +3 -1 + tests/libntp cleanup for Unity + + tests/libntp/humandate.c@1.3 +3 -2 + tests/libntp cleanup for Unity + + tests/libntp/lfpfunc.c@1.6 +0 -2 + tests/libntp cleanup for Unity + + tests/libntp/lfptest.h@1.3 +0 -0 + Rename: tests/libntp/c_lfptest.h -> tests/libntp/lfptest.h + + tests/libntp/lfptostr.c@1.2 +2 -1 + tests/libntp cleanup for Unity + + tests/libntp/msyslog.c@1.2 +2 -3 + tests/libntp cleanup for Unity + + tests/libntp/netof.c@1.3 +4 -4 + tests/libntp cleanup for Unity + + tests/libntp/octtoint.c@1.3 +1 -3 + tests/libntp cleanup for Unity + + tests/libntp/prettydate.c@1.2 +2 -1 + tests/libntp cleanup for Unity + + tests/libntp/recvbuff.c@1.4 +3 -4 + tests/libntp cleanup for Unity + + tests/libntp/refnumtoa.c@1.2 +1 -0 + tests/libntp cleanup for Unity + + tests/libntp/run-clocktime.c@1.4 +8 -8 + tests/libntp cleanup for Unity + + tests/libntp/run-hextolfp.c@1.3 +6 -6 + tests/libntp cleanup for Unity + + tests/libntp/run-humandate.c@1.2 +2 -2 + tests/libntp cleanup for Unity + + tests/libntp/run-lfpfunc.c@1.9 +9 -9 + tests/libntp cleanup for Unity + + tests/libntp/run-lfptostr.c@1.2 +11 -11 + tests/libntp cleanup for Unity + + tests/libntp/run-msyslog.c@1.2 +8 -8 + tests/libntp cleanup for Unity + + tests/libntp/run-octtoint.c@1.4 +7 -7 + tests/libntp cleanup for Unity + + tests/libntp/run-prettydate.c@1.2 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/run-recvbuff.c@1.2 +3 -3 + tests/libntp cleanup for Unity + + tests/libntp/run-refnumtoa.c@1.3 +2 -2 + tests/libntp cleanup for Unity + + tests/libntp/run-socktoa.c@1.6 +6 -6 + tests/libntp cleanup for Unity + + tests/libntp/run-ssl_init.c@1.4 +5 -5 + tests/libntp cleanup for Unity + + tests/libntp/run-strtolfp.c@1.2 +7 -7 + tests/libntp cleanup for Unity + + tests/libntp/run-timespecops.c@1.3 +28 -28 + tests/libntp cleanup for Unity + + tests/libntp/run-timevalops.c@1.5 +28 -28 + tests/libntp cleanup for Unity + + tests/libntp/run-tstotv.c@1.2 +3 -3 + tests/libntp cleanup for Unity + + tests/libntp/run-tvtots.c@1.2 +3 -3 + tests/libntp cleanup for Unity + + tests/libntp/run-uglydate.c@1.7 +1 -1 + tests/libntp cleanup for Unity + + tests/libntp/sockaddrtest.h@1.3 +0 -0 + Rename: tests/libntp/c_sockaddrtest.h -> tests/libntp/sockaddrtest.h + + tests/libntp/socktoa.c@1.3 +3 -1 + tests/libntp cleanup for Unity + + tests/libntp/ssl_init.c@1.5 +2 -1 + tests/libntp cleanup for Unity + + tests/libntp/strtolfp.c@1.2 +3 -1 + tests/libntp cleanup for Unity + + tests/libntp/test-libntp.c@1.9 +1 -0 + tests/libntp cleanup for Unity + + tests/libntp/testcalshims.h@1.4 +0 -3 + tests/libntp cleanup for Unity + + tests/libntp/timespecops.c@1.2 +0 -1 + tests/libntp cleanup for Unity + + tests/libntp/timestructs.c@1.2 +0 -0 + Rename: tests/libntp/c_timestructs.c -> tests/libntp/timestructs.c + + tests/libntp/timestructs.h@1.2 +0 -0 + Rename: tests/libntp/c_timestructs.h -> tests/libntp/timestructs.h + + tests/libntp/timevalops.c@1.5 +2 -4 + tests/libntp cleanup for Unity + + tests/libntp/tstotv.c@1.2 +3 -1 + tests/libntp cleanup for Unity + + tests/libntp/tvtots.c@1.3 +3 -2 + tests/libntp cleanup for Unity + + tests/libntp/uglydate.c@1.5 +1 -0 + tests/libntp cleanup for Unity + + tests/libntp/vi64ops.c@1.2 +2 -2 + tests/libntp cleanup for Unity + +ChangeSet@1.3450, 2015-06-20 02:39:45+00:00, stenn@psp-fb1.ntp.org + Unity cleanup of sntp/tests/ + + sntp/tests/Makefile.am@1.46 +4 -3 + Unity cleanup of sntp/tests/ + + sntp/tests/crypto.cpp@1.5 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/fileHandlingTest.h@1.8 +8 -7 + Unity cleanup of sntp/tests/ + + sntp/tests/fileHandlingTest.h@1.7 +0 -0 + Rename: sntp/tests/c_fileHandlingTest.h -> sntp/tests/fileHandlingTest.h + + sntp/tests/g_fileHandlingTest.h@1.6 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/g_fileHandlingTest.h@1.5 +0 -0 + Rename: sntp/tests/fileHandlingTest.h -> sntp/tests/g_fileHandlingTest.h + + sntp/tests/g_keyFile.cpp@1.8 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/g_kodDatabase.cpp@1.5 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/g_kodFile.cpp@1.10 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/g_networking.cpp@1.10 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/g_sntptest.h@1.6 +0 -0 + Rename: sntp/tests/sntptest.h -> sntp/tests/g_sntptest.h + + sntp/tests/keyFile.c@1.3 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/kodDatabase.c@1.2 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/kodFile.c@1.5 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/nameresolution.cpp@1.2 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/networking.c@1.3 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/packetHandling.cpp@1.11 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/packetProcessing.cpp@1.6 +1 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/run-keyFile.c@1.4 +0 -1 + Unity cleanup of sntp/tests/ + + sntp/tests/sntptest.h@1.2 +0 -0 + Rename: sntp/tests/c_sntptest.h -> sntp/tests/sntptest.h + + sntp/tests/utilities.cpp@1.9 +2 -2 + Unity cleanup of sntp/tests/ + +ChangeSet@1.3449, 2015-06-20 01:25:54+00:00, stenn@psp-fb1.ntp.org + Remove obsolete gtest files + + BitKeeper/deleted/03/atolfp.cpp~4b2bfa141cb6e704@1.10, stenn@psp-at1.ntp.org +0 -0 + Delete: tests/libntp/strtolfp.cpp + + BitKeeper/deleted/11/octtoint.cpp~50548df6cb56ca39@1.3, stenn@psp-at1.ntp.org +0 -0 + Delete: tests/libntp/octtoint.cpp + + BitKeeper/deleted/1e/lfptostr.cpp~fc33022cca22f4a0@1.4, stenn@psp-at1.ntp.org +0 -0 + Delete: tests/libntp/lfptostr.cpp + + BitKeeper/deleted/29/netof.cpp~ce09accf46a3055c@1.2, stenn@psp-at1.ntp.org +0 -0 + Delete: tests/libntp/netof.cpp + + BitKeeper/deleted/36/hextolfp.cpp~bdb41862b8a92a90@1.6, stenn@psp-at1.ntp.org +0 -0 + Delete: tests/libntp/hextolfp.cpp + + BitKeeper/deleted/c0/decodenetnum.cpp~eb55b950b046942f@1.3, stenn@psp-at1.ntp.org +0 -0 + Delete: tests/libntp/decodenetnum.cpp + +ChangeSet@1.3447, 2015-06-20 00:57:57+00:00, tflendrich@psp-deb1.ntp.org + Makefile.am: + dashes are now lined up + + tests/libntp/Makefile.am@1.77 +9 -9 + dashes are now lined up + +ChangeSet@1.3445.1.1, 2015-06-20 00:57:43+00:00, stenn@psp-at1.ntp.org + sntp/tests/Makefile.am cleanup + + sntp/tests/Makefile.am@1.45 +41 -37 + sntp/tests/Makefile.am cleanup + +ChangeSet@1.3446, 2015-06-20 00:55:15+00:00, tflendrich@psp-deb1.ntp.org + Makefile.am: + changed the indent from spaces to tabs + + tests/libntp/Makefile.am@1.76 +5 -5 + changed the indent from spaces to tabs + +ChangeSet@1.3445, 2015-06-19 23:49:56+00:00, tflendrich@psp-deb1.ntp.org + Makefile.am: + added a missing "-lpthread" + + tests/libntp/Makefile.am@1.75 +1 -0 + added a missing "-lpthread" + +ChangeSet@1.3444, 2015-06-19 23:34:57+00:00, tflendrich@psp-deb1.ntp.org + Makefile.am: + fixed the merge + + tests/libntp/Makefile.am@1.74 +1 -0 + fixed the merge + +ChangeSet@1.3429.3.3, 2015-06-20 00:33:19+02:00, tomek@tomek-n56vz.(none) + converted humandate from gtest to unity + + tests/libntp/Makefile.am@1.68.3.3 +20 -1 + added humandate.c + + tests/libntp/g_humandate.cpp@1.3 +0 -0 + Rename: tests/libntp/humandate.cpp -> tests/libntp/g_humandate.cpp + + tests/libntp/humandate.c@1.2 +25 -31 + + tests/libntp/humandate.c@1.1 +41 -0 + BitKeeper file /home/tomek/ntp/kod/head/ntp-stable-unity/tests/libntp/humandate.c + + tests/libntp/humandate.c@1.0 +0 -0 + + tests/libntp/run-humandate.c@1.1 +53 -0 + BitKeeper file /home/tomek/ntp/kod/head/ntp-stable-unity/tests/libntp/run-humandate.c + + tests/libntp/run-humandate.c@1.0 +0 -0 + + tests/libntp/run-sfptostr.c@1.1 +65 -0 + BitKeeper file /home/tomek/ntp/kod/head/ntp-stable-unity/tests/libntp/run-sfptostr.c + + tests/libntp/run-sfptostr.c@1.0 +0 -0 + +ChangeSet@1.3442, 2015-06-19 23:52:11+02:00, viperus@ubuntu.(none) + kodFile.c: + removed debug printfs + + sntp/tests/kodFile.c@1.4 +7 -7 + removed debug printfs + +ChangeSet@1.3441, 2015-06-19 23:15:36+02:00, viperus@ubuntu.(none) + Makefile.am: + added some clean and distclean stuff + c_fileHandlingTest.h: + added more debug printfs + kodFile.c: + changed CreatePath so new files are written in a writeable directory + + sntp/tests/Makefile.am@1.43 +2 -1 + added some clean and distclean stuff + + sntp/tests/c_fileHandlingTest.h@1.6 +1 -1 + added more debug printfs + + sntp/tests/kodFile.c@1.3 +7 -4 + changed CreatePath so new files are written in a writeable directory + + sntp/tests/run-kodFile.c@1.2 +2 -2 + +ChangeSet@1.3429.3.2, 2015-06-19 23:07:51+02:00, tomek@tomek-n56vz.(none) + converted sfptostr from GTest to Unity + + sntp/tests/Makefile.am@1.40.3.1 +1 -1 + makefile now works if someone has gtest + + sntp/tests/g_keyFile.cpp@1.4.2.1 +0 -0 + Rename: sntp/tests/keyFile.cpp -> sntp/tests/g_keyFile.cpp + + tests/libntp/Makefile.am@1.68.3.2 +21 -1 + added sfptostr.c + + tests/libntp/g_sfptostr.cpp@1.2 +0 -0 + Rename: tests/libntp/sfptostr.cpp -> tests/libntp/g_sfptostr.cpp + + tests/libntp/sfptostr.c@1.1 +73 -0 + BitKeeper file /home/tomek/ntp/kod/head/ntp-stable-unity/tests/libntp/sfptostr.c + + tests/libntp/sfptostr.c@1.0 +0 -0 + +ChangeSet@1.3429.3.1, 2015-06-19 22:31:16+02:00, tomek@tomek-n56vz.(none) + converted tvtots from gtest to unity + + tests/libntp/Makefile.am@1.68.3.1 +21 -1 + added tvtots.c + + tests/libntp/g_tvtots.cpp@1.7 +0 -0 + Rename: tests/libntp/tvtots.cpp -> tests/libntp/g_tvtots.cpp + + tests/libntp/run-tvtots.c@1.1 +55 -0 + BitKeeper file /home/tomek/ntp/kod/head/ntp-stable-unity/tests/libntp/run-tvtots.c + + tests/libntp/run-tvtots.c@1.0 +0 -0 + + tests/libntp/tvtots.c@1.2 +53 -0 + converted to unity + + tests/libntp/tvtots.c@1.1 +0 -0 + BitKeeper file /home/tomek/ntp/kod/head/ntp-stable-unity/tests/libntp/tvtots.c + + tests/libntp/tvtots.c@1.0 +0 -0 + +ChangeSet@1.3429.1.9, 2015-06-19 18:00:35+00:00, tflendrich@psp-deb1.ntp.org + bring back two files that were wrongfully removed + + tests/libntp/test-libntp.c@1.8 +0 -0 + Rename: BitKeeper/deleted/a4/test-libntp.c~4efce7533d11e808 -> tests/libntp/test-libntp.c + + tests/libntp/test-libntp.h@1.6 +0 -0 + Rename: BitKeeper/deleted/01/test-libntp.h~c19218ad555ac21 -> tests/libntp/test-libntp.h + +ChangeSet@1.3439, 2015-06-19 17:51:30+02:00, viperus@ubuntu.(none) + c_fileHandlingTest.h: + added new cases with strcpy(path,....) + run-strtolfp.c, run-lfptostr.c: + new file + + sntp/tests/c_fileHandlingTest.h@1.5 +4 -1 + added new cases with strcpy(path,....) + + tests/libntp/run-lfptostr.c@1.1 +71 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-lfptostr.c + + tests/libntp/run-lfptostr.c@1.0 +0 -0 + + tests/libntp/run-strtolfp.c@1.1 +63 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-strtolfp.c + + tests/libntp/run-strtolfp.c@1.0 +0 -0 + +ChangeSet@1.3429.2.2, 2015-06-19 20:24:45+05:30, loki@dadasgift.(none) + Test - crypto.c from sntp + + sntp/tests/Makefile.am@1.40.2.1 +20 -1 + + sntp/tests/crypto.c@1.1 +127 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/sntp/tests/crypto.c + + sntp/tests/crypto.c@1.0 +0 -0 + + sntp/tests/g_crypto.cpp@1.1 +129 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/sntp/tests/g_crypto.cpp + + sntp/tests/g_crypto.cpp@1.0 +0 -0 + +ChangeSet@1.3413.3.4, 2015-06-19 16:06:35+02:00, martin@pc-martin.(none) + More support for smeared leap seconds. + + include/ntpd.h@1.190 +2 -0 + More support for smeared leap seconds. + + ntpd/ntp_config.c@1.329 +1 -0 + More support for smeared leap seconds. + + ntpd/ntp_control.c@1.197 +18 -1 + More support for smeared leap seconds. + + ntpd/ntp_leapsec.h@1.13 +1 -0 + More support for smeared leap seconds. + + ntpd/ntp_proto.c@1.358 +33 -14 + More support for smeared leap seconds. + + ntpd/ntp_timer.c@1.90 +40 -10 + More support for smeared leap seconds. + +ChangeSet@1.3435.1.1, 2015-06-19 13:51:57+00:00, viperus@psp-at1.ntp.org + c_fileHandlingTest.h: + added debug printfs, changed path value + kodFile.c: + added debug printfs + + sntp/tests/c_fileHandlingTest.h@1.4 +1 -1 + added debug printfs, changed path value + + sntp/tests/kodFile.c@1.2 +3 -3 + added debug printfs + +ChangeSet@1.3436, 2015-06-19 15:42:41+02:00, viperus@ubuntu.(none) + kod-output-single, kod-output-blank, kod-output-multiple: + new file + + sntp/tests/data/kod-output-blank@1.1 +0 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/data/kod-output-blank + + sntp/tests/data/kod-output-blank@1.0 +0 -0 + + sntp/tests/data/kod-output-multiple@1.1 +3 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/data/kod-output-multiple + + sntp/tests/data/kod-output-multiple@1.0 +0 -0 + + sntp/tests/data/kod-output-single@1.1 +1 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/data/kod-output-single + + sntp/tests/data/kod-output-single@1.0 +0 -0 + +ChangeSet@1.3435, 2015-06-19 13:58:37+02:00, viperus@ubuntu.(none) + c_fileHandlingTest.h: + added different paths depening on the build dir, maybe this will work on freebsd + run-keyFile.c: + slight change + + sntp/tests/c_fileHandlingTest.h@1.3 +16 -2 + added different paths depening on the build dir, maybe this will work on freebsd + + sntp/tests/run-keyFile.c@1.3 +1 -0 + slight change + +ChangeSet@1.3413.3.3, 2015-06-19 08:20:49+00:00, burnicki@psp-deb1.ntp.org + Updates by Harlan. + + ntpd/complete.conf.in@1.29 +1 -0 + Updates by Harlan. + + ntpd/ntp_parser.c@1.95 +1511 -1563 + Updates by Harlan. + + ntpd/ntp_parser.h@1.60 +230 -220 + Updates by Harlan. + +ChangeSet@1.3429.1.8, 2015-06-19 07:03:32+00:00, tflendrich@psp-at1.ntp.org + removed generated files that are not longer used + + BitKeeper/deleted/01/test-libntp.h~c19218ad555ac21@1.5 +0 -0 + Delete: tests/libntp/test-libntp.h + + BitKeeper/deleted/17/test-msyslog.c~36cfb2ff59dd5e9@1.2 +0 -0 + Delete: tests/libntp/test-msyslog.c + + BitKeeper/deleted/2a/test-recvbuff.c~1bf5e94672c41f5@1.2 +0 -0 + Delete: tests/libntp/test-recvbuff.c + + BitKeeper/deleted/67/test-tstotv.c~3117fe865385504e@1.2 +0 -0 + Delete: tests/libntp/test-tstotv.c + + BitKeeper/deleted/6f/test-ssl_init.c~2c5bc2112c1aaf15@1.2 +0 -0 + Delete: tests/libntp/test-ssl_init.c + + BitKeeper/deleted/91/test-vi64ops.c~3812d64e36653bf4@1.2 +0 -0 + Delete: tests/libntp/test-vi64ops.c + + BitKeeper/deleted/a4/test-libntp.c~4efce7533d11e808@1.7 +0 -0 + Delete: tests/libntp/test-libntp.c + + BitKeeper/deleted/b9/test-prettydate.c~ce9792d7bb10506b@1.2 +0 -0 + Delete: tests/libntp/test-prettydate.c + + BitKeeper/deleted/bb/test-caltontp.c~8cc124d6c538f1cb@1.2 +0 -0 + Delete: tests/libntp/test-caltontp.c + +ChangeSet@1.3429.1.7, 2015-06-19 06:43:05+00:00, tflendrich@psp-at1.ntp.org + deleted old, unused generated files + + BitKeeper/deleted/27/run-test-prettydate.c~93d1bdc762261643@1.2 +0 -0 + Delete: tests/libntp/run-test-prettydate.c + + BitKeeper/deleted/31/run-test-vi64ops.c~ddc8f15be90f476c@1.2 +0 -0 + Delete: tests/libntp/run-test-vi64ops.c + + BitKeeper/deleted/40/run-test-ssl_init.c~7ed3e3db79be5452@1.2 +0 -0 + Delete: tests/libntp/run-test-ssl_init.c + + BitKeeper/deleted/55/run-test-caltontp.c~989b072c54cd2ccd@1.2 +0 -0 + Delete: tests/libntp/run-test-caltontp.c + + BitKeeper/deleted/67/run-test-tstotv.c~48cf1897ca453301@1.2 +0 -0 + Delete: tests/libntp/run-test-tstotv.c + + BitKeeper/deleted/9f/run-test-msyslog.c~fb1907a46fb63895@1.2 +0 -0 + Delete: tests/libntp/run-test-msyslog.c + + BitKeeper/deleted/bc/run-test-recvbuff.c~cf87735b269fb6c2@1.2 +0 -0 + Delete: tests/libntp/run-test-recvbuff.c + +ChangeSet@1.3413.1.3, 2015-06-19 12:04:49+05:30, loki@dadasgift.(none) + lfptostr & strtolfp tests + + tests/libntp/Makefile.am@1.64.1.3 +38 -2 + +ChangeSet@1.3429.1.6, 2015-06-19 06:20:32+00:00, tflendrich@psp-deb1.ntp.org + added autogenerated files + + tests/libntp/run-caltontp.c@1.1 +57 -0 + BitKeeper file /home/tflendrich/develpment/harlans/ntp-stable-unity/tests/libntp/run-caltontp.c + + tests/libntp/run-caltontp.c@1.0 +0 -0 + + tests/libntp/run-msyslog.c@1.1 +65 -0 + BitKeeper file /home/tflendrich/develpment/harlans/ntp-stable-unity/tests/libntp/run-msyslog.c + + tests/libntp/run-msyslog.c@1.0 +0 -0 + + tests/libntp/run-prettydate.c@1.1 +51 -0 + BitKeeper file /home/tflendrich/develpment/harlans/ntp-stable-unity/tests/libntp/run-prettydate.c + + tests/libntp/run-prettydate.c@1.0 +0 -0 + + tests/libntp/run-recvbuff.c@1.1 +55 -0 + BitKeeper file /home/tflendrich/develpment/harlans/ntp-stable-unity/tests/libntp/run-recvbuff.c + + tests/libntp/run-recvbuff.c@1.0 +0 -0 + + tests/libntp/run-tstotv.c@1.1 +55 -0 + BitKeeper file /home/tflendrich/develpment/harlans/ntp-stable-unity/tests/libntp/run-tstotv.c + + tests/libntp/run-tstotv.c@1.0 +0 -0 + + tests/libntp/test-caltontp.c@1.1 +0 -0 + BitKeeper file /home/tflendrich/develpment/harlans/ntp-stable-unity/tests/libntp/test-caltontp.c + + tests/libntp/test-caltontp.c@1.0 +0 -0 + + tests/libntp/test-msyslog.c@1.1 +0 -0 + BitKeeper file /home/tflendrich/develpment/harlans/ntp-stable-unity/tests/libntp/test-msyslog.c + + tests/libntp/test-msyslog.c@1.0 +0 -0 + + tests/libntp/test-prettydate.c@1.1 +0 -0 + BitKeeper file /home/tflendrich/develpment/harlans/ntp-stable-unity/tests/libntp/test-prettydate.c + + tests/libntp/test-prettydate.c@1.0 +0 -0 + + tests/libntp/test-recvbuff.c@1.1 +0 -0 + BitKeeper file /home/tflendrich/develpment/harlans/ntp-stable-unity/tests/libntp/test-recvbuff.c + + tests/libntp/test-recvbuff.c@1.0 +0 -0 + + tests/libntp/test-ssl_init.c@1.1 +0 -0 + BitKeeper file /home/tflendrich/develpment/harlans/ntp-stable-unity/tests/libntp/test-ssl_init.c + + tests/libntp/test-ssl_init.c@1.0 +0 -0 + + tests/libntp/test-tstotv.c@1.1 +0 -0 + BitKeeper file /home/tflendrich/develpment/harlans/ntp-stable-unity/tests/libntp/test-tstotv.c + + tests/libntp/test-tstotv.c@1.0 +0 -0 + + tests/libntp/test-vi64ops.c@1.1 +0 -0 + BitKeeper file /home/tflendrich/develpment/harlans/ntp-stable-unity/tests/libntp/test-vi64ops.c + + tests/libntp/test-vi64ops.c@1.0 +0 -0 + +ChangeSet@1.3429.1.5, 2015-06-19 07:09:46+02:00, tomek@tomek-n56vz.(none) + recvbuff.c: + removed testcalshims.h + + tests/libntp/recvbuff.c@1.3 +2 -2 + removed testcalshims.h + +ChangeSet@1.3429.1.4, 2015-06-19 04:16:11+00:00, tflendrich@psp-deb1.ntp.org + Makefile.am: + added -lpthread + + tests/libntp/Makefile.am@1.71 +1 -0 + added -lpthread + +ChangeSet@1.3429.1.3, 2015-06-19 05:59:58+02:00, tomek@tomek-n56vz.(none) + fixed a makefile: it didn't work if we had gtest enabled + + sntp/tests/Makefile.am@1.40.1.1 +2 -2 + + sntp/tests/g_keyFile.cpp@1.4.1.1 +0 -0 + Rename: sntp/tests/keyFile.cpp -> sntp/tests/g_keyFile.cpp + + tests/libntp/Makefile.am@1.70 +106 -11 + +ChangeSet@1.3434, 2015-06-19 03:25:54+02:00, viperus@ubuntu.(none) + + tests/libntp/run-caljulian.c@1.7 +4 -4 + +ChangeSet@1.3433, 2015-06-19 03:13:24+02:00, viperus@ubuntu.(none) + g_kodFile.cpp: + Rename: sntp/tests/kodFile.cpp -> sntp/tests/g_kodFile.cpp + g_keyFile.cpp: + Rename: sntp/tests/keyFile.cpp -> sntp/tests/g_keyFile.cpp + run-kodFile.c, kodFile.c: + new file + Makefile.am: + replaced ../version.c with $(top_builddir)/version.c. Converted new test. + c_fileHandlingTest.h: + converted all functions from C++ to C + keyFile.c: + uncommented all functions, 90% converted + + sntp/tests/Makefile.am@1.41 +26 -4 + replaced ../version.c with $(top_builddir)/version.c. Converted new test. + + sntp/tests/c_fileHandlingTest.h@1.2 +53 -26 + converted all functions from C++ to C + + sntp/tests/g_keyFile.cpp@1.5 +0 -0 + Rename: sntp/tests/keyFile.cpp -> sntp/tests/g_keyFile.cpp + + sntp/tests/g_kodFile.cpp@1.9 +0 -0 + Rename: sntp/tests/kodFile.cpp -> sntp/tests/g_kodFile.cpp + + sntp/tests/keyFile.c@1.2 +51 -47 + uncommented all functions, 90% converted + + sntp/tests/kodFile.c@1.1 +142 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/kodFile.c + + sntp/tests/kodFile.c@1.0 +0 -0 + + sntp/tests/run-keyFile.c@1.2 +10 -0 + + sntp/tests/run-kodFile.c@1.1 +61 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/run-kodFile.c + + sntp/tests/run-kodFile.c@1.0 +0 -0 + +ChangeSet@1.3432, 2015-06-18 23:33:19+02:00, viperus@ubuntu.(none) + caljulian.c: + replacing malloc.h with "ntp_stdlib.h" + + tests/libntp/caljulian.c@1.6 +3 -1 + replacing malloc.h with "ntp_stdlib.h" + +ChangeSet@1.3413.3.2, 2015-06-18 18:05:44+02:00, martin@pc-martin.(none) + Started to support leap smear. + + include/ntpd.h@1.189 +1 -0 + Started to support leap smear. + + ntpd/keyword-gen-utd@1.24 +1 -1 + Started to support leap smear. + + ntpd/keyword-gen.c@1.30 +17 -16 + Started to support leap smear. + + ntpd/ntp_config.c@1.328 +5 -1 + Started to support leap smear. + + ntpd/ntp_io.c@1.402 +2 -1 + Started to support leap smear. + + ntpd/ntp_keyword.h@1.26 +670 -656 + Started to support leap smear. + + ntpd/ntp_leapsec.h@1.12 +12 -0 + Started to support leap smear. + + ntpd/ntp_parser.c@1.94 +2031 -1971 + Started to support leap smear. + + ntpd/ntp_parser.h@1.59 +339 -345 + Started to support leap smear. + + ntpd/ntp_parser.y@1.86 +51 -46 + Started to support leap smear. + + ntpd/ntp_proto.c@1.357 +35 -2 + Started to support leap smear. + + ntpd/ntp_timer.c@1.89 +55 -9 + Started to support leap smear. + +ChangeSet@1.3413.3.1, 2015-06-18 16:45:21+02:00, martin@pc-martin.(none) + Removed trailing whitespace. + + ntpd/ntp_leapsec.c@1.22 +17 -17 + Removed trailing whitespace. + + ntpd/ntp_leapsec.h@1.11 +2 -2 + Removed trailing whitespace. + + ntpd/ntp_timer.c@1.88 +6 -6 + Removed trailing whitespace. + +ChangeSet@1.3429.1.1, 2015-06-18 08:48:31+00:00, stenn@psp-at1.ntp.org + typo + + sntp/tests/Makefile.am@1.40 +1 -1 + typo + +ChangeSet@1.3429, 2015-06-18 08:34:39+00:00, stenn@psp-at1.ntp.org + sntp/tests/networking.c build fixes + + sntp/tests/Makefile.am@1.39 +2 -1 + sntp/tests/networking.c build fixes + +ChangeSet@1.3427.1.2, 2015-06-18 10:21:18+02:00, viperus@ubuntu.(none) + caljulian.c: + included malloc.h to avoid implicit declaration + + tests/libntp/caljulian.c@1.5 +1 -0 + included malloc.h to avoid implicit declaration + + tests/libntp/run-caljulian.c@1.6 +4 -4 + +ChangeSet@1.3427.1.1, 2015-06-18 10:09:02+02:00, viperus@ubuntu.(none) + ssl_init.c: + fixing a test bug with #ifdef OPENSSL + + tests/libntp/run-ssl_init.c@1.1.1.1 +2 -0 + + tests/libntp/ssl_init.c@1.2.1.1 +5 -2 + fixing a test bug with #ifdef OPENSSL + +ChangeSet@1.3428, 2015-06-18 08:05:23+00:00, stenn@psp-at1.ntp.org + Unity ssl_init typo fix + + tests/libntp/run-ssl_init.c@1.2 +2 -0 + Unity ssl_init typo fix + + tests/libntp/ssl_init.c@1.3 +1 -1 + Unity ssl_init typo fix + +ChangeSet@1.3427, 2015-06-18 07:55:11+00:00, stenn@psp-at1.ntp.org + Unity update to sntp/Makefile.am + + sntp/Makefile.am@1.84 +0 -2 + Unity update to sntp/Makefile.am + +ChangeSet@1.3426, 2015-06-18 07:49:21+00:00, stenn@psp-at1.ntp.org + Unity cleanup + + BitKeeper/deleted/46/run-test-keyFile.c~4bf68803bc8e2c40@1.2 +0 -0 + Delete: sntp/tests/run-test-keyFile.c + + BitKeeper/deleted/56/run-test-kodDatabase.c~d8bb8b62b1e08d30@1.2 +0 -0 + Delete: sntp/tests/run-test-kodDatabase.c + + BitKeeper/deleted/fc/run-test-networking.c~b2cd2d50f3d83a90@1.2 +0 -0 + Delete: sntp/tests/run-test-networking.c + + sntp/tests/Makefile.am@1.38 +19 -17 + Unity cleanup + +ChangeSet@1.3425, 2015-06-18 09:06:24+02:00, viperus@ubuntu.(none) + removing duplicate file + + BitKeeper/deleted/61/socktoa.cpp~151e8671c6e040ac@1.3 +0 -0 + Delete: tests/libntp/socktoa.cpp + +ChangeSet@1.3424, 2015-06-18 09:04:46+02:00, viperus@ubuntu.(none) + run-keyFile.c, run-networking.c, run-kodDatabase.c: + new file + Makefile.am: + hopefully fixing bug-2852 + + sntp/tests/run-keyFile.c@1.1 +49 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/run-keyFile.c + + sntp/tests/run-keyFile.c@1.0 +0 -0 + + sntp/tests/run-kodDatabase.c@1.1 +59 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/run-kodDatabase.c + + sntp/tests/run-kodDatabase.c@1.0 +0 -0 + + sntp/tests/run-networking.c@1.1 +49 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/run-networking.c + + sntp/tests/run-networking.c@1.0 +0 -0 + + tests/libntp/Makefile.am@1.68 +1 -1 + hopefully fixing bug-2852 + +ChangeSet@1.3423, 2015-06-17 19:45:59+02:00, viperus@ubuntu.(none) + clocktime.c: + fixed the warning about implicit declaration, because mike_t said so, and mike_t is a wizard XD + bug-2803.c: + added declarations at the top of the file to fix warnings + + tests/bug-2803/bug-2803.c@1.5 +4 -1 + added declarations at the top of the file to fix warnings + + tests/bug-2803/run-bug-2803.c@1.5 +4 -2 + + tests/libntp/clocktime.c@1.2 +6 -0 + fixed the warning about implicit declaration, because mike_t said so, and mike_t is a wizard XD + + tests/libntp/run-clocktime.c@1.3 +8 -8 + +ChangeSet@1.3422, 2015-06-17 13:26:20+02:00, viperus@ubuntu.(none) + Makefile.am: + minor cleanup + + sntp/tests/Makefile.am@1.37 +2 -2 + minor cleanup + +ChangeSet@1.3421, 2015-06-17 13:17:39+02:00, viperus@ubuntu.(none) + run-ssl_init.c: + new file + ssl_init.c: + fix for minor #else warning + Makefile.am: + modified /sntp/tests/Makefile.am so it is consistent to harlans /tests/libntp/Makefile.am changes, including the run-test-* -> run-* + fixed the stuff I broke with automerge XD + + sntp/tests/Makefile.am@1.36 +18 -17 + modified /sntp/tests/Makefile.am so it is consistent to harlans /tests/libntp/Makefile.am changes, including the run-test-* -> run-* + + tests/libntp/Makefile.am@1.67 +15 -9 + fixed the stuff I broke with automerge XD + + tests/libntp/run-ssl_init.c@1.1 +57 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-ssl_init.c + + tests/libntp/run-ssl_init.c@1.0 +0 -0 + + tests/libntp/ssl_init.c@1.2 +2 -1 + fix for minor #else warning + +ChangeSet@1.3413.2.1, 2015-06-17 15:12:46+05:30, loki@dadasgift.(none) + Changes for & tests + + tests/libntp/Makefile.am@1.64.2.1 +41 -3 + + tests/libntp/g_lfptostr.cpp@1.1 +103 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/g_lfptostr.cpp + + tests/libntp/g_lfptostr.cpp@1.0 +0 -0 + + tests/libntp/g_strtolfp.cpp@1.1 +107 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/g_strtolfp.cpp + + tests/libntp/g_strtolfp.cpp@1.0 +0 -0 + + tests/libntp/lfptostr.c@1.1 +102 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/lfptostr.c + + tests/libntp/lfptostr.c@1.0 +0 -0 + + tests/libntp/strtolfp.c@1.1 +112 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/strtolfp.c + + tests/libntp/strtolfp.c@1.0 +0 -0 + +ChangeSet@1.3419, 2015-06-17 11:30:50+02:00, viperus@ubuntu.(none) + Many files: + new file + Makefile.am: + removed keyFile test from check_Programs for now + + sntp/tests/Makefile.am@1.35 +19 -2 + removed keyFile test from check_Programs for now + + sntp/tests/c_fileHandlingTest.h@1.1 +63 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/c_fileHandlingTest.h + + sntp/tests/c_fileHandlingTest.h@1.0 +0 -0 + + sntp/tests/keyFile.c@1.1 +136 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/keyFile.c + + sntp/tests/keyFile.c@1.0 +0 -0 + + sntp/tests/kodDatabase.c@1.1 +126 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/kodDatabase.c + + sntp/tests/kodDatabase.c@1.0 +0 -0 + + sntp/tests/run-test-keyFile.c@1.1 +49 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/run-test-keyFile.c + + sntp/tests/run-test-keyFile.c@1.0 +0 -0 + + sntp/tests/run-test-kodDatabase.c@1.1 +59 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/run-test-kodDatabase.c + + sntp/tests/run-test-kodDatabase.c@1.0 +0 -0 + +ChangeSet@1.3418, 2015-06-17 11:03:42+02:00, viperus@ubuntu.(none) + g_kodDatabase.cpp: + Rename: sntp/tests/kodDatabase.cpp -> sntp/tests/g_kodDatabase.cpp + g_networking.cpp: + Rename: sntp/tests/networking.cpp -> sntp/tests/g_networking.cpp + Makefile.am: + renamed *.cpp files to g_*.cpp + + sntp/tests/Makefile.am@1.34 +2 -2 + renamed *.cpp files to g_*.cpp + + sntp/tests/g_kodDatabase.cpp@1.4 +0 -0 + Rename: sntp/tests/kodDatabase.cpp -> sntp/tests/g_kodDatabase.cpp + + sntp/tests/g_networking.cpp@1.9 +0 -0 + Rename: sntp/tests/networking.cpp -> sntp/tests/g_networking.cpp + +ChangeSet@1.3417, 2015-06-17 10:59:42+02:00, viperus@ubuntu.(none) + Makefile.am: + builds another test + added ../version.c so kodDatabase builds. Should be done via a rule, needs fixing! + added c_fileHandlingTest.h to noinst_HEADERS + GTEST_AVAILABLE check moved into /sntp/tests/Makefile.am so unity tests can be run + + sntp/Makefile.am@1.83 +2 -2 + GTEST_AVAILABLE check moved into /sntp/tests/Makefile.am so unity tests can be run + + sntp/tests/Makefile.am@1.33 +7 -5 + added ../version.c so kodDatabase builds. Should be done via a rule, needs fixing! + + sntp/tests/Makefile.am@1.32 +21 -1 + builds another test + + sntp/tests/Makefile.am@1.31 +1 -0 + added c_fileHandlingTest.h to noinst_HEADERS + +ChangeSet@1.3413.1.1, 2015-06-17 04:05:10-04:00, stenn@deacon.udel.edu + clean up unity test names + + BitKeeper/deleted/b6/Makefile-~7d9ad3536b5db654@1.2 +0 -0 + Delete: tests/bug-2803/Makefile- + + BitKeeper/deleted/b8/test-2803.c~ba74ad843e357700@1.2 +0 -0 + Delete: tests/bug-2803/test-2803.c + + bootstrap@1.49 +2 -2 + clean up unity test names + + tests/bug-2803/Makefile.am@1.11 +3 -3 + clean up unity test names + + tests/bug-2803/bug-2803.c@1.4 +0 -0 + Rename: tests/bug-2803/ut-2803.c -> tests/bug-2803/bug-2803.c + + tests/libntp/Makefile.am@1.64.1.1 +194 -194 + clean up unity test names + + tests/libntp/run-a_md5encrypt.c@1.8 +0 -0 + Rename: tests/libntp/run-test-a_md5encrypt.c -> tests/libntp/run-a_md5encrypt.c + + tests/libntp/run-atoint.c@1.6 +0 -0 + Rename: tests/libntp/run-test-atoint.c -> tests/libntp/run-atoint.c + + tests/libntp/run-atouint.c@1.6 +0 -0 + Rename: tests/libntp/run-test-atouint.c -> tests/libntp/run-atouint.c + + tests/libntp/run-authkeys.c@1.7 +0 -0 + Rename: tests/libntp/run-test-authkeys.c -> tests/libntp/run-authkeys.c + + tests/libntp/run-calendar.c@1.3 +0 -0 + Rename: tests/libntp/run-test-calendar.c -> tests/libntp/run-calendar.c + + tests/libntp/run-caljulian.c@1.5 +0 -0 + Rename: tests/libntp/run-test-caljulian.c -> tests/libntp/run-caljulian.c + + tests/libntp/run-calyearstart.c@1.3 +0 -0 + Rename: tests/libntp/run-test-calyearstart.c -> tests/libntp/run-calyearstart.c + + tests/libntp/run-clocktime.c@1.2 +0 -0 + Rename: tests/libntp/run-test-clocktime.c -> tests/libntp/run-clocktime.c + + tests/libntp/run-decodenetnum.c@1.2 +0 -0 + Rename: tests/libntp/run-test-decodenetnum.c -> tests/libntp/run-decodenetnum.c + + tests/libntp/run-hextoint.c@1.6 +0 -0 + Rename: tests/libntp/run-test-hextoint.c -> tests/libntp/run-hextoint.c + + tests/libntp/run-hextolfp.c@1.2 +0 -0 + Rename: tests/libntp/run-test-hextolfp.c -> tests/libntp/run-hextolfp.c + + tests/libntp/run-lfpfunc.c@1.8 +0 -0 + Rename: tests/libntp/run-test-lfpfunc.c -> tests/libntp/run-lfpfunc.c + + tests/libntp/run-modetoa.c@1.7 +0 -0 + Rename: tests/libntp/run-test-modetoa.c -> tests/libntp/run-modetoa.c + + tests/libntp/run-netof.c@1.2 +0 -0 + Rename: tests/libntp/run-test-netof.c -> tests/libntp/run-netof.c + + tests/libntp/run-numtoa.c@1.6 +0 -0 + Rename: tests/libntp/run-test-numtoa.c -> tests/libntp/run-numtoa.c + + tests/libntp/run-numtohost.c@1.6 +0 -0 + Rename: tests/libntp/run-test-numtohost.c -> tests/libntp/run-numtohost.c + + tests/libntp/run-octtoint.c@1.3 +0 -0 + Rename: tests/libntp/run-test-octtoint.c -> tests/libntp/run-octtoint.c + + tests/libntp/run-refnumtoa.c@1.2 +0 -0 + Rename: tests/libntp/run-test-refnumtoa.c -> tests/libntp/run-refnumtoa.c + + tests/libntp/run-socktoa.c@1.2.1.1 +0 -0 + Rename: tests/libntp/run-test-socktoa.c -> tests/libntp/run-socktoa.c + + tests/libntp/run-statestr.c@1.6 +0 -0 + Rename: tests/libntp/run-test-statestr.c -> tests/libntp/run-statestr.c + + tests/libntp/run-timespecops.c@1.2 +0 -0 + Rename: tests/libntp/run-test-timespecops.c -> tests/libntp/run-timespecops.c + + tests/libntp/run-timevalops.c@1.4 +0 -0 + Rename: tests/libntp/run-test-timevalops.c -> tests/libntp/run-timevalops.c + + tests/libntp/run-uglydate.c@1.6 +0 -0 + Rename: tests/libntp/run-test-uglydate.c -> tests/libntp/run-uglydate.c + + tests/libntp/run-vi64ops.c@1.2 +0 -0 + Rename: tests/libntp/run-test-vi64ops.c -> tests/libntp/run-vi64ops.c + + tests/libntp/run-ymd2yd.c@1.6 +0 -0 + Rename: tests/libntp/run-test-ymd2yd.c -> tests/libntp/run-ymd2yd.c + + tests/sandbox/Makefile.am@1.3 +19 -20 + clean up unity test names + + tests/sandbox/run-modetoa.c@1.2 +0 -0 + Rename: tests/sandbox/run-second-test.c -> tests/sandbox/run-modetoa.c + + tests/sandbox/run-uglydate.c@1.2 +0 -0 + Rename: tests/sandbox/run-first-test.c -> tests/sandbox/run-uglydate.c + +ChangeSet@1.3416, 2015-06-17 09:35:55+02:00, viperus@ubuntu.(none) + run-test-networking.c, c_sntptest.h: + new file + networking.c: + added c_sntptest.h include + Makefile.am: + modified so Makefile.am runs unity tests and gtests + + sntp/tests/Makefile.am@1.30 +24 -9 + modified so Makefile.am runs unity tests and gtests + + sntp/tests/c_sntptest.h@1.1 +32 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/c_sntptest.h + + sntp/tests/c_sntptest.h@1.0 +0 -0 + + sntp/tests/networking.c@1.2 +4 -1 + added c_sntptest.h include + + sntp/tests/run-test-networking.c@1.1 +49 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/run-test-networking.c + + sntp/tests/run-test-networking.c@1.0 +0 -0 + +ChangeSet@1.3415, 2015-06-17 08:47:17+02:00, viperus@ubuntu.(none) + networking.c: + new file + Makefile.am: + started adding unity test framework support + + sntp/tests/Makefile.am@1.29 +36 -1 + started adding unity test framework support + + sntp/tests/networking.c@1.1 +4 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/sntp/tests/networking.c + + sntp/tests/networking.c@1.0 +0 -0 + +ChangeSet@1.3414, 2015-06-17 07:45:38+02:00, viperus@ubuntu.(none) + ssl_init.c, run-test-ssl_init.c: + new file + Makefile.am: + added ssl-init.c building + g_ssl_init.cpp: + Rename: tests/libntp/ssl_init.cpp -> tests/libntp/g_ssl_init.cpp + + tests/libntp/Makefile.am@1.65 +21 -2 + added ssl-init.c building + + tests/libntp/g_ssl_init.cpp@1.4 +0 -0 + Rename: tests/libntp/ssl_init.cpp -> tests/libntp/g_ssl_init.cpp + + tests/libntp/run-test-socktoa.c@1.3 +1 -1 + + tests/libntp/run-test-ssl_init.c@1.1 +57 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-ssl_init.c + + tests/libntp/run-test-ssl_init.c@1.0 +0 -0 + + tests/libntp/ssl_init.c@1.1 +53 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/ssl_init.c + + tests/libntp/ssl_init.c@1.0 +0 -0 + +ChangeSet@1.3413, 2015-06-16 18:48:26+02:00, viperus@ubuntu.(none) + socktoa.c: + added new function which replaces EXPECT_NE from gtest + + tests/libntp/run-test-socktoa.c@1.2 +1 -1 + + tests/libntp/socktoa.c@1.2 +4 -0 + added new function which replaces EXPECT_NE from gtest + +ChangeSet@1.3412, 2015-06-16 18:29:22+02:00, viperus@ubuntu.(none) + forgot to rename old .cpp file + + tests/libntp/g_timespecops.cpp@1.9 +0 -0 + Rename: tests/libntp/timespecops.cpp -> tests/libntp/g_timespecops.cpp + +ChangeSet@1.3411, 2015-06-16 18:26:31+02:00, viperus@ubuntu.(none) + timespecops.c : 95% done, lacks printf error messages. Contains 2 unity_helper functions which should be moved ot unity_helper.h + + tests/libntp/Makefile.am@1.64 +19 -1 + + tests/libntp/run-test-timespecops.c@1.1 +105 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-timespecops.c + + tests/libntp/run-test-timespecops.c@1.0 +0 -0 + + tests/libntp/run-test-timevalops.c@1.3 +5 -1 + + tests/libntp/timespecops.c@1.1 +588 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/timespecops.c + + tests/libntp/timespecops.c@1.0 +0 -0 + + tests/libntp/timevalops.c@1.4 +9 -9 + forgot to uncomment a few converted functions + +ChangeSet@1.3410, 2015-06-16 16:45:06+02:00, viperus@ubuntu.(none) + timevalops.c: + 95% done, a few printfs in case of an error have to be converted + + tests/libntp/run-test-timevalops.c@1.2 +32 -20 + + tests/libntp/timevalops.c@1.3 +81 -45 + 95% done, a few printfs in case of an error have to be converted + +ChangeSet@1.3409, 2015-06-16 15:33:51+02:00, viperus@ubuntu.(none) + timevalops.c: + replaced TEST_ASSERT_EQUAL_INT64 with TEST_ASSERT_EQUAL() (TEST_ASSER_EQUAL_INT() also autodetects 32 bit or 64 bit long int, which time_t uses) + + tests/libntp/timevalops.c@1.2 +1 -1 + replaced TEST_ASSERT_EQUAL_INT64 with TEST_ASSERT_EQUAL() (TEST_ASSER_EQUAL_INT() also autodetects 32 bit or 64 bit long int, which time_t uses) + +ChangeSet@1.3408, 2015-06-16 12:46:58+02:00, viperus@ubuntu.(none) + Makefile.am: + added building timevalops.c + run-test-timevalops.c, timevalops.c: + new file + lfpfunc.c: + removed sstream + g_timevalops.cpp: + Rename: tests/libntp/timevalops.cpp -> tests/libntp/g_timevalops.cpp + + tests/libntp/Makefile.am@1.63 +20 -1 + added building timevalops.c + + tests/libntp/g_timevalops.cpp@1.9 +0 -0 + Rename: tests/libntp/timevalops.cpp -> tests/libntp/g_timevalops.cpp + + tests/libntp/lfpfunc.c@1.5 +1 -2 + removed sstream + + tests/libntp/run-test-lfpfunc.c@1.7 +9 -9 + + tests/libntp/run-test-timevalops.c@1.1 +89 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-timevalops.c + + tests/libntp/run-test-timevalops.c@1.0 +0 -0 + + tests/libntp/timevalops.c@1.1 +564 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/timevalops.c + + tests/libntp/timevalops.c@1.0 +0 -0 + +ChangeSet@1.3407, 2015-06-16 01:29:44+02:00, viperus@ubuntu.(none) + Makefile.am: + added -lpthread to decodenetnum_LDADD. Temporary solution, until I get an answer from jnperlin + + tests/libntp/Makefile.am@1.62 +1 -0 + added -lpthread to decodenetnum_LDADD. Temporary solution, until I get an answer from jnperlin + +ChangeSet@1.3406, 2015-06-16 00:54:42+02:00, viperus@ubuntu.(none) + c_sockaddrtest.h: + removed stuff like 1==1 with TRUE. Also added cin cout stuff, should be replaced b + Many files: + new file + Makefile.am: + fixes to Lokesh-Damir merge, added new .h to noinst_SOURCES + c_lfptest.h: + put the static vars back in here, removed them from hextolfp.c, because more files will need them. + hextolfp.c: + removed static consts, placed them in c_lpftest.h + octtoint.c: + removed outdates testcalshims.h, replaced with required includes + + tests/libntp/Makefile.am@1.61 +62 -45 + fixes to Lokesh-Damir merge, added new .h to noinst_SOURCES + + tests/libntp/c_lfptest.h@1.2 +15 -2 + put the static vars back in here, removed them from hextolfp.c, because more files will need them. + + tests/libntp/c_sockaddrtest.h@1.2 +14 -6 + removed stuff like 1==1 with TRUE. Also added cin cout stuff, should be replaced b + + tests/libntp/hextolfp.c@1.3 +0 -7 + removed static consts, placed them in c_lpftest.h + + tests/libntp/octtoint.c@1.2 +4 -1 + removed outdates testcalshims.h, replaced with required includes + + tests/libntp/run-test-decodenetnum.c@1.1 +61 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-decodenetnum.c + + tests/libntp/run-test-decodenetnum.c@1.0 +0 -0 + + tests/libntp/run-test-hextolfp.c@1.1 +61 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-hextolfp.c + + tests/libntp/run-test-hextolfp.c@1.0 +0 -0 + + tests/libntp/run-test-netof.c@1.1 +57 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-netof.c + + tests/libntp/run-test-netof.c@1.0 +0 -0 + + tests/libntp/run-test-octtoint.c@1.2 +11 -8 + + tests/libntp/run-test-socktoa.c@1.1 +61 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-socktoa.c + + tests/libntp/run-test-socktoa.c@1.0 +0 -0 + +ChangeSet@1.3383.1.7, 2015-06-15 23:53:38+05:30, loki@dadasgift.(none) + Changes wrt to test + + tests/libntp/Makefile.am@1.59 +27 -8 + + tests/libntp/g_socktoa.cpp@1.1 +100 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/g_socktoa.cpp + + tests/libntp/g_socktoa.cpp@1.0 +0 -0 + + tests/libntp/socktoa.c@1.1 +103 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/socktoa.c + + tests/libntp/socktoa.c@1.0 +0 -0 + +ChangeSet@1.3383.1.6, 2015-06-15 11:59:18+05:30, loki@dadasgift.(none) + Changes for test + + tests/libntp/Makefile.am@1.58 +16 -3 + + tests/libntp/decodenetnum.c@1.1 +96 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/decodenetnum.c + + tests/libntp/decodenetnum.c@1.0 +0 -0 + + tests/libntp/g_decodenetnum.cpp@1.1 +93 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/g_decodenetnum.cpp + + tests/libntp/g_decodenetnum.cpp@1.0 +0 -0 + +ChangeSet@1.3383.1.5, 2015-06-15 11:21:38+05:30, loki@dadasgift.(none) + Changes wrt to test + + tests/libntp/c_lfptest.h@1.1 +17 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/c_lfptest.h + + tests/libntp/c_lfptest.h@1.0 +0 -0 + + tests/libntp/hextolfp.c@1.2 +24 -17 + + tests/libntp/lfptest.h@1.5 +0 -23 + +ChangeSet@1.3383.1.4, 2015-06-15 11:05:04+05:30, loki@dadasgift.(none) + Changes for tests + + tests/libntp/c_sockaddrtest.h@1.1 +49 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/c_sockaddrtest.h + + tests/libntp/c_sockaddrtest.h@1.0 +0 -0 + + tests/libntp/netof.c@1.2 +1 -1 + + tests/libntp/sockaddrtest.h@1.3 +0 -52 + +ChangeSet@1.3391.1.6, 2015-06-15 01:34:31+02:00, tomek@tomek-n56vz.(none) + Makefile.am: + fixed double definition of something + + tests/libntp/Makefile.am@1.54.3.3 +0 -6 + fixed double definition of something + +ChangeSet@1.3391.1.5, 2015-06-15 01:12:49+02:00, tomek@tomek-n56vz.(none) + Makefile.am: + missing backslashes added + + tests/libntp/Makefile.am@1.54.3.2 +10 -10 + missing backslashes added + +ChangeSet@1.3391.1.4, 2015-06-15 00:51:33+02:00, tomek@tomek-n56vz.(none) + vi64ops.c: + used a simpler assertion + + tests/libntp/vi64ops.c@1.2 +6 -6 + used a simpler assertion + +ChangeSet@1.3391.1.3, 2015-06-15 00:49:59+02:00, tomek@tomek-n56vz.(none) + used TEST_ASSERT_NULL instead of ASSERT_TRUE(ptr == NULL) in test/libntp/recvbuff.c + + tests/libntp/recvbuff.c@1.2 +1 -1 + +ChangeSet@1.3391.1.2, 2015-06-15 00:45:57+02:00, tomek@tomek-n56vz.(none) + edited a makefile in test/libntp to build those tests + + tests/libntp/Makefile.am@1.54.3.1 +108 -7 + +ChangeSet@1.3391.1.1, 2015-06-15 00:42:12+02:00, tomek@tomek-n56vz.(none) + converted a bunch of test from GTest to Unity in test/libntp/ + + BitKeeper/deleted/5b/msyslog.c~2253255e7e9701a2@1.2 +0 -0 + Delete: tests/libntp/msyslog.c + + tests/libntp/msyslog.c@1.1 +137 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/msyslog.c + + tests/libntp/msyslog.c@1.0 +0 -0 + + BitKeeper/deleted/5e/prettydate.cpp~f50578082d92e04@1.4 +0 -0 + Delete: tests/libntp/prettydate.cpp + + BitKeeper/deleted/8d/tstotv.cpp~44f3d9a5f5de991@1.3 +0 -0 + Delete: tests/libntp/tstotv.cpp + + BitKeeper/deleted/a9/recvbuff.cpp~64ef3a6926361d4@1.2 +0 -0 + Delete: tests/libntp/recvbuff.cpp + + BitKeeper/deleted/bb/caltontp.cpp~625109d015181aab@1.2 +0 -0 + Delete: tests/libntp/caltontp.cpp + + BitKeeper/deleted/d2/vi64ops.cpp~8587c242374ab4ce@1.1.1.1 +0 -0 + Delete: tests/libntp/vi64ops.cpp + + BitKeeper/deleted/e2/msyslog.cpp~439edfb748fb30dd@1.4 +0 -0 + Delete: tests/libntp/msyslog.cpp + + tests/libntp/caltontp.c@1.1 +48 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/caltontp.c + + tests/libntp/caltontp.c@1.0 +0 -0 + + tests/libntp/g_caltontp.cpp@1.1 +49 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/g_caltontp.cpp + + tests/libntp/g_caltontp.cpp@1.0 +0 -0 + + tests/libntp/g_msyslog.cpp@1.1 +137 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/g_msyslog.cpp + + tests/libntp/g_msyslog.cpp@1.0 +0 -0 + + tests/libntp/g_prettydate.cpp@1.1 +16 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/g_prettydate.cpp + + tests/libntp/g_prettydate.cpp@1.0 +0 -0 + + tests/libntp/g_recvbuff.cpp@1.1 +38 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/g_recvbuff.cpp + + tests/libntp/g_recvbuff.cpp@1.0 +0 -0 + + tests/libntp/g_tstotv.cpp@1.1 +57 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/g_tstotv.cpp + + tests/libntp/g_tstotv.cpp@1.0 +0 -0 + + tests/libntp/g_vi64ops.cpp@1.1 +64 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/g_vi64ops.cpp + + tests/libntp/g_vi64ops.cpp@1.0 +0 -0 + + tests/libntp/msyslog.c@1.1 +137 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/msyslog.c + + tests/libntp/msyslog.c@1.0 +0 -0 + + tests/libntp/prettydate.c@1.1 +16 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/prettydate.c + + tests/libntp/prettydate.c@1.0 +0 -0 + + tests/libntp/recvbuff.c@1.1 +43 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/recvbuff.c + + tests/libntp/recvbuff.c@1.0 +0 -0 + + tests/libntp/run-test-caltontp.c@1.1 +57 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/run-test-caltontp.c + + tests/libntp/run-test-caltontp.c@1.0 +0 -0 + + tests/libntp/run-test-msyslog.c@1.1 +65 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/run-test-msyslog.c + + tests/libntp/run-test-msyslog.c@1.0 +0 -0 + + tests/libntp/run-test-prettydate.c@1.1 +51 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/run-test-prettydate.c + + tests/libntp/run-test-prettydate.c@1.0 +0 -0 + + tests/libntp/run-test-recvbuff.c@1.1 +55 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/run-test-recvbuff.c + + tests/libntp/run-test-recvbuff.c@1.0 +0 -0 + + tests/libntp/run-test-tstotv.c@1.1 +55 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/run-test-tstotv.c + + tests/libntp/run-test-tstotv.c@1.0 +0 -0 + + tests/libntp/run-test-vi64ops.c@1.1 +55 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/run-test-vi64ops.c + + tests/libntp/run-test-vi64ops.c@1.0 +0 -0 + + tests/libntp/tstotv.c@1.1 +42 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/tstotv.c + + tests/libntp/tstotv.c@1.0 +0 -0 + + tests/libntp/vi64ops.c@1.1 +52 -0 + BitKeeper file /home/tomek/ntp/kod/harlans/ntp-stable-unity/tests/libntp/vi64ops.c + + tests/libntp/vi64ops.c@1.0 +0 -0 + +ChangeSet@1.3404, 2015-06-14 19:01:51+02:00, viperus@ubuntu.(none) + Makefile.am: + added -lpthread to test_caljuliaj_LDADD, because it's not in $(PTHREAD_LIBS) + + tests/libntp/Makefile.am@1.54.1.9 +1 -0 + added -lpthread to test_caljuliaj_LDADD, because it's not in $(PTHREAD_LIBS) + +ChangeSet@1.3403, 2015-06-14 18:42:02+02:00, viperus@ubuntu.(none) + Makefile.am: + added test-libntp.h in noinst_HEADERS, otherwise you can't build make distcheck on my ubuntu + + tests/libntp/Makefile.am@1.54.1.8 +1 -0 + added test-libntp.h in noinst_HEADERS, otherwise you can't build make distcheck on my ubuntu + +ChangeSet@1.3402, 2015-06-14 18:34:38+02:00, viperus@ubuntu.(none) + testlibntp.c: + Rename: tests/libntp/test-libntp.c -> tests/libntp/testlibntp.c + testlibntp.h: + Rename: tests/libntp/test-libntp.h -> tests/libntp/testlibntp.h + test-libntp.h: + Rename: tests/libntp/testlibntp.h -> tests/libntp/test-libntp.h + test-libntp.c: + Rename: tests/libntp/testlibntp.c -> tests/libntp/test-libntp.c + + tests/libntp/test-libntp.c@1.6 +0 -0 + Rename: tests/libntp/testlibntp.c -> tests/libntp/test-libntp.c + + tests/libntp/testlibntp.c@1.5 +0 -0 + Rename: tests/libntp/test-libntp.c -> tests/libntp/testlibntp.c + + tests/libntp/test-libntp.h@1.4 +0 -0 + Rename: tests/libntp/testlibntp.h -> tests/libntp/test-libntp.h + + tests/libntp/testlibntp.h@1.3 +0 -0 + Rename: tests/libntp/test-libntp.h -> tests/libntp/testlibntp.h + +ChangeSet@1.3401, 2015-06-14 16:17:06+00:00, viperus@psp-deb1.ntp.org + Makefile.am: + removed the folder /unity-framework/ + + Makefile.am@1.131 +0 -1 + removed the folder /unity-framework/ + +ChangeSet@1.3400, 2015-06-14 16:14:29+00:00, viperus@psp-deb1.ntp.org + ProductionCode.h~fac233823798db21: + Delete: tests/unity-framework/ProductionCode.h + TestProductionCode.c~4b9dea2fdb531435: + Delete: tests/unity-framework/TestProductionCode.c + TestProductionCode_Runner.c~41a4ba4b8da8c72e: + Delete: tests/unity-framework/TestProductionCode_Runner.c + ProductionCode.c~2c2bc4c32341b018: + Delete: tests/unity-framework/ProductionCode.c + + BitKeeper/deleted/87/TestProductionCode.c~4b9dea2fdb531435@1.2 +0 -0 + Delete: tests/unity-framework/TestProductionCode.c + + BitKeeper/deleted/88/ProductionCode.h~fac233823798db21@1.2 +0 -0 + Delete: tests/unity-framework/ProductionCode.h + + BitKeeper/deleted/ae/ProductionCode.c~2c2bc4c32341b018@1.2 +0 -0 + Delete: tests/unity-framework/ProductionCode.c + + BitKeeper/deleted/af/TestProductionCode_Runner.c~41a4ba4b8da8c72e@1.2 +0 -0 + Delete: tests/unity-framework/TestProductionCode_Runner.c + +ChangeSet@1.3383.1.3, 2015-06-14 20:28:01+05:30, loki@dadasgift.(none) + Files related to test + + tests/libntp/Makefile.am@1.57 +19 -2 + + tests/libntp/sockaddrtest.h@1.2 +53 -0 + +ChangeSet@1.3383.1.2, 2015-06-14 20:26:51+05:30, loki@dadasgift.(none) + Files related to test + + tests/libntp/g_netof.cpp@1.1 +69 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/g_netof.cpp + + tests/libntp/g_netof.cpp@1.0 +0 -0 + + tests/libntp/netof.c@1.1 +74 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/netof.c + + tests/libntp/netof.c@1.0 +0 -0 + +ChangeSet@1.3399, 2015-06-14 12:22:39+00:00, viperus@psp-at1.ntp.org + g_calendar.cpp: + Rename: tests/libntp/calendar.cpp -> tests/libntp/g_calendar.cpp + Makefile.am: + renamed calendar.cpp to g_calendar.cpp, reflecting changes in Makefile.am + + tests/libntp/Makefile.am@1.54.1.7 +2 -1 + renamed calendar.cpp to g_calendar.cpp, reflecting changes in Makefile.am + + tests/libntp/g_calendar.cpp@1.2 +0 -0 + Rename: tests/libntp/calendar.cpp -> tests/libntp/g_calendar.cpp + +ChangeSet@1.3398, 2015-06-14 11:56:02+02:00, viperus@ubuntu.(none) + bug-2803.h~388af97e65bf386e: + Delete: tests/bug-2803/bug-2803.h + TestProductionCode_Runner.c~1dd6cbb7f125c42a: + Delete: tests/bug-2803/TestProductionCode_Runner.c + bug-2803.c~75ddf194e9fda1b8: + Delete: tests/bug-2803/bug-2803.c + Makefile.am: + removed outdated files + ut-2803.c: + merged with bug-2803.c|h, they are obsolete now + + BitKeeper/deleted/52/bug-2803.h~388af97e65bf386e@1.2 +0 -0 + Delete: tests/bug-2803/bug-2803.h + + BitKeeper/deleted/e9/TestProductionCode_Runner.c~1dd6cbb7f125c42a@1.3 +0 -0 + Delete: tests/bug-2803/TestProductionCode_Runner.c + + tests/bug-2803/TestProductionCode_Runner.c@1.2 +9 -25 + + BitKeeper/deleted/f4/bug-2803.c~75ddf194e9fda1b8@1.4 +0 -0 + Delete: tests/bug-2803/bug-2803.c + + tests/bug-2803/Makefile.am@1.10 +0 -2 + removed outdated files + + tests/bug-2803/run-bug-2803.c@1.4 +1 -1 + + tests/bug-2803/ut-2803.c@1.3 +100 -10 + merged with bug-2803.c|h, they are obsolete now + +ChangeSet@1.3397, 2015-06-14 11:34:05+02:00, viperus@ubuntu.(none) + calendar.c: + forgot to return 2 functions + + tests/libntp/calendar.c@1.2 +3 -18 + forgot to return 2 functions + + tests/libntp/run-test-calendar.c@1.2 +11 -11 + +ChangeSet@1.3396, 2015-06-14 11:26:43+02:00, viperus@ubuntu.(none) + caljulian.c: + removed an unnecessary printf + run-test-calendar.c, calendar.c: + new file + Makefile.am: + now builds calendar.c as well + + tests/libntp/Makefile.am@1.54.1.6 +23 -0 + now builds calendar.c as well + + tests/libntp/calendar.c@1.1 +431 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/calendar.c + + tests/libntp/calendar.c@1.0 +0 -0 + + tests/libntp/caljulian.c@1.4 +0 -1 + removed an unnecessary printf + + tests/libntp/run-test-calendar.c@1.1 +71 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-calendar.c + + tests/libntp/run-test-calendar.c@1.0 +0 -0 + + tests/libntp/run-test-caljulian.c@1.4 +4 -4 + +ChangeSet@1.3395, 2015-06-14 10:24:54+02:00, viperus@ubuntu.(none) + Makefile.am: + removed run-test-libntp.c, unncecessary + run-test-libntp.c~b495db21713a6587: + Delete: tests/libntp/run-test-libntp.c + + BitKeeper/deleted/78/run-test-libntp.c~b495db21713a6587@1.3 +0 -0 + Delete: tests/libntp/run-test-libntp.c + + tests/libntp/Makefile.am@1.54.1.5 +0 -1 + removed run-test-libntp.c, unncecessary + + tests/libntp/run-test-caljulian.c@1.3 +4 -4 + +ChangeSet@1.3394, 2015-06-14 10:05:45+02:00, viperus@ubuntu.(none) + caljulian.c: + minor cleanup + Makefile.am: + mereged with Harlan's Makefile.am@1.55 version. + + tests/libntp/Makefile.am@1.54.1.4 +162 -134 + mereged with Harlan's Makefile.am@1.55 version. + + tests/libntp/caljulian.c@1.3 +2 -9 + minor cleanup + +ChangeSet@1.3393, 2015-06-14 08:29:55+02:00, viperus@ubuntu.(none) + caljulian.c: + fixed printf in case of an error + + tests/libntp/caljulian.c@1.2 +24 -4 + fixed printf in case of an error + + tests/libntp/run-test-caljulian.c@1.2 +4 -4 + +ChangeSet@1.3391, 2015-06-14 05:15:48+00:00, stenn@psp-at1.ntp.org + [Bug 2778] Implement "apeers" ntpq command to include associd + + ntpq/ntpq-subs.c@1.108 +5 -4 + [Bug 2778] Implement "apeers" ntpq command to include associd + +ChangeSet@1.3390, 2015-06-14 03:18:13+00:00, stenn@psp-at1.ntp.org + merge cleanup + + ChangeLog@1.1656 +1 -1 + merge cleanup + +ChangeSet@1.3388, 2015-06-14 00:10:48+00:00, stenn@psp-at1.ntp.org + Unity updates + + bootstrap@1.48 +30 -13 + Unity updates + + tests/libntp/Makefile.am@1.54.1.2 +133 -148 + Unity updates + + tests/libntp/a_md5encrypt.c@1.6 +17 -15 + Unity updates + + tests/libntp/run-test-a_md5encrypt.c@1.7 +5 -5 + Unity updates + +ChangeSet@1.3386.1.4, 2015-06-14 01:42:05+02:00, viperus@ubuntu.(none) + forgot to rename the .cpp file + + tests/libntp/g_caljulian.cpp@1.6 +0 -0 + Rename: tests/libntp/caljulian.cpp -> tests/libntp/g_caljulian.cpp + +ChangeSet@1.3386.1.3, 2015-06-14 01:40:35+02:00, viperus@ubuntu.(none) + Many files: + new file + calyearstart.c: + removed the functions from here, put them in test-libntp.c + Makefile.am: + adding support for new tests + g_calyearstart.cpp: + Rename: tests/libntp/calyearstart.cpp -> tests/libntp/g_calyearstart.cpp + g_clocktime.cpp: + Rename: tests/libntp/clocktime.cpp -> tests/libntp/g_clocktime.cpp + test-libntp.h: + added headers for new functions + test-libntp.c: + moved the functions which 3 tests use into this file + run-test-calyearstart.c: + minor update + + tests/libntp/Makefile.am@1.54.2.3 +57 -12 + adding support for new tests + + tests/libntp/caljulian.c@1.1 +101 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/caljulian.c + + tests/libntp/caljulian.c@1.0 +0 -0 + + tests/libntp/calyearstart.c@1.2 +2 -19 + removed the functions from here, put them in test-libntp.c + + tests/libntp/calyearstart.c@1.1 +61 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/calyearstart.c + + tests/libntp/calyearstart.c@1.0 +0 -0 + + tests/libntp/clocktime.c@1.1 +199 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/clocktime.c + + tests/libntp/clocktime.c@1.0 +0 -0 + + tests/libntp/g_calyearstart.cpp@1.4 +0 -0 + Rename: tests/libntp/calyearstart.cpp -> tests/libntp/g_calyearstart.cpp + + tests/libntp/g_clocktime.cpp@1.5 +0 -0 + Rename: tests/libntp/clocktime.cpp -> tests/libntp/g_clocktime.cpp + + tests/libntp/run-test-caljulian.c@1.1 +57 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-caljulian.c + + tests/libntp/run-test-caljulian.c@1.0 +0 -0 + + tests/libntp/run-test-calyearstart.c@1.2 +3 -3 + minor update + + tests/libntp/run-test-calyearstart.c@1.1 +55 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-calyearstart.c + + tests/libntp/run-test-calyearstart.c@1.0 +0 -0 + + tests/libntp/run-test-clocktime.c@1.1 +65 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-clocktime.c + + tests/libntp/run-test-clocktime.c@1.0 +0 -0 + + tests/libntp/test-libntp.c@1.4 +14 -22 + moved the functions which 3 tests use into this file + + tests/libntp/test-libntp.h@1.2 +3 -6 + added headers for new functions + +ChangeSet@1.3386.1.2, 2015-06-14 00:20:14+02:00, viperus@ubuntu.(none) + Makefile.am: + added refnumtoa.c + run-test-vi64ops.c, refnumtoa.c, run-test-refnumtoa.c: + new file + g_refnumtoa.cpp: + Rename: tests/libntp/refnumtoa.cpp -> tests/libntp/g_refnumtoa.cpp + + tests/libntp/Makefile.am@1.54.2.2 +19 -2 + added refnumtoa.c + + tests/libntp/g_refnumtoa.cpp@1.3 +0 -0 + Rename: tests/libntp/refnumtoa.cpp -> tests/libntp/g_refnumtoa.cpp + + tests/libntp/refnumtoa.c@1.1 +63 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/refnumtoa.c + + tests/libntp/refnumtoa.c@1.0 +0 -0 + + tests/libntp/run-test-refnumtoa.c@1.1 +53 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-refnumtoa.c + + tests/libntp/run-test-refnumtoa.c@1.0 +0 -0 + + tests/libntp/run-test-vi64ops.c@1.1 +55 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-vi64ops.c + + tests/libntp/run-test-vi64ops.c@1.0 +0 -0 + +ChangeSet@1.3386.1.1, 2015-06-13 23:35:39+02:00, viperus@ubuntu.(none) + vi64ops.c: + new file + Makefile.am: + added stuff related to vi64ops.c + g_vi64ops.cpp: + Rename: tests/libntp/vi64ops.cpp -> tests/libntp/g_vi64ops.cpp + + tests/libntp/Makefile.am@1.54.2.1 +23 -2 + added stuff related to vi64ops.c + + tests/libntp/g_vi64ops.cpp@1.2 +0 -0 + Rename: tests/libntp/vi64ops.cpp -> tests/libntp/g_vi64ops.cpp + + tests/libntp/vi64ops.c@1.1 +72 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/vi64ops.c + + tests/libntp/vi64ops.c@1.0 +0 -0 + +ChangeSet@1.3387, 2015-06-13 18:35:19+00:00, stenn@psp-at1.ntp.org + Makefile.am unity-related cleanup + + tests/bug-2803/run-bug-2803.c@1.3 +5 -2 + template update + + tests/libntp/Makefile.am@1.54.1.1 +148 -133 + Makefile.am unity-related cleanup + +ChangeSet@1.3385, 2015-06-13 05:28:57-04:00, stenn@deacon.udel.edu + unity notes + + NEWS@1.138 +8 -1 + unity notes + +ChangeSet@1.3384, 2015-06-13 05:16:11-04:00, stenn@deacon.udel.edu + Note that Unity requires ruby, if tests change + + ChangeLog@1.1653 +1 -0 + Note that Unity requires ruby, if tests change + +ChangeSet@1.3370.1.3, 2015-06-13 14:42:51+05:30, loki@dadasgift.(none) + hextolfp test converted to unity + + tests/libntp/Makefile.am@1.56 +19 -2 + + tests/libntp/g_hextolfp.cpp@1.1 +58 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/g_hextolfp.cpp + + tests/libntp/g_hextolfp.cpp@1.0 +0 -0 + + tests/libntp/hextolfp.c@1.1 +61 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/hextolfp.c + + tests/libntp/hextolfp.c@1.0 +0 -0 + + tests/libntp/lfptest.h@1.4 +25 -1 + +ChangeSet@1.3383, 2015-06-13 02:47:12+00:00, stenn@psp-fb1.ntp.org + testcalshims.h cleanup + + tests/libntp/a_md5encrypt.c@1.5 +1 -5 + testcalshims.h cleanup + + tests/libntp/atoint.c@1.3 +4 -1 + testcalshims.h cleanup + + tests/libntp/atouint.c@1.3 +4 -2 + testcalshims.h cleanup + + tests/libntp/authkeys.c@1.6 +5 -3 + testcalshims.h cleanup + + tests/libntp/hextoint.c@1.3 +5 -3 + testcalshims.h cleanup + + tests/libntp/lfpfunc.c@1.4 +4 -13 + testcalshims.h cleanup + + tests/libntp/modetoa.c@1.5 +5 -5 + testcalshims.h cleanup + + tests/libntp/numtoa.c@1.3 +5 -2 + testcalshims.h cleanup + + tests/libntp/numtohost.c@1.3 +4 -2 + testcalshims.h cleanup + + tests/libntp/run-test-a_md5encrypt.c@1.6 +5 -5 + testcalshims.h cleanup + + tests/libntp/run-test-atoint.c@1.5 +6 -6 + testcalshims.h cleanup + + tests/libntp/run-test-atouint.c@1.5 +5 -5 + testcalshims.h cleanup + + tests/libntp/run-test-authkeys.c@1.6 +6 -6 + testcalshims.h cleanup + + tests/libntp/run-test-hextoint.c@1.5 +5 -5 + testcalshims.h cleanup + + tests/libntp/run-test-lfpfunc.c@1.6 +9 -9 + testcalshims.h cleanup + + tests/libntp/run-test-numtoa.c@1.5 +2 -2 + testcalshims.h cleanup + + tests/libntp/run-test-numtohost.c@1.5 +1 -1 + testcalshims.h cleanup + + tests/libntp/run-test-statestr.c@1.5 +4 -4 + testcalshims.h cleanup + + tests/libntp/run-test-ymd2yd.c@1.5 +4 -4 + testcalshims.h cleanup + + tests/libntp/statestr.c@1.3 +6 -5 + testcalshims.h cleanup + + tests/libntp/testcalshims.c@1.4 +4 -1 + testcalshims.h cleanup + + tests/libntp/uglydate.c@1.4 +4 -4 + testcalshims.h cleanup + + tests/libntp/ymd2yd.c@1.3 +5 -1 + testcalshims.h cleanup + +ChangeSet@1.3370.1.2, 2015-06-12 16:39:36+05:30, loki@dadasgift.(none) + Makefile.am modified for octotint.c file + + tests/libntp/Makefile.am@1.55 +20 -2 + +ChangeSet@1.3382, 2015-06-12 10:53:55+00:00, stenn@psp-fb1.ntp.org + md5encrypt tests need current_time + + tests/libntp/a_md5encrypt.c@1.4 +2 -0 + md5encrypt tests need current_time + + tests/libntp/run-test-a_md5encrypt.c@1.5 +5 -5 + md5encrypt tests need current_time + +ChangeSet@1.3370.1.1, 2015-06-12 15:50:51+05:30, loki@dadasgift.(none) + octtoint.cpp converted to unity framework + + tests/libntp/g_octtoint.cpp@1.1 +57 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/g_octtoint.cpp + + tests/libntp/g_octtoint.cpp@1.0 +0 -0 + + tests/libntp/octtoint.c@1.1 +63 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/octtoint.c + + tests/libntp/octtoint.c@1.0 +0 -0 + + tests/libntp/run-test-octtoint.c@1.1 +60 -0 + BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/libntp/run-test-octtoint.c + + tests/libntp/run-test-octtoint.c@1.0 +0 -0 + +ChangeSet@1.3345.1.11, 2015-06-12 10:14:37+00:00, stenn@psp-at1.ntp.org + sntp/unity/Makefile.am: Use default AUTOMAKE_OPTIONS + + sntp/unity/Makefile.am@1.3.1.1 +1 -1 + sntp/unity/Makefile.am: Use default AUTOMAKE_OPTIONS + +ChangeSet@1.3379, 2015-06-12 09:58:12+00:00, stenn@psp-at1.ntp.org + EOL cleanup + + sntp/unity/unity_internals.h@1.3 +4 -4 + EOL cleanup + +ChangeSet@1.3378, 2015-06-12 09:29:49+00:00, stenn@psp-at1.ntp.org + Distribute unity/auto/ + + sntp/Makefile.am@1.82 +1 -0 + Distribute unity/auto/ + +ChangeSet@1.3377, 2015-06-12 11:27:01+02:00, viperus@ubuntu.(none) + authkeys.c: + added code which runs init_auth() only in the 1st setUp, prevents segfault + generate_test_runner.rb: + removed init_lib() and init_auth() from here. Put it into setUp() in the test, but it should be run only once + + sntp/unity/auto/generate_test_runner.rb@1.5 +3 -2 + removed init_lib() and init_auth() from here. Put it into setUp() in the test, but it should be run only once + + tests/libntp/authkeys.c@1.5 +6 -2 + added code which runs init_auth() only in the 1st setUp, prevents segfault + + tests/libntp/run-test-a_md5encrypt.c@1.4 +0 -2 + + tests/libntp/run-test-atoint.c@1.4 +0 -2 + + tests/libntp/run-test-atouint.c@1.4 +0 -2 + + tests/libntp/run-test-authkeys.c@1.5 +6 -8 + + tests/libntp/run-test-hextoint.c@1.4 +0 -2 + + tests/libntp/run-test-lfpfunc.c@1.5 +0 -2 + + tests/libntp/run-test-modetoa.c@1.6 +0 -2 + + tests/libntp/run-test-numtoa.c@1.4 +0 -2 + + tests/libntp/run-test-numtohost.c@1.4 +0 -2 + + tests/libntp/run-test-statestr.c@1.4 +0 -2 + + tests/libntp/run-test-uglydate.c@1.5 +0 -2 + + tests/libntp/run-test-ymd2yd.c@1.4 +0 -2 + +ChangeSet@1.3376, 2015-06-12 11:14:36+02:00, viperus@ubuntu.(none) + test-libntp.c: + removed stuff that was placed elsewhere + + tests/libntp/run-test-a_md5encrypt.c@1.3 +2 -0 + + tests/libntp/run-test-atoint.c@1.3 +2 -0 + + tests/libntp/run-test-atouint.c@1.3 +2 -0 + + tests/libntp/run-test-authkeys.c@1.4 +8 -8 + + tests/libntp/run-test-hextoint.c@1.3 +2 -0 + + tests/libntp/run-test-lfpfunc.c@1.4 +2 -0 + + tests/libntp/run-test-modetoa.c@1.5 +2 -0 + + tests/libntp/run-test-numtoa.c@1.3 +2 -0 + + tests/libntp/run-test-numtohost.c@1.3 +2 -0 + + tests/libntp/run-test-statestr.c@1.3 +2 -0 + + tests/libntp/run-test-uglydate.c@1.4 +2 -0 + + tests/libntp/run-test-ymd2yd.c@1.3 +2 -0 + + tests/libntp/test-libntp.c@1.3 +5 -3 + removed stuff that was placed elsewhere + +ChangeSet@1.3375, 2015-06-12 10:50:27+02:00, viperus@ubuntu.(none) + generate_test_runner.rb: + test runners main() will always call init_lib() and init_auth() + + sntp/unity/auto/generate_test_runner.rb@1.4 +2 -1 + test runners main() will always call init_lib() and init_auth() + + tests/libntp/authkeys.c@1.4 +3 -1 + +ChangeSet@1.3374, 2015-06-12 10:37:47+02:00, viperus@ubuntu.(none) + updating autogenerated testrunners with progname = argv[0] + + tests/libntp/run-test-a_md5encrypt.c@1.2 +9 -6 + + tests/libntp/run-test-atoint.c@1.2 +10 -7 + + tests/libntp/run-test-atouint.c@1.2 +9 -6 + + tests/libntp/run-test-authkeys.c@1.3 +6 -3 + + tests/libntp/run-test-hextoint.c@1.2 +9 -6 + + tests/libntp/run-test-lfpfunc.c@1.3 +15 -8 + + tests/libntp/run-test-modetoa.c@1.4 +6 -3 + + tests/libntp/run-test-numtoa.c@1.2 +6 -3 + + tests/libntp/run-test-numtohost.c@1.2 +5 -2 + + tests/libntp/run-test-statestr.c@1.2 +8 -5 + + tests/libntp/run-test-uglydate.c@1.3 +5 -2 + + tests/libntp/run-test-ymd2yd.c@1.2 +8 -5 + +ChangeSet@1.3373, 2015-06-12 10:33:08+02:00, viperus@ubuntu.(none) + testcalshims.h: + also removed progname and current_time var + testcalshims.c: + removed progname and current_time var + + tests/libntp/authkeys.c@1.3 +3 -1 + + tests/libntp/testcalshims.c@1.3 +2 -2 + removed progname and current_time var + + tests/libntp/testcalshims.h@1.3 +2 -2 + also removed progname and current_time var + +ChangeSet@1.3372, 2015-06-12 10:14:36+02:00, viperus@ubuntu.(none) + generate_test_runner.rb: + Added progname = argv[0] in main() function of each runner. + + sntp/unity/auto/generate_test_runner.rb@1.3 +8 -1 + Added progname = argv[0] in main() function of each runner. + +ChangeSet@1.3371, 2015-06-12 06:25:21+00:00, viperus@psp-at1.ntp.org + removed the outdated functions made purely for testing unity + + tests/bug-2803/Makefile.am@1.9 +3 -3 + + tests/bug-2803/run-bug-2803.c@1.2 +4 -2 + + tests/bug-2803/ut-2803.c@1.2 +1 -12 + +ChangeSet@1.3369, 2015-06-11 23:00:26+02:00, viperus@ubuntu.(none) + manually merged a few lines in tests/bug-2803/Makefile.am + + tests/bug-2803/Makefile.am@1.8 +6 -2 + +ChangeSet@1.3345.1.9, 2015-06-11 20:01:57+00:00, stenn@psp-at1.ntp.org + test/Makefile.am DIST_SUBDIRS cleanup + + tests/Makefile.am@1.9 +7 -0 + test/Makefile.am DIST_SUBDIRS cleanup + +ChangeSet@1.3345.1.8, 2015-06-11 19:00:08+00:00, stenn@psp-at1.ntp.org + Fix a typo in tests/libntp/modetoa.c + + tests/libntp/modetoa.c@1.1.1.1 +1 -1 + Fix a typo in tests/libntp/modetoa.c + +ChangeSet@1.3367, 2015-06-11 20:50:24+02:00, viperus@ubuntu.(none) + finished this test, changed TEST_ASSERT_DOUBLE_WITHIN(...) as jnperlin suggested + + tests/libntp/lfpfunc.c@1.3 +158 -237 + +ChangeSet@1.3345.1.7, 2015-06-11 18:48:46+00:00, stenn@psp-at1.ntp.org + Updates to tests/libntp/ + + tests/libntp/run-test-libntp.c@1.2 +2 -2 + Updates to tests/libntp/ + + tests/libntp/test-libntp.c@1.2 +9 -1 + Updates to tests/libntp/ + +ChangeSet@1.3326.12.3, 2015-06-11 20:08:33+02:00, jnperlin@hydra.(none) + [Bug 2843] make check fails on 4.3.36 + Fixed compiler warnings about numeric range overflow (The original topic was fixed in a byplay to bug#2830) + + ChangeLog@1.1641.10.3 +3 -0 + [Bug 2843] make check fails on 4.3.36 + Fixed compiler warnings about numeric range overflow (The original topic was fixed in a byplay to bug#2830) + + tests/ntpd/leapsec.cpp@1.14 +21 -21 + [Bug 2843] make check fails on 4.3.36 + Fixed compiler warnings about numeric range overflow (The original topic was fixed in a byplay to bug#2830) + +ChangeSet@1.3345.1.6, 2015-06-11 17:55:32+00:00, stenn@psp-at1.ntp.org + tests/bug-2803/Makefile.am must distribute bug-2803.h + + ChangeLog@1.1648.1.5 +1 -0 + tests/bug-2803/Makefile.am must distribute bug-2803.h + + tests/bug-2803/Makefile.am@1.7 +1 -0 + tests/bug-2803/Makefile.am must distribute bug-2803.h + +ChangeSet@1.3345.1.5, 2015-06-11 17:54:00+00:00, stenn@psp-at1.ntp.org + sntp/libpkgver belongs in EXTRA_DIST, not DIST_SUBDIRS + + ChangeLog@1.1648.1.4 +1 -0 + sntp/libpkgver belongs in EXTRA_DIST, not DIST_SUBDIRS + + sntp/Makefile.am@1.81 +2 -1 + sntp/libpkgver belongs in EXTRA_DIST, not DIST_SUBDIRS + +ChangeSet@1.3326.12.2, 2015-06-10 22:23:44-04:00, stenn@deacon.udel.edu + Typo: Bug 2887 -> Bug 2778 + + ChangeLog@1.1641.10.2 +1 -1 + Typo: Bug 2887 -> Bug 2778 + +ChangeSet@1.3366, 2015-06-10 13:09:48+02:00, viperus@ubuntu.(none) + minor change in testrunner + + tests/libntp/run-test-lfpfunc.c@1.2 +9 -5 + +ChangeSet@1.3365, 2015-06-10 13:08:39+02:00, viperus@ubuntu.(none) + + Makefile.am: + added -DUNITY_DOUBLE_INCLUDE to CFLAGS, so I don't get linker errors anymore (because asserting double is disabled by default in unity) + + Makefile.am: (/tests/libntp/Makefile.am) + added -DUNITY.... to makefile when building lfpfunc.c. Maybe I should add -DUNITY... to CFLAGS_unity or something like that' + lfpfunc.c: + converted more tests + + + sntp/unity/Makefile.am@1.2.1.1 +4 -0 + added -DUNITY_DOUBLE_INCLUDE to CFLAGS, so I don't get linker errors anymore (because asserting double is disabled by default in unity) + + tests/libntp/Makefile.am@1.54 +2 -1 + 'added -DUNITY.... to makefile when building lfpfunc.c. Maybe I should add -DUNITY... to CFLAGS_unity or something like that' + + tests/libntp/lfpfunc.c@1.2 +72 -80 + 'added -DUNITY.... to makefile when building lfpfunc.c. Maybe I should add -DUNITY... to CFLAGS_unity or somethign like that' + +ChangeSet@1.3326.12.1, 2015-06-10 10:52:55+00:00, stenn@psp-at1.ntp.org + [Bug 2778] Implement "apeers" ntpq command to include associd + + ChangeLog@1.1641.10.1 +1 -0 + [Bug 2778] Implement "apeers" ntpq command to include associd + + ntpq/invoke-ntpq.texi@1.500 +11 -1 + [Bug 2778] Implement "apeers" ntpq command to include associd + + ntpq/ntpq-opts.c@1.517 +1 -1 + [Bug 2778] Implement "apeers" ntpq command to include associd + + ntpq/ntpq-opts.def@1.26 +8 -0 + [Bug 2778] Implement "apeers" ntpq command to include associd + + ntpq/ntpq-opts.h@1.515 +1 -1 + [Bug 2778] Implement "apeers" ntpq command to include associd + + ntpq/ntpq-subs.c@1.105.1.1 +140 -2 + [Bug 2778] Implement "apeers" ntpq command to include associd + + ntpq/ntpq.1ntpqman@1.328 +15 -4 + [Bug 2778] Implement "apeers" ntpq command to include associd + + ntpq/ntpq.1ntpqmdoc@1.328 +10 -2 + [Bug 2778] Implement "apeers" ntpq command to include associd + + ntpq/ntpq.man.in@1.328 +15 -4 + [Bug 2778] Implement "apeers" ntpq command to include associd + + ntpq/ntpq.mdoc.in@1.328 +10 -2 + [Bug 2778] Implement "apeers" ntpq command to include associd + +ChangeSet@1.3364, 2015-06-10 10:21:01+02:00, viperus@ubuntu.(none) + Makefile.am: + Added LIBM in LDADD. + + tests/libntp/Makefile.am@1.53 +30 -10 + Added LIBM in LDADD. + +ChangeSet@1.3326.7.16, 2015-06-09 23:58:56+02:00, jnperlin@nemesis.localnet + [Bug 2845] Harden memory allocation in ntpd + implement and use 'eallocarray(...)' where appropriate + + ChangeLog@1.1641.7.12 +1 -0 + [Bug 2845] Harden memory allocation in ntpd + implement and use 'eallocarray(...)' where appropriate + + include/ntp_stdlib.h@1.78 +19 -10 + [Bug 2845] Harden memory allocation in ntpd + add 'oreallocarray()' prototypes and the macros 'eallocarray' and 'ereallocarray' + use proper parentheses in allocation macro expansions + + libntp/emalloc.c@1.18 +53 -0 + [Bug 2845] Harden memory allocation in ntpd + add 'oreallocarry()' implementation + + ntpd/ntp_config.c@1.327 +4 -3 + [Bug 2845] Harden memory allocation in ntpd + use 'eallocarray(...)' where appropriate + + ntpd/ntp_crypto.c@1.179 +2 -2 + [Bug 2845] Harden memory allocation in ntpd + use 'eallocarray(...)' where appropriate + + ntpd/ntp_monitor.c@1.42 +1 -1 + [Bug 2845] Harden memory allocation in ntpd + use 'eallocarray(...)' where appropriate + + ntpq/ntpq-subs.c@1.106 +1 -1 + [Bug 2845] Harden memory allocation in ntpd + use 'eallocarray(...)' where appropriate + + sntp/kod_management.c@1.33 +2 -2 + [Bug 2845] Harden memory allocation in ntpd + use 'eallocarray(...)' where appropriate + +ChangeSet@1.3363, 2015-06-08 10:29:19+02:00, viperus@ubuntu.(none) + added incomplete test for lfpfunc.c. Changes to makefile and created c_timestructs.c and .h, because timestructs.cpp is a big c++ wrapper. Slowly converting it all to C code + + tests/libntp/c_timestructs.c@1.1 +155 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/c_timestructs.c + + tests/libntp/c_timestructs.c@1.0 +0 -0 + + tests/libntp/c_timestructs.h@1.1 +213 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/c_timestructs.h + + tests/libntp/c_timestructs.h@1.0 +0 -0 + + tests/libntp/g_lfpfunc.cpp@1.3 +0 -0 + Rename: tests/libntp/lfpfunc.cpp -> tests/libntp/g_lfpfunc.cpp + + tests/libntp/lfpfunc.c@1.1 +643 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/lfpfunc.c + + tests/libntp/lfpfunc.c@1.0 +0 -0 + + tests/libntp/run-test-lfpfunc.c@1.1 +56 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-lfpfunc.c + + tests/libntp/run-test-lfpfunc.c@1.0 +0 -0 + +ChangeSet@1.3326.7.15, 2015-06-07 21:20:28-04:00, stenn@deacon.udel.edu + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + + ntpd/ntp_timer.c@1.87 +10 -0 + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + +ChangeSet@1.3326.7.14, 2015-06-07 23:11:26+02:00, jnperlin@hydra.(none) + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + - add changelog entry + - add ASSERTS to ntp_crypto.c for length of signature + + ChangeLog@1.1641.7.11 +4 -0 + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + - add missing entries + + ntpd/ntp_crypto.c@1.178 +34 -11 + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + - add asserts to signature length code + +ChangeSet@1.3362, 2015-06-07 17:14:49+02:00, viperus@ubuntu.(none) + removed some spaces from Makefile.am, removed init_auth from setUp, because every test was calling it. Added init_auth inside run-test-authkeys.c. This is aproblem because I had to modify an autogenerated file! + + tests/libntp/Makefile.am@1.52 +1 -4 + + tests/libntp/authkeys.c@1.2 +2 -0 + + tests/libntp/run-test-authkeys.c@1.2 +8 -6 + +ChangeSet@1.3361, 2015-06-07 13:22:51+00:00, viperus@psp-at1.ntp.org + loaded math lib for some tests so building works on psp-at1 and psp-fb1 + + tests/libntp/Makefile.am@1.51 +7 -1 + +ChangeSet@1.3360, 2015-06-07 15:09:23+02:00, viperus@ubuntu.(none) + re-enabled a_md5encrypt test + + tests/libntp/Makefile.am@1.50 +1 -2 + +ChangeSet@1.3359, 2015-06-07 15:04:05+02:00, viperus@ubuntu.(none) + temporarily removed #test-a_md5encrypt due to log10, linking with math lib + + tests/libntp/Makefile.am@1.49 +2 -1 + +ChangeSet@1.3358, 2015-06-07 14:39:28+02:00, viperus@ubuntu.(none) + added new includes in all files + + tests/libntp/a_md5encrypt.c@1.3 +3 -3 + + tests/libntp/atoint.c@1.2 +1 -0 + + tests/libntp/atouint.c@1.2 +2 -1 + + tests/libntp/hextoint.c@1.2 +2 -1 + + tests/libntp/modetoa.c@1.3 +1 -0 + + tests/libntp/numtoa.c@1.2 +2 -1 + + tests/libntp/numtohost.c@1.2 +2 -1 + + tests/libntp/statestr.c@1.2 +2 -1 + + tests/libntp/uglydate.c@1.3 +1 -1 + + tests/libntp/ymd2yd.c@1.2 +1 -0 + +ChangeSet@1.3357, 2015-06-07 14:31:53+02:00, viperus@ubuntu.(none) + removed a minor makefile bug, put added new include in uglydate.c + + tests/libntp/Makefile.am@1.48 +0 -1 + + tests/libntp/uglydate.c@1.2 +1 -0 + +ChangeSet@1.3356, 2015-06-07 11:37:45+02:00, viperus@ubuntu.(none) + for some reason this file isnt available on psp-deb1 + + tests/libntp/a_md5encrypt.c@1.2 +1 -0 + +ChangeSet@1.3326.11.2, 2015-06-07 11:25:17+02:00, jnperlin@hydra.(none) + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + - fix test case that got damaged by changes to TAI table limit logic + + tests/ntpd/leapsec.cpp@1.13 +6 -2 + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + - fix test case that got damaged by changes to TAI table limit logic + +ChangeSet@1.3355, 2015-06-07 11:02:10+02:00, viperus@ubuntu.(none) + adding new test files and their runners + + tests/libntp/a_md5encrypt.c@1.1 +98 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/a_md5encrypt.c + + tests/libntp/a_md5encrypt.c@1.0 +0 -0 + + tests/libntp/atouint.c@1.1 +40 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/atouint.c + + tests/libntp/atouint.c@1.0 +0 -0 + + tests/libntp/authkeys.c@1.1 +107 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/authkeys.c + + tests/libntp/authkeys.c@1.0 +0 -0 + + tests/libntp/run-test-a_md5encrypt.c@1.1 +56 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-a_md5encrypt.c + + tests/libntp/run-test-a_md5encrypt.c@1.0 +0 -0 + + tests/libntp/run-test-atouint.c@1.1 +56 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-atouint.c + + tests/libntp/run-test-atouint.c@1.0 +0 -0 + + tests/libntp/run-test-authkeys.c@1.1 +58 -0 + BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/libntp/run-test-authkeys.c + + tests/libntp/run-test-authkeys.c@1.0 +0 -0 + +ChangeSet@1.3353, 2015-06-07 10:51:34+02:00, viperus@ubuntu.(none) + forgot to ci a few files + + tests/libntp/Makefile.am@1.47 +51 -4 + + tests/libntp/testcalshims.c@1.2 +7 -3 + + tests/libntp/testcalshims.h@1.2 +7 -3 + +ChangeSet@1.3352, 2015-06-07 10:30:09+02:00, viperus@ubuntu.(none) + modified testcalshims.h to suppoer md5encrypt.c and authkeys.c , added new tests, and modified Makefile.am + + tests/libntp/g_a_md5encrypt.cpp@1.6 +0 -0 + Rename: tests/libntp/a_md5encrypt.cpp -> tests/libntp/g_a_md5encrypt.cpp + + tests/libntp/g_atouint.cpp@1.2 +0 -0 + Rename: tests/libntp/atouint.cpp -> tests/libntp/g_atouint.cpp + + tests/libntp/g_authkeys.cpp@1.8 +0 -0 + Rename: tests/libntp/authkeys.cpp -> tests/libntp/g_authkeys.cpp + +ChangeSet@1.3326.7.12, 2015-06-07 04:00:46-04:00, stenn@deacon.udel.edu + sntp/scripts/genLocInfo: treat raspbian as debian + + ChangeLog@1.1641.7.10 +1 -0 + sntp/scripts/genLocInfo: treat raspbian as debian + + sntp/scripts/genLocInfo@1.18 +8 -0 + sntp/scripts/genLocInfo: treat raspbian as debian + +ChangeSet@1.3326.7.11, 2015-06-07 06:16:41+00:00, stenn@psp-at1.ntp.org + [Bug 2842] Bug in mdoc2man + + ChangeLog@1.1641.7.9 +1 -0 + [Bug 2842] Bug in mdoc2man + + sntp/ag-tpl/Mdoc.pm@1.1 +542 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable/sntp/ag-tpl/Mdoc.pm + + sntp/ag-tpl/Mdoc.pm@1.0 +0 -0 + + sntp/ag-tpl/mdoc2man@1.1 +219 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable/sntp/ag-tpl/mdoc2man + + sntp/ag-tpl/mdoc2man@1.0 +0 -0 + +ChangeSet@1.3326.7.10, 2015-06-07 03:16:04+00:00, stenn@psp-fb1.ntp.org + [Bug 2836] DFC77 patches from Frank Kardel to make decoding more robust, and require 2 consecutive timestamps to be consistent + + ChangeLog@1.1641.7.8 +2 -0 + [Bug 2836] DFC77 patches from Frank Kardel to make decoding more robust, and require 2 consecutive timestamps to be consistent + + libparse/clk_rawdcf.c@1.21 +6 -4 + [Bug 2836] DFC77 patches from Frank Kardel to make decoding more robust, and require 2 consecutive timestamps to be consistent + + libparse/parse.c@1.20 +2 -2 + [Bug 2836] DFC77 patches from Frank Kardel to make decoding more robust, and require 2 consecutive timestamps to be consistent + + ntpd/refclock_parse.c@1.79 +2 -0 + [Bug 2836] DFC77 patches from Frank Kardel to make decoding more robust, and require 2 consecutive timestamps to be consistent + +ChangeSet@1.3351, 2015-06-06 08:38:18+00:00, viperus@psp-deb1.ntp.org + adding new unity test files, changes to Makefile.am + + tests/libntp/Makefile.am@1.46 +119 -15 + + tests/libntp/atoint.c@1.1 +47 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/atoint.c + + tests/libntp/atoint.c@1.0 +0 -0 + + tests/libntp/g_atoint.cpp@1.3 +0 -0 + Rename: tests/libntp/atoint.cpp -> tests/libntp/g_atoint.cpp + + tests/libntp/g_hextoint.cpp@1.4 +0 -0 + Rename: tests/libntp/hextoint.cpp -> tests/libntp/g_hextoint.cpp + + tests/libntp/g_numtoa.cpp@1.3 +0 -0 + Rename: tests/libntp/numtoa.cpp -> tests/libntp/g_numtoa.cpp + + tests/libntp/g_numtohost.cpp@1.2 +0 -0 + Rename: tests/libntp/numtohost.cpp -> tests/libntp/g_numtohost.cpp + + tests/libntp/g_statestr.cpp@1.3 +1 -0 + + tests/libntp/g_statestr.cpp@1.2 +0 -0 + Rename: tests/libntp/statestr.cpp -> tests/libntp/g_statestr.cpp + + tests/libntp/g_ymd2yd.cpp@1.2 +0 -0 + Rename: tests/libntp/ymd2yd.cpp -> tests/libntp/g_ymd2yd.cpp + + tests/libntp/hextoint.c@1.1 +44 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/hextoint.c + + tests/libntp/hextoint.c@1.0 +0 -0 + + tests/libntp/modetoa.c@1.2 +2 -3 + + tests/libntp/numtoa.c@1.1 +27 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/numtoa.c + + tests/libntp/numtoa.c@1.0 +0 -0 + + tests/libntp/numtohost.c@1.1 +16 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/numtohost.c + + tests/libntp/numtohost.c@1.0 +0 -0 + + tests/libntp/run-test-atoint.c@1.1 +58 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/run-test-atoint.c + + tests/libntp/run-test-atoint.c@1.0 +0 -0 + + tests/libntp/run-test-hextoint.c@1.1 +56 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/run-test-hextoint.c + + tests/libntp/run-test-hextoint.c@1.0 +0 -0 + + tests/libntp/run-test-modetoa.c@1.3 +1 -1 + + tests/libntp/run-test-numtoa.c@1.1 +50 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/run-test-numtoa.c + + tests/libntp/run-test-numtoa.c@1.0 +0 -0 + + tests/libntp/run-test-numtohost.c@1.1 +48 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/run-test-numtohost.c + + tests/libntp/run-test-numtohost.c@1.0 +0 -0 + + tests/libntp/run-test-statestr.c@1.1 +54 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/run-test-statestr.c + + tests/libntp/run-test-statestr.c@1.0 +0 -0 + + tests/libntp/run-test-ymd2yd.c@1.1 +54 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/run-test-ymd2yd.c + + tests/libntp/run-test-ymd2yd.c@1.0 +0 -0 + + tests/libntp/statestr.c@1.1 +34 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/statestr.c + + tests/libntp/statestr.c@1.0 +0 -0 + + tests/libntp/ymd2yd.c@1.1 +30 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/ymd2yd.c + + tests/libntp/ymd2yd.c@1.0 +0 -0 + +ChangeSet@1.3326.7.9, 2015-06-05 08:24:51+00:00, stenn@psp-at1.ntp.org + [Bug 2837] add test for DSCP to ntpd/complete.conf.in - from Hal Murray + + ChangeLog@1.1641.7.7 +1 -0 + [Bug 2837] add test for DSCP to ntpd/complete.conf.in - from Hal Murray + + ntpd/complete.conf.in@1.28 +1 -0 + [Bug 2837] add test for DSCP to ntpd/complete.conf.in - from Hal Murray + +ChangeSet@1.3326.11.1, 2015-06-05 06:31:07+02:00, jnperlin@hydra.(none) + Bug 2830 - ntpd doesn't always transfer the correct TAI offset via autokey + - trigger a possible autokey update on change of 'sys_tai' + + include/ntpd.h@1.188 +1 -0 + Bug 2830 - ntpd doesn't always transfer the correct TAI offset via autokey + add 'crypto_update_taichange()': update autokey data after TAI change if possible + + ntpd/ntp_crypto.c@1.177 +75 -113 + Bug 2830 - ntpd doesn't always transfer the correct TAI offset via autokey + - add 'crypto_update_taichange()': update autokey data after TAI change if possible + - fix potential problem with signature size + - use DPRINTF where possible + + ntpd/ntp_timer.c@1.86 +7 -1 + Bug 2830 - ntpd doesn't always transfer the correct TAI offset via autokey + possibly update autokey data after 'sys_tai' changes + +ChangeSet@1.3326.7.8, 2015-06-05 02:42:26+00:00, stenn@psp-at1.ntp.org + 2830 fixes from Pearly + + ChangeLog@1.1641.7.6 +3 -0 + 2830 fixes from Pearly + +ChangeSet@1.3326.8.10, 2015-06-04 19:39:40+00:00, stenn@psp-at1.ntp.org + [Bug 2842] Glitch in ntp.conf.def documentation stanza + + ChangeLog@1.1641.8.9 +1 -0 + [Bug 2842] Glitch in ntp.conf.def documentation stanza + + ntpd/invoke-ntp.conf.texi@1.184 +3 -3 + [Bug 2842] Glitch in ntp.conf.def documentation stanza + + ntpd/ntp.conf.5man@1.218 +6 -6 + [Bug 2842] Glitch in ntp.conf.def documentation stanza + + ntpd/ntp.conf.5mdoc@1.218 +4 -4 + [Bug 2842] Glitch in ntp.conf.def documentation stanza + + ntpd/ntp.conf.def@1.16 +2 -2 + [Bug 2842] Glitch in ntp.conf.def documentation stanza + + ntpd/ntp.conf.man.in@1.218 +6 -6 + [Bug 2842] Glitch in ntp.conf.def documentation stanza + + ntpd/ntp.conf.mdoc.in@1.218 +4 -4 + [Bug 2842] Glitch in ntp.conf.def documentation stanza + +ChangeSet@1.3326.10.2, 2015-06-04 03:24:16-04:00, stenn@deacon.udel.edu + [Bug 2824] Convert update-leap to perl. (also see 2769) + + configure.ac@1.588.1.1 +1 -0 + [Bug 2824] Convert update-leap to perl. (also see 2769) + + scripts/update-leap/update-leap.in@1.2 +2 -3 + [Bug 2824] Convert update-leap to perl. (also see 2769) + +ChangeSet@1.3326.10.1, 2015-06-04 03:21:27-04:00, stenn@deacon.udel.edu + [Bug 2837] Allow a configurable DSCP value + + ntpd/keyword-gen-utd@1.23 +1 -1 + [Bug 2837] Allow a configurable DSCP value + + ntpd/ntp_keyword.h@1.25 +842 -838 + [Bug 2837] Allow a configurable DSCP value + + ntpd/ntp_parser.c@1.93 +1074 -1060 + [Bug 2837] Allow a configurable DSCP value + + ntpd/ntp_parser.h@1.58 +320 -318 + [Bug 2837] Allow a configurable DSCP value + +ChangeSet@1.3326.8.8, 2015-06-04 03:14:37+00:00, stenn@psp-fb1.ntp.org + Report select() debug messages at debug level 3 now + + ChangeLog@1.1641.8.8 +1 -1 + Report select() debug messages at debug level 3 now + +ChangeSet@1.3326.8.7, 2015-06-03 17:04:21+02:00, martin@pc-martin.(none) + Increased the debug level at which a tiny debug message is printed. + + ChangeLog@1.1641.8.7 +1 -0 + Increased the debug level at which a tiny debug message is printed. + + ntpd/ntp_io.c@1.399.1.2 +1 -1 + Increased the debug level at which a tiny debug message is printed. + +ChangeSet@1.3326.8.6, 2015-06-03 09:30:35+00:00, stenn@psp-at1.ntp.org + [Bug 2837] Allow a configurable DSCP value + + ChangeLog@1.1641.8.6 +2 -1 + [Bug 2837] Allow a configurable DSCP value + + html/miscopt.html@1.81 +2 -0 + [Bug 2837] Allow a configurable DSCP value + + include/ntp_io.h@1.22 +1 -0 + [Bug 2837] Allow a configurable DSCP value + + ntpd/keyword-gen.c@1.29 +1 -0 + [Bug 2837] Allow a configurable DSCP value + + ntpd/ntp_config.c@1.326 +8 -1 + [Bug 2837] Allow a configurable DSCP value + + ntpd/ntp_io.c@1.399.1.1 +5 -5 + [Bug 2837] Allow a configurable DSCP value + + ntpd/ntp_parser.y@1.85 +13 -0 + [Bug 2837] Allow a configurable DSCP value + +ChangeSet@1.3326.8.5, 2015-06-03 03:46:57-04:00, stenn@deacon.udel.edu + ChangeLog cleanup + + ChangeLog@1.1641.8.5 +2 -2 + ChangeLog cleanup + +ChangeSet@1.3326.8.3, 2015-06-03 05:39:07+00:00, stenn@psp-at1.ntp.org + ChangeLog order cleanup + + ChangeLog@1.1641.8.3 +2 -2 + ChangeLog order cleanup + +ChangeSet@1.3326.9.2, 2015-06-03 01:07:20-04:00, stenn@deacon.udel.edu + update-leap conversion is bug 2824, not 2769 + + ChangeLog@1.1641.9.2 +1 -1 + update-leap conversion is bug 2824, not 2769 + +ChangeSet@1.3326.7.6, 2015-06-02 09:11:10+02:00, jnperlin@hydra.(none) + Bug 2830 - ntpd doesn't always transfer the correct TAI offset via autokey + fix a few bad ideas and missing links + + ntpd/ntp_crypto.c@1.176 +34 -39 + Bug 2830 - ntpd doesn't always transfer the correct TAI offset via autokey + - fix the autokey TAI data block (initial value, never omit data) + + ntpd/ntp_leapsec.c@1.21 +25 -16 + Bug 2830 - ntpd doesn't always transfer the correct TAI offset via autokey + - loading the leap frame should always copy the data (not just after the close monitoring time) + - loading the table data via build time limit keeps the last 10 years before build data + - lstostr() should return 'const char*' + +ChangeSet@1.3345.1.1, 2015-06-01 10:42:57+00:00, stenn@psp-fb1.ntp.org + add unity_fixture to the unity library + + sntp/unity/Makefile.am@1.3 +9 -5 + add unity_fixture to the unity library + + sntp/unity/unity_fixture.c@1.1 +398 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/unity_fixture.c + + sntp/unity/unity_fixture.c@1.0 +0 -0 + + sntp/unity/unity_fixture.h@1.1 +86 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/unity_fixture.h + + sntp/unity/unity_fixture.h@1.0 +0 -0 + + sntp/unity/unity_fixture_internals.h@1.1 +44 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/unity_fixture_internals.h + + sntp/unity/unity_fixture_internals.h@1.0 +0 -0 + + sntp/unity/unity_fixture_malloc_overrides.h@1.1 +21 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/unity_fixture_malloc_overrides.h + + sntp/unity/unity_fixture_malloc_overrides.h@1.0 +0 -0 + +ChangeSet@1.3326.7.5, 2015-06-01 07:24:52+02:00, jnperlin@hydra.(none) + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + NTPD transfers the current TAI (instead of an announcement) now. This might still needed improvement. + + ChangeLog@1.1641.7.4 +2 -3 + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + NTPD transfers the current TAI (instead of an announcement) now. This might still needed improvement. + + ntpd/ntp_crypto.c@1.175 +55 -34 + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + transmit/receive the current leap era instead of of the latest announcement in autokey packets + + ntpd/ntp_leapsec.c@1.20 +116 -1 + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + Support adjustment of transmitting the current TAI offset via autokey. + Needs support to shift the table values in absence of fixed entries. + + ntpd/ntp_leapsec.h@1.10 +42 -5 + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + Support adjustment of transmitting the current TAI offset via autokey. + Needs support to shift the table values in absence of fixed entries. + + tests/ntpd/leapsec.cpp@1.12 +82 -5 + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + Test processing of TAI offset shifts as used by autokey + +ChangeSet@1.3326.9.1, 2015-05-30 07:19:56+00:00, stenn@psp-fb1.ntp.org + [Bug 2769] Convert update-leap to perl + + ChangeLog@1.1641.9.1 +3 -0 + [Bug 2769] Convert update-leap to perl + + scripts/update-leap/Makefile.am@1.4 +2 -1 + [Bug 2769] Convert update-leap to perl + + scripts/update-leap/update-leap.in@1.1 +425 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable/scripts/update-leap/update-leap.in + + scripts/update-leap/update-leap.in@1.0 +0 -0 + + scripts/update-leap/update-leap.sh@1.2 +0 -0 + Rename: scripts/update-leap/update-leap -> scripts/update-leap/update-leap.sh + +ChangeSet@1.3350, 2015-05-27 09:51:28+00:00, viperus@psp-deb1.ntp.org + modified the ruby testRunner generator, so the test prints filesnames properly. ALSO, run-test-name.c files dont rebuild after I modify the ruby code + + sntp/unity/auto/generate_test_runner.rb@1.2 +2 -1 + + tests/libntp/run-test-modetoa.c@1.2 +1 -1 + + tests/libntp/run-test-uglydate.c@1.2 +1 -1 + +ChangeSet@1.3349, 2015-05-27 08:40:02+00:00, viperus@psp-deb1.ntp.org + added run-testmodeto.c and run-test.uglydate.c + + tests/libntp/run-test-modetoa.c@1.1 +50 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/run-test-modetoa.c + + tests/libntp/run-test-modetoa.c@1.0 +0 -0 + + tests/libntp/run-test-uglydate.c@1.1 +48 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/run-test-uglydate.c + + tests/libntp/run-test-uglydate.c@1.0 +0 -0 + +ChangeSet@1.3348, 2015-05-27 08:38:25+00:00, viperus@psp-deb1.ntp.org + modified makefile to work with multiple tests + + tests/libntp/Makefile.am@1.45 +45 -6 + +ChangeSet@1.3347, 2015-05-26 10:15:06+00:00, viperus@psp-deb1.ntp.org + ut-2803.c: + Removed unncessary include. + + tests/sandbox/ut-2803.c@1.3 +1 -1 + Removed unncessary include. + +ChangeSet@1.3346, 2015-05-26 10:11:49+00:00, viperus@psp-deb1.ntp.org + making better sandbox examples + + tests/sandbox/Makefile.am@1.2 +22 -5 + makefile now builds 3 seperate tests + + tests/sandbox/ut-2803.c@1.2 +44 -5 + added more test examples + +ChangeSet@1.3345, 2015-05-26 09:36:31+00:00, viperus@psp-deb1.ntp.org + we want to build tests/libntp even if no GTEST + + tests/Makefile.am@1.8 +8 -6 + we want to build tests/libntp even if no GTEST + + tests/libntp/Makefile.am@1.44 +6 -1 + we want to build tests/libntp even if no GTEST + +ChangeSet@1.3344, 2015-05-26 09:31:22+00:00, viperus@psp-deb1.ntp.org + added run-test-libntp.c + + tests/libntp/run-test-libntp.c@1.1 +50 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/run-test-libntp.c + + tests/libntp/run-test-libntp.c@1.0 +0 -0 + +ChangeSet@1.3343, 2015-05-26 09:23:18+00:00, viperus@psp-deb1.ntp.org + probably commited changes to tests/libntp/Makefile.am + + tests/libntp/Makefile.am@1.43 +44 -11 + modified makefile. + +ChangeSet@1.3342, 2015-05-26 09:13:23+00:00, viperus@psp-deb1.ntp.org + added more files to libntp/ and added some autogenerated tests to sandbox so other people can see how do they lok like. + + tests/libntp/g_modetoa.cpp@1.2 +0 -0 + Rename: tests/libntp/modetoa.cpp -> tests/libntp/g_modetoa.cpp + + tests/libntp/g_uglydate.cpp@1.3 +0 -0 + Rename: tests/libntp/uglydate.cpp -> tests/libntp/g_uglydate.cpp + + tests/libntp/modetoa.c@1.1 +20 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/modetoa.c + + tests/libntp/modetoa.c@1.0 +0 -0 + + tests/libntp/test-libntp.c@1.1 +29 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/test-libntp.c + + tests/libntp/test-libntp.c@1.0 +0 -0 + + tests/libntp/test-libntp.h@1.1 +6 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/test-libntp.h + + tests/libntp/test-libntp.h@1.0 +0 -0 + + tests/libntp/testcalshims.c@1.1 +27 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/testcalshims.c + + tests/libntp/testcalshims.c@1.0 +0 -0 + + tests/libntp/testcalshims.h@1.1 +9 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/testcalshims.h + + tests/libntp/testcalshims.h@1.0 +0 -0 + + tests/libntp/uglydate.c@1.1 +16 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/libntp/uglydate.c + + tests/libntp/uglydate.c@1.0 +0 -0 + + tests/sandbox/run-first-test.c@1.1 +48 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/sandbox/run-first-test.c + + tests/sandbox/run-first-test.c@1.0 +0 -0 + + tests/sandbox/run-second-test.c@1.1 +50 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/sandbox/run-second-test.c + + tests/sandbox/run-second-test.c@1.0 +0 -0 + + tests/sandbox/run-ut-2803.c@1.1 +58 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/sandbox/run-ut-2803.c + + tests/sandbox/run-ut-2803.c@1.0 +0 -0 + +ChangeSet@1.3341, 2015-05-26 08:45:31+00:00, viperus@psp-deb1.ntp.org + added a few more files to sandbox/ , updated unity to print FAIL instead of Failure + + tests/sandbox/modetoa.c@1.1 +20 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/sandbox/modetoa.c + + tests/sandbox/modetoa.c@1.0 +0 -0 + + tests/sandbox/uglydate.c@1.1 +16 -0 + BitKeeper file /home/viperus/ntp-stable-unity/tests/sandbox/uglydate.c + + tests/sandbox/uglydate.c@1.0 +0 -0 + +ChangeSet@1.3340, 2015-05-19 10:24:10+00:00, stenn@psp-at1.ntp.org + Unity test framework fixes + + configure.ac@1.592 +1 -1 + Unity test framework fixes + + sntp/configure.ac@1.80 +1 -1 + Unity test framework fixes + + sntp/m4/ntp_unitytest.m4@1.2 +1 -1 + Unity test framework fixes + +ChangeSet@1.3339, 2015-05-19 09:33:10+00:00, stenn@psp-deb1.ntp.org + Unity test framework fixes + + ChangeLog@1.1648 +1 -0 + Unity test framework fixes + + configure.ac@1.591 +3 -0 + Unity test framework fixes + + sntp/configure.ac@1.79 +1 -0 + Unity test framework fixes + + sntp/m4/ntp_unitytest.m4@1.1, stenn@psp-at1.ntp.org +19 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/m4/ntp_unitytest.m4 + + sntp/m4/ntp_unitytest.m4@1.0, stenn@psp-at1.ntp.org +0 -0 + +ChangeSet@1.3338, 2015-05-19 07:22:21+00:00, stenn@psp-at1.ntp.org + Unity framework cleanup + + tests/bug-2803/run-bug-2803.c@1.1 +46 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/bug-2803/run-bug-2803.c + + tests/bug-2803/run-bug-2803.c@1.0 +0 -0 + +ChangeSet@1.3337, 2015-05-18 06:30:54+00:00, viperus@psp-deb1.ntp.org + tests/sandbox cleanup + + BitKeeper/etc/ignore@1.88 +1 -0 + added tests/sandbox/Makefile.in + +ChangeSet@1.3336, 2015-05-18 06:29:35+00:00, viperus@psp-deb1.ntp.org + tests/sandbox cleanup + + BitKeeper/deleted/8f/Makefile.in~199a99ee888869a7@1.2 +0 -0 + Delete: tests/sandbox/Makefile.in + + configure.ac@1.590 +1 -0 + tests/sandbox cleanup + +ChangeSet@1.3335, 2015-05-17 22:30:55+00:00, stenn@psp-at1.ntp.org + Created tests/sandbox/ + + tests/Makefile.am@1.7 +1 -0 + Created tests/sandbox/ + + tests/sandbox/Makefile.am@1.1 +67 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/sandbox/Makefile.am + + tests/sandbox/Makefile.am@1.0 +0 -0 + + tests/sandbox/Makefile.in@1.1 +1258 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/sandbox/Makefile.in + + tests/sandbox/Makefile.in@1.0 +0 -0 + + tests/sandbox/bug-2803.c@1.1 +99 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/sandbox/bug-2803.c + + tests/sandbox/bug-2803.c@1.0 +0 -0 + + tests/sandbox/bug-2803.h@1.1 +1 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/sandbox/bug-2803.h + + tests/sandbox/bug-2803.h@1.0 +0 -0 + + tests/sandbox/run-bug-2803.c@1.1 +46 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/sandbox/run-bug-2803.c + + tests/sandbox/run-bug-2803.c@1.0 +0 -0 + + tests/sandbox/test-2803.c@1.1 +229 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/sandbox/test-2803.c + + tests/sandbox/test-2803.c@1.0 +0 -0 + + tests/sandbox/ut-2803.c@1.1 +41 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/sandbox/ut-2803.c + + tests/sandbox/ut-2803.c@1.0 +0 -0 + +ChangeSet@1.3334, 2015-05-17 22:16:38+00:00, stenn@psp-at1.ntp.org + Unity framework improvements + + sntp/unity/auto/colour_prompt.rb@1.1 +94 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/auto/colour_prompt.rb + + sntp/unity/auto/colour_prompt.rb@1.0 +0 -0 + + sntp/unity/auto/colour_reporter.rb@1.1 +39 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/auto/colour_reporter.rb + + sntp/unity/auto/colour_reporter.rb@1.0 +0 -0 + + sntp/unity/auto/generate_config.yml@1.1 +36 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/auto/generate_config.yml + + sntp/unity/auto/generate_config.yml@1.0 +0 -0 + + sntp/unity/auto/generate_module.rb@1.1 +202 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/auto/generate_module.rb + + sntp/unity/auto/generate_module.rb@1.0 +0 -0 + + sntp/unity/auto/generate_test_runner.rb@1.1 +298 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/auto/generate_test_runner.rb + + sntp/unity/auto/generate_test_runner.rb@1.0 +0 -0 + + sntp/unity/auto/runner_maybe.c@1.1 +52 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/auto/runner_maybe.c + + sntp/unity/auto/runner_maybe.c@1.0 +0 -0 + + sntp/unity/auto/test_file_filter.rb@1.1 +23 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/auto/test_file_filter.rb + + sntp/unity/auto/test_file_filter.rb@1.0 +0 -0 + + sntp/unity/auto/unity_test_summary.rb@1.1 +126 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/auto/unity_test_summary.rb + + sntp/unity/auto/unity_test_summary.rb@1.0 +0 -0 + + sntp/unity/unity.c@1.2 +110 -5 + Unity XFAIL patches from Damir Tomic + + sntp/unity/unity_internals.h@1.2 +11 -0 + Unity XFAIL patches from Damir Tomic + + tests/bug-2803/Makefile.am@1.6 +1 -1 + Unity cleanup + + tests/bug-2803/Makefile.am@1.5 +6 -1 + Unity cleanup + +ChangeSet@1.3333, 2015-05-17 06:47:45+00:00, stenn@psp-at1.ntp.org + Initial support for PACKAGE_VERSION tests + + ChangeLog@1.1647 +3 -0 + Initial support for PACKAGE_VERSION tests + + sntp/Makefile.am@1.80 +1 -1 + Added libpkgver + + sntp/libpkgver/colcomp.c@1.2 +2 -2 + import typo fix + + sntp/libpkgver/colcomp.c@1.1, stenn@psp-deb1.ntp.org +135 -0 + BitKeeper file /home/stenn/ntp-stable-unity/sntp/libpkgver/colcomp.c + + sntp/libpkgver/colcomp.c@1.0, stenn@psp-deb1.ntp.org +0 -0 + + sntp/libpkgver/pkgver.h@1.1, stenn@psp-deb1.ntp.org +19 -0 + BitKeeper file /home/stenn/ntp-stable-unity/sntp/libpkgver/pkgver.h + + sntp/libpkgver/pkgver.h@1.0, stenn@psp-deb1.ntp.org +0 -0 + + sntp/unity/Makefile.am@1.2 +1 -0 + Added colcomp.c from libpkgver + +ChangeSet@1.3332, 2015-05-16 08:58:44+00:00, stenn@psp-at1.ntp.org + Updates to bug-2803 tests + + tests/bug-2803/Makefile.am@1.4 +4 -2 + Updates to bug-2803 tests + + tests/bug-2803/TestProductionCode_Runner.c@1.1 +55 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/bug-2803/TestProductionCode_Runner.c + + tests/bug-2803/TestProductionCode_Runner.c@1.0 +0 -0 + + tests/bug-2803/bug-2803.c@1.3 +1 -1 + Updates to bug-2803 tests + + tests/bug-2803/bug-2803.h@1.1 +1 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/bug-2803/bug-2803.h + + tests/bug-2803/bug-2803.h@1.0 +0 -0 + + tests/bug-2803/ut-2803.c@1.1 +41 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/bug-2803/ut-2803.c + + tests/bug-2803/ut-2803.c@1.0 +0 -0 + +ChangeSet@1.3326.8.2, 2015-05-16 04:28:40+00:00, abe@psp-deb1.ntp.org + refclock.html, ChangeLog: + [Bug 2834] Correct a broken html tag in html/refclock.html + + ChangeLog@1.1641.8.2 +1 -0 + [Bug 2834] Correct a broken html tag in html/refclock.html + + html/refclock.html@1.45 +1 -1 + [Bug 2834] Correct a broken html tag in html/refclock.html + +ChangeSet@1.3326.8.1, 2015-05-15 11:43:04+00:00, abe@psp-deb1.ntp.org + driver40.html, refclock_jjy.c, driver40-ja.html, ChangeLog: + refclock_jjy.c supports the TDC-300 + + ChangeLog@1.1641.8.1 +1 -0 + refclock_jjy.c supports the TDC-300 + + html/drivers/driver40-ja.html@1.4 +62 -9 + refclock_jjy.c supports the TDC-300 + + html/drivers/driver40.html@1.19 +62 -9 + refclock_jjy.c supports the TDC-300 + + ntpd/refclock_jjy.c@1.29 +253 -1 + refclock_jjy.c supports the TDC-300 + +ChangeSet@1.3326.7.4, 2015-05-14 17:08:20+02:00, jnperlin@hydra.(none) + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + NTP does *not* transfer the TAI offset, but a leap second announcement. + Handling of these announcements and stepping over leap seconds needed improvement. + + ChangeLog@1.1641.7.3 +4 -0 + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + NTP does *not* transfer the TAI offset, but a leap second announcement. + Handling of these announcements and stepping over leap seconds needed improvement. + + ntpd/ntp_leapsec.c@1.19 +60 -26 + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + NTP does *not* transfer the TAI offset, but a leap second announcement. This needed some more work: + - Extending the expiration date via autokey without a new transition did not work. + - Assuming a positive leap transition at the first leap second helps when starting without leap file. + - Stepping over a leapsecond should not trigger the leap second transition detection. + + tests/ntpd/leapsec.cpp@1.11 +162 -4 + [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + Add/fix test cases to validate the changes to ntp_leapsec.c + +ChangeSet@1.3326.7.3, 2015-05-12 04:35:09-04:00, stenn@deacon.udel.edu + NTP_4_2_8P3_RC1 + TAG: NTP_4_2_8P3_RC1 + + ChangeLog@1.1641.7.2 +1 -0 + NTP_4_2_8P3_RC1 + + ntpd/invoke-ntp.conf.texi@1.183 +1 -1 + NTP_4_2_8P3_RC1 + + ntpd/invoke-ntp.keys.texi@1.179 +1 -1 + NTP_4_2_8P3_RC1 + + ntpd/invoke-ntpd.texi@1.496 +2 -2 + NTP_4_2_8P3_RC1 + + ntpd/ntp.conf.5man@1.217 +3 -3 + NTP_4_2_8P3_RC1 + + ntpd/ntp.conf.5mdoc@1.217 +2 -2 + NTP_4_2_8P3_RC1 + + ntpd/ntp.conf.html@1.174 +1 -1 + NTP_4_2_8P3_RC1 + + ntpd/ntp.conf.man.in@1.217 +3 -3 + NTP_4_2_8P3_RC1 + + ntpd/ntp.conf.mdoc.in@1.217 +2 -2 + NTP_4_2_8P3_RC1 + + ntpd/ntp.keys.5man@1.213 +2 -2 + NTP_4_2_8P3_RC1 + + ntpd/ntp.keys.5mdoc@1.213 +2 -2 + NTP_4_2_8P3_RC1 + + ntpd/ntp.keys.html@1.175 +1 -1 + NTP_4_2_8P3_RC1 + + ntpd/ntp.keys.man.in@1.213 +2 -2 + NTP_4_2_8P3_RC1 + + ntpd/ntp.keys.mdoc.in@1.213 +2 -2 + NTP_4_2_8P3_RC1 + + ntpd/ntpd-opts.c@1.518 +268 -268 + NTP_4_2_8P3_RC1 + + ntpd/ntpd-opts.h@1.517 +3 -3 + NTP_4_2_8P3_RC1 + + ntpd/ntpd.1ntpdman@1.325 +3 -3 + NTP_4_2_8P3_RC1 + + ntpd/ntpd.1ntpdmdoc@1.325 +2 -2 + NTP_4_2_8P3_RC1 + + ntpd/ntpd.html@1.169 +2 -2 + NTP_4_2_8P3_RC1 + + ntpd/ntpd.man.in@1.325 +3 -3 + NTP_4_2_8P3_RC1 + + ntpd/ntpd.mdoc.in@1.325 +2 -2 + NTP_4_2_8P3_RC1 + + ntpdc/invoke-ntpdc.texi@1.493 +2 -2 + NTP_4_2_8P3_RC1 + + ntpdc/ntpdc-opts.c@1.511 +130 -130 + NTP_4_2_8P3_RC1 + + ntpdc/ntpdc-opts.h@1.510 +3 -3 + NTP_4_2_8P3_RC1 + + ntpdc/ntpdc.1ntpdcman@1.324 +3 -3 + NTP_4_2_8P3_RC1 + + ntpdc/ntpdc.1ntpdcmdoc@1.324 +2 -2 + NTP_4_2_8P3_RC1 + + ntpdc/ntpdc.html@1.337 +2 -2 + NTP_4_2_8P3_RC1 + + ntpdc/ntpdc.man.in@1.324 +3 -3 + NTP_4_2_8P3_RC1 + + ntpdc/ntpdc.mdoc.in@1.324 +2 -2 + NTP_4_2_8P3_RC1 + + ntpq/invoke-ntpq.texi@1.499 +5 -3 + NTP_4_2_8P3_RC1 + + ntpq/ntpq-opts.c@1.516 +129 -129 + NTP_4_2_8P3_RC1 + + ntpq/ntpq-opts.h@1.514 +3 -3 + NTP_4_2_8P3_RC1 + + ntpq/ntpq.1ntpqman@1.327 +6 -4 + NTP_4_2_8P3_RC1 + + ntpq/ntpq.1ntpqmdoc@1.327 +5 -3 + NTP_4_2_8P3_RC1 + + ntpq/ntpq.html@1.166 +2 -2 + NTP_4_2_8P3_RC1 + + ntpq/ntpq.man.in@1.327 +6 -4 + NTP_4_2_8P3_RC1 + + ntpq/ntpq.mdoc.in@1.327 +5 -3 + NTP_4_2_8P3_RC1 + + ntpsnmpd/invoke-ntpsnmpd.texi@1.495 +2 -2 + NTP_4_2_8P3_RC1 + + ntpsnmpd/ntpsnmpd-opts.c@1.513 +91 -91 + NTP_4_2_8P3_RC1 + + ntpsnmpd/ntpsnmpd-opts.h@1.512 +3 -3 + NTP_4_2_8P3_RC1 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.324 +3 -3 + NTP_4_2_8P3_RC1 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.324 +2 -2 + NTP_4_2_8P3_RC1 + + ntpsnmpd/ntpsnmpd.html@1.164 +1 -1 + NTP_4_2_8P3_RC1 + + ntpsnmpd/ntpsnmpd.man.in@1.324 +3 -3 + NTP_4_2_8P3_RC1 + + ntpsnmpd/ntpsnmpd.mdoc.in@1.324 +2 -2 + NTP_4_2_8P3_RC1 + + packageinfo.sh@1.511 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.85 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.86 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/calc_tickadj/calc_tickadj.html@1.87 +1 -1 + NTP_4_2_8P3_RC1 + + scripts/calc_tickadj/calc_tickadj.man.in@1.84 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/calc_tickadj/calc_tickadj.mdoc.in@1.86 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/calc_tickadj/invoke-calc_tickadj.texi@1.89 +1 -1 + NTP_4_2_8P3_RC1 + + scripts/invoke-plot_summary.texi@1.106 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/invoke-summary.texi@1.106 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntp-wait/invoke-ntp-wait.texi@1.316 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntp-wait/ntp-wait-opts@1.52 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntp-wait/ntp-wait.1ntp-waitman@1.313 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.314 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntp-wait/ntp-wait.html@1.333 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntp-wait/ntp-wait.man.in@1.313 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/ntp-wait/ntp-wait.mdoc.in@1.314 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntpsweep/invoke-ntpsweep.texi@1.104 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntpsweep/ntpsweep-opts@1.54 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntpsweep/ntpsweep.1ntpsweepman@1.92 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.92 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntpsweep/ntpsweep.html@1.105 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntpsweep/ntpsweep.man.in@1.92 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/ntpsweep/ntpsweep.mdoc.in@1.93 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntptrace/invoke-ntptrace.texi@1.105 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntptrace/ntptrace-opts@1.54 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntptrace/ntptrace.1ntptraceman@1.92 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/ntptrace/ntptrace.1ntptracemdoc@1.93 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntptrace/ntptrace.html@1.106 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/ntptrace/ntptrace.man.in@1.92 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/ntptrace/ntptrace.mdoc.in@1.94 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/plot_summary-opts@1.54 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/plot_summary.1plot_summaryman@1.104 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/plot_summary.1plot_summarymdoc@1.104 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/plot_summary.html@1.107 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/plot_summary.man.in@1.104 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/plot_summary.mdoc.in@1.104 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/summary-opts@1.54 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/summary.1summaryman@1.104 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/summary.1summarymdoc@1.104 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/summary.html@1.107 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/summary.man.in@1.104 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/summary.mdoc.in@1.104 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/update-leap/invoke-update-leap.texi@1.5 +1 -1 + NTP_4_2_8P3_RC1 + + scripts/update-leap/update-leap-opts@1.5 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/update-leap/update-leap.1update-leapman@1.5 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/update-leap/update-leap.1update-leapmdoc@1.5 +2 -2 + NTP_4_2_8P3_RC1 + + scripts/update-leap/update-leap.html@1.5 +1 -1 + NTP_4_2_8P3_RC1 + + scripts/update-leap/update-leap.man.in@1.5 +3 -3 + NTP_4_2_8P3_RC1 + + scripts/update-leap/update-leap.mdoc.in@1.5 +2 -2 + NTP_4_2_8P3_RC1 + + sntp/invoke-sntp.texi@1.493 +2 -2 + NTP_4_2_8P3_RC1 + + sntp/sntp-opts.c@1.512 +185 -185 + NTP_4_2_8P3_RC1 + + sntp/sntp-opts.h@1.510 +3 -3 + NTP_4_2_8P3_RC1 + + sntp/sntp.1sntpman@1.328 +3 -3 + NTP_4_2_8P3_RC1 + + sntp/sntp.1sntpmdoc@1.328 +2 -2 + NTP_4_2_8P3_RC1 + + sntp/sntp.html@1.508 +2 -2 + NTP_4_2_8P3_RC1 + + sntp/sntp.man.in@1.328 +3 -3 + NTP_4_2_8P3_RC1 + + sntp/sntp.mdoc.in@1.328 +2 -2 + NTP_4_2_8P3_RC1 + + util/invoke-ntp-keygen.texi@1.496 +2 -2 + NTP_4_2_8P3_RC1 + + util/ntp-keygen-opts.c@1.514 +198 -198 + NTP_4_2_8P3_RC1 + + util/ntp-keygen-opts.h@1.512 +3 -3 + NTP_4_2_8P3_RC1 + + util/ntp-keygen.1ntp-keygenman@1.324 +3 -3 + NTP_4_2_8P3_RC1 + + util/ntp-keygen.1ntp-keygenmdoc@1.324 +2 -2 + NTP_4_2_8P3_RC1 + + util/ntp-keygen.html@1.170 +2 -2 + NTP_4_2_8P3_RC1 + + util/ntp-keygen.man.in@1.324 +3 -3 + NTP_4_2_8P3_RC1 + + util/ntp-keygen.mdoc.in@1.324 +2 -2 + NTP_4_2_8P3_RC1 + +ChangeSet@1.3326.7.2, 2015-05-12 04:02:33-04:00, stenn@deacon.udel.edu + 4.2.8p3-RC1 + + NEWS@1.137 +51 -1 + 4.2.8p3-RC1 + + packageinfo.sh@1.510 +1 -1 + 4.2.8p3-RC1 + +ChangeSet@1.3326.1.11, 2015-05-08 23:35:28-04:00, stenn@deacon.udel.edu + cleanup + + ChangeLog@1.1641.1.11 +3 -3 + cleanup + +ChangeSet@1.3326.1.9, 2015-05-09 03:28:48+00:00, stenn@psp-at1.ntp.org + minor cleanup + + ChangeLog@1.1641.1.9 +3 -3 + minor cleanup + + lib/isc/unix/ifiter_getifaddrs.c@1.16 +2 -0 + minor cleanup + +ChangeSet@1.3326.4.6, 2015-05-08 23:57:16+02:00, jnperlin@hydra.(none) + * [Bug 2745] ntpd -x steps clock on leap second + removed dead test code block in ntpd/ntp_leapsec.c + + ntpd/ntp_leapsec.c@1.18 +0 -8 + * [Bug 2745] ntpd -x steps clock on leap second + removed dead test code block + + +ChangeSet@1.3326.4.5, 2015-05-08 23:35:42+02:00, jnperlin@hydra.(none) + * [Bug 2745] ntpd -x steps clock on leap second + Fixed an initial-value problem that caused misbehaviour in absence of any leapsecond information. + + ChangeLog@1.1641.4.4 +2 -0 + * [Bug 2745] ntpd -x steps clock on leap second + Fixed an initial-value problem that caused misbehaviour in absence of any leapsecond information. + + ntpd/ntp_leapsec.c@1.17 +29 -3 + * [Bug 2745] ntpd -x steps clock on leap second + Fixed an initial-value problem that caused misbehaviour in absence of any leapsecond information. + Added support function to reset to pristine state for unit tests. + + ntpd/ntp_leapsec.h@1.9 +3 -0 + * [Bug 2745] ntpd -x steps clock on leap second + Added support function to reset to pristine state for unit tests. + + tests/ntpd/leapsec.cpp@1.10 +20 -10 + * [Bug 2745] ntpd -x steps clock on leap second + Added test case to validate the behaviour of queries in pristine state. + +ChangeSet@1.3326.6.1, 2015-05-08 21:25:22+02:00, jnperlin@hydra.(none) + * [Bug 2808] GPSD_JSON driver enhancements, step 1. + Fix crash during cleanup if GPS device not present and char device. + + ChangeLog@1.1641.6.1 +1 -0 + * [Bug 2808] GPSD_JSON driver enhancements, step 1. + Fix crash during cleanup if GPS device not present and char device. + + ntpd/refclock_gpsdjson.c@1.22 +12 -3 + * [Bug 2808] GPSD_JSON driver enhancements, step 1. + Fix crash during cleanup if GPS device not present and char device. + +ChangeSet@1.3326.1.8, 2015-05-08 12:25:43+02:00, martin@pc-martin.(none) + [Bug 2792] If the IFF_RUNNING interface flag is supported then an interface is ignored + as long as this flag is not set since the interface is not usable (e.g., no link). + + ChangeLog@1.1641.1.8 +3 -0 + [Bug 2792] If the IFF_RUNNING interface flag is supported then an interface is ignored + as long as this flag is not set since the interface is not usable (e.g., no link). + + lib/isc/unix/ifiter_getifaddrs.c@1.15 +17 -0 + [Bug 2792] If the IFF_RUNNING interface flag is supported then an interface is ignored + as long as this flag is not set since the interface is not usable (e.g., no link). + +ChangeSet@1.3326.1.7, 2015-05-08 08:29:08+00:00, stenn@psp-at1.ntp.org + CID 739725: Fix a rare resource leak in libevent/listener.c + + ChangeLog@1.1641.1.7 +1 -0 + CID 739725: Fix a rare resource leak in libevent/listener.c + + sntp/libevent/listener.c@1.8 +2 -0 + CID 739725: Fix a rare resource leak in libevent/listener.c + +ChangeSet@1.3326.1.6, 2015-05-08 08:19:06+00:00, stenn@psp-at1.ntp.org + [Bug 2821] Add a missing NTP_PRINTF and a missing const + + ChangeLog@1.1641.1.6 +1 -0 + [Bug 2821] Add a missing NTP_PRINTF and a missing const + + ntpd/refclock_gpsdjson.c@1.21 +1 -1 + [Bug 2821] Add a missing NTP_PRINTF and a missing const + + sntp/main.c@1.96 +1 -1 + [Bug 2821] Add a missing NTP_PRINTF and a missing const + +ChangeSet@1.3326.1.5, 2015-05-08 07:48:27+00:00, stenn@psp-at1.ntp.org + cleanup + + ChangeLog@1.1641.1.5 +3 -2 + cleanup + +ChangeSet@1.3326.3.3, 2015-05-08 07:37:35+00:00, stenn@psp-at1.ntp.org + merge cleanup + + ChangeLog@1.1641.3.3 +3 -4 + merge cleanup + +ChangeSet@1.3326.5.2, 2015-05-08 05:35:12+00:00, stenn@psp-at1.ntp.org + Add an assert to the ntpq ifstats code + + ChangeLog@1.1641.5.2 +1 -0 + Add an assert to the ntpq ifstats code + + ntpq/ntpq-subs.c@1.105 +1 -0 + Add an assert to the ntpq ifstats code + +ChangeSet@1.3326.5.1, 2015-05-08 04:59:19+00:00, stenn@psp-at1.ntp.org + Clean up the RLIMIT_STACK code + + ChangeLog@1.1641.5.1 +1 -0 + Clean up the RLIMIT_STACK code + + ntpd/ntp_config.c@1.325 +3 -2 + Clean up the RLIMIT_STACK code + +ChangeSet@1.3326.4.4, 2015-05-07 23:55:59+02:00, jnperlin@hydra.(none) + [Bug 2745] ntpd -x steps clock on leap second + provide test case for empty table lookup with real leap second + don't step with '-x' or if step min. step > 1sec + + ChangeLog@1.1641.4.3 +3 -3 + [Bug 2745] ntpd -x steps clock on leap second + provide test case for empty table lookup with real leap second + don't step with '-x' or if step min. step > 1sec + + tests/ntpd/leapsec.cpp@1.9 +43 -0 + [Bug 2745] ntpd -x steps clock on leap second + provide test case for empty table lookup with real leap second + +ChangeSet@1.3326.4.2, 2015-05-07 04:55:15+00:00, stenn@psp-at1.ntp.org + [Bug 2825] Quiet file installation in html/ + + ChangeLog@1.1641.4.1 +1 -0 + [Bug 2825] Quiet file installation in html/ + + Makefile.am@1.128.1.1 +3 -2 + [Bug 2825] Quiet file installation in html/ + +ChangeSet@1.3326.4.1, 2015-05-07 00:03:30+00:00, stenn@psp-at1.ntp.org + bk gone file cleanup + + BitKeeper/etc/gone@1.13 +0 -8 + bk gone file cleanup + +ChangeSet@1.3326.3.1, 2015-05-06 22:38:12+02:00, jnperlin@hydra.(none) + [Bug 2808] GPSD_JSON driver enhancements, step 1. + Increase internal token buffer to parse all JSON data, even SKY. + Avoid syslog clutter when driver has init problems but is nout used later on. + + ChangeLog@1.1641.3.1 +4 -0 + [Bug 2808] GPSD_JSON driver enhancements, step 1. + Increase internal token buffer to parse all JSON data, even SKY. + Avoid syslog clutter when driver has init problems but is nout used later on. + + ntpd/refclock_gpsdjson.c@1.20 +87 -11 + [Bug 2808] GPSD_JSON driver enhancements, step 1. + Increase internal token buffer to parse all JSON data, even SKY. + Avoid syslog clutter when driver has init problems but is nout used later on. + +ChangeSet@1.3326.1.3, 2015-05-05 23:32:59+02:00, jnperlin@nemesis.localnet + [Bug 2750] build for Win64 + loopback ppsapi dll needs def-file for entry point renaming in x86 target builds + + BitKeeper/etc/ignore@1.87 +6 -1 + [Bug 2750] build for Win64 + add all '.suo' files + add {Win32,x64}-{tmp,out} dirs + + ChangeLog@1.1641.1.3 +2 -1 + [Bug 2750] build for Win64 + use def-file for entry point renaming in x86 target builds of loopback ppsapi provider + + ports/winnt/ppsapi/loopback/src/loopback-ppsapi.def@1.4 +3 -1 + [Bug 2750] build for Win64 + add comment to explain why this is needed + + ports/winnt/ppsapi/loopback/src/loopback-ppsapi.def@1.3 +0 -0 + Rename: BitKeeper/deleted/74/loopback-ppsapi.def~c04da70eaf86d30 -> ports/winnt/ppsapi/loopback/src/loopback-ppsapi.def + + ports/winnt/vs2008/loopback-pps/loopback-ppsapi-provider.vcproj@1.3 +2 -0 + [Bug 2750] build for Win64 + use def-file for entry point renaming in x86 target builds + + ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj@1.5 +4 -0 + [Bug 2750] build for Win64 + use def-file for entry point renaming in x86 target builds + +ChangeSet@1.3326.1.2, 2015-05-04 22:51:42+00:00, stenn@psp-at1.ntp.org + Remove vs2013/ntp.v12.suo and vs2013/ntp.sdf + + BitKeeper/etc/gone@1.12 +1 -0 + Add items with bk gone + + BitKeeper/etc/gone@1.11 +0 -0 + Turn on MONOTONIC flag + + BitKeeper/etc/gone@1.10 +1 -0 + Add items with bk gone + +ChangeSet@1.3326.1.1, 2015-05-04 06:46:05+00:00, stenn@psp-at1.ntp.org + [Bug 2822] New leap column in sntp broke NTP::Util.pm + + ChangeLog@1.1641.1.2 +1 -0 + [Bug 2822] New leap column in sntp broke NTP::Util.pm + + scripts/lib/NTP/Util.pm@1.4 +1 -1 + [Bug 2822] New leap column in sntp broke NTP::Util.pm + +ChangeSet@1.3326, 2015-05-03 08:00:35+00:00, stenn@psp-deb1.ntp.org + Windows port build cleanup + + ChangeLog@1.1641.1.1 +1 -0 + Windows port build cleanup + +ChangeSet@1.3320.1.13, 2015-05-03 07:11:22+00:00, stenn@psp-at1.ntp.org + unity framework + + Makefile.am@1.129 +1 -0 + unity framework + + sntp/Makefile.am@1.79 +2 -2 + unity framework + + tests/unity-framework/ProductionCode.c@1.1 +24 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/unity-framework/ProductionCode.c + + tests/unity-framework/ProductionCode.c@1.0 +0 -0 + + tests/unity-framework/ProductionCode.h@1.1 +3 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/unity-framework/ProductionCode.h + + tests/unity-framework/ProductionCode.h@1.0 +0 -0 + + tests/unity-framework/TestProductionCode.c@1.1 +62 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/unity-framework/TestProductionCode.c + + tests/unity-framework/TestProductionCode.c@1.0 +0 -0 + + tests/unity-framework/TestProductionCode_Runner.c@1.1 +37 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/unity-framework/TestProductionCode_Runner.c + + tests/unity-framework/TestProductionCode_Runner.c@1.0 +0 -0 + +ChangeSet@1.3320.1.12, 2015-05-03 03:50:55+00:00, stenn@psp-at1.ntp.org + typo + + tests/bug-2803/Makefile.am@1.3 +1 -1 + typo + +ChangeSet@1.3320.1.11, 2015-05-03 03:41:35+00:00, stenn@psp-at1.ntp.org + bug-2803 framework + + sntp/configure.ac@1.78 +1 -0 + bug-2803 framework + + sntp/unity/Makefile.am@1.1 +15 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/Makefile.am + + sntp/unity/Makefile.am@1.0 +0 -0 + + tests/bug-2803/Makefile.am@1.2 +14 -8 + bug-2803 framework + + tests/bug-2803/bug-2803.c@1.2 +4 -134 + bug-2803 framework + +ChangeSet@1.3320.1.10, 2015-05-03 02:43:24+00:00, stenn@psp-at1.ntp.org + Updates for bug-2803/ tests + + configure.ac@1.589 +1 -0 + Updates for bug-2803/ tests + + tests/Makefile.am@1.6 +3 -0 + Updates for bug-2803/ tests + + tests/bug-2803/Makefile.am@1.1 +54 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/bug-2803/Makefile.am + + tests/bug-2803/Makefile.am@1.0 +0 -0 + +ChangeSet@1.3320.1.8, 2015-05-02 04:05:14+00:00, stenn@psp-at1.ntp.org + cleanup + + ChangeLog@1.1641 +1 -1 + cleanup + +ChangeSet@1.3320.1.7, 2015-05-01 13:27:32+00:00, abe@psp-deb1.ntp.org + driver40-ja.html: + [BUG 2806] Correcting typo of the driver40-ja.html + ChangeLog: + [BUG 2806] CID 1296235: refclock_jjy.c and correcting typo of driver40-ja.html + refclock_jjy.c: + [BUG 2806] CID 1296235: Fix refclock_jjy.c and some changes to avoid claims by the check tool + + ChangeLog@1.1640 +1 -0 + [BUG 2806] CID 1296235: refclock_jjy.c and correcting typo of driver40-ja.html + + html/drivers/driver40-ja.html@1.3 +2 -2 + [BUG 2806] Correcting typo of the driver40-ja.html + + ntpd/refclock_jjy.c@1.28 +12 -2 + [BUG 2806] CID 1296235: Fix refclock_jjy.c and some changes to avoid claims by the check tool + +ChangeSet@1.3320.4.13, 2015-05-01 05:59:34-04:00, stenn@deacon.udel.edu + [Bug 2590] autogen-5.18.5 + + ChangeLog@1.1635.3.8 +1 -1 + [Bug 2590] autogen-5.18.5 + + sntp/include/autogen-version.def@1.22 +1 -1 + [Bug 2590] autogen-5.18.5 + +ChangeSet@1.3320.4.12, 2015-05-01 09:25:56+00:00, stenn@psp-at1.ntp.org + [Bug 2650] fix includefile processing + + ChangeLog@1.1635.3.7 +1 -0 + [Bug 2650] fix includefile processing + +ChangeSet@1.3320.10.2, 2015-05-01 01:08:05+02:00, jnperlin@hydra.(none) + [Bug 2650] includefile processing broken. + rework and cleanup of config processing after merge from 4.2.8p2 + + ntpd/keyword-gen.c@1.28 +0 -2 + [Bug 2650] includefile processing broken. + rework and cleanup of config processing after merge from 4.2.8p2 + + ntpd/ntp_parser.c@1.92 +405 -412 + [Bug 2650] includefile processing broken. + rework and cleanup of config processing after merge from 4.2.8p2 + + ntpd/ntp_scanner.c@1.48 +56 -45 + [Bug 2650] includefile processing broken. + rework and cleanup of config processing after merge from 4.2.8p2 + + ntpd/ntp_scanner.h@1.20 +8 -1 + [Bug 2650] includefile processing broken. + rework and cleanup of config processing after merge from 4.2.8p2 + +ChangeSet@1.3320.4.10, 2015-04-30 05:55:00+00:00, stenn@psp-at1.ntp.org + update dates + + html/drivers/driver40-ja.html@1.2 +1 -1 + update dates + + html/drivers/driver40.html@1.18 +1 -1 + update dates + + html/drivers/driver46.html@1.7 +1 -1 + update dates + +ChangeSet@1.3320.4.9, 2015-04-30 05:01:21+00:00, stenn@psp-at1.ntp.org + cleanup + + ChangeLog@1.1635.3.6 +0 -3 + cleanup + + ntpd/refclock_shm.c@1.31.1.3 +4 -0 + cleanup + +ChangeSet@1.3320.3.5, 2015-04-30 04:02:23+00:00, stenn@psp-at1.ntp.org + cleanup + + ChangeLog@1.1635.2.4 +3 -3 + cleanup + + ntpd/ntp_timer.c@1.85 +1 -1 + cleanup + + ntpd/refclock_shm.c@1.31.3.1 +4 -1 + cleanup + +ChangeSet@1.3320.7.3, 2015-04-29 22:58:45+00:00, stenn@psp-at1.ntp.org + cleanup + + ChangeLog@1.1635.5.2 +1 -1 + cleanup + +ChangeSet@1.3292.1.21, 2015-04-29 20:07:39+02:00, jnperlin@hydra.(none) + [bug 2650] includefile processing broken + forward from lost/orphaned repo + + ntpd/ntp_config.c@1.322.1.1 +20 -38 + [bug 2650] includefile processing broken + forward from lost/orphaned repo + + ntpd/ntp_parser.c@1.89.1.1 +404 -411 + [bug 2650] includefile processing broken + forward from lost/orphaned repo + + ntpd/ntp_parser.h@1.55.1.1 +2 -2 + [bug 2650] includefile processing broken + forward from lost/orphaned repo + + ntpd/ntp_parser.y@1.82.1.1 +43 -51 + [bug 2650] includefile processing broken + forward from lost/orphaned repo + + ntpd/ntp_scanner.c@1.47 +297 -128 + [bug 2650] includefile processing broken + forward from lost/orphaned repo + + ntpd/ntp_scanner.h@1.19 +27 -22 + [bug 2650] includefile processing broken + forward from lost/orphaned repo + +ChangeSet@1.3320.3.2, 2015-04-29 19:29:16+02:00, jnperlin@hydra.(none) + [Bug 2745] ntpd -x steps clock on leap second + Better syslog messages when not stepping + + ntpd/ntp_timer.c@1.84 +19 -4 + [Bug 2745] ntpd -x steps clock on leap second + Better syslog messages when not stepping + +ChangeSet@1.3320.4.6, 2015-04-29 18:58:30+02:00, jnperlin@hydra.(none) + [Bug 2808] - GPSD_JSON driver enhancements, step 1 + fix coverity issues in refclock_shm and refclock_gpsdjson + + ChangeLog@1.1635.3.3 +2 -0 + [Bug 2808] - GPSD_JSON driver enhancements, step 1 + fix coverity issues in refclock_shm and refclock_gpsdjson + + libjsmn/jsmn.c@1.5 +6 -5 + [Bug 2808] - GPSD_JSON driver enhancements, step 1 + fix coverity issue with potential NULL pointer access + + ntpd/refclock_gpsdjson.c@1.19 +3 -2 + [Bug 2808] - GPSD_JSON driver enhancements, step 1 + fix coverity issue with negative array index + + ntpd/refclock_shm.c@1.31.2.1 +0 -1 + [Bug 2808] - GPSD_JSON driver enhancements, step 1 + fix coverity issue with unreachable code + +ChangeSet@1.3320.8.1, 2015-04-29 07:03:32+00:00, stenn@psp-at1.ntp.org + [Bug 2805] ntpd fails to join multicast group + + ChangeLog@1.1635.6.1 +1 -0 + [Bug 2805] ntpd fails to join multicast group + + ntpd/ntp_io.c@1.400 +30 -9 + [Bug 2805] ntpd fails to join multicast group + +ChangeSet@1.3320.7.2, 2015-04-28 12:08:31+00:00, abe@psp-deb1.ntp.org + ChangeLog: + [BUG 2806] refclock_jjy.c supports the Tel-JJY + + ChangeLog@1.1635.5.1 +1 -0 + [BUG 2806] refclock_jjy.c supports the Tel-JJY + +ChangeSet@1.3320.7.1, 2015-04-28 11:47:00+00:00, abe@psp-deb1.ntp.org + driver40-ja.html: + new file + driver40.html, refclock_jjy.c: + [BUG 2806] refclock_jjy.c supports the Tel-JJY + + html/drivers/driver40-ja.html@1.1 +481 -0 + BitKeeper file /home/abe/ntp-stable-2806/html/drivers/driver40-ja.html + + html/drivers/driver40-ja.html@1.0 +0 -0 + + html/drivers/driver40.html@1.17 +265 -48 + [BUG 2806] refclock_jjy.c supports the Tel-JJY + + ntpd/refclock_jjy.c@1.27 +3570 -1117 + [BUG 2806] refclock_jjy.c supports the Tel-JJY + +ChangeSet@1.3320.5.10, 2015-04-28 09:13:57+00:00, stenn@psp-at1.ntp.org + bug-2803 tests + + tests/bug-2803/Makefile-@1.1 +10 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/bug-2803/Makefile- + + tests/bug-2803/Makefile-@1.0 +0 -0 + + tests/bug-2803/bug-2803.c@1.1 +229 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/bug-2803/bug-2803.c + + tests/bug-2803/bug-2803.c@1.0 +0 -0 + + tests/bug-2803/test-2803.c@1.1 +229 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/tests/bug-2803/test-2803.c + + tests/bug-2803/test-2803.c@1.0 +0 -0 + +ChangeSet@1.3320.5.8, 2015-04-27 20:49:41+00:00, stenn@psp-at1.ntp.org + [Bug 2612] restrict: Warn when 'monitor' can't be disabled because of 'limited' + + ChangeLog@1.1635.4.6 +2 -0 + [Bug 2612] restrict: Warn when 'monitor' can't be disabled because of 'limited' + + ntpd/ntp_proto.c@1.356 +5 -1 + [Bug 2612] restrict: Warn when 'monitor' can't be disabled because of 'limited' + +ChangeSet@1.3320.5.7, 2015-04-27 10:48:48+00:00, stenn@psp-at1.ntp.org + [Bug 2815] net-snmp before v5.4 has circular library dependencies + + ChangeLog@1.1635.4.5 +1 -0 + [Bug 2815] net-snmp before v5.4 has circular library dependencies + + configure.ac@1.584.1.2 +14 -0 + [Bug 2815] net-snmp before v5.4 has circular library dependencies + +ChangeSet@1.3320.2.11, 2015-04-27 08:41:41+00:00, stenn@psp-deb1.ntp.org + [Bug 2776] Clean up EVP_MD_do_all_sorted() test + + sntp/m4/ntp_openssl.m4@1.24 +3 -1 + [Bug 2776] Clean up EVP_MD_do_all_sorted() test + +ChangeSet@1.3320.5.6, 2015-04-26 19:53:46+00:00, stenn@psp-at1.ntp.org + [Bug 2813] HP-UX needs -D__STDC_VERSION__=199901L and limits.h + + ChangeLog@1.1635.4.4 +1 -0 + [Bug 2813] HP-UX needs -D__STDC_VERSION__=199901L and limits.h + + include/ntp_types.h@1.34 +5 -0 + [Bug 2813] HP-UX needs -D__STDC_VERSION__=199901L and limits.h + + sntp/m4/os_cflags.m4@1.10 +2 -2 + [Bug 2813] HP-UX needs -D__STDC_VERSION__=199901L and limits.h + +ChangeSet@1.3320.5.5, 2015-04-26 18:44:23+00:00, stenn@psp-at1.ntp.org + autogen-5.18.5 + + ChangeLog@1.1635.4.3 +1 -0 + autogen-5.18.5 + + sntp/libopts/COPYING.gplv3@1.8 +1 -1 + autogen-5.18.5 + + sntp/libopts/COPYING.lgplv3@1.8 +1 -1 + autogen-5.18.5 + + sntp/libopts/COPYING.mbsd@1.3 +1 -0 + autogen-5.18.5 + + sntp/libopts/README@1.10 +1 -1 + autogen-5.18.5 + + sntp/libopts/ag-char-map.h@1.31 +2 -2 + autogen-5.18.5 + + sntp/libopts/alias.c@1.8 +1 -1 + autogen-5.18.5 + + sntp/libopts/ao-strs.c@1.17 +2 -2 + autogen-5.18.5 + + sntp/libopts/ao-strs.h@1.16 +2 -2 + autogen-5.18.5 + + sntp/libopts/autoopts.c@1.20 +4 -4 + autogen-5.18.5 + + sntp/libopts/autoopts.h@1.21 +12 -12 + autogen-5.18.5 + + sntp/libopts/autoopts/options.h@1.30 +96 -96 + autogen-5.18.5 + + sntp/libopts/autoopts/project.h@1.8 +1 -1 + autogen-5.18.5 + + sntp/libopts/autoopts/usage-txt.h@1.29 +15 -15 + autogen-5.18.5 + + sntp/libopts/boolean.c@1.15 +5 -5 + autogen-5.18.5 + + sntp/libopts/check.c@1.8 +1 -1 + autogen-5.18.5 + + sntp/libopts/compat/compat.h@1.16 +1 -1 + autogen-5.18.5 + + sntp/libopts/compat/pathfind.c@1.11 +13 -13 + autogen-5.18.5 + + sntp/libopts/compat/windows-config.h@1.14 +1 -1 + autogen-5.18.5 + + sntp/libopts/configfile.c@1.23 +54 -55 + autogen-5.18.5 + + sntp/libopts/cook.c@1.15 +10 -10 + autogen-5.18.5 + + sntp/libopts/enum.c@1.13 +14 -14 + autogen-5.18.5 + + sntp/libopts/env.c@1.9 +4 -4 + autogen-5.18.5 + + sntp/libopts/file.c@1.16 +6 -6 + autogen-5.18.5 + + sntp/libopts/find.c@1.12 +10 -10 + autogen-5.18.5 + + sntp/libopts/genshell.c@1.31 +25 -25 + autogen-5.18.5 + + sntp/libopts/gettext.h@1.4 +1 -1 + autogen-5.18.5 + + sntp/libopts/init.c@1.8 +12 -13 + autogen-5.18.5 + + sntp/libopts/intprops.h@1.2 +1 -1 + autogen-5.18.5 + + sntp/libopts/libopts.c@1.9 +2 -0 + autogen-5.18.5 + + sntp/libopts/load.c@1.21 +8 -8 + autogen-5.18.5 + + sntp/libopts/m4/libopts.m4@1.34 +28 -28 + autogen-5.18.5 + + sntp/libopts/m4/liboptschk.m4@1.13 +1 -1 + autogen-5.18.5 + + sntp/libopts/m4/stdnoreturn.m4@1.2 +1 -1 + autogen-5.18.5 + + sntp/libopts/makeshell.c@1.20 +22 -17 + autogen-5.18.5 + + sntp/libopts/nested.c@1.16 +36 -36 + autogen-5.18.5 + + sntp/libopts/numeric.c@1.15 +10 -10 + autogen-5.18.5 + + sntp/libopts/option-value-type.c@1.18 +2 -2 + autogen-5.18.5 + + sntp/libopts/option-value-type.h@1.32 +1 -1 + autogen-5.18.5 + + sntp/libopts/option-xat-attribute.c@1.18 +2 -2 + autogen-5.18.5 + + sntp/libopts/option-xat-attribute.h@1.32 +1 -1 + autogen-5.18.5 + + sntp/libopts/parse-duration.c@1.14 +3 -3 + autogen-5.18.5 + + sntp/libopts/parse-duration.h@1.10 +1 -1 + autogen-5.18.5 + + sntp/libopts/pgusage.c@1.18 +5 -5 + autogen-5.18.5 + + sntp/libopts/proto.h@1.31 +2 -2 + autogen-5.18.5 + + sntp/libopts/putshell.c@1.15 +7 -7 + autogen-5.18.5 + + sntp/libopts/reset.c@1.17 +5 -5 + autogen-5.18.5 + + sntp/libopts/restore.c@1.14 +19 -19 + autogen-5.18.5 + + sntp/libopts/save.c@1.18 +11 -11 + autogen-5.18.5 + + sntp/libopts/sort.c@1.14 +5 -5 + autogen-5.18.5 + + sntp/libopts/stack.c@1.16 +15 -15 + autogen-5.18.5 + + sntp/libopts/stdnoreturn.in.h@1.2 +1 -1 + autogen-5.18.5 + + sntp/libopts/streqvcmp.c@1.16 +11 -11 + autogen-5.18.5 + + sntp/libopts/text_mmap.c@1.17 +11 -11 + autogen-5.18.5 + + sntp/libopts/time.c@1.15 +5 -5 + autogen-5.18.5 + + sntp/libopts/tokenize.c@1.13 +28 -28 + autogen-5.18.5 + + sntp/libopts/usage.c@1.21 +4 -4 + autogen-5.18.5 + + sntp/libopts/version.c@1.19 +9 -9 + autogen-5.18.5 + +ChangeSet@1.3320.5.4, 2015-04-26 05:26:11-04:00, stenn@deacon.udel.edu + CID 1269537: Clean up a line of dead code in getShmTime(). + + ChangeLog@1.1635.4.2 +1 -0 + CID 1269537: Clean up a line of dead code in getShmTime(). + + ntpd/refclock_shm.c@1.31.1.1 +4 -1 + CID 1269537: Clean up a line of dead code in getShmTime(). + +ChangeSet@1.3320.2.9, 2015-04-26 08:14:52+00:00, stenn@psp-at1.ntp.org + CID 1295478: Quiet a pedantic potential error from the fix for Bug 2776 + + ChangeLog@1.1635.1.6 +2 -0 + CID 1295478: Quiet a pedantic potential error from the fix for Bug 2776 + + ntpq/ntpq.c@1.158 +9 -0 + CID 1295478: Quiet a pedantic potential error from the fix for Bug 2776 + +ChangeSet@1.3320.6.1, 2015-04-25 23:56:16+00:00, stenn@psp-fb1.ntp.org + Improve the ntpq documentation around the controlkey keyid + + ChangeLog@1.1635.4.1 +1 -0 + Improve the ntpq documentation around the controlkey keyid + + ntpq/ntpq-opts.def@1.25 +3 -1 + Improve the ntpq documentation around the controlkey keyid + +ChangeSet@1.3320.5.2, 2015-04-24 22:46:50-04:00, stenn@deacon.udel.edu + [Bug 2804] more cleanup to install-local-data + + Makefile.am@1.128 +1 -1 + [Bug 2804] more cleanup to install-local-data + +ChangeSet@1.3320.5.1, 2015-04-24 18:59:14-04:00, stenn@deacon.udel.edu + Fix regression in previous [Bug 2804] fix + + Makefile.am@1.127 +4 -4 + Fix regression in previous [Bug 2804] fix + +ChangeSet@1.3320.4.4, 2015-04-24 21:20:38+02:00, jnperlin@hydra.(none) + [Bug 2808] GPSD_JSON driver enhancements, step 1. + Add a few more tallies as per Hal Murray's suggestions + + ChangeLog@1.1635.3.2 +2 -0 + [Bug 2808] GPSD_JSON driver enhancements, step 1. + Add a few more tallies as per Hal Murray's suggestions + + + html/drivers/driver46.html@1.6 +54 -16 + [Bug 2808] GPSD_JSON driver enhancements, step 1. + Add a few more tallies as per Hal Murray's suggestions + + + ntpd/refclock_gpsdjson.c@1.18 +39 -18 + [Bug 2808] GPSD_JSON driver enhancements, step 1. + Add a few more tallies as per Hal Murray's suggestions + + +ChangeSet@1.3320.2.7, 2015-04-24 09:25:09+00:00, stenn@psp-at1.ntp.org + [Bug 2776] Improve ntpq's 'help keytype' + + sntp/m4/ntp_openssl.m4@1.23 +7 -1 + [Bug 2776] Improve ntpq's 'help keytype' + +ChangeSet@1.3320.4.3, 2015-04-24 01:25:50-04:00, stenn@deacon.udel.edu + refclock_true.c true_debug() can't open debug log because of incompatible open/fdopen parameters + + ChangeLog@1.1635.3.1 +2 -0 + refclock_true.c true_debug() can't open debug log because of incompatible open/fdopen parameters + + ntpd/refclock_true.c@1.24 +1 -1 + refclock_true.c true_debug() can't open debug log because of incompatible open/fdopen parameters + +ChangeSet@1.3320.4.2, 2015-04-22 13:49:17-04:00, stenn@deacon.udel.edu + Update NEWS file + + NEWS@1.136 +4 -1 + Update NEWS file + +ChangeSet@1.3320.2.5, 2015-04-22 17:33:08+00:00, stenn@psp-fb1.ntp.org + Fix typo in patch for bug 2776 + + ntpq/ntpq.c@1.157 +1 -1 + Fix typo in patch for bug 2776 + +ChangeSet@1.3320.2.4, 2015-04-22 11:25:54+00:00, stenn@psp-fb1.ntp.org + [Bug 2776] Improve ntpq's 'help keytype' + + ntpq/ntpq.c@1.156 +6 -1 + [Bug 2776] Improve ntpq's 'help keytype' + + sntp/m4/ntp_openssl.m4@1.22 +1 -0 + [Bug 2776] Improve ntpq's 'help keytype' + +ChangeSet@1.3320.4.1, 2015-04-22 08:36:46+00:00, stenn@psp-at1.ntp.org + [Bug 2804] install-local-data assumes GNU find semantics + + Makefile.am@1.126 +4 -4 + [Bug 2804] install-local-data assumes GNU find semantics + +ChangeSet@1.3320.3.1, 2015-04-21 21:08:11+02:00, jnperlin@hydra.(none) + [Bug 2745] ntpd -x steps clock on leap second + Do leap second stepping only of the step adjustment is beyond the proper jump distance limit and step correction is allowed at all. + + ChangeLog@1.1635.2.1 +3 -0 + [Bug 2745] ntpd -x steps clock on leap second + Do leap second stepping only of the step adjustment is beyond the proper jump distance limit and step correction is allowed at all. + + + ntpd/ntp_timer.c@1.83 +15 -5 + [Bug 2745] ntpd -x steps clock on leap second + Do leap second stepping only of the step adjustment is beyond the proper jump distance limit and step correction is allowed at all. + + +ChangeSet@1.3320.2.3, 2015-04-21 09:48:05+00:00, stenn@psp-deb1.ntp.org + [Bug 2776] Improve ntpq's 'help keytype' + + ChangeLog@1.1635.1.3 +1 -0 + [Bug 2776] Improve ntpq's 'help keytype' + + ntpq/ntpq.c@1.155 +132 -8 + [Bug 2776] Improve ntpq's 'help keytype' + +ChangeSet@1.3320.2.2, 2015-04-21 06:49:56+00:00, stenn@psp-fb1.ntp.org + [Bug 2794] Clean up kernel clock status reports + + ChangeLog@1.1635.1.2 +1 -0 + [Bug 2794] Clean up kernel clock status reports + + ntpd/ntp_loopfilter.c@1.184 +83 -8 + [Bug 2794] Clean up kernel clock status reports + +ChangeSet@1.3320.2.1, 2015-04-20 11:26:22+00:00, stenn@psp-fb1.ntp.org + [Bug 2804] install-local-data assumes GNU 'find' semantics' + + ChangeLog@1.1635.1.1 +1 -0 + [Bug 2804] install-local-data assumes GNU 'find' semantics' + + Makefile.am@1.125 +6 -4 + [Bug 2804] install-local-data assumes GNU 'find' semantics' + +ChangeSet@1.3320.1.4, 2015-04-20 10:00:46+00:00, stenn@psp-deb1.ntp.org + [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX + + ChangeLog@1.1637 +1 -0 + [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX + + configure.ac@1.587 +21 -5 + [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX + + ntpd/refclock_shm.c@1.35 +2 -2 + [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX + +ChangeSet@1.3320.1.2, 2015-04-19 23:50:36+00:00, stenn@psp-fb1.ntp.org + cleanup + + ChangeLog@1.1635 +4 -3 + cleanup + +ChangeSet@1.3323, 2015-04-19 12:38:34+02:00, jnperlin@nemesis.localnet + Fixed include file lists; improved generation of 'ntp_keyword.h' + + ports/winnt/vs2008/libntp/libntp.vcproj@1.54 +7 -15 + Fixed include file lists + + ports/winnt/vs2008/ntpd/gen-ntp_keyword.bat@1.4 +19 -7 + 'Touch' both output files to avoid needless cycles + + ports/winnt/vs2008/ntpd/ntpd.vcproj@1.48 +8 -16 + Fixed include file lists + + ports/winnt/vs2008/ntpdate/ntpdate.vcproj@1.16 +1 -1 + Fixed include file lists + + ports/winnt/vs2013/libntp/libntp.vcxproj@1.8 +5 -7 + Fixed include file lists + + ports/winnt/vs2013/libntp/libntp.vcxproj.filters@1.6 +15 -21 + Fixed include file lists + + ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat@1.3 +18 -6 + 'Touch' both output files to avoid needless cycles + + ports/winnt/vs2013/ntpd/ntpd.vcxproj@1.6 +8 -9 + Fixed include file lists + + ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters@1.4 +22 -25 + Fixed include file lists + + ports/winnt/vs2013/ntpdate/ntpdate.vcxproj@1.6 +1 -1 + Fixed include file lists + + ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters@1.3 +3 -3 + Fixed include file lists + +ChangeSet@1.3322, 2015-04-13 23:24:19+02:00, jnperlin@nemesis.localnet + make sure batch files are executed via 'call' -- multiple custom build steps fail otherwise. + + ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj@1.4 +6 -6 + make sure batch files are executed via 'call' -- multiple custom build steps fail otherwise. + + ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj@1.5 +6 -6 + make sure batch files are executed via 'call' -- multiple custom build steps fail otherwise. + + ports/winnt/vs2013/ntpd/ntpd.vcxproj@1.5 +43 -41 + make sure batch files are executed via 'call' -- multiple custom build steps fail otherwise. + + ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters@1.3 +3 -6 + make sure batch files are executed via 'call' -- multiple custom build steps fail otherwise. + + ports/winnt/vs2013/ntpdate/ntpdate.vcxproj@1.5 +6 -6 + make sure batch files are executed via 'call' -- multiple custom build steps fail otherwise. + + ports/winnt/vs2013/ntpdc/ntpdc.vcxproj@1.5 +6 -6 + make sure batch files are executed via 'call' -- multiple custom build steps fail otherwise. + + ports/winnt/vs2013/ntpq/ntpq.vcxproj@1.5 +6 -6 + make sure batch files are executed via 'call' -- multiple custom build steps fail otherwise. + +ChangeSet@1.3320.1.1, 2015-04-13 20:39:08+02:00, jnperlin@hydra.(none) + [Bug 2808] GPSD_JSON driver enhancements, step 1 + + ChangeLog@1.1634 +4 -0 + [Bug 2808] GPSD_JSON driver enhancements, step 1 + + html/drivers/driver46.html@1.5 +210 -69 + [Bug 2808] GPSD_JSON driver enhancements, step 1 + extended docs to reflect new modes, describe clockstat lines + + libjsmn/Makefile@1.2 +10 -2 + [Bug 2808] GPSD_JSON driver enhancements, step 1 + update of libjsmn + + libjsmn/README.md@1.2 +16 -10 + [Bug 2808] GPSD_JSON driver enhancements, step 1 + update of libjsmn + + libjsmn/example/jsondump.c@1.1 +112 -0 + [Bug 2808] GPSD_JSON driver enhancements, step 1 + update of libjsmn + + libjsmn/example/jsondump.c@1.0 +0 -0 + + libjsmn/example/simple.c@1.1 +75 -0 + [Bug 2808] GPSD_JSON driver enhancements, step 1 + update of libjsmn + + libjsmn/example/simple.c@1.0 +0 -0 + + libjsmn/jsmn.c@1.4 +68 -26 + [Bug 2808] GPSD_JSON driver enhancements, step 1 + update of libjsmn + + libjsmn/jsmn.h@1.2 +13 -5 + [Bug 2808] GPSD_JSON driver enhancements, step 1 + update of libjsmn + + libjsmn/jsmn_test.c@1.2 +269 -70 + [Bug 2808] GPSD_JSON driver enhancements, step 1 + update of libjsmn + + ntpd/refclock_gpsdjson.c@1.17 +1242 -480 + [Bug 2808] GPSD_JSON driver enhancements, step 1 + +ChangeSet@1.3321, 2015-04-12 19:49:34+02:00, jnperlin@nemesis.localnet + WinBuild: cleanup of VS2008/VS2013 build, add 64bit build to VS2008 + + BitKeeper/deleted/1f/libntp.vcproj~633f10802d3dd886@1.2 +0 -0 + Delete: ports/winnt/vs2013/libntp/libntp.vcproj + + BitKeeper/deleted/2c/loopback-ppsapi-provider.vcproj~cc591e5b57f29333@1.2 +0 -0 + Delete: ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcproj + + BitKeeper/deleted/4a/ntpdate.vcproj~25a4bb1b2b25d122@1.2 +0 -0 + Delete: ports/winnt/vs2013/ntpdate/ntpdate.vcproj + + BitKeeper/deleted/59/ntp-keygen.vcproj~113746c5269b75c1@1.2 +0 -0 + Delete: ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcproj + + BitKeeper/deleted/74/loopback-ppsapi.def~c04da70eaf86d30@1.2 +0 -0 + Delete: ports/winnt/ppsapi/loopback/src/loopback-ppsapi.def + + BitKeeper/deleted/7d/instsrv.vcproj~d954b04479d96296@1.2 +0 -0 + Delete: ports/winnt/vs2013/instsrv/instsrv.vcproj + + BitKeeper/deleted/85/ntpq.vcproj~7315506e38872e71@1.2 +0 -0 + Delete: ports/winnt/vs2013/ntpq/ntpq.vcproj + + BitKeeper/deleted/be/ntpd-keyword-gen.vcproj~9da2e11a69865360@1.2 +0 -0 + Delete: ports/winnt/vs2013/ntpd-keyword-gen/ntpd-keyword-gen.vcproj + + BitKeeper/deleted/c6/ntpd.vcproj~b19ad49465a3e751@1.2 +0 -0 + Delete: ports/winnt/vs2013/ntpd/ntpd.vcproj + + BitKeeper/deleted/fc/ntpdc.vcproj~d5808b9e94b3c99@1.2 +0 -0 + Delete: ports/winnt/vs2013/ntpdc/ntpdc.vcproj + + ports/winnt/include/config.h@1.112 +6 -4 + OPENSSL set from property sheet + + ports/winnt/ppsapi/loopback/src/loopback-ppsapi.h@1.2 +4 -1 + avoid double definition of _CRT_SECURE_NO_WARNINGS + + ports/winnt/ppsapi/loopback/src/timepps.h@1.3 +21 -15 + reduce number of warnings + + ports/winnt/vs2008/common.vsprops@1.1 +53 -0 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/common.vsprops@1.0 +0 -0 + + ports/winnt/vs2008/debug-x64.vsprops@1.1 +20 -0 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/debug-x64.vsprops@1.0 +0 -0 + + ports/winnt/vs2008/debug.vsprops@1.1 +20 -0 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/debug.vsprops@1.0 +0 -0 + + ports/winnt/vs2008/instsrv/instsrv.vcproj@1.7 +200 -87 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/libntp/libntp.vcproj@1.53 +156 -49 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/loopback-pps/loopback-ppsapi-provider.vcproj@1.2 +190 -62 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj@1.15 +173 -137 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/ntp.sln@1.11 +39 -1 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/ntpd-keyword-gen/ntpd-keyword-gen.vcproj@1.3 +144 -53 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/ntpd/gen-ntp_keyword.bat@1.3 +6 -4 + minor cleanup & touch emulation + + ports/winnt/vs2008/ntpd/ntpd.vcproj@1.47 +253 -235 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/ntpdate/ntpdate.vcproj@1.15 +178 -116 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/ntpdc/ntpdc.vcproj@1.17 +178 -157 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/ntpq/ntpq.vcproj@1.16 +176 -149 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/release-x64.vsprops@1.1 +21 -0 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/release-x64.vsprops@1.0 +0 -0 + + ports/winnt/vs2008/release.vsprops@1.1 +21 -0 + add 64bit build, refactor into property sheets + + ports/winnt/vs2008/release.vsprops@1.0 +0 -0 + + ports/winnt/vs2013/common.props@1.1 +59 -0 + refactor into property sheets + + ports/winnt/vs2013/common.props@1.0 +0 -0 + + ports/winnt/vs2013/debug-x64.props@1.1 +23 -0 + refactor into property sheets + + ports/winnt/vs2013/debug-x64.props@1.0 +0 -0 + + ports/winnt/vs2013/debug.props@1.1 +24 -0 + refactor into property sheets + + ports/winnt/vs2013/debug.props@1.0 +0 -0 + + ports/winnt/vs2013/instsrv/instsrv.vcxproj@1.3 +88 -499 + refactor into property sheets + + ports/winnt/vs2013/instsrv/instsrv.vcxproj.filters@1.2 +9 -3 + refactor into property sheets + + ports/winnt/vs2013/libntp/libntp.vcxproj@1.7 +150 -462 + refactor into property sheets + + ports/winnt/vs2013/libntp/libntp.vcxproj.filters@1.5 +21 -24 + refactor into property sheets + + ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj@1.3 +95 -430 + refactor into property sheets + + ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj.filters@1.2 +4 -1 + refactor into property sheets + + ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj@1.4 +83 -565 + refactor into property sheets + + ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj.filters@1.2 +3 -3 + refactor into property sheets + + ports/winnt/vs2013/ntp.sln@1.3 +61 -61 + refactor into property sheets + + ports/winnt/vs2013/ntpd-keyword-gen/ntpd-keyword-gen.vcxproj@1.4 +85 -389 + refactor into property sheets + + ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat@1.2 +6 -4 + minor cleanup & touch emulation + + ports/winnt/vs2013/ntpd/ntpd.vcxproj@1.4 +195 -728 + refactor into property sheets + + ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters@1.2 +19 -31 + refactor into property sheets + + ports/winnt/vs2013/ntpdate/ntpdate.vcxproj@1.4 +84 -547 + refactor into property sheets + + ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters@1.2 +3 -3 + refactor into property sheets + + ports/winnt/vs2013/ntpdc/ntpdc.vcxproj@1.4 +85 -575 + refactor into property sheets + + ports/winnt/vs2013/ntpdc/ntpdc.vcxproj.filters@1.2 +3 -3 + refactor into property sheets + + ports/winnt/vs2013/ntpq/ntpq.vcxproj@1.4 +74 -537 + refactor into property sheets + + ports/winnt/vs2013/ntpq/ntpq.vcxproj.filters@1.2 +3 -3 + refactor into property sheets + + ports/winnt/vs2013/release-x64.props@1.1 +24 -0 + refactor into property sheets + + ports/winnt/vs2013/release-x64.props@1.0 +0 -0 + + ports/winnt/vs2013/release.props@1.1 +25 -0 + refactor into property sheets + + ports/winnt/vs2013/release.props@1.0 +0 -0 + ChangeSet@1.3320, 2015-04-07 04:28:16-04:00, stenn@deacon.udel.edu NTP_4_2_8P2 TAG: NTP_4_2_8P2 @@ -344,6 +7089,32 @@ ChangeSet@1.3318, 2015-04-07 07:57:32+00:00, stenn@psp-fb1.ntp.org NEWS@1.135 +4 -2 NEWS update +ChangeSet@1.3314.1.4, 2015-04-07 07:43:04+00:00, stenn@psp-fb1.ntp.org + Initial import of the Unity test framework + + ChangeLog@1.1629.1.4 +1 -0 + Initial import of the Unity test framework + + sntp/unity/license.txt@1.1 +21 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/license.txt + + sntp/unity/license.txt@1.0 +0 -0 + + sntp/unity/unity.c@1.1 +1177 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/unity.c + + sntp/unity/unity.c@1.0 +0 -0 + + sntp/unity/unity.h@1.1 +272 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/unity.h + + sntp/unity/unity.h@1.0 +0 -0 + + sntp/unity/unity_internals.h@1.1 +692 -0 + BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/unity_internals.h + + sntp/unity/unity_internals.h@1.0 +0 -0 + ChangeSet@1.3314.1.3, 2015-04-03 03:56:38-04:00, stenn@deacon.udel.edu NTP_4_2_8P2_RC3 TAG: NTP_4_2_8P2_RC3 @@ -1199,19 +7970,19 @@ ChangeSet@1.3308.2.4, 2015-03-30 19:10:12+02:00, jnperlin@nemesis.localnet [Bug 2795] Cannot build without OpenSLL (on Win32) Provided a Win32 specific wrapper around libevent/arc4random.c -ChangeSet@1.3305.3.8, 2015-03-30 15:55:43+02:00, martin@pc-martin.(none) +ChangeSet@1.3305.4.8, 2015-03-30 15:55:43+02:00, martin@pc-martin.(none) [Bug 2794] Don't let reports on normal kernel status changes look like errors. - ChangeLog@1.1622.3.8 +2 -0 + ChangeLog@1.1622.4.8 +2 -0 [Bug 2794] Don't let reports on normal kernel status changes look like errors. ntpd/ntp_loopfilter.c@1.181 +30 -19 [Bug 2794] Don't let reports on normal kernel status changes look like errors. -ChangeSet@1.3305.3.7, 2015-03-30 11:23:48+02:00, martin@pc-martin.(none) +ChangeSet@1.3305.4.7, 2015-03-30 11:23:48+02:00, martin@pc-martin.(none) [Bug 2788] New flag -G (force_step_once) - ChangeLog@1.1622.3.7 +1 -0 + ChangeLog@1.1622.4.7 +1 -0 [Bug 2788] New flag -G (force_step_once) include/ntpd.h@1.185.1.1 +4 -3 @@ -1600,10 +8371,10 @@ ChangeSet@1.3308, 2015-03-29 01:49:10+00:00, stenn@psp-deb1.ntp.org ntpd/ntpd.c@1.159 +1 -0 [Bug 2346] "graceful termination" signals do not do peer cleanup -ChangeSet@1.3305.3.6, 2015-03-25 17:32:25+01:00, martin@pc-martin.(none) +ChangeSet@1.3305.4.6, 2015-03-25 17:32:25+01:00, martin@pc-martin.(none) [Bug 2592] Account for PPS sources which can provide an accurate absolute time stamp, and status information. - ChangeLog@1.1622.3.6 +2 -0 + ChangeLog@1.1622.4.6 +2 -0 [Bug 2592] Account for PPS sources which can provide an accurate absolute time stamp, and status information. include/ntp.h@1.213 +2 -1 @@ -1615,10 +8386,10 @@ ChangeSet@1.3305.3.6, 2015-03-25 17:32:25+01:00, martin@pc-martin.(none) ntpd/refclock_parse.c@1.78 +2 -2 [Bug 2592] Parse driver can return absolute timestamp with PPS, and status information. -ChangeSet@1.3305.3.5, 2015-03-25 17:24:59+01:00, martin@pc-martin.(none) +ChangeSet@1.3305.4.5, 2015-03-25 17:24:59+01:00, martin@pc-martin.(none) Fixed indention and removed trailing whitespace. - ChangeLog@1.1622.3.5 +1 -0 + ChangeLog@1.1622.4.5 +1 -0 Fixed indention and removed trailing whitespace. include/ntp.h@1.212 +4 -4 @@ -1633,25 +8404,25 @@ ChangeSet@1.3305.3.5, 2015-03-25 17:24:59+01:00, martin@pc-martin.(none) ntpd/refclock_parse.c@1.77 +16 -16 Fixed indention. -ChangeSet@1.3305.3.4, 2015-03-22 07:59:12+00:00, stenn@psp-fb1.ntp.org +ChangeSet@1.3305.4.4, 2015-03-22 07:59:12+00:00, stenn@psp-fb1.ntp.org merge cleanup - ChangeLog@1.1622.3.4 +0 -1 + ChangeLog@1.1622.4.4 +0 -1 merge cleanup -ChangeSet@1.3305.5.3, 2015-03-22 07:24:07+00:00, stenn@psp-fb1.ntp.org +ChangeSet@1.3305.6.3, 2015-03-22 07:24:07+00:00, stenn@psp-fb1.ntp.org Bug 2791 -> Bug 2789 - ChangeLog@1.1622.5.3 +1 -1 + ChangeLog@1.1622.6.3 +1 -1 Bug 2791 -> Bug 2789 -ChangeSet@1.3305.5.2, 2015-03-22 06:59:06+00:00, stenn@psp-fb1.ntp.org +ChangeSet@1.3305.6.2, 2015-03-22 06:59:06+00:00, stenn@psp-fb1.ntp.org Merge cleanup - ChangeLog@1.1622.5.2 +22 -22 + ChangeLog@1.1622.6.2 +22 -22 Merge cleanup -ChangeSet@1.3305.4.2, 2015-03-22 03:48:52+00:00, stenn@psp-fb1.ntp.org +ChangeSet@1.3305.5.2, 2015-03-22 03:48:52+00:00, stenn@psp-fb1.ntp.org [Bug 2769] New script: update-leap .point-changed-filelist@1.26 +7 -0 @@ -1660,16 +8431,16 @@ ChangeSet@1.3305.4.2, 2015-03-22 03:48:52+00:00, stenn@psp-fb1.ntp.org scripts/update-leap/Makefile.am@1.2 +2 -1 [Bug 2769] New script: update-leap -ChangeSet@1.3305.4.1, 2015-03-22 03:01:33+00:00, stenn@psp-fb1.ntp.org +ChangeSet@1.3305.5.1, 2015-03-22 03:01:33+00:00, stenn@psp-fb1.ntp.org [Bug 2769] New script: update-leap BitKeeper/etc/ignore@1.86 +1 -0 added Makefile.in - ChangeLog@1.1622.4.1 +1 -0 + ChangeLog@1.1622.5.1 +1 -0 [Bug 2769] New script: update-leap - configure.ac@1.585 +8 -7 + configure.ac@1.584.1.1 +8 -7 [Bug 2769] New script: update-leap scripts/Makefile.am@1.40 +1 -0 @@ -1756,11 +8527,11 @@ ChangeSet@1.3305.4.1, 2015-03-22 03:01:33+00:00, stenn@psp-fb1.ntp.org sntp/m4/ntp_locinfo.m4@1.18 +6 -0 [Bug 2769] New script: update-leap -ChangeSet@1.3305.3.1, 2015-03-20 13:03:38+01:00, burnicki@pc-martin4. +ChangeSet@1.3305.4.1, 2015-03-20 13:03:38+01:00, burnicki@pc-martin4. [Bug 2790] If ntpd sets the Windows MM timer highest resolution then pause briefly before measuring system clock precision to yield correct results. - ChangeLog@1.1622.3.1 +3 -1 + ChangeLog@1.1622.4.1 +3 -1 [Bug 2790] If ntpd sets the Windows MM timer highest resolution then pause briefly before measuring system clock precision to yield correct results. @@ -1768,19 +8539,19 @@ ChangeSet@1.3305.3.1, 2015-03-20 13:03:38+01:00, burnicki@pc-martin4. [Bug 2790] If ntpd sets the Windows MM timer highest resolution then pause briefly before measuring system clock precision to yield correct results. -ChangeSet@1.3305.2.6, 2015-03-20 11:47:15+01:00, martin@pc-martin.(none) +ChangeSet@1.3305.3.6, 2015-03-20 11:47:15+01:00, martin@pc-martin.(none) [Bug 2791] Quiet compiler warnings from libevent. - ChangeLog@1.1622.2.6 +1 -0 + ChangeLog@1.1622.3.6 +1 -0 [Bug 2791] Quiet compiler warnings from libevent. sntp/libevent/evthread-internal.h@1.8 +2 -2 [Bug 2791] Fixed function prototypes to quiet compiler warnings. -ChangeSet@1.3305.2.5, 2015-03-20 11:36:15+01:00, martin@pc-martin.(none) +ChangeSet@1.3305.3.5, 2015-03-20 11:36:15+01:00, martin@pc-martin.(none) [Bug 1787] DCF77's formerly "antenna" bit is "call bit" since 2003. - ChangeLog@1.1622.2.5 +4 -3 + ChangeLog@1.1622.3.5 +4 -3 [Bug 1787] DCF77's formerly "antenna" bit is "call bit" since 2003. include/parse.h@1.12 +3 -3 @@ -1809,23 +8580,23 @@ ChangeSet@1.3305.2.5, 2015-03-20 11:36:15+01:00, martin@pc-martin.(none) [Bug 1787] DCF77's formerly "antenna" bit is "call bit" since 2003. Removed trailing whitespace and fixed indention. -ChangeSet@1.3305.2.4, 2015-03-19 17:00:30+01:00, martin@pc-martin.(none) +ChangeSet@1.3305.3.4, 2015-03-19 17:00:30+01:00, martin@pc-martin.(none) Added a comment from Juergen Perlinger in ntp_date.c to make the code clearer. - ChangeLog@1.1622.2.4 +1 -0 + ChangeLog@1.1622.3.4 +1 -0 Added a comment from Juergen Perlinger in ntp_date.c to make the code clearer. libntp/ntp_calendar.c@1.15 +40 -34 Added a comment from Juergen Perlinger to make the code clearer. Removed trailing whitespace. -ChangeSet@1.3305.2.3, 2015-03-19 16:52:05+01:00, martin@pc-martin.(none) +ChangeSet@1.3305.3.3, 2015-03-19 16:52:05+01:00, martin@pc-martin.(none) Use predefined function types for parse driver functions used to set up function pointers. Account for changed prototype of parse_inp_fnc_t functions. Cast parse conversion results to appropriate types to avoid compiler warnings. Let ioctl() for Windows accept a (void *) to avoid compiler warnings when called with pointers to different types. - ChangeLog@1.1622.2.3 +7 -0 + ChangeLog@1.1622.3.3 +7 -0 Use predefined function types for parse driver functions used to set up function pointers. Account for changed prototype of parse_inp_fnc_t functions. Cast parse conversion results to appropriate types to avoid compiler warnings. @@ -1915,12 +8686,12 @@ ChangeSet@1.3305.2.3, 2015-03-19 16:52:05+01:00, martin@pc-martin.(none) ports/winnt/libntp/termios.c@1.30 +2 -1 Let ioctl() accept a (void *) to avoid compiler warnings when called with pointers to different types. -ChangeSet@1.3305.1.19, 2015-03-19 07:54:24+00:00, stenn@psp-deb1.ntp.org +ChangeSet@1.3305.2.4, 2015-03-19 07:54:24+00:00, stenn@psp-deb1.ntp.org ntp_proto.c, ChangeLog: [Sec 2779] ntpd accepts unauthenticated packets with symmetric key crypto. [Sec 2781] Authentication doesn't protect symmetric associations against DoS attacks. - ChangeLog@1.1622.1.16 +3 -0 + ChangeLog@1.1622.2.4 +3 -0 [Sec 2779] ntpd accepts unauthenticated packets with symmetric key crypto. [Sec 2781] Authentication doesn't protect symmetric associations against DoS attacks. @@ -1928,10 +8699,10 @@ ChangeSet@1.3305.1.19, 2015-03-19 07:54:24+00:00, stenn@psp-deb1.ntp.org [Sec 2779] ntpd accepts unauthenticated packets with symmetric key crypto. [Sec 2781] Authentication doesn't protect symmetric associations against DoS attacks. -ChangeSet@1.3305.1.18, 2015-03-16 09:17:42+00:00, stenn@psp-fb1.ntp.org +ChangeSet@1.3305.2.3, 2015-03-16 09:17:42+00:00, stenn@psp-fb1.ntp.org [Bug 2763] Allow different thresholds for forward and backward steps - ChangeLog@1.1622.1.15 +1 -0 + ChangeLog@1.1622.2.3 +1 -0 [Bug 2763] Allow different thresholds for forward and backward steps include/ntp.h@1.211 +13 -11 @@ -1982,7 +8753,7 @@ ChangeSet@1.3305.1.18, 2015-03-16 09:17:42+00:00, stenn@psp-fb1.ntp.org ntpd/ntp_parser.y@1.83 +4 -0 [Bug 2763] Allow different thresholds for forward and backward steps -ChangeSet@1.3305.2.2, 2015-03-13 10:28:32+01:00, martin@pc-martin.(none) +ChangeSet@1.3305.3.2, 2015-03-13 10:28:32+01:00, martin@pc-martin.(none) Removed non-ASCII characters from some copyright comments. Removed trailing whitespace. Updated definitions for Meinberg clocks from current Meinberg header files. Now use C99 fixed-width types and avoid non-ASCII characters in comments. @@ -1993,7 +8764,7 @@ ChangeSet@1.3305.2.2, 2015-03-13 10:28:32+01:00, martin@pc-martin.(none) Reworked mk_utcinfo() to avoid printing of ambiguous leap second dates. Modified mbg_tm_str() which now expexts an additional parameter controlling if the time status shall be printed. - ChangeLog@1.1622.2.2 +12 -0 + ChangeLog@1.1622.3.2 +12 -0 Removed non-ASCII characters from some copyright comments. Removed trailing whitespace. Updated definitions for Meinberg clocks from current Meinberg header files. Now use C99 fixed-width types and avoid non-ASCII characters in comments. @@ -2099,19 +8870,19 @@ ChangeSet@1.3305.2.2, 2015-03-13 10:28:32+01:00, martin@pc-martin.(none) parseutil/testdcf.c@1.9 +2 -2 Removed non-ASCII characters from copyright comment. -ChangeSet@1.3305.1.17, 2015-03-10 11:21:46+00:00, stenn@psp-fb1.ntp.org +ChangeSet@1.3305.2.2, 2015-03-10 11:21:46+00:00, stenn@psp-fb1.ntp.org merge cleanup - ChangeLog@1.1622.1.14 +1 -3 + ChangeLog@1.1622.2.2 +1 -3 merge cleanup ntpd/ntp_loopfilter.c@1.178 +5 -2 merge cleanup -ChangeSet@1.3305.2.1, 2015-03-10 10:48:25+01:00, martin@pc-martin.(none) +ChangeSet@1.3305.3.1, 2015-03-10 10:48:25+01:00, martin@pc-martin.(none) Fixed loops and decoding of Meinberg GPS satellite info. - ChangeLog@1.1622.2.1 +1 -0 + ChangeLog@1.1622.3.1 +1 -0 Fixed loops and decoding of Meinberg GPS satellite info. libparse/data_mbg.c@1.13 +3 -3 @@ -2120,16 +8891,43 @@ ChangeSet@1.3305.2.1, 2015-03-10 10:48:25+01:00, martin@pc-martin.(none) ntpd/refclock_parse.c@1.73 +44 -68 Fixed loops and decoding of Meinberg GPS satellite info. -ChangeSet@1.3305.1.16, 2015-03-09 06:36:19-04:00, murray@pogo.udel.edu +ChangeSet@1.3305.2.1, 2015-03-09 06:36:19-04:00, murray@pogo.udel.edu ChangeLog, ntp_loopfilter.c: Fix for bug 2774 - ChangeLog@1.1622.1.13 +3 -0 + ChangeLog@1.1622.2.1 +3 -0 Fix for bug 2774 ntpd/ntp_loopfilter.c@1.177 +4 -1 Fix for bug 2774 +ChangeSet@1.3305.1.18, 2015-03-07 23:04:03+00:00, stenn@psp-fb1.ntp.org + [Bug 2782] Refactor refclock_shm.c, add memory barrier protection + + ntpd/refclock_shm.c@1.34 +6 -1 + [Bug 2782] Refactor refclock_shm.c, add memory barrier protection + +ChangeSet@1.3305.1.17, 2015-03-07 01:51:49+00:00, stenn@stenn.ntp.org + [Bug 2784] Fix for 2782 uses clock_gettime() instead of get_ostime() + + ChangeLog@1.1622.1.14 +1 -0 + [Bug 2784] Fix for 2782 uses clock_gettime() instead of get_ostime() + + ntpd/refclock_shm.c@1.33 +1 -1 + [Bug 2784] Fix for 2782 uses clock_gettime() instead of get_ostime() + +ChangeSet@1.3305.1.16, 2015-03-05 20:08:21+00:00, stenn@stenn.ntp.org + [Bug 2782] Refactor refclock_shm.c, add memory barrier protection + + ChangeLog@1.1622.1.13 +1 -0 + [Bug 2782] Refactor refclock_shm.c, add memory barrier protection + + configure.ac@1.585 +7 -1 + [Bug 2782] Refactor refclock_shm.c, add memory barrier protection + + ntpd/refclock_shm.c@1.32 +196 -108 + [Bug 2782] Refactor refclock_shm.c, add memory barrier protection + ChangeSet@1.3305.1.15, 2015-03-05 10:17:02+00:00, stenn@psp-fb1.ntp.org [Bug 2783] Quiet autoconf warnings about missing AC_LANG_SOURCE diff --git a/contrib/ntp/Makefile.am b/contrib/ntp/Makefile.am index fc76719f0428..11b20bfdb971 100644 --- a/contrib/ntp/Makefile.am +++ b/contrib/ntp/Makefile.am @@ -34,6 +34,7 @@ EXTRA_DIST = \ NOTES.y2kfixes \ README.bk \ README.hackers \ + README.leapsmear \ README.patches \ README.refclocks \ README.versions \ @@ -113,10 +114,13 @@ dist-hook: @find $(distdir) -type d -name SCCS -print | xargs rm -rf install-data-local: - ( cd $(srcdir) && find html -name SCCS -prune -o -type d \ - -exec $(INSTALL) -d $(DESTDIR)$(htmldir)/{} ";" ) - ( cd $(srcdir) && find html -name SCCS -prune -o -type f \ - -exec $(INSTALL_DATA) {} $(DESTDIR)$(htmldir)/{} ";" ) + @echo "Installing stand-alone HTML documentation" + @( cd $(srcdir) && \ + for i in `find html -type d | grep -v SCCS` ; \ + do $(INSTALL) -d $(DESTDIR)$(htmldir)/$$i ; done ) + @( cd $(srcdir) && \ + for i in `find html -type f | grep -v SCCS` ; \ + do $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i ; done ) uninstall-local: rm -rf $(DESTDIR)$(htmldir)/html diff --git a/contrib/ntp/Makefile.in b/contrib/ntp/Makefile.in index 47232a60e2bd..4d71d85fd0d2 100644 --- a/contrib/ntp/Makefile.in +++ b/contrib/ntp/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 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. @@ -15,6 +14,61 @@ @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@ @@ -34,18 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure ChangeLog INSTALL NEWS TODO compile \ - config.guess config.sub depcomp install-sh ltmain.sh missing \ - sntp/libevent/build-aux/compile \ - sntp/libevent/build-aux/config.guess \ - sntp/libevent/build-aux/config.sub \ - sntp/libevent/build-aux/depcomp \ - sntp/libevent/build-aux/install-sh \ - sntp/libevent/build-aux/ltmain.sh \ - sntp/libevent/build-aux/missing sntp/libevent/build-aux/ylwrap \ - ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \ @@ -76,6 +118,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ + $(top_srcdir)/sntp/m4/ntp_unitytest.m4 \ $(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \ $(top_srcdir)/sntp/m4/openldap-thread-check.m4 \ @@ -85,42 +128,99 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/sntp/libevent/build-aux/ar-lib \ + $(top_srcdir)/sntp/libevent/build-aux/compile \ + $(top_srcdir)/sntp/libevent/build-aux/config.guess \ + $(top_srcdir)/sntp/libevent/build-aux/config.sub \ + $(top_srcdir)/sntp/libevent/build-aux/install-sh \ + $(top_srcdir)/sntp/libevent/build-aux/ltmain.sh \ + $(top_srcdir)/sntp/libevent/build-aux/missing ChangeLog \ + INSTALL NEWS README TODO compile config.guess config.sub \ + depcomp install-sh ltmain.sh missing \ + sntp/libevent/build-aux/ar-lib sntp/libevent/build-aux/compile \ + sntp/libevent/build-aux/config.guess \ + sntp/libevent/build-aux/config.sub \ + sntp/libevent/build-aux/depcomp \ + sntp/libevent/build-aux/install-sh \ + sntp/libevent/build-aux/ltmain.sh \ + sntp/libevent/build-aux/missing sntp/libevent/build-aux/ylwrap \ + ylwrap DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -148,7 +248,10 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -199,6 +302,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@ GTEST_LDFLAGS = @GTEST_LDFLAGS@ GTEST_LIBS = @GTEST_LIBS@ HAVE_INLINE = @HAVE_INLINE@ +HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@ HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@ HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@ INSTALL = @INSTALL@ @@ -315,6 +419,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@ PATH_PERL = @PATH_PERL@ +PATH_RUBY = @PATH_RUBY@ PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_TEST = @PATH_TEST@ PERLLIBDIR = @PERLLIBDIR@ @@ -444,6 +549,7 @@ EXTRA_DIST = \ NOTES.y2kfixes \ README.bk \ README.hackers \ + README.leapsmear \ README.patches \ README.refclocks \ README.versions \ @@ -488,7 +594,7 @@ all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -503,7 +609,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -524,10 +629,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -550,22 +653,25 @@ distclean-libtool: -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -580,57 +686,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -646,12 +707,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -663,15 +719,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -680,9 +732,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -718,13 +792,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -756,36 +827,42 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -796,8 +873,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -807,17 +884,19 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -840,13 +919,21 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -879,10 +966,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -967,26 +1059,27 @@ ps-am: uninstall-am: uninstall-local -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - ctags-recursive install install-am install-strip \ - tags-recursive +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-local +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am uninstall-local + +.PRECIOUS: Makefile .gcc-warning: @@ -1032,10 +1125,13 @@ dist-hook: @find $(distdir) -type d -name SCCS -print | xargs rm -rf install-data-local: - ( cd $(srcdir) && find html -name SCCS -prune -o -type d \ - -exec $(INSTALL) -d $(DESTDIR)$(htmldir)/{} ";" ) - ( cd $(srcdir) && find html -name SCCS -prune -o -type f \ - -exec $(INSTALL_DATA) {} $(DESTDIR)$(htmldir)/{} ";" ) + @echo "Installing stand-alone HTML documentation" + @( cd $(srcdir) && \ + for i in `find html -type d | grep -v SCCS` ; \ + do $(INSTALL) -d $(DESTDIR)$(htmldir)/$$i ; done ) + @( cd $(srcdir) && \ + for i in `find html -type f | grep -v SCCS` ; \ + do $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i ; done ) uninstall-local: rm -rf $(DESTDIR)$(htmldir)/html diff --git a/contrib/ntp/NEWS b/contrib/ntp/NEWS index a425a9a4dc3f..4e61d1b80bb7 100644 --- a/contrib/ntp/NEWS +++ b/contrib/ntp/NEWS @@ -1,5 +1,154 @@ --- -NTP 4.2.8p2 (Harlan Stenn , 2015/04/xx) +NTP 4.2.8p3 (Harlan Stenn , 2015/06/29) + +Focus: 1 Security fix. Bug fixes and enhancements. Leap-second improvements. + +Severity: MEDIUM + +Security Fix: + +* [Sec 2853] Crafted remote config packet can crash some versions of + ntpd. Aleksis Kauppinen, Juergen Perlinger, Harlan Stenn. + +Under specific circumstances an attacker can send a crafted packet to +cause a vulnerable ntpd instance to crash. This requires each of the +following to be true: + +1) ntpd set up to allow remote configuration (not allowed by default), and +2) knowledge of the configuration password, and +3) access to a computer entrusted to perform remote configuration. + +This vulnerability is considered low-risk. + +New features in this release: + +Optional (disabled by default) support to have ntpd provide smeared +leap second time. A specially built and configured ntpd will only +offer smeared time in response to client packets. These response +packets will also contain a "refid" of 254.a.b.c, where the 24 bits +of a, b, and c encode the amount of smear in a 2:22 integer:fraction +format. See README.leapsmear and http://bugs.ntp.org/2855 for more +information. + + *IF YOU CHOOSE TO CONFIGURE NTPD TO PROVIDE LEAP SMEAR TIME* + *BE SURE YOU DO NOT OFFER THAT TIME ON PUBLIC TIMESERVERS.* + +We've imported the Unity test framework, and have begun converting +the existing google-test items to this new framework. If you want +to write new tests or change old ones, you'll need to have ruby +installed. You don't need ruby to run the test suite. + +Bug Fixes and Improvements: + +* CID 739725: Fix a rare resource leak in libevent/listener.c. +* CID 1295478: Quiet a pedantic potential error from the fix for Bug 2776. +* CID 1296235: Fix refclock_jjy.c and correcting type of the driver40-ja.html +* CID 1269537: Clean up a line of dead code in getShmTime(). +* [Bug 1060] Buffer overruns in libparse/clk_rawdcf.c. Helge Oldach. +* [Bug 2590] autogen-5.18.5. +* [Bug 2612] restrict: Warn when 'monitor' can't be disabled because + of 'limited'. +* [Bug 2650] fix includefile processing. +* [Bug 2745] ntpd -x steps clock on leap second + Fixed an initial-value problem that caused misbehaviour in absence of + any leapsecond information. + Do leap second stepping only of the step adjustment is beyond the + proper jump distance limit and step correction is allowed at all. +* [Bug 2750] build for Win64 + Building for 32bit of loopback ppsapi needs def file +* [Bug 2776] Improve ntpq's 'help keytype'. +* [Bug 2778] Implement "apeers" ntpq command to include associd. +* [Bug 2782] Refactor refclock_shm.c, add memory barrier protection. +* [Bug 2792] If the IFF_RUNNING interface flag is supported then an + interface is ignored as long as this flag is not set since the + interface is not usable (e.g., no link). +* [Bug 2794] Clean up kernel clock status reports. +* [Bug 2800] refclock_true.c true_debug() can't open debug log because + of incompatible open/fdopen parameters. +* [Bug 2804] install-local-data assumes GNU 'find' semantics. +* [Bug 2805] ntpd fails to join multicast group. +* [Bug 2806] refclock_jjy.c supports the Telephone JJY. +* [Bug 2808] GPSD_JSON driver enhancements, step 1. + Fix crash during cleanup if GPS device not present and char device. + Increase internal token buffer to parse all JSON data, even SKY. + Defer logging of errors during driver init until the first unit is + started, so the syslog is not cluttered when the driver is not used. + Various improvements, see http://bugs.ntp.org/2808 for details. + Changed libjsmn to a more recent version. +* [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX. +* [Bug 2813] HP-UX needs -D__STDC_VERSION__=199901L and limits.h. +* [Bug 2815] net-snmp before v5.4 has circular library dependencies. +* [Bug 2821] Add a missing NTP_PRINTF and a missing const. +* [Bug 2822] New leap column in sntp broke NTP::Util.pm. +* [Bug 2824] Convert update-leap to perl. (also see 2769) +* [Bug 2825] Quiet file installation in html/ . +* [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey + NTPD transfers the current TAI (instead of an announcement) now. + This might still needed improvement. + Update autokey data ASAP when 'sys_tai' changes. + Fix unit test that was broken by changes for autokey update. + Avoid potential signature length issue and use DPRINTF where possible + in ntp_crypto.c. +* [Bug 2832] refclock_jjy.c supports the TDC-300. +* [Bug 2834] Correct a broken html tag in html/refclock.html +* [Bug 2836] DFC77 patches from Frank Kardel to make decoding more + robust, and require 2 consecutive timestamps to be consistent. +* [Bug 2837] Allow a configurable DSCP value. +* [Bug 2837] add test for DSCP to ntpd/complete.conf.in +* [Bug 2842] Glitch in ntp.conf.def documentation stanza. +* [Bug 2842] Bug in mdoc2man. +* [Bug 2843] make check fails on 4.3.36 + Fixed compiler warnings about numeric range overflow + (The original topic was fixed in a byplay to bug#2830) +* [Bug 2845] Harden memory allocation in ntpd. +* [Bug 2852] 'make check' can't find unity.h. Hal Murray. +* [Bug 2854] Missing brace in libntp/strdup.c. Masanari Iida. +* [Bug 2855] Parser fix for conditional leap smear code. Harlan Stenn. +* [Bug 2855] Report leap smear in the REFID. Harlan Stenn. +* [Bug 2855] Implement conditional leap smear code. Martin Burnicki. +* [Bug 2856] ntpd should wait() on terminated child processes. Paul Green. +* [Bug 2857] Stratus VOS does not support SIGIO. Paul Green. +* [Bug 2859] Improve raw DCF77 robustness deconding. Frank Kardel. +* [Bug 2860] ntpq ifstats sanity check is too stringent. Frank Kardel. +* html/drivers/driver22.html: typo fix. Harlan Stenn. +* refidsmear test cleanup. Tomasz Flendrich. +* refidsmear function support and tests. Harlan Stenn. +* sntp/tests/Makefile.am: remove g_nameresolution.cpp as it tested + something that was only in the 4.2.6 sntp. Harlan Stenn. +* Modified tests/bug-2803/Makefile.am so it builds Unity framework tests. + Damir Tomić +* Modified tests/libtnp/Makefile.am so it builds Unity framework tests. + Damir Tomić +* Modified sntp/tests/Makefile.am so it builds Unity framework tests. + Damir Tomić +* tests/sandbox/smeartest.c: Harlan Stenn, Damir Tomic, Juergen Perlinger. +* Converted from gtest to Unity: tests/bug-2803/. Damir Tomić +* Converted from gtest to Unity: tests/libntp/ a_md5encrypt, atoint.c, + atouint.c, authkeys.c, buftvtots.c, calendar.c, caljulian.c, + calyearstart.c, clocktime.c, hextoint.c, lfpfunc.c, modetoa.c, + numtoa.c, numtohost.c, refnumtoa.c, ssl_init.c, statestr.c, + timespecops.c, timevalops.c, uglydate.c, vi64ops.c, ymd2yd.c. + Damir Tomić +* Converted from gtest to Unity: sntp/tests/ kodDatabase.c, kodFile.c, + networking.c, keyFile.c, utilities.cpp, sntptest.h, + fileHandlingTest.h. Damir Tomić +* Initial support for experimental leap smear code. Harlan Stenn. +* Fixes to sntp/tests/fileHandlingTest.h.in. Harlan Stenn. +* Report select() debug messages at debug level 3 now. +* sntp/scripts/genLocInfo: treat raspbian as debian. +* Unity test framework fixes. + ** Requires ruby for changes to tests. +* Initial support for PACKAGE_VERSION tests. +* sntp/libpkgver belongs in EXTRA_DIST, not DIST_SUBDIRS. +* tests/bug-2803/Makefile.am must distribute bug-2803.h. +* Add an assert to the ntpq ifstats code. +* Clean up the RLIMIT_STACK code. +* Improve the ntpq documentation around the controlkey keyid. +* ntpq.c cleanup. +* Windows port build cleanup. + +--- +NTP 4.2.8p2 (Harlan Stenn , 2015/04/07) Focus: Security and Bug fixes, enhancements. diff --git a/contrib/ntp/README.leapsmear b/contrib/ntp/README.leapsmear new file mode 100644 index 000000000000..37f1c73a7de8 --- /dev/null +++ b/contrib/ntp/README.leapsmear @@ -0,0 +1,272 @@ +Leap Second Smearing with NTP +----------------------------- + +By Martin Burnicki +with some edits by Harlan Stenn + +The NTP software protocol and its reference implementation, ntpd, were +originally designed to distribute UTC time over a network as accurately as +possible. + +Unfortunately, leap seconds are scheduled to be inserted into or deleted +from the UTC time scale in irregular intervals to keep the UTC time scale +synchronized with the Earth rotation. Deletions haven't happened, yet, but +insertions have happened over 30 times. + +The problem is that POSIX requires 86400 seconds in a day, and there is no +prescribed way to handle leap seconds in POSIX. + +Whenever a leap second is to be handled ntpd either: + +- passes the leap second announcement down to the OS kernel (if the OS +supports this) and the kernel handles the leap second automatically, or + +- applies the leap second correction itself. + +NTP servers also pass a leap second warning flag down to their clients via +the normal NTP packet exchange, so clients also become aware of an +approaching leap second, and can handle the leap second appropriately. + + +The Problem on Unix-like Systems +-------------------------------- +If a leap second is to be inserted then in most Unix-like systems the OS +kernel just steps the time back by 1 second at the beginning of the leap +second, so the last second of the UTC day is repeated and thus duplicate +timestamps can occur. + +Unfortunately there are lots of applications which get confused it the +system time is stepped back, e.g. due to a leap second insertion. Thus, +many users have been looking for ways to avoid this, and tried to introduce +workarounds which may work properly, or not. + +So even though these Unix kernels normally can handle leap seconds, the way +they do this is not optimal for applications. + +One good way to handle the leap second is to use ntp_gettime() instead of +the usual calls, because ntp_gettime() includes a "clock state" variable +that will actually tell you if the time you are receiving is OK or not, and +if it is OK, if the current second is an in-progress leap second. But even +though this mechanism has been available for about 20 years' time, almost +nobody uses it. + + +NTP Client for Windows Contains a Workaround +-------------------------------------------- +The Windows system time knows nothing about leap seconds, so for many years +the Windows port of ntpd provides a workaround where the system time is +slewed by the client to compensate the leap second. + +Thus it is not required to use a smearing NTP server for Windows clients, +but of course the smearing server approach also works. + + +The Leap Smear Approach +----------------------- +Due to the reasons mentioned above some support for leap smearing has +recently been implemented in ntpd. This means that to insert a leap second +an NTP server adds a certain increasing "smear" offset to the real UTC time +sent to its clients, so that after some predefined interval the leap second +offset is compensated. The smear interval should be long enough, +e.g. several hours, so that NTP clients can easily follow the clock drift +caused by the smeared time. + +During the period while the leap smear is being performed, ntpd will include +a specially-formatted 'refid' in time packets that contain "smeared" time. +This refid is of the form 254.x.y.z, where x.y.z are 24 encoded bits of the +smear value. + +With this approach the time an NTP server sends to its clients still matches +UTC before the leap second, up to the beginning of the smear interval, and +again corresponds to UTC after the insertion of the leap second has +finished, at the end of the smear interval. By examining the first byte of +the refid, one can also determine if the server is offering smeared time or +not. + +Of course, clients which receive the "smeared" time from an NTP server don't +have to (and even must not) care about the leap second anymore. Smearing is +just transparent to the clients, and the clients don't even notice there's a +leap second. + + +Pros and Cons of the Smearing Approach +-------------------------------------- +The disadvantages of this approach are: + +- During the smear interval the time provided by smearing NTP servers +differs significantly from UTC, and thus from the time provided by normal, +non-smearing NTP servers. The difference can be up to 1 second, depending +on the smear algorithm. + +- Since smeared time differs from true UTC, and many applications require +correct legal time (UTC), there may be legal consequences to using smeared +time. Make sure you check to see if this requirement affects you. + +However, for applications where it's only important that all computers have +the same time and a temporary offset of up to 1 s to UTC is acceptable, a +better approach may be to slew the time in a well defined way, over a +certain interval, which is what we call smearing the leap second. + + +The Motivation to Implement Leap Smearing +----------------------------------------- +Here is some historical background for ntpd, related to smearing/slewing +time. + +Up to ntpd 4.2.4, if kernel support for leap seconds was either not +available or was not enabled, ntpd didn't care about the leap second at all. +So if ntpd was run with -x and thus kernel support wasn't used, ntpd saw a +sudden 1 s offset after the leap second and normally would have stepped the +time by -1 s a few minutes later. However, 'ntpd -x' does not step the time +but "slews" the 1-second correction, which takes 33 minutes and 20 seconds +to complete. This could be considered a bug, but certainly this was only an +accidental behavior. + +However, as we learned in the discussion in http://bugs.ntp.org/2745, this +behavior was very much appreciated since indeed the time was never stepped +back, and even though the start of the slewing was somewhat undefined and +depended on the poll interval. The system time was off by 1 second for +several minutes before slewing even started. + +In ntpd 4.2.6 some code was added which let ntpd step the time at UTC +midnight to insert a leap second, if kernel support was not used. +Unfortunately this also happened if ntpd was started with -x, so the folks +who expected that the time was never stepped when ntpd was run with -x found +this wasn't true anymore, and again from the discussion in NTP bug 2745 we +learn that there were even some folks who patched ntpd to get the 4.2.4 +behavior back. + +In 4.2.8 the leap second code was rewritten and some enhancements were +introduced, but the resulting code still showed the behavior of 4.2.6, +i.e. ntpd with -x would still step the time. This has only recently been +fixed in the current ntpd stable code, but this fix is only available with a +certain patch level of ntpd 4.2.8. + +So a possible solution for users who were looking for a way to come over the +leap second without the time being stepped could have been to check the +version of ntpd installed on each of their systems. If it's still 4.2.4 be +sure to start the client ntpd with -x. If it's 4.2.6 or 4.2.8 it won't work +anyway except if you had a patched ntpd version instead of the original +version. So you'd need to upgrade to the current -stable code to be able to +run ntpd with -x and get the desired result, so you'd still have the +requirement to check/update/configure every single machine in your network +that runs ntpd. + +Google's leap smear approach is a very efficient solution for this, for +sites that do not require correct timestamps for legal purposes. You just +have to take care that your NTP servers support leap smearing and configure +those few servers accordingly. If the smear interval is long enough so that +NTP clients can follow the smeared time it doesn't matter at all which +version of ntpd is installed on a client machine, it just works, and it even +works around kernel bugs due to the leap second. + +Since all clients follow the same smeared time the time difference between +the clients during the smear interval is as small as possible, compared to +the -x approach. The current leap second code in ntpd determines the point +in system time when the leap second is to be inserted, and given a +particular smear interval it's easy to determine the start point of the +smearing, and the smearing is finished when the leap second ends, i.e. the +next UTC day begins. + +The maximum error doesn't exceed what you'd get with the old smearing caused +by -x in ntpd 4.2.4, so if users could accept the old behavior they would +even accept the smearing at the server side. + +In order to affect the local timekeeping as little as possible the leap +smear support currently implemented in ntpd does not affect the internal +system time at all. Only the timestamps and refid in outgoing reply packets +*to clients* are modified by the smear offset, so this makes sure the basic +functionality of ntpd is not accidentally broken. Also peer packets +exchanged with other NTP servers are based on the real UTC system time and +the normal refid, as usual. + +The leap smear implementation is optionally available in ntp-4.2.8p3 and +later, and the changes can be tracked via http://bugs.ntp.org/2855. + + +Using NTP's Leap Second Smearing +-------------------------------- +- Leap Second Smearing MUST NOT be used for public servers, e.g. servers +provided by metrology institutes, or servers participating in the NTP pool +project. There would be a high risk that NTP clients get the time from a +mixture of smearing and non-smearing NTP servers which could result in +undefined client behavior. Instead, leap second smearing should only be +configured on time servers providing dedicated clients with time, if all +those clients can accept smeared time. + +- Leap Second Smearing is NOT configured by default. The only way to get +this behavior is to invoke the ./configure script from the NTP source code +package with the --enable-leap-smear parameter before the executables are +built. + +- Even if ntpd has been compiled to enable leap smearing support, leap +smearing is only done if explicitly configured. + +- The leap smear interval should be at least several hours' long, and up to +1 day (86400s). If the interval is too short then the applied smear offset +is applied too quickly for clients to follow. 86400s (1 day) is a good +choice. + +- If several NTP servers are set up for leap smearing then the *same* smear +interval should be configured on each server. + +- Smearing NTP servers DO NOT send a leap second warning flag to client time +requests. Since the leap second is applied gradually the clients don't even +notice there's a leap second being inserted, and thus there will be no log +message or similar related to the leap second be visible on the clients. + +- Since clients don't (and must not) become aware of the leap second at all, +clients getting the time from a smearing NTP server MUST NOT be configured +to use a leap second file. If they had a leap second file they would apply +the leap second twice: the smeared one from the server, plus another one +inserted by themselves due to the leap second file. As a result, the +additional correction would soon be detected and corrected/adjusted. + +- Clients MUST NOT be configured to poll both smearing and non-smearing NTP +servers at the same time. During the smear interval they would get +different times from different servers and wouldn't know which server(s) to +accept. + + +Setting Up A Smearing NTP Server +-------------------------------- +If an NTP server should perform leap smearing then the leap smear interval +(in seconds) needs to be specified in the NTP configuration file ntp.conf, +e.g.: + + leapsmearinterval 86400 + +Please keep in mind the leap smear interval should be between several and 24 +hours' long. With shorter values clients may not be able to follow the +drift caused by the smeared time, and with longer values the discrepancy +between system time and UTC will cause more problems when reconciling +timestamp differences. + +When ntpd starts and a smear interval has been specified then a log message +is generated, e.g.: + + ntpd[31120]: config: leap smear interval 86400 s + +While ntpd is running with a leap smear interval specified the command: + + ntpq -c rv + +reports the smear status, e.g.: + +# ntpq -c rv +associd=0 status=4419 leap_add_sec, sync_uhf_radio, 1 event, leap_armed, +version="ntpd 4.2.8p3-RC1@1.3349-o Mon Jun 22 14:24:09 UTC 2015 (26)", +processor="i586", system="Linux/3.7.1", leap=01, stratum=1, +precision=-18, rootdelay=0.000, rootdisp=1.075, refid=MRS, +reftime=d93dab96.09666671 Tue, Jun 30 2015 23:58:14.036, +clock=d93dab9b.3386a8d5 Tue, Jun 30 2015 23:58:19.201, peer=2335, +tc=3, mintc=3, offset=-0.097015, frequency=44.627, sys_jitter=0.003815, +clk_jitter=0.451, clk_wander=0.035, tai=35, leapsec=201507010000, +expire=201512280000, leapsmearinterval=86400, leapsmearoffset=-932.087 + +In the example above 'leapsmearinterval' reports the configured leap smear +interval all the time, while the 'leapsmearoffset' value is 0 outside the +interval and increases from 0 to -1000 ms over the interval. So this can be +used to monitor if and how the time sent to clients is smeared. With a +leapsmearoffset of -.932087, the refid reported in smeared packets would be +254.196.88.176. diff --git a/contrib/ntp/aclocal.m4 b/contrib/ntp/aclocal.m4 index 24036a425915..bbc54be40406 100644 --- a/contrib/ntp/aclocal.m4 +++ b/contrib/ntp/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file 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. @@ -11,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # serial 9 -*- Autoconf -*- # Enable extensions on systems that normally disable them. @@ -138,7 +139,7 @@ AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) ]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -150,10 +151,10 @@ AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS], # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -169,22 +170,82 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# +# This file 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. + +# AM_PROG_AR([ACT-IF-FAIL]) +# ------------------------- +# Try to determine the archiver interface, and trigger the ar-lib wrapper +# if it is needed. If the detection of archiver interface fails, run +# ACT-IF-FAIL (default is to abort configure with a proper error message). +AC_DEFUN([AM_PROG_AR], +[AC_BEFORE([$0], [LT_INIT])dnl +AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([ar-lib])dnl +AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false]) +: ${AR=ar} + +AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], + [AC_LANG_PUSH([C]) + am_cv_ar_interface=ar + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], + [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([am_ar_try]) + if test "$ac_status" -eq 0; then + am_cv_ar_interface=ar + else + am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([am_ar_try]) + if test "$ac_status" -eq 0; then + am_cv_ar_interface=lib + else + am_cv_ar_interface=unknown + fi + fi + rm -f conftest.lib libconftest.a + ]) + AC_LANG_POP([C])]) + +case $am_cv_ar_interface in +ar) + ;; +lib) + # Microsoft lib, so override with the ar-lib wrapper script. + # FIXME: It is wrong to rewrite AR. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__AR in this case, + # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something + # similar. + AR="$am_aux_dir/ar-lib $AR" + ;; +unknown) + m4_default([$1], + [AC_MSG_ERROR([could not determine $AR interface])]) + ;; +esac +AC_SUBST([AR])dnl +]) + # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file 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. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -203,7 +264,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -221,30 +282,26 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file 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. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -263,16 +320,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file 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. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -282,7 +337,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -295,12 +350,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -308,8 +364,9 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -348,16 +405,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -366,16 +423,16 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -423,7 +480,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -433,34 +490,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file 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. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -473,7 +535,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -485,21 +547,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -517,7 +577,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -527,18 +587,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file 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. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -551,7 +614,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -580,33 +643,42 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -615,34 +687,82 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -664,7 +784,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -675,7 +795,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -683,16 +803,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file 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. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -708,14 +826,12 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file 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. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -733,7 +849,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -758,52 +874,14 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file 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. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file 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. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -811,11 +889,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -828,63 +905,35 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file 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. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file 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. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -895,24 +944,82 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file 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. -# serial 5 +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file 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. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# +# This file 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. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -923,32 +1030,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -958,36 +1073,85 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file 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. -# serial 1 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -995,34 +1159,32 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file 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. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1030,24 +1192,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file 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. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1057,75 +1217,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR @@ -1159,6 +1358,7 @@ m4_include([sntp/m4/ntp_pkg_config.m4]) m4_include([sntp/m4/ntp_prog_cc.m4]) m4_include([sntp/m4/ntp_rlimit.m4]) m4_include([sntp/m4/ntp_sntp.m4]) +m4_include([sntp/m4/ntp_unitytest.m4]) m4_include([sntp/m4/ntp_ver_suffix.m4]) m4_include([sntp/m4/ntp_vpathhack.m4]) m4_include([sntp/m4/openldap-thread-check.m4]) diff --git a/contrib/ntp/adjtimed/Makefile.in b/contrib/ntp/adjtimed/Makefile.in index 56f4dfbe1d62..716b9401e542 100644 --- a/contrib/ntp/adjtimed/Makefile.in +++ b/contrib/ntp/adjtimed/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 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. @@ -20,6 +19,61 @@ # subdir to warn folks if there is another version there. 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@ @@ -42,9 +96,6 @@ bin_PROGRAMS = libexec_PROGRAMS = sbin_PROGRAMS = EXTRA_PROGRAMS = adjtimed$(EXEEXT) -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/bincheck.mf $(top_srcdir)/depsver.mf \ - $(top_srcdir)/includes.mf $(top_srcdir)/sntp/check-libntp.mf subdir = adjtimed ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ @@ -76,6 +127,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ + $(top_srcdir)/sntp/m4/ntp_unitytest.m4 \ $(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \ $(top_srcdir)/sntp/m4/openldap-thread-check.m4 \ @@ -85,6 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -98,9 +151,22 @@ adjtimed_LDADD = $(LDADD) am__DEPENDENCIES_1 = adjtimed_DEPENDENCIES = ../libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp am__depfiles_maybe = depfiles @@ -111,26 +177,48 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = adjtimed.c DIST_SOURCES = adjtimed.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/bincheck.mf \ + $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \ + $(top_srcdir)/sntp/check-libntp.mf \ + $(top_srcdir)/sntp/libevent/build-aux/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -181,6 +269,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@ GTEST_LDFLAGS = @GTEST_LDFLAGS@ GTEST_LIBS = @GTEST_LIBS@ HAVE_INLINE = @HAVE_INLINE@ +HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@ HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@ HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@ INSTALL = @INSTALL@ @@ -297,6 +386,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@ PATH_PERL = @PATH_PERL@ +PATH_RUBY = @PATH_RUBY@ PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_TEST = @PATH_TEST@ PERLLIBDIR = @PERLLIBDIR@ @@ -418,7 +508,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/bincheck.mf $(top_sr echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign adjtimed/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign adjtimed/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -427,6 +516,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/bincheck.mf $(top_srcdir)/sntp/check-libntp.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -438,14 +528,19 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -466,7 +561,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -481,14 +577,19 @@ clean-binPROGRAMS: rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -509,7 +610,8 @@ uninstall-libexecPROGRAMS: @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -524,14 +626,19 @@ clean-libexecPROGRAMS: rm -f $$list install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -552,7 +659,8 @@ uninstall-sbinPROGRAMS: @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(sbindir)" && rm -f $$files @@ -565,7 +673,8 @@ clean-sbinPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -adjtimed$(EXEEXT): $(adjtimed_OBJECTS) $(adjtimed_DEPENDENCIES) + +adjtimed$(EXEEXT): $(adjtimed_OBJECTS) $(adjtimed_DEPENDENCIES) $(EXTRA_adjtimed_DEPENDENCIES) @rm -f adjtimed$(EXEEXT) $(AM_V_CCLD)$(LINK) $(adjtimed_OBJECTS) $(adjtimed_LDADD) $(LIBS) @@ -580,26 +689,23 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -607,26 +713,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -638,15 +733,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -655,6 +746,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -708,10 +814,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -801,22 +912,25 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS \ .MAKE: all check install install-am install-exec-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libexecPROGRAMS clean-libtool \ - clean-sbinPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-hook \ - install-html install-html-am install-info install-info-am \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \ + clean-libtool clean-sbinPROGRAMS cscopelist-am ctags ctags-am \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook install-html \ + install-html-am install-info install-info-am \ install-libexecPROGRAMS install-man install-pdf install-pdf-am \ install-ps install-ps-am install-sbinPROGRAMS install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-libexecPROGRAMS uninstall-sbinPROGRAMS +.PRECIOUS: Makefile + install-exec-hook: @test -z "${bin_PROGRAMS}${bin_SCRIPTS}" \ diff --git a/contrib/ntp/bootstrap b/contrib/ntp/bootstrap index 2368af3a6445..dcba5c7fa3a8 100755 --- a/contrib/ntp/bootstrap +++ b/contrib/ntp/bootstrap @@ -50,6 +50,7 @@ AUTORECONF=${AUTORECONF:-autoreconf} # ;; # esac +## Old way # 20060629: HMS: Let's try checking in libopts and the autogen-generated files ## The copy for ntp... #rm -rf libopts* @@ -64,22 +65,34 @@ AUTORECONF=${AUTORECONF:-autoreconf} # tar -xvf - # mv libopts-*.*.* libopts ) -def_files=`find [B-Za-z]* -type f -name '*.def' -print | fgrep -v /SCCS/` -prog_opt_files=`grep -l '^prog.name' $def_files` +## EOOld way + +## Unity test runners +# the ruby generator must be older than the test files. +# the test files must be older than the runner files. + +runner_files=`find [B-Za-z]* -type f -name 'run-*' -print | fgrep -v /SCCS/` +l= +lt= +lr= +for f in ${runner_files} +do + fb=`echo $f | sed -e 's/run-//'` + lt="$lt $fb" + lr="$lr $f" # Yes, lr and runner_files are eventually the same +done +touch $lt +echo "Touching <$lt>" +sleep 1 +touch $lr +echo "Touching <$lr>" + +## EOUnity test runners ## AutoGen stuff -#incdir=${PWD}/include - -#for f in ${prog_opt_files} -#do -# ( cd $(dirname ${f}) -# echo "Running autogen on $f..." -# autogen -L${incdir} $(basename ${f}) -# ) || exit 1 -#done - -## Non-AutoGen stuff +def_files=`find [B-Za-z]* -type f -name '*.def' -print | fgrep -v /SCCS/` +prog_opt_files=`grep -l '^prog.name' $def_files` # touch the stuff generated by the opt files @@ -129,6 +142,8 @@ esac ## EOAutoGen stuff +## Yacc/bison files + # Yacc/bison files ntp_parser.[ch] so we don't require the tool if # ntp_parser.y hasn't been updated. At the same time, keyword-gen-utd # and ntp_keyword.h which are derived from ntp_parser.h and @@ -136,6 +151,8 @@ esac touch ntpd/ntp_parser.[ch] ntpd/keyword-gen-utd ntpd/ntp_keyword.h +## EOYacc/bison files + cp bincheck.mf sntp/ cp depsver.mf sntp/ diff --git a/contrib/ntp/clockstuff/Makefile.in b/contrib/ntp/clockstuff/Makefile.in index c852adb9c940..0236354805cf 100644 --- a/contrib/ntp/clockstuff/Makefile.in +++ b/contrib/ntp/clockstuff/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 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. @@ -16,6 +15,61 @@ @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@ @@ -35,9 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ EXTRA_PROGRAMS = propdelay$(EXEEXT) chutest$(EXEEXT) -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \ - $(top_srcdir)/sntp/check-libntp.mf subdir = clockstuff ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ @@ -69,6 +120,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ + $(top_srcdir)/sntp/m4/ntp_unitytest.m4 \ $(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \ $(top_srcdir)/sntp/m4/openldap-thread-check.m4 \ @@ -78,6 +130,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -89,14 +142,27 @@ chutest_LDADD = $(LDADD) am__DEPENDENCIES_1 = chutest_DEPENDENCIES = ../libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = propdelay_SOURCES = propdelay.c propdelay_OBJECTS = propdelay.$(OBJEXT) am__DEPENDENCIES_2 = ../libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) propdelay_DEPENDENCIES = $(am__DEPENDENCIES_2) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp am__depfiles_maybe = depfiles @@ -107,26 +173,47 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = chutest.c propdelay.c DIST_SOURCES = chutest.c propdelay.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \ + $(top_srcdir)/includes.mf $(top_srcdir)/sntp/check-libntp.mf \ + $(top_srcdir)/sntp/libevent/build-aux/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -177,6 +264,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@ GTEST_LDFLAGS = @GTEST_LDFLAGS@ GTEST_LIBS = @GTEST_LIBS@ HAVE_INLINE = @HAVE_INLINE@ +HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@ HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@ HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@ INSTALL = @INSTALL@ @@ -293,6 +381,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@ PATH_PERL = @PATH_PERL@ +PATH_RUBY = @PATH_RUBY@ PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_TEST = @PATH_TEST@ PERLLIBDIR = @PERLLIBDIR@ @@ -416,7 +505,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/sntp/check-libntp.mf echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign clockstuff/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign clockstuff/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -425,6 +513,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/sntp/check-libntp.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -443,10 +532,12 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -chutest$(EXEEXT): $(chutest_OBJECTS) $(chutest_DEPENDENCIES) + +chutest$(EXEEXT): $(chutest_OBJECTS) $(chutest_DEPENDENCIES) $(EXTRA_chutest_DEPENDENCIES) @rm -f chutest$(EXEEXT) $(AM_V_CCLD)$(LINK) $(chutest_OBJECTS) $(chutest_LDADD) $(LIBS) -propdelay$(EXEEXT): $(propdelay_OBJECTS) $(propdelay_DEPENDENCIES) + +propdelay$(EXEEXT): $(propdelay_OBJECTS) $(propdelay_DEPENDENCIES) $(EXTRA_propdelay_DEPENDENCIES) @rm -f propdelay$(EXEEXT) $(AM_V_CCLD)$(LINK) $(propdelay_OBJECTS) $(propdelay_LDADD) $(LIBS) @@ -462,26 +553,23 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -489,26 +577,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -520,15 +597,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -537,6 +610,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -587,10 +675,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -677,18 +770,21 @@ uninstall-am: .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile check-libntp: ../libntp/libntp.a diff --git a/contrib/ntp/config.h.in b/contrib/ntp/config.h.in index 5ca9484a00c7..81867c7b0771 100644 --- a/contrib/ntp/config.h.in +++ b/contrib/ntp/config.h.in @@ -333,6 +333,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_NAMESER_H +/* Define to 1 if you have the `atomic_thread_fence' function. */ +#undef HAVE_ATOMIC_THREAD_FENCE + /* Do we have audio support? */ #undef HAVE_AUDIO @@ -386,6 +389,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ERRNO_H +/* Define to 1 if you have the `EVP_MD_do_all_sorted' function. */ +#undef HAVE_EVP_MD_DO_ALL_SORTED + /* Define to 1 if you have the `fchmod' function. */ #undef HAVE_FCHMOD @@ -821,6 +827,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDARG_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDATOMIC_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDBOOL_H @@ -1315,6 +1324,9 @@ /* define to 1 if library is thread safe */ #undef LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE +/* leap smear mechanism */ +#undef LEAP_SMEAR + /* Define to any value to include libseccomp sandboxing. */ #undef LIBSECCOMP @@ -1473,8 +1485,8 @@ /* Do we want the SCO clock hacks? */ #undef SCO5_CLOCK -/* The size of `char*', as computed by sizeof. */ -#undef SIZEOF_CHARP +/* The size of `char *', as computed by sizeof. */ +#undef SIZEOF_CHAR_P /* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT diff --git a/contrib/ntp/configure b/contrib/ntp/configure index 29d777c34ea0..1d686cbdcba8 100755 --- a/contrib/ntp/configure +++ b/contrib/ntp/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ntp 4.2.8p2. +# Generated by GNU Autoconf 2.69 for ntp 4.2.8p3. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -339,6 +367,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -515,28 +555,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -570,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ntp' PACKAGE_TARNAME='ntp' -PACKAGE_VERSION='4.2.8p2' -PACKAGE_STRING='ntp 4.2.8p2' +PACKAGE_VERSION='4.2.8p3' +PACKAGE_STRING='ntp 4.2.8p3' PACKAGE_BUGREPORT='http://bugs.ntp.org./' PACKAGE_URL='http://www.ntp.org./' @@ -626,6 +646,10 @@ GTEST_CXXFLAGS GTEST_LIBS GTEST_LDFLAGS GTEST_CONFIG +UNITYBUILD_AVAILABLE_FALSE +UNITYBUILD_AVAILABLE_TRUE +PATH_RUBY +HAVE_LEAPSMEARINTERVAL SAVECONFIG_ENABLED_FALSE SAVECONFIG_ENABLED_TRUE LSCF @@ -698,8 +722,6 @@ NMEDIT DSYMUTIL MANIFEST_TOOL RANLIB -ac_ct_AR -AR DLLTOOL OBJDUMP LN_S @@ -710,6 +732,8 @@ LD FGREP SED LIBTOOL +ac_ct_AR +AR INSTALL_UPDATE_LEAP_FALSE INSTALL_UPDATE_LEAP_TRUE UPDATE_LEAP_NI @@ -817,6 +841,7 @@ CPP am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -840,6 +865,8 @@ build_cpu build AM_BACKSLASH AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -1021,6 +1048,7 @@ enable_ipv6 with_kame enable_getifaddrs enable_saveconfig +enable_leap_smear with_gtest ' ac_precious_vars='build_alias @@ -1493,8 +1521,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1580,7 +1606,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ntp 4.2.8p2 to adapt to many kinds of systems. +\`configure' configures ntp 4.2.8p3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1650,7 +1676,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ntp 4.2.8p2:";; + short | recursive ) echo "Configuration of ntp 4.2.8p3:";; esac cat <<\_ACEOF @@ -1660,10 +1686,12 @@ Optional Features and Packages: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --with-locfile=XXX os-specific or "legacy" --enable-shared[=PKGS] build shared libraries [default=no] --enable-static[=PKGS] build static libraries [default=yes] @@ -1791,6 +1819,7 @@ Optional Features and Packages: --with-kame - =/usr/local/v6 --enable-getifaddrs + Enable the use of getifaddrs() [[yes|no]]. --enable-saveconfig + saveconfig mechanism + --enable-leap-smear - experimental leap smear code --with-gtest Use the gtest framework (Default: if it's available) Some influential environment variables: @@ -1879,10 +1908,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ntp configure 4.2.8p2 -generated by GNU Autoconf 2.68 +ntp configure 4.2.8p3 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2159,7 +2188,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2347,7 +2376,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2437,7 +2466,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2453,7 +2483,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2479,7 +2510,8 @@ int main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2495,7 +2527,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2529,7 +2562,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2704,8 +2738,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ntp $as_me 4.2.8p2, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by ntp $as_me 4.2.8p3, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3213,7 +3247,7 @@ $as_echo "$as_me: $cache_file version: $c_version" >&6;} NTP_CACHEVERSION_PARENT='main' ; export NTP_CACHEVERSION_PARENT -am__api_version='1.11' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3252,7 +3286,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -3310,9 +3344,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -3323,32 +3354,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -3360,6 +3399,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -3370,8 +3419,8 @@ test "$program_suffix" != NONE && ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -3382,15 +3431,15 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3399,10 +3448,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -3421,7 +3470,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3461,7 +3510,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3512,7 +3561,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -3541,12 +3590,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3565,7 +3608,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3629,6 +3672,45 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3651,7 +3733,7 @@ fi # Define the identity of the package. PACKAGE='ntp' - VERSION='4.2.8p2' + VERSION='4.2.8p3' cat >>confdefs.h <<_ACEOF @@ -3679,29 +3761,109 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' -AMTAR=${AMTAR-"${am_missing_run}tar"} +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi AM_BACKSLASH='\' @@ -3809,7 +3971,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3842,6 +4004,7 @@ fi if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3874,7 +4037,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3914,7 +4077,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3967,7 +4130,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4008,7 +4171,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4066,7 +4229,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4110,7 +4273,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4556,8 +4719,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4642,6 +4804,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4653,8 +4874,9 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4688,16 +4910,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4706,16 +4928,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4924,7 +5146,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4990,7 +5212,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5238,116 +5460,6 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } @@ -5360,8 +5472,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -5587,7 +5698,7 @@ main () return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO"; then : @@ -5644,7 +5755,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5684,7 +5795,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5737,7 +5848,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5778,7 +5889,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -5836,7 +5947,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5880,7 +5991,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6076,8 +6187,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -6162,6 +6272,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -6173,8 +6342,9 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -6208,16 +6378,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -6226,16 +6396,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -6291,20 +6461,6 @@ fi # Ralf Wildenhues: With per-target flags we need CC_C_O # AM_PROG_CC_C_O supersets AC_PROG_CC_C_O -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - if test $ac_cv_c_compiler_gnu = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 @@ -6655,7 +6811,7 @@ $as_echo_n "checking additional compiler flags... " >&6; } ntp_os_cflags="-Ae -Wp,-H18816" ;; esac - ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE" + ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE -D__STDC_VERSION__=199901L" ;; hpux*) case "$GCC" in @@ -6665,7 +6821,7 @@ $as_echo_n "checking additional compiler flags... " >&6; } # use Ansi compiler on HPUX ntp_os_cflags="-Ae" esac - ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE" + ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE -D__STDC_VERSION__=199901L" ;; irix6*) case "$CC" in @@ -7248,6 +7404,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Do we need CXX for anything besides google test? ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7276,7 +7433,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7320,7 +7477,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7516,8 +7673,9 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -7551,16 +7709,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -7569,16 +7727,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -7650,7 +7808,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_YACC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8002,6 +8160,177 @@ fi +if test -n "$ac_tool_prefix"; then + for ac_prog in ar lib "link -lib" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar lib "link -lib" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + +: ${AR=ar} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5 +$as_echo_n "checking the archiver ($AR) interface... " >&6; } +if ${am_cv_ar_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + am_cv_ar_interface=ar + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int some_variable = 0; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 + (eval $am_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + am_cv_ar_interface=ar + else + am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 + (eval $am_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + am_cv_ar_interface=lib + else + am_cv_ar_interface=unknown + fi + fi + rm -f conftest.lib libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 +$as_echo "$am_cv_ar_interface" >&6; } + +case $am_cv_ar_interface in +ar) + ;; +lib) + # Microsoft lib, so override with the ar-lib wrapper script. + # FIXME: It is wrong to rewrite AR. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__AR in this case, + # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something + # similar. + AR="$am_aux_dir/ar-lib $AR" + ;; +unknown) + as_fn_error $? "could not determine $AR interface" "$LINENO" 5 + ;; +esac + # So far, the only shared library we might use is libopts. @@ -8045,8 +8374,8 @@ esac -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -8153,7 +8482,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -8232,7 +8561,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -8488,7 +8817,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8532,7 +8861,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8951,7 +9280,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8991,7 +9320,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9297,7 +9626,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9337,7 +9666,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9440,7 +9769,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9484,7 +9813,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9609,7 +9938,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9649,7 +9978,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9708,7 +10037,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9748,7 +10077,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10383,7 +10712,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10423,7 +10752,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10503,7 +10832,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10543,7 +10872,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10595,7 +10924,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10635,7 +10964,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10687,7 +11016,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10727,7 +11056,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10779,7 +11108,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10819,7 +11148,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10871,7 +11200,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10911,7 +11240,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -18805,32 +19134,32 @@ fi # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char*" >&5 -$as_echo_n "checking size of char*... " >&6; } -if ${ac_cv_sizeof_charp+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char *" >&5 +$as_echo_n "checking size of char *... " >&6; } +if ${ac_cv_sizeof_char_p+:} false; then : $as_echo_n "(cached) " >&6 else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char*))" "ac_cv_sizeof_charp" "$ac_includes_default"; then : + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char *))" "ac_cv_sizeof_char_p" "$ac_includes_default"; then : else - if test "$ac_cv_type_charp" = yes; then + if test "$ac_cv_type_char_p" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (char*) +as_fn_error 77 "cannot compute sizeof (char *) See \`config.log' for more details" "$LINENO" 5; } else - ac_cv_sizeof_charp=0 + ac_cv_sizeof_char_p=0 fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_charp" >&5 -$as_echo "$ac_cv_sizeof_charp" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char_p" >&5 +$as_echo "$ac_cv_sizeof_char_p" >&6; } cat >>confdefs.h <<_ACEOF -#define SIZEOF_CHARP $ac_cv_sizeof_charp +#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p _ACEOF @@ -19294,7 +19623,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -19498,7 +19827,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19541,7 +19870,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19758,6 +20087,63 @@ done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 +$as_echo_n "checking for unsigned long long int... " >&6; } +if ${ac_cv_type_unsigned_long_long_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_type_unsigned_long_long_int=yes + if test "x${ac_cv_prog_cc_c99-no}" = xno; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + /* For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63; +int +main () +{ +/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + +else + ac_cv_type_unsigned_long_long_int=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 +$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } + if test $ac_cv_type_unsigned_long_long_int = yes; then + +$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h + + fi + + ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" if test "x$ac_cv_func_vsnprintf" = xyes; then : hw_cv_func_vsnprintf=yes @@ -19890,7 +20276,8 @@ main () { static int test_array [1 - 2 * !(/* On Ultrix 4.3 cc, long double is 4 and double is 8. */ sizeof (double) <= sizeof (long double))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -19913,75 +20300,47 @@ $as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 $as_echo_n "checking for long long int... " >&6; } if ${ac_cv_type_long_long_int+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - /* For now, do not test the preprocessor; as of 2007 there are too many - implementations with broken preprocessors. Perhaps this can - be revisited in 2012. In the meantime, code should not expect - #if to work with literals wider than 32 bits. */ - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; - unsigned long long int ull = 18446744073709551615ULL; - /* Test constant expressions. */ - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; - int i = 63; -int -main () -{ -/* Test availability of runtime routines for shift and division. */ - long long int llmax = 9223372036854775807ll; - unsigned long long int ullmax = 18446744073709551615ull; - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull)); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if test "$cross_compiling" = yes; then : ac_cv_type_long_long_int=yes + if test "x${ac_cv_prog_cc_c99-no}" = xno; then + ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int + if test $ac_cv_type_long_long_int = yes; then + if test "$cross_compiling" = yes; then : + : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - #ifndef LLONG_MAX - # define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - # define LLONG_MAX (HALF - 1 + HALF) - #endif + #ifndef LLONG_MAX + # define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + # define LLONG_MAX (HALF - 1 + HALF) + #endif int main () { long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0; ; return 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : - ac_cv_type_long_long_int=yes + else ac_cv_type_long_long_int=no fi @@ -19989,11 +20348,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi -else - ac_cv_type_long_long_int=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + fi + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 $as_echo "$ac_cv_type_long_long_int" >&6; } @@ -20009,7 +20365,9 @@ $as_echo_n "checking for unsigned long long int... " >&6; } if ${ac_cv_type_unsigned_long_long_int+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cv_type_unsigned_long_long_int=yes + if test "x${ac_cv_prog_cc_c99-no}" = xno; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* For now, do not test the preprocessor; as of 2007 there are too many @@ -20042,12 +20400,13 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_type_unsigned_long_long_int=yes + else ac_cv_type_unsigned_long_long_int=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 $as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } @@ -20122,7 +20481,8 @@ int main () { static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -20176,11 +20536,11 @@ else int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -20197,8 +20557,9 @@ main () ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -20214,10 +20575,10 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -20340,11 +20701,11 @@ else int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -20361,8 +20722,9 @@ main () ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -20378,10 +20740,10 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -21263,23 +21625,20 @@ else /* end confdefs.h. */ $ac_includes_default int -find_stack_direction () +find_stack_direction (int *addr, int depth) { - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; + int dir, dummy = 0; + if (! addr) + addr = &dummy; + *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; + dir = depth ? find_stack_direction (addr, depth - 1) : 0; + return dir + dummy; } int -main () +main (int argc, char **argv) { - return find_stack_direction () < 0; + return find_stack_direction (0, argc + !argv + 20) < 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : @@ -22252,7 +22611,8 @@ int main () { static int test_array [1 - 2 * !(((char) -1) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -22651,7 +23011,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -28278,6 +28638,9 @@ case "$ntp_cv_hdr_def_sigio" in *-sni-sysv*) ans=no ;; + *-stratus-vos) + ans=no + ;; *-univel-sysv*) ans=no ;; @@ -28356,6 +28719,9 @@ case "$ntp_cv_hdr_def_sigpoll" in *-sni-sysv*) ans=no ;; + *-stratus-vos) + ans=no + ;; *-*-aix[4-9]*) # XXX Only verified thru AIX6 ans=no @@ -28419,6 +28785,9 @@ case "$ntp_cv_hdr_def_sigpoll" in *-sni-sysv*) ans=no ;; + *-stratus-vos) + ans=no + ;; *-*-aix[4-9]*) # XXX Only verified thru AIX6 ans=no @@ -28598,7 +28967,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -28745,7 +29114,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PATH_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -28786,7 +29155,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PATH_TEST="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -28861,7 +29230,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PATH_NET_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -28889,6 +29258,20 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_NET_SNMP_CONFIG" >&5 $as_echo "$PATH_NET_SNMP_CONFIG" >&6; } +case "$PATH_NET_SNMP_CONFIG" in + /*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for net-snmp version" >&5 +$as_echo_n "checking for net-snmp version... " >&6; } +if ${ntp_cv_net_snmp_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ntp_cv_net_snmp_version=`$PATH_NET_SNMP_CONFIG --version` + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_net_snmp_version" >&5 +$as_echo "$ntp_cv_net_snmp_version" >&6; } + ;; +esac + case "$host" in *-*-vxworks*) ac_link="$ac_link $VX_KERNEL" @@ -29309,7 +29692,7 @@ fi done -for ac_header in sgtty.h stdlib.h string.h termio.h +for ac_header in sgtty.h stdatomic.h stdlib.h string.h termio.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -29627,6 +30010,53 @@ done ;; esac +case "$ac_cv_header_stdatomic_h" in + yes) + for ac_func in atomic_thread_fence +do : + ac_fn_c_check_func "$LINENO" "atomic_thread_fence" "ac_cv_func_atomic_thread_fence" +if test "x$ac_cv_func_atomic_thread_fence" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ATOMIC_THREAD_FENCE 1 +_ACEOF + +fi +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for atomic_thread_fence()" >&5 +$as_echo_n "checking for atomic_thread_fence()... " >&6; } +if ${ntp_cv_func_atomic_thread_fence+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + atomic_thread_fence(memory_order_seq_cst); + + + ; + return 0; +} + ntp_cv_func_atomic_thread_fence=yes +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ntp_cv_func_atomic_thread_fence=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_func_atomic_thread_fence" >&5 +$as_echo "$ntp_cv_func_atomic_thread_fence" >&6; } + ;; +esac + case "$host" in *-*-solaris2.6) # Broken... @@ -33974,7 +34404,26 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS_NTP="$CFLAGS_NTP -Wstrict-prototypes" esac +# Because we don't want -Werror for the EVP_MD_do_all_sorted check CFLAGS="$NTPO_SAVED_CFLAGS" + +case "$ntp_openssl" in + yes) + LIBS="$NTPO_SAVED_LIBS $LDADD_NTP" + for ac_func in EVP_MD_do_all_sorted +do : + ac_fn_c_check_func "$LINENO" "EVP_MD_do_all_sorted" "ac_cv_func_EVP_MD_do_all_sorted" +if test "x$ac_cv_func_EVP_MD_do_all_sorted" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_EVP_MD_DO_ALL_SORTED 1 +_ACEOF + +fi +done + + ;; +esac + CPPFLAGS="$NTPO_SAVED_CPPFLAGS" LIBS="$NTPO_SAVED_LIBS" { NTPO_SAVED_CFLAGS=; unset NTPO_SAVED_CFLAGS;} @@ -34491,6 +34940,9 @@ else *-sni-sysv*) ans=dosynctodr ;; + *-stratus-vos) + ans=no + ;; *-*-aix*) ans=dosynctodr ;; @@ -34553,6 +35005,9 @@ else *-sni-sysv*) ans=noprintf ;; + *-stratus-vos) + ans=no + ;; *-*-aix*) ans=noprintf ;; @@ -35004,6 +35459,11 @@ case "$ans" in case "$PATH_NET_SNMP_CONFIG" in /*) SNMP_LIBS=`$PATH_NET_SNMP_CONFIG --agent-libs` + # Bug 2815. This is a bit of a hack, but it works... + case "$ntp_cv_net_snmp_version" in + 5.3*) SNMP_LIBS=`echo $SNMP_LIBS | $SED -e 's/-lnetsnmpagent/-lnetsnmpagent -lnetsnmpmibs/'` + ;; + esac # HMS: we really want to separate CPPFLAGS and CFLAGS foo=`$PATH_NET_SNMP_CONFIG --cflags` @@ -35164,6 +35624,9 @@ case "$host" in *-sni-sysv*) ans=yes ;; + *-stratus-vos) + ans=no + ;; *-univel-sysv*) ans=no ;; @@ -36344,6 +36807,94 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 $as_echo "$ntp_ok" >&6; } +### + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we want the experimental leap smear code" >&5 +$as_echo_n "checking if we want the experimental leap smear code... " >&6; } +# Check whether --enable-leap-smear was given. +if test "${enable_leap_smear+set}" = set; then : + enableval=$enable_leap_smear; ntp_ok=$enableval +else + ntp_ok=no + +fi + +ntp_leap_smear_enabled=0 +case "$ntp_ok" in + yes) + ntp_leap_smear_enabled=1 + +$as_echo "#define LEAP_SMEAR 1" >>confdefs.h + + + HAVE_LEAPSMEARINTERVAL="leapsmearinterval 0" + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 +$as_echo "$ntp_ok" >&6; } + + +# We may not need have_unity +have_unity=false +# Extract the first word of "ruby", so it can be a program name with args. +set dummy ruby; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_RUBY+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PATH_RUBY in + [\\/]* | ?:[\\/]*) + ac_cv_path_PATH_RUBY="$PATH_RUBY" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_RUBY="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PATH_RUBY=$ac_cv_path_PATH_RUBY +if test -n "$PATH_RUBY"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_RUBY" >&5 +$as_echo "$PATH_RUBY" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +case "$PATH_RUBY" in + /*) + have_unity=true + ;; + *) PATH_RUBY="false" + ;; +esac +# We may not need UNITYBUILD_AVAILABLE + if $have_unity; then + UNITYBUILD_AVAILABLE_TRUE= + UNITYBUILD_AVAILABLE_FALSE='#' +else + UNITYBUILD_AVAILABLE_TRUE='#' + UNITYBUILD_AVAILABLE_FALSE= +fi + + + + gta=false @@ -36375,7 +36926,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTEST_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -36530,12 +37081,20 @@ ac_config_files="$ac_config_files scripts/summary" ac_config_files="$ac_config_files scripts/update-leap/Makefile" +ac_config_files="$ac_config_files scripts/update-leap/update-leap" + ac_config_files="$ac_config_files tests/Makefile" +ac_config_files="$ac_config_files tests/bug-2803/Makefile" + ac_config_files="$ac_config_files tests/libntp/Makefile" ac_config_files="$ac_config_files tests/ntpd/Makefile" +ac_config_files="$ac_config_files tests/sandbox/Makefile" + +ac_config_files="$ac_config_files tests/sec-2853/Makefile" + ac_config_files="$ac_config_files util/Makefile" @@ -36685,6 +37244,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -36758,6 +37325,10 @@ if test -z "${SAVECONFIG_ENABLED_TRUE}" && test -z "${SAVECONFIG_ENABLED_FALSE}" as_fn_error $? "conditional \"SAVECONFIG_ENABLED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${UNITYBUILD_AVAILABLE_TRUE}" && test -z "${UNITYBUILD_AVAILABLE_FALSE}"; then + as_fn_error $? "conditional \"UNITYBUILD_AVAILABLE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GTEST_AVAILABLE_TRUE}" && test -z "${GTEST_AVAILABLE_FALSE}"; then as_fn_error $? "conditional \"GTEST_AVAILABLE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -37060,16 +37631,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -37129,28 +37700,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -37171,8 +37730,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ntp $as_me 4.2.8p2, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by ntp $as_me 4.2.8p3, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -37238,11 +37797,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ntp config.status 4.2.8p2 -configured by $0, generated by GNU Autoconf 2.68, +ntp config.status 4.2.8p3 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -37333,7 +37892,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -37780,9 +38339,13 @@ do "scripts/plot_summary") CONFIG_FILES="$CONFIG_FILES scripts/plot_summary" ;; "scripts/summary") CONFIG_FILES="$CONFIG_FILES scripts/summary" ;; "scripts/update-leap/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/update-leap/Makefile" ;; + "scripts/update-leap/update-leap") CONFIG_FILES="$CONFIG_FILES scripts/update-leap/update-leap" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; + "tests/bug-2803/Makefile") CONFIG_FILES="$CONFIG_FILES tests/bug-2803/Makefile" ;; "tests/libntp/Makefile") CONFIG_FILES="$CONFIG_FILES tests/libntp/Makefile" ;; "tests/ntpd/Makefile") CONFIG_FILES="$CONFIG_FILES tests/ntpd/Makefile" ;; + "tests/sandbox/Makefile") CONFIG_FILES="$CONFIG_FILES tests/sandbox/Makefile" ;; + "tests/sec-2853/Makefile") CONFIG_FILES="$CONFIG_FILES tests/sec-2853/Makefile" ;; "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -38419,7 +38982,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -38432,7 +38995,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -38466,21 +39029,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -39315,7 +39876,7 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX _LT_EOF ;; - "ntpd/complete.conf":F) sed -e '/^rlimit$/d' < ntpd/complete.conf > ntpd/complete.conf.new && mv ntpd/complete.conf.new ntpd/complete.conf ;; + "ntpd/complete.conf":F) sed -e '/^rlimit$/d' -e '/^$/d' < ntpd/complete.conf > ntpd/complete.conf.new && mv ntpd/complete.conf.new ntpd/complete.conf ;; "ntpdc/nl.pl":F) chmod +x ntpdc/nl.pl ;; "scripts/build/mkver":F) chmod +x scripts/build/mkver ;; "scripts/calc_tickadj/calc_tickadj":F) chmod +x scripts/calc_tickadj/calc_tickadj ;; @@ -39325,6 +39886,7 @@ _LT_EOF "scripts/ntpver":F) chmod +x scripts/ntpver ;; "scripts/plot_summary":F) chmod +x scripts/plot_summary ;; "scripts/summary":F) chmod +x scripts/summary ;; + "scripts/update-leap/update-leap":F) chmod +x scripts/update-leap/update-leap ;; esac done # for ac_tag diff --git a/contrib/ntp/configure.ac b/contrib/ntp/configure.ac index dc5c7fcfd703..de6043015b17 100644 --- a/contrib/ntp/configure.ac +++ b/contrib/ntp/configure.ac @@ -65,6 +65,7 @@ ntp_jupiter_ok=${ntp_jupiter_ok=no} NTP_PROG_CC AC_PROG_CPP +# Do we need CXX for anything besides google test? AC_PROG_CXX AC_PROG_YACC AC_PROG_CC_C_O @@ -180,6 +181,15 @@ case "$PROG_NET_SNMP_CONFIG" in esac AC_MSG_RESULT([$PATH_NET_SNMP_CONFIG]) +case "$PATH_NET_SNMP_CONFIG" in + /*) AC_CACHE_CHECK( + [for net-snmp version], + [ntp_cv_net_snmp_version], + [ntp_cv_net_snmp_version=`$PATH_NET_SNMP_CONFIG --version`] + ) + ;; +esac + case "$host" in *-*-vxworks*) ac_link="$ac_link $VX_KERNEL" @@ -291,7 +301,7 @@ AC_CHECK_HEADER( AC_CHECK_HEADERS([fcntl.h fnmatch.h ieeefp.h inttypes.h kvm.h math.h]) AC_CHECK_HEADERS([memory.h netdb.h poll.h]) -AC_CHECK_HEADERS([sgtty.h stdlib.h string.h termio.h]) +AC_CHECK_HEADERS([sgtty.h stdatomic.h stdlib.h string.h termio.h]) AC_CHECK_HEADERS([termios.h timepps.h timex.h unistd.h]) case "$host" in @@ -375,6 +385,28 @@ case "$host" in ;; esac +case "$ac_cv_header_stdatomic_h" in + yes) + AC_CHECK_FUNCS([atomic_thread_fence]) + AC_CACHE_CHECK( + [for atomic_thread_fence()], + [ntp_cv_func_atomic_thread_fence], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ + #include + ]], + [[ + atomic_thread_fence(memory_order_seq_cst); + ]] + )] + [ntp_cv_func_atomic_thread_fence=yes], + [ntp_cv_func_atomic_thread_fence=no] + )] + ) + ;; +esac + case "$host" in *-*-solaris2.6) # Broken... @@ -3426,6 +3458,9 @@ AC_CACHE_CHECK( *-sni-sysv*) ans=dosynctodr ;; + *-stratus-vos) + ans=no + ;; *-*-aix*) ans=dosynctodr ;; @@ -3480,6 +3515,9 @@ AC_CACHE_CHECK( *-sni-sysv*) ans=noprintf ;; + *-stratus-vos) + ans=no + ;; *-*-aix*) ans=noprintf ;; @@ -3873,6 +3911,11 @@ case "$ans" in case "$PATH_NET_SNMP_CONFIG" in /*) SNMP_LIBS=`$PATH_NET_SNMP_CONFIG --agent-libs` + # Bug 2815. This is a bit of a hack, but it works... + case "$ntp_cv_net_snmp_version" in + 5.3*) SNMP_LIBS=`echo $SNMP_LIBS | $SED -e 's/-lnetsnmpagent/-lnetsnmpagent -lnetsnmpmibs/'` + ;; + esac AC_SUBST([SNMP_LIBS]) # HMS: we really want to separate CPPFLAGS and CFLAGS foo=`$PATH_NET_SNMP_CONFIG --cflags` @@ -3986,6 +4029,9 @@ case "$host" in *-sni-sysv*) ans=yes ;; + *-stratus-vos) + ans=no + ;; *-univel-sysv*) ans=no ;; @@ -4306,6 +4352,31 @@ esac AM_CONDITIONAL([SAVECONFIG_ENABLED], [test x$ntp_saveconfig_enabled = x1]) AC_MSG_RESULT([$ntp_ok]) +### + +AC_MSG_CHECKING([if we want the experimental leap smear code]) +AC_ARG_ENABLE( + [leap-smear], + [AS_HELP_STRING( + [--enable-leap-smear], + [- experimental leap smear code] + )], + [ntp_ok=$enableval], + [ntp_ok=no] +) +ntp_leap_smear_enabled=0 +case "$ntp_ok" in + yes) + ntp_leap_smear_enabled=1 + AC_DEFINE([LEAP_SMEAR], [1], [leap smear mechanism]) + AC_SUBST([HAVE_LEAPSMEARINTERVAL]) + HAVE_LEAPSMEARINTERVAL="leapsmearinterval 0" + ;; +esac +AC_MSG_RESULT([$ntp_ok]) + +NTP_UNITYBUILD + dnl gtest is needed for our tests subdirs. It would be nice if we could dnl require a C++ compiler only if we will use gtest, but AC_PROG_CXX dnl can't be conditionalized. @@ -4326,7 +4397,7 @@ AC_CONFIG_FILES([kernel/sys/Makefile]) AC_CONFIG_FILES([libntp/Makefile]) AC_CONFIG_FILES([libparse/Makefile]) AC_CONFIG_FILES([ntpd/Makefile]) -AC_CONFIG_FILES([ntpd/complete.conf], [sed -e '/^rlimit$/d' < ntpd/complete.conf > ntpd/complete.conf.new && mv ntpd/complete.conf.new ntpd/complete.conf]) +AC_CONFIG_FILES([ntpd/complete.conf], [sed -e '/^rlimit$/d' -e '/^$/d' < ntpd/complete.conf > ntpd/complete.conf.new && mv ntpd/complete.conf.new ntpd/complete.conf]) AC_CONFIG_FILES([ntpdate/Makefile]) AC_CONFIG_FILES([ntpdc/Makefile]) AC_CONFIG_FILES([ntpdc/nl.pl], [chmod +x ntpdc/nl.pl]) @@ -4349,9 +4420,13 @@ AC_CONFIG_FILES([scripts/ntpver], [chmod +x scripts/ntpver]) AC_CONFIG_FILES([scripts/plot_summary], [chmod +x scripts/plot_summary]) AC_CONFIG_FILES([scripts/summary], [chmod +x scripts/summary]) AC_CONFIG_FILES([scripts/update-leap/Makefile]) +AC_CONFIG_FILES([scripts/update-leap/update-leap], [chmod +x scripts/update-leap/update-leap]) AC_CONFIG_FILES([tests/Makefile]) +AC_CONFIG_FILES([tests/bug-2803/Makefile]) AC_CONFIG_FILES([tests/libntp/Makefile]) AC_CONFIG_FILES([tests/ntpd/Makefile]) +AC_CONFIG_FILES([tests/sandbox/Makefile]) +AC_CONFIG_FILES([tests/sec-2853/Makefile]) AC_CONFIG_FILES([util/Makefile]) perllibdir="${datadir}/ntp/lib" diff --git a/contrib/ntp/html/drivers/driver22.html b/contrib/ntp/html/drivers/driver22.html index 6e01a38cfe3f..acae265d2950 100644 --- a/contrib/ntp/html/drivers/driver22.html +++ b/contrib/ntp/html/drivers/driver22.html @@ -80,7 +80,7 @@
Specifies PPS capture on the rising (assert) pulse edge if 0 (default) or falling (clear) pulse edge if 1. Not used under Windows - if the special serialpps.sys serial port driver is installed then the leading edge will always be used.
flag3 0 | 1
-
Controls the kernel PPS discipline: 0 for disable (default), 1 for enable. Not used under Windows - if the special serialpps.sys<\tt> serial port driver is used then kernel PPS will be available and used.
+
Controls the kernel PPS discipline: 0 for disable (default), 1 for enable. Not used under Windows - if the special serialpps.sys serial port driver is used then kernel PPS will be available and used.
flag4 0 | 1
Record a timestamp once for each second if 1. Useful for constructing Allan deviation plots.
diff --git a/contrib/ntp/html/drivers/driver40-ja.html b/contrib/ntp/html/drivers/driver40-ja.html new file mode 100644 index 000000000000..8b67e9009d40 --- /dev/null +++ b/contrib/ntp/html/drivers/driver40-ja.html @@ -0,0 +1,534 @@ + + + + + + + + + + JJY Receivers + + + + + + +

JJY Receivers

+

Last update: + 15-May-2015 00:00 + UTC          ENGLISH（英語）   JAPANESE（日本語）

+
+

Synopsis

+ Address: 127.127.40.u
+ Reference ID: JJY
+ Driver ID: JJY
+ Serial Port: /dev/jjyu; それぞれのJJY受信機、GPS時計、テレフォンJJYを参照して下さい。 +

Description

+

このドライバーは、以下の、日本で販売されている JJY受信機、GPS時計と、電話回線による時刻配信サービスをサポートしています。 +

+ + + + + +
+ トライステート   TS-JJY01, TS-JJY02
+ シーデックス   JST2000
+ エコー計測器   LT-2000
+ シチズンTIC   JJY-200
+ トライステート   TS-GPSclock-01
+ 		+ セイコー タイム システム   TDC-300
+ テレフォンJJY
+
+
    + +
  • +

    トライステート   TS-JJY01, TS-JJY02   http://www.tristate.ne.jp/ (日本語)


    +
    +
    NTPの設定 ( ntp.conf )
    +

    +
    +
    server   127.127.40.X   mode 1
    +

    +
    fudge   127.127.40.X   time1 0.NNN   flag1 0|1
    +
    +

    Time1 は、受信機からの時刻に加算する調整時間を、固定小数点形式の秒で設定します。
    + この受信機には、数10ミリ秒 ( 0.0NN秒 ) から百数10ミリ秒 ( 0.1NN秒 ) の調整時間を設定すると良いでしょう。

    +

    Flag1 は、時刻同期には無関係です。Flag1 を 1 に設定すると、状態を問い合わせるコマンドを DATE コマンドと STIM コマンドの前に発行して、応答を clockstats ファイルに記録します。

    + + + +
    0 (Default)DCST と STUS コマンドは、発行しません。
    1DCST と STUS コマンドを、発行します。
    +
    +
    +
    +
    +
    インターフェース
    +
    +

    RS-232C, 9600 BPS, 8ビット, パリティなし, 1ストップ・ビット

    +
    +
    +
    日時データの形式
    +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    コマンド --> 応答
    dcst{CR}{LF} --> valid{CR}{LF} | invalid{CR}{LF}
    stus{CR}{LF} --> adjusted{CR}{LF} | unadjusted{CR}{LF}
    time{CR}{LF} --> HH:MM:SS{CR}{LF}
    date{CR}{LF} --> YYYY/MM/DD WWW{CR}{LF}
    stim{CR}{LF} --> HH:MM:SS{CR}{LF}
    +

    日付と時刻は、別々に問い合わせます。日付が深夜０時の前か後かの不確定をチェックするため、日付の問い合わせの前後に時刻を問い合わせています。


    +
    +
    +
    • + +
  • +

    シーデックス   JST2000   http://www.c-dex.co.jp/ (日本語)


    +
    +
    NTPの設定 ( ntp.conf )
    +

    +
    +
    server   127.127.40.X   mode 2
    +

    +
    fudge   127.127.40.X   time1 0.NNN
    +
    +
    +
    +
    インターフェース
    +
    +

    RS-232C, 9600 BPS, 8ビット, パリティなし, 1ストップ・ビット

    +
    +
    +
    日時データの形式
    +

    + + + + + + + + + + + +
    コマンド --> 応答
    {ENQ}1J{ETX} --> {STX}JYYMMDD HHMMSSS{ETX}
    +
    +
    +
    +
    • + +
  • +

    エコー計測器   LT-2000   http://www.clock.co.jp/ (日本語)


    +
    +
    NTPの設定 ( ntp.conf )
    +

    +
    +
    server   127.127.40.X   mode 3
    +

    +
    fudge   127.127.40.X   time1 0.NNN
    +
    +
    +
    +
    Interface
    +
    +

    RS-232C, 9600 BPS, 8ビット, パリティなし, 1ストップ・ビット

    +
    +
    +
    Time code format
    +

    + + + + + + + + + + + + + + + + + + + + + +
    コマンド --> 応答
    C --> ( Mode 2 : Continuous )
    ( Every second before 0.5 second )YYMMDDWHHMMSS{ST1}{ST2}{ST3}{ST4}{CR}
    # --> ( Mode 1 : Request&Send )
    +
    +
    +
    +
    • + +
  • +

    シチズンTIC   JJY-200   http://www.tic-citizen.co.jp/ (日本語)


    +
    +
    NTPの設定 ( ntp.conf )
    +

    +
    +
    server   127.127.40.X   mode 4
    +

    +
    fudge   127.127.40.X   time1 0.NNN
    +
    +
    +
    +
    インターフェース
    +
    +

    RS-232C, 4800 BPS, 8ビット, パリティなし, 1ストップ・ビット

    +
    +
    +
    日時データの形式
    +

    + + + + + + + + + + + +
    コマンド --> 応答
    ( Every second )'XX YY/MM/DD W HH:MM:SS{CR}
    +
    +
    +
    +
    • + +
  • +

    トライステート   TS-GPSclock-01   http://www.tristate.ne.jp/ (日本語)

    +

    このドライバーは、JJY受信機ではないGPS時計のトライステート TS-GPSclock-01 のコマンド・レスポンス・モードをサポートします。
    + TS-GPSclock-01 は、オンボードのスイッチとメニューでコマンド・レスポンス・モードとタイム・ゾーンをJST（日本標準時）に設定しなければなりまん。
    + この Type 40 のドライバーの他, TS-GPSclock-01 のNMEAモードは、一般 NMEA GPS ドライバー ( Type 20 ) でも利用することができます。

    +
    +
    NTPの設定 ( ntp.conf )
    +

    +
    +
    server   127.127.40.X   mode 5
    +

    +
    fudge   127.127.40.X   time1 0.NNN   flag1 0|1
    +
    +

    Time1 は、受信機からの時刻に加算する調整時間を、固定小数点形式の秒で設定します

    +

    Flag1 は、時刻同期には無関係です。Flag1 を 1 に設定すると、状態を問い合わせるコマンドを DATE コマンドと STIM コマンドの前に発行して、応答を clockstats ファイルに記録します。

    + + + +
    0 (Default)STUS コマンドは、発行しません。
    1STUS コマンドを、発行します。
    +
    +
    +
    +
    +
    インターフェース
    +
    +

    USB ( /dev/ttyACM0 )

    +
    +
    +
    日時データの形式
    +

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    コマンド --> 応答
    stus{CR}{LF} --> *R{CR}{LF} | *G{CR}{LF} | *U{CR}{LF} | +U{CR}{LF}
    time{CR}{LF} --> HH:MM:SS{CR}{LF}
    date{CR}{LF} --> YYYY/MM/DD{CR}{LF}
    time{CR}{LF} --> HH:MM:SS{CR}{LF}
    +

    日付と時刻は、別々に問い合わせます。日付が深夜０時の前か後かの不確定をチェックするため、日付の問い合わせの前後に時刻を問い合わせています。


    +
    +
    +
    • + +
  • +

    セイコー タイム システム   TDC-300   http://www.seiko-sts.co.jp/ (英語と日本語)


    +

    TDC-300 は、フロント・パネルのメニュー表示とスイッチで type 3 のデータ形式に設定しなければなりません。

    +
    +
    NTP configuration ( ntp.conf )
    +

    +
    +
    server   127.127.40.X   mode 6
    +

    +
    fudge   127.127.40.X   time1 0.NNN
    +
    +
    +
    +
    インターフェース
    +
    +

    RS-232C, 2400 BPS, 8-bits, no parity, 1 stop bit

    +
    +
    +
    日時データの形式
    +

    + + + + + + + + + + + + + + + + +
    コマンド --> 応答
    {STX}YYMMDDWHHMMSS{ETX}
    ( 5 to 10 mSec. before second ){STX}{xE5}{ETX}
    +
    +
    +
    +
    • + +
  • +

    テレフォンJJY   http://jjy.nict.go.jp/ (英語と日本語)

    +

    テレフォンJJYは、電話回線による時刻配信サービスです。
    + このサービスは、国立研究開発法人　情報通信研究機構が提供しています。

    +

    注意：　このモード（テレフォンJJY）は、refclock_acts ( Type 18 ) のドライバーと同時に利用することはできません。 + 設定ファイルの phone は、server と関係付けられていないため、ドライバーの refclock_acts ( type 18 ) も、この refclock_jjy ( type 40, mode 100 to 180 ) のいずれも、 + 複数の phone のうち、どれが自分に関係するものか識別できないからです。

    +
    +
    NTPの設定 ( ntp.conf )
    +
    +
    +
    server   127.127.40.X   mode (100, 101 to 180)   minpoll N
    +
    +

    モード 100 を設定した場合、このドライバーは、遅延を計測するためのループバック・コマンドは発行せず、電話回線とシステムの処理による遅延は調整しません。
    + モード 101 から 180 を設定した場合、このドライバーは、ループバック・コマンドを発行して、テレフォンJJYのループバック回路を通して電話回線とシステムの処理による遅延を計測します。
    + テレフォンJJYのループバック回路を経由した往復の時間は、5回、計測されます。 + それぞれの遅延時間のうち、700ミリ秒を超えたものは、平均遅延時間の計算より除外されます。 + また、700ミリ秒以下の有効な遅延時間が、3回以上の場合は、そのうち、最大の遅延時間は、平均遅延時間の計算より除外され、 + 4回以上の場合は、そのうち、最小の遅延時間は、平均遅延時間の計算より除外されます。 + 調整時間は、往復時間　×　( モード番号 - 100 ) % で計算し、同期する時刻に加算されます。
    + モード 101 から 180 を設定して自動遅延補正を選択するなら、モード 145 から 165 が良いでしょう。

    +

    デフォルトの日時問い合わせ処理間隔 6 ( 64 秒 ) は、このモードには、短すぎます。　"minpoll" は、8 ( 256 秒, 約 4 分 ) 以上を設定して下さい。
    + 日時問い合わせ処理間隔は、秒数を 2 のべき乗で指定します。　minpoll の値が、12 なら 4096 秒（約1時間）、14 なら 16384 秒（約4.5時間）、16 なら 65536 秒（約18時間）となります。


    +
    +
    fudge   127.127.40.X   flag1 0|1   flag2 0|1   flag3 0|1   flag4 0|1
    +
    +

    Time1 は、受信機からの時刻に加算する調整時間を、固定小数点形式の秒で設定します。
    + mode 100 の場合は、time1 で調整する時間を設定したほうが良いでしょう。
    + mode 101 から 180 の場合は、このドライバーが計測したループバックの遅延時間の一定の割合を同期時刻に加算しますので、time1 は設定しないほうが良いでしょう。

    +
    Flag1 は、タッチ・トーンかダイヤル・パルスかを指定します。
    + + + +
    0 (Default)タッチ・トーンATDWTnn...nn
    1ダイヤル・パルスATDWPnn...nn
    +
    +
    Flag2 は、エラー訂正プロトコルを指定します。
    + + + +
    0 (Default)ノーマル（エラー訂正なし）AT\N0
    1V42, MNP, ノーマルの自動選択AT\N3
    +
    +
    Flag3 は、スピーカーのオン／オフを指定します。
    + + + +
    0 (Default)オフATM0Ln
    1オンATM2Ln
    +
    +
    Flag4 は、スピーカーの音量を指定します。
    + + + +
    0 (Default)低ATMnL1
    1中ATMnL2
    +
    +
    +
    phone 042NNNNNNN
    +
    +

    電話番号は、http://jjy.nict.go.jp/ で公開されています。
    + 電話番号の桁数をチェックしています。もし、日本国外から発信するために国際電話アクセス番号と国番号を付加すると、桁数制限を超えます。
    + また、電話番号の最初の2桁や3桁をチェックしています。日本の緊急番号や特別のサービスの番号を指定することはできません。
    + 内線から外線に発信する時は、"0," ( ゼロとカンマ ) を先頭に付加して下さい。外線発信番号は、チェックしていて、それ以外の外線発信番号を指定することはできません。

    +
    +
    +
    +
    +
    インターフェース
    +
    +

    RS-232C 又は USB, 2400 BPS, 8ビット, パリティなし, 1ストップ・ビット

    +

    モデム制御コマンド:
    + ATE0Q0V1, ATMnLn, AT&K4, AT+MS=V22B, AT%C0, AT\Nn, ATH1, ATDWxnn...nn
    + +++, ATH0

    +
    +
    +
    日時データの形式
    +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    プロンプト --> コマンド --> 応答
    Name{SP}?{SP} --> TJJY{CR} --> Welcome messages
    > --> LOOP{CR} --> ( Switch to the loopback circuit )
       ( One char. ) --> ( One char. )
       COM{CR} --> ( Exit from the loopback circuit )
    > --> TIME{CR} --> HHMMSS{CR}HHMMSS{CR}HHMMSS{CR} 3 times on second
    > --> 4DATE{CR} --> YYYYMMDD{CR}
    > --> LEAPSEC{CR} --> {SP}0{CR} | +1{CR} | -1{CR}
    > --> TIME{CR} --> HHMMSS{CR}HHMMSS{CR}HHMMSS{CR} 3 times on second
    > --> BYE{CR} --> Sayounara messages
    +

    日付と時刻は、別々に問い合わせます。日付が深夜０時の前か後かの不確定をチェックするため、日付の問い合わせの前後に時刻を問い合わせています。
    + うるう秒は、処理していません。情報として clockstats ファイルに記録しているだけです。

    +
    +
    +
    +
    • + +
+ +

JJY は、長波で日本標準時(JST)を送信している無線局で、国立研究開発法人　情報通信研究機構が運用しています。JJY の運用情報などは、 http://www.nict.go.jp/（英語と日本語）や http://jjy.nict.go.jp/（英語と日本語）で提供されています。

+

実際のシリアル・ポートのデバイスにシンボリック・リンクを作成して下さい。シンボリック・リンクを作成するコマンドは、以下のとおりです。

+

ln -s /dev/ttyS0 /dev/jjy0

+

RS-232C から USB への変換ケーブルを利用して、JJY受信機、GPS時計、モデムをRS-232Cポートではなく、USBに接続することができます。この場合のシンボリック・リンクを作成するコマンドは、以下のとおりです。

+

ln -s /dev/ttyUSB0 /dev/jjy0

+

Windows NT の場合は、 COMX: の数字部分がドライバーのユニット番号に使用されます。 ドライバーのユニット 1 は、COM1: にユニット 3 は、COM3: に対応します。

+

Monitor Data

+

このドライバーは、JJY受信機、GPS時計、モデムとの送受信データを clockstats ファイルに記録します。

+

+ statsdir /var/log/ntpd/
+ filegen clockstats file clockstats type day enable +

+
レコード中のマークについて
+ + + + + + + + +
JJY 情報（このドライバーの開始または終了）
--> 送信データ
<-- 受信データ
--- 情報
=== 情報（ポーリングの開始、および、同期時刻）
-W- 警告メッセージ
-X- エラー・メッセージ
+

Fudge Factors

+
+
time1 time
+
受信機からの時刻に対する調整時間を、固定小数点形式の秒で設定します。デフォルトは、0.0秒です。
+
time2 time
+
未使用。
+
stratum number
+
NTPの階層番号を 0 から 15 で指定します。デフォルトは、0です。
+
refid string
+
ドライバーIDで、ASCII の1文字から4文字で指定します。デフォルトは、JJY です。
+
flag1 0 | 1
+
それぞれのモードを参照して下さい。
+
flag2 0 | 1
+
それぞれのモードを参照して下さい。
+
flag3 0 | 1
+
それぞれのモードを参照して下さい。
+
flag4 0 | 1
+
それぞれのモードを参照して下さい。
+
+
+ + + + diff --git a/contrib/ntp/html/drivers/driver40.html b/contrib/ntp/html/drivers/driver40.html index 6799f7699611..356429e499e6 100644 --- a/contrib/ntp/html/drivers/driver40.html +++ b/contrib/ntp/html/drivers/driver40.html @@ -5,6 +5,7 @@ + JJY Receivers @@ -15,8 +16,8 @@

JJY Receivers

Last update: - 3-May-2011 00:20 - UTC

+ 15-May-2015 00:00 + UTC          ENGLISH   JAPANESE

Synopsis

Address: 127.127.40.u
@@ -24,19 +25,37 @@ Driver ID: JJY
Serial Port: /dev/jjyu; See corresponding receiver

Description

-

This driver supports the following JJY receivers sold in Japan.

+

This driver supports the following the JJY receivers and the GPS clock sold in Japan, and the time service through a telephone line. +

+ + + + + +
+ Tristate Ltd.   TS-JJY01, TS-JJY02
+ C-DEX Co.,Ltd.   JST2000
+ Echo Keisokuki Co.,Ltd.   LT-2000
+ CITIZEN T.I.C. CO.,LTD.   JJY-200
+ Tristate Ltd.   TS-GPSclock-01
+ 		+ SEIKO TIME SYSTEMS INC.   TDC-300
+ Telephone JJY
+
  • -

    Tristate Ltd. JJY01, JJY02 http://www.tristate.ne.jp/ (Japanese only)


    +

    Tristate Ltd.   TS-JJY01, TS-JJY02   http://www.tristate.ne.jp/ (Japanese only)


    NTP configuration ( ntp.conf )
    -
    -

    server   127.127.40.X   mode 1

    +

    -
    fudge   127.127.40.X   flag1 0|1
    +
    server   127.127.40.X   mode 1
    +

    +
    fudge   127.127.40.X   time1 0.NNN   flag1 0|1
    -

    Flag1 has no effect for time synchronization. When a flag1 is set to 1, status commands are issued before DATE and STIM commands, and write a response text into a clockstats file.

    +

    Time1 may specify a constant to be added to the time offset for the time from the receiver, a fixed-point decimal number in seconds. You may specify the time offset from several tens of milli-seconds ( 0.0NN seconds ) to a hundred and several tens of milli-seconds ( 0.1NN seconds ) for this clock.

    +

    Flag1 has no effect for time synchronization. When flag1 is set to 1, status commands are issued before DATE and STIM commands, and write a response text into the clockstats file.

    @@ -47,7 +66,7 @@
    Interface
    -

    RS-232C, 9600 baud, 8-bits, no parity, 1 stop bit

    +

    RS-232C, 9600 BPS, 8-bits, no parity, 1 stop bit


    Time code format
    @@ -58,6 +77,21 @@ + + + + + + + + + + + + + + + @@ -69,22 +103,26 @@
    0 (Default)DCST and STUS commands are not issued
    1DCST and STUS commands are issued
     -->  Reply
    dcst{CR}{LF} --> valid{CR}{LF} | invalid{CR}{LF}
    stus{CR}{LF} --> adjusted{CR}{LF} | unadjusted{CR}{LF}
    time{CR}{LF} --> HH:MM:SS{CR}{LF}
    date{CR}{LF}  --> HH:MM:SS{CR}{LF}
    -
    +

    The date and time are requested separately. The time is requested before and after the date request to check uncertainty of the date whether it's before or after midnight.


  • -

    C-DEX Co.,Ltd. JST2000 http://www.c-dex.co.jp/ (Japanese only)


    +

    C-DEX Co.,Ltd.   JST2000   http://www.c-dex.co.jp/ (Japanese only)


    NTP configuration ( ntp.conf )
    -
    -

    server   127.127.40.X   mode 2

    +

    +
    +
    server   127.127.40.X   mode 2
    +

    +
    fudge   127.127.40.X   time1 0.NNN
    +

    Interface
    -

    RS-232C, 9600 baud, 8-bits, no parity, 1 stop bit

    +

    RS-232C, 9600 BPS, 8-bits, no parity, 1 stop bit


    Time code format
    @@ -107,16 +145,20 @@
  • -

    Echo Keisokuki Co.,Ltd. LT-2000 http://www.clock.co.jp/ (Japanese only)


    +

    Echo Keisokuki Co.,Ltd.   LT-2000   http://www.clock.co.jp/ (Japanese only)


    NTP configuration ( ntp.conf )
    -
    -

    server   127.127.40.X   mode 3

    +

    +
    +
    server   127.127.40.X   mode 3
    +

    +
    fudge   127.127.40.X   time1 0.NNN
    +

    Interface
    -

    RS-232C, 9600 baud, 8-bits, no parity, 1 stop bit

    +

    RS-232C, 9600 BPS, 8-bits, no parity, 1 stop bit


    Time code format
    @@ -149,16 +191,20 @@
  • -

    CITIZEN T.I.C. CO.,LTD. JJY-200 http://www.tic-citizen.co.jp/ (Japanese only)


    +

    CITIZEN T.I.C. CO.,LTD.   JJY-200   http://www.tic-citizen.co.jp/ (Japanese only)


    NTP configuration ( ntp.conf )
    -
    -

    server   127.127.40.X   mode 4

    +

    +
    +
    server   127.127.40.X   mode 4
    +

    +
    fudge   127.127.40.X   time1 0.NNN
    +

    Interface
    -

    RS-232C, 4800 baud, 8-bits, no parity, 1 stop bit

    +

    RS-232C, 4800 BPS, 8-bits, no parity, 1 stop bit


    Time code format
    @@ -181,16 +227,18 @@
  • -

    Tristate Ltd. TS-GPSclock-01 http://www.tristate.ne.jp/ (Japanese only)

    +

    Tristate Ltd.   TS-GPSclock-01   http://www.tristate.ne.jp/ (Japanese only)

    This driver supports the Tristate TS-GPSclock-01 in command/response mode, though it is a GPS clock, not JJY radio clock. Using the menus and the onboard switches, the TS-GPSclock-01 should be set to command/response mode and JST time zone.
    Besides this driver ( Type 40 ), the generic NMEA GPS driver ( Type 20 ) supports the TS-GPSclock-01 in NMEA mode.

    NTP configuration ( ntp.conf )
    -
    -

    server   127.127.40.X   mode 5

    +

    -
    fudge   127.127.40.X   flag1 0|1
    +
    server   127.127.40.X   mode 5
    +

    +
    fudge   127.127.40.X   time1 0.NNN   flag1 0|1
    +

    Time1 may specify a constant to be added to the time offset for the time from the receiver, a fixed-point decimal number in seconds.

    Flag1 has no effect for time synchronization. When a flag1 is set to 1, status command is issued before DATE and TIME commands, and write a response text into a clockstats file.

    @@ -213,6 +261,16 @@ + + + + + + + + + + @@ -224,38 +282,250 @@
    0 (Default)STUS command is not issued
     -->  Reply
    stus{CR}{LF} --> *R{CR}{LF} | *G{CR}{LF} | *U{CR}{LF} | +U{CR}{LF}
    time{CR}{LF} --> HH:MM:SS{CR}{LF}
    date{CR}{LF}  --> HH:MM:SS{CR}{LF}
    +

    The date and time are requested separately. The time is requested before and after the date request to check uncertainty of the date whether it's before or after midnight.


    +
    +
    +
    • + +
  • +

    SEIKO TIME SYSTEMS INC.   TDC-300   http://www.seiko-sts.co.jp/ (English and Japanese)


    +

    The TDC-300 must be set to the type 3 data format using the front panel menu display and the switches.

    +
    +
    NTP configuration ( ntp.conf )
    +

    +
    +
    server   127.127.40.X   mode 6
    +

    +
    fudge   127.127.40.X   time1 0.NNN
    +
    +
    +
    +
    Interface
    +
    +

    RS-232C, 2400 BPS, 8-bits, no parity, 1 stop bit

    +
    +
    +
    Time code format
    +

    + + + + + + + + + + + + + + + + +
    Command --> Reply
    {STX}YYMMDDWHHMMSS{ETX}
    ( 5 to 10 mSec. before second ){STX}{xE5}{ETX}
    +
    +
    +
    +
    • + +
  • +

    Telephone JJY   http://jjy.nict.go.jp/ (English and Japanese)

    +

    The telephone JJY is the time service through a public telephone line.
    + The service is provided by the National Institute of Information and Communications Technology in Japan.

    +

    ATTENTION; This mode, the telephone JJY, can not be used with the refclock_acts ( type 18 ) at the same time. + Because the "phone" statement in the ntp configuration file is not involved with the "server" statement, + so the both the refclock_acts ( type 18 ) and this refclock_jjy ( type 40, mode 100 to 180 ) can not recognize the appropriate "phone" statement among the "phone" statements.

    +
    +
    NTP configuration ( ntp.conf )
    +

    +
    +
    server   127.127.40.X   mode (100, 101 to 180)   minpoll N
    +
    +

    The mode 100 is specified, this driver does not issue the loopback command in order to measure the delay, and the delay of the telephone line and the system processing is not adjusted.
    + The mode 101 to 180 is specified, this driver issues the loopback command and measures the delay of the telephone line and the system processing through the Telphone JJY loopback circuit.
    + The round trip time through the Telphone JJY loopback circuit is measured 5 times, and each delay time is greater than 700 milli-seconds, + that delay time is ignored during average delay time calculation. Also, if the valid delay time ( <= 700 mS. ) is measured more than 3 times, the maximum delay time among the valid delay times is ignored, + and if the valid delay time is measured more than 4 times, the minimum delay time among them is ignored, like marking/grading sports judgment.
    + The adjustment time is calculated by the formula,
    + multiply ( the measured round trip time ) by ( ( the mode number ) - 100 ) %,
    + and the adjustment delay time is added to the syncronizing time.
    + If you choose the automatic delay ajustment, in other words, the mode 101 to 180 is specifed, the recommended mode number is 145 to 165.

    +

    The default polling interval 6 ( 64 seconds ) is too short for this mode. The "minpoll" should be set to greater than or equal to 8 ( 256 seconds, about 4 minutes ).
    + The interval time is given the value in second power of 2. The minpoll value 12 is 4096 seconds interval ( about 1 hour ), 14 is 16384 seconds interval ( about 4.5 hours ), 16 is 65536 seconds ( about 18 hours ), respectively.


    +
    +
    fudge   127.127.40.X   flag1 0|1   flag2 0|1   flag3 0|1   flag4 0|1
    +
    +

    Time1 may specify a constant to be added to the time offset for the time from the receiver, a fixed-point decimal number in seconds.
    + When the mode 100 is specified, the time1 may be specified in order to adjust the time offset.
    + When the mode 101 to 180 is specified, the time1 should not be specified because this driver adds some percentage of the measured loopback delay, depending on the value of the mode number.

    +
    Flag1 is the modem dialing type.
    + + + +
    0 (Default)ToneATDWTnn...nn
    1PulseATDWPnn...nn
    +
    +
    Flag2 is the modem error correction type.
    + + + +
    0 (Default)NormalAT\N0
    1Auto V42, MNP, NormalAT\N3
    +
    +
    Flag3 is the modem speaker switch.
    + + + +
    0 (Default)OffATM0Ln
    1OnATM2Ln
    +
    +
    Flag4 is the modem speaker volume.
    + + + +
    0 (Default)LowATMnL1
    1MiddleATMnL2
    +
    +
    +
    phone 042NNNNNNN
    +
    +

    The phone number is available at http://jjy.nict.go.jp/
    + The number of digits of the phone number is checked. If the international access number and the country number are added in order to call from outside of Japan, the number of digits is over the limit.
    + The first 2 or 3 digits are checked. The emergency service number and the special service number in Japan are not allowed.
    + Calling from extension line, the number for an outside line should be prefix "0," ( Zero, Comma ). The prefix is also checked, and no other outside access number is allowed.

    +
    +
    +
    +
    +
    Interface
    +
    +

    RS-232C or USB, 2400 BPS, 8-bits, no parity, 1 stop bit

    +

    Modem control commands:
    + ATE0Q0V1, ATMnLn, AT&K4, AT+MS=V22B, AT%C0, AT\Nn, ATH1, ATDWxnn...nn
    + +++, ATH0

    +
    +
    +
    Time code format
    +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Prompt --> Command --> Reply
    Name{SP}?{SP} --> TJJY{CR} --> Welcome messages
    > --> LOOP{CR} --> ( Switch to the loopback circuit )
       ( One char. ) --> ( One char. )
       COM{CR} --> ( Exit from the loopback circuit )
    > --> TIME{CR} --> HHMMSS{CR}HHMMSS{CR}HHMMSS{CR} 3 times on second
    > --> 4DATE{CR} --> YYYYMMDD{CR}
    > --> LEAPSEC{CR} --> {SP}0{CR} | +1{CR} | -1{CR}
    > --> TIME{CR} --> HHMMSS{CR}HHMMSS{CR}HHMMSS{CR} 3 times on second
    > --> BYE{CR} --> Sayounara messages
    +

    The date and time are requested separately. The time is requested before and after the date request to check uncertainty of the date whether it's before or after midnight.
    + The leap second is not handled, and only written in the clockstats file as an information.


-

JJY is the radio station which transmites the JST (Japan Standard Time) in long wave radio. The station JJY is operated by the National Institute of Information and Communications Technology. An operating announcement and some information are avaiable from http://www.nict.go.jp/ (English and Japanese) and http://jjy.nict.go.jp/ (English and Japanese)

+ +

The JJY is the radio station which transmits the JST (Japan Standard Time) in long wave radio. The station JJY is operated by the National Institute of Information and Communications Technology. + An operating announcement and some information are available from http://www.nict.go.jp/ (English and Japanese) and http://jjy.nict.go.jp/ (English and Japanese)

The user is expected to provide a symbolic link to an available serial port device. This is typically performed by a command such as;

ln -s /dev/ttyS0 /dev/jjy0

-

Using RS232C to USB converter cable, the clock can be connected to an USB port instead of a serial port. In this case, typical symbolic link command is as follows; +

Using an RS-232C to USB converter cable, the clock or a modem can be connected to a USB port instead of a serial port. In this case, the typical symbolic link command is as follows;

ln -s /dev/ttyUSB0 /dev/jjy0

Windows NT does not support symbolic links to device files. COMX: is the unit used by the driver, based on the refclock unit number, where unit 1 corresponds to COM1: and unit 3 corresponds to COM3:

Monitor Data

-

The driver writes each timecode as received to the clockstats file.

+

The driver writes sent and received data to/from the JJY receivers, GPS clock, and the modem into the clockstats file.

+

+ statsdir /var/log/ntpd/
+ filegen clockstats file clockstats type day enable +

+
Mark of the clockstats record
+ + + + + + + + +
JJY Infomation message ( This refclock starts or stops. )
--> Sent data
<-- Received data
--- Infomation message
=== Infomation message ( Start of each polling, and sync. time. )
-W- Warning message
-X- Error message

Fudge Factors

-
time1 time -
Specifies the time offset calibration factor, in seconds and fraction, with default 0.0. -
time2 time -
Not used by this driver. -
stratum number -
Specifies the driver stratum, in decimal from 0 to 15, with default 0. -
refid string -
Specifies the driver reference identifier, an ASCII string from one to four characters, with default JJY. -
flag1 0 | 1 -
See corresponding receiver. -
flag2 0 | 1 -
Not used by this driver. -
flag3 0 | 1 -
Not used by this driver. -
flag4 0 | 1 +
time1 time
+
Specifies the time offset calibration factor, in seconds and fraction, with default 0.0.
+
time2 time
Not used by this driver. +
stratum number
+
Specifies the driver stratum, in decimal from 0 to 15, with default 0.
+
refid string
+
Specifies the driver reference identifier, an ASCII string from one to four characters, with default JJY.
+
flag1 0 | 1
+
See corresponding receiver.
+
flag2 0 | 1
+
See corresponding receiver.
+
flag3 0 | 1
+
See corresponding receiver.
+
flag4 0 | 1
+
See corresponding receiver.
diff --git a/contrib/ntp/html/drivers/driver46.html b/contrib/ntp/html/drivers/driver46.html index 40aded80cca1..cdb0b6899e15 100644 --- a/contrib/ntp/html/drivers/driver46.html +++ b/contrib/ntp/html/drivers/driver46.html @@ -14,7 +14,7 @@

GPSD NG client driver

Last update: - 1-Mar-2014 03:48 + 30-Apr-2015 05:53 UTC

Synopsis

@@ -28,8 +28,9 @@ Features:

-

Description

+ +

Description

This driver is a client driver to the GPSD daemon, which over the time became increasingly popular for UN*Xish @@ -68,25 +69,37 @@

The overall accuracy depends on the receiver used. The driver uses the error estimations (95% probability limits) provided by - GPSD to set the clock precision dynamically according to these - readings. + GPSD to set the clock precision dynamically according to + these readings.

- The driver needs the VERSION, TPV, PPS and WATCH objects of - the GPSD protocol. (Others are quietly ignored.) + The driver needs the VERSION, TPV, PPS, WATCH and TOFF objects + of the GPSD protocol. (Others are quietly ignored.) The + driver can operate without the TOFF objects, which are available + with the protocol version 3.10 and above. (Not to be + confused with the release version of GPSD!) + Running without TOFF objects has a negative impact on the jitter + and offset of the serial timing information; if possible, a + version of GPSD with support for TOFF objects should be + used. +

+

The acronym STI is used here as a synonym for serial + time information from the data channel of the receiver, no + matter what objects were used to obtain it.

+ -

Naming a Device

+

Naming a Device

- The GPSD driver uses the same name as the NMEA driver, - namely /dev/gpsu. There is a simple reason for - that: While the NMEA driver and the GPSD driver can be - active at the same time for different devices, - they cannot access the same device at a time. Having the same - name helps on that. It also eases migration from using NMEA - directly to using GPSD, as no new links etc need to be - created. + The GPSD driver uses the same device name as the NMEA + driver, namely /dev/gpsu. There is a simple + reason for that: While the NMEA driver and the GPSD + driver can be active at the same time for different + devices, they cannot access the same device at a + time. Having the same name helps on that. It also eases + migration from using NMEA directly to using GPSD, as no + new links etc need to be created.

GPSD is normally started with the device name to access; @@ -97,14 +110,16 @@ identification. This makes the migration from the built-in NMEA driver a bit easier.

-

Note: GPSD (as of version 3.10) cannot - use kernel mode PPS on devices that are hot-plugged. This would - require to attach the PPS line discipline to the file, which is - not possible when running with root privileges dropped. This is - not likely to change in the future. +

Note: GPSD (as of version 3.10) cannot use kernel + mode PPS on devices that are hot-plugged. This would require to + attach the PPS line discipline to the character special file, + which is not possible when running with root privileges already + dropped. This is not likely to change in the future.

-

The 'mode' byte

+ + +

The 'mode' word

A few operation modes can be selected with the mode word.

@@ -113,70 +128,234 @@ The Mode Word BitsValueDescription - 0..10 - Uses TPV to get absolute time stamps for full - synchronization. If PPS is available , it is used to improve - the precision, but the clock can work without it. + 0..1 + 0 + STI only operation. This mode is affected by the timing + stability of whatever protocol is used between the GPS + device and GPSD. +
+ Running on STI only is not recommended in general. Possible + use cases include: +
    +
  • The receiver does not provide a PPS signal. +
  • The receiver does provide a PPS signal and + the secondary PPS unit is used. +
  • The receiver has a stable serial timing and a proper + fudge can be established. +
  • You have other time sources available and want to + establish a useful fudge value for time2. +
+ - 1 - Require TPV and PPS to work. + + 1 + Strict operation. This mode needs a valid PPS and a + valid STI to combine the absolute time from the STI with + the time stamp from the PPS record. Does not feed clock + samples if no valid PPS+STI pair is available. +

+ This type of operation results in an ordinary clock with a + very low jitter as long as the PPS data is available, but + the clock fails once PPS drops out. This mode is a + possible choice for receivers that provide a PPS signal + most of the time but have an unstable serial timing that + cannot be fudge-compensated. + 2 - Ignore PPS data, run on TPV only. This is not a - recommended mode unless the serial timing is very stable - and GPSD provides an information element in TPV that - indicates the receive time of the fix data. + Automatic mode. Tries to operate in strict mode unless + it fails to process valid samples for some time, currently + 120s. Then it reverts to STI-only operation until the PPS + is stable again for 40s, when strict mode is engaged + again. +

Important Notice: This is an expiremental + feature!
Switching between strict and STI-only + mode will cause changes in offset and jitter. Use this + mode only if STI-only works fairly well with your setup, + or if you expect longer dropouts of the PPS signal and + prefer to use STI alone over not getting synchronised at + all. - 3 - PPS-only mode. Ignores TPV and does only the PPS phase - correction. This means that some other source must get NTPD - close to synchronisation; only after that happened and the - phase shift between the system clock and the PPS pulse is - less than 125msec the PPS lock will be engaged. + + 3 + (reserved for future extension, do not use) + + + 2..31 + (reserved for future extension, do not + use) - IMPORTANT: work in progress, mode - word ignored right now. Fixed mode '0' operation.

-

Syslog flood throttle

-

This driver can create a lot of syslog messages when things go - wrong, and cluttering the log files is frowned upon. So we attempt - to log persistent or recurring errors only once per hour. On the - other hand, when tracking a problem the syslog flood throttle can - get into the way.

-

Therefore, fudge flag3 can be used to disable the - flood throttle at any time; the throttle is engaged by - default. Running with the syslog flood throttle disabled for - lengthy time is not recommended unless the log files are closely - monitored.

+ -

Fudge Factors

+

Syslog flood throttle

+

This driver can create a lot of syslog messages when things go + wrong, and cluttering the log files is frowned upon. So we + attempt to log persistent or recurring errors only once per + hour. On the other hand, when tracking a problem the syslog + flood throttle can get into the way.

+

Therefore, fudge flag3 can be used to disable the + flood throttle at any time; the throttle is engaged by + default. Running with the syslog flood throttle disabled for + lengthy time is not recommended unless the log files are closely + monitored.

+ + + +

PPS secondary clock unit

+

Units with numbers ≥128 act as secondary clock unit for the + primary clock unit (u mod 128). A secondary unit processes only + the PPS data from GPSD and needs the corresponding master + unit to work1. Use + the 'noselect' keyword on the primary unit if you are not + interested in its data. +

The secondary unit employs the usual precautions before + feeding clock samples:

+
    +
  • The system must be already in a synchronised state. +
  • The system offset must be less than 400ms absolute. +
  • The phase adjustment from the PPS signal must also be less + than 400ms absolute. +
+

If fudge flag flag1 is set for the secondary unit, the + unit asserts the PPS flag on the clock as long as PPS data is + available. This makes the unit eligible as PPS peer and should + only be used if the GPS receiver can be trusted for the quality + of its PPS signal2. The PPS flag gets cleared if no + PPS records can be aquired for some time. The unit also flushes + the sample buffer at this point to avoid the use of stale PPS + data.

+

Attention: This unit uses its own PPS fudge value + which must be set as fudge time1. Only the fudge + values time1 and flag1 have an impact on secondary + units.

+ + + +

Clockstats

+

If flag4 is set when the driver is polled, a clockstats record + is written for the primary clock unit. (The secondary PPS unit + does not provide clock stats on its own.) The first 3 fields are + the normal date, time, and IP address common to all clockstats + records. +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
The Clockstats Line
fieldDescription
1Date as day number since NTP epoch.
2Time as seconds since midnight.
3(Pseudo-) IP address of clock unit.
4Number of received known JSON records since last + poll. The driver knows about TPV, PPS, TOFF, VERSION and + WATCH records; others are silently ignored. +
5Bad replies since last poll. A record is considered + malformed or a bad reply when it is missing vital fields + or the fields contain malformed data that cannot be + parsed. +
6Number of sample cycles since last poll that were + discarded because there was no GPS fix. This is + effectively the number of TPV records with a fix value + < 2 or without a time stamp. +
7Number of serial time information records (TPV or TOFF, + depending on the GPSD version) received since last poll. +
8Number of serial time information records used for + clock samples since the last poll. +
9Number of PPS records received since the last poll.
10Number of PPS records used for clock samples on the + secondary channel since the last poll. +
+

+ + + +

Fudge Factors

time1 time
Specifies the PPS time offset calibration factor, in seconds and fraction, with default 0.0.
time2 time
-
Specifies the TPV time offset calibration factor, in seconds - and fraction, with default 0.0.
+
[Primary Unit] Specifies the TPV/TIME time offset + calibration factor, in seconds and fraction, with default + 0.0.
stratum number
-
Specifies the driver stratum, in decimal from 0 to 15, with default 0.
+
Specifies the driver stratum, in decimal from 0 to 15, with + default 0.
refid string
Specifies the driver reference identifier, an ASCII string from one to four characters, with default GPSD.
-
flag1 0 | 1
(not used)
-
flag2 0 | 1
(not used)
-
flag3 0 | 1
If set, disable the - log throttle. Useful when tracking problems in the interaction - between GPSD and NTPD, since now all error - events are logged. Persistent/recurrent errors can easily fill - up the log, so this should only be enabled during bug - hunts.
-
flag4 0 | 1
If set, write a clock stats - line on every poll cycle.
+
flag1 0 | 1
[Secondary + Unit] When set, flags the secondary clock unit as a + potential PPS peer as long as good PPS data is available. +
+
flag2 0 | 1
+
[Primary Unit] When set, disables the + processing of incoming PPS records. Intended as an aide to + test the effects of a PPS dropout when using automatic mode + (mode 2). +
+
flag3 0 | 1
[Primary Unit] + If set, disables the log throttle. Useful when tracking + problems in the interaction between GPSD and NTPD, + since now all error events are logged. Persistent/recurrent + errors can easily fill up the log, so this should only be + enabled during bug hunts.
+
flag4 0 | 1
[Primary Unit] + If set, write a clock stats line on every poll cycle. +
+ + +
+

1) Data transmission + an decoding is done only once by the primary unit. The decoded + data is then processed independently in both clock units. This + avoids double transmission over two sockets and decoding the + same data twice, but the primary unit is always needed as a + downside of this approach. +

+

2) The clock driver + suppresses the processing PPS records when the TPV/TIME data + indicates the receiver has no fix. It can also deal with + situations where the PPS signal is not delivered + to GPSD. But once it is available, it is also processed + and used to create samples. If a receiver cannot be trusted for + the precision of its PPS signal, it should not be used to create + a possible PPS peer: These get extra clout and can effectively + become the sole source of input for the control loop. You do not + want to use sloppy data for that. +

Additional Information

Reference Clock Drivers

diff --git a/contrib/ntp/html/miscopt.html b/contrib/ntp/html/miscopt.html index 5750d17999d5..ac32419df08a 100644 --- a/contrib/ntp/html/miscopt.html +++ b/contrib/ntp/html/miscopt.html @@ -3,6 +3,7 @@ Miscellaneous Commands and Options + @@ -10,7 +11,7 @@ giffrom Pogo, Walt Kelly

We have three, now looking for more.

Last update: - 28-Feb-2015 12:01 + 29-Jun-2015 05:56 UTC


Related Links

@@ -26,6 +27,8 @@
This command specifies the complete path and name of the file used to record the frequency of the local clock oscillator. This is the same operation as the -f command line option. This command is mutually exclusive with the freq option of the tinker command.
If the file exists, it is read at startup in order to set the initial frequency and then updated once per hour or more with the current frequency computed by the daemon. If the file name is specified, but the file itself does not exist, the starts with an initial frequency of zero and creates the file when writing it for the first time. If this command is not given, the daemon will always start with an initial frequency of zero.
The file format consists of a single line containing a single floating point number, which records the frequency offset measured in parts-per-million (PPM). The file is updated by first writing the current drift value into a temporary file and then renaming this file to replace the old version.
+
dscp dscp
+
This command specifies the Differentiated Services Code Point (DSCP) value that is used in sent NTP packets. The default value is 46 for Expedited Forwarding (EF).
enable [auth | bclient | calibrate | kernel | mode7 | monitor | ntp | stats]
disable [auth | bclient | calibrate | kernel | mode7 | monitor | ntp | stats]
Provides a way to enable or disable various system options. Flags not mentioned are unaffected. Note that most of these flags can be modified remotely using ntpq utility program's :config and config-from-file commands. @@ -57,6 +60,8 @@
This command loads the NIST leapseconds file and initializes the leapsecond values for the next leapsecond time, expiration time and TAI offset. The file can be obtained directly from NIST national time servers using ftp as the ASCII file pub/leap-seconds.
The leapfile is scanned when ntpd processes the leapfile directive or when ntpd detects that leapfile has changed. ntpd checks once a day to see if the leapfile has changed.
While not strictly a security function, the Autokey protocol provides means to securely retrieve the current or updated leapsecond values from a server.
+
leapsmearinterval seconds
+
This EXPERIMENTAL option is only available if ntpd was built with the --enable-leap-smear option to the configure script. It specifies the interval over which a leap second correction will be applied. Recommended values for this option are between 7200 (2 hours) and 86400 (24 hours). DO NOT USE THIS OPTION ON PUBLIC-ACCESS SERVERS! See http://bugs.ntp.org/2855 for more information.
logconfig configkeyword
This command controls the amount and type of output written to the system syslog facility or the alternate logfile log file. All configkeyword keywords can be prefixed with =, + and -, where = sets the syslogmask, + adds and - removes messages. syslog messages can be controlled in four classes (clock, peer, sys and sync). Within these classes four types of messages can be controlled: informational messages (info), event messages (events), statistics messages (statistics) and status messages (status).
Configuration keywords are formed by concatenating the message class with the event class. The all prefix can be used instead of a message class. A message class may also be followed by the all keyword to enable/disable all messages of the respective message class. By default, logconfig output is set to allsync.
@@ -95,6 +100,18 @@
This command is used in conjunction with the ACTS modem driver (type 18). The arguments consist of a maximum of 10 telephone numbers used to dial USNO, NIST or European time services. The Hayes command ATDT is normally prepended to the number, which can contain other modem control codes as well.
reset [allpeers] [auth] [ctl] [io] [mem] [sys] [timer]
Reset one or more groups of counters maintained by ntpd and exposed by ntpq and ntpdc.
+
rlimit [memlock Nmegabytes | stacksize N4kPages | filenum Nfiledescriptors]
+
This command alters certain process storage allocation limits, and is only available on some operating systems. Options are as follows:
+
+
+
memlock Nmegabytes
+
Specify the number of megabytes of memory that can be allocated. Probably only available under Linux, this option is useful when dropping root (the -i option). The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
+
stacksize N4kPages
+
Specifies the maximum size of the process stack on systems with the mlockall() function. Defaults to 50 4k pages (200 4k pages in OpenBSD).
+
filenum Nfiledescriptors
+
Specifies the maximum number of file descriptors ntp may have open at the same time. Defaults to system default.
+
+
saveconfigdir directory_path
Specify the directory in which to write configuration snapshots requested with ntpq's saveconfig command. If saveconfigdir does not appear in the configuration file, saveconfig requests are rejected by ntpd.
setvar variable [default]
@@ -120,18 +137,6 @@
Specifies the stepout threshold in seconds. The default without this command is 300 s. Since this option also affects the training and startup intervals, it should not be set less than the default. Further details are on the Clock State Machine page.
-
rlimit [memlock Nmegabytes | stacksize N4kPages | filenum Nfiledescriptors]
-
This command alters certain process storage allocation limits, and is only available on some operating systems. Options are as follows:
-
-
-
memlock Nmegabytes
-
Specify the number of megabytes of memory that can be allocated. Probably only available under Linux, this option is useful when dropping root (the -i option). The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
-
stacksize N4kPages
-
Specifies the maximum size of the process stack on systems with the mlockall() function. Defaults to 50 4k pages (200 4k pages in OpenBSD).
-
filenum Nfiledescriptors
-
Specifies the maximum number of file descriptors ntp may have open at the same time. Defaults to system default.
-
-
tos [beacon beacon | ceiling ceiling | cohort {0 | 1} | floor floor | maxclock maxclock | maxdist maxdist | minclock minclock | mindist mindist | minsane minsane | orphan stratum | orphanwait delay]
This command alters certain system variables used by the the clock selection and clustering algorithms. The default values of these variables have been carefully optimized for a wide range of network speeds and reliability expectations. Very rarely is it necessary to change the default values; but, some folks can't resist twisting the knobs. It can be used to select the quality and quantity of peers used to synchronize the system clock and is most useful in dynamic server discovery schemes. The options are as follows:
diff --git a/contrib/ntp/html/refclock.html b/contrib/ntp/html/refclock.html index d8969e38cbc3..46d4908fd8d5 100644 --- a/contrib/ntp/html/refclock.html +++ b/contrib/ntp/html/refclock.html @@ -28,7 +28,7 @@

NTP Version 4 supports almost four dozen satellite, radio and telephone modem reference clocks plus several audio devices for instrumentation signals. A general description of the reference clock support is on this page. Additional information about each reference clock driver can be found via links from this page. Additional information is on the Debugging Hints for Reference Clock Drivers and How To Write a Reference Clock Driver pages. Information on how to support pulse-per-second (PPS) signals produced by some devices is on the Pulse-per-second (PPS) Signal Interfacing page. All reference clock drivers require that the reference clock use only Coordinated Universal Time (UTC). Timezone and standard/daylight adjustments are performed by the operating system kernel.

A reference clock will generally (though not always) be a radio timecode receiver synchronized to standard time as provided by NIST and USNO in the US, NRC in Canada and their counterparts elsewhere in the world. A device driver specific to each reference clock must be compiled in the distribution; however, most common radio, satellite and telephone modem clocks are included by default and are activated by configuration commands.

Reference clocks are supported in the same way as ordinary NTP clients and use the same filter, select, cluster and combine algorithms. Drivers have addresses in the form 127.127.t.u, where t is the driver type and u is a unit number in the range 0-3 to distinguish multiple instances of the same driver. The connection to the computer is device dependent, usually a serial port, parallel port or special bus peripheral, but some can work directly from an audio codec or sound card. The particular device is specified by adding a soft link from the name used by the driver to the particular device name.

-

The server command is used to configure a reference clock. Only the mode>,minpoll, maxpoll, and prefer options are supported for reference clocks, as described on the Reference Clock Commands page. The prefer option is discussed on the Mitigation Rules and the prefer Keyword page. Some of these options have meaning only for selected clock drivers.

+

The server command is used to configure a reference clock. Only the mode, minpoll, maxpoll, and prefer options are supported for reference clocks, as described on the Reference Clock Commands page. The prefer option is discussed on the Mitigation Rules and the prefer Keyword page. Some of these options have meaning only for selected clock drivers.

The fudge command can be used to provide additional information for individual drivers and normally follows immediately after the server command. The reference clock stratum is by default 0, so that the server stratum appears to clients as 1. The stratum option can be used to set the stratum to any value in the range 0 through 15. The refid option can be used to change the reference identifier, as might in the case when the driver is disciplined by a pulse-per-second (PPS) source. The device-dependent mode, time and flag options can provide additional driver customization.

Special Considerations

The Audio Drivers page describes three software drivers that process audio signals from an audio codec or sound card. One is for the NIST time and frequency stations WWV and WWVH, another for the Canadian time and frequency station CHU. These require an external shortwave radio and antenna. A third is for the generic IRIG signal produced by some timing devices. Currently, these are supported in FreeBSD, Solaris and SunOS and likely in other system as well.

diff --git a/contrib/ntp/include/Makefile.am b/contrib/ntp/include/Makefile.am index 5ab3e6e9d0df..8b063c3c66f5 100644 --- a/contrib/ntp/include/Makefile.am +++ b/contrib/ntp/include/Makefile.am @@ -64,6 +64,7 @@ noinst_HEADERS = \ parse_conf.h \ recvbuff.h \ refclock_atom.h \ + refidsmear.h \ ssl_applink.c \ timepps-SCO.h \ timepps-Solaris.h \ diff --git a/contrib/ntp/include/Makefile.in b/contrib/ntp/include/Makefile.in index cb210040d8b7..408118b99bde 100644 --- a/contrib/ntp/include/Makefile.in +++ b/contrib/ntp/include/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 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. @@ -16,6 +15,61 @@ @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@ @@ -35,8 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = include -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \ @@ -67,6 +119,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ + $(top_srcdir)/sntp/m4/ntp_unitytest.m4 \ $(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \ $(top_srcdir)/sntp/m4/openldap-thread-check.m4 \ @@ -76,34 +129,69 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -179,6 +267,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@ GTEST_LDFLAGS = @GTEST_LDFLAGS@ GTEST_LIBS = @GTEST_LIBS@ HAVE_INLINE = @HAVE_INLINE@ +HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@ HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@ HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@ INSTALL = @INSTALL@ @@ -295,6 +384,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@ PATH_PERL = @PATH_PERL@ +PATH_RUBY = @PATH_RUBY@ PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_TEST = @PATH_TEST@ PERLLIBDIR = @PERLLIBDIR@ @@ -455,6 +545,7 @@ noinst_HEADERS = \ parse_conf.h \ recvbuff.h \ refclock_atom.h \ + refidsmear.h \ ssl_applink.c \ timepps-SCO.h \ timepps-Solaris.h \ @@ -481,7 +572,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign include/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -507,22 +597,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -537,57 +630,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -603,12 +651,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -620,15 +663,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -637,6 +676,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -673,13 +727,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -714,10 +765,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -795,22 +851,22 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/contrib/ntp/include/isc/Makefile.in b/contrib/ntp/include/isc/Makefile.in index ad0da46e1002..7cbcae303707 100644 --- a/contrib/ntp/include/isc/Makefile.in +++ b/contrib/ntp/include/isc/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 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. @@ -16,6 +15,61 @@ @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@ @@ -35,8 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = include/isc -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \ @@ -67,6 +119,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ + $(top_srcdir)/sntp/m4/ntp_unitytest.m4 \ $(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \ $(top_srcdir)/sntp/m4/openldap-thread-check.m4 \ @@ -76,21 +129,52 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -141,6 +225,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@ GTEST_LDFLAGS = @GTEST_LDFLAGS@ GTEST_LIBS = @GTEST_LIBS@ HAVE_INLINE = @HAVE_INLINE@ +HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@ HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@ HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@ INSTALL = @INSTALL@ @@ -257,6 +342,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@ PATH_PERL = @PATH_PERL@ +PATH_RUBY = @PATH_RUBY@ PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_TEST = @PATH_TEST@ PERLLIBDIR = @PERLLIBDIR@ @@ -373,7 +459,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/isc/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign include/isc/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -398,26 +483,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -429,15 +503,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -446,6 +516,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -494,10 +579,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -577,19 +667,21 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/contrib/ntp/include/ntp_io.h b/contrib/ntp/include/ntp_io.h index 2cdca7108737..5950f0035d6b 100644 --- a/contrib/ntp/include/ntp_io.h +++ b/contrib/ntp/include/ntp_io.h @@ -80,6 +80,7 @@ typedef enum { } nic_rule_action; +extern int qos; SOCKET move_fd(SOCKET fd); isc_boolean_t get_broadcastclient_flag(void); extern int is_ip_address(const char *, u_short, sockaddr_u *); diff --git a/contrib/ntp/include/ntp_stdlib.h b/contrib/ntp/include/ntp_stdlib.h index 38180f0d78f2..bad2697d06fd 100644 --- a/contrib/ntp/include/ntp_stdlib.h +++ b/contrib/ntp/include/ntp_stdlib.h @@ -102,26 +102,35 @@ extern u_int32 addr2refid (sockaddr_u *); /* emalloc.c */ #ifndef EREALLOC_CALLSITE /* ntp_malloc.h defines */ extern void * ereallocz (void *, size_t, size_t, int); -#define erealloczsite(p, n, o, z, f, l) ereallocz(p, n, o, (z)) -#define emalloc(n) ereallocz(NULL, n, 0, FALSE) +extern void * oreallocarray (void *optr, size_t nmemb, size_t size); +#define erealloczsite(p, n, o, z, f, l) ereallocz((p), (n), (o), (z)) +#define emalloc(n) ereallocz(NULL, (n), 0, FALSE) #define emalloc_zero(c) ereallocz(NULL, (c), 0, TRUE) -#define erealloc(p, c) ereallocz(p, (c), 0, FALSE) -#define erealloc_zero(p, n, o) ereallocz(p, n, (o), TRUE) -extern char * estrdup_impl (const char *); +#define erealloc(p, c) ereallocz((p), (c), 0, FALSE) +#define erealloc_zero(p, n, o) ereallocz((p), (n), (o), TRUE) +#define ereallocarray(p, n, s) oreallocarray((p), (n), (s)) +#define eallocarray(n, s) oreallocarray(NULL, (n), (s)) +extern char * estrdup_impl(const char *); #define estrdup(s) estrdup_impl(s) #else extern void * ereallocz (void *, size_t, size_t, int, const char *, int); +extern void * oreallocarray (void *optr, size_t nmemb, size_t size, + const char *, int); #define erealloczsite ereallocz #define emalloc(c) ereallocz(NULL, (c), 0, FALSE, \ __FILE__, __LINE__) #define emalloc_zero(c) ereallocz(NULL, (c), 0, TRUE, \ __FILE__, __LINE__) -#define erealloc(p, c) ereallocz(p, (c), 0, FALSE, \ +#define erealloc(p, c) ereallocz((p), (c), 0, FALSE, \ __FILE__, __LINE__) -#define erealloc_zero(p, n, o) ereallocz(p, n, (o), TRUE, \ +#define erealloc_zero(p, n, o) ereallocz((p), (n), (o), TRUE, \ __FILE__, __LINE__) -extern char * estrdup_impl (const char *, const char *, int); +#define ereallocarray(p, n, s) oreallocarray((p), (n), (s), \ + __FILE__, __LINE__) +#define eallocarray(n, s) oreallocarray(NULL, (n), (s), \ + __FILE__, __LINE__) +extern char * estrdup_impl(const char *, const char *, int); #define estrdup(s) estrdup_impl((s), __FILE__, __LINE__) #endif diff --git a/contrib/ntp/include/ntp_types.h b/contrib/ntp/include/ntp_types.h index 1beb16647a66..1c66165b3b38 100644 --- a/contrib/ntp/include/ntp_types.h +++ b/contrib/ntp/include/ntp_types.h @@ -19,6 +19,11 @@ # include #endif +/* Bug 2813 */ +#ifdef HAVE_LIMITS_H +# include +#endif + #include "ntp_machine.h" diff --git a/contrib/ntp/include/ntpd.h b/contrib/ntp/include/ntpd.h index f0bbeb08211f..be3cd3e7619b 100644 --- a/contrib/ntp/include/ntpd.h +++ b/contrib/ntp/include/ntpd.h @@ -201,6 +201,7 @@ extern keyid_t session_key (sockaddr_u *, sockaddr_u *, keyid_t, extern int make_keylist (struct peer *, struct interface *); extern void key_expire (struct peer *); extern void crypto_update (void); +extern void crypto_update_taichange(void); extern void crypto_config (int, char *); extern void crypto_setup (void); extern u_int crypto_ident (struct peer *); @@ -222,6 +223,7 @@ extern void receive (struct recvbuf *); extern void peer_clear (struct peer *, const char *); extern void process_packet (struct peer *, struct pkt *, u_int); extern void clock_select (void); +extern void set_sys_leap (u_char); extern u_long leapsec; /* seconds to next leap (proximity class) */ extern int leapdif; /* TAI difference step at next leap second*/ @@ -532,6 +534,11 @@ extern u_long current_time; /* seconds since startup */ extern u_long timer_timereset; extern u_long timer_overflows; extern u_long timer_xmtcalls; +extern int leap_sec_in_progress; +#ifdef LEAP_SMEAR +extern struct leap_smear_info leap_smear; +extern int leap_smear_intv; +#endif #ifdef SYS_WINNT HANDLE WaitableTimerHandle; #endif diff --git a/contrib/ntp/include/parse.h b/contrib/ntp/include/parse.h index ca6855d18e58..9b1ffb227425 100644 --- a/contrib/ntp/include/parse.h +++ b/contrib/ntp/include/parse.h @@ -3,7 +3,7 @@ * * parse.h,v 4.12 2007/01/14 08:36:03 kardel RELEASE_20070114_A * - * Copyright (c) 1995-2005 by Frank Kardel ntp.org> + * Copyright (c) 1995-2015 by Frank Kardel ntp.org> * Copyright (c) 1989-1994 by Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg, Germany * * Redistribution and use in source and binary forms, with or without @@ -141,7 +141,7 @@ extern unsigned int splclock (void); * feature information */ #define PARSEB_S_LEAP 0x00010000 /* supports LEAP */ -#define PARSEB_S_ANTENNA 0x00020000 /* supports antenna information */ +#define PARSEB_S_CALLBIT 0x00020000 /* supports callbit information */ #define PARSEB_S_PPS 0x00040000 /* supports PPS time stamping */ #define PARSEB_S_POSITION 0x00080000 /* supports position information (GPS) */ @@ -167,7 +167,7 @@ extern unsigned int splclock (void); #define PARSE_LEAPSECOND(x) (PARSE_SYNC(x) && ((x) & PARSEB_LEAP_SECOND)) #define PARSE_S_LEAP(x) ((x) & PARSEB_S_LEAP) -#define PARSE_S_ANTENNA(x) ((x) & PARSEB_S_ANTENNA) +#define PARSE_S_CALLBIT(x) ((x) & PARSEB_S_CALLBIT) #define PARSE_S_PPS(x) ((x) & PARSEB_S_PPS) #define PARSE_S_POSITION(x) ((x) & PARSEB_S_POSITION) diff --git a/contrib/ntp/include/refidsmear.h b/contrib/ntp/include/refidsmear.h new file mode 100644 index 000000000000..9c0f24529ee5 --- /dev/null +++ b/contrib/ntp/include/refidsmear.h @@ -0,0 +1,3 @@ + +extern l_fp convertRefIDToLFP(uint32_t r); +extern uint32_t convertLFPToRefID(l_fp num); diff --git a/contrib/ntp/kernel/Makefile.in b/contrib/ntp/kernel/Makefile.in index 2147529a1a83..d66d99438737 100644 --- a/contrib/ntp/kernel/Makefile.in +++ b/contrib/ntp/kernel/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 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. @@ -15,6 +14,61 @@ @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@ @@ -34,7 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = kernel -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \ @@ -65,6 +118,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ + $(top_srcdir)/sntp/m4/ntp_unitytest.m4 \ $(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \ $(top_srcdir)/sntp/m4/openldap-thread-check.m4 \ @@ -74,33 +128,67 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -176,6 +264,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@ GTEST_LDFLAGS = @GTEST_LDFLAGS@ GTEST_LIBS = @GTEST_LIBS@ HAVE_INLINE = @HAVE_INLINE@ +HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@ HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@ HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@ INSTALL = @INSTALL@ @@ -292,6 +381,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@ PATH_PERL = @PATH_PERL@ +PATH_RUBY = @PATH_RUBY@ PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_TEST = @PATH_TEST@ PERLLIBDIR = @PERLLIBDIR@ @@ -404,7 +494,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kernel/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign kernel/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -430,22 +519,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -460,57 +552,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -526,12 +573,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -543,15 +585,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -560,6 +598,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -596,13 +649,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -637,10 +687,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -718,22 +773,22 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/contrib/ntp/kernel/sys/Makefile.in b/contrib/ntp/kernel/sys/Makefile.in index 2e8f990bbb41..a9cefad760b7 100644 --- a/contrib/ntp/kernel/sys/Makefile.in +++ b/contrib/ntp/kernel/sys/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 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. @@ -16,6 +15,61 @@ @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@ @@ -35,8 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = kernel/sys -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \ @@ -67,6 +119,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ + $(top_srcdir)/sntp/m4/ntp_unitytest.m4 \ $(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \ $(top_srcdir)/sntp/m4/openldap-thread-check.m4 \ @@ -76,21 +129,52 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -141,6 +225,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@ GTEST_LDFLAGS = @GTEST_LDFLAGS@ GTEST_LIBS = @GTEST_LIBS@ HAVE_INLINE = @HAVE_INLINE@ +HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@ HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@ HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@ INSTALL = @INSTALL@ @@ -257,6 +342,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@ PATH_PERL = @PATH_PERL@ +PATH_RUBY = @PATH_RUBY@ PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_TEST = @PATH_TEST@ PERLLIBDIR = @PERLLIBDIR@ @@ -371,7 +457,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kernel/sys/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign kernel/sys/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -396,26 +481,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -427,15 +501,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -444,6 +514,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -492,10 +577,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -575,19 +665,21 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/contrib/ntp/lib/isc/unix/ifiter_getifaddrs.c b/contrib/ntp/lib/isc/unix/ifiter_getifaddrs.c index 425b9b4c3d35..ad7c5f85c8ec 100644 --- a/contrib/ntp/lib/isc/unix/ifiter_getifaddrs.c +++ b/contrib/ntp/lib/isc/unix/ifiter_getifaddrs.c @@ -147,6 +147,14 @@ internal_current(isc_interfaceiter_t *iter) { ifa = iter->pos; #ifdef __linux + /* + * [Bug 2792] + * burnicki: iter->pos is usually never NULL here (anymore?), + * so linux_if_inet6_current(iter) is never called here. + * However, that routine would check (under Linux), if the + * interface is in a tentative state, e.g. if there's no link + * yet but an IPv6 address has already be assigned. + */ if (iter->pos == NULL) return (linux_if_inet6_current(iter)); #endif @@ -154,6 +162,17 @@ internal_current(isc_interfaceiter_t *iter) { INSIST(ifa != NULL); INSIST(ifa->ifa_name != NULL); + +#ifdef IFF_RUNNING + /* + * [Bug 2792] + * burnicki: if the interface is not running then + * it may be in a tentative state. See above. + */ + if ((ifa->ifa_flags & IFF_RUNNING) == 0) + return (ISC_R_IGNORE); +#endif + if (ifa->ifa_addr == NULL) return (ISC_R_IGNORE); diff --git a/contrib/ntp/libjsmn/Makefile b/contrib/ntp/libjsmn/Makefile index ac947a3af8eb..5e3e2a97f463 100644 --- a/contrib/ntp/libjsmn/Makefile +++ b/contrib/ntp/libjsmn/Makefile @@ -13,15 +13,23 @@ test: jsmn_test ./jsmn_test jsmn_test: jsmn_test.o - $(CC) -L. -ljsmn $< -o $@ + $(CC) $(LDFLAGS) -L. -ljsmn $< -o $@ jsmn_test.o: jsmn_test.c libjsmn.a +simple_example: example/simple.o libjsmn.a + $(CC) $(LDFLAGS) $^ -o $@ + +jsondump: example/jsondump.o libjsmn.a + $(CC) $(LDFLAGS) $^ -o $@ + clean: - rm -f jsmn.o jsmn_test.o + rm -f jsmn.o jsmn_test.o example/simple.o rm -f jsmn_test rm -f jsmn_test.exe rm -f libjsmn.a + rm -f simple_example + rm -f jsondump .PHONY: all clean test diff --git a/contrib/ntp/libjsmn/README.md b/contrib/ntp/libjsmn/README.md index abccffa43247..353af94a8ee6 100644 --- a/contrib/ntp/libjsmn/README.md +++ b/contrib/ntp/libjsmn/README.md @@ -82,9 +82,8 @@ To clone the repository you should have mercurial installed. Just run: $ hg clone http://bitbucket.org/zserge/jsmn jsmn -Repository layout is simple: jsmn.c and jsmn.h are library files; demo.c is an -example of how to use jsmn (it is also used in unit tests); test.sh is a test -script. You will also find README, LICENSE and Makefile files inside. +Repository layout is simple: jsmn.c and jsmn.h are library files, tests are in +the jsmn\_test.c, you will also find README, LICENSE and Makefile files inside. To build the library, run `make`. It is also recommended to run `make test`. Let me know, if some tests fail. @@ -127,20 +126,27 @@ to simplify string extraction from JSON data. All job is done by `jsmn_parser` object. You can initialize a new parser using: - struct jsmn_parser parser; + jsmn_parser parser; jsmntok_t tokens[10]; + jsmn_init(&parser); + // js - pointer to JSON string // tokens - an array of tokens available // 10 - number of tokens available - jsmn_init_parser(&parser, js, tokens, 10); + jsmn_parse(&parser, js, tokens, 10); -This will create a parser, that can parse up to 10 JSON tokens from `js` string. +This will create a parser, and then it tries to parse up to 10 JSON tokens from +the `js` string. + +A non-negative reutrn value of `jsmn_parse` is the number of tokens actually +used by the parser. +Passing NULL instead of the tokens array would not store parsing results, but +instead the function will return the value of tokens needed to parse the given +string. This can be useful if you don't know yet how many tokens to allocate. -Later, you can use `jsmn_parse(&parser)` function to process JSON string with the parser. If something goes wrong, you will get an error. Error will be one of these: -* `JSMN_SUCCESS` - everything went fine. String was parsed * `JSMN_ERROR_INVAL` - bad token, JSON string is corrupted * `JSMN_ERROR_NOMEM` - not enough tokens, JSON string is too large * `JSMN_ERROR_PART` - JSON string is too short, expecting more JSON data diff --git a/contrib/ntp/libjsmn/example/jsondump.c b/contrib/ntp/libjsmn/example/jsondump.c new file mode 100644 index 000000000000..3490bbf49900 --- /dev/null +++ b/contrib/ntp/libjsmn/example/jsondump.c @@ -0,0 +1,112 @@ +#include +#include +#include +#include +#include "../jsmn.h" + +/* + * An example of reading JSON from stdin and printing its content to stdout. + * The output looks like YAML, but I'm not sure if it's really compatible. + */ + +static int dump(const char *js, jsmntok_t *t, size_t count, int indent) { + int i, j, k; + if (count == 0) { + return 0; + } + if (t->type == JSMN_PRIMITIVE) { + printf("%.*s", t->end - t->start, js+t->start); + return 1; + } else if (t->type == JSMN_STRING) { + printf("'%.*s'", t->end - t->start, js+t->start); + return 1; + } else if (t->type == JSMN_OBJECT) { + printf("\n"); + j = 0; + for (i = 0; i < t->size; i++) { + for (k = 0; k < indent; k++) printf(" "); + j += dump(js, t+1+j, count-j, indent+1); + printf(": "); + j += dump(js, t+1+j, count-j, indent+1); + printf("\n"); + } + return j+1; + } else if (t->type == JSMN_ARRAY) { + j = 0; + printf("\n"); + for (i = 0; i < t->size; i++) { + for (k = 0; k < indent-1; k++) printf(" "); + printf(" - "); + j += dump(js, t+1+j, count-j, indent+1); + printf("\n"); + } + return j+1; + } + return 0; +} + +int main() { + int r; + int eof_expected = 0; + char *js = NULL; + size_t jslen = 0; + char buf[BUFSIZ]; + + jsmn_parser p; + jsmntok_t *tok; + size_t tokcount = 2; + + /* Prepare parser */ + jsmn_init(&p); + + /* Allocate some tokens as a start */ + tok = malloc(sizeof(*tok) * tokcount); + if (tok == NULL) { + fprintf(stderr, "malloc(): errno=%d\n", errno); + return 3; + } + + for (;;) { + /* Read another chunk */ + r = fread(buf, 1, sizeof(buf), stdin); + if (r < 0) { + fprintf(stderr, "fread(): %d, errno=%d\n", r, errno); + return 1; + } + if (r == 0) { + if (eof_expected != 0) { + return 0; + } else { + fprintf(stderr, "fread(): unexpected EOF\n"); + return 2; + } + } + + js = realloc(js, jslen + r + 1); + if (js == NULL) { + fprintf(stderr, "realloc(): errno=%d\n", errno); + return 3; + } + strncpy(js + jslen, buf, r); + jslen = jslen + r; + +again: + r = jsmn_parse(&p, js, jslen, tok, tokcount); + if (r < 0) { + if (r == JSMN_ERROR_NOMEM) { + tokcount = tokcount * 2; + tok = realloc(tok, sizeof(*tok) * tokcount); + if (tok == NULL) { + fprintf(stderr, "realloc(): errno=%d\n", errno); + return 3; + } + goto again; + } + } else { + dump(js, tok, p.toknext, 0); + eof_expected = 1; + } + } + + return 0; +} diff --git a/contrib/ntp/libjsmn/example/simple.c b/contrib/ntp/libjsmn/example/simple.c new file mode 100644 index 000000000000..a6f8e6a98f7e --- /dev/null +++ b/contrib/ntp/libjsmn/example/simple.c @@ -0,0 +1,75 @@ +#include +#include +#include "../jsmn.h" + +/* + * A small example of jsmn parsing when JSON structure is known and number of + * tokens is predictable. + */ + +const char *JSON_STRING = + "{\"user\": \"johndoe\", \"admin\": false, \"uid\": 1000,\n " + "\"groups\": [\"users\", \"wheel\", \"audio\", \"video\"]}"; + +static int jsoneq(const char *json, jsmntok_t *tok, const char *s) { + if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start && + strncmp(json + tok->start, s, tok->end - tok->start) == 0) { + return 0; + } + return -1; +} + +int main() { + int i; + int r; + jsmn_parser p; + jsmntok_t t[128]; /* We expect no more than 128 tokens */ + + jsmn_init(&p); + r = jsmn_parse(&p, JSON_STRING, strlen(JSON_STRING), t, sizeof(t)/sizeof(t[0])); + if (r < 0) { + printf("Failed to parse JSON: %d\n", r); + return 1; + } + + /* Assume the top-level element is an object */ + if (r < 1 || t[0].type != JSMN_OBJECT) { + printf("Object expected\n"); + return 1; + } + + /* Loop over all keys of the root object */ + for (i = 1; i < r; i++) { + if (jsoneq(JSON_STRING, &t[i], "user") == 0) { + /* We may use strndup() to fetch string value */ + printf("- User: %.*s\n", t[i+1].end-t[i+1].start, + JSON_STRING + t[i+1].start); + i++; + } else if (jsoneq(JSON_STRING, &t[i], "admin") == 0) { + /* We may additionally check if the value is either "true" or "false" */ + printf("- Admin: %.*s\n", t[i+1].end-t[i+1].start, + JSON_STRING + t[i+1].start); + i++; + } else if (jsoneq(JSON_STRING, &t[i], "uid") == 0) { + /* We may want to do strtol() here to get numeric value */ + printf("- UID: %.*s\n", t[i+1].end-t[i+1].start, + JSON_STRING + t[i+1].start); + i++; + } else if (jsoneq(JSON_STRING, &t[i], "groups") == 0) { + int j; + printf("- Groups:\n"); + if (t[i+1].type != JSMN_ARRAY) { + continue; /* We expect groups to be an array of strings */ + } + for (j = 0; j < t[i+1].size; j++) { + jsmntok_t *g = &t[i+j+2]; + printf(" * %.*s\n", g->end - g->start, JSON_STRING + g->start); + } + i += t[i+1].size + 1; + } else { + printf("Unexpected key: %.*s\n", t[i].end-t[i].start, + JSON_STRING + t[i].start); + } + } + return 0; +} diff --git a/contrib/ntp/libjsmn/jsmn.c b/contrib/ntp/libjsmn/jsmn.c index aa8b12b8020d..2e88fe140d49 100644 --- a/contrib/ntp/libjsmn/jsmn.c +++ b/contrib/ntp/libjsmn/jsmn.c @@ -1,15 +1,14 @@ #include -#include #include "jsmn.h" /** * Allocates a fresh unused token from the token pull. */ -static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, +static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, jsmntok_t *tokens, size_t num_tokens) { jsmntok_t *tok; - if ((size_t)parser->toknext >= num_tokens) { + if (parser->toknext >= num_tokens) { return NULL; } tok = &tokens[parser->toknext++]; @@ -24,7 +23,7 @@ static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, /** * Fills token type and boundaries. */ -static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type, +static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type, int start, int end) { token->type = type; token->start = start; @@ -36,13 +35,13 @@ static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type, * Fills next available token with JSON primitive. */ static jsmnerr_t jsmn_parse_primitive(jsmn_parser *parser, const char *js, - jsmntok_t *tokens, size_t num_tokens) { + size_t len, jsmntok_t *tokens, size_t num_tokens) { jsmntok_t *token; int start; start = parser->pos; - for (; js[parser->pos] != '\0'; parser->pos++) { + for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) { switch (js[parser->pos]) { #ifndef JSMN_STRICT /* In strict mode primitive must be followed by "," or "}" or "]" */ @@ -64,6 +63,10 @@ static jsmnerr_t jsmn_parse_primitive(jsmn_parser *parser, const char *js, #endif found: + if (tokens == NULL) { + parser->pos--; + return 0; + } token = jsmn_alloc_token(parser, tokens, num_tokens); if (token == NULL) { parser->pos = start; @@ -74,14 +77,14 @@ static jsmnerr_t jsmn_parse_primitive(jsmn_parser *parser, const char *js, token->parent = parser->toksuper; #endif parser->pos--; - return JSMN_SUCCESS; + return 0; } /** * Filsl next token with JSON string. */ static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, - jsmntok_t *tokens, size_t num_tokens) { + size_t len, jsmntok_t *tokens, size_t num_tokens) { jsmntok_t *token; int start = parser->pos; @@ -89,11 +92,14 @@ static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, parser->pos++; /* Skip starting quote */ - for (; js[parser->pos] != '\0'; parser->pos++) { + for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) { char c = js[parser->pos]; /* Quote: end of string */ if (c == '\"') { + if (tokens == NULL) { + return 0; + } token = jsmn_alloc_token(parser, tokens, num_tokens); if (token == NULL) { parser->pos = start; @@ -103,13 +109,12 @@ static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, #ifdef JSMN_PARENT_LINKS token->parent = parser->toksuper; #endif - return JSMN_SUCCESS; + return 0; } /* Backslash: Quoted symbol expected */ - if (c == '\\') { - int i = 0; - + if (c == '\\' && parser->pos + 1 < len) { + int i; parser->pos++; switch (js[parser->pos]) { /* Allowed escaped symbols */ @@ -119,7 +124,7 @@ static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, /* Allows escaped symbol \uXXXX */ case 'u': parser->pos++; - for(; i < 4 && js[parser->pos] != '\0'; i++) { + for(i = 0; i < 4 && parser->pos < len && js[parser->pos] != '\0'; i++) { /* If it isn't a hex character we have an error */ if(!((js[parser->pos] >= 48 && js[parser->pos] <= 57) || /* 0-9 */ (js[parser->pos] >= 65 && js[parser->pos] <= 70) || /* A-F */ @@ -145,19 +150,24 @@ static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, /** * Parse JSON string and fill tokens. */ -jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens, - unsigned int num_tokens) { +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len, + jsmntok_t *tokens, unsigned int num_tokens) { jsmnerr_t r; int i; jsmntok_t *token; + int count = 0; - for (; js[parser->pos] != '\0'; parser->pos++) { + for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) { char c; jsmntype_t type; c = js[parser->pos]; switch (c) { case '{': case '[': + count++; + if (tokens == NULL) { + break; + } token = jsmn_alloc_token(parser, tokens, num_tokens); if (token == NULL) return JSMN_ERROR_NOMEM; @@ -172,6 +182,8 @@ jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens, parser->toksuper = parser->toknext - 1; break; case '}': case ']': + if (tokens == NULL) + break; type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY); #ifdef JSMN_PARENT_LINKS if (parser->toknext < 1) { @@ -216,25 +228,56 @@ jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens, #endif break; case '\"': - r = jsmn_parse_string(parser, js, tokens, num_tokens); + r = jsmn_parse_string(parser, js, len, tokens, num_tokens); if (r < 0) return r; - if (parser->toksuper != -1) + count++; + if (parser->toksuper != -1 && tokens != NULL) tokens[parser->toksuper].size++; break; - case '\t' : case '\r' : case '\n' : case ':' : case ',': case ' ': + case '\t' : case '\r' : case '\n' : case ' ': + break; + case ':': + parser->toksuper = parser->toknext - 1; + break; + case ',': + if (tokens != NULL && + tokens[parser->toksuper].type != JSMN_ARRAY && + tokens[parser->toksuper].type != JSMN_OBJECT) { +#ifdef JSMN_PARENT_LINKS + parser->toksuper = tokens[parser->toksuper].parent; +#else + for (i = parser->toknext - 1; i >= 0; i--) { + if (tokens[i].type == JSMN_ARRAY || tokens[i].type == JSMN_OBJECT) { + if (tokens[i].start != -1 && tokens[i].end == -1) { + parser->toksuper = i; + break; + } + } + } +#endif + } break; #ifdef JSMN_STRICT /* In strict mode primitives are: numbers and booleans */ case '-': case '0': case '1' : case '2': case '3' : case '4': case '5': case '6': case '7' : case '8': case '9': case 't': case 'f': case 'n' : + /* And they must not be keys of the object */ + if (tokens != NULL) { + jsmntok_t *t = &tokens[parser->toksuper]; + if (t->type == JSMN_OBJECT || + (t->type == JSMN_STRING && t->size != 0)) { + return JSMN_ERROR_INVAL; + } + } #else /* In non-strict mode every unquoted value is a primitive */ default: #endif - r = jsmn_parse_primitive(parser, js, tokens, num_tokens); + r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens); if (r < 0) return r; - if (parser->toksuper != -1) + count++; + if (parser->toksuper != -1 && tokens != NULL) tokens[parser->toksuper].size++; break; @@ -243,22 +286,22 @@ jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens, default: return JSMN_ERROR_INVAL; #endif - + } + } + if (tokens != NULL) { + for (i = parser->toknext - 1; i >= 0; i--) { + /* Unmatched opened object or array */ + if (tokens[i].start != -1 && tokens[i].end == -1) { + return JSMN_ERROR_PART; + } } } - for (i = parser->toknext - 1; i >= 0; i--) { - /* Unmatched opened object or array */ - if (tokens[i].start != -1 && tokens[i].end == -1) { - return JSMN_ERROR_PART; - } - } - - return JSMN_SUCCESS; + return count; } /** - * Creates a new parser based over a given buffer with an array of tokens + * Creates a new parser based over a given buffer with an array of tokens * available. */ void jsmn_init(jsmn_parser *parser) { diff --git a/contrib/ntp/libjsmn/jsmn.h b/contrib/ntp/libjsmn/jsmn.h index 03b2c1aa4e48..95fb2cabd4d8 100644 --- a/contrib/ntp/libjsmn/jsmn.h +++ b/contrib/ntp/libjsmn/jsmn.h @@ -1,6 +1,12 @@ #ifndef __JSMN_H_ #define __JSMN_H_ +#include + +#ifdef __cplusplus +extern "C" { +#endif + /** * JSON type identifier. Basic types are: * o Object @@ -21,9 +27,7 @@ typedef enum { /* Invalid character inside JSON string */ JSMN_ERROR_INVAL = -2, /* The string is not a full JSON packet, more bytes expected */ - JSMN_ERROR_PART = -3, - /* Everything was fine */ - JSMN_SUCCESS = 0 + JSMN_ERROR_PART = -3 } jsmnerr_t; /** @@ -48,7 +52,7 @@ typedef struct { */ typedef struct { unsigned int pos; /* offset in the JSON string */ - int toknext; /* next token to allocate */ + unsigned int toknext; /* next token to allocate */ int toksuper; /* superior token node, e.g parent object or array */ } jsmn_parser; @@ -61,7 +65,11 @@ void jsmn_init(jsmn_parser *parser); * Run JSON parser. It parses a JSON data string into and array of tokens, each describing * a single JSON object. */ -jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len, jsmntok_t *tokens, unsigned int num_tokens); +#ifdef __cplusplus +} +#endif + #endif /* __JSMN_H_ */ diff --git a/contrib/ntp/libjsmn/jsmn_test.c b/contrib/ntp/libjsmn/jsmn_test.c index fe5f0004555b..39688592293c 100644 --- a/contrib/ntp/libjsmn/jsmn_test.c +++ b/contrib/ntp/libjsmn/jsmn_test.c @@ -2,8 +2,6 @@ #include #include -#include "jsmn.c" - static int test_passed = 0; static int test_failed = 0; @@ -40,6 +38,9 @@ static void test(int (*func)(void), const char *name) { printf("start: %d, end: %d, type: %d, size: %d\n", \ (t).start, (t).end, (t).type, (t).size) +#define JSMN_STRICT +#include "jsmn.c" + int test_empty() { const char *js; int r; @@ -48,30 +49,30 @@ int test_empty() { js = "{}"; jsmn_init(&p); - r = jsmn_parse(&p, js, t, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), t, 10); + check(r >= 0); check(t[0].type == JSMN_OBJECT); check(t[0].start == 0 && t[0].end == 2); js = "[]"; jsmn_init(&p); - r = jsmn_parse(&p, js, t, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), t, 10); + check(r >= 0); check(t[0].type == JSMN_ARRAY); check(t[0].start == 0 && t[0].end == 2); js = "{\"a\":[]}"; jsmn_init(&p); - r = jsmn_parse(&p, js, t, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), t, 10); + check(r >= 0); check(t[0].type == JSMN_OBJECT && t[0].start == 0 && t[0].end == 8); check(t[1].type == JSMN_STRING && t[1].start == 2 && t[1].end == 3); check(t[2].type == JSMN_ARRAY && t[2].start == 5 && t[2].end == 7); js = "[{},{}]"; jsmn_init(&p); - r = jsmn_parse(&p, js, t, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), t, 10); + check(r >= 0); check(t[0].type == JSMN_ARRAY && t[0].start == 0 && t[0].end == 7); check(t[1].type == JSMN_OBJECT && t[1].start == 1 && t[1].end == 3); check(t[2].type == JSMN_OBJECT && t[2].start == 4 && t[2].end == 6); @@ -87,8 +88,8 @@ int test_simple() { js = "{\"a\": 0}"; jsmn_init(&p); - r = jsmn_parse(&p, js, tokens, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r >= 0); check(TOKEN_EQ(tokens[0], 0, 8, JSMN_OBJECT)); check(TOKEN_EQ(tokens[1], 2, 3, JSMN_STRING)); check(TOKEN_EQ(tokens[2], 6, 7, JSMN_PRIMITIVE)); @@ -99,59 +100,59 @@ int test_simple() { jsmn_init(&p); js = "[\"a\":{},\"b\":{}]"; - r = jsmn_parse(&p, js, tokens, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r >= 0); jsmn_init(&p); js = "{\n \"Day\": 26,\n \"Month\": 9,\n \"Year\": 12\n }"; - r = jsmn_parse(&p, js, tokens, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r >= 0); return 0; } int test_primitive() { +#ifndef JSMN_STRICT int r; jsmn_parser p; jsmntok_t tok[10]; const char *js; -#ifndef JSMN_STRICT js = "\"boolVar\" : true"; jsmn_init(&p); - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r >= 0 && tok[0].type == JSMN_STRING && tok[1].type == JSMN_PRIMITIVE); check(TOKEN_STRING(js, tok[0], "boolVar")); check(TOKEN_STRING(js, tok[1], "true")); js = "\"boolVar\" : false"; jsmn_init(&p); - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r >= 0 && tok[0].type == JSMN_STRING && tok[1].type == JSMN_PRIMITIVE); check(TOKEN_STRING(js, tok[0], "boolVar")); check(TOKEN_STRING(js, tok[1], "false")); js = "\"intVar\" : 12345"; jsmn_init(&p); - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r >= 0 && tok[0].type == JSMN_STRING && tok[1].type == JSMN_PRIMITIVE); check(TOKEN_STRING(js, tok[0], "intVar")); check(TOKEN_STRING(js, tok[1], "12345")); js = "\"floatVar\" : 12.345"; jsmn_init(&p); - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r >= 0 && tok[0].type == JSMN_STRING && tok[1].type == JSMN_PRIMITIVE); check(TOKEN_STRING(js, tok[0], "floatVar")); check(TOKEN_STRING(js, tok[1], "12.345")); js = "\"nullVar\" : null"; jsmn_init(&p); - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r >= 0 && tok[0].type == JSMN_STRING && tok[1].type == JSMN_PRIMITIVE); check(TOKEN_STRING(js, tok[0], "nullVar")); check(TOKEN_STRING(js, tok[1], "null")); @@ -167,24 +168,24 @@ int test_string() { js = "\"strVar\" : \"hello world\""; jsmn_init(&p); - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r >= 0 && tok[0].type == JSMN_STRING && tok[1].type == JSMN_STRING); check(TOKEN_STRING(js, tok[0], "strVar")); check(TOKEN_STRING(js, tok[1], "hello world")); js = "\"strVar\" : \"escapes: \\/\\r\\n\\t\\b\\f\\\"\\\\\""; jsmn_init(&p); - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r >= 0 && tok[0].type == JSMN_STRING && tok[1].type == JSMN_STRING); check(TOKEN_STRING(js, tok[0], "strVar")); check(TOKEN_STRING(js, tok[1], "escapes: \\/\\r\\n\\t\\b\\f\\\"\\\\")); js = "\"strVar\" : \"\""; jsmn_init(&p); - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r >= 0 && tok[0].type == JSMN_STRING && tok[1].type == JSMN_STRING); check(TOKEN_STRING(js, tok[0], "strVar")); check(TOKEN_STRING(js, tok[1], "")); @@ -200,27 +201,37 @@ int test_partial_string() { jsmn_init(&p); js = "\"x\": \"va"; - r = jsmn_parse(&p, js, tok, 10); + r = jsmn_parse(&p, js, strlen(js), tok, 10); check(r == JSMN_ERROR_PART && tok[0].type == JSMN_STRING); check(TOKEN_STRING(js, tok[0], "x")); check(p.toknext == 1); + jsmn_init(&p); + char js_slash[9] = "\"x\": \"va\\"; + r = jsmn_parse(&p, js_slash, sizeof(js_slash), tok, 10); + check(r == JSMN_ERROR_PART); + + jsmn_init(&p); + char js_unicode[10] = "\"x\": \"va\\u"; + r = jsmn_parse(&p, js_unicode, sizeof(js_unicode), tok, 10); + check(r == JSMN_ERROR_PART); + js = "\"x\": \"valu"; - r = jsmn_parse(&p, js, tok, 10); + r = jsmn_parse(&p, js, strlen(js), tok, 10); check(r == JSMN_ERROR_PART && tok[0].type == JSMN_STRING); check(TOKEN_STRING(js, tok[0], "x")); check(p.toknext == 1); js = "\"x\": \"value\""; - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r >= 0 && tok[0].type == JSMN_STRING && tok[1].type == JSMN_STRING); check(TOKEN_STRING(js, tok[0], "x")); check(TOKEN_STRING(js, tok[1], "value")); js = "\"x\": \"value\", \"y\": \"value y\""; - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r >= 0 && tok[0].type == JSMN_STRING && tok[1].type == JSMN_STRING && tok[2].type == JSMN_STRING && tok[3].type == JSMN_STRING); check(TOKEN_STRING(js, tok[0], "x")); @@ -241,8 +252,8 @@ int test_unquoted_keys() { jsmn_init(&p); js = "key1: \"value\"\nkey2 : 123"; - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_SUCCESS && tok[0].type == JSMN_PRIMITIVE + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r >= 0 && tok[0].type == JSMN_PRIMITIVE && tok[1].type == JSMN_STRING && tok[2].type == JSMN_PRIMITIVE && tok[3].type == JSMN_PRIMITIVE); check(TOKEN_STRING(js, tok[0], "key1")); @@ -261,19 +272,19 @@ int test_partial_array() { jsmn_init(&p); js = " [ 1, true, "; - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_ERROR_PART && tok[0].type == JSMN_ARRAY + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r == JSMN_ERROR_PART && tok[0].type == JSMN_ARRAY && tok[1].type == JSMN_PRIMITIVE && tok[2].type == JSMN_PRIMITIVE); js = " [ 1, true, [123, \"hello"; - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_ERROR_PART && tok[0].type == JSMN_ARRAY + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r == JSMN_ERROR_PART && tok[0].type == JSMN_ARRAY && tok[1].type == JSMN_PRIMITIVE && tok[2].type == JSMN_PRIMITIVE && tok[3].type == JSMN_ARRAY && tok[4].type == JSMN_PRIMITIVE); js = " [ 1, true, [123, \"hello\"]"; - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_ERROR_PART && tok[0].type == JSMN_ARRAY + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r == JSMN_ERROR_PART && tok[0].type == JSMN_ARRAY && tok[1].type == JSMN_PRIMITIVE && tok[2].type == JSMN_PRIMITIVE && tok[3].type == JSMN_ARRAY && tok[4].type == JSMN_PRIMITIVE && tok[5].type == JSMN_STRING); @@ -281,8 +292,8 @@ int test_partial_array() { check(tok[3].size == 2); js = " [ 1, true, [123, \"hello\"]]"; - r = jsmn_parse(&p, js, tok, 10); - check(r == JSMN_SUCCESS && tok[0].type == JSMN_ARRAY + r = jsmn_parse(&p, js, strlen(js), tok, 10); + check(r >= 0 && tok[0].type == JSMN_ARRAY && tok[1].type == JSMN_PRIMITIVE && tok[2].type == JSMN_PRIMITIVE && tok[3].type == JSMN_ARRAY && tok[4].type == JSMN_PRIMITIVE && tok[5].type == JSMN_STRING); @@ -304,13 +315,13 @@ int test_array_nomem() { jsmn_init(&p); memset(toksmall, 0, sizeof(toksmall)); memset(toklarge, 0, sizeof(toklarge)); - r = jsmn_parse(&p, js, toksmall, i); + r = jsmn_parse(&p, js, strlen(js), toksmall, i); check(r == JSMN_ERROR_NOMEM); memcpy(toklarge, toksmall, sizeof(toksmall)); - r = jsmn_parse(&p, js, toklarge, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), toklarge, 10); + check(r >= 0); check(toklarge[0].type == JSMN_ARRAY && toklarge[0].size == 3); check(toklarge[3].type == JSMN_ARRAY && toklarge[3].size == 2); @@ -319,7 +330,6 @@ int test_array_nomem() { } int test_objects_arrays() { - int i; int r; jsmn_parser p; jsmntok_t tokens[10]; @@ -327,27 +337,60 @@ int test_objects_arrays() { js = "[10}"; jsmn_init(&p); - r = jsmn_parse(&p, js, tokens, 10); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); check(r == JSMN_ERROR_INVAL); js = "[10]"; jsmn_init(&p); - r = jsmn_parse(&p, js, tokens, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r >= 0); js = "{\"a\": 1]"; jsmn_init(&p); - r = jsmn_parse(&p, js, tokens, 10); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); check(r == JSMN_ERROR_INVAL); js = "{\"a\": 1}"; jsmn_init(&p); - r = jsmn_parse(&p, js, tokens, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r >= 0); return 0; } +int test_issue_22() { + int r; + jsmn_parser p; + jsmntok_t tokens[128]; + const char *js; + + js = "{ \"height\":10, \"layers\":[ { \"data\":[6,6], \"height\":10, " + "\"name\":\"Calque de Tile 1\", \"opacity\":1, \"type\":\"tilelayer\", " + "\"visible\":true, \"width\":10, \"x\":0, \"y\":0 }], " + "\"orientation\":\"orthogonal\", \"properties\": { }, \"tileheight\":32, " + "\"tilesets\":[ { \"firstgid\":1, \"image\":\"..\\/images\\/tiles.png\", " + "\"imageheight\":64, \"imagewidth\":160, \"margin\":0, \"name\":\"Tiles\", " + "\"properties\":{}, \"spacing\":0, \"tileheight\":32, \"tilewidth\":32 }], " + "\"tilewidth\":32, \"version\":1, \"width\":10 }"; + jsmn_init(&p); + r = jsmn_parse(&p, js, strlen(js), tokens, 128); + check(r >= 0); +#if 0 + for (i = 1; tokens[i].end < tokens[0].end; i++) { + if (tokens[i].type == JSMN_STRING || tokens[i].type == JSMN_PRIMITIVE) { + printf("%.*s\n", tokens[i].end - tokens[i].start, js + tokens[i].start); + } else if (tokens[i].type == JSMN_ARRAY) { + printf("[%d elems]\n", tokens[i].size); + } else if (tokens[i].type == JSMN_OBJECT) { + printf("{%d elems}\n", tokens[i].size); + } else { + TOKEN_PRINT(tokens[i]); + } + } +#endif + return 0; +} + int test_unicode_characters() { jsmn_parser p; jsmntok_t tokens[10]; @@ -356,42 +399,193 @@ int test_unicode_characters() { int r; js = "{\"a\":\"\\uAbcD\"}"; jsmn_init(&p); - r = jsmn_parse(&p, js, tokens, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r >= 0); js = "{\"a\":\"str\\u0000\"}"; jsmn_init(&p); - r = jsmn_parse(&p, js, tokens, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r >= 0); js = "{\"a\":\"\\uFFFFstr\"}"; jsmn_init(&p); - r = jsmn_parse(&p, js, tokens, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r >= 0); js = "{\"a\":\"str\\uFFGFstr\"}"; jsmn_init(&p); - r = jsmn_parse(&p, js, tokens, 10); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); check(r == JSMN_ERROR_INVAL); js = "{\"a\":\"str\\u@FfF\"}"; jsmn_init(&p); - r = jsmn_parse(&p, js, tokens, 10); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); check(r == JSMN_ERROR_INVAL); js = "{\"a\":[\"\\u028\"]}"; jsmn_init(&p); - r = jsmn_parse(&p, js, tokens, 10); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); check(r == JSMN_ERROR_INVAL); js = "{\"a\":[\"\\u0280\"]}"; jsmn_init(&p); - r = jsmn_parse(&p, js, tokens, 10); - check(r == JSMN_SUCCESS); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r >= 0); return 0; } +int test_input_length() { + const char *js; + int r; + jsmn_parser p; + jsmntok_t tokens[10]; + + js = "{\"a\": 0}garbage"; + + jsmn_init(&p); + r = jsmn_parse(&p, js, 8, tokens, 10); + check(r == 3); + check(TOKEN_STRING(js, tokens[0], "{\"a\": 0}")); + check(TOKEN_STRING(js, tokens[1], "a")); + check(TOKEN_STRING(js, tokens[2], "0")); + + return 0; +} + +int test_count() { + jsmn_parser p; + const char *js; + + js = "{}"; + jsmn_init(&p); + check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 1); + + js = "[]"; + jsmn_init(&p); + check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 1); + + js = "[[]]"; + jsmn_init(&p); + check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 2); + + js = "[[], []]"; + jsmn_init(&p); + check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 3); + + js = "[[], []]"; + jsmn_init(&p); + check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 3); + + js = "[[], [[]], [[], []]]"; + jsmn_init(&p); + check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 7); + + js = "[\"a\", [[], []]]"; + jsmn_init(&p); + check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 5); + + js = "[[], \"[], [[]]\", [[]]]"; + jsmn_init(&p); + check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 5); + + js = "[1, 2, 3]"; + jsmn_init(&p); + check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 4); + + js = "[1, 2, [3, \"a\"], null]"; + jsmn_init(&p); + check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 7); + + return 0; +} + +int test_keyvalue() { + const char *js; + int r; + jsmn_parser p; + jsmntok_t tokens[10]; + + js = "{\"a\": 0, \"b\": \"c\"}"; + + jsmn_init(&p); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r == 5); + check(tokens[0].size == 2); /* two keys */ + check(tokens[1].size == 1 && tokens[3].size == 1); /* one value per key */ + check(tokens[2].size == 0 && tokens[4].size == 0); /* values have zero size */ + + js = "{\"a\"\n0}"; + jsmn_init(&p); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r == JSMN_ERROR_INVAL); + + js = "{\"a\", 0}"; + jsmn_init(&p); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r == JSMN_ERROR_INVAL); + + js = "{\"a\": {2}}"; + jsmn_init(&p); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r == JSMN_ERROR_INVAL); + + js = "{\"a\": {2: 3}}"; + jsmn_init(&p); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r == JSMN_ERROR_INVAL); + + + js = "{\"a\": {\"a\": 2 3}}"; + jsmn_init(&p); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r == JSMN_ERROR_INVAL); + return 0; +} + +/** A huge redefinition of everything to include jsmn in non-script mode */ +#define jsmn_init jsmn_init_nonstrict +#define jsmn_parse jsmn_parse_nonstrict +#define jsmn_parser jsmn_parser_nonstrict +#define jsmn_alloc_token jsmn_alloc_token_nonstrict +#define jsmn_fill_token jsmn_fill_token_nonstrict +#define jsmn_parse_primitive jsmn_parse_primitive_nonstrict +#define jsmn_parse_string jsmn_parse_string_nonstrict +#define jsmntype_t jsmntype_nonstrict_t +#define jsmnerr_t jsmnerr_nonstrict_t +#define jsmntok_t jsmntok_nonstrict_t +#define JSMN_PRIMITIVE JSMN_PRIMITIVE_NONSTRICT +#define JSMN_OBJECT JSMN_OBJECT_NONSTRICT +#define JSMN_ARRAY JSMN_ARRAY_NONSTRICT +#define JSMN_STRING JSMN_STRING_NONSTRICT +#define JSMN_ERROR_NOMEM JSMN_ERROR_NOMEM_NONSTRICT +#define JSMN_ERROR_INVAL JSMN_ERROR_INVAL_NONSTRICT +#define JSMN_ERROR_PART JSMN_ERROR_PART_NONSTRICT +#undef __JSMN_H_ +#undef JSMN_STRICT +#include "jsmn.c" + +int test_nonstrict() { + const char *js; + int r; + jsmn_parser p; + jsmntok_t tokens[10]; + + js = "a: 0garbage"; + + jsmn_init(&p); + r = jsmn_parse(&p, js, 4, tokens, 10); + check(r == 2); + check(TOKEN_STRING(js, tokens[0], "a")); + check(TOKEN_STRING(js, tokens[1], "0")); + + js = "Day : 26\nMonth : Sep\n\nYear: 12"; + jsmn_init(&p); + r = jsmn_parse(&p, js, strlen(js), tokens, 10); + check(r == 6); + return 0; +} + int main() { test(test_empty, "general test for a empty JSON objects/arrays"); test(test_simple, "general test for a simple JSON string"); @@ -403,6 +597,11 @@ int main() { test(test_unquoted_keys, "test unquoted keys (like in JavaScript)"); test(test_objects_arrays, "test objects and arrays"); test(test_unicode_characters, "test unicode characters"); + test(test_input_length, "test strings that are not null-terminated"); + test(test_issue_22, "test issue #22"); + test(test_count, "test tokens count estimation"); + test(test_nonstrict, "test for non-strict mode"); + test(test_keyvalue, "test for keys/values"); printf("\nPASSED: %d\nFAILED: %d\n", test_passed, test_failed); return 0; } diff --git a/contrib/ntp/libntp/Makefile.am b/contrib/ntp/libntp/Makefile.am index c12658f5a18e..914badb5f64b 100644 --- a/contrib/ntp/libntp/Makefile.am +++ b/contrib/ntp/libntp/Makefile.am @@ -89,6 +89,7 @@ libntp_a_SRCS = \ numtohost.c \ octtoint.c \ prettydate.c \ + refidsmear.c \ recvbuff.c \ refnumtoa.c \ snprintf.c \ diff --git a/contrib/ntp/libntp/Makefile.in b/contrib/ntp/libntp/Makefile.in index 1b451169e171..b4b1d818d547 100644 --- a/contrib/ntp/libntp/Makefile.in +++ b/contrib/ntp/libntp/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 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. @@ -16,6 +15,61 @@ @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@ @@ -35,8 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @PTHREADS_TRUE@am__append_1 = $(srcdir)/../lib/isc/pthreads/mutex.c -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf subdir = libntp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ @@ -68,6 +120,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ + $(top_srcdir)/sntp/m4/ntp_unitytest.m4 \ $(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \ $(top_srcdir)/sntp/m4/openldap-thread-check.m4 \ @@ -77,18 +130,17 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = @ARFLAGS@ -AM_V_AR = $(am__v_AR_$(V)) -am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY)) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libntp_a_AR = $(AR) $(ARFLAGS) libntp_a_LIBADD = am__libntp_a_SOURCES_DIST = systime.c a_md5encrypt.c adjtime.c \ @@ -101,10 +153,10 @@ am__libntp_a_SOURCES_DIST = systime.c a_md5encrypt.c adjtime.c \ netof.c ntp_calendar.c ntp_crypto_rnd.c ntp_intres.c \ ntp_libopts.c ntp_lineedit.c ntp_random.c ntp_rfc2553.c \ ntp_worker.c numtoa.c numtohost.c octtoint.c prettydate.c \ - recvbuff.c refnumtoa.c snprintf.c socket.c socktoa.c \ - socktohost.c ssl_init.c statestr.c strdup.c strl_obsd.c \ - syssignal.c timetoa.c timevalops.c uglydate.c vint64ops.c \ - work_fork.c work_thread.c ymd2yd.c \ + refidsmear.c recvbuff.c refnumtoa.c snprintf.c socket.c \ + socktoa.c socktohost.c ssl_init.c statestr.c strdup.c \ + strl_obsd.c syssignal.c timetoa.c timevalops.c uglydate.c \ + vint64ops.c work_fork.c work_thread.c ymd2yd.c \ $(srcdir)/../lib/isc/assertions.c \ $(srcdir)/../lib/isc/buffer.c \ $(srcdir)/../lib/isc/backtrace-emptytbl.c \ @@ -161,14 +213,14 @@ am__objects_4 = a_md5encrypt.$(OBJEXT) adjtime.$(OBJEXT) \ ntp_libopts.$(OBJEXT) ntp_lineedit.$(OBJEXT) \ ntp_random.$(OBJEXT) ntp_rfc2553.$(OBJEXT) \ ntp_worker.$(OBJEXT) numtoa.$(OBJEXT) numtohost.$(OBJEXT) \ - octtoint.$(OBJEXT) prettydate.$(OBJEXT) recvbuff.$(OBJEXT) \ - refnumtoa.$(OBJEXT) snprintf.$(OBJEXT) socket.$(OBJEXT) \ - socktoa.$(OBJEXT) socktohost.$(OBJEXT) ssl_init.$(OBJEXT) \ - statestr.$(OBJEXT) strdup.$(OBJEXT) strl_obsd.$(OBJEXT) \ - syssignal.$(OBJEXT) timetoa.$(OBJEXT) timevalops.$(OBJEXT) \ - uglydate.$(OBJEXT) vint64ops.$(OBJEXT) work_fork.$(OBJEXT) \ - work_thread.$(OBJEXT) ymd2yd.$(OBJEXT) $(am__objects_3) \ - $(am__objects_1) + octtoint.$(OBJEXT) prettydate.$(OBJEXT) refidsmear.$(OBJEXT) \ + recvbuff.$(OBJEXT) refnumtoa.$(OBJEXT) snprintf.$(OBJEXT) \ + socket.$(OBJEXT) socktoa.$(OBJEXT) socktohost.$(OBJEXT) \ + ssl_init.$(OBJEXT) statestr.$(OBJEXT) strdup.$(OBJEXT) \ + strl_obsd.$(OBJEXT) syssignal.$(OBJEXT) timetoa.$(OBJEXT) \ + timevalops.$(OBJEXT) uglydate.$(OBJEXT) vint64ops.$(OBJEXT) \ + work_fork.$(OBJEXT) work_thread.$(OBJEXT) ymd2yd.$(OBJEXT) \ + $(am__objects_3) $(am__objects_1) am_libntp_a_OBJECTS = systime.$(OBJEXT) $(am__objects_4) libntp_a_OBJECTS = $(am_libntp_a_OBJECTS) libntpsim_a_AR = $(AR) $(ARFLAGS) @@ -183,10 +235,10 @@ am__libntpsim_a_SOURCES_DIST = systime_s.c a_md5encrypt.c adjtime.c \ netof.c ntp_calendar.c ntp_crypto_rnd.c ntp_intres.c \ ntp_libopts.c ntp_lineedit.c ntp_random.c ntp_rfc2553.c \ ntp_worker.c numtoa.c numtohost.c octtoint.c prettydate.c \ - recvbuff.c refnumtoa.c snprintf.c socket.c socktoa.c \ - socktohost.c ssl_init.c statestr.c strdup.c strl_obsd.c \ - syssignal.c timetoa.c timevalops.c uglydate.c vint64ops.c \ - work_fork.c work_thread.c ymd2yd.c \ + refidsmear.c recvbuff.c refnumtoa.c snprintf.c socket.c \ + socktoa.c socktohost.c ssl_init.c statestr.c strdup.c \ + strl_obsd.c syssignal.c timetoa.c timevalops.c uglydate.c \ + vint64ops.c work_fork.c work_thread.c ymd2yd.c \ $(srcdir)/../lib/isc/assertions.c \ $(srcdir)/../lib/isc/buffer.c \ $(srcdir)/../lib/isc/backtrace-emptytbl.c \ @@ -214,38 +266,75 @@ am__libntpsim_a_SOURCES_DIST = systime_s.c a_md5encrypt.c adjtime.c \ $(srcdir)/../lib/isc/pthreads/mutex.c am_libntpsim_a_OBJECTS = systime_s.$(OBJEXT) $(am__objects_4) libntpsim_a_OBJECTS = $(am_libntpsim_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libntp_a_SOURCES) $(EXTRA_libntp_a_SOURCES) \ $(libntpsim_a_SOURCES) DIST_SOURCES = $(am__libntp_a_SOURCES_DIST) $(EXTRA_libntp_a_SOURCES) \ $(am__libntpsim_a_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \ + $(top_srcdir)/includes.mf \ + $(top_srcdir)/sntp/libevent/build-aux/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -296,6 +385,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@ GTEST_LDFLAGS = @GTEST_LDFLAGS@ GTEST_LIBS = @GTEST_LIBS@ HAVE_INLINE = @HAVE_INLINE@ +HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@ HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@ HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@ INSTALL = @INSTALL@ @@ -412,6 +502,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@ PATH_PERL = @PATH_PERL@ +PATH_RUBY = @PATH_RUBY@ PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_TEST = @PATH_TEST@ PERLLIBDIR = @PERLLIBDIR@ @@ -584,6 +675,7 @@ libntp_a_SRCS = \ numtohost.c \ octtoint.c \ prettydate.c \ + refidsmear.c \ recvbuff.c \ refnumtoa.c \ snprintf.c \ @@ -631,7 +723,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_src echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libntp/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign libntp/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -640,6 +731,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -652,11 +744,13 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libntp.a: $(libntp_a_OBJECTS) $(libntp_a_DEPENDENCIES) + +libntp.a: $(libntp_a_OBJECTS) $(libntp_a_DEPENDENCIES) $(EXTRA_libntp_a_DEPENDENCIES) $(AM_V_at)-rm -f libntp.a $(AM_V_AR)$(libntp_a_AR) libntp.a $(libntp_a_OBJECTS) $(libntp_a_LIBADD) $(AM_V_at)$(RANLIB) libntp.a -libntpsim.a: $(libntpsim_a_OBJECTS) $(libntpsim_a_DEPENDENCIES) + +libntpsim.a: $(libntpsim_a_OBJECTS) $(libntpsim_a_DEPENDENCIES) $(EXTRA_libntpsim_a_DEPENDENCIES) $(AM_V_at)-rm -f libntpsim.a $(AM_V_AR)$(libntpsim_a_AR) libntpsim.a $(libntpsim_a_OBJECTS) $(libntpsim_a_LIBADD) $(AM_V_at)$(RANLIB) libntpsim.a @@ -738,6 +832,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prettydate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recvbuff.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refidsmear.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refnumtoa.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/result.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@ @@ -770,538 +865,471 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< assertions.o: $(srcdir)/../lib/isc/assertions.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT assertions.o -MD -MP -MF $(DEPDIR)/assertions.Tpo -c -o assertions.o `test -f '$(srcdir)/../lib/isc/assertions.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/assertions.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/assertions.Tpo $(DEPDIR)/assertions.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/assertions.c' object='assertions.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/assertions.c' object='assertions.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o assertions.o `test -f '$(srcdir)/../lib/isc/assertions.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/assertions.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o assertions.o `test -f '$(srcdir)/../lib/isc/assertions.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/assertions.c assertions.obj: $(srcdir)/../lib/isc/assertions.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT assertions.obj -MD -MP -MF $(DEPDIR)/assertions.Tpo -c -o assertions.obj `if test -f '$(srcdir)/../lib/isc/assertions.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/assertions.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/assertions.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/assertions.Tpo $(DEPDIR)/assertions.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/assertions.c' object='assertions.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/assertions.c' object='assertions.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o assertions.obj `if test -f '$(srcdir)/../lib/isc/assertions.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/assertions.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/assertions.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o assertions.obj `if test -f '$(srcdir)/../lib/isc/assertions.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/assertions.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/assertions.c'; fi` buffer.o: $(srcdir)/../lib/isc/buffer.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT buffer.o -MD -MP -MF $(DEPDIR)/buffer.Tpo -c -o buffer.o `test -f '$(srcdir)/../lib/isc/buffer.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/buffer.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/buffer.Tpo $(DEPDIR)/buffer.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/buffer.c' object='buffer.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/buffer.c' object='buffer.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o buffer.o `test -f '$(srcdir)/../lib/isc/buffer.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/buffer.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o buffer.o `test -f '$(srcdir)/../lib/isc/buffer.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/buffer.c buffer.obj: $(srcdir)/../lib/isc/buffer.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT buffer.obj -MD -MP -MF $(DEPDIR)/buffer.Tpo -c -o buffer.obj `if test -f '$(srcdir)/../lib/isc/buffer.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/buffer.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/buffer.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/buffer.Tpo $(DEPDIR)/buffer.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/buffer.c' object='buffer.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/buffer.c' object='buffer.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o buffer.obj `if test -f '$(srcdir)/../lib/isc/buffer.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/buffer.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/buffer.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o buffer.obj `if test -f '$(srcdir)/../lib/isc/buffer.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/buffer.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/buffer.c'; fi` backtrace-emptytbl.o: $(srcdir)/../lib/isc/backtrace-emptytbl.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT backtrace-emptytbl.o -MD -MP -MF $(DEPDIR)/backtrace-emptytbl.Tpo -c -o backtrace-emptytbl.o `test -f '$(srcdir)/../lib/isc/backtrace-emptytbl.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/backtrace-emptytbl.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/backtrace-emptytbl.Tpo $(DEPDIR)/backtrace-emptytbl.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/backtrace-emptytbl.c' object='backtrace-emptytbl.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/backtrace-emptytbl.c' object='backtrace-emptytbl.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o backtrace-emptytbl.o `test -f '$(srcdir)/../lib/isc/backtrace-emptytbl.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/backtrace-emptytbl.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o backtrace-emptytbl.o `test -f '$(srcdir)/../lib/isc/backtrace-emptytbl.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/backtrace-emptytbl.c backtrace-emptytbl.obj: $(srcdir)/../lib/isc/backtrace-emptytbl.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT backtrace-emptytbl.obj -MD -MP -MF $(DEPDIR)/backtrace-emptytbl.Tpo -c -o backtrace-emptytbl.obj `if test -f '$(srcdir)/../lib/isc/backtrace-emptytbl.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/backtrace-emptytbl.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/backtrace-emptytbl.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/backtrace-emptytbl.Tpo $(DEPDIR)/backtrace-emptytbl.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/backtrace-emptytbl.c' object='backtrace-emptytbl.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/backtrace-emptytbl.c' object='backtrace-emptytbl.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o backtrace-emptytbl.obj `if test -f '$(srcdir)/../lib/isc/backtrace-emptytbl.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/backtrace-emptytbl.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/backtrace-emptytbl.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o backtrace-emptytbl.obj `if test -f '$(srcdir)/../lib/isc/backtrace-emptytbl.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/backtrace-emptytbl.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/backtrace-emptytbl.c'; fi` backtrace.o: $(srcdir)/../lib/isc/backtrace.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT backtrace.o -MD -MP -MF $(DEPDIR)/backtrace.Tpo -c -o backtrace.o `test -f '$(srcdir)/../lib/isc/backtrace.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/backtrace.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/backtrace.Tpo $(DEPDIR)/backtrace.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/backtrace.c' object='backtrace.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/backtrace.c' object='backtrace.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o backtrace.o `test -f '$(srcdir)/../lib/isc/backtrace.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/backtrace.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o backtrace.o `test -f '$(srcdir)/../lib/isc/backtrace.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/backtrace.c backtrace.obj: $(srcdir)/../lib/isc/backtrace.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT backtrace.obj -MD -MP -MF $(DEPDIR)/backtrace.Tpo -c -o backtrace.obj `if test -f '$(srcdir)/../lib/isc/backtrace.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/backtrace.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/backtrace.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/backtrace.Tpo $(DEPDIR)/backtrace.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/backtrace.c' object='backtrace.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/backtrace.c' object='backtrace.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o backtrace.obj `if test -f '$(srcdir)/../lib/isc/backtrace.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/backtrace.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/backtrace.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o backtrace.obj `if test -f '$(srcdir)/../lib/isc/backtrace.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/backtrace.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/backtrace.c'; fi` condition.o: $(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT condition.o -MD -MP -MF $(DEPDIR)/condition.Tpo -c -o condition.o `test -f '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/condition.Tpo $(DEPDIR)/condition.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c' object='condition.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c' object='condition.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o condition.o `test -f '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o condition.o `test -f '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c condition.obj: $(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT condition.obj -MD -MP -MF $(DEPDIR)/condition.Tpo -c -o condition.obj `if test -f '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/condition.Tpo $(DEPDIR)/condition.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c' object='condition.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c' object='condition.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o condition.obj `if test -f '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o condition.obj `if test -f '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c'; fi` dir.o: $(srcdir)/../lib/isc/unix/dir.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dir.o -MD -MP -MF $(DEPDIR)/dir.Tpo -c -o dir.o `test -f '$(srcdir)/../lib/isc/unix/dir.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/dir.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dir.Tpo $(DEPDIR)/dir.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/dir.c' object='dir.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/dir.c' object='dir.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dir.o `test -f '$(srcdir)/../lib/isc/unix/dir.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/dir.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dir.o `test -f '$(srcdir)/../lib/isc/unix/dir.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/dir.c dir.obj: $(srcdir)/../lib/isc/unix/dir.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dir.obj -MD -MP -MF $(DEPDIR)/dir.Tpo -c -o dir.obj `if test -f '$(srcdir)/../lib/isc/unix/dir.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/dir.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/dir.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dir.Tpo $(DEPDIR)/dir.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/dir.c' object='dir.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/dir.c' object='dir.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dir.obj `if test -f '$(srcdir)/../lib/isc/unix/dir.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/dir.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/dir.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dir.obj `if test -f '$(srcdir)/../lib/isc/unix/dir.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/dir.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/dir.c'; fi` error.o: $(srcdir)/../lib/isc/error.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error.o -MD -MP -MF $(DEPDIR)/error.Tpo -c -o error.o `test -f '$(srcdir)/../lib/isc/error.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/error.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/error.Tpo $(DEPDIR)/error.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/error.c' object='error.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/error.c' object='error.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error.o `test -f '$(srcdir)/../lib/isc/error.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/error.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error.o `test -f '$(srcdir)/../lib/isc/error.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/error.c error.obj: $(srcdir)/../lib/isc/error.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error.obj -MD -MP -MF $(DEPDIR)/error.Tpo -c -o error.obj `if test -f '$(srcdir)/../lib/isc/error.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/error.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/error.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/error.Tpo $(DEPDIR)/error.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/error.c' object='error.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/error.c' object='error.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error.obj `if test -f '$(srcdir)/../lib/isc/error.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/error.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/error.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error.obj `if test -f '$(srcdir)/../lib/isc/error.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/error.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/error.c'; fi` errno2result.o: $(srcdir)/../lib/isc/unix/errno2result.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT errno2result.o -MD -MP -MF $(DEPDIR)/errno2result.Tpo -c -o errno2result.o `test -f '$(srcdir)/../lib/isc/unix/errno2result.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/errno2result.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/errno2result.Tpo $(DEPDIR)/errno2result.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/errno2result.c' object='errno2result.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/errno2result.c' object='errno2result.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o errno2result.o `test -f '$(srcdir)/../lib/isc/unix/errno2result.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/errno2result.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o errno2result.o `test -f '$(srcdir)/../lib/isc/unix/errno2result.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/errno2result.c errno2result.obj: $(srcdir)/../lib/isc/unix/errno2result.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT errno2result.obj -MD -MP -MF $(DEPDIR)/errno2result.Tpo -c -o errno2result.obj `if test -f '$(srcdir)/../lib/isc/unix/errno2result.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/errno2result.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/errno2result.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/errno2result.Tpo $(DEPDIR)/errno2result.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/errno2result.c' object='errno2result.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/errno2result.c' object='errno2result.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o errno2result.obj `if test -f '$(srcdir)/../lib/isc/unix/errno2result.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/errno2result.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/errno2result.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o errno2result.obj `if test -f '$(srcdir)/../lib/isc/unix/errno2result.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/errno2result.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/errno2result.c'; fi` event.o: $(srcdir)/../lib/isc/event.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT event.o -MD -MP -MF $(DEPDIR)/event.Tpo -c -o event.o `test -f '$(srcdir)/../lib/isc/event.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/event.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/event.Tpo $(DEPDIR)/event.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/event.c' object='event.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/event.c' object='event.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o event.o `test -f '$(srcdir)/../lib/isc/event.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/event.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o event.o `test -f '$(srcdir)/../lib/isc/event.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/event.c event.obj: $(srcdir)/../lib/isc/event.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT event.obj -MD -MP -MF $(DEPDIR)/event.Tpo -c -o event.obj `if test -f '$(srcdir)/../lib/isc/event.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/event.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/event.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/event.Tpo $(DEPDIR)/event.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/event.c' object='event.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/event.c' object='event.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o event.obj `if test -f '$(srcdir)/../lib/isc/event.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/event.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/event.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o event.obj `if test -f '$(srcdir)/../lib/isc/event.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/event.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/event.c'; fi` file.o: $(srcdir)/../lib/isc/unix/file.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT file.o -MD -MP -MF $(DEPDIR)/file.Tpo -c -o file.o `test -f '$(srcdir)/../lib/isc/unix/file.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/file.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/file.Tpo $(DEPDIR)/file.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/file.c' object='file.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/file.c' object='file.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file.o `test -f '$(srcdir)/../lib/isc/unix/file.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/file.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file.o `test -f '$(srcdir)/../lib/isc/unix/file.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/file.c file.obj: $(srcdir)/../lib/isc/unix/file.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT file.obj -MD -MP -MF $(DEPDIR)/file.Tpo -c -o file.obj `if test -f '$(srcdir)/../lib/isc/unix/file.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/file.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/file.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/file.Tpo $(DEPDIR)/file.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/file.c' object='file.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/file.c' object='file.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file.obj `if test -f '$(srcdir)/../lib/isc/unix/file.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/file.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/file.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file.obj `if test -f '$(srcdir)/../lib/isc/unix/file.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/file.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/file.c'; fi` inet_ntop.o: $(srcdir)/../lib/isc/inet_ntop.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_ntop.o -MD -MP -MF $(DEPDIR)/inet_ntop.Tpo -c -o inet_ntop.o `test -f '$(srcdir)/../lib/isc/inet_ntop.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/inet_ntop.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/inet_ntop.Tpo $(DEPDIR)/inet_ntop.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/inet_ntop.c' object='inet_ntop.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/inet_ntop.c' object='inet_ntop.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_ntop.o `test -f '$(srcdir)/../lib/isc/inet_ntop.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/inet_ntop.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_ntop.o `test -f '$(srcdir)/../lib/isc/inet_ntop.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/inet_ntop.c inet_ntop.obj: $(srcdir)/../lib/isc/inet_ntop.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_ntop.obj -MD -MP -MF $(DEPDIR)/inet_ntop.Tpo -c -o inet_ntop.obj `if test -f '$(srcdir)/../lib/isc/inet_ntop.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/inet_ntop.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/inet_ntop.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/inet_ntop.Tpo $(DEPDIR)/inet_ntop.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/inet_ntop.c' object='inet_ntop.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/inet_ntop.c' object='inet_ntop.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_ntop.obj `if test -f '$(srcdir)/../lib/isc/inet_ntop.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/inet_ntop.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/inet_ntop.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_ntop.obj `if test -f '$(srcdir)/../lib/isc/inet_ntop.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/inet_ntop.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/inet_ntop.c'; fi` inet_pton.o: $(srcdir)/../lib/isc/inet_pton.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_pton.o -MD -MP -MF $(DEPDIR)/inet_pton.Tpo -c -o inet_pton.o `test -f '$(srcdir)/../lib/isc/inet_pton.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/inet_pton.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/inet_pton.Tpo $(DEPDIR)/inet_pton.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/inet_pton.c' object='inet_pton.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/inet_pton.c' object='inet_pton.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_pton.o `test -f '$(srcdir)/../lib/isc/inet_pton.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/inet_pton.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_pton.o `test -f '$(srcdir)/../lib/isc/inet_pton.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/inet_pton.c inet_pton.obj: $(srcdir)/../lib/isc/inet_pton.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_pton.obj -MD -MP -MF $(DEPDIR)/inet_pton.Tpo -c -o inet_pton.obj `if test -f '$(srcdir)/../lib/isc/inet_pton.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/inet_pton.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/inet_pton.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/inet_pton.Tpo $(DEPDIR)/inet_pton.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/inet_pton.c' object='inet_pton.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/inet_pton.c' object='inet_pton.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_pton.obj `if test -f '$(srcdir)/../lib/isc/inet_pton.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/inet_pton.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/inet_pton.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_pton.obj `if test -f '$(srcdir)/../lib/isc/inet_pton.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/inet_pton.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/inet_pton.c'; fi` interfaceiter.o: $(srcdir)/../lib/isc/unix/interfaceiter.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interfaceiter.o -MD -MP -MF $(DEPDIR)/interfaceiter.Tpo -c -o interfaceiter.o `test -f '$(srcdir)/../lib/isc/unix/interfaceiter.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/interfaceiter.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/interfaceiter.Tpo $(DEPDIR)/interfaceiter.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/interfaceiter.c' object='interfaceiter.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/interfaceiter.c' object='interfaceiter.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o interfaceiter.o `test -f '$(srcdir)/../lib/isc/unix/interfaceiter.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/interfaceiter.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o interfaceiter.o `test -f '$(srcdir)/../lib/isc/unix/interfaceiter.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/interfaceiter.c interfaceiter.obj: $(srcdir)/../lib/isc/unix/interfaceiter.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interfaceiter.obj -MD -MP -MF $(DEPDIR)/interfaceiter.Tpo -c -o interfaceiter.obj `if test -f '$(srcdir)/../lib/isc/unix/interfaceiter.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/interfaceiter.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/interfaceiter.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/interfaceiter.Tpo $(DEPDIR)/interfaceiter.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/interfaceiter.c' object='interfaceiter.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/interfaceiter.c' object='interfaceiter.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o interfaceiter.obj `if test -f '$(srcdir)/../lib/isc/unix/interfaceiter.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/interfaceiter.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/interfaceiter.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o interfaceiter.obj `if test -f '$(srcdir)/../lib/isc/unix/interfaceiter.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/interfaceiter.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/interfaceiter.c'; fi` lib.o: $(srcdir)/../lib/isc/lib.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib.o -MD -MP -MF $(DEPDIR)/lib.Tpo -c -o lib.o `test -f '$(srcdir)/../lib/isc/lib.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/lib.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib.Tpo $(DEPDIR)/lib.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/lib.c' object='lib.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/lib.c' object='lib.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib.o `test -f '$(srcdir)/../lib/isc/lib.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/lib.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib.o `test -f '$(srcdir)/../lib/isc/lib.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/lib.c lib.obj: $(srcdir)/../lib/isc/lib.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib.obj -MD -MP -MF $(DEPDIR)/lib.Tpo -c -o lib.obj `if test -f '$(srcdir)/../lib/isc/lib.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/lib.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/lib.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib.Tpo $(DEPDIR)/lib.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/lib.c' object='lib.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/lib.c' object='lib.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib.obj `if test -f '$(srcdir)/../lib/isc/lib.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/lib.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/lib.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib.obj `if test -f '$(srcdir)/../lib/isc/lib.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/lib.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/lib.c'; fi` log.o: $(srcdir)/../lib/isc/log.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT log.o -MD -MP -MF $(DEPDIR)/log.Tpo -c -o log.o `test -f '$(srcdir)/../lib/isc/log.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/log.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/log.Tpo $(DEPDIR)/log.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/log.c' object='log.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/log.c' object='log.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o log.o `test -f '$(srcdir)/../lib/isc/log.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/log.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o log.o `test -f '$(srcdir)/../lib/isc/log.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/log.c log.obj: $(srcdir)/../lib/isc/log.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT log.obj -MD -MP -MF $(DEPDIR)/log.Tpo -c -o log.obj `if test -f '$(srcdir)/../lib/isc/log.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/log.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/log.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/log.Tpo $(DEPDIR)/log.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/log.c' object='log.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/log.c' object='log.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o log.obj `if test -f '$(srcdir)/../lib/isc/log.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/log.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/log.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o log.obj `if test -f '$(srcdir)/../lib/isc/log.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/log.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/log.c'; fi` md5.o: $(srcdir)/../lib/isc/md5.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.o -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.o `test -f '$(srcdir)/../lib/isc/md5.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/md5.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/md5.c' object='md5.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/md5.c' object='md5.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.o `test -f '$(srcdir)/../lib/isc/md5.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/md5.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.o `test -f '$(srcdir)/../lib/isc/md5.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/md5.c md5.obj: $(srcdir)/../lib/isc/md5.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.obj -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.obj `if test -f '$(srcdir)/../lib/isc/md5.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/md5.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/md5.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/md5.c' object='md5.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/md5.c' object='md5.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f '$(srcdir)/../lib/isc/md5.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/md5.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/md5.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f '$(srcdir)/../lib/isc/md5.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/md5.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/md5.c'; fi` msgcat.o: $(srcdir)/../lib/isc/nls/msgcat.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT msgcat.o -MD -MP -MF $(DEPDIR)/msgcat.Tpo -c -o msgcat.o `test -f '$(srcdir)/../lib/isc/nls/msgcat.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/nls/msgcat.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/msgcat.Tpo $(DEPDIR)/msgcat.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/nls/msgcat.c' object='msgcat.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/nls/msgcat.c' object='msgcat.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcat.o `test -f '$(srcdir)/../lib/isc/nls/msgcat.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/nls/msgcat.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcat.o `test -f '$(srcdir)/../lib/isc/nls/msgcat.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/nls/msgcat.c msgcat.obj: $(srcdir)/../lib/isc/nls/msgcat.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT msgcat.obj -MD -MP -MF $(DEPDIR)/msgcat.Tpo -c -o msgcat.obj `if test -f '$(srcdir)/../lib/isc/nls/msgcat.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/nls/msgcat.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/nls/msgcat.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/msgcat.Tpo $(DEPDIR)/msgcat.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/nls/msgcat.c' object='msgcat.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/nls/msgcat.c' object='msgcat.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcat.obj `if test -f '$(srcdir)/../lib/isc/nls/msgcat.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/nls/msgcat.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/nls/msgcat.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcat.obj `if test -f '$(srcdir)/../lib/isc/nls/msgcat.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/nls/msgcat.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/nls/msgcat.c'; fi` net.o: $(srcdir)/../lib/isc/unix/net.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT net.o -MD -MP -MF $(DEPDIR)/net.Tpo -c -o net.o `test -f '$(srcdir)/../lib/isc/unix/net.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/net.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/net.Tpo $(DEPDIR)/net.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/net.c' object='net.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/net.c' object='net.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o net.o `test -f '$(srcdir)/../lib/isc/unix/net.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/net.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o net.o `test -f '$(srcdir)/../lib/isc/unix/net.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/net.c net.obj: $(srcdir)/../lib/isc/unix/net.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT net.obj -MD -MP -MF $(DEPDIR)/net.Tpo -c -o net.obj `if test -f '$(srcdir)/../lib/isc/unix/net.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/net.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/net.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/net.Tpo $(DEPDIR)/net.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/net.c' object='net.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/net.c' object='net.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o net.obj `if test -f '$(srcdir)/../lib/isc/unix/net.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/net.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/net.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o net.obj `if test -f '$(srcdir)/../lib/isc/unix/net.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/net.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/net.c'; fi` netaddr.o: $(srcdir)/../lib/isc/netaddr.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netaddr.o -MD -MP -MF $(DEPDIR)/netaddr.Tpo -c -o netaddr.o `test -f '$(srcdir)/../lib/isc/netaddr.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/netaddr.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/netaddr.Tpo $(DEPDIR)/netaddr.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/netaddr.c' object='netaddr.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/netaddr.c' object='netaddr.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netaddr.o `test -f '$(srcdir)/../lib/isc/netaddr.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/netaddr.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netaddr.o `test -f '$(srcdir)/../lib/isc/netaddr.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/netaddr.c netaddr.obj: $(srcdir)/../lib/isc/netaddr.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netaddr.obj -MD -MP -MF $(DEPDIR)/netaddr.Tpo -c -o netaddr.obj `if test -f '$(srcdir)/../lib/isc/netaddr.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/netaddr.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/netaddr.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/netaddr.Tpo $(DEPDIR)/netaddr.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/netaddr.c' object='netaddr.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/netaddr.c' object='netaddr.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netaddr.obj `if test -f '$(srcdir)/../lib/isc/netaddr.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/netaddr.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/netaddr.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netaddr.obj `if test -f '$(srcdir)/../lib/isc/netaddr.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/netaddr.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/netaddr.c'; fi` netscope.o: $(srcdir)/../lib/isc/netscope.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netscope.o -MD -MP -MF $(DEPDIR)/netscope.Tpo -c -o netscope.o `test -f '$(srcdir)/../lib/isc/netscope.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/netscope.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/netscope.Tpo $(DEPDIR)/netscope.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/netscope.c' object='netscope.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/netscope.c' object='netscope.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netscope.o `test -f '$(srcdir)/../lib/isc/netscope.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/netscope.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netscope.o `test -f '$(srcdir)/../lib/isc/netscope.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/netscope.c netscope.obj: $(srcdir)/../lib/isc/netscope.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netscope.obj -MD -MP -MF $(DEPDIR)/netscope.Tpo -c -o netscope.obj `if test -f '$(srcdir)/../lib/isc/netscope.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/netscope.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/netscope.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/netscope.Tpo $(DEPDIR)/netscope.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/netscope.c' object='netscope.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/netscope.c' object='netscope.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netscope.obj `if test -f '$(srcdir)/../lib/isc/netscope.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/netscope.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/netscope.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netscope.obj `if test -f '$(srcdir)/../lib/isc/netscope.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/netscope.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/netscope.c'; fi` ondestroy.o: $(srcdir)/../lib/isc/ondestroy.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ondestroy.o -MD -MP -MF $(DEPDIR)/ondestroy.Tpo -c -o ondestroy.o `test -f '$(srcdir)/../lib/isc/ondestroy.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/ondestroy.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ondestroy.Tpo $(DEPDIR)/ondestroy.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/ondestroy.c' object='ondestroy.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/ondestroy.c' object='ondestroy.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ondestroy.o `test -f '$(srcdir)/../lib/isc/ondestroy.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/ondestroy.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ondestroy.o `test -f '$(srcdir)/../lib/isc/ondestroy.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/ondestroy.c ondestroy.obj: $(srcdir)/../lib/isc/ondestroy.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ondestroy.obj -MD -MP -MF $(DEPDIR)/ondestroy.Tpo -c -o ondestroy.obj `if test -f '$(srcdir)/../lib/isc/ondestroy.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/ondestroy.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/ondestroy.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ondestroy.Tpo $(DEPDIR)/ondestroy.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/ondestroy.c' object='ondestroy.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/ondestroy.c' object='ondestroy.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ondestroy.obj `if test -f '$(srcdir)/../lib/isc/ondestroy.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/ondestroy.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/ondestroy.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ondestroy.obj `if test -f '$(srcdir)/../lib/isc/ondestroy.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/ondestroy.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/ondestroy.c'; fi` random.o: $(srcdir)/../lib/isc/random.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT random.o -MD -MP -MF $(DEPDIR)/random.Tpo -c -o random.o `test -f '$(srcdir)/../lib/isc/random.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/random.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/random.Tpo $(DEPDIR)/random.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/random.c' object='random.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/random.c' object='random.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o random.o `test -f '$(srcdir)/../lib/isc/random.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/random.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o random.o `test -f '$(srcdir)/../lib/isc/random.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/random.c random.obj: $(srcdir)/../lib/isc/random.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT random.obj -MD -MP -MF $(DEPDIR)/random.Tpo -c -o random.obj `if test -f '$(srcdir)/../lib/isc/random.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/random.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/random.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/random.Tpo $(DEPDIR)/random.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/random.c' object='random.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/random.c' object='random.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o random.obj `if test -f '$(srcdir)/../lib/isc/random.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/random.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/random.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o random.obj `if test -f '$(srcdir)/../lib/isc/random.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/random.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/random.c'; fi` result.o: $(srcdir)/../lib/isc/result.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT result.o -MD -MP -MF $(DEPDIR)/result.Tpo -c -o result.o `test -f '$(srcdir)/../lib/isc/result.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/result.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/result.Tpo $(DEPDIR)/result.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/result.c' object='result.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/result.c' object='result.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o result.o `test -f '$(srcdir)/../lib/isc/result.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/result.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o result.o `test -f '$(srcdir)/../lib/isc/result.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/result.c result.obj: $(srcdir)/../lib/isc/result.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT result.obj -MD -MP -MF $(DEPDIR)/result.Tpo -c -o result.obj `if test -f '$(srcdir)/../lib/isc/result.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/result.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/result.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/result.Tpo $(DEPDIR)/result.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/result.c' object='result.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/result.c' object='result.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o result.obj `if test -f '$(srcdir)/../lib/isc/result.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/result.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/result.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o result.obj `if test -f '$(srcdir)/../lib/isc/result.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/result.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/result.c'; fi` stdio.o: $(srcdir)/../lib/isc/unix/stdio.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdio.o -MD -MP -MF $(DEPDIR)/stdio.Tpo -c -o stdio.o `test -f '$(srcdir)/../lib/isc/unix/stdio.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/stdio.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stdio.Tpo $(DEPDIR)/stdio.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/stdio.c' object='stdio.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/stdio.c' object='stdio.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdio.o `test -f '$(srcdir)/../lib/isc/unix/stdio.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/stdio.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdio.o `test -f '$(srcdir)/../lib/isc/unix/stdio.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/stdio.c stdio.obj: $(srcdir)/../lib/isc/unix/stdio.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdio.obj -MD -MP -MF $(DEPDIR)/stdio.Tpo -c -o stdio.obj `if test -f '$(srcdir)/../lib/isc/unix/stdio.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/stdio.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/stdio.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stdio.Tpo $(DEPDIR)/stdio.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/stdio.c' object='stdio.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/stdio.c' object='stdio.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdio.obj `if test -f '$(srcdir)/../lib/isc/unix/stdio.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/stdio.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/stdio.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdio.obj `if test -f '$(srcdir)/../lib/isc/unix/stdio.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/stdio.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/stdio.c'; fi` stdtime.o: $(srcdir)/../lib/isc/unix/stdtime.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdtime.o -MD -MP -MF $(DEPDIR)/stdtime.Tpo -c -o stdtime.o `test -f '$(srcdir)/../lib/isc/unix/stdtime.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/stdtime.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stdtime.Tpo $(DEPDIR)/stdtime.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/stdtime.c' object='stdtime.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/stdtime.c' object='stdtime.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdtime.o `test -f '$(srcdir)/../lib/isc/unix/stdtime.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/stdtime.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdtime.o `test -f '$(srcdir)/../lib/isc/unix/stdtime.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/stdtime.c stdtime.obj: $(srcdir)/../lib/isc/unix/stdtime.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdtime.obj -MD -MP -MF $(DEPDIR)/stdtime.Tpo -c -o stdtime.obj `if test -f '$(srcdir)/../lib/isc/unix/stdtime.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/stdtime.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/stdtime.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stdtime.Tpo $(DEPDIR)/stdtime.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/stdtime.c' object='stdtime.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/stdtime.c' object='stdtime.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdtime.obj `if test -f '$(srcdir)/../lib/isc/unix/stdtime.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/stdtime.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/stdtime.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdtime.obj `if test -f '$(srcdir)/../lib/isc/unix/stdtime.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/stdtime.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/stdtime.c'; fi` strerror.o: $(srcdir)/../lib/isc/unix/strerror.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strerror.o -MD -MP -MF $(DEPDIR)/strerror.Tpo -c -o strerror.o `test -f '$(srcdir)/../lib/isc/unix/strerror.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/strerror.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/strerror.Tpo $(DEPDIR)/strerror.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/strerror.c' object='strerror.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/strerror.c' object='strerror.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strerror.o `test -f '$(srcdir)/../lib/isc/unix/strerror.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/strerror.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strerror.o `test -f '$(srcdir)/../lib/isc/unix/strerror.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/strerror.c strerror.obj: $(srcdir)/../lib/isc/unix/strerror.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strerror.obj -MD -MP -MF $(DEPDIR)/strerror.Tpo -c -o strerror.obj `if test -f '$(srcdir)/../lib/isc/unix/strerror.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/strerror.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/strerror.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/strerror.Tpo $(DEPDIR)/strerror.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/strerror.c' object='strerror.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/strerror.c' object='strerror.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strerror.obj `if test -f '$(srcdir)/../lib/isc/unix/strerror.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/strerror.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/strerror.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strerror.obj `if test -f '$(srcdir)/../lib/isc/unix/strerror.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/strerror.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/strerror.c'; fi` task.o: $(srcdir)/../lib/isc/task.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT task.o -MD -MP -MF $(DEPDIR)/task.Tpo -c -o task.o `test -f '$(srcdir)/../lib/isc/task.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/task.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/task.Tpo $(DEPDIR)/task.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/task.c' object='task.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/task.c' object='task.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o task.o `test -f '$(srcdir)/../lib/isc/task.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/task.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o task.o `test -f '$(srcdir)/../lib/isc/task.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/task.c task.obj: $(srcdir)/../lib/isc/task.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT task.obj -MD -MP -MF $(DEPDIR)/task.Tpo -c -o task.obj `if test -f '$(srcdir)/../lib/isc/task.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/task.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/task.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/task.Tpo $(DEPDIR)/task.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/task.c' object='task.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/task.c' object='task.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o task.obj `if test -f '$(srcdir)/../lib/isc/task.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/task.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/task.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o task.obj `if test -f '$(srcdir)/../lib/isc/task.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/task.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/task.c'; fi` thread.o: $(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT thread.o -MD -MP -MF $(DEPDIR)/thread.Tpo -c -o thread.o `test -f '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thread.Tpo $(DEPDIR)/thread.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c' object='thread.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c' object='thread.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o thread.o `test -f '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o thread.o `test -f '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c thread.obj: $(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT thread.obj -MD -MP -MF $(DEPDIR)/thread.Tpo -c -o thread.obj `if test -f '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thread.Tpo $(DEPDIR)/thread.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c' object='thread.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c' object='thread.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o thread.obj `if test -f '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o thread.obj `if test -f '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c'; fi` time.o: $(srcdir)/../lib/isc/unix/time.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT time.o -MD -MP -MF $(DEPDIR)/time.Tpo -c -o time.o `test -f '$(srcdir)/../lib/isc/unix/time.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/time.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/time.Tpo $(DEPDIR)/time.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/time.c' object='time.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/time.c' object='time.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o time.o `test -f '$(srcdir)/../lib/isc/unix/time.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/time.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o time.o `test -f '$(srcdir)/../lib/isc/unix/time.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/unix/time.c time.obj: $(srcdir)/../lib/isc/unix/time.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT time.obj -MD -MP -MF $(DEPDIR)/time.Tpo -c -o time.obj `if test -f '$(srcdir)/../lib/isc/unix/time.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/time.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/time.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/time.Tpo $(DEPDIR)/time.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/unix/time.c' object='time.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/unix/time.c' object='time.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o time.obj `if test -f '$(srcdir)/../lib/isc/unix/time.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/time.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/time.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o time.obj `if test -f '$(srcdir)/../lib/isc/unix/time.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/unix/time.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/unix/time.c'; fi` sha1.o: $(srcdir)/../lib/isc/sha1.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sha1.o -MD -MP -MF $(DEPDIR)/sha1.Tpo -c -o sha1.o `test -f '$(srcdir)/../lib/isc/sha1.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/sha1.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha1.Tpo $(DEPDIR)/sha1.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/sha1.c' object='sha1.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/sha1.c' object='sha1.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha1.o `test -f '$(srcdir)/../lib/isc/sha1.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/sha1.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha1.o `test -f '$(srcdir)/../lib/isc/sha1.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/sha1.c sha1.obj: $(srcdir)/../lib/isc/sha1.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sha1.obj -MD -MP -MF $(DEPDIR)/sha1.Tpo -c -o sha1.obj `if test -f '$(srcdir)/../lib/isc/sha1.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/sha1.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/sha1.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha1.Tpo $(DEPDIR)/sha1.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/sha1.c' object='sha1.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/sha1.c' object='sha1.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha1.obj `if test -f '$(srcdir)/../lib/isc/sha1.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/sha1.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/sha1.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha1.obj `if test -f '$(srcdir)/../lib/isc/sha1.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/sha1.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/sha1.c'; fi` sockaddr.o: $(srcdir)/../lib/isc/sockaddr.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sockaddr.o -MD -MP -MF $(DEPDIR)/sockaddr.Tpo -c -o sockaddr.o `test -f '$(srcdir)/../lib/isc/sockaddr.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/sockaddr.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sockaddr.Tpo $(DEPDIR)/sockaddr.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/sockaddr.c' object='sockaddr.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/sockaddr.c' object='sockaddr.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sockaddr.o `test -f '$(srcdir)/../lib/isc/sockaddr.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/sockaddr.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sockaddr.o `test -f '$(srcdir)/../lib/isc/sockaddr.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/sockaddr.c sockaddr.obj: $(srcdir)/../lib/isc/sockaddr.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sockaddr.obj -MD -MP -MF $(DEPDIR)/sockaddr.Tpo -c -o sockaddr.obj `if test -f '$(srcdir)/../lib/isc/sockaddr.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/sockaddr.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/sockaddr.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sockaddr.Tpo $(DEPDIR)/sockaddr.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/sockaddr.c' object='sockaddr.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/sockaddr.c' object='sockaddr.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sockaddr.obj `if test -f '$(srcdir)/../lib/isc/sockaddr.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/sockaddr.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/sockaddr.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sockaddr.obj `if test -f '$(srcdir)/../lib/isc/sockaddr.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/sockaddr.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/sockaddr.c'; fi` mutex.o: $(srcdir)/../lib/isc/pthreads/mutex.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutex.o -MD -MP -MF $(DEPDIR)/mutex.Tpo -c -o mutex.o `test -f '$(srcdir)/../lib/isc/pthreads/mutex.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/pthreads/mutex.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mutex.Tpo $(DEPDIR)/mutex.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/pthreads/mutex.c' object='mutex.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/pthreads/mutex.c' object='mutex.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutex.o `test -f '$(srcdir)/../lib/isc/pthreads/mutex.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/pthreads/mutex.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutex.o `test -f '$(srcdir)/../lib/isc/pthreads/mutex.c' || echo '$(srcdir)/'`$(srcdir)/../lib/isc/pthreads/mutex.c mutex.obj: $(srcdir)/../lib/isc/pthreads/mutex.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mutex.obj -MD -MP -MF $(DEPDIR)/mutex.Tpo -c -o mutex.obj `if test -f '$(srcdir)/../lib/isc/pthreads/mutex.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/pthreads/mutex.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/pthreads/mutex.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mutex.Tpo $(DEPDIR)/mutex.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../lib/isc/pthreads/mutex.c' object='mutex.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../lib/isc/pthreads/mutex.c' object='mutex.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutex.obj `if test -f '$(srcdir)/../lib/isc/pthreads/mutex.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/pthreads/mutex.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/pthreads/mutex.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mutex.obj `if test -f '$(srcdir)/../lib/isc/pthreads/mutex.c'; then $(CYGPATH_W) '$(srcdir)/../lib/isc/pthreads/mutex.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../lib/isc/pthreads/mutex.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -1309,26 +1337,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1340,15 +1357,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1357,6 +1370,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1407,10 +1435,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1497,18 +1530,21 @@ uninstall-am: .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile $(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver @[ -f $@ ] || \ diff --git a/contrib/ntp/libntp/emalloc.c b/contrib/ntp/libntp/emalloc.c index 6c1c6787ea41..95d293f1c3dc 100644 --- a/contrib/ntp/libntp/emalloc.c +++ b/contrib/ntp/libntp/emalloc.c @@ -60,6 +60,59 @@ ereallocz( return mem; } +/* oreallocarray.c is licensed under the following: + * Copyright (c) 2008 Otto Moerbeek + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include + +/* + * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX + * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW + */ +#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) + +void * +oreallocarray( + void *optr, + size_t nmemb, + size_t size +#ifdef EREALLOC_CALLSITE /* ntp_malloc.h */ + , + const char * file, + int line +#endif + ) +{ + if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && + nmemb > 0 && SIZE_MAX / nmemb < size) { +#ifndef EREALLOC_CALLSITE + msyslog(LOG_ERR, "fatal allocation size overflow"); +#else + msyslog(LOG_ERR, + "fatal allocation size overflow %s line %d", + file, line); +#endif + exit(1); + } +#ifndef EREALLOC_CALLSITE + return ereallocz(optr, (size * nmemb), 0, FALSE); +#else + return ereallocz(optr, (size * nmemb), 0, FALSE, file, line); +#endif +} char * estrdup_impl( diff --git a/contrib/ntp/libntp/refidsmear.c b/contrib/ntp/libntp/refidsmear.c new file mode 100644 index 000000000000..fef428e8a226 --- /dev/null +++ b/contrib/ntp/libntp/refidsmear.c @@ -0,0 +1,58 @@ +#include + +#include +#include +#include + +/* + * we want to test a refid format of: + * 254.x.y.x + * + * where x.y.z are 24 bits containing 2 (signed) integer bits + * and 22 fractional bits. + * + */ + + +l_fp +convertRefIDToLFP(uint32_t r) +{ + l_fp temp; + + r = ntohl(r); + + // printf("%03d %08x: ", (r >> 24) & 0xFF, (r & 0x00FFFFFF) ); + + temp.l_uf = (r << 10); /* 22 fractional bits */ + + temp.l_ui = (r >> 22) & 0x3; + temp.l_ui |= ~(temp.l_ui & 2) + 1; + + return temp; +} + + +uint32_t +convertLFPToRefID(l_fp num) +{ + uint32_t temp; + + /* round the input with the highest bit to shift out from the + * fraction, then keep just two bits from the integral part. + * + * TODO: check for overflows; should we clamp/saturate or just + * complain? + */ + L_ADDUF(&num, 0x200); + num.l_ui &= 3; + + /* combine integral and fractional part to 24 bits */ + temp = (num.l_ui << 22) | (num.l_uf >> 10); + + /* put in the leading 254.0.0.0 */ + temp |= UINT32_C(0xFE000000); + + // printf("%03d %08x: ", (temp >> 24) & 0xFF, (temp & 0x00FFFFFF) ); + + return htonl(temp); +} diff --git a/contrib/ntp/libntp/strdup.c b/contrib/ntp/libntp/strdup.c index f7565a2fb8f7..62d5a16d433c 100644 --- a/contrib/ntp/libntp/strdup.c +++ b/contrib/ntp/libntp/strdup.c @@ -1,7 +1,8 @@ #include -#include +#include #include "ntp_malloc.h" +#include #ifndef HAVE_STRDUP @@ -15,15 +16,13 @@ strdup( size_t octets; char * cp; - if (s) { - octets = 1 + strlen(s); - cp = malloc(octets); - if (NULL != cp) - memcpy(cp, s, octets); - else - cp = NULL; + REQUIRE(s); + octets = strlen(s) + 1; + if ((cp = malloc(octets)) == NULL) + return NULL; + memcpy(cp, s, octets); - return(cp); + return cp; } #else int strdup_c_nonempty_compilation_unit; diff --git a/contrib/ntp/libntp/work_fork.c b/contrib/ntp/libntp/work_fork.c index dab02bc6af14..96c550e98594 100644 --- a/contrib/ntp/libntp/work_fork.c +++ b/contrib/ntp/libntp/work_fork.c @@ -8,6 +8,7 @@ #include #include #include +#include #include "iosignal.h" #include "ntp_stdlib.h" @@ -111,6 +112,23 @@ interrupt_worker_sleep(void) } +/* + * harvest_child_status() runs in the parent. + */ +static void +harvest_child_status( + blocking_child * c + ) +{ + if (c->pid) + { + /* Wait on the child so it can finish terminating */ + if (waitpid(c->pid, NULL, 0) == c->pid) + TRACE(4, ("harvested child %d\n", c->pid)); + else msyslog(LOG_ERR, "error waiting on child %d: %m", c->pid); + } +} + /* * req_child_exit() runs in the parent. */ @@ -124,6 +142,8 @@ req_child_exit( c->req_write_pipe = -1; return 0; } + /* Closing the pipe forces the child to exit */ + harvest_child_status(c); return -1; } @@ -136,10 +156,7 @@ cleanup_after_child( blocking_child * c ) { - if (-1 != c->req_write_pipe) { - close(c->req_write_pipe); - c->req_write_pipe = -1; - } + harvest_child_status(c); if (-1 != c->resp_read_pipe) { (*addremove_io_fd)(c->resp_read_pipe, c->ispipe, TRUE); close(c->resp_read_pipe); @@ -209,6 +226,8 @@ send_blocking_req_internal( "send_blocking_req_internal: short write %d of %d", rc, octets); + /* Fatal error. Clean up the child process. */ + req_child_exit(c); exit(1); /* otherwise would be return -1 */ } diff --git a/contrib/ntp/libparse/Makefile.in b/contrib/ntp/libparse/Makefile.in index d473a77e76d0..4b15dd685cf3 100644 --- a/contrib/ntp/libparse/Makefile.in +++ b/contrib/ntp/libparse/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 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. @@ -17,6 +16,61 @@ 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@ @@ -36,9 +90,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ EXTRA_PROGRAMS = parsestreams$(EXEEXT) parsesolaris$(EXEEXT) -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \ - $(top_srcdir)/sntp/check-libntp.mf subdir = libparse ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ @@ -70,6 +121,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ + $(top_srcdir)/sntp/m4/ntp_unitytest.m4 \ $(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \ $(top_srcdir)/sntp/m4/openldap-thread-check.m4 \ @@ -79,18 +131,17 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS ?= cru -AM_V_AR = $(am__v_AR_$(V)) -am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY)) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libparse_a_AR = $(AR) $(ARFLAGS) libparse_a_LIBADD = am__objects_1 = @@ -119,12 +170,25 @@ PROGRAMS = $(noinst_PROGRAMS) parsesolaris_SOURCES = parsesolaris.c parsesolaris_OBJECTS = parsesolaris.$(OBJEXT) parsesolaris_LDADD = $(LDADD) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = parsestreams_SOURCES = parsestreams.c parsestreams_OBJECTS = parsestreams.$(OBJEXT) parsestreams_LDADD = $(LDADD) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp am__depfiles_maybe = depfiles @@ -135,25 +199,49 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libparse_a_SOURCES) $(libparse_kernel_a_SOURCES) \ parsesolaris.c parsestreams.c DIST_SOURCES = $(libparse_a_SOURCES) $(libparse_kernel_a_SOURCES) \ parsesolaris.c parsestreams.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \ + $(top_srcdir)/includes.mf $(top_srcdir)/sntp/check-libntp.mf \ + $(top_srcdir)/sntp/libevent/build-aux/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -204,6 +292,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@ GTEST_LDFLAGS = @GTEST_LDFLAGS@ GTEST_LIBS = @GTEST_LIBS@ HAVE_INLINE = @HAVE_INLINE@ +HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@ HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@ HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@ INSTALL = @INSTALL@ @@ -320,6 +409,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@ PATH_PERL = @PATH_PERL@ +PATH_RUBY = @PATH_RUBY@ PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_TEST = @PATH_TEST@ PERLLIBDIR = @PERLLIBDIR@ @@ -506,7 +596,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/sntp/check-libntp.mf echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libparse/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign libparse/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -515,6 +604,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/sntp/check-libntp.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -527,11 +617,13 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libparse.a: $(libparse_a_OBJECTS) $(libparse_a_DEPENDENCIES) + +libparse.a: $(libparse_a_OBJECTS) $(libparse_a_DEPENDENCIES) $(EXTRA_libparse_a_DEPENDENCIES) $(AM_V_at)-rm -f libparse.a $(AM_V_AR)$(libparse_a_AR) libparse.a $(libparse_a_OBJECTS) $(libparse_a_LIBADD) $(AM_V_at)$(RANLIB) libparse.a -libparse_kernel.a: $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_DEPENDENCIES) + +libparse_kernel.a: $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_DEPENDENCIES) $(EXTRA_libparse_kernel_a_DEPENDENCIES) $(AM_V_at)-rm -f libparse_kernel.a $(AM_V_AR)$(libparse_kernel_a_AR) libparse_kernel.a $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_LIBADD) $(AM_V_at)$(RANLIB) libparse_kernel.a @@ -544,10 +636,12 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -parsesolaris$(EXEEXT): $(parsesolaris_OBJECTS) $(parsesolaris_DEPENDENCIES) + +parsesolaris$(EXEEXT): $(parsesolaris_OBJECTS) $(parsesolaris_DEPENDENCIES) $(EXTRA_parsesolaris_DEPENDENCIES) @rm -f parsesolaris$(EXEEXT) $(AM_V_CCLD)$(LINK) $(parsesolaris_OBJECTS) $(parsesolaris_LDADD) $(LIBS) -parsestreams$(EXEEXT): $(parsestreams_OBJECTS) $(parsestreams_DEPENDENCIES) + +parsestreams$(EXEEXT): $(parsestreams_OBJECTS) $(parsestreams_DEPENDENCIES) $(EXTRA_parsestreams_DEPENDENCIES) @rm -f parsestreams$(EXEEXT) $(AM_V_CCLD)$(LINK) $(parsestreams_OBJECTS) $(parsestreams_LDADD) $(LIBS) @@ -584,26 +678,23 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -611,26 +702,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -642,15 +722,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -659,6 +735,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -709,10 +800,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -799,19 +895,21 @@ uninstall-am: .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES clean-noinstPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES clean-noinstPROGRAMS \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile vphack: diff --git a/contrib/ntp/libparse/clk_meinberg.c b/contrib/ntp/libparse/clk_meinberg.c index 4047be5e7314..9d2b676381c6 100644 --- a/contrib/ntp/libparse/clk_meinberg.c +++ b/contrib/ntp/libparse/clk_meinberg.c @@ -5,7 +5,7 @@ * * Meinberg clock support * - * Copyright (c) 1995-2005 by Frank Kardel ntp.org> + * Copyright (c) 1995-2015 by Frank Kardel ntp.org> * Copyright (c) 1989-1994 by Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg, Germany * * Redistribution and use in source and binary forms, with or without @@ -400,7 +400,7 @@ cvt_meinberg( if (format->flags & MBG_EXTENDED) { - clock_time->flags |= PARSEB_S_ANTENNA; + clock_time->flags |= PARSEB_S_CALLBIT; /* * DCF77 does not encode the direction - diff --git a/contrib/ntp/libparse/clk_rawdcf.c b/contrib/ntp/libparse/clk_rawdcf.c index 132fbc33146e..ca4326336f88 100644 --- a/contrib/ntp/libparse/clk_rawdcf.c +++ b/contrib/ntp/libparse/clk_rawdcf.c @@ -5,7 +5,7 @@ * * Raw DCF77 pulse clock support * - * Copyright (c) 1995-2006 by Frank Kardel ntp.org> + * Copyright (c) 1995-2015 by Frank Kardel ntp.org> * Copyright (c) 1989-1994 by Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg, Germany * * Redistribution and use in source and binary forms, with or without @@ -41,6 +41,7 @@ #if defined(REFCLOCK) && defined(CLOCK_PARSE) && defined(CLOCK_RAWDCF) #include "ntp_fp.h" +#include "timevalops.h" #include "ntp_unixtime.h" #include "ntp_calendar.h" @@ -107,7 +108,9 @@ static parse_cvt_fnc_t cvt_rawdcf; static parse_inp_fnc_t inp_rawdcf; typedef struct last_tcode { - time_t tcode; /* last converted time code */ + time_t tcode; /* last converted time code */ + timestamp_t tminute; /* sample time for minute start */ + timestamp_t timeout; /* last timeout timestamp */ } last_tcode_t; #define BUFFER_MAX 61 @@ -230,14 +233,14 @@ convert_rawdcf( const unsigned char *c = dcfprm->zerobits; int i; - parseprintf(DD_RAWDCF,("parse: convert_rawdcf: \"%s\"\n", buffer)); + parseprintf(DD_RAWDCF,("parse: convert_rawdcf: \"%.*s\"\n", size, buffer)); if (size < 57) { #ifndef PARSEKERNEL msyslog(LOG_ERR, "parse: convert_rawdcf: INCOMPLETE DATA - time code only has %d bits", size); #endif - return CVT_NONE; + return CVT_FAIL|CVT_BADFMT; } for (i = 0; i < size; i++) @@ -250,7 +253,7 @@ convert_rawdcf( #ifndef PARSEKERNEL msyslog(LOG_ERR, "parse: convert_rawdcf: BAD DATA - no conversion"); #endif - return CVT_NONE; + return CVT_FAIL|CVT_BADFMT; } if (*b) b++; if (*c) c++; @@ -270,7 +273,7 @@ convert_rawdcf( */ parseprintf(DD_RAWDCF,("parse: convert_rawdcf: parity check passed\n")); - clock_time->flags = PARSEB_S_ANTENNA|PARSEB_S_LEAP; + clock_time->flags = PARSEB_S_CALLBIT|PARSEB_S_LEAP; clock_time->utctime= 0; clock_time->usecond= 0; clock_time->second = 0; @@ -310,7 +313,7 @@ convert_rawdcf( if (ext_bf(buffer, DCF_R, dcfprm->zerobits)) clock_time->flags |= PARSEB_CALLBIT; - parseprintf(DD_RAWDCF,("parse: convert_rawdcf: TIME CODE OK: %d:%d, %d.%d.%d, flags 0x%lx\n", + parseprintf(DD_RAWDCF,("parse: convert_rawdcf: TIME CODE OK: %02d:%02d, %02d.%02d.%02d, flags 0x%lx\n", (int)clock_time->hour, (int)clock_time->minute, (int)clock_time->day, (int)clock_time->month,(int) clock_time->year, (u_long)clock_time->flags)); return CVT_OK; @@ -321,7 +324,7 @@ convert_rawdcf( * bad format - not for us */ #ifndef PARSEKERNEL - msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%s\"", buffer); + msyslog(LOG_ERR, "parse: convert_rawdcf: start bit / parity check FAILED for \"%.*s\"", size, buffer); #endif return CVT_FAIL|CVT_BADFMT; } @@ -484,6 +487,8 @@ cvt_rawdcf( if (*c) c++; } + *s = '\0'; + if (rtc == CVT_NONE) { rtc = convert_rawdcf(buffer, size, &dcfparameter, clock_time); @@ -494,13 +499,15 @@ cvt_rawdcf( newtime = parse_to_unixtime(clock_time, &rtc); if ((rtc == CVT_OK) && t) { - if ((newtime - t->tcode) == 60) /* guard against multi bit errors */ + if ((newtime - t->tcode) <= 600) /* require a successful telegram within last 10 minutes */ { + parseprintf(DD_RAWDCF,("parse: cvt_rawdcf: recent timestamp check OK\n")); clock_time->utctime = newtime; } else { - rtc = CVT_FAIL|CVT_BADTIME; + parseprintf(DD_RAWDCF,("parse: cvt_rawdcf: recent timestamp check FAIL - ignore timestamp\n")); + rtc = CVT_SKIP; } t->tcode = newtime; } @@ -533,13 +540,63 @@ pps_rawdcf( return CVT_NONE; } +static long +calc_usecdiff( + timestamp_t *ref, + timestamp_t *base, + long offset + ) +{ + struct timeval delta; + long delta_usec = 0; + +#ifdef PARSEKERNEL + delta.tv_sec = ref->tv.tv_sec - offset - base->tv.tv_sec; + delta.tv_usec = ref->tv.tv_usec - base->tv.tv_usec; + if (delta.tv_usec < 0) + { + delta.tv_sec -= 1; + delta.tv_usec += 1000000; + } +#else + l_fp delt; + + delt = ref->fp; + delt.l_i -= offset; + L_SUB(&delt, &base->fp); + TSTOTV(&delt, &delta); +#endif + + delta_usec = 1000000 * (int32_t)delta.tv_sec + delta.tv_usec; + return delta_usec; +} + static u_long snt_rawdcf( parse_t *parseio, timestamp_t *ptime ) { - if ((parseio->parse_dtime.parse_status & CVT_MASK) == CVT_OK) + /* + * only synthesize if all of following conditions are met: + * - CVT_OK parse_status (we have a time stamp base) + * - ABS(ptime - tminute - (parse_index - 1) sec) < 500ms (spaced by 1 sec +- 500ms) + * - minute marker is available (confirms minute raster as base) + */ + last_tcode_t *t = (last_tcode_t *)parseio->parse_pdata; + long delta_usec = -1; + + if (t != NULL && t->tminute.tv.tv_sec != 0) { + delta_usec = calc_usecdiff(ptime, &t->tminute, parseio->parse_index - 1); + if (delta_usec < 0) + delta_usec = -delta_usec; + } + + parseprintf(DD_RAWDCF,("parse: snt_rawdcf: synth for offset %d seconds - absolute usec error %ld\n", + parseio->parse_index - 1, delta_usec)); + + if (((parseio->parse_dtime.parse_status & CVT_MASK) == CVT_OK) && + (delta_usec < 500000 && delta_usec >= 0)) /* only if minute marker is available */ { parseio->parse_dtime.parse_stime = *ptime; @@ -576,10 +633,43 @@ inp_rawdcf( if (parse_timedout(parseio, tstamp, &timeout)) { - parseprintf(DD_PARSE, ("inp_rawdcf: time out seen\n")); - + last_tcode_t *t = (last_tcode_t *)parseio->parse_pdata; + long delta_usec; + + parseprintf(DD_RAWDCF, ("inp_rawdcf: time out seen\n")); + /* finish collection */ (void) parse_end(parseio); + + if (t != NULL) + { + /* remember minute start sample time if timeouts occur in minute raster */ + if (t->timeout.tv.tv_sec != 0) + { + delta_usec = calc_usecdiff(tstamp, &t->timeout, 60); + if (delta_usec < 0) + delta_usec = -delta_usec; + } + else + { + delta_usec = -1; + } + + if (delta_usec < 500000 && delta_usec >= 0) + { + parseprintf(DD_RAWDCF, ("inp_rawdcf: timeout time difference %ld usec - minute marker set\n", delta_usec)); + /* collect minute markers only if spaced by 60 seconds */ + t->tminute = *tstamp; + } + else + { + parseprintf(DD_RAWDCF, ("inp_rawdcf: timeout time difference %ld usec - minute marker cleared\n", delta_usec)); + memset((char *)&t->tminute, 0, sizeof(t->tminute)); + } + t->timeout = *tstamp; + } (void) parse_addchar(parseio, ch); + + /* pass up to higher layers */ return PARSE_INP_TIME; } else diff --git a/contrib/ntp/libparse/clk_schmid.c b/contrib/ntp/libparse/clk_schmid.c index 5e303b94c29a..c4f02b07ad13 100644 --- a/contrib/ntp/libparse/clk_schmid.c +++ b/contrib/ntp/libparse/clk_schmid.c @@ -6,7 +6,7 @@ * Schmid clock support * based on information and testing from Adam W. Feigin et. al (Swisstime iis.ethz.ch) * - * Copyright (c) 1995-2005 by Frank Kardel ntp.org> + * Copyright (c) 1995-2015 by Frank Kardel ntp.org> * Copyright (c) 1989-1994 by Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg, Germany * * Redistribution and use in source and binary forms, with or without @@ -184,7 +184,7 @@ cvt_schmid( } } - clock_time->flags |= PARSEB_S_LEAP|PARSEB_S_ANTENNA; + clock_time->flags |= PARSEB_S_LEAP|PARSEB_S_CALLBIT; return CVT_OK; } diff --git a/contrib/ntp/libparse/parse.c b/contrib/ntp/libparse/parse.c index 9e663f911f74..64167f152029 100644 --- a/contrib/ntp/libparse/parse.c +++ b/contrib/ntp/libparse/parse.c @@ -697,14 +697,14 @@ timepacket( { case CVT_FAIL: parseio->parse_badformat++; - break; + return cvtrtc; case CVT_NONE: /* * too bad - pretend bad format */ parseio->parse_badformat++; - break; + return CVT_NONE; case CVT_OK: break; diff --git a/contrib/ntp/ntpd/Makefile.am b/contrib/ntp/ntpd/Makefile.am index 344ac8eb2ce7..c94f7c09edf6 100644 --- a/contrib/ntp/ntpd/Makefile.am +++ b/contrib/ntp/ntpd/Makefile.am @@ -232,6 +232,7 @@ libntpd_a_SOURCES = \ ntp_timer.c \ ntp_util.c \ ppsapi_timepps.h \ + rc_cmdlength.c \ refclock_acts.c \ refclock_arbiter.c \ refclock_arc.c \ diff --git a/contrib/ntp/ntpd/Makefile.in b/contrib/ntp/ntpd/Makefile.in index ed489f632109..7f3084693593 100644 --- a/contrib/ntp/ntpd/Makefile.in +++ b/contrib/ntp/ntpd/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2014 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. @@ -23,6 +22,61 @@ 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@ @@ -43,11 +97,6 @@ build_triplet = @build@ host_triplet = @host@ EXTRA_PROGRAMS = check_y2k$(EXEEXT) keyword-gen$(EXEEXT) ntpd$(EXEEXT) \ ntpdsim$(EXEEXT) -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/complete.conf.in \ - $(top_srcdir)/bincheck.mf $(top_srcdir)/check-libopts.mf \ - $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \ - $(top_srcdir)/sntp/check-libntp.mf ntp_parser.c ntp_parser.h subdir = ntpd ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ @@ -79,6 +128,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ + $(top_srcdir)/sntp/m4/ntp_unitytest.m4 \ $(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \ $(top_srcdir)/sntp/m4/openldap-thread-check.m4 \ @@ -88,18 +138,18 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = complete.conf CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = @ARFLAGS@ -AM_V_AR = $(am__v_AR_$(V)) -am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY)) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libntpd_a_AR = $(AR) $(ARFLAGS) libntpd_a_LIBADD = am__objects_1 = @@ -109,28 +159,28 @@ am_libntpd_a_OBJECTS = cmd_args.$(OBJEXT) ntp_control.$(OBJEXT) \ ntp_monitor.$(OBJEXT) ntp_peer.$(OBJEXT) ntp_proto.$(OBJEXT) \ ntp_refclock.$(OBJEXT) ntp_request.$(OBJEXT) \ ntp_restrict.$(OBJEXT) ntp_signd.$(OBJEXT) ntp_timer.$(OBJEXT) \ - ntp_util.$(OBJEXT) refclock_acts.$(OBJEXT) \ - refclock_arbiter.$(OBJEXT) refclock_arc.$(OBJEXT) \ - refclock_as2201.$(OBJEXT) refclock_atom.$(OBJEXT) \ - refclock_bancomm.$(OBJEXT) refclock_chronolog.$(OBJEXT) \ - refclock_chu.$(OBJEXT) refclock_conf.$(OBJEXT) \ - refclock_datum.$(OBJEXT) refclock_dumbclock.$(OBJEXT) \ - refclock_fg.$(OBJEXT) refclock_gpsdjson.$(OBJEXT) \ - refclock_gpsvme.$(OBJEXT) refclock_heath.$(OBJEXT) \ - refclock_hopfser.$(OBJEXT) refclock_hopfpci.$(OBJEXT) \ - refclock_hpgps.$(OBJEXT) refclock_irig.$(OBJEXT) \ - refclock_jjy.$(OBJEXT) refclock_jupiter.$(OBJEXT) \ - refclock_leitch.$(OBJEXT) refclock_local.$(OBJEXT) \ - refclock_mx4200.$(OBJEXT) refclock_neoclock4x.$(OBJEXT) \ - refclock_nmea.$(OBJEXT) refclock_oncore.$(OBJEXT) \ - refclock_palisade.$(OBJEXT) refclock_parse.$(OBJEXT) \ - refclock_pcf.$(OBJEXT) refclock_pst.$(OBJEXT) \ - refclock_ripencc.$(OBJEXT) refclock_shm.$(OBJEXT) \ - refclock_tpro.$(OBJEXT) refclock_true.$(OBJEXT) \ - refclock_tt560.$(OBJEXT) refclock_ulink.$(OBJEXT) \ - refclock_wwv.$(OBJEXT) refclock_wwvb.$(OBJEXT) \ - refclock_zyfer.$(OBJEXT) refclock_tsyncpci.$(OBJEXT) \ - $(am__objects_1) + ntp_util.$(OBJEXT) rc_cmdlength.$(OBJEXT) \ + refclock_acts.$(OBJEXT) refclock_arbiter.$(OBJEXT) \ + refclock_arc.$(OBJEXT) refclock_as2201.$(OBJEXT) \ + refclock_atom.$(OBJEXT) refclock_bancomm.$(OBJEXT) \ + refclock_chronolog.$(OBJEXT) refclock_chu.$(OBJEXT) \ + refclock_conf.$(OBJEXT) refclock_datum.$(OBJEXT) \ + refclock_dumbclock.$(OBJEXT) refclock_fg.$(OBJEXT) \ + refclock_gpsdjson.$(OBJEXT) refclock_gpsvme.$(OBJEXT) \ + refclock_heath.$(OBJEXT) refclock_hopfser.$(OBJEXT) \ + refclock_hopfpci.$(OBJEXT) refclock_hpgps.$(OBJEXT) \ + refclock_irig.$(OBJEXT) refclock_jjy.$(OBJEXT) \ + refclock_jupiter.$(OBJEXT) refclock_leitch.$(OBJEXT) \ + refclock_local.$(OBJEXT) refclock_mx4200.$(OBJEXT) \ + refclock_neoclock4x.$(OBJEXT) refclock_nmea.$(OBJEXT) \ + refclock_oncore.$(OBJEXT) refclock_palisade.$(OBJEXT) \ + refclock_parse.$(OBJEXT) refclock_pcf.$(OBJEXT) \ + refclock_pst.$(OBJEXT) refclock_ripencc.$(OBJEXT) \ + refclock_shm.$(OBJEXT) refclock_tpro.$(OBJEXT) \ + refclock_true.$(OBJEXT) refclock_tt560.$(OBJEXT) \ + refclock_ulink.$(OBJEXT) refclock_wwv.$(OBJEXT) \ + refclock_wwvb.$(OBJEXT) refclock_zyfer.$(OBJEXT) \ + refclock_tsyncpci.$(OBJEXT) $(am__objects_1) libntpd_a_OBJECTS = $(am_libntpd_a_OBJECTS) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \ @@ -144,9 +194,10 @@ am__DEPENDENCIES_2 = version.o libntpd.a $(am__DEPENDENCIES_1) check_y2k_DEPENDENCIES = $(am__DEPENDENCIES_2) ../libntp/libntp.a \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = keyword_gen_SOURCES = keyword-gen.c keyword_gen_OBJECTS = keyword-gen.$(OBJEXT) keyword_gen_DEPENDENCIES = ../libntp/libntp.a $(am__DEPENDENCIES_1) \ @@ -169,6 +220,18 @@ am_ntpdsim_OBJECTS = $(am__objects_2) ntpdsim-ntp_prio_q.$(OBJEXT) \ ntpdsim_OBJECTS = $(am_ntpdsim_OBJECTS) ntpdsim_DEPENDENCIES = $(am__DEPENDENCIES_2) ../libntp/libntpsim.a \ $(am__DEPENDENCIES_3) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp am__depfiles_maybe = depfiles @@ -179,30 +242,37 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \ + -e s/c++$$/h++/ -e s/c$$/h/ +YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS) LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS) -AM_V_YACC = $(am__v_YACC_$(V)) -am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY)) -am__v_YACC_0 = @echo " YACC " $@; + $(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS) +AM_V_YACC = $(am__v_YACC_@AM_V@) +am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@) +am__v_YACC_0 = @echo " YACC " $@; +am__v_YACC_1 = YLWRAP = $(top_srcdir)/sntp/libevent/build-aux/ylwrap -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libntpd_a_SOURCES) check_y2k.c keyword-gen.c \ $(ntpd_SOURCES) $(ntpdsim_SOURCES) DIST_SOURCES = $(libntpd_a_SOURCES) check_y2k.c keyword-gen.c \ $(ntpd_SOURCES) $(ntpdsim_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -224,6 +294,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 man5dir = $(mandir)/man5 man8dir = $(mandir)/man8 @@ -231,8 +307,32 @@ NROFF = nroff MANS = $(man1_MANS) $(man5_MANS) $(man8_MANS) $(man_MANS) DATA = $(html_DATA) $(noinst_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/complete.conf.in \ + $(top_srcdir)/bincheck.mf $(top_srcdir)/check-libopts.mf \ + $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \ + $(top_srcdir)/sntp/check-libntp.mf \ + $(top_srcdir)/sntp/libevent/build-aux/depcomp \ + $(top_srcdir)/sntp/libevent/build-aux/ylwrap ntp_parser.c \ + ntp_parser.h DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -283,6 +383,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@ GTEST_LDFLAGS = @GTEST_LDFLAGS@ GTEST_LIBS = @GTEST_LIBS@ HAVE_INLINE = @HAVE_INLINE@ +HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@ HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@ HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@ INSTALL = @INSTALL@ @@ -399,6 +500,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@ PATH_PERL = @PATH_PERL@ +PATH_RUBY = @PATH_RUBY@ PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_TEST = @PATH_TEST@ PERLLIBDIR = @PERLLIBDIR@ @@ -675,6 +777,7 @@ libntpd_a_SOURCES = \ ntp_timer.c \ ntp_util.c \ ppsapi_timepps.h \ + rc_cmdlength.c \ refclock_acts.c \ refclock_arbiter.c \ refclock_arc.c \ @@ -739,7 +842,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/bincheck.mf $(top_sr echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ntpd/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign ntpd/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -748,6 +850,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/bincheck.mf $(top_srcdir)/check-libopts.mf $(top_srcdir)/sntp/check-libntp.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -762,20 +865,26 @@ complete.conf: $(top_builddir)/config.status $(srcdir)/complete.conf.in clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libntpd.a: $(libntpd_a_OBJECTS) $(libntpd_a_DEPENDENCIES) + +libntpd.a: $(libntpd_a_OBJECTS) $(libntpd_a_DEPENDENCIES) $(EXTRA_libntpd_a_DEPENDENCIES) $(AM_V_at)-rm -f libntpd.a $(AM_V_AR)$(libntpd_a_AR) libntpd.a $(libntpd_a_OBJECTS) $(libntpd_a_LIBADD) $(AM_V_at)$(RANLIB) libntpd.a install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -796,7 +905,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -820,14 +930,19 @@ clean-checkPROGRAMS: rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -848,7 +963,8 @@ uninstall-libexecPROGRAMS: @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -863,14 +979,19 @@ clean-libexecPROGRAMS: rm -f $$list install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -891,7 +1012,8 @@ uninstall-sbinPROGRAMS: @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(sbindir)" && rm -f $$files @@ -904,21 +1026,23 @@ clean-sbinPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -check_y2k$(EXEEXT): $(check_y2k_OBJECTS) $(check_y2k_DEPENDENCIES) + +check_y2k$(EXEEXT): $(check_y2k_OBJECTS) $(check_y2k_DEPENDENCIES) $(EXTRA_check_y2k_DEPENDENCIES) @rm -f check_y2k$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_y2k_OBJECTS) $(check_y2k_LDADD) $(LIBS) -keyword-gen$(EXEEXT): $(keyword_gen_OBJECTS) $(keyword_gen_DEPENDENCIES) + +keyword-gen$(EXEEXT): $(keyword_gen_OBJECTS) $(keyword_gen_DEPENDENCIES) $(EXTRA_keyword_gen_DEPENDENCIES) @rm -f keyword-gen$(EXEEXT) $(AM_V_CCLD)$(LINK) $(keyword_gen_OBJECTS) $(keyword_gen_LDADD) $(LIBS) ntp_parser.h: ntp_parser.c - @if test ! -f $@; then \ - rm -f ntp_parser.c; \ - $(MAKE) $(AM_MAKEFLAGS) ntp_parser.c; \ - else :; fi -ntpd$(EXEEXT): $(ntpd_OBJECTS) $(ntpd_DEPENDENCIES) + @if test ! -f $@; then rm -f ntp_parser.c; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) ntp_parser.c; else :; fi + +ntpd$(EXEEXT): $(ntpd_OBJECTS) $(ntpd_DEPENDENCIES) $(EXTRA_ntpd_DEPENDENCIES) @rm -f ntpd$(EXEEXT) $(AM_V_CCLD)$(LINK) $(ntpd_OBJECTS) $(ntpd_LDADD) $(LIBS) -ntpdsim$(EXEEXT): $(ntpdsim_OBJECTS) $(ntpdsim_DEPENDENCIES) + +ntpdsim$(EXEEXT): $(ntpdsim_OBJECTS) $(ntpdsim_DEPENDENCIES) $(EXTRA_ntpdsim_DEPENDENCIES) @rm -f ntpdsim$(EXEEXT) $(AM_V_CCLD)$(LINK) $(ntpdsim_OBJECTS) $(ntpdsim_LDADD) $(LIBS) @@ -959,6 +1083,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntpdsim-ntpd-opts.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntpdsim-ntpd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntpdsim-ntpsim.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rc_cmdlength.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refclock_acts.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refclock_arbiter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refclock_arc.Po@am__quote@ @@ -1004,157 +1129,138 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< ntpdsim-ntp_config.o: ntp_config.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntp_config.o -MD -MP -MF $(DEPDIR)/ntpdsim-ntp_config.Tpo -c -o ntpdsim-ntp_config.o `test -f 'ntp_config.c' || echo '$(srcdir)/'`ntp_config.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntp_config.Tpo $(DEPDIR)/ntpdsim-ntp_config.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntp_config.c' object='ntpdsim-ntp_config.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntp_config.c' object='ntpdsim-ntp_config.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_config.o `test -f 'ntp_config.c' || echo '$(srcdir)/'`ntp_config.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_config.o `test -f 'ntp_config.c' || echo '$(srcdir)/'`ntp_config.c ntpdsim-ntp_config.obj: ntp_config.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntp_config.obj -MD -MP -MF $(DEPDIR)/ntpdsim-ntp_config.Tpo -c -o ntpdsim-ntp_config.obj `if test -f 'ntp_config.c'; then $(CYGPATH_W) 'ntp_config.c'; else $(CYGPATH_W) '$(srcdir)/ntp_config.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntp_config.Tpo $(DEPDIR)/ntpdsim-ntp_config.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntp_config.c' object='ntpdsim-ntp_config.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntp_config.c' object='ntpdsim-ntp_config.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_config.obj `if test -f 'ntp_config.c'; then $(CYGPATH_W) 'ntp_config.c'; else $(CYGPATH_W) '$(srcdir)/ntp_config.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_config.obj `if test -f 'ntp_config.c'; then $(CYGPATH_W) 'ntp_config.c'; else $(CYGPATH_W) '$(srcdir)/ntp_config.c'; fi` ntpdsim-ntp_io.o: ntp_io.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntp_io.o -MD -MP -MF $(DEPDIR)/ntpdsim-ntp_io.Tpo -c -o ntpdsim-ntp_io.o `test -f 'ntp_io.c' || echo '$(srcdir)/'`ntp_io.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntp_io.Tpo $(DEPDIR)/ntpdsim-ntp_io.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntp_io.c' object='ntpdsim-ntp_io.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntp_io.c' object='ntpdsim-ntp_io.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_io.o `test -f 'ntp_io.c' || echo '$(srcdir)/'`ntp_io.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_io.o `test -f 'ntp_io.c' || echo '$(srcdir)/'`ntp_io.c ntpdsim-ntp_io.obj: ntp_io.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntp_io.obj -MD -MP -MF $(DEPDIR)/ntpdsim-ntp_io.Tpo -c -o ntpdsim-ntp_io.obj `if test -f 'ntp_io.c'; then $(CYGPATH_W) 'ntp_io.c'; else $(CYGPATH_W) '$(srcdir)/ntp_io.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntp_io.Tpo $(DEPDIR)/ntpdsim-ntp_io.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntp_io.c' object='ntpdsim-ntp_io.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntp_io.c' object='ntpdsim-ntp_io.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_io.obj `if test -f 'ntp_io.c'; then $(CYGPATH_W) 'ntp_io.c'; else $(CYGPATH_W) '$(srcdir)/ntp_io.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_io.obj `if test -f 'ntp_io.c'; then $(CYGPATH_W) 'ntp_io.c'; else $(CYGPATH_W) '$(srcdir)/ntp_io.c'; fi` ntpdsim-ntp_parser.o: ntp_parser.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntp_parser.o -MD -MP -MF $(DEPDIR)/ntpdsim-ntp_parser.Tpo -c -o ntpdsim-ntp_parser.o `test -f 'ntp_parser.c' || echo '$(srcdir)/'`ntp_parser.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntp_parser.Tpo $(DEPDIR)/ntpdsim-ntp_parser.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntp_parser.c' object='ntpdsim-ntp_parser.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntp_parser.c' object='ntpdsim-ntp_parser.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_parser.o `test -f 'ntp_parser.c' || echo '$(srcdir)/'`ntp_parser.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_parser.o `test -f 'ntp_parser.c' || echo '$(srcdir)/'`ntp_parser.c ntpdsim-ntp_parser.obj: ntp_parser.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntp_parser.obj -MD -MP -MF $(DEPDIR)/ntpdsim-ntp_parser.Tpo -c -o ntpdsim-ntp_parser.obj `if test -f 'ntp_parser.c'; then $(CYGPATH_W) 'ntp_parser.c'; else $(CYGPATH_W) '$(srcdir)/ntp_parser.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntp_parser.Tpo $(DEPDIR)/ntpdsim-ntp_parser.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntp_parser.c' object='ntpdsim-ntp_parser.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntp_parser.c' object='ntpdsim-ntp_parser.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_parser.obj `if test -f 'ntp_parser.c'; then $(CYGPATH_W) 'ntp_parser.c'; else $(CYGPATH_W) '$(srcdir)/ntp_parser.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_parser.obj `if test -f 'ntp_parser.c'; then $(CYGPATH_W) 'ntp_parser.c'; else $(CYGPATH_W) '$(srcdir)/ntp_parser.c'; fi` ntpdsim-ntp_scanner.o: ntp_scanner.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntp_scanner.o -MD -MP -MF $(DEPDIR)/ntpdsim-ntp_scanner.Tpo -c -o ntpdsim-ntp_scanner.o `test -f 'ntp_scanner.c' || echo '$(srcdir)/'`ntp_scanner.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntp_scanner.Tpo $(DEPDIR)/ntpdsim-ntp_scanner.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntp_scanner.c' object='ntpdsim-ntp_scanner.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntp_scanner.c' object='ntpdsim-ntp_scanner.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_scanner.o `test -f 'ntp_scanner.c' || echo '$(srcdir)/'`ntp_scanner.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_scanner.o `test -f 'ntp_scanner.c' || echo '$(srcdir)/'`ntp_scanner.c ntpdsim-ntp_scanner.obj: ntp_scanner.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntp_scanner.obj -MD -MP -MF $(DEPDIR)/ntpdsim-ntp_scanner.Tpo -c -o ntpdsim-ntp_scanner.obj `if test -f 'ntp_scanner.c'; then $(CYGPATH_W) 'ntp_scanner.c'; else $(CYGPATH_W) '$(srcdir)/ntp_scanner.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntp_scanner.Tpo $(DEPDIR)/ntpdsim-ntp_scanner.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntp_scanner.c' object='ntpdsim-ntp_scanner.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntp_scanner.c' object='ntpdsim-ntp_scanner.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_scanner.obj `if test -f 'ntp_scanner.c'; then $(CYGPATH_W) 'ntp_scanner.c'; else $(CYGPATH_W) '$(srcdir)/ntp_scanner.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_scanner.obj `if test -f 'ntp_scanner.c'; then $(CYGPATH_W) 'ntp_scanner.c'; else $(CYGPATH_W) '$(srcdir)/ntp_scanner.c'; fi` ntpdsim-ntpd.o: ntpd.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntpd.o -MD -MP -MF $(DEPDIR)/ntpdsim-ntpd.Tpo -c -o ntpdsim-ntpd.o `test -f 'ntpd.c' || echo '$(srcdir)/'`ntpd.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntpd.Tpo $(DEPDIR)/ntpdsim-ntpd.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntpd.c' object='ntpdsim-ntpd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntpd.c' object='ntpdsim-ntpd.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntpd.o `test -f 'ntpd.c' || echo '$(srcdir)/'`ntpd.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntpd.o `test -f 'ntpd.c' || echo '$(srcdir)/'`ntpd.c ntpdsim-ntpd.obj: ntpd.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntpd.obj -MD -MP -MF $(DEPDIR)/ntpdsim-ntpd.Tpo -c -o ntpdsim-ntpd.obj `if test -f 'ntpd.c'; then $(CYGPATH_W) 'ntpd.c'; else $(CYGPATH_W) '$(srcdir)/ntpd.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntpd.Tpo $(DEPDIR)/ntpdsim-ntpd.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntpd.c' object='ntpdsim-ntpd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntpd.c' object='ntpdsim-ntpd.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntpd.obj `if test -f 'ntpd.c'; then $(CYGPATH_W) 'ntpd.c'; else $(CYGPATH_W) '$(srcdir)/ntpd.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntpd.obj `if test -f 'ntpd.c'; then $(CYGPATH_W) 'ntpd.c'; else $(CYGPATH_W) '$(srcdir)/ntpd.c'; fi` ntpdsim-ntpd-opts.o: ntpd-opts.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntpd-opts.o -MD -MP -MF $(DEPDIR)/ntpdsim-ntpd-opts.Tpo -c -o ntpdsim-ntpd-opts.o `test -f 'ntpd-opts.c' || echo '$(srcdir)/'`ntpd-opts.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntpd-opts.Tpo $(DEPDIR)/ntpdsim-ntpd-opts.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntpd-opts.c' object='ntpdsim-ntpd-opts.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntpd-opts.c' object='ntpdsim-ntpd-opts.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntpd-opts.o `test -f 'ntpd-opts.c' || echo '$(srcdir)/'`ntpd-opts.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntpd-opts.o `test -f 'ntpd-opts.c' || echo '$(srcdir)/'`ntpd-opts.c ntpdsim-ntpd-opts.obj: ntpd-opts.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntpd-opts.obj -MD -MP -MF $(DEPDIR)/ntpdsim-ntpd-opts.Tpo -c -o ntpdsim-ntpd-opts.obj `if test -f 'ntpd-opts.c'; then $(CYGPATH_W) 'ntpd-opts.c'; else $(CYGPATH_W) '$(srcdir)/ntpd-opts.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntpd-opts.Tpo $(DEPDIR)/ntpdsim-ntpd-opts.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntpd-opts.c' object='ntpdsim-ntpd-opts.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntpd-opts.c' object='ntpdsim-ntpd-opts.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntpd-opts.obj `if test -f 'ntpd-opts.c'; then $(CYGPATH_W) 'ntpd-opts.c'; else $(CYGPATH_W) '$(srcdir)/ntpd-opts.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntpd-opts.obj `if test -f 'ntpd-opts.c'; then $(CYGPATH_W) 'ntpd-opts.c'; else $(CYGPATH_W) '$(srcdir)/ntpd-opts.c'; fi` ntpdsim-ntp_prio_q.o: ntp_prio_q.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntp_prio_q.o -MD -MP -MF $(DEPDIR)/ntpdsim-ntp_prio_q.Tpo -c -o ntpdsim-ntp_prio_q.o `test -f 'ntp_prio_q.c' || echo '$(srcdir)/'`ntp_prio_q.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntp_prio_q.Tpo $(DEPDIR)/ntpdsim-ntp_prio_q.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntp_prio_q.c' object='ntpdsim-ntp_prio_q.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntp_prio_q.c' object='ntpdsim-ntp_prio_q.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_prio_q.o `test -f 'ntp_prio_q.c' || echo '$(srcdir)/'`ntp_prio_q.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_prio_q.o `test -f 'ntp_prio_q.c' || echo '$(srcdir)/'`ntp_prio_q.c ntpdsim-ntp_prio_q.obj: ntp_prio_q.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntp_prio_q.obj -MD -MP -MF $(DEPDIR)/ntpdsim-ntp_prio_q.Tpo -c -o ntpdsim-ntp_prio_q.obj `if test -f 'ntp_prio_q.c'; then $(CYGPATH_W) 'ntp_prio_q.c'; else $(CYGPATH_W) '$(srcdir)/ntp_prio_q.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntp_prio_q.Tpo $(DEPDIR)/ntpdsim-ntp_prio_q.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntp_prio_q.c' object='ntpdsim-ntp_prio_q.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntp_prio_q.c' object='ntpdsim-ntp_prio_q.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_prio_q.obj `if test -f 'ntp_prio_q.c'; then $(CYGPATH_W) 'ntp_prio_q.c'; else $(CYGPATH_W) '$(srcdir)/ntp_prio_q.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntp_prio_q.obj `if test -f 'ntp_prio_q.c'; then $(CYGPATH_W) 'ntp_prio_q.c'; else $(CYGPATH_W) '$(srcdir)/ntp_prio_q.c'; fi` ntpdsim-ntpsim.o: ntpsim.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntpsim.o -MD -MP -MF $(DEPDIR)/ntpdsim-ntpsim.Tpo -c -o ntpdsim-ntpsim.o `test -f 'ntpsim.c' || echo '$(srcdir)/'`ntpsim.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntpsim.Tpo $(DEPDIR)/ntpdsim-ntpsim.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntpsim.c' object='ntpdsim-ntpsim.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntpsim.c' object='ntpdsim-ntpsim.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntpsim.o `test -f 'ntpsim.c' || echo '$(srcdir)/'`ntpsim.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntpsim.o `test -f 'ntpsim.c' || echo '$(srcdir)/'`ntpsim.c ntpdsim-ntpsim.obj: ntpsim.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntpdsim-ntpsim.obj -MD -MP -MF $(DEPDIR)/ntpdsim-ntpsim.Tpo -c -o ntpdsim-ntpsim.obj `if test -f 'ntpsim.c'; then $(CYGPATH_W) 'ntpsim.c'; else $(CYGPATH_W) '$(srcdir)/ntpsim.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ntpdsim-ntpsim.Tpo $(DEPDIR)/ntpdsim-ntpsim.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ntpsim.c' object='ntpdsim-ntpsim.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ntpsim.c' object='ntpdsim-ntpsim.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntpsim.obj `if test -f 'ntpsim.c'; then $(CYGPATH_W) 'ntpsim.c'; else $(CYGPATH_W) '$(srcdir)/ntpsim.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ntpdsim_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntpdsim-ntpsim.obj `if test -f 'ntpsim.c'; then $(CYGPATH_W) 'ntpsim.c'; else $(CYGPATH_W) '$(srcdir)/ntpsim.c'; fi` .y.c: - $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) + $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE) mostlyclean-libtool: -rm -f *.lo @@ -1163,11 +1269,18 @@ clean-libtool: -rm -rf .libs _libs install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1='$(man1_MANS)'; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -1196,16 +1309,21 @@ uninstall-man1: sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-man5: $(man5_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" - @list='$(man5_MANS)'; test -n "$(man5dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.5[a-z]*$$/p'; \ + @list1='$(man5_MANS)'; \ + list2='$(man_MANS)'; \ + test -n "$(man5dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.5[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -1234,16 +1352,21 @@ uninstall-man5: sed -n '/\.5[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man5dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) install-man8: $(man8_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1='$(man8_MANS)'; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -1272,13 +1395,14 @@ uninstall-man8: sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) install-htmlDATA: $(html_DATA) @$(NORMAL_INSTALL) - test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1292,30 +1416,17 @@ uninstall-htmlDATA: @$(NORMAL_UNINSTALL) @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(htmldir)" && rm -f $$files + dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1327,15 +1438,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1344,24 +1451,26 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1412,10 +1521,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1512,27 +1626,29 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 .MAKE: all check check-am install install-am install-exec-am \ install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ clean-libexecPROGRAMS clean-libtool clean-noinstLIBRARIES \ - clean-sbinPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-exec-hook install-html install-html-am \ - install-htmlDATA install-info install-info-am \ + clean-sbinPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook install-html \ + install-html-am install-htmlDATA install-info install-info-am \ install-libexecPROGRAMS install-man install-man1 install-man5 \ install-man8 install-pdf install-pdf-am install-ps \ install-ps-am install-sbinPROGRAMS install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-htmlDATA uninstall-libexecPROGRAMS uninstall-man \ uninstall-man1 uninstall-man5 uninstall-man8 \ uninstall-sbinPROGRAMS +.PRECIOUS: Makefile + vphack: test -e ntp_parser.c || ln -s $(srcdir)/ntp_parser.c . diff --git a/contrib/ntp/ntpd/complete.conf.in b/contrib/ntp/ntpd/complete.conf.in index a820094abb74..747a48f2f2a8 100644 --- a/contrib/ntp/ntpd/complete.conf.in +++ b/contrib/ntp/ntpd/complete.conf.in @@ -2,8 +2,10 @@ saveconfigdir "/etc/ntp/conf" driftfile "/etc/ntp.drift" 1e-7 logfile "/var/log/ntp.log" leapfile "/etc/ntp.leapseconds" +@HAVE_LEAPSMEARINTERVAL@ nonvolatile 1e-7 ident "udent" +dscp 46 logconfig =allall -allinfo -allevents -allstatistics -allstatus +allall -clockinfo -clockevents -clockstatistics -clockstatus +clockall -syncinfo -syncevents -syncstatistics -syncstatus +syncall -sysinfo -sysevents -sysstatistics -sysstatus +sysall statsdir "/etc/ntp/stats" statistics clockstats cryptostats loopstats peerstats protostats rawstats sysstats timingstats diff --git a/contrib/ntp/ntpd/invoke-ntp.conf.texi b/contrib/ntp/ntpd/invoke-ntp.conf.texi index 7151efb82e14..d7a9d13a2d99 100644 --- a/contrib/ntp/ntpd/invoke-ntp.conf.texi +++ b/contrib/ntp/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed April 7, 2015 at 04:25:50 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed June 29, 2015 at 04:30:28 PM by AutoGen 5.18.5 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -2291,6 +2291,9 @@ This implies that must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. +@item @code{dscp} @kbd{value} +This option specifies the Differentiated Services Control Point (DSCP) value, +a 6-bit code. The default value is 46, signifying Expedited Forwarding. @item @code{enable} @code{[@code{auth} | @code{bclient} | @code{calibrate} | @code{kernel} | @code{mode7} | @code{monitor} | @code{ntp} | @code{stats}]} @item @code{disable} @code{[@code{auth} | @code{bclient} | @code{calibrate} | @code{kernel} | @code{mode7} | @code{monitor} | @code{ntp} | @code{stats}]} Provides a way to enable or disable various server options. @@ -2376,6 +2379,19 @@ This option is useful for sites that run @code{ntpd(1ntpdmdoc)} on multiple hosts, with (mostly) common options (e.g., a restriction list). +@item @code{leapsmearinterval} @kbd{seconds} +This EXPERIMENTAL option is only available if +@code{ntpd(1ntpdmdoc)} +was built with the +@code{--enable-leap-smear} +option to the +@code{configure} +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information. @item @code{logconfig} @kbd{configkeyword} This command controls the amount and type of output written to the system @@ -2570,11 +2586,11 @@ option). The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. @item @code{stacksize} @kbd{N4kPages} Specifies the maximum size of the process stack on systems with the -@item @code{filenum} @kbd{Nfiledescriptors} -Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. @code{mlockall()} function. Defaults to 50 4k pages (200 4k pages in OpenBSD). +@item @code{filenum} @kbd{Nfiledescriptors} +Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. @end table @item @code{trap} @kbd{host_address} @code{[@code{port} @kbd{port_number}]} @code{[@code{interface} @kbd{interface_address}]} This command configures a trap receiver at the given host diff --git a/contrib/ntp/ntpd/invoke-ntp.keys.texi b/contrib/ntp/ntpd/invoke-ntp.keys.texi index b0d494040e79..622c4ffe03c2 100644 --- a/contrib/ntp/ntpd/invoke-ntp.keys.texi +++ b/contrib/ntp/ntpd/invoke-ntp.keys.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.keys.texi) # -# It has been AutoGen-ed April 7, 2015 at 04:25:52 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed June 29, 2015 at 04:30:31 PM by AutoGen 5.18.5 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore diff --git a/contrib/ntp/ntpd/invoke-ntpd.texi b/contrib/ntp/ntpd/invoke-ntpd.texi index b6c69db8a1da..6936dda91f04 100644 --- a/contrib/ntp/ntpd/invoke-ntpd.texi +++ b/contrib/ntp/ntpd/invoke-ntpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpd.texi) # -# It has been AutoGen-ed April 7, 2015 at 04:25:54 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed June 29, 2015 at 04:30:33 PM by AutoGen 5.18.5 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -142,7 +142,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.8p2 +ntpd - NTP daemon program - Ver. 4.2.8p3 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/contrib/ntp/ntpd/keyword-gen-utd b/contrib/ntp/ntpd/keyword-gen-utd index b9b59bd4739f..467351b65e3a 100644 --- a/contrib/ntp/ntpd/keyword-gen-utd +++ b/contrib/ntp/ntpd/keyword-gen-utd @@ -1 +1 @@ - * Generated 2015-03-16 09:05:44 UTC diff_ignore_line + * Generated 2015-06-25 03:57:00 UTC diff_ignore_line diff --git a/contrib/ntp/ntpd/keyword-gen.c b/contrib/ntp/ntpd/keyword-gen.c index 5872e2a5cc1f..42e94973f81e 100644 --- a/contrib/ntp/ntpd/keyword-gen.c +++ b/contrib/ntp/ntpd/keyword-gen.c @@ -46,6 +46,7 @@ struct key_tok ntp_keywords[] = { { "ctl", T_Ctl, FOLLBY_TOKEN }, { "disable", T_Disable, FOLLBY_TOKEN }, { "driftfile", T_Driftfile, FOLLBY_STRING }, +{ "dscp", T_Dscp, FOLLBY_TOKEN }, { "enable", T_Enable, FOLLBY_TOKEN }, { "end", T_End, FOLLBY_TOKEN }, { "filegen", T_Filegen, FOLLBY_TOKEN }, @@ -53,6 +54,7 @@ struct key_tok ntp_keywords[] = { { "io", T_Io, FOLLBY_TOKEN }, { "includefile", T_Includefile, FOLLBY_STRING }, { "leapfile", T_Leapfile, FOLLBY_STRING }, +{ "leapsmearinterval", T_Leapsmearinterval, FOLLBY_TOKEN }, { "logconfig", T_Logconfig, FOLLBY_STRINGS_TO_EOC }, { "logfile", T_Logfile, FOLLBY_STRING }, { "manycastclient", T_Manycastclient, FOLLBY_STRING }, @@ -333,12 +335,11 @@ generate_fsm(void) char *r; u_short initial_state; u_short this_state; - u_short prev_state; u_short state; u_short i; u_short token; - /* + /* * Sort ntp_keywords in alphabetical keyword order. This is * not necessary, but minimizes nonfunctional changes in the * generated finite state machine when keywords are modified. @@ -347,7 +348,7 @@ generate_fsm(void) sizeof(ntp_keywords[0]), compare_key_tok_text); /* - * To save space, reserve the state array entry matching each + * To save space, reserve the state array entry matching each * token number for its terminal state, so the token identifier * does not need to be stored in each state, but can be * recovered trivially. To mark the entry reserved, @@ -414,7 +415,7 @@ generate_fsm(void) } if (sst[i].finishes_token) { - snprintf(token_id_comment, + snprintf(token_id_comment, sizeof(token_id_comment), "%5d %-17s", i, symbname(sst[i].finishes_token)); if (i != sst[i].finishes_token) { @@ -442,7 +443,6 @@ generate_fsm(void) * spellings result in the same T_* value. */ prefix_len = 0; - prev_state = 0; this_state = i; do { for (state = 1; state < sst_highwater; state++) @@ -468,8 +468,8 @@ generate_fsm(void) snprintf(token_id_comment, sizeof(token_id_comment), "%5d %-17s", - i, (initial_state == i) - ? "[initial state]" + i, (initial_state == i) + ? "[initial state]" : prefix); } @@ -497,8 +497,8 @@ generate_fsm(void) */ static u_short create_scan_states( - char * text, - u_short token, + char * text, + u_short token, follby followedby, u_short prev_state ) @@ -512,7 +512,7 @@ create_scan_states( curr_char_s = prev_state; prev_char_s = 0; - /* Find the correct position to insert the state. + /* Find the correct position to insert the state. * All states should be in alphabetical order */ while (curr_char_s && (text[0] < sst[curr_char_s].ch)) { @@ -520,7 +520,7 @@ create_scan_states( curr_char_s = sst[curr_char_s].other_next_s; } - /* + /* * Check if a previously seen keyword has the same prefix as * the current keyword. If so, simply use the state for that * keyword as my_state, otherwise, allocate a new state. @@ -548,7 +548,7 @@ create_scan_states( exit(3); } /* Store the next character of the keyword */ - sst[my_state].ch = text[0]; + sst[my_state].ch = text[0]; sst[my_state].other_next_s = curr_char_s; sst[my_state].followedby = FOLLBY_NON_ACCEPTING; @@ -587,7 +587,7 @@ create_scan_states( return_state = my_state; } } else - sst[my_state].match_next_s = + sst[my_state].match_next_s = create_scan_states( &text[1], token, @@ -615,8 +615,8 @@ create_keyword_scanner(void) current_keyword = ntp_keywords[i].key; scanner = create_scan_states( - ntp_keywords[i].key, - ntp_keywords[i].token, + ntp_keywords[i].key, + ntp_keywords[i].token, ntp_keywords[i].followedby, scanner); } @@ -657,7 +657,7 @@ generate_token_text(void) if (i > 0) printf(","); printf("\n\t/* %-5d %5d %20s */\t\"%s\"", - id - lowest_id, id, symbname(id), + id - lowest_id, id, symbname(id), ntp_keywords[i].key); i++; id++; @@ -666,7 +666,7 @@ generate_token_text(void) printf("\n};\n\n"); } - + int compare_key_tok_id( const void *a1, @@ -749,7 +749,7 @@ symbname( } else { LIB_GETBUF(name); snprintf(name, LIB_BUFLENGTH, "%d", token); - } + } return name; } diff --git a/contrib/ntp/ntpd/ntp.conf.5man b/contrib/ntp/ntpd/ntp.conf.5man index f1ed4b298fd9..14438bdc7da1 100644 --- a/contrib/ntp/ntpd/ntp.conf.5man +++ b/contrib/ntp/ntpd/ntp.conf.5man @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5man "07 Apr 2015" "4.2.8p2" "File Formats" +.TH ntp.conf 5man "29 Jun 2015" "4.2.8p3" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-gKaW.1/ag-tKaO91) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-R0aO7B/ag-30aG6B) .\" -.\" It has been AutoGen-ed April 7, 2015 at 04:25:37 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed June 29, 2015 at 04:30:16 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -35,7 +35,7 @@ All arguments must be options. The \f\*[B-Font]ntp.conf\fP configuration file is read at initial startup by the -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] daemon in order to specify the synchronization sources, modes and other related information. Usually, it is installed in the @@ -307,7 +307,7 @@ This is designed to speed the initial synchronization acquisition with the \f\*[B-Font]server\f[] command and s addresses and when -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] is started with the \f\*[B-Font]\-q\f[] option. @@ -528,7 +528,7 @@ and \f\*[B-Font]disable\f[] commands and also by remote configuration commands sent by a -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] program running in another machine. If this flag is enabled, which is the default @@ -595,15 +595,15 @@ secure means beyond the scope of the NTP protocol itself. Besides the keys used for ordinary NTP associations, additional keys can be used as passwords for the -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpq\f[]\fR(1ntpqmdoc)\f[] and -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] utility programs. .sp \n(Ppu .ne 2 When -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] is first started, it reads the key file specified in the \f\*[B-Font]keys\f[] configuration command and installs the keys @@ -617,17 +617,17 @@ allows, for instance, the installation of possibly several batches of keys and then activating or deactivating each batch remotely using -\fCntpdc\fR(1ntpdcmdoc)\f[]. +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]. This also provides a revocation capability that can be used if a key becomes compromised. The \f\*[B-Font]requestkey\f[] command selects the key used as the password for the -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] utility, while the \f\*[B-Font]controlkey\f[] command selects the key used as the password for the -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpq\f[]\fR(1ntpqmdoc)\f[] utility. .SS Public Key Cryptography NTPv4 supports the original NTPv3 symmetric key scheme @@ -674,7 +674,7 @@ page. The specific cryptographic environment used by Autokey servers and clients is determined by a set of files and soft links generated by the -\fCntp-keygen\fR(1ntpkeygenmdoc)\f[] +\fCntp-keygen\f[]\fR(1ntpkeygenmdoc)\f[] program. This includes a required host key file, required certificate file and optional sign key file, @@ -721,7 +721,7 @@ DNS compromise is essential. By convention, the name of an Autokey host is the name returned by the Unix -\fCgethostname\fR(2)\f[] +\fCgethostname\f[]\fR(2)\f[] system call or equivalent in other systems. By the system design model, there are no provisions to allow alternate names or aliases. @@ -821,7 +821,7 @@ If verification fails, Bob sends Cathy a thing called a crypto-NAK, which tells her something broke. She can see the evidence using the -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpq\f[]\fR(1ntpqmdoc)\f[] program. .sp \n(Ppu .ne 2 @@ -846,7 +846,7 @@ with one server and no authentication with another might not be wise. .SS Key Management The cryptographic values used by the Autokey protocol are incorporated as a set of files generated by the -\fCntp-keygen\fR(1ntpkeygenmdoc)\f[] +\fCntp-keygen\f[]\fR(1ntpkeygenmdoc)\f[] utility program, including symmetric key, host key and public certificate files, as well as sign key, identity parameters and leapseconds files. @@ -855,9 +855,9 @@ certificate files can be generated by the OpenSSL utilities and certificates can be imported from public certificate authorities. Note that symmetric keys are necessary for the -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpq\f[]\fR(1ntpqmdoc)\f[] and -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] utility programs. The remaining files are necessary only for the Autokey protocol. @@ -895,7 +895,7 @@ sent. .TP 7 .NOP \f\*[B-Font]controlkey\f[] \f\*[I-Font]key\f[] Specifies the key identifier to use with the -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpq\f[]\fR(1ntpqmdoc)\f[] utility, which uses the standard protocol defined in RFC-1305. The @@ -984,10 +984,10 @@ not found, the host key is also the sign key. .NOP \f\*[B-Font]keys\f[] \f\*[I-Font]keyfile\f[] Specifies the complete path and location of the MD5 key file containing the keys and key identifiers used by -\fCntpd\fR(1ntpdmdoc)\f[], -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[], +\fCntpq\f[]\fR(1ntpqmdoc)\f[] and -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] when operating with symmetric key cryptography. This is the same operation as the \f\*[B-Font]\-k\f[] @@ -1001,10 +1001,10 @@ The default is .TP 7 .NOP \f\*[B-Font]requestkey\f[] \f\*[I-Font]key\f[] Specifies the key identifier to use with the -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] utility program, which uses a proprietary protocol specific to this implementation of -\fCntpd\fR(1ntpdmdoc)\f[]. +\fCntpd\f[]\fR(1ntpdmdoc)\f[]. The \f\*[I-Font]key\f[] argument is a key identifier @@ -1027,9 +1027,9 @@ for every message sent. Specifies the key identifiers which are trusted for the purposes of authenticating peers with symmetric key cryptography, as well as keys used by the -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpq\f[]\fR(1ntpqmdoc)\f[] and -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] programs. The authentication procedures require that both the local and remote servers share the same key and key identifier for this @@ -1106,7 +1106,7 @@ The certificate is missing, corrupted or bogus. The identity key is missing, corrupt or bogus. .PP .SH Monitoring Support -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] includes a comprehensive monitoring facility suitable for continuous, long term recording of server and client timekeeping performance. @@ -1122,7 +1122,7 @@ directory of this distribution. Using these facilities and UNIX -\fCcron\fR(8)\f[] +\fCcron\f[]\fR(8)\f[] jobs, the data can be automatically summarized and archived for retrospective analysis. .SS Monitoring Commands @@ -1348,7 +1348,7 @@ produced.) .ne 2 Note that this command can be sent from the -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] program running at a remote location. .RS .TP 7 @@ -1422,7 +1422,7 @@ server. This type does not perform any changes to file set members during runtime, however it provides an easy way of separating files belonging to different -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] server incarnations. The set member filename is built by appending a \[oq]\&.\[cq] @@ -1432,7 +1432,7 @@ and \f\*[I-Font]filename\f[] strings, and appending the decimal representation of the process ID of the -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] server process. .TP 7 .NOP \f\*[B-Font]day\f[] @@ -1524,7 +1524,7 @@ Enables or disables the recording function. .PP .SH Access Control Support The -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] daemon implements a general purpose address/mask based restriction list. The list contains address/match entries sorted first @@ -1672,9 +1672,9 @@ may be specified: .TP 7 .NOP \f\*[B-Font]ignore\f[] Deny packets of all kinds, including -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpq\f[]\fR(1ntpqmdoc)\f[] and -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] queries. .TP 7 .NOP \f\*[B-Font]kod\f[] @@ -1690,7 +1690,7 @@ Deny service if the packet spacing violates the lower limits specified in the discard command. A history of clients is kept using the monitoring capability of -\fCntpd\fR(1ntpdmdoc)\f[]. +\fCntpd\f[]\fR(1ntpdmdoc)\f[]. Thus, monitoring is always active as long as there is a restriction entry with the \f\*[B-Font]limited\f[] @@ -1709,9 +1709,9 @@ be overridden by later requests for normal priority traps. .TP 7 .NOP \f\*[B-Font]nomodify\f[] Deny -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpq\f[]\fR(1ntpqmdoc)\f[] and -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] queries which attempt to modify the state of the server (i.e., run time reconfiguration). Queries which return @@ -1719,9 +1719,9 @@ information are permitted. .TP 7 .NOP \f\*[B-Font]noquery\f[] Deny -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpq\f[]\fR(1ntpqmdoc)\f[] and -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] queries. Time service is not affected. .TP 7 @@ -1746,9 +1746,9 @@ directive. .TP 7 .NOP \f\*[B-Font]noserve\f[] Deny all packets except -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpq\f[]\fR(1ntpqmdoc)\f[] and -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] queries. .TP 7 .NOP \f\*[B-Font]notrap\f[] @@ -2078,11 +2078,11 @@ re-associate accordingly. .ne 2 Some administrators prefer to avoid running -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] continuously and run either -\fCntpdate\fR(8)\f[] +\fCntpdate\f[]\fR(8)\f[] or -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] \f\*[B-Font]\-q\f[] as a cron job. In either case the servers must be @@ -2090,7 +2090,7 @@ configured in advance and the program fails if none are available when the cron job runs. A really slick application of manycast is with -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] \f\*[B-Font]\-q\f[]. The program wakes up, scans the local landscape looking for the usual suspects, selects the best from among @@ -2260,7 +2260,7 @@ hazardous. .ne 2 For the purposes of configuration, -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] treats reference clocks in a manner analogous to normal NTP peers as much as possible. @@ -2348,7 +2348,7 @@ command as well. The stratum number of a reference clock is by default zero. Since the -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] daemon adds one to the stratum of each peer, a primary server ordinarily displays an external stratum of one. @@ -2422,7 +2422,7 @@ It must immediately follow the command which configures the driver. Note that the same capability is possible at run time using the -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] program. The options are interpreted as follows: @@ -2564,11 +2564,15 @@ The file is updated by first writing the current drift value into a temporary file and then renaming this file to replace the old version. This implies that -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. .TP 7 +.NOP \f\*[B-Font]dscp\f[] \f\*[I-Font]value\f[] +This option specifies the Differentiated Services Control Point (DSCP) value, +a 6-bit code. The default value is 46, signifying Expedited Forwarding. +.TP 7 .NOP \f\*[B-Font]enable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[]] .TP 7 .NOP \f\*[B-Font]disable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[]] @@ -2576,7 +2580,7 @@ Provides a way to enable or disable various server options. Flags not mentioned are unaffected. Note that all of these flags can be controlled remotely using the -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] utility program. .RS .TP 7 @@ -2613,21 +2617,21 @@ if support is available, otherwise .NOP \f\*[B-Font]mode7\f[] Enables processing of NTP mode 7 implementation-specific requests which are used by the deprecated -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] program. The default for this flag is disable. This flag is excluded from runtime configuration using -\fCntpq\fR(1ntpqmdoc)\f[]. +\fCntpq\f[]\fR(1ntpqmdoc)\f[]. The -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpq\f[]\fR(1ntpqmdoc)\f[] program provides the same capabilities as -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] using standard mode 6 requests. .TP 7 .NOP \f\*[B-Font]monitor\f[] Enables the monitoring facility. See the -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] program and the \f\*[B-Font]monlist\f[] @@ -2661,14 +2665,28 @@ be nested to a depth of five; upon reaching the end of any include file, command processing resumes in the previous configuration file. This option is useful for sites that run -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] on multiple hosts, with (mostly) common options (e.g., a restriction list). .TP 7 +.NOP \f\*[B-Font]leapsmearinterval\f[] \f\*[I-Font]seconds\f[] +This EXPERIMENTAL option is only available if +\fCntpd\f[]\fR(1ntpdmdoc)\f[] +was built with the +\f\*[B-Font]\--enable-leap-smear\f[] +option to the +\f\*[B-Font]configure\f[] +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information. +.TP 7 .NOP \f\*[B-Font]logconfig\f[] \f\*[I-Font]configkeyword\f[] This command controls the amount and type of output written to the system -\fCsyslog\fR(3)\f[] +\fCsyslog\f[]\fR(3)\f[] facility or the alternate \f\*[B-Font]logfile\f[] log file. @@ -2683,14 +2701,14 @@ and where \[oq]=\[cq] sets the -\fCsyslog\fR(3)\f[] +\fCsyslog\f[]\fR(3)\f[] priority mask, \[oq]+\[cq] adds and \[oq]\-\[cq] removes messages. -\fCsyslog\fR(3)\f[] +\fCsyslog\f[]\fR(3)\f[] messages can be controlled in four classes (\f\*[B-Font]clock\f[], \f\*[B-Font]peer\f[], \f\*[B-Font]sys\f[] and \f\*[B-Font]sync\f[]). @@ -2728,7 +2746,7 @@ logconfig =syncstatus +sysevents .ne 2 This would just list the synchronizations state of -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] and the major system events. For a simple reference server, the following minimum message configuration could be useful: @@ -2749,7 +2767,7 @@ peers, system events and so on is suppressed. .NOP \f\*[B-Font]logfile\f[] \f\*[I-Font]logfile\f[] This command specifies the location of an alternate log file to be used instead of the default system -\fCsyslog\fR(3)\f[] +\fCsyslog\f[]\fR(3)\f[] facility. This is the same operation as the \-l command line option. .TP 7 @@ -2764,7 +2782,7 @@ is followed by the \f\*[B-Font]default\f[] keyword, the variable will be listed as part of the default system variables -(\fCntpq\fR(1ntpqmdoc)\f[] \f\*[B-Font]rv\f[] command)). +(\fCntpq\f[]\fR(1ntpqmdoc)\f[] \f\*[B-Font]rv\f[] command)). These additional variables serve informational purposes only. They are not related to the protocol @@ -2888,12 +2906,12 @@ The default is 32 megabytes. Setting this to zero will prevent any attemp to loc .TP 7 .NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[] Specifies the maximum size of the process stack on systems with the +\fBmlockall\f[]\fR()\f[] +function. +Defaults to 50 4k pages (200 4k pages in OpenBSD). .TP 7 .NOP \f\*[B-Font]filenum\f[] \f\*[I-Font]Nfiledescriptors\f[] Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. -\fBmlockall\fR()\f[] -function. -Defaults to 50 4k pages (200 4k pages in OpenBSD). .RE .TP 7 .NOP \f\*[B-Font]trap\f[] \f\*[I-Font]host_address\f[] [\f\*[B-Font]port\f[] \f\*[I-Font]port_number\f[]] [\f\*[B-Font]interface\f[] \f\*[I-Font]interface_address\f[]] @@ -2986,9 +3004,9 @@ libopts had an internal operational error. Please report it to autogen-users@lists.sourceforge.net. Thank you. .PP .SH "SEE ALSO" -\fCntpd\fR(1ntpdmdoc)\f[], -\fCntpdc\fR(1ntpdcmdoc)\f[], -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[], +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[], +\fCntpq\f[]\fR(1ntpqmdoc)\f[] .sp \n(Ppu .ne 2 diff --git a/contrib/ntp/ntpd/ntp.conf.5mdoc b/contrib/ntp/ntpd/ntp.conf.5mdoc index 1a52a1257c4e..938acf6d6a13 100644 --- a/contrib/ntp/ntpd/ntp.conf.5mdoc +++ b/contrib/ntp/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd April 7 2015 +.Dd June 29 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed April 7, 2015 at 04:25:57 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed June 29, 2015 at 04:30:36 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2386,6 +2386,9 @@ This implies that must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. +.It Ic dscp Ar value +This option specifies the Differentiated Services Control Point (DSCP) value, +a 6\-bit code. The default value is 46, signifying Expedited Forwarding. .It Xo Ic enable .Oo .Cm auth | Cm bclient | @@ -2485,6 +2488,19 @@ This option is useful for sites that run .Xr ntpd 1ntpdmdoc on multiple hosts, with (mostly) common options (e.g., a restriction list). +.It Ic leapsmearinterval Ar seconds +This EXPERIMENTAL option is only available if +.Xr ntpd 1ntpdmdoc +was built with the +.Cm \-\-enable\-leap\-smear +option to the +.Cm configure +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC\-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information. .It Ic logconfig Ar configkeyword This command controls the amount and type of output written to the system @@ -2717,11 +2733,11 @@ option). The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. .It Cm stacksize Ar N4kPages Specifies the maximum size of the process stack on systems with the -.It Cm filenum Ar Nfiledescriptors -Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. .Fn mlockall function. Defaults to 50 4k pages (200 4k pages in OpenBSD). +.It Cm filenum Ar Nfiledescriptors +Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. .El .It Xo Ic trap Ar host_address .Op Cm port Ar port_number diff --git a/contrib/ntp/ntpd/ntp.conf.def b/contrib/ntp/ntpd/ntp.conf.def index e5c44b7565c7..7e09c0306946 100644 --- a/contrib/ntp/ntpd/ntp.conf.def +++ b/contrib/ntp/ntpd/ntp.conf.def @@ -2388,6 +2388,9 @@ This implies that must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. +.It Ic dscp Ar value +This option specifies the Differentiated Services Control Point (DSCP) value, +a 6-bit code. The default value is 46, signifying Expedited Forwarding. .It Xo Ic enable .Oo .Cm auth | Cm bclient | @@ -2487,6 +2490,19 @@ This option is useful for sites that run .Xr ntpd 1ntpdmdoc on multiple hosts, with (mostly) common options (e.g., a restriction list). +.It Ic leapsmearinterval Ar seconds +This EXPERIMENTAL option is only available if +.Xr ntpd 1ntpdmdoc +was built with the +.Cm --enable-leap-smear +option to the +.Cm configure +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information. .It Ic logconfig Ar configkeyword This command controls the amount and type of output written to the system @@ -2719,11 +2735,11 @@ option). The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. .It Cm stacksize Ar N4kPages Specifies the maximum size of the process stack on systems with the -.It Cm filenum Ar Nfiledescriptors -Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. .Fn mlockall function. Defaults to 50 4k pages (200 4k pages in OpenBSD). +.It Cm filenum Ar Nfiledescriptors +Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. .El .It Xo Ic trap Ar host_address .Op Cm port Ar port_number diff --git a/contrib/ntp/ntpd/ntp.conf.html b/contrib/ntp/ntpd/ntp.conf.html index 7ab25e3756f4..ad643556ea1f 100644 --- a/contrib/ntp/ntpd/ntp.conf.html +++ b/contrib/ntp/ntpd/ntp.conf.html @@ -33,7 +33,7 @@ Up: (dir)

This document describes the configuration file for the NTP Project's ntpd program. -

This document applies to version 4.2.8p2 of ntp.conf. +

This document applies to version 4.2.8p3 of ntp.conf.

Short Contents

@@ -2286,6 +2286,8 @@ This implies that must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. +
dscp value
This option specifies the Differentiated Services Control Point (DSCP) value, +a 6-bit code. The default value is 46, signifying Expedited Forwarding.
enable [auth | bclient | calibrate | kernel | mode7 | monitor | ntp | stats]
disable [auth | bclient | calibrate | kernel | mode7 | monitor | ntp | stats]
Provides a way to enable or disable various server options. Flags not mentioned are unaffected. Note that all of these flags @@ -2360,6 +2362,18 @@ This option is useful for sites that run ntpd(1ntpdmdoc) on multiple hosts, with (mostly) common options (e.g., a restriction list). +
leapsmearinterval seconds
This EXPERIMENTAL option is only available if +ntpd(1ntpdmdoc) +was built with the +--enable-leap-smear +option to the +configure +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information.
logconfig configkeyword
This command controls the amount and type of output written to the system syslog(3) @@ -2539,10 +2553,10 @@ when dropping root (the option). The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
stacksize N4kPages
Specifies the maximum size of the process stack on systems with the -
filenum Nfiledescriptors
Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. mlockall() function. Defaults to 50 4k pages (200 4k pages in OpenBSD). +
filenum Nfiledescriptors
Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
trap host_address [port port_number] [interface interface_address]
This command configures a trap receiver at the given host address and port number for sending messages with the specified diff --git a/contrib/ntp/ntpd/ntp.conf.man.in b/contrib/ntp/ntpd/ntp.conf.man.in index 548151d334c7..ef9e14dfe770 100644 --- a/contrib/ntp/ntpd/ntp.conf.man.in +++ b/contrib/ntp/ntpd/ntp.conf.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5 "07 Apr 2015" "4.2.8p2" "File Formats" +.TH ntp.conf 5 "29 Jun 2015" "4.2.8p3" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-gKaW.1/ag-tKaO91) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-R0aO7B/ag-30aG6B) .\" -.\" It has been AutoGen-ed April 7, 2015 at 04:25:37 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed June 29, 2015 at 04:30:16 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -35,7 +35,7 @@ All arguments must be options. The \f\*[B-Font]ntp.conf\fP configuration file is read at initial startup by the -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] daemon in order to specify the synchronization sources, modes and other related information. Usually, it is installed in the @@ -307,7 +307,7 @@ This is designed to speed the initial synchronization acquisition with the \f\*[B-Font]server\f[] command and s addresses and when -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] is started with the \f\*[B-Font]\-q\f[] option. @@ -528,7 +528,7 @@ and \f\*[B-Font]disable\f[] commands and also by remote configuration commands sent by a -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] program running in another machine. If this flag is enabled, which is the default @@ -595,15 +595,15 @@ secure means beyond the scope of the NTP protocol itself. Besides the keys used for ordinary NTP associations, additional keys can be used as passwords for the -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] and -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] utility programs. .sp \n(Ppu .ne 2 When -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] is first started, it reads the key file specified in the \f\*[B-Font]keys\f[] configuration command and installs the keys @@ -617,17 +617,17 @@ allows, for instance, the installation of possibly several batches of keys and then activating or deactivating each batch remotely using -\fCntpdc\fR(@NTPDC_MS@)\f[]. +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]. This also provides a revocation capability that can be used if a key becomes compromised. The \f\*[B-Font]requestkey\f[] command selects the key used as the password for the -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] utility, while the \f\*[B-Font]controlkey\f[] command selects the key used as the password for the -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] utility. .SS Public Key Cryptography NTPv4 supports the original NTPv3 symmetric key scheme @@ -674,7 +674,7 @@ page. The specific cryptographic environment used by Autokey servers and clients is determined by a set of files and soft links generated by the -\fCntp-keygen\fR(1ntpkeygenmdoc)\f[] +\fCntp-keygen\f[]\fR(1ntpkeygenmdoc)\f[] program. This includes a required host key file, required certificate file and optional sign key file, @@ -721,7 +721,7 @@ DNS compromise is essential. By convention, the name of an Autokey host is the name returned by the Unix -\fCgethostname\fR(2)\f[] +\fCgethostname\f[]\fR(2)\f[] system call or equivalent in other systems. By the system design model, there are no provisions to allow alternate names or aliases. @@ -821,7 +821,7 @@ If verification fails, Bob sends Cathy a thing called a crypto-NAK, which tells her something broke. She can see the evidence using the -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] program. .sp \n(Ppu .ne 2 @@ -846,7 +846,7 @@ with one server and no authentication with another might not be wise. .SS Key Management The cryptographic values used by the Autokey protocol are incorporated as a set of files generated by the -\fCntp-keygen\fR(1ntpkeygenmdoc)\f[] +\fCntp-keygen\f[]\fR(1ntpkeygenmdoc)\f[] utility program, including symmetric key, host key and public certificate files, as well as sign key, identity parameters and leapseconds files. @@ -855,9 +855,9 @@ certificate files can be generated by the OpenSSL utilities and certificates can be imported from public certificate authorities. Note that symmetric keys are necessary for the -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] and -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] utility programs. The remaining files are necessary only for the Autokey protocol. @@ -895,7 +895,7 @@ sent. .TP 7 .NOP \f\*[B-Font]controlkey\f[] \f\*[I-Font]key\f[] Specifies the key identifier to use with the -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] utility, which uses the standard protocol defined in RFC-1305. The @@ -984,10 +984,10 @@ not found, the host key is also the sign key. .NOP \f\*[B-Font]keys\f[] \f\*[I-Font]keyfile\f[] Specifies the complete path and location of the MD5 key file containing the keys and key identifiers used by -\fCntpd\fR(@NTPD_MS@)\f[], -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[], +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] and -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] when operating with symmetric key cryptography. This is the same operation as the \f\*[B-Font]\-k\f[] @@ -1001,10 +1001,10 @@ The default is .TP 7 .NOP \f\*[B-Font]requestkey\f[] \f\*[I-Font]key\f[] Specifies the key identifier to use with the -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] utility program, which uses a proprietary protocol specific to this implementation of -\fCntpd\fR(@NTPD_MS@)\f[]. +\fCntpd\f[]\fR(@NTPD_MS@)\f[]. The \f\*[I-Font]key\f[] argument is a key identifier @@ -1027,9 +1027,9 @@ for every message sent. Specifies the key identifiers which are trusted for the purposes of authenticating peers with symmetric key cryptography, as well as keys used by the -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] and -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] programs. The authentication procedures require that both the local and remote servers share the same key and key identifier for this @@ -1106,7 +1106,7 @@ The certificate is missing, corrupted or bogus. The identity key is missing, corrupt or bogus. .PP .SH Monitoring Support -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] includes a comprehensive monitoring facility suitable for continuous, long term recording of server and client timekeeping performance. @@ -1122,7 +1122,7 @@ directory of this distribution. Using these facilities and UNIX -\fCcron\fR(8)\f[] +\fCcron\f[]\fR(8)\f[] jobs, the data can be automatically summarized and archived for retrospective analysis. .SS Monitoring Commands @@ -1348,7 +1348,7 @@ produced.) .ne 2 Note that this command can be sent from the -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] program running at a remote location. .RS .TP 7 @@ -1422,7 +1422,7 @@ server. This type does not perform any changes to file set members during runtime, however it provides an easy way of separating files belonging to different -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] server incarnations. The set member filename is built by appending a \[oq]\&.\[cq] @@ -1432,7 +1432,7 @@ and \f\*[I-Font]filename\f[] strings, and appending the decimal representation of the process ID of the -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] server process. .TP 7 .NOP \f\*[B-Font]day\f[] @@ -1524,7 +1524,7 @@ Enables or disables the recording function. .PP .SH Access Control Support The -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] daemon implements a general purpose address/mask based restriction list. The list contains address/match entries sorted first @@ -1672,9 +1672,9 @@ may be specified: .TP 7 .NOP \f\*[B-Font]ignore\f[] Deny packets of all kinds, including -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] and -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] queries. .TP 7 .NOP \f\*[B-Font]kod\f[] @@ -1690,7 +1690,7 @@ Deny service if the packet spacing violates the lower limits specified in the discard command. A history of clients is kept using the monitoring capability of -\fCntpd\fR(@NTPD_MS@)\f[]. +\fCntpd\f[]\fR(@NTPD_MS@)\f[]. Thus, monitoring is always active as long as there is a restriction entry with the \f\*[B-Font]limited\f[] @@ -1709,9 +1709,9 @@ be overridden by later requests for normal priority traps. .TP 7 .NOP \f\*[B-Font]nomodify\f[] Deny -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] and -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] queries which attempt to modify the state of the server (i.e., run time reconfiguration). Queries which return @@ -1719,9 +1719,9 @@ information are permitted. .TP 7 .NOP \f\*[B-Font]noquery\f[] Deny -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] and -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] queries. Time service is not affected. .TP 7 @@ -1746,9 +1746,9 @@ directive. .TP 7 .NOP \f\*[B-Font]noserve\f[] Deny all packets except -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] and -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] queries. .TP 7 .NOP \f\*[B-Font]notrap\f[] @@ -2078,11 +2078,11 @@ re-associate accordingly. .ne 2 Some administrators prefer to avoid running -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] continuously and run either -\fCntpdate\fR(8)\f[] +\fCntpdate\f[]\fR(8)\f[] or -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] \f\*[B-Font]\-q\f[] as a cron job. In either case the servers must be @@ -2090,7 +2090,7 @@ configured in advance and the program fails if none are available when the cron job runs. A really slick application of manycast is with -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] \f\*[B-Font]\-q\f[]. The program wakes up, scans the local landscape looking for the usual suspects, selects the best from among @@ -2260,7 +2260,7 @@ hazardous. .ne 2 For the purposes of configuration, -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] treats reference clocks in a manner analogous to normal NTP peers as much as possible. @@ -2348,7 +2348,7 @@ command as well. The stratum number of a reference clock is by default zero. Since the -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] daemon adds one to the stratum of each peer, a primary server ordinarily displays an external stratum of one. @@ -2422,7 +2422,7 @@ It must immediately follow the command which configures the driver. Note that the same capability is possible at run time using the -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] program. The options are interpreted as follows: @@ -2564,11 +2564,15 @@ The file is updated by first writing the current drift value into a temporary file and then renaming this file to replace the old version. This implies that -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. .TP 7 +.NOP \f\*[B-Font]dscp\f[] \f\*[I-Font]value\f[] +This option specifies the Differentiated Services Control Point (DSCP) value, +a 6-bit code. The default value is 46, signifying Expedited Forwarding. +.TP 7 .NOP \f\*[B-Font]enable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[]] .TP 7 .NOP \f\*[B-Font]disable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[]] @@ -2576,7 +2580,7 @@ Provides a way to enable or disable various server options. Flags not mentioned are unaffected. Note that all of these flags can be controlled remotely using the -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] utility program. .RS .TP 7 @@ -2613,21 +2617,21 @@ if support is available, otherwise .NOP \f\*[B-Font]mode7\f[] Enables processing of NTP mode 7 implementation-specific requests which are used by the deprecated -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] program. The default for this flag is disable. This flag is excluded from runtime configuration using -\fCntpq\fR(@NTPQ_MS@)\f[]. +\fCntpq\f[]\fR(@NTPQ_MS@)\f[]. The -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] program provides the same capabilities as -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] using standard mode 6 requests. .TP 7 .NOP \f\*[B-Font]monitor\f[] Enables the monitoring facility. See the -\fCntpdc\fR(@NTPDC_MS@)\f[] +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[] program and the \f\*[B-Font]monlist\f[] @@ -2661,14 +2665,28 @@ be nested to a depth of five; upon reaching the end of any include file, command processing resumes in the previous configuration file. This option is useful for sites that run -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] on multiple hosts, with (mostly) common options (e.g., a restriction list). .TP 7 +.NOP \f\*[B-Font]leapsmearinterval\f[] \f\*[I-Font]seconds\f[] +This EXPERIMENTAL option is only available if +\fCntpd\f[]\fR(@NTPD_MS@)\f[] +was built with the +\f\*[B-Font]\--enable-leap-smear\f[] +option to the +\f\*[B-Font]configure\f[] +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information. +.TP 7 .NOP \f\*[B-Font]logconfig\f[] \f\*[I-Font]configkeyword\f[] This command controls the amount and type of output written to the system -\fCsyslog\fR(3)\f[] +\fCsyslog\f[]\fR(3)\f[] facility or the alternate \f\*[B-Font]logfile\f[] log file. @@ -2683,14 +2701,14 @@ and where \[oq]=\[cq] sets the -\fCsyslog\fR(3)\f[] +\fCsyslog\f[]\fR(3)\f[] priority mask, \[oq]+\[cq] adds and \[oq]\-\[cq] removes messages. -\fCsyslog\fR(3)\f[] +\fCsyslog\f[]\fR(3)\f[] messages can be controlled in four classes (\f\*[B-Font]clock\f[], \f\*[B-Font]peer\f[], \f\*[B-Font]sys\f[] and \f\*[B-Font]sync\f[]). @@ -2728,7 +2746,7 @@ logconfig =syncstatus +sysevents .ne 2 This would just list the synchronizations state of -\fCntpd\fR(@NTPD_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[] and the major system events. For a simple reference server, the following minimum message configuration could be useful: @@ -2749,7 +2767,7 @@ peers, system events and so on is suppressed. .NOP \f\*[B-Font]logfile\f[] \f\*[I-Font]logfile\f[] This command specifies the location of an alternate log file to be used instead of the default system -\fCsyslog\fR(3)\f[] +\fCsyslog\f[]\fR(3)\f[] facility. This is the same operation as the \-l command line option. .TP 7 @@ -2764,7 +2782,7 @@ is followed by the \f\*[B-Font]default\f[] keyword, the variable will be listed as part of the default system variables -(\fCntpq\fR(@NTPQ_MS@)\f[] \f\*[B-Font]rv\f[] command)). +(\fCntpq\f[]\fR(@NTPQ_MS@)\f[] \f\*[B-Font]rv\f[] command)). These additional variables serve informational purposes only. They are not related to the protocol @@ -2888,12 +2906,12 @@ The default is 32 megabytes. Setting this to zero will prevent any attemp to loc .TP 7 .NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[] Specifies the maximum size of the process stack on systems with the +\fBmlockall\f[]\fR()\f[] +function. +Defaults to 50 4k pages (200 4k pages in OpenBSD). .TP 7 .NOP \f\*[B-Font]filenum\f[] \f\*[I-Font]Nfiledescriptors\f[] Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. -\fBmlockall\fR()\f[] -function. -Defaults to 50 4k pages (200 4k pages in OpenBSD). .RE .TP 7 .NOP \f\*[B-Font]trap\f[] \f\*[I-Font]host_address\f[] [\f\*[B-Font]port\f[] \f\*[I-Font]port_number\f[]] [\f\*[B-Font]interface\f[] \f\*[I-Font]interface_address\f[]] @@ -2986,9 +3004,9 @@ libopts had an internal operational error. Please report it to autogen-users@lists.sourceforge.net. Thank you. .PP .SH "SEE ALSO" -\fCntpd\fR(@NTPD_MS@)\f[], -\fCntpdc\fR(@NTPDC_MS@)\f[], -\fCntpq\fR(@NTPQ_MS@)\f[] +\fCntpd\f[]\fR(@NTPD_MS@)\f[], +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[], +\fCntpq\f[]\fR(@NTPQ_MS@)\f[] .sp \n(Ppu .ne 2 diff --git a/contrib/ntp/ntpd/ntp.conf.mdoc.in b/contrib/ntp/ntpd/ntp.conf.mdoc.in index da935ed697ee..93c638d6edff 100644 --- a/contrib/ntp/ntpd/ntp.conf.mdoc.in +++ b/contrib/ntp/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd April 7 2015 +.Dd June 29 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed April 7, 2015 at 04:25:57 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed June 29, 2015 at 04:30:36 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2386,6 +2386,9 @@ This implies that must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. +.It Ic dscp Ar value +This option specifies the Differentiated Services Control Point (DSCP) value, +a 6\-bit code. The default value is 46, signifying Expedited Forwarding. .It Xo Ic enable .Oo .Cm auth | Cm bclient | @@ -2485,6 +2488,19 @@ This option is useful for sites that run .Xr ntpd @NTPD_MS@ on multiple hosts, with (mostly) common options (e.g., a restriction list). +.It Ic leapsmearinterval Ar seconds +This EXPERIMENTAL option is only available if +.Xr ntpd @NTPD_MS@ +was built with the +.Cm \-\-enable\-leap\-smear +option to the +.Cm configure +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC\-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information. .It Ic logconfig Ar configkeyword This command controls the amount and type of output written to the system @@ -2717,11 +2733,11 @@ option). The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. .It Cm stacksize Ar N4kPages Specifies the maximum size of the process stack on systems with the -.It Cm filenum Ar Nfiledescriptors -Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. .Fn mlockall function. Defaults to 50 4k pages (200 4k pages in OpenBSD). +.It Cm filenum Ar Nfiledescriptors +Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. .El .It Xo Ic trap Ar host_address .Op Cm port Ar port_number diff --git a/contrib/ntp/ntpd/ntp.keys.5man b/contrib/ntp/ntpd/ntp.keys.5man index a505afb90dc6..63d4553852ae 100644 --- a/contrib/ntp/ntpd/ntp.keys.5man +++ b/contrib/ntp/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "07 Apr 2015" "4.2.8p2" "File Formats" +.TH ntp.keys 5man "29 Jun 2015" "4.2.8p3" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed April 7, 2015 at 04:25:42 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed June 29, 2015 at 04:30:21 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME @@ -40,12 +40,12 @@ This document describes the format of an NTP symmetric key file. For a description of the use of this type of file, see the "Authentication Support" section of the -\fCntp.conf\fR(5)\f[] +\fCntp.conf\f[]\fR(5)\f[] page. .sp \n(Ppu .ne 2 -\fCntpd\fR(8)\f[] +\fCntpd\f[]\fR(8)\f[] reads its keys from a file specified using the \f\*[B-Font]\-k\f[] command line option or the @@ -140,9 +140,9 @@ which is truncated as necessary. .ne 2 Note that the keys used by the -\fCntpq\fR(8)\f[] +\fCntpq\f[]\fR(8)\f[] and -\fCntpdc\fR(8)\f[] +\fCntpdc\f[]\fR(8)\f[] programs are checked against passwords requested by the programs and entered by hand, so it is generally appropriate to specify these keys in ASCII format. @@ -152,11 +152,11 @@ so it is generally appropriate to specify these keys in ASCII format. the default name of the configuration file .PP .SH "SEE ALSO" -\fCntp.conf\fR(5)\f[], -\fCntpd\fR(1ntpdmdoc)\f[], -\fCntpdate\fR(1ntpdatemdoc)\f[], -\fCntpdc\fR(1ntpdcmdoc)\f[], -\fCsntp\fR(1sntpmdoc)\f[] +\fCntp.conf\f[]\fR(5)\f[], +\fCntpd\f[]\fR(1ntpdmdoc)\f[], +\fCntpdate\f[]\fR(1ntpdatemdoc)\f[], +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[], +\fCsntp\f[]\fR(1sntpmdoc)\f[] .SH "AUTHORS" The University of Delaware and Network Time Foundation .SH "COPYRIGHT" diff --git a/contrib/ntp/ntpd/ntp.keys.5mdoc b/contrib/ntp/ntpd/ntp.keys.5mdoc index a7157ec4e394..47e5f81d258a 100644 --- a/contrib/ntp/ntpd/ntp.keys.5mdoc +++ b/contrib/ntp/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd April 7 2015 +.Dd June 29 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed April 7, 2015 at 04:26:00 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed June 29, 2015 at 04:30:39 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/contrib/ntp/ntpd/ntp.keys.html b/contrib/ntp/ntpd/ntp.keys.html index 98a22ef0aedb..f096f63fc837 100644 --- a/contrib/ntp/ntpd/ntp.keys.html +++ b/contrib/ntp/ntpd/ntp.keys.html @@ -33,7 +33,7 @@ Up: (dir)

This document describes the symmetric key file for the NTP Project's ntpd program. -

This document applies to version 4.2.8p2 of ntp.keys. +

This document applies to version 4.2.8p3 of ntp.keys.

Short Contents

diff --git a/contrib/ntp/ntpd/ntp.keys.man.in b/contrib/ntp/ntpd/ntp.keys.man.in index c7585afa16f3..1080b91bf0ed 100644 --- a/contrib/ntp/ntpd/ntp.keys.man.in +++ b/contrib/ntp/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "07 Apr 2015" "4.2.8p2" "File Formats" +.TH ntp.keys 5 "29 Jun 2015" "4.2.8p3" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed April 7, 2015 at 04:25:42 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed June 29, 2015 at 04:30:21 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME @@ -40,12 +40,12 @@ This document describes the format of an NTP symmetric key file. For a description of the use of this type of file, see the "Authentication Support" section of the -\fCntp.conf\fR(5)\f[] +\fCntp.conf\f[]\fR(5)\f[] page. .sp \n(Ppu .ne 2 -\fCntpd\fR(8)\f[] +\fCntpd\f[]\fR(8)\f[] reads its keys from a file specified using the \f\*[B-Font]\-k\f[] command line option or the @@ -140,9 +140,9 @@ which is truncated as necessary. .ne 2 Note that the keys used by the -\fCntpq\fR(8)\f[] +\fCntpq\f[]\fR(8)\f[] and -\fCntpdc\fR(8)\f[] +\fCntpdc\f[]\fR(8)\f[] programs are checked against passwords requested by the programs and entered by hand, so it is generally appropriate to specify these keys in ASCII format. @@ -152,11 +152,11 @@ so it is generally appropriate to specify these keys in ASCII format. the default name of the configuration file .PP .SH "SEE ALSO" -\fCntp.conf\fR(5)\f[], -\fCntpd\fR(@NTPD_MS@)\f[], -\fCntpdate\fR(@NTPDATE_MS@)\f[], -\fCntpdc\fR(@NTPDC_MS@)\f[], -\fCsntp\fR(@SNTP_MS@)\f[] +\fCntp.conf\f[]\fR(5)\f[], +\fCntpd\f[]\fR(@NTPD_MS@)\f[], +\fCntpdate\f[]\fR(@NTPDATE_MS@)\f[], +\fCntpdc\f[]\fR(@NTPDC_MS@)\f[], +\fCsntp\f[]\fR(@SNTP_MS@)\f[] .SH "AUTHORS" The University of Delaware and Network Time Foundation .SH "COPYRIGHT" diff --git a/contrib/ntp/ntpd/ntp.keys.mdoc.in b/contrib/ntp/ntpd/ntp.keys.mdoc.in index e6590db72fbb..6bd1c0987c2c 100644 --- a/contrib/ntp/ntpd/ntp.keys.mdoc.in +++ b/contrib/ntp/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd April 7 2015 +.Dd June 29 2015 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed April 7, 2015 at 04:26:00 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed June 29, 2015 at 04:30:39 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/contrib/ntp/ntpd/ntp_config.c b/contrib/ntp/ntpd/ntp_config.c index a224579d1cce..300773240c74 100644 --- a/contrib/ntp/ntpd/ntp_config.c +++ b/contrib/ntp/ntpd/ntp_config.c @@ -54,9 +54,6 @@ #include "ntpd-opts.h" -/* Bison still(!) does not emit usable prototypes for the calling code */ -int yyparse (struct FILE_INFO *ip_file); - /* list of servers from command line for config_peers() */ int cmdline_server_count; char ** cmdline_servers; @@ -134,8 +131,6 @@ typedef struct peer_resolved_ctx_tag { * Definitions of things either imported from or exported to outside */ extern int yydebug; /* ntp_parser.c (.y) */ -int curr_include_level; /* The current include level */ -struct FILE_INFO *fp[MAXINCLUDELEVEL+1]; config_tree cfgt; /* Parser output stored here */ struct config_tree_tag *cfg_tree_history; /* History of configs */ char *sys_phone[MAXPHONE] = {NULL}; /* ACTS phone numbers */ @@ -181,11 +176,6 @@ struct netinfo_config_state { struct REMOTE_CONFIG_INFO remote_config; /* Remote configuration buffer and pointer info */ -int input_from_file = 1; /* A boolean flag, which when set, indicates that - the input is to be taken from the configuration - file, instead of the remote-configuration buffer - */ - int old_config_style = 1; /* A boolean flag, which when set, * indicates that the old configuration * format with a newline at the end of @@ -257,7 +247,7 @@ static void free_config_tree(config_tree *ptree); static void destroy_restrict_node(restrict_node *my_node); static int is_sane_resolved_address(sockaddr_u *peeraddr, int hmode); -static void save_and_apply_config_tree(void); +static void save_and_apply_config_tree(int/*BOOL*/ from_file); static void destroy_int_fifo(int_fifo *); #define FREE_INT_FIFO(pf) \ do { \ @@ -314,7 +304,7 @@ static sockaddr_u *get_next_address(address_node *addr); static void config_sim(config_tree *); static void config_ntpdsim(config_tree *); #else /* !SIM follows */ -static void config_ntpd(config_tree *); +static void config_ntpd(config_tree *, int/*BOOL*/ input_from_file); static void config_other_modes(config_tree *); static void config_auth(config_tree *); static void config_access(config_tree *); @@ -326,7 +316,7 @@ static void config_trap(config_tree *); static void config_fudge(config_tree *); static void config_peers(config_tree *); static void config_unpeers(config_tree *); -static void config_nic_rules(config_tree *); +static void config_nic_rules(config_tree *, int/*BOOL*/ input_from_file); static void config_reset_counters(config_tree *); static u_char get_correct_host_mode(int token); static int peerflag_bits(peer_node *); @@ -2751,7 +2741,8 @@ free_config_tinker( #ifndef SIM static void config_nic_rules( - config_tree *ptree + config_tree *ptree, + int/*BOOL*/ input_from_file ) { nic_rule_node * curr_node; @@ -3502,6 +3493,11 @@ config_vars( stats_config(STATS_FREQ_FILE, curr_var->value.s); break; + case T_Dscp: + /* DSCP is in the upper 6 bits of the IP TOS/DS field */ + qos = curr_var->value.i << 2; + break; + case T_Ident: sys_ident = curr_var->value.s; break; @@ -3515,6 +3511,13 @@ config_vars( stats_config(STATS_LEAP_FILE, curr_var->value.s); break; +#ifdef LEAP_SMEAR + case T_Leapsmearinterval: + leap_smear_intv = curr_var->value.i; + msyslog(LOG_INFO, "config: leap smear interval %i s", leap_smear_intv); + break; +#endif + case T_Pidfile: stats_config(STATS_PID_FILE, curr_var->value.s); break; @@ -4224,7 +4227,7 @@ config_sim( serv_info = HEAD_PFIFO(sim_n->servers); for (; serv_info != NULL; serv_info = serv_info->link) simulation.num_of_servers++; - simulation.servers = emalloc(simulation.num_of_servers * + simulation.servers = eallocarray(simulation.num_of_servers, sizeof(simulation.servers[0])); i = 0; @@ -4295,11 +4298,11 @@ free_config_sim( #ifndef SIM static void config_ntpd( - config_tree *ptree + config_tree *ptree, + int/*BOOL*/ input_from_files ) { - config_nic_rules(ptree); - io_open_sockets(); + config_nic_rules(ptree, input_from_files); config_monitor(ptree); config_auth(ptree); config_tos(ptree); @@ -4314,6 +4317,9 @@ config_ntpd( config_ttl(ptree); config_trap(ptree); config_vars(ptree); + + io_open_sockets(); + config_other_modes(ptree); config_peers(ptree); config_unpeers(ptree); @@ -4370,28 +4376,22 @@ config_remotely( sockaddr_u * remote_addr ) { - struct FILE_INFO remote_cuckoo; char origin[128]; snprintf(origin, sizeof(origin), "remote config from %s", stoa(remote_addr)); - ZERO(remote_cuckoo); - remote_cuckoo.fname = origin; - remote_cuckoo.line_no = 1; - remote_cuckoo.col_no = 1; - input_from_file = 0; - + lex_init_stack(origin, NULL); /* no checking needed... */ init_syntax_tree(&cfgt); - yyparse(&remote_cuckoo); + yyparse(); + lex_drop_stack(); + cfgt.source.attr = CONF_SOURCE_NTPQ; cfgt.timestamp = time(NULL); cfgt.source.value.s = estrdup(stoa(remote_addr)); DPRINTF(1, ("Finished Parsing!!\n")); - save_and_apply_config_tree(); - - input_from_file = 1; + save_and_apply_config_tree(FALSE); } @@ -4443,9 +4443,8 @@ getconfig( getCmdOpts(argc, argv); init_syntax_tree(&cfgt); - curr_include_level = 0; if ( - (fp[curr_include_level] = F_OPEN(FindConfig(config_file), "r")) == NULL + !lex_init_stack(FindConfig(config_file), "r") #ifdef HAVE_NETINFO /* If there is no config_file, try NetInfo. */ && check_netinfo && !(config_netinfo = get_netinfo_config()) @@ -4459,8 +4458,7 @@ getconfig( #else /* Under WinNT try alternate_config_file name, first NTP.CONF, then NTP.INI */ - if ((fp[curr_include_level] = F_OPEN(FindConfig(alt_config_file), "r")) == NULL) { - + if (!lex_init_stack(FindConfig(alt_config_file), "r")) { /* * Broadcast clients can sometimes run without * a configuration file. @@ -4480,17 +4478,15 @@ getconfig( #ifdef DEBUG yydebug = !!(debug >= 5); #endif - yyparse(fp[curr_include_level]); + yyparse(); + lex_drop_stack(); DPRINTF(1, ("Finished Parsing!!\n")); cfgt.source.attr = CONF_SOURCE_FILE; cfgt.timestamp = time(NULL); - save_and_apply_config_tree(); - - while (curr_include_level != -1) - FCLOSE(fp[curr_include_level--]); + save_and_apply_config_tree(TRUE); #ifdef HAVE_NETINFO if (config_netinfo) @@ -4500,7 +4496,7 @@ getconfig( void -save_and_apply_config_tree(void) +save_and_apply_config_tree(int/*BOOL*/ input_from_file) { config_tree *ptree; #ifndef SAVECONFIG @@ -4554,7 +4550,7 @@ save_and_apply_config_tree(void) */ #ifndef SIM - config_ntpd(ptree); + config_ntpd(ptree, input_from_file); #else config_ntpdsim(ptree); #endif @@ -4785,8 +4781,9 @@ gettokens_netinfo ( if (namelist.ni_namelist_len == 0) continue; config->val_list = - emalloc(sizeof(char*) * - (namelist.ni_namelist_len + 1)); + eallocarray( + (namelist.ni_namelist_len + 1), + sizeof(char*)); val_list = config->val_list; for (index = 0; @@ -4936,7 +4933,7 @@ ntp_rlimit( case RLIMIT_NOFILE: /* * For large systems the default file descriptor limit may - * not be enough. + * not be enough. */ DPRINTF(2, ("ntp_rlimit: NOFILE: %d %s\n", (int)(rl_value / rl_scale), rl_sstr)); @@ -4956,7 +4953,7 @@ ntp_rlimit( DPRINTF(2, ("ntp_rlimit: STACK: %d %s pages\n", (int)(rl_value / rl_scale), rl_sstr)); if (-1 == getrlimit(RLIMIT_STACK, &rl)) { - msyslog(LOG_ERR, "getrlimit() failed: %m"); + msyslog(LOG_ERR, "getrlimit(RLIMIT_STACK) failed: %m"); } else { if (rl_value > rl.rlim_max) { msyslog(LOG_WARNING, @@ -4965,9 +4962,10 @@ ntp_rlimit( (u_long)rl_value); rl_value = rl.rlim_max; } + rl.rlim_cur = rl_value; if (-1 == setrlimit(RLIMIT_STACK, &rl)) { msyslog(LOG_ERR, - "ntp_rlimit: Cannot adjust stack limit: %m"); + "ntp_rlimit: Cannot set RLIMIT_STACK: %m"); } } break; diff --git a/contrib/ntp/ntpd/ntp_control.c b/contrib/ntp/ntpd/ntp_control.c index 2a1cf22f3007..43d2b275767f 100644 --- a/contrib/ntp/ntpd/ntp_control.c +++ b/contrib/ntp/ntpd/ntp_control.c @@ -36,6 +36,7 @@ # include "ntp_syscall.h" #endif +extern size_t remoteconfig_cmdlength( const char *src_buf, const char *src_end ); #ifndef MIN #define MIN(a, b) (((a) <= (b)) ? (a) : (b)) @@ -229,7 +230,9 @@ static const struct ctl_proc control_codes[] = { #define CS_TIMER_XMTS 87 #define CS_FUZZ 88 #define CS_WANDER_THRESH 89 -#define CS_MAX_NOAUTOKEY CS_WANDER_THRESH +#define CS_LEAPSMEARINTV 90 +#define CS_LEAPSMEAROFFS 91 +#define CS_MAX_NOAUTOKEY CS_LEAPSMEAROFFS #ifdef AUTOKEY #define CS_FLAGS (1 + CS_MAX_NOAUTOKEY) #define CS_HOST (2 + CS_MAX_NOAUTOKEY) @@ -425,6 +428,10 @@ static const struct ctl_var sys_var[] = { { CS_TIMER_XMTS, RO, "timer_xmts" }, /* 87 */ { CS_FUZZ, RO, "fuzz" }, /* 88 */ { CS_WANDER_THRESH, RO, "clk_wander_threshold" }, /* 89 */ +#ifdef LEAP_SMEAR + { CS_LEAPSMEARINTV, RO, "leapsmearinterval" }, /* 90 */ + { CS_LEAPSMEAROFFS, RO, "leapsmearoffset" }, /* 91 */ +#endif /* LEAP_SMEAR */ #ifdef AUTOKEY { CS_FLAGS, RO, "flags" }, /* 1 + CS_MAX_NOAUTOKEY */ { CS_HOST, RO, "host" }, /* 2 + CS_MAX_NOAUTOKEY */ @@ -467,6 +474,8 @@ static const u_char def_sys_var[] = { CS_TAI, CS_LEAPTAB, CS_LEAPEND, + CS_LEAPSMEARINTV, + CS_LEAPSMEAROFFS, #ifdef AUTOKEY CS_HOST, CS_IDENT, @@ -1980,6 +1989,19 @@ ctl_putsys( break; } +#ifdef LEAP_SMEAR + case CS_LEAPSMEARINTV: + if (leap_smear_intv > 0) + ctl_putuint(sys_var[CS_LEAPSMEARINTV].text, leap_smear_intv); + break; + + case CS_LEAPSMEAROFFS: + if (leap_smear_intv > 0) + ctl_putdbl(sys_var[CS_LEAPSMEAROFFS].text, + leap_smear.doffset * 1e3); + break; +#endif /* LEAP_SMEAR */ + case CS_RATE: ctl_putuint(sys_var[CS_RATE].text, ntp_minpoll); break; @@ -3289,6 +3311,7 @@ write_variables( ctl_flushpkt(0); } + /* * configure() processes ntpq :config/config-from-file, allowing * generic runtime reconfiguration. @@ -3300,7 +3323,6 @@ static void configure( { size_t data_count; int retval; - int replace_nl; /* I haven't yet implemented changes to an existing association. * Hence check if the association id is 0 @@ -3326,7 +3348,7 @@ static void configure( } /* Initialize the remote config buffer */ - data_count = reqend - reqpt; + data_count = remoteconfig_cmdlength(reqpt, reqend); if (data_count > sizeof(remote_config.buffer) - 2) { snprintf(remote_config.err_msg, @@ -3340,34 +3362,41 @@ static void configure( stoa(&rbufp->recv_srcadr)); return; } - - memcpy(remote_config.buffer, reqpt, data_count); - if (data_count > 0 - && '\n' != remote_config.buffer[data_count - 1]) - remote_config.buffer[data_count++] = '\n'; - remote_config.buffer[data_count] = '\0'; - remote_config.pos = 0; - remote_config.err_pos = 0; - remote_config.no_errors = 0; - - /* do not include terminating newline in log */ - if (data_count > 0 - && '\n' == remote_config.buffer[data_count - 1]) { - remote_config.buffer[data_count - 1] = '\0'; - replace_nl = TRUE; - } else { - replace_nl = FALSE; + /* Bug 2853 -- check if all characters were acceptable */ + if (data_count != (size_t)(reqend - reqpt)) { + snprintf(remote_config.err_msg, + sizeof(remote_config.err_msg), + "runtime configuration failed: request contains an unprintable character"); + ctl_putdata(remote_config.err_msg, + strlen(remote_config.err_msg), 0); + ctl_flushpkt(0); + msyslog(LOG_NOTICE, + "runtime config from %s rejected: request contains an unprintable character: %0x", + stoa(&rbufp->recv_srcadr), + reqpt[data_count]); + return; } + memcpy(remote_config.buffer, reqpt, data_count); + /* The buffer has no trailing linefeed or NUL right now. For + * logging, we do not want a newline, so we do that first after + * adding the necessary NUL byte. + */ + remote_config.buffer[data_count] = '\0'; DPRINTF(1, ("Got Remote Configuration Command: %s\n", remote_config.buffer)); msyslog(LOG_NOTICE, "%s config: %s", stoa(&rbufp->recv_srcadr), remote_config.buffer); - if (replace_nl) - remote_config.buffer[data_count - 1] = '\n'; - + /* Now we have to make sure there is a NL/NUL sequence at the + * end of the buffer before we parse it. + */ + remote_config.buffer[data_count++] = '\n'; + remote_config.buffer[data_count] = '\0'; + remote_config.pos = 0; + remote_config.err_pos = 0; + remote_config.no_errors = 0; config_remotely(&rbufp->recv_srcadr); /* diff --git a/contrib/ntp/ntpd/ntp_crypto.c b/contrib/ntp/ntpd/ntp_crypto.c index 7a5a1008e04e..2be501d15695 100644 --- a/contrib/ntp/ntpd/ntp_crypto.c +++ b/contrib/ntp/ntpd/ntp_crypto.c @@ -316,8 +316,8 @@ make_keylist( */ tstamp = crypto_time(); if (peer->keylist == NULL) - peer->keylist = emalloc(sizeof(keyid_t) * - NTP_MAXSESSION); + peer->keylist = eallocarray(NTP_MAXSESSION, + sizeof(keyid_t)); /* * Generate an initial key ID which is unique and greater than @@ -380,16 +380,14 @@ make_keylist( EVP_SignUpdate(&ctx, (u_char *)vp, 12); EVP_SignUpdate(&ctx, vp->ptr, sizeof(struct autokey)); if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { - vp->siglen = htonl(sign_siglen); + NTP_INSIST(len <= sign_siglen); + vp->siglen = htonl(len); peer->flags |= FLAG_ASSOC; } } -#ifdef DEBUG - if (debug) - printf("make_keys: %d %08x %08x ts %u fs %u poll %d\n", + DPRINTF(1, ("make_keys: %d %08x %08x ts %u fs %u poll %d\n", peer->keynumber, keyid, cookie, ntohl(vp->tstamp), - ntohl(vp->fstamp), peer->hpoll); -#endif + ntohl(vp->fstamp), peer->hpoll)); return (XEVNT_OK); } @@ -456,13 +454,9 @@ crypto_recv( // HMS: Why pkt[1] instead of ep->associd ? associd = (associd_t)ntohl(pkt[1]); rval = XEVNT_OK; -#ifdef DEBUG - if (debug) - printf( - "crypto_recv: flags 0x%x ext offset %d len %u code 0x%x associd %d\n", + DPRINTF(1, ("crypto_recv: flags 0x%x ext offset %d len %u code 0x%x associd %d\n", peer->crypto, authlen, len, code >> 16, - associd); -#endif + associd)); /* * Check version number and field length. If bad, @@ -538,13 +532,9 @@ crypto_recv( rval = XEVNT_LEN; break; } -#ifdef DEBUG - if (debug) - printf( - "crypto_recv: ident host 0x%x %d server 0x%x %d\n", + DPRINTF(1, ("crypto_recv: ident host 0x%x %d server 0x%x %d\n", crypto_flags, peer->associd, fstamp, - peer->assoc); -#endif + peer->assoc)); temp32 = crypto_flags & CRYPTO_FLAG_MASK; /* @@ -617,10 +607,7 @@ crypto_recv( peer->assoc, peer->subject, OBJ_nid2ln(temp32)); record_crypto_stats(&peer->srcadr, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_recv: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_recv: %s\n", statstr)); break; /* @@ -678,10 +665,7 @@ crypto_recv( OBJ_nid2ln(temp32), temp32, ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_recv: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_recv: %s\n", statstr)); break; /* @@ -718,10 +702,7 @@ crypto_recv( snprintf(statstr, sizeof(statstr), "iff %s fs %u", peer->issuer, ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_recv: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_recv: %s\n", statstr)); break; /* @@ -759,10 +740,7 @@ crypto_recv( snprintf(statstr, sizeof(statstr), "gq %s fs %u", peer->issuer, ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_recv: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_recv: %s\n", statstr)); break; /* @@ -799,10 +777,7 @@ crypto_recv( snprintf(statstr, sizeof(statstr), "mv %s fs %u", peer->issuer, ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_recv: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_recv: %s\n", statstr)); break; @@ -868,10 +843,7 @@ crypto_recv( "cook %x ts %u fs %u", peer->pcookie, ntohl(ep->tstamp), ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_recv: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_recv: %s\n", statstr)); break; /* @@ -930,10 +902,7 @@ crypto_recv( bp->key, ntohl(ep->tstamp), ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_recv: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_recv: %s\n", statstr)); break; /* @@ -970,10 +939,7 @@ crypto_recv( OBJ_nid2ln(temp32), temp32, ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_recv: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_recv: %s\n", statstr)); break; /* @@ -988,43 +954,32 @@ crypto_recv( * compare the value timestamps here, as they * can be updated by different servers. */ - if ((rval = crypto_verify(ep, NULL, peer)) != - XEVNT_OK) + rval = crypto_verify(ep, NULL, peer); + if ((rval != XEVNT_OK ) || + (vallen != 3*sizeof(uint32_t)) ) break; - /* - * If the packet leap values are more recent - * than the stored ones, install the new leap - * values and recompute the signatures. + /* Check if we can update the basic TAI offset + * for our current leap frame. This is a hack + * and ignores the time stamps in the autokey + * message. */ - if (leapsec_add_fix(ntohl(ep->pkt[0]), - ntohl(ep->pkt[1]), - ntohl(ep->pkt[2]), - NULL)) - { - leap_signature_t lsig; - - leapsec_getsig(&lsig); - tai_leap.tstamp = ep->tstamp; - tai_leap.fstamp = ep->fstamp; - tai_leap.vallen = ep->vallen; - crypto_update(); - mprintf_event(EVNT_TAI, peer, - "%d leap %s expire %s", lsig.taiof, - fstostr(lsig.ttime), - fstostr(lsig.etime)); - } + if (sys_leap != LEAP_NOTINSYNC) + leapsec_autokey_tai(ntohl(ep->pkt[0]), + rbufp->recv_time.l_ui, NULL); + tai_leap.tstamp = ep->tstamp; + tai_leap.fstamp = ep->fstamp; + crypto_update(); + mprintf_event(EVNT_TAI, peer, + "%d seconds", ntohl(ep->pkt[0])); peer->crypto |= CRYPTO_FLAG_LEAP; peer->flash &= ~TEST8; snprintf(statstr, sizeof(statstr), - "leap TAI offset %d at %u expire %u fs %u", - ntohl(ep->pkt[0]), ntohl(ep->pkt[1]), - ntohl(ep->pkt[2]), ntohl(ep->fstamp)); + "leap TAI offset %d at %u expire %u fs %u", + ntohl(ep->pkt[0]), ntohl(ep->pkt[1]), + ntohl(ep->pkt[2]), ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_recv: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_recv: %s\n", statstr)); break; /* @@ -1073,10 +1028,7 @@ crypto_recv( "%04x %d %02x %s", htonl(ep->opcode), associd, rval, eventstr(rval)); record_crypto_stats(&peer->srcadr, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_recv: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_recv: %s\n", statstr)); return (rval); } authlen += (len + 3) / 4 * 4; @@ -1421,19 +1373,12 @@ crypto_xmit( "%04x %d %02x %s", opcode, associd, rval, eventstr(rval)); record_crypto_stats(srcadr_sin, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_xmit: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_xmit: %s\n", statstr)); if (!(opcode & CRYPTO_RESP)) return (0); } -#ifdef DEBUG - if (debug) - printf( - "crypto_xmit: flags 0x%x offset %d len %d code 0x%x associd %d\n", - crypto_flags, start, len, opcode >> 16, associd); -#endif + DPRINTF(1, ("crypto_xmit: flags 0x%x offset %d len %d code 0x%x associd %d\n", + crypto_flags, start, len, opcode >> 16, associd)); return (len); } @@ -1645,8 +1590,10 @@ crypto_encrypt( EVP_SignInit(&ctx, sign_digest); EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, vallen); - if (EVP_SignFinal(&ctx, vp->sig, &vallen, sign_pkey)) - vp->siglen = htonl(sign_siglen); + if (EVP_SignFinal(&ctx, vp->sig, &vallen, sign_pkey)) { + NTP_INSIST(vallen <= sign_siglen); + vp->siglen = htonl(vallen); + } return (XEVNT_OK); } @@ -1858,7 +1805,7 @@ crypto_update(void) char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ u_int32 *ptr; u_int len; - leap_signature_t lsig; + leap_result_t leap_data; hostval.tstamp = htonl(crypto_time()); if (hostval.tstamp == 0) @@ -1877,8 +1824,10 @@ crypto_update(void) EVP_SignInit(&ctx, sign_digest); EVP_SignUpdate(&ctx, (u_char *)&pubkey, 12); EVP_SignUpdate(&ctx, pubkey.ptr, ntohl(pubkey.vallen)); - if (EVP_SignFinal(&ctx, pubkey.sig, &len, sign_pkey)) - pubkey.siglen = htonl(sign_siglen); + if (EVP_SignFinal(&ctx, pubkey.sig, &len, sign_pkey)) { + NTP_INSIST(len <= sign_siglen); + pubkey.siglen = htonl(len); + } } /* @@ -1896,8 +1845,10 @@ crypto_update(void) EVP_SignUpdate(&ctx, (u_char *)&cp->cert, 12); EVP_SignUpdate(&ctx, cp->cert.ptr, ntohl(cp->cert.vallen)); - if (EVP_SignFinal(&ctx, cp->cert.sig, &len, sign_pkey)) - cp->cert.siglen = htonl(sign_siglen); + if (EVP_SignFinal(&ctx, cp->cert.sig, &len, sign_pkey)) { + NTP_INSIST(len <= sign_siglen); + cp->cert.siglen = htonl(len); + } } /* @@ -1906,33 +1857,86 @@ crypto_update(void) */ tai_leap.tstamp = hostval.tstamp; tai_leap.fstamp = hostval.fstamp; + + /* Get the leap second era. We might need a full lookup early + * after start, when the cache is not yet loaded. + */ + leapsec_frame(&leap_data); + if ( ! memcmp(&leap_data.ebase, &leap_data.ttime, sizeof(vint64))) { + time_t now = time(NULL); + uint32_t nowntp = (uint32_t)now + JAN_1970; + leapsec_query(&leap_data, nowntp, &now); + } + + /* Create the data block. The protocol does not work without. */ len = 3 * sizeof(u_int32); - if (tai_leap.ptr == NULL) + if (tai_leap.ptr == NULL || ntohl(tai_leap.vallen) != len) { + free(tai_leap.ptr); tai_leap.ptr = emalloc(len); - tai_leap.vallen = htonl(len); + tai_leap.vallen = htonl(len); + } ptr = (u_int32 *)tai_leap.ptr; - leapsec_getsig(&lsig); - ptr[0] = htonl(lsig.taiof); - ptr[1] = htonl(lsig.ttime); - ptr[2] = htonl(lsig.etime); + if (leap_data.tai_offs > 10) { + /* create a TAI / leap era block. The end time is a + * fake -- maybe we can do better. + */ + ptr[0] = htonl(leap_data.tai_offs); + ptr[1] = htonl(leap_data.ebase.d_s.lo); + if (leap_data.ttime.d_s.hi >= 0) + ptr[2] = htonl(leap_data.ttime.D_s.lo + 7*86400); + else + ptr[2] = htonl(leap_data.ebase.D_s.lo + 25*86400); + } else { + /* no leap era available */ + memset(ptr, 0, len); + } if (tai_leap.sig == NULL) tai_leap.sig = emalloc(sign_siglen); EVP_SignInit(&ctx, sign_digest); EVP_SignUpdate(&ctx, (u_char *)&tai_leap, 12); EVP_SignUpdate(&ctx, tai_leap.ptr, len); - if (EVP_SignFinal(&ctx, tai_leap.sig, &len, sign_pkey)) - tai_leap.siglen = htonl(sign_siglen); - if (lsig.ttime > 0) - crypto_flags |= CRYPTO_FLAG_TAI; + if (EVP_SignFinal(&ctx, tai_leap.sig, &len, sign_pkey)) { + NTP_INSIST(len <= sign_siglen); + tai_leap.siglen = htonl(len); + } + crypto_flags |= CRYPTO_FLAG_TAI; + snprintf(statstr, sizeof(statstr), "signature update ts %u", ntohl(hostval.tstamp)); record_crypto_stats(NULL, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_update: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_update: %s\n", statstr)); } +/* + * crypto_update_taichange - eventually trigger crypto_update + * + * This is called when a change in 'sys_tai' is detected. This will + * happen shortly after a leap second is detected, but unhappily also + * early after system start; also, the crypto stuff might be unused and + * an unguarded call to crypto_update() causes a crash. + * + * This function makes sure that there already *is* a valid crypto block + * for the use with autokey, and only calls 'crypto_update()' if it can + * succeed. + * + * Returns void (no errors) + */ +void +crypto_update_taichange(void) +{ + static const u_int len = 3 * sizeof(u_int32); + + /* check if the signing digest algo is available */ + if (sign_digest == NULL || sign_pkey == NULL) + return; + + /* check size of TAI extension block */ + if (tai_leap.ptr == NULL || ntohl(tai_leap.vallen) != len) + return; + + /* crypto_update should at least not crash here! */ + crypto_update(); +} /* * value_free - free value structure components. @@ -2164,8 +2168,10 @@ crypto_alice( EVP_SignInit(&ctx, sign_digest); EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, len); - if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) - vp->siglen = htonl(sign_siglen); + if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { + NTP_INSIST(len <= sign_siglen); + vp->siglen = htonl(len); + } return (XEVNT_OK); } @@ -2272,8 +2278,10 @@ crypto_bob( EVP_SignInit(&ctx, sign_digest); EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, vallen); - if (EVP_SignFinal(&ctx, vp->sig, &vallen, sign_pkey)) - vp->siglen = htonl(sign_siglen); + if (EVP_SignFinal(&ctx, vp->sig, &vallen, sign_pkey)) { + NTP_INSIST(vallen <= sign_siglen); + vp->siglen = htonl(vallen); + } return (XEVNT_OK); } @@ -2477,8 +2485,10 @@ crypto_alice2( EVP_SignInit(&ctx, sign_digest); EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, len); - if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) - vp->siglen = htonl(sign_siglen); + if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { + NTP_INSIST(len <= sign_siglen); + vp->siglen = htonl(len); + } return (XEVNT_OK); } @@ -2575,8 +2585,10 @@ crypto_bob2( EVP_SignInit(&ctx, sign_digest); EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, len); - if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) - vp->siglen = htonl(sign_siglen); + if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { + NTP_INSIST(len <= sign_siglen); + vp->siglen = htonl(len); + } return (XEVNT_OK); } @@ -2804,8 +2816,10 @@ crypto_alice3( EVP_SignInit(&ctx, sign_digest); EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, len); - if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) - vp->siglen = htonl(sign_siglen); + if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { + NTP_INSIST(len <= sign_siglen); + vp->siglen = htonl(len); + } return (XEVNT_OK); } @@ -2904,8 +2918,10 @@ crypto_bob3( EVP_SignInit(&ctx, sign_digest); EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, len); - if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) - vp->siglen = htonl(sign_siglen); + if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { + NTP_INSIST(len <= sign_siglen); + vp->siglen = htonl(len); + } return (XEVNT_OK); } @@ -3141,8 +3157,10 @@ cert_sign( EVP_SignInit(&ctx, sign_digest); EVP_SignUpdate(&ctx, (u_char *)vp, 12); EVP_SignUpdate(&ctx, vp->ptr, len); - if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) - vp->siglen = htonl(sign_siglen); + if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { + NTP_INSIST(len <= sign_siglen); + vp->siglen = htonl(len); + } } #ifdef DEBUG if (debug > 1) @@ -3425,11 +3443,8 @@ cert_parse( ret->flags |= CERT_TRUST; else if (strcmp(pathbuf, "Private") == 0) ret->flags |= CERT_PRIV; -#if DEBUG - if (debug) - printf("cert_parse: %s: %s\n", - OBJ_nid2ln(temp), pathbuf); -#endif + DPRINTF(1, ("cert_parse: %s: %s\n", + OBJ_nid2ln(temp), pathbuf)); break; /* @@ -3440,12 +3455,10 @@ cert_parse( ret->grpkey = BN_bin2bn(&ext->value->data[2], ext->value->length - 2, NULL); /* fall through */ -#if DEBUG default: - if (debug) - printf("cert_parse: %s\n", - OBJ_nid2ln(temp)); -#endif + DPRINTF(1, ("cert_parse: %s\n", + OBJ_nid2ln(temp))); + break; } } if (strcmp(ret->subject, ret->issuer) == 0) { @@ -3630,9 +3643,9 @@ crypto_key( snprintf(statstr, sizeof(statstr), "%s mod %d", &linkname[2], EVP_PKEY_size(pkey) * 8); record_crypto_stats(addr, statstr); + + DPRINTF(1, ("crypto_key: %s\n", statstr)); #ifdef DEBUG - if (debug) - printf("crypto_key: %s\n", statstr); if (debug > 1) { if (pkey->type == EVP_PKEY_DSA) DSA_print_fp(stdout, pkey->pkey.dsa, 0); @@ -3747,10 +3760,7 @@ crypto_cert( snprintf(statstr, sizeof(statstr), "%s 0x%x len %lu", &linkname[2], ret->flags, len); record_crypto_stats(NULL, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_cert: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_cert: %s\n", statstr)); return (ret); } @@ -3820,12 +3830,8 @@ crypto_setup(void) arc4random_buf(&seed, sizeof(l_fp)); RAND_seed(&seed, sizeof(l_fp)); RAND_write_file(randfile); -#ifdef DEBUG - if (debug) - printf( - "crypto_setup: OpenSSL version %lx random seed file %s bytes read %d\n", - SSLeay(), randfile, bytes); -#endif + DPRINTF(1, ("crypto_setup: OpenSSL version %lx random seed file %s bytes read %d\n", + SSLeay(), randfile, bytes)); } /* @@ -3954,10 +3960,7 @@ crypto_setup(void) snprintf(statstr, sizeof(statstr), "setup 0x%x host %s %s", crypto_flags, hostname, OBJ_nid2ln(cinfo->nid)); record_crypto_stats(NULL, statstr); -#ifdef DEBUG - if (debug) - printf("crypto_setup: %s\n", statstr); -#endif + DPRINTF(1, ("crypto_setup: %s\n", statstr)); } @@ -3972,10 +3975,8 @@ crypto_config( { int nid; -#ifdef DEBUG - if (debug > 1) - printf("crypto_config: item %d %s\n", item, cp); -#endif + DPRINTF(1, ("crypto_config: item %d %s\n", item, cp)); + switch (item) { /* diff --git a/contrib/ntp/ntpd/ntp_io.c b/contrib/ntp/ntpd/ntp_io.c index 43cf3b8292ba..2b5a003e0061 100644 --- a/contrib/ntp/ntpd/ntp_io.c +++ b/contrib/ntp/ntpd/ntp_io.c @@ -73,6 +73,19 @@ extern int listen_to_virtual_ips; +#ifndef IPTOS_DSCP_EF +#define IPTOS_DSCP_EF 0xb8 +#endif +int qos = IPTOS_DSCP_EF; /* QoS RFC3246 */ + +#ifdef LEAP_SMEAR +/* TODO burnicki: This should be moved to ntp_timer.c, but if we do so + * we get a linker error. Since we're running out of time before the leap + * second occurs, we let it here where it just works. + */ +int leap_smear_intv; +#endif + /* * NIC rule entry */ @@ -2018,6 +2031,32 @@ update_interfaces( if (sys_bclient) io_setbclient(); + /* + * Check multicast interfaces and try to join multicast groups if + * not joined yet. + */ + for (ep = ep_list; ep != NULL; ep = ep->elink) { + remaddr_t *entry; + + if (!(INT_MCASTIF & ep->flags) || (INT_MCASTOPEN & ep->flags)) + continue; + + /* Find remote address that was linked to this interface */ + for (entry = remoteaddr_list; + entry != NULL; + entry = entry->link) { + if (entry->ep == ep) { + if (socket_multicast_enable(ep, &entry->addr)) { + msyslog(LOG_INFO, + "Joined %s socket to multicast group %s", + stoa(&ep->sin), + stoa(&entry->addr)); + } + break; + } + } + } + return new_interface_found; } @@ -2441,12 +2480,12 @@ socket_multicast_enable( IP_ADD_MEMBERSHIP, (char *)&mreq, sizeof(mreq))) { - msyslog(LOG_ERR, + DPRINTF(2, ( "setsockopt IP_ADD_MEMBERSHIP failed: %m on socket %d, addr %s for %x / %x (%s)", iface->fd, stoa(&iface->sin), mreq.imr_multiaddr.s_addr, mreq.imr_interface.s_addr, - stoa(maddr)); + stoa(maddr))); return ISC_FALSE; } DPRINTF(4, ("Added IPv4 multicast membership on socket %d, addr %s for %x / %x (%s)\n", @@ -2471,10 +2510,10 @@ socket_multicast_enable( if (setsockopt(iface->fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (char *)&mreq6, sizeof(mreq6))) { - msyslog(LOG_ERR, + DPRINTF(2, ( "setsockopt IPV6_JOIN_GROUP failed: %m on socket %d, addr %s for interface %u (%s)", iface->fd, stoa(&iface->sin), - mreq6.ipv6mr_interface, stoa(maddr)); + mreq6.ipv6mr_interface, stoa(maddr))); return ISC_FALSE; } DPRINTF(4, ("Added IPv6 multicast group on socket %d, addr %s for interface %u (%s)\n", @@ -2776,11 +2815,6 @@ io_multicast_add( "Joined %s socket to multicast group %s", stoa(&ep->sin), stoa(addr)); - else - msyslog(LOG_ERR, - "Failed to join %s socket to multicast group %s", - stoa(&ep->sin), - stoa(addr)); } add_addr_to_list(addr, one_ep); @@ -2851,11 +2885,6 @@ open_socket( int on = 1; int off = 0; -#ifndef IPTOS_DSCP_EF -#define IPTOS_DSCP_EF 0xb8 -#endif - int qos = IPTOS_DSCP_EF; /* QoS RFC3246 */ - if (IS_IPV6(addr) && !ipv6_works) return INVALID_SOCKET; @@ -3585,7 +3614,7 @@ io_handler(void) else if (debug > 4) { msyslog(LOG_DEBUG, "select(): nfound=%d, error: %m", nfound); } else { - DPRINTF(1, ("select() returned %d: %m\n", nfound)); + DPRINTF(3, ("select() returned %d: %m\n", nfound)); } # endif /* DEBUG */ # else /* HAVE_SIGNALED_IO */ diff --git a/contrib/ntp/ntpd/ntp_keyword.h b/contrib/ntp/ntpd/ntp_keyword.h index 723793636b7e..0a593f69dd21 100644 --- a/contrib/ntp/ntpd/ntp_keyword.h +++ b/contrib/ntp/ntpd/ntp_keyword.h @@ -2,7 +2,7 @@ * ntp_keyword.h * * NOTE: edit this file with caution, it is generated by keyword-gen.c - * Generated 2015-03-16 09:05:44 UTC diff_ignore_line + * Generated 2015-06-25 03:57:00 UTC diff_ignore_line * */ #include "ntp_scanner.h" @@ -10,7 +10,7 @@ #define LOWEST_KEYWORD_ID 258 -const char * const keyword_text[189] = { +const char * const keyword_text[191] = { /* 0 258 T_Abbrev */ "abbrev", /* 1 259 T_Age */ "age", /* 2 260 T_All */ "all", @@ -43,173 +43,175 @@ const char * const keyword_text[189] = { /* 29 287 T_Double */ NULL, /* 30 288 T_Driftfile */ "driftfile", /* 31 289 T_Drop */ "drop", - /* 32 290 T_Ellipsis */ "...", - /* 33 291 T_Enable */ "enable", - /* 34 292 T_End */ "end", - /* 35 293 T_False */ NULL, - /* 36 294 T_File */ "file", - /* 37 295 T_Filegen */ "filegen", - /* 38 296 T_Filenum */ "filenum", - /* 39 297 T_Flag1 */ "flag1", - /* 40 298 T_Flag2 */ "flag2", - /* 41 299 T_Flag3 */ "flag3", - /* 42 300 T_Flag4 */ "flag4", - /* 43 301 T_Flake */ "flake", - /* 44 302 T_Floor */ "floor", - /* 45 303 T_Freq */ "freq", - /* 46 304 T_Fudge */ "fudge", - /* 47 305 T_Host */ "host", - /* 48 306 T_Huffpuff */ "huffpuff", - /* 49 307 T_Iburst */ "iburst", - /* 50 308 T_Ident */ "ident", - /* 51 309 T_Ignore */ "ignore", - /* 52 310 T_Incalloc */ "incalloc", - /* 53 311 T_Incmem */ "incmem", - /* 54 312 T_Initalloc */ "initalloc", - /* 55 313 T_Initmem */ "initmem", - /* 56 314 T_Includefile */ "includefile", - /* 57 315 T_Integer */ NULL, - /* 58 316 T_Interface */ "interface", - /* 59 317 T_Intrange */ NULL, - /* 60 318 T_Io */ "io", - /* 61 319 T_Ipv4 */ "ipv4", - /* 62 320 T_Ipv4_flag */ "-4", - /* 63 321 T_Ipv6 */ "ipv6", - /* 64 322 T_Ipv6_flag */ "-6", - /* 65 323 T_Kernel */ "kernel", - /* 66 324 T_Key */ "key", - /* 67 325 T_Keys */ "keys", - /* 68 326 T_Keysdir */ "keysdir", - /* 69 327 T_Kod */ "kod", - /* 70 328 T_Mssntp */ "mssntp", - /* 71 329 T_Leapfile */ "leapfile", - /* 72 330 T_Limited */ "limited", - /* 73 331 T_Link */ "link", - /* 74 332 T_Listen */ "listen", - /* 75 333 T_Logconfig */ "logconfig", - /* 76 334 T_Logfile */ "logfile", - /* 77 335 T_Loopstats */ "loopstats", - /* 78 336 T_Lowpriotrap */ "lowpriotrap", - /* 79 337 T_Manycastclient */ "manycastclient", - /* 80 338 T_Manycastserver */ "manycastserver", - /* 81 339 T_Mask */ "mask", - /* 82 340 T_Maxage */ "maxage", - /* 83 341 T_Maxclock */ "maxclock", - /* 84 342 T_Maxdepth */ "maxdepth", - /* 85 343 T_Maxdist */ "maxdist", - /* 86 344 T_Maxmem */ "maxmem", - /* 87 345 T_Maxpoll */ "maxpoll", - /* 88 346 T_Mdnstries */ "mdnstries", - /* 89 347 T_Mem */ "mem", - /* 90 348 T_Memlock */ "memlock", - /* 91 349 T_Minclock */ "minclock", - /* 92 350 T_Mindepth */ "mindepth", - /* 93 351 T_Mindist */ "mindist", - /* 94 352 T_Minimum */ "minimum", - /* 95 353 T_Minpoll */ "minpoll", - /* 96 354 T_Minsane */ "minsane", - /* 97 355 T_Mode */ "mode", - /* 98 356 T_Mode7 */ "mode7", - /* 99 357 T_Monitor */ "monitor", - /* 100 358 T_Month */ "month", - /* 101 359 T_Mru */ "mru", - /* 102 360 T_Multicastclient */ "multicastclient", - /* 103 361 T_Nic */ "nic", - /* 104 362 T_Nolink */ "nolink", - /* 105 363 T_Nomodify */ "nomodify", - /* 106 364 T_Nomrulist */ "nomrulist", - /* 107 365 T_None */ "none", - /* 108 366 T_Nonvolatile */ "nonvolatile", - /* 109 367 T_Nopeer */ "nopeer", - /* 110 368 T_Noquery */ "noquery", - /* 111 369 T_Noselect */ "noselect", - /* 112 370 T_Noserve */ "noserve", - /* 113 371 T_Notrap */ "notrap", - /* 114 372 T_Notrust */ "notrust", - /* 115 373 T_Ntp */ "ntp", - /* 116 374 T_Ntpport */ "ntpport", - /* 117 375 T_NtpSignDsocket */ "ntpsigndsocket", - /* 118 376 T_Orphan */ "orphan", - /* 119 377 T_Orphanwait */ "orphanwait", - /* 120 378 T_Panic */ "panic", - /* 121 379 T_Peer */ "peer", - /* 122 380 T_Peerstats */ "peerstats", - /* 123 381 T_Phone */ "phone", - /* 124 382 T_Pid */ "pid", - /* 125 383 T_Pidfile */ "pidfile", - /* 126 384 T_Pool */ "pool", - /* 127 385 T_Port */ "port", - /* 128 386 T_Preempt */ "preempt", - /* 129 387 T_Prefer */ "prefer", - /* 130 388 T_Protostats */ "protostats", - /* 131 389 T_Pw */ "pw", - /* 132 390 T_Randfile */ "randfile", - /* 133 391 T_Rawstats */ "rawstats", - /* 134 392 T_Refid */ "refid", - /* 135 393 T_Requestkey */ "requestkey", - /* 136 394 T_Reset */ "reset", - /* 137 395 T_Restrict */ "restrict", - /* 138 396 T_Revoke */ "revoke", - /* 139 397 T_Rlimit */ "rlimit", - /* 140 398 T_Saveconfigdir */ "saveconfigdir", - /* 141 399 T_Server */ "server", - /* 142 400 T_Setvar */ "setvar", - /* 143 401 T_Source */ "source", - /* 144 402 T_Stacksize */ "stacksize", - /* 145 403 T_Statistics */ "statistics", - /* 146 404 T_Stats */ "stats", - /* 147 405 T_Statsdir */ "statsdir", - /* 148 406 T_Step */ "step", - /* 149 407 T_Stepback */ "stepback", - /* 150 408 T_Stepfwd */ "stepfwd", - /* 151 409 T_Stepout */ "stepout", - /* 152 410 T_Stratum */ "stratum", - /* 153 411 T_String */ NULL, - /* 154 412 T_Sys */ "sys", - /* 155 413 T_Sysstats */ "sysstats", - /* 156 414 T_Tick */ "tick", - /* 157 415 T_Time1 */ "time1", - /* 158 416 T_Time2 */ "time2", - /* 159 417 T_Timer */ "timer", - /* 160 418 T_Timingstats */ "timingstats", - /* 161 419 T_Tinker */ "tinker", - /* 162 420 T_Tos */ "tos", - /* 163 421 T_Trap */ "trap", - /* 164 422 T_True */ "true", - /* 165 423 T_Trustedkey */ "trustedkey", - /* 166 424 T_Ttl */ "ttl", - /* 167 425 T_Type */ "type", - /* 168 426 T_U_int */ NULL, - /* 169 427 T_Unconfig */ "unconfig", - /* 170 428 T_Unpeer */ "unpeer", - /* 171 429 T_Version */ "version", - /* 172 430 T_WanderThreshold */ NULL, - /* 173 431 T_Week */ "week", - /* 174 432 T_Wildcard */ "wildcard", - /* 175 433 T_Xleave */ "xleave", - /* 176 434 T_Year */ "year", - /* 177 435 T_Flag */ NULL, - /* 178 436 T_EOC */ NULL, - /* 179 437 T_Simulate */ "simulate", - /* 180 438 T_Beep_Delay */ "beep_delay", - /* 181 439 T_Sim_Duration */ "simulation_duration", - /* 182 440 T_Server_Offset */ "server_offset", - /* 183 441 T_Duration */ "duration", - /* 184 442 T_Freq_Offset */ "freq_offset", - /* 185 443 T_Wander */ "wander", - /* 186 444 T_Jitter */ "jitter", - /* 187 445 T_Prop_Delay */ "prop_delay", - /* 188 446 T_Proc_Delay */ "proc_delay" + /* 32 290 T_Dscp */ "dscp", + /* 33 291 T_Ellipsis */ "...", + /* 34 292 T_Enable */ "enable", + /* 35 293 T_End */ "end", + /* 36 294 T_False */ NULL, + /* 37 295 T_File */ "file", + /* 38 296 T_Filegen */ "filegen", + /* 39 297 T_Filenum */ "filenum", + /* 40 298 T_Flag1 */ "flag1", + /* 41 299 T_Flag2 */ "flag2", + /* 42 300 T_Flag3 */ "flag3", + /* 43 301 T_Flag4 */ "flag4", + /* 44 302 T_Flake */ "flake", + /* 45 303 T_Floor */ "floor", + /* 46 304 T_Freq */ "freq", + /* 47 305 T_Fudge */ "fudge", + /* 48 306 T_Host */ "host", + /* 49 307 T_Huffpuff */ "huffpuff", + /* 50 308 T_Iburst */ "iburst", + /* 51 309 T_Ident */ "ident", + /* 52 310 T_Ignore */ "ignore", + /* 53 311 T_Incalloc */ "incalloc", + /* 54 312 T_Incmem */ "incmem", + /* 55 313 T_Initalloc */ "initalloc", + /* 56 314 T_Initmem */ "initmem", + /* 57 315 T_Includefile */ "includefile", + /* 58 316 T_Integer */ NULL, + /* 59 317 T_Interface */ "interface", + /* 60 318 T_Intrange */ NULL, + /* 61 319 T_Io */ "io", + /* 62 320 T_Ipv4 */ "ipv4", + /* 63 321 T_Ipv4_flag */ "-4", + /* 64 322 T_Ipv6 */ "ipv6", + /* 65 323 T_Ipv6_flag */ "-6", + /* 66 324 T_Kernel */ "kernel", + /* 67 325 T_Key */ "key", + /* 68 326 T_Keys */ "keys", + /* 69 327 T_Keysdir */ "keysdir", + /* 70 328 T_Kod */ "kod", + /* 71 329 T_Mssntp */ "mssntp", + /* 72 330 T_Leapfile */ "leapfile", + /* 73 331 T_Leapsmearinterval */ "leapsmearinterval", + /* 74 332 T_Limited */ "limited", + /* 75 333 T_Link */ "link", + /* 76 334 T_Listen */ "listen", + /* 77 335 T_Logconfig */ "logconfig", + /* 78 336 T_Logfile */ "logfile", + /* 79 337 T_Loopstats */ "loopstats", + /* 80 338 T_Lowpriotrap */ "lowpriotrap", + /* 81 339 T_Manycastclient */ "manycastclient", + /* 82 340 T_Manycastserver */ "manycastserver", + /* 83 341 T_Mask */ "mask", + /* 84 342 T_Maxage */ "maxage", + /* 85 343 T_Maxclock */ "maxclock", + /* 86 344 T_Maxdepth */ "maxdepth", + /* 87 345 T_Maxdist */ "maxdist", + /* 88 346 T_Maxmem */ "maxmem", + /* 89 347 T_Maxpoll */ "maxpoll", + /* 90 348 T_Mdnstries */ "mdnstries", + /* 91 349 T_Mem */ "mem", + /* 92 350 T_Memlock */ "memlock", + /* 93 351 T_Minclock */ "minclock", + /* 94 352 T_Mindepth */ "mindepth", + /* 95 353 T_Mindist */ "mindist", + /* 96 354 T_Minimum */ "minimum", + /* 97 355 T_Minpoll */ "minpoll", + /* 98 356 T_Minsane */ "minsane", + /* 99 357 T_Mode */ "mode", + /* 100 358 T_Mode7 */ "mode7", + /* 101 359 T_Monitor */ "monitor", + /* 102 360 T_Month */ "month", + /* 103 361 T_Mru */ "mru", + /* 104 362 T_Multicastclient */ "multicastclient", + /* 105 363 T_Nic */ "nic", + /* 106 364 T_Nolink */ "nolink", + /* 107 365 T_Nomodify */ "nomodify", + /* 108 366 T_Nomrulist */ "nomrulist", + /* 109 367 T_None */ "none", + /* 110 368 T_Nonvolatile */ "nonvolatile", + /* 111 369 T_Nopeer */ "nopeer", + /* 112 370 T_Noquery */ "noquery", + /* 113 371 T_Noselect */ "noselect", + /* 114 372 T_Noserve */ "noserve", + /* 115 373 T_Notrap */ "notrap", + /* 116 374 T_Notrust */ "notrust", + /* 117 375 T_Ntp */ "ntp", + /* 118 376 T_Ntpport */ "ntpport", + /* 119 377 T_NtpSignDsocket */ "ntpsigndsocket", + /* 120 378 T_Orphan */ "orphan", + /* 121 379 T_Orphanwait */ "orphanwait", + /* 122 380 T_Panic */ "panic", + /* 123 381 T_Peer */ "peer", + /* 124 382 T_Peerstats */ "peerstats", + /* 125 383 T_Phone */ "phone", + /* 126 384 T_Pid */ "pid", + /* 127 385 T_Pidfile */ "pidfile", + /* 128 386 T_Pool */ "pool", + /* 129 387 T_Port */ "port", + /* 130 388 T_Preempt */ "preempt", + /* 131 389 T_Prefer */ "prefer", + /* 132 390 T_Protostats */ "protostats", + /* 133 391 T_Pw */ "pw", + /* 134 392 T_Randfile */ "randfile", + /* 135 393 T_Rawstats */ "rawstats", + /* 136 394 T_Refid */ "refid", + /* 137 395 T_Requestkey */ "requestkey", + /* 138 396 T_Reset */ "reset", + /* 139 397 T_Restrict */ "restrict", + /* 140 398 T_Revoke */ "revoke", + /* 141 399 T_Rlimit */ "rlimit", + /* 142 400 T_Saveconfigdir */ "saveconfigdir", + /* 143 401 T_Server */ "server", + /* 144 402 T_Setvar */ "setvar", + /* 145 403 T_Source */ "source", + /* 146 404 T_Stacksize */ "stacksize", + /* 147 405 T_Statistics */ "statistics", + /* 148 406 T_Stats */ "stats", + /* 149 407 T_Statsdir */ "statsdir", + /* 150 408 T_Step */ "step", + /* 151 409 T_Stepback */ "stepback", + /* 152 410 T_Stepfwd */ "stepfwd", + /* 153 411 T_Stepout */ "stepout", + /* 154 412 T_Stratum */ "stratum", + /* 155 413 T_String */ NULL, + /* 156 414 T_Sys */ "sys", + /* 157 415 T_Sysstats */ "sysstats", + /* 158 416 T_Tick */ "tick", + /* 159 417 T_Time1 */ "time1", + /* 160 418 T_Time2 */ "time2", + /* 161 419 T_Timer */ "timer", + /* 162 420 T_Timingstats */ "timingstats", + /* 163 421 T_Tinker */ "tinker", + /* 164 422 T_Tos */ "tos", + /* 165 423 T_Trap */ "trap", + /* 166 424 T_True */ "true", + /* 167 425 T_Trustedkey */ "trustedkey", + /* 168 426 T_Ttl */ "ttl", + /* 169 427 T_Type */ "type", + /* 170 428 T_U_int */ NULL, + /* 171 429 T_Unconfig */ "unconfig", + /* 172 430 T_Unpeer */ "unpeer", + /* 173 431 T_Version */ "version", + /* 174 432 T_WanderThreshold */ NULL, + /* 175 433 T_Week */ "week", + /* 176 434 T_Wildcard */ "wildcard", + /* 177 435 T_Xleave */ "xleave", + /* 178 436 T_Year */ "year", + /* 179 437 T_Flag */ NULL, + /* 180 438 T_EOC */ NULL, + /* 181 439 T_Simulate */ "simulate", + /* 182 440 T_Beep_Delay */ "beep_delay", + /* 183 441 T_Sim_Duration */ "simulation_duration", + /* 184 442 T_Server_Offset */ "server_offset", + /* 185 443 T_Duration */ "duration", + /* 186 444 T_Freq_Offset */ "freq_offset", + /* 187 445 T_Wander */ "wander", + /* 188 446 T_Jitter */ "jitter", + /* 189 447 T_Prop_Delay */ "prop_delay", + /* 190 448 T_Proc_Delay */ "proc_delay" }; -#define SCANNER_INIT_S 837 +#define SCANNER_INIT_S 853 -const scan_state sst[840] = { +const scan_state sst[856] = { /*SS_T( ch, f-by, match, other ), */ 0, /* 0 */ - S_ST( '-', 3, 322, 0 ), /* 1 */ + S_ST( '-', 3, 323, 0 ), /* 1 */ S_ST( '.', 3, 3, 1 ), /* 2 */ - S_ST( '.', 3, 290, 0 ), /* 3 . */ + S_ST( '.', 3, 291, 0 ), /* 3 . */ S_ST( 'a', 3, 23, 2 ), /* 4 */ S_ST( 'b', 3, 6, 0 ), /* 5 a */ S_ST( 'b', 3, 7, 0 ), /* 6 ab */ @@ -250,7 +252,7 @@ const scan_state sst[840] = { S_ST( 'd', 3, 42, 0 ), /* 41 beep_ */ S_ST( 'e', 3, 43, 0 ), /* 42 beep_d */ S_ST( 'l', 3, 44, 0 ), /* 43 beep_de */ - S_ST( 'a', 3, 438, 0 ), /* 44 beep_del */ + S_ST( 'a', 3, 440, 0 ), /* 44 beep_del */ S_ST( 'r', 3, 46, 34 ), /* 45 b */ S_ST( 'o', 3, 47, 0 ), /* 46 br */ S_ST( 'a', 3, 48, 0 ), /* 47 bro */ @@ -311,7 +313,7 @@ const scan_state sst[840] = { S_ST( 'a', 3, 103, 0 ), /* 102 cryptost */ S_ST( 't', 3, 279, 0 ), /* 103 cryptosta */ S_ST( 't', 3, 280, 96 ), /* 104 c */ - S_ST( 'd', 3, 137, 64 ), /* 105 */ + S_ST( 'd', 3, 139, 64 ), /* 105 */ S_ST( 'a', 3, 281, 0 ), /* 106 d */ S_ST( 'e', 3, 108, 106 ), /* 107 d */ S_ST( 'f', 3, 109, 0 ), /* 108 de */ @@ -343,127 +345,127 @@ const scan_state sst[840] = { S_ST( 'i', 3, 135, 0 ), /* 134 driftf */ S_ST( 'l', 3, 288, 0 ), /* 135 driftfi */ S_ST( 'o', 3, 289, 130 ), /* 136 dr */ - S_ST( 'u', 3, 138, 129 ), /* 137 d */ - S_ST( 'r', 3, 139, 0 ), /* 138 du */ - S_ST( 'a', 3, 140, 0 ), /* 139 dur */ - S_ST( 't', 3, 141, 0 ), /* 140 dura */ - S_ST( 'i', 3, 142, 0 ), /* 141 durat */ - S_ST( 'o', 3, 441, 0 ), /* 142 durati */ - S_ST( 'e', 3, 144, 105 ), /* 143 */ - S_ST( 'n', 3, 292, 0 ), /* 144 e */ - S_ST( 'a', 3, 146, 0 ), /* 145 en */ - S_ST( 'b', 3, 147, 0 ), /* 146 ena */ - S_ST( 'l', 3, 291, 0 ), /* 147 enab */ - S_ST( 'f', 3, 169, 143 ), /* 148 */ - S_ST( 'i', 3, 150, 0 ), /* 149 f */ - S_ST( 'l', 3, 294, 0 ), /* 150 fi */ - S_ST( 'g', 3, 152, 0 ), /* 151 file */ - S_ST( 'e', 3, 295, 0 ), /* 152 fileg */ - S_ST( 'n', 3, 154, 151 ), /* 153 file */ - S_ST( 'u', 3, 296, 0 ), /* 154 filen */ - S_ST( 'l', 3, 159, 149 ), /* 155 f */ - S_ST( 'a', 3, 158, 0 ), /* 156 fl */ - S_ST( 'g', 3, 300, 0 ), /* 157 fla */ - S_ST( 'k', 3, 301, 157 ), /* 158 fla */ - S_ST( 'o', 3, 160, 156 ), /* 159 fl */ - S_ST( 'o', 3, 302, 0 ), /* 160 flo */ - S_ST( 'r', 3, 162, 155 ), /* 161 f */ - S_ST( 'e', 3, 303, 0 ), /* 162 fr */ - S_ST( '_', 3, 164, 0 ), /* 163 freq */ - S_ST( 'o', 3, 165, 0 ), /* 164 freq_ */ - S_ST( 'f', 3, 166, 0 ), /* 165 freq_o */ - S_ST( 'f', 3, 167, 0 ), /* 166 freq_of */ - S_ST( 's', 3, 168, 0 ), /* 167 freq_off */ - S_ST( 'e', 3, 442, 0 ), /* 168 freq_offs */ - S_ST( 'u', 3, 170, 161 ), /* 169 f */ - S_ST( 'd', 3, 171, 0 ), /* 170 fu */ - S_ST( 'g', 3, 304, 0 ), /* 171 fud */ - S_ST( 'h', 3, 175, 148 ), /* 172 */ - S_ST( 'o', 3, 174, 0 ), /* 173 h */ - S_ST( 's', 3, 305, 0 ), /* 174 ho */ - S_ST( 'u', 3, 176, 173 ), /* 175 h */ - S_ST( 'f', 3, 177, 0 ), /* 176 hu */ - S_ST( 'f', 3, 178, 0 ), /* 177 huf */ - S_ST( 'p', 3, 179, 0 ), /* 178 huff */ - S_ST( 'u', 3, 180, 0 ), /* 179 huffp */ - S_ST( 'f', 3, 306, 0 ), /* 180 huffpu */ - S_ST( 'i', 3, 222, 172 ), /* 181 */ - S_ST( 'b', 3, 183, 0 ), /* 182 i */ - S_ST( 'u', 3, 184, 0 ), /* 183 ib */ - S_ST( 'r', 3, 185, 0 ), /* 184 ibu */ - S_ST( 's', 3, 307, 0 ), /* 185 ibur */ - S_ST( 'd', 3, 187, 182 ), /* 186 i */ - S_ST( 'e', 3, 188, 0 ), /* 187 id */ - S_ST( 'n', 3, 308, 0 ), /* 188 ide */ - S_ST( 'g', 3, 190, 186 ), /* 189 i */ - S_ST( 'n', 3, 191, 0 ), /* 190 ig */ - S_ST( 'o', 3, 192, 0 ), /* 191 ign */ - S_ST( 'r', 3, 309, 0 ), /* 192 igno */ - S_ST( 'n', 3, 216, 189 ), /* 193 i */ - S_ST( 'c', 3, 206, 0 ), /* 194 in */ - S_ST( 'a', 3, 196, 0 ), /* 195 inc */ - S_ST( 'l', 3, 197, 0 ), /* 196 inca */ - S_ST( 'l', 3, 198, 0 ), /* 197 incal */ - S_ST( 'o', 3, 310, 0 ), /* 198 incall */ - S_ST( 'l', 3, 200, 195 ), /* 199 inc */ - S_ST( 'u', 3, 201, 0 ), /* 200 incl */ - S_ST( 'd', 3, 202, 0 ), /* 201 inclu */ - S_ST( 'e', 3, 203, 0 ), /* 202 includ */ - S_ST( 'f', 3, 204, 0 ), /* 203 include */ - S_ST( 'i', 3, 205, 0 ), /* 204 includef */ - S_ST( 'l', 3, 314, 0 ), /* 205 includefi */ - S_ST( 'm', 3, 207, 199 ), /* 206 inc */ - S_ST( 'e', 3, 311, 0 ), /* 207 incm */ - S_ST( 'i', 3, 209, 194 ), /* 208 in */ - S_ST( 't', 3, 214, 0 ), /* 209 ini */ - S_ST( 'a', 3, 211, 0 ), /* 210 init */ - S_ST( 'l', 3, 212, 0 ), /* 211 inita */ - S_ST( 'l', 3, 213, 0 ), /* 212 inital */ - S_ST( 'o', 3, 312, 0 ), /* 213 initall */ - S_ST( 'm', 3, 215, 210 ), /* 214 init */ - S_ST( 'e', 3, 313, 0 ), /* 215 initm */ - S_ST( 't', 3, 217, 208 ), /* 216 in */ - S_ST( 'e', 3, 218, 0 ), /* 217 int */ - S_ST( 'r', 3, 219, 0 ), /* 218 inte */ - S_ST( 'f', 3, 220, 0 ), /* 219 inter */ - S_ST( 'a', 3, 221, 0 ), /* 220 interf */ - S_ST( 'c', 3, 316, 0 ), /* 221 interfa */ - S_ST( 'p', 3, 223, 318 ), /* 222 i */ - S_ST( 'v', 3, 321, 0 ), /* 223 ip */ - S_ST( 'j', 3, 225, 181 ), /* 224 */ - S_ST( 'i', 3, 226, 0 ), /* 225 j */ - S_ST( 't', 3, 227, 0 ), /* 226 ji */ - S_ST( 't', 3, 228, 0 ), /* 227 jit */ - S_ST( 'e', 3, 444, 0 ), /* 228 jitt */ - S_ST( 'k', 3, 236, 224 ), /* 229 */ - S_ST( 'e', 3, 324, 0 ), /* 230 k */ - S_ST( 'r', 3, 232, 0 ), /* 231 ke */ - S_ST( 'n', 3, 233, 0 ), /* 232 ker */ - S_ST( 'e', 3, 323, 0 ), /* 233 kern */ - S_ST( 'd', 3, 235, 0 ), /* 234 keys */ - S_ST( 'i', 3, 326, 0 ), /* 235 keysd */ - S_ST( 'o', 3, 327, 230 ), /* 236 k */ - S_ST( 'l', 3, 253, 229 ), /* 237 */ - S_ST( 'e', 3, 239, 0 ), /* 238 l */ - S_ST( 'a', 3, 240, 0 ), /* 239 le */ - S_ST( 'p', 3, 241, 0 ), /* 240 lea */ - S_ST( 'f', 3, 242, 0 ), /* 241 leap */ - S_ST( 'i', 3, 243, 0 ), /* 242 leapf */ - S_ST( 'l', 3, 329, 0 ), /* 243 leapfi */ - S_ST( 'i', 3, 250, 238 ), /* 244 l */ - S_ST( 'm', 3, 246, 0 ), /* 245 li */ - S_ST( 'i', 3, 247, 0 ), /* 246 lim */ - S_ST( 't', 3, 248, 0 ), /* 247 limi */ - S_ST( 'e', 3, 330, 0 ), /* 248 limit */ - S_ST( 'n', 3, 331, 245 ), /* 249 li */ - S_ST( 's', 3, 251, 249 ), /* 250 li */ - S_ST( 't', 3, 252, 0 ), /* 251 lis */ - S_ST( 'e', 3, 332, 0 ), /* 252 list */ - S_ST( 'o', 3, 449, 244 ), /* 253 l */ - S_ST( 'g', 3, 315, 0 ), /* 254 lo */ - S_ST( 'c', 3, 256, 0 ), /* 255 log */ - S_ST( 'o', 3, 257, 0 ), /* 256 logc */ - S_ST( 'n', 3, 287, 0 ), /* 257 logco */ + S_ST( 's', 3, 138, 129 ), /* 137 d */ + S_ST( 'c', 3, 290, 0 ), /* 138 ds */ + S_ST( 'u', 3, 140, 137 ), /* 139 d */ + S_ST( 'r', 3, 141, 0 ), /* 140 du */ + S_ST( 'a', 3, 142, 0 ), /* 141 dur */ + S_ST( 't', 3, 143, 0 ), /* 142 dura */ + S_ST( 'i', 3, 144, 0 ), /* 143 durat */ + S_ST( 'o', 3, 443, 0 ), /* 144 durati */ + S_ST( 'e', 3, 146, 105 ), /* 145 */ + S_ST( 'n', 3, 293, 0 ), /* 146 e */ + S_ST( 'a', 3, 148, 0 ), /* 147 en */ + S_ST( 'b', 3, 149, 0 ), /* 148 ena */ + S_ST( 'l', 3, 292, 0 ), /* 149 enab */ + S_ST( 'f', 3, 171, 145 ), /* 150 */ + S_ST( 'i', 3, 152, 0 ), /* 151 f */ + S_ST( 'l', 3, 295, 0 ), /* 152 fi */ + S_ST( 'g', 3, 154, 0 ), /* 153 file */ + S_ST( 'e', 3, 296, 0 ), /* 154 fileg */ + S_ST( 'n', 3, 156, 153 ), /* 155 file */ + S_ST( 'u', 3, 297, 0 ), /* 156 filen */ + S_ST( 'l', 3, 161, 151 ), /* 157 f */ + S_ST( 'a', 3, 160, 0 ), /* 158 fl */ + S_ST( 'g', 3, 301, 0 ), /* 159 fla */ + S_ST( 'k', 3, 302, 159 ), /* 160 fla */ + S_ST( 'o', 3, 162, 158 ), /* 161 fl */ + S_ST( 'o', 3, 303, 0 ), /* 162 flo */ + S_ST( 'r', 3, 164, 157 ), /* 163 f */ + S_ST( 'e', 3, 304, 0 ), /* 164 fr */ + S_ST( '_', 3, 166, 0 ), /* 165 freq */ + S_ST( 'o', 3, 167, 0 ), /* 166 freq_ */ + S_ST( 'f', 3, 168, 0 ), /* 167 freq_o */ + S_ST( 'f', 3, 169, 0 ), /* 168 freq_of */ + S_ST( 's', 3, 170, 0 ), /* 169 freq_off */ + S_ST( 'e', 3, 444, 0 ), /* 170 freq_offs */ + S_ST( 'u', 3, 172, 163 ), /* 171 f */ + S_ST( 'd', 3, 173, 0 ), /* 172 fu */ + S_ST( 'g', 3, 305, 0 ), /* 173 fud */ + S_ST( 'h', 3, 177, 150 ), /* 174 */ + S_ST( 'o', 3, 176, 0 ), /* 175 h */ + S_ST( 's', 3, 306, 0 ), /* 176 ho */ + S_ST( 'u', 3, 178, 175 ), /* 177 h */ + S_ST( 'f', 3, 179, 0 ), /* 178 hu */ + S_ST( 'f', 3, 180, 0 ), /* 179 huf */ + S_ST( 'p', 3, 181, 0 ), /* 180 huff */ + S_ST( 'u', 3, 182, 0 ), /* 181 huffp */ + S_ST( 'f', 3, 307, 0 ), /* 182 huffpu */ + S_ST( 'i', 3, 224, 174 ), /* 183 */ + S_ST( 'b', 3, 185, 0 ), /* 184 i */ + S_ST( 'u', 3, 186, 0 ), /* 185 ib */ + S_ST( 'r', 3, 187, 0 ), /* 186 ibu */ + S_ST( 's', 3, 308, 0 ), /* 187 ibur */ + S_ST( 'd', 3, 189, 184 ), /* 188 i */ + S_ST( 'e', 3, 190, 0 ), /* 189 id */ + S_ST( 'n', 3, 309, 0 ), /* 190 ide */ + S_ST( 'g', 3, 192, 188 ), /* 191 i */ + S_ST( 'n', 3, 193, 0 ), /* 192 ig */ + S_ST( 'o', 3, 194, 0 ), /* 193 ign */ + S_ST( 'r', 3, 310, 0 ), /* 194 igno */ + S_ST( 'n', 3, 218, 191 ), /* 195 i */ + S_ST( 'c', 3, 208, 0 ), /* 196 in */ + S_ST( 'a', 3, 198, 0 ), /* 197 inc */ + S_ST( 'l', 3, 199, 0 ), /* 198 inca */ + S_ST( 'l', 3, 200, 0 ), /* 199 incal */ + S_ST( 'o', 3, 311, 0 ), /* 200 incall */ + S_ST( 'l', 3, 202, 197 ), /* 201 inc */ + S_ST( 'u', 3, 203, 0 ), /* 202 incl */ + S_ST( 'd', 3, 204, 0 ), /* 203 inclu */ + S_ST( 'e', 3, 205, 0 ), /* 204 includ */ + S_ST( 'f', 3, 206, 0 ), /* 205 include */ + S_ST( 'i', 3, 207, 0 ), /* 206 includef */ + S_ST( 'l', 3, 315, 0 ), /* 207 includefi */ + S_ST( 'm', 3, 209, 201 ), /* 208 inc */ + S_ST( 'e', 3, 312, 0 ), /* 209 incm */ + S_ST( 'i', 3, 211, 196 ), /* 210 in */ + S_ST( 't', 3, 216, 0 ), /* 211 ini */ + S_ST( 'a', 3, 213, 0 ), /* 212 init */ + S_ST( 'l', 3, 214, 0 ), /* 213 inita */ + S_ST( 'l', 3, 215, 0 ), /* 214 inital */ + S_ST( 'o', 3, 313, 0 ), /* 215 initall */ + S_ST( 'm', 3, 217, 212 ), /* 216 init */ + S_ST( 'e', 3, 314, 0 ), /* 217 initm */ + S_ST( 't', 3, 219, 210 ), /* 218 in */ + S_ST( 'e', 3, 220, 0 ), /* 219 int */ + S_ST( 'r', 3, 221, 0 ), /* 220 inte */ + S_ST( 'f', 3, 222, 0 ), /* 221 inter */ + S_ST( 'a', 3, 223, 0 ), /* 222 interf */ + S_ST( 'c', 3, 317, 0 ), /* 223 interfa */ + S_ST( 'p', 3, 225, 319 ), /* 224 i */ + S_ST( 'v', 3, 322, 0 ), /* 225 ip */ + S_ST( 'j', 3, 227, 183 ), /* 226 */ + S_ST( 'i', 3, 228, 0 ), /* 227 j */ + S_ST( 't', 3, 229, 0 ), /* 228 ji */ + S_ST( 't', 3, 230, 0 ), /* 229 jit */ + S_ST( 'e', 3, 446, 0 ), /* 230 jitt */ + S_ST( 'k', 3, 238, 226 ), /* 231 */ + S_ST( 'e', 3, 325, 0 ), /* 232 k */ + S_ST( 'r', 3, 234, 0 ), /* 233 ke */ + S_ST( 'n', 3, 235, 0 ), /* 234 ker */ + S_ST( 'e', 3, 324, 0 ), /* 235 kern */ + S_ST( 'd', 3, 237, 0 ), /* 236 keys */ + S_ST( 'i', 3, 327, 0 ), /* 237 keysd */ + S_ST( 'o', 3, 328, 232 ), /* 238 k */ + S_ST( 'l', 3, 449, 231 ), /* 239 */ + S_ST( 'e', 3, 241, 0 ), /* 240 l */ + S_ST( 'a', 3, 242, 0 ), /* 241 le */ + S_ST( 'p', 3, 246, 0 ), /* 242 lea */ + S_ST( 'f', 3, 244, 0 ), /* 243 leap */ + S_ST( 'i', 3, 245, 0 ), /* 244 leapf */ + S_ST( 'l', 3, 330, 0 ), /* 245 leapfi */ + S_ST( 's', 3, 247, 243 ), /* 246 leap */ + S_ST( 'm', 3, 248, 0 ), /* 247 leaps */ + S_ST( 'e', 3, 249, 0 ), /* 248 leapsm */ + S_ST( 'a', 3, 250, 0 ), /* 249 leapsme */ + S_ST( 'r', 3, 251, 0 ), /* 250 leapsmea */ + S_ST( 'i', 3, 252, 0 ), /* 251 leapsmear */ + S_ST( 'n', 3, 253, 0 ), /* 252 leapsmeari */ + S_ST( 't', 3, 254, 0 ), /* 253 leapsmearin */ + S_ST( 'e', 3, 255, 0 ), /* 254 leapsmearint */ + S_ST( 'r', 3, 256, 0 ), /* 255 leapsmearinte */ + S_ST( 'v', 3, 257, 0 ), /* 256 leapsmearinter */ + S_ST( 'a', 3, 331, 0 ), /* 257 leapsmearinterv */ S_ST( 'v', 1, 0, 0 ), /* 258 T_Abbrev */ S_ST( 'e', 0, 0, 0 ), /* 259 T_Age */ S_ST( 'l', 0, 12, 0 ), /* 260 T_All */ @@ -493,558 +495,574 @@ const scan_state sst[840] = { S_ST( 'e', 0, 0, 0 ), /* 284 T_Disable */ S_ST( 'd', 0, 0, 0 ), /* 285 T_Discard */ S_ST( 'n', 0, 0, 0 ), /* 286 T_Dispersion */ - S_ST( 'f', 3, 293, 0 ), /* 287 logcon */ + S_ST( 'i', 3, 432, 240 ), /* 287 l */ S_ST( 'e', 1, 0, 0 ), /* 288 T_Driftfile */ S_ST( 'p', 0, 0, 0 ), /* 289 T_Drop */ - S_ST( '.', 0, 0, 0 ), /* 290 T_Ellipsis */ - S_ST( 'e', 0, 0, 0 ), /* 291 T_Enable */ - S_ST( 'd', 0, 0, 145 ), /* 292 T_End */ - S_ST( 'i', 3, 333, 0 ), /* 293 logconf */ - S_ST( 'e', 1, 153, 0 ), /* 294 T_File */ - S_ST( 'n', 0, 0, 0 ), /* 295 T_Filegen */ - S_ST( 'm', 0, 0, 0 ), /* 296 T_Filenum */ - S_ST( '1', 0, 0, 0 ), /* 297 T_Flag1 */ - S_ST( '2', 0, 0, 297 ), /* 298 T_Flag2 */ - S_ST( '3', 0, 0, 298 ), /* 299 T_Flag3 */ - S_ST( '4', 0, 0, 299 ), /* 300 T_Flag4 */ - S_ST( 'e', 0, 0, 0 ), /* 301 T_Flake */ - S_ST( 'r', 0, 0, 0 ), /* 302 T_Floor */ - S_ST( 'q', 0, 163, 0 ), /* 303 T_Freq */ - S_ST( 'e', 1, 0, 0 ), /* 304 T_Fudge */ - S_ST( 't', 1, 0, 0 ), /* 305 T_Host */ - S_ST( 'f', 0, 0, 0 ), /* 306 T_Huffpuff */ - S_ST( 't', 0, 0, 0 ), /* 307 T_Iburst */ - S_ST( 't', 1, 0, 0 ), /* 308 T_Ident */ - S_ST( 'e', 0, 0, 0 ), /* 309 T_Ignore */ - S_ST( 'c', 0, 0, 0 ), /* 310 T_Incalloc */ - S_ST( 'm', 0, 0, 0 ), /* 311 T_Incmem */ - S_ST( 'c', 0, 0, 0 ), /* 312 T_Initalloc */ - S_ST( 'm', 0, 0, 0 ), /* 313 T_Initmem */ - S_ST( 'e', 1, 0, 0 ), /* 314 T_Includefile */ - S_ST( 'f', 3, 317, 255 ), /* 315 log */ - S_ST( 'e', 0, 0, 0 ), /* 316 T_Interface */ - S_ST( 'i', 3, 411, 0 ), /* 317 logf */ - S_ST( 'o', 0, 0, 193 ), /* 318 T_Io */ - S_ST( '4', 0, 0, 0 ), /* 319 T_Ipv4 */ - S_ST( '4', 0, 0, 0 ), /* 320 T_Ipv4_flag */ - S_ST( '6', 0, 0, 319 ), /* 321 T_Ipv6 */ - S_ST( '6', 0, 0, 320 ), /* 322 T_Ipv6_flag */ - S_ST( 'l', 0, 0, 0 ), /* 323 T_Kernel */ - S_ST( 'y', 0, 325, 231 ), /* 324 T_Key */ - S_ST( 's', 1, 234, 0 ), /* 325 T_Keys */ - S_ST( 'r', 1, 0, 0 ), /* 326 T_Keysdir */ - S_ST( 'd', 0, 0, 0 ), /* 327 T_Kod */ - S_ST( 'p', 0, 0, 0 ), /* 328 T_Mssntp */ - S_ST( 'e', 1, 0, 0 ), /* 329 T_Leapfile */ - S_ST( 'd', 0, 0, 0 ), /* 330 T_Limited */ - S_ST( 'k', 0, 0, 0 ), /* 331 T_Link */ - S_ST( 'n', 0, 0, 0 ), /* 332 T_Listen */ - S_ST( 'g', 2, 0, 0 ), /* 333 T_Logconfig */ - S_ST( 'e', 1, 0, 0 ), /* 334 T_Logfile */ - S_ST( 's', 0, 0, 0 ), /* 335 T_Loopstats */ - S_ST( 'p', 0, 0, 0 ), /* 336 T_Lowpriotrap */ - S_ST( 't', 1, 0, 0 ), /* 337 T_Manycastclient */ - S_ST( 'r', 2, 0, 0 ), /* 338 T_Manycastserver */ - S_ST( 'k', 0, 0, 0 ), /* 339 T_Mask */ - S_ST( 'e', 0, 0, 0 ), /* 340 T_Maxage */ - S_ST( 'k', 0, 0, 0 ), /* 341 T_Maxclock */ - S_ST( 'h', 0, 0, 0 ), /* 342 T_Maxdepth */ - S_ST( 't', 0, 0, 0 ), /* 343 T_Maxdist */ - S_ST( 'm', 0, 0, 0 ), /* 344 T_Maxmem */ - S_ST( 'l', 0, 0, 0 ), /* 345 T_Maxpoll */ - S_ST( 's', 0, 0, 0 ), /* 346 T_Mdnstries */ - S_ST( 'm', 0, 502, 0 ), /* 347 T_Mem */ - S_ST( 'k', 0, 0, 0 ), /* 348 T_Memlock */ - S_ST( 'k', 0, 0, 0 ), /* 349 T_Minclock */ - S_ST( 'h', 0, 0, 0 ), /* 350 T_Mindepth */ - S_ST( 't', 0, 0, 0 ), /* 351 T_Mindist */ - S_ST( 'm', 0, 0, 0 ), /* 352 T_Minimum */ - S_ST( 'l', 0, 0, 0 ), /* 353 T_Minpoll */ - S_ST( 'e', 0, 0, 0 ), /* 354 T_Minsane */ - S_ST( 'e', 0, 356, 0 ), /* 355 T_Mode */ - S_ST( '7', 0, 0, 0 ), /* 356 T_Mode7 */ - S_ST( 'r', 0, 0, 0 ), /* 357 T_Monitor */ - S_ST( 'h', 0, 0, 0 ), /* 358 T_Month */ - S_ST( 'u', 0, 0, 0 ), /* 359 T_Mru */ - S_ST( 't', 2, 0, 0 ), /* 360 T_Multicastclient */ - S_ST( 'c', 0, 0, 0 ), /* 361 T_Nic */ - S_ST( 'k', 0, 0, 0 ), /* 362 T_Nolink */ - S_ST( 'y', 0, 0, 0 ), /* 363 T_Nomodify */ - S_ST( 't', 0, 0, 0 ), /* 364 T_Nomrulist */ - S_ST( 'e', 0, 0, 0 ), /* 365 T_None */ - S_ST( 'e', 0, 0, 0 ), /* 366 T_Nonvolatile */ - S_ST( 'r', 0, 0, 0 ), /* 367 T_Nopeer */ - S_ST( 'y', 0, 0, 0 ), /* 368 T_Noquery */ - S_ST( 't', 0, 0, 0 ), /* 369 T_Noselect */ - S_ST( 'e', 0, 0, 0 ), /* 370 T_Noserve */ - S_ST( 'p', 0, 0, 0 ), /* 371 T_Notrap */ - S_ST( 't', 0, 0, 0 ), /* 372 T_Notrust */ - S_ST( 'p', 0, 598, 0 ), /* 373 T_Ntp */ - S_ST( 't', 0, 0, 0 ), /* 374 T_Ntpport */ - S_ST( 't', 1, 0, 0 ), /* 375 T_NtpSignDsocket */ - S_ST( 'n', 0, 613, 0 ), /* 376 T_Orphan */ - S_ST( 't', 0, 0, 0 ), /* 377 T_Orphanwait */ - S_ST( 'c', 0, 0, 0 ), /* 378 T_Panic */ - S_ST( 'r', 1, 622, 0 ), /* 379 T_Peer */ - S_ST( 's', 0, 0, 0 ), /* 380 T_Peerstats */ - S_ST( 'e', 2, 0, 0 ), /* 381 T_Phone */ - S_ST( 'd', 0, 630, 0 ), /* 382 T_Pid */ - S_ST( 'e', 1, 0, 0 ), /* 383 T_Pidfile */ - S_ST( 'l', 1, 0, 0 ), /* 384 T_Pool */ - S_ST( 't', 0, 0, 0 ), /* 385 T_Port */ - S_ST( 't', 0, 0, 0 ), /* 386 T_Preempt */ - S_ST( 'r', 0, 0, 0 ), /* 387 T_Prefer */ - S_ST( 's', 0, 0, 0 ), /* 388 T_Protostats */ - S_ST( 'w', 1, 0, 636 ), /* 389 T_Pw */ - S_ST( 'e', 1, 0, 0 ), /* 390 T_Randfile */ - S_ST( 's', 0, 0, 0 ), /* 391 T_Rawstats */ - S_ST( 'd', 1, 0, 0 ), /* 392 T_Refid */ - S_ST( 'y', 0, 0, 0 ), /* 393 T_Requestkey */ - S_ST( 't', 0, 0, 0 ), /* 394 T_Reset */ - S_ST( 't', 0, 0, 0 ), /* 395 T_Restrict */ - S_ST( 'e', 0, 0, 0 ), /* 396 T_Revoke */ - S_ST( 't', 0, 0, 0 ), /* 397 T_Rlimit */ - S_ST( 'r', 1, 0, 0 ), /* 398 T_Saveconfigdir */ - S_ST( 'r', 1, 713, 0 ), /* 399 T_Server */ - S_ST( 'r', 1, 0, 0 ), /* 400 T_Setvar */ - S_ST( 'e', 0, 0, 0 ), /* 401 T_Source */ - S_ST( 'e', 0, 0, 0 ), /* 402 T_Stacksize */ - S_ST( 's', 0, 0, 0 ), /* 403 T_Statistics */ - S_ST( 's', 0, 756, 751 ), /* 404 T_Stats */ - S_ST( 'r', 1, 0, 0 ), /* 405 T_Statsdir */ - S_ST( 'p', 0, 764, 0 ), /* 406 T_Step */ - S_ST( 'k', 0, 0, 0 ), /* 407 T_Stepback */ - S_ST( 'd', 0, 0, 0 ), /* 408 T_Stepfwd */ - S_ST( 't', 0, 0, 0 ), /* 409 T_Stepout */ - S_ST( 'm', 0, 0, 0 ), /* 410 T_Stratum */ - S_ST( 'l', 3, 334, 0 ), /* 411 logfi */ - S_ST( 's', 0, 771, 0 ), /* 412 T_Sys */ - S_ST( 's', 0, 0, 0 ), /* 413 T_Sysstats */ - S_ST( 'k', 0, 0, 0 ), /* 414 T_Tick */ - S_ST( '1', 0, 0, 0 ), /* 415 T_Time1 */ - S_ST( '2', 0, 0, 415 ), /* 416 T_Time2 */ - S_ST( 'r', 0, 0, 416 ), /* 417 T_Timer */ - S_ST( 's', 0, 0, 0 ), /* 418 T_Timingstats */ - S_ST( 'r', 0, 0, 0 ), /* 419 T_Tinker */ - S_ST( 's', 0, 0, 0 ), /* 420 T_Tos */ - S_ST( 'p', 1, 0, 0 ), /* 421 T_Trap */ - S_ST( 'e', 0, 0, 0 ), /* 422 T_True */ - S_ST( 'y', 0, 0, 0 ), /* 423 T_Trustedkey */ - S_ST( 'l', 0, 0, 0 ), /* 424 T_Ttl */ - S_ST( 'e', 0, 0, 0 ), /* 425 T_Type */ - S_ST( 'o', 3, 430, 254 ), /* 426 lo */ - S_ST( 'g', 1, 0, 0 ), /* 427 T_Unconfig */ - S_ST( 'r', 1, 0, 0 ), /* 428 T_Unpeer */ - S_ST( 'n', 0, 0, 0 ), /* 429 T_Version */ - S_ST( 'p', 3, 435, 0 ), /* 430 loo */ - S_ST( 'k', 0, 0, 0 ), /* 431 T_Week */ - S_ST( 'd', 0, 0, 0 ), /* 432 T_Wildcard */ - S_ST( 'e', 0, 0, 0 ), /* 433 T_Xleave */ - S_ST( 'r', 0, 0, 0 ), /* 434 T_Year */ - S_ST( 's', 3, 436, 0 ), /* 435 loop */ - S_ST( 't', 3, 447, 0 ), /* 436 loops */ - S_ST( 'e', 0, 0, 0 ), /* 437 T_Simulate */ - S_ST( 'y', 0, 0, 0 ), /* 438 T_Beep_Delay */ - S_ST( 'n', 0, 0, 0 ), /* 439 T_Sim_Duration */ - S_ST( 't', 0, 0, 0 ), /* 440 T_Server_Offset */ - S_ST( 'n', 0, 0, 0 ), /* 441 T_Duration */ - S_ST( 't', 0, 0, 0 ), /* 442 T_Freq_Offset */ - S_ST( 'r', 0, 0, 0 ), /* 443 T_Wander */ - S_ST( 'r', 0, 0, 0 ), /* 444 T_Jitter */ - S_ST( 'y', 0, 0, 0 ), /* 445 T_Prop_Delay */ - S_ST( 'y', 0, 0, 0 ), /* 446 T_Proc_Delay */ - S_ST( 'a', 3, 448, 0 ), /* 447 loopst */ - S_ST( 't', 3, 335, 0 ), /* 448 loopsta */ - S_ST( 'w', 3, 450, 426 ), /* 449 lo */ - S_ST( 'p', 3, 451, 0 ), /* 450 low */ - S_ST( 'r', 3, 452, 0 ), /* 451 lowp */ - S_ST( 'i', 3, 453, 0 ), /* 452 lowpr */ - S_ST( 'o', 3, 454, 0 ), /* 453 lowpri */ - S_ST( 't', 3, 455, 0 ), /* 454 lowprio */ - S_ST( 'r', 3, 456, 0 ), /* 455 lowpriot */ - S_ST( 'a', 3, 336, 0 ), /* 456 lowpriotr */ - S_ST( 'm', 3, 538, 237 ), /* 457 */ - S_ST( 'a', 3, 476, 0 ), /* 458 m */ - S_ST( 'n', 3, 460, 0 ), /* 459 ma */ - S_ST( 'y', 3, 461, 0 ), /* 460 man */ - S_ST( 'c', 3, 462, 0 ), /* 461 many */ - S_ST( 'a', 3, 463, 0 ), /* 462 manyc */ - S_ST( 's', 3, 464, 0 ), /* 463 manyca */ - S_ST( 't', 3, 470, 0 ), /* 464 manycas */ - S_ST( 'c', 3, 466, 0 ), /* 465 manycast */ - S_ST( 'l', 3, 467, 0 ), /* 466 manycastc */ - S_ST( 'i', 3, 468, 0 ), /* 467 manycastcl */ - S_ST( 'e', 3, 469, 0 ), /* 468 manycastcli */ - S_ST( 'n', 3, 337, 0 ), /* 469 manycastclie */ - S_ST( 's', 3, 471, 465 ), /* 470 manycast */ - S_ST( 'e', 3, 472, 0 ), /* 471 manycasts */ - S_ST( 'r', 3, 473, 0 ), /* 472 manycastse */ - S_ST( 'v', 3, 474, 0 ), /* 473 manycastser */ - S_ST( 'e', 3, 338, 0 ), /* 474 manycastserv */ - S_ST( 's', 3, 339, 459 ), /* 475 ma */ - S_ST( 'x', 3, 491, 475 ), /* 476 ma */ - S_ST( 'a', 3, 478, 0 ), /* 477 max */ - S_ST( 'g', 3, 340, 0 ), /* 478 maxa */ - S_ST( 'c', 3, 480, 477 ), /* 479 max */ - S_ST( 'l', 3, 481, 0 ), /* 480 maxc */ - S_ST( 'o', 3, 482, 0 ), /* 481 maxcl */ - S_ST( 'c', 3, 341, 0 ), /* 482 maxclo */ - S_ST( 'd', 3, 487, 479 ), /* 483 max */ - S_ST( 'e', 3, 485, 0 ), /* 484 maxd */ - S_ST( 'p', 3, 486, 0 ), /* 485 maxde */ - S_ST( 't', 3, 342, 0 ), /* 486 maxdep */ - S_ST( 'i', 3, 488, 484 ), /* 487 maxd */ - S_ST( 's', 3, 343, 0 ), /* 488 maxdi */ - S_ST( 'm', 3, 490, 483 ), /* 489 max */ - S_ST( 'e', 3, 344, 0 ), /* 490 maxm */ - S_ST( 'p', 3, 492, 489 ), /* 491 max */ - S_ST( 'o', 3, 493, 0 ), /* 492 maxp */ - S_ST( 'l', 3, 345, 0 ), /* 493 maxpo */ - S_ST( 'd', 3, 495, 458 ), /* 494 m */ - S_ST( 'n', 3, 496, 0 ), /* 495 md */ - S_ST( 's', 3, 497, 0 ), /* 496 mdn */ - S_ST( 't', 3, 498, 0 ), /* 497 mdns */ - S_ST( 'r', 3, 499, 0 ), /* 498 mdnst */ - S_ST( 'i', 3, 500, 0 ), /* 499 mdnstr */ - S_ST( 'e', 3, 346, 0 ), /* 500 mdnstri */ - S_ST( 'e', 3, 347, 494 ), /* 501 m */ - S_ST( 'l', 3, 503, 0 ), /* 502 mem */ - S_ST( 'o', 3, 504, 0 ), /* 503 meml */ - S_ST( 'c', 3, 348, 0 ), /* 504 memlo */ - S_ST( 'i', 3, 506, 501 ), /* 505 m */ - S_ST( 'n', 3, 523, 0 ), /* 506 mi */ - S_ST( 'c', 3, 508, 0 ), /* 507 min */ - S_ST( 'l', 3, 509, 0 ), /* 508 minc */ - S_ST( 'o', 3, 510, 0 ), /* 509 mincl */ - S_ST( 'c', 3, 349, 0 ), /* 510 minclo */ - S_ST( 'd', 3, 515, 507 ), /* 511 min */ - S_ST( 'e', 3, 513, 0 ), /* 512 mind */ - S_ST( 'p', 3, 514, 0 ), /* 513 minde */ - S_ST( 't', 3, 350, 0 ), /* 514 mindep */ - S_ST( 'i', 3, 516, 512 ), /* 515 mind */ - S_ST( 's', 3, 351, 0 ), /* 516 mindi */ - S_ST( 'i', 3, 518, 511 ), /* 517 min */ - S_ST( 'm', 3, 519, 0 ), /* 518 mini */ - S_ST( 'u', 3, 352, 0 ), /* 519 minim */ - S_ST( 'p', 3, 521, 517 ), /* 520 min */ - S_ST( 'o', 3, 522, 0 ), /* 521 minp */ - S_ST( 'l', 3, 353, 0 ), /* 522 minpo */ - S_ST( 's', 3, 524, 520 ), /* 523 min */ - S_ST( 'a', 3, 525, 0 ), /* 524 mins */ - S_ST( 'n', 3, 354, 0 ), /* 525 minsa */ - S_ST( 'o', 3, 528, 505 ), /* 526 m */ - S_ST( 'd', 3, 355, 0 ), /* 527 mo */ - S_ST( 'n', 3, 532, 527 ), /* 528 mo */ - S_ST( 'i', 3, 530, 0 ), /* 529 mon */ - S_ST( 't', 3, 531, 0 ), /* 530 moni */ - S_ST( 'o', 3, 357, 0 ), /* 531 monit */ - S_ST( 't', 3, 358, 529 ), /* 532 mon */ - S_ST( 'r', 3, 359, 526 ), /* 533 m */ - S_ST( 's', 3, 535, 533 ), /* 534 m */ - S_ST( 's', 3, 536, 0 ), /* 535 ms */ - S_ST( 'n', 3, 537, 0 ), /* 536 mss */ - S_ST( 't', 3, 328, 0 ), /* 537 mssn */ - S_ST( 'u', 3, 539, 534 ), /* 538 m */ - S_ST( 'l', 3, 540, 0 ), /* 539 mu */ - S_ST( 't', 3, 541, 0 ), /* 540 mul */ - S_ST( 'i', 3, 542, 0 ), /* 541 mult */ - S_ST( 'c', 3, 543, 0 ), /* 542 multi */ - S_ST( 'a', 3, 544, 0 ), /* 543 multic */ - S_ST( 's', 3, 545, 0 ), /* 544 multica */ - S_ST( 't', 3, 546, 0 ), /* 545 multicas */ - S_ST( 'c', 3, 547, 0 ), /* 546 multicast */ - S_ST( 'l', 3, 548, 0 ), /* 547 multicastc */ - S_ST( 'i', 3, 549, 0 ), /* 548 multicastcl */ - S_ST( 'e', 3, 550, 0 ), /* 549 multicastcli */ - S_ST( 'n', 3, 360, 0 ), /* 550 multicastclie */ - S_ST( 'n', 3, 594, 457 ), /* 551 */ - S_ST( 'i', 3, 361, 0 ), /* 552 n */ - S_ST( 'o', 3, 589, 552 ), /* 553 n */ - S_ST( 'l', 3, 555, 0 ), /* 554 no */ - S_ST( 'i', 3, 556, 0 ), /* 555 nol */ - S_ST( 'n', 3, 362, 0 ), /* 556 noli */ - S_ST( 'm', 3, 562, 554 ), /* 557 no */ - S_ST( 'o', 3, 559, 0 ), /* 558 nom */ - S_ST( 'd', 3, 560, 0 ), /* 559 nomo */ - S_ST( 'i', 3, 561, 0 ), /* 560 nomod */ - S_ST( 'f', 3, 363, 0 ), /* 561 nomodi */ - S_ST( 'r', 3, 563, 558 ), /* 562 nom */ - S_ST( 'u', 3, 564, 0 ), /* 563 nomr */ - S_ST( 'l', 3, 565, 0 ), /* 564 nomru */ - S_ST( 'i', 3, 566, 0 ), /* 565 nomrul */ - S_ST( 's', 3, 364, 0 ), /* 566 nomruli */ - S_ST( 'n', 3, 568, 557 ), /* 567 no */ - S_ST( 'v', 3, 569, 365 ), /* 568 non */ - S_ST( 'o', 3, 570, 0 ), /* 569 nonv */ - S_ST( 'l', 3, 571, 0 ), /* 570 nonvo */ - S_ST( 'a', 3, 572, 0 ), /* 571 nonvol */ - S_ST( 't', 3, 573, 0 ), /* 572 nonvola */ - S_ST( 'i', 3, 574, 0 ), /* 573 nonvolat */ - S_ST( 'l', 3, 366, 0 ), /* 574 nonvolati */ - S_ST( 'p', 3, 576, 567 ), /* 575 no */ - S_ST( 'e', 3, 577, 0 ), /* 576 nop */ - S_ST( 'e', 3, 367, 0 ), /* 577 nope */ - S_ST( 'q', 3, 579, 575 ), /* 578 no */ - S_ST( 'u', 3, 580, 0 ), /* 579 noq */ - S_ST( 'e', 3, 581, 0 ), /* 580 noqu */ - S_ST( 'r', 3, 368, 0 ), /* 581 noque */ - S_ST( 's', 3, 583, 578 ), /* 582 no */ - S_ST( 'e', 3, 587, 0 ), /* 583 nos */ - S_ST( 'l', 3, 585, 0 ), /* 584 nose */ - S_ST( 'e', 3, 586, 0 ), /* 585 nosel */ - S_ST( 'c', 3, 369, 0 ), /* 586 nosele */ - S_ST( 'r', 3, 588, 584 ), /* 587 nose */ - S_ST( 'v', 3, 370, 0 ), /* 588 noser */ - S_ST( 't', 3, 590, 582 ), /* 589 no */ - S_ST( 'r', 3, 592, 0 ), /* 590 not */ - S_ST( 'a', 3, 371, 0 ), /* 591 notr */ - S_ST( 'u', 3, 593, 591 ), /* 592 notr */ - S_ST( 's', 3, 372, 0 ), /* 593 notru */ - S_ST( 't', 3, 373, 553 ), /* 594 n */ - S_ST( 'p', 3, 596, 0 ), /* 595 ntp */ - S_ST( 'o', 3, 597, 0 ), /* 596 ntpp */ - S_ST( 'r', 3, 374, 0 ), /* 597 ntppo */ - S_ST( 's', 3, 599, 595 ), /* 598 ntp */ - S_ST( 'i', 3, 600, 0 ), /* 599 ntps */ - S_ST( 'g', 3, 601, 0 ), /* 600 ntpsi */ - S_ST( 'n', 3, 602, 0 ), /* 601 ntpsig */ - S_ST( 'd', 3, 603, 0 ), /* 602 ntpsign */ - S_ST( 's', 3, 604, 0 ), /* 603 ntpsignd */ - S_ST( 'o', 3, 605, 0 ), /* 604 ntpsignds */ - S_ST( 'c', 3, 606, 0 ), /* 605 ntpsigndso */ - S_ST( 'k', 3, 607, 0 ), /* 606 ntpsigndsoc */ - S_ST( 'e', 3, 375, 0 ), /* 607 ntpsigndsock */ - S_ST( 'o', 3, 609, 551 ), /* 608 */ - S_ST( 'r', 3, 610, 0 ), /* 609 o */ - S_ST( 'p', 3, 611, 0 ), /* 610 or */ - S_ST( 'h', 3, 612, 0 ), /* 611 orp */ - S_ST( 'a', 3, 376, 0 ), /* 612 orph */ - S_ST( 'w', 3, 614, 0 ), /* 613 orphan */ - S_ST( 'a', 3, 615, 0 ), /* 614 orphanw */ - S_ST( 'i', 3, 377, 0 ), /* 615 orphanwa */ - S_ST( 'p', 3, 389, 608 ), /* 616 */ - S_ST( 'a', 3, 618, 0 ), /* 617 p */ - S_ST( 'n', 3, 619, 0 ), /* 618 pa */ - S_ST( 'i', 3, 378, 0 ), /* 619 pan */ - S_ST( 'e', 3, 621, 617 ), /* 620 p */ - S_ST( 'e', 3, 379, 0 ), /* 621 pe */ - S_ST( 's', 3, 623, 0 ), /* 622 peer */ - S_ST( 't', 3, 624, 0 ), /* 623 peers */ - S_ST( 'a', 3, 625, 0 ), /* 624 peerst */ - S_ST( 't', 3, 380, 0 ), /* 625 peersta */ - S_ST( 'h', 3, 627, 620 ), /* 626 p */ - S_ST( 'o', 3, 628, 0 ), /* 627 ph */ - S_ST( 'n', 3, 381, 0 ), /* 628 pho */ - S_ST( 'i', 3, 382, 626 ), /* 629 p */ - S_ST( 'f', 3, 631, 0 ), /* 630 pid */ - S_ST( 'i', 3, 632, 0 ), /* 631 pidf */ - S_ST( 'l', 3, 383, 0 ), /* 632 pidfi */ - S_ST( 'o', 3, 635, 629 ), /* 633 p */ - S_ST( 'o', 3, 384, 0 ), /* 634 po */ - S_ST( 'r', 3, 385, 634 ), /* 635 po */ - S_ST( 'r', 3, 643, 633 ), /* 636 p */ - S_ST( 'e', 3, 641, 0 ), /* 637 pr */ - S_ST( 'e', 3, 639, 0 ), /* 638 pre */ - S_ST( 'm', 3, 640, 0 ), /* 639 pree */ - S_ST( 'p', 3, 386, 0 ), /* 640 preem */ - S_ST( 'f', 3, 642, 638 ), /* 641 pre */ - S_ST( 'e', 3, 387, 0 ), /* 642 pref */ - S_ST( 'o', 3, 656, 637 ), /* 643 pr */ - S_ST( 'c', 3, 645, 0 ), /* 644 pro */ - S_ST( '_', 3, 646, 0 ), /* 645 proc */ - S_ST( 'd', 3, 647, 0 ), /* 646 proc_ */ - S_ST( 'e', 3, 648, 0 ), /* 647 proc_d */ - S_ST( 'l', 3, 649, 0 ), /* 648 proc_de */ - S_ST( 'a', 3, 446, 0 ), /* 649 proc_del */ - S_ST( 'p', 3, 651, 644 ), /* 650 pro */ - S_ST( '_', 3, 652, 0 ), /* 651 prop */ - S_ST( 'd', 3, 653, 0 ), /* 652 prop_ */ - S_ST( 'e', 3, 654, 0 ), /* 653 prop_d */ - S_ST( 'l', 3, 655, 0 ), /* 654 prop_de */ - S_ST( 'a', 3, 445, 0 ), /* 655 prop_del */ - S_ST( 't', 3, 657, 650 ), /* 656 pro */ - S_ST( 'o', 3, 658, 0 ), /* 657 prot */ - S_ST( 's', 3, 659, 0 ), /* 658 proto */ - S_ST( 't', 3, 660, 0 ), /* 659 protos */ - S_ST( 'a', 3, 661, 0 ), /* 660 protost */ - S_ST( 't', 3, 388, 0 ), /* 661 protosta */ - S_ST( 'r', 3, 693, 616 ), /* 662 */ - S_ST( 'a', 3, 669, 0 ), /* 663 r */ - S_ST( 'n', 3, 665, 0 ), /* 664 ra */ - S_ST( 'd', 3, 666, 0 ), /* 665 ran */ - S_ST( 'f', 3, 667, 0 ), /* 666 rand */ - S_ST( 'i', 3, 668, 0 ), /* 667 randf */ - S_ST( 'l', 3, 390, 0 ), /* 668 randfi */ - S_ST( 'w', 3, 670, 664 ), /* 669 ra */ - S_ST( 's', 3, 671, 0 ), /* 670 raw */ - S_ST( 't', 3, 672, 0 ), /* 671 raws */ - S_ST( 'a', 3, 673, 0 ), /* 672 rawst */ - S_ST( 't', 3, 391, 0 ), /* 673 rawsta */ - S_ST( 'e', 3, 690, 663 ), /* 674 r */ - S_ST( 'f', 3, 676, 0 ), /* 675 re */ - S_ST( 'i', 3, 392, 0 ), /* 676 ref */ - S_ST( 'q', 3, 678, 675 ), /* 677 re */ - S_ST( 'u', 3, 679, 0 ), /* 678 req */ - S_ST( 'e', 3, 680, 0 ), /* 679 requ */ - S_ST( 's', 3, 681, 0 ), /* 680 reque */ - S_ST( 't', 3, 682, 0 ), /* 681 reques */ - S_ST( 'k', 3, 683, 0 ), /* 682 request */ - S_ST( 'e', 3, 393, 0 ), /* 683 requestk */ - S_ST( 's', 3, 686, 677 ), /* 684 re */ - S_ST( 'e', 3, 394, 0 ), /* 685 res */ - S_ST( 't', 3, 687, 685 ), /* 686 res */ - S_ST( 'r', 3, 688, 0 ), /* 687 rest */ - S_ST( 'i', 3, 689, 0 ), /* 688 restr */ - S_ST( 'c', 3, 395, 0 ), /* 689 restri */ - S_ST( 'v', 3, 691, 684 ), /* 690 re */ - S_ST( 'o', 3, 692, 0 ), /* 691 rev */ - S_ST( 'k', 3, 396, 0 ), /* 692 revo */ - S_ST( 'l', 3, 694, 674 ), /* 693 r */ - S_ST( 'i', 3, 695, 0 ), /* 694 rl */ - S_ST( 'm', 3, 696, 0 ), /* 695 rli */ - S_ST( 'i', 3, 397, 0 ), /* 696 rlim */ - S_ST( 's', 3, 770, 662 ), /* 697 */ - S_ST( 'a', 3, 699, 0 ), /* 698 s */ - S_ST( 'v', 3, 700, 0 ), /* 699 sa */ - S_ST( 'e', 3, 701, 0 ), /* 700 sav */ - S_ST( 'c', 3, 702, 0 ), /* 701 save */ - S_ST( 'o', 3, 703, 0 ), /* 702 savec */ - S_ST( 'n', 3, 704, 0 ), /* 703 saveco */ - S_ST( 'f', 3, 705, 0 ), /* 704 savecon */ - S_ST( 'i', 3, 706, 0 ), /* 705 saveconf */ - S_ST( 'g', 3, 707, 0 ), /* 706 saveconfi */ - S_ST( 'd', 3, 708, 0 ), /* 707 saveconfig */ - S_ST( 'i', 3, 398, 0 ), /* 708 saveconfigd */ - S_ST( 'e', 3, 719, 698 ), /* 709 s */ - S_ST( 'r', 3, 711, 0 ), /* 710 se */ - S_ST( 'v', 3, 712, 0 ), /* 711 ser */ - S_ST( 'e', 3, 399, 0 ), /* 712 serv */ - S_ST( '_', 3, 714, 0 ), /* 713 server */ - S_ST( 'o', 3, 715, 0 ), /* 714 server_ */ - S_ST( 'f', 3, 716, 0 ), /* 715 server_o */ - S_ST( 'f', 3, 717, 0 ), /* 716 server_of */ - S_ST( 's', 3, 718, 0 ), /* 717 server_off */ - S_ST( 'e', 3, 440, 0 ), /* 718 server_offs */ - S_ST( 't', 3, 720, 710 ), /* 719 se */ - S_ST( 'v', 3, 721, 0 ), /* 720 set */ - S_ST( 'a', 3, 400, 0 ), /* 721 setv */ - S_ST( 'i', 3, 723, 709 ), /* 722 s */ - S_ST( 'm', 3, 724, 0 ), /* 723 si */ - S_ST( 'u', 3, 725, 0 ), /* 724 sim */ - S_ST( 'l', 3, 726, 0 ), /* 725 simu */ - S_ST( 'a', 3, 727, 0 ), /* 726 simul */ - S_ST( 't', 3, 728, 0 ), /* 727 simula */ - S_ST( 'i', 3, 729, 437 ), /* 728 simulat */ - S_ST( 'o', 3, 730, 0 ), /* 729 simulati */ - S_ST( 'n', 3, 731, 0 ), /* 730 simulatio */ - S_ST( '_', 3, 732, 0 ), /* 731 simulation */ - S_ST( 'd', 3, 733, 0 ), /* 732 simulation_ */ - S_ST( 'u', 3, 734, 0 ), /* 733 simulation_d */ - S_ST( 'r', 3, 735, 0 ), /* 734 simulation_du */ - S_ST( 'a', 3, 736, 0 ), /* 735 simulation_dur */ - S_ST( 't', 3, 737, 0 ), /* 736 simulation_dura */ - S_ST( 'i', 3, 738, 0 ), /* 737 simulation_durat */ - S_ST( 'o', 3, 439, 0 ), /* 738 simulation_durati */ - S_ST( 'o', 3, 740, 722 ), /* 739 s */ - S_ST( 'u', 3, 741, 0 ), /* 740 so */ - S_ST( 'r', 3, 742, 0 ), /* 741 sou */ - S_ST( 'c', 3, 401, 0 ), /* 742 sour */ - S_ST( 't', 3, 766, 739 ), /* 743 s */ - S_ST( 'a', 3, 750, 0 ), /* 744 st */ - S_ST( 'c', 3, 746, 0 ), /* 745 sta */ - S_ST( 'k', 3, 747, 0 ), /* 746 stac */ - S_ST( 's', 3, 748, 0 ), /* 747 stack */ - S_ST( 'i', 3, 749, 0 ), /* 748 stacks */ - S_ST( 'z', 3, 402, 0 ), /* 749 stacksi */ - S_ST( 't', 3, 404, 745 ), /* 750 sta */ - S_ST( 'i', 3, 752, 0 ), /* 751 stat */ - S_ST( 's', 3, 753, 0 ), /* 752 stati */ - S_ST( 't', 3, 754, 0 ), /* 753 statis */ - S_ST( 'i', 3, 755, 0 ), /* 754 statist */ - S_ST( 'c', 3, 403, 0 ), /* 755 statisti */ - S_ST( 'd', 3, 757, 0 ), /* 756 stats */ - S_ST( 'i', 3, 405, 0 ), /* 757 statsd */ - S_ST( 'e', 3, 406, 744 ), /* 758 st */ - S_ST( 'b', 3, 760, 0 ), /* 759 step */ - S_ST( 'a', 3, 761, 0 ), /* 760 stepb */ - S_ST( 'c', 3, 407, 0 ), /* 761 stepba */ - S_ST( 'f', 3, 763, 759 ), /* 762 step */ - S_ST( 'w', 3, 408, 0 ), /* 763 stepf */ - S_ST( 'o', 3, 765, 762 ), /* 764 step */ - S_ST( 'u', 3, 409, 0 ), /* 765 stepo */ - S_ST( 'r', 3, 767, 758 ), /* 766 st */ - S_ST( 'a', 3, 768, 0 ), /* 767 str */ - S_ST( 't', 3, 769, 0 ), /* 768 stra */ - S_ST( 'u', 3, 410, 0 ), /* 769 strat */ - S_ST( 'y', 3, 412, 743 ), /* 770 s */ - S_ST( 's', 3, 772, 0 ), /* 771 sys */ - S_ST( 't', 3, 773, 0 ), /* 772 syss */ - S_ST( 'a', 3, 774, 0 ), /* 773 sysst */ - S_ST( 't', 3, 413, 0 ), /* 774 syssta */ - S_ST( 't', 3, 801, 697 ), /* 775 */ - S_ST( 'i', 3, 787, 0 ), /* 776 t */ - S_ST( 'c', 3, 414, 0 ), /* 777 ti */ - S_ST( 'm', 3, 780, 777 ), /* 778 ti */ - S_ST( 'e', 3, 417, 0 ), /* 779 tim */ - S_ST( 'i', 3, 781, 779 ), /* 780 tim */ - S_ST( 'n', 3, 782, 0 ), /* 781 timi */ - S_ST( 'g', 3, 783, 0 ), /* 782 timin */ - S_ST( 's', 3, 784, 0 ), /* 783 timing */ - S_ST( 't', 3, 785, 0 ), /* 784 timings */ - S_ST( 'a', 3, 786, 0 ), /* 785 timingst */ - S_ST( 't', 3, 418, 0 ), /* 786 timingsta */ - S_ST( 'n', 3, 788, 778 ), /* 787 ti */ - S_ST( 'k', 3, 789, 0 ), /* 788 tin */ - S_ST( 'e', 3, 419, 0 ), /* 789 tink */ - S_ST( 'o', 3, 420, 776 ), /* 790 t */ - S_ST( 'r', 3, 793, 790 ), /* 791 t */ - S_ST( 'a', 3, 421, 0 ), /* 792 tr */ - S_ST( 'u', 3, 794, 792 ), /* 793 tr */ - S_ST( 's', 3, 795, 422 ), /* 794 tru */ - S_ST( 't', 3, 796, 0 ), /* 795 trus */ - S_ST( 'e', 3, 797, 0 ), /* 796 trust */ - S_ST( 'd', 3, 798, 0 ), /* 797 truste */ - S_ST( 'k', 3, 799, 0 ), /* 798 trusted */ - S_ST( 'e', 3, 423, 0 ), /* 799 trustedk */ - S_ST( 't', 3, 424, 791 ), /* 800 t */ - S_ST( 'y', 3, 802, 800 ), /* 801 t */ - S_ST( 'p', 3, 425, 0 ), /* 802 ty */ - S_ST( 'u', 3, 804, 775 ), /* 803 */ - S_ST( 'n', 3, 810, 0 ), /* 804 u */ - S_ST( 'c', 3, 806, 0 ), /* 805 un */ - S_ST( 'o', 3, 807, 0 ), /* 806 unc */ - S_ST( 'n', 3, 808, 0 ), /* 807 unco */ - S_ST( 'f', 3, 809, 0 ), /* 808 uncon */ - S_ST( 'i', 3, 427, 0 ), /* 809 unconf */ - S_ST( 'p', 3, 811, 805 ), /* 810 un */ - S_ST( 'e', 3, 812, 0 ), /* 811 unp */ - S_ST( 'e', 3, 428, 0 ), /* 812 unpe */ - S_ST( 'v', 3, 814, 803 ), /* 813 */ - S_ST( 'e', 3, 815, 0 ), /* 814 v */ - S_ST( 'r', 3, 816, 0 ), /* 815 ve */ - S_ST( 's', 3, 817, 0 ), /* 816 ver */ - S_ST( 'i', 3, 818, 0 ), /* 817 vers */ - S_ST( 'o', 3, 429, 0 ), /* 818 versi */ - S_ST( 'w', 3, 826, 813 ), /* 819 */ - S_ST( 'a', 3, 821, 0 ), /* 820 w */ - S_ST( 'n', 3, 822, 0 ), /* 821 wa */ - S_ST( 'd', 3, 823, 0 ), /* 822 wan */ - S_ST( 'e', 3, 443, 0 ), /* 823 wand */ - S_ST( 'e', 3, 825, 820 ), /* 824 w */ - S_ST( 'e', 3, 431, 0 ), /* 825 we */ - S_ST( 'i', 3, 827, 824 ), /* 826 w */ - S_ST( 'l', 3, 828, 0 ), /* 827 wi */ - S_ST( 'd', 3, 829, 0 ), /* 828 wil */ - S_ST( 'c', 3, 830, 0 ), /* 829 wild */ - S_ST( 'a', 3, 831, 0 ), /* 830 wildc */ - S_ST( 'r', 3, 432, 0 ), /* 831 wildca */ - S_ST( 'x', 3, 833, 819 ), /* 832 */ - S_ST( 'l', 3, 834, 0 ), /* 833 x */ - S_ST( 'e', 3, 835, 0 ), /* 834 xl */ - S_ST( 'a', 3, 836, 0 ), /* 835 xle */ - S_ST( 'v', 3, 433, 0 ), /* 836 xlea */ - S_ST( 'y', 3, 838, 832 ), /* 837 [initial state] */ - S_ST( 'e', 3, 839, 0 ), /* 838 y */ - S_ST( 'a', 3, 434, 0 ) /* 839 ye */ + S_ST( 'p', 0, 0, 0 ), /* 290 T_Dscp */ + S_ST( '.', 0, 0, 0 ), /* 291 T_Ellipsis */ + S_ST( 'e', 0, 0, 0 ), /* 292 T_Enable */ + S_ST( 'd', 0, 0, 147 ), /* 293 T_End */ + S_ST( 'm', 3, 316, 0 ), /* 294 li */ + S_ST( 'e', 1, 155, 0 ), /* 295 T_File */ + S_ST( 'n', 0, 0, 0 ), /* 296 T_Filegen */ + S_ST( 'm', 0, 0, 0 ), /* 297 T_Filenum */ + S_ST( '1', 0, 0, 0 ), /* 298 T_Flag1 */ + S_ST( '2', 0, 0, 298 ), /* 299 T_Flag2 */ + S_ST( '3', 0, 0, 299 ), /* 300 T_Flag3 */ + S_ST( '4', 0, 0, 300 ), /* 301 T_Flag4 */ + S_ST( 'e', 0, 0, 0 ), /* 302 T_Flake */ + S_ST( 'r', 0, 0, 0 ), /* 303 T_Floor */ + S_ST( 'q', 0, 165, 0 ), /* 304 T_Freq */ + S_ST( 'e', 1, 0, 0 ), /* 305 T_Fudge */ + S_ST( 't', 1, 0, 0 ), /* 306 T_Host */ + S_ST( 'f', 0, 0, 0 ), /* 307 T_Huffpuff */ + S_ST( 't', 0, 0, 0 ), /* 308 T_Iburst */ + S_ST( 't', 1, 0, 0 ), /* 309 T_Ident */ + S_ST( 'e', 0, 0, 0 ), /* 310 T_Ignore */ + S_ST( 'c', 0, 0, 0 ), /* 311 T_Incalloc */ + S_ST( 'm', 0, 0, 0 ), /* 312 T_Incmem */ + S_ST( 'c', 0, 0, 0 ), /* 313 T_Initalloc */ + S_ST( 'm', 0, 0, 0 ), /* 314 T_Initmem */ + S_ST( 'e', 1, 0, 0 ), /* 315 T_Includefile */ + S_ST( 'i', 3, 318, 0 ), /* 316 lim */ + S_ST( 'e', 0, 0, 0 ), /* 317 T_Interface */ + S_ST( 't', 3, 413, 0 ), /* 318 limi */ + S_ST( 'o', 0, 0, 195 ), /* 319 T_Io */ + S_ST( '4', 0, 0, 0 ), /* 320 T_Ipv4 */ + S_ST( '4', 0, 0, 0 ), /* 321 T_Ipv4_flag */ + S_ST( '6', 0, 0, 320 ), /* 322 T_Ipv6 */ + S_ST( '6', 0, 0, 321 ), /* 323 T_Ipv6_flag */ + S_ST( 'l', 0, 0, 0 ), /* 324 T_Kernel */ + S_ST( 'y', 0, 326, 233 ), /* 325 T_Key */ + S_ST( 's', 1, 236, 0 ), /* 326 T_Keys */ + S_ST( 'r', 1, 0, 0 ), /* 327 T_Keysdir */ + S_ST( 'd', 0, 0, 0 ), /* 328 T_Kod */ + S_ST( 'p', 0, 0, 0 ), /* 329 T_Mssntp */ + S_ST( 'e', 1, 0, 0 ), /* 330 T_Leapfile */ + S_ST( 'l', 0, 0, 0 ), /* 331 T_Leapsmearinterval */ + S_ST( 'd', 0, 0, 0 ), /* 332 T_Limited */ + S_ST( 'k', 0, 0, 0 ), /* 333 T_Link */ + S_ST( 'n', 0, 0, 0 ), /* 334 T_Listen */ + S_ST( 'g', 2, 0, 0 ), /* 335 T_Logconfig */ + S_ST( 'e', 1, 0, 0 ), /* 336 T_Logfile */ + S_ST( 's', 0, 0, 0 ), /* 337 T_Loopstats */ + S_ST( 'p', 0, 0, 0 ), /* 338 T_Lowpriotrap */ + S_ST( 't', 1, 0, 0 ), /* 339 T_Manycastclient */ + S_ST( 'r', 2, 0, 0 ), /* 340 T_Manycastserver */ + S_ST( 'k', 0, 0, 0 ), /* 341 T_Mask */ + S_ST( 'e', 0, 0, 0 ), /* 342 T_Maxage */ + S_ST( 'k', 0, 0, 0 ), /* 343 T_Maxclock */ + S_ST( 'h', 0, 0, 0 ), /* 344 T_Maxdepth */ + S_ST( 't', 0, 0, 0 ), /* 345 T_Maxdist */ + S_ST( 'm', 0, 0, 0 ), /* 346 T_Maxmem */ + S_ST( 'l', 0, 0, 0 ), /* 347 T_Maxpoll */ + S_ST( 's', 0, 0, 0 ), /* 348 T_Mdnstries */ + S_ST( 'm', 0, 518, 0 ), /* 349 T_Mem */ + S_ST( 'k', 0, 0, 0 ), /* 350 T_Memlock */ + S_ST( 'k', 0, 0, 0 ), /* 351 T_Minclock */ + S_ST( 'h', 0, 0, 0 ), /* 352 T_Mindepth */ + S_ST( 't', 0, 0, 0 ), /* 353 T_Mindist */ + S_ST( 'm', 0, 0, 0 ), /* 354 T_Minimum */ + S_ST( 'l', 0, 0, 0 ), /* 355 T_Minpoll */ + S_ST( 'e', 0, 0, 0 ), /* 356 T_Minsane */ + S_ST( 'e', 0, 358, 0 ), /* 357 T_Mode */ + S_ST( '7', 0, 0, 0 ), /* 358 T_Mode7 */ + S_ST( 'r', 0, 0, 0 ), /* 359 T_Monitor */ + S_ST( 'h', 0, 0, 0 ), /* 360 T_Month */ + S_ST( 'u', 0, 0, 0 ), /* 361 T_Mru */ + S_ST( 't', 2, 0, 0 ), /* 362 T_Multicastclient */ + S_ST( 'c', 0, 0, 0 ), /* 363 T_Nic */ + S_ST( 'k', 0, 0, 0 ), /* 364 T_Nolink */ + S_ST( 'y', 0, 0, 0 ), /* 365 T_Nomodify */ + S_ST( 't', 0, 0, 0 ), /* 366 T_Nomrulist */ + S_ST( 'e', 0, 0, 0 ), /* 367 T_None */ + S_ST( 'e', 0, 0, 0 ), /* 368 T_Nonvolatile */ + S_ST( 'r', 0, 0, 0 ), /* 369 T_Nopeer */ + S_ST( 'y', 0, 0, 0 ), /* 370 T_Noquery */ + S_ST( 't', 0, 0, 0 ), /* 371 T_Noselect */ + S_ST( 'e', 0, 0, 0 ), /* 372 T_Noserve */ + S_ST( 'p', 0, 0, 0 ), /* 373 T_Notrap */ + S_ST( 't', 0, 0, 0 ), /* 374 T_Notrust */ + S_ST( 'p', 0, 614, 0 ), /* 375 T_Ntp */ + S_ST( 't', 0, 0, 0 ), /* 376 T_Ntpport */ + S_ST( 't', 1, 0, 0 ), /* 377 T_NtpSignDsocket */ + S_ST( 'n', 0, 629, 0 ), /* 378 T_Orphan */ + S_ST( 't', 0, 0, 0 ), /* 379 T_Orphanwait */ + S_ST( 'c', 0, 0, 0 ), /* 380 T_Panic */ + S_ST( 'r', 1, 638, 0 ), /* 381 T_Peer */ + S_ST( 's', 0, 0, 0 ), /* 382 T_Peerstats */ + S_ST( 'e', 2, 0, 0 ), /* 383 T_Phone */ + S_ST( 'd', 0, 646, 0 ), /* 384 T_Pid */ + S_ST( 'e', 1, 0, 0 ), /* 385 T_Pidfile */ + S_ST( 'l', 1, 0, 0 ), /* 386 T_Pool */ + S_ST( 't', 0, 0, 0 ), /* 387 T_Port */ + S_ST( 't', 0, 0, 0 ), /* 388 T_Preempt */ + S_ST( 'r', 0, 0, 0 ), /* 389 T_Prefer */ + S_ST( 's', 0, 0, 0 ), /* 390 T_Protostats */ + S_ST( 'w', 1, 0, 652 ), /* 391 T_Pw */ + S_ST( 'e', 1, 0, 0 ), /* 392 T_Randfile */ + S_ST( 's', 0, 0, 0 ), /* 393 T_Rawstats */ + S_ST( 'd', 1, 0, 0 ), /* 394 T_Refid */ + S_ST( 'y', 0, 0, 0 ), /* 395 T_Requestkey */ + S_ST( 't', 0, 0, 0 ), /* 396 T_Reset */ + S_ST( 't', 0, 0, 0 ), /* 397 T_Restrict */ + S_ST( 'e', 0, 0, 0 ), /* 398 T_Revoke */ + S_ST( 't', 0, 0, 0 ), /* 399 T_Rlimit */ + S_ST( 'r', 1, 0, 0 ), /* 400 T_Saveconfigdir */ + S_ST( 'r', 1, 729, 0 ), /* 401 T_Server */ + S_ST( 'r', 1, 0, 0 ), /* 402 T_Setvar */ + S_ST( 'e', 0, 0, 0 ), /* 403 T_Source */ + S_ST( 'e', 0, 0, 0 ), /* 404 T_Stacksize */ + S_ST( 's', 0, 0, 0 ), /* 405 T_Statistics */ + S_ST( 's', 0, 772, 767 ), /* 406 T_Stats */ + S_ST( 'r', 1, 0, 0 ), /* 407 T_Statsdir */ + S_ST( 'p', 0, 780, 0 ), /* 408 T_Step */ + S_ST( 'k', 0, 0, 0 ), /* 409 T_Stepback */ + S_ST( 'd', 0, 0, 0 ), /* 410 T_Stepfwd */ + S_ST( 't', 0, 0, 0 ), /* 411 T_Stepout */ + S_ST( 'm', 0, 0, 0 ), /* 412 T_Stratum */ + S_ST( 'e', 3, 332, 0 ), /* 413 limit */ + S_ST( 's', 0, 787, 0 ), /* 414 T_Sys */ + S_ST( 's', 0, 0, 0 ), /* 415 T_Sysstats */ + S_ST( 'k', 0, 0, 0 ), /* 416 T_Tick */ + S_ST( '1', 0, 0, 0 ), /* 417 T_Time1 */ + S_ST( '2', 0, 0, 417 ), /* 418 T_Time2 */ + S_ST( 'r', 0, 0, 418 ), /* 419 T_Timer */ + S_ST( 's', 0, 0, 0 ), /* 420 T_Timingstats */ + S_ST( 'r', 0, 0, 0 ), /* 421 T_Tinker */ + S_ST( 's', 0, 0, 0 ), /* 422 T_Tos */ + S_ST( 'p', 1, 0, 0 ), /* 423 T_Trap */ + S_ST( 'e', 0, 0, 0 ), /* 424 T_True */ + S_ST( 'y', 0, 0, 0 ), /* 425 T_Trustedkey */ + S_ST( 'l', 0, 0, 0 ), /* 426 T_Ttl */ + S_ST( 'e', 0, 0, 0 ), /* 427 T_Type */ + S_ST( 'n', 3, 333, 294 ), /* 428 li */ + S_ST( 'g', 1, 0, 0 ), /* 429 T_Unconfig */ + S_ST( 'r', 1, 0, 0 ), /* 430 T_Unpeer */ + S_ST( 'n', 0, 0, 0 ), /* 431 T_Version */ + S_ST( 's', 3, 437, 428 ), /* 432 li */ + S_ST( 'k', 0, 0, 0 ), /* 433 T_Week */ + S_ST( 'd', 0, 0, 0 ), /* 434 T_Wildcard */ + S_ST( 'e', 0, 0, 0 ), /* 435 T_Xleave */ + S_ST( 'r', 0, 0, 0 ), /* 436 T_Year */ + S_ST( 't', 3, 438, 0 ), /* 437 lis */ + S_ST( 'e', 3, 334, 0 ), /* 438 list */ + S_ST( 'e', 0, 0, 0 ), /* 439 T_Simulate */ + S_ST( 'y', 0, 0, 0 ), /* 440 T_Beep_Delay */ + S_ST( 'n', 0, 0, 0 ), /* 441 T_Sim_Duration */ + S_ST( 't', 0, 0, 0 ), /* 442 T_Server_Offset */ + S_ST( 'n', 0, 0, 0 ), /* 443 T_Duration */ + S_ST( 't', 0, 0, 0 ), /* 444 T_Freq_Offset */ + S_ST( 'r', 0, 0, 0 ), /* 445 T_Wander */ + S_ST( 'r', 0, 0, 0 ), /* 446 T_Jitter */ + S_ST( 'y', 0, 0, 0 ), /* 447 T_Prop_Delay */ + S_ST( 'y', 0, 0, 0 ), /* 448 T_Proc_Delay */ + S_ST( 'o', 3, 465, 287 ), /* 449 l */ + S_ST( 'g', 3, 456, 0 ), /* 450 lo */ + S_ST( 'c', 3, 452, 0 ), /* 451 log */ + S_ST( 'o', 3, 453, 0 ), /* 452 logc */ + S_ST( 'n', 3, 454, 0 ), /* 453 logco */ + S_ST( 'f', 3, 455, 0 ), /* 454 logcon */ + S_ST( 'i', 3, 335, 0 ), /* 455 logconf */ + S_ST( 'f', 3, 457, 451 ), /* 456 log */ + S_ST( 'i', 3, 458, 0 ), /* 457 logf */ + S_ST( 'l', 3, 336, 0 ), /* 458 logfi */ + S_ST( 'o', 3, 460, 450 ), /* 459 lo */ + S_ST( 'p', 3, 461, 0 ), /* 460 loo */ + S_ST( 's', 3, 462, 0 ), /* 461 loop */ + S_ST( 't', 3, 463, 0 ), /* 462 loops */ + S_ST( 'a', 3, 464, 0 ), /* 463 loopst */ + S_ST( 't', 3, 337, 0 ), /* 464 loopsta */ + S_ST( 'w', 3, 466, 459 ), /* 465 lo */ + S_ST( 'p', 3, 467, 0 ), /* 466 low */ + S_ST( 'r', 3, 468, 0 ), /* 467 lowp */ + S_ST( 'i', 3, 469, 0 ), /* 468 lowpr */ + S_ST( 'o', 3, 470, 0 ), /* 469 lowpri */ + S_ST( 't', 3, 471, 0 ), /* 470 lowprio */ + S_ST( 'r', 3, 472, 0 ), /* 471 lowpriot */ + S_ST( 'a', 3, 338, 0 ), /* 472 lowpriotr */ + S_ST( 'm', 3, 554, 239 ), /* 473 */ + S_ST( 'a', 3, 492, 0 ), /* 474 m */ + S_ST( 'n', 3, 476, 0 ), /* 475 ma */ + S_ST( 'y', 3, 477, 0 ), /* 476 man */ + S_ST( 'c', 3, 478, 0 ), /* 477 many */ + S_ST( 'a', 3, 479, 0 ), /* 478 manyc */ + S_ST( 's', 3, 480, 0 ), /* 479 manyca */ + S_ST( 't', 3, 486, 0 ), /* 480 manycas */ + S_ST( 'c', 3, 482, 0 ), /* 481 manycast */ + S_ST( 'l', 3, 483, 0 ), /* 482 manycastc */ + S_ST( 'i', 3, 484, 0 ), /* 483 manycastcl */ + S_ST( 'e', 3, 485, 0 ), /* 484 manycastcli */ + S_ST( 'n', 3, 339, 0 ), /* 485 manycastclie */ + S_ST( 's', 3, 487, 481 ), /* 486 manycast */ + S_ST( 'e', 3, 488, 0 ), /* 487 manycasts */ + S_ST( 'r', 3, 489, 0 ), /* 488 manycastse */ + S_ST( 'v', 3, 490, 0 ), /* 489 manycastser */ + S_ST( 'e', 3, 340, 0 ), /* 490 manycastserv */ + S_ST( 's', 3, 341, 475 ), /* 491 ma */ + S_ST( 'x', 3, 507, 491 ), /* 492 ma */ + S_ST( 'a', 3, 494, 0 ), /* 493 max */ + S_ST( 'g', 3, 342, 0 ), /* 494 maxa */ + S_ST( 'c', 3, 496, 493 ), /* 495 max */ + S_ST( 'l', 3, 497, 0 ), /* 496 maxc */ + S_ST( 'o', 3, 498, 0 ), /* 497 maxcl */ + S_ST( 'c', 3, 343, 0 ), /* 498 maxclo */ + S_ST( 'd', 3, 503, 495 ), /* 499 max */ + S_ST( 'e', 3, 501, 0 ), /* 500 maxd */ + S_ST( 'p', 3, 502, 0 ), /* 501 maxde */ + S_ST( 't', 3, 344, 0 ), /* 502 maxdep */ + S_ST( 'i', 3, 504, 500 ), /* 503 maxd */ + S_ST( 's', 3, 345, 0 ), /* 504 maxdi */ + S_ST( 'm', 3, 506, 499 ), /* 505 max */ + S_ST( 'e', 3, 346, 0 ), /* 506 maxm */ + S_ST( 'p', 3, 508, 505 ), /* 507 max */ + S_ST( 'o', 3, 509, 0 ), /* 508 maxp */ + S_ST( 'l', 3, 347, 0 ), /* 509 maxpo */ + S_ST( 'd', 3, 511, 474 ), /* 510 m */ + S_ST( 'n', 3, 512, 0 ), /* 511 md */ + S_ST( 's', 3, 513, 0 ), /* 512 mdn */ + S_ST( 't', 3, 514, 0 ), /* 513 mdns */ + S_ST( 'r', 3, 515, 0 ), /* 514 mdnst */ + S_ST( 'i', 3, 516, 0 ), /* 515 mdnstr */ + S_ST( 'e', 3, 348, 0 ), /* 516 mdnstri */ + S_ST( 'e', 3, 349, 510 ), /* 517 m */ + S_ST( 'l', 3, 519, 0 ), /* 518 mem */ + S_ST( 'o', 3, 520, 0 ), /* 519 meml */ + S_ST( 'c', 3, 350, 0 ), /* 520 memlo */ + S_ST( 'i', 3, 522, 517 ), /* 521 m */ + S_ST( 'n', 3, 539, 0 ), /* 522 mi */ + S_ST( 'c', 3, 524, 0 ), /* 523 min */ + S_ST( 'l', 3, 525, 0 ), /* 524 minc */ + S_ST( 'o', 3, 526, 0 ), /* 525 mincl */ + S_ST( 'c', 3, 351, 0 ), /* 526 minclo */ + S_ST( 'd', 3, 531, 523 ), /* 527 min */ + S_ST( 'e', 3, 529, 0 ), /* 528 mind */ + S_ST( 'p', 3, 530, 0 ), /* 529 minde */ + S_ST( 't', 3, 352, 0 ), /* 530 mindep */ + S_ST( 'i', 3, 532, 528 ), /* 531 mind */ + S_ST( 's', 3, 353, 0 ), /* 532 mindi */ + S_ST( 'i', 3, 534, 527 ), /* 533 min */ + S_ST( 'm', 3, 535, 0 ), /* 534 mini */ + S_ST( 'u', 3, 354, 0 ), /* 535 minim */ + S_ST( 'p', 3, 537, 533 ), /* 536 min */ + S_ST( 'o', 3, 538, 0 ), /* 537 minp */ + S_ST( 'l', 3, 355, 0 ), /* 538 minpo */ + S_ST( 's', 3, 540, 536 ), /* 539 min */ + S_ST( 'a', 3, 541, 0 ), /* 540 mins */ + S_ST( 'n', 3, 356, 0 ), /* 541 minsa */ + S_ST( 'o', 3, 544, 521 ), /* 542 m */ + S_ST( 'd', 3, 357, 0 ), /* 543 mo */ + S_ST( 'n', 3, 548, 543 ), /* 544 mo */ + S_ST( 'i', 3, 546, 0 ), /* 545 mon */ + S_ST( 't', 3, 547, 0 ), /* 546 moni */ + S_ST( 'o', 3, 359, 0 ), /* 547 monit */ + S_ST( 't', 3, 360, 545 ), /* 548 mon */ + S_ST( 'r', 3, 361, 542 ), /* 549 m */ + S_ST( 's', 3, 551, 549 ), /* 550 m */ + S_ST( 's', 3, 552, 0 ), /* 551 ms */ + S_ST( 'n', 3, 553, 0 ), /* 552 mss */ + S_ST( 't', 3, 329, 0 ), /* 553 mssn */ + S_ST( 'u', 3, 555, 550 ), /* 554 m */ + S_ST( 'l', 3, 556, 0 ), /* 555 mu */ + S_ST( 't', 3, 557, 0 ), /* 556 mul */ + S_ST( 'i', 3, 558, 0 ), /* 557 mult */ + S_ST( 'c', 3, 559, 0 ), /* 558 multi */ + S_ST( 'a', 3, 560, 0 ), /* 559 multic */ + S_ST( 's', 3, 561, 0 ), /* 560 multica */ + S_ST( 't', 3, 562, 0 ), /* 561 multicas */ + S_ST( 'c', 3, 563, 0 ), /* 562 multicast */ + S_ST( 'l', 3, 564, 0 ), /* 563 multicastc */ + S_ST( 'i', 3, 565, 0 ), /* 564 multicastcl */ + S_ST( 'e', 3, 566, 0 ), /* 565 multicastcli */ + S_ST( 'n', 3, 362, 0 ), /* 566 multicastclie */ + S_ST( 'n', 3, 610, 473 ), /* 567 */ + S_ST( 'i', 3, 363, 0 ), /* 568 n */ + S_ST( 'o', 3, 605, 568 ), /* 569 n */ + S_ST( 'l', 3, 571, 0 ), /* 570 no */ + S_ST( 'i', 3, 572, 0 ), /* 571 nol */ + S_ST( 'n', 3, 364, 0 ), /* 572 noli */ + S_ST( 'm', 3, 578, 570 ), /* 573 no */ + S_ST( 'o', 3, 575, 0 ), /* 574 nom */ + S_ST( 'd', 3, 576, 0 ), /* 575 nomo */ + S_ST( 'i', 3, 577, 0 ), /* 576 nomod */ + S_ST( 'f', 3, 365, 0 ), /* 577 nomodi */ + S_ST( 'r', 3, 579, 574 ), /* 578 nom */ + S_ST( 'u', 3, 580, 0 ), /* 579 nomr */ + S_ST( 'l', 3, 581, 0 ), /* 580 nomru */ + S_ST( 'i', 3, 582, 0 ), /* 581 nomrul */ + S_ST( 's', 3, 366, 0 ), /* 582 nomruli */ + S_ST( 'n', 3, 584, 573 ), /* 583 no */ + S_ST( 'v', 3, 585, 367 ), /* 584 non */ + S_ST( 'o', 3, 586, 0 ), /* 585 nonv */ + S_ST( 'l', 3, 587, 0 ), /* 586 nonvo */ + S_ST( 'a', 3, 588, 0 ), /* 587 nonvol */ + S_ST( 't', 3, 589, 0 ), /* 588 nonvola */ + S_ST( 'i', 3, 590, 0 ), /* 589 nonvolat */ + S_ST( 'l', 3, 368, 0 ), /* 590 nonvolati */ + S_ST( 'p', 3, 592, 583 ), /* 591 no */ + S_ST( 'e', 3, 593, 0 ), /* 592 nop */ + S_ST( 'e', 3, 369, 0 ), /* 593 nope */ + S_ST( 'q', 3, 595, 591 ), /* 594 no */ + S_ST( 'u', 3, 596, 0 ), /* 595 noq */ + S_ST( 'e', 3, 597, 0 ), /* 596 noqu */ + S_ST( 'r', 3, 370, 0 ), /* 597 noque */ + S_ST( 's', 3, 599, 594 ), /* 598 no */ + S_ST( 'e', 3, 603, 0 ), /* 599 nos */ + S_ST( 'l', 3, 601, 0 ), /* 600 nose */ + S_ST( 'e', 3, 602, 0 ), /* 601 nosel */ + S_ST( 'c', 3, 371, 0 ), /* 602 nosele */ + S_ST( 'r', 3, 604, 600 ), /* 603 nose */ + S_ST( 'v', 3, 372, 0 ), /* 604 noser */ + S_ST( 't', 3, 606, 598 ), /* 605 no */ + S_ST( 'r', 3, 608, 0 ), /* 606 not */ + S_ST( 'a', 3, 373, 0 ), /* 607 notr */ + S_ST( 'u', 3, 609, 607 ), /* 608 notr */ + S_ST( 's', 3, 374, 0 ), /* 609 notru */ + S_ST( 't', 3, 375, 569 ), /* 610 n */ + S_ST( 'p', 3, 612, 0 ), /* 611 ntp */ + S_ST( 'o', 3, 613, 0 ), /* 612 ntpp */ + S_ST( 'r', 3, 376, 0 ), /* 613 ntppo */ + S_ST( 's', 3, 615, 611 ), /* 614 ntp */ + S_ST( 'i', 3, 616, 0 ), /* 615 ntps */ + S_ST( 'g', 3, 617, 0 ), /* 616 ntpsi */ + S_ST( 'n', 3, 618, 0 ), /* 617 ntpsig */ + S_ST( 'd', 3, 619, 0 ), /* 618 ntpsign */ + S_ST( 's', 3, 620, 0 ), /* 619 ntpsignd */ + S_ST( 'o', 3, 621, 0 ), /* 620 ntpsignds */ + S_ST( 'c', 3, 622, 0 ), /* 621 ntpsigndso */ + S_ST( 'k', 3, 623, 0 ), /* 622 ntpsigndsoc */ + S_ST( 'e', 3, 377, 0 ), /* 623 ntpsigndsock */ + S_ST( 'o', 3, 625, 567 ), /* 624 */ + S_ST( 'r', 3, 626, 0 ), /* 625 o */ + S_ST( 'p', 3, 627, 0 ), /* 626 or */ + S_ST( 'h', 3, 628, 0 ), /* 627 orp */ + S_ST( 'a', 3, 378, 0 ), /* 628 orph */ + S_ST( 'w', 3, 630, 0 ), /* 629 orphan */ + S_ST( 'a', 3, 631, 0 ), /* 630 orphanw */ + S_ST( 'i', 3, 379, 0 ), /* 631 orphanwa */ + S_ST( 'p', 3, 391, 624 ), /* 632 */ + S_ST( 'a', 3, 634, 0 ), /* 633 p */ + S_ST( 'n', 3, 635, 0 ), /* 634 pa */ + S_ST( 'i', 3, 380, 0 ), /* 635 pan */ + S_ST( 'e', 3, 637, 633 ), /* 636 p */ + S_ST( 'e', 3, 381, 0 ), /* 637 pe */ + S_ST( 's', 3, 639, 0 ), /* 638 peer */ + S_ST( 't', 3, 640, 0 ), /* 639 peers */ + S_ST( 'a', 3, 641, 0 ), /* 640 peerst */ + S_ST( 't', 3, 382, 0 ), /* 641 peersta */ + S_ST( 'h', 3, 643, 636 ), /* 642 p */ + S_ST( 'o', 3, 644, 0 ), /* 643 ph */ + S_ST( 'n', 3, 383, 0 ), /* 644 pho */ + S_ST( 'i', 3, 384, 642 ), /* 645 p */ + S_ST( 'f', 3, 647, 0 ), /* 646 pid */ + S_ST( 'i', 3, 648, 0 ), /* 647 pidf */ + S_ST( 'l', 3, 385, 0 ), /* 648 pidfi */ + S_ST( 'o', 3, 651, 645 ), /* 649 p */ + S_ST( 'o', 3, 386, 0 ), /* 650 po */ + S_ST( 'r', 3, 387, 650 ), /* 651 po */ + S_ST( 'r', 3, 659, 649 ), /* 652 p */ + S_ST( 'e', 3, 657, 0 ), /* 653 pr */ + S_ST( 'e', 3, 655, 0 ), /* 654 pre */ + S_ST( 'm', 3, 656, 0 ), /* 655 pree */ + S_ST( 'p', 3, 388, 0 ), /* 656 preem */ + S_ST( 'f', 3, 658, 654 ), /* 657 pre */ + S_ST( 'e', 3, 389, 0 ), /* 658 pref */ + S_ST( 'o', 3, 672, 653 ), /* 659 pr */ + S_ST( 'c', 3, 661, 0 ), /* 660 pro */ + S_ST( '_', 3, 662, 0 ), /* 661 proc */ + S_ST( 'd', 3, 663, 0 ), /* 662 proc_ */ + S_ST( 'e', 3, 664, 0 ), /* 663 proc_d */ + S_ST( 'l', 3, 665, 0 ), /* 664 proc_de */ + S_ST( 'a', 3, 448, 0 ), /* 665 proc_del */ + S_ST( 'p', 3, 667, 660 ), /* 666 pro */ + S_ST( '_', 3, 668, 0 ), /* 667 prop */ + S_ST( 'd', 3, 669, 0 ), /* 668 prop_ */ + S_ST( 'e', 3, 670, 0 ), /* 669 prop_d */ + S_ST( 'l', 3, 671, 0 ), /* 670 prop_de */ + S_ST( 'a', 3, 447, 0 ), /* 671 prop_del */ + S_ST( 't', 3, 673, 666 ), /* 672 pro */ + S_ST( 'o', 3, 674, 0 ), /* 673 prot */ + S_ST( 's', 3, 675, 0 ), /* 674 proto */ + S_ST( 't', 3, 676, 0 ), /* 675 protos */ + S_ST( 'a', 3, 677, 0 ), /* 676 protost */ + S_ST( 't', 3, 390, 0 ), /* 677 protosta */ + S_ST( 'r', 3, 709, 632 ), /* 678 */ + S_ST( 'a', 3, 685, 0 ), /* 679 r */ + S_ST( 'n', 3, 681, 0 ), /* 680 ra */ + S_ST( 'd', 3, 682, 0 ), /* 681 ran */ + S_ST( 'f', 3, 683, 0 ), /* 682 rand */ + S_ST( 'i', 3, 684, 0 ), /* 683 randf */ + S_ST( 'l', 3, 392, 0 ), /* 684 randfi */ + S_ST( 'w', 3, 686, 680 ), /* 685 ra */ + S_ST( 's', 3, 687, 0 ), /* 686 raw */ + S_ST( 't', 3, 688, 0 ), /* 687 raws */ + S_ST( 'a', 3, 689, 0 ), /* 688 rawst */ + S_ST( 't', 3, 393, 0 ), /* 689 rawsta */ + S_ST( 'e', 3, 706, 679 ), /* 690 r */ + S_ST( 'f', 3, 692, 0 ), /* 691 re */ + S_ST( 'i', 3, 394, 0 ), /* 692 ref */ + S_ST( 'q', 3, 694, 691 ), /* 693 re */ + S_ST( 'u', 3, 695, 0 ), /* 694 req */ + S_ST( 'e', 3, 696, 0 ), /* 695 requ */ + S_ST( 's', 3, 697, 0 ), /* 696 reque */ + S_ST( 't', 3, 698, 0 ), /* 697 reques */ + S_ST( 'k', 3, 699, 0 ), /* 698 request */ + S_ST( 'e', 3, 395, 0 ), /* 699 requestk */ + S_ST( 's', 3, 702, 693 ), /* 700 re */ + S_ST( 'e', 3, 396, 0 ), /* 701 res */ + S_ST( 't', 3, 703, 701 ), /* 702 res */ + S_ST( 'r', 3, 704, 0 ), /* 703 rest */ + S_ST( 'i', 3, 705, 0 ), /* 704 restr */ + S_ST( 'c', 3, 397, 0 ), /* 705 restri */ + S_ST( 'v', 3, 707, 700 ), /* 706 re */ + S_ST( 'o', 3, 708, 0 ), /* 707 rev */ + S_ST( 'k', 3, 398, 0 ), /* 708 revo */ + S_ST( 'l', 3, 710, 690 ), /* 709 r */ + S_ST( 'i', 3, 711, 0 ), /* 710 rl */ + S_ST( 'm', 3, 712, 0 ), /* 711 rli */ + S_ST( 'i', 3, 399, 0 ), /* 712 rlim */ + S_ST( 's', 3, 786, 678 ), /* 713 */ + S_ST( 'a', 3, 715, 0 ), /* 714 s */ + S_ST( 'v', 3, 716, 0 ), /* 715 sa */ + S_ST( 'e', 3, 717, 0 ), /* 716 sav */ + S_ST( 'c', 3, 718, 0 ), /* 717 save */ + S_ST( 'o', 3, 719, 0 ), /* 718 savec */ + S_ST( 'n', 3, 720, 0 ), /* 719 saveco */ + S_ST( 'f', 3, 721, 0 ), /* 720 savecon */ + S_ST( 'i', 3, 722, 0 ), /* 721 saveconf */ + S_ST( 'g', 3, 723, 0 ), /* 722 saveconfi */ + S_ST( 'd', 3, 724, 0 ), /* 723 saveconfig */ + S_ST( 'i', 3, 400, 0 ), /* 724 saveconfigd */ + S_ST( 'e', 3, 735, 714 ), /* 725 s */ + S_ST( 'r', 3, 727, 0 ), /* 726 se */ + S_ST( 'v', 3, 728, 0 ), /* 727 ser */ + S_ST( 'e', 3, 401, 0 ), /* 728 serv */ + S_ST( '_', 3, 730, 0 ), /* 729 server */ + S_ST( 'o', 3, 731, 0 ), /* 730 server_ */ + S_ST( 'f', 3, 732, 0 ), /* 731 server_o */ + S_ST( 'f', 3, 733, 0 ), /* 732 server_of */ + S_ST( 's', 3, 734, 0 ), /* 733 server_off */ + S_ST( 'e', 3, 442, 0 ), /* 734 server_offs */ + S_ST( 't', 3, 736, 726 ), /* 735 se */ + S_ST( 'v', 3, 737, 0 ), /* 736 set */ + S_ST( 'a', 3, 402, 0 ), /* 737 setv */ + S_ST( 'i', 3, 739, 725 ), /* 738 s */ + S_ST( 'm', 3, 740, 0 ), /* 739 si */ + S_ST( 'u', 3, 741, 0 ), /* 740 sim */ + S_ST( 'l', 3, 742, 0 ), /* 741 simu */ + S_ST( 'a', 3, 743, 0 ), /* 742 simul */ + S_ST( 't', 3, 744, 0 ), /* 743 simula */ + S_ST( 'i', 3, 745, 439 ), /* 744 simulat */ + S_ST( 'o', 3, 746, 0 ), /* 745 simulati */ + S_ST( 'n', 3, 747, 0 ), /* 746 simulatio */ + S_ST( '_', 3, 748, 0 ), /* 747 simulation */ + S_ST( 'd', 3, 749, 0 ), /* 748 simulation_ */ + S_ST( 'u', 3, 750, 0 ), /* 749 simulation_d */ + S_ST( 'r', 3, 751, 0 ), /* 750 simulation_du */ + S_ST( 'a', 3, 752, 0 ), /* 751 simulation_dur */ + S_ST( 't', 3, 753, 0 ), /* 752 simulation_dura */ + S_ST( 'i', 3, 754, 0 ), /* 753 simulation_durat */ + S_ST( 'o', 3, 441, 0 ), /* 754 simulation_durati */ + S_ST( 'o', 3, 756, 738 ), /* 755 s */ + S_ST( 'u', 3, 757, 0 ), /* 756 so */ + S_ST( 'r', 3, 758, 0 ), /* 757 sou */ + S_ST( 'c', 3, 403, 0 ), /* 758 sour */ + S_ST( 't', 3, 782, 755 ), /* 759 s */ + S_ST( 'a', 3, 766, 0 ), /* 760 st */ + S_ST( 'c', 3, 762, 0 ), /* 761 sta */ + S_ST( 'k', 3, 763, 0 ), /* 762 stac */ + S_ST( 's', 3, 764, 0 ), /* 763 stack */ + S_ST( 'i', 3, 765, 0 ), /* 764 stacks */ + S_ST( 'z', 3, 404, 0 ), /* 765 stacksi */ + S_ST( 't', 3, 406, 761 ), /* 766 sta */ + S_ST( 'i', 3, 768, 0 ), /* 767 stat */ + S_ST( 's', 3, 769, 0 ), /* 768 stati */ + S_ST( 't', 3, 770, 0 ), /* 769 statis */ + S_ST( 'i', 3, 771, 0 ), /* 770 statist */ + S_ST( 'c', 3, 405, 0 ), /* 771 statisti */ + S_ST( 'd', 3, 773, 0 ), /* 772 stats */ + S_ST( 'i', 3, 407, 0 ), /* 773 statsd */ + S_ST( 'e', 3, 408, 760 ), /* 774 st */ + S_ST( 'b', 3, 776, 0 ), /* 775 step */ + S_ST( 'a', 3, 777, 0 ), /* 776 stepb */ + S_ST( 'c', 3, 409, 0 ), /* 777 stepba */ + S_ST( 'f', 3, 779, 775 ), /* 778 step */ + S_ST( 'w', 3, 410, 0 ), /* 779 stepf */ + S_ST( 'o', 3, 781, 778 ), /* 780 step */ + S_ST( 'u', 3, 411, 0 ), /* 781 stepo */ + S_ST( 'r', 3, 783, 774 ), /* 782 st */ + S_ST( 'a', 3, 784, 0 ), /* 783 str */ + S_ST( 't', 3, 785, 0 ), /* 784 stra */ + S_ST( 'u', 3, 412, 0 ), /* 785 strat */ + S_ST( 'y', 3, 414, 759 ), /* 786 s */ + S_ST( 's', 3, 788, 0 ), /* 787 sys */ + S_ST( 't', 3, 789, 0 ), /* 788 syss */ + S_ST( 'a', 3, 790, 0 ), /* 789 sysst */ + S_ST( 't', 3, 415, 0 ), /* 790 syssta */ + S_ST( 't', 3, 817, 713 ), /* 791 */ + S_ST( 'i', 3, 803, 0 ), /* 792 t */ + S_ST( 'c', 3, 416, 0 ), /* 793 ti */ + S_ST( 'm', 3, 796, 793 ), /* 794 ti */ + S_ST( 'e', 3, 419, 0 ), /* 795 tim */ + S_ST( 'i', 3, 797, 795 ), /* 796 tim */ + S_ST( 'n', 3, 798, 0 ), /* 797 timi */ + S_ST( 'g', 3, 799, 0 ), /* 798 timin */ + S_ST( 's', 3, 800, 0 ), /* 799 timing */ + S_ST( 't', 3, 801, 0 ), /* 800 timings */ + S_ST( 'a', 3, 802, 0 ), /* 801 timingst */ + S_ST( 't', 3, 420, 0 ), /* 802 timingsta */ + S_ST( 'n', 3, 804, 794 ), /* 803 ti */ + S_ST( 'k', 3, 805, 0 ), /* 804 tin */ + S_ST( 'e', 3, 421, 0 ), /* 805 tink */ + S_ST( 'o', 3, 422, 792 ), /* 806 t */ + S_ST( 'r', 3, 809, 806 ), /* 807 t */ + S_ST( 'a', 3, 423, 0 ), /* 808 tr */ + S_ST( 'u', 3, 810, 808 ), /* 809 tr */ + S_ST( 's', 3, 811, 424 ), /* 810 tru */ + S_ST( 't', 3, 812, 0 ), /* 811 trus */ + S_ST( 'e', 3, 813, 0 ), /* 812 trust */ + S_ST( 'd', 3, 814, 0 ), /* 813 truste */ + S_ST( 'k', 3, 815, 0 ), /* 814 trusted */ + S_ST( 'e', 3, 425, 0 ), /* 815 trustedk */ + S_ST( 't', 3, 426, 807 ), /* 816 t */ + S_ST( 'y', 3, 818, 816 ), /* 817 t */ + S_ST( 'p', 3, 427, 0 ), /* 818 ty */ + S_ST( 'u', 3, 820, 791 ), /* 819 */ + S_ST( 'n', 3, 826, 0 ), /* 820 u */ + S_ST( 'c', 3, 822, 0 ), /* 821 un */ + S_ST( 'o', 3, 823, 0 ), /* 822 unc */ + S_ST( 'n', 3, 824, 0 ), /* 823 unco */ + S_ST( 'f', 3, 825, 0 ), /* 824 uncon */ + S_ST( 'i', 3, 429, 0 ), /* 825 unconf */ + S_ST( 'p', 3, 827, 821 ), /* 826 un */ + S_ST( 'e', 3, 828, 0 ), /* 827 unp */ + S_ST( 'e', 3, 430, 0 ), /* 828 unpe */ + S_ST( 'v', 3, 830, 819 ), /* 829 */ + S_ST( 'e', 3, 831, 0 ), /* 830 v */ + S_ST( 'r', 3, 832, 0 ), /* 831 ve */ + S_ST( 's', 3, 833, 0 ), /* 832 ver */ + S_ST( 'i', 3, 834, 0 ), /* 833 vers */ + S_ST( 'o', 3, 431, 0 ), /* 834 versi */ + S_ST( 'w', 3, 842, 829 ), /* 835 */ + S_ST( 'a', 3, 837, 0 ), /* 836 w */ + S_ST( 'n', 3, 838, 0 ), /* 837 wa */ + S_ST( 'd', 3, 839, 0 ), /* 838 wan */ + S_ST( 'e', 3, 445, 0 ), /* 839 wand */ + S_ST( 'e', 3, 841, 836 ), /* 840 w */ + S_ST( 'e', 3, 433, 0 ), /* 841 we */ + S_ST( 'i', 3, 843, 840 ), /* 842 w */ + S_ST( 'l', 3, 844, 0 ), /* 843 wi */ + S_ST( 'd', 3, 845, 0 ), /* 844 wil */ + S_ST( 'c', 3, 846, 0 ), /* 845 wild */ + S_ST( 'a', 3, 847, 0 ), /* 846 wildc */ + S_ST( 'r', 3, 434, 0 ), /* 847 wildca */ + S_ST( 'x', 3, 849, 835 ), /* 848 */ + S_ST( 'l', 3, 850, 0 ), /* 849 x */ + S_ST( 'e', 3, 851, 0 ), /* 850 xl */ + S_ST( 'a', 3, 852, 0 ), /* 851 xle */ + S_ST( 'v', 3, 435, 0 ), /* 852 xlea */ + S_ST( 'y', 3, 854, 848 ), /* 853 [initial state] */ + S_ST( 'e', 3, 855, 0 ), /* 854 y */ + S_ST( 'a', 3, 436, 0 ) /* 855 ye */ }; diff --git a/contrib/ntp/ntpd/ntp_leapsec.c b/contrib/ntp/ntpd/ntp_leapsec.c index eeef89f3c648..7a652f5cf6b9 100644 --- a/contrib/ntp/ntpd/ntp_leapsec.c +++ b/contrib/ntp/ntpd/ntp_leapsec.c @@ -89,11 +89,13 @@ static char * get_line(leapsec_reader, void*, char*, size_t); static char * skipws(const char*); static int parsefail(const char * cp, const char * ep); static void reload_limits(leap_table_t*, const vint64*); +static void fetch_leap_era(leap_era_t*, const leap_table_t*, + const vint64*); static int betweenu32(uint32_t, uint32_t, uint32_t); static void reset_times(leap_table_t*); static int leapsec_add(leap_table_t*, const vint64*, int); static int leapsec_raw(leap_table_t*, const vint64 *, int, int); -static char * lstostr(const vint64 * ts); +static const char * lstostr(const vint64 * ts); /* ===================================================================== * Get & Set the current leap table @@ -107,8 +109,17 @@ leapsec_get_table( leap_table_t *p1, *p2; p1 = _lptr; - p1 = &_ltab[p1 == &_ltab[1]]; - p2 = &_ltab[p1 == &_ltab[0]]; + if (p1 == &_ltab[0]) { + p2 = &_ltab[1]; + } else if (p1 == &_ltab[1]) { + p2 = &_ltab[0]; + } else { + p1 = &_ltab[0]; + p2 = &_ltab[1]; + reset_times(p1); + reset_times(p2); + _lptr = p1; + } if (alternate) { memcpy(p2, p1, sizeof(leap_table_t)); p1 = p2; @@ -178,10 +189,15 @@ leapsec_load( struct calendar build; leapsec_clear(pt); - if (use_build_limit && ntpcal_get_build_date(&build)) + if (use_build_limit && ntpcal_get_build_date(&build)) { + /* don't prune everything -- permit the last 10yrs + * before build. + */ + build.year -= 10; limit = ntpcal_date_to_ntp64(&build); - else + } else { memset(&limit, 0, sizeof(limit)); + } while (get_line(func, farg, linebuf, sizeof(linebuf))) { cp = linebuf; @@ -198,7 +214,7 @@ leapsec_load( pt->head.update = strtouv64(cp, &ep, 10); if (parsefail(cp, ep)) goto fail_read; - } + } } else if (isdigit((u_char)*cp)) { ttime = strtouv64(cp, &ep, 10); if (parsefail(cp, ep)) @@ -288,7 +304,7 @@ leapsec_query( * leap era frame. */ reload_limits(pt, &ts64); - } else if (ucmpv64(&ts64, &pt->head.dtime) >= 0) { + } else if (ucmpv64(&ts64, &pt->head.dtime) >= 0) { /* Boundary crossed in forward direction. This might * indicate a leap transition, so we prepare for that * case. @@ -296,32 +312,47 @@ leapsec_query( * Some operations below are actually NOPs in electric * mode, but having only one code path that works for * both modes is easier to maintain. + * + * There's another quirk we must keep looking out for: + * If we just stepped the clock, the step might have + * crossed a leap boundary. As with backward steps, we + * do not want to raise the 'fired' event in that case. + * So we raise the 'fired' event only if we're close to + * the transition and just reload the limits otherwise. */ - last = pt->head.ttime; - qr->warped = (int16_t)(last.D_s.lo - - pt->head.dtime.D_s.lo); - next = addv64i32(&ts64, qr->warped); - reload_limits(pt, &next); - fired = ucmpv64(&pt->head.ebase, &last) == 0; - if (fired) { - ts64 = next; - ts32 = next.D_s.lo; + last = addv64i32(&pt->head.dtime, 3); /* get boundary */ + if (ucmpv64(&ts64, &last) >= 0) { + /* that was likely a query after a step */ + reload_limits(pt, &ts64); } else { - qr->warped = 0; + /* close enough for deeper examination */ + last = pt->head.ttime; + qr->warped = (int16_t)(last.D_s.lo - + pt->head.dtime.D_s.lo); + next = addv64i32(&ts64, qr->warped); + reload_limits(pt, &next); + fired = ucmpv64(&pt->head.ebase, &last) == 0; + if (fired) { + ts64 = next; + ts32 = next.D_s.lo; + } else { + qr->warped = 0; + } } } qr->tai_offs = pt->head.this_tai; + qr->ebase = pt->head.ebase; + qr->ttime = pt->head.ttime; /* If before the next scheduling alert, we're done. */ if (ucmpv64(&ts64, &pt->head.stime) < 0) return fired; - /* now start to collect the remaing data */ + /* now start to collect the remaining data */ due32 = pt->head.dtime.D_s.lo; qr->tai_diff = pt->head.next_tai - pt->head.this_tai; - qr->ttime = pt->head.ttime; qr->ddist = due32 - ts32; qr->dynamic = pt->head.dynls; qr->proximity = LSPROX_SCHEDULE; @@ -329,7 +360,7 @@ leapsec_query( /* if not in the last day before transition, we're done. */ if (!betweenu32(due32 - SECSPERDAY, ts32, due32)) return fired; - + qr->proximity = LSPROX_ANNOUNCE; if (!betweenu32(due32 - 10, ts32, due32)) return fired; @@ -339,6 +370,22 @@ leapsec_query( return fired; } +/* ------------------------------------------------------------------ */ +int/*BOOL*/ +leapsec_query_era( + leap_era_t * qr , + uint32_t ntpts, + const time_t * pivot) +{ + const leap_table_t * pt; + vint64 ts64; + + pt = leapsec_get_table(FALSE); + ts64 = ntpcal_ntp_to_ntp(ntpts, pivot); + fetch_leap_era(qr, pt, &ts64); + return TRUE; +} + /* ------------------------------------------------------------------ */ int/*BOOL*/ leapsec_frame( @@ -348,15 +395,14 @@ leapsec_frame( memset(qr, 0, sizeof(leap_result_t)); pt = leapsec_get_table(FALSE); - if (ucmpv64(&pt->head.ttime, &pt->head.stime) <= 0) - return FALSE; qr->tai_offs = pt->head.this_tai; qr->tai_diff = pt->head.next_tai - pt->head.this_tai; + qr->ebase = pt->head.ebase; qr->ttime = pt->head.ttime; qr->dynamic = pt->head.dynls; - return TRUE; + return ucmpv64(&pt->head.ttime, &pt->head.stime) >= 0; } /* ------------------------------------------------------------------ */ @@ -392,7 +438,7 @@ leapsec_load_stream( msyslog(LOG_NOTICE, "%s ('%s'): good hash signature", logPrefix, fname); break; - + case LSVALID_NOHASH: msyslog(LOG_ERR, "%s ('%s'): no hash signature", logPrefix, fname); @@ -442,7 +488,7 @@ leapsec_load_stream( "%s ('%s'): loaded, expire=%s ofs=%d (no entries after build date)", logPrefix, fname, lstostr(&pt->head.expire), pt->head.base_tai); - + return leapsec_set_table(pt); } @@ -461,7 +507,7 @@ leapsec_load_file( /* just do nothing if there is no leap file */ if ( !(fname && *fname) ) return FALSE; - + /* try to stat the leapfile */ if (0 != stat(fname, &sb_new)) { if (logall) @@ -551,6 +597,7 @@ leapsec_daystolive( } /* ------------------------------------------------------------------ */ +#if 0 /* currently unused -- possibly revived later */ int/*BOOL*/ leapsec_add_fix( int total, @@ -566,7 +613,7 @@ leapsec_add_fix( time(&tpiv); pivot = &tpiv; } - + et64 = ntpcal_ntp_to_ntp(etime, pivot); tt64 = ntpcal_ntp_to_ntp(ttime, pivot); pt = leapsec_get_table(TRUE); @@ -583,6 +630,7 @@ leapsec_add_fix( return leapsec_set_table(pt); } +#endif /* ------------------------------------------------------------------ */ int/*BOOL*/ @@ -600,6 +648,71 @@ leapsec_add_dyn( && leapsec_set_table(pt)); } +/* ------------------------------------------------------------------ */ +int/*BOOL*/ +leapsec_autokey_tai( + int tai_offset, + uint32_t ntpnow , + const time_t * pivot ) +{ + leap_table_t * pt; + leap_era_t era; + vint64 now64; + int idx; + + (void)tai_offset; + pt = leapsec_get_table(FALSE); + + /* Bail out if the basic offset is not zero and the putative + * offset is bigger than 10s. That was in 1972 -- we don't want + * to go back that far! + */ + if (pt->head.base_tai != 0 || tai_offset < 10) + return FALSE; + + /* If there's already data in the table, check if an update is + * possible. Update is impossible if there are static entries + * (since this indicates a valid leapsecond file) or if we're + * too close to a leapsecond transition: We do not know on what + * side the transition the sender might have been, so we use a + * dead zone around the transition. + */ + + /* Check for static entries */ + for (idx = 0; idx != pt->head.size; idx++) + if ( ! pt->info[idx].dynls) + return FALSE; + + /* get the fulll time stamp and leap era for it */ + now64 = ntpcal_ntp_to_ntp(ntpnow, pivot); + fetch_leap_era(&era, pt, &now64); + + /* check the limits with 20s dead band */ + era.ebase = addv64i32(&era.ebase, 20); + if (ucmpv64(&now64, &era.ebase) < 0) + return FALSE; + + era.ttime = addv64i32(&era.ttime, -20); + if (ucmpv64(&now64, &era.ttime) > 0) + return FALSE; + + /* Here we can proceed. Calculate the delta update. */ + tai_offset -= era.taiof; + + /* Shift the header info offsets. */ + pt->head.base_tai += tai_offset; + pt->head.this_tai += tai_offset; + pt->head.next_tai += tai_offset; + + /* Shift table entry offsets (if any) */ + for (idx = 0; idx != pt->head.size; idx++) + pt->info[idx].taiof += tai_offset; + + /* claim success... */ + return TRUE; +} + + /* ===================================================================== * internal helpers */ @@ -630,15 +743,21 @@ add_range( const leap_info_t * pi) { /* If the table is full, make room by throwing out the oldest - * entry. But remember the accumulated leap seconds! + * entry. But remember the accumulated leap seconds! Likewise, + * assume a positive leap insertion if this is the first entry + * in the table. This is not necessarily the best of all ideas, + * but it helps a great deal if a system does not have a leap + * table and gets updated from an upstream server. */ - if (pt->head.size >= MAX_HIST) { + if (pt->head.size == 0) { + pt->head.base_tai = pi->taiof - 1; + } else if (pt->head.size >= MAX_HIST) { pt->head.size = MAX_HIST - 1; pt->head.base_tai = pt->info[pt->head.size].taiof; } /* make room in lower end and insert item */ - memmove(pt->info+1, pt->info, pt->head.size*sizeof(*pt->info)); + memmove(pt->info+1, pt->info, pt->head.size*sizeof(*pt->info)); pt->info[0] = *pi; pt->head.size++; @@ -670,7 +789,7 @@ get_line( { int ch; char *ptr; - + /* if we cannot even store the delimiter, declare failure */ if (buff == NULL || size == 0) return NULL; @@ -698,7 +817,7 @@ skipws( return (char*)noconst(ptr); } -/* [internal] check if a strtoXYZ ended at EOL or whistespace and +/* [internal] check if a strtoXYZ ended at EOL or whitespace and * converted something at all. Return TRUE if something went wrong. */ static int/*BOOL*/ @@ -758,7 +877,7 @@ reload_limits( pt->head.dtime = addv64i32( &pt->head.ttime, pt->head.next_tai - pt->head.this_tai); - + pt->head.stime = subv64u32( &pt->head.ttime, pt->info[idx].stime); @@ -771,6 +890,37 @@ reload_limits( } } +/* [internal] fetch the leap era for a given time stamp. + * This is a cut-down version the algorithm used to reload the table + * limits, but it does not update any global state and provides just the + * era information for a given time stamp. + */ +static void +fetch_leap_era( + leap_era_t * into, + const leap_table_t * pt , + const vint64 * ts ) +{ + int idx; + + /* Simple search loop, also works with empty table. */ + for (idx = 0; idx != pt->head.size; idx++) + if (ucmpv64(ts, &pt->info[idx].ttime) >= 0) + break; + /* fetch era data, keeping an eye on boundary conditions */ + if (idx >= pt->head.size) { + memset(&into->ebase, 0x00, sizeof(vint64)); + into->taiof = pt->head.base_tai; + } else { + into->ebase = pt->info[idx].ttime; + into->taiof = pt->info[idx].taiof; + } + if (--idx >= 0) + into->ttime = pt->info[idx].ttime; + else + memset(&into->ttime, 0xFF, sizeof(vint64)); +} + /* [internal] Take a time stamp and create a leap second frame for * it. This will schedule a leap second for the beginning of the next * month, midnight UTC. The 'insert' argument tells if a leap second is @@ -791,7 +941,7 @@ leapsec_add( struct calendar fts; leap_info_t li; - /* Check against the table expiration and the lates available + /* Check against the table expiration and the latest available * leap entry. Do not permit inserts, only appends, and only if * the extend the table beyond the expiration! */ @@ -843,10 +993,22 @@ leapsec_raw( struct calendar fts; leap_info_t li; - /* Check that we only extend the table. Paranoia rulez! */ - if (pt->head.size && ucmpv64(ttime, &pt->info[0].ttime) <= 0) { - errno = ERANGE; - return FALSE; + /* Check that we either extend the table or get a duplicate of + * the latest entry. The latter is a benevolent overwrite with + * identical data and could happen if we get an autokey message + * that extends the lifetime of the current leapsecond table. + * Otherwise paranoia rulez! + */ + if (pt->head.size) { + int cmp = ucmpv64(ttime, &pt->info[0].ttime); + if (cmp == 0) + cmp -= (taiof != pt->info[0].taiof); + if (cmp < 0) { + errno = ERANGE; + return FALSE; + } + if (cmp == 0) + return TRUE; } ntpcal_ntp64_to_date(&fts, ttime); @@ -856,7 +1018,7 @@ leapsec_raw( return FALSE; } fts.month--; /* was in range 1..12, no overflow here! */ - starttime = ntpcal_date_to_ntp64(&fts); + starttime = ntpcal_date_to_ntp64(&fts); li.ttime = *ttime; li.stime = ttime->D_s.lo - starttime.D_s.lo; li.taiof = (int16_t)taiof; @@ -947,7 +1109,7 @@ do_hash_data( isc_sha1_update( mdctx, text, sizeof(text)); } - + if (0 < tlen) isc_sha1_update(mdctx, text, tlen); } @@ -991,20 +1153,34 @@ leapsec_validate( /* * lstostr - prettyprint NTP seconds */ -static char * lstostr( +static const char * +lstostr( const vint64 * ts) { char * buf; struct calendar tm; LIB_GETBUF(buf); - ntpcal_ntp64_to_date(&tm, ts); - snprintf(buf, LIB_BUFLENGTH, "%04d-%02d-%02dT%02d:%02dZ", - tm.year, tm.month, tm.monthday, - tm.hour, tm.minute); + + if ( ! (ts->d_s.hi >= 0 && ntpcal_ntp64_to_date(&tm, ts) >= 0)) + snprintf(buf, LIB_BUFLENGTH, "%s", "9999-12-31T23:59:59Z"); + else + snprintf(buf, LIB_BUFLENGTH, "%04d-%02d-%02dT%02d:%02d:%02dZ", + tm.year, tm.month, tm.monthday, + tm.hour, tm.minute, tm.second); + return buf; } +/* reset the global state for unit tests */ +void +leapsec_ut_pristine(void) +{ + memset(_ltab, 0, sizeof(_ltab)); + _lptr = NULL; + _electric = 0; +} + /* -*- that's all folks! -*- */ diff --git a/contrib/ntp/ntpd/ntp_leapsec.h b/contrib/ntp/ntpd/ntp_leapsec.h index 75edcc4608f7..120b75fcbb3f 100644 --- a/contrib/ntp/ntpd/ntp_leapsec.h +++ b/contrib/ntp/ntpd/ntp_leapsec.h @@ -61,16 +61,27 @@ extern int leapsec_validate(leapsec_reader, void*); */ extern int/*BOOL*/ leapsec_electric(int/*BOOL*/ on); +/* Query result for a leap era. This is the minimal stateless + * information available for a time stamp in UTC. + */ +struct leap_era { + vint64 ebase; /* era base (UTC of start) */ + vint64 ttime; /* era end (UTC of next leap second) */ + int16_t taiof; /* offset to TAI in this era */ +}; +typedef struct leap_era leap_era_t; /* Query result for a leap second schedule - * 'ttime' is the transition point in full time scale, but only if - * 'tai_diff' is not zero. Nominal UTC time when the next leap - * era starts. + * 'ebase' is the nominal UTC time when the current leap era + * started. (Era base time) + * 'ttime' is the next transition point in full time scale. (Nominal UTC + * time when the next leap era starts.) * 'ddist' is the distance to the transition, in clock seconds. * This is the distance to the due time, which is different * from the transition time if the mode is non-electric. * Only valid if 'tai_diff' is not zero. - * 'tai_offs' is the CURRENT distance from clock (UTC) to TAI. Always valid. + * 'tai_offs' is the CURRENT distance from clock (UTC) to TAI. Always + * valid. * 'tai_diff' is the change in TAI offset after the next leap * transition. Zero if nothing is pending or too far ahead. * 'warped' is set only once, when the the leap second occurred between @@ -79,8 +90,9 @@ extern int/*BOOL*/ leapsec_electric(int/*BOOL*/ on); * 'proximity' is a proximity warning. See definitions below. This is * more useful than an absolute difference to the leap second. * 'dynamic' != 0 if entry was requested by clock/peer - */ + */ struct leap_result { + vint64 ebase; vint64 ttime; uint32_t ddist; int16_t tai_offs; @@ -91,6 +103,15 @@ struct leap_result { }; typedef struct leap_result leap_result_t; +/* The leap signature is used in two distinct circumstances, and it has + * slightly different content in these cases: + * - it is used to indictae the time range covered by the leap second + * table, and then it contains the last transition, TAI offset after + * the final transition, and the expiration time. + * - it is used to query data for AUTOKEY updates, and then it contains + * the *current* TAI offset, the *next* transition time and the + * expiration time of the table. + */ struct leap_signature { uint32_t etime; /* expiration time */ uint32_t ttime; /* transition time */ @@ -99,6 +120,24 @@ struct leap_signature { typedef struct leap_signature leap_signature_t; +#ifdef LEAP_SMEAR + +struct leap_smear_info { + int enabled; /* not 0 if smearing is generally enabled */ + int in_progress; /* not 0 if smearing is in progress, i.e. the offset has been computed */ + int leap_occurred; /* not 0 if the leap second has already occurred, i.e., during the leap second */ + double doffset; /* the current smear offset as double */ + l_fp offset; /* the current smear offset */ + uint32_t t_offset; /* the current time for which a smear offset has been computed */ + long interval; /* smear interval, in [s], should be at least some hours */ + double intv_start; /* start time of the smear interval */ + double intv_end; /* end time of the smear interval */ +}; +typedef struct leap_smear_info leap_smear_info_t; + +#endif /* LEAP_SMEAR */ + + #define LSPROX_NOWARN 0 /* clear radar screen */ #define LSPROX_SCHEDULE 1 /* less than 1 month to target*/ #define LSPROX_ANNOUNCE 2 /* less than 1 day to target */ @@ -170,6 +209,7 @@ extern int32_t leapsec_daystolive(uint32_t when, const time_t * pivot); */ extern void leapsec_reset_frame(void); +#if 0 /* currently unused -- possibly revived later */ /* Given a transition time, the TAI offset valid after that and an * expiration time, try to establish a system leap transition. Only * works if the existing table is extended. On success, updates the @@ -177,6 +217,7 @@ extern void leapsec_reset_frame(void); */ extern int/*BOOL*/ leapsec_add_fix(int offset, uint32_t ttime, uint32_t etime, const time_t * pivot); +#endif /* Take a time stamp and create a leap second frame for it. This will * schedule a leap second for the beginning of the next month, midnight @@ -200,9 +241,15 @@ extern int/*BOOL*/ leapsec_add_dyn(int/*BOOL*/ insert, uint32_t ntp_now, * last and the current query. In that case, qr->warped contains the * required clock stepping, which is always zero in electric mode. */ -extern int/*BOOL*/ leapsec_query(leap_result_t *qr, uint32_t ntpts, +extern int/*BOOL*/ leapsec_query(leap_result_t * qr, uint32_t ntpts, const time_t * pivot); +/* For a given time stamp, fetch the data for the bracketing leap + * era. The time stamp is subject to NTP era unfolding. + */ +extern int/*BOOL*/ leapsec_query_era(leap_era_t * qr, uint32_t ntpts, + const time_t * pivot); + /* Get the current leap frame info. Returns TRUE if the result contains * useable data, FALSE if there is currently no leap second frame. * This merely replicates some results from a previous query, but since @@ -215,4 +262,15 @@ extern int/*BOOL*/ leapsec_query(leap_result_t *qr, uint32_t ntpts, */ extern int/*BOOL*/ leapsec_frame(leap_result_t *qr); + +/* Process a AUTOKEY TAI offset information. This *might* augment the + * current leap data table with the given TAI offset. + * Returns TRUE if action was taken, FALSE otherwise. + */ +extern int/*BOOL*/ leapsec_autokey_tai(int tai_offset, uint32_t ntpnow, + const time_t * pivot); + +/* reset global state for unit tests */ +extern void leapsec_ut_pristine(void); + #endif /* !defined(NTP_LEAPSEC_H) */ diff --git a/contrib/ntp/ntpd/ntp_loopfilter.c b/contrib/ntp/ntpd/ntp_loopfilter.c index e47f83b976a2..cb183b934fc8 100644 --- a/contrib/ntp/ntpd/ntp_loopfilter.c +++ b/contrib/ntp/ntpd/ntp_loopfilter.c @@ -246,6 +246,8 @@ ntp_adjtime_error_handler( int line /* line number of ntp_adjtime call */ ) { + char des[1024] = ""; /* Decoded Error Status */ + switch (ret) { case -1: switch (saved_errno) { @@ -317,14 +319,88 @@ ntp_adjtime_error_handler( # warning TIME_WAIT is not defined #endif #ifdef TIME_ERROR +#if 0 + +from the reference implementation of ntp_gettime(): + + // Hardware or software error + if ((time_status & (STA_UNSYNC | STA_CLOCKERR)) + + /* + * PPS signal lost when either time or frequency synchronization + * requested + */ + || (time_status & (STA_PPSFREQ | STA_PPSTIME) + && !(time_status & STA_PPSSIGNAL)) + + /* + * PPS jitter exceeded when time synchronization requested + */ + || (time_status & STA_PPSTIME && + time_status & STA_PPSJITTER) + + /* + * PPS wander exceeded or calibration error when frequency + * synchronization requested + */ + || (time_status & STA_PPSFREQ && + time_status & (STA_PPSWANDER | STA_PPSERROR))) + return (TIME_ERROR); + +or, from ntp_adjtime(): + + if ( (time_status & (STA_UNSYNC | STA_CLOCKERR)) + || (time_status & (STA_PPSFREQ | STA_PPSTIME) + && !(time_status & STA_PPSSIGNAL)) + || (time_status & STA_PPSTIME + && time_status & STA_PPSJITTER) + || (time_status & STA_PPSFREQ + && time_status & (STA_PPSWANDER | STA_PPSERROR)) + ) + return (TIME_ERROR); +#endif + case TIME_ERROR: /* 5: unsynchronized, or loss of synchronization */ /* error (see status word) */ + + if (ptimex->status & STA_UNSYNC) + snprintf(des, sizeof(des), "%s%sClock Unsynchronized", + des, (*des) ? "; " : ""); + + if (ptimex->status & STA_CLOCKERR) + snprintf(des, sizeof(des), "%s%sClock Error", + des, (*des) ? "; " : ""); + + if (!(ptimex->status & STA_PPSSIGNAL) + && ptimex->status & STA_PPSFREQ) + snprintf(des, sizeof(des), "%s%sPPS Frequency Sync wanted but no PPS", + des, (*des) ? "; " : ""); + + if (!(ptimex->status & STA_PPSSIGNAL) + && ptimex->status & STA_PPSTIME) + snprintf(des, sizeof(des), "%s%sPPS Time Sync wanted but no PPS signal", + des, (*des) ? "; " : ""); + + if ( ptimex->status & STA_PPSTIME + && ptimex->status & STA_PPSJITTER) + snprintf(des, sizeof(des), "%s%sPPS Time Sync wanted but PPS Jitter exceeded", + des, (*des) ? "; " : ""); + + if ( ptimex->status & STA_PPSFREQ + && ptimex->status & STA_PPSWANDER) + snprintf(des, sizeof(des), "%s%sPPS Frequency Sync wanted but PPS Wander exceeded", + des, (*des) ? "; " : ""); + + if ( ptimex->status & STA_PPSFREQ + && ptimex->status & STA_PPSERROR) + snprintf(des, sizeof(des), "%s%sPPS Frequency Sync wanted but Calibration error detected", + des, (*des) ? "; " : ""); + if (pps_call && !(ptimex->status & STA_PPSSIGNAL)) report_event(EVNT_KERN, NULL, - "PPS no signal"); - errno = saved_errno; - DPRINTF(1, ("kernel loop status (%s) %d %m\n", - k_st_flags(ptimex->status), errno)); + "no PPS signal"); + DPRINTF(1, ("kernel loop status %#x (%s)\n", + ptimex->status, des)); /* * This code may be returned when ntp_adjtime() has just * been called for the first time, quite a while after @@ -339,15 +415,14 @@ ntp_adjtime_error_handler( * or ??? * msyslog(LOG_INFO, "kernel reports time synchronization lost"); */ - errno = saved_errno; /* may not be needed */ - msyslog(LOG_INFO, "kernel reports TIME_ERROR: %#x: %s %m", - ptimex->status, k_st_flags(ptimex->status)); + msyslog(LOG_INFO, "kernel reports TIME_ERROR: %#x: %s", + ptimex->status, des); break; #else # warning TIME_ERROR is not defined #endif default: - msyslog(LOG_NOTICE, "%s: %s line %d: unhandled return value %d from ntp_adjtime in %s at line %d", + msyslog(LOG_NOTICE, "%s: %s line %d: unhandled return value %d from ntp_adjtime() in %s at line %d", caller, file_name(), line, ret, __func__, __LINE__ diff --git a/contrib/ntp/ntpd/ntp_monitor.c b/contrib/ntp/ntpd/ntp_monitor.c index 1214e1d661c2..02fd757307da 100644 --- a/contrib/ntp/ntpd/ntp_monitor.c +++ b/contrib/ntp/ntpd/ntp_monitor.c @@ -183,7 +183,7 @@ mon_getmoremem(void) : mru_incalloc; if (entries) { - chunk = emalloc(entries * sizeof(*chunk)); + chunk = eallocarray(entries, sizeof(*chunk)); mru_alloc += entries; for (chunk += entries; entries; entries--) mon_free_entry(--chunk); diff --git a/contrib/ntp/ntpd/ntp_parser.c b/contrib/ntp/ntpd/ntp_parser.c index 0cf55197ac6c..d76ac3374386 100644 --- a/contrib/ntp/ntpd/ntp_parser.c +++ b/contrib/ntp/ntpd/ntp_parser.c @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 3.0.2. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -26,7 +26,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.0.2" +#define YYBISON_VERSION "2.7.12-4996" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -62,7 +62,8 @@ /* Copy the first part of user declarations. */ -#line 14 "ntp_parser.y" /* yacc.c:339 */ +/* Line 371 of yacc.c */ +#line 11 "../../ntpd/ntp_parser.y" #ifdef HAVE_CONFIG_H # include @@ -88,7 +89,7 @@ #define YYFREE free #define YYERROR_VERBOSE #define YYMAXDEPTH 1000 /* stop the madness sooner */ - void yyerror(struct FILE_INFO *ip_file, const char *msg); + void yyerror(const char *msg); #ifdef SIM # define ONLY_SIM(a) (a) @@ -96,13 +97,14 @@ # define ONLY_SIM(a) NULL #endif -#line 100 "ntp_parser.c" /* yacc.c:339 */ +/* Line 371 of yacc.c */ +#line 102 "ntp_parser.c" -# ifndef YY_NULLPTR +# ifndef YY_NULL # if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULLPTR nullptr +# define YY_NULL nullptr # else -# define YY_NULLPTR 0 +# define YY_NULL 0 # endif # endif @@ -116,9 +118,9 @@ /* In a future release of Bison, this section will be replaced by #include "y.tab.h". */ -#ifndef YY_YY_Y_TAB_H_INCLUDED -# define YY_YY_Y_TAB_H_INCLUDED -/* Debug traces. */ +#ifndef YY_YY_NTP_PARSER_H_INCLUDED +# define YY_YY_NTP_PARSER_H_INCLUDED +/* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 1 #endif @@ -126,201 +128,204 @@ extern int yydebug; #endif -/* Token type. */ +/* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - enum yytokentype - { - T_Abbrev = 258, - T_Age = 259, - T_All = 260, - T_Allan = 261, - T_Allpeers = 262, - T_Auth = 263, - T_Autokey = 264, - T_Automax = 265, - T_Average = 266, - T_Bclient = 267, - T_Beacon = 268, - T_Broadcast = 269, - T_Broadcastclient = 270, - T_Broadcastdelay = 271, - T_Burst = 272, - T_Calibrate = 273, - T_Ceiling = 274, - T_Clockstats = 275, - T_Cohort = 276, - T_ControlKey = 277, - T_Crypto = 278, - T_Cryptostats = 279, - T_Ctl = 280, - T_Day = 281, - T_Default = 282, - T_Digest = 283, - T_Disable = 284, - T_Discard = 285, - T_Dispersion = 286, - T_Double = 287, - T_Driftfile = 288, - T_Drop = 289, - T_Ellipsis = 290, - T_Enable = 291, - T_End = 292, - T_False = 293, - T_File = 294, - T_Filegen = 295, - T_Filenum = 296, - T_Flag1 = 297, - T_Flag2 = 298, - T_Flag3 = 299, - T_Flag4 = 300, - T_Flake = 301, - T_Floor = 302, - T_Freq = 303, - T_Fudge = 304, - T_Host = 305, - T_Huffpuff = 306, - T_Iburst = 307, - T_Ident = 308, - T_Ignore = 309, - T_Incalloc = 310, - T_Incmem = 311, - T_Initalloc = 312, - T_Initmem = 313, - T_Includefile = 314, - T_Integer = 315, - T_Interface = 316, - T_Intrange = 317, - T_Io = 318, - T_Ipv4 = 319, - T_Ipv4_flag = 320, - T_Ipv6 = 321, - T_Ipv6_flag = 322, - T_Kernel = 323, - T_Key = 324, - T_Keys = 325, - T_Keysdir = 326, - T_Kod = 327, - T_Mssntp = 328, - T_Leapfile = 329, - T_Limited = 330, - T_Link = 331, - T_Listen = 332, - T_Logconfig = 333, - T_Logfile = 334, - T_Loopstats = 335, - T_Lowpriotrap = 336, - T_Manycastclient = 337, - T_Manycastserver = 338, - T_Mask = 339, - T_Maxage = 340, - T_Maxclock = 341, - T_Maxdepth = 342, - T_Maxdist = 343, - T_Maxmem = 344, - T_Maxpoll = 345, - T_Mdnstries = 346, - T_Mem = 347, - T_Memlock = 348, - T_Minclock = 349, - T_Mindepth = 350, - T_Mindist = 351, - T_Minimum = 352, - T_Minpoll = 353, - T_Minsane = 354, - T_Mode = 355, - T_Mode7 = 356, - T_Monitor = 357, - T_Month = 358, - T_Mru = 359, - T_Multicastclient = 360, - T_Nic = 361, - T_Nolink = 362, - T_Nomodify = 363, - T_Nomrulist = 364, - T_None = 365, - T_Nonvolatile = 366, - T_Nopeer = 367, - T_Noquery = 368, - T_Noselect = 369, - T_Noserve = 370, - T_Notrap = 371, - T_Notrust = 372, - T_Ntp = 373, - T_Ntpport = 374, - T_NtpSignDsocket = 375, - T_Orphan = 376, - T_Orphanwait = 377, - T_Panic = 378, - T_Peer = 379, - T_Peerstats = 380, - T_Phone = 381, - T_Pid = 382, - T_Pidfile = 383, - T_Pool = 384, - T_Port = 385, - T_Preempt = 386, - T_Prefer = 387, - T_Protostats = 388, - T_Pw = 389, - T_Randfile = 390, - T_Rawstats = 391, - T_Refid = 392, - T_Requestkey = 393, - T_Reset = 394, - T_Restrict = 395, - T_Revoke = 396, - T_Rlimit = 397, - T_Saveconfigdir = 398, - T_Server = 399, - T_Setvar = 400, - T_Source = 401, - T_Stacksize = 402, - T_Statistics = 403, - T_Stats = 404, - T_Statsdir = 405, - T_Step = 406, - T_Stepback = 407, - T_Stepfwd = 408, - T_Stepout = 409, - T_Stratum = 410, - T_String = 411, - T_Sys = 412, - T_Sysstats = 413, - T_Tick = 414, - T_Time1 = 415, - T_Time2 = 416, - T_Timer = 417, - T_Timingstats = 418, - T_Tinker = 419, - T_Tos = 420, - T_Trap = 421, - T_True = 422, - T_Trustedkey = 423, - T_Ttl = 424, - T_Type = 425, - T_U_int = 426, - T_Unconfig = 427, - T_Unpeer = 428, - T_Version = 429, - T_WanderThreshold = 430, - T_Week = 431, - T_Wildcard = 432, - T_Xleave = 433, - T_Year = 434, - T_Flag = 435, - T_EOC = 436, - T_Simulate = 437, - T_Beep_Delay = 438, - T_Sim_Duration = 439, - T_Server_Offset = 440, - T_Duration = 441, - T_Freq_Offset = 442, - T_Wander = 443, - T_Jitter = 444, - T_Prop_Delay = 445, - T_Proc_Delay = 446 - }; + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + T_Abbrev = 258, + T_Age = 259, + T_All = 260, + T_Allan = 261, + T_Allpeers = 262, + T_Auth = 263, + T_Autokey = 264, + T_Automax = 265, + T_Average = 266, + T_Bclient = 267, + T_Beacon = 268, + T_Broadcast = 269, + T_Broadcastclient = 270, + T_Broadcastdelay = 271, + T_Burst = 272, + T_Calibrate = 273, + T_Ceiling = 274, + T_Clockstats = 275, + T_Cohort = 276, + T_ControlKey = 277, + T_Crypto = 278, + T_Cryptostats = 279, + T_Ctl = 280, + T_Day = 281, + T_Default = 282, + T_Digest = 283, + T_Disable = 284, + T_Discard = 285, + T_Dispersion = 286, + T_Double = 287, + T_Driftfile = 288, + T_Drop = 289, + T_Dscp = 290, + T_Ellipsis = 291, + T_Enable = 292, + T_End = 293, + T_False = 294, + T_File = 295, + T_Filegen = 296, + T_Filenum = 297, + T_Flag1 = 298, + T_Flag2 = 299, + T_Flag3 = 300, + T_Flag4 = 301, + T_Flake = 302, + T_Floor = 303, + T_Freq = 304, + T_Fudge = 305, + T_Host = 306, + T_Huffpuff = 307, + T_Iburst = 308, + T_Ident = 309, + T_Ignore = 310, + T_Incalloc = 311, + T_Incmem = 312, + T_Initalloc = 313, + T_Initmem = 314, + T_Includefile = 315, + T_Integer = 316, + T_Interface = 317, + T_Intrange = 318, + T_Io = 319, + T_Ipv4 = 320, + T_Ipv4_flag = 321, + T_Ipv6 = 322, + T_Ipv6_flag = 323, + T_Kernel = 324, + T_Key = 325, + T_Keys = 326, + T_Keysdir = 327, + T_Kod = 328, + T_Mssntp = 329, + T_Leapfile = 330, + T_Leapsmearinterval = 331, + T_Limited = 332, + T_Link = 333, + T_Listen = 334, + T_Logconfig = 335, + T_Logfile = 336, + T_Loopstats = 337, + T_Lowpriotrap = 338, + T_Manycastclient = 339, + T_Manycastserver = 340, + T_Mask = 341, + T_Maxage = 342, + T_Maxclock = 343, + T_Maxdepth = 344, + T_Maxdist = 345, + T_Maxmem = 346, + T_Maxpoll = 347, + T_Mdnstries = 348, + T_Mem = 349, + T_Memlock = 350, + T_Minclock = 351, + T_Mindepth = 352, + T_Mindist = 353, + T_Minimum = 354, + T_Minpoll = 355, + T_Minsane = 356, + T_Mode = 357, + T_Mode7 = 358, + T_Monitor = 359, + T_Month = 360, + T_Mru = 361, + T_Multicastclient = 362, + T_Nic = 363, + T_Nolink = 364, + T_Nomodify = 365, + T_Nomrulist = 366, + T_None = 367, + T_Nonvolatile = 368, + T_Nopeer = 369, + T_Noquery = 370, + T_Noselect = 371, + T_Noserve = 372, + T_Notrap = 373, + T_Notrust = 374, + T_Ntp = 375, + T_Ntpport = 376, + T_NtpSignDsocket = 377, + T_Orphan = 378, + T_Orphanwait = 379, + T_Panic = 380, + T_Peer = 381, + T_Peerstats = 382, + T_Phone = 383, + T_Pid = 384, + T_Pidfile = 385, + T_Pool = 386, + T_Port = 387, + T_Preempt = 388, + T_Prefer = 389, + T_Protostats = 390, + T_Pw = 391, + T_Randfile = 392, + T_Rawstats = 393, + T_Refid = 394, + T_Requestkey = 395, + T_Reset = 396, + T_Restrict = 397, + T_Revoke = 398, + T_Rlimit = 399, + T_Saveconfigdir = 400, + T_Server = 401, + T_Setvar = 402, + T_Source = 403, + T_Stacksize = 404, + T_Statistics = 405, + T_Stats = 406, + T_Statsdir = 407, + T_Step = 408, + T_Stepback = 409, + T_Stepfwd = 410, + T_Stepout = 411, + T_Stratum = 412, + T_String = 413, + T_Sys = 414, + T_Sysstats = 415, + T_Tick = 416, + T_Time1 = 417, + T_Time2 = 418, + T_Timer = 419, + T_Timingstats = 420, + T_Tinker = 421, + T_Tos = 422, + T_Trap = 423, + T_True = 424, + T_Trustedkey = 425, + T_Ttl = 426, + T_Type = 427, + T_U_int = 428, + T_Unconfig = 429, + T_Unpeer = 430, + T_Version = 431, + T_WanderThreshold = 432, + T_Week = 433, + T_Wildcard = 434, + T_Xleave = 435, + T_Year = 436, + T_Flag = 437, + T_EOC = 438, + T_Simulate = 439, + T_Beep_Delay = 440, + T_Sim_Duration = 441, + T_Server_Offset = 442, + T_Duration = 443, + T_Freq_Offset = 444, + T_Wander = 445, + T_Jitter = 446, + T_Prop_Delay = 447, + T_Proc_Delay = 448 + }; #endif /* Tokens. */ #define T_Abbrev 258 @@ -355,170 +360,173 @@ extern int yydebug; #define T_Double 287 #define T_Driftfile 288 #define T_Drop 289 -#define T_Ellipsis 290 -#define T_Enable 291 -#define T_End 292 -#define T_False 293 -#define T_File 294 -#define T_Filegen 295 -#define T_Filenum 296 -#define T_Flag1 297 -#define T_Flag2 298 -#define T_Flag3 299 -#define T_Flag4 300 -#define T_Flake 301 -#define T_Floor 302 -#define T_Freq 303 -#define T_Fudge 304 -#define T_Host 305 -#define T_Huffpuff 306 -#define T_Iburst 307 -#define T_Ident 308 -#define T_Ignore 309 -#define T_Incalloc 310 -#define T_Incmem 311 -#define T_Initalloc 312 -#define T_Initmem 313 -#define T_Includefile 314 -#define T_Integer 315 -#define T_Interface 316 -#define T_Intrange 317 -#define T_Io 318 -#define T_Ipv4 319 -#define T_Ipv4_flag 320 -#define T_Ipv6 321 -#define T_Ipv6_flag 322 -#define T_Kernel 323 -#define T_Key 324 -#define T_Keys 325 -#define T_Keysdir 326 -#define T_Kod 327 -#define T_Mssntp 328 -#define T_Leapfile 329 -#define T_Limited 330 -#define T_Link 331 -#define T_Listen 332 -#define T_Logconfig 333 -#define T_Logfile 334 -#define T_Loopstats 335 -#define T_Lowpriotrap 336 -#define T_Manycastclient 337 -#define T_Manycastserver 338 -#define T_Mask 339 -#define T_Maxage 340 -#define T_Maxclock 341 -#define T_Maxdepth 342 -#define T_Maxdist 343 -#define T_Maxmem 344 -#define T_Maxpoll 345 -#define T_Mdnstries 346 -#define T_Mem 347 -#define T_Memlock 348 -#define T_Minclock 349 -#define T_Mindepth 350 -#define T_Mindist 351 -#define T_Minimum 352 -#define T_Minpoll 353 -#define T_Minsane 354 -#define T_Mode 355 -#define T_Mode7 356 -#define T_Monitor 357 -#define T_Month 358 -#define T_Mru 359 -#define T_Multicastclient 360 -#define T_Nic 361 -#define T_Nolink 362 -#define T_Nomodify 363 -#define T_Nomrulist 364 -#define T_None 365 -#define T_Nonvolatile 366 -#define T_Nopeer 367 -#define T_Noquery 368 -#define T_Noselect 369 -#define T_Noserve 370 -#define T_Notrap 371 -#define T_Notrust 372 -#define T_Ntp 373 -#define T_Ntpport 374 -#define T_NtpSignDsocket 375 -#define T_Orphan 376 -#define T_Orphanwait 377 -#define T_Panic 378 -#define T_Peer 379 -#define T_Peerstats 380 -#define T_Phone 381 -#define T_Pid 382 -#define T_Pidfile 383 -#define T_Pool 384 -#define T_Port 385 -#define T_Preempt 386 -#define T_Prefer 387 -#define T_Protostats 388 -#define T_Pw 389 -#define T_Randfile 390 -#define T_Rawstats 391 -#define T_Refid 392 -#define T_Requestkey 393 -#define T_Reset 394 -#define T_Restrict 395 -#define T_Revoke 396 -#define T_Rlimit 397 -#define T_Saveconfigdir 398 -#define T_Server 399 -#define T_Setvar 400 -#define T_Source 401 -#define T_Stacksize 402 -#define T_Statistics 403 -#define T_Stats 404 -#define T_Statsdir 405 -#define T_Step 406 -#define T_Stepback 407 -#define T_Stepfwd 408 -#define T_Stepout 409 -#define T_Stratum 410 -#define T_String 411 -#define T_Sys 412 -#define T_Sysstats 413 -#define T_Tick 414 -#define T_Time1 415 -#define T_Time2 416 -#define T_Timer 417 -#define T_Timingstats 418 -#define T_Tinker 419 -#define T_Tos 420 -#define T_Trap 421 -#define T_True 422 -#define T_Trustedkey 423 -#define T_Ttl 424 -#define T_Type 425 -#define T_U_int 426 -#define T_Unconfig 427 -#define T_Unpeer 428 -#define T_Version 429 -#define T_WanderThreshold 430 -#define T_Week 431 -#define T_Wildcard 432 -#define T_Xleave 433 -#define T_Year 434 -#define T_Flag 435 -#define T_EOC 436 -#define T_Simulate 437 -#define T_Beep_Delay 438 -#define T_Sim_Duration 439 -#define T_Server_Offset 440 -#define T_Duration 441 -#define T_Freq_Offset 442 -#define T_Wander 443 -#define T_Jitter 444 -#define T_Prop_Delay 445 -#define T_Proc_Delay 446 +#define T_Dscp 290 +#define T_Ellipsis 291 +#define T_Enable 292 +#define T_End 293 +#define T_False 294 +#define T_File 295 +#define T_Filegen 296 +#define T_Filenum 297 +#define T_Flag1 298 +#define T_Flag2 299 +#define T_Flag3 300 +#define T_Flag4 301 +#define T_Flake 302 +#define T_Floor 303 +#define T_Freq 304 +#define T_Fudge 305 +#define T_Host 306 +#define T_Huffpuff 307 +#define T_Iburst 308 +#define T_Ident 309 +#define T_Ignore 310 +#define T_Incalloc 311 +#define T_Incmem 312 +#define T_Initalloc 313 +#define T_Initmem 314 +#define T_Includefile 315 +#define T_Integer 316 +#define T_Interface 317 +#define T_Intrange 318 +#define T_Io 319 +#define T_Ipv4 320 +#define T_Ipv4_flag 321 +#define T_Ipv6 322 +#define T_Ipv6_flag 323 +#define T_Kernel 324 +#define T_Key 325 +#define T_Keys 326 +#define T_Keysdir 327 +#define T_Kod 328 +#define T_Mssntp 329 +#define T_Leapfile 330 +#define T_Leapsmearinterval 331 +#define T_Limited 332 +#define T_Link 333 +#define T_Listen 334 +#define T_Logconfig 335 +#define T_Logfile 336 +#define T_Loopstats 337 +#define T_Lowpriotrap 338 +#define T_Manycastclient 339 +#define T_Manycastserver 340 +#define T_Mask 341 +#define T_Maxage 342 +#define T_Maxclock 343 +#define T_Maxdepth 344 +#define T_Maxdist 345 +#define T_Maxmem 346 +#define T_Maxpoll 347 +#define T_Mdnstries 348 +#define T_Mem 349 +#define T_Memlock 350 +#define T_Minclock 351 +#define T_Mindepth 352 +#define T_Mindist 353 +#define T_Minimum 354 +#define T_Minpoll 355 +#define T_Minsane 356 +#define T_Mode 357 +#define T_Mode7 358 +#define T_Monitor 359 +#define T_Month 360 +#define T_Mru 361 +#define T_Multicastclient 362 +#define T_Nic 363 +#define T_Nolink 364 +#define T_Nomodify 365 +#define T_Nomrulist 366 +#define T_None 367 +#define T_Nonvolatile 368 +#define T_Nopeer 369 +#define T_Noquery 370 +#define T_Noselect 371 +#define T_Noserve 372 +#define T_Notrap 373 +#define T_Notrust 374 +#define T_Ntp 375 +#define T_Ntpport 376 +#define T_NtpSignDsocket 377 +#define T_Orphan 378 +#define T_Orphanwait 379 +#define T_Panic 380 +#define T_Peer 381 +#define T_Peerstats 382 +#define T_Phone 383 +#define T_Pid 384 +#define T_Pidfile 385 +#define T_Pool 386 +#define T_Port 387 +#define T_Preempt 388 +#define T_Prefer 389 +#define T_Protostats 390 +#define T_Pw 391 +#define T_Randfile 392 +#define T_Rawstats 393 +#define T_Refid 394 +#define T_Requestkey 395 +#define T_Reset 396 +#define T_Restrict 397 +#define T_Revoke 398 +#define T_Rlimit 399 +#define T_Saveconfigdir 400 +#define T_Server 401 +#define T_Setvar 402 +#define T_Source 403 +#define T_Stacksize 404 +#define T_Statistics 405 +#define T_Stats 406 +#define T_Statsdir 407 +#define T_Step 408 +#define T_Stepback 409 +#define T_Stepfwd 410 +#define T_Stepout 411 +#define T_Stratum 412 +#define T_String 413 +#define T_Sys 414 +#define T_Sysstats 415 +#define T_Tick 416 +#define T_Time1 417 +#define T_Time2 418 +#define T_Timer 419 +#define T_Timingstats 420 +#define T_Tinker 421 +#define T_Tos 422 +#define T_Trap 423 +#define T_True 424 +#define T_Trustedkey 425 +#define T_Ttl 426 +#define T_Type 427 +#define T_U_int 428 +#define T_Unconfig 429 +#define T_Unpeer 430 +#define T_Version 431 +#define T_WanderThreshold 432 +#define T_Week 433 +#define T_Wildcard 434 +#define T_Xleave 435 +#define T_Year 436 +#define T_Flag 437 +#define T_EOC 438 +#define T_Simulate 439 +#define T_Beep_Delay 440 +#define T_Sim_Duration 441 +#define T_Server_Offset 442 +#define T_Duration 443 +#define T_Freq_Offset 444 +#define T_Wander 445 +#define T_Jitter 446 +#define T_Prop_Delay 447 +#define T_Proc_Delay 448 + + -/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE YYSTYPE; -union YYSTYPE +typedef union YYSTYPE { -#line 54 "ntp_parser.y" /* yacc.c:355 */ +/* Line 387 of yacc.c */ +#line 51 "../../ntpd/ntp_parser.y" char * String; double Double; @@ -537,22 +545,37 @@ union YYSTYPE script_info * Sim_script; script_info_fifo * Sim_script_fifo; -#line 541 "ntp_parser.c" /* yacc.c:355 */ -}; + +/* Line 387 of yacc.c */ +#line 551 "ntp_parser.c" +} YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif - extern YYSTYPE yylval; -int yyparse (struct FILE_INFO *ip_file); +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ -#endif /* !YY_YY_Y_TAB_H_INCLUDED */ +#endif /* !YY_YY_NTP_PARSER_H_INCLUDED */ /* Copy the second part of user declarations. */ -#line 556 "ntp_parser.c" /* yacc.c:358 */ +/* Line 390 of yacc.c */ +#line 579 "ntp_parser.c" #ifdef short # undef short @@ -566,8 +589,11 @@ typedef unsigned char yytype_uint8; #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#else +#elif (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) typedef signed char yytype_int8; +#else +typedef short int yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -587,7 +613,8 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -609,30 +636,11 @@ typedef short int yytype_int16; # endif #endif -#ifndef YY_ATTRIBUTE -# if (defined __GNUC__ \ - && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ - || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C -# define YY_ATTRIBUTE(Spec) __attribute__(Spec) -# else -# define YY_ATTRIBUTE(Spec) /* empty */ -# endif -#endif - -#ifndef YY_ATTRIBUTE_PURE -# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) -#endif - -#ifndef YY_ATTRIBUTE_UNUSED -# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) -#endif - -#if !defined _Noreturn \ - && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) -# if defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if (! defined __GNUC__ || __GNUC__ < 2 \ + || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) +# define __attribute__(Spec) /* empty */ # endif #endif @@ -643,25 +651,24 @@ typedef short int yytype_int16; # define YYUSE(E) /* empty */ #endif -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ -/* Suppress an incorrect diagnostic about yylval being uninitialized. */ -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ - _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ - _Pragma ("GCC diagnostic pop") -#else -# define YY_INITIAL_VALUE(Value) Value -#endif -#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_END -#endif -#ifndef YY_INITIAL_VALUE -# define YY_INITIAL_VALUE(Value) /* Nothing. */ -#endif +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(N) (N) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int yyi) +#else +static int +YYID (yyi) + int yyi; +#endif +{ + return yyi; +} +#endif #if ! defined yyoverflow || YYERROR_VERBOSE @@ -680,7 +687,8 @@ typedef short int yytype_int16; # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS @@ -692,8 +700,8 @@ typedef short int yytype_int16; # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's 'empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -709,7 +717,7 @@ typedef short int yytype_int16; # endif # if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 @@ -717,13 +725,15 @@ typedef short int yytype_int16; # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS +# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS +# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -733,7 +743,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -758,16 +768,16 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (0) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (YYID (0)) #endif @@ -786,50 +796,48 @@ union yyalloc for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ - while (0) + while (YYID (0)) # endif # endif #endif /* !YYCOPY_NEEDED */ /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 207 +#define YYFINAL 210 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 622 +#define YYLAST 647 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 197 +#define YYNTOKENS 199 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 104 +#define YYNNTS 105 /* YYNRULES -- Number of rules. */ -#define YYNRULES 310 -/* YYNSTATES -- Number of states. */ -#define YYNSTATES 415 +#define YYNRULES 313 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 419 -/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned - by yylex, with out-of-bounds checking. */ +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 446 +#define YYMAXUTOK 448 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, without out-of-bounds checking. */ +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 193, 194, 2, 2, 2, 2, 2, 2, 2, 2, + 195, 196, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 192, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 194, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 195, 2, 196, 2, 2, 2, 2, + 2, 2, 2, 197, 2, 198, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -861,45 +869,165 @@ static const yytype_uint8 yytranslate[] = 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191 + 185, 186, 187, 188, 189, 190, 191, 192, 193 }; #if YYDEBUG - /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const yytype_uint16 yyprhs[] = +{ + 0, 0, 3, 5, 9, 12, 15, 16, 18, 20, + 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, + 42, 46, 48, 50, 52, 54, 56, 58, 61, 63, + 65, 67, 68, 71, 73, 75, 77, 79, 81, 83, + 85, 87, 89, 91, 93, 95, 98, 101, 103, 105, + 107, 109, 111, 113, 116, 118, 121, 123, 125, 127, + 130, 133, 136, 139, 142, 145, 148, 151, 154, 157, + 160, 163, 164, 167, 170, 173, 175, 177, 179, 181, + 183, 186, 189, 191, 194, 197, 200, 202, 204, 206, + 208, 210, 212, 214, 216, 218, 220, 223, 226, 230, + 233, 235, 237, 239, 241, 243, 245, 247, 249, 251, + 252, 255, 258, 261, 263, 265, 267, 269, 271, 273, + 275, 277, 279, 281, 283, 285, 287, 290, 293, 297, + 303, 307, 312, 317, 321, 322, 325, 327, 329, 331, + 333, 335, 337, 339, 341, 343, 345, 347, 349, 351, + 353, 355, 358, 360, 363, 365, 367, 369, 372, 374, + 377, 379, 381, 383, 385, 387, 389, 391, 393, 397, + 400, 402, 405, 408, 411, 414, 417, 419, 421, 423, + 425, 427, 429, 432, 435, 437, 440, 442, 444, 446, + 449, 452, 455, 457, 459, 461, 463, 465, 467, 469, + 471, 473, 475, 477, 480, 483, 485, 488, 490, 492, + 494, 496, 498, 500, 502, 504, 506, 508, 510, 512, + 515, 518, 521, 524, 528, 530, 533, 536, 539, 542, + 546, 549, 551, 553, 555, 557, 559, 561, 563, 565, + 567, 569, 571, 574, 575, 580, 582, 583, 584, 587, + 590, 593, 596, 598, 600, 604, 608, 610, 612, 614, + 616, 618, 620, 622, 624, 626, 629, 632, 634, 636, + 638, 640, 642, 644, 646, 648, 651, 653, 656, 658, + 660, 662, 668, 671, 673, 676, 678, 680, 682, 684, + 686, 688, 694, 696, 700, 703, 707, 709, 711, 714, + 716, 722, 727, 731, 734, 736, 743, 747, 750, 754, + 756, 758, 760, 762 +}; + +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int16 yyrhs[] = +{ + 200, 0, -1, 201, -1, 201, 202, 183, -1, 202, + 183, -1, 1, 183, -1, -1, 203, -1, 216, -1, + 218, -1, 219, -1, 228, -1, 236, -1, 223, -1, + 245, -1, 250, -1, 254, -1, 259, -1, 263, -1, + 290, -1, 204, 205, 208, -1, 146, -1, 131, -1, + 126, -1, 14, -1, 84, -1, 206, -1, 207, 158, + -1, 158, -1, 66, -1, 68, -1, -1, 208, 209, + -1, 210, -1, 212, -1, 214, -1, 211, -1, 9, + -1, 17, -1, 53, -1, 116, -1, 133, -1, 134, + -1, 169, -1, 180, -1, 213, 61, -1, 213, 173, + -1, 70, -1, 100, -1, 92, -1, 171, -1, 102, + -1, 176, -1, 215, 158, -1, 54, -1, 217, 205, + -1, 174, -1, 175, -1, 15, -1, 85, 287, -1, + 107, 287, -1, 93, 61, -1, 10, 61, -1, 22, + 61, -1, 23, 220, -1, 71, 158, -1, 72, 158, + -1, 140, 61, -1, 143, 61, -1, 170, 283, -1, + 122, 158, -1, -1, 220, 221, -1, 222, 158, -1, + 143, 61, -1, 51, -1, 54, -1, 136, -1, 137, + -1, 28, -1, 167, 224, -1, 224, 225, -1, 225, + -1, 226, 61, -1, 227, 289, -1, 21, 288, -1, + 19, -1, 48, -1, 123, -1, 124, -1, 101, -1, + 13, -1, 98, -1, 90, -1, 96, -1, 88, -1, + 150, 229, -1, 152, 158, -1, 41, 230, 231, -1, + 229, 230, -1, 230, -1, 20, -1, 24, -1, 82, + -1, 127, -1, 138, -1, 160, -1, 165, -1, 135, + -1, -1, 231, 232, -1, 40, 158, -1, 172, 235, + -1, 233, -1, 234, -1, 78, -1, 109, -1, 37, + -1, 29, -1, 112, -1, 129, -1, 26, -1, 178, + -1, 105, -1, 181, -1, 4, -1, 30, 239, -1, + 106, 242, -1, 142, 205, 237, -1, 142, 206, 86, + 206, 237, -1, 142, 27, 237, -1, 142, 66, 27, + 237, -1, 142, 68, 27, 237, -1, 142, 148, 237, + -1, -1, 237, 238, -1, 47, -1, 55, -1, 73, + -1, 74, -1, 77, -1, 83, -1, 110, -1, 111, + -1, 114, -1, 115, -1, 117, -1, 118, -1, 119, + -1, 121, -1, 176, -1, 239, 240, -1, 240, -1, + 241, 61, -1, 11, -1, 99, -1, 104, -1, 242, + 243, -1, 243, -1, 244, 61, -1, 56, -1, 57, + -1, 58, -1, 59, -1, 87, -1, 89, -1, 91, + -1, 97, -1, 50, 205, 246, -1, 246, 247, -1, + 247, -1, 248, 289, -1, 249, 288, -1, 157, 61, + -1, 3, 158, -1, 139, 158, -1, 162, -1, 163, + -1, 43, -1, 44, -1, 45, -1, 46, -1, 144, + 251, -1, 251, 252, -1, 252, -1, 253, 61, -1, + 95, -1, 149, -1, 42, -1, 37, 255, -1, 29, + 255, -1, 255, 256, -1, 256, -1, 257, -1, 258, + -1, 8, -1, 12, -1, 18, -1, 69, -1, 104, + -1, 120, -1, 103, -1, 151, -1, 166, 260, -1, + 260, 261, -1, 261, -1, 262, 289, -1, 6, -1, + 31, -1, 49, -1, 52, -1, 125, -1, 153, -1, + 154, -1, 155, -1, 156, -1, 161, -1, 275, -1, + 279, -1, 264, 289, -1, 265, 61, -1, 266, 158, + -1, 267, 158, -1, 60, 158, 202, -1, 38, -1, + 33, 268, -1, 80, 273, -1, 128, 286, -1, 147, + 269, -1, 168, 206, 271, -1, 171, 282, -1, 16, + -1, 113, -1, 161, -1, 35, -1, 76, -1, 54, + -1, 75, -1, 130, -1, 81, -1, 145, -1, 158, + -1, 158, 32, -1, -1, 158, 194, 158, 270, -1, + 27, -1, -1, -1, 271, 272, -1, 132, 61, -1, + 62, 206, -1, 273, 274, -1, 274, -1, 158, -1, + 276, 278, 277, -1, 276, 278, 158, -1, 62, -1, + 108, -1, 5, -1, 65, -1, 67, -1, 179, -1, + 79, -1, 55, -1, 34, -1, 141, 280, -1, 280, + 281, -1, 281, -1, 7, -1, 8, -1, 25, -1, + 64, -1, 94, -1, 159, -1, 164, -1, 282, 61, + -1, 61, -1, 283, 284, -1, 284, -1, 61, -1, + 285, -1, 195, 61, 36, 61, 196, -1, 286, 158, + -1, 158, -1, 287, 205, -1, 205, -1, 61, -1, + 169, -1, 39, -1, 61, -1, 32, -1, 291, 197, + 292, 295, 198, -1, 184, -1, 292, 293, 183, -1, + 293, 183, -1, 294, 194, 289, -1, 185, -1, 186, + -1, 295, 296, -1, 296, -1, 298, 197, 297, 299, + 198, -1, 187, 194, 289, 183, -1, 146, 194, 205, + -1, 299, 300, -1, 300, -1, 188, 194, 289, 197, + 301, 198, -1, 301, 302, 183, -1, 302, 183, -1, + 303, 194, 289, -1, 189, -1, 190, -1, 191, -1, + 192, -1, 193, -1 +}; + +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 366, 366, 370, 371, 372, 386, 387, 388, 389, - 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, - 407, 417, 418, 419, 420, 421, 425, 426, 431, 436, - 438, 444, 445, 453, 454, 455, 459, 464, 465, 466, - 467, 468, 469, 470, 471, 475, 477, 482, 483, 484, - 485, 486, 487, 491, 496, 505, 515, 516, 526, 528, - 530, 532, 543, 550, 552, 557, 559, 561, 563, 565, - 574, 580, 581, 589, 591, 603, 604, 605, 606, 607, - 616, 621, 626, 634, 636, 638, 643, 644, 645, 646, - 647, 648, 652, 653, 654, 655, 664, 666, 675, 685, - 690, 698, 699, 700, 701, 702, 703, 704, 705, 710, - 711, 719, 729, 738, 753, 758, 759, 763, 764, 768, - 769, 770, 771, 772, 773, 774, 783, 787, 791, 799, - 807, 815, 830, 845, 858, 859, 867, 868, 869, 870, - 871, 872, 873, 874, 875, 876, 877, 878, 879, 880, - 881, 885, 890, 898, 903, 904, 905, 909, 914, 922, - 927, 928, 929, 930, 931, 932, 933, 934, 942, 952, - 957, 965, 967, 969, 971, 973, 978, 979, 983, 984, - 985, 986, 994, 999, 1004, 1012, 1017, 1018, 1019, 1028, - 1030, 1035, 1040, 1048, 1050, 1067, 1068, 1069, 1070, 1071, - 1072, 1076, 1077, 1085, 1090, 1095, 1103, 1108, 1109, 1110, - 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1126, 1127, 1128, - 1135, 1142, 1158, 1177, 1182, 1184, 1186, 1188, 1190, 1197, - 1202, 1203, 1204, 1208, 1209, 1210, 1214, 1215, 1219, 1226, - 1236, 1245, 1250, 1252, 1257, 1258, 1266, 1268, 1276, 1281, - 1289, 1314, 1321, 1331, 1332, 1336, 1337, 1338, 1339, 1343, - 1344, 1345, 1349, 1354, 1359, 1367, 1368, 1369, 1370, 1371, - 1372, 1373, 1383, 1388, 1396, 1401, 1409, 1411, 1415, 1420, - 1425, 1433, 1438, 1446, 1455, 1456, 1460, 1461, 1470, 1488, - 1492, 1497, 1505, 1510, 1511, 1515, 1520, 1528, 1533, 1538, - 1543, 1548, 1556, 1561, 1566, 1574, 1579, 1580, 1581, 1582, - 1583 + 0, 366, 366, 370, 371, 372, 387, 388, 389, 390, + 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, + 408, 418, 419, 420, 421, 422, 426, 427, 432, 437, + 439, 445, 446, 454, 455, 456, 460, 465, 466, 467, + 468, 469, 470, 471, 472, 476, 478, 483, 484, 485, + 486, 487, 488, 492, 497, 506, 516, 517, 527, 529, + 531, 533, 544, 551, 553, 558, 560, 562, 564, 566, + 575, 581, 582, 590, 592, 604, 605, 606, 607, 608, + 617, 622, 627, 635, 637, 639, 644, 645, 646, 647, + 648, 649, 653, 654, 655, 656, 665, 667, 676, 686, + 691, 699, 700, 701, 702, 703, 704, 705, 706, 711, + 712, 720, 730, 739, 754, 759, 760, 764, 765, 769, + 770, 771, 772, 773, 774, 775, 784, 788, 792, 800, + 808, 816, 831, 846, 859, 860, 868, 869, 870, 871, + 872, 873, 874, 875, 876, 877, 878, 879, 880, 881, + 882, 886, 891, 899, 904, 905, 906, 910, 915, 923, + 928, 929, 930, 931, 932, 933, 934, 935, 943, 953, + 958, 966, 968, 970, 972, 974, 979, 980, 984, 985, + 986, 987, 995, 1000, 1005, 1013, 1018, 1019, 1020, 1029, + 1031, 1036, 1041, 1049, 1051, 1068, 1069, 1070, 1071, 1072, + 1073, 1077, 1078, 1086, 1091, 1096, 1104, 1109, 1110, 1111, + 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1127, 1128, 1129, + 1136, 1143, 1150, 1166, 1185, 1187, 1189, 1191, 1193, 1195, + 1202, 1207, 1208, 1209, 1213, 1217, 1226, 1227, 1228, 1232, + 1233, 1237, 1244, 1254, 1263, 1268, 1270, 1275, 1276, 1284, + 1286, 1294, 1299, 1307, 1332, 1339, 1349, 1350, 1354, 1355, + 1356, 1357, 1361, 1362, 1363, 1367, 1372, 1377, 1385, 1386, + 1387, 1388, 1389, 1390, 1391, 1401, 1406, 1414, 1419, 1427, + 1429, 1433, 1438, 1443, 1451, 1456, 1464, 1473, 1474, 1478, + 1479, 1488, 1506, 1510, 1515, 1523, 1528, 1529, 1533, 1538, + 1546, 1551, 1556, 1561, 1566, 1574, 1579, 1584, 1592, 1597, + 1598, 1599, 1600, 1601 }; #endif @@ -914,23 +1042,23 @@ static const char *const yytname[] = "T_Broadcastdelay", "T_Burst", "T_Calibrate", "T_Ceiling", "T_Clockstats", "T_Cohort", "T_ControlKey", "T_Crypto", "T_Cryptostats", "T_Ctl", "T_Day", "T_Default", "T_Digest", "T_Disable", "T_Discard", - "T_Dispersion", "T_Double", "T_Driftfile", "T_Drop", "T_Ellipsis", - "T_Enable", "T_End", "T_False", "T_File", "T_Filegen", "T_Filenum", - "T_Flag1", "T_Flag2", "T_Flag3", "T_Flag4", "T_Flake", "T_Floor", - "T_Freq", "T_Fudge", "T_Host", "T_Huffpuff", "T_Iburst", "T_Ident", - "T_Ignore", "T_Incalloc", "T_Incmem", "T_Initalloc", "T_Initmem", - "T_Includefile", "T_Integer", "T_Interface", "T_Intrange", "T_Io", - "T_Ipv4", "T_Ipv4_flag", "T_Ipv6", "T_Ipv6_flag", "T_Kernel", "T_Key", - "T_Keys", "T_Keysdir", "T_Kod", "T_Mssntp", "T_Leapfile", "T_Limited", - "T_Link", "T_Listen", "T_Logconfig", "T_Logfile", "T_Loopstats", - "T_Lowpriotrap", "T_Manycastclient", "T_Manycastserver", "T_Mask", - "T_Maxage", "T_Maxclock", "T_Maxdepth", "T_Maxdist", "T_Maxmem", - "T_Maxpoll", "T_Mdnstries", "T_Mem", "T_Memlock", "T_Minclock", - "T_Mindepth", "T_Mindist", "T_Minimum", "T_Minpoll", "T_Minsane", - "T_Mode", "T_Mode7", "T_Monitor", "T_Month", "T_Mru", - "T_Multicastclient", "T_Nic", "T_Nolink", "T_Nomodify", "T_Nomrulist", - "T_None", "T_Nonvolatile", "T_Nopeer", "T_Noquery", "T_Noselect", - "T_Noserve", "T_Notrap", "T_Notrust", "T_Ntp", "T_Ntpport", + "T_Dispersion", "T_Double", "T_Driftfile", "T_Drop", "T_Dscp", + "T_Ellipsis", "T_Enable", "T_End", "T_False", "T_File", "T_Filegen", + "T_Filenum", "T_Flag1", "T_Flag2", "T_Flag3", "T_Flag4", "T_Flake", + "T_Floor", "T_Freq", "T_Fudge", "T_Host", "T_Huffpuff", "T_Iburst", + "T_Ident", "T_Ignore", "T_Incalloc", "T_Incmem", "T_Initalloc", + "T_Initmem", "T_Includefile", "T_Integer", "T_Interface", "T_Intrange", + "T_Io", "T_Ipv4", "T_Ipv4_flag", "T_Ipv6", "T_Ipv6_flag", "T_Kernel", + "T_Key", "T_Keys", "T_Keysdir", "T_Kod", "T_Mssntp", "T_Leapfile", + "T_Leapsmearinterval", "T_Limited", "T_Link", "T_Listen", "T_Logconfig", + "T_Logfile", "T_Loopstats", "T_Lowpriotrap", "T_Manycastclient", + "T_Manycastserver", "T_Mask", "T_Maxage", "T_Maxclock", "T_Maxdepth", + "T_Maxdist", "T_Maxmem", "T_Maxpoll", "T_Mdnstries", "T_Mem", + "T_Memlock", "T_Minclock", "T_Mindepth", "T_Mindist", "T_Minimum", + "T_Minpoll", "T_Minsane", "T_Mode", "T_Mode7", "T_Monitor", "T_Month", + "T_Mru", "T_Multicastclient", "T_Nic", "T_Nolink", "T_Nomodify", + "T_Nomrulist", "T_None", "T_Nonvolatile", "T_Nopeer", "T_Noquery", + "T_Noselect", "T_Noserve", "T_Notrap", "T_Notrust", "T_Ntp", "T_Ntpport", "T_NtpSignDsocket", "T_Orphan", "T_Orphanwait", "T_Panic", "T_Peer", "T_Peerstats", "T_Phone", "T_Pid", "T_Pidfile", "T_Pool", "T_Port", "T_Preempt", "T_Prefer", "T_Protostats", "T_Pw", "T_Randfile", @@ -965,24 +1093,25 @@ static const char *const yytname[] = "system_option", "system_option_flag_keyword", "system_option_local_flag_keyword", "tinker_command", "tinker_option_list", "tinker_option", "tinker_option_keyword", - "miscellaneous_command", "misc_cmd_dbl_keyword", "misc_cmd_str_keyword", - "misc_cmd_str_lcl_keyword", "drift_parm", "variable_assign", - "t_default_or_zero", "trap_option_list", "trap_option", - "log_config_list", "log_config_command", "interface_command", - "interface_nic", "nic_rule_class", "nic_rule_action", "reset_command", - "counter_set_list", "counter_set_keyword", "integer_list", - "integer_list_range", "integer_list_range_elt", "integer_range", - "string_list", "address_list", "boolean", "number", "simulate_command", - "sim_conf_start", "sim_init_statement_list", "sim_init_statement", - "sim_init_keyword", "sim_server_list", "sim_server", "sim_server_offset", - "sim_server_name", "sim_act_list", "sim_act", "sim_act_stmt_list", - "sim_act_stmt", "sim_act_keyword", YY_NULLPTR + "miscellaneous_command", "misc_cmd_dbl_keyword", "misc_cmd_int_keyword", + "misc_cmd_str_keyword", "misc_cmd_str_lcl_keyword", "drift_parm", + "variable_assign", "t_default_or_zero", "trap_option_list", + "trap_option", "log_config_list", "log_config_command", + "interface_command", "interface_nic", "nic_rule_class", + "nic_rule_action", "reset_command", "counter_set_list", + "counter_set_keyword", "integer_list", "integer_list_range", + "integer_list_range_elt", "integer_range", "string_list", "address_list", + "boolean", "number", "simulate_command", "sim_conf_start", + "sim_init_statement_list", "sim_init_statement", "sim_init_keyword", + "sim_server_list", "sim_server", "sim_server_offset", "sim_server_name", + "sim_act_list", "sim_act", "sim_act_stmt_list", "sim_act_stmt", + "sim_act_keyword", YY_NULL }; #endif # ifdef YYPRINT -/* YYTOKNUM[NUM] -- (External) token number corresponding to the - (internal) symbol number NUM (which must be that of a token). */ +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, @@ -1004,372 +1133,48 @@ static const yytype_uint16 yytoknum[] = 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, - 445, 446, 61, 40, 41, 123, 125 + 445, 446, 447, 448, 61, 40, 41, 123, 125 }; # endif -#define YYPACT_NINF -182 - -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-182))) - -#define YYTABLE_NINF -7 - -#define yytable_value_is_error(Yytable_value) \ - 0 - - /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -static const yytype_int16 yypact[] = -{ - 18, -161, -18, -182, -182, -182, -10, -182, 189, 11, - -103, 189, -182, 7, -49, -182, -100, -182, -97, -90, - -182, -84, -182, -182, -49, 13, 365, -49, -182, -182, - -81, -182, -80, -182, -182, 20, 86, 104, 21, -33, - -182, -182, -73, 7, -72, -182, 51, 500, -71, -54, - 26, -182, -182, -182, 90, 205, -83, -182, -49, -182, - -49, -182, -182, -182, -182, -182, -182, -182, -182, -182, - -182, -8, -65, -51, -182, -9, -182, -182, -91, -182, - -182, -182, -15, -182, -182, -182, -182, -182, -182, -182, - -182, 189, -182, -182, -182, -182, -182, -182, 11, -182, - 46, 85, -182, 189, -182, -182, -182, -182, -182, -182, - -182, -182, -182, -182, -182, -182, 92, -182, -35, 366, - -182, -182, -182, -84, -182, -182, -49, -182, -182, -182, - -182, -182, -182, -182, -182, -182, 365, -182, 68, -49, - -182, -182, -23, -182, -182, -182, -182, -182, -182, -182, - -182, 86, -182, -182, 114, 121, -182, -182, 67, -182, - -182, -182, -182, -33, -182, 93, -28, -182, 7, -182, - -182, -182, -182, -182, -182, -182, -182, -182, -182, -182, - -182, 51, -182, -8, -182, -182, -17, -182, -182, -182, - -182, -182, -182, -182, -182, 500, -182, 107, -8, -182, - -182, 112, -54, -182, -182, -182, 113, -182, 8, -182, - -182, -182, -182, -182, -182, -182, -182, -182, -182, -182, - -2, -147, -182, -182, -182, -182, -182, 128, -182, 25, - -182, -182, -182, -182, 116, 37, -182, -182, -182, -182, - 38, 135, -182, -182, 92, -182, -8, -17, -182, -182, - -182, -182, -182, -182, -182, -182, 445, -182, -182, 445, - 445, -71, -182, -182, 40, -182, -182, -182, -182, -182, - -182, -182, -182, -182, -182, -52, 163, -182, -182, -182, - 261, -182, -182, -182, -182, -182, -182, -182, -182, -114, - 27, 14, -182, -182, -182, -182, 55, -182, -182, 0, - -182, -182, -182, -182, -182, -182, -182, -182, -182, -182, - -182, -182, -182, -182, -182, -182, -182, -182, -182, -182, - -182, -182, -182, -182, -182, 445, 445, -182, 185, -71, - 153, -182, 156, -182, -182, -182, -182, -182, -182, -182, - -182, -182, -182, -182, -182, -182, -182, -182, -182, -182, - -182, -182, -53, -182, 61, 30, 43, -133, -182, 23, - -182, -8, -182, -182, -182, -182, -182, -182, -182, -182, - -182, 445, -182, -182, -182, -182, 32, -182, -182, -182, - -49, -182, -182, -182, 45, -182, -182, -182, 41, 50, - -8, 47, -157, -182, 56, -8, -182, -182, -182, 49, - 130, -182, -182, -182, -182, -182, 110, 59, 54, -182, - 70, -182, -8, -182, -182 -}; - - /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE does not specify something else to do. Zero - means the default is an error. */ -static const yytype_uint16 yydefact[] = -{ - 0, 0, 0, 24, 58, 230, 0, 71, 0, 0, - 240, 0, 223, 0, 0, 233, 0, 253, 0, 0, - 234, 0, 236, 25, 0, 0, 0, 0, 254, 231, - 0, 23, 0, 235, 22, 0, 0, 0, 0, 0, - 237, 21, 0, 0, 0, 232, 0, 0, 0, 0, - 0, 56, 57, 289, 0, 2, 0, 7, 0, 8, - 0, 9, 10, 13, 11, 12, 14, 15, 16, 17, - 18, 0, 0, 0, 217, 0, 218, 19, 0, 5, - 62, 63, 64, 195, 196, 197, 198, 201, 199, 200, - 202, 190, 192, 193, 194, 154, 155, 156, 126, 152, - 0, 238, 224, 189, 101, 102, 103, 104, 108, 105, - 106, 107, 109, 29, 30, 28, 0, 26, 0, 6, - 65, 66, 250, 225, 249, 282, 59, 61, 160, 161, - 162, 163, 164, 165, 166, 167, 127, 158, 0, 60, - 70, 280, 226, 67, 265, 266, 267, 268, 269, 270, - 271, 262, 264, 134, 29, 30, 134, 134, 26, 68, - 188, 186, 187, 182, 184, 0, 0, 227, 96, 100, - 97, 207, 208, 209, 210, 211, 212, 213, 214, 215, - 216, 203, 205, 0, 91, 86, 0, 87, 95, 93, - 94, 92, 90, 88, 89, 80, 82, 0, 0, 244, - 276, 0, 69, 275, 277, 273, 229, 1, 0, 4, - 31, 55, 287, 286, 219, 220, 221, 261, 260, 259, - 0, 0, 79, 75, 76, 77, 78, 0, 72, 0, - 191, 151, 153, 239, 98, 0, 178, 179, 180, 181, - 0, 0, 176, 177, 168, 170, 0, 0, 27, 222, - 248, 281, 157, 159, 279, 263, 130, 134, 134, 133, - 128, 0, 183, 185, 0, 99, 204, 206, 285, 283, - 284, 85, 81, 83, 84, 228, 0, 274, 272, 3, - 20, 255, 256, 257, 252, 258, 251, 293, 294, 0, - 0, 0, 74, 73, 118, 117, 0, 115, 116, 0, - 110, 113, 114, 174, 175, 173, 169, 171, 172, 136, - 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, - 147, 148, 149, 150, 135, 131, 132, 134, 243, 0, - 0, 245, 0, 37, 38, 39, 54, 47, 49, 48, - 51, 40, 41, 42, 43, 50, 52, 44, 32, 33, - 36, 34, 0, 35, 0, 0, 0, 0, 296, 0, - 291, 0, 111, 125, 121, 123, 119, 120, 122, 124, - 112, 129, 242, 241, 247, 246, 0, 45, 46, 53, - 0, 290, 288, 295, 0, 292, 278, 299, 0, 0, - 0, 0, 0, 301, 0, 0, 297, 300, 298, 0, - 0, 306, 307, 308, 309, 310, 0, 0, 0, 302, - 0, 304, 0, 303, 305 -}; - - /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int16 yypgoto[] = -{ - -182, -182, -182, -45, -182, -182, -14, -36, -182, -182, - -182, -182, -182, -182, -182, -182, -182, -182, -182, -182, - -182, -182, -182, -182, -182, -182, 60, -182, -182, -182, - -182, -38, -182, -182, -182, -182, -182, -182, -142, -182, - -182, 134, -182, -182, 120, -182, -182, -182, 5, -182, - -182, -182, -182, 96, -182, -182, 250, -42, -182, -182, - -182, -182, 81, -182, -182, -182, -182, -182, -182, -182, - -182, -182, -182, -182, 140, -182, -182, -182, -182, -182, - -182, 117, -182, -182, 63, -182, -182, 240, 22, -181, - -182, -182, -182, -16, -182, -182, -86, -182, -182, -182, - -120, -182, -132, -182 -}; - - /* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int16 yydefgoto[] = -{ - -1, 54, 55, 56, 57, 58, 125, 117, 118, 280, - 348, 349, 350, 351, 352, 353, 354, 59, 60, 61, - 62, 82, 228, 229, 63, 195, 196, 197, 198, 64, - 168, 112, 234, 300, 301, 302, 370, 65, 256, 324, - 98, 99, 100, 136, 137, 138, 66, 244, 245, 246, - 247, 67, 163, 164, 165, 68, 91, 92, 93, 94, - 69, 181, 182, 183, 70, 71, 72, 73, 102, 167, - 373, 275, 331, 123, 124, 74, 75, 286, 220, 76, - 151, 152, 206, 202, 203, 204, 142, 126, 271, 214, - 77, 78, 289, 290, 291, 357, 358, 389, 359, 392, - 393, 406, 407, 408 -}; - - /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule whose - number is the opposite. If YYTABLE_NINF, syntax error. */ -static const yytype_int16 yytable[] = -{ - 116, 158, 267, 281, 363, 169, 200, 377, 160, 329, - 208, 355, 199, 222, 259, 260, 113, 274, 114, 1, - 79, 268, 95, 157, 212, 217, 364, 104, 2, 391, - 355, 105, 3, 4, 5, 223, 287, 288, 224, 396, - 6, 7, 80, 269, 210, 218, 211, 8, 9, 230, - 81, 10, 213, 101, 11, 12, 119, 171, 13, 120, - 161, 230, 282, 382, 283, 307, 121, 14, 219, 287, - 288, 15, 122, 127, 249, 140, 141, 16, 330, 17, - 143, 159, 172, 166, 170, 115, 205, 106, 18, 19, - 207, 215, 20, 144, 145, 235, 21, 22, 209, 173, - 23, 24, 174, 365, 221, 216, 232, 115, 96, 25, - 366, 146, 251, 97, 162, 325, 326, 233, 378, 225, - 226, 248, 26, 27, 28, 251, 227, 367, 253, 29, - 265, 153, 107, 254, 236, 237, 238, 239, 30, 201, - 108, 257, 31, 109, 32, 294, 33, 34, 258, 147, - 270, 261, 295, 263, 284, 296, 35, 36, 37, 38, - 39, 40, 41, 42, 264, 110, 43, 273, 44, 154, - 111, 155, 276, 278, 175, 285, 368, 45, 148, 369, - 385, 293, 46, 47, 48, 371, 49, 50, 292, 279, - 51, 52, 297, 303, 304, 305, 328, 83, 332, -6, - 53, 84, 176, 177, 178, 179, 361, 85, 360, 394, - 180, 362, 372, 375, 399, 2, 376, 379, 384, 3, - 4, 5, 380, 298, 381, 327, 386, 6, 7, 240, - 388, 414, 231, 390, 8, 9, 391, 398, 10, 395, - 411, 11, 12, 149, 400, 13, 412, 241, 150, 306, - 156, 413, 242, 243, 14, 272, 252, 86, 15, 262, - 115, 103, 266, 250, 16, 277, 17, 139, 255, 308, - 333, 383, 397, 356, 410, 18, 19, 0, 334, 20, - 0, 0, 0, 21, 22, 0, 299, 23, 24, 0, - 87, 88, 0, 374, 0, 0, 25, 401, 402, 403, - 404, 405, 0, 0, 0, 0, 409, 89, 0, 26, - 27, 28, 0, 335, 336, 0, 29, 401, 402, 403, - 404, 405, 0, 0, 0, 30, 0, 0, 0, 31, - 337, 32, 0, 33, 34, 0, 0, 0, 90, 0, - 0, 0, 0, 35, 36, 37, 38, 39, 40, 41, - 42, 338, 0, 43, 0, 44, 0, 0, 0, 339, - 0, 340, 0, 0, 45, 0, 387, 0, 0, 46, - 47, 48, 0, 49, 50, 341, 2, 51, 52, 0, - 3, 4, 5, 0, 0, 0, -6, 53, 6, 7, - 0, 0, 342, 343, 0, 8, 9, 0, 0, 10, - 0, 0, 11, 12, 0, 0, 13, 0, 0, 0, - 0, 0, 0, 0, 0, 14, 0, 0, 0, 15, - 128, 129, 130, 131, 0, 16, 0, 17, 344, 0, - 345, 0, 0, 0, 0, 346, 18, 19, 0, 347, - 20, 0, 0, 0, 21, 22, 0, 0, 23, 24, - 132, 0, 133, 0, 134, 0, 0, 25, 0, 0, - 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 26, 27, 28, 0, 0, 0, 0, 29, 0, 0, - 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, - 31, 309, 32, 0, 33, 34, 0, 0, 0, 310, - 0, 0, 0, 0, 35, 36, 37, 38, 39, 40, - 41, 42, 0, 184, 43, 0, 44, 311, 312, 185, - 313, 186, 0, 0, 0, 45, 314, 0, 0, 0, - 46, 47, 48, 0, 49, 50, 0, 0, 51, 52, - 0, 0, 0, 0, 0, 0, 0, 187, 53, 0, - 0, 0, 0, 315, 316, 0, 0, 317, 318, 0, - 319, 320, 321, 0, 322, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 188, 0, 189, 0, - 0, 0, 0, 0, 190, 0, 191, 0, 0, 192, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 323, - 0, 193, 194 -}; - -static const yytype_int16 yycheck[] = -{ - 14, 37, 183, 5, 4, 43, 60, 60, 41, 61, - 55, 144, 48, 28, 156, 157, 65, 198, 67, 1, - 181, 38, 11, 37, 32, 34, 26, 20, 10, 186, - 144, 24, 14, 15, 16, 50, 183, 184, 53, 196, - 22, 23, 60, 60, 58, 54, 60, 29, 30, 91, - 60, 33, 60, 156, 36, 37, 156, 6, 40, 156, - 93, 103, 64, 196, 66, 246, 156, 49, 77, 183, - 184, 53, 156, 60, 119, 156, 156, 59, 130, 61, - 60, 60, 31, 156, 156, 156, 60, 80, 70, 71, - 0, 156, 74, 7, 8, 3, 78, 79, 181, 48, - 82, 83, 51, 103, 195, 156, 60, 156, 97, 91, - 110, 25, 126, 102, 147, 257, 258, 32, 171, 134, - 135, 156, 104, 105, 106, 139, 141, 127, 60, 111, - 168, 27, 125, 156, 42, 43, 44, 45, 120, 193, - 133, 27, 124, 136, 126, 29, 128, 129, 27, 63, - 167, 84, 36, 60, 156, 39, 138, 139, 140, 141, - 142, 143, 144, 145, 192, 158, 148, 60, 150, 65, - 163, 67, 60, 60, 123, 177, 176, 159, 92, 179, - 361, 156, 164, 165, 166, 327, 168, 169, 60, 181, - 172, 173, 76, 156, 156, 60, 156, 8, 35, 181, - 182, 12, 151, 152, 153, 154, 192, 18, 181, 390, - 159, 156, 27, 60, 395, 10, 60, 156, 195, 14, - 15, 16, 192, 107, 181, 261, 194, 22, 23, 137, - 185, 412, 98, 192, 29, 30, 186, 181, 33, 192, - 181, 36, 37, 157, 195, 40, 192, 155, 162, 244, - 146, 181, 160, 161, 49, 195, 136, 68, 53, 163, - 156, 11, 181, 123, 59, 202, 61, 27, 151, 247, - 9, 357, 392, 289, 406, 70, 71, -1, 17, 74, - -1, -1, -1, 78, 79, -1, 170, 82, 83, -1, - 101, 102, -1, 329, -1, -1, 91, 187, 188, 189, - 190, 191, -1, -1, -1, -1, 196, 118, -1, 104, - 105, 106, -1, 52, 53, -1, 111, 187, 188, 189, - 190, 191, -1, -1, -1, 120, -1, -1, -1, 124, - 69, 126, -1, 128, 129, -1, -1, -1, 149, -1, - -1, -1, -1, 138, 139, 140, 141, 142, 143, 144, - 145, 90, -1, 148, -1, 150, -1, -1, -1, 98, - -1, 100, -1, -1, 159, -1, 380, -1, -1, 164, - 165, 166, -1, 168, 169, 114, 10, 172, 173, -1, - 14, 15, 16, -1, -1, -1, 181, 182, 22, 23, - -1, -1, 131, 132, -1, 29, 30, -1, -1, 33, - -1, -1, 36, 37, -1, -1, 40, -1, -1, -1, - -1, -1, -1, -1, -1, 49, -1, -1, -1, 53, - 55, 56, 57, 58, -1, 59, -1, 61, 167, -1, - 169, -1, -1, -1, -1, 174, 70, 71, -1, 178, - 74, -1, -1, -1, 78, 79, -1, -1, 82, 83, - 85, -1, 87, -1, 89, -1, -1, 91, -1, -1, - 95, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 104, 105, 106, -1, -1, -1, -1, 111, -1, -1, - -1, -1, -1, -1, -1, -1, 120, -1, -1, -1, - 124, 46, 126, -1, 128, 129, -1, -1, -1, 54, - -1, -1, -1, -1, 138, 139, 140, 141, 142, 143, - 144, 145, -1, 13, 148, -1, 150, 72, 73, 19, - 75, 21, -1, -1, -1, 159, 81, -1, -1, -1, - 164, 165, 166, -1, 168, 169, -1, -1, 172, 173, - -1, -1, -1, -1, -1, -1, -1, 47, 182, -1, - -1, -1, -1, 108, 109, -1, -1, 112, 113, -1, - 115, 116, 117, -1, 119, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 86, -1, 88, -1, - -1, -1, -1, -1, 94, -1, 96, -1, -1, 99, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 174, - -1, 121, 122 -}; - - /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint16 yystos[] = -{ - 0, 1, 10, 14, 15, 16, 22, 23, 29, 30, - 33, 36, 37, 40, 49, 53, 59, 61, 70, 71, - 74, 78, 79, 82, 83, 91, 104, 105, 106, 111, - 120, 124, 126, 128, 129, 138, 139, 140, 141, 142, - 143, 144, 145, 148, 150, 159, 164, 165, 166, 168, - 169, 172, 173, 182, 198, 199, 200, 201, 202, 214, - 215, 216, 217, 221, 226, 234, 243, 248, 252, 257, - 261, 262, 263, 264, 272, 273, 276, 287, 288, 181, - 60, 60, 218, 8, 12, 18, 68, 101, 102, 118, - 149, 253, 254, 255, 256, 11, 97, 102, 237, 238, - 239, 156, 265, 253, 20, 24, 80, 125, 133, 136, - 158, 163, 228, 65, 67, 156, 203, 204, 205, 156, - 156, 156, 156, 270, 271, 203, 284, 60, 55, 56, - 57, 58, 85, 87, 89, 95, 240, 241, 242, 284, - 156, 156, 283, 60, 7, 8, 25, 63, 92, 157, - 162, 277, 278, 27, 65, 67, 146, 203, 204, 60, - 41, 93, 147, 249, 250, 251, 156, 266, 227, 228, - 156, 6, 31, 48, 51, 123, 151, 152, 153, 154, - 159, 258, 259, 260, 13, 19, 21, 47, 86, 88, - 94, 96, 99, 121, 122, 222, 223, 224, 225, 204, - 60, 193, 280, 281, 282, 60, 279, 0, 200, 181, - 203, 203, 32, 60, 286, 156, 156, 34, 54, 77, - 275, 195, 28, 50, 53, 134, 135, 141, 219, 220, - 254, 238, 60, 32, 229, 3, 42, 43, 44, 45, - 137, 155, 160, 161, 244, 245, 246, 247, 156, 200, - 271, 203, 241, 60, 156, 278, 235, 27, 27, 235, - 235, 84, 250, 60, 192, 228, 259, 286, 38, 60, - 167, 285, 223, 60, 286, 268, 60, 281, 60, 181, - 206, 5, 64, 66, 156, 177, 274, 183, 184, 289, - 290, 291, 60, 156, 29, 36, 39, 76, 107, 170, - 230, 231, 232, 156, 156, 60, 245, 286, 285, 46, - 54, 72, 73, 75, 81, 108, 109, 112, 113, 115, - 116, 117, 119, 174, 236, 235, 235, 204, 156, 61, - 130, 269, 35, 9, 17, 52, 53, 69, 90, 98, - 100, 114, 131, 132, 167, 169, 174, 178, 207, 208, - 209, 210, 211, 212, 213, 144, 290, 292, 293, 295, - 181, 192, 156, 4, 26, 103, 110, 127, 176, 179, - 233, 235, 27, 267, 204, 60, 60, 60, 171, 156, - 192, 181, 196, 293, 195, 286, 194, 203, 185, 294, - 192, 186, 296, 297, 286, 192, 196, 297, 181, 286, - 195, 187, 188, 189, 190, 191, 298, 299, 300, 196, - 299, 181, 192, 181, 286 -}; - - /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 197, 198, 199, 199, 199, 200, 200, 200, 200, - 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 201, 202, 202, 202, 202, 202, 203, 203, 204, 205, - 205, 206, 206, 207, 207, 207, 208, 209, 209, 209, - 209, 209, 209, 209, 209, 210, 210, 211, 211, 211, - 211, 211, 211, 212, 213, 214, 215, 215, 216, 216, - 216, 216, 217, 217, 217, 217, 217, 217, 217, 217, - 217, 218, 218, 219, 219, 220, 220, 220, 220, 220, - 221, 222, 222, 223, 223, 223, 224, 224, 224, 224, - 224, 224, 225, 225, 225, 225, 226, 226, 226, 227, - 227, 228, 228, 228, 228, 228, 228, 228, 228, 229, - 229, 230, 230, 230, 230, 231, 231, 232, 232, 233, - 233, 233, 233, 233, 233, 233, 234, 234, 234, 234, - 234, 234, 234, 234, 235, 235, 236, 236, 236, 236, - 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, - 236, 237, 237, 238, 239, 239, 239, 240, 240, 241, - 242, 242, 242, 242, 242, 242, 242, 242, 243, 244, - 244, 245, 245, 245, 245, 245, 246, 246, 247, 247, - 247, 247, 248, 249, 249, 250, 251, 251, 251, 252, - 252, 253, 253, 254, 254, 255, 255, 255, 255, 255, - 255, 256, 256, 257, 258, 258, 259, 260, 260, 260, - 260, 260, 260, 260, 260, 260, 260, 261, 261, 261, - 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, - 262, 262, 262, 263, 263, 263, 264, 264, 265, 265, - 265, 266, 267, 267, 268, 268, 269, 269, 270, 270, - 271, 272, 272, 273, 273, 274, 274, 274, 274, 275, - 275, 275, 276, 277, 277, 278, 278, 278, 278, 278, - 278, 278, 279, 279, 280, 280, 281, 281, 282, 283, - 283, 284, 284, 285, 285, 285, 286, 286, 287, 288, - 289, 289, 290, 291, 291, 292, 292, 293, 294, 295, - 296, 296, 297, 298, 298, 299, 300, 300, 300, 300, - 300 + 0, 199, 200, 201, 201, 201, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 203, 204, 204, 204, 204, 204, 205, 205, 206, 207, + 207, 208, 208, 209, 209, 209, 210, 211, 211, 211, + 211, 211, 211, 211, 211, 212, 212, 213, 213, 213, + 213, 213, 213, 214, 215, 216, 217, 217, 218, 218, + 218, 218, 219, 219, 219, 219, 219, 219, 219, 219, + 219, 220, 220, 221, 221, 222, 222, 222, 222, 222, + 223, 224, 224, 225, 225, 225, 226, 226, 226, 226, + 226, 226, 227, 227, 227, 227, 228, 228, 228, 229, + 229, 230, 230, 230, 230, 230, 230, 230, 230, 231, + 231, 232, 232, 232, 232, 233, 233, 234, 234, 235, + 235, 235, 235, 235, 235, 235, 236, 236, 236, 236, + 236, 236, 236, 236, 237, 237, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 239, 239, 240, 241, 241, 241, 242, 242, 243, + 244, 244, 244, 244, 244, 244, 244, 244, 245, 246, + 246, 247, 247, 247, 247, 247, 248, 248, 249, 249, + 249, 249, 250, 251, 251, 252, 253, 253, 253, 254, + 254, 255, 255, 256, 256, 257, 257, 257, 257, 257, + 257, 258, 258, 259, 260, 260, 261, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 263, 263, 263, + 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, + 263, 264, 264, 264, 265, 265, 266, 266, 266, 267, + 267, 268, 268, 268, 269, 270, 270, 271, 271, 272, + 272, 273, 273, 274, 275, 275, 276, 276, 277, 277, + 277, 277, 278, 278, 278, 279, 280, 280, 281, 281, + 281, 281, 281, 281, 281, 282, 282, 283, 283, 284, + 284, 285, 286, 286, 287, 287, 288, 288, 288, 289, + 289, 290, 291, 292, 292, 293, 294, 294, 295, 295, + 296, 297, 298, 299, 299, 300, 301, 301, 302, 303, + 303, 303, 303, 303 }; - /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 1, 3, 2, 2, 0, 1, 1, 1, @@ -1394,28 +1199,368 @@ static const yytype_uint8 yyr2[] = 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 2, 2, 3, 1, 2, 2, 2, 2, 3, 2, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 0, 4, 1, 0, 0, 2, 2, 2, 2, 1, - 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 1, 2, 1, 1, 1, 5, 2, - 1, 2, 1, 1, 1, 1, 1, 1, 5, 1, - 3, 2, 3, 1, 1, 2, 1, 5, 4, 3, - 2, 1, 6, 3, 2, 3, 1, 1, 1, 1, - 1 + 2, 2, 2, 3, 1, 2, 2, 2, 2, 3, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 0, 4, 1, 0, 0, 2, 2, + 2, 2, 1, 1, 3, 3, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, + 1, 5, 2, 1, 2, 1, 1, 1, 1, 1, + 1, 5, 1, 3, 2, 3, 1, 1, 2, 1, + 5, 4, 3, 2, 1, 6, 3, 2, 3, 1, + 1, 1, 1, 1 }; +/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const yytype_uint16 yydefact[] = +{ + 0, 0, 0, 24, 58, 231, 0, 71, 0, 0, + 243, 234, 0, 224, 0, 0, 236, 0, 256, 0, + 0, 237, 235, 0, 239, 25, 0, 0, 0, 0, + 257, 232, 0, 23, 0, 238, 22, 0, 0, 0, + 0, 0, 240, 21, 0, 0, 0, 233, 0, 0, + 0, 0, 0, 56, 57, 292, 0, 2, 0, 7, + 0, 8, 0, 9, 10, 13, 11, 12, 14, 15, + 16, 17, 18, 0, 0, 0, 0, 217, 0, 218, + 19, 0, 5, 62, 63, 64, 195, 196, 197, 198, + 201, 199, 200, 202, 190, 192, 193, 194, 154, 155, + 156, 126, 152, 0, 241, 225, 189, 101, 102, 103, + 104, 108, 105, 106, 107, 109, 29, 30, 28, 0, + 26, 0, 6, 65, 66, 253, 226, 252, 285, 59, + 61, 160, 161, 162, 163, 164, 165, 166, 167, 127, + 158, 0, 60, 70, 283, 227, 67, 268, 269, 270, + 271, 272, 273, 274, 265, 267, 134, 29, 30, 134, + 134, 26, 68, 188, 186, 187, 182, 184, 0, 0, + 228, 96, 100, 97, 207, 208, 209, 210, 211, 212, + 213, 214, 215, 216, 203, 205, 0, 91, 86, 0, + 87, 95, 93, 94, 92, 90, 88, 89, 80, 82, + 0, 0, 247, 279, 0, 69, 278, 280, 276, 230, + 1, 0, 4, 31, 55, 290, 289, 219, 220, 221, + 222, 264, 263, 262, 0, 0, 79, 75, 76, 77, + 78, 0, 72, 0, 191, 151, 153, 242, 98, 0, + 178, 179, 180, 181, 0, 0, 176, 177, 168, 170, + 0, 0, 27, 223, 251, 284, 157, 159, 282, 266, + 130, 134, 134, 133, 128, 0, 183, 185, 0, 99, + 204, 206, 288, 286, 287, 85, 81, 83, 84, 229, + 0, 277, 275, 3, 20, 258, 259, 260, 255, 261, + 254, 296, 297, 0, 0, 0, 74, 73, 118, 117, + 0, 115, 116, 0, 110, 113, 114, 174, 175, 173, + 169, 171, 172, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 149, 150, 135, 131, + 132, 134, 246, 0, 0, 248, 0, 37, 38, 39, + 54, 47, 49, 48, 51, 40, 41, 42, 43, 50, + 52, 44, 32, 33, 36, 34, 0, 35, 0, 0, + 0, 0, 299, 0, 294, 0, 111, 125, 121, 123, + 119, 120, 122, 124, 112, 129, 245, 244, 250, 249, + 0, 45, 46, 53, 0, 293, 291, 298, 0, 295, + 281, 302, 0, 0, 0, 0, 0, 304, 0, 0, + 300, 303, 301, 0, 0, 309, 310, 311, 312, 313, + 0, 0, 0, 305, 0, 307, 0, 306, 308 +}; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = +{ + -1, 56, 57, 58, 59, 60, 128, 120, 121, 284, + 352, 353, 354, 355, 356, 357, 358, 61, 62, 63, + 64, 85, 232, 233, 65, 198, 199, 200, 201, 66, + 171, 115, 238, 304, 305, 306, 374, 67, 260, 328, + 101, 102, 103, 139, 140, 141, 68, 248, 249, 250, + 251, 69, 166, 167, 168, 70, 94, 95, 96, 97, + 71, 184, 185, 186, 72, 73, 74, 75, 76, 105, + 170, 377, 279, 335, 126, 127, 77, 78, 290, 224, + 79, 154, 155, 209, 205, 206, 207, 145, 129, 275, + 217, 80, 81, 293, 294, 295, 361, 362, 393, 363, + 396, 397, 410, 411, 412 +}; -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -185 +static const yytype_int16 yypact[] = +{ + 78, -169, -34, -185, -185, -185, -29, -185, 17, 43, + -124, -185, 17, -185, -5, -27, -185, -121, -185, -112, + -110, -185, -185, -100, -185, -185, -27, 0, 116, -27, + -185, -185, -91, -185, -89, -185, -185, 11, 35, 30, + 13, 31, -185, -185, -83, -5, -78, -185, 186, 523, + -76, -56, 15, -185, -185, -185, 83, 244, -99, -185, + -27, -185, -27, -185, -185, -185, -185, -185, -185, -185, + -185, -185, -185, -12, 24, -71, -69, -185, -11, -185, + -185, -107, -185, -185, -185, 8, -185, -185, -185, -185, + -185, -185, -185, -185, 17, -185, -185, -185, -185, -185, + -185, 43, -185, 34, 59, -185, 17, -185, -185, -185, + -185, -185, -185, -185, -185, -185, -185, -185, -185, 7, + -185, -61, 407, -185, -185, -185, -100, -185, -185, -27, + -185, -185, -185, -185, -185, -185, -185, -185, -185, 116, + -185, 44, -27, -185, -185, -52, -185, -185, -185, -185, + -185, -185, -185, -185, 35, -185, -185, 85, 96, -185, + -185, 39, -185, -185, -185, -185, 31, -185, 75, -46, + -185, -5, -185, -185, -185, -185, -185, -185, -185, -185, + -185, -185, -185, -185, 186, -185, -12, -185, -185, -35, + -185, -185, -185, -185, -185, -185, -185, -185, 523, -185, + 82, -12, -185, -185, 91, -56, -185, -185, -185, 100, + -185, -26, -185, -185, -185, -185, -185, -185, -185, -185, + -185, -185, -185, -185, -2, -130, -185, -185, -185, -185, + -185, 105, -185, 9, -185, -185, -185, -185, -7, 18, + -185, -185, -185, -185, 25, 121, -185, -185, 7, -185, + -12, -35, -185, -185, -185, -185, -185, -185, -185, -185, + 391, -185, -185, 391, 391, -76, -185, -185, 29, -185, + -185, -185, -185, -185, -185, -185, -185, -185, -185, -51, + 153, -185, -185, -185, 464, -185, -185, -185, -185, -185, + -185, -185, -185, -82, 14, 1, -185, -185, -185, -185, + 38, -185, -185, 12, -185, -185, -185, -185, -185, -185, + -185, -185, -185, -185, -185, -185, -185, -185, -185, -185, + -185, -185, -185, -185, -185, -185, -185, -185, -185, 391, + 391, -185, 171, -76, 140, -185, 141, -185, -185, -185, + -185, -185, -185, -185, -185, -185, -185, -185, -185, -185, + -185, -185, -185, -185, -185, -185, -55, -185, 53, 20, + 33, -128, -185, 32, -185, -12, -185, -185, -185, -185, + -185, -185, -185, -185, -185, 391, -185, -185, -185, -185, + 16, -185, -185, -185, -27, -185, -185, -185, 46, -185, + -185, -185, 37, 48, -12, 40, -167, -185, 54, -12, + -185, -185, -185, 45, 79, -185, -185, -185, -185, -185, + 98, 57, 47, -185, 60, -185, -12, -185, -185 +}; +/* YYPGOTO[NTERM-NUM]. */ +static const yytype_int16 yypgoto[] = +{ + -185, -185, -185, -44, -185, -185, -15, -38, -185, -185, + -185, -185, -185, -185, -185, -185, -185, -185, -185, -185, + -185, -185, -185, -185, -185, -185, 28, -185, -185, -185, + -185, -36, -185, -185, -185, -185, -185, -185, -152, -185, + -185, 146, -185, -185, 111, -185, -185, -185, 3, -185, + -185, -185, -185, 89, -185, -185, 245, -66, -185, -185, + -185, -185, 72, -185, -185, -185, -185, -185, -185, -185, + -185, -185, -185, -185, -185, 137, -185, -185, -185, -185, + -185, -185, 110, -185, -185, 70, -185, -185, 236, 27, + -184, -185, -185, -185, -17, -185, -185, -81, -185, -185, + -185, -113, -185, -126, -185 +}; + +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -7 +static const yytype_int16 yytable[] = +{ + 119, 161, 271, 285, 272, 203, 381, 263, 264, 172, + 239, 333, 202, 211, 82, 107, 367, 278, 359, 108, + 215, 395, 298, 221, 160, 86, 273, 83, 234, 87, + 299, 400, 84, 300, 104, 88, 226, 122, 368, 116, + 234, 117, 147, 148, 222, 213, 123, 214, 124, 216, + 240, 241, 242, 243, 98, 291, 292, 156, 125, 227, + 149, 130, 228, 286, 359, 287, 311, 143, 223, 144, + 386, 301, 146, 163, 162, 169, 208, 109, 253, 1, + 173, 334, 118, 210, 212, 218, 89, 219, 2, 220, + 225, 237, 3, 4, 5, 236, 157, 252, 158, 150, + 6, 7, 302, 291, 292, 257, 258, 8, 9, 329, + 330, 10, 261, 11, 255, 12, 13, 369, 382, 14, + 90, 91, 110, 262, 370, 265, 164, 255, 15, 151, + 111, 118, 16, 112, 274, 269, 267, 92, 17, 204, + 18, 371, 99, 277, 229, 230, 244, 100, 268, 19, + 20, 231, 280, 21, 22, 113, 288, 283, 23, 24, + 114, 282, 25, 26, 245, 303, 296, 297, 93, 246, + 247, 27, 131, 132, 133, 134, 307, 289, 159, 375, + 165, 389, 309, 308, 28, 29, 30, 332, 118, 336, + 372, 31, 174, 373, 152, 365, 366, 364, 376, 153, + 32, 379, 380, 135, 33, 136, 34, 137, 35, 36, + 398, 383, 390, 138, 384, 403, 385, 175, 37, 38, + 39, 40, 41, 42, 43, 44, 276, 331, 45, 388, + 46, 394, 418, 392, 399, 176, 395, 402, 177, 47, + 415, 416, 404, 417, 48, 49, 50, 235, 51, 52, + 256, 310, 53, 54, 2, 266, 270, 106, 3, 4, + 5, -6, 55, 254, 259, 142, 6, 7, 405, 406, + 407, 408, 409, 8, 9, 281, 360, 10, 312, 11, + 387, 12, 13, 401, 414, 14, 0, 405, 406, 407, + 408, 409, 0, 0, 15, 378, 413, 0, 16, 0, + 0, 0, 0, 0, 17, 0, 18, 0, 0, 0, + 0, 178, 0, 0, 0, 19, 20, 0, 0, 21, + 22, 0, 0, 0, 23, 24, 0, 0, 25, 26, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 179, + 180, 181, 182, 0, 0, 0, 0, 183, 0, 0, + 28, 29, 30, 0, 0, 0, 0, 31, 0, 0, + 0, 0, 0, 0, 0, 0, 32, 0, 0, 391, + 33, 0, 34, 0, 35, 36, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 38, 39, 40, 41, 42, + 43, 44, 0, 0, 45, 0, 46, 0, 0, 0, + 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, + 48, 49, 50, 0, 51, 52, 0, 2, 53, 54, + 0, 3, 4, 5, 0, 0, 0, -6, 55, 6, + 7, 0, 0, 0, 0, 0, 8, 9, 313, 0, + 10, 0, 11, 0, 12, 13, 314, 0, 14, 0, + 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, + 0, 16, 0, 0, 315, 316, 0, 17, 317, 18, + 0, 0, 0, 337, 318, 0, 0, 0, 19, 20, + 0, 338, 21, 22, 0, 0, 0, 23, 24, 0, + 0, 25, 26, 0, 0, 0, 0, 0, 0, 0, + 27, 319, 320, 0, 0, 321, 322, 0, 323, 324, + 325, 0, 326, 28, 29, 30, 0, 339, 340, 0, + 31, 0, 0, 0, 0, 0, 0, 0, 0, 32, + 0, 0, 0, 33, 341, 34, 187, 35, 36, 0, + 0, 0, 188, 0, 189, 0, 0, 37, 38, 39, + 40, 41, 42, 43, 44, 0, 342, 45, 0, 46, + 0, 0, 0, 0, 343, 0, 344, 327, 47, 0, + 0, 190, 0, 48, 49, 50, 0, 51, 52, 0, + 345, 53, 54, 0, 0, 0, 0, 0, 0, 0, + 0, 55, 0, 0, 0, 0, 0, 346, 347, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 191, 0, 192, 0, 0, 0, 0, 0, 193, + 0, 194, 0, 0, 195, 0, 0, 0, 0, 0, + 0, 0, 0, 348, 0, 349, 0, 0, 0, 0, + 350, 0, 0, 0, 351, 0, 196, 197 +}; + +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-185))) + +#define yytable_value_is_error(Yytable_value) \ + YYID (0) + +static const yytype_int16 yycheck[] = +{ + 15, 39, 186, 5, 39, 61, 61, 159, 160, 45, + 3, 62, 50, 57, 183, 20, 4, 201, 146, 24, + 32, 188, 29, 34, 39, 8, 61, 61, 94, 12, + 37, 198, 61, 40, 158, 18, 28, 158, 26, 66, + 106, 68, 7, 8, 55, 60, 158, 62, 158, 61, + 43, 44, 45, 46, 11, 185, 186, 27, 158, 51, + 25, 61, 54, 65, 146, 67, 250, 158, 79, 158, + 198, 78, 61, 42, 61, 158, 61, 82, 122, 1, + 158, 132, 158, 0, 183, 61, 69, 158, 10, 158, + 197, 32, 14, 15, 16, 61, 66, 158, 68, 64, + 22, 23, 109, 185, 186, 61, 158, 29, 30, 261, + 262, 33, 27, 35, 129, 37, 38, 105, 173, 41, + 103, 104, 127, 27, 112, 86, 95, 142, 50, 94, + 135, 158, 54, 138, 169, 171, 61, 120, 60, 195, + 62, 129, 99, 61, 136, 137, 139, 104, 194, 71, + 72, 143, 61, 75, 76, 160, 158, 183, 80, 81, + 165, 61, 84, 85, 157, 172, 61, 158, 151, 162, + 163, 93, 56, 57, 58, 59, 158, 179, 148, 331, + 149, 365, 61, 158, 106, 107, 108, 158, 158, 36, + 178, 113, 6, 181, 159, 194, 158, 183, 27, 164, + 122, 61, 61, 87, 126, 89, 128, 91, 130, 131, + 394, 158, 196, 97, 194, 399, 183, 31, 140, 141, + 142, 143, 144, 145, 146, 147, 198, 265, 150, 197, + 152, 194, 416, 187, 194, 49, 188, 183, 52, 161, + 183, 194, 197, 183, 166, 167, 168, 101, 170, 171, + 139, 248, 174, 175, 10, 166, 184, 12, 14, 15, + 16, 183, 184, 126, 154, 29, 22, 23, 189, 190, + 191, 192, 193, 29, 30, 205, 293, 33, 251, 35, + 361, 37, 38, 396, 410, 41, -1, 189, 190, 191, + 192, 193, -1, -1, 50, 333, 198, -1, 54, -1, + -1, -1, -1, -1, 60, -1, 62, -1, -1, -1, + -1, 125, -1, -1, -1, 71, 72, -1, -1, 75, + 76, -1, -1, -1, 80, 81, -1, -1, 84, 85, + -1, -1, -1, -1, -1, -1, -1, 93, -1, 153, + 154, 155, 156, -1, -1, -1, -1, 161, -1, -1, + 106, 107, 108, -1, -1, -1, -1, 113, -1, -1, + -1, -1, -1, -1, -1, -1, 122, -1, -1, 384, + 126, -1, 128, -1, 130, 131, -1, -1, -1, -1, + -1, -1, -1, -1, 140, 141, 142, 143, 144, 145, + 146, 147, -1, -1, 150, -1, 152, -1, -1, -1, + -1, -1, -1, -1, -1, 161, -1, -1, -1, -1, + 166, 167, 168, -1, 170, 171, -1, 10, 174, 175, + -1, 14, 15, 16, -1, -1, -1, 183, 184, 22, + 23, -1, -1, -1, -1, -1, 29, 30, 47, -1, + 33, -1, 35, -1, 37, 38, 55, -1, 41, -1, + -1, -1, -1, -1, -1, -1, -1, 50, -1, -1, + -1, 54, -1, -1, 73, 74, -1, 60, 77, 62, + -1, -1, -1, 9, 83, -1, -1, -1, 71, 72, + -1, 17, 75, 76, -1, -1, -1, 80, 81, -1, + -1, 84, 85, -1, -1, -1, -1, -1, -1, -1, + 93, 110, 111, -1, -1, 114, 115, -1, 117, 118, + 119, -1, 121, 106, 107, 108, -1, 53, 54, -1, + 113, -1, -1, -1, -1, -1, -1, -1, -1, 122, + -1, -1, -1, 126, 70, 128, 13, 130, 131, -1, + -1, -1, 19, -1, 21, -1, -1, 140, 141, 142, + 143, 144, 145, 146, 147, -1, 92, 150, -1, 152, + -1, -1, -1, -1, 100, -1, 102, 176, 161, -1, + -1, 48, -1, 166, 167, 168, -1, 170, 171, -1, + 116, 174, 175, -1, -1, -1, -1, -1, -1, -1, + -1, 184, -1, -1, -1, -1, -1, 133, 134, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 88, -1, 90, -1, -1, -1, -1, -1, 96, + -1, 98, -1, -1, 101, -1, -1, -1, -1, -1, + -1, -1, -1, 169, -1, 171, -1, -1, -1, -1, + 176, -1, -1, -1, 180, -1, 123, 124 +}; + +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint16 yystos[] = +{ + 0, 1, 10, 14, 15, 16, 22, 23, 29, 30, + 33, 35, 37, 38, 41, 50, 54, 60, 62, 71, + 72, 75, 76, 80, 81, 84, 85, 93, 106, 107, + 108, 113, 122, 126, 128, 130, 131, 140, 141, 142, + 143, 144, 145, 146, 147, 150, 152, 161, 166, 167, + 168, 170, 171, 174, 175, 184, 200, 201, 202, 203, + 204, 216, 217, 218, 219, 223, 228, 236, 245, 250, + 254, 259, 263, 264, 265, 266, 267, 275, 276, 279, + 290, 291, 183, 61, 61, 220, 8, 12, 18, 69, + 103, 104, 120, 151, 255, 256, 257, 258, 11, 99, + 104, 239, 240, 241, 158, 268, 255, 20, 24, 82, + 127, 135, 138, 160, 165, 230, 66, 68, 158, 205, + 206, 207, 158, 158, 158, 158, 273, 274, 205, 287, + 61, 56, 57, 58, 59, 87, 89, 91, 97, 242, + 243, 244, 287, 158, 158, 286, 61, 7, 8, 25, + 64, 94, 159, 164, 280, 281, 27, 66, 68, 148, + 205, 206, 61, 42, 95, 149, 251, 252, 253, 158, + 269, 229, 230, 158, 6, 31, 49, 52, 125, 153, + 154, 155, 156, 161, 260, 261, 262, 13, 19, 21, + 48, 88, 90, 96, 98, 101, 123, 124, 224, 225, + 226, 227, 206, 61, 195, 283, 284, 285, 61, 282, + 0, 202, 183, 205, 205, 32, 61, 289, 61, 158, + 158, 34, 55, 79, 278, 197, 28, 51, 54, 136, + 137, 143, 221, 222, 256, 240, 61, 32, 231, 3, + 43, 44, 45, 46, 139, 157, 162, 163, 246, 247, + 248, 249, 158, 202, 274, 205, 243, 61, 158, 281, + 237, 27, 27, 237, 237, 86, 252, 61, 194, 230, + 261, 289, 39, 61, 169, 288, 225, 61, 289, 271, + 61, 284, 61, 183, 208, 5, 65, 67, 158, 179, + 277, 185, 186, 292, 293, 294, 61, 158, 29, 37, + 40, 78, 109, 172, 232, 233, 234, 158, 158, 61, + 247, 289, 288, 47, 55, 73, 74, 77, 83, 110, + 111, 114, 115, 117, 118, 119, 121, 176, 238, 237, + 237, 206, 158, 62, 132, 272, 36, 9, 17, 53, + 54, 70, 92, 100, 102, 116, 133, 134, 169, 171, + 176, 180, 209, 210, 211, 212, 213, 214, 215, 146, + 293, 295, 296, 298, 183, 194, 158, 4, 26, 105, + 112, 129, 178, 181, 235, 237, 27, 270, 206, 61, + 61, 61, 173, 158, 194, 183, 198, 296, 197, 289, + 196, 205, 187, 297, 194, 188, 299, 300, 289, 194, + 198, 300, 183, 289, 197, 189, 190, 191, 192, 193, + 301, 302, 303, 198, 302, 183, 194, 183, 289 +}; + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ + +#define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -1431,16 +1576,28 @@ do \ } \ else \ { \ - yyerror (ip_file, YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (0) + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (YYID (0)) /* Error token number */ -#define YYTERROR 1 -#define YYERRCODE 256 +#define YYTERROR 1 +#define YYERRCODE 256 +/* This macro is provided for backward compatibility. */ +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif + + +/* YYLEX -- calling `yylex' with the right arguments. */ +#ifdef YYLEX_PARAM +# define YYLEX yylex (YYLEX_PARAM) +#else +# define YYLEX yylex () +#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -1450,45 +1607,50 @@ while (0) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (0) +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (YYID (0)) -/* This macro is provided for backward compatibility. */ -#ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -#endif +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value, ip_file); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (0) - - -/*----------------------------------------. -| Print this symbol's value on YYOUTPUT. | -`----------------------------------------*/ +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct FILE_INFO *ip_file) +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif { FILE *yyo = yyoutput; YYUSE (yyo); - YYUSE (ip_file); if (!yyvaluep) return; # ifdef YYPRINT if (yytype < YYNTOKENS) YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); # endif YYUSE (yytype); } @@ -1498,13 +1660,24 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue | Print this symbol on YYOUTPUT. | `--------------------------------*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct FILE_INFO *ip_file) +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif { - YYFPRINTF (yyoutput, "%s %s (", - yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - yy_symbol_value_print (yyoutput, yytype, yyvaluep, ip_file); + yy_symbol_value_print (yyoutput, yytype, yyvaluep); YYFPRINTF (yyoutput, ")"); } @@ -1513,8 +1686,16 @@ yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, str | TOP (included). | `------------------------------------------------------------------*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +#else +static void +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; +#endif { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -1525,42 +1706,49 @@ yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (0) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (YYID (0)) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, struct FILE_INFO *ip_file) +yy_reduce_print (YYSTYPE *yyvsp, int yyrule) +#else +static void +yy_reduce_print (yyvsp, yyrule) + YYSTYPE *yyvsp; + int yyrule; +#endif { - unsigned long int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; + unsigned long int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, - yystos[yyssp[yyi + 1 - yynrhs]], - &(yyvsp[(yyi + 1) - (yynrhs)]) - , ip_file); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyssp, yyvsp, Rule, ip_file); \ -} while (0) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyvsp, Rule); \ +} while (YYID (0)) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -1574,7 +1762,7 @@ int yydebug; /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1597,8 +1785,15 @@ int yydebug; # define yystrlen strlen # else /* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) +#else +static YYSIZE_T +yystrlen (yystr) + const char *yystr; +#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -1614,8 +1809,16 @@ yystrlen (const char *yystr) # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static char * yystpcpy (char *yydest, const char *yysrc) +#else +static char * +yystpcpy (yydest, yysrc) + char *yydest; + const char *yysrc; +#endif { char *yyd = yydest; const char *yys = yysrc; @@ -1645,27 +1848,27 @@ yytnamerr (char *yyres, const char *yystr) char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -1688,11 +1891,11 @@ static int yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); YYSIZE_T yysize = yysize0; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = YY_NULLPTR; + const char *yyformat = YY_NULL; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1700,6 +1903,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, int yycount = 0; /* There are many possibilities here to consider: + - Assume YYFAIL is not used. It's too flawed to consider. See + + for details. YYERROR is fine as it does not invoke this + function. - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected @@ -1749,7 +1956,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, } yyarg[yycount++] = yytname[yyx]; { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) return 2; @@ -1816,18 +2023,26 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, | Release the memory associated to this symbol. | `-----------------------------------------------*/ +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct FILE_INFO *ip_file) +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +#else +static void +yydestruct (yymsg, yytype, yyvaluep) + const char *yymsg; + int yytype; + YYSTYPE *yyvaluep; +#endif { YYUSE (yyvaluep); - YYUSE (ip_file); + if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YYUSE (yytype); - YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -1836,8 +2051,18 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct FILE_INFO * /* The lookahead symbol. */ int yychar; + +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); + /* Number of syntax errors so far. */ int yynerrs; @@ -1846,16 +2071,35 @@ int yynerrs; | yyparse. | `----------*/ +#ifdef YYPARSE_PARAM +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) int -yyparse (struct FILE_INFO *ip_file) +yyparse (void *YYPARSE_PARAM) +#else +int +yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +#endif +#else /* ! YYPARSE_PARAM */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void) +#else +int +yyparse () + +#endif +#endif { int yystate; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; /* The stacks and their tools: - 'yyss': related to states. - 'yyvs': related to semantic values. + `yyss': related to states. + `yyvs': related to semantic values. Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ @@ -1923,23 +2167,23 @@ yyparse (struct FILE_INFO *ip_file) #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); - yyss = yyss1; - yyvs = yyvs1; + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -1947,22 +2191,22 @@ yyparse (struct FILE_INFO *ip_file) # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -1971,10 +2215,10 @@ yyparse (struct FILE_INFO *ip_file) yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -2003,7 +2247,7 @@ yyparse (struct FILE_INFO *ip_file) if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = yylex (ip_file); + yychar = YYLEX; } if (yychar <= YYEOF) @@ -2068,7 +2312,7 @@ yyparse (struct FILE_INFO *ip_file) yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - '$$ = $1'. + `$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -2082,1257 +2326,1277 @@ yyparse (struct FILE_INFO *ip_file) switch (yyn) { case 5: -#line 373 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 373 "../../ntpd/ntp_parser.y" { /* I will need to incorporate much more fine grained * error messages. The following should suffice for * the time being. */ - msyslog(LOG_ERR, + struct FILE_INFO * ip_ctx = lex_current(); + msyslog(LOG_ERR, "syntax error in %s line %d, column %d", - ip_file->fname, - ip_file->err_line_no, - ip_file->err_col_no); + ip_ctx->fname, + ip_ctx->errpos.nline, + ip_ctx->errpos.ncol); } -#line 2098 "ntp_parser.c" /* yacc.c:1646 */ break; case 20: -#line 408 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 409 "../../ntpd/ntp_parser.y" { peer_node *my_node; - my_node = create_peer_node((yyvsp[-2].Integer), (yyvsp[-1].Address_node), (yyvsp[0].Attr_val_fifo)); + my_node = create_peer_node((yyvsp[(1) - (3)].Integer), (yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Attr_val_fifo)); APPEND_G_FIFO(cfgt.peers, my_node); } -#line 2109 "ntp_parser.c" /* yacc.c:1646 */ break; case 27: -#line 427 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Address_node) = create_address_node((yyvsp[0].String), (yyvsp[-1].Integer)); } -#line 2115 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 428 "../../ntpd/ntp_parser.y" + { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), (yyvsp[(1) - (2)].Integer)); } break; case 28: -#line 432 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Address_node) = create_address_node((yyvsp[0].String), AF_UNSPEC); } -#line 2121 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 433 "../../ntpd/ntp_parser.y" + { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), AF_UNSPEC); } break; case 29: -#line 437 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 438 "../../ntpd/ntp_parser.y" { (yyval.Integer) = AF_INET; } -#line 2127 "ntp_parser.c" /* yacc.c:1646 */ break; case 30: -#line 439 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 440 "../../ntpd/ntp_parser.y" { (yyval.Integer) = AF_INET6; } -#line 2133 "ntp_parser.c" /* yacc.c:1646 */ break; case 31: -#line 444 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 445 "../../ntpd/ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; } -#line 2139 "ntp_parser.c" /* yacc.c:1646 */ break; case 32: -#line 446 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 447 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); } -#line 2148 "ntp_parser.c" /* yacc.c:1646 */ break; case 36: -#line 460 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); } -#line 2154 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 461 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 45: -#line 476 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } -#line 2160 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 477 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 46: -#line 478 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_uval((yyvsp[-1].Integer), (yyvsp[0].Integer)); } -#line 2166 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 479 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_uval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 53: -#line 492 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } -#line 2172 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 493 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 55: -#line 506 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 507 "../../ntpd/ntp_parser.y" { unpeer_node *my_node; - - my_node = create_unpeer_node((yyvsp[0].Address_node)); + + my_node = create_unpeer_node((yyvsp[(2) - (2)].Address_node)); if (my_node) APPEND_G_FIFO(cfgt.unpeers, my_node); } -#line 2184 "ntp_parser.c" /* yacc.c:1646 */ break; case 58: -#line 527 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 528 "../../ntpd/ntp_parser.y" { cfgt.broadcastclient = 1; } -#line 2190 "ntp_parser.c" /* yacc.c:1646 */ break; case 59: -#line 529 "ntp_parser.y" /* yacc.c:1646 */ - { CONCAT_G_FIFOS(cfgt.manycastserver, (yyvsp[0].Address_fifo)); } -#line 2196 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 530 "../../ntpd/ntp_parser.y" + { CONCAT_G_FIFOS(cfgt.manycastserver, (yyvsp[(2) - (2)].Address_fifo)); } break; case 60: -#line 531 "ntp_parser.y" /* yacc.c:1646 */ - { CONCAT_G_FIFOS(cfgt.multicastclient, (yyvsp[0].Address_fifo)); } -#line 2202 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 532 "../../ntpd/ntp_parser.y" + { CONCAT_G_FIFOS(cfgt.multicastclient, (yyvsp[(2) - (2)].Address_fifo)); } break; case 61: -#line 533 "ntp_parser.y" /* yacc.c:1646 */ - { cfgt.mdnstries = (yyvsp[0].Integer); } -#line 2208 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 534 "../../ntpd/ntp_parser.y" + { cfgt.mdnstries = (yyvsp[(2) - (2)].Integer); } break; case 62: -#line 544 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 545 "../../ntpd/ntp_parser.y" { attr_val *atrv; - - atrv = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); + + atrv = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); APPEND_G_FIFO(cfgt.vars, atrv); } -#line 2219 "ntp_parser.c" /* yacc.c:1646 */ break; case 63: -#line 551 "ntp_parser.y" /* yacc.c:1646 */ - { cfgt.auth.control_key = (yyvsp[0].Integer); } -#line 2225 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 552 "../../ntpd/ntp_parser.y" + { cfgt.auth.control_key = (yyvsp[(2) - (2)].Integer); } break; case 64: -#line 553 "ntp_parser.y" /* yacc.c:1646 */ - { +/* Line 1787 of yacc.c */ +#line 554 "../../ntpd/ntp_parser.y" + { cfgt.auth.cryptosw++; - CONCAT_G_FIFOS(cfgt.auth.crypto_cmd_list, (yyvsp[0].Attr_val_fifo)); + CONCAT_G_FIFOS(cfgt.auth.crypto_cmd_list, (yyvsp[(2) - (2)].Attr_val_fifo)); } -#line 2234 "ntp_parser.c" /* yacc.c:1646 */ break; case 65: -#line 558 "ntp_parser.y" /* yacc.c:1646 */ - { cfgt.auth.keys = (yyvsp[0].String); } -#line 2240 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 559 "../../ntpd/ntp_parser.y" + { cfgt.auth.keys = (yyvsp[(2) - (2)].String); } break; case 66: -#line 560 "ntp_parser.y" /* yacc.c:1646 */ - { cfgt.auth.keysdir = (yyvsp[0].String); } -#line 2246 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 561 "../../ntpd/ntp_parser.y" + { cfgt.auth.keysdir = (yyvsp[(2) - (2)].String); } break; case 67: -#line 562 "ntp_parser.y" /* yacc.c:1646 */ - { cfgt.auth.request_key = (yyvsp[0].Integer); } -#line 2252 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 563 "../../ntpd/ntp_parser.y" + { cfgt.auth.request_key = (yyvsp[(2) - (2)].Integer); } break; case 68: -#line 564 "ntp_parser.y" /* yacc.c:1646 */ - { cfgt.auth.revoke = (yyvsp[0].Integer); } -#line 2258 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 565 "../../ntpd/ntp_parser.y" + { cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); } break; case 69: -#line 566 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 567 "../../ntpd/ntp_parser.y" { - cfgt.auth.trusted_key_list = (yyvsp[0].Attr_val_fifo); + cfgt.auth.trusted_key_list = (yyvsp[(2) - (2)].Attr_val_fifo); // if (!cfgt.auth.trusted_key_list) // cfgt.auth.trusted_key_list = $2; // else // LINK_SLIST(cfgt.auth.trusted_key_list, $2, link); } -#line 2271 "ntp_parser.c" /* yacc.c:1646 */ break; case 70: -#line 575 "ntp_parser.y" /* yacc.c:1646 */ - { cfgt.auth.ntp_signd_socket = (yyvsp[0].String); } -#line 2277 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 576 "../../ntpd/ntp_parser.y" + { cfgt.auth.ntp_signd_socket = (yyvsp[(2) - (2)].String); } break; case 71: -#line 580 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 581 "../../ntpd/ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; } -#line 2283 "ntp_parser.c" /* yacc.c:1646 */ break; case 72: -#line 582 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 583 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); } -#line 2292 "ntp_parser.c" /* yacc.c:1646 */ break; case 73: -#line 590 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } -#line 2298 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 591 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 74: -#line 592 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 593 "../../ntpd/ntp_parser.y" { (yyval.Attr_val) = NULL; - cfgt.auth.revoke = (yyvsp[0].Integer); + cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); msyslog(LOG_WARNING, "'crypto revoke %d' is deprecated, " "please use 'revoke %d' instead.", cfgt.auth.revoke, cfgt.auth.revoke); } -#line 2311 "ntp_parser.c" /* yacc.c:1646 */ break; case 80: -#line 617 "ntp_parser.y" /* yacc.c:1646 */ - { CONCAT_G_FIFOS(cfgt.orphan_cmds, (yyvsp[0].Attr_val_fifo)); } -#line 2317 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 618 "../../ntpd/ntp_parser.y" + { CONCAT_G_FIFOS(cfgt.orphan_cmds, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 81: -#line 622 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 623 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); } -#line 2326 "ntp_parser.c" /* yacc.c:1646 */ break; case 82: -#line 627 "ntp_parser.y" /* yacc.c:1646 */ - { +/* Line 1787 of yacc.c */ +#line 628 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); } -#line 2335 "ntp_parser.c" /* yacc.c:1646 */ break; case 83: -#line 635 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (double)(yyvsp[0].Integer)); } -#line 2341 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 636 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 84: -#line 637 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); } -#line 2347 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 638 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 85: -#line 639 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (double)(yyvsp[0].Integer)); } -#line 2353 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 640 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 96: -#line 665 "ntp_parser.y" /* yacc.c:1646 */ - { CONCAT_G_FIFOS(cfgt.stats_list, (yyvsp[0].Int_fifo)); } -#line 2359 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 666 "../../ntpd/ntp_parser.y" + { CONCAT_G_FIFOS(cfgt.stats_list, (yyvsp[(2) - (2)].Int_fifo)); } break; case 97: -#line 667 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 668 "../../ntpd/ntp_parser.y" { - if (input_from_file) { - cfgt.stats_dir = (yyvsp[0].String); + if (lex_from_file()) { + cfgt.stats_dir = (yyvsp[(2) - (2)].String); } else { - YYFREE((yyvsp[0].String)); - yyerror(ip_file, "statsdir remote configuration ignored"); + YYFREE((yyvsp[(2) - (2)].String)); + yyerror("statsdir remote configuration ignored"); } } -#line 2372 "ntp_parser.c" /* yacc.c:1646 */ break; case 98: -#line 676 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 677 "../../ntpd/ntp_parser.y" { filegen_node *fgn; - - fgn = create_filegen_node((yyvsp[-1].Integer), (yyvsp[0].Attr_val_fifo)); + + fgn = create_filegen_node((yyvsp[(2) - (3)].Integer), (yyvsp[(3) - (3)].Attr_val_fifo)); APPEND_G_FIFO(cfgt.filegen_opts, fgn); } -#line 2383 "ntp_parser.c" /* yacc.c:1646 */ break; case 99: -#line 686 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 687 "../../ntpd/ntp_parser.y" { - (yyval.Int_fifo) = (yyvsp[-1].Int_fifo); - APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); + (yyval.Int_fifo) = (yyvsp[(1) - (2)].Int_fifo); + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(2) - (2)].Integer))); } -#line 2392 "ntp_parser.c" /* yacc.c:1646 */ break; case 100: -#line 691 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 692 "../../ntpd/ntp_parser.y" { (yyval.Int_fifo) = NULL; - APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(1) - (1)].Integer))); } -#line 2401 "ntp_parser.c" /* yacc.c:1646 */ break; case 109: -#line 710 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 711 "../../ntpd/ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; } -#line 2407 "ntp_parser.c" /* yacc.c:1646 */ break; case 110: -#line 712 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 713 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); } -#line 2416 "ntp_parser.c" /* yacc.c:1646 */ break; case 111: -#line 720 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 721 "../../ntpd/ntp_parser.y" { - if (input_from_file) { - (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); + if (lex_from_file()) { + (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } else { (yyval.Attr_val) = NULL; - YYFREE((yyvsp[0].String)); - yyerror(ip_file, "filegen file remote config ignored"); + YYFREE((yyvsp[(2) - (2)].String)); + yyerror("filegen file remote config ignored"); } } -#line 2430 "ntp_parser.c" /* yacc.c:1646 */ break; case 112: -#line 730 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 731 "../../ntpd/ntp_parser.y" { - if (input_from_file) { - (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); + if (lex_from_file()) { + (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } else { (yyval.Attr_val) = NULL; - yyerror(ip_file, "filegen type remote config ignored"); + yyerror("filegen type remote config ignored"); } } -#line 2443 "ntp_parser.c" /* yacc.c:1646 */ break; case 113: -#line 739 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 740 "../../ntpd/ntp_parser.y" { const char *err; - - if (input_from_file) { - (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); + + if (lex_from_file()) { + (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } else { (yyval.Attr_val) = NULL; - if (T_Link == (yyvsp[0].Integer)) + if (T_Link == (yyvsp[(1) - (1)].Integer)) err = "filegen link remote config ignored"; else err = "filegen nolink remote config ignored"; - yyerror(ip_file, err); + yyerror(err); } } -#line 2462 "ntp_parser.c" /* yacc.c:1646 */ break; case 114: -#line 754 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); } -#line 2468 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 755 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 126: -#line 784 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 785 "../../ntpd/ntp_parser.y" { - CONCAT_G_FIFOS(cfgt.discard_opts, (yyvsp[0].Attr_val_fifo)); + CONCAT_G_FIFOS(cfgt.discard_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); } -#line 2476 "ntp_parser.c" /* yacc.c:1646 */ break; case 127: -#line 788 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 789 "../../ntpd/ntp_parser.y" { - CONCAT_G_FIFOS(cfgt.mru_opts, (yyvsp[0].Attr_val_fifo)); + CONCAT_G_FIFOS(cfgt.mru_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); } -#line 2484 "ntp_parser.c" /* yacc.c:1646 */ break; case 128: -#line 792 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 793 "../../ntpd/ntp_parser.y" { restrict_node *rn; - rn = create_restrict_node((yyvsp[-1].Address_node), NULL, (yyvsp[0].Int_fifo), - ip_file->line_no); + rn = create_restrict_node((yyvsp[(2) - (3)].Address_node), NULL, (yyvsp[(3) - (3)].Int_fifo), + lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } -#line 2496 "ntp_parser.c" /* yacc.c:1646 */ break; case 129: -#line 800 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 801 "../../ntpd/ntp_parser.y" { restrict_node *rn; - rn = create_restrict_node((yyvsp[-3].Address_node), (yyvsp[-1].Address_node), (yyvsp[0].Int_fifo), - ip_file->line_no); + rn = create_restrict_node((yyvsp[(2) - (5)].Address_node), (yyvsp[(4) - (5)].Address_node), (yyvsp[(5) - (5)].Int_fifo), + lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } -#line 2508 "ntp_parser.c" /* yacc.c:1646 */ break; case 130: -#line 808 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 809 "../../ntpd/ntp_parser.y" { restrict_node *rn; - rn = create_restrict_node(NULL, NULL, (yyvsp[0].Int_fifo), - ip_file->line_no); + rn = create_restrict_node(NULL, NULL, (yyvsp[(3) - (3)].Int_fifo), + lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } -#line 2520 "ntp_parser.c" /* yacc.c:1646 */ break; case 131: -#line 816 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 817 "../../ntpd/ntp_parser.y" { restrict_node *rn; rn = create_restrict_node( create_address_node( - estrdup("0.0.0.0"), + estrdup("0.0.0.0"), AF_INET), create_address_node( - estrdup("0.0.0.0"), + estrdup("0.0.0.0"), AF_INET), - (yyvsp[0].Int_fifo), - ip_file->line_no); + (yyvsp[(4) - (4)].Int_fifo), + lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } -#line 2539 "ntp_parser.c" /* yacc.c:1646 */ break; case 132: -#line 831 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 832 "../../ntpd/ntp_parser.y" { restrict_node *rn; - + rn = create_restrict_node( create_address_node( - estrdup("::"), + estrdup("::"), AF_INET6), create_address_node( - estrdup("::"), + estrdup("::"), AF_INET6), - (yyvsp[0].Int_fifo), - ip_file->line_no); + (yyvsp[(4) - (4)].Int_fifo), + lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } -#line 2558 "ntp_parser.c" /* yacc.c:1646 */ break; case 133: -#line 846 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 847 "../../ntpd/ntp_parser.y" { restrict_node * rn; - APPEND_G_FIFO((yyvsp[0].Int_fifo), create_int_node((yyvsp[-1].Integer))); + APPEND_G_FIFO((yyvsp[(3) - (3)].Int_fifo), create_int_node((yyvsp[(2) - (3)].Integer))); rn = create_restrict_node( - NULL, NULL, (yyvsp[0].Int_fifo), ip_file->line_no); + NULL, NULL, (yyvsp[(3) - (3)].Int_fifo), lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } -#line 2571 "ntp_parser.c" /* yacc.c:1646 */ break; case 134: -#line 858 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 859 "../../ntpd/ntp_parser.y" { (yyval.Int_fifo) = NULL; } -#line 2577 "ntp_parser.c" /* yacc.c:1646 */ break; case 135: -#line 860 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 861 "../../ntpd/ntp_parser.y" { - (yyval.Int_fifo) = (yyvsp[-1].Int_fifo); - APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); + (yyval.Int_fifo) = (yyvsp[(1) - (2)].Int_fifo); + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(2) - (2)].Integer))); } -#line 2586 "ntp_parser.c" /* yacc.c:1646 */ break; case 151: -#line 886 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 887 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); } -#line 2595 "ntp_parser.c" /* yacc.c:1646 */ break; case 152: -#line 891 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 892 "../../ntpd/ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); } -#line 2604 "ntp_parser.c" /* yacc.c:1646 */ break; case 153: -#line 899 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } -#line 2610 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 900 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 157: -#line 910 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 911 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); } -#line 2619 "ntp_parser.c" /* yacc.c:1646 */ break; case 158: -#line 915 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 916 "../../ntpd/ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); } -#line 2628 "ntp_parser.c" /* yacc.c:1646 */ break; case 159: -#line 923 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } -#line 2634 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 924 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 168: -#line 943 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 944 "../../ntpd/ntp_parser.y" { addr_opts_node *aon; - - aon = create_addr_opts_node((yyvsp[-1].Address_node), (yyvsp[0].Attr_val_fifo)); + + aon = create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Attr_val_fifo)); APPEND_G_FIFO(cfgt.fudge, aon); } -#line 2645 "ntp_parser.c" /* yacc.c:1646 */ break; case 169: -#line 953 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 954 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); } -#line 2654 "ntp_parser.c" /* yacc.c:1646 */ break; case 170: -#line 958 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 959 "../../ntpd/ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); } -#line 2663 "ntp_parser.c" /* yacc.c:1646 */ break; case 171: -#line 966 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); } -#line 2669 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 967 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 172: -#line 968 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } -#line 2675 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 969 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 173: -#line 970 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } -#line 2681 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 971 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 174: -#line 972 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } -#line 2687 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 973 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 175: -#line 974 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } -#line 2693 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 975 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 182: -#line 995 "ntp_parser.y" /* yacc.c:1646 */ - { CONCAT_G_FIFOS(cfgt.rlimit, (yyvsp[0].Attr_val_fifo)); } -#line 2699 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 996 "../../ntpd/ntp_parser.y" + { CONCAT_G_FIFOS(cfgt.rlimit, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 183: -#line 1000 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1001 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); } -#line 2708 "ntp_parser.c" /* yacc.c:1646 */ break; case 184: -#line 1005 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1006 "../../ntpd/ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); } -#line 2717 "ntp_parser.c" /* yacc.c:1646 */ break; case 185: -#line 1013 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } -#line 2723 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1014 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 189: -#line 1029 "ntp_parser.y" /* yacc.c:1646 */ - { CONCAT_G_FIFOS(cfgt.enable_opts, (yyvsp[0].Attr_val_fifo)); } -#line 2729 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1030 "../../ntpd/ntp_parser.y" + { CONCAT_G_FIFOS(cfgt.enable_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 190: -#line 1031 "ntp_parser.y" /* yacc.c:1646 */ - { CONCAT_G_FIFOS(cfgt.disable_opts, (yyvsp[0].Attr_val_fifo)); } -#line 2735 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1032 "../../ntpd/ntp_parser.y" + { CONCAT_G_FIFOS(cfgt.disable_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 191: -#line 1036 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1037 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); } -#line 2744 "ntp_parser.c" /* yacc.c:1646 */ break; case 192: -#line 1041 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1042 "../../ntpd/ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); } -#line 2753 "ntp_parser.c" /* yacc.c:1646 */ break; case 193: -#line 1049 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); } -#line 2759 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1050 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 194: -#line 1051 "ntp_parser.y" /* yacc.c:1646 */ - { - if (input_from_file) { - (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); +/* Line 1787 of yacc.c */ +#line 1052 "../../ntpd/ntp_parser.y" + { + if (lex_from_file()) { + (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } else { char err_str[128]; - + (yyval.Attr_val) = NULL; snprintf(err_str, sizeof(err_str), "enable/disable %s remote configuration ignored", - keyword((yyvsp[0].Integer))); - yyerror(ip_file, err_str); + keyword((yyvsp[(1) - (1)].Integer))); + yyerror(err_str); } } -#line 2777 "ntp_parser.c" /* yacc.c:1646 */ break; case 203: -#line 1086 "ntp_parser.y" /* yacc.c:1646 */ - { CONCAT_G_FIFOS(cfgt.tinker, (yyvsp[0].Attr_val_fifo)); } -#line 2783 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1087 "../../ntpd/ntp_parser.y" + { CONCAT_G_FIFOS(cfgt.tinker, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 204: -#line 1091 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1092 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); } -#line 2792 "ntp_parser.c" /* yacc.c:1646 */ break; case 205: -#line 1096 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1097 "../../ntpd/ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); } -#line 2801 "ntp_parser.c" /* yacc.c:1646 */ break; case 206: -#line 1104 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); } -#line 2807 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1105 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 219: -#line 1129 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1130 "../../ntpd/ntp_parser.y" { attr_val *av; - - av = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); + + av = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); APPEND_G_FIFO(cfgt.vars, av); } -#line 2818 "ntp_parser.c" /* yacc.c:1646 */ break; case 220: -#line 1136 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1137 "../../ntpd/ntp_parser.y" { attr_val *av; - - av = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); + + av = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); APPEND_G_FIFO(cfgt.vars, av); } -#line 2829 "ntp_parser.c" /* yacc.c:1646 */ break; case 221: -#line 1143 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1144 "../../ntpd/ntp_parser.y" + { + attr_val *av; + + av = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); + APPEND_G_FIFO(cfgt.vars, av); + } + break; + + case 222: +/* Line 1787 of yacc.c */ +#line 1151 "../../ntpd/ntp_parser.y" { char error_text[64]; attr_val *av; - if (input_from_file) { - av = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); + if (lex_from_file()) { + av = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); APPEND_G_FIFO(cfgt.vars, av); } else { - YYFREE((yyvsp[0].String)); + YYFREE((yyvsp[(2) - (2)].String)); snprintf(error_text, sizeof(error_text), "%s remote config ignored", - keyword((yyvsp[-1].Integer))); - yyerror(ip_file, error_text); + keyword((yyvsp[(1) - (2)].Integer))); + yyerror(error_text); } } -#line 2849 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 222: -#line 1159 "ntp_parser.y" /* yacc.c:1646 */ - { - if (!input_from_file) { - yyerror(ip_file, "remote includefile ignored"); - break; - } - if (curr_include_level >= MAXINCLUDELEVEL) { - fprintf(stderr, "getconfig: Maximum include file level exceeded.\n"); - msyslog(LOG_ERR, "getconfig: Maximum include file level exceeded."); - } else { - fp[curr_include_level + 1] = F_OPEN(FindConfig((yyvsp[-1].String)), "r"); - if (fp[curr_include_level + 1] == NULL) { - fprintf(stderr, "getconfig: Couldn't open <%s>\n", FindConfig((yyvsp[-1].String))); - msyslog(LOG_ERR, "getconfig: Couldn't open <%s>", FindConfig((yyvsp[-1].String))); - } else { - ip_file = fp[++curr_include_level]; - } - } - } -#line 2872 "ntp_parser.c" /* yacc.c:1646 */ break; case 223: -#line 1178 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1167 "../../ntpd/ntp_parser.y" { - while (curr_include_level != -1) - FCLOSE(fp[curr_include_level--]); + if (!lex_from_file()) { + YYFREE((yyvsp[(2) - (3)].String)); /* avoid leak */ + yyerror("remote includefile ignored"); + break; + } + if (lex_level() > MAXINCLUDELEVEL) { + fprintf(stderr, "getconfig: Maximum include file level exceeded.\n"); + msyslog(LOG_ERR, "getconfig: Maximum include file level exceeded."); + } else { + const char * path = FindConfig((yyvsp[(2) - (3)].String)); /* might return $2! */ + if (!lex_push_file(path, "r")) { + fprintf(stderr, "getconfig: Couldn't open <%s>\n", path); + msyslog(LOG_ERR, "getconfig: Couldn't open <%s>", path); + } + } + YYFREE((yyvsp[(2) - (3)].String)); /* avoid leak */ } -#line 2881 "ntp_parser.c" /* yacc.c:1646 */ break; case 224: -#line 1183 "ntp_parser.y" /* yacc.c:1646 */ - { /* see drift_parm below for actions */ } -#line 2887 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1186 "../../ntpd/ntp_parser.y" + { lex_flush_stack(); } break; case 225: -#line 1185 "ntp_parser.y" /* yacc.c:1646 */ - { CONCAT_G_FIFOS(cfgt.logconfig, (yyvsp[0].Attr_val_fifo)); } -#line 2893 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1188 "../../ntpd/ntp_parser.y" + { /* see drift_parm below for actions */ } break; case 226: -#line 1187 "ntp_parser.y" /* yacc.c:1646 */ - { CONCAT_G_FIFOS(cfgt.phone, (yyvsp[0].String_fifo)); } -#line 2899 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1190 "../../ntpd/ntp_parser.y" + { CONCAT_G_FIFOS(cfgt.logconfig, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 227: -#line 1189 "ntp_parser.y" /* yacc.c:1646 */ - { APPEND_G_FIFO(cfgt.setvar, (yyvsp[0].Set_var)); } -#line 2905 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1192 "../../ntpd/ntp_parser.y" + { CONCAT_G_FIFOS(cfgt.phone, (yyvsp[(2) - (2)].String_fifo)); } break; case 228: -#line 1191 "ntp_parser.y" /* yacc.c:1646 */ - { - addr_opts_node *aon; - - aon = create_addr_opts_node((yyvsp[-1].Address_node), (yyvsp[0].Attr_val_fifo)); - APPEND_G_FIFO(cfgt.trap, aon); - } -#line 2916 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1194 "../../ntpd/ntp_parser.y" + { APPEND_G_FIFO(cfgt.setvar, (yyvsp[(2) - (2)].Set_var)); } break; case 229: -#line 1198 "ntp_parser.y" /* yacc.c:1646 */ - { CONCAT_G_FIFOS(cfgt.ttl, (yyvsp[0].Attr_val_fifo)); } -#line 2922 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1196 "../../ntpd/ntp_parser.y" + { + addr_opts_node *aon; + + aon = create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Attr_val_fifo)); + APPEND_G_FIFO(cfgt.trap, aon); + } break; - case 238: -#line 1220 "ntp_parser.y" /* yacc.c:1646 */ - { - attr_val *av; - - av = create_attr_sval(T_Driftfile, (yyvsp[0].String)); - APPEND_G_FIFO(cfgt.vars, av); - } -#line 2933 "ntp_parser.c" /* yacc.c:1646 */ + case 230: +/* Line 1787 of yacc.c */ +#line 1203 "../../ntpd/ntp_parser.y" + { CONCAT_G_FIFOS(cfgt.ttl, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; - case 239: -#line 1227 "ntp_parser.y" /* yacc.c:1646 */ + case 235: +/* Line 1787 of yacc.c */ +#line 1218 "../../ntpd/ntp_parser.y" { - attr_val *av; - - av = create_attr_sval(T_Driftfile, (yyvsp[-1].String)); - APPEND_G_FIFO(cfgt.vars, av); - av = create_attr_dval(T_WanderThreshold, (yyvsp[0].Double)); - APPEND_G_FIFO(cfgt.vars, av); +#ifndef LEAP_SMEAR + yyerror("Built without LEAP_SMEAR support."); +#endif } -#line 2946 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 240: -#line 1236 "ntp_parser.y" /* yacc.c:1646 */ - { - attr_val *av; - - av = create_attr_sval(T_Driftfile, ""); - APPEND_G_FIFO(cfgt.vars, av); - } -#line 2957 "ntp_parser.c" /* yacc.c:1646 */ break; case 241: -#line 1246 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Set_var) = create_setvar_node((yyvsp[-3].String), (yyvsp[-1].String), (yyvsp[0].Integer)); } -#line 2963 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1238 "../../ntpd/ntp_parser.y" + { + attr_val *av; + + av = create_attr_sval(T_Driftfile, (yyvsp[(1) - (1)].String)); + APPEND_G_FIFO(cfgt.vars, av); + } + break; + + case 242: +/* Line 1787 of yacc.c */ +#line 1245 "../../ntpd/ntp_parser.y" + { + attr_val *av; + + av = create_attr_sval(T_Driftfile, (yyvsp[(1) - (2)].String)); + APPEND_G_FIFO(cfgt.vars, av); + av = create_attr_dval(T_WanderThreshold, (yyvsp[(2) - (2)].Double)); + APPEND_G_FIFO(cfgt.vars, av); + } break; case 243: -#line 1252 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Integer) = 0; } -#line 2969 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1254 "../../ntpd/ntp_parser.y" + { + attr_val *av; + + av = create_attr_sval(T_Driftfile, ""); + APPEND_G_FIFO(cfgt.vars, av); + } break; case 244: -#line 1257 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val_fifo) = NULL; } -#line 2975 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 245: -#line 1259 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); - } -#line 2984 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1264 "../../ntpd/ntp_parser.y" + { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (4)].String), (yyvsp[(3) - (4)].String), (yyvsp[(4) - (4)].Integer)); } break; case 246: -#line 1267 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } -#line 2990 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1270 "../../ntpd/ntp_parser.y" + { (yyval.Integer) = 0; } break; case 247: -#line 1269 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), estrdup((yyvsp[0].Address_node)->address)); - destroy_address_node((yyvsp[0].Address_node)); - } -#line 2999 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1275 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val_fifo) = NULL; } break; case 248: -#line 1277 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1277 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); } -#line 3008 "ntp_parser.c" /* yacc.c:1646 */ break; case 249: -#line 1282 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); - } -#line 3017 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1285 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 250: -#line 1290 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1287 "../../ntpd/ntp_parser.y" { - char prefix; - char * type; - - switch ((yyvsp[0].String)[0]) { - - case '+': - case '-': - case '=': - prefix = (yyvsp[0].String)[0]; - type = (yyvsp[0].String) + 1; - break; - - default: - prefix = '='; - type = (yyvsp[0].String); - } - - (yyval.Attr_val) = create_attr_sval(prefix, estrdup(type)); - YYFREE((yyvsp[0].String)); + (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), estrdup((yyvsp[(2) - (2)].Address_node)->address)); + destroy_address_node((yyvsp[(2) - (2)].Address_node)); } -#line 3043 "ntp_parser.c" /* yacc.c:1646 */ break; case 251: -#line 1315 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1295 "../../ntpd/ntp_parser.y" { - nic_rule_node *nrn; - - nrn = create_nic_rule_node((yyvsp[0].Integer), NULL, (yyvsp[-1].Integer)); - APPEND_G_FIFO(cfgt.nic_rules, nrn); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); } -#line 3054 "ntp_parser.c" /* yacc.c:1646 */ break; case 252: -#line 1322 "ntp_parser.y" /* yacc.c:1646 */ - { - nic_rule_node *nrn; - - nrn = create_nic_rule_node(0, (yyvsp[0].String), (yyvsp[-1].Integer)); - APPEND_G_FIFO(cfgt.nic_rules, nrn); - } -#line 3065 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 262: -#line 1350 "ntp_parser.y" /* yacc.c:1646 */ - { CONCAT_G_FIFOS(cfgt.reset_counters, (yyvsp[0].Int_fifo)); } -#line 3071 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 263: -#line 1355 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Int_fifo) = (yyvsp[-1].Int_fifo); - APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); - } -#line 3080 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 264: -#line 1360 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Int_fifo) = NULL; - APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); - } -#line 3089 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 272: -#line 1384 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[0].Integer))); - } -#line 3098 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 273: -#line 1389 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1300 "../../ntpd/ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[0].Integer))); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); } -#line 3107 "ntp_parser.c" /* yacc.c:1646 */ break; - case 274: -#line 1397 "ntp_parser.y" /* yacc.c:1646 */ + case 253: +/* Line 1787 of yacc.c */ +#line 1308 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + char prefix; + char * type; + + switch ((yyvsp[(1) - (1)].String)[0]) { + + case '+': + case '-': + case '=': + prefix = (yyvsp[(1) - (1)].String)[0]; + type = (yyvsp[(1) - (1)].String) + 1; + break; + + default: + prefix = '='; + type = (yyvsp[(1) - (1)].String); + } + + (yyval.Attr_val) = create_attr_sval(prefix, estrdup(type)); + YYFREE((yyvsp[(1) - (1)].String)); + } + break; + + case 254: +/* Line 1787 of yacc.c */ +#line 1333 "../../ntpd/ntp_parser.y" + { + nic_rule_node *nrn; + + nrn = create_nic_rule_node((yyvsp[(3) - (3)].Integer), NULL, (yyvsp[(2) - (3)].Integer)); + APPEND_G_FIFO(cfgt.nic_rules, nrn); + } + break; + + case 255: +/* Line 1787 of yacc.c */ +#line 1340 "../../ntpd/ntp_parser.y" + { + nic_rule_node *nrn; + + nrn = create_nic_rule_node(0, (yyvsp[(3) - (3)].String), (yyvsp[(2) - (3)].Integer)); + APPEND_G_FIFO(cfgt.nic_rules, nrn); + } + break; + + case 265: +/* Line 1787 of yacc.c */ +#line 1368 "../../ntpd/ntp_parser.y" + { CONCAT_G_FIFOS(cfgt.reset_counters, (yyvsp[(2) - (2)].Int_fifo)); } + break; + + case 266: +/* Line 1787 of yacc.c */ +#line 1373 "../../ntpd/ntp_parser.y" + { + (yyval.Int_fifo) = (yyvsp[(1) - (2)].Int_fifo); + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(2) - (2)].Integer))); + } + break; + + case 267: +/* Line 1787 of yacc.c */ +#line 1378 "../../ntpd/ntp_parser.y" + { + (yyval.Int_fifo) = NULL; + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(1) - (1)].Integer))); } -#line 3116 "ntp_parser.c" /* yacc.c:1646 */ break; case 275: -#line 1402 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1402 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[(2) - (2)].Integer))); } -#line 3125 "ntp_parser.c" /* yacc.c:1646 */ break; case 276: -#line 1410 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_ival('i', (yyvsp[0].Integer)); } -#line 3131 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1407 "../../ntpd/ntp_parser.y" + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[(1) - (1)].Integer))); + } + break; + + case 277: +/* Line 1787 of yacc.c */ +#line 1415 "../../ntpd/ntp_parser.y" + { + (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + } break; case 278: -#line 1416 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_rangeval('-', (yyvsp[-3].Integer), (yyvsp[-1].Integer)); } -#line 3137 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1420 "../../ntpd/ntp_parser.y" + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); + } break; case 279: -#line 1421 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.String_fifo) = (yyvsp[-1].String_fifo); - APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[0].String))); - } -#line 3146 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 280: -#line 1426 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.String_fifo) = NULL; - APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[0].String))); - } -#line 3155 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1428 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival('i', (yyvsp[(1) - (1)].Integer)); } break; case 281: -#line 1434 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Address_fifo) = (yyvsp[-1].Address_fifo); - APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[0].Address_node)); - } -#line 3164 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1434 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_rangeval('-', (yyvsp[(2) - (5)].Integer), (yyvsp[(4) - (5)].Integer)); } break; case 282: -#line 1439 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1439 "../../ntpd/ntp_parser.y" { - (yyval.Address_fifo) = NULL; - APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[0].Address_node)); + (yyval.String_fifo) = (yyvsp[(1) - (2)].String_fifo); + APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[(2) - (2)].String))); } -#line 3173 "ntp_parser.c" /* yacc.c:1646 */ break; case 283: -#line 1447 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1444 "../../ntpd/ntp_parser.y" { - if ((yyvsp[0].Integer) != 0 && (yyvsp[0].Integer) != 1) { - yyerror(ip_file, "Integer value is not boolean (0 or 1). Assuming 1"); - (yyval.Integer) = 1; - } else { - (yyval.Integer) = (yyvsp[0].Integer); - } + (yyval.String_fifo) = NULL; + APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[(1) - (1)].String))); } -#line 3186 "ntp_parser.c" /* yacc.c:1646 */ break; case 284: -#line 1455 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Integer) = 1; } -#line 3192 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1452 "../../ntpd/ntp_parser.y" + { + (yyval.Address_fifo) = (yyvsp[(1) - (2)].Address_fifo); + APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[(2) - (2)].Address_node)); + } break; case 285: -#line 1456 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Integer) = 0; } -#line 3198 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1457 "../../ntpd/ntp_parser.y" + { + (yyval.Address_fifo) = NULL; + APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[(1) - (1)].Address_node)); + } break; case 286: -#line 1460 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Double) = (double)(yyvsp[0].Integer); } -#line 3204 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1465 "../../ntpd/ntp_parser.y" + { + if ((yyvsp[(1) - (1)].Integer) != 0 && (yyvsp[(1) - (1)].Integer) != 1) { + yyerror("Integer value is not boolean (0 or 1). Assuming 1"); + (yyval.Integer) = 1; + } else { + (yyval.Integer) = (yyvsp[(1) - (1)].Integer); + } + } + break; + + case 287: +/* Line 1787 of yacc.c */ +#line 1473 "../../ntpd/ntp_parser.y" + { (yyval.Integer) = 1; } break; case 288: -#line 1471 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1474 "../../ntpd/ntp_parser.y" + { (yyval.Integer) = 0; } + break; + + case 289: +/* Line 1787 of yacc.c */ +#line 1478 "../../ntpd/ntp_parser.y" + { (yyval.Double) = (double)(yyvsp[(1) - (1)].Integer); } + break; + + case 291: +/* Line 1787 of yacc.c */ +#line 1489 "../../ntpd/ntp_parser.y" { sim_node *sn; - - sn = create_sim_node((yyvsp[-2].Attr_val_fifo), (yyvsp[-1].Sim_server_fifo)); + + sn = create_sim_node((yyvsp[(3) - (5)].Attr_val_fifo), (yyvsp[(4) - (5)].Sim_server_fifo)); APPEND_G_FIFO(cfgt.sim_details, sn); /* Revert from ; to \n for end-of-command */ old_config_style = 1; } -#line 3218 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 289: -#line 1488 "ntp_parser.y" /* yacc.c:1646 */ - { old_config_style = 0; } -#line 3224 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 290: -#line 1493 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Attr_val_fifo) = (yyvsp[-2].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val)); - } -#line 3233 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 291: -#line 1498 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val)); - } -#line 3242 "ntp_parser.c" /* yacc.c:1646 */ break; case 292: -#line 1506 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_dval((yyvsp[-2].Integer), (yyvsp[0].Double)); } -#line 3248 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1506 "../../ntpd/ntp_parser.y" + { old_config_style = 0; } + break; + + case 293: +/* Line 1787 of yacc.c */ +#line 1511 "../../ntpd/ntp_parser.y" + { + (yyval.Attr_val_fifo) = (yyvsp[(1) - (3)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (3)].Attr_val)); + } + break; + + case 294: +/* Line 1787 of yacc.c */ +#line 1516 "../../ntpd/ntp_parser.y" + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (2)].Attr_val)); + } break; case 295: -#line 1516 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Sim_server_fifo) = (yyvsp[-1].Sim_server_fifo); - APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[0].Sim_server)); - } -#line 3257 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 296: -#line 1521 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Sim_server_fifo) = NULL; - APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[0].Sim_server)); - } -#line 3266 "ntp_parser.c" /* yacc.c:1646 */ - break; - - case 297: -#line 1529 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Sim_server) = ONLY_SIM(create_sim_server((yyvsp[-4].Address_node), (yyvsp[-2].Double), (yyvsp[-1].Sim_script_fifo))); } -#line 3272 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1524 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; case 298: -#line 1534 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Double) = (yyvsp[-1].Double); } -#line 3278 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1534 "../../ntpd/ntp_parser.y" + { + (yyval.Sim_server_fifo) = (yyvsp[(1) - (2)].Sim_server_fifo); + APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[(2) - (2)].Sim_server)); + } break; case 299: -#line 1539 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Address_node) = (yyvsp[0].Address_node); } -#line 3284 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1539 "../../ntpd/ntp_parser.y" + { + (yyval.Sim_server_fifo) = NULL; + APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[(1) - (1)].Sim_server)); + } break; case 300: -#line 1544 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Sim_script_fifo) = (yyvsp[-1].Sim_script_fifo); - APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[0].Sim_script)); - } -#line 3293 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1547 "../../ntpd/ntp_parser.y" + { (yyval.Sim_server) = ONLY_SIM(create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Sim_script_fifo))); } break; case 301: -#line 1549 "ntp_parser.y" /* yacc.c:1646 */ - { - (yyval.Sim_script_fifo) = NULL; - APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[0].Sim_script)); - } -#line 3302 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1552 "../../ntpd/ntp_parser.y" + { (yyval.Double) = (yyvsp[(3) - (4)].Double); } break; case 302: -#line 1557 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Sim_script) = ONLY_SIM(create_sim_script_info((yyvsp[-3].Double), (yyvsp[-1].Attr_val_fifo))); } -#line 3308 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1557 "../../ntpd/ntp_parser.y" + { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); } break; case 303: -#line 1562 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1562 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = (yyvsp[-2].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val)); + (yyval.Sim_script_fifo) = (yyvsp[(1) - (2)].Sim_script_fifo); + APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[(2) - (2)].Sim_script)); } -#line 3317 "ntp_parser.c" /* yacc.c:1646 */ break; case 304: -#line 1567 "ntp_parser.y" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1567 "../../ntpd/ntp_parser.y" { - (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val)); + (yyval.Sim_script_fifo) = NULL; + APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[(1) - (1)].Sim_script)); } -#line 3326 "ntp_parser.c" /* yacc.c:1646 */ break; case 305: -#line 1575 "ntp_parser.y" /* yacc.c:1646 */ - { (yyval.Attr_val) = create_attr_dval((yyvsp[-2].Integer), (yyvsp[0].Double)); } -#line 3332 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 1575 "../../ntpd/ntp_parser.y" + { (yyval.Sim_script) = ONLY_SIM(create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Attr_val_fifo))); } + break; + + case 306: +/* Line 1787 of yacc.c */ +#line 1580 "../../ntpd/ntp_parser.y" + { + (yyval.Attr_val_fifo) = (yyvsp[(1) - (3)].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (3)].Attr_val)); + } + break; + + case 307: +/* Line 1787 of yacc.c */ +#line 1585 "../../ntpd/ntp_parser.y" + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (2)].Attr_val)); + } + break; + + case 308: +/* Line 1787 of yacc.c */ +#line 1593 "../../ntpd/ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; -#line 3336 "ntp_parser.c" /* yacc.c:1646 */ +/* Line 1787 of yacc.c */ +#line 3600 "ntp_parser.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3354,7 +3618,7 @@ yyparse (struct FILE_INFO *ip_file) *++yyvsp = yyval; - /* Now 'shift' the result of the reduction. Determine what state + /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -3369,9 +3633,9 @@ yyparse (struct FILE_INFO *ip_file) goto yynewstate; -/*--------------------------------------. -| yyerrlab -- here on detecting error. | -`--------------------------------------*/ +/*------------------------------------. +| yyerrlab -- here on detecting error | +`------------------------------------*/ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ @@ -3382,7 +3646,7 @@ yyparse (struct FILE_INFO *ip_file) { ++yynerrs; #if ! YYERROR_VERBOSE - yyerror (ip_file, YY_("syntax error")); + yyerror (YY_("syntax error")); #else # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ yyssp, yytoken) @@ -3409,7 +3673,7 @@ yyparse (struct FILE_INFO *ip_file) yymsgp = yymsg; } } - yyerror (ip_file, yymsgp); + yyerror (yymsgp); if (yysyntax_error_status == 2) goto yyexhaustedlab; } @@ -3422,20 +3686,20 @@ yyparse (struct FILE_INFO *ip_file) if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval, ip_file); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error @@ -3454,7 +3718,7 @@ yyparse (struct FILE_INFO *ip_file) if (/*CONSTCOND*/ 0) goto yyerrorlab; - /* Do not reclaim the symbols of the rule whose action triggered + /* Do not reclaim the symbols of the rule which action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -3467,29 +3731,29 @@ yyparse (struct FILE_INFO *ip_file) | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp, ip_file); + yystos[yystate], yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -3526,7 +3790,7 @@ yyparse (struct FILE_INFO *ip_file) | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ yyexhaustedlab: - yyerror (ip_file, YY_("memory exhausted")); + yyerror (YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif @@ -3538,16 +3802,16 @@ yyparse (struct FILE_INFO *ip_file) user semantic actions for why this is necessary. */ yytoken = YYTRANSLATE (yychar); yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, ip_file); + yytoken, &yylval); } - /* Do not reclaim the symbols of the rule whose action triggered + /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp, ip_file); + yystos[*yyssp], yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow @@ -3558,33 +3822,34 @@ yyparse (struct FILE_INFO *ip_file) if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - return yyresult; + /* Make sure YYID is used. */ + return YYID (yyresult); } -#line 1586 "ntp_parser.y" /* yacc.c:1906 */ -void +/* Line 2050 of yacc.c */ +#line 1604 "../../ntpd/ntp_parser.y" + + +void yyerror( - struct FILE_INFO *ip_file, const char *msg ) { int retval; + struct FILE_INFO * ip_ctx; - ip_file->err_line_no = ip_file->prev_token_line_no; - ip_file->err_col_no = ip_file->prev_token_col_no; - - msyslog(LOG_ERR, - "line %d column %d %s", - ip_file->err_line_no, - ip_file->err_col_no, - msg); - if (!input_from_file) { + ip_ctx = lex_current(); + ip_ctx->errpos = ip_ctx->tokpos; + + msyslog(LOG_ERR, "line %d column %d %s", + ip_ctx->errpos.nline, ip_ctx->errpos.ncol, msg); + if (!lex_from_file()) { /* Save the error message in the correct buffer */ retval = snprintf(remote_config.err_msg + remote_config.err_pos, MAXLINE - remote_config.err_pos, "column %d %s", - ip_file->err_col_no, msg); + ip_ctx->errpos.ncol, msg); /* Increment the value of err_pos */ if (retval > 0) diff --git a/contrib/ntp/ntpd/ntp_parser.h b/contrib/ntp/ntpd/ntp_parser.h index 2804e544973c..b474fc24113c 100644 --- a/contrib/ntp/ntpd/ntp_parser.h +++ b/contrib/ntp/ntpd/ntp_parser.h @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 3.0.2. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison interface for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -26,13 +26,13 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ #ifndef YY_YY_NTP_PARSER_H_INCLUDED # define YY_YY_NTP_PARSER_H_INCLUDED -/* Debug traces. */ +/* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 1 #endif @@ -40,201 +40,204 @@ extern int yydebug; #endif -/* Token type. */ +/* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - enum yytokentype - { - T_Abbrev = 258, - T_Age = 259, - T_All = 260, - T_Allan = 261, - T_Allpeers = 262, - T_Auth = 263, - T_Autokey = 264, - T_Automax = 265, - T_Average = 266, - T_Bclient = 267, - T_Beacon = 268, - T_Broadcast = 269, - T_Broadcastclient = 270, - T_Broadcastdelay = 271, - T_Burst = 272, - T_Calibrate = 273, - T_Ceiling = 274, - T_Clockstats = 275, - T_Cohort = 276, - T_ControlKey = 277, - T_Crypto = 278, - T_Cryptostats = 279, - T_Ctl = 280, - T_Day = 281, - T_Default = 282, - T_Digest = 283, - T_Disable = 284, - T_Discard = 285, - T_Dispersion = 286, - T_Double = 287, - T_Driftfile = 288, - T_Drop = 289, - T_Ellipsis = 290, - T_Enable = 291, - T_End = 292, - T_False = 293, - T_File = 294, - T_Filegen = 295, - T_Filenum = 296, - T_Flag1 = 297, - T_Flag2 = 298, - T_Flag3 = 299, - T_Flag4 = 300, - T_Flake = 301, - T_Floor = 302, - T_Freq = 303, - T_Fudge = 304, - T_Host = 305, - T_Huffpuff = 306, - T_Iburst = 307, - T_Ident = 308, - T_Ignore = 309, - T_Incalloc = 310, - T_Incmem = 311, - T_Initalloc = 312, - T_Initmem = 313, - T_Includefile = 314, - T_Integer = 315, - T_Interface = 316, - T_Intrange = 317, - T_Io = 318, - T_Ipv4 = 319, - T_Ipv4_flag = 320, - T_Ipv6 = 321, - T_Ipv6_flag = 322, - T_Kernel = 323, - T_Key = 324, - T_Keys = 325, - T_Keysdir = 326, - T_Kod = 327, - T_Mssntp = 328, - T_Leapfile = 329, - T_Limited = 330, - T_Link = 331, - T_Listen = 332, - T_Logconfig = 333, - T_Logfile = 334, - T_Loopstats = 335, - T_Lowpriotrap = 336, - T_Manycastclient = 337, - T_Manycastserver = 338, - T_Mask = 339, - T_Maxage = 340, - T_Maxclock = 341, - T_Maxdepth = 342, - T_Maxdist = 343, - T_Maxmem = 344, - T_Maxpoll = 345, - T_Mdnstries = 346, - T_Mem = 347, - T_Memlock = 348, - T_Minclock = 349, - T_Mindepth = 350, - T_Mindist = 351, - T_Minimum = 352, - T_Minpoll = 353, - T_Minsane = 354, - T_Mode = 355, - T_Mode7 = 356, - T_Monitor = 357, - T_Month = 358, - T_Mru = 359, - T_Multicastclient = 360, - T_Nic = 361, - T_Nolink = 362, - T_Nomodify = 363, - T_Nomrulist = 364, - T_None = 365, - T_Nonvolatile = 366, - T_Nopeer = 367, - T_Noquery = 368, - T_Noselect = 369, - T_Noserve = 370, - T_Notrap = 371, - T_Notrust = 372, - T_Ntp = 373, - T_Ntpport = 374, - T_NtpSignDsocket = 375, - T_Orphan = 376, - T_Orphanwait = 377, - T_Panic = 378, - T_Peer = 379, - T_Peerstats = 380, - T_Phone = 381, - T_Pid = 382, - T_Pidfile = 383, - T_Pool = 384, - T_Port = 385, - T_Preempt = 386, - T_Prefer = 387, - T_Protostats = 388, - T_Pw = 389, - T_Randfile = 390, - T_Rawstats = 391, - T_Refid = 392, - T_Requestkey = 393, - T_Reset = 394, - T_Restrict = 395, - T_Revoke = 396, - T_Rlimit = 397, - T_Saveconfigdir = 398, - T_Server = 399, - T_Setvar = 400, - T_Source = 401, - T_Stacksize = 402, - T_Statistics = 403, - T_Stats = 404, - T_Statsdir = 405, - T_Step = 406, - T_Stepback = 407, - T_Stepfwd = 408, - T_Stepout = 409, - T_Stratum = 410, - T_String = 411, - T_Sys = 412, - T_Sysstats = 413, - T_Tick = 414, - T_Time1 = 415, - T_Time2 = 416, - T_Timer = 417, - T_Timingstats = 418, - T_Tinker = 419, - T_Tos = 420, - T_Trap = 421, - T_True = 422, - T_Trustedkey = 423, - T_Ttl = 424, - T_Type = 425, - T_U_int = 426, - T_Unconfig = 427, - T_Unpeer = 428, - T_Version = 429, - T_WanderThreshold = 430, - T_Week = 431, - T_Wildcard = 432, - T_Xleave = 433, - T_Year = 434, - T_Flag = 435, - T_EOC = 436, - T_Simulate = 437, - T_Beep_Delay = 438, - T_Sim_Duration = 439, - T_Server_Offset = 440, - T_Duration = 441, - T_Freq_Offset = 442, - T_Wander = 443, - T_Jitter = 444, - T_Prop_Delay = 445, - T_Proc_Delay = 446 - }; + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + T_Abbrev = 258, + T_Age = 259, + T_All = 260, + T_Allan = 261, + T_Allpeers = 262, + T_Auth = 263, + T_Autokey = 264, + T_Automax = 265, + T_Average = 266, + T_Bclient = 267, + T_Beacon = 268, + T_Broadcast = 269, + T_Broadcastclient = 270, + T_Broadcastdelay = 271, + T_Burst = 272, + T_Calibrate = 273, + T_Ceiling = 274, + T_Clockstats = 275, + T_Cohort = 276, + T_ControlKey = 277, + T_Crypto = 278, + T_Cryptostats = 279, + T_Ctl = 280, + T_Day = 281, + T_Default = 282, + T_Digest = 283, + T_Disable = 284, + T_Discard = 285, + T_Dispersion = 286, + T_Double = 287, + T_Driftfile = 288, + T_Drop = 289, + T_Dscp = 290, + T_Ellipsis = 291, + T_Enable = 292, + T_End = 293, + T_False = 294, + T_File = 295, + T_Filegen = 296, + T_Filenum = 297, + T_Flag1 = 298, + T_Flag2 = 299, + T_Flag3 = 300, + T_Flag4 = 301, + T_Flake = 302, + T_Floor = 303, + T_Freq = 304, + T_Fudge = 305, + T_Host = 306, + T_Huffpuff = 307, + T_Iburst = 308, + T_Ident = 309, + T_Ignore = 310, + T_Incalloc = 311, + T_Incmem = 312, + T_Initalloc = 313, + T_Initmem = 314, + T_Includefile = 315, + T_Integer = 316, + T_Interface = 317, + T_Intrange = 318, + T_Io = 319, + T_Ipv4 = 320, + T_Ipv4_flag = 321, + T_Ipv6 = 322, + T_Ipv6_flag = 323, + T_Kernel = 324, + T_Key = 325, + T_Keys = 326, + T_Keysdir = 327, + T_Kod = 328, + T_Mssntp = 329, + T_Leapfile = 330, + T_Leapsmearinterval = 331, + T_Limited = 332, + T_Link = 333, + T_Listen = 334, + T_Logconfig = 335, + T_Logfile = 336, + T_Loopstats = 337, + T_Lowpriotrap = 338, + T_Manycastclient = 339, + T_Manycastserver = 340, + T_Mask = 341, + T_Maxage = 342, + T_Maxclock = 343, + T_Maxdepth = 344, + T_Maxdist = 345, + T_Maxmem = 346, + T_Maxpoll = 347, + T_Mdnstries = 348, + T_Mem = 349, + T_Memlock = 350, + T_Minclock = 351, + T_Mindepth = 352, + T_Mindist = 353, + T_Minimum = 354, + T_Minpoll = 355, + T_Minsane = 356, + T_Mode = 357, + T_Mode7 = 358, + T_Monitor = 359, + T_Month = 360, + T_Mru = 361, + T_Multicastclient = 362, + T_Nic = 363, + T_Nolink = 364, + T_Nomodify = 365, + T_Nomrulist = 366, + T_None = 367, + T_Nonvolatile = 368, + T_Nopeer = 369, + T_Noquery = 370, + T_Noselect = 371, + T_Noserve = 372, + T_Notrap = 373, + T_Notrust = 374, + T_Ntp = 375, + T_Ntpport = 376, + T_NtpSignDsocket = 377, + T_Orphan = 378, + T_Orphanwait = 379, + T_Panic = 380, + T_Peer = 381, + T_Peerstats = 382, + T_Phone = 383, + T_Pid = 384, + T_Pidfile = 385, + T_Pool = 386, + T_Port = 387, + T_Preempt = 388, + T_Prefer = 389, + T_Protostats = 390, + T_Pw = 391, + T_Randfile = 392, + T_Rawstats = 393, + T_Refid = 394, + T_Requestkey = 395, + T_Reset = 396, + T_Restrict = 397, + T_Revoke = 398, + T_Rlimit = 399, + T_Saveconfigdir = 400, + T_Server = 401, + T_Setvar = 402, + T_Source = 403, + T_Stacksize = 404, + T_Statistics = 405, + T_Stats = 406, + T_Statsdir = 407, + T_Step = 408, + T_Stepback = 409, + T_Stepfwd = 410, + T_Stepout = 411, + T_Stratum = 412, + T_String = 413, + T_Sys = 414, + T_Sysstats = 415, + T_Tick = 416, + T_Time1 = 417, + T_Time2 = 418, + T_Timer = 419, + T_Timingstats = 420, + T_Tinker = 421, + T_Tos = 422, + T_Trap = 423, + T_True = 424, + T_Trustedkey = 425, + T_Ttl = 426, + T_Type = 427, + T_U_int = 428, + T_Unconfig = 429, + T_Unpeer = 430, + T_Version = 431, + T_WanderThreshold = 432, + T_Week = 433, + T_Wildcard = 434, + T_Xleave = 435, + T_Year = 436, + T_Flag = 437, + T_EOC = 438, + T_Simulate = 439, + T_Beep_Delay = 440, + T_Sim_Duration = 441, + T_Server_Offset = 442, + T_Duration = 443, + T_Freq_Offset = 444, + T_Wander = 445, + T_Jitter = 446, + T_Prop_Delay = 447, + T_Proc_Delay = 448 + }; #endif /* Tokens. */ #define T_Abbrev 258 @@ -269,170 +272,173 @@ extern int yydebug; #define T_Double 287 #define T_Driftfile 288 #define T_Drop 289 -#define T_Ellipsis 290 -#define T_Enable 291 -#define T_End 292 -#define T_False 293 -#define T_File 294 -#define T_Filegen 295 -#define T_Filenum 296 -#define T_Flag1 297 -#define T_Flag2 298 -#define T_Flag3 299 -#define T_Flag4 300 -#define T_Flake 301 -#define T_Floor 302 -#define T_Freq 303 -#define T_Fudge 304 -#define T_Host 305 -#define T_Huffpuff 306 -#define T_Iburst 307 -#define T_Ident 308 -#define T_Ignore 309 -#define T_Incalloc 310 -#define T_Incmem 311 -#define T_Initalloc 312 -#define T_Initmem 313 -#define T_Includefile 314 -#define T_Integer 315 -#define T_Interface 316 -#define T_Intrange 317 -#define T_Io 318 -#define T_Ipv4 319 -#define T_Ipv4_flag 320 -#define T_Ipv6 321 -#define T_Ipv6_flag 322 -#define T_Kernel 323 -#define T_Key 324 -#define T_Keys 325 -#define T_Keysdir 326 -#define T_Kod 327 -#define T_Mssntp 328 -#define T_Leapfile 329 -#define T_Limited 330 -#define T_Link 331 -#define T_Listen 332 -#define T_Logconfig 333 -#define T_Logfile 334 -#define T_Loopstats 335 -#define T_Lowpriotrap 336 -#define T_Manycastclient 337 -#define T_Manycastserver 338 -#define T_Mask 339 -#define T_Maxage 340 -#define T_Maxclock 341 -#define T_Maxdepth 342 -#define T_Maxdist 343 -#define T_Maxmem 344 -#define T_Maxpoll 345 -#define T_Mdnstries 346 -#define T_Mem 347 -#define T_Memlock 348 -#define T_Minclock 349 -#define T_Mindepth 350 -#define T_Mindist 351 -#define T_Minimum 352 -#define T_Minpoll 353 -#define T_Minsane 354 -#define T_Mode 355 -#define T_Mode7 356 -#define T_Monitor 357 -#define T_Month 358 -#define T_Mru 359 -#define T_Multicastclient 360 -#define T_Nic 361 -#define T_Nolink 362 -#define T_Nomodify 363 -#define T_Nomrulist 364 -#define T_None 365 -#define T_Nonvolatile 366 -#define T_Nopeer 367 -#define T_Noquery 368 -#define T_Noselect 369 -#define T_Noserve 370 -#define T_Notrap 371 -#define T_Notrust 372 -#define T_Ntp 373 -#define T_Ntpport 374 -#define T_NtpSignDsocket 375 -#define T_Orphan 376 -#define T_Orphanwait 377 -#define T_Panic 378 -#define T_Peer 379 -#define T_Peerstats 380 -#define T_Phone 381 -#define T_Pid 382 -#define T_Pidfile 383 -#define T_Pool 384 -#define T_Port 385 -#define T_Preempt 386 -#define T_Prefer 387 -#define T_Protostats 388 -#define T_Pw 389 -#define T_Randfile 390 -#define T_Rawstats 391 -#define T_Refid 392 -#define T_Requestkey 393 -#define T_Reset 394 -#define T_Restrict 395 -#define T_Revoke 396 -#define T_Rlimit 397 -#define T_Saveconfigdir 398 -#define T_Server 399 -#define T_Setvar 400 -#define T_Source 401 -#define T_Stacksize 402 -#define T_Statistics 403 -#define T_Stats 404 -#define T_Statsdir 405 -#define T_Step 406 -#define T_Stepback 407 -#define T_Stepfwd 408 -#define T_Stepout 409 -#define T_Stratum 410 -#define T_String 411 -#define T_Sys 412 -#define T_Sysstats 413 -#define T_Tick 414 -#define T_Time1 415 -#define T_Time2 416 -#define T_Timer 417 -#define T_Timingstats 418 -#define T_Tinker 419 -#define T_Tos 420 -#define T_Trap 421 -#define T_True 422 -#define T_Trustedkey 423 -#define T_Ttl 424 -#define T_Type 425 -#define T_U_int 426 -#define T_Unconfig 427 -#define T_Unpeer 428 -#define T_Version 429 -#define T_WanderThreshold 430 -#define T_Week 431 -#define T_Wildcard 432 -#define T_Xleave 433 -#define T_Year 434 -#define T_Flag 435 -#define T_EOC 436 -#define T_Simulate 437 -#define T_Beep_Delay 438 -#define T_Sim_Duration 439 -#define T_Server_Offset 440 -#define T_Duration 441 -#define T_Freq_Offset 442 -#define T_Wander 443 -#define T_Jitter 444 -#define T_Prop_Delay 445 -#define T_Proc_Delay 446 +#define T_Dscp 290 +#define T_Ellipsis 291 +#define T_Enable 292 +#define T_End 293 +#define T_False 294 +#define T_File 295 +#define T_Filegen 296 +#define T_Filenum 297 +#define T_Flag1 298 +#define T_Flag2 299 +#define T_Flag3 300 +#define T_Flag4 301 +#define T_Flake 302 +#define T_Floor 303 +#define T_Freq 304 +#define T_Fudge 305 +#define T_Host 306 +#define T_Huffpuff 307 +#define T_Iburst 308 +#define T_Ident 309 +#define T_Ignore 310 +#define T_Incalloc 311 +#define T_Incmem 312 +#define T_Initalloc 313 +#define T_Initmem 314 +#define T_Includefile 315 +#define T_Integer 316 +#define T_Interface 317 +#define T_Intrange 318 +#define T_Io 319 +#define T_Ipv4 320 +#define T_Ipv4_flag 321 +#define T_Ipv6 322 +#define T_Ipv6_flag 323 +#define T_Kernel 324 +#define T_Key 325 +#define T_Keys 326 +#define T_Keysdir 327 +#define T_Kod 328 +#define T_Mssntp 329 +#define T_Leapfile 330 +#define T_Leapsmearinterval 331 +#define T_Limited 332 +#define T_Link 333 +#define T_Listen 334 +#define T_Logconfig 335 +#define T_Logfile 336 +#define T_Loopstats 337 +#define T_Lowpriotrap 338 +#define T_Manycastclient 339 +#define T_Manycastserver 340 +#define T_Mask 341 +#define T_Maxage 342 +#define T_Maxclock 343 +#define T_Maxdepth 344 +#define T_Maxdist 345 +#define T_Maxmem 346 +#define T_Maxpoll 347 +#define T_Mdnstries 348 +#define T_Mem 349 +#define T_Memlock 350 +#define T_Minclock 351 +#define T_Mindepth 352 +#define T_Mindist 353 +#define T_Minimum 354 +#define T_Minpoll 355 +#define T_Minsane 356 +#define T_Mode 357 +#define T_Mode7 358 +#define T_Monitor 359 +#define T_Month 360 +#define T_Mru 361 +#define T_Multicastclient 362 +#define T_Nic 363 +#define T_Nolink 364 +#define T_Nomodify 365 +#define T_Nomrulist 366 +#define T_None 367 +#define T_Nonvolatile 368 +#define T_Nopeer 369 +#define T_Noquery 370 +#define T_Noselect 371 +#define T_Noserve 372 +#define T_Notrap 373 +#define T_Notrust 374 +#define T_Ntp 375 +#define T_Ntpport 376 +#define T_NtpSignDsocket 377 +#define T_Orphan 378 +#define T_Orphanwait 379 +#define T_Panic 380 +#define T_Peer 381 +#define T_Peerstats 382 +#define T_Phone 383 +#define T_Pid 384 +#define T_Pidfile 385 +#define T_Pool 386 +#define T_Port 387 +#define T_Preempt 388 +#define T_Prefer 389 +#define T_Protostats 390 +#define T_Pw 391 +#define T_Randfile 392 +#define T_Rawstats 393 +#define T_Refid 394 +#define T_Requestkey 395 +#define T_Reset 396 +#define T_Restrict 397 +#define T_Revoke 398 +#define T_Rlimit 399 +#define T_Saveconfigdir 400 +#define T_Server 401 +#define T_Setvar 402 +#define T_Source 403 +#define T_Stacksize 404 +#define T_Statistics 405 +#define T_Stats 406 +#define T_Statsdir 407 +#define T_Step 408 +#define T_Stepback 409 +#define T_Stepfwd 410 +#define T_Stepout 411 +#define T_Stratum 412 +#define T_String 413 +#define T_Sys 414 +#define T_Sysstats 415 +#define T_Tick 416 +#define T_Time1 417 +#define T_Time2 418 +#define T_Timer 419 +#define T_Timingstats 420 +#define T_Tinker 421 +#define T_Tos 422 +#define T_Trap 423 +#define T_True 424 +#define T_Trustedkey 425 +#define T_Ttl 426 +#define T_Type 427 +#define T_U_int 428 +#define T_Unconfig 429 +#define T_Unpeer 430 +#define T_Version 431 +#define T_WanderThreshold 432 +#define T_Week 433 +#define T_Wildcard 434 +#define T_Xleave 435 +#define T_Year 436 +#define T_Flag 437 +#define T_EOC 438 +#define T_Simulate 439 +#define T_Beep_Delay 440 +#define T_Sim_Duration 441 +#define T_Server_Offset 442 +#define T_Duration 443 +#define T_Freq_Offset 444 +#define T_Wander 445 +#define T_Jitter 446 +#define T_Prop_Delay 447 +#define T_Proc_Delay 448 + + -/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE YYSTYPE; -union YYSTYPE +typedef union YYSTYPE { -#line 54 "ntp_parser.y" /* yacc.c:1909 */ +/* Line 2053 of yacc.c */ +#line 51 "../../ntpd/ntp_parser.y" char * String; double Double; @@ -451,15 +457,29 @@ union YYSTYPE script_info * Sim_script; script_info_fifo * Sim_script_fifo; -#line 455 "ntp_parser.h" /* yacc.c:1909 */ -}; + +/* Line 2053 of yacc.c */ +#line 463 "ntp_parser.h" +} YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif - extern YYSTYPE yylval; -int yyparse (struct FILE_INFO *ip_file); +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ #endif /* !YY_YY_NTP_PARSER_H_INCLUDED */ diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index 577b5fb0af5a..40624066746f 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -14,6 +14,7 @@ #include "ntp_control.h" #include "ntp_string.h" #include "ntp_leapsec.h" +#include "refidsmear.h" #include #ifdef HAVE_LIBSCF_H @@ -61,7 +62,8 @@ typedef struct peer_select_tag { * System variables are declared here. Unless specified otherwise, all * times are in seconds. */ -u_char sys_leap; /* system leap indicator */ +u_char sys_leap; /* system leap indicator, use set_sys_leap() to change this */ +u_char xmt_leap; /* leap indicator sent in client requests, set up by set_sys_leap() */ u_char sys_stratum; /* system stratum */ s_char sys_precision; /* local clock precision (log2 s) */ double sys_rootdelay; /* roundtrip delay to primary source */ @@ -70,6 +72,11 @@ u_int32 sys_refid; /* reference id (network byte order) */ l_fp sys_reftime; /* last update time */ struct peer *sys_peer; /* current peer */ +#ifdef LEAP_SMEAR +struct leap_smear_info leap_smear; +#endif +int leap_sec_in_progress; + /* * Rate controls. Leaky buckets are used to throttle the packet * transmission rates in order to protect busy servers such as at NIST @@ -151,6 +158,33 @@ void pool_name_resolved (int, int, void *, const char *, const struct addrinfo *); #endif /* WORKER */ +void +set_sys_leap(u_char new_sys_leap) { + sys_leap = new_sys_leap; + xmt_leap = sys_leap; + + /* + * Under certain conditions we send faked leap bits to clients, so + * eventually change xmt_leap below, but never change LEAP_NOTINSYNC. + */ + if (xmt_leap != LEAP_NOTINSYNC) { + if (leap_sec_in_progress) { + /* always send "not sync" */ + xmt_leap = LEAP_NOTINSYNC; + } +#ifdef LEAP_SMEAR + else { + /* + * If leap smear is enabled in general we must never send a leap second warning + * to clients, so make sure we only send "in sync". + */ + if (leap_smear.enabled) + xmt_leap = LEAP_NOWARNING; + } +#endif /* LEAP_SMEAR */ + } +} + /* * transmit - transmit procedure called by poll timeout @@ -1909,7 +1943,7 @@ clock_update( */ case 2: clear_all(); - sys_leap = LEAP_NOTINSYNC; + set_sys_leap(LEAP_NOTINSYNC); sys_stratum = STRATUM_UNSPEC; memcpy(&sys_refid, "STEP", 4); sys_rootdelay = 0; @@ -1930,7 +1964,7 @@ clock_update( * process. */ if (sys_leap == LEAP_NOTINSYNC) { - sys_leap = LEAP_NOWARNING; + set_sys_leap(LEAP_NOWARNING); #ifdef AUTOKEY if (crypto_flags) crypto_update(); @@ -2424,7 +2458,7 @@ clock_select(void) osys_peer = sys_peer; sys_survivors = 0; #ifdef LOCKCLOCK - sys_leap = LEAP_NOTINSYNC; + set_sys_leap(LEAP_NOTINSYNC); sys_stratum = STRATUM_UNSPEC; memcpy(&sys_refid, "DOWN", 4); #endif /* LOCKCLOCK */ @@ -3407,6 +3441,16 @@ peer_xmit( } +#ifdef LEAP_SMEAR + +static void +leap_smear_add_offs(l_fp *t, l_fp *t_recv) { + L_ADD(t, &leap_smear.offset); +} + +#endif /* LEAP_SMEAR */ + + /* * fast_xmit - Send packet for nonpersistent association. Note that * neither the source or destination can be a broadcast address. @@ -3468,18 +3512,60 @@ fast_xmit( * This is a normal packet. Use the system variables. */ } else { - xpkt.li_vn_mode = PKT_LI_VN_MODE(sys_leap, +#ifdef LEAP_SMEAR + /* + * Make copies of the variables which can be affected by smearing. + */ + l_fp this_ref_time; + l_fp this_recv_time; +#endif + + /* + * If we are inside the leap smear interval we add the current smear offset to + * the packet receive time, to the packet transmit time, and eventually to the + * reftime to make sure the reftime isn't later than the transmit/receive times. + */ + xpkt.li_vn_mode = PKT_LI_VN_MODE(xmt_leap, PKT_VERSION(rpkt->li_vn_mode), xmode); + xpkt.stratum = STRATUM_TO_PKT(sys_stratum); xpkt.ppoll = max(rpkt->ppoll, ntp_minpoll); xpkt.precision = sys_precision; xpkt.refid = sys_refid; xpkt.rootdelay = HTONS_FP(DTOFP(sys_rootdelay)); xpkt.rootdisp = HTONS_FP(DTOUFP(sys_rootdisp)); + +#ifdef LEAP_SMEAR + this_ref_time = sys_reftime; + if (leap_smear.in_progress) { + leap_smear_add_offs(&this_ref_time, NULL); + xpkt.refid = convertLFPToRefID(leap_smear.offset); + DPRINTF(2, ("fast_xmit: leap_smear.in_progress: refid %8x, smear %s\n", + ntohl(xpkt.refid), + lfptoa(&leap_smear.offset, 8) + )); + } + HTONL_FP(&this_ref_time, &xpkt.reftime); +#else HTONL_FP(&sys_reftime, &xpkt.reftime); +#endif + xpkt.org = rpkt->xmt; + +#ifdef LEAP_SMEAR + this_recv_time = rbufp->recv_time; + if (leap_smear.in_progress) + leap_smear_add_offs(&this_recv_time, NULL); + HTONL_FP(&this_recv_time, &xpkt.rec); +#else HTONL_FP(&rbufp->recv_time, &xpkt.rec); +#endif + get_systime(&xmt_tx); +#ifdef LEAP_SMEAR + if (leap_smear.in_progress) + leap_smear_add_offs(&xmt_tx, &this_recv_time); +#endif HTONL_FP(&xmt_tx, &xpkt.xmt); } @@ -3988,7 +4074,7 @@ init_proto(void) * Fill in the sys_* stuff. Default is don't listen to * broadcasting, require authentication. */ - sys_leap = LEAP_NOTINSYNC; + set_sys_leap(LEAP_NOTINSYNC); sys_stratum = STRATUM_UNSPEC; memcpy(&sys_refid, "INIT", 4); sys_peer = NULL; @@ -4062,8 +4148,12 @@ proto_config( case PROTO_MONITOR: /* monitoring (monitor) */ if (value) mon_start(MON_ON); - else + else { mon_stop(MON_ON); + if (mon_enabled) + msyslog(LOG_WARNING, + "restrict: 'monitor' cannot be disabled while 'limited' is enabled"); + } break; case PROTO_NTP: /* NTP discipline (ntp) */ diff --git a/contrib/ntp/ntpd/ntp_scanner.c b/contrib/ntp/ntpd/ntp_scanner.c index a7c19922bd53..49adf6bfb767 100644 --- a/contrib/ntp/ntpd/ntp_scanner.c +++ b/contrib/ntp/ntpd/ntp_scanner.c @@ -38,6 +38,7 @@ char yytext[MAX_LEXEME]; /* Buffer for storing the input text/lexeme */ u_int32 conf_file_sum; /* Simple sum of characters read */ +static struct FILE_INFO * lex_stack = NULL; @@ -86,153 +87,342 @@ keyword( } -/* FILE INTERFACE - * -------------- - * We define a couple of wrapper functions around the standard C fgetc - * and ungetc functions in order to include positional bookkeeping +/* FILE & STRING BUFFER INTERFACE + * ------------------------------ + * + * This set out as a couple of wrapper functions around the standard C + * fgetc and ungetc functions in order to include positional + * bookkeeping. Alas, this is no longer a good solution with nested + * input files and the possibility to send configuration commands via + * 'ntpdc' and 'ntpq'. + * + * Now there are a few functions to maintain a stack of nested input + * sources (though nesting is only allowd for disk files) and from the + * scanner / parser point of view there's no difference between both + * types of sources. + * + * The 'fgetc()' / 'ungetc()' replacements now operate on a FILE_INFO + * structure. Instead of trying different 'ungetc()' strategies for file + * and buffer based parsing, we keep the backup char in our own + * FILE_INFO structure. This is sufficient, as the parser does *not* + * jump around via 'seek' or the like, and there's no need to + * check/clear the backup store in other places than 'lex_getch()'. */ -struct FILE_INFO * -F_OPEN( +/* + * Allocate an info structure and attach it to a file. + * + * Note: When 'mode' is NULL, then the INFO block will be set up to + * contain a NULL file pointer, as suited for remote config command + * parsing. Otherwise having a NULL file pointer is considered an error, + * and a NULL info block pointer is returned to indicate failure! + * + * Note: We use a variable-sized structure to hold a copy of the file + * name (or, more proper, the input source description). This is more + * secure than keeping a reference to some other storage that might go + * out of scope. + */ +static struct FILE_INFO * +lex_open( const char *path, const char *mode ) { - struct FILE_INFO *my_info; + struct FILE_INFO *stream; + size_t nnambuf; - my_info = emalloc(sizeof *my_info); + nnambuf = strlen(path); + stream = emalloc_zero(sizeof(*stream) + nnambuf); + stream->curpos.nline = 1; + stream->backch = EOF; + /* copy name with memcpy -- trailing NUL already there! */ + memcpy(stream->fname, path, nnambuf); - my_info->line_no = 1; - my_info->col_no = 0; - my_info->prev_line_col_no = 0; - my_info->prev_token_col_no = 0; - my_info->fname = path; - - my_info->fd = fopen(path, mode); - if (NULL == my_info->fd) { - free(my_info); - return NULL; + if (NULL != mode) { + stream->fpi = fopen(path, mode); + if (NULL == stream->fpi) { + free(stream); + stream = NULL; + } } - return my_info; + return stream; } -int -FGETC( +/* get next character from buffer or file. This will return any putback + * character first; it will also make sure the last line is at least + * virtually terminated with a '\n'. + */ +static int +lex_getch( struct FILE_INFO *stream ) { int ch; - - do - ch = fgetc(stream->fd); - while (EOF != ch && (CHAR_MIN > ch || ch > CHAR_MAX)); - if (EOF != ch) { - if (input_from_file) - conf_file_sum += (u_char)ch; - ++stream->col_no; - if (ch == '\n') { - stream->prev_line_col_no = stream->col_no; - ++stream->line_no; - stream->col_no = 1; + if (NULL == stream || stream->force_eof) + return EOF; + + if (EOF != stream->backch) { + ch = stream->backch; + stream->backch = EOF; + if (stream->fpi) + conf_file_sum += ch; + } else if (stream->fpi) { + /* fetch next 7-bit ASCII char (or EOF) from file */ + while ((ch = fgetc(stream->fpi)) != EOF && ch > SCHAR_MAX) + stream->curpos.ncol++; + if (EOF != ch) { + conf_file_sum += ch; + stream->curpos.ncol++; } + } else { + /* fetch next 7-bit ASCII char from buffer */ + const char * scan; + scan = &remote_config.buffer[remote_config.pos]; + while ((ch = (u_char)*scan) > SCHAR_MAX) { + scan++; + stream->curpos.ncol++; + } + if ('\0' != ch) { + scan++; + stream->curpos.ncol++; + } else { + ch = EOF; + } + remote_config.pos = (int)(scan - remote_config.buffer); + } + + /* If the last line ends without '\n', generate one. This + * happens most likely on Windows, where editors often have a + * sloppy concept of a line. + */ + if (EOF == ch && stream->curpos.ncol != 0) + ch = '\n'; + + /* update scan position tallies */ + if (ch == '\n') { + stream->bakpos = stream->curpos; + stream->curpos.nline++; + stream->curpos.ncol = 0; } return ch; } -/* BUGS: 1. Function will fail on more than one line of pushback - * 2. No error checking is done to see if ungetc fails - * SK: I don't think its worth fixing these bugs for our purposes ;-) +/* Note: lex_ungetch will fail to track more than one line of push + * back. But since it guarantees only one char of back storage anyway, + * this should not be a problem. */ -int -UNGETC( +static int +lex_ungetch( int ch, struct FILE_INFO *stream ) { - if (input_from_file) - conf_file_sum -= (u_char)ch; - if (ch == '\n') { - stream->col_no = stream->prev_line_col_no; - stream->prev_line_col_no = -1; - --stream->line_no; + /* check preconditions */ + if (NULL == stream || stream->force_eof) + return EOF; + if (EOF != stream->backch || EOF == ch) + return EOF; + + /* keep for later reference and update checksum */ + stream->backch = (u_char)ch; + if (stream->fpi) + conf_file_sum -= stream->backch; + + /* update position */ + if (stream->backch == '\n') { + stream->curpos = stream->bakpos; + stream->bakpos.ncol = -1; } - --stream->col_no; - return ungetc(ch, stream->fd); + stream->curpos.ncol--; + return stream->backch; } -int -FCLOSE( +/* dispose of an input structure. If the file pointer is not NULL, close + * the file. This function does not check the result of 'fclose()'. + */ +static void +lex_close( struct FILE_INFO *stream ) { - int ret_val = fclose(stream->fd); - - if (!ret_val) + if (NULL != stream) { + if (NULL != stream->fpi) + fclose(stream->fpi); free(stream); - return ret_val; + } } -/* STREAM INTERFACE - * ---------------- - * Provide a wrapper for the stream functions so that the - * stream can either read from a file or from a character - * array. - * NOTE: This is not very efficient for reading from character - * arrays, but needed to allow remote configuration where the - * configuration command is provided through ntpq. - * - * The behavior of there two functions is determined by the - * input_from_file flag. +/* INPUT STACK + * ----------- + * + * Nested input sources are a bit tricky at first glance. We deal with + * this problem using a stack of input sources, that is, a forward + * linked list of FILE_INFO structs. + * + * This stack is never empty during parsing; while an encounter with EOF + * can and will remove nested input sources, removing the last element + * in the stack will not work during parsing, and the EOF condition of + * the outermost input file remains until the parser folds up. */ -static int -get_next_char( - struct FILE_INFO *ip_file +static struct FILE_INFO * +_drop_stack_do( + struct FILE_INFO * head ) { - char ch; - - if (input_from_file) - return FGETC(ip_file); - else { - if (remote_config.buffer[remote_config.pos] == '\0') - return EOF; - else { - ip_file->col_no++; - ch = remote_config.buffer[remote_config.pos++]; - if (ch == '\n') { - ip_file->prev_line_col_no = ip_file->col_no; - ++ip_file->line_no; - ip_file->col_no = 1; - } - return ch; - } + struct FILE_INFO * tail; + while (NULL != head) { + tail = head->st_next; + lex_close(head); + head = tail; } + return head; } -static void -push_back_char( - struct FILE_INFO *ip_file, - int ch + + +/* Create a singleton input source on an empty lexer stack. This will + * fail if there is already an input source, or if the underlying disk + * file cannot be opened. + * + * Returns TRUE if a new input object was successfully created. + */ +int/*BOOL*/ +lex_init_stack( + const char * path, + const char * mode ) { - if (input_from_file) - UNGETC(ch, ip_file); - else { - if (ch == '\n') { - ip_file->col_no = ip_file->prev_line_col_no; - ip_file->prev_line_col_no = -1; - --ip_file->line_no; - } - --ip_file->col_no; + if (NULL != lex_stack || NULL == path) + return FALSE; - remote_config.pos--; - } + lex_stack = lex_open(path, mode); + return (NULL != lex_stack); +} + +/* This removes *all* input sources from the stack, leaving the head + * pointer as NULL. Any attempt to parse in that state is likely to bomb + * with segmentation faults or the like. + * + * In other words: Use this to clean up after parsing, and do not parse + * anything until the next 'lex_init_stack()' succeeded. + */ +void +lex_drop_stack() +{ + lex_stack = _drop_stack_do(lex_stack); +} + +/* Flush the lexer input stack: This will nip all input objects on the + * stack (but keeps the current top-of-stack) and marks the top-of-stack + * as inactive. Any further calls to lex_getch yield only EOF, and it's + * no longer possible to push something back. + * + * Returns TRUE if there is a head element (top-of-stack) that was not + * in the force-eof mode before this call. + */ +int/*BOOL*/ +lex_flush_stack() +{ + int retv = FALSE; + + if (NULL != lex_stack) { + retv = !lex_stack->force_eof; + lex_stack->force_eof = TRUE; + lex_stack->st_next = _drop_stack_do( + lex_stack->st_next); + } + return retv; +} + +/* Push another file on the parsing stack. If the mode is NULL, create a + * FILE_INFO suitable for in-memory parsing; otherwise, create a + * FILE_INFO that is bound to a local/disc file. Note that 'path' must + * not be NULL, or the function will fail. + * + * Returns TRUE if a new info record was pushed onto the stack. + */ +int/*BOOL*/ lex_push_file( + const char * path, + const char * mode + ) +{ + struct FILE_INFO * next = NULL; + + if (NULL != path) { + next = lex_open(path, mode); + if (NULL != next) { + next->st_next = lex_stack; + lex_stack = next; + } + } + return (NULL != next); +} + +/* Pop, close & free the top of the include stack, unless the stack + * contains only a singleton input object. In that case the function + * fails, because the parser does not expect the input stack to be + * empty. + * + * Returns TRUE if an object was successfuly popped from the stack. + */ +int/*BOOL*/ +lex_pop_file(void) +{ + struct FILE_INFO * head = lex_stack; + struct FILE_INFO * tail = NULL; + + if (NULL != head) { + tail = head->st_next; + if (NULL != tail) { + lex_stack = tail; + lex_close(head); + } + } + return (NULL != tail); +} + +/* Get include nesting level. This currently loops over the stack and + * counts elements; but since this is of concern only with an include + * statement and the nesting depth has a small limit, there's no + * bottleneck expected here. + * + * Returns the nesting level of includes, that is, the current depth of + * the lexer input stack. + * + * Note: + */ +size_t +lex_level(void) +{ + size_t cnt = 0; + struct FILE_INFO *ipf = lex_stack; + + while (NULL != ipf) { + cnt++; + ipf = ipf->st_next; + } + return cnt; +} + +/* check if the current input is from a file */ +int/*BOOL*/ +lex_from_file(void) +{ + return (NULL != lex_stack) && (NULL != lex_stack->fpi); +} + +struct FILE_INFO * +lex_current() +{ + /* this became so simple, it could be a macro. But then, + * lex_stack needed to be global... + */ + return lex_stack; } - /* STATE MACHINES * -------------- @@ -297,7 +487,7 @@ is_integer( /* Check that all the remaining characters are digits */ for (; lexeme[i] != '\0'; i++) { - if (!isdigit((unsigned char)lexeme[i])) + if (!isdigit((u_char)lexeme[i])) return FALSE; } @@ -322,7 +512,7 @@ is_u_int( int is_hex; i = 0; - if ('0' == lexeme[i] && 'x' == tolower((unsigned char)lexeme[i + 1])) { + if ('0' == lexeme[i] && 'x' == tolower((u_char)lexeme[i + 1])) { i += 2; is_hex = TRUE; } else { @@ -331,9 +521,9 @@ is_u_int( /* Check that all the remaining characters are digits */ for (; lexeme[i] != '\0'; i++) { - if (is_hex && !isxdigit((unsigned char)lexeme[i])) + if (is_hex && !isxdigit((u_char)lexeme[i])) return FALSE; - if (!is_hex && !isdigit((unsigned char)lexeme[i])) + if (!is_hex && !isdigit((u_char)lexeme[i])) return FALSE; } @@ -357,14 +547,14 @@ is_double( i++; /* Read the integer part */ - for (; lexeme[i] && isdigit((unsigned char)lexeme[i]); i++) + for (; lexeme[i] && isdigit((u_char)lexeme[i]); i++) num_digits++; /* Check for the optional decimal point */ if ('.' == lexeme[i]) { i++; /* Check for any digits after the decimal point */ - for (; lexeme[i] && isdigit((unsigned char)lexeme[i]); i++) + for (; lexeme[i] && isdigit((u_char)lexeme[i]); i++) num_digits++; } @@ -380,7 +570,7 @@ is_double( return 1; /* There is still more input, read the exponent */ - if ('e' == tolower((unsigned char)lexeme[i])) + if ('e' == tolower((u_char)lexeme[i])) i++; else return 0; @@ -390,7 +580,7 @@ is_double( i++; /* Now read the exponent part */ - while (lexeme[i] && isdigit((unsigned char)lexeme[i])) + while (lexeme[i] && isdigit((u_char)lexeme[i])) i++; /* Check if we are done */ @@ -455,7 +645,7 @@ create_string_token( * ignore end of line whitespace */ pch = lexeme; - while (*pch && isspace((unsigned char)*pch)) + while (*pch && isspace((u_char)*pch)) pch++; if (!*pch) { @@ -476,37 +666,31 @@ create_string_token( * value representing the token or type. */ int -yylex( - struct FILE_INFO *ip_file - ) +yylex(void) { static follby followedby = FOLLBY_TOKEN; - size_t i; + int i; int instring; int yylval_was_set; int converted; int token; /* The return value */ int ch; - if (input_from_file) - ip_file = fp[curr_include_level]; instring = FALSE; yylval_was_set = FALSE; do { /* Ignore whitespace at the beginning */ - while (EOF != (ch = get_next_char(ip_file)) && + while (EOF != (ch = lex_getch(lex_stack)) && isspace(ch) && !is_EOC(ch)) + ; /* Null Statement */ if (EOF == ch) { - if (!input_from_file || curr_include_level <= 0) + if ( ! lex_pop_file()) return 0; - - FCLOSE(fp[curr_include_level]); - ip_file = fp[--curr_include_level]; token = T_EOC; goto normal_return; @@ -531,15 +715,14 @@ yylex( yytext[1] = '\0'; goto normal_return; } else - push_back_char(ip_file, ch); + lex_ungetch(ch, lex_stack); /* save the position of start of the token */ - ip_file->prev_token_line_no = ip_file->line_no; - ip_file->prev_token_col_no = ip_file->col_no; + lex_stack->tokpos = lex_stack->curpos; /* Read in the lexeme */ i = 0; - while (EOF != (ch = get_next_char(ip_file))) { + while (EOF != (ch = lex_getch(lex_stack))) { yytext[i] = (char)ch; @@ -553,7 +736,7 @@ yylex( /* Read the rest of the line on reading a start of comment character */ if ('#' == ch) { - while (EOF != (ch = get_next_char(ip_file)) + while (EOF != (ch = lex_getch(lex_stack)) && '\n' != ch) ; /* Null Statement */ break; @@ -571,7 +754,7 @@ yylex( */ if ('"' == ch) { instring = TRUE; - while (EOF != (ch = get_next_char(ip_file)) && + while (EOF != (ch = lex_getch(lex_stack)) && ch != '"' && ch != '\n') { yytext[i++] = (char)ch; if (i >= COUNTOF(yytext)) @@ -583,18 +766,15 @@ yylex( * not be pushed back, so we read another char. */ if ('"' == ch) - ch = get_next_char(ip_file); + ch = lex_getch(lex_stack); } /* Pushback the last character read that is not a part - * of this lexeme. - * If the last character read was an EOF, pushback a - * newline character. This is to prevent a parse error - * when there is no newline at the end of a file. + * of this lexeme. This fails silently if ch is EOF, + * but then the EOF condition persists and is handled on + * the next turn by the include stack mechanism. */ - if (EOF == ch) - push_back_char(ip_file, '\n'); - else - push_back_char(ip_file, ch); + lex_ungetch(ch, lex_stack); + yytext[i] = '\0'; } while (i == 0); @@ -627,7 +807,7 @@ yylex( msyslog(LOG_ERR, "Integer cannot be represented: %s", yytext); - if (input_from_file) { + if (lex_from_file()) { exit(1); } else { /* force end of parsing */ @@ -640,7 +820,7 @@ yylex( } else if (is_u_int(yytext)) { yylval_was_set = TRUE; if ('0' == yytext[0] && - 'x' == tolower((unsigned char)yytext[1])) + 'x' == tolower((unsigned long)yytext[1])) converted = sscanf(&yytext[2], "%x", &yylval.U_int); else @@ -650,7 +830,7 @@ yylex( msyslog(LOG_ERR, "U_int cannot be represented: %s", yytext); - if (input_from_file) { + if (lex_from_file()) { exit(1); } else { /* force end of parsing */ @@ -735,14 +915,14 @@ yylex( yytext[min(sizeof(yytext) - 1, 50)] = 0; msyslog(LOG_ERR, "configuration item on line %d longer than limit of %lu, began with '%s'", - ip_file->line_no, (u_long)min(sizeof(yytext) - 1, 50), + lex_stack->curpos.nline, (u_long)min(sizeof(yytext) - 1, 50), yytext); /* * If we hit the length limit reading the startup configuration * file, abort. */ - if (input_from_file) + if (lex_from_file()) exit(sizeof(yytext) - 1); /* diff --git a/contrib/ntp/ntpd/ntp_scanner.h b/contrib/ntp/ntpd/ntp_scanner.h index 67976371d8ff..11bbfe914be5 100644 --- a/contrib/ntp/ntpd/ntp_scanner.h +++ b/contrib/ntp/ntpd/ntp_scanner.h @@ -83,22 +83,28 @@ typedef enum { typedef u_int32 scan_state; +struct LCPOS { + int nline; + int ncol; +}; -/* Structure to hold a filename, file pointer and positional info */ +/* Structure to hold a filename, file pointer and positional info. + * Instances are dynamically allocated, and the file name is copied by + * value into a dynamic extension of the 'fname' array. (Which *must* be + * the last field for that reason!) + */ struct FILE_INFO { - const char * fname; /* Path to the file */ - FILE * fd; /* File Descriptor */ - int line_no; /* Line Number */ - int col_no; /* Column Number */ - int prev_line_col_no; /* Col No on the - previous line when a - '\n' was seen */ - int prev_token_line_no; /* Line at start of - token */ - int prev_token_col_no; /* Col No at start of - token */ - int err_line_no; - int err_col_no; + struct FILE_INFO * st_next; /* next on stack */ + FILE * fpi; /* File Descriptor */ + int force_eof; /* locked or not */ + int backch; /* ungetch buffer */ + + struct LCPOS curpos; /* current scan position */ + struct LCPOS bakpos; /* last line end for ungetc */ + struct LCPOS tokpos; /* current token position */ + struct LCPOS errpos; /* error position */ + + char fname[1]; /* (formal only) buffered name */ }; @@ -106,25 +112,31 @@ struct FILE_INFO { * ------------------------ */ extern config_tree cfgt; /* Parser output stored here */ -extern int curr_include_level; /* The current include level */ /* VARIOUS EXTERNAL DECLARATIONS * ----------------------------- */ extern int old_config_style; -extern int input_from_file; -extern struct FILE_INFO *fp[]; /* VARIOUS SUBROUTINE DECLARATIONS * ------------------------------- */ extern const char *keyword(int token); extern char *quote_if_needed(char *str); -int yylex(struct FILE_INFO *); +int yylex(void); -struct FILE_INFO *F_OPEN(const char *path, const char *mode); -int FGETC(struct FILE_INFO *stream); -int UNGETC(int ch, struct FILE_INFO *stream); -int FCLOSE(struct FILE_INFO *stream); +/* managing the input source stack itself */ +extern int/*BOOL*/ lex_init_stack(const char * path, const char * mode); +extern void lex_drop_stack(void); +extern int/*BOOL*/ lex_flush_stack(void); + +/* add/remove a nested input source */ +extern int/*BOOL*/ lex_push_file(const char * path, const char * mode); +extern int/*BOOL*/ lex_pop_file(void); + +/* input stack state query functions */ +extern size_t lex_level(void); +extern int/*BOOL*/ lex_from_file(void); +extern struct FILE_INFO * lex_current(void); #endif /* NTP_SCANNER_H */ diff --git a/contrib/ntp/ntpd/ntp_timer.c b/contrib/ntp/ntpd/ntp_timer.c index 958c8db39400..5cbb892e3ddd 100644 --- a/contrib/ntp/ntpd/ntp_timer.c +++ b/contrib/ntp/ntpd/ntp_timer.c @@ -41,6 +41,7 @@ #define TC_ERR (-1) #endif + static void check_leapsec(u_int32, const time_t*, int/*BOOL*/); /* @@ -110,7 +111,7 @@ static RETSIGTYPE alarming (int); static timer_t timer_id; typedef struct itimerspec intervaltimer; # define itv_frac tv_nsec -# else +# else typedef struct itimerval intervaltimer; # define itv_frac tv_usec # endif @@ -151,7 +152,7 @@ set_timer_or_die( /* * reinit_timer - reinitialize interval timer after a clock step. */ -void +void reinit_timer(void) { #if !defined(SYS_WINNT) && !defined(VMS) @@ -211,7 +212,7 @@ init_timer(void) } # endif signal_no_reset(SIGALRM, alarming); - itimer.it_interval.tv_sec = + itimer.it_interval.tv_sec = itimer.it_value.tv_sec = (1 << EVENT_TIMEOUT); itimer.it_interval.itv_frac = itimer.it_value.itv_frac = 0; set_timer_or_die(&itimer); @@ -228,7 +229,7 @@ init_timer(void) #else /* SYS_WINNT follows */ /* * Set up timer interrupts for every 2**EVENT_TIMEOUT seconds - * Under Windows/NT, + * Under Windows/NT, */ WaitableTimerHandle = CreateWaitableTimer(NULL, FALSE, NULL); @@ -341,9 +342,9 @@ timer(void) if (sys_orphan < STRATUM_UNSPEC && sys_peer == NULL && current_time > orphwait) { if (sys_leap == LEAP_NOTINSYNC) { - sys_leap = LEAP_NOWARNING; + set_sys_leap(LEAP_NOWARNING); #ifdef AUTOKEY - if (crypto_flags) + if (crypto_flags) crypto_update(); #endif /* AUTOKEY */ } @@ -370,11 +371,11 @@ timer(void) if (sys_leap != LEAP_NOTINSYNC) { if (leapsec >= LSPROX_ANNOUNCE && leapdif) { if (leapdif > 0) - sys_leap = LEAP_ADDSECOND; + set_sys_leap(LEAP_ADDSECOND); else - sys_leap = LEAP_DELSECOND; + set_sys_leap(LEAP_DELSECOND); } else { - sys_leap = LEAP_NOWARNING; + set_sys_leap(LEAP_NOWARNING); } } @@ -472,7 +473,7 @@ alarming( # endif # ifdef DEBUG if (debug >= 4) - write(1, msg, strlen(msg)); + (void)(-1 == write(1, msg, strlen(msg))); # endif } #endif /* SYS_WINNT */ @@ -496,44 +497,162 @@ timer_clr_stats(void) timer_timereset = current_time; } + +static void +check_leap_sec_in_progress( const leap_result_t *lsdata ) { + int prv_leap_sec_in_progress = leap_sec_in_progress; + leap_sec_in_progress = lsdata->tai_diff && (lsdata->ddist < 3); + + /* if changed we may have to update the leap status sent to clients */ + if (leap_sec_in_progress != prv_leap_sec_in_progress) + set_sys_leap(sys_leap); +} + + static void check_leapsec( u_int32 now , const time_t * tpiv , int/*BOOL*/ reset) { + static const char leapmsg_p_step[] = + "Positive leap second, stepped backward."; + static const char leapmsg_p_slew[] = + "Positive leap second, no step correction. " + "System clock will be inaccurate for a long time."; + + static const char leapmsg_n_step[] = + "Negative leap second, stepped forward."; + static const char leapmsg_n_slew[] = + "Negative leap second, no step correction. " + "System clock will be inaccurate for a long time."; + leap_result_t lsdata; u_int32 lsprox; - +#ifdef AUTOKEY + int/*BOOL*/ update_autokey = FALSE; +#endif + #ifndef SYS_WINNT /* WinNT port has its own leap second handling */ # ifdef KERNEL_PLL leapsec_electric(pll_control && kern_enable); # else leapsec_electric(0); # endif -#endif +#endif +#ifdef LEAP_SMEAR + leap_smear.enabled = leap_smear_intv != 0; +#endif if (reset) { lsprox = LSPROX_NOWARN; leapsec_reset_frame(); memset(&lsdata, 0, sizeof(lsdata)); - } else if (leapsec_query(&lsdata, now, tpiv)) { + } else { + int fired = leapsec_query(&lsdata, now, tpiv); + + DPRINTF(1, ("*** leapsec_query: fired %i, now %u (0x%08X), tai_diff %i, ddist %u\n", + fired, now, now, lsdata.tai_diff, lsdata.ddist)); + +#ifdef LEAP_SMEAR + leap_smear.in_progress = 0; + leap_smear.doffset = 0.0; + + if (leap_smear.enabled) { + if (lsdata.tai_diff) { + if (leap_smear.interval == 0) { + leap_smear.interval = leap_smear_intv; + leap_smear.intv_end = lsdata.ttime.Q_s; + leap_smear.intv_start = leap_smear.intv_end - leap_smear.interval; + DPRINTF(1, ("*** leapsec_query: setting leap_smear interval %li, begin %.0f, end %.0f\n", + leap_smear.interval, leap_smear.intv_start, leap_smear.intv_end)); + } + } + else { + if (leap_smear.interval) + DPRINTF(1, ("*** leapsec_query: clearing leap_smear interval\n")); + leap_smear.interval = 0; + } + + if (leap_smear.interval) { + double dtemp = now; + if (dtemp >= leap_smear.intv_start && dtemp <= leap_smear.intv_end) { + double leap_smear_time = dtemp - leap_smear.intv_start; + /* + * For now we just do a linear interpolation over the smear interval + */ +#if 0 + // linear interpolation + leap_smear.doffset = -(leap_smear_time * lsdata.tai_diff / leap_smear.interval); +#else + // Google approach: lie(t) = (1.0 - cos(pi * t / w)) / 2.0 + leap_smear.doffset = -((double) lsdata.tai_diff - cos( M_PI * leap_smear_time / leap_smear.interval)) / 2.0; +#endif + /* + * TODO see if we're inside an inserted leap second, so we need to compute + * leap_smear.doffset = 1.0 - leap_smear.doffset + */ + leap_smear.in_progress = 1; +#if 0 && defined( DEBUG ) + msyslog(LOG_NOTICE, "*** leapsec_query: [%.0f:%.0f] (%li), now %u (%.0f), smear offset %.6f ms\n", + leap_smear.intv_start, leap_smear.intv_end, leap_smear.interval, + now, leap_smear_time, leap_smear.doffset); +#else + DPRINTF(1, ("*** leapsec_query: [%.0f:%.0f] (%li), now %u (%.0f), smear offset %.6f ms\n", + leap_smear.intv_start, leap_smear.intv_end, leap_smear.interval, + now, leap_smear_time, leap_smear.doffset)); +#endif + + } + } + } + else + leap_smear.interval = 0; + + /* + * Update the current leap smear offset, eventually 0.0 if outside smear interval. + */ + DTOLFP(leap_smear.doffset, &leap_smear.offset); + +#endif /* LEAP_SMEAR */ + + if (fired) { /* Full hit. Eventually step the clock, but always * announce the leap event has happened. */ + const char *leapmsg = NULL; if (lsdata.warped < 0) { - step_systime(lsdata.warped); - msyslog(LOG_NOTICE, "Inserting positive leap second."); + if (clock_max_back > 0.0 && + clock_max_back < fabs(lsdata.warped)) { + step_systime(lsdata.warped); + leapmsg = leapmsg_p_step; + } else { + leapmsg = leapmsg_p_slew; + } } else if (lsdata.warped > 0) { - step_systime(lsdata.warped); - msyslog(LOG_NOTICE, "Inserting negative leap second."); + if (clock_max_fwd > 0.0 && + clock_max_fwd < fabs(lsdata.warped)) { + step_systime(lsdata.warped); + leapmsg = leapmsg_n_step; + } else { + leapmsg = leapmsg_n_slew; + } } + if (leapmsg) + msyslog(LOG_NOTICE, "%s", leapmsg); report_event(EVNT_LEAP, NULL, NULL); +#ifdef AUTOKEY + update_autokey = TRUE; +#endif lsprox = LSPROX_NOWARN; leapsec = LSPROX_NOWARN; sys_tai = lsdata.tai_offs; - } else { + } else { +#ifdef AUTOKEY + update_autokey = (sys_tai != lsdata.tai_offs); +#endif lsprox = lsdata.proximity; sys_tai = lsdata.tai_offs; + } } /* We guard against panic alarming during the red alert phase. @@ -563,8 +682,15 @@ check_leapsec( leapsec = lsprox; } - if (leapsec >= LSPROX_SCHEDULE) - leapdif = lsdata.tai_diff; - else - leapdif = 0; + if (leapsec >= LSPROX_SCHEDULE) + leapdif = lsdata.tai_diff; + else + leapdif = 0; + + check_leap_sec_in_progress(&lsdata); + +#ifdef AUTOKEY + if (update_autokey) + crypto_update_taichange(); +#endif } diff --git a/contrib/ntp/ntpd/ntpd-opts.c b/contrib/ntp/ntpd/ntpd-opts.c index 910689d1ea97..2d547a18de79 100644 --- a/contrib/ntp/ntpd/ntpd-opts.c +++ b/contrib/ntp/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed April 7, 2015 at 04:23:14 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed June 29, 2015 at 04:28:19 PM by AutoGen 5.18.5 * From the definitions ntpd-opts.def * and the template file options * @@ -75,7 +75,7 @@ extern FILE * option_usage_fp; * static const strings for ntpd options */ static char const ntpd_opt_strs[3129] = -/* 0 */ "ntpd 4.2.8p2\n" +/* 0 */ "ntpd 4.2.8p3\n" "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -205,12 +205,12 @@ static char const ntpd_opt_strs[3129] = /* 2900 */ "output version information and exit\0" /* 2936 */ "version\0" /* 2944 */ "NTPD\0" -/* 2949 */ "ntpd - NTP daemon program - Ver. 4.2.8p2\n" +/* 2949 */ "ntpd - NTP daemon program - Ver. 4.2.8p3\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3080 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3114 */ "\n\0" -/* 3116 */ "ntpd 4.2.8p2"; +/* 3116 */ "ntpd 4.2.8p3"; /** * ipv4 option description with @@ -1331,7 +1331,7 @@ OPT_VALUE_SET_DEBUG_LEVEL++; (void)pOptDesc; (void)pOptions; } -/* extracted from optmain.tlib near line 1245 */ +/* extracted from optmain.tlib near line 1250 */ /** * The directory containing the data associated with ntpd. @@ -1443,11 +1443,11 @@ AO_gettext(char const * pz) if (option_xlateable_txt.field_ct != 0) { res = dgettext("libopts", pz); if (res == pz) - res = (char *)(void *)_(pz); + res = (char *)VOIDP(_(pz)); } else - res = (char *)(void *)_(pz); + res = (char *)VOIDP(_(pz)); #else - res = (char *)(void *)_(pz); + res = (char *)VOIDP(_(pz)); #endif if (res == pz) return res; @@ -1484,7 +1484,7 @@ translate_option_strings(void) * Do the translations. The first pointer follows the field count * field. The field count field is the size of a pointer. */ - char ** ppz = (char**)(void*)&(option_xlateable_txt); + char ** ppz = (char**)VOIDP(&(option_xlateable_txt)); int ix = option_xlateable_txt.field_ct; do { @@ -1494,16 +1494,16 @@ translate_option_strings(void) /* prevent re-translation and disable "libopts" domain lookup */ option_xlateable_txt.field_ct = 0; - coerce_it((void*)&(opts->pzCopyright)); - coerce_it((void*)&(opts->pzCopyNotice)); - coerce_it((void*)&(opts->pzFullVersion)); - coerce_it((void*)&(opts->pzUsageTitle)); - coerce_it((void*)&(opts->pzExplain)); - coerce_it((void*)&(opts->pzDetail)); + coerce_it(VOIDP(&(opts->pzCopyright))); + coerce_it(VOIDP(&(opts->pzCopyNotice))); + coerce_it(VOIDP(&(opts->pzFullVersion))); + coerce_it(VOIDP(&(opts->pzUsageTitle))); + coerce_it(VOIDP(&(opts->pzExplain))); + coerce_it(VOIDP(&(opts->pzDetail))); { tOptDesc * od = opts->pOptDesc; for (ix = opts->optCt; ix > 0; ix--, od++) - coerce_it((void*)&(od->pzText)); + coerce_it(VOIDP(&(od->pzText))); } } } @@ -1529,7 +1529,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.2.8p2\n\ + puts(_("ntpd 4.2.8p3\n\ Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -1670,7 +1670,7 @@ implied warranty.\n")); puts(_("output version information and exit")); /* referenced via ntpdOptions.pzUsageTitle */ - puts(_("ntpd - NTP daemon program - Ver. 4.2.8p2\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.2.8p3\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1678,7 +1678,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.2.8p2")); + puts(_("ntpd 4.2.8p3")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); @@ -1704,7 +1704,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ #line 121 "../version.c" puts(_("Automated Options version %s\n" "\tCopyright (C) 1999-2014 by Bruce Korb - all rights reserved\n")); -#line 82 "../makeshell.c" +#line 87 "../makeshell.c" puts(_("(AutoOpts bug): %s.\n")); #line 90 "../reset.c" puts(_("optionResetOpt() called, but reset-option not configured")); @@ -1728,9 +1728,9 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("%s: Command line arguments required\n")); #line 43 "../alias.c" puts(_("%d %s%s options allowed\n")); -#line 89 "../makeshell.c" +#line 94 "../makeshell.c" puts(_("%s error %d (%s) calling %s for '%s'\n")); -#line 301 "../makeshell.c" +#line 306 "../makeshell.c" puts(_("interprocess pipe")); #line 168 "../version.c" puts(_("error: version option argument '%c' invalid. Use:\n" @@ -1808,9 +1808,9 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("Try '%s %s' for more information.\n")); #line 45 "../alias.c" puts(_("one %s%s option allowed\n")); -#line 203 "../makeshell.c" +#line 208 "../makeshell.c" puts(_("standard output")); -#line 938 "../makeshell.c" +#line 943 "../makeshell.c" puts(_("standard output")); #line 274 "../usage.c" puts(_("standard output")); @@ -1828,9 +1828,9 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("standard error")); #line 175 "../version.c" puts(_("standard error")); -#line 203 "../makeshell.c" +#line 208 "../makeshell.c" puts(_("write")); -#line 938 "../makeshell.c" +#line 943 "../makeshell.c" puts(_("write")); #line 273 "../usage.c" puts(_("write")); @@ -1882,7 +1882,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ #line 380 "../usage.c" puts(_("Options are specified by doubled hyphens and their name or by a single\n" "hyphen and the flag character.\n")); -#line 916 "../makeshell.c" +#line 921 "../makeshell.c" puts(_("\n" "= = = = = = = =\n\n" "This incarnation of genshell will produce\n" diff --git a/contrib/ntp/ntpd/ntpd-opts.h b/contrib/ntp/ntpd/ntpd-opts.h index 682aebda41af..21142d8c4de2 100644 --- a/contrib/ntp/ntpd/ntpd-opts.h +++ b/contrib/ntp/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed April 7, 2015 at 04:23:13 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed June 29, 2015 at 04:28:18 PM by AutoGen 5.18.5 * From the definitions ntpd-opts.def * and the template file options * @@ -106,9 +106,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 38 /** ntpd version */ -#define NTPD_VERSION "4.2.8p2" +#define NTPD_VERSION "4.2.8p3" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.2.8p2" +#define NTPD_FULL_VERSION "ntpd 4.2.8p3" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/contrib/ntp/ntpd/ntpd.1ntpdman b/contrib/ntp/ntpd/ntpd.1ntpdman index 5ded89b0cac0..c231b7fd8486 100644 --- a/contrib/ntp/ntpd/ntpd.1ntpdman +++ b/contrib/ntp/ntpd/ntpd.1ntpdman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpd 1ntpdman "07 Apr 2015" "4.2.8p2" "User Commands" +.TH ntpd 1ntpdman "29 Jun 2015" "4.2.8p3" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-TQays3/ag-5Qaqr3) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-LZaapD/ag-XZa4nD) .\" -.\" It has been AutoGen-ed April 7, 2015 at 04:25:45 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed June 29, 2015 at 04:30:24 PM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -59,7 +59,7 @@ with future gigahertz CPU clocks and gigabit LANs. Ordinarily, \f\*[B-Font]ntpd\fP reads the -\fCntp.conf\fR(5)\f[] +\fCntp.conf\f[]\fR(5)\f[] configuration file at startup time in order to determine the synchronization sources and operating modes. It is also possible to @@ -78,7 +78,7 @@ then \f\*[B-Font]ntpd\fP will attempt to read its configuration from the NetInfo if the default -\fCntp.conf\fR(5)\f[] +\fCntp.conf\f[]\fR(5)\f[] file cannot be read and no file is specified by the \f\*[B-Font]\-c\f[] @@ -93,9 +93,9 @@ configuration options altered while the \f\*[B-Font]ntpd\fP is running using the -\fCntpq\fR(1ntpqmdoc)\f[] +\fCntpq\f[]\fR(1ntpqmdoc)\f[] and -\fCntpdc\fR(1ntpdcmdoc)\f[] +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[] utility programs. .sp \n(Ppu .ne 2 @@ -103,11 +103,11 @@ utility programs. When \f\*[B-Font]ntpd\fP starts it looks at the value of -\fCumask\fR(2)\f[], +\fCumask\f[]\fR(2)\f[], and if zero \f\*[B-Font]ntpd\fP will set the -\fCumask\fR(2)\f[] +\fCumask\f[]\fR(2)\f[] to 022. .SH "OPTIONS" .TP @@ -472,7 +472,7 @@ keyword with the \f\*[B-Font]server\f[] configuration command, as described in -\fCntp.conf\fR(5)\f[]. +\fCntp.conf\f[]\fR(5)\f[]. .sp \n(Ppu .ne 2 @@ -601,9 +601,9 @@ when you have permission to do so from the owner of the target host. Finally, in the past many startup scripts would run -\fCntpdate\fR(1ntpdatemdoc)\f[] +\fCntpdate\f[]\fR(1ntpdatemdoc)\f[] to get the system clock close to correct before starting -\fCntpd\fR(1ntpdmdoc)\f[], +\fCntpd\f[]\fR(1ntpdmdoc)\f[], but this was never more than a mediocre hack and is no longer needed. If you are following the instructions in \fIStarting NTP (Best Current Practice)\f[] @@ -611,12 +611,12 @@ and you still need to set the system time before starting \f\*[B-Font]ntpd\fP, please open a bug report and document what is going on, and then look at using -\fCsntp\fR(1sntpmdoc)\f[]. +\fCsntp\f[]\fR(1sntpmdoc)\f[]. .sp \n(Ppu .ne 2 There is a way to start -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] that often addresses all of the problems mentioned above. .SS "Starting NTP (Best Current Practice)" First, use the @@ -630,14 +630,14 @@ entries. If you can also keep a good \fIntp.drift\f[] file then -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] will effectively "warm-start" and your system's clock will be stable in under 11 seconds' time. .sp \n(Ppu .ne 2 As soon as possible in the startup sequence, start -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] with at least the \f\*[B-Font]\-g\f[] and perhaps the @@ -646,7 +646,7 @@ options. Then, start the rest of your "normal" processes. This will give -\fCntpd\fR(1ntpdmdoc)\f[] +\fCntpd\f[]\fR(1ntpdmdoc)\f[] as much time as possible to get the system's clock synchronized and stable. .sp \n(Ppu .ne 2 @@ -658,13 +658,13 @@ or database servers that require monotonically-increasing time, run -\fCntp-wait\fR(1ntp-waitmdoc)\f[] +\fCntp-wait\f[]\fR(1ntp-waitmdoc)\f[] as late as possible in the boot sequence (perhaps with the \f\*[B-Font]\-v\f[] flag) and after -\fCntp-wait\fR(1ntp-waitmdoc)\f[] +\fCntp-wait\f[]\fR(1ntp-waitmdoc)\f[] exits successfully it is as safe as it will ever be to start any process that require stable time. @@ -749,11 +749,11 @@ In some cases it may not be practical for \f\*[B-Font]ntpd\fP to run continuously. A common workaround has been to run the -\fCntpdate\fR(1ntpdatemdoc)\f[] +\fCntpdate\f[]\fR(1ntpdatemdoc)\f[] or -\fCsntp\fR(1sntpmdoc)\f[] +\fCsntp\f[]\fR(1sntpmdoc)\f[] programs from a -\fCcron\fR(8)\f[] +\fCcron\f[]\fR(8)\f[] job at designated times. However, these programs do not have the crafted signal @@ -780,7 +780,7 @@ If nothing is heard after a couple of minutes, the daemon times out and exits. After a suitable period of mourning, the -\fCntpdate\fR(1ntpdatemdoc)\f[] +\fCntpdate\f[]\fR(1ntpdatemdoc)\f[] program will be retired. .sp \n(Ppu @@ -891,7 +891,7 @@ The filter is activated by the command and \f\*[B-Font]huffpuff\f[] keyword, as described in -\fCntp.conf\fR(5)\f[]. +\fCntp.conf\f[]\fR(5)\f[]. .SH "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES @@ -923,11 +923,11 @@ libopts had an internal operational error. Please report it to autogen-users@lists.sourceforge.net. Thank you. .PP .SH "SEE ALSO" -\fCntp.conf\fR(5)\f[], -\fCntpdate\fR(1ntpdatemdoc)\f[], -\fCntpdc\fR(1ntpdcmdoc)\f[], -\fCntpq\fR(1ntpqmdoc)\f[], -\fCsntp\fR(1sntpmdoc)\f[] +\fCntp.conf\f[]\fR(5)\f[], +\fCntpdate\f[]\fR(1ntpdatemdoc)\f[], +\fCntpdc\f[]\fR(1ntpdcmdoc)\f[], +\fCntpq\f[]\fR(1ntpqmdoc)\f[], +\fCsntp\f[]\fR(1sntpmdoc)\f[] .sp \n(Ppu .ne 2 diff --git a/contrib/ntp/ntpd/ntpd.1ntpdmdoc b/contrib/ntp/ntpd/ntpd.1ntpdmdoc index 14b38e40a861..08d7655dff1f 100644 --- a/contrib/ntp/ntpd/ntpd.1ntpdmdoc +++ b/contrib/ntp/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd April 7 2015 +.Dd June 29 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed April 7, 2015 at 04:26:02 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed June 29, 2015 at 04:30:41 PM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/contrib/ntp/ntpd/ntpd.html b/contrib/ntp/ntpd/ntpd.html index 8919ee90d241..7af6d9859f95 100644 --- a/contrib/ntp/ntpd/ntpd.html +++ b/contrib/ntp/ntpd/ntpd.html @@ -39,7 +39,7 @@ The program can operate in any of several modes, including client/server, symmetric and broadcast modes, and with both symmetric-key and public-key cryptography. -

This document applies to version 4.2.8p2 of ntpd. +

This document applies to version 4.2.8p3 of ntpd.

  • ntpd Description: Description @@ -220,7 +220,7 @@ the usage text by passing it through a pager program. used to select the program, defaulting to more. Both will exit with a status code of 0. -
    ntpd - NTP daemon program - Ver. 4.2.8p2-RC3
+
    ntpd - NTP daemon program - Ver. 4.2.8p3-RC3
 Usage:  ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
diff --git a/contrib/ntp/ntpd/ntpd.man.in b/contrib/ntp/ntpd/ntpd.man.in
index d9497a3ec46c..c7c4eecd2edc 100644
--- a/contrib/ntp/ntpd/ntpd.man.in
+++ b/contrib/ntp/ntpd/ntpd.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpd @NTPD_MS@ "07 Apr 2015" "4.2.8p2" "User Commands"
+.TH ntpd @NTPD_MS@ "29 Jun 2015" "4.2.8p3" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-TQays3/ag-5Qaqr3)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-LZaapD/ag-XZa4nD)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:25:45 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:30:24 PM by AutoGen 5.18.5
 .\" From the definitions ntpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -59,7 +59,7 @@ with future gigahertz CPU clocks and gigabit LANs.
 Ordinarily,
 \f\*[B-Font]ntpd\fP
 reads the
-\fCntp.conf\fR(5)\f[]
+\fCntp.conf\f[]\fR(5)\f[]
 configuration file at startup time in order to determine the
 synchronization sources and operating modes.
 It is also possible to
@@ -78,7 +78,7 @@ then
 \f\*[B-Font]ntpd\fP
 will attempt to read its configuration from the
 NetInfo if the default
-\fCntp.conf\fR(5)\f[]
+\fCntp.conf\f[]\fR(5)\f[]
 file cannot be read and no file is
 specified by the
 \f\*[B-Font]\-c\f[]
@@ -93,9 +93,9 @@ configuration options altered while the
 \f\*[B-Font]ntpd\fP
 is running
 using the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 utility programs.
 .sp \n(Ppu
 .ne 2
@@ -103,11 +103,11 @@ utility programs.
 When
 \f\*[B-Font]ntpd\fP
 starts it looks at the value of
-\fCumask\fR(2)\f[],
+\fCumask\f[]\fR(2)\f[],
 and if zero
 \f\*[B-Font]ntpd\fP
 will set the
-\fCumask\fR(2)\f[]
+\fCumask\f[]\fR(2)\f[]
 to 022.
 .SH "OPTIONS"
 .TP
@@ -472,7 +472,7 @@ keyword with the
 \f\*[B-Font]server\f[]
 configuration
 command, as described in
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 .sp \n(Ppu
 .ne 2
 
@@ -601,9 +601,9 @@ when you have permission to do so from the owner of the target host.
 
 Finally,
 in the past many startup scripts would run
-\fCntpdate\fR(@NTPDATE_MS@)\f[]
+\fCntpdate\f[]\fR(@NTPDATE_MS@)\f[]
 to get the system clock close to correct before starting
-\fCntpd\fR(@NTPD_MS@)\f[],
+\fCntpd\f[]\fR(@NTPD_MS@)\f[],
 but this was never more than a mediocre hack and is no longer needed.
 If you are following the instructions in
 \fIStarting NTP (Best Current Practice)\f[]
@@ -611,12 +611,12 @@ and you still need to set the system time before starting
 \f\*[B-Font]ntpd\fP,
 please open a bug report and document what is going on,
 and then look at using
-\fCsntp\fR(@SNTP_MS@)\f[].
+\fCsntp\f[]\fR(@SNTP_MS@)\f[].
 .sp \n(Ppu
 .ne 2
 
 There is a way to start
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 that often addresses all of the problems mentioned above.
 .SS "Starting NTP (Best Current Practice)"
 First, use the
@@ -630,14 +630,14 @@ entries.
 If you can also keep a good
 \fIntp.drift\f[]
 file then
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 will effectively "warm-start" and your system's clock will
 be stable in under 11 seconds' time.
 .sp \n(Ppu
 .ne 2
 
 As soon as possible in the startup sequence, start
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 with at least the
 \f\*[B-Font]\-g\f[]
 and perhaps the
@@ -646,7 +646,7 @@ options.
 Then,
 start the rest of your "normal" processes.
 This will give
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 as much time as possible to get the system's clock synchronized and stable.
 .sp \n(Ppu
 .ne 2
@@ -658,13 +658,13 @@ or database servers
 that require
 monotonically-increasing time,
 run
-\fCntp-wait\fR(@NTP_WAIT_MS@)\f[]
+\fCntp-wait\f[]\fR(@NTP_WAIT_MS@)\f[]
 as late as possible in the boot sequence
 (perhaps with the
 \f\*[B-Font]\-v\f[]
 flag)
 and after
-\fCntp-wait\fR(@NTP_WAIT_MS@)\f[]
+\fCntp-wait\f[]\fR(@NTP_WAIT_MS@)\f[]
 exits successfully
 it is as safe as it will ever be to start any process that require
 stable time.
@@ -749,11 +749,11 @@ In some cases it may not be practical for
 \f\*[B-Font]ntpd\fP
 to run continuously.
 A common workaround has been to run the
-\fCntpdate\fR(@NTPDATE_MS@)\f[]
+\fCntpdate\f[]\fR(@NTPDATE_MS@)\f[]
 or
-\fCsntp\fR(@SNTP_MS@)\f[]
+\fCsntp\f[]\fR(@SNTP_MS@)\f[]
 programs from a
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 job at designated
 times.
 However, these programs do not have the crafted signal
@@ -780,7 +780,7 @@ If nothing is heard after a
 couple of minutes, the daemon times out and exits.
 After a suitable
 period of mourning, the
-\fCntpdate\fR(@NTPDATE_MS@)\f[]
+\fCntpdate\f[]\fR(@NTPDATE_MS@)\f[]
 program will be
 retired.
 .sp \n(Ppu
@@ -891,7 +891,7 @@ The filter is activated by the
 command and
 \f\*[B-Font]huffpuff\f[]
 keyword, as described in
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 .SH "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH FILES
@@ -923,11 +923,11 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "SEE ALSO"
-\fCntp.conf\fR(5)\f[],
-\fCntpdate\fR(@NTPDATE_MS@)\f[],
-\fCntpdc\fR(@NTPDC_MS@)\f[],
-\fCntpq\fR(@NTPQ_MS@)\f[],
-\fCsntp\fR(@SNTP_MS@)\f[]
+\fCntp.conf\f[]\fR(5)\f[],
+\fCntpdate\f[]\fR(@NTPDATE_MS@)\f[],
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[],
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[],
+\fCsntp\f[]\fR(@SNTP_MS@)\f[]
 .sp \n(Ppu
 .ne 2
 
diff --git a/contrib/ntp/ntpd/ntpd.mdoc.in b/contrib/ntp/ntpd/ntpd.mdoc.in
index 445853284887..7d87d85bbc27 100644
--- a/contrib/ntp/ntpd/ntpd.mdoc.in
+++ b/contrib/ntp/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTPD @NTPD_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:26:02 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:30:41 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/ntpd/rc_cmdlength.c b/contrib/ntp/ntpd/rc_cmdlength.c
new file mode 100644
index 000000000000..2807d2acd73e
--- /dev/null
+++ b/contrib/ntp/ntpd/rc_cmdlength.c
@@ -0,0 +1,35 @@
+#include 
+
+#if HAVE_UNISTD_H
+# include 
+#endif
+
+
+/* Bug 2853 */
+/* evaluate the length of the command sequence. This breaks at the first
+ * char that is not >= SPACE and <= 127 after trimming from the right.
+ */
+size_t
+remoteconfig_cmdlength(
+	const char *src_buf,
+	const char *src_end
+	)
+{
+	const char *scan;
+	unsigned char ch;
+
+	/* trim whitespace & garbage from the right */
+	while (src_end != src_buf) {
+		ch = src_end[-1];
+		if (ch > ' ' && ch < 128)
+			break;
+		--src_end;
+	}
+	/* now do a forward scan */
+	for (scan = src_buf; scan != src_end; ++scan) {
+		ch = scan[0];
+		if ((ch < ' ' || ch >= 128) && ch != '\t')
+			break;
+	}
+	return (size_t)(scan - src_buf);
+}
diff --git a/contrib/ntp/ntpd/refclock_gpsdjson.c b/contrib/ntp/ntpd/refclock_gpsdjson.c
index 2171a4fff788..0a88cece4d24 100644
--- a/contrib/ntp/ntpd/refclock_gpsdjson.c
+++ b/contrib/ntp/ntpd/refclock_gpsdjson.c
@@ -6,35 +6,120 @@
  *
  *	Heavily inspired by refclock_nmea.c
  *
+ * Special thanks to Gary Miller and Hal Murray for their comments and
+ * ideas.
+ *
  * Note: This will currently NOT work with Windows due to some
  * limitations:
  *
  *  - There is no GPSD for Windows. (There is an unofficial port to
  *    cygwin, but Windows is not officially supported.)
  *
- *  - To work properly, this driver needs PPS and TPV sentences from
- *    GPSD. I don't see how the cygwin port should deal with that.
+ *  - To work properly, this driver needs PPS and TPV/TOFF sentences
+ *    from GPSD. I don't see how the cygwin port should deal with the
+ *    PPS signal.
  *
  *  - The device name matching must be done in a different way for
  *    Windows. (Can be done with COMxx matching, as done for NMEA.)
  *
  * Apart from those minor hickups, once GPSD has been fully ported to
- * Windows, there's no reason why this should not work there ;-)
+ * Windows, there's no reason why this should not work there ;-) If this
+ * is ever to happen at all is a different question.
+ *
+ * ---------------------------------------------------------------------
+ *
+ * This driver works slightly different from most others, as the PPS
+ * information (if available) is also coming from GPSD via the data
+ * connection. This makes using both the PPS data and the serial data
+ * easier, but OTOH it's not possible to use the ATOM driver to feed a
+ * raw PPS stream to the core of NTPD.
+ *
+ * To go around this, the driver can use a secondary clock unit
+ * (units>=128) that operate in tandem with the primary clock unit
+ * (unit%128). The primary clock unit does all the IO stuff and data
+ * decoding; if a a secondary unit is attached to a primary unit, this
+ * secondary unit is feed with the PPS samples only and can act as a PPS
+ * source to the clock selection.
+ *
+ * The drawback is that the primary unit must be present for the
+ * secondary unit to work.
+ *
+ * This design is a compromise to reduce the IO load for both NTPD and
+ * GPSD; it also ensures that data is transmitted and evaluated only
+ * once on the side of NTPD.
+ *
+ * ---------------------------------------------------------------------
+ *
+ * trouble shooting hints:
+ *
+ *   Enable and check the clock stats. Check if there are bad replies;
+ *   there should be none. If there are actually bad replies, then the
+ *   driver cannot parse all JSON records from GPSD, and some record
+ *   types are vital for the operation of the driver. This indicates a
+ *   problem on the protocol level.
+ *
+ *   When started on the command line with a debug level >= 2, the
+ *   driver dumps the raw received data and the parser input to
+ *   stdout. Since the debug level is global, NTPD starts to create a
+ *   *lot* of output. It makes sense to pipe it through '(f)grep
+ *   GPSD_JSON' before writing the result to disk.
+ *
+ *   A bit less intrusive is using netcat or telnet to connect to GPSD
+ *   and snoop what NTPD would get. If you try this, you have to send a
+ *   WATCH command to GPSD:
+ *
+ * ?WATCH={"device":"/dev/gps0","enable":true,"json":true,"pps":true};
+ *
+ *   should show you what GPSD has to say to NTPD. Replace "/dev/gps0"
+ *   with the device link used by GPSD, if necessary.
  */
 
+
 #ifdef HAVE_CONFIG_H
 #include 
 #endif
 
 #include "ntp_types.h"
 
-#if defined(REFCLOCK) && defined(CLOCK_GPSDJSON) && !defined(SYS_WINNT) 
+#if defined(REFCLOCK) && defined(CLOCK_GPSDJSON) && !defined(SYS_WINNT)
 
 /* =====================================================================
- * get the little JSMN library directly into our guts
+ * Get the little JSMN library directly into our guts. Use the 'parent
+ * link' feature for maximum speed.
  */
+#define JSMN_PARENT_LINKS
 #include "../libjsmn/jsmn.c"
 
+/* =====================================================================
+ * JSON parsing stuff
+ */
+
+#define JSMN_MAXTOK	350
+#define INVALID_TOKEN (-1)
+
+typedef struct json_ctx {
+	char        * buf;
+	int           ntok;
+	jsmntok_t     tok[JSMN_MAXTOK];
+} json_ctx;
+
+typedef int tok_ref;
+
+/* Not all targets have 'long long', and not all of them have 'strtoll'.
+ * Sigh. We roll our own integer number parser.
+ */
+#ifdef HAVE_LONG_LONG
+typedef signed   long long int json_int;
+typedef unsigned long long int json_uint;
+#define JSON_INT_MAX LLONG_MAX
+#define JSON_INT_MIN LLONG_MIN
+#else
+typedef signed   long int json_int;
+typedef unsigned long int json_uint;
+#define JSON_INT_MAX LONG_MAX
+#define JSON_INT_MIN LONG_MIN
+#endif
+
 /* =====================================================================
  * header stuff we need
  */
@@ -44,6 +129,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -66,6 +152,42 @@
 #include "ntp_calendar.h"
 #include "timespecops.h"
 
+/* get operation modes from mode word.
+
+ * + SERIAL (default) evaluates only serial time information ('STI') as
+ *   provided by TPV and TOFF records. TPV evaluation suffers from a
+ *   bigger jitter than TOFF, sine it does not contain the receive time
+ *   from GPSD and therefore the receive time of NTPD must be
+ *   substituted for it. The network latency makes this a second rate
+ *   guess.
+ *
+ *   If TOFF records are detected in the data stream, the timing
+ *   information is gleaned from this record -- it contains the local
+ *   receive time stamp from GPSD and therefore eliminates the
+ *   transmission latency between GPSD and NTPD. The timing information
+ *   from TPV is ignored once a TOFF is detected or expected.
+ *
+ *   TPV is still used to check the fix status, so the driver can stop
+ *   feeding samples when GPSD says that the time information is
+ *   effectively unreliable.
+ *
+ * + STRICT means only feed clock samples when a valid STI/PPS pair is
+ *   available. Combines the reference time from STI with the pulse time
+ *   from PPS. Masks the serial data jitter as long PPS is available,
+ *   but can rapidly deteriorate once PPS drops out.
+ *
+ * + AUTO tries to use STI/PPS pairs if available for some time, and if
+ *   this fails for too long switches back to STI only until the PPS
+ *   signal becomes available again. See the HTML docs for this driver
+ *   about the gotchas and why this is not the default.
+ */
+#define MODE_OP_MASK   0x03
+#define MODE_OP_STI    0
+#define MODE_OP_STRICT 1
+#define MODE_OP_AUTO   2
+#define MODE_OP_MAXVAL 2
+#define MODE_OP_MODE(x)		((x) & MODE_OP_MASK)
+
 #define	PRECISION	(-9)	/* precision assumed (about 2 ms) */
 #define	PPS_PRECISION	(-20)	/* precision assumed (about 1 us) */
 #define	REFID		"GPSD"	/* reference id */
@@ -76,9 +198,24 @@
 #define TICKOVER_HIGH	120
 #define LOGTHROTTLE	3600
 
-#define PPS_MAXCOUNT	30
-#define PPS_HIWAT       20
-#define PPS_LOWAT       10
+/* Primary channel PPS avilability dance:
+ * Every good PPS sample gets us a credit of PPS_INCCOUNT points, every
+ * bad/missing PPS sample costs us a debit of PPS_DECCOUNT points. When
+ * the account reaches the upper limit we change to a mode where only
+ * PPS-augmented samples are fed to the core; when the account drops to
+ * zero we switch to a mode where TPV-only timestamps are fed to the
+ * core.
+ * This reduces the chance of rapid alternation between raw and
+ * PPS-augmented time stamps.
+ */
+#define PPS_MAXCOUNT	60	/* upper limit of account  */
+#define PPS_INCCOUNT     3	/* credit for good samples */
+#define PPS_DECCOUNT     1	/* debit for bad samples   */
+
+/* The secondary (PPS) channel uses a different strategy to avoid old
+ * PPS samples in the median filter.
+ */
+#define PPS2_MAXCOUNT 10
 
 #ifndef BOOL
 # define BOOL int
@@ -90,7 +227,11 @@
 # define FALSE 0
 #endif
 
-/* some local typedefs : The NTPD formatting style cries for short type
+#define PROTO_VERSION(hi,lo) \
+	    ((((uint32_t)(hi) << 16) & 0xFFFF0000u) | \
+	     ((uint32_t)(lo) & 0x0FFFFu))
+
+/* some local typedefs: The NTPD formatting style cries for short type
  * names, and we provide them locally. Note:the suffix '_t' is reserved
  * for the standard; I use a capital T instead.
  */
@@ -116,9 +257,11 @@ static	void	gpsd_poll	(int, peerT *);
 static	void	gpsd_control	(int, const struct refclockstat *,
 				 struct refclockstat *, peerT *);
 static	void	gpsd_timer	(int, peerT *);
-static  void    gpsd_clockstats (int, peerT *);
 
-static  int     myasprintf(char**, char const*, ...);
+static  int     myasprintf(char**, char const*, ...) NTP_PRINTF(2, 3);
+
+static void     enter_opmode(peerT *peer, int mode);
+static void	leave_opmode(peerT *peer, int mode);
 
 struct refclock refclock_gpsdjson = {
 	gpsd_start,		/* start up driver */
@@ -133,55 +276,86 @@ struct refclock refclock_gpsdjson = {
 /* =====================================================================
  * our local clock unit and data
  */
-typedef struct gpsd_unit {
-	int	 unit;
-	/* current line protocol version */
-	uint16_t proto_major;
-	uint16_t proto_minor;
+struct gpsd_unit;
+typedef struct gpsd_unit gpsd_unitT;
 
-	/* PPS time stamps */
+struct gpsd_unit {
+	/* links for sharing between master/slave units */
+	gpsd_unitT *next_unit;
+	size_t      refcount;
+
+	/* data for the secondary PPS channel */
+	peerT      *pps_peer;
+
+	/* unit and operation modes */
+	int      unit;
+	int      mode;
+	char    *logname;	/* cached name for log/print */
+	char    * device;	/* device name of unit */
+
+	/* current line protocol version */
+	uint32_t proto_version;
+
+	/* PPS time stamps primary + secondary channel */
 	l_fp pps_local;	/* when we received the PPS message */
 	l_fp pps_stamp;	/* related reference time */
 	l_fp pps_recvt;	/* when GPSD detected the pulse */
+	l_fp pps_stamp2;/* related reference time (secondary) */
+	l_fp pps_recvt2;/* when GPSD detected the pulse (secondary)*/
+	int  ppscount;	/* PPS counter (primary unit) */
+	int  ppscount2;	/* PPS counter (secondary unit) */
 
-	/* TPV (GPS data) time stamps */
-	l_fp tpv_local;	/* when we received the TPV message */
-	l_fp tpv_stamp;	/* effective GPS time stamp */
-	l_fp tpv_recvt;	/* when GPSD got the fix */
+	/* TPV or TOFF serial time information */
+	l_fp sti_local;	/* when we received the TPV/TOFF message */
+	l_fp sti_stamp;	/* effective GPS time stamp */
+	l_fp sti_recvt;	/* when GPSD got the fix */
+
+	/* precision estimates */
+	int16_t	    sti_prec;	/* serial precision based on EPT */
+	int16_t     pps_prec;	/* PPS precision from GPSD or above */
 
 	/* fudge values for correction, mirrored as 'l_fp' */
-	l_fp pps_fudge;
-	l_fp tpv_fudge;
+	l_fp pps_fudge;		/* PPS fudge primary channel */
+	l_fp pps_fudge2;	/* PPS fudge secondary channel */
+	l_fp sti_fudge;		/* TPV/TOFF serial data fudge */
 
 	/* Flags to indicate available data */
-	int fl_tpv   : 1;	/* valid TPV seen (have time) */
+	int fl_nosync: 1;	/* GPSD signals bad quality */
+	int fl_sti   : 1;	/* valid TPV/TOFF seen (have time) */
 	int fl_pps   : 1;	/* valid pulse seen */
+	int fl_pps2  : 1;	/* valid pulse seen for PPS channel */
+	int fl_rawsti: 1;	/* permit raw TPV/TOFF time stamps */
 	int fl_vers  : 1;	/* have protocol version */
 	int fl_watch : 1;	/* watch reply seen */
-	int fl_nsec  : 1;	/* have nanosec PPS info */
+	/* protocol flags */
+	int pf_nsec  : 1;	/* have nanosec PPS info */
+	int pf_toff  : 1;	/* have TOFF record for timing */
 
 	/* admin stuff for sockets and device selection */
 	int         fdt;	/* current connecting socket */
 	addrinfoT * addr;	/* next address to try */
 	u_int       tickover;	/* timeout countdown */
 	u_int       tickpres;	/* timeout preset */
-	u_int       ppscount;	/* PPS mode up/down count */
-	char      * device;	/* device name of unit */
 
 	/* tallies for the various events */
-	u_int       tc_good;	/* good samples received */
-	u_int	    tc_btime;	/* bad time stamps */
-	u_int       tc_bdate;	/* bad date strings */
-	u_int       tc_breply;	/* bad replies */
 	u_int       tc_recv;	/* received known records */
+	u_int       tc_breply;	/* bad replies / parsing errors */
+	u_int       tc_nosync;	/* TPV / sample cycles w/o fix */
+	u_int       tc_sti_recv;/* received serial time info records */
+	u_int       tc_sti_used;/* used        --^-- */
+	u_int       tc_pps_recv;/* received PPS timing info records */
+	u_int       tc_pps_used;/* used        --^-- */
 
 	/* log bloat throttle */
 	u_int       logthrottle;/* seconds to next log slot */
 
-	/* record assemby buffer and saved length */	
+	/* The parse context for the current record */
+	json_ctx    json_parse;
+
+	/* record assemby buffer and saved length */
 	int  buflen;
 	char buffer[MAX_PDU_LEN];
-} gpsd_unitT;
+};
 
 /* =====================================================================
  * static local helpers forward decls
@@ -195,6 +369,9 @@ static void gpsd_parse(peerT * const peer,
 static BOOL convert_ascii_time(l_fp * fp, const char * gps_time);
 static void save_ltc(clockprocT * const pp, const char * const tc);
 static int  syslogok(clockprocT * const pp, gpsd_unitT * const up);
+static void log_data(peerT *peer, const char *what,
+		     const char *buf, size_t len);
+static int16_t clamped_precision(int rawprec);
 
 /* =====================================================================
  * local / static stuff
@@ -202,15 +379,45 @@ static int  syslogok(clockprocT * const pp, gpsd_unitT * const up);
 
 /* The logon string is actually the ?WATCH command of GPSD, using JSON
  * data and selecting the GPS device name we created from our unit
- * number. [Note: This is a format string!]
+ * number. We have an old a newer version that request PPS (and TOFF)
+ * transmission.
+ * Note: These are actually format strings!
  */
-#define s_logon \
-    "?WATCH={\"enable\":true,\"json\":true,\"device\":\"%s\"};\r\n"
+static const char * const s_req_watch[2] = {
+	"?WATCH={\"device\":\"%s\",\"enable\":true,\"json\":true};\r\n",
+	"?WATCH={\"device\":\"%s\",\"enable\":true,\"json\":true,\"pps\":true};\r\n"
+};
 
-/* We keep a static list of network addresses for 'localhost:gpsd', and
- * we try to connect to them in round-robin fashion.
+static const char * const s_req_version =
+    "?VERSION;\r\n";
+
+/* We keep a static list of network addresses for 'localhost:gpsd' or a
+ * fallback alias of it, and we try to connect to them in round-robin
+ * fashion. The service lookup is done during the driver init
+ * function to minmise the impact of 'getaddrinfo()'.
+ *
+ * Alas, the init function is called even if there are no clocks
+ * configured for this driver. So it makes sense to defer the logging of
+ * any errors or other notifications until the first clock unit is
+ * started -- otherwise there might be syslog entries from a driver that
+ * is not used at all.
  */
-static addrinfoT * s_gpsd_addr;
+static addrinfoT  *s_gpsd_addr;
+static gpsd_unitT *s_clock_units;
+
+/* list of service/socket names we want to resolve against */
+static const char * const s_svctab[][2] = {
+	{ "localhost", "gpsd" },
+	{ "localhost", "2947" },
+	{ "127.0.0.1", "2947" },
+	{ NULL, NULL }
+};
+
+/* list of address resolution errors and index of service entry that
+ * finally worked.
+ */
+static int s_svcerr[sizeof(s_svctab)/sizeof(s_svctab[0])];
+static int s_svcidx;
 
 /* =====================================================================
  * log throttling
@@ -238,41 +445,122 @@ syslogok(
 static void
 gpsd_init(void)
 {
-	addrinfoT hints;
-	
+	addrinfoT   hints;
+	int         rc, idx;
+
+	memset(s_svcerr, 0, sizeof(s_svcerr));
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_family   = AF_UNSPEC;
 	hints.ai_protocol = IPPROTO_TCP;
 	hints.ai_socktype = SOCK_STREAM;
 
-	/* just take the first configured address of localhost... */
-	if (getaddrinfo("localhost", "gpsd", &hints, &s_gpsd_addr))
+	for (idx = 0; s_svctab[idx][0] && !s_gpsd_addr; idx++) {
+		rc = getaddrinfo(s_svctab[idx][0], s_svctab[idx][1],
+				 &hints, &s_gpsd_addr);
+		s_svcerr[idx] = rc;
+		if (0 == rc)
+			break;
 		s_gpsd_addr = NULL;
+	}
+	s_svcidx = idx;
+}
+
+/* ---------------------------------------------------------------------
+ * Init Check: flush pending log messages and check if we can proceed
+ */
+static int/*BOOL*/
+gpsd_init_check(void)
+{
+	int idx;
+
+	/* Check if there is something to log */
+	if (s_svcidx == 0)
+		return (s_gpsd_addr != NULL);
+
+	/* spool out the resolver errors */
+	for (idx = 0; idx < s_svcidx; ++idx) {
+		msyslog(LOG_WARNING,
+			"GPSD_JSON: failed to resolve '%s:%s', rc=%d (%s)",
+			s_svctab[idx][0], s_svctab[idx][1],
+			s_svcerr[idx], gai_strerror(s_svcerr[idx]));
+	}
+
+	/* check if it was fatal, or if we can proceed */
+	if (s_gpsd_addr == NULL)
+		msyslog(LOG_ERR, "%s",
+			"GPSD_JSON: failed to get socket address, giving up.");
+	else if (idx != 0)
+		msyslog(LOG_WARNING,
+			"GPSD_JSON: using '%s:%s' instead of '%s:%s'",
+			s_svctab[idx][0], s_svctab[idx][1],
+			s_svctab[0][0], s_svctab[0][1]);
+
+	/* make sure this gets logged only once and tell if we can
+	 * proceed or not
+	 */
+	s_svcidx = 0;
+	return (s_gpsd_addr != NULL);
 }
 
 /* ---------------------------------------------------------------------
  * Start: allocate a unit pointer and set up the runtime data
  */
-
 static int
 gpsd_start(
 	int     unit,
 	peerT * peer)
 {
-	clockprocT * const pp = peer->procptr;
-	gpsd_unitT * const up = emalloc_zero(sizeof(*up));
+	clockprocT  * const pp = peer->procptr;
+	gpsd_unitT  * up;
+	gpsd_unitT ** uscan    = &s_clock_units;
 
 	struct stat sb;
 
-	/* initialize the unit structure */
-	up->fdt      = -1;
-	up->addr     = s_gpsd_addr;
-	up->tickpres = TICKOVER_LOW;
+	/* check if we can proceed at all or if init failed */
+	if ( ! gpsd_init_check())
+		return FALSE;
 
+	/* search for matching unit */
+	while ((up = *uscan) != NULL && up->unit != (unit & 0x7F))
+		uscan = &up->next_unit;
+	if (up == NULL) {
+		/* alloc unit, add to list and increment use count ASAP. */
+		up = emalloc_zero(sizeof(*up));
+		*uscan = up;
+		++up->refcount;
+
+		/* initialize the unit structure */
+		up->logname  = estrdup(refnumtoa(&peer->srcadr));
+		up->unit     = unit & 0x7F;
+		up->fdt      = -1;
+		up->addr     = s_gpsd_addr;
+		up->tickpres = TICKOVER_LOW;
+
+		/* Create the device name and check for a Character
+		 * Device. It's assumed that GPSD was started with the
+		 * same link, so the names match. (If this is not
+		 * practicable, we will have to read the symlink, if
+		 * any, so we can get the true device file.)
+		 */
+		if (-1 == myasprintf(&up->device, "%s%u",
+				     s_dev_stem, up->unit)) {
+			msyslog(LOG_ERR, "%s: clock device name too long",
+				up->logname);
+			goto dev_fail;
+		}
+		if (-1 == stat(up->device, &sb) || !S_ISCHR(sb.st_mode)) {
+			msyslog(LOG_ERR, "%s: '%s' is not a character device",
+				up->logname, up->device);
+			goto dev_fail;
+		}
+	} else {
+		/* All set up, just increment use count. */
+		++up->refcount;
+	}
+	
 	/* setup refclock processing */
-	up->unit    = unit;
 	pp->unitptr = (caddr_t)up;
-	pp->io.fd   = -1;
+	pp->io.fd         = -1;
 	pp->io.clock_recv = gpsd_receive;
 	pp->io.srcclock   = peer;
 	pp->io.datalen    = 0;
@@ -282,35 +570,39 @@ gpsd_start(
 	memcpy(&pp->refid, REFID, 4);
 
 	/* Initialize miscellaneous variables */
-	peer->precision = PRECISION;
+	if (unit >= 128)
+		peer->precision = PPS_PRECISION;
+	else
+		peer->precision = PRECISION;
 
-	/* Create the device name and check for a Character Device. It's
-	 * assumed that GPSD was started with the same link, so the
-	 * names match. (If this is not practicable, we will have to
-	 * read the symlink, if any, so we can get the true device
-	 * file.)
-	 */
-	if (-1 == myasprintf(&up->device, "%s%u", s_dev_stem, unit)) {
-	    msyslog(LOG_ERR, "%s clock device name too long",
-		    refnumtoa(&peer->srcadr));
-	    goto dev_fail;
-	}
-	if (-1 == stat(up->device, &sb) || !S_ISCHR(sb.st_mode)) {
-		msyslog(LOG_ERR, "%s: '%s' is not a character device",
-			refnumtoa(&peer->srcadr), up->device);
-	    goto dev_fail;
+	/* If the daemon name lookup failed, just give up now. */
+	if (NULL == up->addr) {
+		msyslog(LOG_ERR, "%s: no GPSD socket address, giving up",
+			up->logname);
+		goto dev_fail;
 	}
+
 	LOGIF(CLOCKINFO,
 	      (LOG_NOTICE, "%s: startup, device is '%s'",
 	       refnumtoa(&peer->srcadr), up->device));
+	up->mode = MODE_OP_MODE(peer->ttl);
+	if (up->mode > MODE_OP_MAXVAL)
+		up->mode = 0;
+	if (unit >= 128)
+		up->pps_peer = peer;
+	else
+		enter_opmode(peer, up->mode);
 	return TRUE;
 
 dev_fail:
 	/* On failure, remove all UNIT ressources and declare defeat. */
 
 	INSIST (up);
-	free(up->device);
-	free(up);
+	if (!--up->refcount) {
+		*uscan = up->next_unit;
+		free(up->device);
+		free(up);
+	}
 
 	pp->unitptr = (caddr_t)NULL;
 	return FALSE;
@@ -325,17 +617,38 @@ gpsd_shutdown(
 {
 	clockprocT * const pp = peer->procptr;
 	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
+	gpsd_unitT ** uscan   = &s_clock_units;
 
 	UNUSED_ARG(unit);
 
-	if (up) {
-	    free(up->device);
-	    free(up);
+	/* The unit pointer might have been removed already. */
+	if (up == NULL)
+		return;
+
+	/* now check if we must close IO resources */
+	if (peer != up->pps_peer) {
+		if (-1 != pp->io.fd) {
+			DPRINTF(1, ("%s: closing clock, fd=%d\n",
+				    up->logname, pp->io.fd));
+			io_closeclock(&pp->io);
+			pp->io.fd = -1;
+		}
+		if (up->fdt != -1)
+			close(up->fdt);
+	}
+	/* decrement use count and eventually remove this unit. */
+	if (!--up->refcount) {
+		/* unlink this unit */
+		while (*uscan != NULL)
+			if (*uscan == up)
+				*uscan = up->next_unit;
+			else
+				uscan = &(*uscan)->next_unit;
+		free(up->logname);
+		free(up->device);
+		free(up);
 	}
 	pp->unitptr = (caddr_t)NULL;
-	if (-1 != pp->io.fd)
-		io_closeclock(&pp->io);
-	pp->io.fd = -1;
 	LOGIF(CLOCKINFO,
 	      (LOG_NOTICE, "%s: shutdown", refnumtoa(&peer->srcadr)));
 }
@@ -349,11 +662,16 @@ gpsd_receive(
 	/* declare & init control structure ptrs */
 	peerT	   * const peer = rbufp->recv_peer;
 	clockprocT * const pp   = peer->procptr;
-	gpsd_unitT * const up   = (gpsd_unitT *)pp->unitptr;	
+	gpsd_unitT * const up   = (gpsd_unitT *)pp->unitptr;
 
 	const char *psrc, *esrc;
 	char       *pdst, *edst, ch;
 
+	/* log the data stream, if this is enabled */
+	log_data(peer, "recv", (const char*)rbufp->recv_buffer,
+		 (size_t)rbufp->recv_length);
+
+
 	/* Since we're getting a raw stream data, we must assemble lines
 	 * in our receive buffer. We can't use neither 'refclock_gtraw'
 	 * not 'refclock_gtlin' here...  We process chars until we reach
@@ -375,6 +693,7 @@ gpsd_receive(
 				--pdst;
 			*pdst = '\0';
 			/* process data and reset buffer */
+			up->buflen = pdst - up->buffer;
 			gpsd_parse(peer, &rbufp->recv_time);
 			pdst = up->buffer;
 		} else if (pdst != edst) {
@@ -389,6 +708,68 @@ gpsd_receive(
 
 /* ------------------------------------------------------------------ */
 
+static void
+poll_primary(
+	peerT      * const peer ,
+	clockprocT * const pp   ,
+	gpsd_unitT * const up   )
+{
+	if (pp->coderecv != pp->codeproc) {
+		/* all is well */
+		pp->lastref = pp->lastrec;
+		refclock_report(peer, CEVNT_NOMINAL);
+		refclock_receive(peer);
+	} else {
+		/* Not working properly, admit to it. If we have no
+		 * connection to GPSD, declare the clock as faulty. If
+		 * there were bad replies, this is handled as the major
+		 * cause, and everything else is just a timeout.
+		 */
+		peer->precision = PRECISION;
+		if (-1 == pp->io.fd)
+			refclock_report(peer, CEVNT_FAULT);
+		else if (0 != up->tc_breply)
+			refclock_report(peer, CEVNT_BADREPLY);
+		else
+			refclock_report(peer, CEVNT_TIMEOUT);
+	}
+
+	if (pp->sloppyclockflag & CLK_FLAG4)
+		mprintf_clock_stats(
+			&peer->srcadr,"%u %u %u %u %u %u %u",
+			up->tc_recv,
+			up->tc_breply, up->tc_nosync,
+			up->tc_sti_recv, up->tc_sti_used,
+			up->tc_pps_recv, up->tc_pps_used);
+
+	/* clear tallies for next round */
+	up->tc_breply   = 0;
+	up->tc_recv     = 0;
+	up->tc_nosync   = 0;
+	up->tc_sti_recv = 0;
+	up->tc_sti_used = 0;
+	up->tc_pps_recv = 0;
+	up->tc_pps_used = 0;
+}
+
+static void
+poll_secondary(
+	peerT      * const peer ,
+	clockprocT * const pp   ,
+	gpsd_unitT * const up   )
+{
+	if (pp->coderecv != pp->codeproc) {
+		/* all is well */
+		pp->lastref = pp->lastrec;
+		refclock_report(peer, CEVNT_NOMINAL);
+		refclock_receive(peer);
+	} else {
+		peer->precision = PPS_PRECISION;
+		peer->flags &= ~FLAG_PPS;
+		refclock_report(peer, CEVNT_TIMEOUT);
+	}
+}
+
 static void
 gpsd_poll(
 	int     unit,
@@ -396,43 +777,12 @@ gpsd_poll(
 {
 	clockprocT * const pp = peer->procptr;
 	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
-	u_int   tc_max;
 
 	++pp->polls;
-
-	/* find the dominant error */
-	tc_max = max(up->tc_btime, up->tc_bdate);
-	tc_max = max(tc_max, up->tc_breply);
-
-	if (pp->coderecv != pp->codeproc) {
-		/* all is well */
-		pp->lastref = pp->lastrec;
-		refclock_receive(peer);
-	} else {
-		/* not working properly, admit to it */
-		peer->flags    &= ~FLAG_PPS;
-		peer->precision = PRECISION;
-
-		if (-1 == pp->io.fd) {
-			/* not connected to GPSD: clearly not working! */
-			refclock_report(peer, CEVNT_FAULT);
-		} else if (tc_max == up->tc_breply) {
-			refclock_report(peer, CEVNT_BADREPLY);
-		} else if (tc_max == up->tc_btime) {
-			refclock_report(peer, CEVNT_BADTIME);
-		} else if (tc_max == up->tc_bdate) {
-			refclock_report(peer, CEVNT_BADDATE);
-		} else {
-			refclock_report(peer, CEVNT_TIMEOUT);
-		}
-	}
-
-	if (pp->sloppyclockflag & CLK_FLAG4)
-		gpsd_clockstats(unit, peer);
-
-	/* clear tallies for next round */
-	up->tc_good = up->tc_btime = up->tc_bdate =
-	    up->tc_breply = up->tc_recv = 0;
+	if (peer == up->pps_peer)
+		poll_secondary(peer, pp, up);
+	else
+		poll_primary(peer, pp, up);
 }
 
 /* ------------------------------------------------------------------ */
@@ -447,23 +797,32 @@ gpsd_control(
 	clockprocT * const pp = peer->procptr;
 	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
 
-	/* save preprocessed fudge times */
-	DTOLFP(pp->fudgetime1, &up->pps_fudge);
-	DTOLFP(pp->fudgetime2, &up->tpv_fudge);
-}
+	if (peer == up->pps_peer) {
+		DTOLFP(pp->fudgetime1, &up->pps_fudge2);
+		if ( ! (pp->sloppyclockflag & CLK_FLAG1))
+			peer->flags &= ~FLAG_PPS;
+	} else {
+		/* save preprocessed fudge times */
+		DTOLFP(pp->fudgetime1, &up->pps_fudge);
+		DTOLFP(pp->fudgetime2, &up->sti_fudge);
+
+		if (MODE_OP_MODE(up->mode ^ peer->ttl)) {
+			leave_opmode(peer, up->mode);
+			up->mode = MODE_OP_MODE(peer->ttl);
+			enter_opmode(peer, up->mode);
+		}
+	}
+ }
 
 /* ------------------------------------------------------------------ */
 
 static void
-gpsd_timer(
-	int     unit,
-	peerT * peer)
+timer_primary(
+	peerT      * const peer ,
+	clockprocT * const pp   ,
+	gpsd_unitT * const up   )
 {
-	static const char query[] = "?VERSION;";
-
-	clockprocT * const pp = peer->procptr;
-	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
-	int                rc;
+	int rc;
 
 	/* This is used for timeout handling. Nothing that needs
 	 * sub-second precison happens here, so receive/connect/retry
@@ -479,20 +838,17 @@ gpsd_timer(
 		--up->tickover;
 	switch (up->tickover) {
 	case 4:
-		/* try to get a live signal
-		 * If the device is not yet present, we will most likely
-		 * get an error. We put out a new version request,
-		 * because the reply will initiate a new watch request
-		 * cycle.
+		/* If we are connected to GPSD, try to get a live signal
+		 * by querying the version. Otherwise just check the
+		 * socket to become ready.
 		 */
 		if (-1 != pp->io.fd) {
-			if ( ! up->fl_watch) {
-				DPRINTF(2, ("GPSD_JSON(%d): timer livecheck: '%s'\n",
-					    up->unit, query));
-				rc = write(pp->io.fd,
-					   query, sizeof(query));
-				(void)rc;
-			}
+			size_t rlen = strlen(s_req_version);
+			DPRINTF(2, ("%s: timer livecheck: '%s'\n",
+				    up->logname, s_req_version));
+			log_data(peer, "send", s_req_version, rlen);
+			rc = write(pp->io.fd, s_req_version, rlen);
+			(void)rc;
 		} else if (-1 != up->fdt) {
 			gpsd_test_socket(peer);
 		}
@@ -511,35 +867,278 @@ gpsd_timer(
 		if (-1 == pp->io.fd && -1 != up->fdt)
 			gpsd_test_socket(peer);
 	}
+}
 
-	if (up->ppscount > PPS_HIWAT && !(peer->flags & FLAG_PPS))
-		peer->flags |= FLAG_PPS;
-	if (up->ppscount < PPS_LOWAT &&  (peer->flags & FLAG_PPS))
+static void
+timer_secondary(
+	peerT      * const peer ,
+	clockprocT * const pp   ,
+	gpsd_unitT * const up   )
+{
+	/* Reduce the count by one. Flush sample buffer and clear PPS
+	 * flag when this happens.
+	 */
+	up->ppscount2 = max(0, (up->ppscount2 - 1));
+	if (0 == up->ppscount2) {
+		if (pp->coderecv != pp->codeproc) {
+			refclock_report(peer, CEVNT_TIMEOUT);
+			pp->coderecv = pp->codeproc;
+		}
 		peer->flags &= ~FLAG_PPS;
+	}
+}
+
+static void
+gpsd_timer(
+	int     unit,
+	peerT * peer)
+{
+	clockprocT * const pp = peer->procptr;
+	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
+
+	if (peer == up->pps_peer)
+		timer_secondary(peer, pp, up);
+	else
+		timer_primary(peer, pp, up);
+}
+
+/* =====================================================================
+ * handle opmode switches
+ */
+
+static void
+enter_opmode(
+	peerT *peer,
+	int    mode)
+{
+	clockprocT * const pp = peer->procptr;
+	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
+
+	DPRINTF(1, ("%s: enter operation mode %d\n",
+		    up->logname, MODE_OP_MODE(mode)));
+
+	if (MODE_OP_MODE(mode) == MODE_OP_AUTO) {
+		up->fl_rawsti = 0;
+		up->ppscount  = PPS_MAXCOUNT / 2;
+	}
+	up->fl_pps = 0;
+	up->fl_sti = 0;
+}
+
+/* ------------------------------------------------------------------ */
+
+static void
+leave_opmode(
+	peerT *peer,
+	int    mode)
+{
+	clockprocT * const pp = peer->procptr;
+	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
+
+	DPRINTF(1, ("%s: leaving operation mode %d\n",
+		    up->logname, MODE_OP_MODE(mode)));
+
+	if (MODE_OP_MODE(mode) == MODE_OP_AUTO) {
+		up->fl_rawsti = 0;
+		up->ppscount  = 0;
+	}
+	up->fl_pps = 0;
+	up->fl_sti = 0;
+}
+
+/* =====================================================================
+ * operation mode specific evaluation
+ */
+
+static void
+add_clock_sample(
+	peerT      * const peer ,
+	clockprocT * const pp   ,
+	l_fp               stamp,
+	l_fp               recvt)
+{
+	pp->lastref = stamp;
+	if (pp->coderecv == pp->codeproc)
+		refclock_report(peer, CEVNT_NOMINAL);
+	refclock_process_offset(pp, stamp, recvt, 0.0);
+}
+
+/* ------------------------------------------------------------------ */
+
+static void
+eval_strict(
+	peerT      * const peer ,
+	clockprocT * const pp   ,
+	gpsd_unitT * const up   )
+{
+	if (up->fl_sti && up->fl_pps) {
+		/* use TPV reference time + PPS receive time */
+		add_clock_sample(peer, pp, up->sti_stamp, up->pps_recvt);
+		peer->precision = up->pps_prec;
+		/* both packets consumed now... */
+		up->fl_pps = 0;
+		up->fl_sti = 0;
+		++up->tc_sti_used;
+	}
+}
+
+/* ------------------------------------------------------------------ */
+/* PPS processing for the secondary channel. GPSD provides us with full
+ * timing information, so there's no danger of PLL-locking to the wrong
+ * second. The belts and suspenders needed for the raw ATOM clock are
+ * unnecessary here.
+ */
+static void
+eval_pps_secondary(
+	peerT      * const peer ,
+	clockprocT * const pp   ,
+	gpsd_unitT * const up   )
+{
+	if (up->fl_pps2) {
+		/* feed data */
+		add_clock_sample(peer, pp, up->pps_stamp2, up->pps_recvt2);
+		peer->precision = up->pps_prec;
+		/* PPS peer flag logic */
+		up->ppscount2 = min(PPS2_MAXCOUNT, (up->ppscount2 + 2));
+		if ((PPS2_MAXCOUNT == up->ppscount2) &&
+		    (pp->sloppyclockflag & CLK_FLAG1) )
+			peer->flags |= FLAG_PPS;
+		/* mark time stamp as burned... */
+		up->fl_pps2 = 0;
+		++up->tc_pps_used;
+	}
+}
+
+/* ------------------------------------------------------------------ */
+
+static void
+eval_serial(
+	peerT      * const peer ,
+	clockprocT * const pp   ,
+	gpsd_unitT * const up   )
+{
+	if (up->fl_sti) {
+		add_clock_sample(peer, pp, up->sti_stamp, up->sti_recvt);
+		peer->precision = up->sti_prec;
+		/* mark time stamp as burned... */
+		up->fl_sti = 0;
+		++up->tc_sti_used;
+	}
+}
+
+/* ------------------------------------------------------------------ */
+static void
+eval_auto(
+	peerT      * const peer ,
+	clockprocT * const pp   ,
+	gpsd_unitT * const up   )
+{
+	/* If there's no TPV available, stop working here... */
+	if (!up->fl_sti)
+		return;
+
+	/* check how to handle STI+PPS: Can PPS be used to augment STI
+	 * (or vice versae), do we drop the sample because there is a
+	 * temporary missing PPS signal, or do we feed on STI time
+	 * stamps alone?
+	 *
+	 * Do a counter/threshold dance to decide how to proceed.
+	 */
+	if (up->fl_pps) {
+		up->ppscount = min(PPS_MAXCOUNT,
+				   (up->ppscount + PPS_INCCOUNT));
+		if ((PPS_MAXCOUNT == up->ppscount) && up->fl_rawsti) {
+			up->fl_rawsti = 0;
+			msyslog(LOG_INFO,
+				"%s: expect valid PPS from now",
+				up->logname);
+		}
+	} else {
+		up->ppscount = max(0, (up->ppscount - PPS_DECCOUNT));
+		if ((0 == up->ppscount) && !up->fl_rawsti) {
+			up->fl_rawsti = -1;
+			msyslog(LOG_WARNING,
+				"%s: use TPV alone from now",
+				up->logname);
+		}
+	}
+
+	/* now eventually feed the sample */
+	if (up->fl_rawsti)
+		eval_serial(peer, pp, up);
+	else
+		eval_strict(peer, pp, up);
 }
 
 /* =====================================================================
  * JSON parsing stuff
  */
 
-#define JSMN_MAXTOK	100
-#define INVALID_TOKEN (-1)
+/* ------------------------------------------------------------------ */
+/* Parse a decimal integer with a possible sign. Works like 'strtoll()'
+ * or 'strtol()', but with a fixed base of 10 and without eating away
+ * leading whitespace. For the error codes, the handling of the end
+ * pointer and the return values see 'strtol()'.
+ */
+static json_int
+strtojint(
+	const char *cp, char **ep)
+{
+	json_uint     accu, limit_lo, limit_hi;
+	int           flags; /* bit 0: overflow; bit 1: sign */
+	const char  * hold;
 
-typedef struct json_ctx {
-	char        * buf;
-	int           ntok;
-	jsmntok_t     tok[JSMN_MAXTOK];
-} json_ctx;
+	/* pointer union to circumvent a tricky/sticky const issue */
+	union {	const char * c; char * v; } vep;
 
-typedef int tok_ref;
+	/* store initial value of 'cp' -- see 'strtol()' */
+	vep.c = cp;
 
-#ifdef HAVE_LONG_LONG
-typedef long long json_int;
- #define JSON_STRING_TO_INT strtoll
-#else
-typedef long json_int;
- #define JSON_STRING_TO_INT strtol
-#endif
+	/* Eat away an optional sign and set the limits accordingly: The
+	 * high limit is the maximum absolute value that can be returned,
+	 * and the low limit is the biggest value that does not cause an
+	 * overflow when multiplied with 10. Avoid negation overflows.
+	 */
+	if (*cp == '-') {
+		cp += 1;
+		flags    = 2;
+		limit_hi = (json_uint)-(JSON_INT_MIN + 1) + 1;
+	} else {
+		cp += (*cp == '+');
+		flags    = 0;
+		limit_hi = (json_uint)JSON_INT_MAX;
+	}
+	limit_lo = limit_hi / 10;
+
+	/* Now try to convert a sequence of digits. */
+	hold = cp;
+	accu = 0;
+	while (isdigit(*(const unsigned char*)cp)) {
+		flags |= (accu > limit_lo);
+		accu = accu * 10 + (*(const unsigned char*)cp++ - '0');
+		flags |= (accu > limit_hi);
+	}
+	/* Check for empty conversion (no digits seen). */
+	if (hold != cp)
+		vep.c = cp;
+	else
+		errno = EINVAL;	/* accu is still zero */
+	/* Check for range overflow */
+	if (flags & 1) {
+		errno = ERANGE;
+		accu  = limit_hi;
+	}
+	/* If possible, store back the end-of-conversion pointer */
+	if (ep)
+		*ep = vep.v;
+	/* If negative, return the negated result if the accu is not
+	 * zero. Avoid negation overflows.
+	 */
+	if ((flags & 2) && accu)
+		return -(json_int)(accu - 1) - 1;
+	else
+		return (json_int)accu;
+}
 
 /* ------------------------------------------------------------------ */
 
@@ -548,64 +1147,117 @@ json_token_skip(
 	const json_ctx * ctx,
 	tok_ref          tid)
 {
-	int len;
-	len = ctx->tok[tid].size;
-	for (++tid; len; --len)
-		if (tid < ctx->ntok)
-			tid = json_token_skip(ctx, tid);
-		else
+	if (tid >= 0 && tid < ctx->ntok) {
+		int len = ctx->tok[tid].size;
+		/* For arrays and objects, the size is the number of
+		 * ITEMS in the compound. Thats the number of objects in
+		 * the array, and the number of key/value pairs for
+		 * objects. In theory, the key must be a string, and we
+		 * could simply skip one token before skipping the
+		 * value, which can be anything. We're a bit paranoid
+		 * and lazy at the same time: We simply double the
+		 * number of tokens to skip and fall through into the
+		 * array processing when encountering an object.
+		 */
+		switch (ctx->tok[tid].type) {
+		case JSMN_OBJECT:
+			len *= 2;
+			/* FALLTHROUGH */
+		case JSMN_ARRAY:
+			for (++tid; len; --len)
+				tid = json_token_skip(ctx, tid);
 			break;
-	if (tid > ctx->ntok)
-		tid = ctx->ntok;
+			
+		default:
+			++tid;
+			break;
+		}
+		if (tid > ctx->ntok) /* Impossible? Paranoia rulez. */
+			tid = ctx->ntok;
+	}
 	return tid;
 }
-	
+
 /* ------------------------------------------------------------------ */
 
 static int
 json_object_lookup(
-	const json_ctx * ctx,
-	tok_ref          tid,
-	const char     * key)
+	const json_ctx * ctx ,
+	tok_ref          tid ,
+	const char     * key ,
+	int              what)
 {
 	int len;
 
-	if (tid >= ctx->ntok || ctx->tok[tid].type != JSMN_OBJECT)
+	if (tid < 0 || tid >= ctx->ntok ||
+	    ctx->tok[tid].type != JSMN_OBJECT)
 		return INVALID_TOKEN;
-	len = ctx->ntok - tid - 1;
-	if (len > ctx->tok[tid].size)
-		len = ctx->tok[tid].size;
-	for (tid += 1; len > 1; len-=2) {
-		if (ctx->tok[tid].type != JSMN_STRING)
-			continue; /* hmmm... that's an error, strictly speaking */
-		if (!strcmp(key, ctx->buf + ctx->tok[tid].start))
+	
+	len = ctx->tok[tid].size;
+	for (++tid; len && tid+1 < ctx->ntok; --len) {
+		if (ctx->tok[tid].type != JSMN_STRING) { /* Blooper! */
+			tid = json_token_skip(ctx, tid); /* skip key */
+			tid = json_token_skip(ctx, tid); /* skip val */
+		} else if (strcmp(key, ctx->buf + ctx->tok[tid].start)) {
+			tid = json_token_skip(ctx, tid+1); /* skip key+val */
+		} else if (what < 0 || what == ctx->tok[tid+1].type) {
 			return tid + 1;
-		tid = json_token_skip(ctx, tid + 1);
+		} else {
+			break;
+		}
+		/* if skipping ahead returned an error, bail out here. */
+		if (tid < 0)
+			break;
 	}
 	return INVALID_TOKEN;
 }
 
 /* ------------------------------------------------------------------ */
 
-#if 0 /* currently unused */
+static const char*
+json_object_lookup_primitive(
+	const json_ctx * ctx,
+	tok_ref          tid,
+	const char     * key)
+{
+	tid = json_object_lookup(ctx, tid, key, JSMN_PRIMITIVE);
+	if (INVALID_TOKEN  != tid)
+		return ctx->buf + ctx->tok[tid].start;
+	else
+		return NULL;
+}
+/* ------------------------------------------------------------------ */
+/* look up a boolean value. This essentially returns a tribool:
+ * 0->false, 1->true, (-1)->error/undefined
+ */
+static int
+json_object_lookup_bool(
+	const json_ctx * ctx,
+	tok_ref          tid,
+	const char     * key)
+{
+	const char *cp;
+	cp  = json_object_lookup_primitive(ctx, tid, key);
+	switch ( cp ? *cp : '\0') {
+	case 't': return  1;
+	case 'f': return  0;
+	default : return -1;
+	}
+}
+
+/* ------------------------------------------------------------------ */
+
 static const char*
 json_object_lookup_string(
 	const json_ctx * ctx,
 	tok_ref          tid,
 	const char     * key)
 {
-	tok_ref val_ref;
-	val_ref = json_object_lookup(ctx, tid, key);
-	if (INVALID_TOKEN == val_ref               ||
-	    JSMN_STRING   != ctx->tok[val_ref].type )
-		goto cvt_error;
-	return ctx->buf + ctx->tok[val_ref].start;
-
-  cvt_error:
-	errno = EINVAL;
+	tid = json_object_lookup(ctx, tid, key, JSMN_STRING);
+	if (INVALID_TOKEN != tid)
+		return ctx->buf + ctx->tok[tid].start;
 	return NULL;
 }
-#endif
 
 static const char*
 json_object_lookup_string_default(
@@ -614,12 +1266,10 @@ json_object_lookup_string_default(
 	const char     * key,
 	const char     * def)
 {
-	tok_ref val_ref;
-	val_ref = json_object_lookup(ctx, tid, key);
-	if (INVALID_TOKEN == val_ref               ||
-	    JSMN_STRING   != ctx->tok[val_ref].type )
-		return def;
-	return ctx->buf + ctx->tok[val_ref].start;
+	tid = json_object_lookup(ctx, tid, key, JSMN_STRING);
+	if (INVALID_TOKEN != tid)
+		return ctx->buf + ctx->tok[tid].start;
+	return def;
 }
 
 /* ------------------------------------------------------------------ */
@@ -630,22 +1280,18 @@ json_object_lookup_int(
 	tok_ref          tid,
 	const char     * key)
 {
-	json_int  ret;
-	tok_ref   val_ref;
-	char    * ep;
+	json_int     ret;
+	const char * cp;
+	char       * ep;
 
-	val_ref = json_object_lookup(ctx, tid, key);
-	if (INVALID_TOKEN  == val_ref               ||
-	    JSMN_PRIMITIVE != ctx->tok[val_ref].type )
-		goto cvt_error;
-	ret = JSON_STRING_TO_INT(
-		ctx->buf + ctx->tok[val_ref].start, &ep, 10);
-	if (*ep)
-		goto cvt_error;
-	return ret;
-
-  cvt_error:
-	errno = EINVAL;
+	cp = json_object_lookup_primitive(ctx, tid, key);
+	if (NULL != cp) {
+		ret = strtojint(cp, &ep);
+		if (cp != ep && '\0' == *ep)
+			return ret;
+	} else {
+		errno = EINVAL;
+	}
 	return 0;
 }
 
@@ -656,43 +1302,42 @@ json_object_lookup_int_default(
 	const char     * key,
 	json_int         def)
 {
-	json_int  retv;
-	int       esave;
-	
-	esave = errno;
-	errno = 0;
-	retv  = json_object_lookup_int(ctx, tid, key);
-	if (0 != errno)
-		retv = def;
-	errno = esave;
-	return retv;
+	json_int     ret;
+	const char * cp;
+	char       * ep;
+
+	cp = json_object_lookup_primitive(ctx, tid, key);
+	if (NULL != cp) {
+		ret = strtojint(cp, &ep);
+		if (cp != ep && '\0' == *ep)
+			return ret;
+	}
+	return def;
 }
 
 /* ------------------------------------------------------------------ */
-
+#if 0 /* currently unused */
 static double
 json_object_lookup_float(
 	const json_ctx * ctx,
 	tok_ref          tid,
 	const char     * key)
 {
-	double    ret;
-	tok_ref   val_ref;
-	char    * ep;
+	double       ret;
+	const char * cp;
+	char       * ep;
 
-	val_ref = json_object_lookup(ctx, tid, key);
-	if (INVALID_TOKEN  == val_ref               ||
-	    JSMN_PRIMITIVE != ctx->tok[val_ref].type )
-		goto cvt_error;
-	ret = strtod(ctx->buf + ctx->tok[val_ref].start, &ep);
-	if (*ep)
-		goto cvt_error;
-	return ret;
-
-  cvt_error:
-	errno = EINVAL;
+	cp = json_object_lookup_primitive(ctx, tid, key);
+	if (NULL != cp) {
+		ret = strtod(cp, &ep);
+		if (cp != ep && '\0' == *ep)
+			return ret;
+	} else {
+		errno = EINVAL;
+	}
 	return 0.0;
 }
+#endif
 
 static double
 json_object_lookup_float_default(
@@ -701,16 +1346,17 @@ json_object_lookup_float_default(
 	const char     * key,
 	double           def)
 {
-	double    retv;
-	int       esave;
-	
-	esave = errno;
-	errno = 0;
-	retv  = json_object_lookup_float(ctx, tid, key);
-	if (0 != errno)
-		retv = def;
-	errno = esave;
-	return retv;
+	double       ret;
+	const char * cp;
+	char       * ep;
+
+	cp = json_object_lookup_primitive(ctx, tid, key);
+	if (NULL != cp) {
+		ret = strtod(cp, &ep);
+		if (cp != ep && '\0' == *ep)
+			return ret;
+	}
+	return def;
 }
 
 /* ------------------------------------------------------------------ */
@@ -718,31 +1364,29 @@ json_object_lookup_float_default(
 static BOOL
 json_parse_record(
 	json_ctx * ctx,
-	char     * buf)
+	char     * buf,
+	size_t     len)
 {
 	jsmn_parser jsm;
 	int         idx, rc;
 
 	jsmn_init(&jsm);
-	rc = jsmn_parse(&jsm, buf, ctx->tok, JSMN_MAXTOK);
+	rc = jsmn_parse(&jsm, buf, len, ctx->tok, JSMN_MAXTOK);
+	if (rc <= 0)
+		return FALSE;
 	ctx->buf  = buf;
-	ctx->ntok = jsm.toknext;
+	ctx->ntok = rc;
+
+	if (JSMN_OBJECT != ctx->tok[0].type)
+		return FALSE; /* not object!?! */
 
 	/* Make all tokens NUL terminated by overwriting the
-	 * terminator symbol
+	 * terminator symbol. Makes string compares and number parsing a
+	 * lot easier!
 	 */
-	for (idx = 0; idx < jsm.toknext; ++idx)
+	for (idx = 0; idx < ctx->ntok; ++idx)
 		if (ctx->tok[idx].end > ctx->tok[idx].start)
 			ctx->buf[ctx->tok[idx].end] = '\0';
-
-	if (JSMN_ERROR_PART  != rc &&
-	    JSMN_ERROR_NOMEM != rc &&
-	    JSMN_SUCCESS     != rc  )
-		return FALSE; /* not parseable - bail out */
-
-	if (0 >= jsm.toknext || JSMN_OBJECT != ctx->tok[0].type)
-		return FALSE; /* not object or no data!?! */
-
 	return TRUE;
 }
 
@@ -750,6 +1394,27 @@ json_parse_record(
 /* =====================================================================
  * static local helpers
  */
+static BOOL
+get_binary_time(
+	l_fp       * const dest     ,
+	json_ctx   * const jctx     ,
+	const char * const time_name,
+	const char * const frac_name,
+	long               fscale   )
+{
+	BOOL            retv = FALSE;
+	struct timespec ts;
+
+	errno = 0;
+	ts.tv_sec  = (time_t)json_object_lookup_int(jctx, 0, time_name);
+	ts.tv_nsec = (long  )json_object_lookup_int(jctx, 0, frac_name);
+	if (0 == errno) {
+		ts.tv_nsec *= fscale;
+		*dest = tspec_stamp_to_lfp(ts);
+		retv  = TRUE;
+	}
+	return retv;
+}
 
 /* ------------------------------------------------------------------ */
 /* Process a WATCH record
@@ -766,7 +1431,19 @@ process_watch(
 	clockprocT * const pp = peer->procptr;
 	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
 
-	up->fl_watch = -1;
+	const char * path;
+
+	path = json_object_lookup_string(jctx, 0, "device");
+	if (NULL == path || strcmp(path, up->device))
+		return;
+
+	if (json_object_lookup_bool(jctx, 0, "enable") > 0 &&
+	    json_object_lookup_bool(jctx, 0, "json"  ) > 0  )
+		up->fl_watch = -1;
+	else
+		up->fl_watch = 0;
+	DPRINTF(2, ("%s: process_watch, enabled=%d\n",
+		    up->logname, (up->fl_watch & 1)));
 }
 
 /* ------------------------------------------------------------------ */
@@ -784,39 +1461,48 @@ process_version(
 	char * buf;
 	const char *revision;
 	const char *release;
+	uint16_t    pvhi, pvlo;
 
 	/* get protocol version number */
 	revision = json_object_lookup_string_default(
-	    jctx, 0, "rev", "(unknown)");
+		jctx, 0, "rev", "(unknown)");
 	release  = json_object_lookup_string_default(
-	    jctx, 0, "release", "(unknown)");
+		jctx, 0, "release", "(unknown)");
 	errno = 0;
-	up->proto_major = (uint16_t)json_object_lookup_int(
-		jctx, 0, "proto_major");
-	up->proto_minor = (uint16_t)json_object_lookup_int(
-		jctx, 0, "proto_minor");
+	pvhi = (uint16_t)json_object_lookup_int(jctx, 0, "proto_major");
+	pvlo = (uint16_t)json_object_lookup_int(jctx, 0, "proto_minor");
+
 	if (0 == errno) {
-		up->fl_vers = -1;
-		if (syslogok(pp, up))
+		if ( ! up->fl_vers)
 			msyslog(LOG_INFO,
 				"%s: GPSD revision=%s release=%s protocol=%u.%u",
-				refnumtoa(&peer->srcadr),
-				revision, release,
-				up->proto_major, up->proto_minor);
+				up->logname, revision, release,
+				pvhi, pvlo);
+		up->proto_version = PROTO_VERSION(pvhi, pvlo);
+		up->fl_vers = -1;
+	} else {
+		if (syslogok(pp, up))
+			msyslog(LOG_INFO,
+				"%s: could not evaluate version data",
+				up->logname);
+		return;
 	}
-
-	/* With the 3.9 GPSD protocol, '*_musec' vanished and was
-	 * replace by '*_nsec'. Dispatch properly.
+	/* With the 3.9 GPSD protocol, '*_musec' vanished from the PPS
+	 * record and was replace by '*_nsec'.
 	 */
-	if ( up->proto_major >  3 ||
-	    (up->proto_major == 3 && up->proto_minor >= 9))
-		up->fl_nsec = -1;
-	else
-		up->fl_nsec = 0;
+	up->pf_nsec = -(up->proto_version >= PROTO_VERSION(3,9));
 
-	/*TODO: validate protocol version! */
-	
-	/* request watch for our GPS device
+	/* With the 3.10 protocol we can get TOFF records for better
+	 * timing information.
+	 */
+	up->pf_toff = -(up->proto_version >= PROTO_VERSION(3,10));
+
+	/* request watch for our GPS device if not yet watched.
+	 *
+	 * The version string is also sent as a life signal, if we have
+	 * seen useable data. So if we're already watching the device,
+	 * skip the request.
+	 *
 	 * Reuse the input buffer, which is no longer needed in the
 	 * current cycle. Also assume that we can write the watch
 	 * request in one sweep into the socket; since we do not do
@@ -824,19 +1510,21 @@ process_version(
 	 * TCP/IP window size gets lower than the length of the
 	 * request. We handle that when it happens.)
 	 */
+	if (up->fl_watch)
+		return;
+
 	snprintf(up->buffer, sizeof(up->buffer),
-		 s_logon, up->device);
+		 s_req_watch[up->pf_toff != 0], up->device);
 	buf = up->buffer;
 	len = strlen(buf);
-	if (len != write(pp->io.fd, buf, len)) {
-		/*Note: if the server fails to read our request, the
+	log_data(peer, "send", buf, len);
+	if (len != write(pp->io.fd, buf, len) && (syslogok(pp, up))) {
+		/* Note: if the server fails to read our request, the
 		 * resulting data timeout will take care of the
 		 * connection!
 		 */
-		if (syslogok(pp, up))
-			msyslog(LOG_ERR,
-				"%s: failed to write watch request (%m)",
-				refnumtoa(&peer->srcadr));
+		msyslog(LOG_ERR, "%s: failed to write watch request (%m)",
+			up->logname);
 	}
 }
 
@@ -853,76 +1541,72 @@ process_tpv(
 
 	const char * gps_time;
 	int          gps_mode;
-	double       ept, epp, epx, epy, epv;
+	double       ept;
 	int          xlog2;
 
 	gps_mode = (int)json_object_lookup_int_default(
 		jctx, 0, "mode", 0);
 
-	gps_time = json_object_lookup_string_default(
-		jctx, 0, "time", NULL);
+	gps_time = json_object_lookup_string(
+		jctx, 0, "time");
 
-	if (gps_mode < 1 || NULL == gps_time) {
+	/* accept time stamps only in 2d or 3d fix */
+	if (gps_mode < 2 || NULL == gps_time) {
 		/* receiver has no fix; tell about and avoid stale data */
-		up->tc_breply += 1;
-		up->fl_tpv     = 0;
-		up->fl_pps     = 0;
+		if ( ! up->pf_toff)
+			++up->tc_sti_recv;
+		++up->tc_nosync;
+		up->fl_sti    = 0;
+		up->fl_pps    = 0;
+		up->fl_nosync = -1;
 		return;
 	}
+	up->fl_nosync = 0;
 
-	/* save last time code to clock data */
-	save_ltc(pp, gps_time);
+	/* convert clock and set resulting ref time, but only if the
+	 * TOFF sentence is *not* available
+	 */
+	if ( ! up->pf_toff) {
+		++up->tc_sti_recv;
+		/* save last time code to clock data */
+		save_ltc(pp, gps_time);
+		/* now parse the time string */
+		if (convert_ascii_time(&up->sti_stamp, gps_time)) {
+			DPRINTF(2, ("%s: process_tpv, stamp='%s',"
+				    " recvt='%s' mode=%u\n",
+				    up->logname,
+				    gmprettydate(&up->sti_stamp),
+				    gmprettydate(&up->sti_recvt),
+				    gps_mode));
 
-	/* convert clock and set resulting ref time */
-	if (convert_ascii_time(&up->tpv_stamp, gps_time)) {
-		DPRINTF(2, ("GPSD_JSON(%d): process_tpv, stamp='%s', recvt='%s' mode=%u\n",
-			    up->unit,
-			    gmprettydate(&up->tpv_stamp),
-			    gmprettydate(&up->tpv_recvt),
-			    gps_mode));
-		
-		up->tpv_local = *rtime;
-		up->tpv_recvt = *rtime;/*TODO: hack until we get it remote from GPSD */
-		L_SUB(&up->tpv_recvt, &up->tpv_fudge);
-		up->fl_tpv = -1;
-	} else {
-		up->tc_btime += 1;
-		up->fl_tpv    = 0;
+			/* have to use local receive time as substitute
+			 * for the real receive time: TPV does not tell
+			 * us.
+			 */
+			up->sti_local = *rtime;
+			up->sti_recvt = *rtime;
+			L_SUB(&up->sti_recvt, &up->sti_fudge);
+			up->fl_sti = -1;
+		} else {
+			++up->tc_breply;
+			up->fl_sti = 0;
+		}
 	}
-		
+
 	/* Set the precision from the GPSD data
-	 *
-	 * Since EPT has some issues, we use EPT and a home-brewed error
-	 * estimation base on a sphere derived from EPX/Y/V and the
-	 * speed of light. Use the better one of those two.
+	 * Use the ETP field for an estimation of the precision of the
+	 * serial data. If ETP is not available, use the default serial
+	 * data presion instead. (Note: The PPS branch has a different
+	 * precision estimation, since it gets the proper value directly
+	 * from GPSD!)
 	 */
-	ept = json_object_lookup_float_default(jctx, 0, "ept", 1.0);
-	epx = json_object_lookup_float_default(jctx, 0, "epx", 1000.0);
-	epy = json_object_lookup_float_default(jctx, 0, "epy", 1000.0);
-	if (1 == gps_mode) {
-		/* 2d-fix: extend bounding rectangle to cuboid */
-		epv = max(epx, epy);
-	} else {
-		/* 3d-fix: get bounding cuboid */
-		epv = json_object_lookup_float_default(
-				jctx, 0, "epv", 1000.0);
-	}
-
-	/* get diameter of enclosing sphere of bounding cuboid as spatial
-	 * error, then divide spatial error by speed of light to get
-	 * another time error estimate. Add extra 100 meters as
-	 * optimistic lower bound. Then use the better one of the two
-	 * estimations.
-	 */
-	epp = 2.0 * sqrt(epx*epx + epy*epy + epv*epv);
-	epp = (epp + 100.0) / 299792458.0;
-
-	ept = min(ept, epp  );
-	ept = min(ept, 0.5  );
-	ept = max(ept, 1.0-9);
-	ept = frexp(ept, &xlog2);
-
-	peer->precision = xlog2;
+	ept = json_object_lookup_float_default(jctx, 0, "ept", 2.0e-3);
+	ept = frexp(fabs(ept)*0.70710678, &xlog2); /* ~ sqrt(0.5) */
+	if (ept < 0.25)
+		xlog2 = INT_MIN;
+	if (ept > 2.0)
+		xlog2 = INT_MAX;
+	up->sti_prec = clamped_precision(xlog2);
 }
 
 /* ------------------------------------------------------------------ */
@@ -936,51 +1620,118 @@ process_pps(
 	clockprocT * const pp = peer->procptr;
 	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
 
-	struct timespec ts;
-		
-	errno = 0;
-	ts.tv_sec = (time_t)json_object_lookup_int(
-		jctx, 0, "clock_sec");
-	if (up->fl_nsec)
-		ts.tv_nsec = json_object_lookup_int(
-			jctx, 0, "clock_nsec");
-	else
-		ts.tv_nsec = json_object_lookup_int(
-			jctx, 0, "clock_musec") * 1000;
+	int xlog2;
 
-	if (0 != errno)
-		goto fail;
+	++up->tc_pps_recv;
+
+	/* Bail out if there's indication that time sync is bad or
+	 * if we're explicitely requested to ignore PPS data.
+	 */
+	if (up->fl_nosync)
+		return;
 
 	up->pps_local = *rtime;
-	/* get fudged receive time */
-	up->pps_recvt = tspec_stamp_to_lfp(ts);
-	L_SUB(&up->pps_recvt, &up->pps_fudge);
+	/* Now grab the time values. 'clock_*' is the event time of the
+	 * pulse measured on the local system clock; 'real_*' is the GPS
+	 * reference time GPSD associated with the pulse.
+	 */
+	if (up->pf_nsec) {
+		if ( ! get_binary_time(&up->pps_recvt2, jctx,
+				       "clock_sec", "clock_nsec", 1))
+			goto fail;
+		if ( ! get_binary_time(&up->pps_stamp2, jctx,
+				       "real_sec", "real_nsec", 1))
+			goto fail;
+	} else {
+		if ( ! get_binary_time(&up->pps_recvt2, jctx,
+				       "clock_sec", "clock_musec", 1000))
+			goto fail;
+		if ( ! get_binary_time(&up->pps_stamp2, jctx,
+				       "real_sec", "real_musec", 1000))
+			goto fail;
+	}
 
-	/* map to next full second as reference time stamp */
+	/* Try to read the precision field from the PPS record. If it's
+	 * not there, take the precision from the serial data.
+	 */
+	xlog2 = json_object_lookup_int_default(
+			jctx, 0, "precision", up->sti_prec);
+	up->pps_prec = clamped_precision(xlog2);
+	
+	/* Get fudged receive times for primary & secondary unit */
+	up->pps_recvt = up->pps_recvt2;
+	L_SUB(&up->pps_recvt , &up->pps_fudge );
+	L_SUB(&up->pps_recvt2, &up->pps_fudge2);
+	pp->lastrec = up->pps_recvt;
+
+	/* Map to nearest full second as reference time stamp for the
+	 * primary channel. Sanity checks are done in evaluation step.
+	 */
 	up->pps_stamp = up->pps_recvt;
 	L_ADDUF(&up->pps_stamp, 0x80000000u);
 	up->pps_stamp.l_uf = 0;
-	
-	pp->lastrec = up->pps_stamp;
 
-	DPRINTF(2, ("GPSD_JSON(%d): process_pps, stamp='%s', recvt='%s'\n", 
-		    up->unit,
-		    gmprettydate(&up->pps_stamp),
-		    gmprettydate(&up->pps_recvt)));
+	if (NULL != up->pps_peer)
+		save_ltc(up->pps_peer->procptr,
+			 gmprettydate(&up->pps_stamp2));
+	DPRINTF(2, ("%s: PPS record processed,"
+		    " stamp='%s', recvt='%s'\n",
+		    up->logname,
+		    gmprettydate(&up->pps_stamp2),
+		    gmprettydate(&up->pps_recvt2)));
 	
-	/* When we have a time pulse, clear the TPV flag: the
-	 * PPS is only valid for the >NEXT< TPV value!
-	 */
-	up->fl_pps = -1;
-	up->fl_tpv =  0;
+	up->fl_pps  = (0 != (pp->sloppyclockflag & CLK_FLAG2)) - 1;
+	up->fl_pps2 = -1;
 	return;
 
   fail:
-	DPRINTF(2, ("GPSD_JSON(%d): process_pps FAILED, nsec=%d stamp='%s', recvt='%s'\n",
-		    up->unit, up->fl_nsec,
-		    gmprettydate(&up->pps_stamp),
-		    gmprettydate(&up->pps_recvt)));
-	up->tc_breply += 1;
+	DPRINTF(1, ("%s: PPS record processing FAILED\n",
+		    up->logname));
+	++up->tc_breply;
+}
+
+/* ------------------------------------------------------------------ */
+
+static void
+process_toff(
+	peerT      * const peer ,
+	json_ctx   * const jctx ,
+	const l_fp * const rtime)
+{
+	clockprocT * const pp = peer->procptr;
+	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
+
+	++up->tc_sti_recv;
+
+	/* remember this! */
+	up->pf_toff = -1;
+
+	/* bail out if there's indication that time sync is bad */
+	if (up->fl_nosync)
+		return;
+
+	if ( ! get_binary_time(&up->sti_recvt, jctx,
+			       "clock_sec", "clock_nsec", 1))
+			goto fail;
+	if ( ! get_binary_time(&up->sti_stamp, jctx,
+			       "real_sec", "real_nsec", 1))
+			goto fail;
+	L_SUB(&up->sti_recvt, &up->sti_fudge);
+	up->sti_local = *rtime;
+	up->fl_sti    = -1;
+
+	save_ltc(pp, gmprettydate(&up->sti_stamp));
+	DPRINTF(2, ("%s: TOFF record processed,"
+		    " stamp='%s', recvt='%s'\n",
+		    up->logname,
+		    gmprettydate(&up->sti_stamp),
+		    gmprettydate(&up->sti_recvt)));
+	return;
+
+  fail:
+	DPRINTF(1, ("%s: TOFF record processing FAILED\n",
+		    up->logname));
+	++up->tc_breply;
 }
 
 /* ------------------------------------------------------------------ */
@@ -993,53 +1744,75 @@ gpsd_parse(
 	clockprocT * const pp = peer->procptr;
 	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
 
-	json_ctx     jctx;
 	const char * clsid;
-	l_fp         tmpfp;
 
-        DPRINTF(2, ("GPSD_JSON(%d): gpsd_parse: time %s '%s'\n",
-                    up->unit, ulfptoa(rtime, 6), up->buffer));
+        DPRINTF(2, ("%s: gpsd_parse: time %s '%.*s'\n",
+                    up->logname, ulfptoa(rtime, 6),
+		    up->buflen, up->buffer));
 
-	/* See if we can grab anything potentially useful */
-	if (!json_parse_record(&jctx, up->buffer))
+	/* See if we can grab anything potentially useful. JSMN does not
+	 * need a trailing NUL, but it needs the number of bytes to
+	 * process. */
+	if (!json_parse_record(&up->json_parse, up->buffer, up->buflen)) {
+		++up->tc_breply;
 		return;
-
+	}
+	
 	/* Now dispatch over the objects we know */
-	clsid = json_object_lookup_string_default(
-		&jctx, 0, "class", "-bad-repy-");
+	clsid = json_object_lookup_string(&up->json_parse, 0, "class");
+	if (NULL == clsid) {
+		++up->tc_breply;
+		return;
+	}
 
-	up->tc_recv += 1;
-	if (!strcmp("VERSION", clsid))
-		process_version(peer, &jctx, rtime);
-	else if (!strcmp("TPV", clsid))
-		process_tpv(peer, &jctx, rtime);
+	if      (!strcmp("TPV", clsid))
+		process_tpv(peer, &up->json_parse, rtime);
 	else if (!strcmp("PPS", clsid))
-		process_pps(peer, &jctx, rtime);
+		process_pps(peer, &up->json_parse, rtime);
+	else if (!strcmp("TOFF", clsid))
+		process_toff(peer, &up->json_parse, rtime);
+	else if (!strcmp("VERSION", clsid))
+		process_version(peer, &up->json_parse, rtime);
 	else if (!strcmp("WATCH", clsid))
-		process_watch(peer, &jctx, rtime);
+		process_watch(peer, &up->json_parse, rtime);
 	else
 		return; /* nothing we know about... */
+	++up->tc_recv;
 
-	/* now aggregate TPV and PPS -- no PPS? just use TPV...*/
-	if (up->fl_tpv) {
-		/* TODO: also check remote receive time stamps */
-		tmpfp = up->tpv_local;
-		L_SUB(&tmpfp, &up->pps_local);
+	/* if possible, feed the PPS side channel */
+	if (up->pps_peer)
+		eval_pps_secondary(
+			up->pps_peer, up->pps_peer->procptr, up);
 
-		if (up->fl_pps && 0 == tmpfp.l_ui) {
-			refclock_process_offset(
-				pp, up->tpv_stamp, up->pps_recvt, 0.0);
-			if (up->ppscount < PPS_MAXCOUNT)
-				up->ppscount += 1;
-		} else {
-			refclock_process_offset(
-				pp, up->tpv_stamp, up->tpv_recvt, 0.0);
-			if (up->ppscount > 0)
-				up->ppscount -= 1;
-		}
-		up->fl_pps   = 0;
-		up->fl_tpv   = 0;
-		up->tc_good += 1;
+	/* check PPS vs. STI receive times:
+	 * If STI is before PPS, then clearly the STI is too old. If PPS
+	 * is before STI by more than one second, then PPS is too old.
+	 * Weed out stale time stamps & flags.
+	 */
+	if (up->fl_pps && up->fl_sti) {
+		l_fp diff;
+		diff = up->sti_local;
+		L_SUB(&diff, &up->pps_local);
+		if (diff.l_i > 0)
+			up->fl_pps = 0; /* pps too old */
+		else if (diff.l_i < 0)
+			up->fl_sti = 0; /* serial data too old */
+	}
+
+	/* dispatch to the mode-dependent processing functions */
+	switch (up->mode) {
+	default:
+	case MODE_OP_STI:
+		eval_serial(peer, pp, up);
+		break;
+
+	case MODE_OP_STRICT:
+		eval_strict(peer, pp, up);
+		break;
+
+	case MODE_OP_AUTO:
+		eval_auto(peer, pp, up);
+		break;
 	}
 }
 
@@ -1052,17 +1825,21 @@ gpsd_stop_socket(
 	clockprocT * const pp = peer->procptr;
 	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
 
-	if (-1 != pp->io.fd)
+	if (-1 != pp->io.fd) {
+		if (syslogok(pp, up))
+			msyslog(LOG_INFO,
+				"%s: closing socket to GPSD, fd=%d",
+				up->logname, pp->io.fd);
+		else
+			DPRINTF(1, ("%s: closing socket to GPSD, fd=%d\n",
+				    up->logname, pp->io.fd));
 		io_closeclock(&pp->io);
-	pp->io.fd = -1;
-	if (syslogok(pp, up))
-		msyslog(LOG_INFO,
-			"%s: closing socket to GPSD",
-			refnumtoa(&peer->srcadr));
+		pp->io.fd = -1;
+	}
 	up->tickover = up->tickpres;
 	up->tickpres = min(up->tickpres + 5, TICKOVER_HIGH);
 	up->fl_vers  = 0;
-	up->fl_tpv   = 0;
+	up->fl_sti   = 0;
 	up->fl_pps   = 0;
 	up->fl_watch = 0;
 }
@@ -1092,20 +1869,28 @@ gpsd_init_socket(
 		if (syslogok(pp, up))
 			msyslog(LOG_ERR,
 				"%s: cannot create GPSD socket: %m",
-				refnumtoa(&peer->srcadr));
+				up->logname);
 		goto no_socket;
 	}
-	
-	/* make sure the socket is non-blocking */
+
+	/* Make sure the socket is non-blocking. Connect/reconnect and
+	 * IO happen in an event-driven environment, and synchronous
+	 * operations wreak havoc on that.
+	 */
 	rc = fcntl(up->fdt, F_SETFL, O_NONBLOCK, 1);
 	if (-1 == rc) {
 		if (syslogok(pp, up))
 			msyslog(LOG_ERR,
 				"%s: cannot set GPSD socket to non-blocking: %m",
-				refnumtoa(&peer->srcadr));
+				up->logname);
 		goto no_socket;
 	}
-	/* disable nagling */
+	/* Disable nagling. The way both GPSD and NTPD handle the
+	 * protocol makes it record-oriented, and in most cases
+	 * complete records (JSON serialised objects) will be sent in
+	 * one sweep. Nagling gives not much advantage but adds another
+	 * delay, which can worsen the situation for some packets.
+	 */
 	ov = 1;
 	rc = setsockopt(up->fdt, IPPROTO_TCP, TCP_NODELAY,
 			(char*)&ov, sizeof(ov));
@@ -1113,24 +1898,53 @@ gpsd_init_socket(
 		if (syslogok(pp, up))
 			msyslog(LOG_INFO,
 				"%s: cannot disable TCP nagle: %m",
-				refnumtoa(&peer->srcadr));
+				up->logname);
 	}
 
-	/* start a non-blocking connect */
+	/* Start a non-blocking connect. There might be a synchronous
+	 * connection result we have to handle.
+	 */
 	rc = connect(up->fdt, ai->ai_addr, ai->ai_addrlen);
-	if (-1 == rc && errno != EINPROGRESS) {
+	if (-1 == rc) {
+		if (errno == EINPROGRESS) {
+			DPRINTF(1, ("%s: async connect pending, fd=%d\n",
+				    up->logname, up->fdt));
+			return;
+		}
+
 		if (syslogok(pp, up))
 			msyslog(LOG_ERR,
 				"%s: cannot connect GPSD socket: %m",
-				refnumtoa(&peer->srcadr));
+				up->logname);
+		goto no_socket;
+	}
+
+	/* We had a successful synchronous connect, so we add the
+	 * refclock processing ASAP. We still have to wait for the
+	 * version string and apply the watch command later on, but we
+	 * might as well get the show on the road now.
+	 */
+	DPRINTF(1, ("%s: new socket connection, fd=%d\n",
+		    up->logname, up->fdt));
+
+	pp->io.fd = up->fdt;
+	up->fdt   = -1;
+	if (0 == io_addclock(&pp->io)) {
+		if (syslogok(pp, up))
+			msyslog(LOG_ERR,
+				"%s: failed to register with I/O engine",
+				up->logname);
 		goto no_socket;
 	}
 
 	return;
-  
+
   no_socket:
+	if (-1 != pp->io.fd)
+		close(pp->io.fd);
 	if (-1 != up->fdt)
 		close(up->fdt);
+	pp->io.fd    = -1;
 	up->fdt      = -1;
 	up->tickover = up->tickpres;
 	up->tickpres = min(up->tickpres + 5, TICKOVER_HIGH);
@@ -1152,8 +1966,8 @@ gpsd_test_socket(
 	 * socket for writeability. Use the 'poll()' API if available
 	 * and 'select()' otherwise.
 	 */
-	DPRINTF(2, ("GPSD_JSON(%d): check connect, fd=%d\n",
-		    up->unit, up->fdt));
+	DPRINTF(2, ("%s: check connect, fd=%d\n",
+		    up->logname, up->fdt));
 
 #if defined(HAVE_SYS_POLL_H)
 	{
@@ -1188,16 +2002,26 @@ gpsd_test_socket(
 	ec = 0;
 	lc = sizeof(ec);
 	rc = getsockopt(up->fdt, SOL_SOCKET, SO_ERROR, &ec, &lc);
-	DPRINTF(1, ("GPSD_JSON(%d): connect finshed, fd=%d, ec=%d(%s)\n",
-		    up->unit, up->fdt, ec, strerror(ec)));
 	if (-1 == rc || 0 != ec) {
-		errno = ec;
+		const char *errtxt;
+		if (0 == ec)
+			ec = errno;
+		errtxt = strerror(ec);
 		if (syslogok(pp, up))
 			msyslog(LOG_ERR,
-				"%s: (async)cannot connect GPSD socket: %m",
-				refnumtoa(&peer->srcadr));
+				"%s: async connect to GPSD failed,"
+				" fd=%d, ec=%d(%s)",
+				up->logname, up->fdt, ec, errtxt);
+		else
+			DPRINTF(1, ("%s: async connect to GPSD failed,"
+				" fd=%d, ec=%d(%s)\n",
+				    up->logname, up->fdt, ec, errtxt));
 		goto no_socket;
-	}	
+	} else {
+		DPRINTF(1, ("%s: async connect to GPSD succeeded, fd=%d\n",
+			    up->logname, up->fdt));
+	}
+
 	/* swap socket FDs, and make sure the clock was added */
 	pp->io.fd = up->fdt;
 	up->fdt   = -1;
@@ -1205,14 +2029,17 @@ gpsd_test_socket(
 		if (syslogok(pp, up))
 			msyslog(LOG_ERR,
 				"%s: failed to register with I/O engine",
-				refnumtoa(&peer->srcadr));
+				up->logname);
 		goto no_socket;
 	}
 	return;
-	
+
   no_socket:
-	if (-1 != up->fdt)
+	if (-1 != up->fdt) {
+		DPRINTF(1, ("%s: closing socket, fd=%d\n",
+			    up->logname, up->fdt));
 		close(up->fdt);
+	}
 	up->fdt      = -1;
 	up->tickover = up->tickpres;
 	up->tickpres = min(up->tickpres + 5, TICKOVER_HIGH);
@@ -1222,35 +2049,22 @@ gpsd_test_socket(
  * helper stuff
  */
 
-/*
- * shm_clockstats - dump and reset counters
+/* -------------------------------------------------------------------
+ * store a properly clamped precision value
  */
-static void
-gpsd_clockstats(
-	int           unit,
-	peerT * const peer
-	)
+static int16_t
+clamped_precision(
+	int rawprec)
 {
-	clockprocT * const pp = peer->procptr;
-	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
-
-	char logbuf[128];
-	unsigned int llen;
-
-	/* if snprintf() returns a negative values on errors (some older
-	* ones do) make sure we are NUL terminated. Using an unsigned
-	* result does the trick.
-	*/
-	llen = snprintf(logbuf, sizeof(logbuf),
-			"good=%-3u badtime=%-3u baddate=%-3u badreply=%-3u recv=%-3u",
-			up->tc_good, up->tc_btime, up->tc_bdate,
-			up->tc_breply, up->tc_recv);
-	logbuf[min(llen, sizeof(logbuf)-1)] = '\0';
-	record_clock_stats(&peer->srcadr, logbuf);
+	if (rawprec > 0)
+		rawprec = 0;
+	if (rawprec < -32)
+		rawprec = -32;
+	return (int16_t)rawprec;
 }
 
 /* -------------------------------------------------------------------
- * Convert a GPSD timestam (ISO8601 Format) to an l_fp
+ * Convert a GPSD timestamp (ISO8601 Format) to an l_fp
  */
 static BOOL
 convert_ascii_time(
@@ -1260,7 +2074,7 @@ convert_ascii_time(
 	char           *ep;
 	struct tm       gd;
 	struct timespec ts;
-	long            dw;
+	uint32_t        dw;
 
 	/* Use 'strptime' to take the brunt of the work, then parse
 	 * the fractional part manually, starting with a digit weight of
@@ -1268,17 +2082,22 @@ convert_ascii_time(
 	 */
 	ts.tv_nsec = 0;
 	ep = strptime(gps_time, "%Y-%m-%dT%H:%M:%S", &gd);
+	if (NULL == ep)
+		return FALSE; /* could not parse the mandatory stuff! */
 	if (*ep == '.') {
-		dw = 100000000;
-		while (isdigit((unsigned char)*++ep)) {
-			ts.tv_nsec += (*ep - '0') * dw;
-			dw /= 10;
+		dw = 100000000u;
+		while (isdigit(*(unsigned char*)++ep)) {
+			ts.tv_nsec += (*(unsigned char*)ep - '0') * dw;
+			dw /= 10u;
 		}
 	}
 	if (ep[0] != 'Z' || ep[1] != '\0')
-		return FALSE;
+		return FALSE; /* trailing garbage */
 
-	/* now convert the whole thing into a 'l_fp' */
+	/* Now convert the whole thing into a 'l_fp'. We do not use
+	 * 'mkgmtime()' since its not standard and going through the
+	 * calendar routines is not much effort, either.
+	 */
 	ts.tv_sec = (ntpcal_tm_to_rd(&gd) - DAY_NTP_STARTS) * SECSPERDAY
 	          + ntpcal_tm_to_daysec(&gd);
 	*fp = tspec_intv_to_lfp(ts);
@@ -1305,8 +2124,7 @@ save_ltc(
 	pp->a_lastcode[len] = '\0';
 }
 
-/*
- * -------------------------------------------------------------------
+/* -------------------------------------------------------------------
  * asprintf replacement... it's not available everywhere...
  */
 static int
@@ -1336,6 +2154,57 @@ myasprintf(
 	return (int)plen;
 }
 
+/* -------------------------------------------------------------------
+ * dump a raw data buffer
+ */
+
+static char *
+add_string(
+	char *dp,
+	char *ep,
+	const char *sp)
+{
+	while (dp != ep && *sp)
+		*dp++ = *sp++;
+	return dp;
+}
+
+static void
+log_data(
+	peerT      *peer,
+	const char *what,
+	const char *buf ,
+	size_t      len )
+{
+	/* we're running single threaded with regards to the clocks. */
+	static char s_lbuf[2048];
+
+	clockprocT * const pp = peer->procptr;
+	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
+
+	if (debug > 1) {
+		const char *sptr = buf;
+		const char *stop = buf + len;
+		char       *dptr = s_lbuf;
+		char       *dtop = s_lbuf + sizeof(s_lbuf) - 1; /* for NUL */
+
+		while (sptr != stop && dptr != dtop) {
+			if (*sptr == '\\') {
+				dptr = add_string(dptr, dtop, "\\\\");
+			} else if (isprint(*sptr)) {
+				*dptr++ = *sptr;
+			} else {
+				char fbuf[6];
+				snprintf(fbuf, sizeof(fbuf), "\\%03o", *(const u_char*)sptr);
+				dptr = add_string(dptr, dtop, fbuf);
+			}
+			sptr++;
+		}
+		*dptr = '\0';
+		mprintf("%s[%s]: '%s'\n", up->logname, what, s_lbuf);
+	}
+}
+
 #else
 NONEMPTY_TRANSLATION_UNIT
 #endif /* REFCLOCK && CLOCK_GPSDJSON */
diff --git a/contrib/ntp/ntpd/refclock_jjy.c b/contrib/ntp/ntpd/refclock_jjy.c
index e279ee307d73..fef829ca071b 100644
--- a/contrib/ntp/ntpd/refclock_jjy.c
+++ b/contrib/ntp/ntpd/refclock_jjy.c
@@ -4,7 +4,7 @@
 
 /**********************************************************************/
 /*								      */
-/*  Copyright (C) 2001-2011, Takao Abe.  All rights reserved.	      */
+/*  Copyright (C) 2001-2015, Takao Abe.  All rights reserved.	      */
 /*								      */
 /*  Permission to use, copy, modify, and distribute this software     */
 /*  and its documentation for any purpose is hereby granted	      */
@@ -95,6 +95,17 @@
 /*  2011/04/30							      */
 /*    [Add]    Support the Tristate Ltd. TS-GPSclock-01		      */
 /*								      */
+/*  2015/03/29							      */
+/*    [Add]    Support the Telephone JJY			      */
+/*    [Change] Split the start up routine into each JJY receivers.    */
+/*             Change raw data internal bufferring process            */
+/*             Change over midnight handling of TS-JJY01 and TS-GPS01 */
+/*             to put DATE command between before and after TIME's.   */
+/*             Unify the writing clockstats of all JJY receivers.     */
+/*								      */
+/*  2015/05/15							      */
+/*    [Add]    Support the SEIKO TIME SYSTEMS TDC-300		      */
+/*								      */
 /**********************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -116,82 +127,19 @@
 #include "ntp_calendar.h"
 #include "ntp_stdlib.h"
 
-/**********************************************************************/
-/*								      */
-/*  The Tristate Ltd. JJY receiver JJY01			      */
-/*								      */
-/*  Command	   Response		    Remarks		      */
-/*  ------------   ----------------------   ---------------------     */
-/*  dcst   VALID|INVALID			      */
-/*  stus   ADJUSTED|UNADJUSTED			      */
-/*  date   YYYY/MM/DD XXX			      */
-/*  time   HH:MM:SS	    Not used by this driver   */
-/*  stim   HH:MM:SS	    Reply at just second      */
-/*								      */
-/*  During synchronization after a receiver is turned on,	      */
-/*  It replies the past time from 2000/01/01 00:00:00.		      */
-/*  The function "refclock_process" checks the time and tells	      */
-/*  as an insanity time.					      */
-/*								      */
-/**********************************************************************/
-/*								      */
-/*  The C-DEX Co. Ltd. JJY receiver JST2000			      */
-/*								      */
-/*  Command	   Response		    Remarks		      */
-/*  ------------   ----------------------   ---------------------     */
-/*  1J   JYYMMDD HHMMSSS			      */
-/*								      */
-/**********************************************************************/
-/*								      */
-/*  The Echo Keisokuki Co. Ltd. JJY receiver LT2000		      */
-/*								      */
-/*  Command        Response		    Remarks		      */
-/*  ------------   ----------------------   ---------------------     */
-/*  #					    Mode 1 (Request&Send)     */
-/*  T		   YYMMDDWHHMMSS		      */
-/*  C					    Mode 2 (Continuous)	      */
-/*		   YYMMDDWHHMMSS	      */
-/*		   		    Second signal	      */
-/*								      */
-/**********************************************************************/
-/*								      */
-/*  The CITIZEN T.I.C CO., LTD. JJY receiver JJY200		      */
-/*								      */
-/*  Command	   Response		    Remarks		      */
-/*  ------------   ----------------------   ---------------------     */
-/*		   'XX YY/MM/DD W HH:MM:SS			      */
-/*					    XX: OK|NG|ER	      */
-/*					    W:  0(Monday)-6(Sunday)   */
-/*								      */
-/**********************************************************************/
-/*								      */
-/*  The Tristate Ltd. GPS clock TS-GPSCLOCK-01			      */
-/*								      */
-/*  This clock has NMEA mode and command/respose mode.		      */
-/*  When this jjy driver are used, set to command/respose mode        */
-/*  of this clock by the onboard switch SW4, and make sure the        */
-/*  LED-Y is tured on.						      */
-/*  Other than this JJY driver, the refclock driver type 20,	      */
-/*  generic NMEA driver, works with the NMEA mode of this clock.      */
-/*								      */
-/*  Command	   Response		    Remarks		      */
-/*  ------------   ----------------------   ---------------------     */
-/*  stus   *R|*G|*U|+U				      */
-/*  date   YY/MM/DD				      */
-/*  time   HH:MM:SS				      */
-/*								      */
 /**********************************************************************/
 
 /*
  * Interface definitions
  */
 #define	DEVICE  	"/dev/jjy%d"	/* device name and unit */
-#define	SPEED232	B9600		/* uart speed (9600 baud) */
 #define	SPEED232_TRISTATE_JJY01		B9600   /* UART speed (9600 baud) */
 #define	SPEED232_CDEX_JST2000		B9600   /* UART speed (9600 baud) */
 #define	SPEED232_ECHOKEISOKUKI_LT2000	B9600   /* UART speed (9600 baud) */
 #define	SPEED232_CITIZENTIC_JJY200	B4800   /* UART speed (4800 baud) */
 #define	SPEED232_TRISTATE_GPSCLOCK01	B38400  /* USB  speed (38400 baud) */
+#define	SPEED232_SEIKO_TIMESYS_TDC_300	B2400   /* UART speed (2400 baud) */
+#define	SPEED232_TELEPHONE		B2400   /* UART speed (4800 baud) */
 #define	REFID   	"JJY"		/* reference ID */
 #define	DESCRIPTION	"JJY Receiver"
 #define	PRECISION	(-3)		/* precision assumed (about 100 ms) */
@@ -199,22 +147,65 @@
 /*
  * JJY unit control structure
  */
+
+struct jjyRawDataBreak {
+	char	*pString ;
+	int 	iLength ;
+} ;
+
+#define	MAX_TIMESTAMP	6
+#define	MAX_RAWBUF   	100
+#define	MAX_LOOPBACK	5
+
 struct jjyunit {
+/* Set up by the function "jjy_start_xxxxxxxx" */
 	char	unittype ;	    /* UNITTYPE_XXXXXXXXXX */
-	short   operationmode ;	    /* Echo Keisokuki LT-2000 : 1 or 2 */
-	short	version ;
+	short   operationmode ;	    /* Echo Keisokuki LT-2000 */
+	int 	linespeed ;         /* SPEED232_XXXXXXXXXX */
 	short	linediscipline ;    /* LDISC_CLK or LDISC_RAW */
-	char    bPollFlag ;	    /* Set by jjy_pool and Reset by jjy_receive */
-	int 	linecount ;
-	int 	lineerror ;
+/* Receiving data */
+	char	bInitError ;        /* Set by jjy_start if any error during initialization */
+	short	iProcessState ;     /* JJY_PROCESS_STATE_XXXXXX */
+	char	bReceiveFlag ;      /* Set and reset by jjy_receive */
+	char	bLineError ;	    /* Reset by jjy_poll / Set by jjy_receive_xxxxxxxx*/
+	short	iCommandSeq ;       /* 0:Idle  Non-Zero:Issued */
+	short	iReceiveSeq ;
+	int 	iLineCount ;
 	int 	year, month, day, hour, minute, second, msecond ;
+	int 	leapsecond ;
+	int 	iTimestampCount ;   /* TS-JJY01, TS-GPS01, Telephone-JJY */
+	int 	iTimestamp [ MAX_TIMESTAMP ] ;  /* Serial second ( 0 - 86399 ) */
 /* LDISC_RAW only */
-#define	MAX_LINECOUNT	8
-#define	MAX_RAWBUF   	64
-	int 	lineexpect ;
-	int 	charexpect [ MAX_LINECOUNT ] ;
-	int 	charcount ;
-	char	rawbuf [ MAX_RAWBUF ] ;
+	char	sRawBuf [ MAX_RAWBUF ] ;
+	int 	iRawBufLen ;
+	struct	jjyRawDataBreak *pRawBreak ;
+	char	bWaitBreakString ;
+	char	sLineBuf [ MAX_RAWBUF ] ;
+	int 	iLineBufLen ;
+	char	sTextBuf [ MAX_RAWBUF ] ;
+	int 	iTextBufLen ;
+	char	bSkipCntrlCharOnly ;
+/* Telephone JJY auto measurement of the loopback delay */
+	char	bLoopbackMode ;
+	short	iLoopbackCount ;
+	struct	timeval sendTime[MAX_LOOPBACK], delayTime[MAX_LOOPBACK] ;
+	char	bLoopbackTimeout[MAX_LOOPBACK] ;
+	short	iLoopbackValidCount ;
+/* Telephone JJY timer */
+	short	iTeljjySilentTimer ;
+	short	iTeljjyStateTimer ;
+/* Telephone JJY control finite state machine */
+	short	iClockState ;
+	short	iClockEvent ;
+	short	iClockCommandSeq ;
+/* Modem timer */
+	short	iModemSilentCount ;
+	short	iModemSilentTimer ;
+	short	iModemStateTimer ;
+/* Modem control finite state machine */
+	short	iModemState ;
+	short	iModemEvent ;
+	short	iModemCommandSeq ;
 };
 
 #define	UNITTYPE_TRISTATE_JJY01		1
@@ -222,12 +213,93 @@ struct jjyunit {
 #define	UNITTYPE_ECHOKEISOKUKI_LT2000  	3
 #define	UNITTYPE_CITIZENTIC_JJY200  	4
 #define	UNITTYPE_TRISTATE_GPSCLOCK01	5
+#define	UNITTYPE_SEIKO_TIMESYS_TDC_300	6
+#define	UNITTYPE_TELEPHONE		100
+
+#define	JJY_PROCESS_STATE_IDLE   	0
+#define	JJY_PROCESS_STATE_POLL   	1
+#define	JJY_PROCESS_STATE_RECEIVE	2
+#define	JJY_PROCESS_STATE_DONE   	3
+#define	JJY_PROCESS_STATE_ERROR  	4
+
+/**********************************************************************/
 
 /*
+ *  Function calling structure
+ *
+ *  jjy_start
+ *   |--  jjy_start_tristate_jjy01
+ *   |--  jjy_start_cdex_jst2000
+ *   |--  jjy_start_echokeisokuki_lt2000
+ *   |--  jjy_start_citizentic_jjy200
+ *   |--  jjy_start_tristate_gpsclock01
+ *   |--  jjy_start_seiko_tsys_tdc_300
+ *   |--  jjy_start_telephone
+ *
+ *  jjy_shutdown
+ *
+ *  jjy_poll
+ *   |--  jjy_poll_tristate_jjy01
+ *   |--  jjy_poll_cdex_jst2000
+ *   |--  jjy_poll_echokeisokuki_lt2000
+ *   |--  jjy_poll_citizentic_jjy200
+ *   |--  jjy_poll_tristate_gpsclock01
+ *   |--  jjy_poll_seiko_tsys_tdc_300
+ *   |--  jjy_poll_telephone
+ *         |--  teljjy_control
+ *               |--  teljjy_XXXX_YYYY ( XXXX_YYYY is an event handler name. )
+ *                     |--  modem_connect
+ *                           |--  modem_control
+ *                                 |--  modem_XXXX_YYYY ( XXXX_YYYY is an event handler name. )
+ *
+ *  jjy_receive
+ *   |
+ *   |--  jjy_receive_tristate_jjy01
+ *   |     |--  jjy_synctime
+ *   |--  jjy_receive_cdex_jst2000
+ *   |     |--  jjy_synctime
+ *   |--  jjy_receive_echokeisokuki_lt2000
+ *   |     |--  jjy_synctime
+ *   |--  jjy_receive_citizentic_jjy200
+ *   |     |--  jjy_synctime
+ *   |--  jjy_receive_tristate_gpsclock01
+ *   |     |--  jjy_synctime
+ *   |--  jjy_receive_seiko_tsys_tdc_300
+ *   |     |--  jjy_synctime
+ *   |--  jjy_receive_telephone
+ *         |--  modem_receive
+ *         |     |--  modem_control
+ *         |           |--  modem_XXXX_YYYY ( XXXX_YYYY is an event handler name. )
+ *         |--  teljjy_control
+ *               |--  teljjy_XXXX_YYYY ( XXXX_YYYY is an event handler name. )
+ *                     |--  jjy_synctime
+ *                     |--  modem_disconnect
+ *                           |--  modem_control
+ *                                 |--  modem_XXXX_YYYY ( XXXX_YYYY is an event handler name. )
+ *
+ *  jjy_timer
+ *   |--  jjy_timer_telephone
+ *         |--  modem_timer
+ *         |     |--  modem_control
+ *         |           |--  modem_XXXX_YYYY ( XXXX_YYYY is an event handler name. )
+ *         |--  teljjy_control
+ *               |--  teljjy_XXXX_YYYY ( XXXX_YYYY is an event handler name. )
+ *                     |--  modem_disconnect
+ *                           |--  modem_control
+ *                                 |--  modem_XXXX_YYYY ( XXXX_YYYY is an event handler name. )
+ *
  * Function prototypes
  */
- 
+
 static	int 	jjy_start			(int, struct peer *);
+static	int 	jjy_start_tristate_jjy01	(int, struct peer *, struct jjyunit *);
+static	int 	jjy_start_cdex_jst2000		(int, struct peer *, struct jjyunit *);
+static	int 	jjy_start_echokeisokuki_lt2000	(int, struct peer *, struct jjyunit *);
+static	int 	jjy_start_citizentic_jjy200	(int, struct peer *, struct jjyunit *);
+static	int 	jjy_start_tristate_gpsclock01	(int, struct peer *, struct jjyunit *);
+static	int 	jjy_start_seiko_tsys_tdc_300	(int, struct peer *, struct jjyunit *);
+static	int 	jjy_start_telephone		(int, struct peer *, struct jjyunit *);
+
 static	void	jjy_shutdown			(int, struct peer *);
 
 static	void	jjy_poll		    	(int, struct peer *);
@@ -236,15 +308,36 @@ static	void	jjy_poll_cdex_jst2000	    	(int, struct peer *);
 static	void	jjy_poll_echokeisokuki_lt2000	(int, struct peer *);
 static	void	jjy_poll_citizentic_jjy200	(int, struct peer *);
 static	void	jjy_poll_tristate_gpsclock01	(int, struct peer *);
+static	void	jjy_poll_seiko_tsys_tdc_300	(int, struct peer *);
+static	void	jjy_poll_telephone		(int, struct peer *);
 
 static	void	jjy_receive			(struct recvbuf *);
-static	int	jjy_receive_tristate_jjy01	(struct recvbuf *);
-static	int	jjy_receive_cdex_jst2000	(struct recvbuf *);
-static	int	jjy_receive_echokeisokuki_lt2000 (struct recvbuf *);
-static  int	jjy_receive_citizentic_jjy200	(struct recvbuf *);
-static	int	jjy_receive_tristate_gpsclock01	(struct recvbuf *);
+static	int 	jjy_receive_tristate_jjy01	(struct recvbuf *);
+static	int 	jjy_receive_cdex_jst2000	(struct recvbuf *);
+static	int 	jjy_receive_echokeisokuki_lt2000 (struct recvbuf *);
+static  int 	jjy_receive_citizentic_jjy200	(struct recvbuf *);
+static	int 	jjy_receive_tristate_gpsclock01	(struct recvbuf *);
+static	int 	jjy_receive_seiko_tsys_tdc_300	(struct recvbuf *);
+static	int 	jjy_receive_telephone		(struct recvbuf *);
 
-static	void	printableString ( char*, int, char*, int ) ;
+static	void	jjy_timer			(int, struct peer *);
+static	void	jjy_timer_telephone		(int, struct peer *);
+
+static	void	jjy_synctime			( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	void	jjy_write_clockstats		( struct peer *, int, const char* ) ;
+
+static	int 	getRawDataBreakPosition		( struct jjyunit *, int ) ;
+
+static	short	getModemState			( struct jjyunit * ) ;
+static	int 	isModemStateConnect		( short ) ;
+static	int 	isModemStateDisconnect		( short ) ;
+static	int 	isModemStateTimerOn		( struct jjyunit * ) ;
+static	void	modem_connect			( int, struct peer * ) ;
+static	void	modem_disconnect		( int, struct peer * ) ;
+static	int 	modem_receive			( struct recvbuf * ) ;
+static	void	modem_timer			( int, struct peer * );
+
+static	void	printableString ( char*, int, const char*, int ) ;
 
 /*
  * Transfer vector
@@ -256,7 +349,7 @@ struct	refclock refclock_jjy = {
 	noentry,	/* not used */
 	noentry,	/* not used */
 	noentry,	/* not used */
-	NOFLAGS		/* not used */
+	jjy_timer	/* 1 second interval timer */
 };
 
 /*
@@ -269,88 +362,64 @@ struct	refclock refclock_jjy = {
  * Local constants definition
  */
 
-#define	MAX_LOGTEXT	64
+#define	MAX_LOGTEXT	100
 
-/*
- * Tristate JJY01/JJY02 constants definition
- */
+#ifndef	TRUE
+#define	TRUE	(0==0)
+#endif
+#ifndef	FALSE
+#define	FALSE	(!TRUE)
+#endif
 
-#define	TS_JJY01_COMMAND_NUMBER_DATE	1
-#define	TS_JJY01_COMMAND_NUMBER_TIME	2
-#define	TS_JJY01_COMMAND_NUMBER_STIM	3
-#define	TS_JJY01_COMMAND_NUMBER_STUS	4
-#define	TS_JJY01_COMMAND_NUMBER_DCST	5
+/* Local constants definition for the return code of the jjy_receive_xxxxxxxx */
 
-#define	TS_JJY01_REPLY_DATE		"yyyy/mm/dd www\r\n"
-#define	TS_JJY01_REPLY_STIM		"hh:mm:ss\r\n"
-#define	TS_JJY01_REPLY_STUS_YES		"adjusted\r\n"
-#define	TS_JJY01_REPLY_STUS_NO		"unadjusted\r\n"
-#define	TS_JJY01_REPLY_DCST_VALID	"valid\r\n"
-#define	TS_JJY01_REPLY_DCST_INVALID	"invalid\r\n"
+#define	JJY_RECEIVE_DONE	0
+#define	JJY_RECEIVE_SKIP	1
+#define	JJY_RECEIVE_UNPROCESS	2
+#define	JJY_RECEIVE_WAIT	3
+#define	JJY_RECEIVE_ERROR	4
 
-#define	TS_JJY01_REPLY_LENGTH_DATE	    14	/* Length without  */
-#define	TS_JJY01_REPLY_LENGTH_STIM	    8	/* Length without  */
-#define	TS_JJY01_REPLY_LENGTH_STUS_YES	    8	/* Length without  */
-#define	TS_JJY01_REPLY_LENGTH_STUS_NO	    10	/* Length without  */
-#define	TS_JJY01_REPLY_LENGTH_DCST_VALID    5	/* Length without  */
-#define	TS_JJY01_REPLY_LENGTH_DCST_INVALID  7	/* Length without  */
+/* Local constants definition for the 2nd parameter of the jjy_write_clockstats */
 
-static  struct
-{
-	const char	commandNumber ;
-	const char	*commandLog ;
-	const char	*command ;
-	int	commandLength ;
-} tristate_jjy01_command_sequence[] =
-{
-	/* dcst -> VALID or INVALID */
-	{ TS_JJY01_COMMAND_NUMBER_DCST, "dcst", "dcst\r\n", 6 },
-	/* stus -> ADJUSTED or UNADJUSTED */
-	{ TS_JJY01_COMMAND_NUMBER_STUS, "stus", "stus\r\n", 6 },
-	/* date -> YYYY/MM/DD WWW */
-	{ TS_JJY01_COMMAND_NUMBER_DATE, "date", "date\r\n", 6 },
-	/* stim -> HH:MM:SS */
-	{ TS_JJY01_COMMAND_NUMBER_STIM, "stim", "stim\r\n", 6 },
-	/* End of command */
-	{ 0, NULL, NULL, 0 }
-} ;
+#define	JJY_CLOCKSTATS_MARK_NONE	0
+#define	JJY_CLOCKSTATS_MARK_JJY 	1
+#define	JJY_CLOCKSTATS_MARK_SEND	2
+#define	JJY_CLOCKSTATS_MARK_RECEIVE	3
+#define	JJY_CLOCKSTATS_MARK_INFORMATION	4
+#define	JJY_CLOCKSTATS_MARK_ATTENTION	5
+#define	JJY_CLOCKSTATS_MARK_WARNING	6
+#define	JJY_CLOCKSTATS_MARK_ERROR	7
 
-/*
- * Tristate TS-GPSCLOCK01 constants definition
- */
+/* Local constants definition for the clockstats messages */
 
-#define	TS_GPSCLOCK01_COMMAND_NUMBER_DATE	1
-#define	TS_GPSCLOCK01_COMMAND_NUMBER_TIME	2
-#define	TS_GPSCLOCK01_COMMAND_NUMBER_STUS	4
+#define	JJY_CLOCKSTATS_MESSAGE_ECHOBACK         	"* Echoback"
+#define	JJY_CLOCKSTATS_MESSAGE_IGNORE_REPLY     	"* Ignore replay : [%s]"
+#define	JJY_CLOCKSTATS_MESSAGE_OVER_MIDNIGHT_2  	"* Over midnight : timestamp=%d, %d"
+#define	JJY_CLOCKSTATS_MESSAGE_OVER_MIDNIGHT_3  	"* Over midnight : timestamp=%d, %d, %d"
+#define	JJY_CLOCKSTATS_MESSAGE_TIMESTAMP_UNSURE 	"* Unsure timestamp : %s"
+#define	JJY_CLOCKSTATS_MESSAGE_LOOPBACK_DELAY   	"* Loopback delay : %d.%03d mSec."
+#define	JJY_CLOCKSTATS_MESSAGE_DELAY_ADJUST     	"* Delay adjustment : %d mSec. ( valid=%hd/%d )"
+#define	JJY_CLOCKSTATS_MESSAGE_DELAY_UNADJUST   	"* Delay adjustment : None ( valid=%hd/%d )"
 
-#define	TS_GPSCLOCK01_REPLY_DATE		"yyyy/mm/dd\r\n"
-#define	TS_GPSCLOCK01_REPLY_TIME		"hh:mm:ss\r\n"
-#define	TS_GPSCLOCK01_REPLY_STUS_RTC		"*R\r\n"
-#define	TS_GPSCLOCK01_REPLY_STUS_GPS		"*G\r\n"
-#define	TS_GPSCLOCK01_REPLY_STUS_UTC		"*U\r\n"
-#define	TS_GPSCLOCK01_REPLY_STUS_PPS		"+U\r\n"
+#define	JJY_CLOCKSTATS_MESSAGE_UNEXPECTED_REPLY     	"# Unexpected reply : [%s]"
+#define	JJY_CLOCKSTATS_MESSAGE_INVALID_LENGTH     	"# Invalid length : length=%d"
+#define	JJY_CLOCKSTATS_MESSAGE_TOO_MANY_REPLY     	"# Too many reply : count=%d"
+#define	JJY_CLOCKSTATS_MESSAGE_INVALID_REPLY      	"# Invalid reply : [%s]"
+#define	JJY_CLOCKSTATS_MESSAGE_SLOW_REPLY_2       	"# Slow reply : timestamp=%d, %d"
+#define	JJY_CLOCKSTATS_MESSAGE_SLOW_REPLY_3       	"# Slow reply : timestamp=%d, %d, %d"
+#define	JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_DATE	"# Invalid date : rc=%d year=%d month=%d day=%d"
+#define	JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_TIME	"# Invalid time : rc=%d hour=%d minute=%d second=%d"
+#define	JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_DATETIME	"# Invalid time : rc=%d year=%d month=%d day=%d hour=%d minute=%d second=%d"
+#define	JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_LEAP	"# Invalid leap : leapsecond=[%s]"
+#define	JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_STATUS	"# Invalid status : status=[%s]"
 
-#define	TS_GPSCLOCK01_REPLY_LENGTH_DATE	    10	/* Length without  */
-#define	TS_GPSCLOCK01_REPLY_LENGTH_TIME	    8	/* Length without  */
-#define	TS_GPSCLOCK01_REPLY_LENGTH_STUS	    2	/* Length without  */
+/* Debug print macro */
 
-static  struct
-{
-	char	commandNumber ;
-	const char	*commandLog ;
-	const char	*command ;
-	int	commandLength ;
-} tristate_gpsclock01_command_sequence[] =
-{
-	/* stus -> *R or *G or *U or +U */
-	{ TS_GPSCLOCK01_COMMAND_NUMBER_STUS, "stus", "stus\r\n", 6 },
-	/* date -> YYYY/MM/DD WWW */
-	{ TS_GPSCLOCK01_COMMAND_NUMBER_DATE, "date", "date\r\n", 6 },
-	/* time -> HH:MM:SS */
-	{ TS_GPSCLOCK01_COMMAND_NUMBER_TIME, "time", "time\r\n", 6 },
-	/* End of command */
-	{ 0, NULL, NULL, 0 }
-} ;
+#ifdef	DEBUG
+#define	DEBUG_PRINTF_JJY_RECEIVE(sFunc,iLen)	{ if ( debug ) { printf ( "refclock_jjy.c : %s : iProcessState=%d bLineError=%d iCommandSeq=%d iLineCount=%d iTimestampCount=%d iLen=%d\n", sFunc, up->iProcessState, up->bLineError, up->iCommandSeq, up->iLineCount, up->iTimestampCount, iLen ) ; } }
+#else
+#define	DEBUG_PRINTF_JJY_RECEIVE(sFunc,iLen)
+#endif
 
 /**************************************************************************************************/
 /*  jjy_start - open the devices and initialize data for processing                               */
@@ -359,31 +428,42 @@ static int
 jjy_start ( int unit, struct peer *peer )
 {
 
-	struct jjyunit	    *up ;
-	struct refclockproc *pp ;
+	struct	refclockproc *pp ;
+	struct	jjyunit      *up ;
+	int 	rc ;
 	int 	fd ;
-	char	*pDeviceName ;
-	short	iDiscipline ;
-	int 	iSpeed232 ;
-
-	char	sLogText [ MAX_LOGTEXT ] , sDevText [ MAX_LOGTEXT ] ;
+	char	sDeviceName [ sizeof(DEVICE) + 10 ], sLog [ 60 ] ;
 
 #ifdef DEBUG
 	if ( debug ) {
-		printf ( "jjy_start (refclock_jjy.c) : %s  mode=%d  ", ntoa(&peer->srcadr), peer->ttl ) ;
-		printf ( DEVICE, unit ) ;
-		printf ( "\n" ) ;
+		printf( "refclock_jjy.c : jjy_start : %s  mode=%d  dev=%s  unit=%d\n",
+			 ntoa(&peer->srcadr), peer->ttl, DEVICE, unit ) ;
 	}
 #endif
-	snprintf ( sDevText, sizeof(sDevText), DEVICE, unit ) ;
-	snprintf ( sLogText, sizeof(sLogText), "*Initialze*  %s  mode=%d", sDevText, peer->ttl ) ;
-	record_clock_stats ( &peer->srcadr, sLogText ) ;
 
-	/*
-	 * Open serial port
-	 */
-	pDeviceName = emalloc ( strlen(DEVICE) + 10 );
-	snprintf ( pDeviceName, strlen(DEVICE) + 10, DEVICE, unit ) ;
+	/* Allocate memory for the unit structure */
+	up = emalloc( sizeof(*up) ) ;
+	if ( up == NULL ) {
+		msyslog ( LOG_ERR, "refclock_jjy.c : jjy_start : emalloc" ) ;
+		return RC_START_ERROR ;
+	}
+	memset ( up, 0, sizeof(*up) ) ;
+
+	up->bInitError = FALSE ;
+	up->iProcessState = JJY_PROCESS_STATE_IDLE ;
+	up->bReceiveFlag = FALSE ;
+	up->iCommandSeq = 0 ;
+	up->iLineCount = 0 ;
+	up->iTimestampCount = 0 ;
+	up->bWaitBreakString = FALSE ;
+	up->iRawBufLen = up->iLineBufLen = up->iTextBufLen = 0 ;
+	up->bSkipCntrlCharOnly = TRUE ;
+
+	/* Set up the device name */
+	snprintf( sDeviceName, sizeof(sDeviceName), DEVICE, unit ) ;
+
+	snprintf( sLog, sizeof(sLog), "mode=%d dev=%s", peer->ttl, sDeviceName ) ;
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_JJY, sLog ) ;
 
 	/*
 	 * peer->ttl is a mode number specified by "127.127.40.X mode N" in the ntp.conf
@@ -391,101 +471,57 @@ jjy_start ( int unit, struct peer *peer )
 	switch ( peer->ttl ) {
 	case 0 :
 	case 1 :
-		iDiscipline = LDISC_CLK ;
-		iSpeed232   = SPEED232_TRISTATE_JJY01 ;
+		rc = jjy_start_tristate_jjy01 ( unit, peer, up ) ;
 		break ;
 	case 2 :
-		iDiscipline = LDISC_RAW ;
-		iSpeed232   = SPEED232_CDEX_JST2000   ;
+		rc = jjy_start_cdex_jst2000 ( unit, peer, up ) ;
 		break ;
 	case 3 :
-		iDiscipline = LDISC_CLK ;
-		iSpeed232   = SPEED232_ECHOKEISOKUKI_LT2000 ;
+		rc = jjy_start_echokeisokuki_lt2000 ( unit, peer, up ) ;
 		break ;
 	case 4 :
-		iDiscipline = LDISC_CLK ;
-		iSpeed232   = SPEED232_CITIZENTIC_JJY200 ;
+		rc = jjy_start_citizentic_jjy200 ( unit, peer, up ) ;
 		break ;
 	case 5 :
-		iDiscipline = LDISC_CLK ;
-		iSpeed232   = SPEED232_TRISTATE_GPSCLOCK01 ;
+		rc = jjy_start_tristate_gpsclock01 ( unit, peer, up ) ;
+		break ;
+	case 6 :
+		rc = jjy_start_seiko_tsys_tdc_300 ( unit, peer, up ) ;
+		break ;
+	case 100 :
+		rc = jjy_start_telephone ( unit, peer, up ) ;
 		break ;
 	default :
-		msyslog ( LOG_ERR, "JJY receiver [ %s mode %d ] : Unsupported mode",
-			  ntoa(&peer->srcadr), peer->ttl ) ;
-		free ( (void*) pDeviceName ) ;
+		if ( 101 <= peer->ttl && peer->ttl <= 180 ) {
+			rc = jjy_start_telephone ( unit, peer, up ) ;
+		} else {
+			msyslog ( LOG_ERR, "JJY receiver [ %s mode %d ] : Unsupported mode",
+				  ntoa(&peer->srcadr), peer->ttl ) ;
+			free ( (void*) up ) ;
 		return RC_START_ERROR ;
-	}
-
-	fd = refclock_open ( pDeviceName, iSpeed232, iDiscipline ) ;
-	if ( fd <= 0 ) {
-		free ( (void*) pDeviceName ) ;
-		return RC_START_ERROR ;
-	}
-	free ( (void*) pDeviceName ) ;
-
-	/*
-	 * Allocate and initialize unit structure
-	 */
-	up = emalloc (sizeof(*up));
-	memset ( up, 0, sizeof(*up) ) ;
-	up->linediscipline = iDiscipline ;
-
-	/*
-	 * peer->ttl is a mode number specified by "127.127.40.X mode N" in the ntp.conf
-	 */
-	switch ( peer->ttl ) {
-	case 0 :
-		/*
-		 * The mode 0 is a default clock type at this time.
-		 * But this will be change to auto-detect mode in the future.
-		 */
-	case 1 :
-		up->unittype = UNITTYPE_TRISTATE_JJY01 ;
-		up->version  = 100 ;
-		/* 2010/11/20 */
-		/* Command sequence is defined by the struct tristate_jjy01_command_sequence, */
-		/* and the following 3 lines are not used in the mode LDISC_CLK. */
-		/* up->lineexpect = 2 ; */
-		/* up->charexpect[0] = 14 ; */ /* YYYY/MM/DD WWW */
-		/* up->charexpect[1] =  8 ; */ /* HH:MM:SS */
-		break ;
-	case 2 :
-		up->unittype = UNITTYPE_CDEX_JST2000 ;
-		up->lineexpect = 1 ;
-		up->charexpect[0] = 15 ; /* JYYMMDD HHMMSSS */
-		break ;
-	case 3 :
-		up->unittype = UNITTYPE_ECHOKEISOKUKI_LT2000 ;
-		up->operationmode = 2 ;  /* Mode 2 : Continuous mode */
-		up->lineexpect = 1 ;
-		switch ( up->operationmode ) {
-		case 1 :
-			up->charexpect[0] = 15 ; /* YYMMDDWHHMMSS */
-			break ;
-		case 2 :
-			up->charexpect[0] = 17 ; /* YYMMDDWHHMMSS */
-			break ;
 		}
-		break ;
-	case 4 :
-		up->unittype = UNITTYPE_CITIZENTIC_JJY200 ;
-		up->lineexpect = 1 ;
-		up->charexpect[0] = 23 ; /* 'XX YY/MM/DD W HH:MM:SS */
-		break ;
-	case 5 :
-		up->unittype = UNITTYPE_TRISTATE_GPSCLOCK01 ;
-		break ;
-
-	/* 2010/11/20 */
-	/* The "default:" section of this switch block is never executed,     */
-	/* because the former switch block traps the same "default:" case.    */
-	/* This "default:" section codes are removed to avoid spending time   */
-	/* in the future looking, though the codes are functionally harmless. */
-
 	}
 
+	if ( rc != 0 ) {
+		msyslog ( LOG_ERR, "JJY receiver [ %s mode %d ] : Initialize error",
+			  ntoa(&peer->srcadr), peer->ttl ) ;
+		free ( (void*) up ) ;
+		return RC_START_ERROR ;
+	}
+
+	/* Open the device */
+	fd = refclock_open ( sDeviceName, up->linespeed, up->linediscipline ) ;
+	if ( fd <= 0 ) {
+		free ( (void*) up ) ;
+		return RC_START_ERROR ;
+	}
+
+	/*
+	 * Initialize variables
+	 */
 	pp = peer->procptr ;
+
+	pp->clockdesc	= DESCRIPTION ;
 	pp->unitptr       = up ;
 	pp->io.clock_recv = jjy_receive ;
 	pp->io.srcclock   = peer ;
@@ -498,19 +534,17 @@ jjy_start ( int unit, struct peer *peer )
 		pp->unitptr = NULL ;
 		return RC_START_ERROR ;
 	}
+	memcpy( (char*)&pp->refid, REFID, strlen(REFID) ) ;
 
-	/*
-	 * Initialize miscellaneous variables
-	 */
 	peer->precision = PRECISION ;
-	pp->clockdesc	= DESCRIPTION ;
-	memcpy ( (char*)&pp->refid, REFID, strlen(REFID) ) ;
+
+	snprintf( sLog, sizeof(sLog), "minpoll=%d maxpoll=%d", peer->minpoll, peer->maxpoll ) ;
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_JJY, sLog ) ;
 
 	return RC_START_SUCCESS ;
 
 }
 
-
 /**************************************************************************************************/
 /*  jjy_shutdown - shutdown the clock                                                             */
 /**************************************************************************************************/
@@ -521,22 +555,31 @@ jjy_shutdown ( int unit, struct peer *peer )
 	struct jjyunit	    *up;
 	struct refclockproc *pp;
 
+	char	sLog [ 60 ] ;
+
 	pp = peer->procptr ;
 	up = pp->unitptr ;
-	if ( -1 != pp->io.fd )
+	if ( -1 != pp->io.fd ) {
 		io_closeclock ( &pp->io ) ;
-	if ( NULL != up )
+	}
+	if ( NULL != up ) {
 		free ( up ) ;
+	}
+
+	snprintf( sLog, sizeof(sLog), "JJY stopped. unit=%d mode=%d", unit, peer->ttl ) ;
+	record_clock_stats( &peer->srcadr, sLog ) ;
 
 }
 
-
 /**************************************************************************************************/
 /*  jjy_receive - receive data from the serial interface                                          */
 /**************************************************************************************************/
 static void
 jjy_receive ( struct recvbuf *rbufp )
 {
+#ifdef DEBUG
+	static const char *sFunctionName = "jjy_receive" ;
+#endif
 
 	struct jjyunit	    *up ;
 	struct refclockproc *pp ;
@@ -544,8 +587,9 @@ jjy_receive ( struct recvbuf *rbufp )
 
 	l_fp	tRecvTimestamp;		/* arrival timestamp */
 	int 	rc ;
-	char	sLogText [ MAX_LOGTEXT ] ;
-	int 	i, bCntrlChar ;
+	char	*pBuf, sLogText [ MAX_LOGTEXT ] ;
+	int 	iLen, iCopyLen ;
+	int 	i, j, iReadRawBuf, iBreakPosition ;
 
 	/*
 	 * Initialize pointers and read the timecode and timestamp
@@ -557,897 +601,268 @@ jjy_receive ( struct recvbuf *rbufp )
 	/*
 	 * Get next input line
 	 */
-	pp->lencode  = refclock_gtlin ( rbufp, pp->a_lastcode, BMAX, &tRecvTimestamp ) ;
-
 	if ( up->linediscipline == LDISC_RAW ) {
+
+		pp->lencode  = refclock_gtraw ( rbufp, pp->a_lastcode, BMAX-1, &tRecvTimestamp ) ;
+		/* 3rd argument can be BMAX, but the coverity scan tool claim "Memory - corruptions  (OVERRUN)" */
+		/* "a_lastcode" is defined as "char a_lastcode[BMAX]" in the ntp_refclock.h */
+		/* To avoid its claim, pass the value BMAX-1. */
+
 		/*
-		 * The reply with  and  may give a blank line
-		 */
-		if ( pp->lencode == 0  &&  up->charcount == 0 ) return ;
-		/*
-		 * Copy received charaters to temporary buffer 
+		 * Append received charaters to temporary buffer
 		 */
 		for ( i = 0 ;
-		      i < pp->lencode && up->charcount < MAX_RAWBUF - 2 ;
-		      i ++ , up->charcount ++ ) {
-			up->rawbuf[up->charcount] = pp->a_lastcode[i] ;
+		      i < pp->lencode && up->iRawBufLen < MAX_RAWBUF - 2 ;
+		      i ++ , up->iRawBufLen ++ ) {
+			up->sRawBuf[up->iRawBufLen] = pp->a_lastcode[i] ;
 		}
-		while ( up->charcount > 0 && up->rawbuf[0] < ' ' ) {
-			for ( i = 0 ; i < up->charcount - 1 ; i ++ )
-				up->rawbuf[i] = up->rawbuf[i+1] ;
-			up->charcount -- ;
-		}
-		bCntrlChar = 0 ;
-		for ( i = 0 ; i < up->charcount ; i ++ ) {
-			if ( up->rawbuf[i] < ' ' ) {
-				bCntrlChar = 1 ;
-				break ;
-			}
-		}
-		if ( pp->lencode > 0  &&  up->linecount < up->lineexpect ) {
-			if ( bCntrlChar == 0  &&
-			     up->charcount < up->charexpect[up->linecount] )
-				return ;
-		}
-		up->rawbuf[up->charcount] = 0 ;
+		up->sRawBuf[up->iRawBufLen] = 0 ;
+
+
 	} else {
-		/*
-		 * The reply with  gives a blank line
-		 */
-		if ( pp->lencode == 0 ) return ;
+
+		pp->lencode  = refclock_gtlin ( rbufp, pp->a_lastcode, BMAX, &tRecvTimestamp ) ;
+
 	}
+#ifdef DEBUG
+	printf( "\nrefclock_jjy.c : %s : Len=%d  ", sFunctionName, pp->lencode ) ;
+	for ( i = 0 ; i < pp->lencode ; i ++ ) {
+		if ( iscntrl( pp->a_lastcode[i] & 0x7F ) ) {
+			printf( "", pp->a_lastcode[i] & 0xFF ) ;
+		} else {
+			printf( "%c", pp->a_lastcode[i] ) ;
+		}
+	}
+	printf( "\n" ) ;
+#endif
+
+	/*
+	 * The reply with  gives a blank line
+	 */
+
+	if ( pp->lencode == 0 ) return ;
+
+	/*
+	 * Receiving data is not expected
+	 */
+
+	if ( up->iProcessState == JJY_PROCESS_STATE_IDLE
+	  || up->iProcessState == JJY_PROCESS_STATE_DONE
+	  || up->iProcessState == JJY_PROCESS_STATE_ERROR ) {
+		/* Discard received data */
+		up->iRawBufLen = 0 ;
+#ifdef DEBUG
+		if ( debug ) {
+			printf( "refclock_jjy.c : %s : Discard received data\n", sFunctionName ) ;
+		}
+#endif
+		return ;
+	}
+
 	/*
 	 * We get down to business
 	 */
 
-#ifdef DEBUG
-	if ( debug ) {
-		if ( up->linediscipline == LDISC_RAW ) {
-			printableString( sLogText, MAX_LOGTEXT, up->rawbuf, up->charcount ) ;
-		} else {
-			printableString( sLogText, MAX_LOGTEXT, pp->a_lastcode, pp->lencode ) ;
-		}
-		printf ( "jjy_receive (refclock_jjy.c) : [%s]\n", sLogText ) ;
-	}
-#endif
-
 	pp->lastrec = tRecvTimestamp ;
 
-	up->linecount ++ ;
+	up->iLineCount ++ ;
 
-	if ( up->lineerror != 0 ) return ;
+	up->iProcessState = JJY_PROCESS_STATE_RECEIVE ;
+	up->bReceiveFlag = TRUE ;
 
-	switch ( up->unittype ) {
-	
-	case UNITTYPE_TRISTATE_JJY01 :
-		rc = jjy_receive_tristate_jjy01  ( rbufp ) ;
-		break ;
+	iReadRawBuf = 0 ;
+	iBreakPosition = up->iRawBufLen - 1 ;
+	for ( ; up->iProcessState == JJY_PROCESS_STATE_RECEIVE ; ) {
 
-	case UNITTYPE_CDEX_JST2000 :
-		rc = jjy_receive_cdex_jst2000 ( rbufp ) ;
-		break ;
-
-	case UNITTYPE_ECHOKEISOKUKI_LT2000 :
-		rc = jjy_receive_echokeisokuki_lt2000 ( rbufp ) ;
-		break ;
-
-	case UNITTYPE_CITIZENTIC_JJY200 :
-		rc = jjy_receive_citizentic_jjy200 ( rbufp ) ;
-		break ;
-
-	case UNITTYPE_TRISTATE_GPSCLOCK01 :
-		rc = jjy_receive_tristate_gpsclock01  ( rbufp ) ;
-		break ;
-
-	default :
-		rc = 0 ;
-		break ;
-
-	}
-
-	if ( up->linediscipline == LDISC_RAW ) {
-		if ( up->linecount <= up->lineexpect  &&
-		     up->charcount > up->charexpect[up->linecount-1] ) {
-			for ( i = 0 ;
-			      i < up->charcount - up->charexpect[up->linecount-1] ;
-			      i ++ ) {
-				up->rawbuf[i] = up->rawbuf[i+up->charexpect[up->linecount-1]] ;
-			}
-			up->charcount -= up->charexpect[up->linecount-1] ;
-		} else {
-			up->charcount = 0 ;
-		}
-	}
-
-	if ( rc == 0 ) {
-		return ;
-	}
-
-	up->bPollFlag = 0 ;
-
-	if ( up->lineerror != 0 ) {
-		refclock_report ( peer, CEVNT_BADREPLY ) ;
-		strlcpy  ( sLogText, "BAD REPLY [",
-			   sizeof( sLogText ) ) ;
 		if ( up->linediscipline == LDISC_RAW ) {
-			strlcat ( sLogText, up->rawbuf,
-				  sizeof( sLogText ) ) ;
-		} else {
-			strlcat ( sLogText, pp->a_lastcode,
-				  sizeof( sLogText ) ) ;
-		}
-		sLogText[MAX_LOGTEXT-1] = 0 ;
-		if ( strlen ( sLogText ) < MAX_LOGTEXT - 2 )
-			strlcat ( sLogText, "]",
-				  sizeof( sLogText ) ) ;
-		record_clock_stats ( &peer->srcadr, sLogText ) ;
-		return ;
-	}
 
-	pp->year   = up->year ;
-	pp->day    = ymd2yd ( up->year, up->month, up->day ) ;
-	pp->hour   = up->hour ;
-	pp->minute = up->minute ;
-	pp->second = up->second ;
-	pp->nsec   = up->msecond * 1000000;
-
-	/* 
-	 * JST to UTC 
-	 */
-	pp->hour -= 9 ;
-	if ( pp->hour < 0 ) {
-		pp->hour += 24 ;
-		pp->day -- ;
-		if ( pp->day < 1 ) {
-			pp->year -- ;
-			pp->day  = ymd2yd ( pp->year, 12, 31 ) ;
-		}
-	}
-#ifdef DEBUG
-	if ( debug ) {
-		printf ( "jjy_receive (refclock_jjy.c) : %04d/%02d/%02d %02d:%02d:%02d.%1d JST   ", 
-			  up->year, up->month, up->day, up->hour,
-			  up->minute, up->second, up->msecond/100 ) ;
-		printf ( "( %04d/%03d %02d:%02d:%02d.%1d UTC )\n",
-			  pp->year, pp->day, pp->hour, pp->minute,
-			  pp->second, (int)(pp->nsec/100000000) ) ;
-	}
-#endif
-
-	/*
-	 * Process the new sample in the median filter and determine the
-	 * timecode timestamp.
-	 */
-
-	snprintf ( sLogText, sizeof(sLogText),
-		   "%04d/%02d/%02d %02d:%02d:%02d.%1d JST",
-		   up->year, up->month, up->day,
-		   up->hour, up->minute, up->second, up->msecond/100 ) ;
-	record_clock_stats ( &peer->srcadr, sLogText ) ;
-
-	if ( ! refclock_process ( pp ) ) {
-		refclock_report(peer, CEVNT_BADTIME);
-		return ;
-	}
-
-	pp->lastref = pp->lastrec;
-	refclock_receive(peer);
-
-}
-
-/**************************************************************************************************/
-
-static int
-jjy_receive_tristate_jjy01 ( struct recvbuf *rbufp )
-{
-#ifdef DEBUG
-	static	const char	*sFunctionName = "jjy_receive_tristate_jjy01" ;
-#endif
-
-	struct jjyunit	    *up ;
-	struct refclockproc *pp ;
-	struct peer	    *peer;
-
-	char	*pBuf ;
-	int 	iLen ;
-	int 	rc ;
-
-	int 	bOverMidnight = 0 ;
-
-	char	sLogText [ MAX_LOGTEXT ], sReplyText  [ MAX_LOGTEXT ] ;
-
-	const char *pCmd ;
-	int 	iCmdLen ;
-
-	/*
-	 * Initialize pointers and read the timecode and timestamp
-	 */
-	peer = rbufp->recv_peer ;
-	pp = peer->procptr ;
-	up = pp->unitptr ;
-
-	if ( up->linediscipline == LDISC_RAW ) {
-		pBuf = up->rawbuf ;
-		iLen = up->charcount ;
-	} else {
-		pBuf = pp->a_lastcode ;
-		iLen = pp->lencode ;
-	}
-
-	switch ( tristate_jjy01_command_sequence[up->linecount-1].commandNumber ) {
-
-	case TS_JJY01_COMMAND_NUMBER_DATE : /* YYYY/MM/DD WWW */
-
-		if ( iLen != TS_JJY01_REPLY_LENGTH_DATE ) {
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		rc = sscanf ( pBuf, "%4d/%2d/%2d", &up->year,
-			      &up->month, &up->day ) ;
-		if ( rc != 3 || up->year < 2000 || up->month < 1 ||
-		     up->month > 12 || up->day < 1 || up->day > 31 ) {
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		/*** Start of modification on 2004/10/31 ***/
-		/*
-		 * Following codes are moved from the function jjy_poll_tristate_jjy01 in this source.
-		 * The Tristate JJY-01 ( Firmware version 1.01 ) accepts "time" and "stim" commands without any delay.
-		 * But the JJY-01 ( Firmware version 2.01 ) does not accept these commands continuously,
-		 * so this driver issues the second command "stim" after the reply of the first command "date".
-		 */
-
-		/*** 2010/11/20 ***/
-		/*
-		 * Codes of a next command issue are moved to the end of this function.
-		 */
-
-		/*** End of modification ***/
-
-		break ;
-
-	case TS_JJY01_COMMAND_NUMBER_TIME : /* HH:MM:SS */
-	case TS_JJY01_COMMAND_NUMBER_STIM : /* HH:MM:SS */
-
-		if ( iLen != TS_JJY01_REPLY_LENGTH_STIM ) {
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		rc = sscanf ( pBuf, "%2d:%2d:%2d", &up->hour,
-			      &up->minute, &up->second ) ;
-		if ( rc != 3 || up->hour > 23 || up->minute > 59 ||
-		     up->second > 60 ) {
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		up->msecond = 0 ;
-		if ( up->hour == 0 && up->minute == 0 && up->second <= 2 ) {
-			/*
-			 * The command "date" and "time" ( or "stim" ) were sent to the JJY receiver separately,
-			 * and the JJY receiver replies a date and time separately.
-			 * Just after midnight transitions, we ignore this time.
-			 */
-			bOverMidnight = 1 ;
-		}
-		break ;
-
-	case TS_JJY01_COMMAND_NUMBER_STUS :
-
-		if ( ( iLen == TS_JJY01_REPLY_LENGTH_STUS_YES
-		    && strncmp( pBuf, TS_JJY01_REPLY_STUS_YES,
-				TS_JJY01_REPLY_LENGTH_STUS_YES ) == 0 )
-		  || ( iLen == TS_JJY01_REPLY_LENGTH_STUS_NO
-		    && strncmp( pBuf, TS_JJY01_REPLY_STUS_NO,
-				TS_JJY01_REPLY_LENGTH_STUS_NO ) == 0 ) ) {
-			/* Good */
-		} else {
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		break ;
-
-	case TS_JJY01_COMMAND_NUMBER_DCST :
-
-		if ( ( iLen == TS_JJY01_REPLY_LENGTH_DCST_VALID
-		    && strncmp( pBuf, TS_JJY01_REPLY_DCST_VALID,
-				TS_JJY01_REPLY_LENGTH_DCST_VALID ) == 0 )
-		  || ( iLen == TS_JJY01_REPLY_LENGTH_DCST_INVALID
-		    && strncmp( pBuf, TS_JJY01_REPLY_DCST_INVALID,
-				TS_JJY01_REPLY_LENGTH_DCST_INVALID ) == 0 ) ) {
-			/* Good */
-		} else {
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		break ;
-
-	default : /*  Unexpected reply */
-
-		up->lineerror = 1 ;
-		break ;
-
-	}
-
-	/* Clockstats Log */
-
-	printableString( sReplyText, sizeof(sReplyText), pBuf, iLen ) ;
-	snprintf ( sLogText, sizeof(sLogText), "%d: %s -> %c: %s",
-		   up->linecount,
-		   tristate_jjy01_command_sequence[up->linecount-1].commandLog,
-		   ( up->lineerror == 0 ) 
-			? ( ( bOverMidnight == 0 )
-				? 'O' 
-				: 'S' ) 
-			: 'X',
-		   sReplyText ) ;
-	record_clock_stats ( &peer->srcadr, sLogText ) ;
-
-	/* Check before issue next command */
-
-	if ( up->lineerror != 0 ) {
-		/* Do not issue next command */
-		return 0 ;
-	}
-
-	if ( bOverMidnight != 0 ) {
-		/* Do not issue next command */
-		return 0 ;
-	}
-
-	if ( tristate_jjy01_command_sequence[up->linecount].command == NULL ) {
-		/* Command sequence completed */
-		return 1 ;
-	}
-
-	/* Issue next command */
-
-#ifdef DEBUG
-	if ( debug ) {
-		printf ( "%s (refclock_jjy.c) : send '%s'\n",
-			sFunctionName, tristate_jjy01_command_sequence[up->linecount].commandLog ) ;
-	}
-#endif
-
-	pCmd =  tristate_jjy01_command_sequence[up->linecount].command ;
-	iCmdLen = tristate_jjy01_command_sequence[up->linecount].commandLength ;
-	if ( write ( pp->io.fd, pCmd, iCmdLen ) != iCmdLen ) {
-		refclock_report ( peer, CEVNT_FAULT ) ;
-	}
-
-	return 0 ;
-
-}
-
-/**************************************************************************************************/
-
-static int
-jjy_receive_cdex_jst2000 ( struct recvbuf *rbufp )
-{
-#ifdef DEBUG
-	static	const char	*sFunctionName = "jjy_receive_cdex_jst2000" ;
-#endif
-
-	struct jjyunit      *up ;
-	struct refclockproc *pp ;
-	struct peer         *peer;
-
-	char	*pBuf ;
-	int 	iLen ;
-	int 	rc ;
-
-	/*
-	 * Initialize pointers and read the timecode and timestamp
-	 */
-	peer = rbufp->recv_peer ;
-	pp = peer->procptr ;
-	up = pp->unitptr ;
-
-	if ( up->linediscipline == LDISC_RAW ) {
-		pBuf = up->rawbuf ;
-		iLen = up->charcount ;
-	} else {
-		pBuf = pp->a_lastcode ;
-		iLen = pp->lencode ;
-	}
-
-	switch ( up->linecount ) {
-
-	case 1 : /* JYYMMDD HHMMSSS */
-
-		if ( iLen != 15 ) {
-#ifdef DEBUG
-			if ( debug >= 2 ) {
-				printf ( "%s (refclock_jjy.c) : Reply length error ( iLen=%d )\n",
-					 sFunctionName, iLen ) ;
-			}
-#endif
-			up->lineerror = 1 ;
-			break ;
-		}
-		rc = sscanf ( pBuf, "J%2d%2d%2d%*1d%2d%2d%2d%1d",
-			      &up->year, &up->month, &up->day,
-			      &up->hour, &up->minute, &up->second,
-			      &up->msecond ) ;
-		if ( rc != 7 || up->month < 1 || up->month > 12 ||
-		     up->day < 1 || up->day > 31 || up->hour > 23 ||
-		     up->minute > 59 || up->second > 60 ) {
-#ifdef DEBUG
-			if ( debug >= 2 ) {
-				printf ( "%s (refclock_jjy.c) : Time error (rc=%d) [ %02d %02d %02d * %02d %02d %02d.%1d ]\n",
-					 sFunctionName, rc, up->year,
-					 up->month, up->day, up->hour,
-					 up->minute, up->second,
-					 up->msecond ) ;
-			}
-#endif
-			up->lineerror = 1 ;
-			break ;
-		}
-		up->year    += 2000 ;
-		up->msecond *= 100 ;
-		break ;
-
-	default : /*  Unexpected reply */
-
-		up->lineerror = 1 ;
-		break ;
-
-	}
-
-	return 1 ;
-
-}
-
-/**************************************************************************************************/
-
-static int
-jjy_receive_echokeisokuki_lt2000 ( struct recvbuf *rbufp )
-{
-#ifdef DEBUG
-	static	const char	*sFunctionName = "jjy_receive_echokeisokuki_lt2000" ;
-#endif
-
-	struct jjyunit      *up ;
-	struct refclockproc *pp ;
-	struct peer	    *peer;
-
-	char	*pBuf ;
-	int 	iLen ;
-	int 	rc ;
-	int	i, ibcc, ibcc1, ibcc2 ;
-
-	/*
-	 * Initialize pointers and read the timecode and timestamp
-	 */
-	peer = rbufp->recv_peer ;
-	pp = peer->procptr ;
-	up = pp->unitptr ;
-
-	if ( up->linediscipline == LDISC_RAW ) {
-		pBuf = up->rawbuf ;
-		iLen = up->charcount ;
-	} else {
-		pBuf = pp->a_lastcode ;
-		iLen = pp->lencode ;
-	}
-
-	switch ( up->linecount ) {
-
-	case 1 : /* YYMMDDWHHMMSS or YYMMDDWHHMMSS */
-
-		if ( ( up->operationmode == 1 && iLen != 15 ) ||
-		     ( up->operationmode == 2 && iLen != 17 ) ) {
-#ifdef DEBUG
-			if ( debug >= 2 ) {
-				printf ( "%s (refclock_jjy.c) : Reply length error ( iLen=%d )\n",
-					 sFunctionName, iLen ) ;
-			}
-#endif
-			if ( up->operationmode == 1 ) {
-#ifdef DEBUG
-				if ( debug ) {
-					printf ( "%s (refclock_jjy.c) : send '#'\n", __func__ ) ;
-				}
-#endif
-				if ( write ( pp->io.fd, "#",1 ) != 1  ) {
-					refclock_report ( peer, CEVNT_FAULT ) ;
-				}
-			}
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		if ( up->operationmode == 1 ) {
-
-			for ( i = ibcc = 0 ; i < 13 ; i ++ )
-				ibcc ^= pBuf[i] ;
-			ibcc1 = 0x30 | ( ( ibcc >> 4 ) & 0xF ) ;
-			ibcc2 = 0x30 | ( ( ibcc      ) & 0xF ) ;
-			if ( pBuf[13] != ibcc1 || pBuf[14] != ibcc2 ) {
-#ifdef DEBUG
-				if ( debug >= 2 ) {
-					printf ( "%s (refclock_jjy.c) : BCC error ( Recv=%02X,%02X / Calc=%02X,%02X)\n",
-						 sFunctionName,
-						 pBuf[13] & 0xFF,
-						 pBuf[14] & 0xFF,
-						 ibcc1, ibcc2 ) ;
-				}
-#endif
-				up->lineerror = 1 ;
-				break ;
-			}
-
-		}
-
-		rc = sscanf ( pBuf, "%2d%2d%2d%*1d%2d%2d%2d",
-			      &up->year, &up->month, &up->day,
-			      &up->hour, &up->minute, &up->second ) ;
-		if ( rc != 6 || up->month < 1 || up->month > 12 ||
-		     up->day < 1 || up->day > 31 || up->hour > 23 ||
-		     up->minute > 59 || up->second > 60 ) {
-#ifdef DEBUG
-			if ( debug >= 2 ) {
-				printf ( "%s (refclock_jjy.c) : Time error (rc=%d) [ %02d %02d %02d * %02d %02d %02d ]\n",
-					 sFunctionName, rc, up->year,
-					 up->month, up->day, up->hour,
-					 up->minute, up->second ) ;
-			}
-#endif
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		up->year += 2000 ;
-
-		if ( up->operationmode == 2 ) {
-
-			/* A time stamp comes on every 0.5 seccond in the mode 2 of the LT-2000. */
-			up->msecond = 500 ;
-			pp->second -- ;
-			if ( pp->second < 0 ) {
-				pp->second = 59 ;
-				pp->minute -- ;
-				if ( pp->minute < 0 ) {
-					pp->minute = 59 ;
-					pp->hour -- ;
-					if ( pp->hour < 0 ) {
-						pp->hour = 23 ;
-						pp->day -- ;
-						if ( pp->day < 1 ) {
-							pp->year -- ;
-							pp->day  = ymd2yd ( pp->year, 12, 31 ) ;
-						}
+			if ( up->bWaitBreakString ) {
+				iBreakPosition = getRawDataBreakPosition( up, iReadRawBuf ) ;
+				if ( iBreakPosition == -1 ) {
+					/* Break string have not come yet */
+					if ( up->iRawBufLen < MAX_RAWBUF - 2
+					  || iReadRawBuf > 0 ) {
+						/* Temporary buffer is not full */
+						break ;
+					} else {
+						/* Temporary buffer is full */
+						iBreakPosition = up->iRawBufLen - 1 ;
 					}
 				}
+			} else {
+				iBreakPosition = up->iRawBufLen - 1 ;
 			}
 
-			/* Switch from mode 2 to mode 1 in order to restraint of useless time stamp. */
-#ifdef DEBUG
-			if ( debug ) {
-				printf ( "%s (refclock_jjy.c) : send '#'\n",
-					 sFunctionName ) ;
+			/* Copy charaters from temporary buffer to process buffer */
+			up->iLineBufLen = up->iTextBufLen = 0 ;
+			for ( i = iReadRawBuf ; i <= iBreakPosition ; i ++ ) {
+
+				/* Copy all characters */
+				up->sLineBuf[up->iLineBufLen] = up->sRawBuf[i] ;
+				up->iLineBufLen ++ ;
+
+				/* Copy printable characters */
+				if ( ! iscntrl( up->sRawBuf[i] ) ) {
+					up->sTextBuf[up->iTextBufLen] = up->sRawBuf[i] ;
+					up->iTextBufLen ++ ;
+				}
+
 			}
+			up->sLineBuf[up->iLineBufLen] = 0 ;
+			up->sTextBuf[up->iTextBufLen] = 0 ;
+#ifdef DEBUG
+			printf( "refclock_jjy.c : %s : up->iLineBufLen=%d up->iTextBufLen=%d\n",
+				 sFunctionName, up->iLineBufLen, up->iTextBufLen ) ;
 #endif
-			if ( write ( pp->io.fd, "#",1 ) != 1  ) {
-				refclock_report ( peer, CEVNT_FAULT ) ;
+
+			if ( up->bSkipCntrlCharOnly && up->iTextBufLen == 0 ) {
+#ifdef DEBUG
+				printf( "refclock_jjy.c : %s : Skip cntrl char only : up->iRawBufLen=%d iReadRawBuf=%d iBreakPosition=%d\n",
+					 sFunctionName, up->iRawBufLen, iReadRawBuf, iBreakPosition ) ;
+#endif
+				if ( iBreakPosition + 1 < up->iRawBufLen ) {
+					iReadRawBuf = iBreakPosition + 1 ;
+					continue ;
+				} else {
+					break ;
+				}
+
 			}
 
 		}
 
-		break ;
-
-	default : /*  Unexpected reply */
-
-#ifdef DEBUG
-		if ( debug ) {
-			printf ( "%s (refclock_jjy.c) : send '#'\n",
-				 sFunctionName ) ;
-		}
-#endif
-		if ( write ( pp->io.fd, "#",1 ) != 1  ) {
-			refclock_report ( peer, CEVNT_FAULT ) ;
-		}
-
-		up->lineerror = 1 ;
-		break ;
-
-	}
-
-	return 1 ;
-
-}
-
-/**************************************************************************************************/
-
-static int
-jjy_receive_citizentic_jjy200 ( struct recvbuf *rbufp )
-{
-#ifdef DEBUG
-	static const char *sFunctionName = "jjy_receive_citizentic_jjy200" ;
-#endif
-
-	struct jjyunit		*up ;
-	struct refclockproc	*pp ;
-	struct peer		*peer;
-
-	char	*pBuf ;
-	int	iLen ;
-	int	rc ;
-	char	cApostrophe, sStatus[3] ;
-	int	iWeekday ;
-
-	/*
-	* Initialize pointers and read the timecode and timestamp
-	*/
-	peer = rbufp->recv_peer ;
-	pp = peer->procptr ;
-	up = pp->unitptr ;
-
-	if ( up->linediscipline == LDISC_RAW ) {
-		pBuf = up->rawbuf ;
-		iLen = up->charcount ;
-	} else {
-		pBuf = pp->a_lastcode ;
-		iLen = pp->lencode ;
-	}
-
-	/*
-	* JJY-200 sends a timestamp every second.
-	* So, a timestamp is ignored unless it is right after polled.
-	*/
-	if ( ! up->bPollFlag )
-		return 0 ;
-
-	switch ( up->linecount ) {
-
-	case 1 : /* 'XX YY/MM/DD W HH:MM:SS */
-
-		if ( iLen != 23 ) {
-#ifdef DEBUG
-			if ( debug >= 2 ) {
-				printf ( "%s (refclock_jjy.c) : Reply length error ( iLen=%d )\n",
-					 sFunctionName, iLen ) ;
-			}
-#endif
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		rc = sscanf ( pBuf, "%c%2s %2d/%2d/%2d %1d %2d:%2d:%2d",
-			      &cApostrophe, sStatus, &up->year,
-			      &up->month, &up->day, &iWeekday,
-			      &up->hour, &up->minute, &up->second ) ;
-		sStatus[2] = 0 ;
-		if ( rc != 9 || cApostrophe != '\'' ||
-		     strcmp( sStatus, "OK" ) != 0 || up->month < 1 ||
-		     up->month > 12 || up->day < 1 || up->day > 31 ||
-		     iWeekday > 6 || up->hour > 23 || up->minute > 59 ||
-		     up->second > 60 ) {
-#ifdef DEBUG
-			if ( debug >= 2 ) {
-				printf ( "%s (refclock_jjy.c) : Time error (rc=%d) [ %c %2s %02d %02d %02d %d %02d %02d %02d ]\n",
-					 sFunctionName, rc, cApostrophe,
-					 sStatus, up->year, up->month,
-					 up->day, iWeekday, up->hour,
-					 up->minute, up->second ) ;
-			}
-#endif
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		up->year += 2000 ;
-		up->msecond = 0 ;
-
-		break ;
-
-	default : /* Unexpected reply */
-
-		up->lineerror = 1 ;
-		break ;
-
-	}
-
-	return 1 ;
-
-}
-
-/**************************************************************************************************/
-
-static int
-jjy_receive_tristate_gpsclock01 ( struct recvbuf *rbufp )
-{
-#ifdef DEBUG
-	static	const char	*sFunctionName = "jjy_receive_tristate_gpsclock01" ;
-#endif
-
-	struct jjyunit	    *up ;
-	struct refclockproc *pp ;
-	struct peer	    *peer;
-
-	char	*pBuf ;
-	int 	iLen ;
-	int 	rc ;
-
-	int 	bOverMidnight = 0 ;
-
-	char	sLogText [ MAX_LOGTEXT ], sReplyText [ MAX_LOGTEXT ] ;
-
-	const char	*pCmd ;
-	int 	iCmdLen ;
-
-	/*
-	 * Initialize pointers and read the timecode and timestamp
-	 */
-	peer = rbufp->recv_peer ;
-	pp = peer->procptr ;
-	up = pp->unitptr ;
-
-	if ( up->linediscipline == LDISC_RAW ) {
-		pBuf = up->rawbuf ;
-		iLen = up->charcount ;
-	} else {
-		pBuf = pp->a_lastcode ;
-		iLen = pp->lencode ;
-	}
-
-	/*
-	 * Ignore NMEA data stream
-	 */
-	if ( iLen > 5
-	  && ( strncmp( pBuf, "$GP", 3 ) == 0 || strncmp( pBuf, "$PFEC", 5 ) == 0 ) ) {
-#ifdef DEBUG
-		if ( debug ) {
-			printf ( "%s (refclock_jjy.c) : Skip NMEA stream [%s]\n",
-				sFunctionName, pBuf ) ;
-		}
-#endif
-		return 0 ;
-	}
-
-	/*
-	 * Skip command prompt '$Cmd>' from the TS-GPSclock-01
-	 */
-	if ( iLen == 5 && strncmp( pBuf, "$Cmd>", 5 ) == 0 ) {
-		return 0 ;
-	} else if ( iLen > 5 && strncmp( pBuf, "$Cmd>", 5 ) == 0 ) {
-		pBuf += 5 ;
-		iLen -= 5 ;
-	}
-
-	/*
-	 * Ignore NMEA data stream after command prompt
-	 */
-	if ( iLen > 5
-	  && ( strncmp( pBuf, "$GP", 3 ) == 0 || strncmp( pBuf, "$PFEC", 5 ) == 0 ) ) {
-#ifdef DEBUG
-		if ( debug ) {
-			printf ( "%s (refclock_jjy.c) : Skip NMEA stream [%s]\n",
-				sFunctionName, pBuf ) ;
-		}
-#endif
-		return 0 ;
-	}
-
-	switch ( tristate_gpsclock01_command_sequence[up->linecount-1].commandNumber ) {
-
-	case TS_GPSCLOCK01_COMMAND_NUMBER_DATE : /* YYYY/MM/DD */
-
-		if ( iLen != TS_GPSCLOCK01_REPLY_LENGTH_DATE ) {
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		rc = sscanf ( pBuf, "%4d/%2d/%2d", &up->year, &up->month, &up->day ) ;
-		if ( rc != 3 || up->year < 2000 || up->month < 1 || up->month > 12 ||
-		     up->day < 1 || up->day > 31 ) {
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		break ;
-
-	case TS_GPSCLOCK01_COMMAND_NUMBER_TIME : /* HH:MM:SS */
-
-		if ( iLen != TS_GPSCLOCK01_REPLY_LENGTH_TIME ) {
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		rc = sscanf ( pBuf, "%2d:%2d:%2d", &up->hour, &up->minute, &up->second ) ;
-		if ( rc != 3 || up->hour > 23 || up->minute > 59 || up->second > 60 ) {
-			up->lineerror = 1 ;
-			break ;
-		}
-
-		up->msecond = 0 ;
-
-		if ( up->hour == 0 && up->minute == 0 && up->second <= 2 ) {
-			/*
-			 * The command "date" and "time" were sent to the JJY receiver separately,
-			 * and the JJY receiver replies a date and time separately.
-			 * Just after midnight transitions, we ignore this time.
-			 */
-			bOverMidnight = 1 ;
-		}
-
-		break ;
-
-	case TS_GPSCLOCK01_COMMAND_NUMBER_STUS :
-
-		if ( iLen == TS_GPSCLOCK01_REPLY_LENGTH_STUS
-		  && ( strncmp( pBuf, TS_GPSCLOCK01_REPLY_STUS_RTC, TS_GPSCLOCK01_REPLY_LENGTH_STUS ) == 0
-		    || strncmp( pBuf, TS_GPSCLOCK01_REPLY_STUS_GPS, TS_GPSCLOCK01_REPLY_LENGTH_STUS ) == 0
-		    || strncmp( pBuf, TS_GPSCLOCK01_REPLY_STUS_UTC, TS_GPSCLOCK01_REPLY_LENGTH_STUS ) == 0
-		    || strncmp( pBuf, TS_GPSCLOCK01_REPLY_STUS_PPS, TS_GPSCLOCK01_REPLY_LENGTH_STUS ) == 0 ) ) {
-			/* Good */
+		if ( up->linediscipline == LDISC_RAW ) {
+			pBuf = up->sLineBuf ;
+			iLen = up->iLineBufLen ;
 		} else {
-			up->lineerror = 1 ;
+			pBuf = pp->a_lastcode ;
+			iLen = pp->lencode ;
+		}
+
+		iCopyLen = ( iLen <= sizeof(sLogText)-1 ? iLen : sizeof(sLogText)-1 ) ;
+		strncpy( sLogText, pBuf, iCopyLen ) ;
+		sLogText[iCopyLen] = 0 ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_RECEIVE, sLogText ) ;
+
+		switch ( up->unittype ) {
+
+		case UNITTYPE_TRISTATE_JJY01 :
+			rc = jjy_receive_tristate_jjy01  ( rbufp ) ;
+			break ;
+
+		case UNITTYPE_CDEX_JST2000 :
+			rc = jjy_receive_cdex_jst2000 ( rbufp ) ;
+			break ;
+
+		case UNITTYPE_ECHOKEISOKUKI_LT2000 :
+			rc = jjy_receive_echokeisokuki_lt2000 ( rbufp ) ;
+			break ;
+
+		case UNITTYPE_CITIZENTIC_JJY200 :
+			rc = jjy_receive_citizentic_jjy200 ( rbufp ) ;
+			break ;
+
+		case UNITTYPE_TRISTATE_GPSCLOCK01 :
+			rc = jjy_receive_tristate_gpsclock01 ( rbufp ) ;
+			break ;
+
+		case UNITTYPE_SEIKO_TIMESYS_TDC_300 :
+			rc = jjy_receive_seiko_tsys_tdc_300 ( rbufp ) ;
+			break ;
+
+		case UNITTYPE_TELEPHONE :
+			rc = jjy_receive_telephone ( rbufp ) ;
+			break ;
+
+		default :
+			rc = JJY_RECEIVE_ERROR ;
+			break ;
+
+		}
+
+		switch ( rc ) {
+		case JJY_RECEIVE_DONE :
+		case JJY_RECEIVE_SKIP :
+			up->iProcessState = JJY_PROCESS_STATE_DONE ;
+			break ;
+		case JJY_RECEIVE_ERROR :
+			up->iProcessState = JJY_PROCESS_STATE_ERROR ;
+			break ;
+		default :
 			break ;
 		}
 
-		break ;
+		if ( up->linediscipline == LDISC_RAW ) {
+			if ( rc == JJY_RECEIVE_UNPROCESS ) {
+				break ;
+			}
+			iReadRawBuf = iBreakPosition + 1 ;
+			if ( iReadRawBuf >= up->iRawBufLen ) {
+				/* Processed all received data */
+				break ;
+			}
+		}
 
-	default : /*  Unexpected reply */
-
-		up->lineerror = 1 ;
-		break ;
+		if ( up->linediscipline == LDISC_CLK ) {
+			break ;
+		}
 
 	}
 
-	/* Clockstats Log */
-
-	printableString( sReplyText, sizeof(sReplyText), pBuf, iLen ) ;
-	snprintf ( sLogText, sizeof(sLogText), "%d: %s -> %c: %s",
-		   up->linecount,
-		   tristate_gpsclock01_command_sequence[up->linecount-1].commandLog,
-		   ( up->lineerror == 0 ) 
-			? ( ( bOverMidnight == 0 )
-				? 'O' 
-				: 'S' ) 
-			: 'X',
-		   sReplyText ) ;
-	record_clock_stats ( &peer->srcadr, sLogText ) ;
-
-	/* Check before issue next command */
-
-	if ( up->lineerror != 0 ) {
-		/* Do not issue next command */
-		return 0 ;
+	if ( up->linediscipline == LDISC_RAW && iReadRawBuf > 0 ) {
+		for ( i = 0, j = iReadRawBuf ; j < up->iRawBufLen ; i ++, j++ ) {
+			up->sRawBuf[i] = up->sRawBuf[j] ;
+		}
+		up->iRawBufLen -= iReadRawBuf ;
+		if ( up->iRawBufLen < 0 ) {
+			up->iRawBufLen = 0 ;
+		}
 	}
 
-	if ( bOverMidnight != 0 ) {
-		/* Do not issue next command */
-		return 0 ;
+	up->bReceiveFlag = FALSE ;
+
+}
+
+/**************************************************************************************************/
+
+static int
+getRawDataBreakPosition ( struct jjyunit *up, int iStart )
+{
+
+	int 	i, j ;
+
+	if ( iStart >= up->iRawBufLen ) {
+#ifdef DEBUG
+		printf( "refclock_jjy.c : getRawDataBreakPosition : iStart=%d return=-1\n", iStart ) ;
+#endif
+		return -1 ;
 	}
 
-	if ( tristate_gpsclock01_command_sequence[up->linecount].command == NULL ) {
-		/* Command sequence completed */
-		return 1 ;
-	}
+	for ( i = iStart ; i < up->iRawBufLen ; i ++ ) {
 
-	/* Issue next command */
+		for ( j = 0 ; up->pRawBreak[j].pString != NULL ; j ++ ) {
+
+			if ( i + up->pRawBreak[j].iLength <= up->iRawBufLen ) {
+
+				if ( strncmp( up->sRawBuf + i,
+					up->pRawBreak[j].pString,
+					up->pRawBreak[j].iLength ) == 0 ) {
 
 #ifdef DEBUG
-	if ( debug ) {
-		printf ( "%s (refclock_jjy.c) : send '%s'\n",
-			sFunctionName, tristate_gpsclock01_command_sequence[up->linecount].commandLog ) ;
-	}
+					printf( "refclock_jjy.c : getRawDataBreakPosition : iStart=%d return=%d\n",
+						iStart, i + up->pRawBreak[j].iLength - 1 ) ;
 #endif
+					return i + up->pRawBreak[j].iLength - 1 ;
 
-	pCmd =  tristate_gpsclock01_command_sequence[up->linecount].command ;
-	iCmdLen = tristate_gpsclock01_command_sequence[up->linecount].commandLength ;
-	if ( write ( pp->io.fd, pCmd, iCmdLen ) != iCmdLen ) {
-		refclock_report ( peer, CEVNT_FAULT ) ;
+				}
+			}
+		}
 	}
 
-	return 0 ;
+#ifdef DEBUG
+	printf( "refclock_jjy.c : getRawDataBreakPosition : iStart=%d return=-1\n", iStart ) ;
+#endif
+	return -1 ;
 
 }
 
@@ -1458,31 +873,47 @@ static void
 jjy_poll ( int unit, struct peer *peer )
 {
 
+	char	sLog [ 40 ], sReach [ 9 ] ;
+
 	struct jjyunit      *up;
 	struct refclockproc *pp;
 
 	pp = peer->procptr;
 	up = pp->unitptr ;
 
-	if ( pp->polls > 0  &&  up->linecount == 0 ) {
+	if ( up->bInitError ) {
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, "Ignore polling because of error during initializing" ) ;
+		return ;
+	}
+
+	if ( pp->polls > 0  &&  up->iLineCount == 0 ) {
 		/*
 		 * No reply for last command
 		 */
 		refclock_report ( peer, CEVNT_TIMEOUT ) ;
 	}
 
-#ifdef DEBUG
-	if ( debug ) {
-		printf ( "jjy_poll (refclock_jjy.c) : %ld\n", pp->polls ) ;
-	}
-#endif
-
 	pp->polls ++ ;
 
-	up->bPollFlag = 1 ;
-	up->linecount = 0 ;
-	up->lineerror = 0 ;
-	up->charcount = 0 ;
+	sReach[0] = peer->reach & 0x80 ? '1' : '0' ;
+	sReach[1] = peer->reach & 0x40 ? '1' : '0' ;
+	sReach[2] = peer->reach & 0x20 ? '1' : '0' ;
+	sReach[3] = peer->reach & 0x10 ? '1' : '0' ;
+	sReach[4] = peer->reach & 0x08 ? '1' : '0' ;
+	sReach[5] = peer->reach & 0x04 ? '1' : '0' ;
+	sReach[6] = peer->reach & 0x02 ? '1' : '0' ;
+	sReach[7] = 0 ; /* This poll */
+	sReach[8] = 0 ;
+
+	snprintf( sLog, sizeof(sLog), "polls=%ld reach=%s", pp->polls, sReach ) ;
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ATTENTION, sLog ) ;
+
+	up->iProcessState = JJY_PROCESS_STATE_POLL ;
+	up->iCommandSeq = 0 ;
+	up->iReceiveSeq = 0 ;
+	up->iLineCount = 0 ;
+	up->bLineError = FALSE ;
+	up->iRawBufLen = 0 ;
 
 	switch ( up->unittype ) {
 	
@@ -1503,7 +934,15 @@ jjy_poll ( int unit, struct peer *peer )
 		break ;
 
 	case UNITTYPE_TRISTATE_GPSCLOCK01 :
-		jjy_poll_tristate_gpsclock01  ( unit, peer ) ;
+		jjy_poll_tristate_gpsclock01 ( unit, peer ) ;
+		break ;
+
+	case UNITTYPE_SEIKO_TIMESYS_TDC_300 :
+		jjy_poll_seiko_tsys_tdc_300 ( unit, peer ) ;
+		break ;
+
+	case UNITTYPE_TELEPHONE :
+		jjy_poll_telephone ( unit, peer ) ;
 		break ;
 
 	default :
@@ -1513,6 +952,401 @@ jjy_poll ( int unit, struct peer *peer )
 
 }
 
+/**************************************************************************************************/
+/*  jjy_timer - called at one-second intervals                                                    */
+/**************************************************************************************************/
+static void
+jjy_timer ( int unit, struct peer *peer )
+{
+
+	struct	refclockproc *pp ;
+	struct	jjyunit      *up ;
+
+#ifdef DEBUG
+	if ( debug ) {
+		printf ( "refclock_jjy.c : jjy_timer\n" ) ;
+	}
+#endif
+
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	if ( up->bReceiveFlag ) {
+#ifdef DEBUG
+		if ( debug ) {
+			printf ( "refclock_jjy.c : jjy_timer : up->bReceiveFlag= TRUE : Timer skipped.\n" ) ;
+		}
+#endif
+		return ;
+	}
+
+	switch ( up->unittype ) {
+	
+	case UNITTYPE_TELEPHONE :
+		jjy_timer_telephone ( unit, peer ) ;
+		break ;
+
+	default :
+		break ;
+
+	}
+
+}
+
+/**************************************************************************************************/
+/*  jjy_synctime                                                                                  */
+/**************************************************************************************************/
+static void
+jjy_synctime ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	char	sLog [ 80 ], cStatus ;
+	const char	*pStatus ;
+
+	pp->year   = up->year ;
+	pp->day    = ymd2yd( up->year, up->month, up->day ) ;
+	pp->hour   = up->hour ;
+	pp->minute = up->minute ;
+	pp->second = up->second ;
+	pp->nsec   = up->msecond * 1000000 ;
+
+	/* 
+	 * JST to UTC 
+	 */
+	pp->hour -= 9 ;
+	if ( pp->hour < 0 ) {
+		pp->hour += 24 ;
+		pp->day -- ;
+		if ( pp->day < 1 ) {
+			pp->year -- ;
+			pp->day  = ymd2yd( pp->year, 12, 31 ) ;
+		}
+	}
+
+	/*
+	 * Process the new sample in the median filter and determine the
+	 * timecode timestamp.
+	 */
+
+	if ( ! refclock_process( pp ) ) {
+		refclock_report( peer, CEVNT_BADTIME ) ;
+		return ;
+	}
+
+	pp->lastref = pp->lastrec ;
+
+	refclock_receive( peer ) ;
+
+	/*
+	 * Write into the clockstats file
+	 */
+	snprintf ( sLog, sizeof(sLog),
+		   "%04d/%02d/%02d %02d:%02d:%02d.%03d JST   ( %04d/%03d %02d:%02d:%02d.%03d UTC )",
+		   up->year, up->month, up->day,
+		   up->hour, up->minute, up->second, up->msecond,
+		   pp->year, pp->day, pp->hour, pp->minute, pp->second,
+		   (int)(pp->nsec/1000000) ) ;
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ATTENTION, sLog ) ;
+
+	cStatus = ' ' ;
+	pStatus = "" ;
+
+	switch ( peer->status ) {
+	case 0 : cStatus = ' ' ; pStatus = "Reject"    ; break ;
+	case 1 : cStatus = 'x' ; pStatus = "FalseTick" ; break ;
+	case 2 : cStatus = '.' ; pStatus = "Excess"    ; break ;
+	case 3 : cStatus = '-' ; pStatus = "Outlier"   ; break ;
+	case 4 : cStatus = '+' ; pStatus = "Candidate" ; break ;
+	case 5 : cStatus = '#' ; pStatus = "Selected"  ; break ;
+	case 6 : cStatus = '*' ; pStatus = "Sys.Peer"  ; break ;
+	case 7 : cStatus = 'o' ; pStatus = "PPS.Peer"  ; break ;
+	default : break ; 
+	}
+
+	snprintf ( sLog, sizeof(sLog),
+		   "status %d [%c] %s : offset %3.3f mSec. : jitter %3.3f mSec.",
+		    peer->status, cStatus, pStatus, peer->offset * 1000, peer->jitter * 1000 ) ;
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_INFORMATION, sLog ) ;
+
+}
+
+/*################################################################################################*/
+/*################################################################################################*/
+/*##												##*/
+/*##    The Tristate Ltd. JJY receiver TS-JJY01, TS-JJY02					##*/
+/*##												##*/
+/*##    server  127.127.40.X  mode 1								##*/
+/*##												##*/
+/*################################################################################################*/
+/*################################################################################################*/
+/*                                                                                                */
+/*  Command               Response                                  Remarks                       */
+/*  --------------------  ----------------------------------------  ----------------------------  */
+/*  dcst          VALID or INVALID                                        */
+/*  stus          ADJUSTED or UNADJUSTED                                  */
+/*  date          YYYY/MM/DD XXX                    XXX is the day of the week    */
+/*  time          HH:MM:SS                          Not used by this driver       */
+/*  stim          HH:MM:SS                          Reply at just second          */
+/*                                                                                                */
+/*################################################################################################*/
+
+#define	TS_JJY01_COMMAND_NUMBER_DATE	1
+#define	TS_JJY01_COMMAND_NUMBER_TIME	2
+#define	TS_JJY01_COMMAND_NUMBER_STIM	3
+#define	TS_JJY01_COMMAND_NUMBER_STUS	4
+#define	TS_JJY01_COMMAND_NUMBER_DCST	5
+
+#define	TS_JJY01_REPLY_DATE     	"yyyy/mm/dd www"
+#define	TS_JJY01_REPLY_STIM     	"hh:mm:ss"
+#define	TS_JJY01_REPLY_STUS_ADJUSTED	"adjusted"
+#define	TS_JJY01_REPLY_STUS_UNADJUSTED	"unadjusted"
+#define	TS_JJY01_REPLY_DCST_VALID	"valid"
+#define	TS_JJY01_REPLY_DCST_INVALID	"invalid"
+
+#define	TS_JJY01_REPLY_LENGTH_DATE           	14	/* Length without  */
+#define	TS_JJY01_REPLY_LENGTH_TIME           	8	/* Length without  */
+#define	TS_JJY01_REPLY_LENGTH_STIM           	8	/* Length without  */
+#define	TS_JJY01_REPLY_LENGTH_STUS_ADJUSTED  	8	/* Length without  */
+#define	TS_JJY01_REPLY_LENGTH_STUS_UNADJUSTED	10	/* Length without  */
+#define	TS_JJY01_REPLY_LENGTH_DCST_VALID     	5	/* Length without  */
+#define	TS_JJY01_REPLY_LENGTH_DCST_INVALID   	7	/* Length without  */
+
+static  struct
+{
+	const char	commandNumber ;
+	const char	*command ;
+	int	commandLength ;
+	int	iExpectedReplyLength [ 2 ] ;
+} tristate_jjy01_command_sequence[] =
+{
+	{ 0, NULL, 0, { 0, 0 } }, /* Idle */
+	{ TS_JJY01_COMMAND_NUMBER_DCST, "dcst\r\n", 6, { TS_JJY01_REPLY_LENGTH_DCST_VALID   , TS_JJY01_REPLY_LENGTH_DCST_INVALID } },
+	{ TS_JJY01_COMMAND_NUMBER_STUS, "stus\r\n", 6, { TS_JJY01_REPLY_LENGTH_STUS_ADJUSTED, TS_JJY01_REPLY_LENGTH_STUS_UNADJUSTED } },
+	{ TS_JJY01_COMMAND_NUMBER_TIME, "time\r\n", 6, { TS_JJY01_REPLY_LENGTH_TIME         , TS_JJY01_REPLY_LENGTH_TIME } },
+	{ TS_JJY01_COMMAND_NUMBER_DATE, "date\r\n", 6, { TS_JJY01_REPLY_LENGTH_DATE         , TS_JJY01_REPLY_LENGTH_DATE } },
+	{ TS_JJY01_COMMAND_NUMBER_STIM, "stim\r\n", 6, { TS_JJY01_REPLY_LENGTH_STIM         , TS_JJY01_REPLY_LENGTH_STIM } },
+	/* End of command */
+	{ 0, NULL, 0, { 0, 0 } }
+} ;
+
+/**************************************************************************************************/
+
+static int
+jjy_start_tristate_jjy01 ( int unit, struct peer *peer, struct jjyunit *up )
+{
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_JJY, "Refclock: Tristate Ltd. TS-JJY01, TS-JJY02" ) ;
+
+	up->unittype  = UNITTYPE_TRISTATE_JJY01 ;
+	up->linespeed = SPEED232_TRISTATE_JJY01 ;
+	up->linediscipline = LDISC_CLK ;
+
+	return 0 ;
+
+}
+
+/**************************************************************************************************/
+
+static int
+jjy_receive_tristate_jjy01 ( struct recvbuf *rbufp )
+{
+	struct jjyunit	    *up ;
+	struct refclockproc *pp ;
+	struct peer	    *peer;
+
+	char	*pBuf, sLog [ 100 ] ;
+	int 	iLen ;
+	int 	rc ;
+
+	const char *pCmd ;
+	int 	iCmdLen ;
+
+	/* Initialize pointers  */
+
+	peer = rbufp->recv_peer ;
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		pBuf = up->sTextBuf ;
+		iLen = up->iTextBufLen ;
+	} else {
+		pBuf = pp->a_lastcode ;
+		iLen = pp->lencode ;
+	}
+
+	DEBUG_PRINTF_JJY_RECEIVE( "jjy_receive_tristate_jjy01", iLen ) ;
+
+	/* Check expected reply */
+
+	if ( tristate_jjy01_command_sequence[up->iCommandSeq].command == NULL ) {
+		/* Command sequence has not been started, or has been completed */
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_UNEXPECTED_REPLY,
+			  pBuf ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+	}
+
+	/* Check reply length */
+
+	if ( iLen != tristate_jjy01_command_sequence[up->iCommandSeq].iExpectedReplyLength[0]
+	  && iLen != tristate_jjy01_command_sequence[up->iCommandSeq].iExpectedReplyLength[1] ) {
+		/* Unexpected reply length */
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_LENGTH,
+			  iLen ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+	}
+
+	/* Parse reply */
+
+	switch ( tristate_jjy01_command_sequence[up->iCommandSeq].commandNumber ) {
+
+	case TS_JJY01_COMMAND_NUMBER_DATE : /* YYYY/MM/DD WWW */
+
+		rc = sscanf ( pBuf, "%4d/%2d/%2d",
+			      &up->year, &up->month, &up->day ) ;
+
+		if ( rc != 3 || up->year < 2000 || 2099 <= up->year
+		  || up->month < 1 || 12 < up->month
+		  || up->day < 1 || 31 < up->day ) {
+			/* Invalid date */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_DATE,
+				  rc, up->year, up->month, up->day ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		break ;
+
+	case TS_JJY01_COMMAND_NUMBER_TIME : /* HH:MM:SS */
+	case TS_JJY01_COMMAND_NUMBER_STIM : /* HH:MM:SS */
+
+		if ( up->iTimestampCount >= 2 ) {
+			/* Too many time reply */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_TOO_MANY_REPLY,
+				  up->iTimestampCount ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		rc = sscanf ( pBuf, "%2d:%2d:%2d",
+			      &up->hour, &up->minute, &up->second ) ;
+
+		if ( rc != 3 || up->hour > 23 || up->minute > 59 ||
+		     up->second > 60 ) {
+			/* Invalid time */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_TIME,
+				  rc, up->hour, up->minute, up->second ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		up->iTimestamp[up->iTimestampCount] = ( up->hour * 60 + up->minute ) * 60 + up->second ;
+
+		up->iTimestampCount++ ;
+
+		up->msecond = 0 ;
+
+		break ;
+
+	case TS_JJY01_COMMAND_NUMBER_STUS :
+
+		if ( strncmp( pBuf, TS_JJY01_REPLY_STUS_ADJUSTED,
+			     TS_JJY01_REPLY_LENGTH_STUS_ADJUSTED ) == 0
+		  || strncmp( pBuf, TS_JJY01_REPLY_STUS_UNADJUSTED,
+			     TS_JJY01_REPLY_LENGTH_STUS_UNADJUSTED ) == 0 ) {
+			/* Good */
+		} else {
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_REPLY,
+				  pBuf ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		break ;
+
+	case TS_JJY01_COMMAND_NUMBER_DCST :
+
+		if ( strncmp( pBuf, TS_JJY01_REPLY_DCST_VALID,
+			     TS_JJY01_REPLY_LENGTH_DCST_VALID ) == 0
+		  || strncmp( pBuf, TS_JJY01_REPLY_DCST_INVALID,
+			     TS_JJY01_REPLY_LENGTH_DCST_INVALID ) == 0 ) {
+			/* Good */
+		} else {
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_REPLY,
+				  pBuf ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		break ;
+
+	default : /*  Unexpected reply */
+
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_REPLY,
+			  pBuf ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+
+	}
+
+	if ( up->iTimestampCount == 2 ) {
+		/* Process date and time */
+
+		if ( up->iTimestamp[1] - 2 <= up->iTimestamp[0]
+		  && up->iTimestamp[0]     <= up->iTimestamp[1] ) {
+			/* 3 commands (time,date,stim) was excuted in two seconds */
+			jjy_synctime( peer, pp, up ) ;
+			return JJY_RECEIVE_DONE ;
+		} else if ( up->iTimestamp[0] > up->iTimestamp[1] ) {
+			/* Over midnight, and date is unsure */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_OVER_MIDNIGHT_2,
+				  up->iTimestamp[0], up->iTimestamp[1] ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_INFORMATION, sLog ) ;
+			return JJY_RECEIVE_SKIP ;
+		} else {
+			/* Slow reply */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SLOW_REPLY_2,
+				  up->iTimestamp[0], up->iTimestamp[1] ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+	}
+
+	/* Issue next command */
+
+	if ( tristate_jjy01_command_sequence[up->iCommandSeq].command != NULL ) {
+		up->iCommandSeq ++ ;
+	}
+
+	if ( tristate_jjy01_command_sequence[up->iCommandSeq].command == NULL ) {
+		/* Command sequence completed */
+		return JJY_RECEIVE_DONE ;
+	}
+
+	pCmd =  tristate_jjy01_command_sequence[up->iCommandSeq].command ;
+	iCmdLen = tristate_jjy01_command_sequence[up->iCommandSeq].commandLength ;
+	if ( write ( pp->io.fd, pCmd, iCmdLen ) != iCmdLen ) {
+		refclock_report ( peer, CEVNT_FAULT ) ;
+	}
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, pCmd ) ;
+
+	return JJY_RECEIVE_WAIT ;
+
+}
+
 /**************************************************************************************************/
 
 static void
@@ -1522,8 +1356,8 @@ jjy_poll_tristate_jjy01  ( int unit, struct peer *peer )
 	static const char *sFunctionName = "jjy_poll_tristate_jjy01" ;
 #endif
 
-	struct jjyunit	    *up;
-	struct refclockproc *pp;
+	struct refclockproc *pp ;
+	struct jjyunit	    *up ;
 
 	const char *pCmd ;
 	int 	iCmdLen ;
@@ -1531,15 +1365,20 @@ jjy_poll_tristate_jjy01  ( int unit, struct peer *peer )
 	pp = peer->procptr;
 	up = pp->unitptr ;
 
+	up->bLineError = FALSE ;
+	up->iTimestampCount = 0 ;
+
 	if ( ( pp->sloppyclockflag & CLK_FLAG1 ) == 0 ) {
-		up->linecount = 2 ;
+		/* Skip "dcst" and "stus" commands */
+		up->iCommandSeq = 2 ;
+		up->iLineCount = 2 ;
 	}
 
 #ifdef DEBUG
 	if ( debug ) {
-		printf ( "%s (refclock_jjy.c) : flag1=%X CLK_FLAG1=%X up->linecount=%d\n",
+		printf ( "%s (refclock_jjy.c) : flag1=%X CLK_FLAG1=%X up->iLineCount=%d\n",
 			sFunctionName, pp->sloppyclockflag, CLK_FLAG1,
-			up->linecount ) ;
+			up->iLineCount ) ;
 	}
 #endif
 
@@ -1547,20 +1386,144 @@ jjy_poll_tristate_jjy01  ( int unit, struct peer *peer )
 	 * Send a first command
 	 */
 
-#ifdef DEBUG
-	if ( debug ) {
-		printf ( "%s (refclock_jjy.c) : send '%s'\n",
-			 sFunctionName,
-			 tristate_jjy01_command_sequence[up->linecount].commandLog ) ;
-	}
-#endif
+	up->iCommandSeq ++ ;
 
-	pCmd =  tristate_jjy01_command_sequence[up->linecount].command ;
-	iCmdLen = tristate_jjy01_command_sequence[up->linecount].commandLength ;
+	pCmd =  tristate_jjy01_command_sequence[up->iCommandSeq].command ;
+	iCmdLen = tristate_jjy01_command_sequence[up->iCommandSeq].commandLength ;
 	if ( write ( pp->io.fd, pCmd, iCmdLen ) != iCmdLen ) {
 		refclock_report ( peer, CEVNT_FAULT ) ;
 	}
 
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, pCmd ) ;
+
+}
+
+/*################################################################################################*/
+/*################################################################################################*/
+/*##												##*/
+/*##    The C-DEX Co. Ltd. JJY receiver JST2000							##*/
+/*##												##*/
+/*##    server  127.127.40.X  mode 2								##*/
+/*##												##*/
+/*################################################################################################*/
+/*################################################################################################*/
+/*                                                                                                */
+/*  Command               Response                                  Remarks                       */
+/*  --------------------  ----------------------------------------  ----------------------------  */
+/*  1J          JYYMMDD HHMMSSS                 J is a fixed character        */
+/*                                                                                                */
+/*################################################################################################*/
+
+static struct jjyRawDataBreak cdex_jst2000_raw_break [ ] =
+{
+	{ "\x03", 1 }, { NULL, 0 }
+} ;
+
+/**************************************************************************************************/
+
+static int
+jjy_start_cdex_jst2000 ( int unit, struct peer *peer, struct jjyunit *up )
+{
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_JJY, "Refclock: C-DEX Co. Ltd. JST2000" ) ;
+
+	up->unittype  = UNITTYPE_CDEX_JST2000 ;
+	up->linespeed = SPEED232_CDEX_JST2000 ;
+	up->linediscipline = LDISC_RAW ;
+
+	up->pRawBreak = cdex_jst2000_raw_break ;
+	up->bWaitBreakString = TRUE ;
+
+	up->bSkipCntrlCharOnly = FALSE ;
+
+	return 0 ;
+
+}
+
+/**************************************************************************************************/
+
+static int
+jjy_receive_cdex_jst2000 ( struct recvbuf *rbufp )
+{
+
+	struct jjyunit      *up ;
+	struct refclockproc *pp ;
+	struct peer         *peer ;
+
+	char	*pBuf, sLog [ 100 ] ;
+	int 	iLen ;
+	int 	rc ;
+
+	/* Initialize pointers */
+
+	peer = rbufp->recv_peer ;
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		pBuf = up->sTextBuf ;
+		iLen = up->iTextBufLen ;
+	} else {
+		pBuf = pp->a_lastcode ;
+		iLen = pp->lencode ;
+	}
+
+	DEBUG_PRINTF_JJY_RECEIVE( "jjy_receive_cdex_jst2000", iLen ) ;
+
+	/* Check expected reply */
+
+	if ( up->iCommandSeq != 1 ) {
+		/* Command sequence has not been started, or has been completed */
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_UNEXPECTED_REPLY,
+			  pBuf ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+	}
+
+	/* Wait until ETX comes */
+
+	if ( up->iLineBufLen < 17 || up->sLineBuf[up->iLineBufLen-1] != 0x03 ) {
+		return JJY_RECEIVE_UNPROCESS ;
+	}
+
+	/* Check reply length */
+
+	if ( iLen != 15 ) {
+		/* Unexpected reply length */
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_LENGTH,
+			  iLen ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+	}
+
+	/* JYYMMDD HHMMSSS */
+
+	rc = sscanf ( pBuf, "J%2d%2d%2d %2d%2d%2d%1d",
+		      &up->year, &up->month, &up->day,
+		      &up->hour, &up->minute, &up->second,
+		      &up->msecond ) ;
+
+	if ( rc != 7 || up->month < 1 || up->month > 12 ||
+	     up->day < 1 || up->day > 31 || up->hour > 23 ||
+	     up->minute > 59 || up->second > 60 ) {
+		/* Invalid date and time */
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_DATETIME,
+			  rc, up->year, up->month, up->day,
+			  up->hour, up->minute, up->second ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+	}
+
+	up->year    += 2000 ;
+	up->msecond *= 100 ;
+
+	jjy_synctime( peer, pp, up ) ;
+
+	return JJY_RECEIVE_DONE ;
+
 }
 
 /**************************************************************************************************/
@@ -1569,24 +1532,219 @@ static void
 jjy_poll_cdex_jst2000 ( int unit, struct peer *peer )
 {
 
-	struct refclockproc *pp;
+	struct refclockproc *pp ;
+	struct jjyunit      *up ;
 
-	pp = peer->procptr;
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	up->bLineError = FALSE ;
+	up->iRawBufLen = 0 ;
+	up->iLineBufLen = 0 ;
+	up->iTextBufLen = 0 ;
 
 	/*
 	 * Send "1J" command
 	 */
 
-#ifdef DEBUG
-	if ( debug ) {
-		printf ( "jjy_poll_cdex_jst2000 (refclock_jjy.c) : send '1J'\n" ) ;
-	}
-#endif
+	up->iCommandSeq ++ ;
 
 	if ( write ( pp->io.fd, "\0051J\003", 4 ) != 4  ) {
 		refclock_report ( peer, CEVNT_FAULT ) ;
 	}
 
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, "\0051J\003" ) ;
+
+}
+
+/*################################################################################################*/
+/*################################################################################################*/
+/*##												##*/
+/*##    The Echo Keisokuki Co. Ltd. JJY receiver LT2000						##*/
+/*##												##*/
+/*##    server  127.127.40.X  mode 3								##*/
+/*##												##*/
+/*################################################################################################*/
+/*################################################################################################*/
+/*                                                                                                */
+/*  Command               Response                                  Remarks                       */
+/*  --------------------  ----------------------------------------  ----------------------------  */
+/*  #                                                               Mode 1 ( Request & Send )     */
+/*  T                     YYMMDDWHHMMSS                                           */
+/*  C                                                               Mode 2 ( Continuous )         */
+/*                        YYMMDDWHHMMSS     0.5 sec before time stamp     */
+/*                                                             Second signal                 */
+/*                                                                                                */
+/*################################################################################################*/
+
+#define	ECHOKEISOKUKI_LT2000_MODE_REQUEST_SEND		1
+#define	ECHOKEISOKUKI_LT2000_MODE_CONTINUOUS		2
+#define	ECHOKEISOKUKI_LT2000_MODE_SWITCHING_CONTINUOUS	3
+
+#define	ECHOKEISOKUKI_LT2000_COMMAND_REQUEST_SEND 	"#"
+#define	ECHOKEISOKUKI_LT2000_COMMAND_REQUEST_TIME 	"T"
+#define	ECHOKEISOKUKI_LT2000_COMMAND_CONTINUOUS 	"C"
+
+/**************************************************************************************************/
+
+static int
+jjy_start_echokeisokuki_lt2000 ( int unit, struct peer *peer, struct jjyunit *up )
+{
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_JJY, "Refclock: Echo Keisokuki Co. Ltd. LT2000" ) ;
+
+	up->unittype  = UNITTYPE_ECHOKEISOKUKI_LT2000 ;
+	up->linespeed = SPEED232_ECHOKEISOKUKI_LT2000 ;
+	up->linediscipline = LDISC_CLK ;
+
+	up->operationmode = ECHOKEISOKUKI_LT2000_MODE_SWITCHING_CONTINUOUS ;
+
+	return 0 ;
+
+}
+
+/**************************************************************************************************/
+
+static int
+jjy_receive_echokeisokuki_lt2000 ( struct recvbuf *rbufp )
+{
+
+	struct jjyunit      *up ;
+	struct refclockproc *pp ;
+	struct peer	    *peer;
+
+	char	*pBuf, sLog [ 100 ], sErr [ 60 ] ;
+	int 	iLen ;
+	int 	rc ;
+	int	i, ibcc, ibcc1, ibcc2 ;
+
+	/* Initialize pointers */
+
+	peer = rbufp->recv_peer ;
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		pBuf = up->sTextBuf ;
+		iLen = up->iTextBufLen ;
+	} else {
+		pBuf = pp->a_lastcode ;
+		iLen = pp->lencode ;
+	}
+
+	DEBUG_PRINTF_JJY_RECEIVE( "jjy_receive_echokeisokuki_lt2000", iLen ) ;
+
+	/* Check reply length */
+
+	if ( ( up->operationmode == ECHOKEISOKUKI_LT2000_MODE_REQUEST_SEND
+	       && iLen != 15 )
+	  || ( up->operationmode == ECHOKEISOKUKI_LT2000_MODE_CONTINUOUS
+	       && iLen != 17 )
+	  || ( up->operationmode == ECHOKEISOKUKI_LT2000_MODE_SWITCHING_CONTINUOUS
+	       && iLen != 17 ) ) {
+		/* Unexpected reply length */
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_LENGTH,
+			  iLen ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+	}
+
+	if ( up->operationmode == ECHOKEISOKUKI_LT2000_MODE_REQUEST_SEND && iLen == 15 ) {
+		/* YYMMDDWHHMMSS */
+
+		for ( i = ibcc = 0 ; i < 13 ; i ++ ) {
+			ibcc ^= pBuf[i] ;
+		}
+
+		ibcc1 = 0x30 | ( ( ibcc >> 4 ) & 0xF ) ;
+		ibcc2 = 0x30 | ( ( ibcc      ) & 0xF ) ;
+		if ( pBuf[13] != ibcc1 || pBuf[14] != ibcc2 ) {
+			snprintf( sErr, sizeof(sErr)-1, " BCC error : Recv=%02X,%02X / Calc=%02X,%02X ",
+				  pBuf[13] & 0xFF, pBuf[14] & 0xFF,
+				  ibcc1, ibcc2 ) ;
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_REPLY,
+				  sErr ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+	}
+
+	if ( ( up->operationmode == ECHOKEISOKUKI_LT2000_MODE_REQUEST_SEND
+	       && iLen == 15 )
+	  || ( up->operationmode == ECHOKEISOKUKI_LT2000_MODE_CONTINUOUS
+	       && iLen == 17 )
+	  || ( up->operationmode == ECHOKEISOKUKI_LT2000_MODE_SWITCHING_CONTINUOUS
+	       && iLen == 17 ) ) {
+		/* YYMMDDWHHMMSS or YYMMDDWHHMMSS */
+
+		rc = sscanf ( pBuf, "%2d%2d%2d%*1d%2d%2d%2d",
+			      &up->year, &up->month, &up->day,
+			      &up->hour, &up->minute, &up->second ) ;
+
+		if ( rc != 6 || up->month < 1 || up->month > 12
+		  || up->day < 1 || up->day > 31
+		  || up->hour > 23 || up->minute > 59 || up->second > 60 ) {
+			/* Invalid date and time */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_DATETIME,
+				  rc, up->year, up->month, up->day,
+				  up->hour, up->minute, up->second ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		up->year += 2000 ;
+
+		if ( up->operationmode == ECHOKEISOKUKI_LT2000_MODE_CONTINUOUS
+		  || up->operationmode == ECHOKEISOKUKI_LT2000_MODE_SWITCHING_CONTINUOUS ) {
+			/* A time stamp comes on every 0.5 second in the mode 2 of the LT-2000. */
+
+			up->msecond = 500 ;
+			up->second -- ;
+			if ( up->second < 0 ) {
+				up->second = 59 ;
+				up->minute -- ;
+				if ( up->minute < 0 ) {
+					up->minute = 59 ;
+					up->hour -- ;
+					if ( up->hour < 0 ) {
+						up->hour = 23 ;
+						up->day -- ;
+						if ( up->day < 1 ) {
+							up->month -- ;
+							if ( up->month < 1 ) {
+								up->month = 12 ;
+								up->year -- ;
+							}
+						}
+					}
+				}
+			}
+
+		}
+
+		jjy_synctime( peer, pp, up ) ;
+
+
+	}
+
+	if (up->operationmode == ECHOKEISOKUKI_LT2000_MODE_SWITCHING_CONTINUOUS ) {
+		/* Switch from mode 2 to mode 1 in order to restraint of useless time stamp. */
+
+		iLen = strlen( ECHOKEISOKUKI_LT2000_COMMAND_REQUEST_SEND ) ;
+		if ( write ( pp->io.fd, ECHOKEISOKUKI_LT2000_COMMAND_REQUEST_SEND, iLen ) != iLen  ) {
+			refclock_report ( peer, CEVNT_FAULT ) ;
+		}
+
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, ECHOKEISOKUKI_LT2000_COMMAND_REQUEST_SEND ) ;
+
+	}
+
+	return JJY_RECEIVE_DONE ;
+
 }
 
 /**************************************************************************************************/
@@ -1595,34 +1753,160 @@ static void
 jjy_poll_echokeisokuki_lt2000 ( int unit, struct peer *peer )
 {
 
-	struct jjyunit      *up;
-	struct refclockproc *pp;
+	struct refclockproc *pp ;
+	struct jjyunit      *up ;
 
 	char	sCmd[2] ;
 
-	pp = peer->procptr;
+	pp = peer->procptr ;
 	up = pp->unitptr ;
 
+	up->bLineError = FALSE ;
+
 	/*
 	 * Send "T" or "C" command
 	 */
 
 	switch ( up->operationmode ) {
-	case 1 : sCmd[0] = 'T' ; break ;
-	case 2 : sCmd[0] = 'C' ; break ;
+	case ECHOKEISOKUKI_LT2000_MODE_REQUEST_SEND :
+		sCmd[0] = 'T' ;
+		break ;
+	case ECHOKEISOKUKI_LT2000_MODE_CONTINUOUS :
+	case ECHOKEISOKUKI_LT2000_MODE_SWITCHING_CONTINUOUS :
+		sCmd[0] = 'C' ;
+		break ;
 	}
 	sCmd[1] = 0 ;
 
-#ifdef DEBUG
-	if ( debug ) {
-		printf ( "jjy_poll_echokeisokuki_lt2000 (refclock_jjy.c) : send '%s'\n", sCmd ) ;
-	}
-#endif
-
 	if ( write ( pp->io.fd, sCmd, 1 ) != 1  ) {
 		refclock_report ( peer, CEVNT_FAULT ) ;
 	}
 
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, sCmd ) ;
+
+}
+
+/*################################################################################################*/
+/*################################################################################################*/
+/*##												##*/
+/*##    The CITIZEN T.I.C CO., LTD. JJY receiver JJY200						##*/
+/*##												##*/
+/*##    server  127.127.40.X  mode 4								##*/
+/*##												##*/
+/*################################################################################################*/
+/*################################################################################################*/
+/*                                                                                                */
+/*  Command               Response                                  Remarks                       */
+/*  --------------------  ----------------------------------------  ----------------------------  */
+/*                        'XX YY/MM/DD W HH:MM:SS               XX:OK|NG|ER  W:0(Mon)-6(Sun)  */
+/*                                                                                                */
+/*################################################################################################*/
+
+static int
+jjy_start_citizentic_jjy200 ( int unit, struct peer *peer, struct jjyunit *up )
+{
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_JJY, "Refclock: CITIZEN T.I.C CO. LTD. JJY200" ) ;
+
+	up->unittype  = UNITTYPE_CITIZENTIC_JJY200 ;
+	up->linespeed = SPEED232_CITIZENTIC_JJY200 ;
+	up->linediscipline = LDISC_CLK ;
+
+	return 0 ;
+
+}
+
+/**************************************************************************************************/
+
+static int
+jjy_receive_citizentic_jjy200 ( struct recvbuf *rbufp )
+{
+
+	struct jjyunit		*up ;
+	struct refclockproc	*pp ;
+	struct peer		*peer;
+
+	char	*pBuf, sLog [ 100 ], sMsg [ 16 ] ;
+	int	iLen ;
+	int	rc ;
+	char	cApostrophe, sStatus[3] ;
+	int	iWeekday ;
+
+	/* Initialize pointers */
+
+	peer = rbufp->recv_peer ;
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		pBuf = up->sTextBuf ;
+		iLen = up->iTextBufLen ;
+	} else {
+		pBuf = pp->a_lastcode ;
+		iLen = pp->lencode ;
+	}
+
+	DEBUG_PRINTF_JJY_RECEIVE( "jjy_receive_citizentic_jjy200", iLen ) ;
+
+	/*
+	 * JJY-200 sends a timestamp every second.
+	 * So, a timestamp is ignored unless it is right after polled.
+	 */
+
+	if ( up->iProcessState != JJY_PROCESS_STATE_RECEIVE ) {
+		return JJY_RECEIVE_SKIP ;
+	}
+
+	/* Check reply length */
+
+	if ( iLen != 23 ) {
+		/* Unexpected reply length */
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_LENGTH,
+			  iLen ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+	}
+
+	/* 'XX YY/MM/DD W HH:MM:SS */
+
+	rc = sscanf ( pBuf, "%c%2s %2d/%2d/%2d %1d %2d:%2d:%2d",
+		      &cApostrophe, sStatus,
+		      &up->year, &up->month, &up->day, &iWeekday,
+		      &up->hour, &up->minute, &up->second ) ;
+	sStatus[2] = 0 ;
+
+	if ( rc != 9 || cApostrophe != '\''
+	  || ( strcmp( sStatus, "OK" ) != 0
+	    && strcmp( sStatus, "NG" ) != 0
+	    && strcmp( sStatus, "ER" ) != 0 )
+	  || up->month < 1 || up->month > 12 || up->day < 1 || up->day > 31
+	  || iWeekday > 6
+	  || up->hour > 23 || up->minute > 59 || up->second > 60 ) {
+		/* Invalid date and time */
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_DATETIME,
+			  rc, up->year, up->month, up->day,
+			  up->hour, up->minute, up->second ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+	} else if ( strcmp( sStatus, "NG" ) == 0
+		 || strcmp( sStatus, "ER" ) == 0 ) {
+		/* Timestamp is unsure */
+		snprintf( sMsg, sizeof(sMsg)-1, "status=%s", sStatus ) ;
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_TIMESTAMP_UNSURE,
+			  sMsg ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_WARNING, sLog ) ;
+		return JJY_RECEIVE_SKIP ;
+	}
+
+	up->year += 2000 ;
+	up->msecond = 0 ;
+
+	jjy_synctime( peer, pp, up ) ;
+
+	return JJY_RECEIVE_DONE ;
+
 }
 
 /**************************************************************************************************/
@@ -1631,37 +1915,349 @@ static void
 jjy_poll_citizentic_jjy200 ( int unit, struct peer *peer )
 {
 
-	/* Do nothing ( up->bPollFlag is set by the jjy_poll ) */
+	struct refclockproc *pp ;
+	struct jjyunit	    *up ;
+
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	up->bLineError = FALSE ;
+
+}
+
+/*################################################################################################*/
+/*################################################################################################*/
+/*##												##*/
+/*##    The Tristate Ltd. GPS clock TS-GPS01							##*/
+/*##												##*/
+/*##    server  127.127.40.X  mode 5								##*/
+/*##												##*/
+/*################################################################################################*/
+/*################################################################################################*/
+/*                                                                                                */
+/*  This clock has NMEA mode and command/respose mode.                                            */
+/*  When this jjy driver are used, set to command/respose mode of this clock                      */
+/*  by the onboard switch SW4, and make sure the LED-Y is tured on.                               */
+/*  Other than this JJY driver, the refclock driver type 20, generic NMEA driver,                 */
+/*  works with the NMEA mode of this clock.                                                       */
+/*                                                                                                */
+/*  Command               Response                                  Remarks                       */
+/*  --------------------  ----------------------------------------  ----------------------------  */
+/*  stus          *R|*G|*U|+U                                                     */
+/*  date          YY/MM/DD                                                        */
+/*  time          HH:MM:SS                                                        */
+/*                                                                                                */
+/*################################################################################################*/
+
+#define	TS_GPS01_COMMAND_NUMBER_DATE	1
+#define	TS_GPS01_COMMAND_NUMBER_TIME	2
+#define	TS_GPS01_COMMAND_NUMBER_STUS	4
+
+#define	TS_GPS01_REPLY_DATE		"yyyy/mm/dd"
+#define	TS_GPS01_REPLY_TIME		"hh:mm:ss"
+#define	TS_GPS01_REPLY_STUS_RTC		"*R"
+#define	TS_GPS01_REPLY_STUS_GPS		"*G"
+#define	TS_GPS01_REPLY_STUS_UTC		"*U"
+#define	TS_GPS01_REPLY_STUS_PPS		"+U"
+
+#define	TS_GPS01_REPLY_LENGTH_DATE	    10	/* Length without  */
+#define	TS_GPS01_REPLY_LENGTH_TIME	    8	/* Length without  */
+#define	TS_GPS01_REPLY_LENGTH_STUS	    2	/* Length without  */
+
+static  struct
+{
+	char	commandNumber ;
+	const char	*command ;
+	int	commandLength ;
+	int	iExpectedReplyLength ;
+} tristate_gps01_command_sequence[] =
+{
+	{ 0, NULL, 0, 0 }, /* Idle */
+	{ TS_GPS01_COMMAND_NUMBER_STUS, "stus\r\n", 6, TS_GPS01_REPLY_LENGTH_STUS },
+	{ TS_GPS01_COMMAND_NUMBER_TIME, "time\r\n", 6, TS_GPS01_REPLY_LENGTH_TIME },
+	{ TS_GPS01_COMMAND_NUMBER_DATE, "date\r\n", 6, TS_GPS01_REPLY_LENGTH_DATE },
+	{ TS_GPS01_COMMAND_NUMBER_TIME, "time\r\n", 6, TS_GPS01_REPLY_LENGTH_TIME },
+	/* End of command */
+	{ 0, NULL, 0, 0 }
+} ;
+
+/**************************************************************************************************/
+
+static int
+jjy_start_tristate_gpsclock01 ( int unit, struct peer *peer, struct jjyunit *up )
+{
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_JJY, "Refclock: Tristate Ltd. TS-GPS01" ) ;
+
+	up->unittype  = UNITTYPE_TRISTATE_GPSCLOCK01 ;
+	up->linespeed = SPEED232_TRISTATE_GPSCLOCK01 ;
+	up->linediscipline = LDISC_CLK ;
+
+	return 0 ;
+
+}
+
+/**************************************************************************************************/
+
+static int
+jjy_receive_tristate_gpsclock01 ( struct recvbuf *rbufp )
+{
+#ifdef DEBUG
+	static	const char	*sFunctionName = "jjy_receive_tristate_gpsclock01" ;
+#endif
+
+	struct jjyunit	    *up ;
+	struct refclockproc *pp ;
+	struct peer	    *peer;
+
+	char	*pBuf, sLog [ 100 ] ;
+	int 	iLen ;
+	int 	rc ;
+
+	const char	*pCmd ;
+	int 	iCmdLen ;
+
+	/* Initialize pointers */
+
+	peer = rbufp->recv_peer ;
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		pBuf = up->sTextBuf ;
+		iLen = up->iTextBufLen ;
+	} else {
+		pBuf = pp->a_lastcode ;
+		iLen = pp->lencode ;
+	}
+
+	DEBUG_PRINTF_JJY_RECEIVE( "jjy_receive_tristate_gpsclock01", iLen ) ;
+
+	/* Ignore NMEA data stream */
+
+	if ( iLen > 5
+	  && ( strncmp( pBuf, "$GP", 3 ) == 0 || strncmp( pBuf, "$PFEC", 5 ) == 0 ) ) {
+#ifdef DEBUG
+		if ( debug ) {
+			printf ( "%s (refclock_jjy.c) : Skip NMEA stream [%s]\n",
+				sFunctionName, pBuf ) ;
+		}
+#endif
+		return JJY_RECEIVE_WAIT ;
+	}
+
+	/*
+	 * Skip command prompt '$Cmd>' from the TS-GPSclock-01
+	 */
+	if ( iLen == 5 && strncmp( pBuf, "$Cmd>", 5 ) == 0 ) {
+		return JJY_RECEIVE_WAIT ;
+	} else if ( iLen > 5 && strncmp( pBuf, "$Cmd>", 5 ) == 0 ) {
+		pBuf += 5 ;
+		iLen -= 5 ;
+	}
+
+	/*
+	 * Ignore NMEA data stream after command prompt
+	 */
+	if ( iLen > 5
+	  && ( strncmp( pBuf, "$GP", 3 ) == 0 || strncmp( pBuf, "$PFEC", 5 ) == 0 ) ) {
+#ifdef DEBUG
+		if ( debug ) {
+			printf ( "%s (refclock_jjy.c) : Skip NMEA stream [%s]\n",
+				sFunctionName, pBuf ) ;
+		}
+#endif
+		return JJY_RECEIVE_WAIT ;
+	}
+
+	/* Check expected reply */
+
+	if ( tristate_gps01_command_sequence[up->iCommandSeq].command == NULL ) {
+		/* Command sequence has not been started, or has been completed */
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_UNEXPECTED_REPLY,
+			  pBuf ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+	}
+
+	/* Check reply length */
+
+	if ( iLen != tristate_gps01_command_sequence[up->iCommandSeq].iExpectedReplyLength ) {
+		/* Unexpected reply length */
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_LENGTH,
+			  iLen ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+	}
+
+	/* Parse reply */
+
+	switch ( tristate_gps01_command_sequence[up->iCommandSeq].commandNumber ) {
+
+	case TS_GPS01_COMMAND_NUMBER_DATE : /* YYYY/MM/DD */
+
+		rc = sscanf ( pBuf, "%4d/%2d/%2d", &up->year, &up->month, &up->day ) ;
+
+		if ( rc != 3 || up->year < 2000 || 2099 <= up->year
+		  || up->month < 1 || 12 < up->month
+		  || up->day < 1 || 31 < up->day ) {
+			/* Invalid date */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_DATE,
+				  rc, up->year, up->month, up->day ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		break ;
+
+	case TS_GPS01_COMMAND_NUMBER_TIME : /* HH:MM:SS */
+
+		if ( up->iTimestampCount >= 2 ) {
+			/* Too many time reply */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_TOO_MANY_REPLY,
+				  up->iTimestampCount ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		rc = sscanf ( pBuf, "%2d:%2d:%2d",
+			      &up->hour, &up->minute, &up->second ) ;
+
+		if ( rc != 3
+		  || up->hour > 23 || up->minute > 59 || up->second > 60 ) {
+			/* Invalid time */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_TIME,
+				  rc, up->hour, up->minute, up->second ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		up->iTimestamp[up->iTimestampCount] = ( up->hour * 60 + up->minute ) * 60 + up->second ;
+
+		up->iTimestampCount++ ;
+
+		up->msecond = 0 ;
+
+		break ;
+
+	case TS_GPS01_COMMAND_NUMBER_STUS :
+
+		if ( strncmp( pBuf, TS_GPS01_REPLY_STUS_RTC, TS_GPS01_REPLY_LENGTH_STUS ) == 0
+		  || strncmp( pBuf, TS_GPS01_REPLY_STUS_GPS, TS_GPS01_REPLY_LENGTH_STUS ) == 0
+		  || strncmp( pBuf, TS_GPS01_REPLY_STUS_UTC, TS_GPS01_REPLY_LENGTH_STUS ) == 0
+		  || strncmp( pBuf, TS_GPS01_REPLY_STUS_PPS, TS_GPS01_REPLY_LENGTH_STUS ) == 0 ) {
+			/* Good */
+		} else {
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_REPLY,
+				  pBuf ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		break ;
+
+	default : /*  Unexpected reply */
+
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_REPLY,
+			  pBuf ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+
+	}
+
+	if ( up->iTimestampCount == 2 ) {
+		/* Process date and time */
+
+		if ( up->iTimestamp[1] - 2 <= up->iTimestamp[0]
+		  && up->iTimestamp[0]     <= up->iTimestamp[1] ) {
+			/* 3 commands (time,date,stim) was excuted in two seconds */
+			jjy_synctime( peer, pp, up ) ;
+			return JJY_RECEIVE_DONE ;
+		} else if ( up->iTimestamp[0] > up->iTimestamp[1] ) {
+			/* Over midnight, and date is unsure */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_OVER_MIDNIGHT_2,
+				  up->iTimestamp[0], up->iTimestamp[1] ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_INFORMATION, sLog ) ;
+			return JJY_RECEIVE_SKIP ;
+		} else {
+			/* Slow reply */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SLOW_REPLY_2,
+				  up->iTimestamp[0], up->iTimestamp[1] ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+	}
+
+	if ( tristate_gps01_command_sequence[up->iCommandSeq].command == NULL ) {
+		/* Command sequence completed */
+		jjy_synctime( peer, pp, up ) ;
+		return JJY_RECEIVE_DONE ;
+	}
+
+	/* Issue next command */
+
+	if ( tristate_gps01_command_sequence[up->iCommandSeq].command != NULL ) {
+		up->iCommandSeq ++ ;
+	}
+
+	if ( tristate_gps01_command_sequence[up->iCommandSeq].command == NULL ) {
+		/* Command sequence completed */
+		up->iProcessState = JJY_PROCESS_STATE_DONE ;
+		return JJY_RECEIVE_DONE ;
+	}
+
+	pCmd =  tristate_gps01_command_sequence[up->iCommandSeq].command ;
+	iCmdLen = tristate_gps01_command_sequence[up->iCommandSeq].commandLength ;
+	if ( write ( pp->io.fd, pCmd, iCmdLen ) != iCmdLen ) {
+		refclock_report ( peer, CEVNT_FAULT ) ;
+	}
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, pCmd ) ;
+
+	return JJY_RECEIVE_WAIT ;
 
 }
 
 /**************************************************************************************************/
 
 static void
-jjy_poll_tristate_gpsclock01  ( int unit, struct peer *peer )
+jjy_poll_tristate_gpsclock01 ( int unit, struct peer *peer )
 {
 #ifdef DEBUG
 	static const char *sFunctionName = "jjy_poll_tristate_gpsclock01" ;
 #endif
 
-	struct jjyunit	    *up;
-	struct refclockproc *pp;
+	struct refclockproc *pp ;
+	struct jjyunit	    *up ;
 
 	const char	*pCmd ;
 	int 	iCmdLen ;
 
-	pp = peer->procptr;
+	pp = peer->procptr ;
 	up = pp->unitptr ;
 
+	up->iTimestampCount = 0 ;
+
 	if ( ( pp->sloppyclockflag & CLK_FLAG1 ) == 0 ) {
-		up->linecount = 1 ;
+		/* Skip "stus" command */
+		up->iCommandSeq = 1 ;
+		up->iLineCount = 1 ;
 	}
 
 #ifdef DEBUG
 	if ( debug ) {
-		printf ( "%s (refclock_jjy.c) : flag1=%X CLK_FLAG1=%X up->linecount=%d\n",
+		printf ( "%s (refclock_jjy.c) : flag1=%X CLK_FLAG1=%X up->iLineCount=%d\n",
 			sFunctionName, pp->sloppyclockflag, CLK_FLAG1,
-			up->linecount ) ;
+			up->iLineCount ) ;
 	}
 #endif
 
@@ -1669,26 +2265,2145 @@ jjy_poll_tristate_gpsclock01  ( int unit, struct peer *peer )
 	 * Send a first command
 	 */
 
-#ifdef DEBUG
-	if ( debug ) {
-		printf ( "%s (refclock_jjy.c) : send '%s'\n",
-			 sFunctionName,
-			 tristate_gpsclock01_command_sequence[up->linecount].commandLog ) ;
-	}
-#endif
+	up->iCommandSeq ++ ;
 
-	pCmd =  tristate_gpsclock01_command_sequence[up->linecount].command ;
-	iCmdLen = tristate_gpsclock01_command_sequence[up->linecount].commandLength ;
+	pCmd =  tristate_gps01_command_sequence[up->iCommandSeq].command ;
+	iCmdLen = tristate_gps01_command_sequence[up->iCommandSeq].commandLength ;
 	if ( write ( pp->io.fd, pCmd, iCmdLen ) != iCmdLen ) {
 		refclock_report ( peer, CEVNT_FAULT ) ;
 	}
 
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, pCmd ) ;
+
+}
+
+/*################################################################################################*/
+/*################################################################################################*/
+/*##												##*/
+/*##    The SEIKO TIME SYSTEMS TDC-300								##*/
+/*##												##*/
+/*##    server  127.127.40.X  mode 6								##*/
+/*##												##*/
+/*################################################################################################*/
+/*################################################################################################*/
+/*                                                                                                */
+/*  Type                  Response                                  Remarks                       */
+/*  --------------------  ----------------------------------------  ----------------------------  */
+/*  Type 1                HH:MM:SS                                                      */
+/*  Type 2                YYMMDDHHMMSSWLSCU               W:0(Sun)-6(Sat)               */
+/*  Type 3                YYMMDDWHHMMSS                   W:0(Sun)-6(Sat)               */
+/*                                                   5 to 10 mSec. before second   */
+/*                                                                                                */
+/*################################################################################################*/
+
+static struct jjyRawDataBreak seiko_tsys_tdc_300_raw_break [ ] =
+{
+	{ "\x03", 1 }, { NULL, 0 }
+} ;
+
+/**************************************************************************************************/
+
+static int
+jjy_start_seiko_tsys_tdc_300 ( int unit, struct peer *peer, struct jjyunit *up )
+{
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_JJY, "Refclock: SEIKO TIME SYSTEMS TDC-300" ) ;
+
+	up->unittype  = UNITTYPE_SEIKO_TIMESYS_TDC_300 ;
+	up->linespeed = SPEED232_SEIKO_TIMESYS_TDC_300 ;
+	up->linediscipline = LDISC_RAW ;
+
+	up->pRawBreak = seiko_tsys_tdc_300_raw_break ;
+	up->bWaitBreakString = TRUE ;
+
+	up->bSkipCntrlCharOnly = FALSE ;
+
+	return 0 ;
+
+}
+
+/**************************************************************************************************/
+
+static int
+jjy_receive_seiko_tsys_tdc_300 ( struct recvbuf *rbufp )
+{
+
+	struct peer		*peer;
+	struct refclockproc	*pp ;
+	struct jjyunit		*up ;
+
+	char	*pBuf, sLog [ 100 ] ;
+	int	iLen, i ;
+	int	rc, iWeekday ;
+	time_t	now ;
+	struct	tm	*pTime ;
+
+	/* Initialize pointers */
+
+	peer = rbufp->recv_peer ;
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		pBuf = up->sTextBuf ;
+		iLen = up->iTextBufLen ;
+	} else {
+		pBuf = pp->a_lastcode ;
+		iLen = pp->lencode ;
+	}
+
+	DEBUG_PRINTF_JJY_RECEIVE( "jjy_receive_seiko_tsys_tdc_300", iLen ) ;
+
+	/*
+	 * TDC-300 sends a timestamp every second.
+	 * So, a timestamp is ignored unless it is right after polled.
+	 */
+
+	if ( up->iProcessState != JJY_PROCESS_STATE_RECEIVE ) {
+		return JJY_RECEIVE_SKIP ;
+	}
+
+	/* Process timestamp */
+
+	up->iReceiveSeq ++ ;
+
+	switch ( iLen ) {
+
+	case 8 : /* Type 1 : HH:MM:SS */
+
+		for ( i = 0 ; i < iLen ; i ++ ) {
+			pBuf[i] &= 0x7F ;
+		}
+
+		rc = sscanf ( pBuf+1, "%2d:%2d:%2d",
+		      &up->hour, &up->minute, &up->second ) ;
+
+		if ( rc != 3
+		  || up->hour > 23 || up->minute > 59 || up->second > 60 ) {
+			/* Invalid time */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_TIME,
+				  rc, up->hour, up->minute, up->second ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		} else if ( up->hour == 23 && up->minute == 59 && up->second >= 55 ) {
+			/* Uncertainty date guard */
+			return JJY_RECEIVE_WAIT ;
+		}
+
+		time( &now ) ;
+		pTime = localtime( &now ) ;
+		up->year  = pTime->tm_year ;
+		up->month = pTime->tm_mon + 1 ;
+		up->day   = pTime->tm_mday ;
+
+		break ;
+
+	case 17 : /* Type 2 : YYMMDDHHMMSSWLSCU */
+
+		for ( i = 0 ; i < iLen ; i ++ ) {
+			pBuf[i] &= 0x7F ;
+		}
+
+		rc = sscanf ( pBuf+1, "%2d%2d%2d%2d%2d%2d%1d",
+		      &up->year, &up->month, &up->day,
+		      &up->hour, &up->minute, &up->second, &iWeekday ) ;
+
+		if ( rc != 7
+		  || up->month < 1 || up->month > 12 || up->day < 1 || up->day > 31
+		  || iWeekday > 6
+		  || up->hour > 23 || up->minute > 59 || up->second > 60 ) {
+			/* Invalid date and time */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_DATETIME,
+				  rc, up->year, up->month, up->day,
+				  up->hour, up->minute, up->second ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		break ;
+
+	case 13 : /* Type 3 : YYMMDDWHHMMSS */
+
+		rc = sscanf ( pBuf, "%2d%2d%2d%1d%2d%2d%2d",
+		      &up->year, &up->month, &up->day, &iWeekday,
+		      &up->hour, &up->minute, &up->second ) ;
+
+		if ( rc != 7
+		  || up->month < 1 || up->month > 12 || up->day < 1 || up->day > 31
+		  || iWeekday > 6
+		  || up->hour > 23 || up->minute > 59 || up->second > 60 ) {
+			/* Invalid date and time */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_DATETIME,
+				  rc, up->year, up->month, up->day,
+				  up->hour, up->minute, up->second ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		return JJY_RECEIVE_WAIT ;
+
+	case 1 : /* Type 3 :  */
+
+		if ( ( *pBuf & 0xFF ) != 0xE5 ) {
+			/* Invalid second signal */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_REPLY,
+				  up->sLineBuf ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		} else if ( up->iReceiveSeq == 1 ) {
+			/* Wait for next timestamp */
+			up->iReceiveSeq -- ;
+			return JJY_RECEIVE_WAIT ;
+		} else if ( up->iReceiveSeq >= 3 ) {
+			/* Unexpected second signal */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_UNEXPECTED_REPLY,
+				  up->sLineBuf ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+			return JJY_RECEIVE_ERROR ;
+		}
+
+		break ;
+
+	default : /* Unexpected reply length */
+
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_INVALID_LENGTH,
+			  iLen ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+		up->bLineError = TRUE ;
+		return JJY_RECEIVE_ERROR ;
+
+	}
+
+	up->year += 2000 ;
+	up->msecond = 0 ;
+
+	jjy_synctime( peer, pp, up ) ;
+
+	return JJY_RECEIVE_DONE ;
+
+}
+
+/**************************************************************************************************/
+
+static void
+jjy_poll_seiko_tsys_tdc_300 ( int unit, struct peer *peer )
+{
+
+	struct refclockproc *pp ;
+	struct jjyunit	    *up ;
+
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	up->bLineError = FALSE ;
+
+}
+
+/*################################################################################################*/
+/*################################################################################################*/
+/*##												##*/
+/*##    Telephone JJY										##*/
+/*##												##*/
+/*##    server  127.127.40.X  mode 100 to 180							##*/
+/*##												##*/
+/*################################################################################################*/
+/*################################################################################################*/
+/*                                                                                                */
+/*  Prompt                Command               Response              Remarks                     */
+/*  --------------------  --------------------  --------------------  --------------------------  */
+/*  Name?         TJJY              Welcome messages      TJJY is a guest user ID     */
+/*  >                     4DATE             YYYYMMDD                                      */
+/*  >                     LEAPSEC           XX                One of 0, +1, -1        */
+/*  >                     TIME              HHMMSS            3 times on second           */
+/*  >                     BYE               Sayounara messages                                */
+/*                                                                                                */
+/*################################################################################################*/
+
+static struct jjyRawDataBreak teljjy_raw_break [ ] =
+{
+	{ "\r\n", 2 },
+	{ "\r"  , 1 },
+	{ "\n"  , 1 },
+	{ "Name ? ", 7 },
+	{ ">"   , 1 },
+	{ "+++" , 3 },
+	{ NULL  , 0 }
+} ;
+
+#define	TELJJY_STATE_IDLE	0
+#define	TELJJY_STATE_DAILOUT	1
+#define	TELJJY_STATE_LOGIN	2
+#define	TELJJY_STATE_CONNECT	3
+#define	TELJJY_STATE_BYE	4
+
+#define	TELJJY_EVENT_NULL	0
+#define	TELJJY_EVENT_START	1
+#define	TELJJY_EVENT_CONNECT	2
+#define	TELJJY_EVENT_DISCONNECT	3
+#define	TELJJY_EVENT_COMMAND	4
+#define	TELJJY_EVENT_LOGIN	5	/* Posted by the jjy_receive_telephone */
+#define	TELJJY_EVENT_PROMPT	6	/* Posted by the jjy_receive_telephone */
+#define	TELJJY_EVENT_DATA	7	/* Posted by the jjy_receive_telephone */
+#define	TELJJY_EVENT_ERROR	8	/* Posted by the jjy_receive_telephone */
+#define	TELJJY_EVENT_SILENT	9	/* Posted by the jjy_timer_telephone */
+#define	TELJJY_EVENT_TIMEOUT	10	/* Posted by the jjy_timer_telephone */
+
+static	void 	teljjy_control		( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+
+static	int 	teljjy_idle_ignore	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_idle_dialout	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_dial_ignore	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_dial_login	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_dial_disc	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_login_ignore	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_login_disc	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_login_conn	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_login_login	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_login_silent	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_login_error	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_conn_ignore	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_conn_disc	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_conn_send	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_conn_data	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_conn_silent	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_conn_error	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_bye_ignore	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_bye_disc 	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+static	int 	teljjy_bye_modem	( struct peer *peer, struct refclockproc *, struct jjyunit * ) ;
+
+static int ( *pTeljjyHandler [ ] [ 5 ] ) ( ) =
+{               	/*STATE_IDLE           STATE_DAILOUT       STATE_LOGIN           STATE_CONNECT       STATE_BYE        */
+/* NULL       */	{ teljjy_idle_ignore , teljjy_dial_ignore, teljjy_login_ignore, teljjy_conn_ignore, teljjy_bye_ignore },
+/* START      */	{ teljjy_idle_dialout, teljjy_dial_ignore, teljjy_login_ignore, teljjy_conn_ignore, teljjy_bye_ignore },
+/* CONNECT    */	{ teljjy_idle_ignore , teljjy_dial_login , teljjy_login_ignore, teljjy_conn_ignore, teljjy_bye_ignore },
+/* DISCONNECT */	{ teljjy_idle_ignore , teljjy_dial_disc  , teljjy_login_disc  , teljjy_conn_disc  , teljjy_bye_disc   },
+/* COMMAND    */	{ teljjy_idle_ignore , teljjy_dial_ignore, teljjy_login_ignore, teljjy_conn_ignore, teljjy_bye_modem  },
+/* LOGIN      */	{ teljjy_idle_ignore , teljjy_dial_ignore, teljjy_login_login , teljjy_conn_error , teljjy_bye_ignore },
+/* PROMPT     */	{ teljjy_idle_ignore , teljjy_dial_ignore, teljjy_login_conn  , teljjy_conn_send  , teljjy_bye_ignore },
+/* DATA       */	{ teljjy_idle_ignore , teljjy_dial_ignore, teljjy_login_ignore, teljjy_conn_data  , teljjy_bye_ignore },
+/* ERROR      */	{ teljjy_idle_ignore , teljjy_dial_ignore, teljjy_login_error , teljjy_conn_error , teljjy_bye_ignore },
+/* SILENT     */	{ teljjy_idle_ignore , teljjy_dial_ignore, teljjy_login_silent, teljjy_conn_silent, teljjy_bye_ignore },
+/* TIMEOUT    */	{ teljjy_idle_ignore , teljjy_dial_disc  , teljjy_login_error , teljjy_conn_error , teljjy_bye_modem  }
+} ;
+
+static short iTeljjyNextState [ ] [ 5 ] =
+{               	/*STATE_IDLE            STATE_DAILOUT         STATE_LOGIN           STATE_CONNECT         STATE_BYE         */
+/* NULL       */	{ TELJJY_STATE_IDLE   , TELJJY_STATE_DAILOUT, TELJJY_STATE_LOGIN  , TELJJY_STATE_CONNECT, TELJJY_STATE_BYE  },
+/* START      */	{ TELJJY_STATE_DAILOUT, TELJJY_STATE_DAILOUT, TELJJY_STATE_LOGIN  , TELJJY_STATE_CONNECT, TELJJY_STATE_BYE  },
+/* CONNECT    */	{ TELJJY_STATE_IDLE   , TELJJY_STATE_LOGIN  , TELJJY_STATE_LOGIN  , TELJJY_STATE_CONNECT, TELJJY_STATE_BYE  },
+/* DISCONNECT */	{ TELJJY_STATE_IDLE   , TELJJY_STATE_IDLE   , TELJJY_STATE_IDLE   , TELJJY_STATE_IDLE   , TELJJY_STATE_IDLE },
+/* COMMAND    */	{ TELJJY_STATE_IDLE   , TELJJY_STATE_DAILOUT, TELJJY_STATE_LOGIN  , TELJJY_STATE_CONNECT, TELJJY_STATE_BYE  },
+/* LOGIN      */	{ TELJJY_STATE_IDLE   , TELJJY_STATE_DAILOUT, TELJJY_STATE_LOGIN  , TELJJY_STATE_BYE    , TELJJY_STATE_BYE  },
+/* PROMPT     */	{ TELJJY_STATE_IDLE   , TELJJY_STATE_DAILOUT, TELJJY_STATE_CONNECT, TELJJY_STATE_BYE    , TELJJY_STATE_BYE  },
+/* DATA       */	{ TELJJY_STATE_IDLE   , TELJJY_STATE_DAILOUT, TELJJY_STATE_LOGIN  , TELJJY_STATE_CONNECT, TELJJY_STATE_BYE  },
+/* ERROR      */	{ TELJJY_STATE_IDLE   , TELJJY_STATE_DAILOUT, TELJJY_STATE_BYE    , TELJJY_STATE_BYE    , TELJJY_STATE_BYE  },
+/* SILENT     */	{ TELJJY_STATE_IDLE   , TELJJY_STATE_DAILOUT, TELJJY_STATE_LOGIN  , TELJJY_STATE_CONNECT, TELJJY_STATE_BYE  },
+/* TIMEOUT    */	{ TELJJY_STATE_IDLE   , TELJJY_STATE_IDLE   , TELJJY_STATE_BYE    , TELJJY_STATE_BYE    , TELJJY_STATE_BYE  }
+} ;
+
+static short iTeljjyPostEvent [ ] [ 5 ] =
+{               	/*STATE_IDLE         STATE_DAILOUT      STATE_LOGIN           STATE_CONNECT         STATE_BYE         */
+/* NULL       */	{ TELJJY_EVENT_NULL, TELJJY_EVENT_NULL, TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL },
+/* START      */	{ TELJJY_EVENT_NULL, TELJJY_EVENT_NULL, TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL },
+/* CONNECT    */	{ TELJJY_EVENT_NULL, TELJJY_EVENT_NULL, TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL },
+/* DISCONNECT */	{ TELJJY_EVENT_NULL, TELJJY_EVENT_NULL, TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL },
+/* COMMAND    */	{ TELJJY_EVENT_NULL, TELJJY_EVENT_NULL, TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL },
+/* LOGIN      */	{ TELJJY_EVENT_NULL, TELJJY_EVENT_NULL, TELJJY_EVENT_NULL   , TELJJY_EVENT_COMMAND, TELJJY_EVENT_NULL },
+/* PROMPT     */	{ TELJJY_EVENT_NULL, TELJJY_EVENT_NULL, TELJJY_EVENT_PROMPT , TELJJY_EVENT_COMMAND, TELJJY_EVENT_NULL },
+/* DATA       */	{ TELJJY_EVENT_NULL, TELJJY_EVENT_NULL, TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL },
+/* ERROR      */	{ TELJJY_EVENT_NULL, TELJJY_EVENT_NULL, TELJJY_EVENT_COMMAND, TELJJY_EVENT_COMMAND, TELJJY_EVENT_NULL },
+/* SILENT     */	{ TELJJY_EVENT_NULL, TELJJY_EVENT_NULL, TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL   , TELJJY_EVENT_NULL },
+/* TIMEOUT    */	{ TELJJY_EVENT_NULL, TELJJY_EVENT_NULL, TELJJY_EVENT_COMMAND, TELJJY_EVENT_COMMAND, TELJJY_EVENT_NULL }
+} ;
+
+static short iTeljjySilentTimeout [ 5 ] = { 0,   0, 10,  5,  0 } ;
+static short iTeljjyStateTimeout  [ 5 ] = { 0, 120, 60, 60, 40 } ;
+
+#define	TELJJY_STAY_CLOCK_STATE  	0
+#define	TELJJY_CHANGE_CLOCK_STATE	1
+
+/* Command and replay */
+
+#define	TELJJY_REPLY_NONE	0
+#define	TELJJY_REPLY_4DATE	1
+#define	TELJJY_REPLY_TIME	2
+#define	TELJJY_REPLY_LEAPSEC	3
+#define	TELJJY_REPLY_LOOP	4
+#define	TELJJY_REPLY_PROMPT	5
+#define	TELJJY_REPLY_LOOPBACK	6
+#define	TELJJY_REPLY_COM	7
+
+#define	TELJJY_COMMAND_START_SKIP_LOOPBACK	7
+
+static  struct
+{
+	const char	*command ;
+	int	commandLength ;
+	int	iEchobackReplyLength ;
+	int	iExpectedReplyType   ;
+	int	iExpectedReplyLength ;
+} teljjy_command_sequence[] =
+{
+	{ NULL, 0, 0, 0, 0 }, /* Idle */
+	{ "LOOP\r"   , 5, 4, TELJJY_REPLY_LOOP    , 0 }, /* Getting into loopback mode */
+	{ ">"        , 1, 1, TELJJY_REPLY_LOOPBACK, 0 }, /* Loopback measuring of delay time */
+	{ ">"        , 1, 1, TELJJY_REPLY_LOOPBACK, 0 }, /* Loopback measuring of delay time */
+	{ ">"        , 1, 1, TELJJY_REPLY_LOOPBACK, 0 }, /* Loopback measuring of delay time */
+	{ ">"        , 1, 1, TELJJY_REPLY_LOOPBACK, 0 }, /* Loopback measuring of delay time */
+	{ ">"        , 1, 1, TELJJY_REPLY_LOOPBACK, 0 }, /* Loopback measuring of delay time */
+	{ "COM\r"    , 4, 3, TELJJY_REPLY_COM     , 0 }, /* Exit from loopback mode */
+	/* TELJJY_COMMAND_START_SKIP_LOOPBACK */
+	{ "TIME\r"   , 5, 4, TELJJY_REPLY_TIME    , 6 },
+	{ "4DATE\r"  , 6, 5, TELJJY_REPLY_4DATE   , 8 },
+	{ "LEAPSEC\r", 8, 7, TELJJY_REPLY_LEAPSEC , 2 },
+	{ "TIME\r"   , 5, 4, TELJJY_REPLY_TIME    , 6 },
+	{ "BYE\r"    , 4, 3, TELJJY_REPLY_NONE    , 0 },
+	/* End of command */
+	{ NULL, 0, 0, 0, 0 }
+} ;
+
+#define	TELJJY_LOOPBACK_DELAY_THRESHOLD		700 /* Milli second */
+
+#ifdef	DEBUG
+#define	DEBUG_TELJJY_PRINTF(sFunc)	{ if ( debug ) { printf ( "refclock_jjy.c : %s : iClockState=%d iClockEvent=%d iTeljjySilentTimer=%d iTeljjyStateTimer=%d iClockCommandSeq=%d\n", sFunc, up->iClockState, up->iClockEvent, up->iTeljjySilentTimer, up->iTeljjyStateTimer, up->iClockCommandSeq ) ; } }
+#else
+#define	DEBUG_TELJJY_PRINTF(sFunc)
+#endif
+
+/**************************************************************************************************/
+
+static int
+jjy_start_telephone ( int unit, struct peer *peer, struct jjyunit *up )
+{
+
+	char	sLog [ 80 ], sFirstThreeDigits [ 4 ] ;
+	int	i, iNumberOfDigitsOfPhoneNumber, iCommaCount, iCommaPosition ;
+	int	iFirstThreeDigitsCount ;
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_JJY, "Refclock: Telephone JJY" ) ;
+
+	up->unittype  = UNITTYPE_TELEPHONE ;
+	up->linespeed = SPEED232_TELEPHONE ;
+	up->linediscipline = LDISC_RAW ;
+
+	up->pRawBreak = teljjy_raw_break ;
+	up->bWaitBreakString = TRUE ;
+
+	up->bSkipCntrlCharOnly = TRUE ;
+
+	up->iClockState = TELJJY_STATE_IDLE ;
+	up->iClockEvent = TELJJY_EVENT_NULL ;
+
+	/* Check the telephone number */
+
+	if ( sys_phone[0] == NULL ) {
+		msyslog( LOG_ERR, "refclock_jjy.c : jjy_start_telephone : phone in the ntpd.conf must be specified." ) ;
+		up->bInitError = TRUE ;
+		return 1 ;
+	}
+
+	if ( sys_phone[1] != NULL ) {
+		msyslog( LOG_ERR, "refclock_jjy.c : jjy_start_telephone : phone in the ntpd.conf should be only one." ) ;
+		up->bInitError = TRUE ;
+		return 1 ;
+	}
+
+	iNumberOfDigitsOfPhoneNumber = iCommaCount = iCommaPosition = iFirstThreeDigitsCount = 0 ;
+	for ( i = 0 ; i < strlen( sys_phone[0] ) ; i ++ ) {
+		if ( isdigit( *(sys_phone[0]+i) ) ) {
+			if ( iFirstThreeDigitsCount < sizeof(sFirstThreeDigits)-1 ) {
+				sFirstThreeDigits[iFirstThreeDigitsCount++] = *(sys_phone[0]+i) ;
+			}
+			iNumberOfDigitsOfPhoneNumber ++ ;
+		} else if ( *(sys_phone[0]+i) == ',' ) {
+			iCommaCount ++ ;
+			if ( iCommaCount > 1 ) {
+				msyslog( LOG_ERR, "refclock_jjy.c : jjy_start_telephone : phone in the ntpd.conf should be zero or one comma." ) ;
+				up->bInitError = TRUE ;
+				return 1 ;
+			}
+			iFirstThreeDigitsCount = 0 ;
+			iCommaPosition = i ;
+		} else if ( *(sys_phone[0]+i) != '-' ) {
+			msyslog( LOG_ERR, "refclock_jjy.c : jjy_start_telephone : phone in the ntpd.conf should be a number or a hyphen." ) ;
+			up->bInitError = TRUE ;
+			return 1 ;
+		}
+	}
+	sFirstThreeDigits[iFirstThreeDigitsCount] = 0 ;
+
+	if ( iCommaCount == 1 ) {
+		if ( iCommaPosition != 1 || *sys_phone[0] != '0' ) {
+			msyslog( LOG_ERR, "refclock_jjy.c : jjy_start_telephone : Getting an outside line should be '0,'." ) ;
+			up->bInitError = TRUE ;
+			return 1 ;
+		}
+	}
+
+	if ( iNumberOfDigitsOfPhoneNumber - iCommaPosition < 6 || 10 < iNumberOfDigitsOfPhoneNumber - iCommaPosition ) {
+		/* Too short or too long */
+		msyslog( LOG_ERR, "refclock_jjy.c : jjy_start_telephone : phone=%s : Number of digits should be 6 to 10.", sys_phone[0] ) ;
+		up->bInitError = TRUE ;
+		return 1 ;
+	}
+
+	if ( strncmp( sFirstThreeDigits + iCommaPosition, "00" , 2 ) == 0
+	  || strncmp( sFirstThreeDigits + iCommaPosition, "10" , 2 ) == 0
+	  || strncmp( sFirstThreeDigits + iCommaPosition, "11" , 2 ) == 0
+	  || strncmp( sFirstThreeDigits + iCommaPosition, "12" , 2 ) == 0
+	  || strncmp( sFirstThreeDigits + iCommaPosition, "171", 3 ) == 0
+	  || strncmp( sFirstThreeDigits + iCommaPosition, "177", 3 ) == 0
+	  || ( sFirstThreeDigits[0] == '0' &&  sFirstThreeDigits[2] == '0' ) ) {
+		/* Not allowed because of emergency numbers or special service numbers */
+		msyslog( LOG_ERR, "refclock_jjy.c : jjy_start_telephone : phone=%s : First 2 or 3 digits are not allowed.", sys_phone[0] ) ;
+		up->bInitError = TRUE ;
+		return 1 ;
+	}
+
+	snprintf( sLog, sizeof(sLog), "phone=%s", sys_phone[0] ) ;
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_JJY, sLog ) ;
+
+	if ( peer->minpoll < 8 ) {
+		/* minpoll must be greater or equal to 8 ( 256 seconds = about 4 minutes ) */
+		int oldminpoll = peer->minpoll ;
+		peer->minpoll = 8 ;
+		if ( peer->ppoll < peer->minpoll ) {
+			peer->ppoll = peer->minpoll ;
+		}
+		if ( peer->maxpoll < peer->minpoll ) {
+			peer->maxpoll = peer->minpoll ;
+		}
+		snprintf( sLog, sizeof(sLog), "minpoll=%d -> %d", oldminpoll, peer->minpoll ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_JJY, sLog ) ;
+	}
+
+	return 0 ;
+
+}
+
+/**************************************************************************************************/
+
+static int
+jjy_receive_telephone ( struct recvbuf *rbufp )
+{
+#ifdef DEBUG
+	static	const char	*sFunctionName = "jjy_receive_telephone" ;
+#endif
+
+	struct	peer         *peer;
+	struct	refclockproc *pp ;
+	struct	jjyunit      *up ;
+	char	*pBuf ;
+	int	iLen ;
+	short	iPreviousModemState ;
+
+	peer = rbufp->recv_peer ;
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	DEBUG_TELJJY_PRINTF( sFunctionName ) ;
+
+	if ( up->iClockState == TELJJY_STATE_IDLE
+	  || up->iClockState == TELJJY_STATE_DAILOUT
+	  || up->iClockState == TELJJY_STATE_BYE ) {
+
+		iPreviousModemState = getModemState( up ) ;
+
+		modem_receive ( rbufp ) ;
+
+		if ( iPreviousModemState != up->iModemState ) {
+			/* Modem state is changed just now. */
+			if ( isModemStateDisconnect( up->iModemState ) ) {
+				up->iClockEvent = TELJJY_EVENT_DISCONNECT ;
+				teljjy_control ( peer, pp, up ) ;
+			} else if ( isModemStateConnect( up->iModemState ) ) {
+				up->iClockEvent = TELJJY_EVENT_CONNECT ;
+				teljjy_control ( peer, pp, up ) ;
+			}
+		}
+
+		return JJY_RECEIVE_WAIT ;
+
+	}
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		pBuf = up->sTextBuf ;
+		iLen = up->iTextBufLen ;
+	} else {
+		pBuf = pp->a_lastcode ;
+		iLen = pp->lencode ;
+	}
+
+	up->iTeljjySilentTimer = 0 ;
+	if      ( iLen == 7 && strncmp( pBuf, "Name ? ", 7 ) == 0 ) { up->iClockEvent = TELJJY_EVENT_LOGIN  ; }
+	else if ( iLen == 1 && strncmp( pBuf, ">"      , 1 ) == 0 ) { up->iClockEvent = TELJJY_EVENT_PROMPT ; }
+	else if ( iLen >= 1 && strncmp( pBuf, "?"      , 1 ) == 0 ) { up->iClockEvent = TELJJY_EVENT_ERROR  ; }
+	else                                                        { up->iClockEvent = TELJJY_EVENT_DATA   ; }
+
+	teljjy_control ( peer, pp, up ) ;
+
+	return JJY_RECEIVE_WAIT ;
+
+}
+
+/**************************************************************************************************/
+
+static void
+jjy_poll_telephone ( int unit, struct peer *peer )
+{
+#ifdef DEBUG
+	static const char *sFunctionName = "jjy_poll_telephone" ;
+#endif
+
+	struct	refclockproc *pp ;
+	struct	jjyunit      *up ;
+
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	DEBUG_TELJJY_PRINTF( sFunctionName ) ;
+
+	if ( up->iClockState == TELJJY_STATE_IDLE ) {
+		up->iRawBufLen = 0 ;
+		up->iLineBufLen = 0 ;
+		up->iTextBufLen = 0 ;
+	}
+
+	up->iClockEvent = TELJJY_EVENT_START ;
+	teljjy_control ( peer, pp, up ) ;
+
+}
+
+/**************************************************************************************************/
+
+static void
+jjy_timer_telephone ( int unit, struct peer *peer )
+{
+#ifdef DEBUG
+	static const char *sFunctionName = "jjy_timer_telephone" ;
+#endif
+
+	struct	refclockproc *pp ;
+	struct	jjyunit      *up ;
+	short	iPreviousModemState ;
+
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	DEBUG_TELJJY_PRINTF( sFunctionName ) ;
+
+	if ( iTeljjySilentTimeout[up->iClockState] != 0 ) {
+		up->iTeljjySilentTimer++ ;
+		if ( iTeljjySilentTimeout[up->iClockState] <= up->iTeljjySilentTimer ) {
+			up->iClockEvent = TELJJY_EVENT_SILENT ;
+			teljjy_control ( peer, pp, up ) ;
+		}
+	}
+
+	if ( iTeljjyStateTimeout[up->iClockState] != 0 ) {
+		up->iTeljjyStateTimer++ ;
+		if ( iTeljjyStateTimeout[up->iClockState] <= up->iTeljjyStateTimer ) {
+			up->iClockEvent = TELJJY_EVENT_TIMEOUT ;
+			teljjy_control ( peer, pp, up ) ;
+		}
+	}
+
+	if ( isModemStateTimerOn( up ) ) {
+
+		iPreviousModemState = getModemState( up ) ;
+
+		modem_timer ( unit, peer ) ;
+
+		if ( iPreviousModemState != up->iModemState ) {
+			/* Modem state is changed just now. */
+			if ( isModemStateDisconnect( up->iModemState ) ) {
+				up->iClockEvent = TELJJY_EVENT_DISCONNECT ;
+				teljjy_control ( peer, pp, up ) ;
+			} else if ( isModemStateConnect( up->iModemState ) ) {
+				up->iClockEvent = TELJJY_EVENT_CONNECT ;
+				teljjy_control ( peer, pp, up ) ;
+			}
+		}
+
+	}
+
 }
 
 /**************************************************************************************************/
 
 static void
-printableString ( char *sOutput, int iOutputLen, char *sInput, int iInputLen )
+teljjy_control ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	int	i, rc ;
+	short	iPostEvent = TELJJY_EVENT_NULL ;
+
+	DEBUG_TELJJY_PRINTF( "teljjy_control" ) ;
+
+	rc = (*pTeljjyHandler[up->iClockEvent][up->iClockState])( peer, pp, up ) ;
+
+	if ( rc == TELJJY_CHANGE_CLOCK_STATE ) {
+		iPostEvent = iTeljjyPostEvent[up->iClockEvent][up->iClockState] ;
+#ifdef DEBUG
+		if ( debug ) {
+			printf( "refclock_jjy.c : teljjy_control : iClockState=%hd -> %hd  iPostEvent=%hd\n",
+				up->iClockState, iTeljjyNextState[up->iClockEvent][up->iClockState], iPostEvent ) ;
+		}
+#endif
+		up->iTeljjySilentTimer = 0 ;
+		if ( up->iClockState != iTeljjyNextState[up->iClockEvent][up->iClockState] ) {
+			/* Telephone JJY state is changing now */
+			up->iTeljjyStateTimer = 0 ;
+			up->bLineError = FALSE ;
+			up->iClockCommandSeq = 0 ;
+			up->iTimestampCount = 0 ;
+			up->iLoopbackCount = 0 ;
+			for ( i = 0 ; i < MAX_LOOPBACK ; i ++ ) {
+				up->bLoopbackTimeout[i] = FALSE ;
+			}
+			if (iTeljjyNextState[up->iClockEvent][up->iClockState] == TELJJY_STATE_IDLE ) {
+				/* Telephone JJY state is changing to IDLE just now */
+				up->iProcessState = JJY_PROCESS_STATE_DONE ;
+			}
+		}
+		up->iClockState = iTeljjyNextState[up->iClockEvent][up->iClockState] ;
+
+	}
+
+	if ( iPostEvent != TELJJY_EVENT_NULL ) {
+		up->iClockEvent = iPostEvent ;
+		teljjy_control ( peer, pp, up ) ;
+	}
+
+	up->iClockEvent = TELJJY_EVENT_NULL ;
+
+}
+
+/**************************************************************************************************/
+
+static void
+teljjy_setDelay ( struct peer *peer, struct jjyunit *up )
+{
+
+	char	sLog [ 60 ] ;
+	int	milliSecond, microSecond ;
+
+	gettimeofday( &(up->delayTime[up->iLoopbackCount]), NULL ) ;
+
+	up->delayTime[up->iLoopbackCount].tv_sec  -= up->sendTime[up->iLoopbackCount].tv_sec ;
+	up->delayTime[up->iLoopbackCount].tv_usec -= up->sendTime[up->iLoopbackCount].tv_usec ;
+	if ( up->delayTime[up->iLoopbackCount].tv_usec < 0 ) {
+		up->delayTime[up->iLoopbackCount].tv_sec -- ;
+		up->delayTime[up->iLoopbackCount].tv_usec += 1000000 ;
+	}
+
+	milliSecond  = up->delayTime[up->iLoopbackCount].tv_usec / 1000 ;
+	microSecond  = up->delayTime[up->iLoopbackCount].tv_usec - milliSecond * 1000 ;
+	milliSecond += up->delayTime[up->iLoopbackCount].tv_sec * 1000 ;
+
+	snprintf( sLog, sizeof(sLog), JJY_CLOCKSTATS_MESSAGE_LOOPBACK_DELAY,
+		  milliSecond, microSecond ) ;
+
+	if ( milliSecond > TELJJY_LOOPBACK_DELAY_THRESHOLD ) {
+		/* Delay > 700 mS */
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_WARNING, sLog ) ;
+	} else {
+		/* Delay <= 700 mS */
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_INFORMATION, sLog ) ;
+	}
+
+}
+
+/**************************************************************************************************/
+
+static int
+teljjy_getDelay ( struct peer *peer, struct jjyunit *up )
+{
+
+	struct	timeval maxTime, minTime, averTime ;
+	int	i ;
+	int	minIndex = 0, maxIndex = 0, iAverCount = 0 ;
+	int	iThresholdSecond, iThresholdMicroSecond ;
+	int	iPercent ;
+
+	minTime.tv_sec = minTime.tv_usec = 0 ;
+	maxTime.tv_sec = maxTime.tv_usec = 0 ;
+
+	iThresholdSecond = TELJJY_LOOPBACK_DELAY_THRESHOLD / 1000 ;
+	iThresholdMicroSecond = ( TELJJY_LOOPBACK_DELAY_THRESHOLD - ( TELJJY_LOOPBACK_DELAY_THRESHOLD / 1000 ) * 1000 ) * 1000 ;
+
+	up->iLoopbackValidCount = 0 ;
+
+	for ( i = 0 ; i < MAX_LOOPBACK && i < up->iLoopbackCount ; i ++ ) {
+		if ( up->bLoopbackTimeout[i]
+		  || up->delayTime[i].tv_sec  > iThresholdSecond
+		|| ( up->delayTime[i].tv_sec == iThresholdSecond
+		  && up->delayTime[i].tv_usec > iThresholdMicroSecond ) ) {
+			continue ;
+		}
+		if ( up->iLoopbackValidCount == 0 ) {
+			minTime.tv_sec  = up->delayTime[i].tv_sec  ;
+			minTime.tv_usec = up->delayTime[i].tv_usec ;
+			maxTime.tv_sec  = up->delayTime[i].tv_sec  ;
+			maxTime.tv_usec = up->delayTime[i].tv_usec ;
+			minIndex = maxIndex = i ;
+		} else if ( minTime.tv_sec  > up->delayTime[i].tv_sec
+		       || ( minTime.tv_sec == up->delayTime[i].tv_sec
+		         && minTime.tv_usec > up->delayTime[i].tv_usec ) ) {
+			minTime.tv_sec  = up->delayTime[i].tv_sec  ;
+			minTime.tv_usec = up->delayTime[i].tv_usec ;
+			minIndex = i ;
+		} else if ( maxTime.tv_sec  < up->delayTime[i].tv_sec
+		       || ( maxTime.tv_sec == up->delayTime[i].tv_sec
+		         && maxTime.tv_usec < up->delayTime[i].tv_usec ) ) {
+			maxTime.tv_sec  = up->delayTime[i].tv_sec  ;
+			maxTime.tv_usec = up->delayTime[i].tv_usec ;
+			maxIndex = i ;
+		}
+		up->iLoopbackValidCount ++ ;
+	}
+
+	if ( up->iLoopbackValidCount < 2 ) {
+		return -1 ;
+	}
+
+	averTime.tv_usec = 0;
+
+	for ( i = 0 ; i < MAX_LOOPBACK && i < up->iLoopbackCount ; i ++ ) {
+		if ( up->bLoopbackTimeout[i]
+		  || up->delayTime[i].tv_sec  > iThresholdSecond
+		|| ( up->delayTime[i].tv_sec == iThresholdSecond
+		  && up->delayTime[i].tv_usec > iThresholdMicroSecond ) ) {
+			continue ;
+		}
+		if ( up->iLoopbackValidCount >= 3 && i == maxIndex ) {
+			continue ;
+		}
+		if ( up->iLoopbackValidCount >= 4 && i == minIndex ) {
+			continue ;
+		}
+		averTime.tv_usec += up->delayTime[i].tv_usec ;
+		iAverCount ++ ;
+	}
+
+	if ( iAverCount == 0 ) {
+		/* This is never happened. */
+		/* Previous for-if-for blocks assure iAverCount > 0. */
+		/* This code avoids a claim by the coverity scan tool. */
+		return -1 ;
+	}
+
+	/* mode 101 = 1%, mode 150 = 50%, mode 180 = 80% */
+
+	iPercent = ( peer->ttl - 100 ) ;
+
+	/* Average delay time in milli second */
+
+	return ( ( averTime.tv_usec / iAverCount ) * iPercent ) / 100000 ;
+
+}
+
+/******************************/
+static int
+teljjy_idle_ignore ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_idle_ignore" ) ;
+
+	return TELJJY_STAY_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_idle_dialout ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_idle_dialout" ) ;
+
+	modem_connect ( peer->refclkunit, peer ) ;
+
+	return TELJJY_CHANGE_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_dial_ignore ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_dial_ignore" ) ;
+
+	return TELJJY_STAY_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_dial_login ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_dial_login" ) ;
+
+	return TELJJY_CHANGE_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_dial_disc ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_dial_disc" ) ;
+
+	return TELJJY_CHANGE_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_login_ignore ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_login_ignore" ) ;
+
+	return TELJJY_STAY_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_login_disc ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_login_disc" ) ;
+
+	return TELJJY_CHANGE_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_login_conn ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	int	i ;
+
+	DEBUG_TELJJY_PRINTF( "teljjy_login_conn" ) ;
+
+	up->bLineError = FALSE ;
+	up->iClockCommandSeq = 0 ;
+	up->iTimestampCount = 0 ;
+	up->iLoopbackCount = 0 ;
+	for ( i = 0 ; i < MAX_LOOPBACK ; i ++ ) {
+		up->bLoopbackTimeout[i] = FALSE ;
+	}
+
+	return TELJJY_CHANGE_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_login_login ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	char	*pCmd ;
+	int	iCmdLen ;
+
+	DEBUG_TELJJY_PRINTF( "teljjy_login_login" ) ;
+
+	/* Send a guest user ID */
+	pCmd = "TJJY\r" ;
+
+	/* Send login ID */
+	iCmdLen = strlen( pCmd ) ;
+	if ( write( pp->io.fd, pCmd, iCmdLen ) != iCmdLen ) {
+		refclock_report( peer, CEVNT_FAULT ) ;
+	}
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, pCmd ) ;
+
+	return TELJJY_STAY_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_login_silent ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_login_silent" ) ;
+
+	if ( write( pp->io.fd, "\r", 1 ) != 1 ) {
+		refclock_report( peer, CEVNT_FAULT ) ;
+	}
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, "\r" ) ;
+
+	up->iTeljjySilentTimer = 0 ;
+
+	return TELJJY_CHANGE_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_login_error ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_login_error" ) ;
+
+	return TELJJY_CHANGE_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_conn_ignore ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_conn_ignore" ) ;
+
+	return TELJJY_STAY_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_conn_disc ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_conn_disc" ) ;
+
+	return TELJJY_CHANGE_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_conn_send ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	const char	*pCmd ;
+	int	i, iLen, iNextClockState ;
+
+	DEBUG_TELJJY_PRINTF( "teljjy_conn_send" ) ;
+
+	if ( up->iClockCommandSeq > 0
+	  && teljjy_command_sequence[up->iClockCommandSeq].command == NULL ) {
+		/* Command sequence has been completed */
+	  	return TELJJY_CHANGE_CLOCK_STATE ;
+	}
+
+	if ( up->iClockCommandSeq == 0 && peer->ttl == 100 ) {
+		/* Skip loopback */
+
+		up->iClockCommandSeq = TELJJY_COMMAND_START_SKIP_LOOPBACK ;
+
+	} else if ( up->iClockCommandSeq == 0 && peer->ttl != 100 ) {
+		/* Loopback start */
+
+		up->iLoopbackCount = 0 ;
+		for ( i = 0 ; i < MAX_LOOPBACK ; i ++ ) {
+			up->bLoopbackTimeout[i] = FALSE ;
+		}
+
+	} else if ( up->iClockCommandSeq > 0 && peer->ttl != 100
+		 && teljjy_command_sequence[up->iClockCommandSeq].iExpectedReplyType == TELJJY_REPLY_LOOPBACK
+		 && up->iLoopbackCount < MAX_LOOPBACK ) {
+		/* Loopback character comes */
+#ifdef DEBUG
+		if ( debug ) {
+			printf( "refclock_jjy.c : teljjy_conn_send : iLoopbackCount=%d\n",
+				 up->iLoopbackCount ) ;
+		}
+#endif
+
+		teljjy_setDelay( peer, up ) ;
+
+		up->iLoopbackCount ++ ;
+
+	}
+
+	up->iClockCommandSeq++ ;
+
+	pCmd = teljjy_command_sequence[up->iClockCommandSeq].command ;
+	iLen = teljjy_command_sequence[up->iClockCommandSeq].commandLength ;
+	
+	if ( pCmd != NULL ) {
+
+		if ( write( pp->io.fd, pCmd, iLen ) != iLen ) {
+			refclock_report( peer, CEVNT_FAULT ) ;
+		}
+
+		if ( teljjy_command_sequence[up->iClockCommandSeq].iExpectedReplyType == TELJJY_REPLY_LOOPBACK ) {
+			/* Loopback character and timestamp */
+			gettimeofday( &(up->sendTime[up->iLoopbackCount]), NULL ) ;
+			up->bLoopbackMode = TRUE ;
+		} else {
+			/* Regular command */
+			up->bLoopbackMode = FALSE ;
+		}
+
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, pCmd ) ;
+
+		if ( teljjy_command_sequence[up->iClockCommandSeq+1].command == NULL ) {
+			/* Last command of the command sequence */
+			iNextClockState = TELJJY_CHANGE_CLOCK_STATE ;
+		} else {
+			/* More commands to be issued */
+			iNextClockState = TELJJY_STAY_CLOCK_STATE ;
+		}
+
+	} else {
+
+		iNextClockState = TELJJY_CHANGE_CLOCK_STATE ;
+
+	}
+
+	return iNextClockState ;
+
+}
+
+/******************************/
+static int
+teljjy_conn_data ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	char	*pBuf ;
+	int	iLen, rc ;
+	char	sLog [ 80 ] ;
+	char	bAdjustment ;
+
+
+	DEBUG_TELJJY_PRINTF( "teljjy_conn_data" ) ;
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		pBuf = up->sTextBuf ;
+		iLen = up->iTextBufLen ;
+	} else {
+		pBuf = pp->a_lastcode ;
+		iLen = pp->lencode ;
+	}
+
+	if ( teljjy_command_sequence[up->iClockCommandSeq].iEchobackReplyLength == iLen
+	  && teljjy_command_sequence[up->iClockCommandSeq].iExpectedReplyType == TELJJY_REPLY_LOOPBACK
+	  && up->sTextBuf[0] == *(teljjy_command_sequence[up->iClockCommandSeq].command)
+	  && up->iLoopbackCount < MAX_LOOPBACK ) {
+		/* Loopback */
+
+		teljjy_setDelay( peer, up ) ;
+
+		up->iLoopbackCount ++ ;
+
+	} else if ( teljjy_command_sequence[up->iClockCommandSeq].iEchobackReplyLength == iLen
+	    && strncmp( pBuf, teljjy_command_sequence[up->iClockCommandSeq].command, iLen ) == 0 ) {
+		/* Maybe echoback */
+
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_INFORMATION, JJY_CLOCKSTATS_MESSAGE_ECHOBACK ) ;
+
+	} else if ( teljjy_command_sequence[up->iClockCommandSeq].iExpectedReplyLength == iLen
+		 && teljjy_command_sequence[up->iClockCommandSeq].iExpectedReplyType == TELJJY_REPLY_4DATE ) {
+		/* 4DATE -> YYYYMMDD */
+
+		rc = sscanf ( pBuf, "%4d%2d%2d", &up->year, &up->month, &up->day ) ;
+
+		if ( rc != 3 || up->year < 2000 || 2099 <= up->year
+		  || up->month < 1 || 12 < up->month || up->day < 1 || 31 < up->day ) {
+			/* Invalid date */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_DATE,
+				  rc, up->year, up->month, up->day ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+		}
+
+	} else if ( teljjy_command_sequence[up->iClockCommandSeq].iExpectedReplyLength == iLen
+		 && teljjy_command_sequence[up->iClockCommandSeq].iExpectedReplyType == TELJJY_REPLY_LEAPSEC
+	         && ( strncmp( pBuf, " 0", 2 ) == 0 || strncmp( pBuf, "+1", 2 ) == 0 || strncmp( pBuf, "-1", 2 ) == 0 ) ) {
+		/* LEAPSEC -> XX ( One of 0, +1, -1 ) */
+
+		rc = sscanf ( pBuf, "%2d", &up->leapsecond ) ;
+
+		if ( rc != 1 || up->leapsecond < -1 || 1 < up->leapsecond ) {
+			/* Invalid leap second */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_LEAP,
+				  pBuf ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+		}
+
+	} else if ( teljjy_command_sequence[up->iClockCommandSeq].iExpectedReplyLength == iLen
+		 && teljjy_command_sequence[up->iClockCommandSeq].iExpectedReplyType == TELJJY_REPLY_TIME ) {
+		/* TIME -> HHMMSS ( 3 times on second ) */
+
+		rc = sscanf ( pBuf, "%2d%2d%2d", &up->hour, &up->minute, &up->second ) ;
+
+		if ( rc != 3 || up->hour > 23 || up->minute > 59 || up->second > 60 ) {
+			/* Invalid time */
+			snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_SSCANF_INVALID_TIME,
+				  rc, up->hour, up->minute, up->second ) ;
+			jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+			up->bLineError = TRUE ;
+		}
+		up->iTimestamp[up->iTimestampCount] = ( up->hour * 60 + up->minute ) * 60 + up->second ;
+
+		up->iTimestampCount++ ;
+
+		if ( up->iTimestampCount == 6 && ! up->bLineError ) {
+#if DEBUG
+			printf( "refclock_jjy.c : teljjy_conn_data : bLineError=%d iTimestamp=%d, %d, %d\n",
+				up->bLineError,
+				up->iTimestamp[3], up->iTimestamp[4], up->iTimestamp[5] ) ;
+#endif
+			bAdjustment = TRUE ;
+
+			if ( peer->ttl == 100 ) {
+				/* mode=100 */
+				up->msecond = 0 ;
+			} else {
+				/* mode=101 to 110 */
+				up->msecond = teljjy_getDelay( peer, up ) ;
+				if (up->msecond < 0 ) {
+					up->msecond = 0 ;
+					bAdjustment = FALSE ;
+				}
+			}
+
+			if ( ( up->iTimestamp[3] - 15 ) <= up->iTimestamp[2]
+			  &&   up->iTimestamp[2]        <= up->iTimestamp[3]
+			  && ( up->iTimestamp[3] +  1 ) == up->iTimestamp[4]
+			  && ( up->iTimestamp[4] +  1 ) == up->iTimestamp[5] ) {
+				/* Non over midnight */
+
+				jjy_synctime( peer, pp, up ) ;
+
+				if ( peer->ttl != 100 ) {
+					if ( bAdjustment ) {
+						snprintf( sLog, sizeof(sLog),
+							  JJY_CLOCKSTATS_MESSAGE_DELAY_ADJUST,
+							  up->msecond, up->iLoopbackValidCount, MAX_LOOPBACK ) ;
+						jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_INFORMATION, sLog ) ;
+					} else {
+						snprintf( sLog, sizeof(sLog),
+							  JJY_CLOCKSTATS_MESSAGE_DELAY_UNADJUST,
+							   up->iLoopbackValidCount, MAX_LOOPBACK ) ;
+						jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+					}
+				}
+
+			}
+		}
+
+	} else if ( teljjy_command_sequence[up->iClockCommandSeq].iEchobackReplyLength != iLen
+		 && teljjy_command_sequence[up->iClockCommandSeq].iExpectedReplyType == TELJJY_REPLY_LOOPBACK ) {
+		/* Loopback noise ( Unexpected replay ) */
+
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_IGNORE_REPLY,
+			  pBuf ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_WARNING, sLog ) ;
+
+	} else {
+
+		up->bLineError = TRUE ;
+
+		snprintf( sLog, sizeof(sLog)-1, JJY_CLOCKSTATS_MESSAGE_UNEXPECTED_REPLY,
+			  pBuf ) ;
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_ERROR, sLog ) ;
+
+	}
+
+	return TELJJY_STAY_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_conn_silent ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	const char	*pCmd ;
+
+	DEBUG_TELJJY_PRINTF( "teljjy_conn_silent" ) ;
+
+	if ( up->iClockCommandSeq >= 1
+	  && up->iClockCommandSeq < TELJJY_COMMAND_START_SKIP_LOOPBACK ) {
+		/* Loopback */
+#ifdef DEBUG
+		if ( debug ) {
+			printf( "refclock_jjy.c : teljjy_conn_silent : call teljjy_conn_send\n" ) ;
+		}
+#endif
+		if ( teljjy_command_sequence[up->iClockCommandSeq].iExpectedReplyType == TELJJY_REPLY_LOOPBACK ) {
+			up->bLoopbackTimeout[up->iLoopbackCount] = TRUE ;
+		}
+		up->iTeljjySilentTimer = 0 ;
+		return teljjy_conn_send( peer, pp, up ) ;
+	} else {
+		pCmd = "\r" ;
+	}
+
+	if ( write( pp->io.fd, pCmd, 1 ) != 1 ) {
+		refclock_report( peer, CEVNT_FAULT ) ;
+	}
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, pCmd ) ;
+
+	up->iTeljjySilentTimer = 0 ;
+
+	return TELJJY_STAY_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_conn_error ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_conn_error" ) ;
+
+	return TELJJY_CHANGE_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_bye_ignore ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_bye_ignore" ) ;
+
+	return TELJJY_STAY_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_bye_disc ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_bye_disc" ) ;
+
+	return TELJJY_CHANGE_CLOCK_STATE ;
+
+}
+
+/******************************/
+static int
+teljjy_bye_modem ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_TELJJY_PRINTF( "teljjy_bye_modem" ) ;
+
+	modem_disconnect ( peer->refclkunit, peer ) ;
+
+	return TELJJY_STAY_CLOCK_STATE ;
+
+}
+
+/*################################################################################################*/
+/*################################################################################################*/
+/*##												##*/
+/*##    Modem control finite state machine							##*/
+/*##												##*/
+/*################################################################################################*/
+/*################################################################################################*/
+
+/* struct jjyunit.iModemState */
+
+#define	MODEM_STATE_DISCONNECT		0
+#define	MODEM_STATE_INITIALIZE		1
+#define	MODEM_STATE_DAILING		2
+#define	MODEM_STATE_CONNECT		3
+#define	MODEM_STATE_ESCAPE		4
+
+/* struct jjyunit.iModemEvent */
+
+#define MODEM_EVENT_NULL		0
+#define	MODEM_EVENT_INITIALIZE		1
+#define	MODEM_EVENT_DIALOUT		2
+#define	MODEM_EVENT_DISCONNECT		3
+#define	MODEM_EVENT_RESP_OK		4
+#define	MODEM_EVENT_RESP_CONNECT	5
+#define	MODEM_EVENT_RESP_RING		6
+#define	MODEM_EVENT_RESP_NO_CARRIER	7
+#define	MODEM_EVENT_RESP_ERROR		8
+#define	MODEM_EVENT_RESP_CONNECT_X	9
+#define	MODEM_EVENT_RESP_NO_DAILTONE	10
+#define	MODEM_EVENT_RESP_BUSY		11
+#define	MODEM_EVENT_RESP_NO_ANSWER	12
+#define	MODEM_EVENT_RESP_UNKNOWN	13
+#define	MODEM_EVENT_SILENT		14
+#define	MODEM_EVENT_TIMEOUT		15
+
+/* Function prototypes */
+
+static	void	modem_control		( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+
+static	int 	modem_disc_ignore	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_disc_init  	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_init_ignore	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_init_start 	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_init_disc  	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_init_resp00	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_init_resp04	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_dial_ignore	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_dial_dialout	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_dial_escape	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_dial_connect	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_dial_disc  	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_conn_ignore	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_conn_escape	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_esc_ignore	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_esc_escape	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_esc_data  	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_esc_silent	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+static	int 	modem_esc_disc  	( struct peer *, struct refclockproc *, struct jjyunit * ) ;
+
+static int ( *pModemHandler [ ] [ 5 ] ) ( ) =
+{                         	/*STATE_DISCONNECT   STATE_INITIALIZE   STATE_DAILING       STATE_CONNECT      STATE_ESCAPE     */
+/* NULL                 */	{ modem_disc_ignore, modem_init_ignore, modem_dial_ignore , modem_conn_ignore, modem_esc_ignore },
+/* INITIALIZE           */	{ modem_disc_init  , modem_init_start , modem_dial_ignore , modem_conn_ignore, modem_esc_ignore },
+/* DIALOUT              */	{ modem_disc_ignore, modem_init_ignore, modem_dial_dialout, modem_conn_ignore, modem_esc_ignore },
+/* DISCONNECT           */	{ modem_disc_ignore, modem_init_disc  , modem_dial_escape , modem_conn_escape, modem_esc_escape },
+/* RESP: 0: OK          */	{ modem_disc_ignore, modem_init_resp00, modem_dial_ignore , modem_conn_ignore, modem_esc_data   },
+/* RESP: 1: CONNECT     */	{ modem_disc_ignore, modem_init_ignore, modem_dial_connect, modem_conn_ignore, modem_esc_data   },
+/* RESP: 2: RING        */	{ modem_disc_ignore, modem_init_ignore, modem_dial_ignore , modem_conn_ignore, modem_esc_data   },
+/* RESP: 3: NO CARRIER  */	{ modem_disc_ignore, modem_init_ignore, modem_dial_disc   , modem_conn_ignore, modem_esc_data   },
+/* RESP: 4: ERROR       */	{ modem_disc_ignore, modem_init_resp04, modem_dial_disc   , modem_conn_ignore, modem_esc_data   },
+/* RESP: 5: CONNECT     */	{ modem_disc_ignore, modem_init_ignore, modem_dial_connect, modem_conn_ignore, modem_esc_data   },
+/* RESP: 6: NO DAILTONE */	{ modem_disc_ignore, modem_init_ignore, modem_dial_disc   , modem_conn_ignore, modem_esc_data   },
+/* RESP: 7: BUSY        */	{ modem_disc_ignore, modem_init_ignore, modem_dial_disc   , modem_conn_ignore, modem_esc_data   },
+/* RESP: 8: NO ANSWER   */	{ modem_disc_ignore, modem_init_ignore, modem_dial_disc   , modem_conn_ignore, modem_esc_data   },
+/* RESP: 9: UNKNOWN     */	{ modem_disc_ignore, modem_init_ignore, modem_dial_ignore , modem_conn_ignore, modem_esc_data   },
+/* SILENT               */	{ modem_disc_ignore, modem_init_ignore, modem_dial_ignore , modem_conn_ignore, modem_esc_silent },
+/* TIMEOUT              */	{ modem_disc_ignore, modem_init_disc  , modem_dial_escape , modem_conn_escape, modem_esc_disc   }
+} ;
+
+static short iModemNextState [ ] [ 5 ] =
+{                         	/*STATE_DISCONNECT        STATE_INITIALIZE        STATE_DAILING        STATE_CONNECT        STATE_ESCAPE           */
+/* NULL                 */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_INITIALIZE, MODEM_STATE_DAILING   , MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* INITIALIZE           */	{ MODEM_STATE_INITIALIZE, MODEM_STATE_INITIALIZE, MODEM_STATE_DAILING   , MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* DIALOUT              */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_INITIALIZE, MODEM_STATE_DAILING   , MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* DISCONNECT           */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_DISCONNECT, MODEM_STATE_ESCAPE    , MODEM_STATE_ESCAPE , MODEM_STATE_ESCAPE     },
+/* RESP: 0: OK          */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_DAILING   , MODEM_STATE_DAILING   , MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* RESP: 1: CONNECT     */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_INITIALIZE, MODEM_STATE_CONNECT   , MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* RESP: 2: RING        */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_INITIALIZE, MODEM_STATE_DAILING   , MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* RESP: 3: NO CARRIER  */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_INITIALIZE, MODEM_STATE_DISCONNECT, MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* RESP: 4: ERROR       */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_DAILING   , MODEM_STATE_DISCONNECT, MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* RESP: 5: CONNECT X   */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_INITIALIZE, MODEM_STATE_CONNECT   , MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* RESP: 6: NO DAILTONE */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_INITIALIZE, MODEM_STATE_DISCONNECT, MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* RESP: 7: BUSY        */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_INITIALIZE, MODEM_STATE_DISCONNECT, MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* RESP: 8: NO ANSWER   */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_INITIALIZE, MODEM_STATE_DISCONNECT, MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* RESP: 9: UNKNOWN     */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_INITIALIZE, MODEM_STATE_DAILING   , MODEM_STATE_CONNECT, MODEM_STATE_ESCAPE     },
+/* SILENT               */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_INITIALIZE, MODEM_STATE_DAILING   , MODEM_STATE_CONNECT, MODEM_STATE_DISCONNECT },
+/* TIMEOUT              */	{ MODEM_STATE_DISCONNECT, MODEM_STATE_DISCONNECT, MODEM_STATE_ESCAPE    , MODEM_STATE_ESCAPE , MODEM_STATE_DISCONNECT }
+} ;
+
+static short iModemPostEvent [ ] [ 5 ] =
+{                         	/*STATE_DISCONNECT        STATE_INITIALIZE     STATE_DAILING           STATE_CONNECT           STATE_ESCAPE     */
+/* NULL                 */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* INITIALIZE           */	{ MODEM_EVENT_INITIALIZE, MODEM_EVENT_NULL   , MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* DIALOUT              */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* DISCONNECT           */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_DISCONNECT, MODEM_EVENT_DISCONNECT, MODEM_EVENT_NULL },
+/* RESP: 0: OK          */	{ MODEM_EVENT_NULL      , MODEM_EVENT_DIALOUT, MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* RESP: 1: CONNECT     */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* RESP: 2: RING        */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* RESP: 3: NO CARRIER  */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* RESP: 4: ERROR       */	{ MODEM_EVENT_NULL      , MODEM_EVENT_DIALOUT, MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* RESP: 5: CONNECT X   */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* RESP: 6: NO DAILTONE */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* RESP: 7: BUSY        */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* RESP: 8: NO ANSWER   */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* RESP: 9: UNKNOWN     */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* SILENT               */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_NULL      , MODEM_EVENT_NULL      , MODEM_EVENT_NULL },
+/* TIMEOUT              */	{ MODEM_EVENT_NULL      , MODEM_EVENT_NULL   , MODEM_EVENT_DISCONNECT, MODEM_EVENT_DISCONNECT, MODEM_EVENT_NULL }
+} ;
+
+static short iModemSilentTimeout [ 5 ] = { 0,  0,  0, 0,  5 } ;
+static short iModemStateTimeout  [ 5 ] = { 0, 20, 90, 0, 20 } ;
+
+#define	STAY_MODEM_STATE	0
+#define	CHANGE_MODEM_STATE	1
+
+#ifdef	DEBUG
+#define	DEBUG_MODEM_PRINTF(sFunc)	{ if ( debug ) { printf ( "refclock_jjy.c : %s : iModemState=%d iModemEvent=%d iModemSilentTimer=%d iModemStateTimer=%d\n", sFunc, up->iModemState, up->iModemEvent, up->iModemSilentTimer, up->iModemStateTimer ) ; } }
+#else
+#define	DEBUG_MODEM_PRINTF(sFunc)
+#endif
+
+/**************************************************************************************************/
+
+static short
+getModemState ( struct jjyunit *up )
+{
+	return up->iModemState ;
+}
+
+/**************************************************************************************************/
+
+static int
+isModemStateConnect ( short iCheckState )
+{
+	return ( iCheckState == MODEM_STATE_CONNECT ) ;
+}
+
+/**************************************************************************************************/
+
+static int
+isModemStateDisconnect ( short iCheckState )
+{
+	return ( iCheckState == MODEM_STATE_DISCONNECT ) ;
+}
+
+/**************************************************************************************************/
+
+static int
+isModemStateTimerOn ( struct jjyunit *up )
+{
+	return ( iModemSilentTimeout[up->iModemState] != 0 || iModemStateTimeout[up->iModemState] != 0 ) ;
+}
+
+/**************************************************************************************************/
+
+static void
+modem_connect ( int unit, struct peer *peer )
+{
+	struct	refclockproc	*pp;
+	struct	jjyunit 	*up;
+
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	DEBUG_MODEM_PRINTF( "modem_connect" ) ;
+
+	up->iModemEvent = MODEM_EVENT_INITIALIZE ;
+
+	modem_control ( peer, pp, up ) ;
+
+}
+
+/**************************************************************************************************/
+
+static void
+modem_disconnect ( int unit, struct peer *peer )
+{
+	struct	refclockproc	*pp;
+	struct	jjyunit 	*up;
+
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	DEBUG_MODEM_PRINTF( "modem_disconnect" ) ;
+
+	up->iModemEvent = MODEM_EVENT_DISCONNECT ;
+
+	modem_control ( peer, pp, up ) ;
+
+}
+
+/**************************************************************************************************/
+
+static int
+modem_receive ( struct recvbuf *rbufp )
+{
+
+	struct	peer		*peer;
+	struct	jjyunit		*up;
+	struct	refclockproc	*pp;
+	char	*pBuf ;
+	int	iLen ;
+
+#ifdef DEBUG
+	static const char *sFunctionName = "modem_receive" ;
+#endif
+
+	peer = rbufp->recv_peer ;
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	DEBUG_MODEM_PRINTF( sFunctionName ) ;
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		pBuf = up->sTextBuf ;
+		iLen = up->iTextBufLen ;
+	} else {
+		pBuf = pp->a_lastcode ;
+		iLen = pp->lencode ;
+	}
+
+	if      ( iLen ==  2 && strncmp( pBuf, "OK"         ,  2 ) == 0 ) { up->iModemEvent = MODEM_EVENT_RESP_OK          ; }
+	else if ( iLen ==  7 && strncmp( pBuf, "CONNECT"    ,  7 ) == 0 ) { up->iModemEvent = MODEM_EVENT_RESP_CONNECT     ; }
+	else if ( iLen ==  4 && strncmp( pBuf, "RING"       ,  4 ) == 0 ) { up->iModemEvent = MODEM_EVENT_RESP_RING        ; }
+	else if ( iLen == 10 && strncmp( pBuf, "NO CARRIER" , 10 ) == 0 ) { up->iModemEvent = MODEM_EVENT_RESP_NO_CARRIER  ; }
+	else if ( iLen ==  5 && strncmp( pBuf, "ERROR"      ,  5 ) == 0 ) { up->iModemEvent = MODEM_EVENT_RESP_ERROR       ; }
+	else if ( iLen >=  8 && strncmp( pBuf, "CONNECT "   ,  8 ) == 0 ) { up->iModemEvent = MODEM_EVENT_RESP_CONNECT_X   ; }
+	else if ( iLen == 11 && strncmp( pBuf, "NO DAILTONE", 11 ) == 0 ) { up->iModemEvent = MODEM_EVENT_RESP_NO_DAILTONE ; }
+	else if ( iLen ==  4 && strncmp( pBuf, "BUSY"       ,  4 ) == 0 ) { up->iModemEvent = MODEM_EVENT_RESP_BUSY        ; }
+	else if ( iLen ==  9 && strncmp( pBuf, "NO ANSWER"  ,  9 ) == 0 ) { up->iModemEvent = MODEM_EVENT_RESP_NO_ANSWER   ; }
+	else                                                              { up->iModemEvent = MODEM_EVENT_RESP_UNKNOWN     ; }
+
+#ifdef DEBUG
+	if ( debug ) {
+		char	sResp [ 40 ] ;
+		int	iCopyLen ;
+		iCopyLen = ( iLen <= sizeof(sResp)-1 ? iLen : sizeof(sResp)-1 ) ;
+		strncpy( sResp, pBuf, iLen <= sizeof(sResp)-1 ? iLen : sizeof(sResp)-1 ) ;
+		sResp[iCopyLen] = 0 ;
+		printf ( "refclock_jjy.c : modem_receive : iLen=%d pBuf=[%s] iModemEvent=%d\n", iCopyLen, sResp, up->iModemEvent ) ;
+	}
+#endif
+	modem_control ( peer, pp, up ) ;
+
+	return 0 ;
+
+}
+
+/**************************************************************************************************/
+
+static void
+modem_timer ( int unit, struct peer *peer )
+{
+
+	struct	refclockproc *pp ;
+	struct	jjyunit      *up ;
+
+	pp = peer->procptr ;
+	up = pp->unitptr ;
+
+	DEBUG_MODEM_PRINTF( "modem_timer" ) ;
+
+	if ( iModemSilentTimeout[up->iModemState] != 0 ) {
+		up->iModemSilentTimer++ ;
+		if ( iModemSilentTimeout[up->iModemState] <= up->iModemSilentTimer ) {
+			up->iModemEvent = MODEM_EVENT_SILENT ;
+			modem_control ( peer, pp, up ) ;
+		}
+	}
+
+	if ( iModemStateTimeout[up->iModemState] != 0 ) {
+		up->iModemStateTimer++ ;
+		if ( iModemStateTimeout[up->iModemState] <= up->iModemStateTimer ) {
+			up->iModemEvent = MODEM_EVENT_TIMEOUT ;
+			modem_control ( peer, pp, up ) ;
+		}
+	}
+
+}
+
+/**************************************************************************************************/
+
+static void
+modem_control ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	int	rc ;
+	short	iPostEvent = MODEM_EVENT_NULL ;
+
+	DEBUG_MODEM_PRINTF( "modem_control" ) ;
+
+	rc = (*pModemHandler[up->iModemEvent][up->iModemState])( peer, pp, up ) ;
+
+	if ( rc == CHANGE_MODEM_STATE ) {
+		iPostEvent = iModemPostEvent[up->iModemEvent][up->iModemState] ;
+#ifdef DEBUG
+		if ( debug ) {
+			printf( "refclock_jjy.c : modem_control : iModemState=%d -> %d  iPostEvent=%d\n",
+				 up->iModemState, iModemNextState[up->iModemEvent][up->iModemState], iPostEvent ) ;
+		}
+#endif
+
+		if ( up->iModemState != iModemNextState[up->iModemEvent][up->iModemState] ) {
+			up->iModemSilentCount = 0 ;
+			up->iModemStateTimer = 0 ;
+			up->iModemCommandSeq = 0 ;
+		}
+
+		up->iModemState = iModemNextState[up->iModemEvent][up->iModemState] ;
+	}
+
+	if ( iPostEvent != MODEM_EVENT_NULL ) {
+		up->iModemEvent = iPostEvent ;
+		modem_control ( peer, pp, up ) ;
+	}
+
+	up->iModemEvent = MODEM_EVENT_NULL ;
+
+}
+
+/******************************/
+static int
+modem_disc_ignore ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_disc_ignore" ) ;
+
+	return STAY_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_disc_init ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_disc_init" ) ;
+
+	return CHANGE_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_init_ignore ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_init_ignore" ) ;
+
+	return STAY_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_init_start ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_init_start" ) ;
+
+	up->iModemCommandSeq = 0 ;
+
+#ifdef DEBUG
+	if ( debug ) {
+		printf( "refclock_jjy.c : modem_init_start : call modem_init_resp00\n" ) ;
+	}
+#endif
+
+	return modem_init_resp00( peer, pp, up ) ;
+
+}
+
+/******************************/
+static int
+modem_init_resp00 ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	char	*pCmd, cBuf [ 46 ] ;
+	int	iCmdLen ;
+	int	iErrorCorrection, iSpeakerSwitch, iSpeakerVolume ;
+	int	iNextModemState = STAY_MODEM_STATE ;
+
+	DEBUG_MODEM_PRINTF( "modem_init_resp00" ) ;
+
+	up->iModemCommandSeq++ ;
+
+	switch ( up->iModemCommandSeq ) {
+
+	case 1 :
+		/* En = Echoback      0:Off      1:On   */
+		/* Qn = Result codes  0:On       1:Off  */
+		/* Vn = Result codes  0:Numeric  1:Text */
+		pCmd = "ATE0Q0V1\r\n" ;
+		break ;
+
+	case 2 :
+		/* Mn = Speaker switch  0:Off  1:On until remote carrier detected  2:On */
+		if ( ( pp->sloppyclockflag & CLK_FLAG3 ) == 0 ) {
+			/* fudge 127.127.40.n flag3 0 */
+			iSpeakerSwitch = 0 ;
+		} else {
+			/* fudge 127.127.40.n flag3 1 */
+			iSpeakerSwitch = 2 ;
+		}
+
+		/* Ln = Speaker volume  0:Very low  1:Low  2:Middle  3:High */
+		if ( ( pp->sloppyclockflag & CLK_FLAG4 ) == 0 ) {
+			/* fudge 127.127.40.n flag4 0 */
+			iSpeakerVolume = 1 ;
+		} else {
+			/* fudge 127.127.40.n flag4 1 */
+			iSpeakerVolume = 2 ;
+		}
+
+		pCmd = cBuf ;
+		snprintf( pCmd, sizeof(cBuf), "ATM%dL%d\r\n", iSpeakerSwitch, iSpeakerVolume ) ;
+		break ;
+
+	case 3 :
+		/* &Kn = Flow control  4:XON/XOFF */
+		pCmd = "AT&K4\r\n" ;
+		break ;
+
+	case 4 :
+		/* +MS = Protocol  V22B:1200,2400bpsiV.22bis) */
+		pCmd = "AT+MS=V22B\r\n" ;
+		break ;
+
+	case 5 :
+		/* %Cn = Data compression  0:No data compression */
+		pCmd = "AT%C0\r\n" ;
+		break ;
+
+	case 6 :
+		/* \Nn = Error correction  0:Normal mode  1:Direct mode  2:V42,MNP  3:V42,MNP,Normal */
+		if ( ( pp->sloppyclockflag & CLK_FLAG2 ) == 0 ) {
+			/* fudge 127.127.40.n flag2 0 */
+			iErrorCorrection = 0 ;
+		} else {
+			/* fudge 127.127.40.n flag2 1 */
+			iErrorCorrection = 3 ;
+		}
+
+		pCmd = cBuf ;
+		snprintf( pCmd, sizeof(cBuf), "AT\\N%d\r\n", iErrorCorrection ) ;
+		break ;
+
+	case 7 :
+		/* Hn = Hook  0:Hook-On ( Disconnect )  1:Hook-Off ( Connect ) */
+		pCmd = "ATH1\r\n" ;
+		break ;
+
+	case 8 :
+		/* Initialize completion */
+		pCmd = NULL ;
+		iNextModemState = CHANGE_MODEM_STATE ;
+		break ;
+
+	default :
+		pCmd = NULL ;
+		break ;
+
+	}
+
+	if ( pCmd != NULL ) {
+
+		iCmdLen = strlen( pCmd ) ;
+		if ( write( pp->io.fd, pCmd, iCmdLen ) != iCmdLen ) {
+			refclock_report( peer, CEVNT_FAULT ) ;
+		}
+
+		jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, pCmd ) ;
+
+	}
+
+	return iNextModemState ;
+
+}
+
+/******************************/
+static int
+modem_init_resp04 ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_init_resp04" ) ;
+
+	return modem_init_resp00( peer, pp, up ) ;
+
+}
+
+/******************************/
+static int
+modem_init_disc ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_init_disc" ) ;
+#ifdef DEBUG
+	if ( debug ) {
+		printf( "refclock_jjy.c : modem_init_disc : call modem_esc_disc\n" ) ;
+	}
+#endif
+
+	return CHANGE_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_dial_ignore ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_dial_ignore" ) ;
+
+	return STAY_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_dial_dialout ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	char	sCmd [ 46 ] ;
+	int	iCmdLen ;
+	char	cToneOrPulse ;
+
+	DEBUG_MODEM_PRINTF( "modem_dial_dialout" ) ;
+
+	/* Tone or Pulse */
+	if ( ( pp->sloppyclockflag & CLK_FLAG1 ) == 0 ) {
+		/* fudge 127.127.40.n flag1 0 */
+		cToneOrPulse = 'T' ;
+	} else {
+		/* fudge 127.127.40.n flag1 1 */
+		cToneOrPulse = 'P' ;
+	}
+
+	/* Connect ( Dial number ) */
+	snprintf( sCmd, sizeof(sCmd), "ATDW%c%s\r\n", cToneOrPulse, *sys_phone ) ;
+
+	/* Send command */
+	iCmdLen = strlen( sCmd ) ;
+	if ( write( pp->io.fd, sCmd, iCmdLen ) != iCmdLen ) {
+		refclock_report( peer, CEVNT_FAULT ) ;
+	}
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, sCmd ) ;
+
+	return STAY_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_dial_escape ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_dial_escape" ) ;
+#ifdef DEBUG
+	if ( debug ) {
+		printf( "refclock_jjy.c : modem_dial_escape : call modem_conn_escape\n" ) ;
+	}
+#endif
+
+	return modem_conn_escape( peer, pp, up ) ;
+
+}
+
+/******************************/
+static int
+modem_dial_connect ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_dial_connect" ) ;
+
+	return CHANGE_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_dial_disc ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_dial_disc" ) ;
+#ifdef DEBUG
+	if ( debug ) {
+		printf( "refclock_jjy.c : modem_dial_disc : call modem_esc_disc\n" ) ;
+	}
+#endif
+
+	modem_esc_disc( peer, pp, up ) ;
+
+	return CHANGE_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_conn_ignore ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_conn_ignore" ) ;
+
+	return STAY_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_conn_escape ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_conn_escape" ) ;
+
+	return CHANGE_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_esc_ignore ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_esc_ignore" ) ;
+
+	return STAY_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_esc_escape ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	char	*pCmd ;
+	int	iCmdLen ;
+
+	DEBUG_MODEM_PRINTF( "modem_esc_escape" ) ;
+
+	/* Escape command ( Go to command mode ) */
+	pCmd = "+++" ;
+
+	/* Send command */
+	iCmdLen = strlen( pCmd ) ;
+	if ( write( pp->io.fd, pCmd, iCmdLen ) != iCmdLen ) {
+		refclock_report( peer, CEVNT_FAULT ) ;
+	}
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, pCmd ) ;
+
+	return STAY_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_esc_data ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_esc_data" ) ;
+
+	up->iModemSilentTimer = 0 ;
+
+	return STAY_MODEM_STATE ;
+
+}
+
+/******************************/
+static int
+modem_esc_silent ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	DEBUG_MODEM_PRINTF( "modem_esc_silent" ) ;
+
+	up->iModemSilentCount ++ ;
+
+	if ( up->iModemSilentCount < iModemStateTimeout[up->iModemState] / iModemSilentTimeout[up->iModemState] ) {
+#ifdef DEBUG
+		if ( debug ) {
+			printf( "refclock_jjy.c : modem_esc_silent : call modem_esc_escape\n" ) ;
+		}
+#endif
+		modem_esc_escape( peer, pp, up ) ;
+		up->iModemSilentTimer = 0 ;
+		return STAY_MODEM_STATE ;
+	}
+
+#ifdef DEBUG
+	if ( debug ) {
+		printf( "refclock_jjy.c : modem_esc_silent : call modem_esc_disc\n" ) ;
+	}
+#endif
+	return modem_esc_disc( peer, pp, up ) ;
+
+}
+/******************************/
+static int
+modem_esc_disc ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
+{
+
+	char	*pCmd ;
+	int	iCmdLen ;
+
+	DEBUG_MODEM_PRINTF( "modem_esc_disc" ) ;
+
+	/* Disconnect */
+	pCmd = "ATH0\r\n" ;
+
+	/* Send command */
+	iCmdLen = strlen( pCmd ) ;
+	if ( write( pp->io.fd, pCmd, iCmdLen ) != iCmdLen ) {
+		refclock_report( peer, CEVNT_FAULT ) ;
+	}
+
+	jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_SEND, pCmd ) ;
+
+	return CHANGE_MODEM_STATE ;
+
+}
+
+/*################################################################################################*/
+/*################################################################################################*/
+/*##												##*/
+/*##    jjy_write_clockstats									##*/
+/*##												##*/
+/*################################################################################################*/
+/*################################################################################################*/
+
+static void
+jjy_write_clockstats ( struct peer *peer, int iMark, const char *pData )
+{
+
+	char	sLog [ 100 ] ;
+	char	*pMark ;
+	int 	iMarkLen, iDataLen ;
+
+	switch ( iMark ) {
+	case JJY_CLOCKSTATS_MARK_JJY :
+		pMark = "JJY " ;
+		break ;
+	case JJY_CLOCKSTATS_MARK_SEND :
+		pMark = "--> " ;
+		break ;
+	case JJY_CLOCKSTATS_MARK_RECEIVE :
+		pMark = "<-- " ;
+		break ;
+	case JJY_CLOCKSTATS_MARK_INFORMATION :
+		pMark = "--- " ;
+		break ;
+	case JJY_CLOCKSTATS_MARK_ATTENTION :
+		pMark = "=== " ;
+		break ;
+	case JJY_CLOCKSTATS_MARK_WARNING :
+		pMark = "-W- " ;
+		break ;
+	case JJY_CLOCKSTATS_MARK_ERROR :
+		pMark = "-X- " ;
+		break ;
+	default :
+		pMark = "" ;
+		break ;
+	}
+
+	iDataLen = strlen( pData ) ;
+	iMarkLen = strlen( pMark ) ;
+	strcpy( sLog, pMark ) ; /* Harmless because of enough length */
+	printableString( sLog+iMarkLen, sizeof(sLog)-iMarkLen, pData, iDataLen ) ;
+
+#ifdef DEBUG
+	if ( debug ) {
+		printf( "refclock_jjy.c : clockstats : %s\n", sLog ) ;
+	}
+#endif
+	record_clock_stats( &peer->srcadr, sLog ) ;
+
+}
+
+/*################################################################################################*/
+/*################################################################################################*/
+/*##												##*/
+/*##    printableString										##*/
+/*##												##*/
+/*################################################################################################*/
+/*################################################################################################*/
+
+static void
+printableString ( char *sOutput, int iOutputLen, const char *sInput, int iInputLen )
 {
 	const char	*printableControlChar[] = {
 			"", "", "", "",
diff --git a/contrib/ntp/ntpd/refclock_parse.c b/contrib/ntp/ntpd/refclock_parse.c
index 195ec39cb4f0..147a462231dd 100644
--- a/contrib/ntp/ntpd/refclock_parse.c
+++ b/contrib/ntp/ntpd/refclock_parse.c
@@ -15,7 +15,7 @@
  *   Currently the STREAMS module is only available for Suns running
  *   SunOS 4.x and SunOS5.x.
  *
- * Copyright (c) 1995-2009 by Frank Kardel  ntp.org>
+ * Copyright (c) 1995-2015 by Frank Kardel  ntp.org>
  * Copyright (c) 1989-1994 by Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg, Germany
  *
  * Redistribution and use in source and binary forms, with or without
@@ -2540,7 +2540,7 @@ parsestate(
 	  {
 		  { PARSEB_S_LEAP,     "LEAP INDICATION" },
 		  { PARSEB_S_PPS,      "PPS SIGNAL" },
-		  { PARSEB_S_ANTENNA,  "ANTENNA" },
+		  { PARSEB_S_CALLBIT,  "CALLBIT" },
 		  { PARSEB_S_POSITION, "POSITION" },
 		  { 0,		       NULL }
 	  };
@@ -2562,7 +2562,7 @@ parsestate(
 		i++;
 	}
 
-	if (lstate & (PARSEB_S_LEAP|PARSEB_S_ANTENNA|PARSEB_S_PPS|PARSEB_S_POSITION))
+	if (lstate & (PARSEB_S_LEAP|PARSEB_S_CALLBIT|PARSEB_S_PPS|PARSEB_S_POSITION))
 	{
 		if (s != t)
 			t = ap(buffer, size, t, "; ");
@@ -2998,7 +2998,7 @@ parse_start(
 	if (!notice)
         {
 		NLOG(NLOG_CLOCKINFO) /* conditional if clause for conditional syslog */
-			msyslog(LOG_INFO, "NTP PARSE support: Copyright (c) 1989-2009, Frank Kardel");
+			msyslog(LOG_INFO, "NTP PARSE support: Copyright (c) 1989-2015, Frank Kardel");
 		notice = 1;
 	}
 
@@ -3782,6 +3782,8 @@ parse_process(
 					msyslog(LOG_WARNING, "PARSE receiver #%d: FAILED TIMECODE: \"%s\" (check receiver configuration / wiring)",
 						CLK_UNIT(parse->peer), mkascii(buffer, sizeof buffer, tmpctl.parsegettc.parse_buffer, (unsigned)(tmpctl.parsegettc.parse_count - 1)));
 			}
+			/* copy status to show only changes in case of failures */
+			parse->timedata.parse_status = parsetime->parse_status;
 		}
 	}
 
diff --git a/contrib/ntp/ntpd/refclock_shm.c b/contrib/ntp/ntpd/refclock_shm.c
index 7174abdbf4cf..6ab5d0267e9e 100644
--- a/contrib/ntp/ntpd/refclock_shm.c
+++ b/contrib/ntp/ntpd/refclock_shm.c
@@ -24,6 +24,7 @@
 #include "timespecops.h"
 #undef fileno
 #include "ntp_stdlib.h"
+#include "ntp_assert.h"
 
 #undef fileno
 #include 
@@ -37,6 +38,10 @@
 # include 
 #endif
 
+#ifdef HAVE_STDATOMIC_H
+# include 
+#endif /* HAVE_STDATOMIC_H */
+
 /*
  * This driver supports a reference clock attached thru shared memory
  */
@@ -117,6 +122,7 @@ struct shmunit {
 	time_t max_delay;	/* age/stale limit */
 };
 
+
 static struct shmTime*
 getShmTime(
 	int unit,
@@ -144,8 +150,8 @@ getShmTime(
 		msyslog(LOG_ERR, "SHM shmat (unit %d): %m", unit);
 		return NULL;
 	}
-	return p;
 
+	return p;
 #else
 
 	static const char * nspref[2] = { "Local", "Global" };
@@ -195,10 +201,14 @@ getShmTime(
 		return NULL;
 	}
 
+	return p;
 #endif
 
-	return p;
+	/* NOTREACHED */
+	ENSURE(!"getShmTime(): Not reached.");
 }
+
+
 /*
  * shm_start - attach to shared memory
  */
@@ -348,10 +358,158 @@ shm_poll(
 	shm_clockstats(unit, peer);
 }
 
+
+enum segstat_t {
+    OK, NO_SEGMENT, NOT_READY, BAD_MODE, CLASH
+};
+
+struct shm_stat_t {
+    int status;
+    int mode;
+    struct timespec tvc, tvr, tvt;
+    int precision;
+    int leap;
+};
+
+static inline void memory_barrier(void)
+{
+#ifdef HAVE_ATOMIC_THREAD_FENCE
+    atomic_thread_fence(memory_order_seq_cst);
+#endif /* HAVE_ATOMIC_THREAD_FENCE */
+}
+
+static enum segstat_t shm_query(volatile struct shmTime *shm_in, struct shm_stat_t *shm_stat)
+/* try to grab a sample from the specified SHM segment */
+{
+    volatile struct shmTime shmcopy, *shm = shm_in;
+    volatile int cnt;
+
+    unsigned int cns_new, rns_new;
+
+    /*
+     * This is the main routine. It snatches the time from the shm
+     * board and tacks on a local timestamp.
+     */
+    if (shm == NULL) {
+	shm_stat->status = NO_SEGMENT;
+	return NO_SEGMENT;
+    }
+
+    /*@-type@*//* splint is confused about struct timespec */
+    shm_stat->tvc.tv_sec = shm_stat->tvc.tv_nsec = 0;
+    {
+	time_t now;
+
+	time(&now);
+	shm_stat->tvc.tv_sec = now;
+    }
+
+    /* relying on word access to be atomic here */
+    if (shm->valid == 0) {
+	shm_stat->status = NOT_READY;
+	return NOT_READY;
+    }
+
+    cnt = shm->count;
+
+    /*
+     * This is proof against concurrency issues if either
+     * (a) the memory_barrier() call works on this host, or
+     * (b) memset compiles to an uninterruptible single-instruction bitblt.
+     */
+    memory_barrier();
+    memcpy((void *)&shmcopy, (void *)shm, sizeof(struct shmTime));
+    shm->valid = 0;
+    memory_barrier();
+
+    /* 
+     * Clash detection in case neither (a) nor (b) was true.
+     * Not supported in mode 0, and word access to the count field 
+     * must be atomic for this to work.
+     */
+    if (shmcopy.mode > 0 && cnt != shm->count) {
+	shm_stat->status = CLASH;
+	return shm_stat->status;
+    }
+
+    shm_stat->status = OK;
+    shm_stat->mode = shmcopy.mode;
+
+    switch (shmcopy.mode) {
+    case 0:
+	shm_stat->tvr.tv_sec	= shmcopy.receiveTimeStampSec;
+	shm_stat->tvr.tv_nsec	= shmcopy.receiveTimeStampUSec * 1000;
+	rns_new		= shmcopy.receiveTimeStampNSec;
+	shm_stat->tvt.tv_sec	= shmcopy.clockTimeStampSec;
+	shm_stat->tvt.tv_nsec	= shmcopy.clockTimeStampUSec * 1000;
+	cns_new		= shmcopy.clockTimeStampNSec;
+
+	/* Since the following comparisons are between unsigned
+	** variables they are always well defined, and any
+	** (signed) underflow will turn into very large unsigned
+	** values, well above the 1000 cutoff.
+	**
+	** Note: The usecs *must* be a *truncated*
+	** representation of the nsecs. This code will fail for
+	** *rounded* usecs, and the logic to deal with
+	** wrap-arounds in the presence of rounded values is
+	** much more convoluted.
+	*/
+	if (   ((cns_new - (unsigned)shm_stat->tvt.tv_nsec) < 1000)
+	       && ((rns_new - (unsigned)shm_stat->tvr.tv_nsec) < 1000)) {
+	    shm_stat->tvt.tv_nsec = cns_new;
+	    shm_stat->tvr.tv_nsec = rns_new;
+	}
+	/* At this point shm_stat->tvr and shm_stat->tvt contain valid ns-level
+	** timestamps, possibly generated by extending the old
+	** us-level timestamps
+	*/
+	break;
+
+    case 1:
+
+	shm_stat->tvr.tv_sec	= shmcopy.receiveTimeStampSec;
+	shm_stat->tvr.tv_nsec	= shmcopy.receiveTimeStampUSec * 1000;
+	rns_new		= shmcopy.receiveTimeStampNSec;
+	shm_stat->tvt.tv_sec	= shmcopy.clockTimeStampSec;
+	shm_stat->tvt.tv_nsec	= shmcopy.clockTimeStampUSec * 1000;
+	cns_new		= shmcopy.clockTimeStampNSec;
+		
+	/* See the case above for an explanation of the
+	** following test.
+	*/
+	if (   ((cns_new - (unsigned)shm_stat->tvt.tv_nsec) < 1000)
+	       && ((rns_new - (unsigned)shm_stat->tvr.tv_nsec) < 1000)) {
+	    shm_stat->tvt.tv_nsec = cns_new;
+	    shm_stat->tvr.tv_nsec = rns_new;
+	}
+	/* At this point shm_stat->tvr and shm_stat->tvt contains valid ns-level
+	** timestamps, possibly generated by extending the old
+	** us-level timestamps
+	*/
+	break;
+
+    default:
+	shm_stat->status = BAD_MODE;
+	break;
+    }
+    /*@-type@*/
+
+    /*
+     * leap field is not a leap offset but a leap notification code.
+     * The values are magic numbers used by NTP and set by GPSD, if at all, in
+     * the subframe code.
+     */
+    shm_stat->leap = shmcopy.leap;
+    shm_stat->precision = shmcopy.precision;
+
+    return shm_stat->status;
+}
+
 /*
- * shm_timer - called onece every second.
+ * shm_timer - called once every second.
  *
- * This tries to grab a sample from the SHM segment
+ * This tries to grab a sample from the SHM segment, filtering bad ones
  */
 static void
 shm_timer(
@@ -362,33 +520,20 @@ shm_timer(
 	struct refclockproc * const pp = peer->procptr;
 	struct shmunit *      const up = pp->unitptr;
 
-	/* access order is important for lock-free SHM access; we
-	** enforce order by treating the whole structure volatile.
-	**
-	** IMPORTANT NOTE: This does not protect from reordering on CPU
-	** level, and it does nothing for cache consistency and
-	** visibility of changes by other cores. We need atomic and/or
-	** fence instructions for that.
-	*/
 	volatile struct shmTime *shm;
 
-	struct timespec tvr;
-	struct timespec tvt;
 	l_fp tsrcv;
 	l_fp tsref;
-	unsigned int c;
-	unsigned int cns_new, rns_new;
-	int cnt;
+	int c;
 
 	/* for formatting 'a_lastcode': */
 	struct calendar cd;
-	time_t tt, now;
+	time_t tt;
 	vint64 ts;
 
-	/*
-	 * This is the main routine. It snatches the time from the shm
-	 * board and tacks on a local timestamp.
-	 */
+	enum segstat_t status;
+	struct shm_stat_t shm_stat;
+
 	up->ticks++;
 	if ((shm = up->shm) == NULL) {
 		/* try to map again - this may succeed if meanwhile some-
@@ -400,88 +545,43 @@ shm_timer(
 			return;
 		}
 	}
-	if ( ! shm->valid) {
-		DPRINTF(1, ("%s: SHM not ready\n",
-			    refnumtoa(&peer->srcadr)));
-		up->notready++;
-		return;
-	}
 
-	switch (shm->mode) {
-	case 0:
-		tvr.tv_sec	= shm->receiveTimeStampSec;
-		tvr.tv_nsec	= shm->receiveTimeStampUSec * 1000;
-		rns_new		= shm->receiveTimeStampNSec;
-		tvt.tv_sec	= shm->clockTimeStampSec;
-		tvt.tv_nsec	= shm->clockTimeStampUSec * 1000;
-		cns_new		= shm->clockTimeStampNSec;
-
-		/* Since the following comparisons are between unsigned
-		** variables they are always well defined, and any
-		** (signed) underflow will turn into very large unsigned
-		** values, well above the 1000 cutoff.
-		**
-		** Note: The usecs *must* be a *truncated*
-		** representation of the nsecs. This code will fail for
-		** *rounded* usecs, and the logic to deal with
-		** wrap-arounds in the presence of rounded values is
-		** much more convoluted.
-		*/
-		if (   ((cns_new - (unsigned)tvt.tv_nsec) < 1000)
-		    && ((rns_new - (unsigned)tvr.tv_nsec) < 1000)) {
-			tvt.tv_nsec = cns_new;
-			tvr.tv_nsec = rns_new;
-		}
-		/* At this point tvr and tvt contains valid ns-level
-		** timestamps, possibly generated by extending the old
-		** us-level timestamps
-		*/
- 		DPRINTF(2, ("%s: SHM type 0 sample\n",
-			    refnumtoa(&peer->srcadr)));
-		break;
-
-	case 1:
-		cnt = shm->count;
-
-		tvr.tv_sec	= shm->receiveTimeStampSec;
-		tvr.tv_nsec	= shm->receiveTimeStampUSec * 1000;
-		rns_new		= shm->receiveTimeStampNSec;
-		tvt.tv_sec	= shm->clockTimeStampSec;
-		tvt.tv_nsec	= shm->clockTimeStampUSec * 1000;
-		cns_new		= shm->clockTimeStampNSec;
-		if (cnt != shm->count) {
-			DPRINTF(1, ("%s: type 1 access clash\n",
-				    refnumtoa(&peer->srcadr)));
-			msyslog (LOG_NOTICE, "SHM: access clash in shared memory");
-			up->clash++;
-			return;
-		}
-		
-		/* See the case above for an explanation of the
-		** following test.
-		*/
-		if (   ((cns_new - (unsigned)tvt.tv_nsec) < 1000)
-		    && ((rns_new - (unsigned)tvr.tv_nsec) < 1000)) {
-			tvt.tv_nsec = cns_new;
-			tvr.tv_nsec = rns_new;
-		}
-		/* At this point tvr and tvt contains valid ns-level
-		** timestamps, possibly generated by extending the old
-		** us-level timestamps
-		*/
- 		DPRINTF(2, ("%s: SHM type 1 sample\n",
-			    refnumtoa(&peer->srcadr)));
-		break;
+	/* query the segment, atomically */
+	status = shm_query(shm, &shm_stat);
 
+	switch (status) {
+	case OK:
+	    DPRINTF(2, ("%s: SHM type %d sample\n",
+			refnumtoa(&peer->srcadr), shm_stat.mode));
+	    break;
+	case NO_SEGMENT:
+	    /* should never happen, but is harmless */
+	    return;
+	case NOT_READY:
+	    DPRINTF(1, ("%s: SHM not ready\n",refnumtoa(&peer->srcadr)));
+	    up->notready++;
+	    return;
+	case BAD_MODE:
+	    DPRINTF(1, ("%s: SHM type blooper, mode=%d\n",
+			refnumtoa(&peer->srcadr), shm->mode));
+	    up->bad++;
+	    msyslog (LOG_ERR, "SHM: bad mode found in shared memory: %d",
+		     shm->mode);
+	    return;
+	case CLASH:
+	    DPRINTF(1, ("%s: type 1 access clash\n",
+			refnumtoa(&peer->srcadr)));
+	    msyslog (LOG_NOTICE, "SHM: access clash in shared memory");
+	    up->clash++;
+	    return;
 	default:
- 		DPRINTF(1, ("%s: SHM type blooper, mode=%d\n",
-			    refnumtoa(&peer->srcadr), shm->mode));
-		up->bad++;
-		msyslog (LOG_ERR, "SHM: bad mode found in shared memory: %d",
-			 shm->mode);
-		return;
+	    DPRINTF(1, ("%s: internal error, unknown SHM fetch status\n",
+			refnumtoa(&peer->srcadr)));
+	    msyslog (LOG_NOTICE, "internal error, unknown SHM fetch status");
+	    up->bad++;
+	    return;
 	}
-	shm->valid = 0;
+
 
 	/* format the last time code in human-readable form into
 	 * 'pp->a_lastcode'. Someone claimed: "NetBSD has incompatible
@@ -489,7 +589,7 @@ shm_timer(
 	 * around that potential problem. BTW, simply casting a pointer
 	 * is a receipe for disaster on some architectures.
 	 */
-	tt = (time_t)tvt.tv_sec;
+	tt = (time_t)shm_stat.tvt.tv_sec;
 	ts = time_to_vint64(&tt);
 	ntpcal_time_to_date(&cd, &ts);
 		
@@ -498,12 +598,11 @@ shm_timer(
 		     "%04u-%02u-%02uT%02u:%02u:%02u.%09ldZ",
 		     cd.year, cd.month, cd.monthday,
 		     cd.hour, cd.minute, cd.second,
-		     (long)tvt.tv_nsec);
+		     (long)shm_stat.tvt.tv_nsec);
 	pp->lencode = (c < sizeof(pp->a_lastcode)) ? c : 0;
 
 	/* check 1: age control of local time stamp */
-	time(&now);
-	tt = now - tvr.tv_sec;
+	tt = shm_stat.tvc.tv_sec - shm_stat.tvr.tv_sec;
 	if (tt < 0 || tt > up->max_delay) {
 		DPRINTF(1, ("%s:SHM stale/bad receive time, delay=%llds\n",
 			    refnumtoa(&peer->srcadr), (long long)tt));
@@ -514,7 +613,7 @@ shm_timer(
 	}
 
 	/* check 2: delta check */
-	tt = tvr.tv_sec - tvt.tv_sec - (tvr.tv_nsec < tvt.tv_nsec);
+	tt = shm_stat.tvr.tv_sec - shm_stat.tvt.tv_sec - (shm_stat.tvr.tv_nsec < shm_stat.tvt.tv_nsec);
 	if (tt < 0)
 		tt = -tt;
 	if (up->max_delta > 0 && tt > up->max_delta) {
@@ -529,10 +628,10 @@ shm_timer(
 	/* if we really made it to this point... we're winners! */
 	DPRINTF(2, ("%s: SHM feeding data\n",
 		    refnumtoa(&peer->srcadr)));
-	tsrcv = tspec_stamp_to_lfp(tvr);
-	tsref = tspec_stamp_to_lfp(tvt);
-	pp->leap = shm->leap;
-	peer->precision = shm->precision;
+	tsrcv = tspec_stamp_to_lfp(shm_stat.tvr);
+	tsref = tspec_stamp_to_lfp(shm_stat.tvt);
+	pp->leap = shm_stat.leap;
+	peer->precision = shm_stat.precision;
 	refclock_process_offset(pp, tsref, tsrcv, pp->fudgetime1);
 	up->good++;
 }
diff --git a/contrib/ntp/ntpd/refclock_true.c b/contrib/ntp/ntpd/refclock_true.c
index 7a5c491bb595..67ba6dfbecce 100644
--- a/contrib/ntp/ntpd/refclock_true.c
+++ b/contrib/ntp/ntpd/refclock_true.c
@@ -240,7 +240,7 @@ true_debug(struct peer *peer, const char *fmt, ...)
 				 "/tmp/true%d.debug", up->unit);
 			fd = open(filename, O_CREAT | O_WRONLY | O_EXCL,
 				  0600);
-			if (fd >= 0 && (up->debug = fdopen(fd, "r+"))) {
+			if (fd >= 0 && (up->debug = fdopen(fd, "w"))) {
 #ifdef HAVE_SETVBUF
 				static char buf[BUFSIZ];
 
diff --git a/contrib/ntp/ntpdate/Makefile.in b/contrib/ntp/ntpdate/Makefile.in
index 0dcac192e7cf..feae7e4c7443 100644
--- a/contrib/ntp/ntpdate/Makefile.in
+++ b/contrib/ntp/ntpdate/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -21,6 +20,61 @@
 
 
 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@
@@ -40,10 +94,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 EXTRA_PROGRAMS = ntpdate$(EXEEXT)
-DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/bincheck.mf \
-	$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \
-	$(top_srcdir)/sntp/check-libntp.mf
 subdir = ntpdate
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -75,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -84,6 +135,8 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -97,9 +150,22 @@ am__DEPENDENCIES_1 =
 ntpdate_DEPENDENCIES = $(LDADD) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -110,27 +176,49 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = ntpdate.c
 DIST_SOURCES = ntpdate.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/bincheck.mf \
+	$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \
+	$(top_srcdir)/sntp/check-libntp.mf \
+	$(top_srcdir)/sntp/libevent/build-aux/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -181,6 +269,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -297,6 +386,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -429,7 +519,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/bincheck.mf $(top_sr
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ntpdate/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign ntpdate/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -438,6 +527,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/bincheck.mf $(top_srcdir)/sntp/check-libntp.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -449,14 +539,19 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -477,7 +572,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -492,14 +588,19 @@ clean-binPROGRAMS:
 	rm -f $$list
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -520,7 +621,8 @@ uninstall-libexecPROGRAMS:
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
@@ -535,14 +637,19 @@ clean-libexecPROGRAMS:
 	rm -f $$list
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -563,7 +670,8 @@ uninstall-sbinPROGRAMS:
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
@@ -576,7 +684,8 @@ clean-sbinPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-ntpdate$(EXEEXT): $(ntpdate_OBJECTS) $(ntpdate_DEPENDENCIES) 
+
+ntpdate$(EXEEXT): $(ntpdate_OBJECTS) $(ntpdate_DEPENDENCIES) $(EXTRA_ntpdate_DEPENDENCIES) 
 	@rm -f ntpdate$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ntpdate_OBJECTS) $(ntpdate_LDADD) $(LIBS)
 
@@ -591,26 +700,23 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -618,26 +724,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -649,15 +744,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -666,6 +757,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -719,10 +825,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -813,22 +924,25 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS \
 
 .MAKE: all check install install-am install-exec-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libexecPROGRAMS clean-libtool \
-	clean-sbinPROGRAMS ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-exec-hook \
-	install-html install-html-am install-info install-info-am \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+	clean-libtool clean-sbinPROGRAMS cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-hook install-html \
+	install-html-am install-info install-info-am \
 	install-libexecPROGRAMS install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-sbinPROGRAMS install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-libexecPROGRAMS uninstall-sbinPROGRAMS
 
+.PRECIOUS: Makefile
+
 
 $(PROGRAMS): $(LDADD)
 
diff --git a/contrib/ntp/ntpdc/Makefile.in b/contrib/ntp/ntpdc/Makefile.in
index 0bb1e30e9488..be8cd5578412 100644
--- a/contrib/ntp/ntpdc/Makefile.in
+++ b/contrib/ntp/ntpdc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -22,6 +21,61 @@
 
 
 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@
@@ -41,11 +95,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 EXTRA_PROGRAMS = ntpdc$(EXEEXT) ntpdc-layout$(EXEEXT)
-DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/nl.pl.in \
-	$(top_srcdir)/bincheck.mf $(top_srcdir)/check-libopts.mf \
-	$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \
-	$(top_srcdir)/sntp/check-libntp.mf
 subdir = ntpdc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -77,6 +126,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -86,6 +136,8 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = nl.pl
@@ -102,12 +154,25 @@ ntpdc_DEPENDENCIES = version.o $(am__DEPENDENCIES_1) \
 	../libntp/libntp.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 ntpdc_layout_SOURCES = ntpdc-layout.c
 ntpdc_layout_OBJECTS = ntpdc-layout.$(OBJEXT)
 ntpdc_layout_DEPENDENCIES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -118,24 +183,25 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(ntpdc_SOURCES) ntpdc-layout.c
 DIST_SOURCES = $(ntpdc_SOURCES) ntpdc-layout.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -157,14 +223,42 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man1_MANS) $(man8_MANS) $(man_MANS)
 DATA = $(html_DATA) $(noinst_DATA)
 HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/nl.pl.in \
+	$(top_srcdir)/bincheck.mf $(top_srcdir)/check-libopts.mf \
+	$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \
+	$(top_srcdir)/sntp/check-libntp.mf \
+	$(top_srcdir)/sntp/libevent/build-aux/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -215,6 +309,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -331,6 +426,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -511,7 +607,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/bincheck.mf $(top_sr
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ntpdc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign ntpdc/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -520,6 +615,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/bincheck.mf $(top_srcdir)/check-libopts.mf $(top_srcdir)/sntp/check-libntp.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -533,14 +629,19 @@ nl.pl: $(top_builddir)/config.status $(srcdir)/nl.pl.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -561,7 +662,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -576,14 +678,19 @@ clean-binPROGRAMS:
 	rm -f $$list
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -604,7 +711,8 @@ uninstall-libexecPROGRAMS:
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
@@ -619,14 +727,19 @@ clean-libexecPROGRAMS:
 	rm -f $$list
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -647,7 +760,8 @@ uninstall-sbinPROGRAMS:
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
@@ -660,10 +774,12 @@ clean-sbinPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-ntpdc$(EXEEXT): $(ntpdc_OBJECTS) $(ntpdc_DEPENDENCIES) 
+
+ntpdc$(EXEEXT): $(ntpdc_OBJECTS) $(ntpdc_DEPENDENCIES) $(EXTRA_ntpdc_DEPENDENCIES) 
 	@rm -f ntpdc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ntpdc_OBJECTS) $(ntpdc_LDADD) $(LIBS)
-ntpdc-layout$(EXEEXT): $(ntpdc_layout_OBJECTS) $(ntpdc_layout_DEPENDENCIES) 
+
+ntpdc-layout$(EXEEXT): $(ntpdc_layout_OBJECTS) $(ntpdc_layout_DEPENDENCIES) $(EXTRA_ntpdc_layout_DEPENDENCIES) 
 	@rm -f ntpdc-layout$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ntpdc_layout_OBJECTS) $(ntpdc_layout_LDADD) $(LIBS)
 
@@ -681,26 +797,23 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -709,11 +822,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1='$(man1_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -742,16 +862,21 @@ uninstall-man1:
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1='$(man8_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -780,13 +905,14 @@ uninstall-man8:
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 install-htmlDATA: $(html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -800,30 +926,17 @@ uninstall-htmlDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -835,15 +948,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -852,24 +961,26 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -918,10 +1029,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1014,25 +1130,27 @@ uninstall-man: uninstall-man1 uninstall-man8
 
 .MAKE: all check install install-am install-exec-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libexecPROGRAMS clean-libtool \
-	clean-sbinPROGRAMS ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-hook install-html install-html-am \
-	install-htmlDATA install-info install-info-am \
-	install-libexecPROGRAMS install-man install-man1 install-man8 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-sbinPROGRAMS install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+	clean-libtool clean-sbinPROGRAMS cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-hook \
+	install-html install-html-am install-htmlDATA install-info \
+	install-info-am install-libexecPROGRAMS install-man \
+	install-man1 install-man8 install-pdf install-pdf-am \
+	install-ps install-ps-am install-sbinPROGRAMS install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-htmlDATA uninstall-libexecPROGRAMS uninstall-man \
 	uninstall-man1 uninstall-man8 uninstall-sbinPROGRAMS
 
+.PRECIOUS: Makefile
+
 
 install-data-local: install-html
 
diff --git a/contrib/ntp/ntpdc/invoke-ntpdc.texi b/contrib/ntp/ntpdc/invoke-ntpdc.texi
index 246e51ec8ac8..253b8ae55327 100644
--- a/contrib/ntp/ntpdc/invoke-ntpdc.texi
+++ b/contrib/ntp/ntpdc/invoke-ntpdc.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpdc.texi)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:26:32 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:31:05 PM by AutoGen 5.18.5
 # From the definitions    ntpdc-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -76,7 +76,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p2
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p3
 Usage:  ntpdc [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/contrib/ntp/ntpdc/nl.pl b/contrib/ntp/ntpdc/nl.pl
index 4a418fbcb0dc..73da2a8403f4 100755
--- a/contrib/ntp/ntpdc/nl.pl
+++ b/contrib/ntp/ntpdc/nl.pl
@@ -1,4 +1,4 @@
-#! /usr/local/perl-5.8.8/bin/perl -w
+#! /usr/local/bin/perl -w
 
 $found = 0;
 $last = 0;
diff --git a/contrib/ntp/ntpdc/ntpdc-opts.c b/contrib/ntp/ntpdc/ntpdc-opts.c
index 94ccea7570ac..3e68aa2c14da 100644
--- a/contrib/ntp/ntpdc/ntpdc-opts.c
+++ b/contrib/ntp/ntpdc/ntpdc-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *
- *  It has been AutoGen-ed  April  7, 2015 at 04:26:14 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  June 29, 2015 at 04:30:51 PM by AutoGen 5.18.5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -69,7 +69,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpdc options
  */
 static char const ntpdc_opt_strs[1911] =
-/*     0 */ "ntpdc 4.2.8p2\n"
+/*     0 */ "ntpdc 4.2.8p3\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -128,14 +128,14 @@ static char const ntpdc_opt_strs[1911] =
 /*  1694 */ "no-load-opts\0"
 /*  1707 */ "no\0"
 /*  1710 */ "NTPDC\0"
-/*  1716 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p2\n"
+/*  1716 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p3\n"
             "Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
 /*  1846 */ "$HOME\0"
 /*  1852 */ ".\0"
 /*  1854 */ ".ntprc\0"
 /*  1861 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1895 */ "\n\0"
-/*  1897 */ "ntpdc 4.2.8p2";
+/*  1897 */ "ntpdc 4.2.8p3";
 
 /**
  *  ipv4 option description with
@@ -598,7 +598,7 @@ OPT_VALUE_SET_DEBUG_LEVEL++;
     (void)pOptDesc;
     (void)pOptions;
 }
-/* extracted from optmain.tlib near line 1245 */
+/* extracted from optmain.tlib near line 1250 */
 
 /**
  * The directory containing the data associated with ntpdc.
@@ -710,11 +710,11 @@ AO_gettext(char const * pz)
     if (option_xlateable_txt.field_ct != 0) {
         res = dgettext("libopts", pz);
         if (res == pz)
-            res = (char *)(void *)_(pz);
+            res = (char *)VOIDP(_(pz));
     } else
-        res = (char *)(void *)_(pz);
+        res = (char *)VOIDP(_(pz));
 #else
-    res = (char *)(void *)_(pz);
+    res = (char *)VOIDP(_(pz));
 #endif
     if (res == pz)
         return res;
@@ -751,7 +751,7 @@ translate_option_strings(void)
          *  Do the translations.  The first pointer follows the field count
          *  field.  The field count field is the size of a pointer.
          */
-        char ** ppz = (char**)(void*)&(option_xlateable_txt);
+        char ** ppz = (char**)VOIDP(&(option_xlateable_txt));
         int     ix  = option_xlateable_txt.field_ct;
 
         do {
@@ -761,16 +761,16 @@ translate_option_strings(void)
         /* prevent re-translation and disable "libopts" domain lookup */
         option_xlateable_txt.field_ct = 0;
 
-        coerce_it((void*)&(opts->pzCopyright));
-        coerce_it((void*)&(opts->pzCopyNotice));
-        coerce_it((void*)&(opts->pzFullVersion));
-        coerce_it((void*)&(opts->pzUsageTitle));
-        coerce_it((void*)&(opts->pzExplain));
-        coerce_it((void*)&(opts->pzDetail));
+        coerce_it(VOIDP(&(opts->pzCopyright)));
+        coerce_it(VOIDP(&(opts->pzCopyNotice)));
+        coerce_it(VOIDP(&(opts->pzFullVersion)));
+        coerce_it(VOIDP(&(opts->pzUsageTitle)));
+        coerce_it(VOIDP(&(opts->pzExplain)));
+        coerce_it(VOIDP(&(opts->pzDetail)));
         {
             tOptDesc * od = opts->pOptDesc;
             for (ix = opts->optCt; ix > 0; ix--, od++)
-                coerce_it((void*)&(od->pzText));
+                coerce_it(VOIDP(&(od->pzText)));
         }
     }
 }
@@ -796,7 +796,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpdcOptions.pzCopyright */
-  puts(_("ntpdc 4.2.8p2\n\
+  puts(_("ntpdc 4.2.8p3\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -862,14 +862,14 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpdcOptions.pzUsageTitle */
-  puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p2\n\
+  puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p3\n\
 Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 
   /* referenced via ntpdcOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntpdcOptions.pzFullVersion */
-  puts(_("ntpdc 4.2.8p2"));
+  puts(_("ntpdc 4.2.8p3"));
 
   /* referenced via ntpdcOptions.pzFullUsage */
   puts(_("<<>>"));
@@ -895,7 +895,7 @@ Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2014 by Bruce Korb - all rights reserved\n"));
-#line 82 "../makeshell.c"
+#line 87 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
@@ -919,9 +919,9 @@ Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 89 "../makeshell.c"
+#line 94 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 301 "../makeshell.c"
+#line 306 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -999,9 +999,9 @@ Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("standard output"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("standard output"));
 #line 274 "../usage.c"
   puts(_("standard output"));
@@ -1019,9 +1019,9 @@ Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("write"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("write"));
 #line 273 "../usage.c"
   puts(_("write"));
@@ -1073,7 +1073,7 @@ Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 #line 380 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 916 "../makeshell.c"
+#line 921 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
diff --git a/contrib/ntp/ntpdc/ntpdc-opts.h b/contrib/ntp/ntpdc/ntpdc-opts.h
index 84763592b2f3..e4965a0c46cb 100644
--- a/contrib/ntp/ntpdc/ntpdc-opts.h
+++ b/contrib/ntp/ntpdc/ntpdc-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *
- *  It has been AutoGen-ed  April  7, 2015 at 04:26:14 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  June 29, 2015 at 04:30:50 PM by AutoGen 5.18.5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -83,9 +83,9 @@ typedef enum {
 /** count of all options for ntpdc */
 #define OPTION_CT    15
 /** ntpdc version */
-#define NTPDC_VERSION       "4.2.8p2"
+#define NTPDC_VERSION       "4.2.8p3"
 /** Full ntpdc version text */
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.8p2"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.8p3"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/contrib/ntp/ntpdc/ntpdc.1ntpdcman b/contrib/ntp/ntpdc/ntpdc.1ntpdcman
index ecff16b0c8d7..cbc58d096661 100644
--- a/contrib/ntp/ntpdc/ntpdc.1ntpdcman
+++ b/contrib/ntp/ntpdc/ntpdc.1ntpdcman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpdc 1ntpdcman "07 Apr 2015" "4.2.8p2" "User Commands"
+.TH ntpdc 1ntpdcman "29 Jun 2015" "4.2.8p3" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-dXaWh5/ag-rXaOg5)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-91aOeF/ag-i2aGdF)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:26:27 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:31:01 PM by AutoGen 5.18.5
 .\" From the definitions ntpdc-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -34,7 +34,7 @@
 \f\*[B-Font]ntpdc\fP
 is deprecated.
 Please use
-\fCntpq\fR(1ntpqmdoc)\f[] instead \- it can do everything
+\fCntpq\f[]\fR(1ntpqmdoc)\f[] instead \- it can do everything
 \f\*[B-Font]ntpdc\fP
 used to do, and it does so using a much more sane interface.
 .sp \n(Ppu
@@ -42,7 +42,7 @@ used to do, and it does so using a much more sane interface.
 
 \f\*[B-Font]ntpdc\fP
 is a utility program used to query
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 about its
 current state and to request changes in that state.
 It uses NTP mode 7 control message formats described in the source code.
@@ -209,7 +209,7 @@ The operation of
 \f\*[B-Font]ntpdc\fP
 are specific to the particular
 implementation of the
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 daemon and can be expected to
 work only with this and maybe some previous versions of the daemon.
 Requests from a remote
@@ -273,7 +273,7 @@ followed by a command keyword will print function and usage
 information about the command.
 This command is probably a better
 source of information about
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 than this manual
 page.
 .TP 7
@@ -390,7 +390,7 @@ The contents of the host field may be one of four forms.
 It may
 be a host name, an IP address, a reference clock implementation
 name with its parameter or
-\fBREFCLK\fR()\f[]
+\fBREFCLK\f[]\fR()\f[]
 On
 \f\*[B-Font]hostnames\f[]
 \f\*[B-Font]no\f[]
@@ -499,7 +499,7 @@ and
 \f\*[B-Font]stats\f[]
 flags.
 See the
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 documentation for the meaning of these flags.
 There
 are two additional flags which are read only, the
@@ -703,7 +703,7 @@ These commands operate in the same way as the
 and
 \f\*[B-Font]disable\f[]
 configuration file commands of
-\fCntpd\fR(1ntpdmdoc)\f[].
+\fCntpd\f[]\fR(1ntpdmdoc)\f[].
 .RS
 .TP 7
 .NOP \f\*[B-Font]auth\f[]
@@ -755,7 +755,7 @@ Enables the statistics facility.
 See the
 \fIMonitoring\f[] \fIOptions\f[]
 section of
-\fCntp.conf\fR(5)\f[]
+\fCntp.conf\f[]\fR(5)\f[]
 for further information.
 The default for this flag is disable.
 .RE
@@ -764,7 +764,7 @@ The default for this flag is disable.
 This command operates in the same way as the
 \f\*[B-Font]restrict\f[]
 configuration file commands of
-\fCntpd\fR(1ntpdmdoc)\f[].
+\fCntpd\f[]\fR(1ntpdmdoc)\f[].
 .TP 7
 .NOP \f\*[B-Font]unrestrict\f[] \f\*[I-Font]address\f[] \f\*[I-Font]mask\f[] \f\*[I-Font]flag\f[] [\f\*[I-Font]...\f[]]
 Unrestrict the matching entry from the restrict list.
@@ -776,7 +776,7 @@ Delete the matching entry from the restrict list.
 Causes the current set of authentication keys to be purged and
 a new set to be obtained by rereading the keys file (which must
 have been specified in the
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 configuration file).
 This
 allows encryption keys to be changed without restarting the
@@ -791,7 +791,7 @@ and
 \f\*[B-Font]untrustedkey\f[]
 configuration file
 commands of
-\fCntpd\fR(1ntpdmdoc)\f[].
+\fCntpd\f[]\fR(1ntpdmdoc)\f[].
 .TP 7
 .NOP \f\*[B-Font]authinfo\f[]
 Returns information concerning the authentication module,
@@ -838,8 +838,8 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "SEE ALSO"
-\fCntp.conf\fR(5)\f[],
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntp.conf\f[]\fR(5)\f[],
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 David L. Mills,
 \fINetwork Time Protocol (Version 3)\fR,
 RFC1305
diff --git a/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc b/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
index 7f0c3634456e..534a6d45bc0e 100644
--- a/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
+++ b/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:26:34 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:31:08 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/ntpdc/ntpdc.html b/contrib/ntp/ntpdc/ntpdc.html
index 37e195c4f626..34cfcc1bf55c 100644
--- a/contrib/ntp/ntpdc/ntpdc.html
+++ b/contrib/ntp/ntpdc/ntpdc.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  
    This document applies to version 4.2.8p2 of ntpdc.
+  
    This document applies to version 4.2.8p3 of ntpdc.
 
   
    The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -152,7 +152,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
    ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p2
+
    ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p3
 Usage:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/contrib/ntp/ntpdc/ntpdc.man.in b/contrib/ntp/ntpdc/ntpdc.man.in
index 71aa128acd6b..84266fb2ffeb 100644
--- a/contrib/ntp/ntpdc/ntpdc.man.in
+++ b/contrib/ntp/ntpdc/ntpdc.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpdc @NTPDC_MS@ "07 Apr 2015" "4.2.8p2" "User Commands"
+.TH ntpdc @NTPDC_MS@ "29 Jun 2015" "4.2.8p3" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-dXaWh5/ag-rXaOg5)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-91aOeF/ag-i2aGdF)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:26:27 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:31:01 PM by AutoGen 5.18.5
 .\" From the definitions ntpdc-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -34,7 +34,7 @@
 \f\*[B-Font]ntpdc\fP
 is deprecated.
 Please use
-\fCntpq\fR(@NTPQ_MS@)\f[] instead \- it can do everything
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[] instead \- it can do everything
 \f\*[B-Font]ntpdc\fP
 used to do, and it does so using a much more sane interface.
 .sp \n(Ppu
@@ -42,7 +42,7 @@ used to do, and it does so using a much more sane interface.
 
 \f\*[B-Font]ntpdc\fP
 is a utility program used to query
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 about its
 current state and to request changes in that state.
 It uses NTP mode 7 control message formats described in the source code.
@@ -209,7 +209,7 @@ The operation of
 \f\*[B-Font]ntpdc\fP
 are specific to the particular
 implementation of the
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 daemon and can be expected to
 work only with this and maybe some previous versions of the daemon.
 Requests from a remote
@@ -273,7 +273,7 @@ followed by a command keyword will print function and usage
 information about the command.
 This command is probably a better
 source of information about
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 than this manual
 page.
 .TP 7
@@ -390,7 +390,7 @@ The contents of the host field may be one of four forms.
 It may
 be a host name, an IP address, a reference clock implementation
 name with its parameter or
-\fBREFCLK\fR()\f[]
+\fBREFCLK\f[]\fR()\f[]
 On
 \f\*[B-Font]hostnames\f[]
 \f\*[B-Font]no\f[]
@@ -499,7 +499,7 @@ and
 \f\*[B-Font]stats\f[]
 flags.
 See the
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 documentation for the meaning of these flags.
 There
 are two additional flags which are read only, the
@@ -703,7 +703,7 @@ These commands operate in the same way as the
 and
 \f\*[B-Font]disable\f[]
 configuration file commands of
-\fCntpd\fR(@NTPD_MS@)\f[].
+\fCntpd\f[]\fR(@NTPD_MS@)\f[].
 .RS
 .TP 7
 .NOP \f\*[B-Font]auth\f[]
@@ -755,7 +755,7 @@ Enables the statistics facility.
 See the
 \fIMonitoring\f[] \fIOptions\f[]
 section of
-\fCntp.conf\fR(5)\f[]
+\fCntp.conf\f[]\fR(5)\f[]
 for further information.
 The default for this flag is disable.
 .RE
@@ -764,7 +764,7 @@ The default for this flag is disable.
 This command operates in the same way as the
 \f\*[B-Font]restrict\f[]
 configuration file commands of
-\fCntpd\fR(@NTPD_MS@)\f[].
+\fCntpd\f[]\fR(@NTPD_MS@)\f[].
 .TP 7
 .NOP \f\*[B-Font]unrestrict\f[] \f\*[I-Font]address\f[] \f\*[I-Font]mask\f[] \f\*[I-Font]flag\f[] [\f\*[I-Font]...\f[]]
 Unrestrict the matching entry from the restrict list.
@@ -776,7 +776,7 @@ Delete the matching entry from the restrict list.
 Causes the current set of authentication keys to be purged and
 a new set to be obtained by rereading the keys file (which must
 have been specified in the
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 configuration file).
 This
 allows encryption keys to be changed without restarting the
@@ -791,7 +791,7 @@ and
 \f\*[B-Font]untrustedkey\f[]
 configuration file
 commands of
-\fCntpd\fR(@NTPD_MS@)\f[].
+\fCntpd\f[]\fR(@NTPD_MS@)\f[].
 .TP 7
 .NOP \f\*[B-Font]authinfo\f[]
 Returns information concerning the authentication module,
@@ -838,8 +838,8 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "SEE ALSO"
-\fCntp.conf\fR(5)\f[],
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntp.conf\f[]\fR(5)\f[],
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 David L. Mills,
 \fINetwork Time Protocol (Version 3)\fR,
 RFC1305
diff --git a/contrib/ntp/ntpdc/ntpdc.mdoc.in b/contrib/ntp/ntpdc/ntpdc.mdoc.in
index 8a89e48377cd..649e8956c09a 100644
--- a/contrib/ntp/ntpdc/ntpdc.mdoc.in
+++ b/contrib/ntp/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:26:34 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:31:08 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/ntpq/Makefile.in b/contrib/ntp/ntpq/Makefile.in
index fad90018b761..39b1b65a2f9e 100644
--- a/contrib/ntp/ntpq/Makefile.in
+++ b/contrib/ntp/ntpq/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -23,6 +22,61 @@
 
 
 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@
@@ -42,10 +96,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 EXTRA_PROGRAMS = ntpq$(EXEEXT)
-DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/bincheck.mf \
-	$(top_srcdir)/check-libopts.mf $(top_srcdir)/depsver.mf \
-	$(top_srcdir)/includes.mf $(top_srcdir)/sntp/check-libntp.mf
 subdir = ntpq
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -77,6 +127,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -86,18 +137,18 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
-AM_V_AR = $(am__v_AR_$(V))
-am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
-am__v_AR_0 = @echo "  AR    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
 libntpq_a_AR = $(AR) $(ARFLAGS)
 libntpq_a_LIBADD =
 am_libntpq_a_OBJECTS = libntpq_a-libntpq.$(OBJEXT) \
@@ -115,9 +166,22 @@ ntpq_DEPENDENCIES = version.o $(am__DEPENDENCIES_1) ../libntp/libntp.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -128,21 +192,25 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libntpq_a_SOURCES) $(ntpq_SOURCES)
 DIST_SOURCES = $(libntpq_a_SOURCES) $(ntpq_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -164,14 +232,41 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man1_MANS) $(man8_MANS) $(man_MANS)
 DATA = $(html_DATA) $(noinst_DATA)
 HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/bincheck.mf \
+	$(top_srcdir)/check-libopts.mf $(top_srcdir)/depsver.mf \
+	$(top_srcdir)/includes.mf $(top_srcdir)/sntp/check-libntp.mf \
+	$(top_srcdir)/sntp/libevent/build-aux/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -222,6 +317,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -338,6 +434,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -514,7 +611,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/bincheck.mf $(top_sr
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ntpq/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign ntpq/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -523,6 +619,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/bincheck.mf $(top_srcdir)/check-libopts.mf $(top_srcdir)/sntp/check-libntp.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -535,20 +632,26 @@ $(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libntpq.a: $(libntpq_a_OBJECTS) $(libntpq_a_DEPENDENCIES) 
+
+libntpq.a: $(libntpq_a_OBJECTS) $(libntpq_a_DEPENDENCIES) $(EXTRA_libntpq_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libntpq.a
 	$(AM_V_AR)$(libntpq_a_AR) libntpq.a $(libntpq_a_OBJECTS) $(libntpq_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libntpq.a
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -569,7 +672,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -584,14 +688,19 @@ clean-binPROGRAMS:
 	rm -f $$list
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -612,7 +721,8 @@ uninstall-libexecPROGRAMS:
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
@@ -627,14 +737,19 @@ clean-libexecPROGRAMS:
 	rm -f $$list
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -655,7 +770,8 @@ uninstall-sbinPROGRAMS:
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
@@ -668,7 +784,8 @@ clean-sbinPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-ntpq$(EXEEXT): $(ntpq_OBJECTS) $(ntpq_DEPENDENCIES) 
+
+ntpq$(EXEEXT): $(ntpq_OBJECTS) $(ntpq_DEPENDENCIES) $(EXTRA_ntpq_DEPENDENCIES) 
 	@rm -f ntpq$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ntpq_OBJECTS) $(ntpq_LDADD) $(LIBS)
 
@@ -687,58 +804,51 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 libntpq_a-libntpq.o: libntpq.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntpq_a_CFLAGS) $(CFLAGS) -MT libntpq_a-libntpq.o -MD -MP -MF $(DEPDIR)/libntpq_a-libntpq.Tpo -c -o libntpq_a-libntpq.o `test -f 'libntpq.c' || echo '$(srcdir)/'`libntpq.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libntpq_a-libntpq.Tpo $(DEPDIR)/libntpq_a-libntpq.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libntpq.c' object='libntpq_a-libntpq.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libntpq.c' object='libntpq_a-libntpq.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntpq_a_CFLAGS) $(CFLAGS) -c -o libntpq_a-libntpq.o `test -f 'libntpq.c' || echo '$(srcdir)/'`libntpq.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntpq_a_CFLAGS) $(CFLAGS) -c -o libntpq_a-libntpq.o `test -f 'libntpq.c' || echo '$(srcdir)/'`libntpq.c
 
 libntpq_a-libntpq.obj: libntpq.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntpq_a_CFLAGS) $(CFLAGS) -MT libntpq_a-libntpq.obj -MD -MP -MF $(DEPDIR)/libntpq_a-libntpq.Tpo -c -o libntpq_a-libntpq.obj `if test -f 'libntpq.c'; then $(CYGPATH_W) 'libntpq.c'; else $(CYGPATH_W) '$(srcdir)/libntpq.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libntpq_a-libntpq.Tpo $(DEPDIR)/libntpq_a-libntpq.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libntpq.c' object='libntpq_a-libntpq.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libntpq.c' object='libntpq_a-libntpq.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntpq_a_CFLAGS) $(CFLAGS) -c -o libntpq_a-libntpq.obj `if test -f 'libntpq.c'; then $(CYGPATH_W) 'libntpq.c'; else $(CYGPATH_W) '$(srcdir)/libntpq.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntpq_a_CFLAGS) $(CFLAGS) -c -o libntpq_a-libntpq.obj `if test -f 'libntpq.c'; then $(CYGPATH_W) 'libntpq.c'; else $(CYGPATH_W) '$(srcdir)/libntpq.c'; fi`
 
 libntpq_a-libntpq_subs.o: libntpq_subs.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntpq_a_CFLAGS) $(CFLAGS) -MT libntpq_a-libntpq_subs.o -MD -MP -MF $(DEPDIR)/libntpq_a-libntpq_subs.Tpo -c -o libntpq_a-libntpq_subs.o `test -f 'libntpq_subs.c' || echo '$(srcdir)/'`libntpq_subs.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libntpq_a-libntpq_subs.Tpo $(DEPDIR)/libntpq_a-libntpq_subs.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libntpq_subs.c' object='libntpq_a-libntpq_subs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libntpq_subs.c' object='libntpq_a-libntpq_subs.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntpq_a_CFLAGS) $(CFLAGS) -c -o libntpq_a-libntpq_subs.o `test -f 'libntpq_subs.c' || echo '$(srcdir)/'`libntpq_subs.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntpq_a_CFLAGS) $(CFLAGS) -c -o libntpq_a-libntpq_subs.o `test -f 'libntpq_subs.c' || echo '$(srcdir)/'`libntpq_subs.c
 
 libntpq_a-libntpq_subs.obj: libntpq_subs.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntpq_a_CFLAGS) $(CFLAGS) -MT libntpq_a-libntpq_subs.obj -MD -MP -MF $(DEPDIR)/libntpq_a-libntpq_subs.Tpo -c -o libntpq_a-libntpq_subs.obj `if test -f 'libntpq_subs.c'; then $(CYGPATH_W) 'libntpq_subs.c'; else $(CYGPATH_W) '$(srcdir)/libntpq_subs.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libntpq_a-libntpq_subs.Tpo $(DEPDIR)/libntpq_a-libntpq_subs.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libntpq_subs.c' object='libntpq_a-libntpq_subs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libntpq_subs.c' object='libntpq_a-libntpq_subs.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntpq_a_CFLAGS) $(CFLAGS) -c -o libntpq_a-libntpq_subs.obj `if test -f 'libntpq_subs.c'; then $(CYGPATH_W) 'libntpq_subs.c'; else $(CYGPATH_W) '$(srcdir)/libntpq_subs.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntpq_a_CFLAGS) $(CFLAGS) -c -o libntpq_a-libntpq_subs.obj `if test -f 'libntpq_subs.c'; then $(CYGPATH_W) 'libntpq_subs.c'; else $(CYGPATH_W) '$(srcdir)/libntpq_subs.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -747,11 +857,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1='$(man1_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -780,16 +897,21 @@ uninstall-man1:
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1='$(man8_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -818,13 +940,14 @@ uninstall-man8:
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 install-htmlDATA: $(html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -838,30 +961,17 @@ uninstall-htmlDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -873,15 +983,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -890,24 +996,26 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -956,10 +1064,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1053,25 +1166,28 @@ uninstall-man: uninstall-man1 uninstall-man8
 
 .MAKE: all check install install-am install-exec-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libexecPROGRAMS clean-libtool \
-	clean-noinstLIBRARIES clean-sbinPROGRAMS ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-exec-hook install-html \
-	install-html-am install-htmlDATA install-info install-info-am \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+	clean-libtool clean-noinstLIBRARIES clean-sbinPROGRAMS \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-hook install-html install-html-am \
+	install-htmlDATA install-info install-info-am \
 	install-libexecPROGRAMS install-man install-man1 install-man8 \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-sbinPROGRAMS install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-htmlDATA uninstall-libexecPROGRAMS uninstall-man \
 	uninstall-man1 uninstall-man8 uninstall-sbinPROGRAMS
 
+.PRECIOUS: Makefile
+
 
 install-data-local: install-html
 
diff --git a/contrib/ntp/ntpq/invoke-ntpq.texi b/contrib/ntp/ntpq/invoke-ntpq.texi
index 505bb23d8c3c..7c28d922a029 100644
--- a/contrib/ntp/ntpq/invoke-ntpq.texi
+++ b/contrib/ntp/ntpq/invoke-ntpq.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpq.texi)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:27:07 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:31:39 PM by AutoGen 5.18.5
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -213,7 +213,9 @@ switch.
 This command allows the specification of a key number to be
 used to authenticate configuration requests.
 This must correspond
-to a key number the server has been configured to use for this
+to the
+@code{controlkey}
+key number the server has been configured to use for this
 purpose.
 @item @code{keytype} @code{[@code{md5} | @code{OpenSSLDigestType}]}
 Specify the type of key to use for authenticating requests.
@@ -472,6 +474,16 @@ offset of server relative to this host
 @item @code{jitter}
 jitter
 @end table
+@item @code{apeers}
+Display a list of peers in the form:
+@example
+[tally]remote refid assid st t when pool reach delay offset jitter
+@end example
+where the output is just like the
+@code{peers}
+command except that the
+@code{refid}
+is displayed in hex format and the association number is also displayed.
 @item @code{pstats} @kbd{assocID}
 Show the statistics for the peer with the given
 @kbd{assocID}.
@@ -835,7 +847,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.8p2
+ntpq - standard NTP query program - Ver. 4.2.8p3
 Usage:  ntpq [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/contrib/ntp/ntpq/ntpq-opts.c b/contrib/ntp/ntpq/ntpq-opts.c
index 74f3d3d8e51a..798a0cdb34b9 100644
--- a/contrib/ntp/ntpq/ntpq-opts.c
+++ b/contrib/ntp/ntpq/ntpq-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *
- *  It has been AutoGen-ed  April  7, 2015 at 04:26:37 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  June 29, 2015 at 04:31:10 PM by AutoGen 5.18.5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -69,7 +69,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpq options
  */
 static char const ntpq_opt_strs[1925] =
-/*     0 */ "ntpq 4.2.8p2\n"
+/*     0 */ "ntpq 4.2.8p3\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -129,13 +129,13 @@ static char const ntpq_opt_strs[1925] =
 /*  1723 */ "no-load-opts\0"
 /*  1736 */ "no\0"
 /*  1739 */ "NTPQ\0"
-/*  1744 */ "ntpq - standard NTP query program - Ver. 4.2.8p2\n"
+/*  1744 */ "ntpq - standard NTP query program - Ver. 4.2.8p3\n"
             "Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
 /*  1863 */ "$HOME\0"
 /*  1869 */ ".\0"
 /*  1871 */ ".ntprc\0"
 /*  1878 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1912 */ "ntpq 4.2.8p2";
+/*  1912 */ "ntpq 4.2.8p3";
 
 /**
  *  ipv4 option description with
@@ -588,7 +588,7 @@ OPT_VALUE_SET_DEBUG_LEVEL++;
     (void)pOptDesc;
     (void)pOptions;
 }
-/* extracted from optmain.tlib near line 1245 */
+/* extracted from optmain.tlib near line 1250 */
 
 /**
  * The directory containing the data associated with ntpq.
@@ -700,11 +700,11 @@ AO_gettext(char const * pz)
     if (option_xlateable_txt.field_ct != 0) {
         res = dgettext("libopts", pz);
         if (res == pz)
-            res = (char *)(void *)_(pz);
+            res = (char *)VOIDP(_(pz));
     } else
-        res = (char *)(void *)_(pz);
+        res = (char *)VOIDP(_(pz));
 #else
-    res = (char *)(void *)_(pz);
+    res = (char *)VOIDP(_(pz));
 #endif
     if (res == pz)
         return res;
@@ -741,7 +741,7 @@ translate_option_strings(void)
          *  Do the translations.  The first pointer follows the field count
          *  field.  The field count field is the size of a pointer.
          */
-        char ** ppz = (char**)(void*)&(option_xlateable_txt);
+        char ** ppz = (char**)VOIDP(&(option_xlateable_txt));
         int     ix  = option_xlateable_txt.field_ct;
 
         do {
@@ -751,16 +751,16 @@ translate_option_strings(void)
         /* prevent re-translation and disable "libopts" domain lookup */
         option_xlateable_txt.field_ct = 0;
 
-        coerce_it((void*)&(opts->pzCopyright));
-        coerce_it((void*)&(opts->pzCopyNotice));
-        coerce_it((void*)&(opts->pzFullVersion));
-        coerce_it((void*)&(opts->pzUsageTitle));
-        coerce_it((void*)&(opts->pzExplain));
-        coerce_it((void*)&(opts->pzDetail));
+        coerce_it(VOIDP(&(opts->pzCopyright)));
+        coerce_it(VOIDP(&(opts->pzCopyNotice)));
+        coerce_it(VOIDP(&(opts->pzFullVersion)));
+        coerce_it(VOIDP(&(opts->pzUsageTitle)));
+        coerce_it(VOIDP(&(opts->pzExplain)));
+        coerce_it(VOIDP(&(opts->pzDetail)));
         {
             tOptDesc * od = opts->pOptDesc;
             for (ix = opts->optCt; ix > 0; ix--, od++)
-                coerce_it((void*)&(od->pzText));
+                coerce_it(VOIDP(&(od->pzText)));
         }
     }
 }
@@ -786,7 +786,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpqOptions.pzCopyright */
-  puts(_("ntpq 4.2.8p2\n\
+  puts(_("ntpq 4.2.8p3\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -852,11 +852,11 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpqOptions.pzUsageTitle */
-  puts(_("ntpq - standard NTP query program - Ver. 4.2.8p2\n\
+  puts(_("ntpq - standard NTP query program - Ver. 4.2.8p3\n\
 Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 
   /* referenced via ntpqOptions.pzFullVersion */
-  puts(_("ntpq 4.2.8p2"));
+  puts(_("ntpq 4.2.8p3"));
 
   /* referenced via ntpqOptions.pzFullUsage */
   puts(_("<<>>"));
@@ -882,7 +882,7 @@ Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2014 by Bruce Korb - all rights reserved\n"));
-#line 82 "../makeshell.c"
+#line 87 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
@@ -906,9 +906,9 @@ Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 89 "../makeshell.c"
+#line 94 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 301 "../makeshell.c"
+#line 306 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -986,9 +986,9 @@ Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("standard output"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("standard output"));
 #line 274 "../usage.c"
   puts(_("standard output"));
@@ -1006,9 +1006,9 @@ Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("write"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("write"));
 #line 273 "../usage.c"
   puts(_("write"));
@@ -1060,7 +1060,7 @@ Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 #line 380 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 916 "../makeshell.c"
+#line 921 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
diff --git a/contrib/ntp/ntpq/ntpq-opts.def b/contrib/ntp/ntpq/ntpq-opts.def
index d0c57a029312..bac20d79af93 100644
--- a/contrib/ntp/ntpq/ntpq-opts.def
+++ b/contrib/ntp/ntpq/ntpq-opts.def
@@ -325,7 +325,9 @@ switch.
 This command allows the specification of a key number to be
 used to authenticate configuration requests.
 This must correspond
-to a key number the server has been configured to use for this
+to the
+.Cm controlkey
+key number the server has been configured to use for this
 purpose.
 .It Ic keytype Xo Oo
 .Cm md5 |
@@ -606,6 +608,14 @@ offset of server relative to this host
 .It Ic jitter
 jitter
 .El
+.It Ic apeers
+Display a list of peers in the form:
+.Dl [tally]remote refid assid st t when pool reach delay offset jitter
+where the output is just like the
+.Ic peers
+command except that the
+.Ic refid
+is displayed in hex format and the association number is also displayed.
 .It Ic pstats Ar assocID
 Show the statistics for the peer with the given
 .Ar assocID .
diff --git a/contrib/ntp/ntpq/ntpq-opts.h b/contrib/ntp/ntpq/ntpq-opts.h
index 43301b9a69f5..fecb970f9dd4 100644
--- a/contrib/ntp/ntpq/ntpq-opts.h
+++ b/contrib/ntp/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *
- *  It has been AutoGen-ed  April  7, 2015 at 04:26:37 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  June 29, 2015 at 04:31:10 PM by AutoGen 5.18.5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -83,9 +83,9 @@ typedef enum {
 /** count of all options for ntpq */
 #define OPTION_CT    15
 /** ntpq version */
-#define NTPQ_VERSION       "4.2.8p2"
+#define NTPQ_VERSION       "4.2.8p3"
 /** Full ntpq version text */
-#define NTPQ_FULL_VERSION  "ntpq 4.2.8p2"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.8p3"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/contrib/ntp/ntpq/ntpq-subs.c b/contrib/ntp/ntpq/ntpq-subs.c
index 8bd4fdbbcf4e..c6478701eb27 100644
--- a/contrib/ntp/ntpq/ntpq-subs.c
+++ b/contrib/ntp/ntpq/ntpq-subs.c
@@ -60,6 +60,8 @@ static	int	doprintpeers	(struct varlist *, int, int, int, const char *, FILE *,
 static	int	dogetpeers	(struct varlist *, associd_t, FILE *, int);
 static	void	dopeers 	(int, FILE *, int);
 static	void	peers		(struct parse *, FILE *);
+static	void	doapeers 	(int, FILE *, int);
+static	void	apeers		(struct parse *, FILE *);
 static	void	lpeers		(struct parse *, FILE *);
 static	void	doopeers	(int, FILE *, int);
 static	void	opeers		(struct parse *, FILE *);
@@ -156,6 +158,9 @@ struct xcmd opcmds[] = {
 	{ "peers",  peers,      { OPT|IP_VERSION, NO, NO, NO },
 	  { "-4|-6", "", "", "" },
 	  "obtain and print a list of the server's peers [IP version]" },
+	{ "apeers",  apeers,      { OPT|IP_VERSION, NO, NO, NO },
+	  { "-4|-6", "", "", "" },
+	  "obtain and print a list of the server's peers and their assocIDs [IP version]" },
 	{ "lpeers", lpeers,     { OPT|IP_VERSION, NO, NO, NO },
 	  { "-4|-6", "", "", "" },
 	  "obtain and print a list of all peers and clients [IP version]" },
@@ -1559,6 +1564,26 @@ struct varlist peervarlist[] = {
 	{ 0,		0 }
 };
 
+struct varlist apeervarlist[] = {
+	{ "srcadr",	0 },	/* 0 */
+	{ "refid",	0 },	/* 1 */
+	{ "assid",	0 },	/* 2 */
+	{ "stratum",	0 },	/* 3 */
+	{ "hpoll",	0 },	/* 4 */
+	{ "ppoll",	0 },	/* 5 */
+	{ "reach",	0 },	/* 6 */
+	{ "delay",	0 },	/* 7 */
+	{ "offset",	0 },	/* 8 */
+	{ "jitter",	0 },	/* 9 */
+	{ "dispersion", 0 },	/* 10 */
+	{ "rec",	0 },	/* 11 */
+	{ "reftime",	0 },	/* 12 */
+	{ "srcport",	0 },	/* 13 */
+	{ "hmode",	0 },	/* 14 */
+	{ "srchost",	0 },	/* 15 */
+	{ 0,		0 }
+};
+
 
 /*
  * Decode an incoming data buffer and print a line in the peer list
@@ -1629,7 +1654,7 @@ doprintpeers(
 				fprintf(stderr, "malformed %s=%s\n",
 					name, value);
 		} else if (!strcmp("srchost", name)) {
-			if (pvl == peervarlist) {
+			if (pvl == peervarlist || pvl == apeervarlist) {
 				len = strlen(value);
 				if (2 < len &&
 				    (size_t)len < sizeof(clock_name)) {
@@ -1675,6 +1700,35 @@ doprintpeers(
 				} else {
 					have_da_rid = FALSE;
 				}
+			} else if (pvl == apeervarlist) {
+				have_da_rid = TRUE;
+				drlen = strlen(value);
+				if (0 == drlen) {
+					dstadr_refid = "";
+				} else if (drlen <= 4) {
+					ZERO(u32);
+					memcpy(&u32, value, drlen);
+					dstadr_refid = refid_str(u32, 1);
+					//fprintf(stderr, "apeervarlist S1 refid: value=<%s>\n", value);
+				} else if (decodenetnum(value, &refidadr)) {
+					if (SOCK_UNSPEC(&refidadr))
+						dstadr_refid = "0.0.0.0";
+					else if (ISREFCLOCKADR(&refidadr))
+						dstadr_refid =
+						    refnumtoa(&refidadr);
+					else {
+						char *buf = emalloc(10);
+						int i = ntohl(refidadr.sa4.sin_addr.s_addr);
+
+						snprintf(buf, 10,
+							"%0x", i);
+						dstadr_refid = buf;
+					//fprintf(stderr, "apeervarlist refid: value=<%x>\n", i);
+					}
+					//fprintf(stderr, "apeervarlist refid: value=<%s>\n", value);
+				} else {
+					have_da_rid = FALSE;
+				}
 			}
 		} else if (!strcmp("stratum", name)) {
 			decodeuint(value, &stratum);
@@ -1691,8 +1745,8 @@ doprintpeers(
 		} else if (!strcmp("offset", name)) {
 			decodetime(value, &estoffset);
 		} else if (!strcmp("jitter", name)) {
-			if (pvl == peervarlist &&
-			    decodetime(value, &estjitter))
+			if ((pvl == peervarlist || pvl == apeervarlist)
+			    && decodetime(value, &estjitter))
 				have_jitter = 1;
 		} else if (!strcmp("rootdisp", name) ||
 			   !strcmp("dispersion", name)) {
@@ -1705,6 +1759,8 @@ doprintpeers(
 		} else if (!strcmp("reftime", name)) {
 			if (!decodets(value, &reftime))
 				L_CLR(&reftime);
+		} else {
+			// fprintf(stderr, "UNRECOGNIZED name=%s ", name);
 		}
 	}
 
@@ -1756,7 +1812,8 @@ doprintpeers(
 	else
 		c = flash2[CTL_PEER_STATVAL(rstatus) & 0x3];
 	if (numhosts > 1) {
-		if (peervarlist == pvl && have_dstadr) {
+		if ((pvl == peervarlist || pvl == apeervarlist)
+		    && have_dstadr) {
 			serverlocal = nntohost_col(&dstadr,
 			    (size_t)min(LIB_BUFLENGTH - 1, maxhostlen),
 			    TRUE);
@@ -1783,8 +1840,14 @@ doprintpeers(
 			drlen = strlen(dstadr_refid);
 			makeascii(drlen, dstadr_refid, fp);
 		}
-		while (drlen++ < 15)
-			fputc(' ', fp);
+		if (pvl == apeervarlist) {
+			while (drlen++ < 9)
+				fputc(' ', fp);
+			fprintf(fp, "%-6d", associd);
+		} else {
+			while (drlen++ < 15)
+				fputc(' ', fp);
+		}
 		fprintf(fp,
 			" %2ld %c %4.4s %4.4s  %3lo  %7.7s %8.7s %7.7s\n",
 			stratum, type,
@@ -1903,6 +1966,60 @@ dopeers(
 }
 
 
+/*
+ * doapeers - print a peer spreadsheet with assocIDs
+ */
+static void
+doapeers(
+	int showall,
+	FILE *fp,
+	int af
+	)
+{
+	u_int		u;
+	char		fullname[LENHOSTNAME];
+	sockaddr_u	netnum;
+	const char *	name_or_num;
+	size_t		sl;
+
+	if (!dogetassoc(fp))
+		return;
+
+	for (u = 0; u < numhosts; u++) {
+		if (getnetnum(chosts[u].name, &netnum, fullname, af)) {
+			name_or_num = nntohost(&netnum);
+			sl = strlen(name_or_num);
+			maxhostlen = max(maxhostlen, sl);
+		}
+	}
+	if (numhosts > 1)
+		fprintf(fp, "%-*.*s ", (int)maxhostlen, (int)maxhostlen,
+			"server (local)");
+	fprintf(fp,
+		"     remote       refid   assid  st t when poll reach   delay   offset  jitter\n");
+	if (numhosts > 1)
+		for (u = 0; u <= maxhostlen; u++)
+			fprintf(fp, "=");
+	fprintf(fp,
+		"==============================================================================\n");
+
+	for (u = 0; u < numassoc; u++) {
+		if (!showall &&
+		    !(CTL_PEER_STATVAL(assoc_cache[u].status)
+		      & (CTL_PST_CONFIG|CTL_PST_REACH))) {
+			if (debug)
+				fprintf(stderr, "eliding [%d]\n",
+					(int)assoc_cache[u].assid);
+			continue;
+		}
+		if (!dogetpeers(apeervarlist, (int)assoc_cache[u].assid,
+				fp, af))
+			return;
+	}
+	return;
+}
+
+
 /*
  * peers - print a peer spreadsheet
  */
@@ -1925,6 +2042,28 @@ peers(
 }
 
 
+/*
+ * apeers - print a peer spreadsheet, with assocIDs
+ */
+/*ARGSUSED*/
+static void
+apeers(
+	struct parse *pcmd,
+	FILE *fp
+	)
+{
+	int af = 0;
+
+	if (pcmd->nargs == 1) {
+		if (pcmd->argval->ival == 6)
+			af = AF_INET6;
+		else
+			af = AF_INET;
+	}
+	doapeers(0, fp, af);
+}
+
+
 /*
  * lpeers - print a peer spreadsheet including all fuzzball peers
  */
@@ -3002,7 +3141,7 @@ mrulist(
 		goto cleanup_return;
 
 	/* construct an array of entry pointers in default order */
-	sorted = emalloc(mru_count * sizeof(*sorted));
+	sorted = eallocarray(mru_count, sizeof(*sorted));
 	ppentry = sorted;
 	if (MRUSORT_R_DEF != order) {
 		ITER_DLIST_BEGIN(mru_list, recent, mlink, mru)
@@ -3099,7 +3238,7 @@ validate_ifnum(
 {
 	if (prow->ifnum == ifnum)
 		return;
-	if (prow->ifnum + 1 == ifnum) {
+	if (prow->ifnum + 1 <= ifnum) {
 		if (*pfields < IFSTATS_FIELDS)
 			fprintf(fp, "Warning: incomplete row with %d (of %d) fields",
 				*pfields, IFSTATS_FIELDS);
@@ -3245,6 +3384,7 @@ ifstats(
 		case 'n':
 			if (1 == sscanf(tag, name_fmt, &ui)) {
 				/* strip quotes */
+				INSIST(val);
 				len = strlen(val);
 				if (len >= 2 &&
 				    len - 2 < sizeof(row.name)) {
diff --git a/contrib/ntp/ntpq/ntpq.1ntpqman b/contrib/ntp/ntpq/ntpq.1ntpqman
index 444a91f4e9a2..afdd8cbecdbe 100644
--- a/contrib/ntp/ntpq/ntpq.1ntpqman
+++ b/contrib/ntp/ntpq/ntpq.1ntpqman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpq 1ntpqman "07 Apr 2015" "4.2.8p2" "User Commands"
+.TH ntpq 1ntpqman "29 Jun 2015" "4.2.8p3" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-SOays6/ag-4Oaqr6)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-6GaipG/ag-fHaaoG)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:27:03 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:31:32 PM by AutoGen 5.18.5
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -267,7 +267,9 @@ switch.
 This command allows the specification of a key number to be
 used to authenticate configuration requests.
 This must correspond
-to a key number the server has been configured to use for this
+to the
+\f\*[B-Font]controlkey\f[]
+key number the server has been configured to use for this
 purpose.
 .br
 .ns
@@ -665,6 +667,17 @@ jitter
 .br
 .ns
 .TP 10
+.NOP \f\*[B-Font]apeers\f[]
+Display a list of peers in the form:
+.Dl [tally]remote refid assid st t when pool reach delay offset jitter
+where the output is just like the
+\f\*[B-Font]peers\f[]
+command except that the
+\f\*[B-Font]refid\f[]
+is displayed in hex format and the association number is also displayed.
+.br
+.ns
+.TP 10
 .NOP \f\*[B-Font]pstats\f[] \f\*[I-Font]assocID\f[]
 Show the statistics for the peer with the given
 \f\*[I-Font]assocID\f[].
@@ -735,7 +748,7 @@ appears in the
 configuration file.
 \f\*[I-Font]filename\f[]
 can use
-\fCstrftime\fR()\f[]
+\fCstrftime\f[]\fR()\f[]
 format specifies to substitute the current date and time, for example,
 \f\*[B-Font]q]saveconfig\f[] \f\*[B-Font]ntp-%Y%m%d-%H%M%S.confq]\f[].
 The filename used is stored in system variable
diff --git a/contrib/ntp/ntpq/ntpq.1ntpqmdoc b/contrib/ntp/ntpq/ntpq.1ntpqmdoc
index d28b09eadbde..4ed69cf03e4c 100644
--- a/contrib/ntp/ntpq/ntpq.1ntpqmdoc
+++ b/contrib/ntp/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:27:09 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:31:41 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -224,7 +224,9 @@ switch.
 This command allows the specification of a key number to be
 used to authenticate configuration requests.
 This must correspond
-to a key number the server has been configured to use for this
+to the
+.Cm controlkey
+key number the server has been configured to use for this
 purpose.
 .It Ic keytype Xo Oo
 .Cm md5 |
@@ -504,6 +506,14 @@ offset of server relative to this host
 .It Ic jitter
 jitter
 .El
+.It Ic apeers
+Display a list of peers in the form:
+.Dl [tally]remote refid assid st t when pool reach delay offset jitter
+where the output is just like the
+.Ic peers
+command except that the
+.Ic refid
+is displayed in hex format and the association number is also displayed.
 .It Ic pstats Ar assocID
 Show the statistics for the peer with the given
 .Ar assocID .
diff --git a/contrib/ntp/ntpq/ntpq.c b/contrib/ntp/ntpq/ntpq.c
index 90cae41b1ca3..af5f6815c4f8 100644
--- a/contrib/ntp/ntpq/ntpq.c
+++ b/contrib/ntp/ntpq/ntpq.c
@@ -21,6 +21,7 @@
 #include 
 
 #include "ntpq.h"
+#include "ntp_assert.h"
 #include "ntp_stdlib.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"
@@ -32,13 +33,13 @@
 #ifdef OPENSSL
 #include "openssl/evp.h"
 #include "openssl/objects.h"
+#include "openssl/err.h"
 #endif
 #include 
 
 #include "ntp_libopts.h"
 #include "ntpq-opts.h"
 
-
 #ifdef SYS_VXWORKS		/* vxWorks needs mode flag -casey*/
 # define open(name, flags)   open(name, flags, 0777)
 # define SERVER_PORT_NUM     123
@@ -218,6 +219,13 @@ static	int	assoccmp	(const void *, const void *);
 
 void	ntpq_custom_opt_handler	(tOptions *, tOptDesc *);
 
+#ifdef OPENSSL
+# ifdef HAVE_EVP_MD_DO_ALL_SORTED
+static void list_md_fn(const EVP_MD *m, const char *from,
+		       const char *to, void *arg );
+# endif
+#endif
+static char *list_digest_names(void);
 
 /*
  * Built-in commands we understand
@@ -275,8 +283,8 @@ struct xcmd builtins[] = {
 	  { "version number", "", "", "" },
 	  "set the NTP version number to use for requests" },
 	{ "keytype",	keytype,	{ OPT|NTP_STR, NO, NO, NO },
-	  { "key type (md5|des)", "", "", "" },
-	  "set key type to use for authenticated requests (des|md5)" },
+	  { "key type %s", "", "", "" },
+	  NULL },
 	{ 0,		0,		{ NO, NO, NO, NO },
 	  { "", "", "", "" }, "" }
 };
@@ -458,6 +466,35 @@ ntpqmain(
 	if (!ipv6_works)
 		ai_fam_default = AF_INET;
 
+	/* Fixup keytype's help based on available digest names */
+
+	{
+	    char *list;
+	    char *msg, *fmt;
+
+	    list = list_digest_names();
+	    for (icmd = 0; icmd < sizeof(builtins)/sizeof(builtins[0]); icmd++) {
+		if (strcmp("keytype", builtins[icmd].keyword) == 0)
+		    break;
+	    }
+
+	    /* CID: 1295478 */
+	    /* This should only "trip" if "keytype" is removed from builtins */
+	    INSIST(icmd < sizeof(builtins)/sizeof(builtins[0]));
+
+#ifdef OPENSSL
+	    builtins[icmd].desc[0] = "digest-name";
+	    fmt = "set key type to use for authenticated requests, one of:%s";
+#else
+	    builtins[icmd].desc[0] = "md5";
+	    fmt = "set key type to use for authenticated requests (%s)";
+#endif
+	    msg = malloc(strlen(fmt) + strlen(list) - strlen("%s") +1);
+	    sprintf(msg, fmt, list);
+	    builtins[icmd].comment = msg;
+	    free(list);
+	}
+
 	progname = argv[0];
 
 	{
@@ -2408,11 +2445,11 @@ keytype(
 	key_type = keytype_from_text(digest_name, &digest_len);
 
 	if (!key_type) {
-		fprintf(fp, "keytype must be 'md5'%s\n",
+		fprintf(fp, "keytype is not valid. "
 #ifdef OPENSSL
-			" or a digest type provided by OpenSSL");
+			"Type \"help keytype\" for the available digest types.\n");
 #else
-			"");
+			"Only \"md5\" is available.\n");
 #endif
 		return;
 	}
@@ -3424,3 +3461,104 @@ ntpq_custom_opt_handler(
 		break;
 	}
 }
+/*
+ * Obtain list of digest names
+ */
+
+#ifdef OPENSSL
+# ifdef HAVE_EVP_MD_DO_ALL_SORTED
+struct hstate {
+   char *list;
+   const char **seen;
+   int idx;
+};
+#define K_PER_LINE 8
+#define K_NL_PFX_STR "\n    "
+#define K_DELIM_STR ", "
+static void list_md_fn(const EVP_MD *m, const char *from, const char *to, void *arg )
+{
+    size_t len, n;
+    const char *name, *cp, **seen;
+    struct hstate *hstate = arg;
+    EVP_MD_CTX ctx;
+    u_int digest_len;
+    u_char digest[EVP_MAX_MD_SIZE];
+
+    if (!m)
+        return; /* Ignore aliases */
+
+    name = EVP_MD_name(m);
+
+    /* Lowercase names aren't accepted by keytype_from_text in ssl_init.c */
+
+    for( cp = name; *cp; cp++ ) {
+	if( islower(*cp) )
+	    return;
+    }
+    len = (cp - name) + 1;
+
+    /* There are duplicates.  Discard if name has been seen. */
+
+    for (seen = hstate->seen; *seen; seen++)
+        if (!strcmp(*seen, name))
+	    return;
+    n = (seen - hstate->seen) + 2;
+    hstate->seen = realloc(hstate->seen, n * sizeof(*seen));
+    hstate->seen[n-2] = name;
+    hstate->seen[n-1] = NULL;
+
+    /* Discard MACs that NTP won't accept.
+     * Keep this consistent with keytype_from_text() in ssl_init.c.
+     */
+
+    EVP_DigestInit(&ctx, EVP_get_digestbyname(name));
+    EVP_DigestFinal(&ctx, digest, &digest_len);
+    if (digest_len > (MAX_MAC_LEN - sizeof(keyid_t)))
+        return;
+
+    if (hstate->list != NULL)
+	len += strlen(hstate->list);
+    len += (hstate->idx >= K_PER_LINE)? strlen(K_NL_PFX_STR): strlen(K_DELIM_STR);
+
+    if (hstate->list == NULL) {
+	hstate->list = (char *)malloc(len);
+	hstate->list[0] = '\0';
+    } else
+	hstate->list = (char *)realloc(hstate->list, len);
+
+    sprintf(hstate->list + strlen(hstate->list), "%s%s",
+	    ((hstate->idx >= K_PER_LINE)? K_NL_PFX_STR : K_DELIM_STR),
+	    name);
+    if (hstate->idx >= K_PER_LINE)
+	hstate->idx = 1;
+    else
+	hstate->idx++;
+}
+# endif
+#endif
+
+static char *list_digest_names(void)
+{
+    char *list = NULL;
+
+#ifdef OPENSSL
+# ifdef HAVE_EVP_MD_DO_ALL_SORTED
+    struct hstate hstate = { NULL, NULL, K_PER_LINE+1 };
+
+    hstate.seen = (const char **)calloc(1, sizeof( const char * ));
+
+    INIT_SSL();
+    EVP_MD_do_all_sorted(list_md_fn, &hstate);
+    list = hstate.list;
+    free(hstate.seen);
+# else
+    list = (char *)malloc(sizeof("md5, others (upgrade to OpenSSL-1.0 for full list)"));
+    strcpy(list, "md5, others (upgrade to OpenSSL-1.0 for full list)");
+# endif
+#else
+    list = (char *)malloc(sizeof("md5"));
+    strcpy(list, "md5");
+#endif
+
+    return list;
+}
diff --git a/contrib/ntp/ntpq/ntpq.html b/contrib/ntp/ntpq/ntpq.html
index 5d7a8f3c54bd..e567419f6ed0 100644
--- a/contrib/ntp/ntpq/ntpq.html
+++ b/contrib/ntp/ntpq/ntpq.html
@@ -44,7 +44,7 @@ monitor the operational status
 and determine the performance of
 ntpd, the NTP daemon.
 
-  
    This document applies to version 4.2.8p2 of ntpq.
+  
    This document applies to version 4.2.8p3 of ntpq.
 
 
      
 
    • ntpq Description
@@ -284,7 +284,9 @@ switch.
 
      keyid keyid
      This command allows the specification of a key number to be
 used to authenticate configuration requests. 
 This must correspond
-to a key number the server has been configured to use for this
+to the
+controlkey
+key number the server has been configured to use for this
 purpose. 
 
      keytype [md5 | OpenSSLDigestType]
      Specify the type of key to use for authenticating requests. 
 md5
@@ -484,7 +486,15 @@ multicast server
 
      offset
      offset of server relative to this host
 
      jitter
      jitter
 
-     
      pstats assocID
      Show the statistics for the peer with the given
+     
      apeers
      Display a list of peers in the form:
+     
                [tally]remote refid assid st t when pool reach delay offset jitter
+     
      
+     
      where the output is just like the
+peers
+command except that the
+refid
+is displayed in hex format and the association number is also displayed. 
+
      pstats assocID
      Show the statistics for the peer with the given
 assocID. 
 
      readlist assocID
      rl assocID
      Read the system or peer variables included in the variable list. 
 
      readvar assocID name[=value] [, ...]
      rv assocID name[=value] [, ...]
      Display the specified variables. 
@@ -759,7 +769,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
      ntpq - standard NTP query program - Ver. 4.2.8p2-RC3
+
      ntpq - standard NTP query program - Ver. 4.2.8p3-RC3
 Usage:  ntpq [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/contrib/ntp/ntpq/ntpq.man.in b/contrib/ntp/ntpq/ntpq.man.in
index c5b9fb560a3e..7d5dcd32f4bf 100644
--- a/contrib/ntp/ntpq/ntpq.man.in
+++ b/contrib/ntp/ntpq/ntpq.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpq @NTPQ_MS@ "07 Apr 2015" "4.2.8p2" "User Commands"
+.TH ntpq @NTPQ_MS@ "29 Jun 2015" "4.2.8p3" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-SOays6/ag-4Oaqr6)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-6GaipG/ag-fHaaoG)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:27:03 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:31:32 PM by AutoGen 5.18.5
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -267,7 +267,9 @@ switch.
 This command allows the specification of a key number to be
 used to authenticate configuration requests.
 This must correspond
-to a key number the server has been configured to use for this
+to the
+\f\*[B-Font]controlkey\f[]
+key number the server has been configured to use for this
 purpose.
 .br
 .ns
@@ -665,6 +667,17 @@ jitter
 .br
 .ns
 .TP 10
+.NOP \f\*[B-Font]apeers\f[]
+Display a list of peers in the form:
+.Dl [tally]remote refid assid st t when pool reach delay offset jitter
+where the output is just like the
+\f\*[B-Font]peers\f[]
+command except that the
+\f\*[B-Font]refid\f[]
+is displayed in hex format and the association number is also displayed.
+.br
+.ns
+.TP 10
 .NOP \f\*[B-Font]pstats\f[] \f\*[I-Font]assocID\f[]
 Show the statistics for the peer with the given
 \f\*[I-Font]assocID\f[].
@@ -735,7 +748,7 @@ appears in the
 configuration file.
 \f\*[I-Font]filename\f[]
 can use
-\fCstrftime\fR()\f[]
+\fCstrftime\f[]\fR()\f[]
 format specifies to substitute the current date and time, for example,
 \f\*[B-Font]q]saveconfig\f[] \f\*[B-Font]ntp-%Y%m%d-%H%M%S.confq]\f[].
 The filename used is stored in system variable
diff --git a/contrib/ntp/ntpq/ntpq.mdoc.in b/contrib/ntp/ntpq/ntpq.mdoc.in
index 32224f2bb6e9..69c28e4acf59 100644
--- a/contrib/ntp/ntpq/ntpq.mdoc.in
+++ b/contrib/ntp/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:27:09 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:31:41 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -224,7 +224,9 @@ switch.
 This command allows the specification of a key number to be
 used to authenticate configuration requests.
 This must correspond
-to a key number the server has been configured to use for this
+to the
+.Cm controlkey
+key number the server has been configured to use for this
 purpose.
 .It Ic keytype Xo Oo
 .Cm md5 |
@@ -504,6 +506,14 @@ offset of server relative to this host
 .It Ic jitter
 jitter
 .El
+.It Ic apeers
+Display a list of peers in the form:
+.Dl [tally]remote refid assid st t when pool reach delay offset jitter
+where the output is just like the
+.Ic peers
+command except that the
+.Ic refid
+is displayed in hex format and the association number is also displayed.
 .It Ic pstats Ar assocID
 Show the statistics for the peer with the given
 .Ar assocID .
diff --git a/contrib/ntp/ntpsnmpd/Makefile.in b/contrib/ntp/ntpsnmpd/Makefile.in
index de2a81c80fd1..34a267f6e992 100644
--- a/contrib/ntp/ntpsnmpd/Makefile.in
+++ b/contrib/ntp/ntpsnmpd/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -21,6 +20,61 @@
 
 
 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@
@@ -40,10 +94,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 EXTRA_PROGRAMS = ntpsnmpd$(EXEEXT)
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/bincheck.mf $(top_srcdir)/check-libopts.mf \
-	$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \
-	$(top_srcdir)/sntp/check-libntp.mf
 subdir = ntpsnmpd
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -75,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -84,6 +135,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -101,9 +153,22 @@ ntpsnmpd_DEPENDENCIES = ../ntpq/libntpq.a ../libntp/libntp.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -114,24 +179,25 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(ntpsnmpd_SOURCES)
 DIST_SOURCES = $(ntpsnmpd_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -153,13 +219,40 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man1_MANS) $(man8_MANS) $(man_MANS)
 DATA = $(html_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/bincheck.mf \
+	$(top_srcdir)/check-libopts.mf $(top_srcdir)/depsver.mf \
+	$(top_srcdir)/includes.mf $(top_srcdir)/sntp/check-libntp.mf \
+	$(top_srcdir)/sntp/libevent/build-aux/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -210,6 +303,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -326,6 +420,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -501,7 +596,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/bincheck.mf $(top_sr
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ntpsnmpd/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign ntpsnmpd/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -510,6 +604,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/bincheck.mf $(top_srcdir)/sntp/check-libntp.mf $(top_srcdir)/check-libopts.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -521,14 +616,19 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -549,7 +649,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -564,14 +665,19 @@ clean-binPROGRAMS:
 	rm -f $$list
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -592,7 +698,8 @@ uninstall-libexecPROGRAMS:
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
@@ -607,14 +714,19 @@ clean-libexecPROGRAMS:
 	rm -f $$list
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -635,7 +747,8 @@ uninstall-sbinPROGRAMS:
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
@@ -648,7 +761,8 @@ clean-sbinPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-ntpsnmpd$(EXEEXT): $(ntpsnmpd_OBJECTS) $(ntpsnmpd_DEPENDENCIES) 
+
+ntpsnmpd$(EXEEXT): $(ntpsnmpd_OBJECTS) $(ntpsnmpd_DEPENDENCIES) $(EXTRA_ntpsnmpd_DEPENDENCIES) 
 	@rm -f ntpsnmpd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ntpsnmpd_OBJECTS) $(ntpsnmpd_LDADD) $(LIBS)
 
@@ -666,26 +780,23 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -694,11 +805,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1='$(man1_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -727,16 +845,21 @@ uninstall-man1:
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1='$(man8_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -765,13 +888,14 @@ uninstall-man8:
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 install-htmlDATA: $(html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -785,30 +909,17 @@ uninstall-htmlDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -820,15 +931,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -837,24 +944,26 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -903,10 +1012,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -999,25 +1113,27 @@ uninstall-man: uninstall-man1 uninstall-man8
 
 .MAKE: all check install install-am install-exec-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libexecPROGRAMS clean-libtool \
-	clean-sbinPROGRAMS ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-hook install-html install-html-am \
-	install-htmlDATA install-info install-info-am \
-	install-libexecPROGRAMS install-man install-man1 install-man8 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-sbinPROGRAMS install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+	clean-libtool clean-sbinPROGRAMS cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-hook \
+	install-html install-html-am install-htmlDATA install-info \
+	install-info-am install-libexecPROGRAMS install-man \
+	install-man1 install-man8 install-pdf install-pdf-am \
+	install-ps install-ps-am install-sbinPROGRAMS install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-htmlDATA uninstall-libexecPROGRAMS uninstall-man \
 	uninstall-man1 uninstall-man8 uninstall-sbinPROGRAMS
 
+.PRECIOUS: Makefile
+
 
 install-data-local: install-html
 
diff --git a/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi b/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
index addadab55bd0..c38de6ecba11 100644
--- a/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
+++ b/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsnmpd.texi)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:27:22 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:31:53 PM by AutoGen 5.18.5
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -47,7 +47,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p2
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p3
 Usage:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c b/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
index 7e0d34ce7454..dbad371a1409 100644
--- a/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
+++ b/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *
- *  It has been AutoGen-ed  April  7, 2015 at 04:27:12 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  June 29, 2015 at 04:31:44 PM by AutoGen 5.18.5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -61,7 +61,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpsnmpd options
  */
 static char const ntpsnmpd_opt_strs[1610] =
-/*     0 */ "ntpsnmpd 4.2.8p2\n"
+/*     0 */ "ntpsnmpd 4.2.8p3\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -101,14 +101,14 @@ static char const ntpsnmpd_opt_strs[1610] =
 /*  1414 */ "no-load-opts\0"
 /*  1427 */ "no\0"
 /*  1430 */ "NTPSNMPD\0"
-/*  1439 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p2\n"
+/*  1439 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p3\n"
             "Usage:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  1542 */ "$HOME\0"
 /*  1548 */ ".\0"
 /*  1550 */ ".ntprc\0"
 /*  1557 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1591 */ "\n\0"
-/*  1593 */ "ntpsnmpd 4.2.8p2";
+/*  1593 */ "ntpsnmpd 4.2.8p3";
 
 /**
  *  nofork option description:
@@ -355,7 +355,7 @@ doUsageOpt(tOptions * opts, tOptDesc * od)
     (void)opts;
     (void)od;
 }
-/* extracted from optmain.tlib near line 1245 */
+/* extracted from optmain.tlib near line 1250 */
 
 /**
  * The directory containing the data associated with ntpsnmpd.
@@ -468,11 +468,11 @@ AO_gettext(char const * pz)
     if (option_xlateable_txt.field_ct != 0) {
         res = dgettext("libopts", pz);
         if (res == pz)
-            res = (char *)(void *)_(pz);
+            res = (char *)VOIDP(_(pz));
     } else
-        res = (char *)(void *)_(pz);
+        res = (char *)VOIDP(_(pz));
 #else
-    res = (char *)(void *)_(pz);
+    res = (char *)VOIDP(_(pz));
 #endif
     if (res == pz)
         return res;
@@ -509,7 +509,7 @@ translate_option_strings(void)
          *  Do the translations.  The first pointer follows the field count
          *  field.  The field count field is the size of a pointer.
          */
-        char ** ppz = (char**)(void*)&(option_xlateable_txt);
+        char ** ppz = (char**)VOIDP(&(option_xlateable_txt));
         int     ix  = option_xlateable_txt.field_ct;
 
         do {
@@ -519,16 +519,16 @@ translate_option_strings(void)
         /* prevent re-translation and disable "libopts" domain lookup */
         option_xlateable_txt.field_ct = 0;
 
-        coerce_it((void*)&(opts->pzCopyright));
-        coerce_it((void*)&(opts->pzCopyNotice));
-        coerce_it((void*)&(opts->pzFullVersion));
-        coerce_it((void*)&(opts->pzUsageTitle));
-        coerce_it((void*)&(opts->pzExplain));
-        coerce_it((void*)&(opts->pzDetail));
+        coerce_it(VOIDP(&(opts->pzCopyright)));
+        coerce_it(VOIDP(&(opts->pzCopyNotice)));
+        coerce_it(VOIDP(&(opts->pzFullVersion)));
+        coerce_it(VOIDP(&(opts->pzUsageTitle)));
+        coerce_it(VOIDP(&(opts->pzExplain)));
+        coerce_it(VOIDP(&(opts->pzDetail)));
         {
             tOptDesc * od = opts->pOptDesc;
             for (ix = opts->optCt; ix > 0; ix--, od++)
-                coerce_it((void*)&(od->pzText));
+                coerce_it(VOIDP(&(od->pzText)));
         }
     }
 }
@@ -554,7 +554,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpsnmpdOptions.pzCopyright */
-  puts(_("ntpsnmpd 4.2.8p2\n\
+  puts(_("ntpsnmpd 4.2.8p3\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -599,14 +599,14 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpsnmpdOptions.pzUsageTitle */
-  puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p2\n\
+  puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p3\n\
 Usage:  %s [ - [] | --[{=| }] ]...\n"));
 
   /* referenced via ntpsnmpdOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntpsnmpdOptions.pzFullVersion */
-  puts(_("ntpsnmpd 4.2.8p2"));
+  puts(_("ntpsnmpd 4.2.8p3"));
 
   /* referenced via ntpsnmpdOptions.pzFullUsage */
   puts(_("<<>>"));
@@ -632,7 +632,7 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2014 by Bruce Korb - all rights reserved\n"));
-#line 82 "../makeshell.c"
+#line 87 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
@@ -656,9 +656,9 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 89 "../makeshell.c"
+#line 94 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 301 "../makeshell.c"
+#line 306 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -736,9 +736,9 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("standard output"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("standard output"));
 #line 274 "../usage.c"
   puts(_("standard output"));
@@ -756,9 +756,9 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("write"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("write"));
 #line 273 "../usage.c"
   puts(_("write"));
@@ -810,7 +810,7 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
 #line 380 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 916 "../makeshell.c"
+#line 921 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
diff --git a/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h b/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
index 54696153edee..c5000c85bcd6 100644
--- a/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
+++ b/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *
- *  It has been AutoGen-ed  April  7, 2015 at 04:27:12 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  June 29, 2015 at 04:31:44 PM by AutoGen 5.18.5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -76,9 +76,9 @@ typedef enum {
 /** count of all options for ntpsnmpd */
 #define OPTION_CT    8
 /** ntpsnmpd version */
-#define NTPSNMPD_VERSION       "4.2.8p2"
+#define NTPSNMPD_VERSION       "4.2.8p3"
 /** Full ntpsnmpd version text */
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.8p2"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.8p3"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index 9724e26e3519..aaf0297c1af4 100644
--- a/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsnmpd 1ntpsnmpdman "07 Apr 2015" "4.2.8p2" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "29 Jun 2015" "4.2.8p3" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-wFai4a/ag-JFaa3a)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-_XaaxH/ag-lYa4vH)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:27:19 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:31:50 PM by AutoGen 5.18.5
 .\" From the definitions ntpsnmpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -36,7 +36,7 @@ All arguments must be options.
 .SH DESCRIPTION
 \f\*[B-Font]ntpsnmpd\fP
 is an SNMP MIB agent designed to interface with
-\fCntpd\fR(1ntpdmdoc)\f[].
+\fCntpd\f[]\fR(1ntpdmdoc)\f[].
 .SH "OPTIONS"
 .TP
 .NOP \f\*[B-Font]\-n\f[], \f\*[B-Font]\-\-nofork\f[]
@@ -109,7 +109,7 @@ when the NTPv4 MIB RFC is standardized.
 .ne 2
 
 If you have
-\fCsnmpwalk\fR(1)\f[]
+\fCsnmpwalk\f[]\fR(1)\f[]
 installed you can run
 .Dl % snmpwalk \-v2c \-c public localhost enterprises.5597.99
 to see a list of all currently supported NTP MIB objects
diff --git a/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index 7326bee98960..b93deaf4b9d5 100644
--- a/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:27:25 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:31:56 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/ntpsnmpd/ntpsnmpd.html b/contrib/ntp/ntpsnmpd/ntpsnmpd.html
index 9d570bb6b046..668eca6fed24 100644
--- a/contrib/ntp/ntpsnmpd/ntpsnmpd.html
+++ b/contrib/ntp/ntpsnmpd/ntpsnmpd.html
@@ -42,7 +42,7 @@ Up: (dir)
 
      The ntpsnmpd utility program is used to monitor NTP daemon ntpd
 operations and determine performance.  It uses the standard NTP mode 6 control
 
-  
      This document applies to version 4.2.8p2 of ntpsnmpd.
+  
      This document applies to version 4.2.8p3 of ntpsnmpd.
 
 
        
 
      • ntpsnmpd Description:             Description
diff --git a/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in b/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
index 15ee8a20286c..9db71b97f843 100644
--- a/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
+++ b/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsnmpd @NTPSNMPD_MS@ "07 Apr 2015" "4.2.8p2" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "29 Jun 2015" "4.2.8p3" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-wFai4a/ag-JFaa3a)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-_XaaxH/ag-lYa4vH)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:27:19 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:31:50 PM by AutoGen 5.18.5
 .\" From the definitions ntpsnmpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -36,7 +36,7 @@ All arguments must be options.
 .SH DESCRIPTION
 \f\*[B-Font]ntpsnmpd\fP
 is an SNMP MIB agent designed to interface with
-\fCntpd\fR(@NTPD_MS@)\f[].
+\fCntpd\f[]\fR(@NTPD_MS@)\f[].
 .SH "OPTIONS"
 .TP
 .NOP \f\*[B-Font]\-n\f[], \f\*[B-Font]\-\-nofork\f[]
@@ -109,7 +109,7 @@ when the NTPv4 MIB RFC is standardized.
 .ne 2
 
 If you have
-\fCsnmpwalk\fR(1)\f[]
+\fCsnmpwalk\f[]\fR(1)\f[]
 installed you can run
 .Dl % snmpwalk \-v2c \-c public localhost enterprises.5597.99
 to see a list of all currently supported NTP MIB objects
diff --git a/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in b/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
index 5bf8bb998e7b..343b1fa0fa80 100644
--- a/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:27:25 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:31:56 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/packageinfo.sh b/contrib/ntp/packageinfo.sh
index 81106fe40be6..444ad4de7109 100644
--- a/contrib/ntp/packageinfo.sh
+++ b/contrib/ntp/packageinfo.sh
@@ -83,7 +83,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=2
+point=3
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/contrib/ntp/parseutil/Makefile.in b/contrib/ntp/parseutil/Makefile.in
index 999f4f1cc0fd..c550bd2c9ce5 100644
--- a/contrib/ntp/parseutil/Makefile.in
+++ b/contrib/ntp/parseutil/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -16,6 +15,61 @@
 @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@
@@ -35,8 +89,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 EXTRA_PROGRAMS = testdcf$(EXEEXT) dcfd$(EXEEXT)
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf
 subdir = parseutil
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -68,6 +120,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -77,6 +130,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -88,14 +142,27 @@ dcfd_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 dcfd_DEPENDENCIES = ../libntp/libntp.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 testdcf_SOURCES = testdcf.c
 testdcf_OBJECTS = testdcf.$(OBJEXT)
 testdcf_LDADD = $(LDADD)
 testdcf_DEPENDENCIES = ../libntp/libntp.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -106,26 +173,47 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = dcfd.c testdcf.c
 DIST_SOURCES = dcfd.c testdcf.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \
+	$(top_srcdir)/includes.mf \
+	$(top_srcdir)/sntp/libevent/build-aux/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -176,6 +264,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -292,6 +381,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -417,7 +507,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_src
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign parseutil/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign parseutil/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -426,6 +515,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -444,10 +534,12 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-dcfd$(EXEEXT): $(dcfd_OBJECTS) $(dcfd_DEPENDENCIES) 
+
+dcfd$(EXEEXT): $(dcfd_OBJECTS) $(dcfd_DEPENDENCIES) $(EXTRA_dcfd_DEPENDENCIES) 
 	@rm -f dcfd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(dcfd_OBJECTS) $(dcfd_LDADD) $(LIBS)
-testdcf$(EXEEXT): $(testdcf_OBJECTS) $(testdcf_DEPENDENCIES) 
+
+testdcf$(EXEEXT): $(testdcf_OBJECTS) $(testdcf_DEPENDENCIES) $(EXTRA_testdcf_DEPENDENCIES) 
 	@rm -f testdcf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(testdcf_OBJECTS) $(testdcf_LDADD) $(LIBS)
 
@@ -463,26 +555,23 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -490,26 +579,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -521,15 +599,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -538,6 +612,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -589,10 +678,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -680,9 +774,9 @@ uninstall-am:
 
 .MAKE: all check check-am install install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
-	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
-	distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \
+	clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -692,7 +786,9 @@ uninstall-am:
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 check-local: @DCFD@
diff --git a/contrib/ntp/parseutil/dcfd.c b/contrib/ntp/parseutil/dcfd.c
index 652b375f78d7..969c1e3863c7 100644
--- a/contrib/ntp/parseutil/dcfd.c
+++ b/contrib/ntp/parseutil/dcfd.c
@@ -13,7 +13,7 @@
  * Lacks:
  *  Leap second handling (at that level you should switch to NTP Version 4 - really!)
  *
- * Copyright (c) 1995-2005 by Frank Kardel  ntp.org>
+ * Copyright (c) 1995-2015 by Frank Kardel  ntp.org>
  * Copyright (c) 1989-1994 by Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg, Germany
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/contrib/ntp/parseutil/testdcf.c b/contrib/ntp/parseutil/testdcf.c
index 00bf05937fab..e876c4406dbf 100644
--- a/contrib/ntp/parseutil/testdcf.c
+++ b/contrib/ntp/parseutil/testdcf.c
@@ -5,7 +5,7 @@
  *
  * simple DCF77 100/200ms pulse test program (via 50Baud serial line)
  *
- * Copyright (c) 1995-2005 by Frank Kardel  ntp.org>
+ * Copyright (c) 1995-2015 by Frank Kardel  ntp.org>
  * Copyright (c) 1989-1994 by Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg, Germany
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/contrib/ntp/scripts/Makefile.in b/contrib/ntp/scripts/Makefile.in
index c0ff722108e0..9fc296bcebe4 100644
--- a/contrib/ntp/scripts/Makefile.in
+++ b/contrib/ntp/scripts/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -17,6 +16,61 @@
 
 
 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@
@@ -36,9 +90,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = scripts
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/ntpver.in $(srcdir)/plot_summary.in \
-	$(srcdir)/summary.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
@@ -69,6 +120,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -78,26 +130,39 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = ntpver plot_summary summary
 CONFIG_CLEAN_VPATH_FILES =
 SCRIPTS = $(noinst_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -119,6 +184,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
 man8dir = $(mandir)/man8
@@ -127,12 +198,34 @@ MANS = $(man1_MANS) $(man8_MANS)
 DATA = $(noinst_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/ntpver.in \
+	$(srcdir)/plot_summary.in $(srcdir)/summary.in README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -208,6 +301,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -324,6 +418,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -516,7 +611,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign scripts/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -548,9 +642,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man1_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
+	@list1='$(man1_MANS)'; \
+	list2=''; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -577,14 +680,21 @@ uninstall-man1:
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man8_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
+	@list1='$(man8_MANS)'; \
+	list2=''; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -611,27 +721,28 @@ uninstall-man8:
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -646,57 +757,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -712,12 +778,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -729,15 +790,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -746,24 +803,26 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -795,13 +854,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -839,10 +895,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -923,24 +984,24 @@ uninstall-am: uninstall-man
 
 uninstall-man: uninstall-man1 uninstall-man8
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-man1 \
-	install-man8 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-man uninstall-man1 \
-	uninstall-man8
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-man1 install-man8 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am uninstall-man \
+	uninstall-man1 uninstall-man8
+
+.PRECIOUS: Makefile
 
 
 install-data-local: install-html
diff --git a/contrib/ntp/scripts/build/Makefile.in b/contrib/ntp/scripts/build/Makefile.in
index 2f6b0260d065..3d52e817de7d 100644
--- a/contrib/ntp/scripts/build/Makefile.in
+++ b/contrib/ntp/scripts/build/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -16,6 +15,61 @@
 @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@
@@ -35,8 +89,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = scripts/build
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/mkver.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
@@ -67,6 +119,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -76,19 +129,33 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = mkver
 CONFIG_CLEAN_VPATH_FILES =
 SCRIPTS = $(noinst_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/mkver.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -139,6 +206,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -255,6 +323,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -383,7 +452,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/build/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign scripts/build/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -409,11 +477,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -460,10 +528,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -544,15 +617,18 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/contrib/ntp/scripts/calc_tickadj/Makefile.in b/contrib/ntp/scripts/calc_tickadj/Makefile.in
index 154e4a3a0493..c1b6576b0289 100644
--- a/contrib/ntp/scripts/calc_tickadj/Makefile.in
+++ b/contrib/ntp/scripts/calc_tickadj/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -17,6 +16,61 @@
 
 
 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@
@@ -37,8 +91,6 @@ build_triplet = @build@
 host_triplet = @host@
 @WANT_CALC_TICKADJ_MS_FALSE@am__append_1 = calc_tickadj.
 subdir = scripts/calc_tickadj
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/calc_tickadj.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
@@ -69,6 +121,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -78,6 +131,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = calc_tickadj
@@ -103,23 +157,42 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man8dir)"
 SCRIPTS = $(bin_SCRIPTS) $(libexec_SCRIPTS) $(sbin_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man1_MANS) $(man8_MANS) $(man_MANS)
 DATA = $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/calc_tickadj.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -170,6 +243,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -286,6 +360,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -452,7 +527,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/calc_tickadj/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign scripts/calc_tickadj/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -474,8 +548,11 @@ calc_tickadj: $(top_builddir)/config.status $(srcdir)/calc_tickadj.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -503,13 +580,14 @@ uninstall-binSCRIPTS:
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 install-libexecSCRIPTS: $(libexec_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -537,13 +615,14 @@ uninstall-libexecSCRIPTS:
 	@list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
+	dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir)
 install-sbinSCRIPTS: $(sbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -571,9 +650,7 @@ uninstall-sbinSCRIPTS:
 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+	dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -582,11 +659,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1='$(man1_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -615,16 +699,21 @@ uninstall-man1:
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1='$(man8_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -653,30 +742,15 @@ uninstall-man8:
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -723,10 +797,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -812,19 +891,22 @@ uninstall-man: uninstall-man1 uninstall-man8
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binSCRIPTS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libexecSCRIPTS install-man install-man1 install-man8 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-sbinSCRIPTS install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \
-	uninstall-libexecSCRIPTS uninstall-man uninstall-man1 \
-	uninstall-man8 uninstall-sbinSCRIPTS
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binSCRIPTS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libexecSCRIPTS install-man \
+	install-man1 install-man8 install-pdf install-pdf-am \
+	install-ps install-ps-am install-sbinSCRIPTS install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-binSCRIPTS uninstall-libexecSCRIPTS \
+	uninstall-man uninstall-man1 uninstall-man8 \
+	uninstall-sbinSCRIPTS
+
+.PRECIOUS: Makefile
 
 
 calc_tickadj: $(srcdir)/calc_tickadj-opts
diff --git a/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman b/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
index e5008ccc700a..8649b811be38 100644
--- a/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
+++ b/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH calc_tickadj 1calc_tickadjman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH calc_tickadj 1calc_tickadjman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-_1aOBS/ag-n2aWAS)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-XJaWrs/ag-9Ja4qs)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:04 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:26:21 PM by AutoGen 5.18.5
 .\" From the definitions calc_tickadj-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc b/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
index 7135beb2bdba..79a1cc6d4523 100644
--- a/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
+++ b/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (calc_tickadj-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:21:08 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:26:25 PM by AutoGen 5.18.5
 .\"  From the definitions    calc_tickadj-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html b/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
index b64096d9269e..c0493a40df66 100644
--- a/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
+++ b/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
@@ -31,7 +31,7 @@ Up: (dir)
 
        calc_tickadj User's Manual
        
 
 
        This document describes the use of the NTP Project's calc_tickadj program. 
-This document applies to version 4.2.8p2 of calc_tickadj.
+This document applies to version 4.2.8p3 of calc_tickadj.
 
   
        
 
        Short Contents
        
diff --git a/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in b/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
index e5008ccc700a..8649b811be38 100644
--- a/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
+++ b/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH calc_tickadj 1calc_tickadjman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH calc_tickadj 1calc_tickadjman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-_1aOBS/ag-n2aWAS)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-XJaWrs/ag-9Ja4qs)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:04 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:26:21 PM by AutoGen 5.18.5
 .\" From the definitions calc_tickadj-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in b/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
index 7135beb2bdba..79a1cc6d4523 100644
--- a/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
+++ b/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (calc_tickadj-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:21:08 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:26:25 PM by AutoGen 5.18.5
 .\"  From the definitions    calc_tickadj-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi b/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
index c9e44b82ca93..f1d7c71143cd 100644
--- a/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
+++ b/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-calc_tickadj.texi)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:09 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:26:27 PM by AutoGen 5.18.5
 # From the definitions    calc_tickadj-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/contrib/ntp/scripts/invoke-plot_summary.texi b/contrib/ntp/scripts/invoke-plot_summary.texi
index 48ea5b48e1e7..09bb00bcb3c7 100644
--- a/contrib/ntp/scripts/invoke-plot_summary.texi
+++ b/contrib/ntp/scripts/invoke-plot_summary.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-plot_summary.texi)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:51 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:27:09 PM by AutoGen 5.18.5
 # From the definitions    plot_summary-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -41,7 +41,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-plot_summary - plot statistics generated by summary script - Ver. 4.2.8p2
+plot_summary - plot statistics generated by summary script - Ver. 4.2.8p3
 USAGE: plot_summary [ - [] | --[@{=| @}] ]... 
 
         --directory=str          Where the summary files are
diff --git a/contrib/ntp/scripts/invoke-summary.texi b/contrib/ntp/scripts/invoke-summary.texi
index 16fc2220a82e..41563725ad7b 100644
--- a/contrib/ntp/scripts/invoke-summary.texi
+++ b/contrib/ntp/scripts/invoke-summary.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-summary.texi)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:57 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:27:14 PM by AutoGen 5.18.5
 # From the definitions    summary-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -42,7 +42,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-summary - compute various stastics from NTP stat files - Ver. 4.2.8p2
+summary - compute various stastics from NTP stat files - Ver. 4.2.8p3
 USAGE: summary [ - [] | --[@{=| @}] ]... 
 
         --directory=str          Directory containing stat files
diff --git a/contrib/ntp/scripts/lib/Makefile.in b/contrib/ntp/scripts/lib/Makefile.in
index 2b0f097ad839..8b05f29af53e 100644
--- a/contrib/ntp/scripts/lib/Makefile.in
+++ b/contrib/ntp/scripts/lib/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -16,6 +15,61 @@
 @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@
@@ -35,7 +89,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = scripts/lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
@@ -66,6 +119,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -75,18 +129,30 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -108,8 +174,16 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(perllibdir)"
 DATA = $(nobase_perllib_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -160,6 +234,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -276,6 +351,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -390,7 +466,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/lib/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign scripts/lib/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -416,15 +491,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-nobase_perllibDATA: $(nobase_perllib_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)"
 	@list='$(nobase_perllib_DATA)'; test -n "$(perllibdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(perllibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(perllibdir)" || exit 1; \
+	fi; \
 	$(am__nobase_list) | while read dir files; do \
 	  xfiles=; for file in $$files; do \
 	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
 	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
 	  test -z "$$xfiles" || { \
 	    test "x$$dir" = x. || { \
-	      echo "$(MKDIR_P) '$(DESTDIR)$(perllibdir)/$$dir'"; \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(perllibdir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(perllibdir)/$$dir"; }; \
 	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(perllibdir)/$$dir'"; \
 	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(perllibdir)/$$dir" || exit $$?; }; \
@@ -434,14 +512,12 @@ uninstall-nobase_perllibDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(nobase_perllib_DATA)'; test -n "$(perllibdir)" || list=; \
 	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(perllibdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(perllibdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(perllibdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -491,10 +567,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -575,17 +656,19 @@ uninstall-am: uninstall-nobase_perllibDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
 	install-nobase_perllibDATA install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-nobase_perllibDATA
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-nobase_perllibDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/contrib/ntp/scripts/lib/NTP/Util.pm b/contrib/ntp/scripts/lib/NTP/Util.pm
index cd2f9e5a7a5d..f37aeaa65446 100644
--- a/contrib/ntp/scripts/lib/NTP/Util.pm
+++ b/contrib/ntp/scripts/lib/NTP/Util.pm
@@ -139,7 +139,7 @@ sub ntp_sntp_line {
         my @output = split / /;
 
         $offset = $output[3];
-        ($stratum = pop @output) =~ s/s(\d{1,2})/$1/;
+        ($stratum = $output[7]) =~ s/s(\d{1,2})/$1/;
     }
     close $fh or croak "running sntp failed: $! (exit status $?)";
     return ($offset, $stratum);
diff --git a/contrib/ntp/scripts/ntp-wait/Makefile.in b/contrib/ntp/scripts/ntp-wait/Makefile.in
index a18414da0912..9b0b1b64b8a7 100644
--- a/contrib/ntp/scripts/ntp-wait/Makefile.in
+++ b/contrib/ntp/scripts/ntp-wait/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -17,6 +16,61 @@
 
 
 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@
@@ -36,8 +90,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = scripts/ntp-wait
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/ntp-wait.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
@@ -68,6 +120,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -77,6 +130,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = ntp-wait
@@ -102,23 +156,42 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(htmldir)"
 SCRIPTS = $(bin_SCRIPTS) $(libexec_SCRIPTS) $(sbin_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man1_MANS) $(man8_MANS) $(man_MANS)
 DATA = $(html_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/ntp-wait.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -169,6 +242,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -285,6 +359,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -446,7 +521,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/ntp-wait/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign scripts/ntp-wait/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -468,8 +542,11 @@ ntp-wait: $(top_builddir)/config.status $(srcdir)/ntp-wait.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -497,13 +574,14 @@ uninstall-binSCRIPTS:
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 install-libexecSCRIPTS: $(libexec_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -531,13 +609,14 @@ uninstall-libexecSCRIPTS:
 	@list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
+	dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir)
 install-sbinSCRIPTS: $(sbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -565,9 +644,7 @@ uninstall-sbinSCRIPTS:
 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+	dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -576,11 +653,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1='$(man1_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -609,16 +693,21 @@ uninstall-man1:
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1='$(man8_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -647,13 +736,14 @@ uninstall-man8:
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 install-htmlDATA: $(html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -667,30 +757,15 @@ uninstall-htmlDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -737,10 +812,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -826,20 +906,23 @@ uninstall-man: uninstall-man1 uninstall-man8
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binSCRIPTS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-htmlDATA install-info install-info-am \
-	install-libexecSCRIPTS install-man install-man1 install-man8 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-sbinSCRIPTS install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binSCRIPTS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-htmlDATA \
+	install-info install-info-am install-libexecSCRIPTS \
+	install-man install-man1 install-man8 install-pdf \
+	install-pdf-am install-ps install-ps-am install-sbinSCRIPTS \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am uninstall-binSCRIPTS \
 	uninstall-htmlDATA uninstall-libexecSCRIPTS uninstall-man \
 	uninstall-man1 uninstall-man8 uninstall-sbinSCRIPTS
 
+.PRECIOUS: Makefile
+
 
 ntp-wait: $(srcdir)/ntp-wait-opts
 
diff --git a/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi b/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
index 9053e8af9f54..5d5948e7f325 100644
--- a/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
+++ b/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-wait.texi)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:17 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:26:33 PM by AutoGen 5.18.5
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -61,7 +61,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p2
+ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p3
 USAGE: ntp-wait [ - [] | --[@{=| @}] ]... 
 
     -n, --tries=num              Number of times to check ntpd
diff --git a/contrib/ntp/scripts/ntp-wait/ntp-wait-opts b/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
index ff99fe57db35..ebb947c56014 100644
--- a/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
+++ b/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (ntp-wait-opts)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:11 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:26:28 PM by AutoGen 5.18.5
 # From the definitions    ntp-wait-opts.def
 # and the template file   perlopt
 
@@ -40,7 +40,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p2
+ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p3
 USAGE: ntp-wait [ - [] | --[{=| }] ]... 
 
     -n, --tries=num              Number of times to check ntpd
diff --git a/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman b/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
index 65a97fd18c27..bc7fda666d75 100644
--- a/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
+++ b/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-wait 1ntp-waitman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH ntp-wait 1ntp-waitman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-CkaW1T/ag-Oka40T)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-OSaORt/ag-0SaWQt)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:13 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:26:30 PM by AutoGen 5.18.5
 .\" From the definitions ntp-wait-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -38,11 +38,11 @@ All arguments must be options.
 will send at most
 \f\*[I-Font]num-tries\f[]
 queries to
-\fCntpd\fR(8)\f[],
+\fCntpd\f[]\fR(8)\f[],
 sleeping for
 \f\*[I-Font]secs-between-tries\f[]
 after each status return that says
-\fCntpd\fR(8)\f[]
+\fCntpd\f[]\fR(8)\f[]
 has not yet produced a synchronized and stable system clock.
 .sp \n(Ppu
 .ne 2
diff --git a/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc b/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
index 1340e5a22203..9149cfd53db1 100644
--- a/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
+++ b/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTP_WAIT 1ntp-waitmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:21:20 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:26:36 PM by AutoGen 5.18.5
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/ntp-wait/ntp-wait.html b/contrib/ntp/scripts/ntp-wait/ntp-wait.html
index 7cc8b992a1bf..e9c063b843be 100644
--- a/contrib/ntp/scripts/ntp-wait/ntp-wait.html
+++ b/contrib/ntp/scripts/ntp-wait/ntp-wait.html
@@ -39,7 +39,7 @@ until the system's time has stabilized and synchronized,
 and only then start any applicaitons (like database servers) that require
 accurate and stable time.
 
-  
        This document applies to version 4.2.8p2 of ntp-wait.
+  
        This document applies to version 4.2.8p3 of ntp-wait.
 
 
        
 
        Short Contents
        
@@ -114,7 +114,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
        ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p2
+
        ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p3
 USAGE: ntp-wait [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
 
     -n, --tries=num              Number of times to check ntpd
diff --git a/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in b/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
index a4edec4dc6e2..b58a569975aa 100644
--- a/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
+++ b/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-wait @NTP_WAIT_MS@ "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-CkaW1T/ag-Oka40T)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-OSaORt/ag-0SaWQt)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:13 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:26:30 PM by AutoGen 5.18.5
 .\" From the definitions ntp-wait-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -38,11 +38,11 @@ All arguments must be options.
 will send at most
 \f\*[I-Font]num-tries\f[]
 queries to
-\fCntpd\fR(8)\f[],
+\fCntpd\f[]\fR(8)\f[],
 sleeping for
 \f\*[I-Font]secs-between-tries\f[]
 after each status return that says
-\fCntpd\fR(8)\f[]
+\fCntpd\f[]\fR(8)\f[]
 has not yet produced a synchronized and stable system clock.
 .sp \n(Ppu
 .ne 2
diff --git a/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in b/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
index c61340d0528b..19e1bdff0e40 100644
--- a/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
+++ b/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:21:20 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:26:36 PM by AutoGen 5.18.5
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/ntpsweep/Makefile.in b/contrib/ntp/scripts/ntpsweep/Makefile.in
index 38af36a85869..0bfc785448e7 100644
--- a/contrib/ntp/scripts/ntpsweep/Makefile.in
+++ b/contrib/ntp/scripts/ntpsweep/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -17,6 +16,61 @@
 
 
 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@
@@ -36,8 +90,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = scripts/ntpsweep
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/ntpsweep.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
@@ -68,6 +120,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -77,6 +130,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = ntpsweep
@@ -102,24 +156,43 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(htmldir)"
 SCRIPTS = $(bin_SCRIPTS) $(libexec_SCRIPTS) $(noinst_SCRIPTS) \
 	$(sbin_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man1_MANS) $(man8_MANS) $(man_MANS)
 DATA = $(html_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/ntpsweep.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -170,6 +243,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -286,6 +360,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -451,7 +526,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/ntpsweep/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign scripts/ntpsweep/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -473,8 +547,11 @@ ntpsweep: $(top_builddir)/config.status $(srcdir)/ntpsweep.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -502,13 +579,14 @@ uninstall-binSCRIPTS:
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 install-libexecSCRIPTS: $(libexec_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -536,13 +614,14 @@ uninstall-libexecSCRIPTS:
 	@list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
+	dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir)
 install-sbinSCRIPTS: $(sbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -570,9 +649,7 @@ uninstall-sbinSCRIPTS:
 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+	dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -581,11 +658,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1='$(man1_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -614,16 +698,21 @@ uninstall-man1:
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1='$(man8_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -652,13 +741,14 @@ uninstall-man8:
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 install-htmlDATA: $(html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -672,30 +762,15 @@ uninstall-htmlDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -742,10 +817,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -832,20 +912,23 @@ uninstall-man: uninstall-man1 uninstall-man8
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binSCRIPTS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-htmlDATA install-info install-info-am \
-	install-libexecSCRIPTS install-man install-man1 install-man8 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-sbinSCRIPTS install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binSCRIPTS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-htmlDATA \
+	install-info install-info-am install-libexecSCRIPTS \
+	install-man install-man1 install-man8 install-pdf \
+	install-pdf-am install-ps install-ps-am install-sbinSCRIPTS \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am uninstall-binSCRIPTS \
 	uninstall-htmlDATA uninstall-libexecSCRIPTS uninstall-man \
 	uninstall-man1 uninstall-man8 uninstall-sbinSCRIPTS
 
+.PRECIOUS: Makefile
+
 
 ntpsweep: $(srcdir)/ntpsweep-opts
 
diff --git a/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi b/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
index 207577a436d7..810ca0817cc8 100644
--- a/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
+++ b/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsweep.texi)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:23 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:26:39 PM by AutoGen 5.18.5
 # From the definitions    ntpsweep-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -45,7 +45,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p2
+ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p3
 USAGE: ntpsweep [ - [] | --[@{=| @}] ]... [hostfile]
 
     -l, --host-list=str          Host to execute actions on
diff --git a/contrib/ntp/scripts/ntpsweep/ntpsweep-opts b/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
index b833b08dca4d..7261dd9fecf2 100644
--- a/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
+++ b/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (ntpsweep-opts)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:21 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:26:38 PM by AutoGen 5.18.5
 # From the definitions    ntpsweep-opts.def
 # and the template file   perlopt
 
@@ -43,7 +43,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p2
+ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p3
 USAGE: ntpsweep [ - [] | --[{=| }] ]... [hostfile]
 
     -l, --host-list=str          Host to execute actions on
diff --git a/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman b/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
index 9ba96830b845..60684d8509b6 100644
--- a/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
+++ b/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsweep 1ntpsweepman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH ntpsweep 1ntpsweepman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-pka4rV/ag-CkaarV)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-JEaGhv/ag-VEaOgv)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:25 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:26:42 PM by AutoGen 5.18.5
 .\" From the definitions ntpsweep-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc b/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
index d933c83a1d0f..d3016a9c2744 100644
--- a/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
+++ b/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTPSWEEP 1ntpsweepmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsweep-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:21:29 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:26:45 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpsweep-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/ntpsweep/ntpsweep.html b/contrib/ntp/scripts/ntpsweep/ntpsweep.html
index 1fc5f54b39a7..c47d36f2a74a 100644
--- a/contrib/ntp/scripts/ntpsweep/ntpsweep.html
+++ b/contrib/ntp/scripts/ntpsweep/ntpsweep.html
@@ -30,7 +30,7 @@ Up: (dir)
 
   
        This document describes the use of the NTP Project's ntpsweep program.
 
-  
        This document applies to version 4.2.8p2 of ntpsweep.
+  
        This document applies to version 4.2.8p3 of ntpsweep.
 
   
        
 
        Short Contents
        
@@ -90,7 +90,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
        ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p2
+
        ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p3
 USAGE: ntpsweep [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostfile]
 
     -l, --host-list=str          Host to execute actions on
diff --git a/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in b/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
index 9ba96830b845..60684d8509b6 100644
--- a/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
+++ b/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsweep 1ntpsweepman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH ntpsweep 1ntpsweepman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-pka4rV/ag-CkaarV)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-JEaGhv/ag-VEaOgv)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:25 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:26:42 PM by AutoGen 5.18.5
 .\" From the definitions ntpsweep-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in b/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
index d933c83a1d0f..d3016a9c2744 100644
--- a/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
+++ b/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTPSWEEP 1ntpsweepmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsweep-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:21:29 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:26:45 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpsweep-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/ntptrace/Makefile.in b/contrib/ntp/scripts/ntptrace/Makefile.in
index 8d7db402d832..b31083d77d17 100644
--- a/contrib/ntp/scripts/ntptrace/Makefile.in
+++ b/contrib/ntp/scripts/ntptrace/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -17,6 +16,61 @@
 
 
 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@
@@ -36,8 +90,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = scripts/ntptrace
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/ntptrace.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
@@ -68,6 +120,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -77,6 +130,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = ntptrace
@@ -102,23 +156,42 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(htmldir)"
 SCRIPTS = $(bin_SCRIPTS) $(libexec_SCRIPTS) $(sbin_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man1_MANS) $(man8_MANS) $(man_MANS)
 DATA = $(html_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/ntptrace.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -169,6 +242,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -285,6 +359,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -445,7 +520,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/ntptrace/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign scripts/ntptrace/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -467,8 +541,11 @@ ntptrace: $(top_builddir)/config.status $(srcdir)/ntptrace.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -496,13 +573,14 @@ uninstall-binSCRIPTS:
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 install-libexecSCRIPTS: $(libexec_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -530,13 +608,14 @@ uninstall-libexecSCRIPTS:
 	@list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
+	dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir)
 install-sbinSCRIPTS: $(sbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -564,9 +643,7 @@ uninstall-sbinSCRIPTS:
 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+	dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -575,11 +652,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1='$(man1_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -608,16 +692,21 @@ uninstall-man1:
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1='$(man8_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -646,13 +735,14 @@ uninstall-man8:
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 install-htmlDATA: $(html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -666,30 +756,15 @@ uninstall-htmlDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -736,10 +811,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -825,20 +905,23 @@ uninstall-man: uninstall-man1 uninstall-man8
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binSCRIPTS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-htmlDATA install-info install-info-am \
-	install-libexecSCRIPTS install-man install-man1 install-man8 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-sbinSCRIPTS install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binSCRIPTS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-htmlDATA \
+	install-info install-info-am install-libexecSCRIPTS \
+	install-man install-man1 install-man8 install-pdf \
+	install-pdf-am install-ps install-ps-am install-sbinSCRIPTS \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am uninstall-binSCRIPTS \
 	uninstall-htmlDATA uninstall-libexecSCRIPTS uninstall-man \
 	uninstall-man1 uninstall-man8 uninstall-sbinSCRIPTS
 
+.PRECIOUS: Makefile
+
 
 ntptrace: $(srcdir)/ntptrace-opts
 
diff --git a/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi b/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
index 58548c11e748..d55d602a740a 100644
--- a/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
+++ b/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntptrace.texi)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:36 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:26:52 PM by AutoGen 5.18.5
 # From the definitions    ntptrace-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -62,7 +62,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntptrace - Trace peers of an NTP server - Ver. 4.2.8p2
+ntptrace - Trace peers of an NTP server - Ver. 4.2.8p3
 USAGE: ntptrace [ - [] | --[@{=| @}] ]... [host]
 
     -n, --numeric                Print IP addresses instead of hostnames
diff --git a/contrib/ntp/scripts/ntptrace/ntptrace-opts b/contrib/ntp/scripts/ntptrace/ntptrace-opts
index 3012392b38ac..679f109f18c6 100644
--- a/contrib/ntp/scripts/ntptrace/ntptrace-opts
+++ b/contrib/ntp/scripts/ntptrace/ntptrace-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (ntptrace-opts)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:31 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:26:46 PM by AutoGen 5.18.5
 # From the definitions    ntptrace-opts.def
 # and the template file   perlopt
 
@@ -40,7 +40,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-ntptrace - Trace peers of an NTP server - Ver. 4.2.8p2
+ntptrace - Trace peers of an NTP server - Ver. 4.2.8p3
 USAGE: ntptrace [ - [] | --[{=| }] ]... [host]
 
     -n, --numeric                Print IP addresses instead of hostnames
diff --git a/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman b/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
index ff02de0e6279..daf73a9dcf1a 100644
--- a/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
+++ b/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntptrace 1ntptraceman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH ntptrace 1ntptraceman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-j_aqKW/ag-w_ayJW)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-RjaOzw/ag-3jaWyw)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:33 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:26:48 PM by AutoGen 5.18.5
 .\" From the definitions ntptrace-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc b/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
index 352b659931ae..ae25afae9510 100644
--- a/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
+++ b/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTPTRACE 1ntptracemdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntptrace-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:21:38 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:26:54 PM by AutoGen 5.18.5
 .\"  From the definitions    ntptrace-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/ntptrace/ntptrace.html b/contrib/ntp/scripts/ntptrace/ntptrace.html
index 86e1a9b4684a..0012517fc639 100644
--- a/contrib/ntp/scripts/ntptrace/ntptrace.html
+++ b/contrib/ntp/scripts/ntptrace/ntptrace.html
@@ -31,7 +31,7 @@ Up: (dir)
 
        Simple Network Time Protocol User Manual
        
 
 
        This document describes the use of the NTP Project's ntptrace program. 
-This document applies to version 4.2.8p2 of ntptrace.
+This document applies to version 4.2.8p3 of ntptrace.
 
   
        
 
        Short Contents
        
@@ -107,7 +107,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
        ntptrace - Trace peers of an NTP server - Ver. 4.2.8p2
+
        ntptrace - Trace peers of an NTP server - Ver. 4.2.8p3
 USAGE: ntptrace [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [host]
 
     -n, --numeric                Print IP addresses instead of hostnames
diff --git a/contrib/ntp/scripts/ntptrace/ntptrace.man.in b/contrib/ntp/scripts/ntptrace/ntptrace.man.in
index f48a071b56d8..56db22ae68eb 100644
--- a/contrib/ntp/scripts/ntptrace/ntptrace.man.in
+++ b/contrib/ntp/scripts/ntptrace/ntptrace.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntptrace @NTPTRACE_MS@ "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH ntptrace @NTPTRACE_MS@ "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-j_aqKW/ag-w_ayJW)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-RjaOzw/ag-3jaWyw)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:33 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:26:48 PM by AutoGen 5.18.5
 .\" From the definitions ntptrace-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in b/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
index c06e718c02b5..6e5a75aa5f92 100644
--- a/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
+++ b/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTPTRACE @NTPTRACE_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntptrace-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:21:38 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:26:54 PM by AutoGen 5.18.5
 .\"  From the definitions    ntptrace-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/plot_summary-opts b/contrib/ntp/scripts/plot_summary-opts
index 3f0389098652..05149f8b2a14 100644
--- a/contrib/ntp/scripts/plot_summary-opts
+++ b/contrib/ntp/scripts/plot_summary-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (plot_summary-opts)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:47 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:27:05 PM by AutoGen 5.18.5
 # From the definitions    plot_summary-opts.def
 # and the template file   perlopt
 
@@ -46,7 +46,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-plot_summary - plot statistics generated by summary script - Ver. 4.2.8p2
+plot_summary - plot statistics generated by summary script - Ver. 4.2.8p3
 USAGE: plot_summary [ - [] | --[{=| }] ]... 
 
         --directory=str          Where the summary files are
diff --git a/contrib/ntp/scripts/plot_summary.1plot_summaryman b/contrib/ntp/scripts/plot_summary.1plot_summaryman
index 03dc6c54ed8a..8abc2f285560 100644
--- a/contrib/ntp/scripts/plot_summary.1plot_summaryman
+++ b/contrib/ntp/scripts/plot_summary.1plot_summaryman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH plot_summary 1plot_summaryman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH plot_summary 1plot_summaryman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-48aGzZ/ag-f9aOyZ)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-8Laipz/ag-iMaqoz)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:53 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:27:11 PM by AutoGen 5.18.5
 .\" From the definitions plot_summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/scripts/plot_summary.1plot_summarymdoc b/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
index 4d7f49228982..3971b7439d0e 100644
--- a/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
+++ b/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (plot_summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:21:55 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:27:13 PM by AutoGen 5.18.5
 .\"  From the definitions    plot_summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/plot_summary.html b/contrib/ntp/scripts/plot_summary.html
index b2fbc66cf6d7..360bdc72fe2f 100644
--- a/contrib/ntp/scripts/plot_summary.html
+++ b/contrib/ntp/scripts/plot_summary.html
@@ -31,7 +31,7 @@ Up: (dir)
 
        Plot_summary User Manual
        
 
 
        This document describes the use of the NTP Project's plot_summary program. 
-This document applies to version 4.2.8p2 of plot_summary.
+This document applies to version 4.2.8p3 of plot_summary.
 
   
        
 
        Short Contents
        
@@ -89,7 +89,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
        plot_summary - plot statistics generated by summary script - Ver. 4.2.8p2
+
        plot_summary - plot statistics generated by summary script - Ver. 4.2.8p3
 USAGE: plot_summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
 
         --directory=str          Where the summary files are
diff --git a/contrib/ntp/scripts/plot_summary.man.in b/contrib/ntp/scripts/plot_summary.man.in
index 03dc6c54ed8a..8abc2f285560 100644
--- a/contrib/ntp/scripts/plot_summary.man.in
+++ b/contrib/ntp/scripts/plot_summary.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH plot_summary 1plot_summaryman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH plot_summary 1plot_summaryman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-48aGzZ/ag-f9aOyZ)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-8Laipz/ag-iMaqoz)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:53 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:27:11 PM by AutoGen 5.18.5
 .\" From the definitions plot_summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/scripts/plot_summary.mdoc.in b/contrib/ntp/scripts/plot_summary.mdoc.in
index 4d7f49228982..3971b7439d0e 100644
--- a/contrib/ntp/scripts/plot_summary.mdoc.in
+++ b/contrib/ntp/scripts/plot_summary.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (plot_summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:21:55 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:27:13 PM by AutoGen 5.18.5
 .\"  From the definitions    plot_summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/summary-opts b/contrib/ntp/scripts/summary-opts
index adb228dcb288..166c01ef2204 100644
--- a/contrib/ntp/scripts/summary-opts
+++ b/contrib/ntp/scripts/summary-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (summary-opts)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:49 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:27:07 PM by AutoGen 5.18.5
 # From the definitions    summary-opts.def
 # and the template file   perlopt
 
@@ -44,7 +44,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-summary - compute various stastics from NTP stat files - Ver. 4.2.8p2
+summary - compute various stastics from NTP stat files - Ver. 4.2.8p3
 USAGE: summary [ - [] | --[{=| }] ]... 
 
         --directory=str          Directory containing stat files
diff --git a/contrib/ntp/scripts/summary.1summaryman b/contrib/ntp/scripts/summary.1summaryman
index d1eeb4898aaa..ab116d524271 100644
--- a/contrib/ntp/scripts/summary.1summaryman
+++ b/contrib/ntp/scripts/summary.1summaryman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH summary 1summaryman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH summary 1summaryman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-jpaiNZ/ag-wpaqMZ)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-B9aWCz/ag-N9a4Bz)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:58 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:27:16 PM by AutoGen 5.18.5
 .\" From the definitions summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/scripts/summary.1summarymdoc b/contrib/ntp/scripts/summary.1summarymdoc
index 3c77a8cceea9..4539660fd584 100644
--- a/contrib/ntp/scripts/summary.1summarymdoc
+++ b/contrib/ntp/scripts/summary.1summarymdoc
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt SUMMARY 1summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:22:00 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:27:18 PM by AutoGen 5.18.5
 .\"  From the definitions    summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/summary.html b/contrib/ntp/scripts/summary.html
index 5326c6a6ce0f..68d1e2343cde 100644
--- a/contrib/ntp/scripts/summary.html
+++ b/contrib/ntp/scripts/summary.html
@@ -31,7 +31,7 @@ Up: (dir)
 
        Summary User Manual
        
 
 
        This document describes the use of the NTP Project's summary program. 
-This document applies to version 4.2.8p2 of summary.
+This document applies to version 4.2.8p3 of summary.
 
   
        
 
        Short Contents
        
@@ -88,7 +88,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
        summary - compute various stastics from NTP stat files - Ver. 4.2.8p2
+
        summary - compute various stastics from NTP stat files - Ver. 4.2.8p3
 USAGE: summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
 
         --directory=str          Directory containing stat files
diff --git a/contrib/ntp/scripts/summary.man.in b/contrib/ntp/scripts/summary.man.in
index d1eeb4898aaa..ab116d524271 100644
--- a/contrib/ntp/scripts/summary.man.in
+++ b/contrib/ntp/scripts/summary.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH summary 1summaryman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH summary 1summaryman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-jpaiNZ/ag-wpaqMZ)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-B9aWCz/ag-N9a4Bz)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:58 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:27:16 PM by AutoGen 5.18.5
 .\" From the definitions summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/scripts/summary.mdoc.in b/contrib/ntp/scripts/summary.mdoc.in
index 3c77a8cceea9..4539660fd584 100644
--- a/contrib/ntp/scripts/summary.mdoc.in
+++ b/contrib/ntp/scripts/summary.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt SUMMARY 1summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:22:00 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:27:18 PM by AutoGen 5.18.5
 .\"  From the definitions    summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/update-leap/Makefile.am b/contrib/ntp/scripts/update-leap/Makefile.am
index 163810233b19..9b5829a0b33c 100644
--- a/contrib/ntp/scripts/update-leap/Makefile.am
+++ b/contrib/ntp/scripts/update-leap/Makefile.am
@@ -28,13 +28,14 @@ endif
 EXTRA_DIST =				\
 	invoke-update-leap.menu		\
 	invoke-update-leap.texi		\
-	update-leap			\
 	update-leap-opts.def		\
 	update-leap-opts		\
 	update-leap.1update-leapman	\
 	update-leap.1update-leapmdoc	\
+	update-leap.in			\
 	update-leap.man.in		\
 	update-leap.mdoc.in		\
+	update-leap.sh			\
 	update-leap.texi		\
 	update-leap.html		\
 	$(NULL)
diff --git a/contrib/ntp/scripts/update-leap/Makefile.in b/contrib/ntp/scripts/update-leap/Makefile.in
index 3ac6ac6949dd..e23edffdb934 100644
--- a/contrib/ntp/scripts/update-leap/Makefile.in
+++ b/contrib/ntp/scripts/update-leap/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -17,6 +16,61 @@
 
 
 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@
@@ -36,7 +90,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = scripts/update-leap
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
@@ -67,6 +120,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -76,9 +130,10 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = update-leap
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -101,24 +156,43 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(htmldir)"
 SCRIPTS = $(bin_SCRIPTS) $(libexec_SCRIPTS) $(noinst_SCRIPTS) \
 	$(sbin_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man1_MANS) $(man8_MANS) $(man_MANS)
 DATA = $(html_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/update-leap.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -169,6 +243,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -285,6 +360,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -407,13 +483,14 @@ man8_MANS =
 EXTRA_DIST = \
 	invoke-update-leap.menu		\
 	invoke-update-leap.texi		\
-	update-leap			\
 	update-leap-opts.def		\
 	update-leap-opts		\
 	update-leap.1update-leapman	\
 	update-leap.1update-leapmdoc	\
+	update-leap.in			\
 	update-leap.man.in		\
 	update-leap.mdoc.in		\
+	update-leap.sh			\
 	update-leap.texi		\
 	update-leap.html		\
 	$(NULL)
@@ -445,7 +522,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/update-leap/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign scripts/update-leap/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -463,10 +539,15 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+update-leap: $(top_builddir)/config.status $(srcdir)/update-leap.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -494,13 +575,14 @@ uninstall-binSCRIPTS:
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 install-libexecSCRIPTS: $(libexec_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -528,13 +610,14 @@ uninstall-libexecSCRIPTS:
 	@list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
+	dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir)
 install-sbinSCRIPTS: $(sbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -562,9 +645,7 @@ uninstall-sbinSCRIPTS:
 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+	dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -573,11 +654,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1='$(man1_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -606,16 +694,21 @@ uninstall-man1:
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1='$(man8_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -644,13 +737,14 @@ uninstall-man8:
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 install-htmlDATA: $(html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -664,30 +758,15 @@ uninstall-htmlDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -734,10 +813,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -823,20 +907,23 @@ uninstall-man: uninstall-man1 uninstall-man8
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binSCRIPTS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-htmlDATA install-info install-info-am \
-	install-libexecSCRIPTS install-man install-man1 install-man8 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-sbinSCRIPTS install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binSCRIPTS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-htmlDATA \
+	install-info install-info-am install-libexecSCRIPTS \
+	install-man install-man1 install-man8 install-pdf \
+	install-pdf-am install-ps install-ps-am install-sbinSCRIPTS \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am uninstall-binSCRIPTS \
 	uninstall-htmlDATA uninstall-libexecSCRIPTS uninstall-man \
 	uninstall-man1 uninstall-man8 uninstall-sbinSCRIPTS
 
+.PRECIOUS: Makefile
+
 
 $(srcdir)/update-leap: $(srcdir)/update-leap-opts
 	@: do-nothing action to avoid default SCCS get
diff --git a/contrib/ntp/scripts/update-leap/invoke-update-leap.texi b/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
index 8fc25dbe9a6d..99babde7d322 100644
--- a/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
+++ b/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-update-leap.texi)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:44 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:26:59 PM by AutoGen 5.18.5
 # From the definitions    update-leap-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -70,7 +70,56 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-/bin/bash: line 136: ./update-leap: Permission denied
+    update-leap
+        Usage: $0 [options] [leapfile]
+
+        Verifies and if necessary, updates leap-second definition file
+
+        All arguments are optional: Default (or current value) shown: -s
+        Specify the URL of the master copy to download $LEAPSRC -d Specify
+        the filename on the local system $LEAPFILE -e Specify how long (in
+        days) before expiration the file is to be refreshed. Note that
+        larger values imply more frequent refreshes. "$PREFETCH" -f Specify
+        location of ntp.conf (used to make sure leapfile directive is
+        present and to default leapfile) $NTPCONF -F Force update even if
+        current file is OK and not close to expiring. -r Specify number of
+        times to retry on get failure $MAXTRIES -i Specify number of minutes
+        between retries $INTERVAL -l Use syslog for output (Implied if
+        CRONJOB is set) -L Don't use syslog for output -P Specify the syslog
+        facility for logging $LOGFAC -t Name of temporary file used in
+        validation $TMPFILE -q Only report errors to stdout -v Verbose
+        output
+
+        The following options are not (yet) implemented in the perl version:
+        -4 Use only IPv4 -6 Use only IPv6 -c Command to restart NTP after
+        installing a new file  - ntpd checks file daily -p 4|6 Prefer
+        IPv4 or IPv6 (as specified) addresses, but use either -z Specify
+        path for utilities $PATHLIST -Z Only use system path
+
+        $0 will validate the file currently on the local system
+
+        Ordinarily, the file is found using the "leapfile" directive in
+        $NTPCONF. However, an alternate location can be specified on the
+        command line.
+
+        If the file does not exist, is not valid, has expired, or is
+        expiring soon, a new copy will be downloaded. If the new copy
+        validates, it is installed and NTP is (optionally) restarted.
+
+        If the current file is acceptable, no download or restart occurs.
+
+        -c can also be used to invoke another script to perform
+        administrative functions, e.g. to copy the file to other local
+        systems.
+
+        This can be run as a cron job. As the file is rarely updated, and
+        leap seconds are announced at least one month in advance (usually
+        longer), it need not be run more frequently than about once every
+        three weeks.
+
+        For cron-friendly behavior, define CRONJOB=1 in the crontab.
+
+        Version $VERSION
 @end example
 @exampleindent 4
 
diff --git a/contrib/ntp/scripts/update-leap/update-leap-opts b/contrib/ntp/scripts/update-leap/update-leap-opts
index 69dba650b8c5..cd5fdea0203e 100644
--- a/contrib/ntp/scripts/update-leap/update-leap-opts
+++ b/contrib/ntp/scripts/update-leap/update-leap-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (update-leap-opts)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:21:40 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:27:05 PM by AutoGen 5.18.5
 # From the definitions    update-leap-opts.def
 # and the template file   perlopt
 
@@ -46,7 +46,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-update-leap - leap-seconds file manager/updater - Ver. 4.2.8p2
+update-leap - leap-seconds file manager/updater - Ver. 4.2.8p3
 USAGE: update-leap [ - [] | --[{=| }] ]... 
 
     -s, --source-url=str         The URL of the master copy of the leapseconds file
diff --git a/contrib/ntp/scripts/update-leap/update-leap.1update-leapman b/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
index a16434777fd3..620b8ad47209 100644
--- a/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
+++ b/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH update-leap 1update-leapman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH update-leap 1update-leapman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-E0ayAX/ag-R0aGzX)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-h5aqpx/ag-t5ayox)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:40 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:26:56 PM by AutoGen 5.18.5
 .\" From the definitions update-leap-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -41,7 +41,7 @@ and if necessary, updates leap-second definition file.
 .ne 2
 
 Ordinarily, the file is found using the "leapfile" directive in
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 However, an alternate location can be specified on the command line.
 .sp \n(Ppu
 .ne 2
diff --git a/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc b/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
index 9fb3a1201334..4b07ff003a26 100644
--- a/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
+++ b/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt UPDATE_LEAP 1update-leapmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (update-leap-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:21:46 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:27:03 PM by AutoGen 5.18.5
 .\"  From the definitions    update-leap-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/update-leap/update-leap.html b/contrib/ntp/scripts/update-leap/update-leap.html
index 3a731ac76066..21bb294651aa 100644
--- a/contrib/ntp/scripts/update-leap/update-leap.html
+++ b/contrib/ntp/scripts/update-leap/update-leap.html
@@ -30,7 +30,7 @@ Up: (dir)
 
   
        This document describes the use of the NTP Project's update-leap program.
 
-  
        This document applies to version 4.2.8p2 of update-leap.
+  
        This document applies to version 4.2.8p3 of update-leap.
 
 
        
 
        Short Contents
        
@@ -114,7 +114,56 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
        /bin/bash: line 136: ./update-leap: Permission denied
+
            update-leap
+        Usage: $0 [options] [leapfile]
+
+        Verifies and if necessary, updates leap-second definition file
+
+        All arguments are optional: Default (or current value) shown: -s
+        Specify the URL of the master copy to download $LEAPSRC -d Specify
+        the filename on the local system $LEAPFILE -e Specify how long (in
+        days) before expiration the file is to be refreshed. Note that
+        larger values imply more frequent refreshes. "$PREFETCH" -f Specify
+        location of ntp.conf (used to make sure leapfile directive is
+        present and to default leapfile) $NTPCONF -F Force update even if
+        current file is OK and not close to expiring. -r Specify number of
+        times to retry on get failure $MAXTRIES -i Specify number of minutes
+        between retries $INTERVAL -l Use syslog for output (Implied if
+        CRONJOB is set) -L Don't use syslog for output -P Specify the syslog
+        facility for logging $LOGFAC -t Name of temporary file used in
+        validation $TMPFILE -q Only report errors to stdout -v Verbose
+        output
+
+        The following options are not (yet) implemented in the perl version:
+        -4 Use only IPv4 -6 Use only IPv6 -c Command to restart NTP after
+        installing a new file <none> - ntpd checks file daily -p 4|6 Prefer
+        IPv4 or IPv6 (as specified) addresses, but use either -z Specify
+        path for utilities $PATHLIST -Z Only use system path
+
+        $0 will validate the file currently on the local system
+
+        Ordinarily, the file is found using the "leapfile" directive in
+        $NTPCONF. However, an alternate location can be specified on the
+        command line.
+
+        If the file does not exist, is not valid, has expired, or is
+        expiring soon, a new copy will be downloaded. If the new copy
+        validates, it is installed and NTP is (optionally) restarted.
+
+        If the current file is acceptable, no download or restart occurs.
+
+        -c can also be used to invoke another script to perform
+        administrative functions, e.g. to copy the file to other local
+        systems.
+
+        This can be run as a cron job. As the file is rarely updated, and
+        leap seconds are announced at least one month in advance (usually
+        longer), it need not be run more frequently than about once every
+        three weeks.
+
+        For cron-friendly behavior, define CRONJOB=1 in the crontab.
+
+        Version $VERSION
 
        
   
        
 
        
diff --git a/contrib/ntp/scripts/update-leap/update-leap.in b/contrib/ntp/scripts/update-leap/update-leap.in
new file mode 100755
index 000000000000..a22b50a5a2be
--- /dev/null
+++ b/contrib/ntp/scripts/update-leap/update-leap.in
@@ -0,0 +1,424 @@
+#! @PATH_PERL@ -w
+
+# Copyright (C) 2015 Network Time Foundation
+# Author: Harlan Stenn
+
+# Original shell version:
+# Copyright (C) 2014 Timothe Litt litt at acm dot org
+
+# This script may be freely copied, used and modified providing that
+# this notice and the copyright statement are included in all copies
+# and derivative works.  No warranty is offered, and use is entirely at
+# your own risk.  Bugfixes and improvements would be appreciated by the
+# author.
+
+use strict;
+
+use Digest::SHA qw(sha1_hex);
+use File::Copy qw(move);
+use File::Fetch;
+use Getopt::Long qw(:config auto_help no_ignore_case bundling);
+use Sys::Syslog;
+
+my $VERSION="1.003";
+
+# leap-seconds file manager/updater
+
+# ########## Default configuration ##########
+#
+
+my $CRONJOB = $ENV{'CRONJOB'};
+$CRONJOB = "" unless defined($CRONJOB);
+my $LOGGER;
+my $QUIET = "";
+my $VERBOSE = "";
+
+# Where to get the file
+my $LEAPSRC="ftp://time.nist.gov/pub/leap-seconds.list";
+my $LEAPFILE;
+
+# How many times to try to download new file
+my $MAXTRIES=6;
+my $INTERVAL=10;
+
+# Where to find ntp config file
+my $NTPCONF="/etc/ntp.conf";
+
+# How long (in days) before expiration to get updated file
+my $PREFETCH="60";
+
+# How to restart NTP - older NTP: service ntpd? try-restart | condrestart
+# Recent NTP checks for new file daily, so there's nothing to do
+my $RESTART="";
+
+my $EXPIRES;
+my $FORCE = "";
+
+# Where to put temporary copy before it's validated
+my $TMPFILE="/tmp/leap-seconds.$$.tmp";
+
+# Syslog facility
+my $LOGFAC="daemon";
+
+# ###########################################
+
+=item update-leap
+
+Usage: $0 [options] [leapfile]
+
+Verifies and if necessary, updates leap-second definition file
+
+All arguments are optional:  Default (or current value) shown:
+    -s    Specify the URL of the master copy to download
+          $LEAPSRC
+    -d    Specify the filename on the local system
+          $LEAPFILE
+    -e    Specify how long (in days) before expiration the file is to be
+    	  refreshed.  Note that larger values imply more frequent refreshes.
+          "$PREFETCH"
+    -f    Specify location of ntp.conf (used to make sure leapfile directive is
+          present and to default  leapfile)
+          $NTPCONF
+    -F    Force update even if current file is OK and not close to expiring.
+    -r    Specify number of times to retry on get failure
+          $MAXTRIES
+    -i    Specify number of minutes between retries
+          $INTERVAL
+    -l    Use syslog for output (Implied if CRONJOB is set)
+    -L    Don't use syslog for output
+    -P    Specify the syslog facility for logging
+          $LOGFAC
+    -t    Name of temporary file used in validation
+          $TMPFILE
+    -q    Only report errors to stdout
+    -v    Verbose output
+
+The following options are not (yet) implemented in the perl version:
+    -4    Use only IPv4
+    -6    Use only IPv6
+    -c    Command to restart NTP after installing a new file
+           - ntpd checks file daily
+    -p 4|6
+          Prefer IPv4 or IPv6 (as specified) addresses, but use either
+    -z    Specify path for utilities
+          $PATHLIST
+    -Z    Only use system path
+
+$0 will validate the file currently on the local system
+
+Ordinarily, the file is found using the "leapfile" directive in $NTPCONF.
+However, an alternate location can be specified on the command line.
+
+If the file does not exist, is not valid, has expired, or is expiring soon,
+a new copy will be downloaded.  If the new copy validates, it is installed and
+NTP is (optionally) restarted.
+
+If the current file is acceptable, no download or restart occurs.
+
+-c can also be used to invoke another script to perform administrative
+functions, e.g. to copy the file to other local systems.
+
+This can be run as a cron job.  As the file is rarely updated, and leap
+seconds are announced at least one month in advance (usually longer), it
+need not be run more frequently than about once every three weeks.
+
+For cron-friendly behavior, define CRONJOB=1 in the crontab.
+
+Version $VERSION
+=cut
+
+# Default: Use syslog for logging if running under cron
+
+my $SYSLOG = $CRONJOB;
+
+# Parse options
+
+our(%opt);
+
+GetOptions(\%opt,
+	'c=s',
+	'e:60',
+	'F',
+	'f=s',
+	'i:10',
+	'L',
+	'l',
+	'P=s',
+	'q',
+	'r:6',
+	's=s',
+	't=s',
+	'v'
+	);
+
+$LOGFAC=$opt{P} if (defined($opt{P}));
+$LEAPSRC=$opt{s} if (defined($opt{s}));
+$PREFETCH=$opt{e} if (defined($opt{e}));
+$NTPCONF=$opt{f} if (defined($opt{f}));
+$FORCE="Y" if (defined($opt{F}));
+$RESTART=$opt{c} if (defined($opt{c}));
+$MAXTRIES=$opt{r} if (defined($opt{r}));
+$INTERVAL=$opt{i} if (defined($opt{i}));
+$TMPFILE=$opt{t} if (defined($opt{t}));
+$SYSLOG="Y" if (defined($opt{l}));
+$SYSLOG="" if (defined($opt{L}));
+$QUIET="Y" if (defined($opt{q}));
+$VERBOSE="Y" if (defined($opt{v}));
+
+# export PATH="$PATHLIST$PATH"
+
+# Handle logging
+
+openlog($0, 'pid', $LOGFAC);
+
+sub logger {
+    my ($priority, $message) = @_;
+
+    # "priority" "message"
+    #
+    # Stdout unless syslog specified or logger isn't available
+    #
+    if ($SYSLOG eq "" or $LOGGER eq "") {
+	if ($QUIET ne "" and ( $priority eq "info" or $priority eq "notice" or $priority eq "debug" ) ) {
+	    return 0
+	}
+	printf "%s: $message\n", uc $priority;
+	return 0;
+    }
+
+    # Also log to stdout if cron job && notice or higher
+    if (($CRONJOB ne "" and ($priority ne "info" ) and ($priority ne "debug" )) || ($VERBOSE ne "")) {
+	# Log to stderr as well
+	print STDERR "$0: $priority: $message\n";
+    }
+    syslog($priority, $message);
+}
+
+# Verify interval
+# INTERVAL=$(( $INTERVAL *1 ))
+
+# Validate a leap-seconds file checksum
+#
+# File format: (full description in files)
+# # marks comments, except:
+# #$ number : the NTP date of the last update
+# #@ number : the NTP date that the file expires
+# Date (seconds since 1900) leaps : leaps is the # of seconds to add for times >= Date
+# Date lines have comments.
+# #h hex hex hex hex hex is the SHA-1 checksum of the data & dates, excluding whitespace w/o leading zeroes
+#
+# Returns:
+#   0	File is valid
+#   1	Invalid Checksum
+#   2	Expired
+
+sub verifySHA {
+    my ($file, $verbose) = @_;
+
+    my $raw = "";
+    my $data = "";
+    my $FSHA;
+
+    # Remove comments, except those that are markers for last update,
+    # expires and hash
+
+    unless (open(LF, $file)) {
+	warn "Can't open <$file>: $!\n";
+	print "Will try and create that file.\n";
+	return 1;
+    };
+    while () {
+	if (/^#\$/) {
+		$raw .= $_;
+		s/^..//;
+		$data .= $_;
+	}
+	elsif (/^#\@/) {
+		$raw .= $_;
+		s/^..//;
+		$data .= $_;
+		s/\s+//g;
+		$EXPIRES = $_ - 2208988800;
+	}
+	elsif (/^#h\s+([[:xdigit:]]+)\s+([[:xdigit:]]+)\s+([[:xdigit:]]+)\s+([[:xdigit:]]+)\s+([[:xdigit:]]+)/) {
+		chomp;
+		$raw .= $_;
+		$FSHA = sprintf("%08s%08s%08s%08s%08s", $1, $2, $3, $4, $5);
+	}
+	elsif (/^#/) {
+		# ignore it
+	}
+	elsif (/^\d/) {
+		s/#.*$//;
+		$raw .= $_;
+		$data .= $_;
+	} else {
+		chomp;
+		print "Unexpected line: <$_>\n";
+	}
+    }
+    close LF;
+
+    # Remove all white space
+    $data =~ s/\s//g;
+
+    # Compute the SHA hash of the data, removing the marker and filename
+    # Computed in binary mode, which shouldn't matter since whitespace has been removed
+
+    my $DSHA = sha1_hex($data);
+
+    # Extract the file's hash. Restore any leading zeroes in hash segments.
+
+    if ( ( "$FSHA" ne "" ) && ( $FSHA eq $DSHA ) ) {
+        if ( $verbose ne "" ) {
+            logger("info", "Checksum of $file validated");
+        }
+    } else {
+        logger("error", "Checksum of $file is invalid:");
+	$FSHA="(no checksum record found in file)"
+	    if ( $FSHA eq "");
+        logger("error", "EXPECTED: $FSHA");
+        logger("error", "COMPUTED: $DSHA");
+        return 1;
+    }
+
+    # Check the expiration date, converting NTP epoch to Unix epoch used by date
+
+    if ( $EXPIRES < time() ) {
+        logger("notice", "File expired on " . gmtime($EXPIRES));
+        return 2;
+    }
+    return 0;
+}
+
+# Verify ntp.conf
+
+-r $NTPCONF || die "Missing ntp configuration: $NTPCONF\n";
+
+# Parse ntp.conf for leapfile directive
+
+open(LF, $NTPCONF) || die "Can't open <$NTPCONF>: $!\n";
+while () {
+    chomp;
+    if (/^ *leapfile\s+(\S+)/) {
+	$LEAPFILE = $1;
+    }
+}
+close LF;
+
+-s $LEAPFILE || warn "$NTPCONF specifies $LEAPFILE as a leapfile, which is empty.\n";
+
+# Allow placing the file someplace else - testing
+
+if ( defined $ARGV[0] ) {
+    if ( $ARGV[0] ne $LEAPFILE ) {
+	logger("notice", "Requested install to $ARGV[0], but $NTPCONF specifies $LEAPFILE");
+    }
+    $LEAPFILE = $ARGV[0];
+}
+
+# Verify the current file
+# If it is missing, doesn't validate or expired
+# Or is expiring soon
+#  Download a new one
+
+if ( $FORCE ne "" || verifySHA($LEAPFILE, $VERBOSE) || ( $EXPIRES lt ( $PREFETCH * 86400 + time() ) )) {
+    my $TRY = 0;
+    my $ff = File::Fetch->new(uri => $LEAPSRC) || die "Fetch failed.\n";
+    while (1) {
+	++$TRY;
+	logger("info", "Attempting download from $LEAPSRC, try $TRY..")
+	    if ($VERBOSE ne "");
+	my $where = $ff->fetch( to => '/tmp' );
+
+        if ($where) {
+            logger("info", "Download of $LEAPSRC succeeded");
+
+            if ( verifySHA($where, $VERBOSE )) {
+		# There is no point in retrying, as the file on the
+		# server is almost certainly corrupt.
+
+                logger("warning", "Downloaded file $where rejected -- saved for diagnosis");
+                exit 1;
+            }
+
+	    # While the shell script version will set correct permissions
+	    # on temporary file, for the perl version that's harder, so
+	    # for now at least one should run this script as the
+	    # appropriate user.
+
+	    # REFFILE="$LEAPFILE"
+            # if [ ! -f $LEAPFILE ]; then
+	    # 	logger "notice" "$LEAPFILE was missing, creating new copy - check permissions"
+            #   touch $LEAPFILE
+	    # 	# Can't copy permissions from old file, copy from NTPCONF instead
+	    # 	REFFILE="$NTPCONF"
+            # fi
+            # chmod --reference $REFFILE $TMPFILE
+            # chown --reference $REFFILE $TMPFILE
+	    # ( which selinuxenabled && selinuxenabled && which chcon ) >/dev/null 2>&1
+            # if  [ $? == 0 ] ; then
+            #     chcon --reference $REFFILE $TMPFILE
+            # fi
+
+	    # Replace current file with validated new one
+
+	    if ( move $where, $LEAPFILE ) {
+                logger("notice", "Installed new $LEAPFILE from $LEAPSRC");
+            } else {
+                logger("error", "Install $where => $LEAPFILE failed -- saved for diagnosis: $!");
+                exit 1;
+            }
+
+	    # Restart NTP (or whatever else is specified)
+
+	    if ( $RESTART ne "" ) {
+		if ( $VERBOSE ne "" ) {
+		    logger("info", "Attempting restart action: $RESTART");
+		}
+
+# XXX
+		#R="$( 2>&1 $RESTART )"
+		#if [ $? -eq 0 ]; then
+		#    logger "notice" "Restart action succeeded"
+		#    if [ -n "$VERBOSE" -a -n "$R" ]; then
+		#	logger "info" "$R"
+		#    fi
+		#else
+		#    logger "error" "Restart action failed"
+		#    if [ -n "$R" ]; then
+		#	logger "error" "$R"
+		#    fi
+		#    exit 2
+		#fi
+	    }
+            exit 0;
+	}
+
+	# Failed to download.  See about trying again
+
+        # rm -f $TMPFILE
+        if ( $TRY ge $MAXTRIES ) {
+            last;
+        }
+        if ( $VERBOSE ne "" ) {
+            logger("info", "Waiting $INTERVAL minutes before retrying...");
+        }
+        sleep $INTERVAL * 60 ;
+    }
+
+    # Failed and out of retries
+
+    logger("warning", "Download from $LEAPSRC failed after $TRY attempts");
+    exit 1;
+}
+
+print "FORCE is <$FORCE>\n";
+print "verifySHA is " . verifySHA($LEAPFILE, "") . "\n";
+print "EXPIRES <$EXPIRES>  vs ". ( $PREFETCH * 86400 + time() ) . "\n";
+
+logger("info", "Not time to replace $LEAPFILE");
+
+exit 0;
+
+# EOF
diff --git a/contrib/ntp/scripts/update-leap/update-leap.man.in b/contrib/ntp/scripts/update-leap/update-leap.man.in
index a16434777fd3..620b8ad47209 100644
--- a/contrib/ntp/scripts/update-leap/update-leap.man.in
+++ b/contrib/ntp/scripts/update-leap/update-leap.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH update-leap 1update-leapman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH update-leap 1update-leapman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-E0ayAX/ag-R0aGzX)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-h5aqpx/ag-t5ayox)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:21:40 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:26:56 PM by AutoGen 5.18.5
 .\" From the definitions update-leap-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -41,7 +41,7 @@ and if necessary, updates leap-second definition file.
 .ne 2
 
 Ordinarily, the file is found using the "leapfile" directive in
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 However, an alternate location can be specified on the command line.
 .sp \n(Ppu
 .ne 2
diff --git a/contrib/ntp/scripts/update-leap/update-leap.mdoc.in b/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
index 9fb3a1201334..4b07ff003a26 100644
--- a/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
+++ b/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt UPDATE_LEAP 1update-leapmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (update-leap-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:21:46 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:27:03 PM by AutoGen 5.18.5
 .\"  From the definitions    update-leap-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/scripts/update-leap/update-leap b/contrib/ntp/scripts/update-leap/update-leap.sh
old mode 100644
new mode 100755
similarity index 100%
rename from contrib/ntp/scripts/update-leap/update-leap
rename to contrib/ntp/scripts/update-leap/update-leap.sh
diff --git a/contrib/ntp/sntp/Makefile.am b/contrib/ntp/sntp/Makefile.am
index 8694ed3e75ca..dfd303a72077 100644
--- a/contrib/ntp/sntp/Makefile.am
+++ b/contrib/ntp/sntp/Makefile.am
@@ -53,8 +53,8 @@ sbin_PROGRAMS =		@SNTP_DS@
 ## recursive make dist in sntp including libevent.
 ##
 
-SUBDIRS = include scripts
-DIST_SUBDIRS = include scripts
+SUBDIRS = include scripts unity
+DIST_SUBDIRS = include scripts unity
 
 if BUILD_LIBEVENT
 SUBDIRS += libevent
@@ -67,10 +67,8 @@ endif
 
 if BUILD_SNTP
 noinst_LIBRARIES = libsntp.a
-if GTEST_AVAILABLE
 SUBDIRS += tests
 endif
-endif
 
 DIST_SUBDIRS += libopts tests
 
@@ -114,6 +112,7 @@ EXTRA_DIST =				\
 	invoke-sntp.menu		\
 	invoke-sntp.texi		\
 	@NTP_FORCE_LIBEVENT_DIST@	\
+	libpkgver 			\
 	loc				\
 	sntp-opts.def			\
 	sntp.1sntpman			\
@@ -122,6 +121,7 @@ EXTRA_DIST =				\
 	sntp.mdoc.in			\
 	sntp.html			\
 	sntp.texi			\
+	unity/auto			\
 	$(srcdir)/scm-rev		\
 	$(srcdir)/m4/version.m4		\
 	$(NULL)
diff --git a/contrib/ntp/sntp/Makefile.in b/contrib/ntp/sntp/Makefile.in
index fac19cc2a50b..c796888e62b5 100644
--- a/contrib/ntp/sntp/Makefile.in
+++ b/contrib/ntp/sntp/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -23,6 +22,61 @@
 
 
 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@
@@ -45,18 +99,7 @@ EXTRA_PROGRAMS = sntp$(EXEEXT)
 @BUILD_LIBEVENT_TRUE@am__append_1 = libevent
 @BUILD_LIBEVENT_TRUE@am__append_2 = libevent
 @NEED_LIBOPTS_TRUE@am__append_3 = libopts
-@BUILD_SNTP_TRUE@@GTEST_AVAILABLE_TRUE@am__append_4 = tests
-DIST_COMMON = $(am__configure_deps) $(noinst_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/bincheck.mf \
-	$(top_srcdir)/check-libntp.mf $(top_srcdir)/check-libopts.mf \
-	$(top_srcdir)/configure $(top_srcdir)/depsver.mf \
-	$(top_srcdir)/includes.mf compile config.guess config.sub \
-	depcomp install-sh libevent/build-aux/compile \
-	libevent/build-aux/config.guess libevent/build-aux/config.sub \
-	libevent/build-aux/depcomp libevent/build-aux/install-sh \
-	libevent/build-aux/ltmain.sh libevent/build-aux/missing \
-	libevent/build-aux/ylwrap ltmain.sh missing
+@BUILD_SNTP_TRUE@am__append_4 = tests
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
@@ -79,6 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/m4/ntp_pkg_config.m4 \
 	$(top_srcdir)/m4/ntp_prog_cc.m4 $(top_srcdir)/m4/ntp_sntp.m4 \
 	$(top_srcdir)/m4/ntp_sysexits.m4 \
+	$(top_srcdir)/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/m4/openldap-thread-check.m4 \
 	$(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/os_cflags.m4 \
@@ -86,6 +130,8 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(noinst_HEADERS) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -94,12 +140,10 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
-AM_V_AR = $(am__v_AR_$(V))
-am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
-am__v_AR_0 = @echo "  AR    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
 libsntp_a_AR = $(AR) $(ARFLAGS)
 libsntp_a_LIBADD =
 am__objects_1 =
@@ -119,9 +163,22 @@ sntp_DEPENDENCIES = version.o libsntp.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) ../libntp/libntp.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/libevent/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -132,28 +189,33 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libsntp_a_SOURCES) $(sntp_SOURCES)
 DIST_SOURCES = $(libsntp_a_SOURCES) $(sntp_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -175,6 +237,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 NROFF = nroff
@@ -183,18 +251,61 @@ DATA = $(html_DATA) $(noinst_DATA)
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/bincheck.mf $(top_srcdir)/check-libntp.mf \
+	$(top_srcdir)/check-libopts.mf $(top_srcdir)/depsver.mf \
+	$(top_srcdir)/includes.mf \
+	$(top_srcdir)/libevent/build-aux/ar-lib \
+	$(top_srcdir)/libevent/build-aux/compile \
+	$(top_srcdir)/libevent/build-aux/config.guess \
+	$(top_srcdir)/libevent/build-aux/config.sub \
+	$(top_srcdir)/libevent/build-aux/depcomp \
+	$(top_srcdir)/libevent/build-aux/install-sh \
+	$(top_srcdir)/libevent/build-aux/ltmain.sh \
+	$(top_srcdir)/libevent/build-aux/missing compile config.guess \
+	config.sub depcomp install-sh libevent/build-aux/ar-lib \
+	libevent/build-aux/compile libevent/build-aux/config.guess \
+	libevent/build-aux/config.sub libevent/build-aux/depcomp \
+	libevent/build-aux/install-sh libevent/build-aux/ltmain.sh \
+	libevent/build-aux/missing libevent/build-aux/ylwrap ltmain.sh \
+	missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -222,7 +333,10 @@ am__relativize = \
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -368,6 +482,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSIX_SHELL = @POSIX_SHELL@
@@ -479,9 +594,9 @@ std_def_list = \
 bin_PROGRAMS = @SNTP_DB@
 libexec_PROGRAMS = @SNTP_DL@
 sbin_PROGRAMS = @SNTP_DS@
-SUBDIRS = include scripts $(am__append_1) $(am__append_3) \
+SUBDIRS = include scripts unity $(am__append_1) $(am__append_3) \
 	$(am__append_4)
-DIST_SUBDIRS = include scripts $(am__append_2) libopts tests
+DIST_SUBDIRS = include scripts unity $(am__append_2) libopts tests
 @BUILD_SNTP_TRUE@noinst_LIBRARIES = libsntp.a
 libsntp_a_SOURCES = \
 	crypto.c		\
@@ -523,6 +638,7 @@ EXTRA_DIST = \
 	invoke-sntp.menu		\
 	invoke-sntp.texi		\
 	@NTP_FORCE_LIBEVENT_DIST@	\
+	libpkgver 			\
 	loc				\
 	sntp-opts.def			\
 	sntp.1sntpman			\
@@ -531,6 +647,7 @@ EXTRA_DIST = \
 	sntp.mdoc.in			\
 	sntp.html			\
 	sntp.texi			\
+	unity/auto			\
 	$(srcdir)/scm-rev		\
 	$(srcdir)/m4/version.m4		\
 	$(NULL)
@@ -565,7 +682,7 @@ all: $(BUILT_SOURCES) config.h
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/bincheck.mf $(top_srcdir)/check-libntp.mf $(top_srcdir)/check-libopts.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__configure_deps)
 	@for dep in $?; do \
@@ -580,7 +697,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/bincheck.mf $(top_sr
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -590,6 +706,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/bincheck.mf $(top_srcdir)/check-libntp.mf $(top_srcdir)/check-libopts.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -601,10 +718,8 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -619,20 +734,26 @@ distclean-hdr:
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libsntp.a: $(libsntp_a_OBJECTS) $(libsntp_a_DEPENDENCIES) 
+
+libsntp.a: $(libsntp_a_OBJECTS) $(libsntp_a_DEPENDENCIES) $(EXTRA_libsntp_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libsntp.a
 	$(AM_V_AR)$(libsntp_a_AR) libsntp.a $(libsntp_a_OBJECTS) $(libsntp_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libsntp.a
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -653,7 +774,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -668,14 +790,19 @@ clean-binPROGRAMS:
 	rm -f $$list
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -696,7 +823,8 @@ uninstall-libexecPROGRAMS:
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
@@ -711,14 +839,19 @@ clean-libexecPROGRAMS:
 	rm -f $$list
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -739,7 +872,8 @@ uninstall-sbinPROGRAMS:
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
@@ -752,7 +886,8 @@ clean-sbinPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-sntp$(EXEEXT): $(sntp_OBJECTS) $(sntp_DEPENDENCIES) 
+
+sntp$(EXEEXT): $(sntp_OBJECTS) $(sntp_DEPENDENCIES) $(EXTRA_sntp_DEPENDENCIES) 
 	@rm -f sntp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sntp_OBJECTS) $(sntp_LDADD) $(LIBS)
 
@@ -774,26 +909,23 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -805,11 +937,18 @@ distclean-libtool:
 	-rm -f libtool config.lt
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1='$(man1_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -838,16 +977,21 @@ uninstall-man1:
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1='$(man8_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -876,13 +1020,14 @@ uninstall-man8:
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 install-htmlDATA: $(html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -896,27 +1041,28 @@ uninstall-htmlDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -931,57 +1077,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -997,12 +1098,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1014,15 +1110,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1031,24 +1123,33 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1082,13 +1183,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -1120,36 +1218,42 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -1160,8 +1264,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -1171,17 +1275,19 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1204,13 +1310,21 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -1247,10 +1361,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1345,17 +1464,16 @@ uninstall-am: uninstall-binPROGRAMS uninstall-htmlDATA \
 
 uninstall-man: uninstall-man1 uninstall-man8
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-	ctags-recursive install install-am install-exec-am \
-	install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all check install install-am \
+	install-exec-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libexecPROGRAMS clean-libtool \
-	clean-noinstLIBRARIES clean-sbinPROGRAMS ctags ctags-recursive \
-	dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \
-	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-binPROGRAMS \
+	clean-cscope clean-generic clean-libexecPROGRAMS clean-libtool \
+	clean-noinstLIBRARIES clean-sbinPROGRAMS cscope cscopelist-am \
+	ctags ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
+	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
+	distclean distclean-compile distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-data \
@@ -1368,10 +1486,11 @@ uninstall-man: uninstall-man1 uninstall-man8
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-htmlDATA \
-	uninstall-libexecPROGRAMS uninstall-man uninstall-man1 \
-	uninstall-man8 uninstall-sbinPROGRAMS
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-htmlDATA uninstall-libexecPROGRAMS uninstall-man \
+	uninstall-man1 uninstall-man8 uninstall-sbinPROGRAMS
+
+.PRECIOUS: Makefile
 
 
 install-data-local: install-html
diff --git a/contrib/ntp/sntp/aclocal.m4 b/contrib/ntp/sntp/aclocal.m4
index 5d30c4211d88..00ce9089638a 100644
--- a/contrib/ntp/sntp/aclocal.m4
+++ b/contrib/ntp/sntp/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file 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.
@@ -11,13 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # serial 9  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
@@ -138,7 +139,7 @@ AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS],
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -150,10 +151,10 @@ AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS],
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.15], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -169,22 +170,82 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_PROG_AR([ACT-IF-FAIL])
+# -------------------------
+# Try to determine the archiver interface, and trigger the ar-lib wrapper
+# if it is needed.  If the detection of archiver interface fails, run
+# ACT-IF-FAIL (default is to abort configure with a proper error message).
+AC_DEFUN([AM_PROG_AR],
+[AC_BEFORE([$0], [LT_INIT])dnl
+AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([ar-lib])dnl
+AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
+: ${AR=ar}
+
+AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
+  [AC_LANG_PUSH([C])
+   am_cv_ar_interface=ar
+   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
+     [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([am_ar_try])
+      if test "$ac_status" -eq 0; then
+        am_cv_ar_interface=ar
+      else
+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+        AC_TRY_EVAL([am_ar_try])
+        if test "$ac_status" -eq 0; then
+          am_cv_ar_interface=lib
+        else
+          am_cv_ar_interface=unknown
+        fi
+      fi
+      rm -f conftest.lib libconftest.a
+     ])
+   AC_LANG_POP([C])])
+
+case $am_cv_ar_interface in
+ar)
+  ;;
+lib)
+  # Microsoft lib, so override with the ar-lib wrapper script.
+  # FIXME: It is wrong to rewrite AR.
+  # But if we don't then we get into trouble of one sort or another.
+  # A longer-term fix would be to have automake use am__AR in this case,
+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+  # similar.
+  AR="$am_aux_dir/ar-lib $AR"
+  ;;
+unknown)
+  m4_default([$1],
+             [AC_MSG_ERROR([could not determine $AR interface])])
+  ;;
+esac
+AC_SUBST([AR])dnl
+])
+
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -203,7 +264,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -221,30 +282,26 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -263,16 +320,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 10
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -282,7 +337,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -295,12 +350,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -308,8 +364,9 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -348,16 +405,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -366,16 +423,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -423,7 +480,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -433,34 +490,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -473,7 +535,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -485,21 +547,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -517,7 +577,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -527,18 +587,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -551,7 +614,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -580,33 +643,42 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# 
+# 
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -615,34 +687,82 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: 
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: .
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -664,7 +784,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -675,7 +795,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -683,16 +803,14 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -708,14 +826,12 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -733,7 +849,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -758,52 +874,14 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 6
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -811,11 +889,10 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -828,63 +905,35 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 4
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -895,24 +944,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 5
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file 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.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -923,32 +1030,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -958,36 +1073,85 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 1
-
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -995,34 +1159,32 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 2
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1030,24 +1192,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -1057,75 +1217,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
 
-  # tar/untar a dummy directory, and stop if the command works
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar /dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar /dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
@@ -1156,6 +1355,7 @@ m4_include([m4/ntp_pkg_config.m4])
 m4_include([m4/ntp_prog_cc.m4])
 m4_include([m4/ntp_sntp.m4])
 m4_include([m4/ntp_sysexits.m4])
+m4_include([m4/ntp_unitytest.m4])
 m4_include([m4/ntp_ver_suffix.m4])
 m4_include([m4/openldap-thread-check.m4])
 m4_include([m4/openldap.m4])
diff --git a/contrib/ntp/sntp/ag-tpl/Mdoc.pm b/contrib/ntp/sntp/ag-tpl/Mdoc.pm
new file mode 100644
index 000000000000..549454f0f175
--- /dev/null
+++ b/contrib/ntp/sntp/ag-tpl/Mdoc.pm
@@ -0,0 +1,542 @@
+=begin comment
+
+## Mdoc.pm -- Perl functions for mdoc processing
+##
+## Author:	Oliver Kindernay (GSoC project for NTP.org)
+##		
+##
+##  This file is part of AutoOpts, a companion to AutoGen.
+##  AutoOpts is free software.
+##  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
+##
+##  AutoOpts is available under any one of two licenses.  The license
+##  in use must be one of these two and the choice is under the control
+##  of the user of the license.
+##
+##   The GNU Lesser General Public License, version 3 or later
+##      See the files "COPYING.lgplv3" and "COPYING.gplv3"
+##
+##   The Modified Berkeley Software Distribution License
+##      See the file "COPYING.mbsd"
+##
+##  These files have the following sha256 sums:
+##
+##  8584710e9b04216a394078dc156b781d0b47e1729104d666658aecef8ee32e95  COPYING.gplv3
+##  4379e7444a0e2ce2b12dd6f5a52a27a4d02d39d247901d3285c88cf0d37f477b  COPYING.lgplv3
+##  13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239  COPYING.mbsd
+=end comment
+=head1 NAME
+
+Mdoc - perl module to parse Mdoc macros
+
+=head1 SYNOPSIS
+
+    use Mdoc qw(ns pp soff son stoggle mapwords);
+
+See mdoc2man and mdoc2texi for code examples.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item def_macro( NAME, CODE, [ raw => 1, greedy => 1, concat_until => '.Xx' ] )
+
+Define new macro. The CODE reference will be called by call_macro(). You can
+have two distinct definitions for and inline macro and for a standalone macro
+(i. e. 'Pa' and '.Pa').
+
+The CODE reference is passed a list of arguments and is expected to return list
+of strings and control characters (see C).
+
+By default the surrouding "" from arguments to macros are removed, use C
+to disable this.
+
+Normaly CODE reference is passed all arguments up to next nested macro. Set
+C to to pass everything up to the end of the line.
+
+If the concat_until is present, the line is concated until the .Xx macro is
+found. For example the following macro definition
+
+    def_macro('.Oo', gen_encloser(qw([ ]), concat_until => '.Oc' }
+    def_macro('.Cm', sub { mapwords {'($_)'} @_ } }
+
+and the following input
+
+    .Oo
+    .Cm foo |
+    .Cm bar |
+    .Oc
+
+results in [(foo) | (bar)]
+
+=item get_macro( NAME )
+
+Returns a hash reference like:
+
+    { run => CODE, raw => [1|0], greedy => [1|0] }
+
+Where C is the CODE reference used to define macro called C
+
+=item parse_line( INPUT, OUTPUT_CODE, PREPROCESS_CODE )
+
+Parse a line from the C filehandle. If a macro was detected it returns a
+list (MACRO_NAME, @MACRO_ARGS), otherwise it calls the C, giving
+caller a chance to modify line before printing it. If C is
+defined it calls it prior to passing argument to a macro, giving caller a
+chance to alter them.  if EOF was reached undef is returned.
+
+=item call_macro( MACRO, ARGS, ... )
+
+Call macro C with C. The CODE reference for macro C is
+called and for all the nested macros. Every called macro returns a list which
+is appended to return value and returned when all nested macros are processed.
+Use to_string() to produce a printable string from the list.
+
+=item to_string ( LIST )
+
+Processes C returned from call_macro() and returns formatted string.
+
+=item mapwords BLOCK ARRAY
+
+This is like perl's map only it calls BLOCK only on elements which are not
+punctuation or control characters.
+
+=item space ( ['on'|'off] )
+
+Turn spacing on or off. If called without argument it returns the current state.
+
+=item gen_encloser ( START, END )
+
+Helper function for generating macros that enclose their arguments.
+    gen_encloser(qw({ }));
+returns
+    sub { '{', ns, @_, ns, pp('}')}
+
+=item set_Bl_callback( CODE , DEFS )
+
+This module implements the Bl/El macros for you. Using set_Bl_callback you can
+provide a macro definition that should be executed on a .Bl call.
+
+=item set_El_callback( CODE , DEFS )
+
+This module implements the Bl/El macros for you. Using set_El_callback you can
+provide a macro definition that should be executed on a .El call.
+
+=item set_Re_callback( CODE )
+
+The C is called after a Rs/Re block is done. With a hash reference as a
+parameter, describing the reference.
+
+=back 
+
+=head1 CONSTANTS
+
+=over 4
+
+=item ns
+
+Indicate 'no space' between to members of the list.
+
+=item pp ( STRING )
+
+The string is 'punctuation point'. It means that every punctuation
+preceeding that element is put behind it. 
+
+=item soff
+
+Turn spacing off.
+
+=item son
+
+Turn spacing on.
+
+=item stoggle
+
+Toogle spacing.
+
+=item hs
+
+Print space no matter spacing mode.
+
+=back
+
+=head1 TODO
+
+* The concat_until only works with standalone macros. This means that
+    .Po blah Pc
+will hang until .Pc in encountered.
+
+* Provide default macros for Bd/Ed
+
+* The reference implementation is uncomplete
+
+=cut
+
+package Mdoc;
+use strict;
+use warnings;
+use List::Util qw(reduce);
+use Text::ParseWords qw(quotewords);
+use Carp;
+use Exporter qw(import);
+our @EXPORT_OK = qw(ns pp soff son stoggle hs mapwords gen_encloser nl);
+
+use constant {
+    ns      => ['nospace'],
+    soff    => ['spaceoff'],
+    son     => ['spaceon'],
+    stoggle => ['spacetoggle'],
+    hs      => ['hardspace'],
+};
+
+sub pp { 
+    my $c = shift;
+    return ['pp', $c ];
+}
+sub gen_encloser {
+    my ($o, $c) = @_;
+    return sub { ($o, ns, @_, ns, pp($c)) };
+}
+
+sub mapwords(&@) {
+    my ($f, @l) = @_;
+    my @res;
+    for my $el (@l) {
+        local $_ = $el;
+        push @res, $el =~ /^(?:[,\.\{\}\(\):;\[\]\|])$/ || ref $el eq 'ARRAY' ? 
+                    $el : $f->();
+    }
+    return @res;
+}
+
+my %macros;
+
+###############################################################################
+
+# Default macro definitions start
+
+###############################################################################
+
+def_macro('Xo',  sub { @_ }, concat_until => '.Xc');
+
+def_macro('.Ns', sub {ns, @_});
+def_macro('Ns',  sub {ns, @_});
+
+{
+    my %reference;
+    def_macro('.Rs', sub { () } );
+    def_macro('.%A', sub {
+        if ($reference{authors}) {
+            $reference{authors} .= " and @_"
+        }
+        else {
+            $reference{authors} = "@_";
+        }
+        return ();
+    });
+    def_macro('.%T', sub { $reference{title} = "@_"; () } );
+    def_macro('.%O', sub { $reference{optional} = "@_"; () } );
+
+    sub set_Re_callback {
+        my ($sub) = @_;
+        croak 'Not a CODE reference' if not ref $sub eq 'CODE';
+        def_macro('.Re', sub { 
+            my @ret = $sub->(\%reference);
+            %reference = (); @ret
+        });
+        return;
+    }
+}
+
+def_macro('.Bl', sub { die '.Bl - no list callback set' });
+def_macro('.It', sub { die ".It called outside of list context - maybe near line $." });
+def_macro('.El', sub { die '.El requires .Bl first' });
+
+
+{ 
+    my $elcb = sub { () };
+
+    sub set_El_callback {
+        my ($sub) = @_;
+        croak 'Not a CODE reference' if ref $sub ne 'CODE';
+        $elcb = $sub;
+        return;
+    }
+
+    sub set_Bl_callback {
+        my ($blcb, %defs) = @_;
+        croak 'Not a CODE reference' if ref $blcb ne 'CODE';
+        def_macro('.Bl', sub { 
+
+            my $orig_it   = get_macro('.It');
+            my $orig_el   = get_macro('.El');
+            my $orig_bl   = get_macro('.Bl');
+            my $orig_elcb = $elcb;
+
+            # Restore previous .It and .El on each .El
+            def_macro('.El', sub {
+                    def_macro('.El', delete $orig_el->{run}, %$orig_el);
+                    def_macro('.It', delete $orig_it->{run}, %$orig_it);
+                    def_macro('.Bl', delete $orig_bl->{run}, %$orig_bl);
+                    my @ret = $elcb->(@_);
+                    $elcb = $orig_elcb;
+                    @ret
+                });
+            $blcb->(@_) 
+        }, %defs);
+        return;
+    }
+}
+
+def_macro('.Sm', sub { 
+    my ($arg) = @_;
+    if (defined $arg) {
+        space($arg);
+    } else {
+        space() eq 'off' ? 
+            space('on') : 
+            space('off'); 
+    }
+    () 
+} );
+def_macro('Sm', do { my $off; sub { 
+    my ($arg) = @_;
+    if (defined $arg && $arg =~ /^(on|off)$/) {
+        shift;
+        if    ($arg eq 'off') { soff, @_; }
+        elsif ($arg eq 'on')  { son, @_; }
+    }
+    else {
+        stoggle, @_;
+    }
+}} );
+
+###############################################################################
+
+# Default macro definitions end
+
+###############################################################################
+
+sub def_macro {
+    croak 'Odd number of elements for hash argument <'.(scalar @_).'>' if @_%2;
+    my ($macro, $sub, %def) = @_;
+    croak 'Not a CODE reference' if ref $sub ne 'CODE';
+
+    $macros{ $macro } = { 
+        run          => $sub,
+        greedy       => delete $def{greedy} || 0,
+        raw          => delete $def{raw}    || 0,
+        concat_until => delete $def{concat_until},
+    };
+    if ($macros{ $macro }{concat_until}) {
+        $macros{ $macros{ $macro }{concat_until} } = { run => sub { @_ } };
+        $macros{ $macro }{greedy}                  = 1;
+    }
+    return;
+}
+
+sub get_macro {
+    my ($macro) = @_;
+    croak "Macro <$macro> not defined" if not exists $macros{ $macro };
+    +{ %{ $macros{ $macro } } }
+}
+
+#TODO: document this
+sub parse_opts {
+    my %args;
+    my $last;
+    for (@_) {
+        if ($_ =~ /^\\?-/) {
+            s/^\\?-//;
+            $args{$_} = 1;
+            $last = _unquote($_);
+        }
+        else {
+            $args{$last} = _unquote($_) if $last;
+            undef $last;
+        }
+    }
+    return %args;
+}
+
+sub _is_control {
+    my ($el, $expected) = @_;
+    if (defined $expected) {
+        ref $el eq 'ARRAY' and $el->[0] eq $expected;
+    }
+    else {
+        ref $el eq 'ARRAY';
+    }
+}
+
+{
+    my $sep = ' ';
+
+    sub to_string {
+        if (@_ > 0) { 
+            # Handle punctunation
+            my ($in_brace, @punct) = '';
+            my @new = map {
+                if (/^([\[\(])$/) {
+                    ($in_brace = $1) =~ tr/([/)]/;
+                    $_, ns
+                }
+                elsif (/^([\)\]])$/ && $in_brace eq $1) {
+                    $in_brace = '';
+                    ns, $_
+                }
+                elsif ($_ =~ /^[,\.;:\?\!\)\]]$/) {
+                    push @punct, ns, $_;
+                    ();
+                }
+                elsif (_is_control($_, 'pp')) {
+                    $_->[1]
+                }
+                elsif (_is_control($_)) {
+                    $_
+                }
+                else {
+                    splice (@punct), $_;
+                }
+            } @_;
+            push @new, @punct;
+
+            # Produce string out of an array dealing with the special control characters
+            # space('off') must but one character delayed
+            my ($no_space, $space_off) = 1;
+            my $res = '';
+            while (defined(my $el = shift @new)) {
+                if    (_is_control($el, 'hardspace'))   { $no_space = 1; $res .= ' ' }
+                elsif (_is_control($el, 'nospace'))     { $no_space = 1;             }
+                elsif (_is_control($el, 'spaceoff'))    { $space_off = 1;            }
+                elsif (_is_control($el, 'spaceon'))     { space('on');               }
+                elsif (_is_control($el, 'spacetoggle')) { space() eq 'on' ? 
+                                                            $space_off = 1 : 
+                                                            space('on')              }
+                else {
+                    if ($no_space) {
+                        $no_space = 0;
+                        $res .= "$el"
+                    }
+                    else {
+                        $res .= "$sep$el"
+                    }
+
+                    if ($space_off)    { space('off'); $space_off = 0; }
+                }
+            }
+            $res
+        }
+        else { 
+            '';
+        }
+    }
+
+    sub space {
+        my ($arg) = @_;
+        if (defined $arg && $arg =~ /^(on|off)$/) {
+            $sep = ' ' if $arg eq 'on';
+            $sep = ''  if $arg eq 'off';
+            return;
+        }
+        else {
+            return $sep eq '' ? 'off' : 'on';
+        }
+    }
+}
+
+sub _unquote {
+    my @args = @_;
+    $_ =~ s/^"([^"]+)"$/$1/g for @args;
+    wantarray ? @args : $args[0];
+}
+
+sub call_macro {
+    my ($macro, @args) = @_;
+    my @ret; 
+
+    my @newargs;
+    my $i = 0;
+
+    @args = _unquote(@args) if (!$macros{ $macro }{raw});
+
+    # Call any callable macros in the argument list
+    for (@args) {
+        if ($_ =~ /^[A-Z][a-z]+$/ && exists $macros{ $_ }) {
+            push @ret, call_macro($_, @args[$i+1 .. $#args]);
+            last;
+        } else {
+            if ($macros{ $macro }{greedy}) {
+                push @ret, $_;
+            }
+            else {
+                push @newargs, $_;
+            }
+        }
+        $i++;
+    }
+
+    if ($macros{ $macro }{concat_until}) {
+        my ($n_macro, @n_args) = ('');
+        while (1) {
+            die "EOF was reached and no $macros{ $macro }{concat_until} found" 
+                if not defined $n_macro;
+            ($n_macro, @n_args) = parse_line(undef, sub { push @ret, shift });
+            if ($n_macro eq $macros{ $macro }{concat_until}) {
+                push @ret, call_macro($n_macro, @n_args);
+                last;
+            }
+            else {
+                $n_macro =~ s/^\.//;
+                push @ret, call_macro($n_macro, @n_args) if exists $macros{ $n_macro };
+            }
+        }
+    }
+
+    if ($macros{ $macro }{greedy}) {
+        #print "MACROG $macro (", (join ', ', @ret), ")\n";
+        return $macros{ $macro }{run}->(@ret);
+    }
+    else {
+        #print "MACRO $macro (", (join ', ', @newargs), ")".(join ', ', @ret)."\n";
+        return $macros{ $macro }{run}->(@newargs), @ret;
+    }
+}
+
+{
+    my ($in_fh, $out_sub, $preprocess_sub);
+    sub parse_line {
+        $in_fh          = $_[0] if defined $_[0] || !defined $in_fh;
+        $out_sub        = $_[1] if defined $_[1] || !defined $out_sub;
+        $preprocess_sub = $_[2] if defined $_[2] || !defined $preprocess_sub;
+
+        croak 'out_sub not a CODE reference' 
+            if not ref $out_sub eq 'CODE';
+        croak 'preprocess_sub not a CODE reference' 
+            if defined $preprocess_sub && not ref $preprocess_sub eq 'CODE';
+
+        while (my $line = <$in_fh>) {
+            chomp $line;
+            if ($line =~ /^\.[A-z][a-z0-9]+/ || $line =~ /^\.%[A-Z]/ || 
+                $line =~ /^\.\\"/) 
+            {
+                $line =~ s/ +/ /g;
+                my ($macro, @args) = quotewords(' ', 1, $line);
+                @args = grep { defined $_ } @args;
+                $preprocess_sub->(@args) if defined $preprocess_sub;
+                if ($macro && exists $macros{ $macro }) {
+                    return ($macro, @args);
+                } else {
+                    $out_sub->($line);
+                }
+            }
+            else {
+                $out_sub->($line);
+            }
+        }
+        return;
+    }
+}
+
+1;
+__END__
diff --git a/contrib/ntp/sntp/ag-tpl/mdoc2man b/contrib/ntp/sntp/ag-tpl/mdoc2man
new file mode 100755
index 000000000000..305fab07b67c
--- /dev/null
+++ b/contrib/ntp/sntp/ag-tpl/mdoc2man
@@ -0,0 +1,219 @@
+#! /usr/local/bin/perl
+
+## mdoc2man.pl -- Convert mdoc tags to man tags
+##
+## Author:	Harlan Stenn 
+##		
+##
+##  This file is part of AutoOpts, a companion to AutoGen.
+##  AutoOpts is free software.
+##  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
+##
+##  AutoOpts is available under any one of two licenses.  The license
+##  in use must be one of these two and the choice is under the control
+##  of the user of the license.
+##
+##   The GNU Lesser General Public License, version 3 or later
+##      See the files "COPYING.lgplv3" and "COPYING.gplv3"
+##
+##   The Modified Berkeley Software Distribution License
+##      See the file "COPYING.mbsd"
+##
+##  These files have the following sha256 sums:
+##
+##  8584710e9b04216a394078dc156b781d0b47e1729104d666658aecef8ee32e95  COPYING.gplv3
+##  4379e7444a0e2ce2b12dd6f5a52a27a4d02d39d247901d3285c88cf0d37f477b  COPYING.lgplv3
+##  13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239  COPYING.mbsd
+
+### ToDo
+# Properly implement -columns in the "my %lists" definition...
+#
+# .Xr requires at least 1 arg, the code here expects at least 2
+#
+###
+
+package mdoc2man;
+use strict;
+use warnings;
+use File::Basename;
+use lib dirname(__FILE__);
+use Mdoc qw(hs ns pp mapwords son soff stoggle gen_encloser);
+
+########
+## Basic
+########
+
+Mdoc::def_macro( '.Sh', sub { '.SH', hs, @_ }, raw => 1);
+Mdoc::def_macro( '.Ss', sub { '.SS', hs, @_ }, raw => 1);
+Mdoc::def_macro( '.Pp', sub { ".sp \\n(Ppu\n.ne 2\n" } );
+Mdoc::def_macro( '.Nd', sub { "\\- @_" } );
+
+# Macros that enclose things
+Mdoc::def_macro( '.Brq', gen_encloser(qw({ }))          , greedy => 1 );
+Mdoc::def_macro( '.Op' , gen_encloser(qw([ ]))          , greedy => 1 );
+Mdoc::def_macro( '.Qq' , gen_encloser(qw(" "))          , greedy => 1 );
+Mdoc::def_macro( '.Dq' , gen_encloser(qw(\*[Lq] \*[Rq])), greedy => 1 );
+Mdoc::def_macro( '.Ql' , gen_encloser(qw(\[oq] \[cq]))  , greedy => 1 );
+Mdoc::def_macro( '.Sq' , gen_encloser(qw(\[oq] \[cq]))  , greedy => 1 );
+Mdoc::def_macro( '.Pq' , gen_encloser(qw/( )/)          , greedy => 1 );
+Mdoc::def_macro( '.D1' , sub { ".in +4\n", ns, @_ , ns , "\n.in -4" } , greedy => 1);
+
+Mdoc::def_macro( 'Oo',  sub { '[', @_ } );
+Mdoc::def_macro( 'Oc',  sub { ']', @_ } );
+
+Mdoc::def_macro( 'Po',  sub { '(', @_} );
+Mdoc::def_macro( 'Pc',  sub { ')', @_ } );
+
+Mdoc::def_macro( 'Bro', sub { '{', ns, @_ } );
+Mdoc::def_macro( 'Brc', sub { '}', @_ } );
+
+Mdoc::def_macro( '.Oo',  gen_encloser(qw([ ])), concat_until => '.Oc' );
+Mdoc::def_macro( '.Bro', gen_encloser(qw({ })), concat_until => '.Brc' );
+Mdoc::def_macro( '.Po',  gen_encloser(qw/( )/), concat_until => '.Pc' );
+
+Mdoc::def_macro( '.Ev', sub { @_ } );
+Mdoc::def_macro( '.An', sub { ".NOP ", @_, "\n.br" }, raw => 1 );
+Mdoc::def_macro( '.Li', sub { mapwords {"\\f[C]$_\\f[]"} @_ } );
+Mdoc::def_macro( '.Cm', sub { mapwords {"\\f\\*[B-Font]$_\\f[]"} @_ } );
+Mdoc::def_macro( '.Ic', sub { mapwords {"\\f\\*[B-Font]$_\\f[]"} @_ } );
+Mdoc::def_macro( '.Fl', sub { mapwords {"\\f\\*[B-Font]\\-$_\\f[]"} @_ } );
+Mdoc::def_macro( '.Ar', sub { mapwords {"\\f\\*[I-Font]$_\\f[]"} @_ } );
+Mdoc::def_macro( '.Em', sub { mapwords {"\\fI$_\\f[]"} @_ } );
+Mdoc::def_macro( '.Va', sub { mapwords {"\\fI$_\\f[]"} @_ } );
+Mdoc::def_macro( '.Sx', sub { mapwords {"\\fI$_\\f[]"} @_ } );
+Mdoc::def_macro( '.Xr', sub { "\\fC".(shift)."\\f[]\\fR(".(shift).")\\f[]", @_ } );
+Mdoc::def_macro( '.Fn', sub { "\\f\\*[B-Font]".(shift)."\\f[]\\fR()\\f[]" } );
+Mdoc::def_macro( '.Fn', sub { "\\fB".(shift)."\\f[]\\fR()\\f[]" } );
+Mdoc::def_macro( '.Fx', sub { "FreeBSD", @_ } );
+Mdoc::def_macro( '.Ux', sub { "UNIX", @_ } );
+
+Mdoc::def_macro( '.No', sub { ".NOP", map { ($_, ns) } @_ } );
+Mdoc::def_macro( '.Pa', sub { mapwords {"\\fI$_\\f[]"} @_; } );
+{
+    my $name;
+    Mdoc::def_macro('.Nm', sub {
+        $name = shift if (!$name);
+        "\\f\\*[B-Font]$name\\fP", @_
+    } );
+}
+
+########
+## lists
+########
+
+my %lists = (
+    bullet => sub {
+        Mdoc::def_macro('.It', sub { '.IP \fB\(bu\fP 2' });
+    },
+
+    column => sub {
+        Mdoc::def_macro('.It', sub { '.IP \fB\(bu\fP 2' });
+    },
+
+    tag    => sub {
+        my (%opts) = @_;
+
+        my $width = '';
+
+        if (exists $opts{width}) {
+            $width = ' '.((length $opts{width})+1);
+        }
+
+        if (exists $opts{compact}) {
+            my $dobrns = 0;
+            Mdoc::def_macro('.It', sub {
+                    my @ret = (".TP$width\n.NOP", hs);
+                    if ($dobrns) {
+                        ".br\n.ns\n", ns, @ret, @_;
+                    }
+                    else {
+                        $dobrns = 1;
+                        @ret, @_;
+                    }
+                }, raw => 1);
+        }
+        else {
+            Mdoc::def_macro('.It', sub {
+                    ".TP$width\n.NOP", hs, @_
+                }, raw => 1);
+        }
+    },
+);
+
+Mdoc::set_Bl_callback(do { my $nested = 0; sub {
+    my $type = shift;
+    my %opts = Mdoc::parse_opts(@_);
+    if (defined $type && $type =~ /-(\w+)/ && exists $lists{$1}) {
+
+        # Wrap nested lists with .RS and .RE
+        Mdoc::set_El_callback(sub { 
+                return '.RE' if $nested-- > 1;
+                return '.PP';
+            });
+
+        $lists{$1}->(%opts);
+
+        if ($nested++) {
+            return ".RS";
+        }
+        else {
+            return ();
+        }
+    }
+    else {
+        die "Invalid list type <$type>";
+    }
+}}, raw => 1);
+
+# don't bother with arguments for now and do what mdoc2man'.sh' did
+
+Mdoc::def_macro('.Bd', sub { ".br\n.in +4\n.nf" } );
+Mdoc::def_macro('.Ed', sub { ".in -4\n.fi" } );
+
+Mdoc::set_Re_callback(sub { 
+        my ($reference) = @_;
+        <<"REF";
+$reference->{authors},
+\\fI$reference->{title}\\fR,
+$reference->{optional}\n.PP
+REF
+});
+
+# Define all macros which have the same sub for inline and standalone macro
+for (qw(Xr Em Ar Fl Ic Cm Qq Op Nm Pa Sq Li Va Brq Pq Fx Ux)) {
+    my $m = Mdoc::get_macro(".$_");
+    Mdoc::def_macro($_, delete $m->{run}, %$m);
+}
+
+sub print_line {
+    print shift;
+    print "\n";
+}
+
+sub run {
+    print <<'DEFS';
+.de1 NOP
+.  it 1 an-trap
+.  if \\n[.$] \,\\$*\/
+..
+.ie t \
+.ds B-Font [CB]
+.ds I-Font [CI]
+.ds R-Font [CR]
+.el \
+.ds B-Font B
+.ds I-Font I
+.ds R-Font R
+DEFS
+
+    while (my ($macro, @args) = Mdoc::parse_line(\*STDIN, \&print_line)) {
+        my @ret = Mdoc::call_macro($macro, @args);
+        print_line(Mdoc::to_string(@ret)) if @ret;
+    }
+    return 0;
+}
+
+exit run(@ARGV) unless caller;
+
+1;
+__END__
diff --git a/contrib/ntp/sntp/config.h.in b/contrib/ntp/sntp/config.h.in
index 64279b9fa9f6..2013ce398e12 100644
--- a/contrib/ntp/sntp/config.h.in
+++ b/contrib/ntp/sntp/config.h.in
@@ -92,6 +92,9 @@
 /* Define to 1 if you have the  header file. */
 #undef HAVE_ERRNO_H
 
+/* Define to 1 if you have the `EVP_MD_do_all_sorted' function. */
+#undef HAVE_EVP_MD_DO_ALL_SORTED
+
 /* Define to 1 if you have the `fchmod' function. */
 #undef HAVE_FCHMOD
 
@@ -725,9 +728,6 @@
 /* Do we need an s_char typedef? */
 #undef NEED_S_CHAR_TYPEDEF
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Define this if optional arguments are disallowed */
 #undef NO_OPTIONAL_OPT_ARGS
 
@@ -773,8 +773,8 @@
 /* define if sched_yield yields the entire process */
 #undef REPLACE_BROKEN_YIELD
 
-/* The size of `char*', as computed by sizeof. */
-#undef SIZEOF_CHARP
+/* The size of `char *', as computed by sizeof. */
+#undef SIZEOF_CHAR_P
 
 /* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
diff --git a/contrib/ntp/sntp/configure b/contrib/ntp/sntp/configure
index 76bdd28f9c70..579848957619 100755
--- a/contrib/ntp/sntp/configure
+++ b/contrib/ntp/sntp/configure
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for sntp 4.2.8p2.
+# Generated by GNU Autoconf 2.69 for sntp 4.2.8p3.
 #
 # Report bugs to .
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -339,6 +367,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -515,28 +555,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -570,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sntp'
 PACKAGE_TARNAME='sntp'
-PACKAGE_VERSION='4.2.8p2'
-PACKAGE_STRING='sntp 4.2.8p2'
+PACKAGE_VERSION='4.2.8p3'
+PACKAGE_STRING='sntp 4.2.8p3'
 PACKAGE_BUGREPORT='http://bugs.ntp.org./'
 PACKAGE_URL='http://www.ntp.org./'
 
@@ -630,6 +650,9 @@ CXXDEPMODE
 ac_ct_CXX
 CXXFLAGS
 CXX
+UNITYBUILD_AVAILABLE_FALSE
+UNITYBUILD_AVAILABLE_TRUE
+PATH_RUBY
 VER_SUFFIX
 LIB_SYSLOG
 subdirs
@@ -661,8 +684,6 @@ NMEDIT
 DSYMUTIL
 MANIFEST_TOOL
 RANLIB
-ac_ct_AR
-AR
 DLLTOOL
 OBJDUMP
 LN_S
@@ -686,6 +707,8 @@ SED
 LDADD_LIBNTP
 NTP_CROSSCOMPILE_FALSE
 NTP_CROSSCOMPILE_TRUE
+ac_ct_AR
+AR
 INSTALL_UPDATE_LEAP_FALSE
 INSTALL_UPDATE_LEAP_TRUE
 UPDATE_LEAP_NI
@@ -783,6 +806,7 @@ CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -806,6 +830,8 @@ build_cpu
 build
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -1377,8 +1403,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1464,7 +1488,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sntp 4.2.8p2 to adapt to many kinds of systems.
+\`configure' configures sntp 4.2.8p3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1534,7 +1558,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sntp 4.2.8p2:";;
+     short | recursive ) echo "Configuration of sntp 4.2.8p3:";;
    esac
   cat <<\_ACEOF
 
@@ -1542,10 +1566,12 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   defaults:               + yes, - no, s system-specific
   --enable-debugging      + include ntpd debugging code
   --enable-thread-support s use threads (+ if available)
@@ -1677,10 +1703,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sntp configure 4.2.8p2
-generated by GNU Autoconf 2.68
+sntp configure 4.2.8p3
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1957,7 +1983,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2160,7 +2186,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2176,7 +2203,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2202,7 +2230,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2218,7 +2247,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2252,7 +2282,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2480,7 +2511,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2502,8 +2533,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sntp $as_me 4.2.8p2, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by sntp $as_me 4.2.8p3, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -3007,7 +3038,7 @@ $as_echo "$as_me: $cache_file version: $c_version" >&6;}
     NTP_CACHEVERSION_PARENT='sntp' ; export NTP_CACHEVERSION_PARENT
 
 
-am__api_version='1.11'
+am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3046,7 +3077,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -3104,9 +3135,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -3117,32 +3145,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -3154,6 +3190,16 @@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -3164,8 +3210,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -3176,15 +3222,15 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3193,10 +3239,10 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -3215,7 +3261,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3255,7 +3301,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3306,7 +3352,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -3335,12 +3381,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -3359,7 +3399,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3423,6 +3463,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -3445,7 +3524,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sntp'
- VERSION='4.2.8p2'
+ VERSION='4.2.8p3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3473,28 +3552,108 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# 
+# 
+mkdir_p='$(MKDIR_P)'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
 
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: 
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: .
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
 
@@ -3596,7 +3755,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -3629,6 +3788,7 @@ fi
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3661,7 +3821,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3701,7 +3861,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3754,7 +3914,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3795,7 +3955,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3853,7 +4013,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3897,7 +4057,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4343,8 +4503,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include 
 #include 
-#include 
-#include 
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4429,6 +4588,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -4440,8 +4658,9 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4475,16 +4694,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4493,16 +4712,16 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -4711,7 +4930,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4777,7 +4996,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5025,116 +5244,6 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
   $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
@@ -5147,8 +5256,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include 
 #include 
-#include 
-#include 
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5374,7 +5482,7 @@ main ()
   return 0;
 }
 _ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"; then :
@@ -5431,7 +5539,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5471,7 +5579,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5524,7 +5632,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5565,7 +5673,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -5623,7 +5731,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5667,7 +5775,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5863,8 +5971,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include 
 #include 
-#include 
-#include 
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5949,6 +6056,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -5960,8 +6126,9 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -5995,16 +6162,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -6013,16 +6180,16 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -6078,20 +6245,6 @@ fi
 
 # Ralf Wildenhues: With per-target flags we need CC_C_O
 # AM_PROG_CC_C_O supersets AC_PROG_CC_C_O
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
 
 if test $ac_cv_c_compiler_gnu = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
@@ -6442,7 +6595,7 @@ $as_echo_n "checking additional compiler flags... " >&6; }
 		ntp_os_cflags="-Ae -Wp,-H18816"
 		;;
 	    esac
-	    ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE"
+	    ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE -D__STDC_VERSION__=199901L"
 	    ;;
 	 hpux*)
 	    case "$GCC" in
@@ -6452,7 +6605,7 @@ $as_echo_n "checking additional compiler flags... " >&6; }
 		# use Ansi compiler on HPUX
 		ntp_os_cflags="-Ae"
 	    esac
-	    ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE"
+	    ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE -D__STDC_VERSION__=199901L"
 	    ;;
 	 irix6*)
 	    case "$CC" in
@@ -7050,6 +7203,177 @@ fi
 
 
 
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar lib "link -lib"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar lib "link -lib"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+$as_echo_n "checking the archiver ($AR) interface... " >&6; }
+if ${am_cv_ar_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+   am_cv_ar_interface=ar
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int some_variable = 0;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+  (eval $am_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+        am_cv_ar_interface=ar
+      else
+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
+        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+  (eval $am_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+        if test "$ac_status" -eq 0; then
+          am_cv_ar_interface=lib
+        else
+          am_cv_ar_interface=unknown
+        fi
+      fi
+      rm -f conftest.lib libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+$as_echo "$am_cv_ar_interface" >&6; }
+
+case $am_cv_ar_interface in
+ar)
+  ;;
+lib)
+  # Microsoft lib, so override with the ar-lib wrapper script.
+  # FIXME: It is wrong to rewrite AR.
+  # But if we don't then we get into trouble of one sort or another.
+  # A longer-term fix would be to have automake use am__AR in this case,
+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+  # similar.
+  AR="$am_aux_dir/ar-lib $AR"
+  ;;
+unknown)
+  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
+  ;;
+esac
+
 
 
 
@@ -7087,7 +7411,7 @@ do
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -7166,7 +7490,7 @@ do
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+      as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -7346,6 +7670,63 @@ done
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
+$as_echo_n "checking for unsigned long long int... " >&6; }
+if ${ac_cv_type_unsigned_long_long_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_unsigned_long_long_int=yes
+     if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  /* For now, do not test the preprocessor; as of 2007 there are too many
+	 implementations with broken preprocessors.  Perhaps this can
+	 be revisited in 2012.  In the meantime, code should not expect
+	 #if to work with literals wider than 32 bits.  */
+      /* Test literals.  */
+      long long int ll = 9223372036854775807ll;
+      long long int nll = -9223372036854775807LL;
+      unsigned long long int ull = 18446744073709551615ULL;
+      /* Test constant expressions.   */
+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+		     ? 1 : -1)];
+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+		     ? 1 : -1)];
+      int i = 63;
+int
+main ()
+{
+/* Test availability of runtime routines for shift and division.  */
+      long long int llmax = 9223372036854775807ll;
+      unsigned long long int ullmax = 18446744073709551615ull;
+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+	      | (llmax / ll) | (llmax % ll)
+	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+	      | (ullmax / ull) | (ullmax % ull));
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+else
+  ac_cv_type_unsigned_long_long_int=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
+$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+
+$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
+
+  fi
+
+
       ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
 if test "x$ac_cv_func_vsnprintf" = xyes; then :
   hw_cv_func_vsnprintf=yes
@@ -7478,7 +7859,8 @@ main ()
 {
 static int test_array [1 - 2 * !(/* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
 	      sizeof (double) <= sizeof (long double))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -7501,75 +7883,47 @@ $as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
   fi
 
 
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
 $as_echo_n "checking for long long int... " >&6; }
 if ${ac_cv_type_long_long_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-  /* For now, do not test the preprocessor; as of 2007 there are too many
-	 implementations with broken preprocessors.  Perhaps this can
-	 be revisited in 2012.  In the meantime, code should not expect
-	 #if to work with literals wider than 32 bits.  */
-      /* Test literals.  */
-      long long int ll = 9223372036854775807ll;
-      long long int nll = -9223372036854775807LL;
-      unsigned long long int ull = 18446744073709551615ULL;
-      /* Test constant expressions.   */
-      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-		     ? 1 : -1)];
-      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
-		     ? 1 : -1)];
-      int i = 63;
-int
-main ()
-{
-/* Test availability of runtime routines for shift and division.  */
-      long long int llmax = 9223372036854775807ll;
-      unsigned long long int ullmax = 18446744073709551615ull;
-      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-	      | (llmax / ll) | (llmax % ll)
-	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
-	      | (ullmax / ull) | (ullmax % ull));
-  ;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  			if test "$cross_compiling" = yes; then :
   ac_cv_type_long_long_int=yes
+      if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+	ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
+	if test $ac_cv_type_long_long_int = yes; then
+	  	  	  	  if test "$cross_compiling" = yes; then :
+  :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include 
-	       #ifndef LLONG_MAX
-	       # define HALF \
-			(1LL << (sizeof (long long int) * CHAR_BIT - 2))
-	       # define LLONG_MAX (HALF - 1 + HALF)
-	       #endif
+		 #ifndef LLONG_MAX
+		 # define HALF \
+			  (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+		 # define LLONG_MAX (HALF - 1 + HALF)
+		 #endif
 int
 main ()
 {
 long long int n = 1;
-	       int i;
-	       for (i = 0; ; i++)
-		 {
-		   long long int m = n << i;
-		   if (m >> i != n)
-		     return 1;
-		   if (LLONG_MAX / 2 < m)
-		     break;
-		 }
-	       return 0;
+		 int i;
+		 for (i = 0; ; i++)
+		   {
+		     long long int m = n << i;
+		     if (m >> i != n)
+		       return 1;
+		     if (LLONG_MAX / 2 < m)
+		       break;
+		   }
+		 return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_type_long_long_int=yes
+
 else
   ac_cv_type_long_long_int=no
 fi
@@ -7577,11 +7931,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-else
-  ac_cv_type_long_long_int=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+	fi
+      fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
 $as_echo "$ac_cv_type_long_long_int" >&6; }
@@ -7597,7 +7948,9 @@ $as_echo_n "checking for unsigned long long int... " >&6; }
 if ${ac_cv_type_unsigned_long_long_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_type_unsigned_long_long_int=yes
+     if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   /* For now, do not test the preprocessor; as of 2007 there are too many
@@ -7630,12 +7983,13 @@ main ()
 
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_type_unsigned_long_long_int=yes
+
 else
   ac_cv_type_unsigned_long_long_int=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
+     fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
 $as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
@@ -7710,7 +8064,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -7764,11 +8119,11 @@ else
 int
 main ()
 {
-/* FIXME: Include the comments suggested by Paul. */
+
 #ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
+  /* Ultrix mips cc rejects this sort of thing.  */
   typedef int charset[2];
-  const charset cs;
+  const charset cs = { 0, 0 };
   /* SunOS 4.1.1 cc rejects this.  */
   char const *const *pcpcc;
   char **ppc;
@@ -7785,8 +8140,9 @@ main ()
   ++pcpcc;
   ppc = (char**) pcpcc;
   pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
+    char tx;
+    char *t = &tx;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
@@ -7802,10 +8158,10 @@ main ()
     iptr p = 0;
     ++p;
   }
-  { /* AIX XL C 1.02.0.0 rejects this saying
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
+    struct s { int j; const int *ap[3]; } bx;
+    struct s *b = &bx; b->j = 5;
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
@@ -7928,11 +8284,11 @@ else
 int
 main ()
 {
-/* FIXME: Include the comments suggested by Paul. */
+
 #ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
+  /* Ultrix mips cc rejects this sort of thing.  */
   typedef int charset[2];
-  const charset cs;
+  const charset cs = { 0, 0 };
   /* SunOS 4.1.1 cc rejects this.  */
   char const *const *pcpcc;
   char **ppc;
@@ -7949,8 +8305,9 @@ main ()
   ++pcpcc;
   ppc = (char**) pcpcc;
   pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
+    char tx;
+    char *t = &tx;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
@@ -7966,10 +8323,10 @@ main ()
     iptr p = 0;
     ++p;
   }
-  { /* AIX XL C 1.02.0.0 rejects this saying
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
+    struct s { int j; const int *ap[3]; } bx;
+    struct s *b = &bx; b->j = 5;
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
@@ -8854,23 +9211,20 @@ else
 /* end confdefs.h.  */
 $ac_includes_default
 int
-find_stack_direction ()
+find_stack_direction (int *addr, int depth)
 {
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
+  int dir, dummy = 0;
+  if (! addr)
+    addr = &dummy;
+  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+  return dir + dummy;
 }
 
 int
-main ()
+main (int argc, char **argv)
 {
-  return find_stack_direction () < 0;
+  return find_stack_direction (0, argc + !argv + 20) < 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -9843,7 +10197,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(((char) -1) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -10242,7 +10597,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15869,6 +16224,9 @@ case "$ntp_cv_hdr_def_sigio" in
      *-sni-sysv*)
 	ans=no
 	;;
+     *-stratus-vos)
+	ans=no
+	;;
      *-univel-sysv*)
 	ans=no
 	;;
@@ -15947,6 +16305,9 @@ case "$ntp_cv_hdr_def_sigpoll" in
      *-sni-sysv*)
 	ans=no
 	;;
+     *-stratus-vos)
+	ans=no
+	;;
      *-*-aix[4-9]*)
 	# XXX Only verified thru AIX6
 	ans=no
@@ -16010,6 +16371,9 @@ case "$ntp_cv_hdr_def_sigpoll" in
      *-sni-sysv*)
 	ans=no
 	;;
+     *-stratus-vos)
+	ans=no
+	;;
      *-*-aix[4-9]*)
 	# XXX Only verified thru AIX6
 	ans=no
@@ -16190,8 +16554,8 @@ esac
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -16301,7 +16665,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16345,7 +16709,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16764,7 +17128,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16804,7 +17168,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17110,7 +17474,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17150,7 +17514,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17253,7 +17617,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17297,7 +17661,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17422,7 +17786,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17462,7 +17826,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17521,7 +17885,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17561,7 +17925,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18196,7 +18560,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18236,7 +18600,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18316,7 +18680,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18356,7 +18720,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18408,7 +18772,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18448,7 +18812,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18500,7 +18864,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18540,7 +18904,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18592,7 +18956,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18632,7 +18996,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18684,7 +19048,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18724,7 +19088,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -23450,32 +23814,32 @@ fi
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char*" >&5
-$as_echo_n "checking size of char*... " >&6; }
-if ${ac_cv_sizeof_charp+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char *" >&5
+$as_echo_n "checking size of char *... " >&6; }
+if ${ac_cv_sizeof_char_p+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char*))" "ac_cv_sizeof_charp"        "$ac_includes_default"; then :
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char *))" "ac_cv_sizeof_char_p"        "$ac_includes_default"; then :
 
 else
-  if test "$ac_cv_type_charp" = yes; then
+  if test "$ac_cv_type_char_p" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (char*)
+as_fn_error 77 "cannot compute sizeof (char *)
 See \`config.log' for more details" "$LINENO" 5; }
    else
-     ac_cv_sizeof_charp=0
+     ac_cv_sizeof_char_p=0
    fi
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_charp" >&5
-$as_echo "$ac_cv_sizeof_charp" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char_p" >&5
+$as_echo "$ac_cv_sizeof_char_p" >&6; }
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CHARP $ac_cv_sizeof_charp
+#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
 _ACEOF
 
 
@@ -23939,7 +24303,7 @@ do
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -24224,14 +24588,14 @@ fi
   Xyes|Xno|X )
     case "X${libopts_cv_with_libregex_root}" in
     Xyes|Xno|X ) libopts_cv_with_libregex_cflags=no ;;
-    * )        libopts_cv_with_libregex_cflags=-I${libopts_cv_with_libregex_root}/include ;;
+    * ) libopts_cv_with_libregex_cflags=-I${libopts_cv_with_libregex_root}/include ;;
     esac
   esac
   case "X${libopts_cv_with_libregex_libs}" in
   Xyes|Xno|X )
     case "X${libopts_cv_with_libregex_root}" in
     Xyes|Xno|X ) libopts_cv_with_libregex_libs=no ;;
-    * )        libopts_cv_with_libregex_libs="-L${libopts_cv_with_libregex_root}/lib -lregex";;
+    * )        libopts_cv_with_libregex_libs="-L${libopts_cv_with_libregex_root}/lib -lregex" ;;
     esac
   esac
   libopts_save_CPPFLAGS="${CPPFLAGS}"
@@ -24265,7 +24629,7 @@ else
 #include 
 #include REGEX_HEADER
 static regex_t re;
-void comp_re( char const* pzPat ) {
+void comp_re(char const * pzPat) {
   int res = regcomp( &re, pzPat, REG_EXTENDED|REG_ICASE|REG_NEWLINE );
   if (res == 0) return;
   exit( res ); }
@@ -24328,8 +24692,8 @@ else
 /* end confdefs.h.  */
 #include 
 #include 
-int main (int argc, char** argv) {
-   char* pz = pathfind( getenv( "PATH" ), "sh", "x" );
+int main (int argc, char ** argv) {
+   char * pz = pathfind( getenv( "PATH" ), "sh", "x" );
    return (pz == 0) ? 1 : 0;
 }
 _ACEOF
@@ -24401,7 +24765,7 @@ else
 /* end confdefs.h.  */
 #include 
 #include 
-int main (int argc, char** argv) {
+int main (int argc, char ** argv) {
 #ifndef PATH_MAX
 choke me!!
 #else
@@ -24504,8 +24868,8 @@ else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include 
-int main (int argc, char** argv) {
-FILE* fp = fopen("conftest.$ac_ext", "rb");
+int main (int argc, char ** argv) {
+FILE * fp = fopen("conftest.$ac_ext", "rb");
 return (fp == NULL) ? 1 : fclose(fp); }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -24550,8 +24914,8 @@ else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include 
-int main (int argc, char** argv) {
-FILE* fp = fopen("conftest.$ac_ext", "rt");
+int main (int argc, char ** argv) {
+FILE * fp = fopen("conftest.$ac_ext", "rt");
 return (fp == NULL) ? 1 : fclose(fp); }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -24645,7 +25009,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -24688,7 +25052,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -25034,60 +25398,60 @@ else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include 
-#ifndef bool
- "error: bool is not defined"
-#endif
-#ifndef false
- "error: false is not defined"
-#endif
-#if false
- "error: false is not 0"
-#endif
-#ifndef true
- "error: true is not defined"
-#endif
-#if true != 1
- "error: true is not 1"
-#endif
-#ifndef __bool_true_false_are_defined
- "error: __bool_true_false_are_defined is not defined"
-#endif
+             #include 
+             #ifndef bool
+              "error: bool is not defined"
+             #endif
+             #ifndef false
+              "error: false is not defined"
+             #endif
+             #if false
+              "error: false is not 0"
+             #endif
+             #ifndef true
+              "error: true is not defined"
+             #endif
+             #if true != 1
+              "error: true is not 1"
+             #endif
+             #ifndef __bool_true_false_are_defined
+              "error: __bool_true_false_are_defined is not defined"
+             #endif
 
-	struct s { _Bool s: 1; _Bool t; } s;
+             struct s { _Bool s: 1; _Bool t; } s;
 
-	char a[true == 1 ? 1 : -1];
-	char b[false == 0 ? 1 : -1];
-	char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-	char d[(bool) 0.5 == true ? 1 : -1];
-	/* See body of main program for 'e'.  */
-	char f[(_Bool) 0.0 == false ? 1 : -1];
-	char g[true];
-	char h[sizeof (_Bool)];
-	char i[sizeof s.t];
-	enum { j = false, k = true, l = false * true, m = true * 256 };
-	/* The following fails for
-	   HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-	_Bool n[m];
-	char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-	char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-	/* Catch a bug in an HP-UX C compiler.  See
-	   http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-	   http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-	 */
-	_Bool q = true;
-	_Bool *pq = &q;
+             char a[true == 1 ? 1 : -1];
+             char b[false == 0 ? 1 : -1];
+             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+             char d[(bool) 0.5 == true ? 1 : -1];
+             /* See body of main program for 'e'.  */
+             char f[(_Bool) 0.0 == false ? 1 : -1];
+             char g[true];
+             char h[sizeof (_Bool)];
+             char i[sizeof s.t];
+             enum { j = false, k = true, l = false * true, m = true * 256 };
+             /* The following fails for
+                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+             _Bool n[m];
+             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+             /* Catch a bug in an HP-UX C compiler.  See
+                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+              */
+             _Bool q = true;
+             _Bool *pq = &q;
 
 int
 main ()
 {
 
-	bool e = &s;
-	*pq |= q;
-	*pq |= ! q;
-	/* Refer to every declared value, to avoid compiler optimizations.  */
-	return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-		+ !m + !n + !o + !p + !q + !pq);
+             bool e = &s;
+             *pq |= q;
+             *pq |= ! q;
+             /* Refer to every declared value, to avoid compiler optimizations.  */
+             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+                     + !m + !n + !o + !p + !q + !pq);
 
   ;
   return 0;
@@ -25102,7 +25466,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
 $as_echo "$ac_cv_header_stdbool_h" >&6; }
-ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+   ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
 if test "x$ac_cv_type__Bool" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
@@ -25112,6 +25476,7 @@ _ACEOF
 
 fi
 
+
 if test $ac_cv_header_stdbool_h = yes; then
 
 $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
@@ -25522,7 +25887,26 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     CFLAGS_NTP="$CFLAGS_NTP -Wstrict-prototypes"
 esac
 
+# Because we don't want -Werror for the EVP_MD_do_all_sorted check
 CFLAGS="$NTPO_SAVED_CFLAGS"
+
+case "$ntp_openssl" in
+ yes)
+    LIBS="$NTPO_SAVED_LIBS $LDADD_NTP"
+    for ac_func in EVP_MD_do_all_sorted
+do :
+  ac_fn_c_check_func "$LINENO" "EVP_MD_do_all_sorted" "ac_cv_func_EVP_MD_do_all_sorted"
+if test "x$ac_cv_func_EVP_MD_do_all_sorted" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_EVP_MD_DO_ALL_SORTED 1
+_ACEOF
+
+fi
+done
+
+    ;;
+esac
+
 CPPFLAGS="$NTPO_SAVED_CPPFLAGS"
 LIBS="$NTPO_SAVED_LIBS"
 { NTPO_SAVED_CFLAGS=; unset NTPO_SAVED_CFLAGS;}
@@ -26367,6 +26751,67 @@ fi
 done
 
 
+
+# We may not need have_unity
+have_unity=false
+# Extract the first word of "ruby", so it can be a program name with args.
+set dummy ruby; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATH_RUBY+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PATH_RUBY in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PATH_RUBY="$PATH_RUBY" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATH_RUBY="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PATH_RUBY=$ac_cv_path_PATH_RUBY
+if test -n "$PATH_RUBY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_RUBY" >&5
+$as_echo "$PATH_RUBY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+case "$PATH_RUBY" in
+ /*)
+    have_unity=true
+    ;;
+ *) PATH_RUBY="false"
+    ;;
+esac
+# We may not need UNITYBUILD_AVAILABLE
+ if $have_unity; then
+  UNITYBUILD_AVAILABLE_TRUE=
+  UNITYBUILD_AVAILABLE_FALSE='#'
+else
+  UNITYBUILD_AVAILABLE_TRUE='#'
+  UNITYBUILD_AVAILABLE_FALSE=
+fi
+
+
+
 # HMS: if we don't find c++ we should not look for gtest.
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -26396,7 +26841,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -26440,7 +26885,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -26636,8 +27081,9 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -26671,16 +27117,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -26689,16 +27135,16 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -29984,7 +30430,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GTEST_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -30066,6 +30512,10 @@ ac_config_files="$ac_config_files scripts/Makefile"
 
 ac_config_files="$ac_config_files tests/Makefile"
 
+ac_config_files="$ac_config_files tests/fileHandlingTest.h"
+
+ac_config_files="$ac_config_files unity/Makefile"
+
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -30176,6 +30626,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -30237,6 +30695,10 @@ if test -z "${BUILD_LIBEVENT_TRUE}" && test -z "${BUILD_LIBEVENT_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_LIBEVENT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${UNITYBUILD_AVAILABLE_TRUE}" && test -z "${UNITYBUILD_AVAILABLE_FALSE}"; then
+  as_fn_error $? "conditional \"UNITYBUILD_AVAILABLE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -30543,16 +31005,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -30612,28 +31074,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -30654,8 +31104,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sntp $as_me 4.2.8p2, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by sntp $as_me 4.2.8p3, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -30721,11 +31171,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sntp config.status 4.2.8p2
-configured by $0, generated by GNU Autoconf 2.68,
+sntp config.status 4.2.8p3
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -30816,7 +31266,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -31235,6 +31685,8 @@ do
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "tests/fileHandlingTest.h") CONFIG_FILES="$CONFIG_FILES tests/fileHandlingTest.h" ;;
+    "unity/Makefile") CONFIG_FILES="$CONFIG_FILES unity/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -31831,7 +32283,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -31844,7 +32296,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -31878,21 +32330,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
diff --git a/contrib/ntp/sntp/configure.ac b/contrib/ntp/sntp/configure.ac
index 172c6b1a1f7d..c0c98dce91fc 100644
--- a/contrib/ntp/sntp/configure.ac
+++ b/contrib/ntp/sntp/configure.ac
@@ -137,6 +137,7 @@ AC_DEFINE([HAVE_TERMIOS], 1, [sntp does not care about TTY stuff])
 # Checks for library functions.
 AC_CHECK_FUNCS([socket])
 
+NTP_UNITYBUILD
 # HMS: if we don't find c++ we should not look for gtest.
 AC_PROG_CXX
 NTP_GOOGLETEST
@@ -150,5 +151,7 @@ AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([include/Makefile])
 AC_CONFIG_FILES([scripts/Makefile])
 AC_CONFIG_FILES([tests/Makefile])
+AC_CONFIG_FILES([tests/fileHandlingTest.h])
+AC_CONFIG_FILES([unity/Makefile])
 
 AC_OUTPUT
diff --git a/contrib/ntp/sntp/include/Makefile.in b/contrib/ntp/sntp/include/Makefile.in
index 31db061256cb..8289b417ce81 100644
--- a/contrib/ntp/sntp/include/Makefile.in
+++ b/contrib/ntp/sntp/include/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -16,6 +15,61 @@
 @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@
@@ -35,8 +89,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = include
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/libopts/m4/stdnoreturn.m4 \
@@ -58,6 +110,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/m4/ntp_pkg_config.m4 \
 	$(top_srcdir)/m4/ntp_prog_cc.m4 $(top_srcdir)/m4/ntp_sntp.m4 \
 	$(top_srcdir)/m4/ntp_sysexits.m4 \
+	$(top_srcdir)/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/m4/openldap-thread-check.m4 \
 	$(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/os_cflags.m4 \
@@ -65,19 +118,34 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -223,6 +291,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSIX_SHELL = @POSIX_SHELL@
@@ -337,7 +406,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign include/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -361,11 +429,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -412,10 +480,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -496,15 +569,18 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 $(srcdir)/version.def: $(srcdir)/../../packageinfo.sh
diff --git a/contrib/ntp/sntp/include/autogen-version.def b/contrib/ntp/sntp/include/autogen-version.def
index bbe3f033d469..e494f0ef4d1f 100644
--- a/contrib/ntp/sntp/include/autogen-version.def
+++ b/contrib/ntp/sntp/include/autogen-version.def
@@ -1,4 +1,4 @@
-#assert (version-compare >= autogen-version "5.18.4")
+#assert (version-compare >= autogen-version "5.18.5")
 // >= is usually what we want.
 // > is when we need a pre* version
 guard-option-names;
diff --git a/contrib/ntp/sntp/include/version.def b/contrib/ntp/sntp/include/version.def
index c315fe80be27..b0076515fea1 100644
--- a/contrib/ntp/sntp/include/version.def
+++ b/contrib/ntp/sntp/include/version.def
@@ -1 +1 @@
-version = '4.2.8p2';
+version = '4.2.8p3';
diff --git a/contrib/ntp/sntp/include/version.texi b/contrib/ntp/sntp/include/version.texi
index d5ea0c033919..4a13b8f2526c 100644
--- a/contrib/ntp/sntp/include/version.texi
+++ b/contrib/ntp/sntp/include/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 07 April 2015
-@set EDITION 4.2.8p2
-@set VERSION 4.2.8p2
+@set UPDATED 29 June 2015
+@set EDITION 4.2.8p3
+@set VERSION 4.2.8p3
diff --git a/contrib/ntp/sntp/invoke-sntp.texi b/contrib/ntp/sntp/invoke-sntp.texi
index bed49ec2cacc..708a370ea9ef 100644
--- a/contrib/ntp/sntp/invoke-sntp.texi
+++ b/contrib/ntp/sntp/invoke-sntp.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-sntp.texi)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:18:04 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:23:30 PM by AutoGen 5.18.5
 # From the definitions    sntp-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -101,7 +101,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p2
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p3
 Usage:  sntp [ - [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/contrib/ntp/sntp/kod_management.c b/contrib/ntp/sntp/kod_management.c
index 562163945f57..c8df3bdca60e 100644
--- a/contrib/ntp/sntp/kod_management.c
+++ b/contrib/ntp/sntp/kod_management.c
@@ -35,7 +35,7 @@ search_entry(
 		return 0;
 	}
 
-	*dst = emalloc(resc * sizeof(**dst));
+	*dst = eallocarray(resc, sizeof(**dst));
 
 	b = 0;
 	for (a = 0; a < kod_db_cnt; a++)
@@ -246,7 +246,7 @@ kod_init_kod_db(
 
 	rewind(db_s);
 
-	kod_db = emalloc(sizeof(kod_db[0]) * kod_db_cnt);
+	kod_db = eallocarray(kod_db_cnt, sizeof(kod_db[0]));
 
 	/* Read contents of file */
 	for (b = 0; 
diff --git a/contrib/ntp/sntp/libevent/Makefile.in b/contrib/ntp/sntp/libevent/Makefile.in
index 4caff8facefb..61d96f5e04ba 100644
--- a/contrib/ntp/sntp/libevent/Makefile.in
+++ b/contrib/ntp/sntp/libevent/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -44,6 +43,61 @@
 
 
 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@
@@ -68,17 +122,6 @@ host_triplet = @host@
 @OPENSSL_TRUE@am__append_4 = libevent_openssl.pc
 noinst_PROGRAMS = $(am__EXEEXT_4) $(am__EXEEXT_6)
 EXTRA_PROGRAMS = $(am__EXEEXT_1)
-DIST_COMMON = $(am__configure_deps) $(am__dist_bin_SCRIPTS_DIST) \
-	$(am__include_HEADERS_DIST) $(am__include_event2_HEADERS_DIST) \
-	$(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/evconfig-private.h.in $(srcdir)/include/include.am \
-	$(srcdir)/libevent.pc.in $(srcdir)/libevent_openssl.pc.in \
-	$(srcdir)/libevent_pthreads.pc.in $(srcdir)/sample/include.am \
-	$(srcdir)/test/include.am $(top_srcdir)/configure ChangeLog \
-	build-aux/compile build-aux/config.guess build-aux/config.sub \
-	build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
-	build-aux/missing build-aux/ylwrap epoll_sub.c
 @INSTALL_LIBEVENT_FALSE@am__append_5 = $(EVENT2_EXPORT)
 @OPENSSL_TRUE@am__append_6 = sample/le-proxy sample/https-client
 @OPENSSL_TRUE@am__append_7 = \
@@ -114,6 +157,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_backport_259_ssizet.m4 \
 	$(top_srcdir)/m4/ntp_pkg_config.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__dist_bin_SCRIPTS_DIST) \
+	$(am__include_HEADERS_DIST) $(am__include_event2_HEADERS_DIST) \
+	$(am__noinst_HEADERS_DIST) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -142,6 +189,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" \
 	"$(DESTDIR)$(include_event2dir)" \
@@ -182,9 +235,10 @@ am__objects_10 = buffer.lo bufferevent.lo bufferevent_filter.lo \
 am__objects_11 = evdns.lo event_tagging.lo evrpc.lo http.lo
 am_libevent_la_OBJECTS = $(am__objects_10) $(am__objects_11)
 libevent_la_OBJECTS = $(am_libevent_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libevent_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libevent_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -381,6 +435,18 @@ test_test_weof_OBJECTS = $(am_test_test_weof_OBJECTS)
 test_test_weof_DEPENDENCIES = libevent_core.la
 am__dist_bin_SCRIPTS_DIST = event_rpcgen.py
 SCRIPTS = $(dist_bin_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -391,22 +457,18 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libevent_la_SOURCES) $(libevent_core_la_SOURCES) \
 	$(libevent_extra_la_SOURCES) $(libevent_openssl_la_SOURCES) \
 	$(libevent_pthreads_la_SOURCES) $(sample_dns_example_SOURCES) \
@@ -440,6 +502,11 @@ DIST_SOURCES = $(am__libevent_la_SOURCES_DIST) \
 	$(test_test_fdleak_SOURCES) $(test_test_init_SOURCES) \
 	$(test_test_ratelim_SOURCES) $(test_test_time_SOURCES) \
 	$(test_test_weof_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(pkgconfig_DATA)
 am__include_HEADERS_DIST = include/evdns.h include/event.h \
 	include/evhttp.h include/evrpc.h include/evutil.h
@@ -489,20 +556,235 @@ am__noinst_HEADERS_DIST = include/event2/buffer.h \
 HEADERS = $(include_HEADERS) $(include_event2_HEADERS) \
 	$(nodist_include_event2_HEADERS) $(nodist_noinst_HEADERS) \
 	$(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in evconfig-private.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+CSCOPE = cscope
+AM_RECURSIVE_TARGETS = cscope check recheck
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(srcdir)/evconfig-private.h.in $(srcdir)/include/include.am \
+	$(srcdir)/libevent.pc.in $(srcdir)/libevent_openssl.pc.in \
+	$(srcdir)/libevent_pthreads.pc.in $(srcdir)/sample/include.am \
+	$(srcdir)/test/include.am $(top_srcdir)/build-aux/compile \
+	$(top_srcdir)/build-aux/config.guess \
+	$(top_srcdir)/build-aux/config.sub \
+	$(top_srcdir)/build-aux/depcomp \
+	$(top_srcdir)/build-aux/install-sh \
+	$(top_srcdir)/build-aux/ltmain.sh \
+	$(top_srcdir)/build-aux/missing \
+	$(top_srcdir)/build-aux/test-driver ChangeLog build-aux/ar-lib \
+	build-aux/compile build-aux/config.guess build-aux/config.sub \
+	build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
+	build-aux/missing build-aux/ylwrap epoll_sub.c
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -946,8 +1228,8 @@ all: $(BUILT_SOURCES) config.h evconfig-private.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-am--refresh:
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/include/include.am $(srcdir)/sample/include.am $(srcdir)/test/include.am $(am__configure_deps)
 	@for dep in $?; do \
@@ -962,7 +1244,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/include/include.am $(src
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -972,6 +1253,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/include/include.am $(srcdir)/sample/include.am $(srcdir)/test/include.am $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -983,10 +1265,8 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -997,10 +1277,8 @@ $(srcdir)/config.h.in:  $(am__configure_deps)
 	touch $@
 
 evconfig-private.h: stamp-h2
-	@if test ! -f $@; then \
-	  rm -f stamp-h2; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \
-	else :; fi
+	@test -f $@ || rm -f stamp-h2
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
 
 stamp-h2: $(srcdir)/evconfig-private.h.in $(top_builddir)/config.status
 	@rm -f stamp-h2
@@ -1014,9 +1292,9 @@ libevent_openssl.pc: $(top_builddir)/config.status $(srcdir)/libevent_openssl.pc
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 libevent_pthreads.pc: $(top_builddir)/config.status $(srcdir)/libevent_pthreads.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -1024,6 +1302,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -1039,30 +1319,39 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libevent.la: $(libevent_la_OBJECTS) $(libevent_la_DEPENDENCIES) 
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libevent.la: $(libevent_la_OBJECTS) $(libevent_la_DEPENDENCIES) $(EXTRA_libevent_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libevent_la_LINK) $(am_libevent_la_rpath) $(libevent_la_OBJECTS) $(libevent_la_LIBADD) $(LIBS)
-libevent_core.la: $(libevent_core_la_OBJECTS) $(libevent_core_la_DEPENDENCIES) 
+
+libevent_core.la: $(libevent_core_la_OBJECTS) $(libevent_core_la_DEPENDENCIES) $(EXTRA_libevent_core_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libevent_core_la_LINK) $(am_libevent_core_la_rpath) $(libevent_core_la_OBJECTS) $(libevent_core_la_LIBADD) $(LIBS)
-libevent_extra.la: $(libevent_extra_la_OBJECTS) $(libevent_extra_la_DEPENDENCIES) 
+
+libevent_extra.la: $(libevent_extra_la_OBJECTS) $(libevent_extra_la_DEPENDENCIES) $(EXTRA_libevent_extra_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libevent_extra_la_LINK) $(am_libevent_extra_la_rpath) $(libevent_extra_la_OBJECTS) $(libevent_extra_la_LIBADD) $(LIBS)
-libevent_openssl.la: $(libevent_openssl_la_OBJECTS) $(libevent_openssl_la_DEPENDENCIES) 
+
+libevent_openssl.la: $(libevent_openssl_la_OBJECTS) $(libevent_openssl_la_DEPENDENCIES) $(EXTRA_libevent_openssl_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libevent_openssl_la_LINK) $(am_libevent_openssl_la_rpath) $(libevent_openssl_la_OBJECTS) $(libevent_openssl_la_LIBADD) $(LIBS)
-libevent_pthreads.la: $(libevent_pthreads_la_OBJECTS) $(libevent_pthreads_la_DEPENDENCIES) 
+
+libevent_pthreads.la: $(libevent_pthreads_la_OBJECTS) $(libevent_pthreads_la_DEPENDENCIES) $(EXTRA_libevent_pthreads_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libevent_pthreads_la_LINK) $(am_libevent_pthreads_la_rpath) $(libevent_pthreads_la_OBJECTS) $(libevent_pthreads_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
@@ -1081,22 +1370,26 @@ sample/$(DEPDIR)/$(am__dirstamp):
 	@: > sample/$(DEPDIR)/$(am__dirstamp)
 sample/dns-example.$(OBJEXT): sample/$(am__dirstamp) \
 	sample/$(DEPDIR)/$(am__dirstamp)
-sample/dns-example$(EXEEXT): $(sample_dns_example_OBJECTS) $(sample_dns_example_DEPENDENCIES) sample/$(am__dirstamp)
+
+sample/dns-example$(EXEEXT): $(sample_dns_example_OBJECTS) $(sample_dns_example_DEPENDENCIES) $(EXTRA_sample_dns_example_DEPENDENCIES) sample/$(am__dirstamp)
 	@rm -f sample/dns-example$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sample_dns_example_OBJECTS) $(sample_dns_example_LDADD) $(LIBS)
 sample/event-read-fifo.$(OBJEXT): sample/$(am__dirstamp) \
 	sample/$(DEPDIR)/$(am__dirstamp)
-sample/event-read-fifo$(EXEEXT): $(sample_event_read_fifo_OBJECTS) $(sample_event_read_fifo_DEPENDENCIES) sample/$(am__dirstamp)
+
+sample/event-read-fifo$(EXEEXT): $(sample_event_read_fifo_OBJECTS) $(sample_event_read_fifo_DEPENDENCIES) $(EXTRA_sample_event_read_fifo_DEPENDENCIES) sample/$(am__dirstamp)
 	@rm -f sample/event-read-fifo$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sample_event_read_fifo_OBJECTS) $(sample_event_read_fifo_LDADD) $(LIBS)
 sample/hello-world.$(OBJEXT): sample/$(am__dirstamp) \
 	sample/$(DEPDIR)/$(am__dirstamp)
-sample/hello-world$(EXEEXT): $(sample_hello_world_OBJECTS) $(sample_hello_world_DEPENDENCIES) sample/$(am__dirstamp)
+
+sample/hello-world$(EXEEXT): $(sample_hello_world_OBJECTS) $(sample_hello_world_DEPENDENCIES) $(EXTRA_sample_hello_world_DEPENDENCIES) sample/$(am__dirstamp)
 	@rm -f sample/hello-world$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sample_hello_world_OBJECTS) $(sample_hello_world_LDADD) $(LIBS)
 sample/http-server.$(OBJEXT): sample/$(am__dirstamp) \
 	sample/$(DEPDIR)/$(am__dirstamp)
-sample/http-server$(EXEEXT): $(sample_http_server_OBJECTS) $(sample_http_server_DEPENDENCIES) sample/$(am__dirstamp)
+
+sample/http-server$(EXEEXT): $(sample_http_server_OBJECTS) $(sample_http_server_DEPENDENCIES) $(EXTRA_sample_http_server_DEPENDENCIES) sample/$(am__dirstamp)
 	@rm -f sample/http-server$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sample_http_server_OBJECTS) $(sample_http_server_LDADD) $(LIBS)
 sample/https-client.$(OBJEXT): sample/$(am__dirstamp) \
@@ -1105,22 +1398,26 @@ sample/hostcheck.$(OBJEXT): sample/$(am__dirstamp) \
 	sample/$(DEPDIR)/$(am__dirstamp)
 sample/openssl_hostname_validation.$(OBJEXT): sample/$(am__dirstamp) \
 	sample/$(DEPDIR)/$(am__dirstamp)
-sample/https-client$(EXEEXT): $(sample_https_client_OBJECTS) $(sample_https_client_DEPENDENCIES) sample/$(am__dirstamp)
+
+sample/https-client$(EXEEXT): $(sample_https_client_OBJECTS) $(sample_https_client_DEPENDENCIES) $(EXTRA_sample_https_client_DEPENDENCIES) sample/$(am__dirstamp)
 	@rm -f sample/https-client$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sample_https_client_OBJECTS) $(sample_https_client_LDADD) $(LIBS)
 sample/le-proxy.$(OBJEXT): sample/$(am__dirstamp) \
 	sample/$(DEPDIR)/$(am__dirstamp)
-sample/le-proxy$(EXEEXT): $(sample_le_proxy_OBJECTS) $(sample_le_proxy_DEPENDENCIES) sample/$(am__dirstamp)
+
+sample/le-proxy$(EXEEXT): $(sample_le_proxy_OBJECTS) $(sample_le_proxy_DEPENDENCIES) $(EXTRA_sample_le_proxy_DEPENDENCIES) sample/$(am__dirstamp)
 	@rm -f sample/le-proxy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sample_le_proxy_OBJECTS) $(sample_le_proxy_LDADD) $(LIBS)
 sample/signal-test.$(OBJEXT): sample/$(am__dirstamp) \
 	sample/$(DEPDIR)/$(am__dirstamp)
-sample/signal-test$(EXEEXT): $(sample_signal_test_OBJECTS) $(sample_signal_test_DEPENDENCIES) sample/$(am__dirstamp)
+
+sample/signal-test$(EXEEXT): $(sample_signal_test_OBJECTS) $(sample_signal_test_DEPENDENCIES) $(EXTRA_sample_signal_test_DEPENDENCIES) sample/$(am__dirstamp)
 	@rm -f sample/signal-test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sample_signal_test_OBJECTS) $(sample_signal_test_LDADD) $(LIBS)
 sample/time-test.$(OBJEXT): sample/$(am__dirstamp) \
 	sample/$(DEPDIR)/$(am__dirstamp)
-sample/time-test$(EXEEXT): $(sample_time_test_OBJECTS) $(sample_time_test_DEPENDENCIES) sample/$(am__dirstamp)
+
+sample/time-test$(EXEEXT): $(sample_time_test_OBJECTS) $(sample_time_test_DEPENDENCIES) $(EXTRA_sample_time_test_DEPENDENCIES) sample/$(am__dirstamp)
 	@rm -f sample/time-test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sample_time_test_OBJECTS) $(sample_time_test_LDADD) $(LIBS)
 test/$(am__dirstamp):
@@ -1131,22 +1428,26 @@ test/$(DEPDIR)/$(am__dirstamp):
 	@: > test/$(DEPDIR)/$(am__dirstamp)
 test/bench.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/bench$(EXEEXT): $(test_bench_OBJECTS) $(test_bench_DEPENDENCIES) test/$(am__dirstamp)
+
+test/bench$(EXEEXT): $(test_bench_OBJECTS) $(test_bench_DEPENDENCIES) $(EXTRA_test_bench_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/bench$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_bench_OBJECTS) $(test_bench_LDADD) $(LIBS)
 test/bench_cascade.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/bench_cascade$(EXEEXT): $(test_bench_cascade_OBJECTS) $(test_bench_cascade_DEPENDENCIES) test/$(am__dirstamp)
+
+test/bench_cascade$(EXEEXT): $(test_bench_cascade_OBJECTS) $(test_bench_cascade_DEPENDENCIES) $(EXTRA_test_bench_cascade_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/bench_cascade$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_bench_cascade_OBJECTS) $(test_bench_cascade_LDADD) $(LIBS)
 test/bench_http.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/bench_http$(EXEEXT): $(test_bench_http_OBJECTS) $(test_bench_http_DEPENDENCIES) test/$(am__dirstamp)
+
+test/bench_http$(EXEEXT): $(test_bench_http_OBJECTS) $(test_bench_http_DEPENDENCIES) $(EXTRA_test_bench_http_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/bench_http$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_bench_http_OBJECTS) $(test_bench_http_LDADD) $(LIBS)
 test/bench_httpclient.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/bench_httpclient$(EXEEXT): $(test_bench_httpclient_OBJECTS) $(test_bench_httpclient_DEPENDENCIES) test/$(am__dirstamp)
+
+test/bench_httpclient$(EXEEXT): $(test_bench_httpclient_OBJECTS) $(test_bench_httpclient_DEPENDENCIES) $(EXTRA_test_bench_httpclient_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/bench_httpclient$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_bench_httpclient_OBJECTS) $(test_bench_httpclient_LDADD) $(LIBS)
 test/test_regress-regress.$(OBJEXT): test/$(am__dirstamp) \
@@ -1187,58 +1488,71 @@ test/test_regress-regress_iocp.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
 test/test_regress-regress_ssl.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/regress$(EXEEXT): $(test_regress_OBJECTS) $(test_regress_DEPENDENCIES) test/$(am__dirstamp)
+
+test/regress$(EXEEXT): $(test_regress_OBJECTS) $(test_regress_DEPENDENCIES) $(EXTRA_test_regress_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/regress$(EXEEXT)
 	$(AM_V_CCLD)$(test_regress_LINK) $(test_regress_OBJECTS) $(test_regress_LDADD) $(LIBS)
 test/test-changelist.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/test-changelist$(EXEEXT): $(test_test_changelist_OBJECTS) $(test_test_changelist_DEPENDENCIES) test/$(am__dirstamp)
+
+test/test-changelist$(EXEEXT): $(test_test_changelist_OBJECTS) $(test_test_changelist_DEPENDENCIES) $(EXTRA_test_test_changelist_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/test-changelist$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_test_changelist_OBJECTS) $(test_test_changelist_LDADD) $(LIBS)
 test/test-closed.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/test-closed$(EXEEXT): $(test_test_closed_OBJECTS) $(test_test_closed_DEPENDENCIES) test/$(am__dirstamp)
+
+test/test-closed$(EXEEXT): $(test_test_closed_OBJECTS) $(test_test_closed_DEPENDENCIES) $(EXTRA_test_test_closed_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/test-closed$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_test_closed_OBJECTS) $(test_test_closed_LDADD) $(LIBS)
 test/test-dumpevents.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/test-dumpevents$(EXEEXT): $(test_test_dumpevents_OBJECTS) $(test_test_dumpevents_DEPENDENCIES) test/$(am__dirstamp)
+
+test/test-dumpevents$(EXEEXT): $(test_test_dumpevents_OBJECTS) $(test_test_dumpevents_DEPENDENCIES) $(EXTRA_test_test_dumpevents_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/test-dumpevents$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_test_dumpevents_OBJECTS) $(test_test_dumpevents_LDADD) $(LIBS)
 test/test-eof.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/test-eof$(EXEEXT): $(test_test_eof_OBJECTS) $(test_test_eof_DEPENDENCIES) test/$(am__dirstamp)
+
+test/test-eof$(EXEEXT): $(test_test_eof_OBJECTS) $(test_test_eof_DEPENDENCIES) $(EXTRA_test_test_eof_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/test-eof$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_test_eof_OBJECTS) $(test_test_eof_LDADD) $(LIBS)
 test/test-fdleak.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/test-fdleak$(EXEEXT): $(test_test_fdleak_OBJECTS) $(test_test_fdleak_DEPENDENCIES) test/$(am__dirstamp)
+
+test/test-fdleak$(EXEEXT): $(test_test_fdleak_OBJECTS) $(test_test_fdleak_DEPENDENCIES) $(EXTRA_test_test_fdleak_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/test-fdleak$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_test_fdleak_OBJECTS) $(test_test_fdleak_LDADD) $(LIBS)
 test/test-init.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/test-init$(EXEEXT): $(test_test_init_OBJECTS) $(test_test_init_DEPENDENCIES) test/$(am__dirstamp)
+
+test/test-init$(EXEEXT): $(test_test_init_OBJECTS) $(test_test_init_DEPENDENCIES) $(EXTRA_test_test_init_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/test-init$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_test_init_OBJECTS) $(test_test_init_LDADD) $(LIBS)
 test/test-ratelim.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/test-ratelim$(EXEEXT): $(test_test_ratelim_OBJECTS) $(test_test_ratelim_DEPENDENCIES) test/$(am__dirstamp)
+
+test/test-ratelim$(EXEEXT): $(test_test_ratelim_OBJECTS) $(test_test_ratelim_DEPENDENCIES) $(EXTRA_test_test_ratelim_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/test-ratelim$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_test_ratelim_OBJECTS) $(test_test_ratelim_LDADD) $(LIBS)
 test/test-time.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/test-time$(EXEEXT): $(test_test_time_OBJECTS) $(test_test_time_DEPENDENCIES) test/$(am__dirstamp)
+
+test/test-time$(EXEEXT): $(test_test_time_OBJECTS) $(test_test_time_DEPENDENCIES) $(EXTRA_test_test_time_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/test-time$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_test_time_OBJECTS) $(test_test_time_LDADD) $(LIBS)
 test/test-weof.$(OBJEXT): test/$(am__dirstamp) \
 	test/$(DEPDIR)/$(am__dirstamp)
-test/test-weof$(EXEEXT): $(test_test_weof_OBJECTS) $(test_test_weof_DEPENDENCIES) test/$(am__dirstamp)
+
+test/test-weof$(EXEEXT): $(test_test_weof_OBJECTS) $(test_test_weof_DEPENDENCIES) $(EXTRA_test_test_weof_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/test-weof$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_test_weof_OBJECTS) $(test_test_weof_LDADD) $(LIBS)
 install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -1266,54 +1580,12 @@ uninstall-dist_binSCRIPTS:
 	@list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f sample/dns-example.$(OBJEXT)
-	-rm -f sample/event-read-fifo.$(OBJEXT)
-	-rm -f sample/hello-world.$(OBJEXT)
-	-rm -f sample/hostcheck.$(OBJEXT)
-	-rm -f sample/http-server.$(OBJEXT)
-	-rm -f sample/https-client.$(OBJEXT)
-	-rm -f sample/le-proxy.$(OBJEXT)
-	-rm -f sample/openssl_hostname_validation.$(OBJEXT)
-	-rm -f sample/signal-test.$(OBJEXT)
-	-rm -f sample/time-test.$(OBJEXT)
-	-rm -f test/bench.$(OBJEXT)
-	-rm -f test/bench_cascade.$(OBJEXT)
-	-rm -f test/bench_http.$(OBJEXT)
-	-rm -f test/bench_httpclient.$(OBJEXT)
-	-rm -f test/test-changelist.$(OBJEXT)
-	-rm -f test/test-closed.$(OBJEXT)
-	-rm -f test/test-dumpevents.$(OBJEXT)
-	-rm -f test/test-eof.$(OBJEXT)
-	-rm -f test/test-fdleak.$(OBJEXT)
-	-rm -f test/test-init.$(OBJEXT)
-	-rm -f test/test-ratelim.$(OBJEXT)
-	-rm -f test/test-time.$(OBJEXT)
-	-rm -f test/test-weof.$(OBJEXT)
-	-rm -f test/test_regress-regress.$(OBJEXT)
-	-rm -f test/test_regress-regress.gen.$(OBJEXT)
-	-rm -f test/test_regress-regress_buffer.$(OBJEXT)
-	-rm -f test/test_regress-regress_bufferevent.$(OBJEXT)
-	-rm -f test/test_regress-regress_dns.$(OBJEXT)
-	-rm -f test/test_regress-regress_et.$(OBJEXT)
-	-rm -f test/test_regress-regress_finalize.$(OBJEXT)
-	-rm -f test/test_regress-regress_http.$(OBJEXT)
-	-rm -f test/test_regress-regress_iocp.$(OBJEXT)
-	-rm -f test/test_regress-regress_listener.$(OBJEXT)
-	-rm -f test/test_regress-regress_main.$(OBJEXT)
-	-rm -f test/test_regress-regress_minheap.$(OBJEXT)
-	-rm -f test/test_regress-regress_rpc.$(OBJEXT)
-	-rm -f test/test_regress-regress_ssl.$(OBJEXT)
-	-rm -f test/test_regress-regress_testutils.$(OBJEXT)
-	-rm -f test/test_regress-regress_thread.$(OBJEXT)
-	-rm -f test/test_regress-regress_util.$(OBJEXT)
-	-rm -f test/test_regress-regress_zlib.$(OBJEXT)
-	-rm -f test/test_regress-tinytest.$(OBJEXT)
+	-rm -f sample/*.$(OBJEXT)
+	-rm -f test/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -1399,340 +1671,298 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 libevent_openssl_la-bufferevent_openssl.lo: bufferevent_openssl.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libevent_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libevent_openssl_la-bufferevent_openssl.lo -MD -MP -MF $(DEPDIR)/libevent_openssl_la-bufferevent_openssl.Tpo -c -o libevent_openssl_la-bufferevent_openssl.lo `test -f 'bufferevent_openssl.c' || echo '$(srcdir)/'`bufferevent_openssl.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libevent_openssl_la-bufferevent_openssl.Tpo $(DEPDIR)/libevent_openssl_la-bufferevent_openssl.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bufferevent_openssl.c' object='libevent_openssl_la-bufferevent_openssl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='bufferevent_openssl.c' object='libevent_openssl_la-bufferevent_openssl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libevent_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libevent_openssl_la-bufferevent_openssl.lo `test -f 'bufferevent_openssl.c' || echo '$(srcdir)/'`bufferevent_openssl.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libevent_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libevent_openssl_la-bufferevent_openssl.lo `test -f 'bufferevent_openssl.c' || echo '$(srcdir)/'`bufferevent_openssl.c
 
 test/test_regress-regress.o: test/regress.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress.Tpo -c -o test/test_regress-regress.o `test -f 'test/regress.c' || echo '$(srcdir)/'`test/regress.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress.Tpo test/$(DEPDIR)/test_regress-regress.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress.c' object='test/test_regress-regress.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress.c' object='test/test_regress-regress.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress.o `test -f 'test/regress.c' || echo '$(srcdir)/'`test/regress.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress.o `test -f 'test/regress.c' || echo '$(srcdir)/'`test/regress.c
 
 test/test_regress-regress.obj: test/regress.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress.Tpo -c -o test/test_regress-regress.obj `if test -f 'test/regress.c'; then $(CYGPATH_W) 'test/regress.c'; else $(CYGPATH_W) '$(srcdir)/test/regress.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress.Tpo test/$(DEPDIR)/test_regress-regress.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress.c' object='test/test_regress-regress.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress.c' object='test/test_regress-regress.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress.obj `if test -f 'test/regress.c'; then $(CYGPATH_W) 'test/regress.c'; else $(CYGPATH_W) '$(srcdir)/test/regress.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress.obj `if test -f 'test/regress.c'; then $(CYGPATH_W) 'test/regress.c'; else $(CYGPATH_W) '$(srcdir)/test/regress.c'; fi`
 
 test/test_regress-regress.gen.o: test/regress.gen.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress.gen.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress.gen.Tpo -c -o test/test_regress-regress.gen.o `test -f 'test/regress.gen.c' || echo '$(srcdir)/'`test/regress.gen.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress.gen.Tpo test/$(DEPDIR)/test_regress-regress.gen.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress.gen.c' object='test/test_regress-regress.gen.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress.gen.c' object='test/test_regress-regress.gen.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress.gen.o `test -f 'test/regress.gen.c' || echo '$(srcdir)/'`test/regress.gen.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress.gen.o `test -f 'test/regress.gen.c' || echo '$(srcdir)/'`test/regress.gen.c
 
 test/test_regress-regress.gen.obj: test/regress.gen.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress.gen.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress.gen.Tpo -c -o test/test_regress-regress.gen.obj `if test -f 'test/regress.gen.c'; then $(CYGPATH_W) 'test/regress.gen.c'; else $(CYGPATH_W) '$(srcdir)/test/regress.gen.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress.gen.Tpo test/$(DEPDIR)/test_regress-regress.gen.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress.gen.c' object='test/test_regress-regress.gen.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress.gen.c' object='test/test_regress-regress.gen.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress.gen.obj `if test -f 'test/regress.gen.c'; then $(CYGPATH_W) 'test/regress.gen.c'; else $(CYGPATH_W) '$(srcdir)/test/regress.gen.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress.gen.obj `if test -f 'test/regress.gen.c'; then $(CYGPATH_W) 'test/regress.gen.c'; else $(CYGPATH_W) '$(srcdir)/test/regress.gen.c'; fi`
 
 test/test_regress-regress_buffer.o: test/regress_buffer.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_buffer.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_buffer.Tpo -c -o test/test_regress-regress_buffer.o `test -f 'test/regress_buffer.c' || echo '$(srcdir)/'`test/regress_buffer.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_buffer.Tpo test/$(DEPDIR)/test_regress-regress_buffer.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_buffer.c' object='test/test_regress-regress_buffer.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_buffer.c' object='test/test_regress-regress_buffer.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_buffer.o `test -f 'test/regress_buffer.c' || echo '$(srcdir)/'`test/regress_buffer.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_buffer.o `test -f 'test/regress_buffer.c' || echo '$(srcdir)/'`test/regress_buffer.c
 
 test/test_regress-regress_buffer.obj: test/regress_buffer.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_buffer.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_buffer.Tpo -c -o test/test_regress-regress_buffer.obj `if test -f 'test/regress_buffer.c'; then $(CYGPATH_W) 'test/regress_buffer.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_buffer.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_buffer.Tpo test/$(DEPDIR)/test_regress-regress_buffer.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_buffer.c' object='test/test_regress-regress_buffer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_buffer.c' object='test/test_regress-regress_buffer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_buffer.obj `if test -f 'test/regress_buffer.c'; then $(CYGPATH_W) 'test/regress_buffer.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_buffer.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_buffer.obj `if test -f 'test/regress_buffer.c'; then $(CYGPATH_W) 'test/regress_buffer.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_buffer.c'; fi`
 
 test/test_regress-regress_bufferevent.o: test/regress_bufferevent.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_bufferevent.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_bufferevent.Tpo -c -o test/test_regress-regress_bufferevent.o `test -f 'test/regress_bufferevent.c' || echo '$(srcdir)/'`test/regress_bufferevent.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_bufferevent.Tpo test/$(DEPDIR)/test_regress-regress_bufferevent.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_bufferevent.c' object='test/test_regress-regress_bufferevent.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_bufferevent.c' object='test/test_regress-regress_bufferevent.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_bufferevent.o `test -f 'test/regress_bufferevent.c' || echo '$(srcdir)/'`test/regress_bufferevent.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_bufferevent.o `test -f 'test/regress_bufferevent.c' || echo '$(srcdir)/'`test/regress_bufferevent.c
 
 test/test_regress-regress_bufferevent.obj: test/regress_bufferevent.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_bufferevent.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_bufferevent.Tpo -c -o test/test_regress-regress_bufferevent.obj `if test -f 'test/regress_bufferevent.c'; then $(CYGPATH_W) 'test/regress_bufferevent.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_bufferevent.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_bufferevent.Tpo test/$(DEPDIR)/test_regress-regress_bufferevent.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_bufferevent.c' object='test/test_regress-regress_bufferevent.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_bufferevent.c' object='test/test_regress-regress_bufferevent.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_bufferevent.obj `if test -f 'test/regress_bufferevent.c'; then $(CYGPATH_W) 'test/regress_bufferevent.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_bufferevent.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_bufferevent.obj `if test -f 'test/regress_bufferevent.c'; then $(CYGPATH_W) 'test/regress_bufferevent.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_bufferevent.c'; fi`
 
 test/test_regress-regress_dns.o: test/regress_dns.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_dns.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_dns.Tpo -c -o test/test_regress-regress_dns.o `test -f 'test/regress_dns.c' || echo '$(srcdir)/'`test/regress_dns.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_dns.Tpo test/$(DEPDIR)/test_regress-regress_dns.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_dns.c' object='test/test_regress-regress_dns.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_dns.c' object='test/test_regress-regress_dns.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_dns.o `test -f 'test/regress_dns.c' || echo '$(srcdir)/'`test/regress_dns.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_dns.o `test -f 'test/regress_dns.c' || echo '$(srcdir)/'`test/regress_dns.c
 
 test/test_regress-regress_dns.obj: test/regress_dns.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_dns.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_dns.Tpo -c -o test/test_regress-regress_dns.obj `if test -f 'test/regress_dns.c'; then $(CYGPATH_W) 'test/regress_dns.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_dns.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_dns.Tpo test/$(DEPDIR)/test_regress-regress_dns.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_dns.c' object='test/test_regress-regress_dns.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_dns.c' object='test/test_regress-regress_dns.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_dns.obj `if test -f 'test/regress_dns.c'; then $(CYGPATH_W) 'test/regress_dns.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_dns.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_dns.obj `if test -f 'test/regress_dns.c'; then $(CYGPATH_W) 'test/regress_dns.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_dns.c'; fi`
 
 test/test_regress-regress_et.o: test/regress_et.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_et.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_et.Tpo -c -o test/test_regress-regress_et.o `test -f 'test/regress_et.c' || echo '$(srcdir)/'`test/regress_et.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_et.Tpo test/$(DEPDIR)/test_regress-regress_et.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_et.c' object='test/test_regress-regress_et.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_et.c' object='test/test_regress-regress_et.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_et.o `test -f 'test/regress_et.c' || echo '$(srcdir)/'`test/regress_et.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_et.o `test -f 'test/regress_et.c' || echo '$(srcdir)/'`test/regress_et.c
 
 test/test_regress-regress_et.obj: test/regress_et.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_et.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_et.Tpo -c -o test/test_regress-regress_et.obj `if test -f 'test/regress_et.c'; then $(CYGPATH_W) 'test/regress_et.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_et.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_et.Tpo test/$(DEPDIR)/test_regress-regress_et.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_et.c' object='test/test_regress-regress_et.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_et.c' object='test/test_regress-regress_et.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_et.obj `if test -f 'test/regress_et.c'; then $(CYGPATH_W) 'test/regress_et.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_et.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_et.obj `if test -f 'test/regress_et.c'; then $(CYGPATH_W) 'test/regress_et.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_et.c'; fi`
 
 test/test_regress-regress_finalize.o: test/regress_finalize.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_finalize.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_finalize.Tpo -c -o test/test_regress-regress_finalize.o `test -f 'test/regress_finalize.c' || echo '$(srcdir)/'`test/regress_finalize.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_finalize.Tpo test/$(DEPDIR)/test_regress-regress_finalize.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_finalize.c' object='test/test_regress-regress_finalize.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_finalize.c' object='test/test_regress-regress_finalize.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_finalize.o `test -f 'test/regress_finalize.c' || echo '$(srcdir)/'`test/regress_finalize.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_finalize.o `test -f 'test/regress_finalize.c' || echo '$(srcdir)/'`test/regress_finalize.c
 
 test/test_regress-regress_finalize.obj: test/regress_finalize.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_finalize.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_finalize.Tpo -c -o test/test_regress-regress_finalize.obj `if test -f 'test/regress_finalize.c'; then $(CYGPATH_W) 'test/regress_finalize.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_finalize.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_finalize.Tpo test/$(DEPDIR)/test_regress-regress_finalize.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_finalize.c' object='test/test_regress-regress_finalize.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_finalize.c' object='test/test_regress-regress_finalize.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_finalize.obj `if test -f 'test/regress_finalize.c'; then $(CYGPATH_W) 'test/regress_finalize.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_finalize.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_finalize.obj `if test -f 'test/regress_finalize.c'; then $(CYGPATH_W) 'test/regress_finalize.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_finalize.c'; fi`
 
 test/test_regress-regress_http.o: test/regress_http.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_http.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_http.Tpo -c -o test/test_regress-regress_http.o `test -f 'test/regress_http.c' || echo '$(srcdir)/'`test/regress_http.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_http.Tpo test/$(DEPDIR)/test_regress-regress_http.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_http.c' object='test/test_regress-regress_http.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_http.c' object='test/test_regress-regress_http.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_http.o `test -f 'test/regress_http.c' || echo '$(srcdir)/'`test/regress_http.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_http.o `test -f 'test/regress_http.c' || echo '$(srcdir)/'`test/regress_http.c
 
 test/test_regress-regress_http.obj: test/regress_http.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_http.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_http.Tpo -c -o test/test_regress-regress_http.obj `if test -f 'test/regress_http.c'; then $(CYGPATH_W) 'test/regress_http.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_http.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_http.Tpo test/$(DEPDIR)/test_regress-regress_http.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_http.c' object='test/test_regress-regress_http.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_http.c' object='test/test_regress-regress_http.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_http.obj `if test -f 'test/regress_http.c'; then $(CYGPATH_W) 'test/regress_http.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_http.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_http.obj `if test -f 'test/regress_http.c'; then $(CYGPATH_W) 'test/regress_http.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_http.c'; fi`
 
 test/test_regress-regress_listener.o: test/regress_listener.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_listener.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_listener.Tpo -c -o test/test_regress-regress_listener.o `test -f 'test/regress_listener.c' || echo '$(srcdir)/'`test/regress_listener.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_listener.Tpo test/$(DEPDIR)/test_regress-regress_listener.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_listener.c' object='test/test_regress-regress_listener.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_listener.c' object='test/test_regress-regress_listener.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_listener.o `test -f 'test/regress_listener.c' || echo '$(srcdir)/'`test/regress_listener.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_listener.o `test -f 'test/regress_listener.c' || echo '$(srcdir)/'`test/regress_listener.c
 
 test/test_regress-regress_listener.obj: test/regress_listener.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_listener.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_listener.Tpo -c -o test/test_regress-regress_listener.obj `if test -f 'test/regress_listener.c'; then $(CYGPATH_W) 'test/regress_listener.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_listener.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_listener.Tpo test/$(DEPDIR)/test_regress-regress_listener.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_listener.c' object='test/test_regress-regress_listener.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_listener.c' object='test/test_regress-regress_listener.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_listener.obj `if test -f 'test/regress_listener.c'; then $(CYGPATH_W) 'test/regress_listener.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_listener.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_listener.obj `if test -f 'test/regress_listener.c'; then $(CYGPATH_W) 'test/regress_listener.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_listener.c'; fi`
 
 test/test_regress-regress_main.o: test/regress_main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_main.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_main.Tpo -c -o test/test_regress-regress_main.o `test -f 'test/regress_main.c' || echo '$(srcdir)/'`test/regress_main.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_main.Tpo test/$(DEPDIR)/test_regress-regress_main.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_main.c' object='test/test_regress-regress_main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_main.c' object='test/test_regress-regress_main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_main.o `test -f 'test/regress_main.c' || echo '$(srcdir)/'`test/regress_main.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_main.o `test -f 'test/regress_main.c' || echo '$(srcdir)/'`test/regress_main.c
 
 test/test_regress-regress_main.obj: test/regress_main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_main.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_main.Tpo -c -o test/test_regress-regress_main.obj `if test -f 'test/regress_main.c'; then $(CYGPATH_W) 'test/regress_main.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_main.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_main.Tpo test/$(DEPDIR)/test_regress-regress_main.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_main.c' object='test/test_regress-regress_main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_main.c' object='test/test_regress-regress_main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_main.obj `if test -f 'test/regress_main.c'; then $(CYGPATH_W) 'test/regress_main.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_main.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_main.obj `if test -f 'test/regress_main.c'; then $(CYGPATH_W) 'test/regress_main.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_main.c'; fi`
 
 test/test_regress-regress_minheap.o: test/regress_minheap.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_minheap.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_minheap.Tpo -c -o test/test_regress-regress_minheap.o `test -f 'test/regress_minheap.c' || echo '$(srcdir)/'`test/regress_minheap.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_minheap.Tpo test/$(DEPDIR)/test_regress-regress_minheap.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_minheap.c' object='test/test_regress-regress_minheap.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_minheap.c' object='test/test_regress-regress_minheap.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_minheap.o `test -f 'test/regress_minheap.c' || echo '$(srcdir)/'`test/regress_minheap.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_minheap.o `test -f 'test/regress_minheap.c' || echo '$(srcdir)/'`test/regress_minheap.c
 
 test/test_regress-regress_minheap.obj: test/regress_minheap.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_minheap.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_minheap.Tpo -c -o test/test_regress-regress_minheap.obj `if test -f 'test/regress_minheap.c'; then $(CYGPATH_W) 'test/regress_minheap.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_minheap.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_minheap.Tpo test/$(DEPDIR)/test_regress-regress_minheap.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_minheap.c' object='test/test_regress-regress_minheap.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_minheap.c' object='test/test_regress-regress_minheap.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_minheap.obj `if test -f 'test/regress_minheap.c'; then $(CYGPATH_W) 'test/regress_minheap.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_minheap.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_minheap.obj `if test -f 'test/regress_minheap.c'; then $(CYGPATH_W) 'test/regress_minheap.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_minheap.c'; fi`
 
 test/test_regress-regress_rpc.o: test/regress_rpc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_rpc.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_rpc.Tpo -c -o test/test_regress-regress_rpc.o `test -f 'test/regress_rpc.c' || echo '$(srcdir)/'`test/regress_rpc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_rpc.Tpo test/$(DEPDIR)/test_regress-regress_rpc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_rpc.c' object='test/test_regress-regress_rpc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_rpc.c' object='test/test_regress-regress_rpc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_rpc.o `test -f 'test/regress_rpc.c' || echo '$(srcdir)/'`test/regress_rpc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_rpc.o `test -f 'test/regress_rpc.c' || echo '$(srcdir)/'`test/regress_rpc.c
 
 test/test_regress-regress_rpc.obj: test/regress_rpc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_rpc.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_rpc.Tpo -c -o test/test_regress-regress_rpc.obj `if test -f 'test/regress_rpc.c'; then $(CYGPATH_W) 'test/regress_rpc.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_rpc.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_rpc.Tpo test/$(DEPDIR)/test_regress-regress_rpc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_rpc.c' object='test/test_regress-regress_rpc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_rpc.c' object='test/test_regress-regress_rpc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_rpc.obj `if test -f 'test/regress_rpc.c'; then $(CYGPATH_W) 'test/regress_rpc.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_rpc.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_rpc.obj `if test -f 'test/regress_rpc.c'; then $(CYGPATH_W) 'test/regress_rpc.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_rpc.c'; fi`
 
 test/test_regress-regress_testutils.o: test/regress_testutils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_testutils.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_testutils.Tpo -c -o test/test_regress-regress_testutils.o `test -f 'test/regress_testutils.c' || echo '$(srcdir)/'`test/regress_testutils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_testutils.Tpo test/$(DEPDIR)/test_regress-regress_testutils.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_testutils.c' object='test/test_regress-regress_testutils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_testutils.c' object='test/test_regress-regress_testutils.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_testutils.o `test -f 'test/regress_testutils.c' || echo '$(srcdir)/'`test/regress_testutils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_testutils.o `test -f 'test/regress_testutils.c' || echo '$(srcdir)/'`test/regress_testutils.c
 
 test/test_regress-regress_testutils.obj: test/regress_testutils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_testutils.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_testutils.Tpo -c -o test/test_regress-regress_testutils.obj `if test -f 'test/regress_testutils.c'; then $(CYGPATH_W) 'test/regress_testutils.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_testutils.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_testutils.Tpo test/$(DEPDIR)/test_regress-regress_testutils.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_testutils.c' object='test/test_regress-regress_testutils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_testutils.c' object='test/test_regress-regress_testutils.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_testutils.obj `if test -f 'test/regress_testutils.c'; then $(CYGPATH_W) 'test/regress_testutils.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_testutils.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_testutils.obj `if test -f 'test/regress_testutils.c'; then $(CYGPATH_W) 'test/regress_testutils.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_testutils.c'; fi`
 
 test/test_regress-regress_util.o: test/regress_util.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_util.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_util.Tpo -c -o test/test_regress-regress_util.o `test -f 'test/regress_util.c' || echo '$(srcdir)/'`test/regress_util.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_util.Tpo test/$(DEPDIR)/test_regress-regress_util.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_util.c' object='test/test_regress-regress_util.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_util.c' object='test/test_regress-regress_util.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_util.o `test -f 'test/regress_util.c' || echo '$(srcdir)/'`test/regress_util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_util.o `test -f 'test/regress_util.c' || echo '$(srcdir)/'`test/regress_util.c
 
 test/test_regress-regress_util.obj: test/regress_util.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_util.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_util.Tpo -c -o test/test_regress-regress_util.obj `if test -f 'test/regress_util.c'; then $(CYGPATH_W) 'test/regress_util.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_util.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_util.Tpo test/$(DEPDIR)/test_regress-regress_util.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_util.c' object='test/test_regress-regress_util.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_util.c' object='test/test_regress-regress_util.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_util.obj `if test -f 'test/regress_util.c'; then $(CYGPATH_W) 'test/regress_util.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_util.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_util.obj `if test -f 'test/regress_util.c'; then $(CYGPATH_W) 'test/regress_util.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_util.c'; fi`
 
 test/test_regress-tinytest.o: test/tinytest.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-tinytest.o -MD -MP -MF test/$(DEPDIR)/test_regress-tinytest.Tpo -c -o test/test_regress-tinytest.o `test -f 'test/tinytest.c' || echo '$(srcdir)/'`test/tinytest.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-tinytest.Tpo test/$(DEPDIR)/test_regress-tinytest.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/tinytest.c' object='test/test_regress-tinytest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/tinytest.c' object='test/test_regress-tinytest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-tinytest.o `test -f 'test/tinytest.c' || echo '$(srcdir)/'`test/tinytest.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-tinytest.o `test -f 'test/tinytest.c' || echo '$(srcdir)/'`test/tinytest.c
 
 test/test_regress-tinytest.obj: test/tinytest.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-tinytest.obj -MD -MP -MF test/$(DEPDIR)/test_regress-tinytest.Tpo -c -o test/test_regress-tinytest.obj `if test -f 'test/tinytest.c'; then $(CYGPATH_W) 'test/tinytest.c'; else $(CYGPATH_W) '$(srcdir)/test/tinytest.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-tinytest.Tpo test/$(DEPDIR)/test_regress-tinytest.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/tinytest.c' object='test/test_regress-tinytest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/tinytest.c' object='test/test_regress-tinytest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-tinytest.obj `if test -f 'test/tinytest.c'; then $(CYGPATH_W) 'test/tinytest.c'; else $(CYGPATH_W) '$(srcdir)/test/tinytest.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-tinytest.obj `if test -f 'test/tinytest.c'; then $(CYGPATH_W) 'test/tinytest.c'; else $(CYGPATH_W) '$(srcdir)/test/tinytest.c'; fi`
 
 test/test_regress-regress_thread.o: test/regress_thread.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_thread.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_thread.Tpo -c -o test/test_regress-regress_thread.o `test -f 'test/regress_thread.c' || echo '$(srcdir)/'`test/regress_thread.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_thread.Tpo test/$(DEPDIR)/test_regress-regress_thread.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_thread.c' object='test/test_regress-regress_thread.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_thread.c' object='test/test_regress-regress_thread.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_thread.o `test -f 'test/regress_thread.c' || echo '$(srcdir)/'`test/regress_thread.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_thread.o `test -f 'test/regress_thread.c' || echo '$(srcdir)/'`test/regress_thread.c
 
 test/test_regress-regress_thread.obj: test/regress_thread.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_thread.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_thread.Tpo -c -o test/test_regress-regress_thread.obj `if test -f 'test/regress_thread.c'; then $(CYGPATH_W) 'test/regress_thread.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_thread.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_thread.Tpo test/$(DEPDIR)/test_regress-regress_thread.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_thread.c' object='test/test_regress-regress_thread.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_thread.c' object='test/test_regress-regress_thread.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_thread.obj `if test -f 'test/regress_thread.c'; then $(CYGPATH_W) 'test/regress_thread.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_thread.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_thread.obj `if test -f 'test/regress_thread.c'; then $(CYGPATH_W) 'test/regress_thread.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_thread.c'; fi`
 
 test/test_regress-regress_zlib.o: test/regress_zlib.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_zlib.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_zlib.Tpo -c -o test/test_regress-regress_zlib.o `test -f 'test/regress_zlib.c' || echo '$(srcdir)/'`test/regress_zlib.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_zlib.Tpo test/$(DEPDIR)/test_regress-regress_zlib.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_zlib.c' object='test/test_regress-regress_zlib.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_zlib.c' object='test/test_regress-regress_zlib.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_zlib.o `test -f 'test/regress_zlib.c' || echo '$(srcdir)/'`test/regress_zlib.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_zlib.o `test -f 'test/regress_zlib.c' || echo '$(srcdir)/'`test/regress_zlib.c
 
 test/test_regress-regress_zlib.obj: test/regress_zlib.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_zlib.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_zlib.Tpo -c -o test/test_regress-regress_zlib.obj `if test -f 'test/regress_zlib.c'; then $(CYGPATH_W) 'test/regress_zlib.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_zlib.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_zlib.Tpo test/$(DEPDIR)/test_regress-regress_zlib.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_zlib.c' object='test/test_regress-regress_zlib.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_zlib.c' object='test/test_regress-regress_zlib.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_zlib.obj `if test -f 'test/regress_zlib.c'; then $(CYGPATH_W) 'test/regress_zlib.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_zlib.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_zlib.obj `if test -f 'test/regress_zlib.c'; then $(CYGPATH_W) 'test/regress_zlib.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_zlib.c'; fi`
 
 test/test_regress-regress_iocp.o: test/regress_iocp.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_iocp.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_iocp.Tpo -c -o test/test_regress-regress_iocp.o `test -f 'test/regress_iocp.c' || echo '$(srcdir)/'`test/regress_iocp.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_iocp.Tpo test/$(DEPDIR)/test_regress-regress_iocp.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_iocp.c' object='test/test_regress-regress_iocp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_iocp.c' object='test/test_regress-regress_iocp.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_iocp.o `test -f 'test/regress_iocp.c' || echo '$(srcdir)/'`test/regress_iocp.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_iocp.o `test -f 'test/regress_iocp.c' || echo '$(srcdir)/'`test/regress_iocp.c
 
 test/test_regress-regress_iocp.obj: test/regress_iocp.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_iocp.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_iocp.Tpo -c -o test/test_regress-regress_iocp.obj `if test -f 'test/regress_iocp.c'; then $(CYGPATH_W) 'test/regress_iocp.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_iocp.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_iocp.Tpo test/$(DEPDIR)/test_regress-regress_iocp.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_iocp.c' object='test/test_regress-regress_iocp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_iocp.c' object='test/test_regress-regress_iocp.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_iocp.obj `if test -f 'test/regress_iocp.c'; then $(CYGPATH_W) 'test/regress_iocp.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_iocp.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_iocp.obj `if test -f 'test/regress_iocp.c'; then $(CYGPATH_W) 'test/regress_iocp.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_iocp.c'; fi`
 
 test/test_regress-regress_ssl.o: test/regress_ssl.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_ssl.o -MD -MP -MF test/$(DEPDIR)/test_regress-regress_ssl.Tpo -c -o test/test_regress-regress_ssl.o `test -f 'test/regress_ssl.c' || echo '$(srcdir)/'`test/regress_ssl.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_ssl.Tpo test/$(DEPDIR)/test_regress-regress_ssl.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_ssl.c' object='test/test_regress-regress_ssl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_ssl.c' object='test/test_regress-regress_ssl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_ssl.o `test -f 'test/regress_ssl.c' || echo '$(srcdir)/'`test/regress_ssl.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_ssl.o `test -f 'test/regress_ssl.c' || echo '$(srcdir)/'`test/regress_ssl.c
 
 test/test_regress-regress_ssl.obj: test/regress_ssl.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_regress-regress_ssl.obj -MD -MP -MF test/$(DEPDIR)/test_regress-regress_ssl.Tpo -c -o test/test_regress-regress_ssl.obj `if test -f 'test/regress_ssl.c'; then $(CYGPATH_W) 'test/regress_ssl.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_ssl.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) test/$(DEPDIR)/test_regress-regress_ssl.Tpo test/$(DEPDIR)/test_regress-regress_ssl.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test/regress_ssl.c' object='test/test_regress-regress_ssl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test/regress_ssl.c' object='test/test_regress-regress_ssl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_ssl.obj `if test -f 'test/regress_ssl.c'; then $(CYGPATH_W) 'test/regress_ssl.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_ssl.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_regress-regress_ssl.obj `if test -f 'test/regress_ssl.c'; then $(CYGPATH_W) 'test/regress_ssl.c'; else $(CYGPATH_W) '$(srcdir)/test/regress_ssl.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1746,8 +1976,11 @@ distclean-libtool:
 	-rm -f libtool config.lt
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1761,13 +1994,14 @@ uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1781,13 +2015,14 @@ uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(includedir)" && rm -f $$files
+	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
 install-include_event2HEADERS: $(include_event2_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(include_event2dir)" || $(MKDIR_P) "$(DESTDIR)$(include_event2dir)"
 	@list='$(include_event2_HEADERS)'; test -n "$(include_event2dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(include_event2dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(include_event2dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1801,13 +2036,14 @@ uninstall-include_event2HEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_event2_HEADERS)'; test -n "$(include_event2dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(include_event2dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(include_event2dir)" && rm -f $$files
+	dir='$(DESTDIR)$(include_event2dir)'; $(am__uninstall_files_from_dir)
 install-nodist_include_event2HEADERS: $(nodist_include_event2_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(include_event2dir)" || $(MKDIR_P) "$(DESTDIR)$(include_event2dir)"
 	@list='$(nodist_include_event2_HEADERS)'; test -n "$(include_event2dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(include_event2dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(include_event2dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1821,30 +2057,17 @@ uninstall-nodist_include_event2HEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(nodist_include_event2_HEADERS)'; test -n "$(include_event2dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(include_event2dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(include_event2dir)" && rm -f $$files
+	dir='$(DESTDIR)$(include_event2dir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES) config.h.in evconfig-private.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in evconfig-private.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1856,15 +2079,11 @@ TAGS:  $(HEADERS) $(SOURCES) config.h.in evconfig-private.h.in $(TAGS_DEPENDENCI
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in evconfig-private.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in evconfig-private.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1873,101 +2092,194 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
 	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      color_start= color_end=; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
-	  else \
-	    echo "$$red$$dashes"; \
-	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+test/test-script.sh.log: test/test-script.sh
+	@p='test/test-script.sh'; \
+	b='test/test-script.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -2010,36 +2322,42 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -2050,8 +2368,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -2061,17 +2379,19 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -2094,13 +2414,21 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -2137,11 +2465,19 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -2238,29 +2574,32 @@ uninstall-am: uninstall-dist_binSCRIPTS uninstall-includeHEADERS \
 
 .MAKE: all check check-am install install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-noinstLTLIBRARIES clean-noinstPROGRAMS ctags dist \
-	dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-compile \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_binSCRIPTS \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-includeHEADERS \
-	install-include_event2HEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man \
-	install-nodist_include_event2HEADERS install-pdf \
+.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-TESTS \
+	check-am clean clean-cscope clean-generic clean-libLTLIBRARIES \
+	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
+	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-compile distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dist_binSCRIPTS install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-includeHEADERS install-include_event2HEADERS \
+	install-info install-info-am install-libLTLIBRARIES \
+	install-man install-nodist_include_event2HEADERS install-pdf \
 	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-dist_binSCRIPTS uninstall-includeHEADERS \
-	uninstall-include_event2HEADERS uninstall-libLTLIBRARIES \
+	pdf pdf-am ps ps-am recheck tags tags-am uninstall \
+	uninstall-am uninstall-dist_binSCRIPTS \
+	uninstall-includeHEADERS uninstall-include_event2HEADERS \
+	uninstall-libLTLIBRARIES \
 	uninstall-nodist_include_event2HEADERS uninstall-pkgconfigDATA
 
+.PRECIOUS: Makefile
+
 
 $(SAMPLES) : libevent.la
 
diff --git a/contrib/ntp/sntp/libevent/aclocal.m4 b/contrib/ntp/sntp/libevent/aclocal.m4
index 4c1c84934719..3d294974f4a2 100644
--- a/contrib/ntp/sntp/libevent/aclocal.m4
+++ b/contrib/ntp/sntp/libevent/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file 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.
@@ -11,13 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # serial 9  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
@@ -138,7 +139,7 @@ AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS],
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -150,10 +151,10 @@ AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS],
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.15], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -169,22 +170,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -203,7 +204,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -221,30 +222,26 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -263,16 +260,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 10
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -282,7 +277,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -295,12 +290,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -308,8 +304,9 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -348,16 +345,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -366,16 +363,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -423,7 +420,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -433,34 +430,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -473,7 +475,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -485,21 +487,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -517,7 +517,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -527,18 +527,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -551,7 +554,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -580,33 +583,42 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# 
+# 
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -615,34 +627,82 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: 
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: .
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -664,7 +724,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -675,7 +735,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -683,16 +743,14 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -708,14 +766,12 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -733,7 +789,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -758,52 +814,14 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 6
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -811,11 +829,10 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -828,63 +845,35 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 4
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -895,24 +884,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 5
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file 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.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -923,32 +970,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -958,36 +1013,85 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 1
-
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -995,34 +1099,32 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 2
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1030,24 +1132,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -1057,75 +1157,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
 
-  # tar/untar a dummy directory, and stop if the command works
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar /dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar /dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
diff --git a/contrib/ntp/sntp/libevent/build-aux/ar-lib b/contrib/ntp/sntp/libevent/build-aux/ar-lib
new file mode 100755
index 000000000000..463b9ec0206e
--- /dev/null
+++ b/contrib/ntp/sntp/libevent/build-aux/ar-lib
@@ -0,0 +1,270 @@
+#! /bin/sh
+# Wrapper for Microsoft lib.exe
+
+me=ar-lib
+scriptversion=2012-03-01.08; # UTC
+
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Written by Peter Rosin .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to  or send patches to
+# .
+
+
+# func_error message
+func_error ()
+{
+  echo "$me: $1" 1>&2
+  exit 1
+}
+
+file_conv=
+
+# func_file_conv build_file
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv in
+	mingw)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_at_file at_file operation archive
+# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
+# for each of them.
+# When interpreting the content of the @FILE, do NOT use func_file_conv,
+# since the user would need to supply preconverted file names to
+# binutils ar, at least for MinGW.
+func_at_file ()
+{
+  operation=$2
+  archive=$3
+  at_file_contents=`cat "$1"`
+  eval set x "$at_file_contents"
+  shift
+
+  for member
+  do
+    $AR -NOLOGO $operation:"$member" "$archive" || exit $?
+  done
+}
+
+case $1 in
+  '')
+     func_error "no command.  Try '$0 --help' for more information."
+     ;;
+  -h | --h*)
+    cat <, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@ progpath="$0"
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@ case $progpath in
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@ func_help ()
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@ opt_finish=false
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1118,6 +1115,10 @@ esac
 			;;
       --no-silent|--no-quiet)
 			opt_silent=false
+func_append preserve_args " $opt"
+			;;
+      --no-warning|--no-warn)
+			opt_warning=false
 func_append preserve_args " $opt"
 			;;
       --no-verbose)
@@ -2059,7 +2060,7 @@ func_mode_compile ()
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@ func_mode_install ()
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@ func_exec_program_core ()
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@ func_mode_link ()
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6147,7 +6160,8 @@ func_mode_link ()
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6831,7 +6845,7 @@ func_mode_link ()
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7316,6 +7330,7 @@ func_mode_link ()
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7432,7 +7447,7 @@ func_mode_link ()
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8020,6 +8035,11 @@ EOF
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8050,7 +8070,7 @@ EOF
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8058,11 +8078,7 @@ EOF
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9152,6 +9168,8 @@ EOF
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9279,8 @@ EOF
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff --git a/contrib/ntp/sntp/libevent/build-aux/test-driver b/contrib/ntp/sntp/libevent/build-aux/test-driver
new file mode 100755
index 000000000000..8e575b017d93
--- /dev/null
+++ b/contrib/ntp/sntp/libevent/build-aux/test-driver
@@ -0,0 +1,148 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2013-07-13.22; # UTC
+
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to  or send patches to
+# .
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <$log_file 2>&1
+estatus=$?
+
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
+fi
+
+case $tweaked_estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/contrib/ntp/sntp/libevent/config.h.in b/contrib/ntp/sntp/libevent/config.h.in
index 946b11a118b4..8a0764188fd0 100644
--- a/contrib/ntp/sntp/libevent/config.h.in
+++ b/contrib/ntp/sntp/libevent/config.h.in
@@ -392,9 +392,6 @@
    */
 #undef LT_OBJDIR
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Numeric representation of the version */
 #undef NUMERIC_VERSION
 
@@ -456,6 +453,11 @@
 /* Version number of package */
 #undef VERSION
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
diff --git a/contrib/ntp/sntp/libevent/configure b/contrib/ntp/sntp/libevent/configure
index d2c07801dfe7..e759b4f8e937 100755
--- a/contrib/ntp/sntp/libevent/configure
+++ b/contrib/ntp/sntp/libevent/configure
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libevent 2.1.5-beta.
+# Generated by GNU Autoconf 2.69 for libevent 2.1.5-beta.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -220,21 +244,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -336,6 +364,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -457,6 +493,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -491,16 +531,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -512,28 +552,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -685,6 +705,7 @@ CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -708,6 +729,8 @@ build_cpu
 build
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -1258,8 +1281,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1423,10 +1444,12 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --disable-gcc-warnings  disable verbose warnings with GCC
   --enable-gcc-hardening  enable compiler security checks
   --disable-thread-support
@@ -1539,9 +1562,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 libevent configure 2.1.5-beta
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1814,7 +1837,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2017,7 +2040,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2033,7 +2057,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2059,7 +2084,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2075,7 +2101,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2109,7 +2136,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2239,7 +2267,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by libevent $as_me 2.1.5-beta, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2619,7 +2647,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-am__api_version='1.11'
+am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2658,7 +2686,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2716,9 +2744,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -2729,32 +2754,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -2766,6 +2799,16 @@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2776,8 +2819,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -2788,15 +2831,15 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2805,10 +2848,10 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2827,7 +2870,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2867,7 +2910,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2918,7 +2961,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2947,12 +2990,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2971,7 +3008,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3035,6 +3072,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -3085,28 +3161,108 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# 
+# 
+mkdir_p='$(MKDIR_P)'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
 
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: 
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: .
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
 ac_config_headers="$ac_config_headers config.h evconfig-private.h:evconfig-private.h.in"
@@ -3210,7 +3366,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -3243,6 +3399,7 @@ fi
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3275,7 +3432,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3315,7 +3472,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3368,7 +3525,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3409,7 +3566,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3467,7 +3624,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3511,7 +3668,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3957,8 +4114,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include 
 #include 
-#include 
-#include 
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4043,6 +4199,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -4054,8 +4269,9 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4089,16 +4305,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4107,16 +4323,16 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -4325,7 +4541,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4391,7 +4607,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4651,131 +4867,6 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
 #    ;;
 #esac
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
@@ -4815,7 +4906,7 @@ do
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -5037,8 +5128,8 @@ esac
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -5145,7 +5236,7 @@ do
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -5224,7 +5315,7 @@ do
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+      as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -5480,7 +5571,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5524,7 +5615,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5932,7 +6023,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5972,7 +6063,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6278,7 +6369,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6318,7 +6409,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6421,7 +6512,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6465,7 +6556,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6590,7 +6681,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6630,7 +6721,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6689,7 +6780,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6729,7 +6820,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7364,7 +7455,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7404,7 +7495,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7484,7 +7575,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7524,7 +7615,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7576,7 +7667,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7616,7 +7707,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7668,7 +7759,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7708,7 +7799,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7760,7 +7851,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7800,7 +7891,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7852,7 +7943,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7892,7 +7983,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12727,6 +12818,8 @@ _ACEOF
 esac
 rm -rf conftest*
   fi
+
+
 fi
 
 
@@ -12752,7 +12845,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12795,7 +12888,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13310,11 +13403,11 @@ else
 int
 main ()
 {
-/* FIXME: Include the comments suggested by Paul. */
+
 #ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
+  /* Ultrix mips cc rejects this sort of thing.  */
   typedef int charset[2];
-  const charset cs;
+  const charset cs = { 0, 0 };
   /* SunOS 4.1.1 cc rejects this.  */
   char const *const *pcpcc;
   char **ppc;
@@ -13331,8 +13424,9 @@ main ()
   ++pcpcc;
   ppc = (char**) pcpcc;
   pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
+    char tx;
+    char *t = &tx;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
@@ -13348,10 +13442,10 @@ main ()
     iptr p = 0;
     ++p;
   }
-  { /* AIX XL C 1.02.0.0 rejects this saying
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
+    struct s { int j; const int *ap[3]; } bx;
+    struct s *b = &bx; b->j = 5;
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
@@ -14970,7 +15064,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_acx_pthread_config="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15126,7 +15220,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_PTHREAD_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15599,6 +15693,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -15985,16 +16087,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -16054,28 +16156,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -16097,7 +16187,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by libevent $as_me 2.1.5-beta, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -16163,10 +16253,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 libevent config.status 2.1.5-beta
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -16257,7 +16347,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -17172,7 +17262,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -17185,7 +17275,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -17219,21 +17309,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
diff --git a/contrib/ntp/sntp/libevent/listener.c b/contrib/ntp/sntp/libevent/listener.c
index 172d2927c0c3..2af14e3a7b54 100644
--- a/contrib/ntp/sntp/libevent/listener.c
+++ b/contrib/ntp/sntp/libevent/listener.c
@@ -421,6 +421,8 @@ listener_read_cb(evutil_socket_t fd, short what, void *p)
 		if (lev->refcnt == 1) {
 			int freed = listener_decref_and_unlock(lev);
 			EVUTIL_ASSERT(freed);
+
+			evutil_closesocket(new_fd);
 			return;
 		}
 		--lev->refcnt;
diff --git a/contrib/ntp/sntp/libevent/m4/ltversion.m4 b/contrib/ntp/sntp/libevent/m4/ltversion.m4
index 9c7b5d411858..07a8602d48d6 100644
--- a/contrib/ntp/sntp/libevent/m4/ltversion.m4
+++ b/contrib/ntp/sntp/libevent/m4/ltversion.m4
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/contrib/ntp/sntp/libopts/COPYING.gplv3 b/contrib/ntp/sntp/libopts/COPYING.gplv3
index 065b7a6c5516..26d6fd2e7b11 100644
--- a/contrib/ntp/sntp/libopts/COPYING.gplv3
+++ b/contrib/ntp/sntp/libopts/COPYING.gplv3
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
diff --git a/contrib/ntp/sntp/libopts/COPYING.lgplv3 b/contrib/ntp/sntp/libopts/COPYING.lgplv3
index 3deaacb08b80..b6db23288f8c 100644
--- a/contrib/ntp/sntp/libopts/COPYING.lgplv3
+++ b/contrib/ntp/sntp/libopts/COPYING.lgplv3
@@ -1,7 +1,7 @@
 		   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
diff --git a/contrib/ntp/sntp/libopts/COPYING.mbsd b/contrib/ntp/sntp/libopts/COPYING.mbsd
index 8a704271906c..74948befa59e 100644
--- a/contrib/ntp/sntp/libopts/COPYING.mbsd
+++ b/contrib/ntp/sntp/libopts/COPYING.mbsd
@@ -1,3 +1,4 @@
+Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
diff --git a/contrib/ntp/sntp/libopts/Makefile.in b/contrib/ntp/sntp/libopts/Makefile.in
index feb2e0f5c822..4ca06b73abd8 100644
--- a/contrib/ntp/sntp/libopts/Makefile.in
+++ b/contrib/ntp/sntp/libopts/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -16,6 +15,61 @@
 @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@
@@ -35,7 +89,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = libopts
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/libopts/m4/stdnoreturn.m4 \
@@ -57,6 +110,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/m4/ntp_pkg_config.m4 \
 	$(top_srcdir)/m4/ntp_prog_cc.m4 $(top_srcdir)/m4/ntp_sntp.m4 \
 	$(top_srcdir)/m4/ntp_sysexits.m4 \
+	$(top_srcdir)/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/m4/openldap-thread-check.m4 \
 	$(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/os_cflags.m4 \
@@ -64,6 +118,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -89,19 +144,38 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
 libopts_la_LIBADD =
 am_libopts_la_OBJECTS = libopts_la-libopts.lo
 libopts_la_OBJECTS = $(am_libopts_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libopts_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libopts_la_LDFLAGS) $(LDFLAGS) -o $@
 @INSTALL_LIBOPTS_FALSE@am_libopts_la_rpath =
 @INSTALL_LIBOPTS_TRUE@am_libopts_la_rpath = -rpath $(libdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/libevent/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -112,26 +186,46 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libopts_la_SOURCES)
 DIST_SOURCES = $(libopts_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/libevent/build-aux/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -277,6 +371,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSIX_SHELL = @POSIX_SHELL@
@@ -408,7 +503,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libopts/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign libopts/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -426,9 +520,9 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -436,6 +530,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -451,22 +547,27 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libopts.la: $(libopts_la_OBJECTS) $(libopts_la_DEPENDENCIES) 
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libopts.la: $(libopts_la_OBJECTS) $(libopts_la_DEPENDENCIES) $(EXTRA_libopts_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libopts_la_LINK) $(am_libopts_la_rpath) $(libopts_la_OBJECTS) $(libopts_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -480,34 +581,30 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 libopts_la-libopts.lo: libopts.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopts_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libopts_la-libopts.lo -MD -MP -MF $(DEPDIR)/libopts_la-libopts.Tpo -c -o libopts_la-libopts.lo `test -f 'libopts.c' || echo '$(srcdir)/'`libopts.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libopts_la-libopts.Tpo $(DEPDIR)/libopts_la-libopts.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libopts.c' object='libopts_la-libopts.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libopts.c' object='libopts_la-libopts.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopts_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libopts_la-libopts.lo `test -f 'libopts.c' || echo '$(srcdir)/'`libopts.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libopts_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libopts_la-libopts.lo `test -f 'libopts.c' || echo '$(srcdir)/'`libopts.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -515,26 +612,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -546,15 +632,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -563,6 +645,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -616,10 +713,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
@@ -707,19 +809,22 @@ uninstall-am: uninstall-libLTLIBRARIES
 
 .MAKE: all check install install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
-	ctags distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libLTLIBRARIES install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-libLTLIBRARIES \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-libLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 libopts.c:		$(BUILT_SOURCES)
diff --git a/contrib/ntp/sntp/libopts/README b/contrib/ntp/sntp/libopts/README
index 4bf758d8c21d..98e4f3c677c8 100644
--- a/contrib/ntp/sntp/libopts/README
+++ b/contrib/ntp/sntp/libopts/README
@@ -115,7 +115,7 @@ These macros work as follows:
 
 LICENSING:
 
-This material is Copyright (C) 1992-2014 by Bruce Korb.  You are
+This material is Copyright (C) 1992-2015 by Bruce Korb.  You are
 licensed to use this under the terms of either the GNU Lesser General
 Public License (see: COPYING.lgpl), or, at your option, the modified
 Berkeley Software Distribution License (see: COPYING.mbsd).  Both of
diff --git a/contrib/ntp/sntp/libopts/ag-char-map.h b/contrib/ntp/sntp/libopts/ag-char-map.h
index 01733d71c78e..e905118ca242 100644
--- a/contrib/ntp/sntp/libopts/ag-char-map.h
+++ b/contrib/ntp/sntp/libopts/ag-char-map.h
@@ -1,6 +1,6 @@
 /*
  *  29 bits for 46 character classifications
- *  generated by char-mapper on 08/08/14 at 16:09:03
+ *  generated by char-mapper on 04/25/15 at 09:53:03
  *
  *  This file contains the character classifications
  *  used by AutoGen and AutoOpts for identifying tokens.
@@ -8,7 +8,7 @@
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
diff --git a/contrib/ntp/sntp/libopts/alias.c b/contrib/ntp/sntp/libopts/alias.c
index be8c6c6cb46f..49e1f1fdd1a9 100644
--- a/contrib/ntp/sntp/libopts/alias.c
+++ b/contrib/ntp/sntp/libopts/alias.c
@@ -12,7 +12,7 @@
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
diff --git a/contrib/ntp/sntp/libopts/ao-strs.c b/contrib/ntp/sntp/libopts/ao-strs.c
index a8fac46c6c46..857aa73528b9 100644
--- a/contrib/ntp/sntp/libopts/ao-strs.c
+++ b/contrib/ntp/sntp/libopts/ao-strs.c
@@ -2,11 +2,11 @@
  *
  * DO NOT EDIT THIS FILE   (ao-strs.c)
  *
- * It has been AutoGen-ed  August  8, 2014 at 04:09:03 PM by AutoGen 5.18.4pre11
+ * It has been AutoGen-ed
  * From the definitions    ao-strs.def
  * and the template file   strings
  *
- *  Copyright (C) 2011-2014 Bruce Korb, all rights reserved.
+ *  Copyright (C) 2011-2015 Bruce Korb, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the
  *  Modified (3 clause) Berkeley Software Distribution License
diff --git a/contrib/ntp/sntp/libopts/ao-strs.h b/contrib/ntp/sntp/libopts/ao-strs.h
index abe1f89e9eb2..864fc48ac5c4 100644
--- a/contrib/ntp/sntp/libopts/ao-strs.h
+++ b/contrib/ntp/sntp/libopts/ao-strs.h
@@ -2,11 +2,11 @@
  *
  * DO NOT EDIT THIS FILE   (ao-strs.h)
  *
- * It has been AutoGen-ed  August  8, 2014 at 04:09:03 PM by AutoGen 5.18.4pre11
+ * It has been AutoGen-ed
  * From the definitions    ao-strs.def
  * and the template file   strings
  *
- *  Copyright (C) 2011-2014 Bruce Korb, all rights reserved.
+ *  Copyright (C) 2011-2015 Bruce Korb, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the
  *  Modified (3 clause) Berkeley Software Distribution License
diff --git a/contrib/ntp/sntp/libopts/autoopts.c b/contrib/ntp/sntp/libopts/autoopts.c
index a5193186a7c0..4b15acafbb63 100644
--- a/contrib/ntp/sntp/libopts/autoopts.c
+++ b/contrib/ntp/sntp/libopts/autoopts.c
@@ -13,7 +13,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -299,9 +299,9 @@ regular_opts(tOptions * opts)
  *
  * what: this is the main option processing routine
  *
- * arg:  + tOptions* + opts  + program options descriptor +
- * arg:  + int       + a_ct  + program arg count  +
- * arg:  + char**    + a_v   + program arg vector +
+ * arg:  + tOptions * + opts  + program options descriptor +
+ * arg:  + int        + a_ct  + program arg count  +
+ * arg:  + char **    + a_v   + program arg vector +
  *
  * ret_type:  int
  * ret_desc:  the count of the arguments processed
diff --git a/contrib/ntp/sntp/libopts/autoopts.h b/contrib/ntp/sntp/libopts/autoopts.h
index 6987958cd111..6f75f9e44e55 100644
--- a/contrib/ntp/sntp/libopts/autoopts.h
+++ b/contrib/ntp/sntp/libopts/autoopts.h
@@ -11,7 +11,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -107,7 +107,7 @@
  *  Coercive cast.  Compel an address to be interpreted as the type
  *  of the first argument.  No complaints, just do it.
  */
-#define C(_t,_p)  ((_t)(void *)(_p))
+#define C(_t,_p)  ((_t)VOIDP(_p))
 #endif
 
 /* The __attribute__((__warn_unused_result__)) feature
@@ -256,10 +256,10 @@ typedef struct {
     char const * pzTime;
 } arg_types_t;
 
-#define AGALOC(c, w)          ao_malloc((size_t)c)
-#define AGREALOC(p, c, w)     ao_realloc((void*)p, (size_t)c)
-#define AGFREE(p)            free((void *)(intptr_t)p)
-#define AGDUPSTR(p, s, w)     (p = ao_strdup(s))
+#define AGALOC(_c, _w)        ao_malloc((size_t)_c)
+#define AGREALOC(_p, _c, _w)  ao_realloc(VOIDP(_p), (size_t)_c)
+#define AGFREE(_p)            free(VOIDP(_p))
+#define AGDUPSTR(_p, _s, _w)  (_p = ao_strdup(_s))
 
 static void *
 ao_malloc(size_t sz);
@@ -267,10 +267,10 @@ ao_malloc(size_t sz);
 static void *
 ao_realloc(void *p, size_t sz);
 
-#define ao_free(_p) free((void *)_p)
+#define ao_free(_p) free(VOIDP(_p))
 
 static char *
-ao_strdup(char const *str);
+ao_strdup(char const * str);
 
 /**
  *  DO option handling?
@@ -369,7 +369,7 @@ ao_strdup(char const *str);
 #endif
 
 #ifndef MAP_FAILED
-#  define  MAP_FAILED           ((void*)-1)
+#  define  MAP_FAILED           VOIDP(-1)
 #endif
 
 #ifndef  _SC_PAGESIZE
@@ -379,8 +379,8 @@ ao_strdup(char const *str);
 #endif
 
 #ifndef HAVE_STRCHR
-extern char* strchr(char const *s, int c);
-extern char* strrchr(char const *s, int c);
+extern char * strchr(char const * s, int c);
+extern char * strrchr(char const * s, int c);
 #endif
 
 /**
@@ -452,7 +452,7 @@ typedef enum { AOFLAG_TABLE } ao_flags_t;
 #undef  _aof_
 
 static char const   zNil[] = "";
-static arg_types_t  argTypes             = { 0 };
+static arg_types_t  argTypes             = { NULL };
 static char         line_fmt_buf[32];
 static bool         displayEnum          = false;
 static char const   pkgdatadir_default[] = PKGDATADIR;
diff --git a/contrib/ntp/sntp/libopts/autoopts/options.h b/contrib/ntp/sntp/libopts/autoopts/options.h
index 32397eb9a081..f92cd0efafde 100644
--- a/contrib/ntp/sntp/libopts/autoopts/options.h
+++ b/contrib/ntp/sntp/libopts/autoopts/options.h
@@ -2,18 +2,18 @@
  *
  *  DO NOT EDIT THIS FILE   (options.h)
  *
- *  It has been AutoGen-ed  August  3, 2014 at 10:44:46 AM by AutoGen 5.18.4pre11
+ *  It has been AutoGen-ed
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
  *
- *  Automated Options Copyright (C) 1992-2014 by Bruce Korb
+ *  Automated Options Copyright (C) 1992-2015 by Bruce Korb
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -82,6 +82,14 @@
  */
 #define AO_EXIT_REQ_USAGE 10064
 
+#undef  VOIDP
+/**
+ * Coerce a value into a void pointer with no const or volatile attributes.
+ * Somewhere along the line, the above set of includes need to set up
+ * the "uintptr_t" type.
+ */
+#define VOIDP(_a)  ((void *)(uintptr_t)(_a))
+
 /**
  *  PUBLIC DEFINES
  *
@@ -90,7 +98,7 @@
  *  to an option descriptor must be obtained.  There are two ways:
  *
  *  1. inside an option processing procedure, it is the second argument,
- *     conventionally "tOptDesc* pOD".
+ *     conventionally "tOptDesc * pOD".
  *
  *  2. Outside of an option procedure (or to reference a different option
  *     descriptor), use either "&DESC( opt_name )" or "&pfx_DESC( opt_name )".
@@ -147,7 +155,7 @@ typedef struct optionValue {
         unsigned int    boolVal;        ///< OPARG_TYPE_BOOLEAN
         unsigned long   setVal;         ///< OPARG_TYPE_MEMBERSHIP
         long            longVal;        ///< OPARG_TYPE_NUMERIC
-        void*           nestVal;        ///< OPARG_TYPE_HIERARCHY
+        void *          nestVal;        ///< OPARG_TYPE_HIERARCHY
     } v;
 } tOptionValue;
 
@@ -445,7 +453,7 @@ typedef tOptProc * tpOptProc;
  *  with the "exitCode" argument passed to it.
  */
 // coverity[+kill]
-typedef void (tUsageProc)(tOptions* pOpts, int exitCode);
+typedef void (tUsageProc)(tOptions * pOpts, int exitCode);
 
 /**
  * a pointer to a procedure that prints usage and exits.
@@ -600,17 +608,9 @@ struct options {
     char *                      pzCurOpt;      ///< current option text
 
     /// Public, the full path of the program
-#if AUTOOPTS_INTERNAL
-    char const *                pzProgPath;
-#else
     char const * const          pzProgPath;
-#endif
     /// Public, the name of the executable, without any path
-#if AUTOOPTS_INTERNAL
-    char const *                pzProgName;
-#else
     char const * const          pzProgName;
-#endif
     /// Public, the upper-cased, shell variable syntax-ed program name
     char const * const          pzPROGNAME;
     /// the name of the "rc file" (configuration file)
@@ -698,7 +698,7 @@ struct options {
  */
 typedef struct {
     unsigned long   tkn_ct;      ///< number of tokens found
-    unsigned char*  tkn_list[1]; ///< array of pointers to tokens
+    unsigned char * tkn_list[1]; ///< array of pointers to tokens
 } token_list_t;
 
 /*
@@ -736,7 +736,7 @@ typedef struct {
 /**
  * mmap result wrapper that yields "true" when mmap has failed.
  */
-#define TEXT_MMAP_FAILED_ADDR(a)  ((void*)(a) ==  (void*)MAP_FAILED)
+#define TEXT_MMAP_FAILED_ADDR(a)  (VOIDP(a) == VOIDP(MAP_FAILED))
 
 #ifdef  __cplusplus
 #define CPLUSPLUS_OPENER extern "C" {
@@ -787,9 +787,9 @@ CPLUSPLUS_OPENER
  *
  * @param string       string to be tokenized
  *
- * @return token_list_t* - pointer to a structure that lists each token
+ * @return token_list_t * - pointer to a structure that lists each token
  */
-extern token_list_t* ao_string_tokenize(char const*);
+extern token_list_t * ao_string_tokenize(char const *);
 
 
 /**
@@ -805,9 +805,9 @@ extern token_list_t* ao_string_tokenize(char const*);
  *
  * @param fname        the file to load
  *
- * @return const tOptionValue* - An allocated, compound value structure
+ * @return const tOptionValue * - An allocated, compound value structure
  */
-extern const tOptionValue* configFileLoad(char const*);
+extern const tOptionValue * configFileLoad(char const *);
 
 
 /**
@@ -835,7 +835,7 @@ extern const tOptionValue* configFileLoad(char const*);
  *
  * @return int - 0 -> SUCCESS, -1 -> FAILURE
  */
-extern int optionFileLoad(tOptions*, char const*);
+extern int optionFileLoad(tOptions *, char const *);
 
 
 /**
@@ -850,9 +850,9 @@ extern int optionFileLoad(tOptions*, char const*);
  * @param name         name of value to find
  * @param value        the matching value
  *
- * @return const tOptionValue* - a compound value structure
+ * @return const tOptionValue * - a compound value structure
  */
-extern const tOptionValue* optionFindNextValue(const tOptDesc*, const tOptionValue*, char const*, char const*);
+extern const tOptionValue * optionFindNextValue(const tOptDesc *, const tOptionValue *, char const *, char const *);
 
 
 /**
@@ -865,9 +865,9 @@ extern const tOptionValue* optionFindNextValue(const tOptDesc*, const tOptionVal
  * @param name         name of value to find
  * @param val          the matching value
  *
- * @return const tOptionValue* - a compound value structure
+ * @return const tOptionValue * - a compound value structure
  */
-extern const tOptionValue* optionFindValue(const tOptDesc*, char const*, char const*);
+extern const tOptionValue * optionFindValue(const tOptDesc *, char const *, char const *);
 
 
 /**
@@ -878,7 +878,7 @@ extern const tOptionValue* optionFindValue(const tOptDesc*, char const*, char co
  *
  * @param pOpts        program options descriptor
  */
-extern void optionFree(tOptions*);
+extern void optionFree(tOptions *);
 
 
 /**
@@ -894,9 +894,9 @@ extern void optionFree(tOptions*);
  * @param pOptValue    a hierarchcal value
  * @param valueName    name of value to get
  *
- * @return const tOptionValue* - a compound value structure
+ * @return const tOptionValue * - a compound value structure
  */
-extern const tOptionValue* optionGetValue(const tOptionValue*, char const*);
+extern const tOptionValue * optionGetValue(const tOptionValue *, char const *);
 
 
 /**
@@ -919,7 +919,7 @@ extern const tOptionValue* optionGetValue(const tOptionValue*, char const*);
  * @param opts         program options descriptor
  * @param line         NUL-terminated text
  */
-extern void optionLoadLine(tOptions*, char const*);
+extern void optionLoadLine(tOptions *, char const *);
 
 
 /**
@@ -930,9 +930,9 @@ extern void optionLoadLine(tOptions*, char const*);
  *
  * @param od           the set membership option description
  *
- * @return char* - the names of the set bits
+ * @return char * - the names of the set bits
  */
-extern char* optionMemberList(tOptDesc *);
+extern char * optionMemberList(tOptDesc *);
 
 
 /**
@@ -947,9 +947,9 @@ extern char* optionMemberList(tOptDesc *);
  * @param pOptValue    a hierarchcal list value
  * @param pOldValue    a value from this list
  *
- * @return const tOptionValue* - a compound value structure
+ * @return const tOptionValue * - a compound value structure
  */
-extern const tOptionValue* optionNextValue(const tOptionValue*, const tOptionValue*);
+extern const tOptionValue * optionNextValue(const tOptionValue *, const tOptionValue *);
 
 
 /**
@@ -962,7 +962,7 @@ extern const tOptionValue* optionNextValue(const tOptionValue*, const tOptionVal
  * @param pOpts        program options descriptor
  * @param ex_code      exit code for calling exit(3)
  */
-extern void optionOnlyUsage(tOptions*, int);
+extern void optionOnlyUsage(tOptions *, int);
 
 
 /**
@@ -973,7 +973,7 @@ extern void optionOnlyUsage(tOptions*, int);
  * @param opts         program options descriptor
  * @param od           the descriptor for this arg
  */
-extern void optionPrintVersion(tOptions*, tOptDesc*);
+extern void optionPrintVersion(tOptions *, tOptDesc *);
 
 
 /**
@@ -987,7 +987,7 @@ extern void optionPrintVersion(tOptions*, tOptDesc*);
  * @param opts         program options descriptor
  * @param od           the descriptor for this arg
  */
-extern void optionPrintVersionAndReturn(tOptions*, tOptDesc*);
+extern void optionPrintVersionAndReturn(tOptions *, tOptDesc *);
 
 
 /**
@@ -1015,7 +1015,7 @@ extern void optionPrintVersionAndReturn(tOptions*, tOptDesc*);
  *
  * @return int - the count of the arguments processed
  */
-extern int optionProcess(tOptions*, int, char**);
+extern int optionProcess(tOptions *, int, char **);
 
 
 /**
@@ -1030,7 +1030,7 @@ extern int optionProcess(tOptions*, int, char**);
  *
  * @param pOpts        program options descriptor
  */
-extern void optionRestore(tOptions*);
+extern void optionRestore(tOptions *);
 
 
 /**
@@ -1053,7 +1053,7 @@ extern void optionRestore(tOptions*);
  *
  * @param opts         program options descriptor
  */
-extern void optionSaveFile(tOptions*);
+extern void optionSaveFile(tOptions *);
 
 
 /**
@@ -1073,7 +1073,7 @@ extern void optionSaveFile(tOptions*);
  *
  * @param pOpts        program options descriptor
  */
-extern void optionSaveState(tOptions*);
+extern void optionSaveState(tOptions *);
 
 
 /**
@@ -1094,9 +1094,9 @@ extern void optionUnloadNested(tOptionValue const *);
  *  Returns the full version string compiled into the library.
  *  The returned string cannot be modified.
  *
- * @return char const* - the version string in constant memory
+ * @return char const * - the version string in constant memory
  */
-extern char const* optionVersion(void);
+extern char const * optionVersion(void);
 
 
 /**
@@ -1109,7 +1109,7 @@ extern char const* optionVersion(void);
  *
  * @param ch_list      characters to equivalence
  */
-extern void strequate(char const*);
+extern void strequate(char const *);
 
 
 /**
@@ -1126,7 +1126,7 @@ extern void strequate(char const*);
  *
  * @return int - the difference between two differing characters
  */
-extern int streqvcmp(char const*, char const*);
+extern int streqvcmp(char const *, char const *);
 
 
 /**
@@ -1171,7 +1171,7 @@ extern void streqvmap(char, char, int);
  *
  * @return int - the difference between two differing characters
  */
-extern int strneqvcmp(char const*, char const*, int);
+extern int strneqvcmp(char const *, char const *, int);
 
 
 /**
@@ -1187,68 +1187,68 @@ extern int strneqvcmp(char const*, char const*, int);
  * @param dest         output string
  * @param src          input string
  */
-extern void strtransform(char*, char const*);
+extern void strtransform(char *, char const *);
 
 /*  AutoOpts PRIVATE FUNCTIONS:  */
 tOptProc optionStackArg, optionUnstackArg, optionBooleanVal, optionNumericVal;
 
-extern char* ao_string_cook(char*, int*);
+extern char * ao_string_cook(char *, int *);
 
-extern unsigned int ao_string_cook_escape_char(char const*, char*, unsigned int);
+extern unsigned int ao_string_cook_escape_char(char const *, char *, unsigned int);
 
-extern void genshelloptUsage(tOptions*, int);
+extern void genshelloptUsage(tOptions *, int);
 
 extern int optionAlias(tOptions *, tOptDesc *, unsigned int);
 
-extern void optionBooleanVal(tOptions*, tOptDesc*);
+extern void optionBooleanVal(tOptions *, tOptDesc *);
 
-extern uintptr_t optionEnumerationVal(tOptions*, tOptDesc*, char const * const *, unsigned int);
+extern uintptr_t optionEnumerationVal(tOptions *, tOptDesc *, char const * const *, unsigned int);
 
-extern void optionFileCheck(tOptions*, tOptDesc*, teOptFileType, tuFileMode);
+extern void optionFileCheck(tOptions *, tOptDesc *, teOptFileType, tuFileMode);
 
-extern char const * optionKeywordName(tOptDesc*, unsigned int);
+extern char const * optionKeywordName(tOptDesc *, unsigned int);
 
-extern void optionLoadOpt(tOptions*, tOptDesc*);
+extern void optionLoadOpt(tOptions *, tOptDesc *);
 
-extern bool optionMakePath(char*, int, char const*, char const*);
+extern bool optionMakePath(char *, int, char const *, char const *);
 
-extern void optionNestedVal(tOptions*, tOptDesc*);
+extern void optionNestedVal(tOptions *, tOptDesc *);
 
-extern void optionNumericVal(tOptions*, tOptDesc*);
+extern void optionNumericVal(tOptions *, tOptDesc *);
 
 extern void optionPagedUsage(tOptions *, tOptDesc *);
 
-extern void optionParseShell(tOptions*);
+extern void optionParseShell(tOptions *);
 
 extern void optionPrintParagraphs(char const *, bool, FILE *);
 
-extern void optionPutShell(tOptions*);
+extern void optionPutShell(tOptions *);
 
 extern char const * optionQuoteString(char const *, char const *);
 
-extern void optionResetOpt(tOptions*, tOptDesc*);
+extern void optionResetOpt(tOptions *, tOptDesc *);
 
-extern void optionSetMembers(tOptions*, tOptDesc*, char const * const *, unsigned int);
+extern void optionSetMembers(tOptions *, tOptDesc *, char const * const *, unsigned int);
 
-extern void optionShowRange(tOptions*, tOptDesc*, const void *, int);
+extern void optionShowRange(tOptions *, tOptDesc *, void *, int);
 
-extern void optionStackArg(tOptions*, tOptDesc*);
+extern void optionStackArg(tOptions *, tOptDesc *);
 
-extern void optionTimeDate(tOptions*, tOptDesc*);
+extern void optionTimeDate(tOptions *, tOptDesc *);
 
-extern void optionTimeVal(tOptions*, tOptDesc*);
+extern void optionTimeVal(tOptions *, tOptDesc *);
 
-extern void optionUnstackArg(tOptions*, tOptDesc*);
+extern void optionUnstackArg(tOptions *, tOptDesc *);
 
-extern void optionUsage(tOptions*, int);
+extern void optionUsage(tOptions *, int);
 
 extern void optionVendorOption(tOptions *, tOptDesc *);
 
-extern void optionVersionStderr(tOptions*, tOptDesc*);
+extern void optionVersionStderr(tOptions *, tOptDesc *);
 
-extern void* text_mmap(char const*, int, int, tmap_info_t*);
+extern void * text_mmap(char const *, int, int, tmap_info_t *);
 
-extern int text_munmap(tmap_info_t*);
+extern int text_munmap(tmap_info_t *);
 
 CPLUSPLUS_CLOSER
 #endif /* AUTOOPTS_OPTIONS_H_GUARD */
diff --git a/contrib/ntp/sntp/libopts/autoopts/project.h b/contrib/ntp/sntp/libopts/autoopts/project.h
index c61a6ca78580..1e7f156ec6e8 100644
--- a/contrib/ntp/sntp/libopts/autoopts/project.h
+++ b/contrib/ntp/sntp/libopts/autoopts/project.h
@@ -4,7 +4,7 @@
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
diff --git a/contrib/ntp/sntp/libopts/autoopts/usage-txt.h b/contrib/ntp/sntp/libopts/autoopts/usage-txt.h
index 0c72d32d5c22..f5831e6d2996 100644
--- a/contrib/ntp/sntp/libopts/autoopts/usage-txt.h
+++ b/contrib/ntp/sntp/libopts/autoopts/usage-txt.h
@@ -2,13 +2,13 @@
  *
  * DO NOT EDIT THIS FILE   (usage-txt.h)
  *
- * It has been AutoGen-ed  August  3, 2014 at 10:44:44 AM by AutoGen 5.18.4pre11
+ * It has been AutoGen-ed
  * From the definitions    usage-txt.def
  * and the template file   usage-txt.tpl
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -368,19 +368,19 @@ static void dummy_func(void) {
   puts(_("allocation of %d bytes failed\n"));
 #line 53 "../init.c"
   puts(_("AutoOpts function called without option descriptor\n"));
-#line 90 "../init.c"
+#line 86 "../init.c"
   puts(_("\tThis exceeds the compiled library version:  "));
-#line 88 "../init.c"
+#line 84 "../init.c"
   puts(_("Automated Options Processing Error!\n"
        "\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
 #line 80 "../autoopts.c"
   puts(_("realloc of %d bytes at 0x%p failed\n"));
-#line 92 "../init.c"
+#line 88 "../init.c"
   puts(_("\tThis is less than the minimum library version:  "));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2014 by Bruce Korb - all rights reserved\n"));
-#line 82 "../makeshell.c"
+#line 87 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
@@ -404,9 +404,9 @@ static void dummy_func(void) {
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 89 "../makeshell.c"
+#line 94 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 301 "../makeshell.c"
+#line 306 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -484,9 +484,9 @@ static void dummy_func(void) {
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("standard output"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("standard output"));
 #line 274 "../usage.c"
   puts(_("standard output"));
@@ -504,9 +504,9 @@ static void dummy_func(void) {
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("write"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("write"));
 #line 273 "../usage.c"
   puts(_("write"));
@@ -558,7 +558,7 @@ static void dummy_func(void) {
 #line 380 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 916 "../makeshell.c"
+#line 921 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
diff --git a/contrib/ntp/sntp/libopts/boolean.c b/contrib/ntp/sntp/libopts/boolean.c
index e83e518c000a..2bea8e7f2aeb 100644
--- a/contrib/ntp/sntp/libopts/boolean.c
+++ b/contrib/ntp/sntp/libopts/boolean.c
@@ -13,7 +13,7 @@
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -36,8 +36,8 @@
  * private:
  *
  * what:  Decipher a boolean value
- * arg:   + tOptions* + opts + program options descriptor +
- * arg:   + tOptDesc* + od  + the descriptor for this arg +
+ * arg:   + tOptions * + opts + program options descriptor +
+ * arg:   + tOptDesc * + od  + the descriptor for this arg +
  *
  * doc:
  *  Decipher a true or false value for a boolean valued option argument.
@@ -47,8 +47,8 @@
 void
 optionBooleanVal(tOptions * opts, tOptDesc * od)
 {
-    char* pz;
-    bool  res = true;
+    char * pz;
+    bool   res = true;
 
     if (INQUERY_CALL(opts, od))
         return;
diff --git a/contrib/ntp/sntp/libopts/check.c b/contrib/ntp/sntp/libopts/check.c
index 9b221a1ef926..eff8ec013354 100644
--- a/contrib/ntp/sntp/libopts/check.c
+++ b/contrib/ntp/sntp/libopts/check.c
@@ -9,7 +9,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
diff --git a/contrib/ntp/sntp/libopts/compat/compat.h b/contrib/ntp/sntp/libopts/compat/compat.h
index 69206a3c1404..561d55db3c3e 100644
--- a/contrib/ntp/sntp/libopts/compat/compat.h
+++ b/contrib/ntp/sntp/libopts/compat/compat.h
@@ -3,7 +3,7 @@
  *  compat.h is free software.
  *  This file is part of AutoGen and AutoOpts.
  *
- *  AutoGen Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
diff --git a/contrib/ntp/sntp/libopts/compat/pathfind.c b/contrib/ntp/sntp/libopts/compat/pathfind.c
index 6554533d2a3a..5c477caf07a6 100644
--- a/contrib/ntp/sntp/libopts/compat/pathfind.c
+++ b/contrib/ntp/sntp/libopts/compat/pathfind.c
@@ -23,9 +23,9 @@ pathfind( char const * path,
 }
 #else
 
-static char* make_absolute( char const *string, char const *dot_path );
-static char* canonicalize_pathname( char *path );
-static char* extract_colon_unit( char* dir, char const *string, int *p_index );
+static char * make_absolute(char const * string, char const * dot_path);
+static char * canonicalize_pathname(char * path);
+static char * extract_colon_unit(char * dir, char const * string, int * p_index);
 
 /**
  * local implementation of pathfind.
@@ -52,8 +52,8 @@ pathfind( char const * path,
      *  FOR each non-null entry in the colon-separated path, DO ...
      */
     for (;;) {
-        DIR*  dirP;
-        char* colon_unit = extract_colon_unit( zPath, path, &p_index );
+        DIR  * dirP;
+        char * colon_unit = extract_colon_unit( zPath, path, &p_index );
 
         if (colon_unit == NULL)
             break;
@@ -69,7 +69,7 @@ pathfind( char const * path,
         for (;;) {
             struct dirent *entP = readdir( dirP );
 
-            if (entP == (struct dirent*)NULL)
+            if (entP == (struct dirent *)NULL)
                 break;
 
             /*
@@ -107,10 +107,10 @@ pathfind( char const * path,
  * DOT_PATH contains the symbolic location of  `.'.  This always returns
  * a new string, even if STRING was an absolute pathname to begin with.
  */
-static char*
-make_absolute( char const *string, char const *dot_path )
+static char *
+make_absolute( char const * string, char const * dot_path )
 {
-    char *result;
+    char * result;
     int result_len;
 
     if (!dot_path || *string == '/') {
@@ -147,7 +147,7 @@ make_absolute( char const *string, char const *dot_path )
  *    Non-leading `../'s and trailing `..'s are handled by removing
  *                    portions of the path.
  */
-static char*
+static char *
 canonicalize_pathname( char *path )
 {
     int i, start;
@@ -231,8 +231,8 @@ canonicalize_pathname( char *path )
  * return the next one  pointed to by (P_INDEX), or NULL if there are no
  * more.  Advance (P_INDEX) to the character after the colon.
  */
-static char*
-extract_colon_unit( char* pzDir, char const *string, int *p_index )
+static char *
+extract_colon_unit(char * pzDir, char const * string, int * p_index)
 {
     char * pzDest = pzDir;
     int    ix     = *p_index;
diff --git a/contrib/ntp/sntp/libopts/compat/windows-config.h b/contrib/ntp/sntp/libopts/compat/windows-config.h
index 78f3202b94dc..fb4e048e6482 100644
--- a/contrib/ntp/sntp/libopts/compat/windows-config.h
+++ b/contrib/ntp/sntp/libopts/compat/windows-config.h
@@ -9,7 +9,7 @@
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
diff --git a/contrib/ntp/sntp/libopts/configfile.c b/contrib/ntp/sntp/libopts/configfile.c
index 040944635658..03156ca6d889 100644
--- a/contrib/ntp/sntp/libopts/configfile.c
+++ b/contrib/ntp/sntp/libopts/configfile.c
@@ -9,7 +9,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -33,7 +33,7 @@ static void
 file_preset(tOptions * opts, char const * fname, int dir);
 
 static char *
-handle_comment(char* txt);
+handle_comment(char * txt);
 
 static char *
 handle_cfg(tOptions * opts, tOptState * ost, char * txt, int dir);
@@ -87,9 +87,9 @@ skip_unkn(char const * txt)
 /*=export_func  configFileLoad
  *
  * what:  parse a configuration file
- * arg:   + char const*     + fname + the file to load +
+ * arg:   + char const * + fname + the file to load +
  *
- * ret_type:  const tOptionValue*
+ * ret_type:  const tOptionValue *
  * ret_desc:  An allocated, compound value structure
  *
  * doc:
@@ -146,11 +146,11 @@ configFileLoad(char const * fname)
 /*=export_func  optionFindValue
  *
  * what:  find a hierarcicaly valued option instance
- * arg:   + const tOptDesc* + odesc + an option with a nested arg type +
- * arg:   + char const*     + name  + name of value to find +
- * arg:   + char const*     + val   + the matching value    +
+ * arg:   + const tOptDesc * + odesc + an option with a nested arg type +
+ * arg:   + char const *     + name  + name of value to find +
+ * arg:   + char const *     + val   + the matching value    +
  *
- * ret_type:  const tOptionValue*
+ * ret_type:  const tOptionValue *
  * ret_desc:  a compound value structure
  *
  * doc:
@@ -182,9 +182,9 @@ optionFindValue(const tOptDesc * odesc, char const * name, char const * val)
     }
 
     else do {
-        tArgList* argl  = odesc->optCookie;
-        int       argct = argl->useCt;
-        void **   poptv = (void**)(intptr_t)(argl->apzArgs);
+        tArgList * argl  = odesc->optCookie;
+        int        argct = argl->useCt;
+        void **    poptv = (void **)(argl->apzArgs);
 
         if (argct == 0) {
             errno = ENOENT;
@@ -192,7 +192,7 @@ optionFindValue(const tOptDesc * odesc, char const * name, char const * val)
         }
 
         if (name == NULL) {
-            res = (tOptionValue*)*poptv;
+            res = (tOptionValue *)*poptv;
             break;
         }
 
@@ -221,12 +221,12 @@ optionFindValue(const tOptDesc * odesc, char const * name, char const * val)
  * FIXME: the handling of 'pzName' and 'pzVal' is just wrong.
  *
  * what:  find a hierarcicaly valued option instance
- * arg:   + const tOptDesc* + odesc + an option with a nested arg type +
- * arg:   + const tOptionValue* + pPrevVal + the last entry +
- * arg:   + char const*     + name     + name of value to find +
- * arg:   + char const*     + value    + the matching value    +
+ * arg:   + const tOptDesc * + odesc + an option with a nested arg type +
+ * arg:   + const tOptionValue * + pPrevVal + the last entry +
+ * arg:   + char const *     + name     + name of value to find +
+ * arg:   + char const *     + value    + the matching value    +
  *
- * ret_type:  const tOptionValue*
+ * ret_type:  const tOptionValue *
  * ret_desc:  a compound value structure
  *
  * doc:
@@ -249,7 +249,7 @@ optionFindNextValue(const tOptDesc * odesc, const tOptionValue * pPrevVal,
                     char const * pzName, char const * pzVal)
 {
     bool old_found = false;
-    tOptionValue* res = NULL;
+    tOptionValue * res = NULL;
 
     (void)pzName;
     (void)pzVal;
@@ -264,12 +264,12 @@ optionFindNextValue(const tOptDesc * odesc, const tOptionValue * pPrevVal,
     }
 
     else do {
-        tArgList* argl = odesc->optCookie;
-        int    ct   = argl->useCt;
-        void** poptv = (void**)(intptr_t)argl->apzArgs;
+        tArgList * argl = odesc->optCookie;
+        int        ct   = argl->useCt;
+        void **   poptv = (void **)argl->apzArgs;
 
         while (--ct >= 0) {
-            tOptionValue* pOV = *(poptv++);
+            tOptionValue * pOV = *(poptv++);
             if (old_found) {
                 res = pOV;
                 break;
@@ -288,10 +288,10 @@ optionFindNextValue(const tOptDesc * odesc, const tOptionValue * pPrevVal,
 /*=export_func  optionGetValue
  *
  * what:  get a specific value from a hierarcical list
- * arg:   + const tOptionValue* + pOptValue + a hierarchcal value +
- * arg:   + char const*   + valueName + name of value to get +
+ * arg:   + const tOptionValue * + pOptValue + a hierarchcal value +
+ * arg:   + char const *         + valueName + name of value to get +
  *
- * ret_type:  const tOptionValue*
+ * ret_type:  const tOptionValue *
  * ret_desc:  a compound value structure
  *
  * doc:
@@ -326,10 +326,10 @@ optionGetValue(tOptionValue const * oov, char const * vname)
 
     if (arg_list->useCt > 0) {
         int     ct     = arg_list->useCt;
-        void ** ovlist = (void**)(intptr_t)(arg_list->apzArgs);
+        void ** ovlist = (void **)(arg_list->apzArgs);
 
         if (vname == NULL) {
-            res = (tOptionValue*)*ovlist;
+            res = (tOptionValue *)*ovlist;
 
         } else do {
             tOptionValue * opt_val = *(ovlist++);
@@ -347,10 +347,10 @@ optionGetValue(tOptionValue const * oov, char const * vname)
 /*=export_func  optionNextValue
  *
  * what:  get the next value from a hierarchical list
- * arg:   + const tOptionValue* + pOptValue + a hierarchcal list value +
- * arg:   + const tOptionValue* + pOldValue + a value from this list   +
+ * arg:   + const tOptionValue * + pOptValue + a hierarchcal list value +
+ * arg:   + const tOptionValue * + pOldValue + a value from this list   +
  *
- * ret_type:  const tOptionValue*
+ * ret_type:  const tOptionValue *
  * ret_desc:  a compound value structure
  *
  * doc:
@@ -385,7 +385,7 @@ optionNextValue(tOptionValue const * ov_list,tOptionValue const * oov )
     arg_list = ov_list->v.nestVal;
     {
         int     ct    = arg_list->useCt;
-        void ** o_list = (void**)(intptr_t)(arg_list->apzArgs);
+        void ** o_list = (void **)(arg_list->apzArgs);
 
         while (ct-- > 0) {
             tOptionValue * nov = *(o_list++);
@@ -395,7 +395,7 @@ optionNextValue(tOptionValue const * ov_list,tOptionValue const * oov )
 
                 } else {
                     err = 0;
-                    res = (tOptionValue*)*o_list;
+                    res = (tOptionValue *)*o_list;
                 }
                 break;
             }
@@ -498,9 +498,9 @@ file_preset(tOptions * opts, char const * fname, int dir)
  *  but actually I don't care that much.  It ends with "-->".
  */
 static char *
-handle_comment(char* txt)
+handle_comment(char * txt)
 {
-    char* pz = strstr(txt, "-->");
+    char * pz = strstr(txt, "-->");
     if (pz != NULL)
         pz += 3;
     return pz;
@@ -515,8 +515,8 @@ handle_comment(char* txt)
 static char *
 handle_cfg(tOptions * opts, tOptState * ost, char * txt, int dir)
 {
-    char* pzName = txt++;
-    char* pzEnd  = strchr(txt, NL);
+    char * pzName = txt++;
+    char * pzEnd  = strchr(txt, NL);
 
     if (pzEnd == NULL)
         return txt + strlen(txt);
@@ -547,8 +547,8 @@ handle_cfg(tOptions * opts, tOptState * ost, char * txt, int dir)
      *  on to a newline *not* preceded by a backslash.
      */
     if (pzEnd[-1] == '\\') {
-        char* pcD = pzEnd-1;
-        char* pcS = pzEnd;
+        char * pcD = pzEnd-1;
+        char * pcS = pzEnd;
 
         for (;;) {
             char ch = *(pcS++);
@@ -920,9 +920,9 @@ handle_struct(tOptions * opts, tOptState * ost, char * txt, int dir)
     tOptionLoadMode mode = option_load_mode;
     tOptionValue    valu;
 
-    char* pzName = ++txt;
-    char* pzData;
-    char* pcNulPoint;
+    char * pzName = ++txt;
+    char * pzData;
+    char * pcNulPoint;
 
     txt = SPN_VALUE_NAME_CHARS(txt);
     pcNulPoint = txt;
@@ -931,8 +931,8 @@ handle_struct(tOptions * opts, tOptState * ost, char * txt, int dir)
     switch (*txt) {
     case ' ':
     case '\t':
-        txt = (void *)(intptr_t)parse_attrs(
-            opts, SPN_WHITESPACE_CHARS(txt), &mode, &valu);
+        txt = VOIDP(parse_attrs(
+            opts, SPN_WHITESPACE_CHARS(txt), &mode, &valu));
         if (txt == NULL)
             return txt;
         if (*txt == '>')
@@ -1096,8 +1096,8 @@ intern_file_load(tOptions * opts)
  *
  * what: Load the locatable config files, in order
  *
- * arg:  + tOptions*   + opts + program options descriptor +
- * arg:  + char const* + prog + program name +
+ * arg:  + tOptions *   + opts + program options descriptor +
+ * arg:  + char const * + prog + program name +
  *
  * ret_type:  int
  * ret_desc:  0 -> SUCCESS, -1 -> FAILURE
@@ -1137,8 +1137,7 @@ optionFileLoad(tOptions * opts, char const * prog)
      * of this pointer to point to writable memory.
      */
     {
-        char const ** pp =
-            (char const **)(void *)(intptr_t)&(opts->pzProgName);
+        char const ** pp = VOIDP(&(opts->pzProgName));
         *pp = prog;
     }
 
@@ -1150,8 +1149,8 @@ optionFileLoad(tOptions * opts, char const * prog)
  * private:
  *
  * what:  Load an option rc/ini file
- * arg:   + tOptions* + opts  + program options descriptor +
- * arg:   + tOptDesc* + odesc + the descriptor for this arg +
+ * arg:   + tOptions * + opts  + program options descriptor +
+ * arg:   + tOptDesc * + odesc + the descriptor for this arg +
  *
  * doc:
  *  Processes the options found in the file named with
diff --git a/contrib/ntp/sntp/libopts/cook.c b/contrib/ntp/sntp/libopts/cook.c
index 952aac95065d..65260a27222d 100644
--- a/contrib/ntp/sntp/libopts/cook.c
+++ b/contrib/ntp/sntp/libopts/cook.c
@@ -10,7 +10,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -38,8 +38,8 @@ contiguous_quote(char ** pps, char * pq, int * lnct_p);
  * private:
  *
  * what:  escape-process a string fragment
- * arg:   + char const*  + pzScan  + points to character after the escape +
- * arg:   + char*        + pRes    + Where to put the result byte +
+ * arg:   + char const * + pzScan  + points to character after the escape +
+ * arg:   + char *       + pRes    + Where to put the result byte +
  * arg:   + unsigned int + nl_ch   + replacement char if scanned char is \n +
  *
  * ret-type: unsigned int
@@ -184,7 +184,7 @@ contiguous_quote(char ** pps, char * pq, int * lnct_p)
 
             case '*':
             {
-                char* p = strstr( ps+2, "*/" );
+                char * p = strstr( ps+2, "*/" );
                 /*
                  *  Skip to terminating star slash
                  */
@@ -218,10 +218,10 @@ contiguous_quote(char ** pps, char * pq, int * lnct_p)
  * private:
  *
  * what:  concatenate and escape-process strings
- * arg:   + char* + pzScan  + The *MODIFIABLE* input buffer +
- * arg:   + int*  + lnct_p  + The (possibly NULL) pointer to a line count +
+ * arg:   + char * + pzScan  + The *MODIFIABLE* input buffer +
+ * arg:   + int *  + lnct_p  + The (possibly NULL) pointer to a line count +
  *
- * ret-type: char*
+ * ret-type: char *
  * ret-desc: The address of the text following the processed strings.
  *           The return value is NULL if the strings are ill-formed.
  *
@@ -245,8 +245,8 @@ ao_string_cook(char * pzScan, int * lnct_p)
      *  It is a quoted string.  Process the escape sequence characters
      *  (in the set "abfnrtv") and make sure we find a closing quote.
      */
-    char* pzD = pzScan++;
-    char* pzS = pzScan;
+    char * pzD = pzScan++;
+    char * pzS = pzScan;
 
     if (lnct_p == NULL)
         lnct_p = &l;
diff --git a/contrib/ntp/sntp/libopts/enum.c b/contrib/ntp/sntp/libopts/enum.c
index e759e8c0a5f0..3345558bec72 100644
--- a/contrib/ntp/sntp/libopts/enum.c
+++ b/contrib/ntp/sntp/libopts/enum.c
@@ -14,7 +14,7 @@
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -186,14 +186,14 @@ find_name(char const * name, tOptions * pOpts, tOptDesc * pOD,
 {
     /*
      *  Return the matching index as a pointer sized integer.
-     *  The result gets stashed in a char* pointer.
+     *  The result gets stashed in a char * pointer.
      */
     uintptr_t   res = name_ct;
-    size_t      len = strlen((const char*)name);
+    size_t      len = strlen((char *)name);
     uintptr_t   idx;
 
     if (IS_DEC_DIGIT_CHAR(*name)) {
-        char * pz = (char *)(void *)(intptr_t)name;
+        char * pz = VOIDP(name);
         unsigned long val = strtoul(pz, &pz, 0);
         if ((*pz == NUL) && (val < name_ct))
             return (uintptr_t)val;
@@ -215,7 +215,7 @@ find_name(char const * name, tOptions * pOpts, tOptDesc * pOD,
      *  Multiple partial matches means we have an ambiguous match.
      */
     for (idx = 0; idx < name_ct; idx++) {
-        if (strncmp((char*)(intptr_t)paz_names[idx], (char*)(intptr_t)name, len) == 0) {
+        if (strncmp((char *)paz_names[idx], (char *)name, len) == 0) {
             if (paz_names[idx][len] == NUL)
                 return idx;  /* full match */
 
@@ -242,7 +242,7 @@ find_name(char const * name, tOptions * pOpts, tOptDesc * pOD,
  * what:  Convert between enumeration values and strings
  * private:
  *
- * arg:   tOptDesc*,     pOD,       enumeration option description
+ * arg:   tOptDesc *,    pOD,       enumeration option description
  * arg:   unsigned int,  enum_val,  the enumeration value to map
  *
  * ret_type:  char const *
@@ -265,8 +265,8 @@ optionKeywordName(tOptDesc * pOD, unsigned int enum_val)
  * what:  Convert from a string to an enumeration value
  * private:
  *
- * arg:   tOptions*,     pOpts,     the program options descriptor
- * arg:   tOptDesc*,     pOD,       enumeration option description
+ * arg:   tOptions *,    pOpts,     the program options descriptor
+ * arg:   tOptDesc *,    pOD,       enumeration option description
  * arg:   char const * const *,  paz_names, list of enumeration names
  * arg:   unsigned int,  name_ct,   number of names in list
  *
@@ -509,7 +509,7 @@ find_member_bit(tOptions * opts, tOptDesc * od, char const * pz, int len,
  *
  * arg:   tOptDesc *,  od,   the set membership option description
  *
- * ret_type: char*
+ * ret_type: char *
  * ret_desc: the names of the set bits
  *
  * doc:   This converts the OPT_VALUE_name mask value to a allocated string.
@@ -521,7 +521,7 @@ optionMemberList(tOptDesc * od)
     uintptr_t    sv = od->optArg.argIntptr;
     char * res;
     (*(od->pOptProc))(OPTPROC_RETURN_VALNAME, od);
-    res = (void *)(intptr_t)od->optArg.argString;
+    res = VOIDP(od->optArg.argString);
     od->optArg.argIntptr = sv;
     return res;
 }
@@ -530,8 +530,8 @@ optionMemberList(tOptDesc * od)
  * what:  Convert between bit flag values and strings
  * private:
  *
- * arg:   tOptions*,     opts,     the program options descriptor
- * arg:   tOptDesc*,     od,       the set membership option description
+ * arg:   tOptions *,     opts,     the program options descriptor
+ * arg:   tOptDesc *,     od,       the set membership option description
  * arg:   char const * const *,
  *                       nm_list,  list of enumeration names
  * arg:   unsigned int,  nm_ct,    number of names in list
@@ -634,12 +634,12 @@ optionSetMembers(tOptions * opts, tOptDesc * od,
         if (nm_ct < (8 * sizeof(uintptr_t)))
             res &= (1UL << nm_ct) - 1UL;
 
-        od->optCookie = (void *)res;
+        od->optCookie = VOIDP(res);
     }
     return;
 
 fail_return:
-    od->optCookie = (void *)0;
+    od->optCookie = VOIDP(0);
 }
 
 /** @}
diff --git a/contrib/ntp/sntp/libopts/env.c b/contrib/ntp/sntp/libopts/env.c
index 7b6615e5e91b..36ae2e535a6c 100644
--- a/contrib/ntp/sntp/libopts/env.c
+++ b/contrib/ntp/sntp/libopts/env.c
@@ -13,7 +13,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -48,7 +48,7 @@ LOCAL void
 doPrognameEnv(tOptions * pOpts, teEnvPresetType type)
 {
     char const *        env_opts = getenv(pOpts->pzPROGNAME);
-    token_list_t*       pTL;
+    token_list_t *      pTL;
     int                 sv_argc;
     proc_state_mask_t   sv_flag;
     char **             sv_argv;
@@ -82,7 +82,7 @@ doPrognameEnv(tOptions * pOpts, teEnvPresetType type)
      */
     {
         uintptr_t v = (uintptr_t)(pTL->tkn_list);
-        pOpts->origArgVect = (void *)(v - sizeof(char *));
+        pOpts->origArgVect = VOIDP(v - sizeof(char *));
     }
     pOpts->origArgCt   = (unsigned int)pTL->tkn_ct   + 1;
     pOpts->fOptSet    &= ~OPTPROC_ERRSTOP;
@@ -192,7 +192,7 @@ env_presets(tOptions * pOpts, teEnvPresetType type)
 {
     int        ct;
     tOptState  st;
-    char*      pzFlagName;
+    char *     pzFlagName;
     size_t     spaceLeft;
     char       zEnvName[ AO_NAME_SIZE ];
 
diff --git a/contrib/ntp/sntp/libopts/file.c b/contrib/ntp/sntp/libopts/file.c
index d5fdb4a98b71..7d92875d84c3 100644
--- a/contrib/ntp/sntp/libopts/file.c
+++ b/contrib/ntp/sntp/libopts/file.c
@@ -10,7 +10,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -107,7 +107,7 @@ open_file_fd(tOptions * pOpts, tOptDesc * pOD, tuFileMode mode)
         /* NOTREACHED */
 
     if ((pOD->fOptState & OPTST_ALLOC_ARG) != 0)
-        pOD->optCookie = (void *)(intptr_t)pOD->optArg.argString;
+        pOD->optCookie = VOIDP(pOD->optArg.argString);
     else
         AGDUPSTR(pOD->optCookie, pOD->optArg.argString, "file name");
 
@@ -131,7 +131,7 @@ fopen_file_fp(tOptions * pOpts, tOptDesc * pOD, tuFileMode mode)
         /* NOTREACHED */
 
     if ((pOD->fOptState & OPTST_ALLOC_ARG) != 0)
-        pOD->optCookie = (void *)(intptr_t)pOD->optArg.argString;
+        pOD->optCookie = VOIDP(pOD->optArg.argString);
     else
         AGDUPSTR(pOD->optCookie, pOD->optArg.argString, "file name");
 
@@ -143,8 +143,8 @@ fopen_file_fp(tOptions * pOpts, tOptDesc * pOD, tuFileMode mode)
  * private:
  *
  * what:  Decipher a boolean value
- * arg:   + tOptions*     + pOpts    + program options descriptor  +
- * arg:   + tOptDesc*     + pOptDesc + the descriptor for this arg +
+ * arg:   + tOptions *    + pOpts    + program options descriptor  +
+ * arg:   + tOptDesc *    + pOptDesc + the descriptor for this arg +
  * arg:   + teOptFileType + ftype    + File handling type          +
  * arg:   + tuFileMode    + mode     + file open mode (if needed)  +
  *
@@ -153,7 +153,7 @@ fopen_file_fp(tOptions * pOpts, tOptDesc * pOD, tuFileMode mode)
  *   The mode specifies if the file must exist, must not exist or may
  *   (or may not) exist.  The mode may also specify opening the
  *   file: don't, open just the descriptor (fd), or open as a stream
- *   (FILE* pointer).
+ *   (FILE * pointer).
 =*/
 void
 optionFileCheck(tOptions * pOpts, tOptDesc * pOD,
diff --git a/contrib/ntp/sntp/libopts/find.c b/contrib/ntp/sntp/libopts/find.c
index 8d4789628cef..90591cc9243d 100644
--- a/contrib/ntp/sntp/libopts/find.c
+++ b/contrib/ntp/sntp/libopts/find.c
@@ -12,7 +12,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -58,7 +58,7 @@ static tSuccess
 get_opt_arg_may(tOptions * pOpts, tOptState * o_st);
 
 static tSuccess
-get_opt_arg_none(tOptions * pOpts, tOptState* o_st);
+get_opt_arg_none(tOptions * pOpts, tOptState * o_st);
 /* = = = END-STATIC-FORWARD = = = */
 
 /**
@@ -80,7 +80,7 @@ parse_opt(char const ** nm_pp, char ** arg_pp, char * buf, size_t bufsz)
 
             buf[res] = NUL;
             *nm_pp   = buf;
-            *arg_pp  = (char *)(intptr_t)p;
+            *arg_pp  = (char *)p;
             return res;
 
         default:
@@ -409,9 +409,9 @@ opt_find_long(tOptions * opts, char const * opt_name, tOptState * state)
  * @param pOptState  state about current option
  */
 LOCAL tSuccess
-opt_find_short(tOptions* pOpts, uint_t optValue, tOptState* pOptState)
+opt_find_short(tOptions * pOpts, uint_t optValue, tOptState * pOptState)
 {
-    tOptDesc*  pRes = pOpts->pOptDesc;
+    tOptDesc * pRes = pOpts->pOptDesc;
     int        ct   = pOpts->optCt;
 
     /*
@@ -554,7 +554,7 @@ get_opt_arg_may(tOptions * pOpts, tOptState * o_st)
         if (*++pOpts->pzCurOpt != NUL)
             o_st->pzOptArg = pOpts->pzCurOpt;
         else {
-            char* pzLA = pOpts->origArgVect[ pOpts->curOptIdx ];
+            char * pzLA = pOpts->origArgVect[ pOpts->curOptIdx ];
 
             /*
              *  BECAUSE it is optional, we must make sure
@@ -577,7 +577,7 @@ get_opt_arg_may(tOptions * pOpts, tOptState * o_st)
          */
         if (  (o_st->pzOptArg == NULL)
            && (! NAMED_OPTS(pOpts))) {
-            char* pzLA = pOpts->origArgVect[ pOpts->curOptIdx ];
+            char * pzLA = pOpts->origArgVect[ pOpts->curOptIdx ];
 
             /*
              *  BECAUSE it is optional, we must make sure
@@ -616,7 +616,7 @@ get_opt_arg_may(tOptions * pOpts, tOptState * o_st)
  *  @returns SUCCESS or FAILURE
  */
 static tSuccess
-get_opt_arg_none(tOptions * pOpts, tOptState* o_st)
+get_opt_arg_none(tOptions * pOpts, tOptState * o_st)
 {
     /*
      *  No option argument.  Make sure next time around we find
@@ -711,7 +711,7 @@ find_opt(tOptions * opts, tOptState * o_st)
          *  strip off the "const" quality of the "default_opt" field.
          */
         while (*(++pz) == '-')   ;
-        def_opt  = (void *)(intptr_t)&(opts->specOptIdx.default_opt);
+        def_opt  = VOIDP(&(opts->specOptIdx.default_opt));
         def      = *def_opt;
         *def_opt = NO_EQUIVALENT;
         res      = opt_find_long(opts, pz, o_st);
diff --git a/contrib/ntp/sntp/libopts/genshell.c b/contrib/ntp/sntp/libopts/genshell.c
index 20e6c15c9fd6..0f05b3efbc44 100644
--- a/contrib/ntp/sntp/libopts/genshell.c
+++ b/contrib/ntp/sntp/libopts/genshell.c
@@ -294,7 +294,7 @@ doUsageOpt(tOptions * opts, tOptDesc * od)
     (void)opts;
     (void)od;
 }
-/* extracted from optmain.tlib near line 1245 */
+/* extracted from optmain.tlib near line 1250 */
 
 /**
  * The directory containing the data associated with genshellopt.
@@ -406,11 +406,11 @@ AO_gettext(char const * pz)
     if (option_xlateable_txt.field_ct != 0) {
         res = dgettext("libopts", pz);
         if (res == pz)
-            res = (char *)(void *)_(pz);
+            res = (char *)VOIDP(_(pz));
     } else
-        res = (char *)(void *)_(pz);
+        res = (char *)VOIDP(_(pz));
 #else
-    res = (char *)(void *)_(pz);
+    res = (char *)VOIDP(_(pz));
 #endif
     if (res == pz)
         return res;
@@ -447,7 +447,7 @@ translate_option_strings(void)
          *  Do the translations.  The first pointer follows the field count
          *  field.  The field count field is the size of a pointer.
          */
-        char ** ppz = (char**)(void*)&(option_xlateable_txt);
+        char ** ppz = (char**)VOIDP(&(option_xlateable_txt));
         int     ix  = option_xlateable_txt.field_ct;
 
         do {
@@ -457,16 +457,16 @@ translate_option_strings(void)
         /* prevent re-translation and disable "libopts" domain lookup */
         option_xlateable_txt.field_ct = 0;
 
-        coerce_it((void*)&(opts->pzCopyright));
-        coerce_it((void*)&(opts->pzCopyNotice));
-        coerce_it((void*)&(opts->pzFullVersion));
-        coerce_it((void*)&(opts->pzUsageTitle));
-        coerce_it((void*)&(opts->pzExplain));
-        coerce_it((void*)&(opts->pzDetail));
+        coerce_it(VOIDP(&(opts->pzCopyright)));
+        coerce_it(VOIDP(&(opts->pzCopyNotice)));
+        coerce_it(VOIDP(&(opts->pzFullVersion)));
+        coerce_it(VOIDP(&(opts->pzUsageTitle)));
+        coerce_it(VOIDP(&(opts->pzExplain)));
+        coerce_it(VOIDP(&(opts->pzDetail)));
         {
             tOptDesc * od = opts->pOptDesc;
             for (ix = opts->optCt; ix > 0; ix--, od++)
-                coerce_it((void*)&(od->pzText));
+                coerce_it(VOIDP(&(od->pzText)));
         }
     }
 }
@@ -555,19 +555,19 @@ by the newly generated text.  The first '#!' line will be regenerated.\n"));
   puts(_("allocation of %d bytes failed\n"));
 #line 53 "../init.c"
   puts(_("AutoOpts function called without option descriptor\n"));
-#line 90 "../init.c"
+#line 86 "../init.c"
   puts(_("\tThis exceeds the compiled library version:  "));
-#line 88 "../init.c"
+#line 84 "../init.c"
   puts(_("Automated Options Processing Error!\n"
        "\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
 #line 80 "../autoopts.c"
   puts(_("realloc of %d bytes at 0x%p failed\n"));
-#line 92 "../init.c"
+#line 88 "../init.c"
   puts(_("\tThis is less than the minimum library version:  "));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2014 by Bruce Korb - all rights reserved\n"));
-#line 82 "../makeshell.c"
+#line 87 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
@@ -591,9 +591,9 @@ by the newly generated text.  The first '#!' line will be regenerated.\n"));
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 89 "../makeshell.c"
+#line 94 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 301 "../makeshell.c"
+#line 306 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -671,9 +671,9 @@ by the newly generated text.  The first '#!' line will be regenerated.\n"));
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("standard output"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("standard output"));
 #line 274 "../usage.c"
   puts(_("standard output"));
@@ -691,9 +691,9 @@ by the newly generated text.  The first '#!' line will be regenerated.\n"));
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("write"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("write"));
 #line 273 "../usage.c"
   puts(_("write"));
@@ -745,7 +745,7 @@ by the newly generated text.  The first '#!' line will be regenerated.\n"));
 #line 380 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 916 "../makeshell.c"
+#line 921 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
diff --git a/contrib/ntp/sntp/libopts/gettext.h b/contrib/ntp/sntp/libopts/gettext.h
index 9b7416ded249..7d3ea3cbf160 100644
--- a/contrib/ntp/sntp/libopts/gettext.h
+++ b/contrib/ntp/sntp/libopts/gettext.h
@@ -1,5 +1,5 @@
 /* Convenience header for conditional use of GNU .
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2015 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/contrib/ntp/sntp/libopts/init.c b/contrib/ntp/sntp/libopts/init.c
index 9374528126dc..e02e1e1b9bc7 100644
--- a/contrib/ntp/sntp/libopts/init.c
+++ b/contrib/ntp/sntp/libopts/init.c
@@ -9,7 +9,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -69,7 +69,7 @@ validate_struct(tOptions * opts, char const * pname)
          */
         if ((opts->fOptSet & OPTPROC_NO_XLAT_MASK) == OPTPROC_NXLAT_OPT)
             opts->fOptSet |= OPTPROC_NXLAT_OPT_CFG;
-        (*opts->pTransProc)();
+        opts->pTransProc();
     }
 
     /*
@@ -81,10 +81,6 @@ validate_struct(tOptions * opts, char const * pname)
        && (  (opts->structVersion > OPTIONS_STRUCT_VERSION  )
           || (opts->structVersion < OPTIONS_MINIMUM_VERSION )
        )  )  {
-
-        static char const ao_ver_string[] =
-            STR(AO_CURRENT)":"STR(AO_REVISION)":"STR(AO_AGE)"\n";
-
         fprintf(stderr, zwrong_ver, pname, NUM_TO_VER(opts->structVersion));
         if (opts->structVersion > OPTIONS_STRUCT_VERSION )
             fputs(ztoo_new, stderr);
@@ -101,17 +97,20 @@ validate_struct(tOptions * opts, char const * pname)
      */
     if (opts->pzProgName == NULL) {
         char const *  pz = strrchr(pname, DIRCH);
+        char const ** pp =
+            (char const **)(void **)&(opts->pzProgName);
 
         if (pz != NULL)
-            opts->pzProgName = pz+1;
+            *pp = pz+1;
         else
-            opts->pzProgName = pname;
+            *pp = pname;
 
-        pz = pathfind(getenv("PATH"), (char *)(intptr_t)pname, "rx");
+        pz = pathfind(getenv("PATH"), (char *)pname, "rx");
         if (pz != NULL)
-            pname = (void *)(intptr_t)pz;
+            pname = VOIDP(pz);
 
-        opts->pzProgPath = pname;
+        pp  = (char const **)VOIDP(&(opts->pzProgPath));
+        *pp = pname;
 
         /*
          *  when comparing long names, these are equivalent
diff --git a/contrib/ntp/sntp/libopts/intprops.h b/contrib/ntp/sntp/libopts/intprops.h
index 6936ad572f88..2ae151b92953 100644
--- a/contrib/ntp/sntp/libopts/intprops.h
+++ b/contrib/ntp/sntp/libopts/intprops.h
@@ -1,6 +1,6 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2005, 2009-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/contrib/ntp/sntp/libopts/libopts.c b/contrib/ntp/sntp/libopts/libopts.c
index a0ff3624745a..97bc359ed8c5 100644
--- a/contrib/ntp/sntp/libopts/libopts.c
+++ b/contrib/ntp/sntp/libopts/libopts.c
@@ -2,6 +2,8 @@
 #include "autoopts/project.h"
 #define  LOCAL static
 #include "ao-strs.h"
+static char const ao_ver_string[] =
+    "41:0:16\n";
 #include "autoopts/options.h"
 #include "autoopts/usage-txt.h"
 #include "genshell.h"
diff --git a/contrib/ntp/sntp/libopts/load.c b/contrib/ntp/sntp/libopts/load.c
index 065449255022..b5230afd382a 100644
--- a/contrib/ntp/sntp/libopts/load.c
+++ b/contrib/ntp/sntp/libopts/load.c
@@ -12,7 +12,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -94,10 +94,10 @@ get_realpath(char * buf, size_t b_sz)
  * private:
  *
  * what:  translate and construct a path
- * arg:   + char*       + p_buf     + The result buffer +
- * arg:   + int         + b_sz      + The size of this buffer +
- * arg:   + char const* + fname     + The input name +
- * arg:   + char const* + prg_path  + The full path of the current program +
+ * arg:   + char *       + p_buf     + The result buffer +
+ * arg:   + int          + b_sz      + The size of this buffer +
+ * arg:   + char const * + fname     + The input name +
+ * arg:   + char const * + prg_path  + The full path of the current program +
  *
  * ret-type: bool
  * ret-desc: true if the name was handled, otherwise false.
@@ -225,7 +225,7 @@ add_prog_path(char * buf, int b_sz, char const * fname, char const * prg_path)
     if (strchr(prg_path, DIRCH) != NULL)
         path = prg_path;
     else {
-        path = pathfind(getenv("PATH"), (char*)(intptr_t)prg_path, "rx");
+        path = pathfind(getenv("PATH"), (char *)prg_path, "rx");
 
         if (path == NULL)
             return false;
@@ -544,8 +544,8 @@ load_opt_line(tOptions * opts, tOptState * opt_state, char * line,
  *
  * what:  process a string for an option name and value
  *
- * arg:   tOptions*,   opts,  program options descriptor
- * arg:   char const*, line,  NUL-terminated text
+ * arg:   tOptions *,   opts,  program options descriptor
+ * arg:   char const *, line,  NUL-terminated text
  *
  * doc:
  *
diff --git a/contrib/ntp/sntp/libopts/m4/libopts.m4 b/contrib/ntp/sntp/libopts/m4/libopts.m4
index 352098b808c6..1a896d9759a5 100644
--- a/contrib/ntp/sntp/libopts/m4/libopts.m4
+++ b/contrib/ntp/sntp/libopts/m4/libopts.m4
@@ -2,7 +2,7 @@ dnl  -*- buffer-read-only: t -*- vi: set ro:
 dnl
 dnl DO NOT EDIT THIS FILE   (libopts.m4)
 dnl
-dnl It has been AutoGen-ed  August  3, 2014 at 10:44:34 AM by AutoGen 5.18.4pre11
+dnl It has been AutoGen-ed
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -97,10 +97,10 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
   ])
   AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t,
   intptr_t, uintptr_t, uint_t, pid_t, size_t, ptrdiff_t])
-  AC_CHECK_SIZEOF(char*, 8)
-  AC_CHECK_SIZEOF(int,   4)
-  AC_CHECK_SIZEOF(long,  8)
-  AC_CHECK_SIZEOF(short, 2)
+  AC_CHECK_SIZEOF(char *, 8)
+  AC_CHECK_SIZEOF(int,    4)
+  AC_CHECK_SIZEOF(long,   8)
+  AC_CHECK_SIZEOF(short,  2)
 
   # ------------
   # AC_CHECK_LIB
@@ -189,14 +189,14 @@ AC_DEFUN([LIBOPTS_WITHLIB_REGEX],[
   Xyes|Xno|X )
     case "X${libopts_cv_with_libregex_root}" in
     Xyes|Xno|X ) libopts_cv_with_libregex_cflags=no ;;
-    * )        libopts_cv_with_libregex_cflags=-I${libopts_cv_with_libregex_root}/include ;;
+    * ) libopts_cv_with_libregex_cflags=-I${libopts_cv_with_libregex_root}/include ;;
     esac
   esac
   case "X${libopts_cv_with_libregex_libs}" in
   Xyes|Xno|X )
     case "X${libopts_cv_with_libregex_root}" in
     Xyes|Xno|X ) libopts_cv_with_libregex_libs=no ;;
-    * )        libopts_cv_with_libregex_libs="-L${libopts_cv_with_libregex_root}/lib -lregex";;
+    * )        libopts_cv_with_libregex_libs="-L${libopts_cv_with_libregex_root}/lib -lregex" ;;
     esac
   esac
   libopts_save_CPPFLAGS="${CPPFLAGS}"
@@ -216,12 +216,12 @@ AC_DEFUN([LIBOPTS_WITHLIB_REGEX],[
   LIBREGEX_LIBS=""
   AC_MSG_CHECKING([whether libregex functions properly])
   AC_CACHE_VAL([libopts_cv_with_libregex],[
-  AC_RUN_IFELSE([AC_LANG_SOURCE([@%:@include 
+  AC_RUN_IFELSE([@%:@include 
 @%:@include 
 @%:@include 
 @%:@include REGEX_HEADER
 static regex_t re;
-void comp_re( char const* pzPat ) {
+void comp_re(char const * pzPat) {
   int res = regcomp( &re, pzPat, REG_EXTENDED|REG_ICASE|REG_NEWLINE );
   if (res == 0) return;
   exit( res ); }
@@ -235,7 +235,7 @@ int main() {
     fputs( "error: regex -->.<-- did not match\n", stderr );
     return 1;
   }
-  return 0; }])],
+  return 0; }],
     [libopts_cv_with_libregex=yes], [libopts_cv_with_libregex=no],
     [libopts_cv_with_libregex=no]) # end of AC_RUN_IFELSE 
   ]) # end of AC_CACHE_VAL for libopts_cv_with_libregex
@@ -260,12 +260,12 @@ libopts_cv_with_libregex=no
 AC_DEFUN([LIBOPTS_RUN_PATHFIND],[
   AC_MSG_CHECKING([whether pathfind(3) works])
   AC_CACHE_VAL([libopts_cv_run_pathfind],[
-  AC_RUN_IFELSE([AC_LANG_SOURCE([@%:@include 
+  AC_RUN_IFELSE([@%:@include 
 @%:@include 
-int main (int argc, char** argv) {
-   char* pz = pathfind( getenv( "PATH" ), "sh", "x" );
+int main (int argc, char ** argv) {
+   char * pz = pathfind( getenv( "PATH" ), "sh", "x" );
    return (pz == 0) ? 1 : 0;
-}])],
+}],
     [libopts_cv_run_pathfind=yes],[libopts_cv_run_pathfind=no],[libopts_cv_run_pathfind=no]
   ) # end of RUN_IFELSE
   ]) # end of AC_CACHE_VAL for libopts_cv_run_pathfind
@@ -303,9 +303,9 @@ echo ${dzero}`
 AC_DEFUN([LIBOPTS_RUN_REALPATH],[
   AC_MSG_CHECKING([whether we have a functional realpath(3C)])
   AC_CACHE_VAL([libopts_cv_run_realpath],[
-  AC_RUN_IFELSE([AC_LANG_SOURCE([@%:@include 
+  AC_RUN_IFELSE([@%:@include 
 @%:@include 
-int main (int argc, char** argv) {
+int main (int argc, char ** argv) {
 @%:@ifndef PATH_MAX
 choke me!!
 @%:@else
@@ -313,7 +313,7 @@ choke me!!
 @%:@endif
    char *pz = realpath(argv@<:@0@:>@, zPath);
    return (pz == zPath) ? 0 : 1;
-}])],
+}],
     [libopts_cv_run_realpath=yes],[libopts_cv_run_realpath=no],[libopts_cv_run_realpath=no]
   ) # end of RUN_IFELSE
   ]) # end of AC_CACHE_VAL for libopts_cv_run_realpath
@@ -330,7 +330,7 @@ choke me!!
 AC_DEFUN([LIBOPTS_RUN_STRFTIME],[
   AC_MSG_CHECKING([whether strftime() works])
   AC_CACHE_VAL([libopts_cv_run_strftime],[
-  AC_RUN_IFELSE([AC_LANG_SOURCE([@%:@include 
+  AC_RUN_IFELSE([@%:@include 
 @%:@include 
 char t_buf@<:@ 64 @:>@;
 int main() {
@@ -346,7 +346,7 @@ int main() {
   tm.tm_yday  = 239; /* days since January 1 @<:@0, 365@:>@ */
   tm.tm_isdst =  1;  /* flag for daylight savings time */
   strftime( t_buf, sizeof( t_buf ), "%A %b %d %j", &tm );
-  return (strcmp( t_buf, z ) != 0); }])],
+  return (strcmp( t_buf, z ) != 0); }],
     [libopts_cv_run_strftime=yes],[libopts_cv_run_strftime=no],[libopts_cv_run_strftime=no]
   ) # end of RUN_IFELSE
   ]) # end of AC_CACHE_VAL for libopts_cv_run_strftime
@@ -363,10 +363,10 @@ int main() {
 AC_DEFUN([LIBOPTS_RUN_FOPEN_BINARY],[
   AC_MSG_CHECKING([whether fopen accepts "b" mode])
   AC_CACHE_VAL([libopts_cv_run_fopen_binary],[
-  AC_RUN_IFELSE([AC_LANG_SOURCE([@%:@include 
-int main (int argc, char** argv) {
-FILE* fp = fopen("conftest.@S|@ac_ext", "rb");
-return (fp == NULL) ? 1 : fclose(fp); }])],
+  AC_RUN_IFELSE([@%:@include 
+int main (int argc, char ** argv) {
+FILE * fp = fopen("conftest.@S|@ac_ext", "rb");
+return (fp == NULL) ? 1 : fclose(fp); }],
     [libopts_cv_run_fopen_binary=yes],[libopts_cv_run_fopen_binary=no],[libopts_cv_run_fopen_binary=no]
   ) # end of RUN_IFELSE
   ]) # end of AC_CACHE_VAL for libopts_cv_run_fopen_binary
@@ -386,10 +386,10 @@ return (fp == NULL) ? 1 : fclose(fp); }])],
 AC_DEFUN([LIBOPTS_RUN_FOPEN_TEXT],[
   AC_MSG_CHECKING([whether fopen accepts "t" mode])
   AC_CACHE_VAL([libopts_cv_run_fopen_text],[
-  AC_RUN_IFELSE([AC_LANG_SOURCE([@%:@include 
-int main (int argc, char** argv) {
-FILE* fp = fopen("conftest.@S|@ac_ext", "rt");
-return (fp == NULL) ? 1 : fclose(fp); }])],
+  AC_RUN_IFELSE([@%:@include 
+int main (int argc, char ** argv) {
+FILE * fp = fopen("conftest.@S|@ac_ext", "rt");
+return (fp == NULL) ? 1 : fclose(fp); }],
     [libopts_cv_run_fopen_text=yes],[libopts_cv_run_fopen_text=no],[libopts_cv_run_fopen_text=no]
   ) # end of RUN_IFELSE
   ]) # end of AC_CACHE_VAL for libopts_cv_run_fopen_text
@@ -461,7 +461,7 @@ dnl the config tests that the library needs.  Invoke the
 dnl "INVOKE_LIBOPTS_MACROS" macro iff we are building libopts.
 dnl
 dnl  This file is part of AutoGen.
-dnl  AutoGen Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+dnl  AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
 dnl
 dnl  AutoGen is free software: you can redistribute it and/or modify it
 dnl  under the terms of the GNU General Public License as published by the
diff --git a/contrib/ntp/sntp/libopts/m4/liboptschk.m4 b/contrib/ntp/sntp/libopts/m4/liboptschk.m4
index c71ae1035700..34d5658c2ff1 100644
--- a/contrib/ntp/sntp/libopts/m4/liboptschk.m4
+++ b/contrib/ntp/sntp/libopts/m4/liboptschk.m4
@@ -1,5 +1,5 @@
 # liboptschk.m4 serial 2 (autogen - 5.11.4)
-dnl Copyright (C) 2005-2014 by Bruce Korb - all rights reserved
+dnl Copyright (C) 2005-2015 by Bruce Korb - all rights reserved
 dnl
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/contrib/ntp/sntp/libopts/m4/stdnoreturn.m4 b/contrib/ntp/sntp/libopts/m4/stdnoreturn.m4
index eea2c1e21dd1..003941164f11 100644
--- a/contrib/ntp/sntp/libopts/m4/stdnoreturn.m4
+++ b/contrib/ntp/sntp/libopts/m4/stdnoreturn.m4
@@ -1,6 +1,6 @@
 # Check for stdnoreturn.h that conforms to C11.
 
-dnl Copyright 2012-2014 Free Software Foundation, Inc.
+dnl Copyright 2012-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/contrib/ntp/sntp/libopts/makeshell.c b/contrib/ntp/sntp/libopts/makeshell.c
index baef8fcb5f79..a61df422c857 100644
--- a/contrib/ntp/sntp/libopts/makeshell.c
+++ b/contrib/ntp/sntp/libopts/makeshell.c
@@ -11,7 +11,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -30,6 +30,11 @@
  *  13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239  COPYING.mbsd
  */
 
+ static inline unsigned char to_uchar (char ch) { return ch; }
+
+#define UPPER(_c) (toupper(to_uchar(_c)))
+#define LOWER(_c) (tolower(to_uchar(_c)))
+
 /* = = = START-STATIC-FORWARD = = = */
 static void
 emit_var_text(char const * prog, char const * var, int fdin);
@@ -101,7 +106,7 @@ fserr_exit(char const * prog, char const * op, char const * fname)
  * private:
  *
  * what:  Decipher a boolean value
- * arg:   + tOptions* + pOpts    + program options descriptor +
+ * arg:   + tOptions * + pOpts    + program options descriptor +
  *
  * doc:
  *  Emit a shell script that will parse the command line options.
@@ -396,13 +401,13 @@ emit_usage(tOptions * opts)
 
         /* Copy the program name into the time/name buffer */
         for (;;) {
-            if ((*pzPN++ = (char)tolower((unsigned char)*pz++)) == NUL)
+            if ((*pzPN++ = (char)tolower(*pz++)) == NUL)
                 break;
         }
 
-        pp  = (char **)(void *)(intptr_t)&(opts->pzProgPath);
+        pp  = VOIDP(&(opts->pzProgPath));
         *pp = tm_nm_buf;
-        pp  = (char **)(void *)(intptr_t)&(opts->pzProgName);
+        pp  = VOIDP(&(opts->pzProgName));
         *pp = tm_nm_buf;
     }
 
@@ -410,8 +415,8 @@ emit_usage(tOptions * opts)
     text_to_var(opts, TT_USAGE,     NULL);
 
     {
-        tOptDesc* pOptDesc = opts->pOptDesc;
-        int       optionCt = opts->optCt;
+        tOptDesc * pOptDesc = opts->pOptDesc;
+        int        optionCt = opts->optCt;
 
         for (;;) {
             if (pOptDesc->pOptProc == optionPrintVersion) {
@@ -601,8 +606,8 @@ emit_inaction(tOptions * opts, tOptDesc * od)
 static void
 emit_flag(tOptions * opts)
 {
-    tOptDesc* od = opts->pOptDesc;
-    int       opt_ct = opts->optCt;
+    tOptDesc * od = opts->pOptDesc;
+    int        opt_ct = opts->optCt;
 
     fputs(zOptionCase, stdout);
 
@@ -653,7 +658,7 @@ emit_match_expr(char const * name, tOptDesc * cod, tOptions * opts)
              *  They must not be the same.  They cannot be, because it would
              *  not compile correctly if they were.
              */
-            while (toupper((unsigned char)od->pz_Name[match_ct]) == toupper((unsigned char)name[match_ct]))
+            while (UPPER(od->pz_Name[match_ct]) == UPPER(name[match_ct]))
                 match_ct++;
 
             if (match_ct > min_match_ct)
@@ -666,8 +671,8 @@ emit_match_expr(char const * name, tOptDesc * cod, tOptions * opts)
                 continue;
 
             match_ct = 0;
-            while (  toupper((unsigned char)od->pz_DisableName[match_ct])
-                  == toupper((unsigned char)name[match_ct]))
+            while (  toupper(od->pz_DisableName[match_ct])
+                  == toupper(name[match_ct]))
                 match_ct++;
             if (match_ct > min_match_ct)
                 min_match_ct = match_ct;
@@ -772,7 +777,7 @@ load_old_output(char const * fname, char const * pname)
      *  Read in all the data as fast as our OS will let us.
      */
     for (;;) {
-        size_t inct = fread((void*)scan, 1, (size_t)stbf.st_size, fp);
+        size_t inct = fread(VOIDP(scan), 1, (size_t)stbf.st_size, fp);
         if (inct == 0)
             break;
 
@@ -845,8 +850,8 @@ open_out(char const * fname, char const * pname)
  * private:
  * what: The usage function for the genshellopt generated program
  *
- * arg:  + tOptions* + opts    + program options descriptor +
- * arg:  + int       + exit_cd + usage text type to produce +
+ * arg:  + tOptions * + opts    + program options descriptor +
+ * arg:  + int        + exit_cd + usage text type to produce +
  *
  * doc:
  *  This function is used to create the usage strings for the option
@@ -901,11 +906,11 @@ genshelloptUsage(tOptions * opts, int exit_cd)
      */
     {
         char *  pz;
-        char ** pp = (char **)(void *)(intptr_t)&(optionParseShellOptions->pzProgName);
+        char ** pp = VOIDP(&(optionParseShellOptions->pzProgName));
         AGDUPSTR(pz, optionParseShellOptions->pzPROGNAME, "prog name");
         *pp = pz;
         while (*pz != NUL) {
-            *pz = (char)tolower((unsigned char)*pz);
+            *pz = (char)LOWER(*pz);
             pz++;
         }
     }
diff --git a/contrib/ntp/sntp/libopts/nested.c b/contrib/ntp/sntp/libopts/nested.c
index 96e45530fb47..f4fb22620932 100644
--- a/contrib/ntp/sntp/libopts/nested.c
+++ b/contrib/ntp/sntp/libopts/nested.c
@@ -12,7 +12,7 @@
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -53,8 +53,8 @@ static xml_xlate_t const xml_xlate[] = {
 static void
 remove_continuation(char * src);
 
-static char const*
-scan_q_str(char const* pzTxt);
+static char const *
+scan_q_str(char const * pzTxt);
 
 static tOptionValue *
 add_string(void ** pp, char const * name, size_t nm_len,
@@ -64,11 +64,11 @@ static tOptionValue *
 add_bool(void ** pp, char const * name, size_t nm_len,
          char const * val, size_t d_len);
 
-static tOptionValue*
+static tOptionValue *
 add_number(void ** pp, char const * name, size_t nm_len,
            char const * val, size_t d_len);
 
-static tOptionValue*
+static tOptionValue *
 add_nested(void ** pp, char const * name, size_t nm_len,
            char * val, size_t d_len);
 
@@ -98,7 +98,7 @@ sort_list(tArgList * arg_list);
 static void
 remove_continuation(char * src)
 {
-    char* pzD;
+    char * pzD;
 
     do  {
         while (*src == NL)  src++;
@@ -133,8 +133,8 @@ remove_continuation(char * src)
 /**
  *  Find the end of a quoted string, skipping escaped quote characters.
  */
-static char const*
-scan_q_str(char const* pzTxt)
+static char const *
+scan_q_str(char const * pzTxt)
 {
     char q = *(pzTxt++); /* remember the type of quote */
 
@@ -182,7 +182,7 @@ static tOptionValue *
 add_string(void ** pp, char const * name, size_t nm_len,
            char const * val, size_t d_len)
 {
-    tOptionValue* pNV;
+    tOptionValue * pNV;
     size_t sz = nm_len + d_len + sizeof(*pNV);
 
     pNV = AGALOC(sz, "option name/str value pair");
@@ -254,7 +254,7 @@ add_bool(void ** pp, char const * name, size_t nm_len,
     else new_val->v.boolVal = ! IS_FALSE_TYPE_CHAR(*val);
 
     new_val->valType = OPARG_TYPE_BOOLEAN;
-    new_val->pzName = (char*)(new_val + 1);
+    new_val->pzName = (char *)(new_val + 1);
     memcpy(new_val->pzName, name, nm_len);
     new_val->pzName[ nm_len ] = NUL;
     addArgListEntry(pp, new_val);
@@ -272,7 +272,7 @@ add_bool(void ** pp, char const * name, size_t nm_len,
  *
  * @returns the new value structure
  */
-static tOptionValue*
+static tOptionValue *
 add_number(void ** pp, char const * name, size_t nm_len,
            char const * val, size_t d_len)
 {
@@ -291,7 +291,7 @@ add_number(void ** pp, char const * name, size_t nm_len,
         new_val->v.longVal = strtol(val, 0, 0);
 
     new_val->valType = OPARG_TYPE_NUMERIC;
-    new_val->pzName  = (char*)(new_val + 1);
+    new_val->pzName  = (char *)(new_val + 1);
     memcpy(new_val->pzName, name, nm_len);
     new_val->pzName[ nm_len ] = NUL;
     addArgListEntry(pp, new_val);
@@ -309,18 +309,18 @@ add_number(void ** pp, char const * name, size_t nm_len,
  *
  * @returns the new value structure
  */
-static tOptionValue*
+static tOptionValue *
 add_nested(void ** pp, char const * name, size_t nm_len,
            char * val, size_t d_len)
 {
-    tOptionValue* new_val;
+    tOptionValue * new_val;
 
     if (d_len == 0) {
         size_t sz = nm_len + sizeof(*new_val) + 1;
         new_val = AGALOC(sz, "empty nest");
         new_val->v.nestVal = NULL;
         new_val->valType = OPARG_TYPE_HIERARCHY;
-        new_val->pzName = (char*)(new_val + 1);
+        new_val->pzName = (char *)(new_val + 1);
         memcpy(new_val->pzName, name, nm_len);
         new_val->pzName[ nm_len ] = NUL;
 
@@ -341,11 +341,11 @@ add_nested(void ** pp, char const * name, size_t nm_len,
 static char const *
 scan_name(char const * name, tOptionValue * res)
 {
-    tOptionValue* new_val;
-    char const * pzScan = name+1; /* we know first char is a name char */
-    char const * pzVal;
-    size_t       nm_len = 1;
-    size_t       d_len = 0;
+    tOptionValue * new_val;
+    char const *   pzScan = name+1; /* we know first char is a name char */
+    char const *   pzVal;
+    size_t         nm_len = 1;
+    size_t         d_len = 0;
 
     /*
      *  Scan over characters that name a value.  These names may not end
@@ -645,13 +645,13 @@ unload_arg_list(tArgList * arg_list)
     char const ** pnew_val = arg_list->apzArgs;
 
     while (ct-- > 0) {
-        tOptionValue* new_val = (tOptionValue*)(void*)(intptr_t)*(pnew_val++);
+        tOptionValue * new_val = (tOptionValue *)VOIDP(*(pnew_val++));
         if (new_val->valType == OPARG_TYPE_HIERARCHY)
             unload_arg_list(new_val->v.nestVal);
         AGFREE(new_val);
     }
 
-    AGFREE((void*)arg_list);
+    AGFREE(arg_list);
 }
 
 /*=export_func  optionUnloadNested
@@ -675,7 +675,7 @@ optionUnloadNested(tOptionValue const * opt_val)
 
     unload_arg_list(opt_val->v.nestVal);
 
-    AGFREE((void*)(intptr_t)opt_val);
+    AGFREE(opt_val);
 }
 
 /**
@@ -694,8 +694,8 @@ sort_list(tArgList * arg_list)
      */
     for (ix = 0; ++ix < lm;) {
         int iy = ix-1;
-        tOptionValue * new_v = C(tOptionValue *, (intptr_t)arg_list->apzArgs[ix]);
-        tOptionValue * old_v = C(tOptionValue *, (intptr_t)arg_list->apzArgs[iy]);
+        tOptionValue * new_v = C(tOptionValue *, arg_list->apzArgs[ix]);
+        tOptionValue * old_v = C(tOptionValue *, arg_list->apzArgs[iy]);
 
         /*
          *  For as long as the new entry precedes the "old" entry,
@@ -703,8 +703,8 @@ sort_list(tArgList * arg_list)
          *  "-1" entry.
          */
         while (strcmp(old_v->pzName, new_v->pzName) > 0) {
-            arg_list->apzArgs[iy+1] = (void*)old_v;
-            old_v = (tOptionValue*)(void*)(intptr_t)(arg_list->apzArgs[--iy]);
+            arg_list->apzArgs[iy+1] = VOIDP(old_v);
+            old_v = (tOptionValue *)VOIDP(arg_list->apzArgs[--iy]);
             if (iy < 0)
                 break;
         }
@@ -713,7 +713,7 @@ sort_list(tArgList * arg_list)
          *  Always store the pointer.  Sometimes it is redundant,
          *  but the redundancy is cheaper than a test and branch sequence.
          */
-        arg_list->apzArgs[iy+1] = (void*)new_v;
+        arg_list->apzArgs[iy+1] = VOIDP(new_v);
     }
 }
 
@@ -725,7 +725,7 @@ sort_list(tArgList * arg_list)
  * arg:   + char const * + pzName + the name for the text +
  * arg:   + size_t       + nm_len + the length of "name"  +
  *
- * ret_type:  tOptionValue*
+ * ret_type:  tOptionValue *
  * ret_desc:  An allocated, compound value structure
  *
  * doc:
@@ -746,7 +746,7 @@ sort_list(tArgList * arg_list)
 LOCAL tOptionValue *
 optionLoadNested(char const * text, char const * name, size_t nm_len)
 {
-    tOptionValue* res_val;
+    tOptionValue * res_val;
 
     /*
      *  Make sure we have some data and we have space to put what we find.
@@ -762,7 +762,7 @@ optionLoadNested(char const * text, char const * name, size_t nm_len)
     }
     res_val = AGALOC(sizeof(*res_val) + nm_len + 1, "nest args");
     res_val->valType = OPARG_TYPE_HIERARCHY;
-    res_val->pzName  = (char*)(res_val + 1);
+    res_val->pzName  = (char *)(res_val + 1);
     memcpy(res_val->pzName, name, nm_len);
     res_val->pzName[nm_len] = NUL;
 
@@ -814,8 +814,8 @@ optionLoadNested(char const * text, char const * name, size_t nm_len)
  * private:
  *
  * what:  parse a hierarchical option argument
- * arg:   + tOptions* + opts + program options descriptor +
- * arg:   + tOptDesc* + od   + the descriptor for this arg +
+ * arg:   + tOptions * + opts + program options descriptor +
+ * arg:   + tOptDesc * + od   + the descriptor for this arg +
  *
  * doc:
  *  Nested value was found on the command line
@@ -837,7 +837,7 @@ optionNestedVal(tOptions * opts, tOptDesc * od)
         av = arg_list->apzArgs;
 
         while (--ct >= 0) {
-            void * p = (void *)(intptr_t)*(av++);
+            void * p = VOIDP(*(av++));
             optionUnloadNested((tOptionValue const *)p);
         }
 
@@ -848,7 +848,7 @@ optionNestedVal(tOptions * opts, tOptDesc * od)
             od->optArg.argString, od->pz_Name, strlen(od->pz_Name));
 
         if (opt_val != NULL)
-            addArgListEntry(&(od->optCookie), (void*)opt_val);
+            addArgListEntry(&(od->optCookie), VOIDP(opt_val));
     }
 }
 
@@ -872,7 +872,7 @@ get_special_char(char const ** ppz, int * ct)
             base = 16;
             pz++;
         }
-        retch = (int)strtoul(pz, (char **)(intptr_t)&pz, base);
+        retch = (int)strtoul(pz, (char **)&pz, base);
         if (*pz != ';')
             return '&';
         base = (int)(++pz - *ppz);
diff --git a/contrib/ntp/sntp/libopts/numeric.c b/contrib/ntp/sntp/libopts/numeric.c
index 471cb936e1a9..ab8f3d1958be 100644
--- a/contrib/ntp/sntp/libopts/numeric.c
+++ b/contrib/ntp/sntp/libopts/numeric.c
@@ -10,7 +10,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -33,16 +33,16 @@
  * private:
  *
  * what:  Show info about range constraints
- * arg:   + tOptions* + pOpts     + program options descriptor  +
- * arg:   + tOptDesc* + pOptDesc  + the descriptor for this arg +
- * arg:   + void *    + rng_table + the value range tables      +
- * arg:   + int       + rng_count + the number of entries       +
+ * arg:   + tOptions * + pOpts     + program options descriptor  +
+ * arg:   + tOptDesc * + pOptDesc  + the descriptor for this arg +
+ * arg:   + void *     + rng_table + the value range tables      +
+ * arg:   + int        + rng_count + the number of entries       +
  *
  * doc:
  *   Show information about a numeric option with range constraints.
 =*/
 void
-optionShowRange(tOptions * pOpts, tOptDesc * pOD, const void * rng_table, int rng_ct)
+optionShowRange(tOptions * pOpts, tOptDesc * pOD, void * rng_table, int rng_ct)
 {
     const struct {long const rmin, rmax;} * rng = rng_table;
 
@@ -97,8 +97,8 @@ optionShowRange(tOptions * pOpts, tOptDesc * pOD, const void * rng_table, int rn
  * private:
  *
  * what:  process an option with a numeric value.
- * arg:   + tOptions* + opts + program options descriptor +
- * arg:   + tOptDesc* + od   + the descriptor for this arg +
+ * arg:   + tOptions * + opts + program options descriptor +
+ * arg:   + tOptDesc * + od   + the descriptor for this arg +
  *
  * doc:
  *  Decipher a numeric value.
@@ -106,8 +106,8 @@ optionShowRange(tOptions * pOpts, tOptDesc * pOD, const void * rng_table, int rn
 void
 optionNumericVal(tOptions * opts, tOptDesc * od)
 {
-    char* pz;
-    long  val;
+    char * pz;
+    long   val;
 
     /*
      *  Guard against all the different ways this procedure might get invoked
diff --git a/contrib/ntp/sntp/libopts/option-value-type.c b/contrib/ntp/sntp/libopts/option-value-type.c
index 08c003a8df5e..5f676408ae00 100644
--- a/contrib/ntp/sntp/libopts/option-value-type.c
+++ b/contrib/ntp/sntp/libopts/option-value-type.c
@@ -2,7 +2,7 @@
  *
  *  DO NOT EDIT THIS FILE   (stdin.c)
  *
- *  It has been AutoGen-ed  August  8, 2014 at 04:09:05 PM by AutoGen 5.18.4pre11
+ *  It has been AutoGen-ed
  *  From the definitions    stdin
  *  and the template file   str2enum
  *
@@ -31,7 +31,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "option-value-type.h"
-/* ANSI-C code produced by gperf version 3.0.3 */
+/* ANSI-C code produced by gperf version 3.0.4 */
 /* Command-line: gperf option-value-type.gp  */
 /* Computed positions: -k'1' */
 
diff --git a/contrib/ntp/sntp/libopts/option-value-type.h b/contrib/ntp/sntp/libopts/option-value-type.h
index 23b2be9cb1d6..cf6dcaadb8cf 100644
--- a/contrib/ntp/sntp/libopts/option-value-type.h
+++ b/contrib/ntp/sntp/libopts/option-value-type.h
@@ -2,7 +2,7 @@
  *
  *  DO NOT EDIT THIS FILE   (stdin.h)
  *
- *  It has been AutoGen-ed  August  8, 2014 at 04:09:05 PM by AutoGen 5.18.4pre11
+ *  It has been AutoGen-ed
  *  From the definitions    stdin
  *  and the template file   str2enum
  *
diff --git a/contrib/ntp/sntp/libopts/option-xat-attribute.c b/contrib/ntp/sntp/libopts/option-xat-attribute.c
index cc5f4f133c3d..be86041fd816 100644
--- a/contrib/ntp/sntp/libopts/option-xat-attribute.c
+++ b/contrib/ntp/sntp/libopts/option-xat-attribute.c
@@ -2,7 +2,7 @@
  *
  *  DO NOT EDIT THIS FILE   (stdin.c)
  *
- *  It has been AutoGen-ed  August  8, 2014 at 04:09:04 PM by AutoGen 5.18.4pre11
+ *  It has been AutoGen-ed
  *  From the definitions    stdin
  *  and the template file   str2enum
  *
@@ -31,7 +31,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "option-xat-attribute.h"
-/* ANSI-C code produced by gperf version 3.0.3 */
+/* ANSI-C code produced by gperf version 3.0.4 */
 /* Command-line: gperf option-xat-attribute.gp  */
 /* Computed positions: -k'1' */
 
diff --git a/contrib/ntp/sntp/libopts/option-xat-attribute.h b/contrib/ntp/sntp/libopts/option-xat-attribute.h
index d2c19c792301..dde1617a445d 100644
--- a/contrib/ntp/sntp/libopts/option-xat-attribute.h
+++ b/contrib/ntp/sntp/libopts/option-xat-attribute.h
@@ -2,7 +2,7 @@
  *
  *  DO NOT EDIT THIS FILE   (stdin.h)
  *
- *  It has been AutoGen-ed  August  8, 2014 at 04:09:04 PM by AutoGen 5.18.4pre11
+ *  It has been AutoGen-ed
  *  From the definitions    stdin
  *  and the template file   str2enum
  *
diff --git a/contrib/ntp/sntp/libopts/parse-duration.c b/contrib/ntp/sntp/libopts/parse-duration.c
index 2536a06a00f7..e072b7d567f5 100644
--- a/contrib/ntp/sntp/libopts/parse-duration.c
+++ b/contrib/ntp/sntp/libopts/parse-duration.c
@@ -1,5 +1,5 @@
 /* Parse a time duration and return a seconds count
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 Free Software Foundation, Inc.
    Written by Bruce Korb , 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -60,14 +60,14 @@ typedef enum {
 static unsigned long
 str_const_to_ul (cch_t * str, cch_t ** ppz, int base)
 {
-  return strtoul (str, (char **)(intptr_t)ppz, base);
+  return strtoul (str, (char **)ppz, base);
 }
 
 /* Wrapper around strtol that does not require a cast.  */
 static long
 str_const_to_l (cch_t * str, cch_t ** ppz, int base)
 {
-  return strtol (str, (char **)(intptr_t)ppz, base);
+  return strtol (str, (char **)ppz, base);
 }
 
 /* Returns BASE + VAL * SCALE, interpreting BASE = BAD_TIME
diff --git a/contrib/ntp/sntp/libopts/parse-duration.h b/contrib/ntp/sntp/libopts/parse-duration.h
index da7301e1cebe..33ddc3366e9f 100644
--- a/contrib/ntp/sntp/libopts/parse-duration.h
+++ b/contrib/ntp/sntp/libopts/parse-duration.h
@@ -1,5 +1,5 @@
 /* Parse a time duration and return a seconds count
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 Free Software Foundation, Inc.
    Written by Bruce Korb , 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/ntp/sntp/libopts/pgusage.c b/contrib/ntp/sntp/libopts/pgusage.c
index a385b4d999a8..3d229c18d058 100644
--- a/contrib/ntp/sntp/libopts/pgusage.c
+++ b/contrib/ntp/sntp/libopts/pgusage.c
@@ -13,7 +13,7 @@
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -33,7 +33,7 @@
  */
 
 #if defined(HAVE_WORKING_FORK)
-static FILE *
+static inline FILE *
 open_tmp_usage(char ** buf)
 {
     char * bf;
@@ -64,7 +64,7 @@ open_tmp_usage(char ** buf)
     }
 }
 
-static char *
+static inline char *
 mk_pager_cmd(char const * fname)
 {
     /*
@@ -85,10 +85,10 @@ mk_pager_cmd(char const * fname)
         if (pager == NULL)
             pager = MORE_STR;
 
-        bfsz = strlen(fname) + strlen(pager) + PAGE_USAGE_FMT_LEN;
+        bfsz = 2 * strlen(fname) + strlen(pager) + PAGE_USAGE_FMT_LEN;
         res  = AGALOC(bfsz, "more cmd");
         snprintf(res, bfsz, PAGE_USAGE_FMT, pager, fname);
-        AGFREE((void*)(intptr_t)fname);
+        AGFREE(fname);
         return res;
     }
 }
diff --git a/contrib/ntp/sntp/libopts/proto.h b/contrib/ntp/sntp/libopts/proto.h
index 3275ea1d0f6f..a78b794fc6a5 100644
--- a/contrib/ntp/sntp/libopts/proto.h
+++ b/contrib/ntp/sntp/libopts/proto.h
@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro:
  *
  * Prototypes for autoopts
- * Generated Fri Aug  8 16:09:18 PDT 2014
+ * Generated Sat Apr 25 09:53:18 PDT 2015
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
@@ -65,7 +65,7 @@ static tSuccess
 opt_find_long(tOptions * opts, char const * opt_name, tOptState * state);
 
 static tSuccess
-opt_find_short(tOptions* pOpts, uint_t optValue, tOptState* pOptState);
+opt_find_short(tOptions * pOpts, uint_t optValue, tOptState * pOptState);
 
 static tSuccess
 get_opt_arg(tOptions * opts, tOptState * o_st);
diff --git a/contrib/ntp/sntp/libopts/putshell.c b/contrib/ntp/sntp/libopts/putshell.c
index 4b0fa10a13fb..9bfa984da67d 100644
--- a/contrib/ntp/sntp/libopts/putshell.c
+++ b/contrib/ntp/sntp/libopts/putshell.c
@@ -12,7 +12,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -296,7 +296,7 @@ print_membership(tOptions * pOpts, tOptDesc * pOD)
     uintptr_t val = 1;
     printf(zOptNumFmt, pOpts->pzPROGNAME, pOD->pz_NAME,
            (int)(uintptr_t)(pOD->optCookie));
-    pOD->optCookie = (void*)(uintptr_t)~0UL;
+    pOD->optCookie = VOIDP(~0UL);
     (*(pOD->pOptProc))(OPTPROC_RETURN_VALNAME, pOD);
 
     pz = pOD->optArg.argString;
@@ -323,7 +323,7 @@ print_membership(tOptions * pOpts, tOptDesc * pOD)
 static void
 print_stacked_arg(tOptions * pOpts, tOptDesc * pOD)
 {
-    tArgList*       pAL = (tArgList*)pOD->optCookie;
+    tArgList *      pAL = (tArgList *)pOD->optCookie;
     char const **   ppz = pAL->apzArgs;
     int             ct  = pAL->useCt;
 
@@ -363,19 +363,19 @@ print_reordering(tOptions * opts)
 /*=export_func  optionPutShell
  * what:  write a portable shell script to parse options
  * private:
- * arg:   tOptions*, pOpts, the program options descriptor
+ * arg:   tOptions *, pOpts, the program options descriptor
  * doc:   This routine will emit portable shell script text for parsing
  *        the options described in the option definitions.
 =*/
 void
-optionPutShell(tOptions* pOpts)
+optionPutShell(tOptions * pOpts)
 {
     int  optIx = 0;
 
     printf(zOptCtFmt, pOpts->curOptIdx-1);
 
     do  {
-        tOptDesc* pOD = pOpts->pOptDesc + optIx;
+        tOptDesc * pOD = pOpts->pOptDesc + optIx;
 
         if ((pOD->fOptState & OPTST_NO_OUTPUT_MASK) != 0)
             continue;
@@ -396,7 +396,7 @@ optionPutShell(tOptions* pOpts)
          *  but copy over the set-state bits.
          */
         if (pOD->optActualIndex != optIx) {
-            tOptDesc* p   = pOpts->pOptDesc + pOD->optActualIndex;
+            tOptDesc * p  = pOpts->pOptDesc + pOD->optActualIndex;
             p->optArg     = pOD->optArg;
             p->fOptState &= OPTST_PERSISTENT_MASK;
             p->fOptState |= pOD->fOptState & ~OPTST_PERSISTENT_MASK;
diff --git a/contrib/ntp/sntp/libopts/reset.c b/contrib/ntp/sntp/libopts/reset.c
index 1e959a1e4ce7..6ca2c05229db 100644
--- a/contrib/ntp/sntp/libopts/reset.c
+++ b/contrib/ntp/sntp/libopts/reset.c
@@ -10,7 +10,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -30,7 +30,7 @@
  */
 
 static void
-optionReset( tOptions* pOpts, tOptDesc* pOD )
+optionReset(tOptions * pOpts, tOptDesc * pOD)
 {
     pOD->fOptState &= OPTST_PERSISTENT_MASK;
     pOD->fOptState |= OPTST_RESET;
@@ -63,8 +63,8 @@ optionResetEverything(tOptions * pOpts)
  * private:
  *
  * what:  Reset the value of an option
- * arg:   + tOptions* + pOpts    + program options descriptor  +
- * arg:   + tOptDesc* + pOptDesc + the descriptor for this arg +
+ * arg:   + tOptions * + pOpts    + program options descriptor  +
+ * arg:   + tOptDesc * + pOptDesc + the descriptor for this arg +
  *
  * doc:
  *  This code will cause another option to be reset to its initial state.
@@ -113,7 +113,7 @@ optionResetOpt(tOptions * pOpts, tOptDesc * pOD)
             assert(0 == 1);
         }
     } else {
-        succ = opt_find_long(pOpts, (char *)(intptr_t)pzArg, &opt_state);
+        succ = opt_find_long(pOpts, (char *)pzArg, &opt_state);
         if (! SUCCESSFUL(succ)) {
             fprintf(stderr, zIllOptStr, pOpts->pzProgPath, pzArg);
             pOpts->pUsageProc(pOpts, EXIT_FAILURE);
diff --git a/contrib/ntp/sntp/libopts/restore.c b/contrib/ntp/sntp/libopts/restore.c
index f711cb3adfc1..02ef14aeba38 100644
--- a/contrib/ntp/sntp/libopts/restore.c
+++ b/contrib/ntp/sntp/libopts/restore.c
@@ -12,7 +12,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -38,11 +38,11 @@
  *  have been marked as allocated though.
  */
 static void
-fixupSavedOptionArgs(tOptions* pOpts)
+fixupSavedOptionArgs(tOptions * pOpts)
 {
-    tOptions* p   = pOpts->pSavedState;
-    tOptDesc* pOD = pOpts->pOptDesc;
-    int       ct  = pOpts->optCt;
+    tOptions * p   = pOpts->pSavedState;
+    tOptDesc * pOD = pOpts->pOptDesc;
+    int        ct  = pOpts->optCt;
 
     /*
      *  Make sure that allocated stuff is only referenced in the
@@ -52,18 +52,18 @@ fixupSavedOptionArgs(tOptions* pOpts)
         switch (OPTST_GET_ARGTYPE(pOD->fOptState)) {
         case OPARG_TYPE_STRING:
             if (pOD->fOptState & OPTST_STACKED) {
-                tOptDesc* q = p->pOptDesc + (pOD - pOpts->pOptDesc);
+                tOptDesc * q = p->pOptDesc + (pOD - pOpts->pOptDesc);
                 q->optCookie = NULL;
             }
             if (pOD->fOptState & OPTST_ALLOC_ARG) {
-                tOptDesc* q = p->pOptDesc + (pOD - pOpts->pOptDesc);
+                tOptDesc * q = p->pOptDesc + (pOD - pOpts->pOptDesc);
                 AGDUPSTR(q->optArg.argString, pOD->optArg.argString, "arg");
             }
             break;
 
         case OPARG_TYPE_HIERARCHY:
         {
-            tOptDesc* q = p->pOptDesc + (pOD - pOpts->pOptDesc);
+            tOptDesc * q = p->pOptDesc + (pOD - pOpts->pOptDesc);
             q->optCookie = NULL;
         }
         }
@@ -73,7 +73,7 @@ fixupSavedOptionArgs(tOptions* pOpts)
 /*=export_func optionSaveState
  *
  * what:  saves the option state to memory
- * arg:   tOptions*, pOpts, program options descriptor
+ * arg:   tOptions *, pOpts, program options descriptor
  *
  * doc:
  *
@@ -96,7 +96,7 @@ fixupSavedOptionArgs(tOptions* pOpts)
 void
 optionSaveState(tOptions * pOpts)
 {
-    tOptions * p = (tOptions*)pOpts->pSavedState;
+    tOptions * p = (tOptions *)pOpts->pSavedState;
 
     if (p == NULL) {
         size_t sz = sizeof(*pOpts)
@@ -116,7 +116,7 @@ optionSaveState(tOptions * pOpts)
 /*=export_func optionRestore
  *
  * what:  restore option state from memory copy
- * arg:   tOptions*, pOpts, program options descriptor
+ * arg:   tOptions *, pOpts, program options descriptor
  *
  * doc:  Copy back the option state from saved memory.
  *       The allocated memory is left intact, so this routine can be
@@ -129,9 +129,9 @@ optionSaveState(tOptions * pOpts)
  *       printed to @code{stderr} and exit is called.
 =*/
 void
-optionRestore(tOptions* pOpts)
+optionRestore(tOptions * pOpts)
 {
-    tOptions* p = (tOptions*)pOpts->pSavedState;
+    tOptions * p = (tOptions *)pOpts->pSavedState;
 
     if (p == NULL) {
         char const * pzName = pOpts->pzProgName;
@@ -159,7 +159,7 @@ optionRestore(tOptions* pOpts)
 /*=export_func optionFree
  *
  * what:  free allocated option processing memory
- * arg:   tOptions*, pOpts, program options descriptor
+ * arg:   tOptions *, pOpts, program options descriptor
  *
  * doc:   AutoOpts sometimes allocates memory and puts pointers to it in the
  *        option state structures.  This routine deallocates all such memory.
@@ -168,11 +168,11 @@ optionRestore(tOptions* pOpts)
  *        this routine is always successful.
 =*/
 void
-optionFree(tOptions* pOpts)
+optionFree(tOptions * pOpts)
 {
  free_saved_state:
     {
-        tOptDesc* p = pOpts->pOptDesc;
+        tOptDesc * p = pOpts->pOptDesc;
         int ct = pOpts->optCt;
         do  {
             if (p->fOptState & OPTST_ALLOC_ARG) {
@@ -204,7 +204,7 @@ optionFree(tOptions* pOpts)
         } while (p++, --ct > 0);
     }
     if (pOpts->pSavedState != NULL) {
-        tOptions * p = (tOptions*)pOpts->pSavedState;
+        tOptions * p = (tOptions *)pOpts->pSavedState;
         memcpy(pOpts, p, sizeof(*p));
         memcpy(pOpts->pOptDesc, p+1, (size_t)p->optCt * sizeof(tOptDesc));
         AGFREE(pOpts->pSavedState);
diff --git a/contrib/ntp/sntp/libopts/save.c b/contrib/ntp/sntp/libopts/save.c
index dd51d6055f76..f462ced8c65d 100644
--- a/contrib/ntp/sntp/libopts/save.c
+++ b/contrib/ntp/sntp/libopts/save.c
@@ -12,7 +12,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -92,7 +92,7 @@ find_dir_name(tOptions * opts, int * p_free)
      *  we can stash the RC (INI) file.
      */
     {
-        char const * const* papz = opts->papzHomeList;
+        char const * const * papz = opts->papzHomeList;
         if (papz == NULL)
             return NULL;
 
@@ -216,7 +216,7 @@ find_file_name(tOptions * opts, int * p_free_name)
         size_t sz = strlen(pzDir) + strlen(opts->pzRcName) + 2;
 
         {
-            char * pzPath = (char*)AGALOC(sz, "file name");
+            char * pzPath = (char *)AGALOC(sz, "file name");
 #ifdef HAVE_SNPRINTF
             snprintf(pzPath, sz, "%s/%s", pzDir, opts->pzRcName);
 #else
@@ -306,7 +306,7 @@ prt_entry(FILE * fp, tOptDesc * od, char const * l_arg)
      *  THEN the char pointer is really the number
      */
     if (OPTST_GET_ARGTYPE(od->fOptState) == OPARG_TYPE_NUMERIC)
-        fprintf(fp, "%d", (int)(t_word)l_arg);
+        fprintf(fp, "%d", (int)(intptr_t)l_arg);
 
     else {
         for (;;) {
@@ -453,7 +453,7 @@ prt_val_list(FILE * fp, char const * name, tArgList * al)
     if (al == NULL)
         return;
     opt_ct   = al->useCt;
-    opt_list = (void **)(intptr_t)al->apzArgs;
+    opt_list = (void **)al->apzArgs;
 
     if (opt_ct <= 0) {
         fprintf(fp, OPEN_CLOSE_FMT, name);
@@ -488,7 +488,7 @@ prt_nested(FILE * fp, tOptDesc * p)
         return;
 
     opt_ct   = al->useCt;
-    opt_list = (void **)(intptr_t)al->apzArgs;
+    opt_list = (void **)al->apzArgs;
 
     if (opt_ct <= 0)
         return;
@@ -560,7 +560,7 @@ open_sv_file(tOptions * opts)
          *  normally point to static data that is overwritten by each call.
          *  The test to detect allocated ctime, so we leak the memory.
          */
-        AGFREE((void*)time_str);
+        AGFREE(time_str);
 #endif
     }
 
@@ -596,7 +596,7 @@ static void
 prt_str_arg(FILE * fp, tOptDesc * pOD)
 {
     if (pOD->fOptState & OPTST_STACKED) {
-        tArgList * pAL = (tArgList*)pOD->optCookie;
+        tArgList * pAL = (tArgList *)pOD->optCookie;
         int        uct = pAL->useCt;
         char const ** ppz = pAL->apzArgs;
 
@@ -629,7 +629,7 @@ prt_enum_arg(FILE * fp, tOptDesc * od)
      *  bit flag values back into a string suitable for printing.
      */
     (*(od->pOptProc))(OPTPROC_RETURN_VALNAME, od);
-    prt_entry(fp, od, (void*)(intptr_t)(od->optArg.argString));
+    prt_entry(fp, od, VOIDP(od->optArg.argString));
 
     od->optArg.argEnum = val;
 }
@@ -689,7 +689,7 @@ prt_file_arg(FILE * fp, tOptDesc * od, tOptions * opts)
  *
  * what:  saves the option state to a file
  *
- * arg:   tOptions*,   opts,  program options descriptor
+ * arg:   tOptions *,   opts,  program options descriptor
  *
  * doc:
  *
@@ -765,7 +765,7 @@ optionSaveFile(tOptions * opts)
             break;
 
         case OPARG_TYPE_NUMERIC:
-            prt_entry(fp, p, (void*)(p->optArg.argInt));
+            prt_entry(fp, p, VOIDP(p->optArg.argInt));
             break;
 
         case OPARG_TYPE_STRING:
diff --git a/contrib/ntp/sntp/libopts/sort.c b/contrib/ntp/sntp/libopts/sort.c
index 894d0ecf58eb..da0033431aff 100644
--- a/contrib/ntp/sntp/libopts/sort.c
+++ b/contrib/ntp/sntp/libopts/sort.c
@@ -10,7 +10,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -198,11 +198,11 @@ optionSort(tOptions * opts)
     /*
      *  Make sure we can allocate two full-sized arg vectors.
      */
-    opt_txt = malloc(opts->origArgCt * sizeof(char*));
+    opt_txt = malloc(opts->origArgCt * sizeof(char *));
     if (opt_txt == NULL)
         goto exit_no_mem;
 
-    ppzOpds = malloc(opts->origArgCt * sizeof(char*));
+    ppzOpds = malloc(opts->origArgCt * sizeof(char *));
     if (ppzOpds == NULL) {
         free(opt_txt);
         goto exit_no_mem;
@@ -315,10 +315,10 @@ optionSort(tOptions * opts)
  joinLists:
     if (optsIdx > 0)
         memcpy(opts->origArgVect + 1, opt_txt,
-               (size_t)optsIdx * sizeof(char*));
+               (size_t)optsIdx * sizeof(char *));
     if (opdsIdx > 0)
         memcpy(opts->origArgVect + 1 + optsIdx, ppzOpds,
-               (size_t)opdsIdx * sizeof(char*));
+               (size_t)opdsIdx * sizeof(char *));
 
  freeTemps:
     free(opt_txt);
diff --git a/contrib/ntp/sntp/libopts/stack.c b/contrib/ntp/sntp/libopts/stack.c
index d2ce165adb88..affe6b661fd5 100644
--- a/contrib/ntp/sntp/libopts/stack.c
+++ b/contrib/ntp/sntp/libopts/stack.c
@@ -11,7 +11,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -38,8 +38,8 @@
  * private:
  *
  * what:  Remove option args from a stack
- * arg:   + tOptions* + opts + program options descriptor +
- * arg:   + tOptDesc* + od   + the descriptor for this arg +
+ * arg:   + tOptions * + opts + program options descriptor +
+ * arg:   + tOptDesc * + od   + the descriptor for this arg +
  *
  * doc:
  *  Invoked for options that are equivalenced to stacked options.
@@ -52,7 +52,7 @@ optionUnstackArg(tOptions * opts, tOptDesc * od)
     if (INQUERY_CALL(opts, od))
         return;
 
-    arg_list = (tArgList*)od->optCookie;
+    arg_list = (tArgList *)od->optCookie;
 
     /*
      *  IF we don't have any stacked options,
@@ -165,7 +165,7 @@ optionUnstackArg(tOptions * opts, tOptDesc * od)
         od->fOptState &= OPTST_PERSISTENT_MASK;
         if ((od->fOptState & OPTST_INITENABLED) == 0)
             od->fOptState |= OPTST_DISABLED;
-        AGFREE((void *)arg_list);
+        AGFREE(arg_list);
         od->optCookie = NULL;
     }
 }
@@ -179,19 +179,19 @@ optionUnstackArg(tOptions * opts, tOptDesc * od)
 LOCAL void
 addArgListEntry(void ** ppAL, void * entry)
 {
-    tArgList* pAL = *(void**)ppAL;
+    tArgList * pAL = *(void **)ppAL;
 
     /*
      *  IF we have never allocated one of these,
      *  THEN allocate one now
      */
     if (pAL == NULL) {
-        pAL = (tArgList*)AGALOC(sizeof(*pAL), "new option arg stack");
+        pAL = (tArgList *)AGALOC(sizeof(*pAL), "new option arg stack");
         if (pAL == NULL)
             return;
         pAL->useCt   = 0;
         pAL->allocCt = MIN_ARG_ALLOC_CT;
-        *ppAL = (void*)pAL;
+        *ppAL = VOIDP(pAL);
     }
 
     /*
@@ -206,11 +206,11 @@ addArgListEntry(void ** ppAL, void * entry)
          *  The base structure contains space for MIN_ARG_ALLOC_CT
          *  pointers.  We subtract it off to find our augment size.
          */
-        sz += sizeof(char*) * ((size_t)pAL->allocCt - MIN_ARG_ALLOC_CT);
-        pAL = (tArgList*)AGREALOC((void*)pAL, sz, "expanded opt arg stack");
+        sz += sizeof(char *) * ((size_t)pAL->allocCt - MIN_ARG_ALLOC_CT);
+        pAL = (tArgList *)AGREALOC(VOIDP(pAL), sz, "expanded opt arg stack");
         if (pAL == NULL)
             return;
-        *ppAL = (void*)pAL;
+        *ppAL = VOIDP(pAL);
     }
 
     /*
@@ -224,8 +224,8 @@ addArgListEntry(void ** ppAL, void * entry)
  * private:
  *
  * what:  put option args on a stack
- * arg:   + tOptions* + opts + program options descriptor +
- * arg:   + tOptDesc* + od   + the descriptor for this arg +
+ * arg:   + tOptions * + opts + program options descriptor +
+ * arg:   + tOptDesc * + od   + the descriptor for this arg +
  *
  * doc:
  *  Keep an entry-ordered list of option arguments.
@@ -239,7 +239,7 @@ optionStackArg(tOptions * opts, tOptDesc * od)
         return;
 
     if ((od->fOptState & OPTST_RESET) != 0) {
-        tArgList * arg_list = (void*)od->optCookie;
+        tArgList * arg_list = od->optCookie;
         int ix;
         if (arg_list == NULL)
             return;
@@ -254,7 +254,7 @@ optionStackArg(tOptions * opts, tOptDesc * od)
             return;
 
         AGDUPSTR(pz, od->optArg.argString, "stack arg");
-        addArgListEntry(&(od->optCookie), (void*)pz);
+        addArgListEntry(&(od->optCookie), VOIDP(pz));
     }
 }
 /** @}
diff --git a/contrib/ntp/sntp/libopts/stdnoreturn.in.h b/contrib/ntp/sntp/libopts/stdnoreturn.in.h
index d4ae183ce6c0..5b4d11bb3b0a 100644
--- a/contrib/ntp/sntp/libopts/stdnoreturn.in.h
+++ b/contrib/ntp/sntp/libopts/stdnoreturn.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C11 .
 
-   Copyright 2012-2014 Free Software Foundation, Inc.
+   Copyright 2012-2015 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/contrib/ntp/sntp/libopts/streqvcmp.c b/contrib/ntp/sntp/libopts/streqvcmp.c
index 371d7f4f0cfd..e87a232d199d 100644
--- a/contrib/ntp/sntp/libopts/streqvcmp.c
+++ b/contrib/ntp/sntp/libopts/streqvcmp.c
@@ -15,7 +15,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -81,9 +81,9 @@ static unsigned char charmap[] = {
  *
  * what: compare two strings with an equivalence mapping
  *
- * arg:  + char const* + str1 + first string +
- * arg:  + char const* + str2 + second string +
- * arg:  + int         + ct   + compare length +
+ * arg:  + char const * + str1 + first string +
+ * arg:  + char const * + str2 + second string +
+ * arg:  + int          + ct   + compare length +
  *
  * ret_type:  int
  * ret_desc:  the difference between two differing characters
@@ -129,8 +129,8 @@ strneqvcmp(char const * s1, char const * s2, int ct)
  *
  * what: compare two strings with an equivalence mapping
  *
- * arg:  + char const* + str1 + first string +
- * arg:  + char const* + str2 + second string +
+ * arg:  + char const * + str1 + first string +
+ * arg:  + char const * + str2 + second string +
  *
  * ret_type:  int
  * ret_desc:  the difference between two differing characters
@@ -226,7 +226,7 @@ streqvmap(char from, char to, int ct)
  *
  * what: map a list of characters to the same value
  *
- * arg:  + char const* + ch_list + characters to equivalence +
+ * arg:  + char const * + ch_list + characters to equivalence +
  *
  * doc:
  *
@@ -238,7 +238,7 @@ streqvmap(char from, char to, int ct)
  * err:  none.
 =*/
 void
-strequate(char const* s)
+strequate(char const * s)
 {
     if ((s != NULL) && (*s != NUL)) {
         unsigned char equiv = (unsigned char)*s;
@@ -252,8 +252,8 @@ strequate(char const* s)
  *
  * what: convert a string into its mapped-to value
  *
- * arg:  + char*       + dest + output string +
- * arg:  + char const* + src  + input string +
+ * arg:  + char *       + dest + output string +
+ * arg:  + char const * + src  + input string +
  *
  * doc:
  *
@@ -267,7 +267,7 @@ strequate(char const* s)
  * err:  none.
 =*/
 void
-strtransform(char* d, char const* s)
+strtransform(char * d, char const * s)
 {
     do  {
         *(d++) = (char)charmap[(unsigned char)*s];
diff --git a/contrib/ntp/sntp/libopts/text_mmap.c b/contrib/ntp/sntp/libopts/text_mmap.c
index f30e71c6c9c3..07c0bf10ebc3 100644
--- a/contrib/ntp/sntp/libopts/text_mmap.c
+++ b/contrib/ntp/sntp/libopts/text_mmap.c
@@ -9,7 +9,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -61,7 +61,7 @@
 #define FILE_WRITABLE(_prt,_flg) \
         (   (_prt & PROT_WRITE) \
          && ((_flg & (MAP_SHARED|MAP_PRIVATE)) == MAP_SHARED))
-#define MAP_FAILED_PTR ((void*)MAP_FAILED)
+#define MAP_FAILED_PTR (VOIDP(MAP_FAILED))
 
 /**
  * Load the contents of a text file.  There are two separate implementations,
@@ -93,7 +93,7 @@ load_text_file(tmap_info_t * mapinfo, char const * pzFile)
 
     {
         size_t sz = mapinfo->txt_size;
-        char*  pz = mapinfo->txt_data;
+        char * pz = mapinfo->txt_data;
 
         while (sz > 0) {
             ssize_t rdct = read(mapinfo->txt_fd, pz, sz);
@@ -254,12 +254,12 @@ close_mmap_files(tmap_info_t * mi)
  *
  * what:  map a text file with terminating NUL
  *
- * arg:   char const*,  pzFile,  name of the file to map
- * arg:   int,          prot,    mmap protections (see mmap(2))
- * arg:   int,          flags,   mmap flags (see mmap(2))
- * arg:   tmap_info_t*, mapinfo, returned info about the mapping
+ * arg:   char const *,  pzFile,  name of the file to map
+ * arg:   int,           prot,    mmap protections (see mmap(2))
+ * arg:   int,           flags,   mmap flags (see mmap(2))
+ * arg:   tmap_info_t *, mapinfo, returned info about the mapping
  *
- * ret-type:   void*
+ * ret-type:   void *
  * ret-desc:   The mmaped data address
  *
  * doc:
@@ -296,7 +296,7 @@ close_mmap_files(tmap_info_t * mi)
  * #include 
  * tmap_info_t mi;
  * int no_nul;
- * void* data = text_mmap("file", PROT_WRITE, MAP_PRIVATE, &mi);
+ * void * data = text_mmap("file", PROT_WRITE, MAP_PRIVATE, &mi);
  * if (data == MAP_FAILED) return;
  * no_nul = (mi.txt_size == mi.txt_full_size);
  * << use the data >>
@@ -327,7 +327,7 @@ text_mmap(char const * pzFile, int prot, int flags, tmap_info_t * mi)
  *
  * what:  unmap the data mapped in by text_mmap
  *
- * arg:   tmap_info_t*, mapinfo, info about the mapping
+ * arg:   tmap_info_t *, mapinfo, info about the mapping
  *
  * ret-type:   int
  * ret-desc:   -1 or 0.  @code{errno} will have the error code.
diff --git a/contrib/ntp/sntp/libopts/time.c b/contrib/ntp/sntp/libopts/time.c
index 517d5b199a4f..62e07541e54a 100644
--- a/contrib/ntp/sntp/libopts/time.c
+++ b/contrib/ntp/sntp/libopts/time.c
@@ -8,7 +8,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -31,8 +31,8 @@
  * private:
  *
  * what:  process an option with a time duration.
- * arg:   + tOptions* + opts + program options descriptor +
- * arg:   + tOptDesc* + od   + the descriptor for this arg +
+ * arg:   + tOptions * + opts + program options descriptor +
+ * arg:   + tOptDesc * + od   + the descriptor for this arg +
  *
  * doc:
  *  Decipher a time duration value.
@@ -64,8 +64,8 @@ optionTimeVal(tOptions * opts, tOptDesc * od)
  * private:
  *
  * what:  process an option with a time and date.
- * arg:   + tOptions* + opts + program options descriptor +
- * arg:   + tOptDesc* + od   + the descriptor for this arg +
+ * arg:   + tOptions * + opts + program options descriptor +
+ * arg:   + tOptDesc * + od   + the descriptor for this arg +
  *
  * doc:
  *  Decipher a time and date value.
diff --git a/contrib/ntp/sntp/libopts/tokenize.c b/contrib/ntp/sntp/libopts/tokenize.c
index a0db4cb8072a..cbff7fba47df 100644
--- a/contrib/ntp/sntp/libopts/tokenize.c
+++ b/contrib/ntp/sntp/libopts/tokenize.c
@@ -9,7 +9,7 @@
  *  This file defines the string_tokenize interface
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -36,20 +36,20 @@
 
 /* = = = START-STATIC-FORWARD = = = */
 static void
-copy_cooked(ch_t** ppDest, char const ** ppSrc);
+copy_cooked(ch_t ** ppDest, char const ** ppSrc);
 
 static void
-copy_raw(ch_t** ppDest, char const ** ppSrc);
+copy_raw(ch_t ** ppDest, char const ** ppSrc);
 
 static token_list_t *
 alloc_token_list(char const * str);
 /* = = = END-STATIC-FORWARD = = = */
 
 static void
-copy_cooked(ch_t** ppDest, char const ** ppSrc)
+copy_cooked(ch_t ** ppDest, char const ** ppSrc)
 {
-    ch_t* pDest = (ch_t*)*ppDest;
-    const ch_t* pSrc  = (const ch_t*)(*ppSrc + 1);
+    ch_t * pDest = (ch_t *)*ppDest;
+    const ch_t * pSrc  = (const ch_t *)(*ppSrc + 1);
 
     for (;;) {
         ch_t ch = *(pSrc++);
@@ -57,7 +57,7 @@ copy_cooked(ch_t** ppDest, char const ** ppSrc)
         case NUL:   *ppSrc = NULL; return;
         case '"':   goto done;
         case '\\':
-            pSrc += ao_string_cook_escape_char((char*)(intptr_t)pSrc, (char*)(intptr_t)&ch, 0x7F);
+            pSrc += ao_string_cook_escape_char((char *)pSrc, (char *)&ch, 0x7F);
             if (ch == 0x7F)
                 break;
             /* FALLTHROUGH */
@@ -68,16 +68,16 @@ copy_cooked(ch_t** ppDest, char const ** ppSrc)
     }
 
  done:
-    *ppDest = (ch_t*)pDest; /* next spot for storing character */
+    *ppDest = (ch_t *)pDest; /* next spot for storing character */
     *ppSrc  = (char const *)pSrc;  /* char following closing quote    */
 }
 
 
 static void
-copy_raw(ch_t** ppDest, char const ** ppSrc)
+copy_raw(ch_t ** ppDest, char const ** ppSrc)
 {
-    ch_t* pDest = *ppDest;
-    cc_t* pSrc  = (cc_t*) (*ppSrc + 1);
+    ch_t * pDest = *ppDest;
+    cc_t * pSrc  = (cc_t *) (*ppSrc + 1);
 
     for (;;) {
         ch_t ch = *(pSrc++);
@@ -151,12 +151,12 @@ alloc_token_list(char const * str)
         } while (*pz != NUL);
 
         res = malloc(sizeof(*res) + (size_t)(pz - str)
-                     + ((size_t)max_token_ct * sizeof(ch_t*)));
+                     + ((size_t)max_token_ct * sizeof(ch_t *)));
     }
 
     if (res == NULL)
         errno = ENOMEM;
-    else res->tkn_list[0] = (ch_t*)(res->tkn_list + (max_token_ct - 1));
+    else res->tkn_list[0] = (ch_t *)(res->tkn_list + (max_token_ct - 1));
 
     return res;
 
@@ -170,9 +170,9 @@ alloc_token_list(char const * str)
  *
  * what: tokenize an input string
  *
- * arg:  + char const* + string + string to be tokenized +
+ * arg:  + char const * + string + string to be tokenized +
  *
- * ret_type:  token_list_t*
+ * ret_type:  token_list_t *
  * ret_desc:  pointer to a structure that lists each token
  *
  * doc:
@@ -213,7 +213,7 @@ alloc_token_list(char const * str)
  * @example
  *    #include 
  *    int ix;
- *    token_list_t* ptl = ao_string_tokenize(some_string)
+ *    token_list_t * ptl = ao_string_tokenize(some_string)
  *    for (ix = 0; ix < ptl->tkn_ct; ix++)
  *       do_something_with_tkn(ptl->tkn_list[ix]);
  *    free(ptl);
@@ -231,11 +231,11 @@ alloc_token_list(char const * str)
  *  @code{ENOMEM} - There is not enough memory.
  *  @end itemize
 =*/
-token_list_t*
-ao_string_tokenize(char const* str)
+token_list_t *
+ao_string_tokenize(char const * str)
 {
-    token_list_t* res = alloc_token_list(str);
-    ch_t* pzDest;
+    token_list_t * res = alloc_token_list(str);
+    ch_t * pzDest;
 
     /*
      *  Now copy each token into the output buffer.
@@ -243,7 +243,7 @@ ao_string_tokenize(char const* str)
     if (res == NULL)
         return res;
 
-    pzDest = (ch_t*)(res->tkn_list[0]);
+    pzDest = (ch_t *)(res->tkn_list[0]);
     res->tkn_ct  = 0;
 
     do  {
@@ -304,15 +304,15 @@ ao_string_tokenize(char const* str)
 #include 
 
 int
-main(int argc, char** argv)
+main(int argc, char ** argv)
 {
     if (argc == 1) {
         printf("USAGE:  %s arg [ ... ]\n", *argv);
         return 1;
     }
     while (--argc > 0) {
-        char* arg = *(++argv);
-        token_list_t* p = ao_string_tokenize(arg);
+        char * arg = *(++argv);
+        token_list_t * p = ao_string_tokenize(arg);
         if (p == NULL) {
             printf("Parsing string ``%s'' failed:\n\terrno %d (%s)\n",
                    arg, errno, strerror(errno));
diff --git a/contrib/ntp/sntp/libopts/usage.c b/contrib/ntp/sntp/libopts/usage.c
index bb33b35ac460..c652da7f0bce 100644
--- a/contrib/ntp/sntp/libopts/usage.c
+++ b/contrib/ntp/sntp/libopts/usage.c
@@ -18,7 +18,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -240,7 +240,7 @@ skip_misuse_usage(tOptions * pOpts)
 /*=export_func  optionOnlyUsage
  *
  * what:  Print usage text for just the options
- * arg:   + tOptions*   + pOpts    + program options descriptor +
+ * arg:   + tOptions *  + pOpts    + program options descriptor +
  * arg:   + int         + ex_code  + exit code for calling exit(3) +
  *
  * doc:
@@ -553,8 +553,8 @@ optionPrintParagraphs(char const * text, bool plain, FILE * fp)
  * private:
  *
  * what:  Print usage text
- * arg:   + tOptions* + opts + program options descriptor +
- * arg:   + int       + exitCode + exit code for calling exit(3) +
+ * arg:   + tOptions * + opts + program options descriptor +
+ * arg:   + int        + exitCode + exit code for calling exit(3) +
  *
  * doc:
  *  This routine will print usage in both GNU-standard and AutoOpts-expanded
diff --git a/contrib/ntp/sntp/libopts/version.c b/contrib/ntp/sntp/libopts/version.c
index 1516c147f889..8a8de75dbe31 100644
--- a/contrib/ntp/sntp/libopts/version.c
+++ b/contrib/ntp/sntp/libopts/version.c
@@ -10,7 +10,7 @@
 /*
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
- *  AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ *  AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
  *
  *  AutoOpts is available under any one of two licenses.  The license
  *  in use must be one of these two and the choice is under the control
@@ -32,13 +32,13 @@
 /*=export_func  optionVersion
  *
  * what:     return the compiled AutoOpts version number
- * ret_type: char const*
+ * ret_type: char const *
  * ret_desc: the version string in constant memory
  * doc:
  *  Returns the full version string compiled into the library.
  *  The returned string cannot be modified.
 =*/
-char const*
+char const *
 optionVersion(void)
 {
     static char const ver[] = OPTIONS_DOTTED_VERSION;
@@ -181,8 +181,8 @@ print_ver(tOptions * opts, tOptDesc * od, FILE * fp, bool call_exit)
 /*=export_func  optionPrintVersion
  *
  * what:  Print the program version
- * arg:   + tOptions* + opts + program options descriptor +
- * arg:   + tOptDesc* + od   + the descriptor for this arg +
+ * arg:   + tOptions * + opts + program options descriptor +
+ * arg:   + tOptDesc * + od   + the descriptor for this arg +
  *
  * doc:
  *  This routine will print the version to stdout.
@@ -196,8 +196,8 @@ optionPrintVersion(tOptions * opts, tOptDesc * od)
 /*=export_func  optionPrintVersionAndReturn
  *
  * what:  Print the program version
- * arg:   + tOptions* + opts + program options descriptor +
- * arg:   + tOptDesc* + od   + the descriptor for this arg +
+ * arg:   + tOptions * + opts + program options descriptor +
+ * arg:   + tOptDesc * + od   + the descriptor for this arg +
  *
  * doc:
  *  This routine will print the version to stdout and return
@@ -215,8 +215,8 @@ optionPrintVersionAndReturn(tOptions * opts, tOptDesc * od)
  * private:
  *
  * what:  Print the program version to stderr
- * arg:   + tOptions* + opts + program options descriptor +
- * arg:   + tOptDesc* + od   + the descriptor for this arg +
+ * arg:   + tOptions * + opts + program options descriptor +
+ * arg:   + tOptDesc * + od   + the descriptor for this arg +
  *
  * doc:
  *  This routine will print the version to stderr.
diff --git a/contrib/ntp/sntp/libpkgver/colcomp.c b/contrib/ntp/sntp/libpkgver/colcomp.c
new file mode 100644
index 000000000000..4b151e3faf62
--- /dev/null
+++ b/contrib/ntp/sntp/libpkgver/colcomp.c
@@ -0,0 +1,135 @@
+/* COLLATE COMPARE, COMPARES DIGITS NUMERICALLY AND OTHERS IN ASCII */
+
+/*
+ *   Copyright 2001, 2015, Harlan Stenn.  Used by NTP with permission.
+ *
+ *   Author: Harlan Stenn 
+ *
+ *   Copying and distribution of this file, with or without modification,
+ *   are permitted in any medium without royalty provided the copyright
+ *   notice and this notice are preserved. This file is offered as-is,
+ *   without any warranty.
+ */
+
+/*
+ * Expected collate order for numeric "pieces" is:
+ * 0 - 9	followed by
+ * 00 - 99	followed by
+ * 000 - 999	followed by
+ * ...
+ */
+
+#include 
+
+/*
+ * Older versions of isdigit() require the argument be isascii()
+ */
+
+#if 0
+# define MyIsDigit(x)	\
+      (isascii ((unsigned char) (x)) && isdigit ((unsigned char) (x)))
+#else
+# define MyIsDigit(x)	isdigit ((unsigned char) (x))
+#endif
+
+
+int 
+colcomp (s1, s2)
+     register char *s1;
+     register char *s2;
+{
+  int hilo = 0;			/* comparison value */
+
+  while (*s1 && *s2)
+    {
+      if  (  MyIsDigit(*s1)
+          && MyIsDigit(*s2))
+	{
+	  hilo = (*s1 < *s2) ? -1 : (*s1 > *s2) ? 1 : 0;
+	  ++s1;
+	  ++s2;
+	  while (MyIsDigit(*s1)
+	     &&  MyIsDigit(*s2))
+	    {
+	      if (!hilo)
+		hilo = (*s1 < *s2) ? -1 : (*s1 > *s2) ? 1 : 0;
+	      ++s1;
+	      ++s2;
+	    }
+	  if (MyIsDigit(*s1))
+	    hilo = 1;		/* s2 is first */
+	  if (MyIsDigit(*s2))
+	    hilo = -1;		/* s1 is first */
+	  if (hilo)
+	    break;
+	  continue;
+	}
+      if (MyIsDigit(*s1))
+	{
+	  hilo = -1;		/* s1 must come first */
+	  break;
+	}
+      if (MyIsDigit(*s2))
+	{
+	  hilo = 1;		/* s2 must come first */
+	  break;
+	}
+      hilo = (*s1 < *s2) ? -1 : (*s1 > *s2) ? 1 : 0;
+      if (hilo)
+	break;
+      ++s1;
+      ++s2;
+    }
+  if (*s1 && *s2)
+    return (hilo);
+  if (hilo)
+    return (hilo);
+  return ((*s1 < *s2) ? -1 : (*s1 > *s2) ? 1 : 0);
+}
+
+#ifdef TEST
+
+#include 
+
+static int  qcmp(   const void      *fi1,
+                    const void      *fi2)
+{
+    return colcomp(*(char**)fi1, *(char**)fi2);
+}
+
+int main( int argc, char *argv[], char *environ[]) {
+  void *base;
+  size_t nmemb = 0;
+  size_t size = sizeof(char *);
+  char *ca[] = {
+    "999", "0", "10", "1", "01", "100", "010", "99", "00", "001", "099", "9"
+  };
+  char **cp;
+  int i;
+
+  if (argc > 1) {
+    /* Sort use-provided list */
+  } else {
+    base = (void *) ca;
+    nmemb = sizeof ca / size;
+  }
+  printf("argc is <%d>, nmemb = <%d>\n", argc, nmemb);
+
+  printf("Before:\n");
+  cp = (char **)base;
+  for (i = 0; i < nmemb; ++i) {
+    printf("%s\n", *cp++);
+  }
+
+  qsort((void *)base, nmemb, size, qcmp);
+
+  printf("After:\n");
+  cp = (char **)base;
+  for (i = 0; i < nmemb; ++i) {
+    printf("%s\n", *cp++);
+  }
+
+  exit(0);
+}
+
+#endif
diff --git a/contrib/ntp/sntp/libpkgver/pkgver.h b/contrib/ntp/sntp/libpkgver/pkgver.h
new file mode 100644
index 000000000000..e01c34d55fe8
--- /dev/null
+++ b/contrib/ntp/sntp/libpkgver/pkgver.h
@@ -0,0 +1,19 @@
+/*
+ * 
+ *   Copyright 2015 Harlan Stenn.  Used by NTP with permission.
+ *
+ *   Author: Harlan Stenn 
+ *
+ *   Copying and distribution of this file, with or without modification, are
+ *   permitted in any medium without royalty provided the copyright notice
+ *   and this notice are preserved. This file is offered as-is, without any
+ *   warranty.
+ */
+
+extern int colcomp(char *s1, char *s2);
+
+#define PKG_VER_LT(x)	(colcomp((x), PACKAGE_VERSION) < 0)
+#define PKG_VER_LE(x)	(colcomp((x), PACKAGE_VERSION) <= 0)
+#define PKG_VER_EQ(x)	(colcomp((x), PACKAGE_VERSION) == 0)
+#define PKG_VER_GE(x)	(colcomp((x), PACKAGE_VERSION) >= 0)
+#define PKG_VER_GT(x)	(colcomp((x), PACKAGE_VERSION) > 0)
diff --git a/contrib/ntp/sntp/m4/ltversion.m4 b/contrib/ntp/sntp/m4/ltversion.m4
index 9c7b5d411858..07a8602d48d6 100644
--- a/contrib/ntp/sntp/m4/ltversion.m4
+++ b/contrib/ntp/sntp/m4/ltversion.m4
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/contrib/ntp/sntp/m4/ntp_libntp.m4 b/contrib/ntp/sntp/m4/ntp_libntp.m4
index 3aa3dff563a4..89b94b6d4ea2 100644
--- a/contrib/ntp/sntp/m4/ntp_libntp.m4
+++ b/contrib/ntp/sntp/m4/ntp_libntp.m4
@@ -912,6 +912,9 @@ case "$ntp_cv_hdr_def_sigio" in
      *-sni-sysv*)
 	ans=no
 	;;
+     *-stratus-vos)
+	ans=no
+	;;
      *-univel-sysv*)
 	ans=no
 	;;
@@ -976,6 +979,9 @@ case "$ntp_cv_hdr_def_sigpoll" in
      *-sni-sysv*)
 	ans=no
 	;;
+     *-stratus-vos)
+	ans=no
+	;;
      *-*-aix[[4-9]]*)
 	# XXX Only verified thru AIX6
 	ans=no
@@ -1035,6 +1041,9 @@ case "$ntp_cv_hdr_def_sigpoll" in
      *-sni-sysv*)
 	ans=no
 	;;
+     *-stratus-vos)
+	ans=no
+	;;
      *-*-aix[[4-9]]*)
 	# XXX Only verified thru AIX6
 	ans=no
diff --git a/contrib/ntp/sntp/m4/ntp_openssl.m4 b/contrib/ntp/sntp/m4/ntp_openssl.m4
index 9d9189ce9383..0e38aba73e8b 100644
--- a/contrib/ntp/sntp/m4/ntp_openssl.m4
+++ b/contrib/ntp/sntp/m4/ntp_openssl.m4
@@ -360,7 +360,16 @@ case "$ntp_openssl:$GCC" in
     CFLAGS_NTP="$CFLAGS_NTP -Wstrict-prototypes"
 esac
 
+# Because we don't want -Werror for the EVP_MD_do_all_sorted check
 CFLAGS="$NTPO_SAVED_CFLAGS"
+
+case "$ntp_openssl" in
+ yes)
+    LIBS="$NTPO_SAVED_LIBS $LDADD_NTP"
+    AC_CHECK_FUNCS([EVP_MD_do_all_sorted])
+    ;;
+esac
+
 CPPFLAGS="$NTPO_SAVED_CPPFLAGS"
 LIBS="$NTPO_SAVED_LIBS"
 AS_UNSET([NTPO_SAVED_CFLAGS])
diff --git a/contrib/ntp/sntp/m4/ntp_unitytest.m4 b/contrib/ntp/sntp/m4/ntp_unitytest.m4
new file mode 100644
index 000000000000..dd7ad3d184c4
--- /dev/null
+++ b/contrib/ntp/sntp/m4/ntp_unitytest.m4
@@ -0,0 +1,19 @@
+dnl ######################################################################
+dnl NTP_UNITYBUILD -  Unity build support
+dnl shared by top-level and sntp/configure.ac
+AC_DEFUN([NTP_UNITYBUILD], [
+# We may not need have_unity
+have_unity=false
+AC_PATH_PROG([PATH_RUBY], [ruby])
+case "$PATH_RUBY" in
+ /*)
+    have_unity=true
+    ;;
+ *) PATH_RUBY="false"
+    ;;
+esac
+# We may not need UNITYBUILD_AVAILABLE
+AM_CONDITIONAL([UNITYBUILD_AVAILABLE], [$have_unity])
+
+])
+dnl ======================================================================
diff --git a/contrib/ntp/sntp/m4/os_cflags.m4 b/contrib/ntp/sntp/m4/os_cflags.m4
index 2ac4ffc7dfb7..a2161e659ad3 100644
--- a/contrib/ntp/sntp/m4/os_cflags.m4
+++ b/contrib/ntp/sntp/m4/os_cflags.m4
@@ -45,7 +45,7 @@ AC_DEFUN([NTP_OS_CFLAGS], [
 		ntp_os_cflags="-Ae -Wp,-H18816"
 		;;
 	    esac
-	    ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE"
+	    ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE -D__STDC_VERSION__=199901L"
 	    ;;
 	 hpux*)
 	    case "$GCC" in
@@ -55,7 +55,7 @@ AC_DEFUN([NTP_OS_CFLAGS], [
 		# use Ansi compiler on HPUX
 		ntp_os_cflags="-Ae"
 	    esac
-	    ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE"
+	    ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE -D__STDC_VERSION__=199901L"
 	    ;;
 	 irix6*)
 	    case "$CC" in
diff --git a/contrib/ntp/sntp/m4/version.m4 b/contrib/ntp/sntp/m4/version.m4
index 945d9cb0cad4..b83123f3bee4 100644
--- a/contrib/ntp/sntp/m4/version.m4
+++ b/contrib/ntp/sntp/m4/version.m4
@@ -1 +1 @@
-m4_define([VERSION_NUMBER],[4.2.8p2])
+m4_define([VERSION_NUMBER],[4.2.8p3])
diff --git a/contrib/ntp/sntp/main.c b/contrib/ntp/sntp/main.c
index 20e27f0fec30..870db93502b9 100644
--- a/contrib/ntp/sntp/main.c
+++ b/contrib/ntp/sntp/main.c
@@ -1161,7 +1161,7 @@ handle_pkt(
 	int		stratum;
 	char *		ref;
 	char *		ts_str;
-	char *		leaptxt;
+	const char *	leaptxt;
 	double		offset;
 	double		precision;
 	double		synch_distance;
diff --git a/contrib/ntp/sntp/scripts/Makefile.in b/contrib/ntp/sntp/scripts/Makefile.in
index 73025d0bb8ba..0eda41de0bf5 100644
--- a/contrib/ntp/sntp/scripts/Makefile.in
+++ b/contrib/ntp/sntp/scripts/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -15,6 +14,61 @@
 
 @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@
@@ -34,7 +88,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = scripts
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/libopts/m4/stdnoreturn.m4 \
@@ -56,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/m4/ntp_pkg_config.m4 \
 	$(top_srcdir)/m4/ntp_prog_cc.m4 $(top_srcdir)/m4/ntp_sntp.m4 \
 	$(top_srcdir)/m4/ntp_sysexits.m4 \
+	$(top_srcdir)/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/m4/openldap-thread-check.m4 \
 	$(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/os_cflags.m4 \
@@ -63,18 +117,32 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -220,6 +288,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSIX_SHELL = @POSIX_SHELL@
@@ -329,7 +398,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign scripts/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -353,11 +421,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -404,10 +472,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -488,15 +561,18 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/contrib/ntp/sntp/scripts/genLocInfo b/contrib/ntp/sntp/scripts/genLocInfo
index d761c4c66358..fe9d3926b358 100755
--- a/contrib/ntp/sntp/scripts/genLocInfo
+++ b/contrib/ntp/sntp/scripts/genLocInfo
@@ -79,6 +79,14 @@ ${V}echo "Looking for <$lf>" >&2
     case "$LF" in
      '')
 	case "$CVO_OSNAME" in
+	 raspbian*)
+	    lf=loc/debian
+${V}echo "Looking for <$lf>" >&2
+	    if test -f $lf
+	    then
+		LF=$lf
+	    fi
+	    ;;
 	 redhat* | fedora*)
 	    lf=loc/redhat
 ${V}echo "Looking for <$lf>" >&2
diff --git a/contrib/ntp/sntp/sntp-opts.c b/contrib/ntp/sntp/sntp-opts.c
index ce28d653d71c..be05bb6dbab3 100644
--- a/contrib/ntp/sntp/sntp-opts.c
+++ b/contrib/ntp/sntp/sntp-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *
- *  It has been AutoGen-ed  April  7, 2015 at 04:17:23 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  June 29, 2015 at 04:23:20 PM by AutoGen 5.18.5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -70,7 +70,7 @@ extern FILE * option_usage_fp;
  *  static const strings for sntp options
  */
 static char const sntp_opt_strs[2549] =
-/*     0 */ "sntp 4.2.8p2\n"
+/*     0 */ "sntp 4.2.8p3\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -155,7 +155,7 @@ static char const sntp_opt_strs[2549] =
 /*  2298 */ "LOAD_OPTS\0"
 /*  2308 */ "no-load-opts\0"
 /*  2321 */ "SNTP\0"
-/*  2326 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p2\n"
+/*  2326 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p3\n"
             "Usage:  %s [ - [] | --[{=| }] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
 /*  2485 */ "$HOME\0"
@@ -163,7 +163,7 @@ static char const sntp_opt_strs[2549] =
 /*  2493 */ ".ntprc\0"
 /*  2500 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2534 */ "\n\0"
-/*  2536 */ "sntp 4.2.8p2";
+/*  2536 */ "sntp 4.2.8p3";
 
 /**
  *  ipv4 option description with
@@ -936,7 +936,7 @@ doOptSteplimit(tOptions* pOptions, tOptDesc* pOptDesc)
     option_usage_fp = stderr;
 
  emit_ranges:
-    optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
+optionShowRange(pOptions, pOptDesc, VOIDP(rng), 1);
 }
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -972,9 +972,9 @@ doOptNtpversion(tOptions* pOptions, tOptDesc* pOptDesc)
     option_usage_fp = stderr;
 
  emit_ranges:
-    optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
+optionShowRange(pOptions, pOptDesc, VOIDP(rng), 1);
 }
-/* extracted from optmain.tlib near line 1245 */
+/* extracted from optmain.tlib near line 1250 */
 
 /**
  * The directory containing the data associated with sntp.
@@ -1087,11 +1087,11 @@ AO_gettext(char const * pz)
     if (option_xlateable_txt.field_ct != 0) {
         res = dgettext("libopts", pz);
         if (res == pz)
-            res = (char *)(void *)_(pz);
+            res = (char *)VOIDP(_(pz));
     } else
-        res = (char *)(void *)_(pz);
+        res = (char *)VOIDP(_(pz));
 #else
-    res = (char *)(void *)_(pz);
+    res = (char *)VOIDP(_(pz));
 #endif
     if (res == pz)
         return res;
@@ -1128,7 +1128,7 @@ translate_option_strings(void)
          *  Do the translations.  The first pointer follows the field count
          *  field.  The field count field is the size of a pointer.
          */
-        char ** ppz = (char**)(void*)&(option_xlateable_txt);
+        char ** ppz = (char**)VOIDP(&(option_xlateable_txt));
         int     ix  = option_xlateable_txt.field_ct;
 
         do {
@@ -1138,16 +1138,16 @@ translate_option_strings(void)
         /* prevent re-translation and disable "libopts" domain lookup */
         option_xlateable_txt.field_ct = 0;
 
-        coerce_it((void*)&(opts->pzCopyright));
-        coerce_it((void*)&(opts->pzCopyNotice));
-        coerce_it((void*)&(opts->pzFullVersion));
-        coerce_it((void*)&(opts->pzUsageTitle));
-        coerce_it((void*)&(opts->pzExplain));
-        coerce_it((void*)&(opts->pzDetail));
+        coerce_it(VOIDP(&(opts->pzCopyright)));
+        coerce_it(VOIDP(&(opts->pzCopyNotice)));
+        coerce_it(VOIDP(&(opts->pzFullVersion)));
+        coerce_it(VOIDP(&(opts->pzUsageTitle)));
+        coerce_it(VOIDP(&(opts->pzExplain)));
+        coerce_it(VOIDP(&(opts->pzDetail)));
         {
             tOptDesc * od = opts->pOptDesc;
             for (ix = opts->optCt; ix > 0; ix--, od++)
-                coerce_it((void*)&(od->pzText));
+                coerce_it(VOIDP(&(od->pzText)));
         }
     }
 }
@@ -1173,7 +1173,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via sntpOptions.pzCopyright */
-  puts(_("sntp 4.2.8p2\n\
+  puts(_("sntp 4.2.8p3\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -1263,7 +1263,7 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via sntpOptions.pzUsageTitle */
-  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p2\n\
+  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p3\n\
 Usage:  %s [ - [] | --[{=| }] ]... \\\n\
 \t\t[ hostname-or-IP ...]\n"));
 
@@ -1271,7 +1271,7 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("\n"));
 
   /* referenced via sntpOptions.pzFullVersion */
-  puts(_("sntp 4.2.8p2"));
+  puts(_("sntp 4.2.8p3"));
 
   /* referenced via sntpOptions.pzFullUsage */
   puts(_("<<>>"));
@@ -1297,7 +1297,7 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2014 by Bruce Korb - all rights reserved\n"));
-#line 82 "../makeshell.c"
+#line 87 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
@@ -1321,9 +1321,9 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 89 "../makeshell.c"
+#line 94 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 301 "../makeshell.c"
+#line 306 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -1401,9 +1401,9 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("standard output"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("standard output"));
 #line 274 "../usage.c"
   puts(_("standard output"));
@@ -1421,9 +1421,9 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("write"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("write"));
 #line 273 "../usage.c"
   puts(_("write"));
@@ -1475,7 +1475,7 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
 #line 380 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 916 "../makeshell.c"
+#line 921 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
diff --git a/contrib/ntp/sntp/sntp-opts.h b/contrib/ntp/sntp/sntp-opts.h
index 8f1a5df5675a..06fa376c7f2e 100644
--- a/contrib/ntp/sntp/sntp-opts.h
+++ b/contrib/ntp/sntp/sntp-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *
- *  It has been AutoGen-ed  April  7, 2015 at 04:17:22 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  June 29, 2015 at 04:23:19 PM by AutoGen 5.18.5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -91,9 +91,9 @@ typedef enum {
 /** count of all options for sntp */
 #define OPTION_CT    23
 /** sntp version */
-#define SNTP_VERSION       "4.2.8p2"
+#define SNTP_VERSION       "4.2.8p3"
 /** Full sntp version text */
-#define SNTP_FULL_VERSION  "sntp 4.2.8p2"
+#define SNTP_FULL_VERSION  "sntp 4.2.8p3"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/contrib/ntp/sntp/sntp.1sntpman b/contrib/ntp/sntp/sntp.1sntpman
index 1b636e9843b0..9033a812d766 100644
--- a/contrib/ntp/sntp/sntp.1sntpman
+++ b/contrib/ntp/sntp/sntp.1sntpman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH sntp 1sntpman "07 Apr 2015" "4.2.8p2" "User Commands"
+.TH sntp 1sntpman "29 Jun 2015" "4.2.8p3" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-E6aqmA/ag-76ailA)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-JTaaO5/ag-VTa4M5)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:18:00 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:23:26 PM by AutoGen 5.18.5
 .\" From the definitions sntp-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -296,7 +296,7 @@ to check the current time and error in the local clock.
 With suitable privilege,
 run as a command
 or from a
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 job,
 \f\*[B-Font]sntp \-Ss \-M 128 ntpserver.somewhere\f[]
 will request the time from the server,
@@ -310,14 +310,14 @@ the correction  will be stepped.
 With suitable privilege,
 run as a command
 or from a
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 job,
 \f\*[B-Font]sntp \-S ntpserver.somewhere\f[]
 will set (step) the local clock from a synchronized specified server,
 like the (deprecated)
-\fCntpdate\fR(1ntpdatemdoc)\f[],
+\fCntpdate\f[]\fR(1ntpdatemdoc)\f[],
 or
-\fCrdate\fR(8)\f[]
+\fCrdate\f[]\fR(8)\f[]
 commands.
 .PP
 .SH "ENVIRONMENT"
diff --git a/contrib/ntp/sntp/sntp.1sntpmdoc b/contrib/ntp/sntp/sntp.1sntpmdoc
index 5a84a80ff4ce..52bc5ad93083 100644
--- a/contrib/ntp/sntp/sntp.1sntpmdoc
+++ b/contrib/ntp/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt SNTP 1sntpmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:18:06 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:23:32 PM by AutoGen 5.18.5
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/sntp/sntp.html b/contrib/ntp/sntp/sntp.html
index 5b41a7f4d2a2..c5f11b6de87c 100644
--- a/contrib/ntp/sntp/sntp.html
+++ b/contrib/ntp/sntp/sntp.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  
        This document applies to version 4.2.8p2 of sntp.
+  
        This document applies to version 4.2.8p3 of sntp.
 
   
        The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -176,7 +176,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
        sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p2
+
        sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p3
 Usage:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/contrib/ntp/sntp/sntp.man.in b/contrib/ntp/sntp/sntp.man.in
index a1a3e0719fa3..f4607eb4a79c 100644
--- a/contrib/ntp/sntp/sntp.man.in
+++ b/contrib/ntp/sntp/sntp.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH sntp @SNTP_MS@ "07 Apr 2015" "4.2.8p2" "User Commands"
+.TH sntp @SNTP_MS@ "29 Jun 2015" "4.2.8p3" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-E6aqmA/ag-76ailA)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-JTaaO5/ag-VTa4M5)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:18:00 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:23:26 PM by AutoGen 5.18.5
 .\" From the definitions sntp-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -296,7 +296,7 @@ to check the current time and error in the local clock.
 With suitable privilege,
 run as a command
 or from a
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 job,
 \f\*[B-Font]sntp \-Ss \-M 128 ntpserver.somewhere\f[]
 will request the time from the server,
@@ -310,14 +310,14 @@ the correction  will be stepped.
 With suitable privilege,
 run as a command
 or from a
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 job,
 \f\*[B-Font]sntp \-S ntpserver.somewhere\f[]
 will set (step) the local clock from a synchronized specified server,
 like the (deprecated)
-\fCntpdate\fR(@NTPDATE_MS@)\f[],
+\fCntpdate\f[]\fR(@NTPDATE_MS@)\f[],
 or
-\fCrdate\fR(8)\f[]
+\fCrdate\f[]\fR(8)\f[]
 commands.
 .PP
 .SH "ENVIRONMENT"
diff --git a/contrib/ntp/sntp/sntp.mdoc.in b/contrib/ntp/sntp/sntp.mdoc.in
index 31a42685c0be..f302ab9f18df 100644
--- a/contrib/ntp/sntp/sntp.mdoc.in
+++ b/contrib/ntp/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt SNTP @SNTP_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:18:06 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:23:32 PM by AutoGen 5.18.5
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/sntp/tests/Makefile.am b/contrib/ntp/sntp/tests/Makefile.am
index feb914276205..2228aa0e73f2 100644
--- a/contrib/ntp/sntp/tests/Makefile.am
+++ b/contrib/ntp/sntp/tests/Makefile.am
@@ -1,30 +1,64 @@
 NULL =
 BUILT_SOURCES =
+CLEANFILES = kod-output-blank kod-output-single kod-output-multiple debug-output-lfp-dec debug-output-lfp-bin debug-output-pkt
+DISTCLEANFILES = kod-output-blank kod-output-single kod-output-multiple
+EXTRA_PROGRAMS =
 
-check_PROGRAMS = 
-if BUILD_SNTP
+run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+
+# Use EXTRA_PROGRAMS for test files that are under development but
+# not production-ready
+#EXTRA_PROGRAMS +=		test-packetHandling test-packetProcessing
+
+check_PROGRAMS =			\
+	test-crypto			\
+	test-keyFile			\
+	test-kodDatabase		\
+	test-kodFile			\
+	test-networking			\
+	test-packetHandling		\
+	test-packetProcessing		\
+	test-utilities			\
+	$(NULL)
+
+if GTEST_AVAILABLE
 check_PROGRAMS += tests
+else
+EXTRA_PROGRAMS += tests
 endif
 
-base_SOURCES =				\
-	$(srcdir)/../tests_main.cpp	\
+#if BUILD_SNTP
+#check_PROGRAMS += tests
+#endif
+
+base_SOURCES =			\
+	../tests_main.cpp	\
 	$(NULL)
 
 tests_SOURCES =			\
 	$(base_SOURCES)		\
-	crypto.cpp		\
-	keyFile.cpp		\
-	kodDatabase.cpp		\
-	kodFile.cpp		\
-	networking.cpp		\
-	packetHandling.cpp	\
-	packetProcessing.cpp	\
-	utilities.cpp		\
+	g_networking.cpp	\
+	g_packetHandling.cpp	\
+	g_packetProcessing.cpp	\
 	$(NULL)
 
+# HMS: this test was for the 4.2.6 sntp code.
+#	g_nameresolution.cpp	
+
+# HMS: Somebody needs to audit the following files to
+# make sure all of these tests are now handled by Unity
+#
+#	g_utilities.cpp		
+#	g_kodDatabase.cpp	
+#	g_keyFile.cpp		
+#	g_crypto.cpp		
+#	g_kodFile.cpp		
+
 noinst_HEADERS =		\
-	sntptest.h		\
 	fileHandlingTest.h	\
+	sntptest.h		\
+	g_fileHandlingTest.h	\
+	g_sntptest.h		\
 	$(NULL)
 
 dist_check_SCRIPTS =	tests-runner
@@ -45,7 +79,7 @@ EXTRA_DIST =				\
 	data/kod-test-empty		\
 	$(NULL)
 
-CLEANFILES =				\
+CLEANFILES +=				\
 	data/kod-output-multiple	\
 	data/kod-output-single		\
 	data/debug-output-pkt		\
@@ -54,6 +88,7 @@ CLEANFILES =				\
 	data/debug-output-lfp-bin	\
 	$(NULL)
 
+#split into LDADD and tests_LDADD?
 LDADD =						\
 	../libsntp.a				\
 	$(LIBOPTS_LDADD)			\
@@ -65,6 +100,12 @@ LDADD =						\
 	$(GTEST_LIBS)				\
 	$(NULL)
 
+unity_tests_LDADD =				\
+	$(LDADD)				\
+	$(top_builddir)/unity/libunity.a	\
+	$(LIBM)					\
+	$(NULL)
+
 AM_CFLAGS   = $(CFLAGS_NTP)
 AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 
@@ -78,11 +119,164 @@ AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 AM_LDFLAGS = $(LDFLAGS_NTP)
 
+BUILT_SOURCES +=				\
+	$(srcdir)/run-crypto.c			\
+	$(srcdir)/run-keyFile.c			\
+	$(srcdir)/run-kodDatabase.c		\
+	$(srcdir)/run-kodFile.c			\
+	$(srcdir)/run-networking.c		\
+	$(srcdir)/run-packetProcessing.c	\
+	$(srcdir)/run-utilities.c		\
+	$(srcdir)/run-packetHandling.c		\
+	$(NULL)
+
+test_keyFile_CFLAGS =			\
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_keyFile_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_kodDatabase_CFLAGS =		\
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_kodDatabase_LDADD =		\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_kodFile_CFLAGS =			\
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_kodFile_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_networking_CFLAGS =		\
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_networking_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_utilities_CFLAGS =			\
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_utilities_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_crypto_CFLAGS =			\
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_crypto_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_packetProcessing_CFLAGS =		\
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_packetProcessing_LDADD =		\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_packetHandling_CFLAGS =		\
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_packetHandling_LDADD =		\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_networking_SOURCES =		\
+	networking.c			\
+	run-networking.c		\
+	$(top_builddir)/version.c	\
+	$(NULL)
+
+test_packetHandling_SOURCES =		\
+	packetHandling.c		\
+	run-packetHandling.c		\
+	$(top_builddir)/version.c	\
+	$(NULL)
+
+test_kodDatabase_SOURCES =		\
+	kodDatabase.c			\
+	run-kodDatabase.c		\
+	$(top_builddir)/version.c	\
+	$(NULL)
+
+test_keyFile_SOURCES =			\
+	keyFile.c			\
+	run-keyFile.c			\
+	$(top_builddir)/version.c	\
+	$(NULL)
+
+test_kodFile_SOURCES =			\
+	kodFile.c			\
+	run-kodFile.c			\
+	$(top_builddir)/version.c	\
+	$(NULL)
+#	../version.c
+
+test_packetProcessing_SOURCES =		\
+	packetProcessing.c		\
+	run-packetProcessing.c		\
+	$(NULL)
+
+test_utilities_SOURCES =		\
+	utilities.c			\
+	run-utilities.c			\
+	$(NULL)
+
+test_crypto_SOURCES =			\
+	crypto.c			\
+	run-crypto.c			\
+	$(top_builddir)/version.c	\
+	$(NULL)
+
+
+$(srcdir)/run-kodFile.c: $(srcdir)/kodFile.c $(std_unity_list)
+	$(run_unity) kodFile.c run-kodFile.c
+
+$(srcdir)/run-keyFile.c: $(srcdir)/keyFile.c $(std_unity_list)
+	$(run_unity) keyFile.c run-keyFile.c
+
+$(srcdir)/run-kodDatabase.c: $(srcdir)/kodDatabase.c $(std_unity_list)
+	$(run_unity) kodDatabase.c run-kodDatabase.c
+
+$(srcdir)/run-networking.c: $(srcdir)/networking.c $(std_unity_list)
+	$(run_unity) networking.c run-networking.c
+
+$(srcdir)/run-packetProcessing.c: $(srcdir)/packetProcessing.c $(std_unity_list)
+	$(run_unity) packetProcessing.c run-packetProcessing.c
+
+$(srcdir)/run-packetHandling.c: $(srcdir)/packetHandling.c $(std_unity_list)
+	$(run_unity) packetHandling.c run-packetHandling.c
+
+$(srcdir)/run-utilities.c: $(srcdir)/utilities.c $(std_unity_list)
+	$(run_unity) utilities.c run-utilities.c
+
+$(srcdir)/run-crypto.c: $(srcdir)/crypto.c $(std_unity_list)
+	$(run_unity) crypto.c run-crypto.c
+
+#$(srcdir)/../version.c: $(srcdir)/../version.c
+#	gcc -o version.o ../version.c
+
 TESTS = 
 
 if !NTP_CROSSCOMPILE
-TESTS += tests-runner
+TESTS += $(check_PROGRAMS)
 endif
+#if !NTP_CROSSCOMPILE
+#TESTS += tests-runner
+#endif
 
 ## ensure ../libsntp.a is built
 
@@ -98,8 +292,8 @@ check-libsntp: ../libsntp.a
 ## check-libntp.mf - automake fragment
 ## slightly adapted for deeper directory
 
-BUILT_SOURCES	+= check-libntp
-CLEANFILES	+= check-libntp
+BUILT_SOURCES	+= check-libntp check-libunity
+CLEANFILES	+= check-libntp	check-libunity
 
 check-libntp: ../../libntp/libntp.a
 	@echo stamp > $@
@@ -107,5 +301,11 @@ check-libntp: ../../libntp/libntp.a
 ../../libntp/libntp.a:
 	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 
+check-libunity: ../sntp/unity/libunity.a
+	@echo stamp > $@
+
+../sntp/unity/libunity.a:
+	cd ../unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
+
 include $(top_srcdir)/depsver.mf
 include $(top_srcdir)/includes.mf
diff --git a/contrib/ntp/sntp/tests/Makefile.in b/contrib/ntp/sntp/tests/Makefile.in
index 194af0f7754c..8cc0ba5234db 100644
--- a/contrib/ntp/sntp/tests/Makefile.in
+++ b/contrib/ntp/sntp/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -16,6 +15,61 @@
 @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@
@@ -34,12 +88,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-check_PROGRAMS = $(am__EXEEXT_1)
-@BUILD_SNTP_TRUE@am__append_1 = tests
-@NTP_CROSSCOMPILE_FALSE@am__append_2 = tests-runner
-DIST_COMMON = $(dist_check_SCRIPTS) $(noinst_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf
+EXTRA_PROGRAMS = $(am__EXEEXT_1)
+check_PROGRAMS = test-crypto$(EXEEXT) test-keyFile$(EXEEXT) \
+	test-kodDatabase$(EXEEXT) test-kodFile$(EXEEXT) \
+	test-networking$(EXEEXT) test-packetHandling$(EXEEXT) \
+	test-packetProcessing$(EXEEXT) test-utilities$(EXEEXT) \
+	$(am__EXEEXT_2) $(am__EXEEXT_3)
+@GTEST_AVAILABLE_TRUE@am__append_1 = tests
+@GTEST_AVAILABLE_FALSE@am__append_2 = tests
+@NTP_CROSSCOMPILE_FALSE@am__append_3 = $(check_PROGRAMS)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
@@ -62,6 +119,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/m4/ntp_pkg_config.m4 \
 	$(top_srcdir)/m4/ntp_prog_cc.m4 $(top_srcdir)/m4/ntp_sntp.m4 \
 	$(top_srcdir)/m4/ntp_sysexits.m4 \
+	$(top_srcdir)/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/m4/openldap-thread-check.m4 \
 	$(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/os_cflags.m4 \
@@ -69,61 +127,414 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_check_SCRIPTS) \
+	$(noinst_HEADERS) $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = fileHandlingTest.h
 CONFIG_CLEAN_VPATH_FILES =
-@BUILD_SNTP_TRUE@am__EXEEXT_1 = tests$(EXEEXT)
+@GTEST_AVAILABLE_FALSE@am__EXEEXT_1 = tests$(EXEEXT)
+am__EXEEXT_2 =
+@GTEST_AVAILABLE_TRUE@am__EXEEXT_3 = tests$(EXEEXT)
 am__objects_1 =
+am_test_crypto_OBJECTS = test_crypto-crypto.$(OBJEXT) \
+	test_crypto-run-crypto.$(OBJEXT) test_crypto-version.$(OBJEXT) \
+	$(am__objects_1)
+test_crypto_OBJECTS = $(am_test_crypto_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = ../libsntp.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/../libntp/libntp.a \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+test_crypto_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_crypto_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_keyFile_OBJECTS = test_keyFile-keyFile.$(OBJEXT) \
+	test_keyFile-run-keyFile.$(OBJEXT) \
+	test_keyFile-version.$(OBJEXT) $(am__objects_1)
+test_keyFile_OBJECTS = $(am_test_keyFile_OBJECTS)
+test_keyFile_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_keyFile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_keyFile_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_kodDatabase_OBJECTS = test_kodDatabase-kodDatabase.$(OBJEXT) \
+	test_kodDatabase-run-kodDatabase.$(OBJEXT) \
+	test_kodDatabase-version.$(OBJEXT) $(am__objects_1)
+test_kodDatabase_OBJECTS = $(am_test_kodDatabase_OBJECTS)
+test_kodDatabase_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_kodDatabase_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_kodDatabase_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_test_kodFile_OBJECTS = test_kodFile-kodFile.$(OBJEXT) \
+	test_kodFile-run-kodFile.$(OBJEXT) \
+	test_kodFile-version.$(OBJEXT) $(am__objects_1)
+test_kodFile_OBJECTS = $(am_test_kodFile_OBJECTS)
+test_kodFile_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_kodFile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_kodFile_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_networking_OBJECTS = test_networking-networking.$(OBJEXT) \
+	test_networking-run-networking.$(OBJEXT) \
+	test_networking-version.$(OBJEXT) $(am__objects_1)
+test_networking_OBJECTS = $(am_test_networking_OBJECTS)
+test_networking_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_networking_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_networking_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_test_packetHandling_OBJECTS =  \
+	test_packetHandling-packetHandling.$(OBJEXT) \
+	test_packetHandling-run-packetHandling.$(OBJEXT) \
+	test_packetHandling-version.$(OBJEXT) $(am__objects_1)
+test_packetHandling_OBJECTS = $(am_test_packetHandling_OBJECTS)
+test_packetHandling_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_packetHandling_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_packetHandling_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_test_packetProcessing_OBJECTS =  \
+	test_packetProcessing-packetProcessing.$(OBJEXT) \
+	test_packetProcessing-run-packetProcessing.$(OBJEXT) \
+	$(am__objects_1)
+test_packetProcessing_OBJECTS = $(am_test_packetProcessing_OBJECTS)
+test_packetProcessing_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_packetProcessing_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_packetProcessing_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_test_utilities_OBJECTS = test_utilities-utilities.$(OBJEXT) \
+	test_utilities-run-utilities.$(OBJEXT) $(am__objects_1)
+test_utilities_OBJECTS = $(am_test_utilities_OBJECTS)
+test_utilities_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_utilities_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_utilities_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+	$@
 am__objects_2 = tests_main.$(OBJEXT) $(am__objects_1)
-am_tests_OBJECTS = $(am__objects_2) crypto.$(OBJEXT) keyFile.$(OBJEXT) \
-	kodDatabase.$(OBJEXT) kodFile.$(OBJEXT) networking.$(OBJEXT) \
-	packetHandling.$(OBJEXT) packetProcessing.$(OBJEXT) \
-	utilities.$(OBJEXT) $(am__objects_1)
+am_tests_OBJECTS = $(am__objects_2) g_networking.$(OBJEXT) \
+	g_packetHandling.$(OBJEXT) g_packetProcessing.$(OBJEXT) \
+	$(am__objects_1)
 tests_OBJECTS = $(am_tests_OBJECTS)
 tests_LDADD = $(LDADD)
-am__DEPENDENCIES_1 =
 tests_DEPENDENCIES = ../libsntp.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/../libntp/libntp.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/libevent/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_$(V))
-am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_$(V))
-am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(tests_SOURCES)
-DIST_SOURCES = $(tests_SOURCES)
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(test_crypto_SOURCES) $(test_keyFile_SOURCES) \
+	$(test_kodDatabase_SOURCES) $(test_kodFile_SOURCES) \
+	$(test_networking_SOURCES) $(test_packetHandling_SOURCES) \
+	$(test_packetProcessing_SOURCES) $(test_utilities_SOURCES) \
+	$(tests_SOURCES)
+DIST_SOURCES = $(test_crypto_SOURCES) $(test_keyFile_SOURCES) \
+	$(test_kodDatabase_SOURCES) $(test_kodFile_SOURCES) \
+	$(test_networking_SOURCES) $(test_packetHandling_SOURCES) \
+	$(test_packetProcessing_SOURCES) $(test_utilities_SOURCES) \
+	$(tests_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/libevent/build-aux/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) \
+	$(top_srcdir)/libevent/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/fileHandlingTest.h.in $(top_srcdir)/depsver.mf \
+	$(top_srcdir)/includes.mf \
+	$(top_srcdir)/libevent/build-aux/depcomp \
+	$(top_srcdir)/libevent/build-aux/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -269,6 +680,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSIX_SHELL = @POSIX_SHELL@
@@ -357,26 +769,54 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
-BUILT_SOURCES = check-libsntp check-libntp .deps-ver
+#if !NTP_CROSSCOMPILE
+#TESTS += tests-runner
+#endif
+BUILT_SOURCES = $(srcdir)/run-crypto.c $(srcdir)/run-keyFile.c \
+	$(srcdir)/run-kodDatabase.c $(srcdir)/run-kodFile.c \
+	$(srcdir)/run-networking.c $(srcdir)/run-packetProcessing.c \
+	$(srcdir)/run-utilities.c $(srcdir)/run-packetHandling.c \
+	$(NULL) check-libsntp check-libntp check-libunity .deps-ver
+CLEANFILES = kod-output-blank kod-output-single kod-output-multiple \
+	debug-output-lfp-dec debug-output-lfp-bin debug-output-pkt \
+	data/kod-output-multiple data/kod-output-single \
+	data/debug-output-pkt data/debug-output-lfp-dec \
+	data/kod-output-blank data/debug-output-lfp-bin $(NULL) \
+	check-libsntp check-libntp check-libunity .deps-ver
+DISTCLEANFILES = kod-output-blank kod-output-single kod-output-multiple
+run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+
+#if BUILD_SNTP
+#check_PROGRAMS += tests
+#endif
 base_SOURCES = \
-	$(srcdir)/../tests_main.cpp	\
+	../tests_main.cpp	\
 	$(NULL)
 
 tests_SOURCES = \
 	$(base_SOURCES)		\
-	crypto.cpp		\
-	keyFile.cpp		\
-	kodDatabase.cpp		\
-	kodFile.cpp		\
-	networking.cpp		\
-	packetHandling.cpp	\
-	packetProcessing.cpp	\
-	utilities.cpp		\
+	g_networking.cpp	\
+	g_packetHandling.cpp	\
+	g_packetProcessing.cpp	\
 	$(NULL)
 
+
+# HMS: this test was for the 4.2.6 sntp code.
+#	g_nameresolution.cpp	
+
+# HMS: Somebody needs to audit the following files to
+# make sure all of these tests are now handled by Unity
+#
+#	g_utilities.cpp		
+#	g_kodDatabase.cpp	
+#	g_keyFile.cpp		
+#	g_crypto.cpp		
+#	g_kodFile.cpp		
 noinst_HEADERS = \
-	sntptest.h		\
 	fileHandlingTest.h	\
+	sntptest.h		\
+	g_fileHandlingTest.h	\
+	g_sntptest.h		\
 	$(NULL)
 
 dist_check_SCRIPTS = tests-runner
@@ -396,10 +836,8 @@ EXTRA_DIST = \
 	data/kod-test-empty		\
 	$(NULL)
 
-CLEANFILES = data/kod-output-multiple data/kod-output-single \
-	data/debug-output-pkt data/debug-output-lfp-dec \
-	data/kod-output-blank data/debug-output-lfp-bin $(NULL) \
-	check-libsntp check-libntp .deps-ver
+
+#split into LDADD and tests_LDADD?
 LDADD = \
 	../libsntp.a				\
 	$(LIBOPTS_LDADD)			\
@@ -411,13 +849,133 @@ LDADD = \
 	$(GTEST_LIBS)				\
 	$(NULL)
 
+unity_tests_LDADD = \
+	$(LDADD)				\
+	$(top_builddir)/unity/libunity.a	\
+	$(LIBM)					\
+	$(NULL)
+
 AM_CFLAGS = $(CFLAGS_NTP)
 AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 AM_CPPFLAGS = $(SNTP_INCS) -I$(srcdir)/.. -I$(top_srcdir)/../tests \
 	$(LIBOPTS_CFLAGS) $(CPPFLAGS_LIBEVENT) $(GTEST_CPPFLAGS) \
 	$(CPPFLAGS_NTP)
 AM_LDFLAGS = $(LDFLAGS_NTP)
-TESTS = $(am__append_2)
+test_keyFile_CFLAGS = \
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_keyFile_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_kodDatabase_CFLAGS = \
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_kodDatabase_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_kodFile_CFLAGS = \
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_kodFile_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_networking_CFLAGS = \
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_networking_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_utilities_CFLAGS = \
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_utilities_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_crypto_CFLAGS = \
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_crypto_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_packetProcessing_CFLAGS = \
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_packetProcessing_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_packetHandling_CFLAGS = \
+	-I$(top_srcdir)/unity		\
+	$(NULL)
+
+test_packetHandling_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_networking_SOURCES = \
+	networking.c			\
+	run-networking.c		\
+	$(top_builddir)/version.c	\
+	$(NULL)
+
+test_packetHandling_SOURCES = \
+	packetHandling.c		\
+	run-packetHandling.c		\
+	$(top_builddir)/version.c	\
+	$(NULL)
+
+test_kodDatabase_SOURCES = \
+	kodDatabase.c			\
+	run-kodDatabase.c		\
+	$(top_builddir)/version.c	\
+	$(NULL)
+
+test_keyFile_SOURCES = \
+	keyFile.c			\
+	run-keyFile.c			\
+	$(top_builddir)/version.c	\
+	$(NULL)
+
+test_kodFile_SOURCES = \
+	kodFile.c			\
+	run-kodFile.c			\
+	$(top_builddir)/version.c	\
+	$(NULL)
+
+#	../version.c
+test_packetProcessing_SOURCES = \
+	packetProcessing.c		\
+	run-packetProcessing.c		\
+	$(NULL)
+
+test_utilities_SOURCES = \
+	utilities.c			\
+	run-utilities.c			\
+	$(NULL)
+
+test_crypto_SOURCES = \
+	crypto.c			\
+	run-crypto.c			\
+	$(top_builddir)/version.c	\
+	$(NULL)
+
+
+#$(srcdir)/../version.c: $(srcdir)/../version.c
+#	gcc -o version.o ../version.c
+TESTS = $(am__append_3)
 SNTP_INCS = -I$(top_srcdir)/../include \
 	-I$(top_srcdir)/../lib/isc/include \
 	-I$(top_srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include \
@@ -426,7 +984,7 @@ all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
+.SUFFIXES: .c .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -439,7 +997,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_src
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign tests/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -448,6 +1005,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -457,6 +1015,8 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+fileHandlingTest.h: $(top_builddir)/config.status $(srcdir)/fileHandlingTest.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
@@ -466,7 +1026,40 @@ clean-checkPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-tests$(EXEEXT): $(tests_OBJECTS) $(tests_DEPENDENCIES) 
+
+test-crypto$(EXEEXT): $(test_crypto_OBJECTS) $(test_crypto_DEPENDENCIES) $(EXTRA_test_crypto_DEPENDENCIES) 
+	@rm -f test-crypto$(EXEEXT)
+	$(AM_V_CCLD)$(test_crypto_LINK) $(test_crypto_OBJECTS) $(test_crypto_LDADD) $(LIBS)
+
+test-keyFile$(EXEEXT): $(test_keyFile_OBJECTS) $(test_keyFile_DEPENDENCIES) $(EXTRA_test_keyFile_DEPENDENCIES) 
+	@rm -f test-keyFile$(EXEEXT)
+	$(AM_V_CCLD)$(test_keyFile_LINK) $(test_keyFile_OBJECTS) $(test_keyFile_LDADD) $(LIBS)
+
+test-kodDatabase$(EXEEXT): $(test_kodDatabase_OBJECTS) $(test_kodDatabase_DEPENDENCIES) $(EXTRA_test_kodDatabase_DEPENDENCIES) 
+	@rm -f test-kodDatabase$(EXEEXT)
+	$(AM_V_CCLD)$(test_kodDatabase_LINK) $(test_kodDatabase_OBJECTS) $(test_kodDatabase_LDADD) $(LIBS)
+
+test-kodFile$(EXEEXT): $(test_kodFile_OBJECTS) $(test_kodFile_DEPENDENCIES) $(EXTRA_test_kodFile_DEPENDENCIES) 
+	@rm -f test-kodFile$(EXEEXT)
+	$(AM_V_CCLD)$(test_kodFile_LINK) $(test_kodFile_OBJECTS) $(test_kodFile_LDADD) $(LIBS)
+
+test-networking$(EXEEXT): $(test_networking_OBJECTS) $(test_networking_DEPENDENCIES) $(EXTRA_test_networking_DEPENDENCIES) 
+	@rm -f test-networking$(EXEEXT)
+	$(AM_V_CCLD)$(test_networking_LINK) $(test_networking_OBJECTS) $(test_networking_LDADD) $(LIBS)
+
+test-packetHandling$(EXEEXT): $(test_packetHandling_OBJECTS) $(test_packetHandling_DEPENDENCIES) $(EXTRA_test_packetHandling_DEPENDENCIES) 
+	@rm -f test-packetHandling$(EXEEXT)
+	$(AM_V_CCLD)$(test_packetHandling_LINK) $(test_packetHandling_OBJECTS) $(test_packetHandling_LDADD) $(LIBS)
+
+test-packetProcessing$(EXEEXT): $(test_packetProcessing_OBJECTS) $(test_packetProcessing_DEPENDENCIES) $(EXTRA_test_packetProcessing_DEPENDENCIES) 
+	@rm -f test-packetProcessing$(EXEEXT)
+	$(AM_V_CCLD)$(test_packetProcessing_LINK) $(test_packetProcessing_OBJECTS) $(test_packetProcessing_LDADD) $(LIBS)
+
+test-utilities$(EXEEXT): $(test_utilities_OBJECTS) $(test_utilities_DEPENDENCIES) $(EXTRA_test_utilities_DEPENDENCIES) 
+	@rm -f test-utilities$(EXEEXT)
+	$(AM_V_CCLD)$(test_utilities_LINK) $(test_utilities_OBJECTS) $(test_utilities_LDADD) $(LIBS)
+
+tests$(EXEEXT): $(tests_OBJECTS) $(tests_DEPENDENCIES) $(EXTRA_tests_DEPENDENCIES) 
 	@rm -f tests$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(tests_OBJECTS) $(tests_LDADD) $(LIBS)
 
@@ -476,55 +1069,396 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypto.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kodDatabase.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kodFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networking.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packetHandling.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packetProcessing.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_networking.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_packetHandling.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_packetProcessing.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-crypto.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-run-crypto.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-version.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_keyFile-keyFile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_keyFile-run-keyFile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_keyFile-version.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kodDatabase-kodDatabase.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kodDatabase-run-kodDatabase.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kodDatabase-version.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kodFile-kodFile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kodFile-run-kodFile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kodFile-version.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_networking-networking.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_networking-run-networking.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_networking-version.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_packetHandling-packetHandling.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_packetHandling-run-packetHandling.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_packetHandling-version.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_packetProcessing-packetProcessing.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_packetProcessing-run-packetProcessing.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_utilities-run-utilities.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_utilities-utilities.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilities.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+test_crypto-crypto.o: crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -MT test_crypto-crypto.o -MD -MP -MF $(DEPDIR)/test_crypto-crypto.Tpo -c -o test_crypto-crypto.o `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_crypto-crypto.Tpo $(DEPDIR)/test_crypto-crypto.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='crypto.c' object='test_crypto-crypto.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -c -o test_crypto-crypto.o `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
+
+test_crypto-crypto.obj: crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -MT test_crypto-crypto.obj -MD -MP -MF $(DEPDIR)/test_crypto-crypto.Tpo -c -o test_crypto-crypto.obj `if test -f 'crypto.c'; then $(CYGPATH_W) 'crypto.c'; else $(CYGPATH_W) '$(srcdir)/crypto.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_crypto-crypto.Tpo $(DEPDIR)/test_crypto-crypto.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='crypto.c' object='test_crypto-crypto.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -c -o test_crypto-crypto.obj `if test -f 'crypto.c'; then $(CYGPATH_W) 'crypto.c'; else $(CYGPATH_W) '$(srcdir)/crypto.c'; fi`
+
+test_crypto-run-crypto.o: run-crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -MT test_crypto-run-crypto.o -MD -MP -MF $(DEPDIR)/test_crypto-run-crypto.Tpo -c -o test_crypto-run-crypto.o `test -f 'run-crypto.c' || echo '$(srcdir)/'`run-crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_crypto-run-crypto.Tpo $(DEPDIR)/test_crypto-run-crypto.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-crypto.c' object='test_crypto-run-crypto.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -c -o test_crypto-run-crypto.o `test -f 'run-crypto.c' || echo '$(srcdir)/'`run-crypto.c
+
+test_crypto-run-crypto.obj: run-crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -MT test_crypto-run-crypto.obj -MD -MP -MF $(DEPDIR)/test_crypto-run-crypto.Tpo -c -o test_crypto-run-crypto.obj `if test -f 'run-crypto.c'; then $(CYGPATH_W) 'run-crypto.c'; else $(CYGPATH_W) '$(srcdir)/run-crypto.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_crypto-run-crypto.Tpo $(DEPDIR)/test_crypto-run-crypto.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-crypto.c' object='test_crypto-run-crypto.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -c -o test_crypto-run-crypto.obj `if test -f 'run-crypto.c'; then $(CYGPATH_W) 'run-crypto.c'; else $(CYGPATH_W) '$(srcdir)/run-crypto.c'; fi`
+
+test_crypto-version.o: $(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -MT test_crypto-version.o -MD -MP -MF $(DEPDIR)/test_crypto-version.Tpo -c -o test_crypto-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_crypto-version.Tpo $(DEPDIR)/test_crypto-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_crypto-version.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -c -o test_crypto-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+
+test_crypto-version.obj: $(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -MT test_crypto-version.obj -MD -MP -MF $(DEPDIR)/test_crypto-version.Tpo -c -o test_crypto-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_crypto-version.Tpo $(DEPDIR)/test_crypto-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_crypto-version.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -c -o test_crypto-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+
+test_keyFile-keyFile.o: keyFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -MT test_keyFile-keyFile.o -MD -MP -MF $(DEPDIR)/test_keyFile-keyFile.Tpo -c -o test_keyFile-keyFile.o `test -f 'keyFile.c' || echo '$(srcdir)/'`keyFile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_keyFile-keyFile.Tpo $(DEPDIR)/test_keyFile-keyFile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='keyFile.c' object='test_keyFile-keyFile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -c -o test_keyFile-keyFile.o `test -f 'keyFile.c' || echo '$(srcdir)/'`keyFile.c
+
+test_keyFile-keyFile.obj: keyFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -MT test_keyFile-keyFile.obj -MD -MP -MF $(DEPDIR)/test_keyFile-keyFile.Tpo -c -o test_keyFile-keyFile.obj `if test -f 'keyFile.c'; then $(CYGPATH_W) 'keyFile.c'; else $(CYGPATH_W) '$(srcdir)/keyFile.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_keyFile-keyFile.Tpo $(DEPDIR)/test_keyFile-keyFile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='keyFile.c' object='test_keyFile-keyFile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -c -o test_keyFile-keyFile.obj `if test -f 'keyFile.c'; then $(CYGPATH_W) 'keyFile.c'; else $(CYGPATH_W) '$(srcdir)/keyFile.c'; fi`
+
+test_keyFile-run-keyFile.o: run-keyFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -MT test_keyFile-run-keyFile.o -MD -MP -MF $(DEPDIR)/test_keyFile-run-keyFile.Tpo -c -o test_keyFile-run-keyFile.o `test -f 'run-keyFile.c' || echo '$(srcdir)/'`run-keyFile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_keyFile-run-keyFile.Tpo $(DEPDIR)/test_keyFile-run-keyFile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-keyFile.c' object='test_keyFile-run-keyFile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -c -o test_keyFile-run-keyFile.o `test -f 'run-keyFile.c' || echo '$(srcdir)/'`run-keyFile.c
+
+test_keyFile-run-keyFile.obj: run-keyFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -MT test_keyFile-run-keyFile.obj -MD -MP -MF $(DEPDIR)/test_keyFile-run-keyFile.Tpo -c -o test_keyFile-run-keyFile.obj `if test -f 'run-keyFile.c'; then $(CYGPATH_W) 'run-keyFile.c'; else $(CYGPATH_W) '$(srcdir)/run-keyFile.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_keyFile-run-keyFile.Tpo $(DEPDIR)/test_keyFile-run-keyFile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-keyFile.c' object='test_keyFile-run-keyFile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -c -o test_keyFile-run-keyFile.obj `if test -f 'run-keyFile.c'; then $(CYGPATH_W) 'run-keyFile.c'; else $(CYGPATH_W) '$(srcdir)/run-keyFile.c'; fi`
+
+test_keyFile-version.o: $(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -MT test_keyFile-version.o -MD -MP -MF $(DEPDIR)/test_keyFile-version.Tpo -c -o test_keyFile-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_keyFile-version.Tpo $(DEPDIR)/test_keyFile-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_keyFile-version.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -c -o test_keyFile-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+
+test_keyFile-version.obj: $(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -MT test_keyFile-version.obj -MD -MP -MF $(DEPDIR)/test_keyFile-version.Tpo -c -o test_keyFile-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_keyFile-version.Tpo $(DEPDIR)/test_keyFile-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_keyFile-version.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -c -o test_keyFile-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+
+test_kodDatabase-kodDatabase.o: kodDatabase.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -MT test_kodDatabase-kodDatabase.o -MD -MP -MF $(DEPDIR)/test_kodDatabase-kodDatabase.Tpo -c -o test_kodDatabase-kodDatabase.o `test -f 'kodDatabase.c' || echo '$(srcdir)/'`kodDatabase.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_kodDatabase-kodDatabase.Tpo $(DEPDIR)/test_kodDatabase-kodDatabase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodDatabase.c' object='test_kodDatabase-kodDatabase.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -c -o test_kodDatabase-kodDatabase.o `test -f 'kodDatabase.c' || echo '$(srcdir)/'`kodDatabase.c
+
+test_kodDatabase-kodDatabase.obj: kodDatabase.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -MT test_kodDatabase-kodDatabase.obj -MD -MP -MF $(DEPDIR)/test_kodDatabase-kodDatabase.Tpo -c -o test_kodDatabase-kodDatabase.obj `if test -f 'kodDatabase.c'; then $(CYGPATH_W) 'kodDatabase.c'; else $(CYGPATH_W) '$(srcdir)/kodDatabase.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_kodDatabase-kodDatabase.Tpo $(DEPDIR)/test_kodDatabase-kodDatabase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodDatabase.c' object='test_kodDatabase-kodDatabase.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -c -o test_kodDatabase-kodDatabase.obj `if test -f 'kodDatabase.c'; then $(CYGPATH_W) 'kodDatabase.c'; else $(CYGPATH_W) '$(srcdir)/kodDatabase.c'; fi`
+
+test_kodDatabase-run-kodDatabase.o: run-kodDatabase.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -MT test_kodDatabase-run-kodDatabase.o -MD -MP -MF $(DEPDIR)/test_kodDatabase-run-kodDatabase.Tpo -c -o test_kodDatabase-run-kodDatabase.o `test -f 'run-kodDatabase.c' || echo '$(srcdir)/'`run-kodDatabase.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_kodDatabase-run-kodDatabase.Tpo $(DEPDIR)/test_kodDatabase-run-kodDatabase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-kodDatabase.c' object='test_kodDatabase-run-kodDatabase.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -c -o test_kodDatabase-run-kodDatabase.o `test -f 'run-kodDatabase.c' || echo '$(srcdir)/'`run-kodDatabase.c
+
+test_kodDatabase-run-kodDatabase.obj: run-kodDatabase.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -MT test_kodDatabase-run-kodDatabase.obj -MD -MP -MF $(DEPDIR)/test_kodDatabase-run-kodDatabase.Tpo -c -o test_kodDatabase-run-kodDatabase.obj `if test -f 'run-kodDatabase.c'; then $(CYGPATH_W) 'run-kodDatabase.c'; else $(CYGPATH_W) '$(srcdir)/run-kodDatabase.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_kodDatabase-run-kodDatabase.Tpo $(DEPDIR)/test_kodDatabase-run-kodDatabase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-kodDatabase.c' object='test_kodDatabase-run-kodDatabase.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -c -o test_kodDatabase-run-kodDatabase.obj `if test -f 'run-kodDatabase.c'; then $(CYGPATH_W) 'run-kodDatabase.c'; else $(CYGPATH_W) '$(srcdir)/run-kodDatabase.c'; fi`
+
+test_kodDatabase-version.o: $(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -MT test_kodDatabase-version.o -MD -MP -MF $(DEPDIR)/test_kodDatabase-version.Tpo -c -o test_kodDatabase-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_kodDatabase-version.Tpo $(DEPDIR)/test_kodDatabase-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_kodDatabase-version.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -c -o test_kodDatabase-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+
+test_kodDatabase-version.obj: $(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -MT test_kodDatabase-version.obj -MD -MP -MF $(DEPDIR)/test_kodDatabase-version.Tpo -c -o test_kodDatabase-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_kodDatabase-version.Tpo $(DEPDIR)/test_kodDatabase-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_kodDatabase-version.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -c -o test_kodDatabase-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+
+test_kodFile-kodFile.o: kodFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -MT test_kodFile-kodFile.o -MD -MP -MF $(DEPDIR)/test_kodFile-kodFile.Tpo -c -o test_kodFile-kodFile.o `test -f 'kodFile.c' || echo '$(srcdir)/'`kodFile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_kodFile-kodFile.Tpo $(DEPDIR)/test_kodFile-kodFile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodFile.c' object='test_kodFile-kodFile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -c -o test_kodFile-kodFile.o `test -f 'kodFile.c' || echo '$(srcdir)/'`kodFile.c
+
+test_kodFile-kodFile.obj: kodFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -MT test_kodFile-kodFile.obj -MD -MP -MF $(DEPDIR)/test_kodFile-kodFile.Tpo -c -o test_kodFile-kodFile.obj `if test -f 'kodFile.c'; then $(CYGPATH_W) 'kodFile.c'; else $(CYGPATH_W) '$(srcdir)/kodFile.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_kodFile-kodFile.Tpo $(DEPDIR)/test_kodFile-kodFile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodFile.c' object='test_kodFile-kodFile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -c -o test_kodFile-kodFile.obj `if test -f 'kodFile.c'; then $(CYGPATH_W) 'kodFile.c'; else $(CYGPATH_W) '$(srcdir)/kodFile.c'; fi`
+
+test_kodFile-run-kodFile.o: run-kodFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -MT test_kodFile-run-kodFile.o -MD -MP -MF $(DEPDIR)/test_kodFile-run-kodFile.Tpo -c -o test_kodFile-run-kodFile.o `test -f 'run-kodFile.c' || echo '$(srcdir)/'`run-kodFile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_kodFile-run-kodFile.Tpo $(DEPDIR)/test_kodFile-run-kodFile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-kodFile.c' object='test_kodFile-run-kodFile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -c -o test_kodFile-run-kodFile.o `test -f 'run-kodFile.c' || echo '$(srcdir)/'`run-kodFile.c
+
+test_kodFile-run-kodFile.obj: run-kodFile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -MT test_kodFile-run-kodFile.obj -MD -MP -MF $(DEPDIR)/test_kodFile-run-kodFile.Tpo -c -o test_kodFile-run-kodFile.obj `if test -f 'run-kodFile.c'; then $(CYGPATH_W) 'run-kodFile.c'; else $(CYGPATH_W) '$(srcdir)/run-kodFile.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_kodFile-run-kodFile.Tpo $(DEPDIR)/test_kodFile-run-kodFile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-kodFile.c' object='test_kodFile-run-kodFile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -c -o test_kodFile-run-kodFile.obj `if test -f 'run-kodFile.c'; then $(CYGPATH_W) 'run-kodFile.c'; else $(CYGPATH_W) '$(srcdir)/run-kodFile.c'; fi`
+
+test_kodFile-version.o: $(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -MT test_kodFile-version.o -MD -MP -MF $(DEPDIR)/test_kodFile-version.Tpo -c -o test_kodFile-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_kodFile-version.Tpo $(DEPDIR)/test_kodFile-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_kodFile-version.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -c -o test_kodFile-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+
+test_kodFile-version.obj: $(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -MT test_kodFile-version.obj -MD -MP -MF $(DEPDIR)/test_kodFile-version.Tpo -c -o test_kodFile-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_kodFile-version.Tpo $(DEPDIR)/test_kodFile-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_kodFile-version.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -c -o test_kodFile-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+
+test_networking-networking.o: networking.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -MT test_networking-networking.o -MD -MP -MF $(DEPDIR)/test_networking-networking.Tpo -c -o test_networking-networking.o `test -f 'networking.c' || echo '$(srcdir)/'`networking.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_networking-networking.Tpo $(DEPDIR)/test_networking-networking.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='networking.c' object='test_networking-networking.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -c -o test_networking-networking.o `test -f 'networking.c' || echo '$(srcdir)/'`networking.c
+
+test_networking-networking.obj: networking.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -MT test_networking-networking.obj -MD -MP -MF $(DEPDIR)/test_networking-networking.Tpo -c -o test_networking-networking.obj `if test -f 'networking.c'; then $(CYGPATH_W) 'networking.c'; else $(CYGPATH_W) '$(srcdir)/networking.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_networking-networking.Tpo $(DEPDIR)/test_networking-networking.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='networking.c' object='test_networking-networking.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -c -o test_networking-networking.obj `if test -f 'networking.c'; then $(CYGPATH_W) 'networking.c'; else $(CYGPATH_W) '$(srcdir)/networking.c'; fi`
+
+test_networking-run-networking.o: run-networking.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -MT test_networking-run-networking.o -MD -MP -MF $(DEPDIR)/test_networking-run-networking.Tpo -c -o test_networking-run-networking.o `test -f 'run-networking.c' || echo '$(srcdir)/'`run-networking.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_networking-run-networking.Tpo $(DEPDIR)/test_networking-run-networking.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-networking.c' object='test_networking-run-networking.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -c -o test_networking-run-networking.o `test -f 'run-networking.c' || echo '$(srcdir)/'`run-networking.c
+
+test_networking-run-networking.obj: run-networking.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -MT test_networking-run-networking.obj -MD -MP -MF $(DEPDIR)/test_networking-run-networking.Tpo -c -o test_networking-run-networking.obj `if test -f 'run-networking.c'; then $(CYGPATH_W) 'run-networking.c'; else $(CYGPATH_W) '$(srcdir)/run-networking.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_networking-run-networking.Tpo $(DEPDIR)/test_networking-run-networking.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-networking.c' object='test_networking-run-networking.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -c -o test_networking-run-networking.obj `if test -f 'run-networking.c'; then $(CYGPATH_W) 'run-networking.c'; else $(CYGPATH_W) '$(srcdir)/run-networking.c'; fi`
+
+test_networking-version.o: $(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -MT test_networking-version.o -MD -MP -MF $(DEPDIR)/test_networking-version.Tpo -c -o test_networking-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_networking-version.Tpo $(DEPDIR)/test_networking-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_networking-version.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -c -o test_networking-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+
+test_networking-version.obj: $(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -MT test_networking-version.obj -MD -MP -MF $(DEPDIR)/test_networking-version.Tpo -c -o test_networking-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_networking-version.Tpo $(DEPDIR)/test_networking-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_networking-version.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -c -o test_networking-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+
+test_packetHandling-packetHandling.o: packetHandling.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -MT test_packetHandling-packetHandling.o -MD -MP -MF $(DEPDIR)/test_packetHandling-packetHandling.Tpo -c -o test_packetHandling-packetHandling.o `test -f 'packetHandling.c' || echo '$(srcdir)/'`packetHandling.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_packetHandling-packetHandling.Tpo $(DEPDIR)/test_packetHandling-packetHandling.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='packetHandling.c' object='test_packetHandling-packetHandling.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -c -o test_packetHandling-packetHandling.o `test -f 'packetHandling.c' || echo '$(srcdir)/'`packetHandling.c
+
+test_packetHandling-packetHandling.obj: packetHandling.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -MT test_packetHandling-packetHandling.obj -MD -MP -MF $(DEPDIR)/test_packetHandling-packetHandling.Tpo -c -o test_packetHandling-packetHandling.obj `if test -f 'packetHandling.c'; then $(CYGPATH_W) 'packetHandling.c'; else $(CYGPATH_W) '$(srcdir)/packetHandling.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_packetHandling-packetHandling.Tpo $(DEPDIR)/test_packetHandling-packetHandling.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='packetHandling.c' object='test_packetHandling-packetHandling.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -c -o test_packetHandling-packetHandling.obj `if test -f 'packetHandling.c'; then $(CYGPATH_W) 'packetHandling.c'; else $(CYGPATH_W) '$(srcdir)/packetHandling.c'; fi`
+
+test_packetHandling-run-packetHandling.o: run-packetHandling.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -MT test_packetHandling-run-packetHandling.o -MD -MP -MF $(DEPDIR)/test_packetHandling-run-packetHandling.Tpo -c -o test_packetHandling-run-packetHandling.o `test -f 'run-packetHandling.c' || echo '$(srcdir)/'`run-packetHandling.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_packetHandling-run-packetHandling.Tpo $(DEPDIR)/test_packetHandling-run-packetHandling.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-packetHandling.c' object='test_packetHandling-run-packetHandling.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -c -o test_packetHandling-run-packetHandling.o `test -f 'run-packetHandling.c' || echo '$(srcdir)/'`run-packetHandling.c
+
+test_packetHandling-run-packetHandling.obj: run-packetHandling.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -MT test_packetHandling-run-packetHandling.obj -MD -MP -MF $(DEPDIR)/test_packetHandling-run-packetHandling.Tpo -c -o test_packetHandling-run-packetHandling.obj `if test -f 'run-packetHandling.c'; then $(CYGPATH_W) 'run-packetHandling.c'; else $(CYGPATH_W) '$(srcdir)/run-packetHandling.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_packetHandling-run-packetHandling.Tpo $(DEPDIR)/test_packetHandling-run-packetHandling.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-packetHandling.c' object='test_packetHandling-run-packetHandling.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -c -o test_packetHandling-run-packetHandling.obj `if test -f 'run-packetHandling.c'; then $(CYGPATH_W) 'run-packetHandling.c'; else $(CYGPATH_W) '$(srcdir)/run-packetHandling.c'; fi`
+
+test_packetHandling-version.o: $(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -MT test_packetHandling-version.o -MD -MP -MF $(DEPDIR)/test_packetHandling-version.Tpo -c -o test_packetHandling-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_packetHandling-version.Tpo $(DEPDIR)/test_packetHandling-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_packetHandling-version.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -c -o test_packetHandling-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+
+test_packetHandling-version.obj: $(top_builddir)/version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -MT test_packetHandling-version.obj -MD -MP -MF $(DEPDIR)/test_packetHandling-version.Tpo -c -o test_packetHandling-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_packetHandling-version.Tpo $(DEPDIR)/test_packetHandling-version.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_packetHandling-version.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -c -o test_packetHandling-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+
+test_packetProcessing-packetProcessing.o: packetProcessing.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -MT test_packetProcessing-packetProcessing.o -MD -MP -MF $(DEPDIR)/test_packetProcessing-packetProcessing.Tpo -c -o test_packetProcessing-packetProcessing.o `test -f 'packetProcessing.c' || echo '$(srcdir)/'`packetProcessing.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_packetProcessing-packetProcessing.Tpo $(DEPDIR)/test_packetProcessing-packetProcessing.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='packetProcessing.c' object='test_packetProcessing-packetProcessing.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -c -o test_packetProcessing-packetProcessing.o `test -f 'packetProcessing.c' || echo '$(srcdir)/'`packetProcessing.c
+
+test_packetProcessing-packetProcessing.obj: packetProcessing.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -MT test_packetProcessing-packetProcessing.obj -MD -MP -MF $(DEPDIR)/test_packetProcessing-packetProcessing.Tpo -c -o test_packetProcessing-packetProcessing.obj `if test -f 'packetProcessing.c'; then $(CYGPATH_W) 'packetProcessing.c'; else $(CYGPATH_W) '$(srcdir)/packetProcessing.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_packetProcessing-packetProcessing.Tpo $(DEPDIR)/test_packetProcessing-packetProcessing.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='packetProcessing.c' object='test_packetProcessing-packetProcessing.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -c -o test_packetProcessing-packetProcessing.obj `if test -f 'packetProcessing.c'; then $(CYGPATH_W) 'packetProcessing.c'; else $(CYGPATH_W) '$(srcdir)/packetProcessing.c'; fi`
+
+test_packetProcessing-run-packetProcessing.o: run-packetProcessing.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -MT test_packetProcessing-run-packetProcessing.o -MD -MP -MF $(DEPDIR)/test_packetProcessing-run-packetProcessing.Tpo -c -o test_packetProcessing-run-packetProcessing.o `test -f 'run-packetProcessing.c' || echo '$(srcdir)/'`run-packetProcessing.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_packetProcessing-run-packetProcessing.Tpo $(DEPDIR)/test_packetProcessing-run-packetProcessing.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-packetProcessing.c' object='test_packetProcessing-run-packetProcessing.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -c -o test_packetProcessing-run-packetProcessing.o `test -f 'run-packetProcessing.c' || echo '$(srcdir)/'`run-packetProcessing.c
+
+test_packetProcessing-run-packetProcessing.obj: run-packetProcessing.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -MT test_packetProcessing-run-packetProcessing.obj -MD -MP -MF $(DEPDIR)/test_packetProcessing-run-packetProcessing.Tpo -c -o test_packetProcessing-run-packetProcessing.obj `if test -f 'run-packetProcessing.c'; then $(CYGPATH_W) 'run-packetProcessing.c'; else $(CYGPATH_W) '$(srcdir)/run-packetProcessing.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_packetProcessing-run-packetProcessing.Tpo $(DEPDIR)/test_packetProcessing-run-packetProcessing.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-packetProcessing.c' object='test_packetProcessing-run-packetProcessing.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -c -o test_packetProcessing-run-packetProcessing.obj `if test -f 'run-packetProcessing.c'; then $(CYGPATH_W) 'run-packetProcessing.c'; else $(CYGPATH_W) '$(srcdir)/run-packetProcessing.c'; fi`
+
+test_utilities-utilities.o: utilities.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -MT test_utilities-utilities.o -MD -MP -MF $(DEPDIR)/test_utilities-utilities.Tpo -c -o test_utilities-utilities.o `test -f 'utilities.c' || echo '$(srcdir)/'`utilities.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_utilities-utilities.Tpo $(DEPDIR)/test_utilities-utilities.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='utilities.c' object='test_utilities-utilities.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -c -o test_utilities-utilities.o `test -f 'utilities.c' || echo '$(srcdir)/'`utilities.c
+
+test_utilities-utilities.obj: utilities.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -MT test_utilities-utilities.obj -MD -MP -MF $(DEPDIR)/test_utilities-utilities.Tpo -c -o test_utilities-utilities.obj `if test -f 'utilities.c'; then $(CYGPATH_W) 'utilities.c'; else $(CYGPATH_W) '$(srcdir)/utilities.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_utilities-utilities.Tpo $(DEPDIR)/test_utilities-utilities.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='utilities.c' object='test_utilities-utilities.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -c -o test_utilities-utilities.obj `if test -f 'utilities.c'; then $(CYGPATH_W) 'utilities.c'; else $(CYGPATH_W) '$(srcdir)/utilities.c'; fi`
+
+test_utilities-run-utilities.o: run-utilities.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -MT test_utilities-run-utilities.o -MD -MP -MF $(DEPDIR)/test_utilities-run-utilities.Tpo -c -o test_utilities-run-utilities.o `test -f 'run-utilities.c' || echo '$(srcdir)/'`run-utilities.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_utilities-run-utilities.Tpo $(DEPDIR)/test_utilities-run-utilities.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-utilities.c' object='test_utilities-run-utilities.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -c -o test_utilities-run-utilities.o `test -f 'run-utilities.c' || echo '$(srcdir)/'`run-utilities.c
+
+test_utilities-run-utilities.obj: run-utilities.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -MT test_utilities-run-utilities.obj -MD -MP -MF $(DEPDIR)/test_utilities-run-utilities.Tpo -c -o test_utilities-run-utilities.obj `if test -f 'run-utilities.c'; then $(CYGPATH_W) 'run-utilities.c'; else $(CYGPATH_W) '$(srcdir)/run-utilities.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_utilities-run-utilities.Tpo $(DEPDIR)/test_utilities-run-utilities.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-utilities.c' object='test_utilities-run-utilities.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -c -o test_utilities-run-utilities.obj `if test -f 'run-utilities.c'; then $(CYGPATH_W) 'run-utilities.c'; else $(CYGPATH_W) '$(srcdir)/run-utilities.c'; fi`
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
-tests_main.o: $(srcdir)/../tests_main.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tests_main.o -MD -MP -MF $(DEPDIR)/tests_main.Tpo -c -o tests_main.o `test -f '$(srcdir)/../tests_main.cpp' || echo '$(srcdir)/'`$(srcdir)/../tests_main.cpp
+tests_main.o: ../tests_main.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tests_main.o -MD -MP -MF $(DEPDIR)/tests_main.Tpo -c -o tests_main.o `test -f '../tests_main.cpp' || echo '$(srcdir)/'`../tests_main.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tests_main.Tpo $(DEPDIR)/tests_main.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(srcdir)/../tests_main.cpp' object='tests_main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../tests_main.cpp' object='tests_main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.o `test -f '$(srcdir)/../tests_main.cpp' || echo '$(srcdir)/'`$(srcdir)/../tests_main.cpp
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.o `test -f '../tests_main.cpp' || echo '$(srcdir)/'`../tests_main.cpp
 
-tests_main.obj: $(srcdir)/../tests_main.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tests_main.obj -MD -MP -MF $(DEPDIR)/tests_main.Tpo -c -o tests_main.obj `if test -f '$(srcdir)/../tests_main.cpp'; then $(CYGPATH_W) '$(srcdir)/../tests_main.cpp'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../tests_main.cpp'; fi`
+tests_main.obj: ../tests_main.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tests_main.obj -MD -MP -MF $(DEPDIR)/tests_main.Tpo -c -o tests_main.obj `if test -f '../tests_main.cpp'; then $(CYGPATH_W) '../tests_main.cpp'; else $(CYGPATH_W) '$(srcdir)/../tests_main.cpp'; fi`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tests_main.Tpo $(DEPDIR)/tests_main.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(srcdir)/../tests_main.cpp' object='tests_main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../tests_main.cpp' object='tests_main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.obj `if test -f '$(srcdir)/../tests_main.cpp'; then $(CYGPATH_W) '$(srcdir)/../tests_main.cpp'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../tests_main.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.obj `if test -f '../tests_main.cpp'; then $(CYGPATH_W) '../tests_main.cpp'; else $(CYGPATH_W) '$(srcdir)/../tests_main.cpp'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -532,26 +1466,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -563,15 +1486,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -580,101 +1499,243 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
 	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      color_start= color_end=; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
-	  else \
-	    echo "$$red$$dashes"; \
-	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS) $(dist_check_SCRIPTS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+test-crypto.log: test-crypto$(EXEEXT)
+	@p='test-crypto$(EXEEXT)'; \
+	b='test-crypto'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-keyFile.log: test-keyFile$(EXEEXT)
+	@p='test-keyFile$(EXEEXT)'; \
+	b='test-keyFile'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-kodDatabase.log: test-kodDatabase$(EXEEXT)
+	@p='test-kodDatabase$(EXEEXT)'; \
+	b='test-kodDatabase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-kodFile.log: test-kodFile$(EXEEXT)
+	@p='test-kodFile$(EXEEXT)'; \
+	b='test-kodFile'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-networking.log: test-networking$(EXEEXT)
+	@p='test-networking$(EXEEXT)'; \
+	b='test-networking'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-packetHandling.log: test-packetHandling$(EXEEXT)
+	@p='test-packetHandling$(EXEEXT)'; \
+	b='test-packetHandling'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-packetProcessing.log: test-packetProcessing$(EXEEXT)
+	@p='test-packetProcessing$(EXEEXT)'; \
+	b='test-packetProcessing'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-utilities.log: test-utilities$(EXEEXT)
+	@p='test-utilities$(EXEEXT)'; \
+	b='test-utilities'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+tests.log: tests$(EXEEXT)
+	@p='tests$(EXEEXT)'; \
+	b='tests'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -725,11 +1786,19 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -737,6 +1806,7 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -815,9 +1885,9 @@ uninstall-am:
 
 .MAKE: all check check-am install install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -827,8 +1897,34 @@ uninstall-am:
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
+	recheck tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
+
+$(srcdir)/run-kodFile.c: $(srcdir)/kodFile.c $(std_unity_list)
+	$(run_unity) kodFile.c run-kodFile.c
+
+$(srcdir)/run-keyFile.c: $(srcdir)/keyFile.c $(std_unity_list)
+	$(run_unity) keyFile.c run-keyFile.c
+
+$(srcdir)/run-kodDatabase.c: $(srcdir)/kodDatabase.c $(std_unity_list)
+	$(run_unity) kodDatabase.c run-kodDatabase.c
+
+$(srcdir)/run-networking.c: $(srcdir)/networking.c $(std_unity_list)
+	$(run_unity) networking.c run-networking.c
+
+$(srcdir)/run-packetProcessing.c: $(srcdir)/packetProcessing.c $(std_unity_list)
+	$(run_unity) packetProcessing.c run-packetProcessing.c
+
+$(srcdir)/run-packetHandling.c: $(srcdir)/packetHandling.c $(std_unity_list)
+	$(run_unity) packetHandling.c run-packetHandling.c
+
+$(srcdir)/run-utilities.c: $(srcdir)/utilities.c $(std_unity_list)
+	$(run_unity) utilities.c run-utilities.c
+
+$(srcdir)/run-crypto.c: $(srcdir)/crypto.c $(std_unity_list)
+	$(run_unity) crypto.c run-crypto.c
 
 check-libsntp: ../libsntp.a
 	@echo stamp > $@
@@ -841,6 +1937,12 @@ check-libntp: ../../libntp/libntp.a
 
 ../../libntp/libntp.a:
 	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+
+check-libunity: ../sntp/unity/libunity.a
+	@echo stamp > $@
+
+../sntp/unity/libunity.a:
+	cd ../unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
 $(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
 	@[ -f $@ ] ||							\
 		cp $(top_srcdir)/deps-ver $@
diff --git a/contrib/ntp/sntp/tests/crypto.cpp b/contrib/ntp/sntp/tests/crypto.c
similarity index 70%
rename from contrib/ntp/sntp/tests/crypto.cpp
rename to contrib/ntp/sntp/tests/crypto.c
index a6f89f5aa842..254469e63a94 100644
--- a/contrib/ntp/sntp/tests/crypto.cpp
+++ b/contrib/ntp/sntp/tests/crypto.c
@@ -1,16 +1,14 @@
+#include "config.h"
+#include "unity.h"
+#include "ntp_types.h"
+
 #include "sntptest.h"
-
-extern "C" {
 #include "crypto.h"
-};
-
-class cryptoTest : public sntptest {
-};
 
 #define MD5_LENGTH 16
 #define SHA1_LENGTH 20
 
-TEST_F(cryptoTest, MakeMd5Mac) {
+void test_MakeMd5Mac(void) {
 
 	const char* PKT_DATA = "abcdefgh0123";
 	const int PKT_LEN = strlen(PKT_DATA);
@@ -18,21 +16,22 @@ TEST_F(cryptoTest, MakeMd5Mac) {
 		"\x52\x6c\xb8\x38\xaf\x06\x5a\xfb\x6c\x98\xbb\xc0\x9b\x0a\x7a\x1b";
 	char actual[MD5_LENGTH];
 
-	key md5;
+	struct key md5;
 	md5.next = NULL;
 	md5.key_id = 10;
 	md5.key_len = 6;
 	memcpy(&md5.key_seq, "md5seq", md5.key_len);
 	memcpy(&md5.type, "MD5", 4);
 
-	EXPECT_EQ(MD5_LENGTH,
+	TEST_ASSERT_EQUAL(MD5_LENGTH,
 			  make_mac((char*)PKT_DATA, PKT_LEN, MD5_LENGTH, &md5, actual));
 
-	EXPECT_TRUE(memcmp(EXPECTED_DIGEST, actual, MD5_LENGTH) == 0);
+	TEST_ASSERT_TRUE(memcmp(EXPECTED_DIGEST, actual, MD5_LENGTH) == 0);
 }
 
+
+void test_MakeSHA1Mac(void) {
 #ifdef OPENSSL
-TEST_F(cryptoTest, MakeSHA1Mac) {
 	const char* PKT_DATA = "abcdefgh0123";
 	const int PKT_LEN = strlen(PKT_DATA);
 	const char* EXPECTED_DIGEST =
@@ -40,21 +39,24 @@ TEST_F(cryptoTest, MakeSHA1Mac) {
 		"\x63\x85\xb4\xce\xbe\x94\xa0\x97\x16\x1d";
 	char actual[SHA1_LENGTH];
 
-	key sha1;
+	struct key sha1;
 	sha1.next = NULL;
 	sha1.key_id = 20;
 	sha1.key_len = 7;
 	memcpy(&sha1.key_seq, "sha1seq", sha1.key_len);
 	memcpy(&sha1.type, "SHA1", 5);
 
-	EXPECT_EQ(SHA1_LENGTH,
+	TEST_ASSERT_EQUAL(SHA1_LENGTH,
 			  make_mac((char*)PKT_DATA, PKT_LEN, SHA1_LENGTH, &sha1, actual));
 
-	EXPECT_TRUE(memcmp(EXPECTED_DIGEST, actual, SHA1_LENGTH) == 0);
-}
+	TEST_ASSERT_TRUE(memcmp(EXPECTED_DIGEST, actual, SHA1_LENGTH) == 0);
+#else
+	TEST_IGNORE_MESSAGE("OpenSSL not found, skipping...");
 #endif	/* OPENSSL */
+}
 
-TEST_F(cryptoTest, VerifyCorrectMD5) {
+
+void test_VerifyCorrectMD5(void) {
 	const char* PKT_DATA =
 		"sometestdata"		// Data
 		"\0\0\0\0"			// Key-ID (unused)
@@ -62,18 +64,19 @@ TEST_F(cryptoTest, VerifyCorrectMD5) {
 		"\x2b\x7b\xfe\x4f\xa2\x32\xcf\xac";
 	const int PKT_LEN = 12;
 
-	key md5;
+	struct key md5;
 	md5.next = NULL;
 	md5.key_id = 0;
 	md5.key_len = 6;
 	memcpy(&md5.key_seq, "md5key", md5.key_len);
 	memcpy(&md5.type, "MD5", 4);
 
-	EXPECT_TRUE(auth_md5((char*)PKT_DATA, PKT_LEN, MD5_LENGTH, &md5));
+	TEST_ASSERT_TRUE(auth_md5((char*)PKT_DATA, PKT_LEN, MD5_LENGTH, &md5));
 }
 
+
+void test_VerifySHA1(void) {
 #ifdef OPENSSL
-TEST_F(cryptoTest, VerifySHA1) {
 	const char* PKT_DATA =
 		"sometestdata"		// Data
 		"\0\0\0\0"			// Key-ID (unused)
@@ -81,18 +84,20 @@ TEST_F(cryptoTest, VerifySHA1) {
 		"\x2d\x8a\x7d\x06\x96\xe6\x0c\xbc\xed\xe1";
 	const int PKT_LEN = 12;
 
-	key sha1;
+	struct key sha1;
 	sha1.next = NULL;
 	sha1.key_id = 0;
 	sha1.key_len = 7;
 	memcpy(&sha1.key_seq, "sha1key", sha1.key_len);
 	memcpy(&sha1.type, "SHA1", 5);
 
-	EXPECT_TRUE(auth_md5((char*)PKT_DATA, PKT_LEN, SHA1_LENGTH, &sha1));
-}
+	TEST_ASSERT_TRUE(auth_md5((char*)PKT_DATA, PKT_LEN, SHA1_LENGTH, &sha1));
+#else
+	TEST_IGNORE_MESSAGE("OpenSSL not found, skipping...");
 #endif	/* OPENSSL */
+}
 
-TEST_F(cryptoTest, VerifyFailure) {
+void test_VerifyFailure(void) {
 	/* We use a copy of the MD5 verification code, but modify
 	 * the last bit to make sure verification fails. */
 	const char* PKT_DATA =
@@ -102,28 +107,28 @@ TEST_F(cryptoTest, VerifyFailure) {
 		"\x2b\x7b\xfe\x4f\xa2\x32\xcf\x00"; // Last byte is wrong!
 	const int PKT_LEN = 12;
 
-	key md5;
+	struct key md5;
 	md5.next = NULL;
 	md5.key_id = 0;
 	md5.key_len = 6;
 	memcpy(&md5.key_seq, "md5key", md5.key_len);
 	memcpy(&md5.type, "MD5", 4);
 
-	EXPECT_FALSE(auth_md5((char*)PKT_DATA, PKT_LEN, MD5_LENGTH, &md5));
+	TEST_ASSERT_FALSE(auth_md5((char*)PKT_DATA, PKT_LEN, MD5_LENGTH, &md5));
 }
 
-TEST_F(cryptoTest, PacketSizeNotMultipleOfFourBytes) {
+void test_PacketSizeNotMultipleOfFourBytes(void) {
 	const char* PKT_DATA = "123456";
 	const int PKT_LEN = 6;
 	char actual[MD5_LENGTH];
 
-	key md5;
+	struct key md5;
 	md5.next = NULL;
 	md5.key_id = 10;
 	md5.key_len = 6;
 	memcpy(&md5.key_seq, "md5seq", md5.key_len);
 	memcpy(&md5.type, "MD5", 4);
 
-	EXPECT_EQ(0, make_mac((char*)PKT_DATA, PKT_LEN, MD5_LENGTH, &md5, actual));
+	TEST_ASSERT_EQUAL(0, make_mac((char*)PKT_DATA, PKT_LEN, MD5_LENGTH, &md5, actual));
 }
 
diff --git a/contrib/ntp/sntp/tests/fileHandlingTest.h b/contrib/ntp/sntp/tests/fileHandlingTest.h
index 502a248b9bd0..38c3fa6391c4 100644
--- a/contrib/ntp/sntp/tests/fileHandlingTest.h
+++ b/contrib/ntp/sntp/tests/fileHandlingTest.h
@@ -1,64 +1,100 @@
 #ifndef FILE_HANDLING_TEST_H
 #define FILE_HANDLING_TEST_H
 
+#include "stdlib.h"
 #include "sntptest.h"
 
-#include 
-#include 
+#include 
+#include 
 
-using std::ifstream;
-using std::string;
-using std::ios;
 
-class fileHandlingTest : public sntptest {
-protected:
-	enum DirectoryType {
-		INPUT_DIR = 0,
-		OUTPUT_DIR = 1
-	};
-
-	std::string CreatePath(const char* filename, DirectoryType argument) {
-		std::string path;
-
-		if (m_params.size() >= argument + 1) {
-			path = m_params[argument];
-		}
-
-		if (path[path.size()-1] != DIR_SEP && !path.empty()) {
-			path.append(1, DIR_SEP);
-		}
-		path.append(filename);
-
-		return path;
-	}
-
-	int GetFileSize(ifstream& file) {
-		int initial = file.tellg();
-
-		file.seekg(0, ios::end);
-		int length = file.tellg();
-		file.seekg(initial);
-
-		return length;
-	}
-
-	void CompareFileContent(ifstream& expected, ifstream& actual) {
-		int currentLine = 1;
-		while (actual.good() && expected.good()) {
-			string actualLine, expectedLine;
-			getline(actual, actualLine);
-			getline(expected, expectedLine);
-			
-			EXPECT_EQ(expectedLine, actualLine) << "Comparision failed on line " << currentLine;
-			currentLine++;
-		}
-	}
-
-	void ClearFile(const std::string& filename) {
-		std::ofstream clear(filename.c_str(), ios::trunc);
-		ASSERT_TRUE(clear.good());
-		clear.close();
-	}
+enum DirectoryType {
+	INPUT_DIR = 0,
+	OUTPUT_DIR = 1
 };
 
+const char * CreatePath(const char* filename, enum DirectoryType argument) {
+	
+	 char * path = malloc (sizeof (char) * 256);
+
+	/*
+	if (m_params.size() >= argument + 1) {
+		path = m_params[argument];
+	}
+
+	if (path[path.size()-1] != DIR_SEP && !path.empty()) {
+		path.append(1, DIR_SEP);
+	}
+	*/
+	//strcpy(path,filename);
+	//path.append(filename);
+
+	//return path;
+
+	char cwd[1024];
+	if (getcwd(cwd, sizeof(cwd)) != NULL)
+		printf("Current working dir: %s\n", cwd);
+	
+	printf("builddir is   <.>\n");
+	printf("abs_srcdir is \n");
+	strcpy(path,"/deacon/backroom/snaps/ntp-stable/sntp/tests/data/");
+
+	//strcpy(path,"");
+	strcat(path,filename);
+	printf("PATH IS : %s\n",path);
+	return path;
+}
+
+int GetFileSize(FILE *file) {
+
+	fseek(file, 0L, SEEK_END);
+	int length = ftell(file);
+	fseek(file, 0L, SEEK_SET);
+	
+	//int initial = file.tellg();
+
+	//file.seekg(0, ios::end);
+	//int length = file.tellg();
+	//file.seekg(initial);
+
+	return length;
+}
+
+bool CompareFileContent(FILE* expected, FILE* actual) {
+	int currentLine = 1;
+
+	char actualLine[1024];
+	char expectedLine[1024];
+	size_t lenAct = sizeof actualLine;
+	size_t lenExp = sizeof expectedLine;
+	
+	while (  ( (fgets(actualLine, lenAct, actual)) != NULL)
+	      && ( (fgets(expectedLine, lenExp, expected)) != NULL )
+	      ) {
+
+		//printf("%s",actualLine);
+		//printf("%s",expectedLine);
+	
+		if( strcmp(actualLine,expectedLine) !=0 ){
+			printf("Comparision failed on line %d",currentLine);
+			return FALSE;
+		}
+
+		//I removed this and modified the test kodFile.c, because there shouldn't be any ASSERTs in .h files!
+		//TEST_ASSERT_EQUAL_STRING(actualLine,expectedLine);//EXPECT_EQ(expectedLine, actualLine) << "Comparision failed on line " << currentLine;
+		currentLine++;
+	}
+
+	return TRUE;
+}
+
+void ClearFile(const char * filename) {
+	FILE * clear = fopen(filename, "w");//ios::trunc); //similar to truncate, I GUESS???!
+	
+	//I removed this because there shouldn't be any ASSERTs in .h files!
+	//TEST_ASSERT_TRUE(clear != NULL);
+	fclose(clear);
+}
+
+
 #endif // FILE_HANDLING_TEST_H
diff --git a/contrib/ntp/sntp/tests/fileHandlingTest.h.in b/contrib/ntp/sntp/tests/fileHandlingTest.h.in
new file mode 100644
index 000000000000..8ff9d34ec3b7
--- /dev/null
+++ b/contrib/ntp/sntp/tests/fileHandlingTest.h.in
@@ -0,0 +1,100 @@
+#ifndef FILE_HANDLING_TEST_H
+#define FILE_HANDLING_TEST_H
+
+#include "stdlib.h"
+#include "sntptest.h"
+
+#include 
+#include 
+
+
+enum DirectoryType {
+	INPUT_DIR = 0,
+	OUTPUT_DIR = 1
+};
+
+const char * CreatePath(const char* filename, enum DirectoryType argument) {
+	
+	 char * path = malloc (sizeof (char) * 256);
+
+	/*
+	if (m_params.size() >= argument + 1) {
+		path = m_params[argument];
+	}
+
+	if (path[path.size()-1] != DIR_SEP && !path.empty()) {
+		path.append(1, DIR_SEP);
+	}
+	*/
+	//strcpy(path,filename);
+	//path.append(filename);
+
+	//return path;
+
+	char cwd[1024];
+	if (getcwd(cwd, sizeof(cwd)) != NULL)
+		printf("Current working dir: %s\n", cwd);
+	
+	printf("builddir is   <@builddir@>\n");
+	printf("abs_srcdir is <@abs_srcdir@>\n");
+	strcpy(path,"@abs_srcdir@/data/");
+
+	//strcpy(path,"");
+	strcat(path,filename);
+	printf("PATH IS : %s\n",path);
+	return path;
+}
+
+int GetFileSize(FILE *file) {
+
+	fseek(file, 0L, SEEK_END);
+	int length = ftell(file);
+	fseek(file, 0L, SEEK_SET);
+	
+	//int initial = file.tellg();
+
+	//file.seekg(0, ios::end);
+	//int length = file.tellg();
+	//file.seekg(initial);
+
+	return length;
+}
+
+bool CompareFileContent(FILE* expected, FILE* actual) {
+	int currentLine = 1;
+
+	char actualLine[1024];
+	char expectedLine[1024];
+	size_t lenAct = sizeof actualLine;
+	size_t lenExp = sizeof expectedLine;
+	
+	while (  ( (fgets(actualLine, lenAct, actual)) != NULL)
+	      && ( (fgets(expectedLine, lenExp, expected)) != NULL )
+	      ) {
+
+		//printf("%s",actualLine);
+		//printf("%s",expectedLine);
+	
+		if( strcmp(actualLine,expectedLine) !=0 ){
+			printf("Comparision failed on line %d",currentLine);
+			return FALSE;
+		}
+
+		//I removed this and modified the test kodFile.c, because there shouldn't be any ASSERTs in .h files!
+		//TEST_ASSERT_EQUAL_STRING(actualLine,expectedLine);//EXPECT_EQ(expectedLine, actualLine) << "Comparision failed on line " << currentLine;
+		currentLine++;
+	}
+
+	return TRUE;
+}
+
+void ClearFile(const char * filename) {
+	FILE * clear = fopen(filename, "w");//ios::trunc); //similar to truncate, I GUESS???!
+	
+	//I removed this because there shouldn't be any ASSERTs in .h files!
+	//TEST_ASSERT_TRUE(clear != NULL);
+	fclose(clear);
+}
+
+
+#endif // FILE_HANDLING_TEST_H
diff --git a/contrib/ntp/sntp/tests/g_fileHandlingTest.h b/contrib/ntp/sntp/tests/g_fileHandlingTest.h
new file mode 100644
index 000000000000..7c8a78a146e3
--- /dev/null
+++ b/contrib/ntp/sntp/tests/g_fileHandlingTest.h
@@ -0,0 +1,64 @@
+#ifndef FILE_HANDLING_TEST_H
+#define FILE_HANDLING_TEST_H
+
+#include "g_sntptest.h"
+
+#include 
+#include 
+
+using std::ifstream;
+using std::string;
+using std::ios;
+
+class fileHandlingTest : public sntptest {
+protected:
+	enum DirectoryType {
+		INPUT_DIR = 0,
+		OUTPUT_DIR = 1
+	};
+
+	std::string CreatePath(const char* filename, DirectoryType argument) {
+		std::string path;
+
+		if (m_params.size() >= argument + 1) {
+			path = m_params[argument];
+		}
+
+		if (path[path.size()-1] != DIR_SEP && !path.empty()) {
+			path.append(1, DIR_SEP);
+		}
+		path.append(filename);
+
+		return path;
+	}
+
+	int GetFileSize(ifstream& file) {
+		int initial = file.tellg();
+
+		file.seekg(0, ios::end);
+		int length = file.tellg();
+		file.seekg(initial);
+
+		return length;
+	}
+
+	void CompareFileContent(ifstream& expected, ifstream& actual) {
+		int currentLine = 1;
+		while (actual.good() && expected.good()) {
+			string actualLine, expectedLine;
+			getline(actual, actualLine);
+			getline(expected, expectedLine);
+			
+			EXPECT_EQ(expectedLine, actualLine) << "Comparision failed on line " << currentLine;
+			currentLine++;
+		}
+	}
+
+	void ClearFile(const std::string& filename) {
+		std::ofstream clear(filename.c_str(), ios::trunc);
+		ASSERT_TRUE(clear.good());
+		clear.close();
+	}
+};
+
+#endif // FILE_HANDLING_TEST_H
diff --git a/contrib/ntp/sntp/tests/networking.cpp b/contrib/ntp/sntp/tests/g_networking.cpp
similarity index 63%
rename from contrib/ntp/sntp/tests/networking.cpp
rename to contrib/ntp/sntp/tests/g_networking.cpp
index 1d6ad6c44065..d75f4a5cc680 100644
--- a/contrib/ntp/sntp/tests/networking.cpp
+++ b/contrib/ntp/sntp/tests/g_networking.cpp
@@ -1,4 +1,4 @@
-#include "sntptest.h"
+#include "g_sntptest.h"
 
 extern "C" {
 #include "networking.h"
diff --git a/contrib/ntp/sntp/tests/packetHandling.cpp b/contrib/ntp/sntp/tests/g_packetHandling.cpp
similarity index 99%
rename from contrib/ntp/sntp/tests/packetHandling.cpp
rename to contrib/ntp/sntp/tests/g_packetHandling.cpp
index ef17489bd6b9..bd5b14e0d70c 100644
--- a/contrib/ntp/sntp/tests/packetHandling.cpp
+++ b/contrib/ntp/sntp/tests/g_packetHandling.cpp
@@ -1,4 +1,4 @@
-#include "sntptest.h"
+#include "g_sntptest.h"
 
 extern "C" {
 #include "kod_management.h"
diff --git a/contrib/ntp/sntp/tests/packetProcessing.cpp b/contrib/ntp/sntp/tests/g_packetProcessing.cpp
similarity index 99%
rename from contrib/ntp/sntp/tests/packetProcessing.cpp
rename to contrib/ntp/sntp/tests/g_packetProcessing.cpp
index 322b8938ecc2..85659a43dda5 100644
--- a/contrib/ntp/sntp/tests/packetProcessing.cpp
+++ b/contrib/ntp/sntp/tests/g_packetProcessing.cpp
@@ -1,4 +1,4 @@
-#include "sntptest.h"
+#include "g_sntptest.h"
 
 extern "C" {
 #include "networking.h"
diff --git a/contrib/ntp/sntp/tests/g_sntptest.h b/contrib/ntp/sntp/tests/g_sntptest.h
new file mode 100644
index 000000000000..d5add9cbf465
--- /dev/null
+++ b/contrib/ntp/sntp/tests/g_sntptest.h
@@ -0,0 +1,35 @@
+#ifndef SNTPTEST_H
+#define SNTPTEST_H
+
+#include "tests_main.h"
+
+extern "C" {
+#include "ntp_stdlib.h"
+#include "sntp-opts.h"
+};
+
+class sntptest : public ntptest {
+protected:
+	sntptest() {
+		optionSaveState(&sntpOptions);
+	}
+
+	~sntptest() {
+		optionRestore(&sntpOptions);
+	}
+
+	void ActivateOption(const char* option, const char* argument) {
+		const int ARGV_SIZE = 4;
+
+		char* opts[ARGV_SIZE];
+		
+		opts[0] = estrdup("sntpopts");
+		opts[1] = estrdup(option);
+		opts[2] = estrdup(argument);
+		opts[3] = estrdup("127.0.0.1");
+
+		optionProcess(&sntpOptions, ARGV_SIZE, opts);
+	}
+};
+
+#endif // SNTPTEST_H
diff --git a/contrib/ntp/sntp/tests/keyFile.c b/contrib/ntp/sntp/tests/keyFile.c
new file mode 100644
index 000000000000..3769947c5008
--- /dev/null
+++ b/contrib/ntp/sntp/tests/keyFile.c
@@ -0,0 +1,140 @@
+#include "config.h"
+#include "fileHandlingTest.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_types.h"
+#include "crypto.h"
+
+#include "unity.h"
+
+//typedef int bool;
+
+
+bool CompareKeys(struct key expected, struct key actual) {
+	if (expected.key_id != actual.key_id){
+		printf("Expected key_id: %d", expected.key_id);
+		printf(" but was: %d\n", actual.key_id);
+		return FALSE;
+	}
+	if (expected.key_len != actual.key_len){
+		printf("Expected key_len: %d", expected.key_len);
+		printf(" but was: %d\n", actual.key_len);
+		return FALSE;
+	}
+	if (strcmp(expected.type, actual.type) != 0){
+		printf("Expected key_type: %s", expected.type);
+		printf(" but was: %s\n", actual.type);
+		return FALSE;
+
+	}
+	if (memcmp(expected.key_seq, actual.key_seq, expected.key_len) != 0){
+		printf("Key mismatch!\n");
+		return FALSE;		
+	}
+	return TRUE;
+}
+
+bool CompareKeysAlternative(int key_id,
+	       int key_len,
+	       const char* type,
+	       const char* key_seq,
+	       struct key actual) {
+	struct key temp;
+
+	temp.key_id = key_id;
+	temp.key_len = key_len;
+	strlcpy(temp.type, type, sizeof(temp.type));
+	memcpy(temp.key_seq, key_seq, key_len);
+
+	return CompareKeys(temp, actual);
+}
+
+
+void test_ReadEmptyKeyFile() {
+	struct key* keys = NULL;
+
+	TEST_ASSERT_EQUAL(0, auth_init(CreatePath("key-test-empty", INPUT_DIR), &keys));
+
+	TEST_ASSERT_TRUE(keys == NULL);
+}
+
+void test_ReadASCIIKeys() {
+	struct key* keys = NULL;
+
+	TEST_ASSERT_EQUAL(2, auth_init(CreatePath("key-test-ascii", INPUT_DIR), &keys));
+
+	TEST_ASSERT_TRUE(keys != NULL);
+
+	struct key* result = NULL;
+	get_key(40, &result);
+	TEST_ASSERT_TRUE(result != NULL);
+	TEST_ASSERT_TRUE(CompareKeysAlternative(40, 11, "MD5", "asciikeyTwo", *result));
+
+	result = NULL;
+	get_key(50, &result);
+	TEST_ASSERT_TRUE(result != NULL);
+	TEST_ASSERT_TRUE(CompareKeysAlternative(50, 11, "MD5", "asciikeyOne", *result));
+}
+
+void test_ReadHexKeys() {
+	struct key* keys = NULL;
+
+	TEST_ASSERT_EQUAL(3, auth_init(CreatePath("key-test-hex", INPUT_DIR), &keys));
+
+	TEST_ASSERT_TRUE(keys != NULL);
+
+	struct key* result = NULL;
+	get_key(10, &result);
+	TEST_ASSERT_TRUE(result != NULL);
+	TEST_ASSERT_TRUE(CompareKeysAlternative(10, 13, "MD5",
+		 "\x01\x23\x45\x67\x89\xab\xcd\xef\x01\x23\x45\x67\x89", *result));
+
+	result = NULL;
+	get_key(20, &result);
+	TEST_ASSERT_TRUE(result != NULL);
+	char data1[15]; memset(data1, 0x11, 15);
+	TEST_ASSERT_TRUE(CompareKeysAlternative(20, 15, "MD5", data1, *result));
+
+	result = NULL;
+	get_key(30, &result);
+	TEST_ASSERT_TRUE(result != NULL);
+	char data2[13]; memset(data2, 0x01, 13);
+	TEST_ASSERT_TRUE(CompareKeysAlternative(30, 13, "MD5", data2, *result));
+}
+
+void test_ReadKeyFileWithComments() {
+	struct key* keys = NULL;
+
+	TEST_ASSERT_EQUAL(2, auth_init(CreatePath("key-test-comments", INPUT_DIR), &keys));
+	
+	TEST_ASSERT_TRUE(keys != NULL);
+
+	struct key* result = NULL;
+	get_key(10, &result);
+	TEST_ASSERT_TRUE(result != NULL);
+	char data[15]; memset(data, 0x01, 15);
+	TEST_ASSERT_TRUE(CompareKeysAlternative(10, 15, "MD5", data, *result));
+
+	result = NULL;
+	get_key(34, &result);
+	TEST_ASSERT_TRUE(result != NULL);
+	TEST_ASSERT_TRUE(CompareKeysAlternative(34, 3, "MD5", "xyz", *result));
+}
+
+void test_ReadKeyFileWithInvalidHex() {
+	struct key* keys = NULL;
+
+	TEST_ASSERT_EQUAL(1, auth_init(CreatePath("key-test-invalid-hex", INPUT_DIR), &keys));
+
+	TEST_ASSERT_TRUE(keys != NULL);
+
+	struct key* result = NULL;
+	get_key(10, &result);
+	TEST_ASSERT_TRUE(result != NULL);
+	char data[15]; memset(data, 0x01, 15);
+	TEST_ASSERT_TRUE(CompareKeysAlternative(10, 15, "MD5", data, *result));
+
+	result = NULL;
+	get_key(30, &result); // Should not exist, and result should remain NULL.
+	TEST_ASSERT_TRUE(result == NULL);
+}
diff --git a/contrib/ntp/sntp/tests/keyFile.cpp b/contrib/ntp/sntp/tests/keyFile.cpp
deleted file mode 100644
index 3efbe8f8d8f6..000000000000
--- a/contrib/ntp/sntp/tests/keyFile.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-#include "fileHandlingTest.h"
-
-extern "C" {
-#include "crypto.h"
-};
-
-class keyFileTest : public fileHandlingTest {
-protected:
-	::testing::AssertionResult CompareKeys(key& expected, key& actual) {
-		if (expected.key_id != actual.key_id)
-			return ::testing::AssertionFailure()
-				<< "Expected key_id: " << expected.key_id
-				<< " but was: " << actual.key_id;
-		if (expected.key_len != actual.key_len)
-			return ::testing::AssertionFailure()
-				<< "Expected key_len: " << expected.key_len
-				<< " but was: " << actual.key_len;
-		if (strcmp(expected.type, actual.type) != 0)
-			return ::testing::AssertionFailure()
-				<< "Expected key_type: " << expected.type
-				<< " but was: " << actual.type;
-		if (memcmp(expected.key_seq, actual.key_seq, expected.key_len) != 0)
-			return ::testing::AssertionFailure()
-				<< "Key mismatch!";
-		return ::testing::AssertionSuccess();
-	}
-
-	::testing::AssertionResult CompareKeys(int key_id,
-					       int key_len,
-					       const char* type,
-					       const char* key_seq,
-					       key& actual) {
-		key temp;
-
-		temp.key_id = key_id;
-		temp.key_len = key_len;
-		strlcpy(temp.type, type, sizeof(temp.type));
-		memcpy(temp.key_seq, key_seq, key_len);
-
-		return CompareKeys(temp, actual);
-	}
-};
-
-TEST_F(keyFileTest, ReadEmptyKeyFile) {
-	key* keys = NULL;
-
-	ASSERT_EQ(0, auth_init(CreatePath("key-test-empty", INPUT_DIR).c_str(), &keys));
-
-	EXPECT_TRUE(keys == NULL);
-}
-
-TEST_F(keyFileTest, ReadASCIIKeys) {
-	key* keys = NULL;
-
-	ASSERT_EQ(2, auth_init(CreatePath("key-test-ascii", INPUT_DIR).c_str(), &keys));
-
-	ASSERT_TRUE(keys != NULL);
-
-	key* result = NULL;
-	get_key(40, &result);
-	ASSERT_TRUE(result != NULL);
-	EXPECT_TRUE(CompareKeys(40, 11, "MD5", "asciikeyTwo", *result));
-
-	result = NULL;
-	get_key(50, &result);
-	ASSERT_TRUE(result != NULL);
-	EXPECT_TRUE(CompareKeys(50, 11, "MD5", "asciikeyOne", *result));
-}
-
-TEST_F(keyFileTest, ReadHexKeys) {
-	key* keys = NULL;
-
-	ASSERT_EQ(3, auth_init(CreatePath("key-test-hex", INPUT_DIR).c_str(), &keys));
-
-	ASSERT_TRUE(keys != NULL);
-
-	key* result = NULL;
-	get_key(10, &result);
-	ASSERT_TRUE(result != NULL);
-	EXPECT_TRUE(CompareKeys(10, 13, "MD5",
-		 "\x01\x23\x45\x67\x89\xab\xcd\xef\x01\x23\x45\x67\x89", *result));
-
-	result = NULL;
-	get_key(20, &result);
-	ASSERT_TRUE(result != NULL);
-	char data1[15]; memset(data1, 0x11, 15);
-	EXPECT_TRUE(CompareKeys(20, 15, "MD5", data1, *result));
-
-	result = NULL;
-	get_key(30, &result);
-	ASSERT_TRUE(result != NULL);
-	char data2[13]; memset(data2, 0x01, 13);
-	EXPECT_TRUE(CompareKeys(30, 13, "MD5", data2, *result));
-}
-
-TEST_F(keyFileTest, ReadKeyFileWithComments) {
-	key* keys = NULL;
-
-	ASSERT_EQ(2, auth_init(CreatePath("key-test-comments", INPUT_DIR).c_str(), &keys));
-	
-	ASSERT_TRUE(keys != NULL);
-
-	key* result = NULL;
-	get_key(10, &result);
-	ASSERT_TRUE(result != NULL);
-	char data[15]; memset(data, 0x01, 15);
-	EXPECT_TRUE(CompareKeys(10, 15, "MD5", data, *result));
-
-	result = NULL;
-	get_key(34, &result);
-	ASSERT_TRUE(result != NULL);
-	EXPECT_TRUE(CompareKeys(34, 3, "MD5", "xyz", *result));
-}
-
-TEST_F(keyFileTest, ReadKeyFileWithInvalidHex) {
-	key* keys = NULL;
-
-	ASSERT_EQ(1, auth_init(CreatePath("key-test-invalid-hex", INPUT_DIR).c_str(), &keys));
-
-	ASSERT_TRUE(keys != NULL);
-
-	key* result = NULL;
-	get_key(10, &result);
-	ASSERT_TRUE(result != NULL);
-	char data[15]; memset(data, 0x01, 15);
-	EXPECT_TRUE(CompareKeys(10, 15, "MD5", data, *result));
-
-	result = NULL;
-	get_key(30, &result); // Should not exist, and result should remain NULL.
-	ASSERT_TRUE(result == NULL);
-}
diff --git a/contrib/ntp/sntp/tests/kodDatabase.c b/contrib/ntp/sntp/tests/kodDatabase.c
new file mode 100644
index 000000000000..a6b86d06bf00
--- /dev/null
+++ b/contrib/ntp/sntp/tests/kodDatabase.c
@@ -0,0 +1,126 @@
+#include "config.h"
+
+#include "ntp_types.h"
+#include "sntptest.h"
+#include "ntp_stdlib.h"
+#include "sntp-opts.h"
+
+#include "kod_management.h"
+
+#include "unity.h"
+
+void setUp(void)
+{
+	kod_init_kod_db("/dev/null", TRUE);
+}
+
+void tearDown(void)
+{
+}
+
+
+void test_SingleEntryHandling() {
+	char HOST[] = "192.0.2.5";
+	char REASON[] = "DENY";
+
+	add_entry(HOST, REASON);
+
+	struct kod_entry* result;
+
+	TEST_ASSERT_EQUAL(1, search_entry(HOST, &result));
+	TEST_ASSERT_EQUAL_STRING(HOST, result->hostname);
+	TEST_ASSERT_EQUAL_STRING(REASON, result->type);
+}
+
+void test_MultipleEntryHandling() {
+	char HOST1[] = "192.0.2.3";
+	char REASON1[] = "DENY";
+
+	char HOST2[] = "192.0.5.5";
+	char REASON2[] = "RATE";
+
+	char HOST3[] = "192.0.10.1";
+	char REASON3[] = "DENY";
+
+	add_entry(HOST1, REASON1);
+	add_entry(HOST2, REASON2);
+	add_entry(HOST3, REASON3);
+
+	struct kod_entry* result;
+
+	TEST_ASSERT_EQUAL(1, search_entry(HOST1, &result));
+	TEST_ASSERT_EQUAL_STRING(HOST1, result->hostname);
+	TEST_ASSERT_EQUAL_STRING(REASON1, result->type);
+
+	TEST_ASSERT_EQUAL(1, search_entry(HOST2, &result));
+	TEST_ASSERT_EQUAL_STRING(HOST2, result->hostname);
+	TEST_ASSERT_EQUAL_STRING(REASON2, result->type);
+
+	TEST_ASSERT_EQUAL(1, search_entry(HOST3, &result));
+	TEST_ASSERT_EQUAL_STRING(HOST3, result->hostname);
+	TEST_ASSERT_EQUAL_STRING(REASON3, result->type);
+
+	free(result);
+}
+
+void test_NoMatchInSearch() {
+	char HOST_ADD[] = "192.0.2.6";
+	char HOST_NOTADD[] = "192.0.6.1";
+	char REASON[] = "DENY";
+
+	add_entry(HOST_ADD, REASON);
+
+	struct kod_entry* result;
+
+	TEST_ASSERT_EQUAL(0, search_entry(HOST_NOTADD, &result));
+	TEST_ASSERT_TRUE(result == NULL);
+}
+
+void test_AddDuplicate() {
+	char HOST[] = "192.0.2.3";
+	char REASON1[] = "RATE";
+	char REASON2[] = "DENY";
+
+	add_entry(HOST, REASON1);
+	struct kod_entry* result1;
+	TEST_ASSERT_EQUAL(1, search_entry(HOST, &result1));
+
+	/* 
+	 * Sleeps for two seconds since we want to ensure that
+	 * the timestamp is updated to a new value.
+	 */
+	sleep(2);
+
+	add_entry(HOST, REASON2);
+	struct kod_entry* result2;
+	TEST_ASSERT_EQUAL(1, search_entry(HOST, &result2));
+
+	TEST_ASSERT_FALSE(result1->timestamp == result2->timestamp);
+
+	free(result1);
+	free(result2);
+}
+
+void test_DeleteEntry() {
+	char HOST1[] = "192.0.2.1";
+	char HOST2[] = "192.0.2.2";
+	char HOST3[] = "192.0.2.3";
+	char REASON[] = "DENY";
+
+	add_entry(HOST1, REASON);
+	add_entry(HOST2, REASON);
+	add_entry(HOST3, REASON);
+
+	struct kod_entry* result;
+	
+	TEST_ASSERT_EQUAL(1, search_entry(HOST2, &result));
+	free(result);
+
+	delete_entry(HOST2, REASON);
+
+	TEST_ASSERT_EQUAL(0, search_entry(HOST2, &result));
+
+	// Ensure that the other entry is still there.
+	TEST_ASSERT_EQUAL(1, search_entry(HOST1, &result));
+	free(result);
+}
diff --git a/contrib/ntp/sntp/tests/kodDatabase.cpp b/contrib/ntp/sntp/tests/kodDatabase.cpp
deleted file mode 100644
index 515f4337a3e4..000000000000
--- a/contrib/ntp/sntp/tests/kodDatabase.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include "sntptest.h"
-
-extern "C" {
-#include "kod_management.h"
-};
-
-class kodDatabaseTest : public sntptest {
-protected:
-	virtual void SetUp() {
-		kod_init_kod_db("/dev/null", TRUE);
-	}
-};
-
-TEST_F(kodDatabaseTest, SingleEntryHandling) {
-	char HOST[] = "192.0.2.5";
-	char REASON[] = "DENY";
-
-	add_entry(HOST, REASON);
-
-	kod_entry* result;
-
-	EXPECT_EQ(1, search_entry(HOST, &result));
-	EXPECT_STREQ(HOST, result->hostname);
-	EXPECT_STREQ(REASON, result->type);
-}
-
-TEST_F(kodDatabaseTest, MultipleEntryHandling) {
-	char HOST1[] = "192.0.2.3";
-	char REASON1[] = "DENY";
-
-	char HOST2[] = "192.0.5.5";
-	char REASON2[] = "RATE";
-
-	char HOST3[] = "192.0.10.1";
-	char REASON3[] = "DENY";
-
-	add_entry(HOST1, REASON1);
-	add_entry(HOST2, REASON2);
-	add_entry(HOST3, REASON3);
-
-	kod_entry* result;
-
-	EXPECT_EQ(1, search_entry(HOST1, &result));
-	EXPECT_STREQ(HOST1, result->hostname);
-	EXPECT_STREQ(REASON1, result->type);
-
-	EXPECT_EQ(1, search_entry(HOST2, &result));
-	EXPECT_STREQ(HOST2, result->hostname);
-	EXPECT_STREQ(REASON2, result->type);
-
-	EXPECT_EQ(1, search_entry(HOST3, &result));
-	EXPECT_STREQ(HOST3, result->hostname);
-	EXPECT_STREQ(REASON3, result->type);
-
-	free(result);
-}
-
-TEST_F(kodDatabaseTest, NoMatchInSearch) {
-	char HOST_ADD[] = "192.0.2.6";
-	char HOST_NOTADD[] = "192.0.6.1";
-	char REASON[] = "DENY";
-
-	add_entry(HOST_ADD, REASON);
-
-	kod_entry* result;
-
-	EXPECT_EQ(0, search_entry(HOST_NOTADD, &result));
-	EXPECT_TRUE(result == NULL);
-}
-
-TEST_F(kodDatabaseTest, AddDuplicate) {
-	char HOST[] = "192.0.2.3";
-	char REASON1[] = "RATE";
-	char REASON2[] = "DENY";
-
-	add_entry(HOST, REASON1);
-	kod_entry* result1;
-	ASSERT_EQ(1, search_entry(HOST, &result1));
-
-	/* 
-	 * Sleeps for two seconds since we want to ensure that
-	 * the timestamp is updated to a new value.
-	 */
-	sleep(2);
-
-	add_entry(HOST, REASON2);
-	kod_entry* result2;
-	ASSERT_EQ(1, search_entry(HOST, &result2));
-
-	EXPECT_NE(result1->timestamp, result2->timestamp);
-
-	free(result1);
-	free(result2);
-}
-
-TEST_F(kodDatabaseTest, DeleteEntry) {
-	char HOST1[] = "192.0.2.1";
-	char HOST2[] = "192.0.2.2";
-	char HOST3[] = "192.0.2.3";
-	char REASON[] = "DENY";
-
-	add_entry(HOST1, REASON);
-	add_entry(HOST2, REASON);
-	add_entry(HOST3, REASON);
-
-	kod_entry* result;
-	
-	ASSERT_EQ(1, search_entry(HOST2, &result));
-	free(result);
-
-	delete_entry(HOST2, REASON);
-
-	EXPECT_EQ(0, search_entry(HOST2, &result));
-
-	// Ensure that the other entry is still there.
-	EXPECT_EQ(1, search_entry(HOST1, &result));
-	free(result);
-}
diff --git a/contrib/ntp/sntp/tests/kodFile.c b/contrib/ntp/sntp/tests/kodFile.c
new file mode 100644
index 000000000000..7daec212692e
--- /dev/null
+++ b/contrib/ntp/sntp/tests/kodFile.c
@@ -0,0 +1,145 @@
+#include "config.h"
+#include "ntp_types.h"
+#include "ntp_stdlib.h" // For estrdup()
+
+
+#include "fileHandlingTest.h"
+
+#include "kod_management.h"
+
+#include "unity.h"
+
+/*
+ * We access some parts of the kod database directly, without
+ * going through the public interface
+ */
+extern int kod_db_cnt;
+extern struct kod_entry** kod_db;
+extern char* kod_db_file;
+
+void setUp() {
+		kod_db_cnt = 0;
+		kod_db = NULL;
+}
+
+void tearDown() {
+}
+
+
+void test_ReadEmptyFile() {
+	kod_init_kod_db(CreatePath("kod-test-empty", INPUT_DIR), TRUE);
+
+	TEST_ASSERT_EQUAL(0, kod_db_cnt);
+}
+
+void test_ReadCorrectFile() {
+	kod_init_kod_db(CreatePath("kod-test-correct", INPUT_DIR), TRUE);
+	
+	TEST_ASSERT_EQUAL(2, kod_db_cnt);
+
+	struct kod_entry* res;
+
+	TEST_ASSERT_EQUAL(1, search_entry("192.0.2.5", &res));
+	TEST_ASSERT_EQUAL_STRING("DENY", res->type);
+	TEST_ASSERT_EQUAL_STRING("192.0.2.5", res->hostname);
+	TEST_ASSERT_EQUAL(0x12345678, res->timestamp);
+
+	TEST_ASSERT_EQUAL(1, search_entry("192.0.2.100", &res));
+	TEST_ASSERT_EQUAL_STRING("RSTR", res->type);
+	TEST_ASSERT_EQUAL_STRING("192.0.2.100", res->hostname);
+	TEST_ASSERT_EQUAL(0xfff, res->timestamp);
+}
+
+void test_ReadFileWithBlankLines() {
+	kod_init_kod_db(CreatePath("kod-test-blanks", INPUT_DIR), TRUE);
+
+	TEST_ASSERT_EQUAL(3, kod_db_cnt);
+
+	struct kod_entry* res;
+
+	TEST_ASSERT_EQUAL(1, search_entry("192.0.2.5", &res));
+	TEST_ASSERT_EQUAL_STRING("DENY", res->type);
+	TEST_ASSERT_EQUAL_STRING("192.0.2.5", res->hostname);
+	TEST_ASSERT_EQUAL(0x12345678, res->timestamp);
+
+	TEST_ASSERT_EQUAL(1, search_entry("192.0.2.100", &res));
+	TEST_ASSERT_EQUAL_STRING("RSTR", res->type);
+	TEST_ASSERT_EQUAL_STRING("192.0.2.100", res->hostname);
+	TEST_ASSERT_EQUAL(0xfff, res->timestamp);
+
+	TEST_ASSERT_EQUAL(1, search_entry("example.com", &res));
+	TEST_ASSERT_EQUAL_STRING("DENY", res->type);
+	TEST_ASSERT_EQUAL_STRING("example.com", res->hostname);
+	TEST_ASSERT_EQUAL(0xabcd, res->timestamp);
+}
+
+void test_WriteEmptyFile() {
+	//kod_db_file = estrdup(CreatePath("kod-output-blank", OUTPUT_DIR)); //causing issues on psp-at1, replaced
+	kod_db_file = estrdup("kod-output-blank");
+	//printf("kod PATH: %s\n",kod_db_file);
+	write_kod_db();
+
+	// Open file and ensure that the filesize is 0 bytes.
+	FILE * is;
+	is = fopen(kod_db_file, "rb");//std::ios::binary);
+	TEST_ASSERT_FALSE(is == NULL );//is.fail());
+	
+	TEST_ASSERT_EQUAL(0, GetFileSize(is));
+
+	fclose(is);
+}
+
+void test_WriteFileWithSingleEntry() {
+	//kod_db_file = estrdup(CreatePath("kod-output-single", OUTPUT_DIR)); //causing issues on psp-at1, replaced
+	kod_db_file = estrdup("kod-output-single"); 
+    	//printf("kod PATH: %s\n",kod_db_file);
+	add_entry("host1", "DENY");
+
+	// Here we must manipulate the timestamps, so they match the one in
+	// the expected file.
+	//
+	kod_db[0]->timestamp = 1;
+
+	write_kod_db();
+
+	// Open file and compare sizes.
+	FILE * actual = fopen(kod_db_file, "rb");
+	FILE * expected = fopen(CreatePath("kod-expected-single", INPUT_DIR),"rb");
+	TEST_ASSERT_TRUE(actual !=NULL);//TEST_ASSERT_TRUE(actual.good());
+	TEST_ASSERT_TRUE(expected !=NULL);//TEST_ASSERT_TRUE(expected.good());
+
+	TEST_ASSERT_EQUAL(GetFileSize(expected), GetFileSize(actual));
+
+	TEST_ASSERT_TRUE(CompareFileContent(expected, actual));
+}
+
+void test_WriteFileWithMultipleEntries() {
+	//kod_db_file = estrdup(CreatePath("kod-output-multiple", OUTPUT_DIR)); //causing issues on psp-at1, replaced
+	kod_db_file = estrdup("kod-output-multiple");
+    	//printf("kod PATH: %s\n",kod_db_file);
+	add_entry("example.com", "RATE");
+	add_entry("192.0.2.1", "DENY");
+	add_entry("192.0.2.5", "RSTR");
+
+	//
+	// Manipulate timestamps. This is a bit of a hack, ideally these
+	// tests should not care about the internal representation.
+	//
+	kod_db[0]->timestamp = 0xabcd;
+	kod_db[1]->timestamp = 0xabcd;
+	kod_db[2]->timestamp = 0xabcd;
+
+	write_kod_db();
+
+	// Open file and compare sizes and content.
+	FILE * actual = fopen(kod_db_file, "rb");
+	FILE * expected = fopen(CreatePath("kod-expected-multiple", INPUT_DIR),"rb");
+	TEST_ASSERT_TRUE(actual !=NULL);//TEST_ASSERT_TRUE(actual.good());
+	TEST_ASSERT_TRUE(expected !=NULL);//TEST_ASSERT_TRUE(expected.good());
+
+	
+	TEST_ASSERT_EQUAL(GetFileSize(expected), GetFileSize(actual));
+
+	TEST_ASSERT_TRUE(CompareFileContent(expected, actual));
+}
+
diff --git a/contrib/ntp/sntp/tests/kodFile.cpp b/contrib/ntp/sntp/tests/kodFile.cpp
deleted file mode 100644
index e1775f6374fa..000000000000
--- a/contrib/ntp/sntp/tests/kodFile.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#include "fileHandlingTest.h"
-
-extern "C" {
-#include "kod_management.h"
-
-#include "ntp_stdlib.h" // For estrdup()
-};
-
-/*
- * We access some parts of the kod database directly, without
- * going through the public interface
- */
-extern int kod_db_cnt;
-extern kod_entry** kod_db;
-extern char* kod_db_file;
-
-class kodFileTest : public fileHandlingTest {
-protected:
-	virtual void SetUp() {
-		kod_db_cnt = 0;
-		kod_db = NULL;
-	}
-
-	virtual void TearDown() {
-	}
-};
-
-TEST_F(kodFileTest, ReadEmptyFile) {
-	kod_init_kod_db(CreatePath("kod-test-empty", INPUT_DIR).c_str(), TRUE);
-
-	EXPECT_EQ(0, kod_db_cnt);
-}
-
-TEST_F(kodFileTest, ReadCorrectFile) {
-	kod_init_kod_db(CreatePath("kod-test-correct", INPUT_DIR).c_str(), TRUE);
-	
-	EXPECT_EQ(2, kod_db_cnt);
-
-	kod_entry* res;
-
-	ASSERT_EQ(1, search_entry("192.0.2.5", &res));
-	EXPECT_STREQ("DENY", res->type);
-	EXPECT_STREQ("192.0.2.5", res->hostname);
-	EXPECT_EQ(0x12345678, res->timestamp);
-
-	ASSERT_EQ(1, search_entry("192.0.2.100", &res));
-	EXPECT_STREQ("RSTR", res->type);
-	EXPECT_STREQ("192.0.2.100", res->hostname);
-	EXPECT_EQ(0xfff, res->timestamp);
-}
-
-TEST_F(kodFileTest, ReadFileWithBlankLines) {
-	kod_init_kod_db(CreatePath("kod-test-blanks", INPUT_DIR).c_str(), TRUE);
-
-	EXPECT_EQ(3, kod_db_cnt);
-
-	kod_entry* res;
-
-	ASSERT_EQ(1, search_entry("192.0.2.5", &res));
-	EXPECT_STREQ("DENY", res->type);
-	EXPECT_STREQ("192.0.2.5", res->hostname);
-	EXPECT_EQ(0x12345678, res->timestamp);
-
-	ASSERT_EQ(1, search_entry("192.0.2.100", &res));
-	EXPECT_STREQ("RSTR", res->type);
-	EXPECT_STREQ("192.0.2.100", res->hostname);
-	EXPECT_EQ(0xfff, res->timestamp);
-
-	ASSERT_EQ(1, search_entry("example.com", &res));
-	EXPECT_STREQ("DENY", res->type);
-	EXPECT_STREQ("example.com", res->hostname);
-	EXPECT_EQ(0xabcd, res->timestamp);
-}
-
-TEST_F(kodFileTest, WriteEmptyFile) {
-	kod_db_file = estrdup(CreatePath("kod-output-blank", OUTPUT_DIR).c_str());
-
-	write_kod_db();
-
-	// Open file and ensure that the filesize is 0 bytes.
-	std::ifstream is(kod_db_file, std::ios::binary);
-	ASSERT_FALSE(is.fail());
-	
-	EXPECT_EQ(0, GetFileSize(is));
-
-	is.close();
-}
-
-TEST_F(kodFileTest, WriteFileWithSingleEntry) {
-	kod_db_file = estrdup(CreatePath("kod-output-single", OUTPUT_DIR).c_str());
-
-	add_entry("host1", "DENY");
-
-	/* Here we must manipulate the timestamps, so they match the one in
-	 * the expected file.
-	 */
-	kod_db[0]->timestamp = 1;
-
-	write_kod_db();
-
-	// Open file and compare sizes.
-	ifstream actual(kod_db_file, ios::binary);
-	ifstream expected(CreatePath("kod-expected-single", INPUT_DIR).c_str());
-	ASSERT_TRUE(actual.good());
-	ASSERT_TRUE(expected.good());
-
-	ASSERT_EQ(GetFileSize(expected), GetFileSize(actual));
-
-	CompareFileContent(expected, actual);
-}
-
-TEST_F(kodFileTest, WriteFileWithMultipleEntries) {
-	kod_db_file = estrdup(CreatePath("kod-output-multiple", OUTPUT_DIR).c_str());
-
-	add_entry("example.com", "RATE");
-	add_entry("192.0.2.1", "DENY");
-	add_entry("192.0.2.5", "RSTR");
-
-	/*
-	 * Manipulate timestamps. This is a bit of a hack, ideally these
-	 * tests should not care about the internal representation.
-	 */
-	kod_db[0]->timestamp = 0xabcd;
-	kod_db[1]->timestamp = 0xabcd;
-	kod_db[2]->timestamp = 0xabcd;
-
-	write_kod_db();
-
-	// Open file and compare sizes and content.
-	ifstream actual(kod_db_file, ios::binary);
-	ifstream expected(CreatePath("kod-expected-multiple", INPUT_DIR).c_str());
-	ASSERT_TRUE(actual.good());
-	ASSERT_TRUE(expected.good());
-	
-	ASSERT_EQ(GetFileSize(expected), GetFileSize(actual));
-
-	CompareFileContent(expected, actual);
-}
diff --git a/contrib/ntp/sntp/tests/networking.c b/contrib/ntp/sntp/tests/networking.c
new file mode 100644
index 000000000000..e2e37123952e
--- /dev/null
+++ b/contrib/ntp/sntp/tests/networking.c
@@ -0,0 +1,7 @@
+#include "config.h"
+
+#include "sntptest.h"
+
+#include "networking.h"
+
+#include "unity.h"
diff --git a/contrib/ntp/sntp/tests/packetHandling.c b/contrib/ntp/sntp/tests/packetHandling.c
new file mode 100644
index 000000000000..4cb5a91c9308
--- /dev/null
+++ b/contrib/ntp/sntp/tests/packetHandling.c
@@ -0,0 +1,274 @@
+#include "config.h"
+#include "ntp_debug.h"
+#include "ntp_stdlib.h"
+#include "ntp_types.h"
+
+#include "sntptest.h"
+
+#include "kod_management.h"
+#include "main.h"
+#include "networking.h"
+#include "ntp.h"
+
+#include "unity.h"
+
+
+int counter = 0;
+
+
+// old code from google test framework, moved to SetUp() for unity
+void setUp(void)
+{ 
+	init_lib(); 
+}
+
+
+
+int LfpEquality(const l_fp expected, const l_fp actual) {
+		if (L_ISEQU(&expected, &actual)) {
+			return TRUE; 
+		} else {
+			return FALSE;
+		}
+}
+
+void test_GenerateUnauthenticatedPacket(void) {
+	struct pkt testpkt;
+
+	struct timeval xmt;
+	GETTIMEOFDAY(&xmt, NULL);
+	xmt.tv_sec += JAN_1970;
+
+	TEST_ASSERT_EQUAL(LEN_PKT_NOMAC,
+			  generate_pkt(&testpkt, &xmt, 0, NULL));
+
+	TEST_ASSERT_EQUAL(LEAP_NOTINSYNC, PKT_LEAP(testpkt.li_vn_mode));
+	TEST_ASSERT_EQUAL(NTP_VERSION, PKT_VERSION(testpkt.li_vn_mode));
+	TEST_ASSERT_EQUAL(MODE_CLIENT, PKT_MODE(testpkt.li_vn_mode));
+
+	TEST_ASSERT_EQUAL(STRATUM_UNSPEC, PKT_TO_STRATUM(testpkt.stratum));
+	TEST_ASSERT_EQUAL(8, testpkt.ppoll);
+
+	l_fp expected_xmt, actual_xmt;
+	TVTOTS(&xmt, &expected_xmt);
+	NTOHL_FP(&testpkt.xmt, &actual_xmt);
+	TEST_ASSERT_TRUE(LfpEquality(expected_xmt, actual_xmt));
+}
+
+void test_GenerateAuthenticatedPacket(void) {
+	struct key testkey;
+	testkey.next = NULL;
+	testkey.key_id = 30;
+	testkey.key_len = 9;
+	memcpy(testkey.key_seq, "123456789", testkey.key_len);
+	memcpy(testkey.type, "MD5", 3);
+
+	struct pkt testpkt;
+
+	struct timeval xmt;
+	GETTIMEOFDAY(&xmt, NULL);
+	xmt.tv_sec += JAN_1970;
+
+	const int EXPECTED_PKTLEN = LEN_PKT_NOMAC + MAX_MD5_LEN;
+
+	TEST_ASSERT_EQUAL(EXPECTED_PKTLEN,
+			  generate_pkt(&testpkt, &xmt, testkey.key_id, &testkey));
+
+	TEST_ASSERT_EQUAL(LEAP_NOTINSYNC, PKT_LEAP(testpkt.li_vn_mode));
+	TEST_ASSERT_EQUAL(NTP_VERSION, PKT_VERSION(testpkt.li_vn_mode));
+	TEST_ASSERT_EQUAL(MODE_CLIENT, PKT_MODE(testpkt.li_vn_mode));
+
+	TEST_ASSERT_EQUAL(STRATUM_UNSPEC, PKT_TO_STRATUM(testpkt.stratum));
+	TEST_ASSERT_EQUAL(8, testpkt.ppoll);
+
+	l_fp expected_xmt, actual_xmt;
+	TVTOTS(&xmt, &expected_xmt);
+	NTOHL_FP(&testpkt.xmt, &actual_xmt);
+	TEST_ASSERT_TRUE(LfpEquality(expected_xmt, actual_xmt));
+
+	TEST_ASSERT_EQUAL(testkey.key_id, ntohl(testpkt.exten[0]));
+	
+	char expected_mac[MAX_MD5_LEN];
+	TEST_ASSERT_EQUAL(MAX_MD5_LEN - 4, // Remove the key_id, only keep the mac.
+			  make_mac((char*)&testpkt, LEN_PKT_NOMAC, MAX_MD5_LEN, &testkey, expected_mac));
+	TEST_ASSERT_TRUE(memcmp(expected_mac, (char*)&testpkt.exten[1], MAX_MD5_LEN -4) == 0);
+}
+
+void test_OffsetCalculationPositiveOffset(void) {
+	struct pkt rpkt;
+
+	rpkt.precision = -16; // 0,000015259
+	rpkt.rootdelay = HTONS_FP(DTOUFP(0.125));
+	rpkt.rootdisp = HTONS_FP(DTOUFP(0.25));
+	// Synch Distance: (0.125+0.25)/2.0 == 0.1875
+	l_fp reftime;
+	get_systime(&reftime);
+	HTONL_FP(&reftime, &rpkt.reftime);
+
+	l_fp tmp;
+
+	// T1 - Originate timestamp
+	tmp.l_ui = 1000000000UL;
+	tmp.l_uf = 0UL;
+	HTONL_FP(&tmp, &rpkt.org);
+
+	// T2 - Receive timestamp
+	tmp.l_ui = 1000000001UL;
+	tmp.l_uf = 2147483648UL;
+	HTONL_FP(&tmp, &rpkt.rec);
+
+	// T3 - Transmit timestamp
+	tmp.l_ui = 1000000002UL;
+	tmp.l_uf = 0UL;
+	HTONL_FP(&tmp, &rpkt.xmt);
+
+	// T4 - Destination timestamp as standard timeval
+	tmp.l_ui = 1000000001UL;
+	tmp.l_uf = 0UL;
+	struct timeval dst;
+	TSTOTV(&tmp, &dst);
+	dst.tv_sec -= JAN_1970;
+
+	double offset, precision, synch_distance;
+	offset_calculation(&rpkt, LEN_PKT_NOMAC, &dst, &offset, &precision, &synch_distance);
+
+	TEST_ASSERT_EQUAL_FLOAT(1.25, offset);
+	TEST_ASSERT_EQUAL_FLOAT(1. / ULOGTOD(16), precision);
+	// 1.1250150000000001 ?
+	TEST_ASSERT_EQUAL_FLOAT(1.125015, synch_distance);
+}
+
+void test_OffsetCalculationNegativeOffset(void) {
+	struct pkt rpkt;
+
+	rpkt.precision = -1;
+	rpkt.rootdelay = HTONS_FP(DTOUFP(0.5));
+	rpkt.rootdisp = HTONS_FP(DTOUFP(0.5));
+	// Synch Distance is (0.5+0.5)/2.0, or 0.5
+	l_fp reftime;
+	get_systime(&reftime);
+	HTONL_FP(&reftime, &rpkt.reftime);
+
+	l_fp tmp;
+
+	// T1 - Originate timestamp
+	tmp.l_ui = 1000000001UL;
+	tmp.l_uf = 0UL;
+	HTONL_FP(&tmp, &rpkt.org);
+
+	// T2 - Receive timestamp
+	tmp.l_ui = 1000000000UL;
+	tmp.l_uf = 2147483648UL;
+	HTONL_FP(&tmp, &rpkt.rec);
+
+	// T3 - Transmit timestamp
+	tmp.l_ui = 1000000001UL;
+	tmp.l_uf = 2147483648UL;
+	HTONL_FP(&tmp, &rpkt.xmt);
+
+	// T4 - Destination timestamp as standard timeval
+	tmp.l_ui = 1000000003UL;
+	tmp.l_uf = 0UL;
+	struct timeval dst;
+	TSTOTV(&tmp, &dst);
+	dst.tv_sec -= JAN_1970;
+
+	double offset, precision, synch_distance;
+	offset_calculation(&rpkt, LEN_PKT_NOMAC, &dst, &offset, &precision, &synch_distance);
+
+	TEST_ASSERT_EQUAL_FLOAT(-1, offset);
+	TEST_ASSERT_EQUAL_FLOAT(1. / ULOGTOD(1), precision);
+	TEST_ASSERT_EQUAL_FLOAT(1.3333483333333334, synch_distance);
+}
+
+void test_HandleUnusableServer(void) {
+	struct pkt		rpkt;
+	sockaddr_u	host;
+	int		rpktl;
+
+	ZERO(rpkt);
+	ZERO(host);
+	rpktl = SERVER_UNUSEABLE;
+	TEST_ASSERT_EQUAL(-1, handle_pkt(rpktl, &rpkt, &host, ""));
+}
+
+void test_HandleUnusablePacket(void) {
+	struct pkt		rpkt;
+	sockaddr_u	host;
+	int		rpktl;
+
+	ZERO(rpkt);
+	ZERO(host);
+	rpktl = PACKET_UNUSEABLE;
+	TEST_ASSERT_EQUAL(1, handle_pkt(rpktl, &rpkt, &host, ""));
+}
+
+void test_HandleServerAuthenticationFailure(void) {
+	struct pkt		rpkt;
+	sockaddr_u	host;
+	int		rpktl;
+
+	ZERO(rpkt);
+	ZERO(host);
+	rpktl = SERVER_AUTH_FAIL;
+	TEST_ASSERT_EQUAL(1, handle_pkt(rpktl, &rpkt, &host, ""));
+}
+
+void test_HandleKodDemobilize(void) {
+	const char *	HOSTNAME = "192.0.2.1";
+	const char *	REASON = "DENY";
+	struct pkt		rpkt;
+	sockaddr_u	host;
+	int		rpktl;
+	struct kod_entry *	entry;
+
+	rpktl = KOD_DEMOBILIZE;
+	ZERO(rpkt);
+	memcpy(&rpkt.refid, REASON, 4);
+	ZERO(host);
+	host.sa4.sin_family = AF_INET;
+	host.sa4.sin_addr.s_addr = inet_addr(HOSTNAME);
+
+	// Test that the KOD-entry is added to the database.
+	kod_init_kod_db("/dev/null", TRUE);
+
+	TEST_ASSERT_EQUAL(1, handle_pkt(rpktl, &rpkt, &host, HOSTNAME));
+
+	TEST_ASSERT_EQUAL(1, search_entry(HOSTNAME, &entry));
+	TEST_ASSERT_TRUE(memcmp(REASON, entry->type, 4) == 0);
+}
+
+void test_HandleKodRate(void) {
+	struct 	pkt		rpkt;
+	sockaddr_u	host;
+	int		rpktl;
+
+	ZERO(rpkt);
+	ZERO(host);
+	rpktl = KOD_RATE;
+	TEST_ASSERT_EQUAL(1, handle_pkt(rpktl, &rpkt, &host, ""));
+}
+
+void test_HandleCorrectPacket(void) {
+	struct pkt		rpkt;
+	sockaddr_u	host;
+	int		rpktl;
+	l_fp		now;
+
+	// We don't want our testing code to actually change the system clock.
+	TEST_ASSERT_FALSE(ENABLED_OPT(STEP));
+	TEST_ASSERT_FALSE(ENABLED_OPT(SLEW));
+
+	get_systime(&now);
+	HTONL_FP(&now, &rpkt.reftime);
+	HTONL_FP(&now, &rpkt.org);
+	HTONL_FP(&now, &rpkt.rec);
+	HTONL_FP(&now, &rpkt.xmt);
+	rpktl = LEN_PKT_NOMAC;
+	ZERO(host);
+	AF(&host) = AF_INET;
+
+	TEST_ASSERT_EQUAL(0, handle_pkt(rpktl, &rpkt, &host, ""));
+}
+
+/* packetHandling.c */
diff --git a/contrib/ntp/sntp/tests/packetProcessing.c b/contrib/ntp/sntp/tests/packetProcessing.c
new file mode 100644
index 000000000000..27ab72e4d433
--- /dev/null
+++ b/contrib/ntp/sntp/tests/packetProcessing.c
@@ -0,0 +1,339 @@
+#include "config.h"
+#include "sntptest.h"
+#include "networking.h"
+#include "ntp_stdlib.h"
+#include "unity.h"
+
+const char * Version = "stub unit test Version string";
+
+// Hacks into the key database.
+extern struct key* key_ptr;
+extern int key_cnt;
+
+
+static struct pkt testpkt;
+static struct pkt testspkt;
+static sockaddr_u testsock;
+bool restoreKeyDb;
+
+void PrepareAuthenticationTest(int key_id,
+							   int key_len,
+							   const char* type,
+							   const void* key_seq) {
+	char str[25];
+	sprintf(str, "%d", key_id);
+	ActivateOption("-a", str);
+
+	key_cnt = 1;
+	key_ptr = malloc(sizeof(struct key));
+	key_ptr->next = NULL;
+	key_ptr->key_id = key_id;
+	key_ptr->key_len = key_len;
+	memcpy(key_ptr->type, "MD5", 3);
+
+	TEST_ASSERT_TRUE(key_len < sizeof(key_ptr->key_seq));
+
+	memcpy(key_ptr->key_seq, key_seq, key_ptr->key_len);
+	restoreKeyDb = true;
+}
+
+void PrepareAuthenticationTestMD5(int key_id,
+							   int key_len,
+							   const void* key_seq) {
+	PrepareAuthenticationTest(key_id, key_len, "MD5", key_seq);
+}
+
+void setUp() {
+
+	sntptest();
+	restoreKeyDb = false;
+
+	/* Initialize the test packet and socket,
+	 * so they contain at least some valid data. */
+	testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING, NTP_VERSION,
+										MODE_SERVER);
+	testpkt.stratum = STRATUM_REFCLOCK;
+	memcpy(&testpkt.refid, "GPS\0", 4);
+
+	/* Set the origin timestamp of the received packet to the
+	 * same value as the transmit timestamp of the sent packet. */
+	l_fp tmp;
+	tmp.l_ui = 1000UL;
+	tmp.l_uf = 0UL;
+
+	HTONL_FP(&tmp, &testpkt.org);
+	HTONL_FP(&tmp, &testspkt.xmt);
+
+}
+
+void tearDown() {
+	
+	if (restoreKeyDb) {
+		key_cnt = 0;
+		free(key_ptr);
+		key_ptr = NULL;
+	}
+
+	sntptest_destroy(); //only on the final test!! if counter == 0 etc...
+
+}
+
+
+
+void test_TooShortLength(void) {
+	TEST_ASSERT_EQUAL(PACKET_UNUSEABLE,
+			  process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC - 1,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+	TEST_ASSERT_EQUAL(PACKET_UNUSEABLE,
+			  process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC - 1,
+						  MODE_BROADCAST, &testspkt, "UnitTest"));
+}
+
+void test_LengthNotMultipleOfFour(void) {
+	TEST_ASSERT_EQUAL(PACKET_UNUSEABLE,
+			  process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC + 6,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+	TEST_ASSERT_EQUAL(PACKET_UNUSEABLE,
+			  process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC + 3,
+						  MODE_BROADCAST, &testspkt, "UnitTest"));
+}
+
+void test_TooShortExtensionFieldLength(void) {
+	/* The lower 16-bits are the length of the extension field.
+	 * This lengths must be multiples of 4 bytes, which gives
+	 * a minimum of 4 byte extension field length. */
+	testpkt.exten[7] = htonl(3); // 3 bytes is too short.
+
+	/* We send in a pkt_len of header size + 4 byte extension
+	 * header + 24 byte MAC, this prevents the length error to
+	 * be caught at an earlier stage */
+	int pkt_len = LEN_PKT_NOMAC + 4 + 24;
+
+	TEST_ASSERT_EQUAL(PACKET_UNUSEABLE,
+			  process_pkt(&testpkt, &testsock, pkt_len,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+void test_UnauthenticatedPacketReject(void) {
+	//sntptest();
+	// Activate authentication option
+	ActivateOption("-a", "123");
+	TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION));
+
+	int pkt_len = LEN_PKT_NOMAC;
+
+	// We demand authentication, but no MAC header is present.
+	TEST_ASSERT_EQUAL(SERVER_AUTH_FAIL,
+			  process_pkt(&testpkt, &testsock, pkt_len,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+void test_CryptoNAKPacketReject(void) {
+	// Activate authentication option
+	ActivateOption("-a", "123");
+	TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION));
+
+	int pkt_len = LEN_PKT_NOMAC + 4; // + 4 byte MAC = Crypto-NAK
+
+	TEST_ASSERT_EQUAL(SERVER_AUTH_FAIL,
+			  process_pkt(&testpkt, &testsock, pkt_len,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+void test_AuthenticatedPacketInvalid(void) {
+	// Activate authentication option
+	PrepareAuthenticationTestMD5(50, 9, "123456789");
+	TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION));
+	
+	// Prepare the packet.
+	int pkt_len = LEN_PKT_NOMAC;
+
+	testpkt.exten[0] = htonl(50);
+	int mac_len = make_mac((char*)&testpkt, pkt_len,
+						   MAX_MD5_LEN, key_ptr,
+						   (char*)&testpkt.exten[1]);
+
+	pkt_len += 4 + mac_len;
+
+	// Now, alter the MAC so it becomes invalid.
+	testpkt.exten[1] += 1;
+
+	TEST_ASSERT_EQUAL(SERVER_AUTH_FAIL,
+			  process_pkt(&testpkt, &testsock, pkt_len,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+void test_AuthenticatedPacketUnknownKey(void) {
+	// Activate authentication option
+	PrepareAuthenticationTestMD5(30, 9, "123456789");
+	TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION));
+	
+	// Prepare the packet. Observe that the Key-ID expected is 30,
+	// but the packet has a key id of 50.
+	int pkt_len = LEN_PKT_NOMAC;
+
+	testpkt.exten[0] = htonl(50);
+	int mac_len = make_mac((char*)&testpkt, pkt_len,
+						   MAX_MD5_LEN, key_ptr,
+						   (char*)&testpkt.exten[1]);
+	pkt_len += 4 + mac_len;
+
+	TEST_ASSERT_EQUAL(SERVER_AUTH_FAIL,
+			  process_pkt(&testpkt, &testsock, pkt_len,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+void test_ServerVersionTooOld(void) {
+	TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION));
+
+	testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING,
+										NTP_OLDVERSION - 1,
+										MODE_CLIENT);
+	TEST_ASSERT_TRUE(PKT_VERSION(testpkt.li_vn_mode) < NTP_OLDVERSION);
+
+	int pkt_len = LEN_PKT_NOMAC;
+	
+	TEST_ASSERT_EQUAL(SERVER_UNUSEABLE,
+			  process_pkt(&testpkt, &testsock, pkt_len,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+void test_ServerVersionTooNew(void) {
+	TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION));
+
+	testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING,
+										NTP_VERSION + 1,
+										MODE_CLIENT);
+	TEST_ASSERT_TRUE(PKT_VERSION(testpkt.li_vn_mode) > NTP_VERSION);
+
+	int pkt_len = LEN_PKT_NOMAC;
+
+	TEST_ASSERT_EQUAL(SERVER_UNUSEABLE,
+			  process_pkt(&testpkt, &testsock, pkt_len,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+void test_NonWantedMode(void) {
+	TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION));
+
+	testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING,
+										NTP_VERSION,
+										MODE_CLIENT);
+
+	// The packet has a mode of MODE_CLIENT, but process_pkt expects MODE_SERVER
+
+	TEST_ASSERT_EQUAL(SERVER_UNUSEABLE,
+			  process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+/* Tests bug 1597 */
+void test_KoDRate(void) {
+	TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION));
+
+	testpkt.stratum = STRATUM_PKT_UNSPEC;
+	memcpy(&testpkt.refid, "RATE", 4);
+
+	TEST_ASSERT_EQUAL(KOD_RATE,
+			  process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+void test_KoDDeny(void) {
+	TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION));
+
+	testpkt.stratum = STRATUM_PKT_UNSPEC;
+	memcpy(&testpkt.refid, "DENY", 4);
+
+	TEST_ASSERT_EQUAL(KOD_DEMOBILIZE,
+			  process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+void test_RejectUnsyncedServer(void) {
+	TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION));
+
+	testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOTINSYNC,
+										NTP_VERSION,
+										MODE_SERVER);
+
+	TEST_ASSERT_EQUAL(SERVER_UNUSEABLE,
+			  process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+void test_RejectWrongResponseServerMode(void) {
+	TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION));
+
+	l_fp tmp;
+	tmp.l_ui = 1000UL;
+	tmp.l_uf = 0UL;
+	HTONL_FP(&tmp, &testpkt.org);
+
+	tmp.l_ui = 2000UL;
+	tmp.l_uf = 0UL;
+	HTONL_FP(&tmp, &testspkt.xmt);
+
+	TEST_ASSERT_EQUAL(PACKET_UNUSEABLE,
+			  process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+void test_AcceptNoSentPacketBroadcastMode(void) {
+	TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION));
+
+	testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING,
+					    NTP_VERSION,
+					    MODE_BROADCAST);
+
+	TEST_ASSERT_EQUAL(LEN_PKT_NOMAC,
+		  process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC,
+			      MODE_BROADCAST, NULL, "UnitTest"));
+}
+
+void test_CorrectUnauthenticatedPacket(void) {
+	TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION));
+
+	TEST_ASSERT_EQUAL(LEN_PKT_NOMAC,
+			  process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
+
+void test_CorrectAuthenticatedPacketMD5(void) {
+	PrepareAuthenticationTestMD5(10, 15, "123456789abcdef");
+	TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION));
+
+	int pkt_len = LEN_PKT_NOMAC;
+
+	// Prepare the packet.
+	testpkt.exten[0] = htonl(10);
+	int mac_len = make_mac((char*)&testpkt, pkt_len,
+						   MAX_MD5_LEN, key_ptr,
+						   (char*)&testpkt.exten[1]);
+
+	pkt_len += 4 + mac_len;
+
+	TEST_ASSERT_EQUAL(pkt_len,
+			  process_pkt(&testpkt, &testsock, pkt_len,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+
+}
+
+void test_CorrectAuthenticatedPacketSHA1(void) {
+	PrepareAuthenticationTest(20, 15, "SHA1", "abcdefghijklmno");
+	TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION));
+
+	int pkt_len = LEN_PKT_NOMAC;
+
+	// Prepare the packet.
+	testpkt.exten[0] = htonl(20);
+	int mac_len = make_mac((char*)&testpkt, pkt_len,
+						   MAX_MAC_LEN, key_ptr,
+						   (char*)&testpkt.exten[1]);
+
+	pkt_len += 4 + mac_len;
+
+	TEST_ASSERT_EQUAL(pkt_len,
+			  process_pkt(&testpkt, &testsock, pkt_len,
+						  MODE_SERVER, &testspkt, "UnitTest"));
+}
diff --git a/contrib/ntp/sntp/tests/run-crypto.c b/contrib/ntp/sntp/tests/run-crypto.c
new file mode 100644
index 000000000000..c5dbaf64dfb5
--- /dev/null
+++ b/contrib/ntp/sntp/tests/run-crypto.c
@@ -0,0 +1,62 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_MakeMd5Mac(void);
+extern void test_MakeSHA1Mac(void);
+extern void test_VerifyCorrectMD5(void);
+extern void test_VerifySHA1(void);
+extern void test_VerifyFailure(void);
+extern void test_PacketSizeNotMultipleOfFourBytes(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "crypto.c";
+  UnityBegin("crypto.c");
+  RUN_TEST(test_MakeMd5Mac, 11);
+  RUN_TEST(test_MakeSHA1Mac, 33);
+  RUN_TEST(test_VerifyCorrectMD5, 59);
+  RUN_TEST(test_VerifySHA1, 78);
+  RUN_TEST(test_VerifyFailure, 100);
+  RUN_TEST(test_PacketSizeNotMultipleOfFourBytes, 120);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/sntp/tests/run-keyFile.c b/contrib/ntp/sntp/tests/run-keyFile.c
new file mode 100644
index 000000000000..0a6380d33b35
--- /dev/null
+++ b/contrib/ntp/sntp/tests/run-keyFile.c
@@ -0,0 +1,59 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_ReadEmptyKeyFile();
+extern void test_ReadASCIIKeys();
+extern void test_ReadHexKeys();
+extern void test_ReadKeyFileWithComments();
+extern void test_ReadKeyFileWithInvalidHex();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "keyFile.c";
+  UnityBegin("keyFile.c");
+  RUN_TEST(test_ReadEmptyKeyFile, 53);
+  RUN_TEST(test_ReadASCIIKeys, 61);
+  RUN_TEST(test_ReadHexKeys, 79);
+  RUN_TEST(test_ReadKeyFileWithComments, 105);
+  RUN_TEST(test_ReadKeyFileWithInvalidHex, 124);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/sntp/tests/run-kodDatabase.c b/contrib/ntp/sntp/tests/run-kodDatabase.c
new file mode 100644
index 000000000000..7fc96783e43b
--- /dev/null
+++ b/contrib/ntp/sntp/tests/run-kodDatabase.c
@@ -0,0 +1,59 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_SingleEntryHandling();
+extern void test_MultipleEntryHandling();
+extern void test_NoMatchInSearch();
+extern void test_AddDuplicate();
+extern void test_DeleteEntry();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "kodDatabase.c";
+  UnityBegin("kodDatabase.c");
+  RUN_TEST(test_SingleEntryHandling, 22);
+  RUN_TEST(test_MultipleEntryHandling, 35);
+  RUN_TEST(test_NoMatchInSearch, 66);
+  RUN_TEST(test_AddDuplicate, 79);
+  RUN_TEST(test_DeleteEntry, 104);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/sntp/tests/run-kodFile.c b/contrib/ntp/sntp/tests/run-kodFile.c
new file mode 100644
index 000000000000..9c5896263ee0
--- /dev/null
+++ b/contrib/ntp/sntp/tests/run-kodFile.c
@@ -0,0 +1,61 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_ReadEmptyFile();
+extern void test_ReadCorrectFile();
+extern void test_ReadFileWithBlankLines();
+extern void test_WriteEmptyFile();
+extern void test_WriteFileWithSingleEntry();
+extern void test_WriteFileWithMultipleEntries();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "kodFile.c";
+  UnityBegin("kodFile.c");
+  RUN_TEST(test_ReadEmptyFile, 29);
+  RUN_TEST(test_ReadCorrectFile, 35);
+  RUN_TEST(test_ReadFileWithBlankLines, 53);
+  RUN_TEST(test_WriteEmptyFile, 76);
+  RUN_TEST(test_WriteFileWithSingleEntry, 92);
+  RUN_TEST(test_WriteFileWithMultipleEntries, 116);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/sntp/tests/run-networking.c b/contrib/ntp/sntp/tests/run-networking.c
new file mode 100644
index 000000000000..d5e822c719eb
--- /dev/null
+++ b/contrib/ntp/sntp/tests/run-networking.c
@@ -0,0 +1,49 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "networking.c";
+  UnityBegin("networking.c");
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/sntp/tests/run-packetHandling.c b/contrib/ntp/sntp/tests/run-packetHandling.c
new file mode 100644
index 000000000000..69e958e4c15c
--- /dev/null
+++ b/contrib/ntp/sntp/tests/run-packetHandling.c
@@ -0,0 +1,70 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_GenerateUnauthenticatedPacket(void);
+extern void test_GenerateAuthenticatedPacket(void);
+extern void test_OffsetCalculationPositiveOffset(void);
+extern void test_OffsetCalculationNegativeOffset(void);
+extern void test_HandleUnusableServer(void);
+extern void test_HandleUnusablePacket(void);
+extern void test_HandleServerAuthenticationFailure(void);
+extern void test_HandleKodDemobilize(void);
+extern void test_HandleKodRate(void);
+extern void test_HandleCorrectPacket(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "packetHandling.c";
+  UnityBegin("packetHandling.c");
+  RUN_TEST(test_GenerateUnauthenticatedPacket, 35);
+  RUN_TEST(test_GenerateAuthenticatedPacket, 58);
+  RUN_TEST(test_OffsetCalculationPositiveOffset, 97);
+  RUN_TEST(test_OffsetCalculationNegativeOffset, 141);
+  RUN_TEST(test_HandleUnusableServer, 184);
+  RUN_TEST(test_HandleUnusablePacket, 195);
+  RUN_TEST(test_HandleServerAuthenticationFailure, 206);
+  RUN_TEST(test_HandleKodDemobilize, 217);
+  RUN_TEST(test_HandleKodRate, 241);
+  RUN_TEST(test_HandleCorrectPacket, 252);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/sntp/tests/run-packetProcessing.c b/contrib/ntp/sntp/tests/run-packetProcessing.c
new file mode 100644
index 000000000000..f41d5c7eb2f0
--- /dev/null
+++ b/contrib/ntp/sntp/tests/run-packetProcessing.c
@@ -0,0 +1,86 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_TooShortLength(void);
+extern void test_LengthNotMultipleOfFour(void);
+extern void test_TooShortExtensionFieldLength(void);
+extern void test_UnauthenticatedPacketReject(void);
+extern void test_CryptoNAKPacketReject(void);
+extern void test_AuthenticatedPacketInvalid(void);
+extern void test_AuthenticatedPacketUnknownKey(void);
+extern void test_ServerVersionTooOld(void);
+extern void test_ServerVersionTooNew(void);
+extern void test_NonWantedMode(void);
+extern void test_KoDRate(void);
+extern void test_KoDDeny(void);
+extern void test_RejectUnsyncedServer(void);
+extern void test_RejectWrongResponseServerMode(void);
+extern void test_AcceptNoSentPacketBroadcastMode(void);
+extern void test_CorrectUnauthenticatedPacket(void);
+extern void test_CorrectAuthenticatedPacketMD5(void);
+extern void test_CorrectAuthenticatedPacketSHA1(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "packetProcessing.c";
+  UnityBegin("packetProcessing.c");
+  RUN_TEST(test_TooShortLength, 83);
+  RUN_TEST(test_LengthNotMultipleOfFour, 92);
+  RUN_TEST(test_TooShortExtensionFieldLength, 101);
+  RUN_TEST(test_UnauthenticatedPacketReject, 117);
+  RUN_TEST(test_CryptoNAKPacketReject, 131);
+  RUN_TEST(test_AuthenticatedPacketInvalid, 143);
+  RUN_TEST(test_AuthenticatedPacketUnknownKey, 166);
+  RUN_TEST(test_ServerVersionTooOld, 186);
+  RUN_TEST(test_ServerVersionTooNew, 201);
+  RUN_TEST(test_NonWantedMode, 216);
+  RUN_TEST(test_KoDRate, 231);
+  RUN_TEST(test_KoDDeny, 242);
+  RUN_TEST(test_RejectUnsyncedServer, 253);
+  RUN_TEST(test_RejectWrongResponseServerMode, 265);
+  RUN_TEST(test_AcceptNoSentPacketBroadcastMode, 282);
+  RUN_TEST(test_CorrectUnauthenticatedPacket, 294);
+  RUN_TEST(test_CorrectAuthenticatedPacketMD5, 302);
+  RUN_TEST(test_CorrectAuthenticatedPacketSHA1, 322);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/sntp/tests/run-utilities.c b/contrib/ntp/sntp/tests/run-utilities.c
new file mode 100644
index 000000000000..715bd110c2d4
--- /dev/null
+++ b/contrib/ntp/sntp/tests/run-utilities.c
@@ -0,0 +1,64 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_IPv4Address();
+extern void test_IPv6Address();
+extern void test_SetLiVnMode1();
+extern void test_SetLiVnMode2();
+extern void test_PktOutput();
+extern void test_LfpOutputBinaryFormat();
+extern void test_LfpOutputDecimalFormat();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "utilities.c";
+  UnityBegin("utilities.c");
+  RUN_TEST(test_IPv4Address, 68);
+  RUN_TEST(test_IPv6Address, 78);
+  RUN_TEST(test_SetLiVnMode1, 98);
+  RUN_TEST(test_SetLiVnMode2, 111);
+  RUN_TEST(test_PktOutput, 126);
+  RUN_TEST(test_LfpOutputBinaryFormat, 146);
+  RUN_TEST(test_LfpOutputDecimalFormat, 162);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/sntp/tests/sntptest.h b/contrib/ntp/sntp/tests/sntptest.h
index d5add9cbf465..eff6f6e99dcb 100644
--- a/contrib/ntp/sntp/tests/sntptest.h
+++ b/contrib/ntp/sntp/tests/sntptest.h
@@ -1,35 +1,31 @@
 #ifndef SNTPTEST_H
 #define SNTPTEST_H
 
-#include "tests_main.h"
-
-extern "C" {
 #include "ntp_stdlib.h"
 #include "sntp-opts.h"
-};
 
-class sntptest : public ntptest {
-protected:
-	sntptest() {
-		optionSaveState(&sntpOptions);
-	}
 
-	~sntptest() {
-		optionRestore(&sntpOptions);
-	}
+sntptest() {
+	optionSaveState(&sntpOptions);
+}
 
-	void ActivateOption(const char* option, const char* argument) {
-		const int ARGV_SIZE = 4;
+sntptest_destroy() {
+	optionRestore(&sntpOptions);
+}
 
-		char* opts[ARGV_SIZE];
-		
-		opts[0] = estrdup("sntpopts");
-		opts[1] = estrdup(option);
-		opts[2] = estrdup(argument);
-		opts[3] = estrdup("127.0.0.1");
+void ActivateOption(const char* option, const char* argument) {
+
+	const int ARGV_SIZE = 4;
+
+	char* opts[ARGV_SIZE];
+	
+	opts[0] = estrdup("sntpopts");
+	opts[1] = estrdup(option);
+	opts[2] = estrdup(argument);
+	opts[3] = estrdup("127.0.0.1");
+
+	optionProcess(&sntpOptions, ARGV_SIZE, opts);
+}
 
-		optionProcess(&sntpOptions, ARGV_SIZE, opts);
-	}
-};
 
 #endif // SNTPTEST_H
diff --git a/contrib/ntp/sntp/tests/utilities.c b/contrib/ntp/sntp/tests/utilities.c
new file mode 100644
index 000000000000..65be8df9d8e9
--- /dev/null
+++ b/contrib/ntp/sntp/tests/utilities.c
@@ -0,0 +1,177 @@
+#include "config.h"
+
+#include "sntptest.h"
+#include "fileHandlingTest.h"
+
+#include "main.h"
+#include "utilities.h"
+#include "math.h"
+
+#include "unity.h"
+
+const char * Version = "stub unit test Version string";
+
+
+
+sockaddr_u CreateSockaddr4(const char* address) {
+	sockaddr_u s;
+	s.sa4.sin_family = AF_INET;
+	s.sa4.sin_addr.s_addr = inet_addr(address);
+	SET_PORT(&s, 123);
+
+	return s;
+}
+
+struct addrinfo CreateAddrinfo( sockaddr_u* sock) {
+	struct addrinfo a;
+	a.ai_family = sock->sa.sa_family;
+	a.ai_addrlen = SIZEOF_SOCKADDR(a.ai_family);
+	a.ai_addr = &sock->sa;
+	return a;
+}
+
+
+bool outputFileOpened;
+FILE* outputFile;
+
+//debugUtilitiesTest() : outputFileOpened(false) {}
+
+void InitDebugTest(const char * filename) {
+	// Clear the contents of the current file.
+	// Open the output file
+	outputFile = fopen(filename, "w+");
+	TEST_ASSERT_TRUE(outputFile != NULL);
+	outputFileOpened = true;
+}
+
+// Closes outputFile, and compare contents.
+void FinishDebugTest(const char * expected,
+		     const char * actual) {
+	if (outputFileOpened)
+		fclose(outputFile);
+
+	FILE * e = fopen(expected,"rb");
+	FILE * a = fopen(actual,"rb");
+	TEST_ASSERT_TRUE(e != NULL);
+	TEST_ASSERT_TRUE(a != NULL);
+
+	CompareFileContent(e, a);
+}
+
+
+/* 
+ * These tests are essentially a copy of the tests for socktoa()
+ * in libntp. If sntp switches to using that functions, these
+ * tests can be removed.
+ */
+
+void test_IPv4Address() {
+	const char* ADDR = "192.0.2.10";
+
+	sockaddr_u input = CreateSockaddr4(ADDR);
+	struct addrinfo inputA = CreateAddrinfo(&input);
+
+	TEST_ASSERT_EQUAL_STRING(ADDR, ss_to_str(&input));
+	TEST_ASSERT_EQUAL_STRING(ADDR, addrinfo_to_str(&inputA));
+}
+
+void test_IPv6Address() {
+	const struct in6_addr address = {
+						0x20, 0x01, 0x0d, 0xb8,
+						0x85, 0xa3, 0x08, 0xd3, 
+						0x13, 0x19, 0x8a, 0x2e,
+						0x03, 0x70, 0x73, 0x34
+					};
+	const char * expected = "2001:db8:85a3:8d3:1319:8a2e:370:7334";
+	sockaddr_u	input;
+	struct addrinfo	inputA;
+
+	memset(&input, 0, sizeof(input));
+	input.sa6.sin6_family = AF_INET6;
+	input.sa6.sin6_addr = address;
+	TEST_ASSERT_EQUAL_STRING(expected, ss_to_str(&input));
+
+	inputA = CreateAddrinfo(&input);
+	TEST_ASSERT_EQUAL_STRING(expected, addrinfo_to_str(&inputA));
+}
+
+void test_SetLiVnMode1() {
+	struct pkt expected;
+	expected.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING,
+					     NTP_VERSION,
+					     MODE_SERVER);
+
+	struct pkt actual;
+	set_li_vn_mode(&actual, LEAP_NOWARNING, NTP_VERSION,
+				   MODE_SERVER);
+
+	TEST_ASSERT_EQUAL(expected.li_vn_mode, actual.li_vn_mode);
+}
+
+void test_SetLiVnMode2() {
+	struct pkt expected;
+	expected.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOTINSYNC,
+					     NTP_OLDVERSION,
+					     MODE_BROADCAST);
+
+	struct pkt actual;
+	set_li_vn_mode(&actual, LEAP_NOTINSYNC, NTP_OLDVERSION,
+				   MODE_BROADCAST);
+
+	TEST_ASSERT_EQUAL(expected.li_vn_mode, actual.li_vn_mode);
+}
+
+/* Debug utilities tests */
+
+void test_PktOutput() {
+	char * filename = "debug-output-pkt";//CreatePath("debug-output-pkt", OUTPUT_DIR);
+	InitDebugTest(filename);
+
+	struct pkt testpkt;
+	memset(&testpkt, 0, sizeof(struct pkt));
+	testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING,
+					    NTP_VERSION,
+					    MODE_SERVER);
+
+	l_fp test;
+	test.l_ui = 8;
+	test.l_uf = 2147483647; // Lots of ones.
+	HTONL_FP(&test, &testpkt.xmt);
+
+	pkt_output(&testpkt, LEN_PKT_NOMAC, outputFile);
+
+	FinishDebugTest(CreatePath("debug-input-pkt", INPUT_DIR), filename);
+}
+
+void test_LfpOutputBinaryFormat() {
+	char * filename = "debug-output-lfp-bin";//CreatePath("debug-output-lfp-bin", OUTPUT_DIR);
+	InitDebugTest(filename);
+
+	l_fp test;
+	test.l_ui = 63;  // 00000000 00000000 00000000 00111111
+	test.l_uf = 127; // 00000000 00000000 00000000 01111111
+
+	l_fp network;
+	HTONL_FP(&test, &network);
+
+	l_fp_output_bin(&network, outputFile);
+
+	FinishDebugTest(CreatePath("debug-input-lfp-bin", INPUT_DIR), filename);
+}
+
+void test_LfpOutputDecimalFormat() {
+	char * filename = "debug-output-lfp-dec"; //CreatePath("debug-output-lfp-dec", OUTPUT_DIR);
+	InitDebugTest(filename);
+
+	l_fp test;
+	test.l_ui = 6310; // 0x000018A6
+	test.l_uf = 308502; // 0x00004B516
+
+	l_fp network;
+	HTONL_FP(&test, &network);
+
+	l_fp_output_dec(&network, outputFile);
+
+	FinishDebugTest(CreatePath("debug-input-lfp-dec", INPUT_DIR), filename);
+}
+
diff --git a/contrib/ntp/sntp/tests/utilities.cpp b/contrib/ntp/sntp/tests/utilities.cpp
deleted file mode 100644
index 4c8c30535064..000000000000
--- a/contrib/ntp/sntp/tests/utilities.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-#include "sntptest.h"
-#include "fileHandlingTest.h"
-
-extern "C" {
-#include "main.h"
-#include "utilities.h"
-const char * Version = "stub unit test Version string";
-};
-
-using std::string;
-
-class utilitiesTest : public sntptest {
-protected:
-	sockaddr_u CreateSockaddr4(const char* address) {
-		sockaddr_u s;
-		s.sa4.sin_family = AF_INET;
-		s.sa4.sin_addr.s_addr = inet_addr(address);
-		SET_PORT(&s, 123);
-
-		return s;
-	}
-
-	addrinfo CreateAddrinfo(sockaddr_u* sock) {
-		addrinfo a;
-		a.ai_family = sock->sa.sa_family;
-		a.ai_addrlen = SIZEOF_SOCKADDR(a.ai_family);
-		a.ai_addr = &sock->sa;
-		return a;
-	}
-};
-
-class debugUtilitiesTest : public fileHandlingTest {
-protected:
-	bool outputFileOpened;
-	FILE* outputFile;
-
-	debugUtilitiesTest() : outputFileOpened(false) {}
-
-	void InitDebugTest(const string& filename) {
-		// Clear the contents of the current file.
-		// Open the output file
-		outputFile = fopen(filename.c_str(), "w+");
-		ASSERT_TRUE(outputFile != NULL);
-		outputFileOpened = true;
-	}
-
-	// Closes outputFile, and compare contents.
-	void FinishDebugTest(const string& expected,
-						 const string& actual) {
-		if (outputFileOpened)
-			fclose(outputFile);
-
-		ifstream e(expected.c_str());
-		ifstream a(actual.c_str());
-		ASSERT_TRUE(e.good());
-		ASSERT_TRUE(a.good());
-
-		CompareFileContent(e, a);
-	}
-};
-
-/* 
- * These tests are essentially a copy of the tests for socktoa()
- * in libntp. If sntp switches to using that functions, these
- * tests can be removed.
- */
-
-TEST_F(utilitiesTest, IPv4Address) {
-	const char* ADDR = "192.0.2.10";
-
-	sockaddr_u input = CreateSockaddr4(ADDR);
-	addrinfo inputA = CreateAddrinfo(&input);
-
-	EXPECT_STREQ(ADDR, ss_to_str(&input));
-	EXPECT_STREQ(ADDR, addrinfo_to_str(&inputA));
-}
-
-TEST_F(utilitiesTest, IPv6Address) {
-	const struct in6_addr address = {
-						0x20, 0x01, 0x0d, 0xb8,
-						0x85, 0xa3, 0x08, 0xd3, 
-						0x13, 0x19, 0x8a, 0x2e,
-						0x03, 0x70, 0x73, 0x34
-					};
-	const char * expected = "2001:db8:85a3:8d3:1319:8a2e:370:7334";
-	sockaddr_u	input;
-	addrinfo	inputA;
-
-	memset(&input, 0, sizeof(input));
-	input.sa6.sin6_family = AF_INET6;
-	input.sa6.sin6_addr = address;
-	EXPECT_STREQ(expected, ss_to_str(&input));
-
-	inputA = CreateAddrinfo(&input);
-	EXPECT_STREQ(expected, addrinfo_to_str(&inputA));
-}
-
-TEST_F(utilitiesTest, SetLiVnMode1) {
-	pkt expected;
-	expected.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING,
-					     NTP_VERSION,
-					     MODE_SERVER);
-
-	pkt actual;
-	set_li_vn_mode(&actual, LEAP_NOWARNING, NTP_VERSION,
-				   MODE_SERVER);
-
-	EXPECT_EQ(expected.li_vn_mode, actual.li_vn_mode);
-}
-
-TEST_F(utilitiesTest, SetLiVnMode2) {
-	pkt expected;
-	expected.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOTINSYNC,
-										 NTP_OLDVERSION,
-										 MODE_BROADCAST);
-
-	pkt actual;
-	set_li_vn_mode(&actual, LEAP_NOTINSYNC, NTP_OLDVERSION,
-				   MODE_BROADCAST);
-
-	EXPECT_EQ(expected.li_vn_mode, actual.li_vn_mode);
-}
-
-/* Debug utilities tests */
-
-TEST_F(debugUtilitiesTest, PktOutput) {
-	string filename = CreatePath("debug-output-pkt", OUTPUT_DIR);
-	InitDebugTest(filename);
-
-	pkt testpkt;
-	memset(&testpkt, 0, sizeof(pkt));
-	testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING,
-										NTP_VERSION,
-										MODE_SERVER);
-
-	l_fp test;
-	test.l_ui = 8;
-	test.l_uf = 2147483647; // Lots of ones.
-	HTONL_FP(&test, &testpkt.xmt);
-
-	pkt_output(&testpkt, LEN_PKT_NOMAC, outputFile);
-
-	FinishDebugTest(CreatePath("debug-input-pkt", INPUT_DIR), filename);
-}
-
-TEST_F(debugUtilitiesTest, LfpOutputBinaryFormat) {
-	string filename = CreatePath("debug-output-lfp-bin", OUTPUT_DIR);
-	InitDebugTest(filename);
-
-	l_fp test;
-	test.l_ui = 63;  // 00000000 00000000 00000000 00111111
-	test.l_uf = 127; // 00000000 00000000 00000000 01111111
-
-	l_fp network;
-	HTONL_FP(&test, &network);
-
-	l_fp_output_bin(&network, outputFile);
-
-	FinishDebugTest(CreatePath("debug-input-lfp-bin", INPUT_DIR), filename);
-}
-
-TEST_F(debugUtilitiesTest, LfpOutputDecimalFormat) {
-	string filename = CreatePath("debug-output-lfp-dec", OUTPUT_DIR);
-	InitDebugTest(filename);
-
-	l_fp test;
-	test.l_ui = 6310; // 0x000018A6
-	test.l_uf = 308502; // 0x00004B516
-
-	l_fp network;
-	HTONL_FP(&test, &network);
-
-	l_fp_output_dec(&network, outputFile);
-
-	FinishDebugTest(CreatePath("debug-input-lfp-dec", INPUT_DIR), filename);
-}
diff --git a/contrib/ntp/sntp/tests_main.cpp b/contrib/ntp/sntp/tests_main.cpp
index 3d11bb1302ef..584165d66d87 100644
--- a/contrib/ntp/sntp/tests_main.cpp
+++ b/contrib/ntp/sntp/tests_main.cpp
@@ -1,5 +1,9 @@
 #include "tests_main.h"
 
+extern "C" {
+const char * Version = "stub unit test Version string";
+};
+
 int main(int argc, char **argv) {
 	::testing::InitGoogleTest(&argc, argv);
 
diff --git a/contrib/ntp/sntp/unity/Makefile.am b/contrib/ntp/sntp/unity/Makefile.am
new file mode 100644
index 000000000000..a09e36eb8795
--- /dev/null
+++ b/contrib/ntp/sntp/unity/Makefile.am
@@ -0,0 +1,24 @@
+#AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects
+NULL =
+BUILT_SOURCES =
+CLEANFILES =
+
+noinst_LIBRARIES = libunity.a
+
+libunity_a_CFLAGS =                  	\
+	-DUNITY_INCLUDE_DOUBLE		\
+	$(NULL)
+
+libunity_a_SOURCES =				\
+	../libpkgver/colcomp.c			\
+	unity.c					\
+	unity.h					\
+	unity_internals.h			\
+	unity_fixture.c				\
+	unity_fixture.h				\
+	unity_fixture_internals.h		\
+	unity_fixture_malloc_overrides.h	\
+	$(NULL)
+
+include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
diff --git a/contrib/ntp/sntp/unity/Makefile.in b/contrib/ntp/sntp/unity/Makefile.in
new file mode 100644
index 000000000000..956ff1e20e35
--- /dev/null
+++ b/contrib/ntp/sntp/unity/Makefile.in
@@ -0,0 +1,856 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+subdir = unity
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
+	$(top_srcdir)/libopts/m4/stdnoreturn.m4 \
+	$(top_srcdir)/m4/hms_search_lib.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/ntp_cacheversion.m4 \
+	$(top_srcdir)/m4/ntp_compiler.m4 \
+	$(top_srcdir)/m4/ntp_crosscompile.m4 \
+	$(top_srcdir)/m4/ntp_debug.m4 $(top_srcdir)/m4/ntp_dir_sep.m4 \
+	$(top_srcdir)/m4/ntp_facilitynames.m4 \
+	$(top_srcdir)/m4/ntp_googletest.m4 \
+	$(top_srcdir)/m4/ntp_ipv6.m4 $(top_srcdir)/m4/ntp_lib_m.m4 \
+	$(top_srcdir)/m4/ntp_libevent.m4 \
+	$(top_srcdir)/m4/ntp_libntp.m4 \
+	$(top_srcdir)/m4/ntp_lineeditlibs.m4 \
+	$(top_srcdir)/m4/ntp_locinfo.m4 \
+	$(top_srcdir)/m4/ntp_openssl.m4 \
+	$(top_srcdir)/m4/ntp_pkg_config.m4 \
+	$(top_srcdir)/m4/ntp_prog_cc.m4 $(top_srcdir)/m4/ntp_sntp.m4 \
+	$(top_srcdir)/m4/ntp_sysexits.m4 \
+	$(top_srcdir)/m4/ntp_unitytest.m4 \
+	$(top_srcdir)/m4/ntp_ver_suffix.m4 \
+	$(top_srcdir)/m4/openldap-thread-check.m4 \
+	$(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/os_cflags.m4 \
+	$(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/version.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libunity_a_AR = $(AR) $(ARFLAGS)
+libunity_a_LIBADD =
+am__objects_1 =
+am_libunity_a_OBJECTS = libunity_a-colcomp.$(OBJEXT) \
+	libunity_a-unity.$(OBJEXT) libunity_a-unity_fixture.$(OBJEXT) \
+	$(am__objects_1)
+libunity_a_OBJECTS = $(am_libunity_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/libevent/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libunity_a_SOURCES)
+DIST_SOURCES = $(libunity_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \
+	$(top_srcdir)/includes.mf \
+	$(top_srcdir)/libevent/build-aux/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
+CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
+CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
+CALC_TICKADJ_MS = @CALC_TICKADJ_MS@
+CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAGS_NTP = @CFLAGS_NTP@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_LIBEVENT = @CPPFLAGS_LIBEVENT@
+CPPFLAGS_NTP = @CPPFLAGS_NTP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EDITLINE_LIBS = @EDITLINE_LIBS@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+GTEST_CONFIG = @GTEST_CONFIG@
+GTEST_CPPFLAGS = @GTEST_CPPFLAGS@
+GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
+GTEST_LDFLAGS = @GTEST_LDFLAGS@
+GTEST_LIBS = @GTEST_LIBS@
+HAVE_INLINE = @HAVE_INLINE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDADD_LIBEVENT = @LDADD_LIBEVENT@
+LDADD_LIBNTP = @LDADD_LIBNTP@
+LDADD_LIBUTIL = @LDADD_LIBUTIL@
+LDADD_NTP = @LDADD_NTP@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_NTP = @LDFLAGS_NTP@
+LIBISC_PTHREADS_NOTHREADS = @LIBISC_PTHREADS_NOTHREADS@
+LIBM = @LIBM@
+LIBOBJS = @LIBOBJS@
+LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@
+LIBOPTS_DIR = @LIBOPTS_DIR@
+LIBOPTS_LDADD = @LIBOPTS_LDADD@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIB_SYSLOG = @LIB_SYSLOG@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MANTAGFMT = @MANTAGFMT@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NTPDATE_DB = @NTPDATE_DB@
+NTPDATE_DL = @NTPDATE_DL@
+NTPDATE_DS = @NTPDATE_DS@
+NTPDATE_MS = @NTPDATE_MS@
+NTPDATE_NI = @NTPDATE_NI@
+NTPDC_DB = @NTPDC_DB@
+NTPDC_DL = @NTPDC_DL@
+NTPDC_DS = @NTPDC_DS@
+NTPDC_MS = @NTPDC_MS@
+NTPDC_NI = @NTPDC_NI@
+NTPDSIM_DB = @NTPDSIM_DB@
+NTPDSIM_DL = @NTPDSIM_DL@
+NTPDSIM_DS = @NTPDSIM_DS@
+NTPDSIM_MS = @NTPDSIM_MS@
+NTPDSIM_NI = @NTPDSIM_NI@
+NTPD_DB = @NTPD_DB@
+NTPD_DL = @NTPD_DL@
+NTPD_DS = @NTPD_DS@
+NTPD_MS = @NTPD_MS@
+NTPD_NI = @NTPD_NI@
+NTPQ_DB = @NTPQ_DB@
+NTPQ_DL = @NTPQ_DL@
+NTPQ_DS = @NTPQ_DS@
+NTPQ_MS = @NTPQ_MS@
+NTPQ_NI = @NTPQ_NI@
+NTPSNMPD_DB = @NTPSNMPD_DB@
+NTPSNMPD_DL = @NTPSNMPD_DL@
+NTPSNMPD_DS = @NTPSNMPD_DS@
+NTPSNMPD_MS = @NTPSNMPD_MS@
+NTPSNMPD_NI = @NTPSNMPD_NI@
+NTPSWEEP_DB = @NTPSWEEP_DB@
+NTPSWEEP_DL = @NTPSWEEP_DL@
+NTPSWEEP_DS = @NTPSWEEP_DS@
+NTPSWEEP_MS = @NTPSWEEP_MS@
+NTPSWEEP_NI = @NTPSWEEP_NI@
+NTPTIME_DB = @NTPTIME_DB@
+NTPTIME_DL = @NTPTIME_DL@
+NTPTIME_DS = @NTPTIME_DS@
+NTPTIME_MS = @NTPTIME_MS@
+NTPTIME_NI = @NTPTIME_NI@
+NTPTRACE_DB = @NTPTRACE_DB@
+NTPTRACE_DL = @NTPTRACE_DL@
+NTPTRACE_DS = @NTPTRACE_DS@
+NTPTRACE_MS = @NTPTRACE_MS@
+NTPTRACE_NI = @NTPTRACE_NI@
+NTP_FORCE_LIBEVENT_DIST = @NTP_FORCE_LIBEVENT_DIST@
+NTP_KEYGEN_DB = @NTP_KEYGEN_DB@
+NTP_KEYGEN_DL = @NTP_KEYGEN_DL@
+NTP_KEYGEN_DS = @NTP_KEYGEN_DS@
+NTP_KEYGEN_MS = @NTP_KEYGEN_MS@
+NTP_KEYGEN_NI = @NTP_KEYGEN_NI@
+NTP_WAIT_DB = @NTP_WAIT_DB@
+NTP_WAIT_DL = @NTP_WAIT_DL@
+NTP_WAIT_DS = @NTP_WAIT_DS@
+NTP_WAIT_MS = @NTP_WAIT_MS@
+NTP_WAIT_NI = @NTP_WAIT_NI@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_RUBY = @PATH_RUBY@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POSIX_SHELL = @POSIX_SHELL@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SNTP = @SNTP@
+SNTP_DB = @SNTP_DB@
+SNTP_DL = @SNTP_DL@
+SNTP_DS = @SNTP_DS@
+SNTP_MS = @SNTP_MS@
+SNTP_NI = @SNTP_NI@
+STDNORETURN_H = @STDNORETURN_H@
+STRIP = @STRIP@
+TICKADJ_DB = @TICKADJ_DB@
+TICKADJ_DL = @TICKADJ_DL@
+TICKADJ_DS = @TICKADJ_DS@
+TICKADJ_MS = @TICKADJ_MS@
+TICKADJ_NI = @TICKADJ_NI@
+TIMETRIM_DB = @TIMETRIM_DB@
+TIMETRIM_DL = @TIMETRIM_DL@
+TIMETRIM_DS = @TIMETRIM_DS@
+TIMETRIM_MS = @TIMETRIM_MS@
+TIMETRIM_NI = @TIMETRIM_NI@
+UPDATE_LEAP_DB = @UPDATE_LEAP_DB@
+UPDATE_LEAP_DL = @UPDATE_LEAP_DL@
+UPDATE_LEAP_DS = @UPDATE_LEAP_DS@
+UPDATE_LEAP_MS = @UPDATE_LEAP_MS@
+UPDATE_LEAP_NI = @UPDATE_LEAP_NI@
+VERSION = @VERSION@
+VER_SUFFIX = @VER_SUFFIX@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+#AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects
+NULL = 
+BUILT_SOURCES = .deps-ver
+CLEANFILES = .deps-ver
+noinst_LIBRARIES = libunity.a
+libunity_a_CFLAGS = \
+	-DUNITY_INCLUDE_DOUBLE		\
+	$(NULL)
+
+libunity_a_SOURCES = \
+	../libpkgver/colcomp.c			\
+	unity.c					\
+	unity.h					\
+	unity_internals.h			\
+	unity_fixture.c				\
+	unity_fixture.h				\
+	unity_fixture_internals.h		\
+	unity_fixture_malloc_overrides.h	\
+	$(NULL)
+
+SNTP_INCS = -I$(top_srcdir)/../include \
+	-I$(top_srcdir)/../lib/isc/include \
+	-I$(top_srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include \
+	-I$(top_srcdir)/../lib/isc/unix/include
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign unity/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign unity/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libunity.a: $(libunity_a_OBJECTS) $(libunity_a_DEPENDENCIES) $(EXTRA_libunity_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libunity.a
+	$(AM_V_AR)$(libunity_a_AR) libunity.a $(libunity_a_OBJECTS) $(libunity_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libunity.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_a-colcomp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_a-unity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_a-unity_fixture.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+libunity_a-colcomp.o: ../libpkgver/colcomp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libunity_a_CFLAGS) $(CFLAGS) -MT libunity_a-colcomp.o -MD -MP -MF $(DEPDIR)/libunity_a-colcomp.Tpo -c -o libunity_a-colcomp.o `test -f '../libpkgver/colcomp.c' || echo '$(srcdir)/'`../libpkgver/colcomp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libunity_a-colcomp.Tpo $(DEPDIR)/libunity_a-colcomp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../libpkgver/colcomp.c' object='libunity_a-colcomp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libunity_a_CFLAGS) $(CFLAGS) -c -o libunity_a-colcomp.o `test -f '../libpkgver/colcomp.c' || echo '$(srcdir)/'`../libpkgver/colcomp.c
+
+libunity_a-colcomp.obj: ../libpkgver/colcomp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libunity_a_CFLAGS) $(CFLAGS) -MT libunity_a-colcomp.obj -MD -MP -MF $(DEPDIR)/libunity_a-colcomp.Tpo -c -o libunity_a-colcomp.obj `if test -f '../libpkgver/colcomp.c'; then $(CYGPATH_W) '../libpkgver/colcomp.c'; else $(CYGPATH_W) '$(srcdir)/../libpkgver/colcomp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libunity_a-colcomp.Tpo $(DEPDIR)/libunity_a-colcomp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../libpkgver/colcomp.c' object='libunity_a-colcomp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libunity_a_CFLAGS) $(CFLAGS) -c -o libunity_a-colcomp.obj `if test -f '../libpkgver/colcomp.c'; then $(CYGPATH_W) '../libpkgver/colcomp.c'; else $(CYGPATH_W) '$(srcdir)/../libpkgver/colcomp.c'; fi`
+
+libunity_a-unity.o: unity.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libunity_a_CFLAGS) $(CFLAGS) -MT libunity_a-unity.o -MD -MP -MF $(DEPDIR)/libunity_a-unity.Tpo -c -o libunity_a-unity.o `test -f 'unity.c' || echo '$(srcdir)/'`unity.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libunity_a-unity.Tpo $(DEPDIR)/libunity_a-unity.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='unity.c' object='libunity_a-unity.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libunity_a_CFLAGS) $(CFLAGS) -c -o libunity_a-unity.o `test -f 'unity.c' || echo '$(srcdir)/'`unity.c
+
+libunity_a-unity.obj: unity.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libunity_a_CFLAGS) $(CFLAGS) -MT libunity_a-unity.obj -MD -MP -MF $(DEPDIR)/libunity_a-unity.Tpo -c -o libunity_a-unity.obj `if test -f 'unity.c'; then $(CYGPATH_W) 'unity.c'; else $(CYGPATH_W) '$(srcdir)/unity.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libunity_a-unity.Tpo $(DEPDIR)/libunity_a-unity.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='unity.c' object='libunity_a-unity.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libunity_a_CFLAGS) $(CFLAGS) -c -o libunity_a-unity.obj `if test -f 'unity.c'; then $(CYGPATH_W) 'unity.c'; else $(CYGPATH_W) '$(srcdir)/unity.c'; fi`
+
+libunity_a-unity_fixture.o: unity_fixture.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libunity_a_CFLAGS) $(CFLAGS) -MT libunity_a-unity_fixture.o -MD -MP -MF $(DEPDIR)/libunity_a-unity_fixture.Tpo -c -o libunity_a-unity_fixture.o `test -f 'unity_fixture.c' || echo '$(srcdir)/'`unity_fixture.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libunity_a-unity_fixture.Tpo $(DEPDIR)/libunity_a-unity_fixture.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='unity_fixture.c' object='libunity_a-unity_fixture.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libunity_a_CFLAGS) $(CFLAGS) -c -o libunity_a-unity_fixture.o `test -f 'unity_fixture.c' || echo '$(srcdir)/'`unity_fixture.c
+
+libunity_a-unity_fixture.obj: unity_fixture.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libunity_a_CFLAGS) $(CFLAGS) -MT libunity_a-unity_fixture.obj -MD -MP -MF $(DEPDIR)/libunity_a-unity_fixture.Tpo -c -o libunity_a-unity_fixture.obj `if test -f 'unity_fixture.c'; then $(CYGPATH_W) 'unity_fixture.c'; else $(CYGPATH_W) '$(srcdir)/unity_fixture.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libunity_a-unity_fixture.Tpo $(DEPDIR)/libunity_a-unity_fixture.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='unity_fixture.c' object='libunity_a-unity_fixture.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libunity_a_CFLAGS) $(CFLAGS) -c -o libunity_a-unity_fixture.obj `if test -f 'unity_fixture.c'; then $(CYGPATH_W) 'unity_fixture.c'; else $(CYGPATH_W) '$(srcdir)/unity_fixture.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+$(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
+	@[ -f $@ ] ||							\
+		cp $(top_srcdir)/deps-ver $@
+	@[ -w $@ ] ||							\
+		chmod ug+w $@
+	@cmp $(top_srcdir)/deps-ver $@ > /dev/null || (			\
+		$(MAKE) $(AM_MAKEFLAGS) clean &&					\
+		echo -n "Prior $(subdir)/$(DEPDIR) version " &&		\
+		cat $@ &&						\
+		rm -rf $(DEPDIR) &&					\
+		mkdir $(DEPDIR) && 					\
+		case "$(top_builddir)" in				\
+		 .)							\
+		    ./config.status Makefile depfiles			\
+		    ;;							\
+		 *)							\
+		    cd "$(top_builddir)" &&				\
+		    ./config.status $(subdir)/Makefile depfiles &&	\
+		    cd $(subdir)					\
+		    ;;							\
+		esac &&							\
+		echo -n "Cleaned $(subdir)/$(DEPDIR) version " &&	\
+		cat $(top_srcdir)/deps-ver				\
+	)
+	cp $(top_srcdir)/deps-ver $@
+
+.deps-ver: $(top_srcdir)/deps-ver
+	@[ ! -d $(DEPDIR) ] || $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/deps-ver
+	@touch $@
+
+#
+# depsver.mf	included in Makefile.am for directories with .deps
+#
+# When building in the same directory with sources that change over
+# time, such as when tracking using bk, the .deps files can become
+# stale with respect to moved, deleted, or superceded headers.  Most
+# commonly, this would exhibit as make reporting a failure to make a
+# header file which is no longer in the location given.  To address
+# this issue, we use a deps-ver file which is updated with each change
+# that breaks old .deps files.  A copy of deps-ver is made into
+# $(DEPDIR) if not already present.  If $(DEPDIR)/deps-ver is present
+# with different contents than deps-ver, we make clean to ensure all
+# .o files built before the incompatible change are rebuilt along with
+# their updated .deps files, then remove $(DEPDIR) and recreate it as
+# empty stubs.
+#
+# It is normal when configured with --disable-dependency-tracking for
+# the DEPDIR to not have been created.  For this reason, we use the
+# intermediate target .deps-ver, which invokes make recursively if
+# DEPDIR exists.
+#
+# If you modify depsver.mf, please make the changes to the master
+# copy, the one in sntp is copied by the bootstrap script from it.
+#
+# This comment block follows rather than leads the related code so that
+# it stays with it in the generated Makefile.in and Makefile.
+#
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/contrib/ntp/sntp/unity/auto/colour_prompt.rb b/contrib/ntp/sntp/unity/auto/colour_prompt.rb
new file mode 100644
index 000000000000..81003dd59d64
--- /dev/null
+++ b/contrib/ntp/sntp/unity/auto/colour_prompt.rb
@@ -0,0 +1,94 @@
+# ==========================================
+#   Unity Project - A Test Framework for C
+#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+#   [Released under MIT License. Please refer to license.txt for details]
+# ========================================== 
+
+if RUBY_PLATFORM =~/(win|w)32$/
+	begin
+		require 'Win32API'
+	rescue LoadError
+		puts "ERROR! \"Win32API\" library not found"
+		puts "\"Win32API\" is required for colour on a windows machine"
+		puts "  try => \"gem install Win32API\" on the command line"
+		puts
+	end
+	# puts
+  # puts 'Windows Environment Detected...'
+	# puts 'Win32API Library Found.'
+	# puts
+end
+
+class ColourCommandLine
+  def initialize
+    if RUBY_PLATFORM =~/(win|w)32$/  
+      get_std_handle = Win32API.new("kernel32", "GetStdHandle", ['L'], 'L')
+      @set_console_txt_attrb =
+      Win32API.new("kernel32","SetConsoleTextAttribute",['L','N'], 'I')
+      @hout = get_std_handle.call(-11)
+    end
+  end
+  
+  def change_to(new_colour)
+    if RUBY_PLATFORM =~/(win|w)32$/
+      @set_console_txt_attrb.call(@hout,self.win32_colour(new_colour))
+    else
+	  	"\033[30;#{posix_colour(new_colour)};22m"
+	 	end
+  end
+  
+  def win32_colour(colour)
+    case colour
+      when :black then 0  
+      when :dark_blue then 1
+      when :dark_green then 2
+      when :dark_cyan then 3
+      when :dark_red then 4
+      when :dark_purple then 5
+      when :dark_yellow, :narrative then 6
+      when :default_white, :default, :dark_white then 7
+      when :silver then 8
+      when :blue then 9
+      when :green, :success then 10
+      when :cyan, :output then 11
+      when :red, :failure then 12
+      when :purple then 13
+      when :yellow then 14
+      when :white then 15
+      else
+        0
+    end
+  end
+	
+	def posix_colour(colour)
+	  case colour
+      when :black then 30  
+      when :red, :failure then 31
+      when :green, :success then 32
+			when :yellow then 33
+      when :blue, :narrative then 34
+      when :purple, :magenta then 35
+      when :cyan, :output then 36
+      when :white, :default_white, :default then 37
+      else
+        30
+    end
+  end
+	
+  def out_c(mode, colour, str)
+    case RUBY_PLATFORM
+			when /(win|w)32$/
+			  change_to(colour)
+				 $stdout.puts str if mode == :puts
+				 $stdout.print str if mode == :print
+			  change_to(:default_white)
+			else
+				$stdout.puts("#{change_to(colour)}#{str}\033[0m") if mode == :puts
+				$stdout.print("#{change_to(colour)}#{str}\033[0m") if mode == :print
+		end			
+  end
+end # ColourCommandLine
+
+def colour_puts(role,str)  ColourCommandLine.new.out_c(:puts, role, str)  end
+def colour_print(role,str) ColourCommandLine.new.out_c(:print, role, str) end
+
diff --git a/contrib/ntp/sntp/unity/auto/colour_reporter.rb b/contrib/ntp/sntp/unity/auto/colour_reporter.rb
new file mode 100644
index 000000000000..5aa1d277518c
--- /dev/null
+++ b/contrib/ntp/sntp/unity/auto/colour_reporter.rb
@@ -0,0 +1,39 @@
+# ==========================================
+#   Unity Project - A Test Framework for C
+#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+#   [Released under MIT License. Please refer to license.txt for details]
+# ========================================== 
+
+require "#{File.expand_path(File.dirname(__FILE__))}/colour_prompt"
+
+$colour_output = true
+
+def report(message)
+  if not $colour_output
+    $stdout.puts(message)
+  else
+    message = message.join('\n') if (message.class == Array)
+    message.each_line do |line|
+      line.chomp!
+      colour = case(line)
+        when /(?:total\s+)?tests:?\s+(\d+)\s+(?:total\s+)?failures:?\s+\d+\s+Ignored:?/i
+          ($1.to_i == 0) ? :green : :red
+        when /PASS/
+          :green
+        when /^OK$/
+          :green
+        when /(?:FAIL|ERROR)/
+          :red
+        when /IGNORE/
+          :yellow
+        when /^(?:Creating|Compiling|Linking)/
+          :white
+        else
+          :silver
+      end
+      colour_puts(colour, line)
+    end
+  end
+  $stdout.flush
+  $stderr.flush
+end
\ No newline at end of file
diff --git a/contrib/ntp/sntp/unity/auto/generate_config.yml b/contrib/ntp/sntp/unity/auto/generate_config.yml
new file mode 100644
index 000000000000..4a5e47424561
--- /dev/null
+++ b/contrib/ntp/sntp/unity/auto/generate_config.yml
@@ -0,0 +1,36 @@
+#this is a sample configuration file for generate_module
+#you would use it by calling generate_module with the -ygenerate_config.yml option
+#files like this are useful for customizing generate_module to your environment
+:generate_module:
+  :defaults:
+    #these defaults are used in place of any missing options at the command line
+    :path_src: ../src/
+    :path_inc: ../src/
+    :path_tst: ../test/
+    :update_svn: true
+  :includes:
+    #use [] for no additional includes, otherwise list the includes on separate lines
+    :src:
+      - Defs.h
+      - Board.h
+    :inc: []
+    :tst:
+      - Defs.h
+      - Board.h
+      - Exception.h
+  :boilerplates: 
+    #these are inserted at the top of generated files.
+    #just comment out or remove if not desired.
+    #use %1$s where you would like the file name to appear (path/extension not included)
+    :src: |
+      //-------------------------------------------
+      // %1$s.c
+      //-------------------------------------------
+    :inc: |
+      //-------------------------------------------
+      // %1$s.h
+      //-------------------------------------------
+    :tst: |
+      //-------------------------------------------
+      // Test%1$s.c : Units tests for %1$s.c
+      //-------------------------------------------
diff --git a/contrib/ntp/sntp/unity/auto/generate_module.rb b/contrib/ntp/sntp/unity/auto/generate_module.rb
new file mode 100644
index 000000000000..3db1a984cddb
--- /dev/null
+++ b/contrib/ntp/sntp/unity/auto/generate_module.rb
@@ -0,0 +1,202 @@
+# ==========================================
+#   Unity Project - A Test Framework for C
+#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+#   [Released under MIT License. Please refer to license.txt for details]
+# ========================================== 
+
+# This script creates all the files with start code necessary for a new module.
+# A simple module only requires a source file, header file, and test file.
+# Triad modules require a source, header, and test file for each triad type (like model, conductor, and hardware).
+
+require 'rubygems'
+require 'fileutils'
+
+HERE = File.expand_path(File.dirname(__FILE__)) + '/'
+
+#help text when requested
+HELP_TEXT = [ "\nGENERATE MODULE\n-------- ------",
+              "\nUsage: ruby generate_module [options] module_name",
+              "  -i\"include\" sets the path to output headers to 'include' (DEFAULT ../src)",
+              "  -s\"../src\"  sets the path to output source to '../src'   (DEFAULT ../src)",
+              "  -t\"C:/test\" sets the path to output source to 'C:/test'  (DEFAULT ../test)",
+              "  -p\"MCH\"     sets the output pattern to MCH.",
+              "              dh  - driver hardware.",
+              "              dih - driver interrupt hardware.",
+              "              mch - model conductor hardware.",
+              "              mvp - model view presenter.",
+              "              src - just a single source module. (DEFAULT)",
+              "  -d          destroy module instead of creating it.",
+              "  -u          update subversion too (requires subversion command line)",
+              "  -y\"my.yml\"  selects a different yaml config file for module generation",
+              "" ].join("\n")
+
+#Built in patterns
+PATTERNS = { 'src' => {''         => { :inc => [] } },
+             'dh'  => {'Driver'   => { :inc => ['%1$sHardware.h'] }, 
+                       'Hardware' => { :inc => [] } 
+                      },
+             'dih' => {'Driver'   => { :inc => ['%1$sHardware.h', '%1$sInterrupt.h'] }, 
+                       'Interrupt'=> { :inc => ['%1$sHardware.h'] },
+                       'Hardware' => { :inc => [] } 
+                      },
+             'mch' => {'Model'    => { :inc => [] }, 
+                       'Conductor'=> { :inc => ['%1$sModel.h', '%1$sHardware.h'] },
+                       'Hardware' => { :inc => [] } 
+                      },
+             'mvp' => {'Model'    => { :inc => [] }, 
+                       'Presenter'=> { :inc => ['%1$sModel.h', '%1$sView.h'] },
+                       'View'     => { :inc => [] } 
+                      }
+           }
+
+#TEMPLATE_TST
+TEMPLATE_TST = %q[#include "unity.h"
+%2$s#include "%1$s.h"
+
+void setUp(void)
+{
+}
+
+void tearDown(void)
+{
+}
+
+void test_%1$s_NeedToImplement(void)
+{
+    TEST_IGNORE();
+}
+]
+
+#TEMPLATE_SRC
+TEMPLATE_SRC = %q[%2$s#include "%1$s.h"
+]
+
+#TEMPLATE_INC
+TEMPLATE_INC = %q[#ifndef _%3$s_H
+#define _%3$s_H%2$s
+
+#endif // _%3$s_H
+]
+
+# Parse the command line parameters.
+ARGV.each do |arg|
+  case(arg)
+    when /^-d/      then @destroy = true
+    when /^-u/      then @update_svn = true
+    when /^-p(\w+)/ then @pattern = $1
+    when /^-s(.+)/  then @path_src = $1
+    when /^-i(.+)/  then @path_inc = $1
+    when /^-t(.+)/  then @path_tst = $1
+    when /^-y(.+)/  then @yaml_config = $1
+    when /^(\w+)/
+      raise "ERROR: You can't have more than one Module name specified!" unless @module_name.nil?
+      @module_name = arg
+    when /^-(h|-help)/ 
+      puts HELP_TEXT
+      exit
+    else
+      raise "ERROR: Unknown option specified '#{arg}'"
+  end
+end
+raise "ERROR: You must have a Module name specified! (use option -h for help)" if @module_name.nil?
+
+#load yaml file if one was requested
+if @yaml_config
+  require 'yaml'
+  cfg = YAML.load_file(HERE + @yaml_config)[:generate_module]
+  @path_src     = cfg[:defaults][:path_src]   if @path_src.nil?
+  @path_inc     = cfg[:defaults][:path_inc]   if @path_inc.nil?
+  @path_tst     = cfg[:defaults][:path_tst]   if @path_tst.nil?
+  @update_svn   = cfg[:defaults][:update_svn] if @update_svn.nil?
+  @extra_inc    = cfg[:includes]
+  @boilerplates = cfg[:boilerplates]
+else
+  @boilerplates = {}
+end
+
+# Create default file paths if none were provided
+@path_src = HERE + "../src/"  if @path_src.nil?
+@path_inc = @path_src         if @path_inc.nil?
+@path_tst = HERE + "../test/" if @path_tst.nil?
+@path_src += '/'              unless (@path_src[-1] == 47)
+@path_inc += '/'              unless (@path_inc[-1] == 47)
+@path_tst += '/'              unless (@path_tst[-1] == 47)
+@pattern  = 'src'             if @pattern.nil?
+@includes = { :src => [], :inc => [], :tst => [] }
+@includes.merge!(@extra_inc) unless @extra_inc.nil?
+
+#create triad definition
+TRIAD = [ { :ext => '.c', :path => @path_src,        :template => TEMPLATE_SRC, :inc => :src, :boilerplate => @boilerplates[:src] }, 
+          { :ext => '.h', :path => @path_inc,        :template => TEMPLATE_INC, :inc => :inc, :boilerplate => @boilerplates[:inc] },
+          { :ext => '.c', :path => @path_tst+'Test', :template => TEMPLATE_TST, :inc => :tst, :boilerplate => @boilerplates[:tst] },
+        ]
+
+#prepare the pattern for use
+@patterns = PATTERNS[@pattern.downcase]
+raise "ERROR: The design pattern specified isn't one that I recognize!" if @patterns.nil?
+
+# Assemble the path/names of the files we need to work with.
+files = []
+TRIAD.each do |triad|
+  @patterns.each_pair do |pattern_file, pattern_traits|
+    files << {
+      :path => "#{triad[:path]}#{@module_name}#{pattern_file}#{triad[:ext]}",
+      :name => "#{@module_name}#{pattern_file}",
+      :template => triad[:template],
+      :boilerplate => triad[:boilerplate],
+      :includes => case(triad[:inc])
+                     when :src then @includes[:src] | pattern_traits[:inc].map{|f| f % [@module_name]}
+                     when :inc then @includes[:inc]
+                     when :tst then @includes[:tst] | pattern_traits[:inc].map{|f| "Mock#{f}"% [@module_name]}
+                   end
+    }
+  end
+end
+
+# destroy files if that was what was requested
+if @destroy
+  files.each do |filespec|
+    file = filespec[:path]
+    if File.exist?(file)
+      if @update_svn
+        `svn delete \"#{file}\" --force` 
+        puts "File #{file} deleted and removed from source control"
+      else
+        FileUtils.remove(file)
+        puts "File #{file} deleted"
+      end
+    else
+      puts "File #{file} does not exist so cannot be removed."
+    end
+  end
+  puts "Destroy Complete"
+  exit
+end
+
+#Abort if any module already exists
+files.each do |file|
+  raise "ERROR: File #{file[:name]} already exists. Exiting." if File.exist?(file[:path])
+end
+
+# Create Source Modules
+files.each_with_index do |file, i|
+  File.open(file[:path], 'w') do |f|
+    f.write(file[:boilerplate] % [file[:name]]) unless file[:boilerplate].nil?
+    f.write(file[:template] % [ file[:name], 
+                                file[:includes].map{|f| "#include \"#{f}\"\n"}.join, 
+                                file[:name].upcase ]
+           )
+  end
+  if (@update_svn)
+    `svn add \"#{file[:path]}\"` 
+    if $?.exitstatus == 0
+      puts "File #{file[:path]} created and added to source control"
+    else
+      puts "File #{file[:path]} created but FAILED adding to source control!"
+    end
+  else
+    puts "File #{file[:path]} created"
+  end
+end
+
+puts 'Generate Complete'
diff --git a/contrib/ntp/sntp/unity/auto/generate_test_runner.rb b/contrib/ntp/sntp/unity/auto/generate_test_runner.rb
new file mode 100644
index 000000000000..c115fadccfee
--- /dev/null
+++ b/contrib/ntp/sntp/unity/auto/generate_test_runner.rb
@@ -0,0 +1,309 @@
+# ==========================================
+#   Unity Project - A Test Framework for C
+#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+#   [Released under MIT License. Please refer to license.txt for details]
+# ========================================== 
+
+File.expand_path(File.join(File.dirname(__FILE__),'colour_prompt'))
+
+class UnityTestRunnerGenerator
+
+  def initialize(options = nil)
+    @options = { :includes => [], :plugins => [], :framework => :unity }
+    case(options)
+      when NilClass then @options
+      when String   then @options.merge!(UnityTestRunnerGenerator.grab_config(options))
+      when Hash     then @options.merge!(options)
+      else          raise "If you specify arguments, it should be a filename or a hash of options"
+    end
+  end
+  
+  def self.grab_config(config_file)
+    options = { :includes => [], :plugins => [], :framework => :unity }
+    unless (config_file.nil? or config_file.empty?)
+      require 'yaml'
+      yaml_guts = YAML.load_file(config_file)
+      options.merge!(yaml_guts[:unity] ? yaml_guts[:unity] : yaml_guts[:cmock])
+      raise "No :unity or :cmock section found in #{config_file}" unless options
+    end
+    return(options)
+  end
+
+  def run(input_file, output_file, options=nil)
+    tests = []
+    includes = []
+    used_mocks = []
+    
+    @options.merge!(options) unless options.nil?
+    module_name = File.basename(input_file)
+    
+    #pull required data from source file
+    File.open(input_file, 'r') do |input|
+      tests      = find_tests(input)
+      includes   = find_includes(input)
+      used_mocks = find_mocks(includes)
+    end
+
+    #build runner file
+    File.open(output_file, 'w') do |output|
+      create_header(output, used_mocks)
+      create_externs(output, tests, used_mocks)
+      create_mock_management(output, used_mocks)
+      create_suite_setup_and_teardown(output)
+      create_reset(output, used_mocks)
+      create_main(output, input_file, tests)
+    end
+    
+    all_files_used = [input_file, output_file]
+    all_files_used += includes.map {|filename| filename + '.c'} unless includes.empty?
+    all_files_used += @options[:includes] unless @options[:includes].empty?
+    return all_files_used.uniq
+  end
+  
+  def find_tests(input_file)
+    tests_raw = []
+    tests_args = []
+    tests_and_line_numbers = []
+    
+    input_file.rewind
+    source_raw = input_file.read
+    source_scrubbed = source_raw.gsub(/\/\/.*$/, '')           # remove line comments
+    source_scrubbed = source_scrubbed.gsub(/\/\*.*?\*\//m, '') # remove block comments
+    lines = source_scrubbed.split(/(^\s*\#.*$)                 # Treat preprocessor directives as a logical line
+                              | (;|\{|\}) /x)                  # Match ;, {, and } as end of lines
+
+    lines.each_with_index do |line, index|
+      #find tests
+      if line =~ /^((?:\s*TEST_CASE\s*\(.*?\)\s*)*)\s*void\s+(test.*?)\s*\(\s*(.*)\s*\)/
+        name = $2
+        call = $3
+        args = (@options[:use_param_tests] and $1) ? ($1.gsub(/\s*TEST_CASE\s*\(\s*/,'').strip.split(/\s*\)/).compact) : nil
+        tests_and_line_numbers << { :name => name, :args => args, :call => call, :line_number => 0 }
+        tests_args = []
+      end
+    end
+
+    #determine line numbers and create tests to run
+    source_lines = source_raw.split("\n")
+    source_index = 0;
+    tests_and_line_numbers.size.times do |i|
+      source_lines[source_index..-1].each_with_index do |line, index|
+        if (line =~ /#{tests_and_line_numbers[i][:name]}/)
+          source_index += index
+          tests_and_line_numbers[i][:line_number] = source_index + 1
+          break
+        end
+      end
+    end
+    
+    return tests_and_line_numbers
+  end
+
+  def find_includes(input_file)
+    input_file.rewind
+    includes = []
+    input_file.readlines.each do |line|
+      scan_results = line.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/)
+      includes << scan_results[0][0] if (scan_results.size > 0)
+    end
+    return includes
+  end
+  
+  def find_mocks(includes)
+    mock_headers = []
+    includes.each do |include_file|
+      mock_headers << File.basename(include_file) if (include_file =~ /^mock/i)
+    end
+    return mock_headers  
+  end
+  
+  def create_header(output, mocks)
+    output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
+    create_runtest(output, mocks)
+    output.puts("\n//=======Automagically Detected Files To Include=====")
+    output.puts("#include \"#{@options[:framework].to_s}.h\"")
+    output.puts('#include "cmock.h"') unless (mocks.empty?)
+    @options[:includes].flatten.uniq.compact.each do |includes|
+      output.puts("#include \"#{includes.gsub('.h','')}.h\"")
+    end
+    output.puts('#include ')
+    output.puts('#include ')
+    output.puts('#include "CException.h"') if @options[:plugins].include?(:cexception)
+    mocks.each do |mock|
+      output.puts("#include \"#{mock.gsub('.h','')}.h\"")
+    end
+    if @options[:enforce_strict_ordering]
+      output.puts('')    
+      output.puts('int GlobalExpectCount;') 
+      output.puts('int GlobalVerifyOrder;') 
+      output.puts('char* GlobalOrderError;') 
+    end
+  end
+  
+  def create_externs(output, tests, mocks)
+    output.puts("\n//=======External Functions This Runner Calls=====")
+    output.puts("extern void setUp(void);")
+    output.puts("extern void tearDown(void);")
+    output.puts("void resetTest(void);")
+    tests.each do |test|
+      output.puts("extern void #{test[:name]}(#{test[:call]});")
+    end
+    output.puts('')
+  end
+  
+  def create_mock_management(output, mocks)
+    unless (mocks.empty?)
+      output.puts("\n//=======Mock Management=====")
+      output.puts("static void CMock_Init(void)")
+      output.puts("{")
+      if @options[:enforce_strict_ordering]
+        output.puts("  GlobalExpectCount = 0;")
+        output.puts("  GlobalVerifyOrder = 0;") 
+        output.puts("  GlobalOrderError = NULL;") 
+      end
+      mocks.each do |mock|
+        output.puts("  #{mock}_Init();")
+      end
+      output.puts("}\n")
+
+      output.puts("static void CMock_Verify(void)")
+      output.puts("{")
+      mocks.each do |mock|
+        output.puts("  #{mock}_Verify();")
+      end
+      output.puts("}\n")
+
+      output.puts("static void CMock_Destroy(void)")
+      output.puts("{")
+      mocks.each do |mock|
+        output.puts("  #{mock}_Destroy();")
+      end
+      output.puts("}\n")
+    end
+  end
+  
+  def create_suite_setup_and_teardown(output)
+    unless (@options[:suite_setup].nil?)
+      output.puts("\n//=======Suite Setup=====")
+      output.puts("static int suite_setup(void)")
+      output.puts("{")
+      output.puts(@options[:suite_setup])
+      output.puts("}")
+    end
+    unless (@options[:suite_teardown].nil?)
+      output.puts("\n//=======Suite Teardown=====")
+      output.puts("static int suite_teardown(int num_failures)")
+      output.puts("{")
+      output.puts(@options[:suite_teardown])
+      output.puts("}")
+    end
+  end
+  
+  def create_runtest(output, used_mocks)
+    cexception = @options[:plugins].include? :cexception
+    va_args1   = @options[:use_param_tests] ? ', ...' : ''
+    va_args2   = @options[:use_param_tests] ? '__VA_ARGS__' : ''
+    output.puts("\n//=======Test Runner Used To Run Each Test Below=====")
+    output.puts("#define RUN_TEST_NO_ARGS") if @options[:use_param_tests] 
+    output.puts("#define RUN_TEST(TestFunc, TestLineNum#{va_args1}) \\")
+    output.puts("{ \\")
+    output.puts("  Unity.CurrentTestName = #TestFunc#{va_args2.empty? ? '' : " \"(\" ##{va_args2} \")\""}; \\")
+    output.puts("  Unity.CurrentTestLineNumber = TestLineNum; \\")
+    output.puts("  Unity.NumberOfTests++; \\")
+    output.puts("  if (TEST_PROTECT()) \\")
+    output.puts("  { \\")
+    output.puts("    CEXCEPTION_T e; \\") if cexception
+    output.puts("    Try { \\") if cexception
+    output.puts("      CMock_Init(); \\") unless (used_mocks.empty?) 
+    output.puts("      setUp(); \\")
+    output.puts("      TestFunc(#{va_args2}); \\")
+    output.puts("      CMock_Verify(); \\") unless (used_mocks.empty?)
+    output.puts("    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, \"Unhandled Exception!\"); } \\") if cexception
+    output.puts("  } \\")
+    output.puts("  CMock_Destroy(); \\") unless (used_mocks.empty?)
+    output.puts("  if (TEST_PROTECT() && !TEST_IS_IGNORED) \\")
+    output.puts("  { \\")
+    output.puts("    tearDown(); \\")
+    output.puts("  } \\")
+    output.puts("  UnityConcludeTest(); \\")
+    output.puts("}\n")
+  end
+  
+  def create_reset(output, used_mocks)
+    output.puts("\n//=======Test Reset Option=====")
+    output.puts("void resetTest()")
+    output.puts("{")
+    output.puts("  CMock_Verify();") unless (used_mocks.empty?)
+    output.puts("  CMock_Destroy();") unless (used_mocks.empty?)
+    output.puts("  tearDown();")
+    output.puts("  CMock_Init();") unless (used_mocks.empty?) 
+    output.puts("  setUp();")
+    output.puts("}")
+  end
+  
+  def create_main(output, filename, tests)
+    output.puts("\nchar *progname;\n")
+    output.puts("\n\n//=======MAIN=====")
+  
+    output.puts("int main(int argc, char *argv[])")
+    output.puts("{")
+  #new stuff added
+    #output.puts("\nu_long current_time = 4; // needed by authkeys. Used only in to calculate lifetime.\n");
+  
+    output.puts("  progname = argv[0];\n")    
+    #not necessary after all
+    #output.puts("  init_lib();\n")
+    #output.puts("  init_auth();\n")	
+    output.puts("  suite_setup();") unless @options[:suite_setup].nil?
+    output.puts("  Unity.TestFile = \"#{filename}\";")
+    output.puts("  UnityBegin(\"#{filename}\");")
+
+    if (@options[:use_param_tests])
+      tests.each do |test|
+        if ((test[:args].nil?) or (test[:args].empty?))
+          output.puts("  RUN_TEST(#{test[:name]}, #{test[:line_number]}, RUN_TEST_NO_ARGS);")
+        else
+          test[:args].each {|args| output.puts("  RUN_TEST(#{test[:name]}, #{test[:line_number]}, #{args});")}
+        end
+      end
+    else
+        tests.each { |test| output.puts("  RUN_TEST(#{test[:name]}, #{test[:line_number]});") }
+    end
+    output.puts()
+    output.puts("  return #{@options[:suite_teardown].nil? ? "" : "suite_teardown"}(UnityEnd());")
+    output.puts("}")
+  end
+end
+
+
+if ($0 == __FILE__)
+  options = { :includes => [] }
+  yaml_file = nil
+  
+  #parse out all the options first
+  ARGV.reject! do |arg| 
+    case(arg)
+      when '-cexception' 
+        options[:plugins] = [:cexception]; true
+      when /\w+\.yml/
+        options = UnityTestRunnerGenerator.grab_config(arg); true
+      else false
+    end
+  end     
+           
+  #make sure there is at least one parameter left (the input file)
+  if !ARGV[0]
+    puts ["usage: ruby #{__FILE__} (yaml) (options) input_test_file output_test_runner (includes)",
+           "  blah.yml    - will use config options in the yml file (see docs)",
+           "  -cexception - include cexception support"].join("\n")
+    exit 1
+  end
+  
+  #create the default test runner name if not specified
+  ARGV[1] = ARGV[0].gsub(".c","_Runner.c") if (!ARGV[1])
+  
+  #everything else is an include file
+  options[:includes] = (ARGV.slice(2..-1).flatten.compact) if (ARGV.size > 2)
+  
+  UnityTestRunnerGenerator.new(options).run(ARGV[0], ARGV[1])
+end
diff --git a/contrib/ntp/sntp/unity/auto/runner_maybe.c b/contrib/ntp/sntp/unity/auto/runner_maybe.c
new file mode 100644
index 000000000000..3e82c81c749b
--- /dev/null
+++ b/contrib/ntp/sntp/unity/auto/runner_maybe.c
@@ -0,0 +1,52 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_main(void );
+extern void test_custom(void);
+extern void test_custom25(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "../ut-2803.c";
+  UnityBegin();
+  RUN_TEST(test_main, 29);
+  RUN_TEST(test_custom, 34);
+  RUN_TEST(test_custom25, 43);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/sntp/unity/auto/test_file_filter.rb b/contrib/ntp/sntp/unity/auto/test_file_filter.rb
new file mode 100644
index 000000000000..3dbc26a28e06
--- /dev/null
+++ b/contrib/ntp/sntp/unity/auto/test_file_filter.rb
@@ -0,0 +1,23 @@
+# ==========================================
+#   Unity Project - A Test Framework for C
+#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+#   [Released under MIT License. Please refer to license.txt for details]
+# ========================================== 
+
+require'yaml'
+
+module RakefileHelpers
+  class TestFileFilter
+    def initialize(all_files = false)
+      @all_files = all_files
+      if not @all_files == true
+        if File.exist?('test_file_filter.yml')
+          filters = YAML.load_file( 'test_file_filter.yml' )
+          @all_files, @only_files, @exclude_files = 
+            filters[:all_files], filters[:only_files], filters[:exclude_files] 
+        end
+      end
+    end		
+    attr_accessor :all_files, :only_files, :exclude_files
+  end
+end
diff --git a/contrib/ntp/sntp/unity/auto/unity_test_summary.rb b/contrib/ntp/sntp/unity/auto/unity_test_summary.rb
new file mode 100644
index 000000000000..69ec2e8d9588
--- /dev/null
+++ b/contrib/ntp/sntp/unity/auto/unity_test_summary.rb
@@ -0,0 +1,126 @@
+# ==========================================
+#   Unity Project - A Test Framework for C
+#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+#   [Released under MIT License. Please refer to license.txt for details]
+# ========================================== 
+
+#!/usr/bin/ruby
+#
+# unity_test_summary.rb
+#
+require 'fileutils'
+require 'set'
+
+class UnityTestSummary
+  include FileUtils::Verbose
+
+  attr_reader :report, :total_tests, :failures, :ignored
+  
+  def initialize
+    @report = ''
+    @total_tests = 0
+    @failures = 0
+    @ignored = 0
+  end
+  
+  def run
+    # Clean up result file names
+    results = @targets.map {|target| target.gsub(/\\/,'/')}
+    
+    # Dig through each result file, looking for details on pass/fail:   
+    failure_output = []
+    ignore_output = []
+    
+    results.each do |result_file|
+      lines = File.readlines(result_file).map { |line| line.chomp }
+      if lines.length == 0
+        raise "Empty test result file: #{result_file}"
+      else
+        output = get_details(result_file, lines)
+        failure_output << output[:failures] unless output[:failures].empty?
+        ignore_output  << output[:ignores]  unless output[:ignores].empty?
+        tests,failures,ignored = parse_test_summary(lines)
+        @total_tests += tests
+        @failures += failures
+        @ignored += ignored
+      end
+    end
+    
+    if @ignored > 0
+      @report += "\n"
+      @report += "--------------------------\n"
+      @report += "UNITY IGNORED TEST SUMMARY\n"
+      @report += "--------------------------\n"
+      @report += ignore_output.flatten.join("\n")
+    end
+    
+    if @failures > 0
+      @report += "\n"
+      @report += "--------------------------\n"
+      @report += "UNITY FAILED TEST SUMMARY\n"
+      @report += "--------------------------\n"
+      @report += failure_output.flatten.join("\n")
+    end
+  
+    @report += "\n"
+    @report += "--------------------------\n"
+    @report += "OVERALL UNITY TEST SUMMARY\n"
+    @report += "--------------------------\n"
+    @report += "#{@total_tests} TOTAL TESTS #{@failures} TOTAL FAILURES #{@ignored} IGNORED\n"
+    @report += "\n"
+  end
+  
+  def set_targets(target_array)
+    @targets = target_array
+  end
+  
+  def set_root_path(path)
+    @root = path
+  end
+
+  def usage(err_msg=nil)
+    puts err_msg if err_msg
+    puts "Usage: unity_test_summary.rb"
+    exit 1
+  end
+  
+  protected
+  
+  @@targets=nil
+  @@path=nil
+  @@root=nil
+
+  def get_details(result_file, lines)
+    results = { :failures => [], :ignores => [], :successes => [] }
+    lines.each do |line|
+      src_file,src_line,test_name,status,msg = line.split(/:/)
+      line_out = ((@root and (@root != 0)) ? "#{@root}#{line}" : line ).gsub(/\//, "\\")
+      case(status)
+        when 'IGNORE' then results[:ignores]   << line_out
+        when 'FAIL'   then results[:failures]  << line_out
+        when 'PASS'   then results[:successes] << line_out
+      end
+    end
+    return results
+  end
+  
+  def parse_test_summary(summary)
+    if summary[-3..-1].join("\n") =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/
+      [$1.to_i,$2.to_i,$3.to_i]
+    else
+      raise "Couldn't parse test results: #{summary}"
+    end
+  end
+
+  def here; File.expand_path(File.dirname(__FILE__)); end
+  
+end
+
+if $0 == __FILE__
+  script = UnityTestSummary.new
+  begin
+    script.run
+  rescue Exception => e
+    script.usage e.message
+  end
+end
diff --git a/contrib/ntp/sntp/unity/unity.c b/contrib/ntp/sntp/unity/unity.c
new file mode 100644
index 000000000000..cbdef3bb0a12
--- /dev/null
+++ b/contrib/ntp/sntp/unity/unity.c
@@ -0,0 +1,1282 @@
+/* =========================================================================
+    Unity Project - A Test Framework for C
+    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
+    [Released under MIT License. Please refer to license.txt for details]
+============================================================================ */
+
+#include "unity.h"
+
+#define UNITY_FAIL_AND_BAIL   { Unity.CurrentTestFailed  = 1; longjmp(Unity.AbortFrame, 1); }
+#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; longjmp(Unity.AbortFrame, 1); }
+/// return prematurely if we are already in failure or ignore state
+#define UNITY_SKIP_EXECUTION  { if ((Unity.CurrentTestFailed != 0) || (Unity.CurrentTestIgnored != 0)) {return;} }
+#define UNITY_PRINT_EOL       { UNITY_OUTPUT_CHAR('\n'); }
+
+struct _Unity Unity;
+
+const char UnityStrOk[]                     = "OK";
+const char UnityStrPass[]                   = "PASS";
+const char UnityStrFail[]                   = "FAIL";
+const char UnityStrIgnore[]                 = "IGNORE";
+const char UnityStrXPASS[]                  = "XPASS";
+const char UnityStrXFAIL[]                  = "XFAIL";
+const char UnityStrNull[]                   = "NULL";
+const char UnityStrSpacer[]                 = ". ";
+const char UnityStrExpected[]               = " Expected ";
+const char UnityStrWas[]                    = " Was ";
+const char UnityStrTo[]                     = " To ";
+const char UnityStrElement[]                = " Element ";
+const char UnityStrByte[]                   = " Byte ";
+const char UnityStrMemory[]                 = " Memory Mismatch.";
+const char UnityStrDelta[]                  = " Values Not Within Delta ";
+const char UnityStrPointless[]              = " You Asked Me To Compare Nothing, Which Was Pointless.";
+const char UnityStrNullPointerForExpected[] = " Expected pointer to be NULL";
+const char UnityStrNullPointerForActual[]   = " Actual pointer was NULL";
+const char UnityStrNot[]                    = "Not ";
+const char UnityStrInf[]                    = "Infinity";
+const char UnityStrNegInf[]                 = "Negative Infinity";
+const char UnityStrNaN[]                    = "NaN";
+const char UnityStrDet[]                    = "Determinate";
+const char UnityStrErrFloat[]               = "Unity Floating Point Disabled";
+const char UnityStrErrDouble[]              = "Unity Double Precision Disabled";
+const char UnityStrErr64[]                  = "Unity 64-bit Support Disabled";
+const char UnityStrBreaker[]                = "-----------------------";
+const char UnityStrResultsTests[]           = " Tests: ";
+const char UnityStrResultsFailures[]        = " Failures ";
+const char UnityStrResultsIgnored[]         = " Ignored ";
+const char UnityStrResultsXFAIL[]           = " XFAIL ";
+const char UnityStrResultsXPASS[]           = " XPASS ";
+const char UnityStrResultsPass[]            = " PASS ";
+
+
+#ifndef UNITY_EXCLUDE_FLOAT
+// Dividing by these constants produces +/- infinity.
+// The rationale is given in UnityAssertFloatIsInf's body.
+static const _UF f_zero = 0.0f;
+#ifndef UNITY_EXCLUDE_DOUBLE
+static const _UD d_zero = 0.0;
+#endif
+#endif
+
+// compiler-generic print formatting masks
+const _U_UINT UnitySizeMask[] =
+{
+    255u,         // 0xFF
+    65535u,       // 0xFFFF
+    65535u,
+    4294967295u,  // 0xFFFFFFFF
+    4294967295u,
+    4294967295u,
+    4294967295u
+#ifdef UNITY_SUPPORT_64
+    ,0xFFFFFFFFFFFFFFFF
+#endif
+};
+
+void UnityPrintFail(void);
+void UnityPrintOk(void);
+
+//-----------------------------------------------
+// Pretty Printers & Test Result Output Handlers
+//-----------------------------------------------
+
+void UnityPrint(const char* string)
+{
+    const char* pch = string;
+
+    if (pch != NULL)
+    {
+        while (*pch)
+        {
+            // printable characters plus CR & LF are printed
+            if ((*pch <= 126) && (*pch >= 32))
+            {
+                UNITY_OUTPUT_CHAR(*pch);
+            }
+            //write escaped carriage returns
+            else if (*pch == 13)
+            {
+                UNITY_OUTPUT_CHAR('\\');
+                UNITY_OUTPUT_CHAR('r');
+            }
+            //write escaped line feeds
+            else if (*pch == 10)
+            {
+                UNITY_OUTPUT_CHAR('\\');
+                UNITY_OUTPUT_CHAR('n');
+            }
+            // unprintable characters are shown as codes
+            else
+            {
+                UNITY_OUTPUT_CHAR('\\');
+                UnityPrintNumberHex((_U_UINT)*pch, 2);
+            }
+            pch++;
+        }
+    }
+}
+
+//-----------------------------------------------
+void UnityPrintNumberByStyle(const _U_SINT number, const UNITY_DISPLAY_STYLE_T style)
+{
+    if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT)
+    {
+        UnityPrintNumber(number);
+    }
+    else if ((style & UNITY_DISPLAY_RANGE_UINT) == UNITY_DISPLAY_RANGE_UINT)
+    {
+        UnityPrintNumberUnsigned(  (_U_UINT)number  &  UnitySizeMask[((_U_UINT)style & (_U_UINT)0x0F) - 1]  );
+    }
+    else
+    {
+        UnityPrintNumberHex((_U_UINT)number, (char)((style & 0x000F) << 1));
+    }
+}
+
+//-----------------------------------------------
+/// basically do an itoa using as little ram as possible
+void UnityPrintNumber(const _U_SINT number_to_print)
+{
+    _U_SINT divisor = 1;
+    _U_SINT next_divisor;
+    _U_UINT number;
+
+    if (number_to_print == (1l << (UNITY_LONG_WIDTH-1)))
+    {
+        //The largest representable negative number
+        UNITY_OUTPUT_CHAR('-');
+        number = (1ul << (UNITY_LONG_WIDTH-1));
+    }
+    else if (number_to_print < 0)
+    {
+        //Some other negative number
+        UNITY_OUTPUT_CHAR('-');
+        number = (_U_UINT)(-number_to_print);
+    }
+    else
+    {
+        //Positive number
+        number = (_U_UINT)number_to_print;
+    }
+
+    // figure out initial divisor
+    while (number / divisor > 9)
+    {
+        next_divisor = divisor * 10;
+        if (next_divisor > divisor)
+            divisor = next_divisor;
+        else
+            break;
+    }
+
+    // now mod and print, then divide divisor
+    do
+    {
+        UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10)));
+        divisor /= 10;
+    }
+    while (divisor > 0);
+}
+
+//-----------------------------------------------
+/// basically do an itoa using as little ram as possible
+void UnityPrintNumberUnsigned(const _U_UINT number)
+{
+    _U_UINT divisor = 1;
+    _U_UINT next_divisor;
+
+    // figure out initial divisor
+    while (number / divisor > 9)
+    {
+        next_divisor = divisor * 10;
+        if (next_divisor > divisor)
+            divisor = next_divisor;
+        else
+            break;
+    }
+
+    // now mod and print, then divide divisor
+    do
+    {
+        UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10)));
+        divisor /= 10;
+    }
+    while (divisor > 0);
+}
+
+//-----------------------------------------------
+void UnityPrintNumberHex(const _U_UINT number, const char nibbles_to_print)
+{
+    _U_UINT nibble;
+    char nibbles = nibbles_to_print;
+    UNITY_OUTPUT_CHAR('0');
+    UNITY_OUTPUT_CHAR('x');
+
+    while (nibbles > 0)
+    {
+        nibble = (number >> (--nibbles << 2)) & 0x0000000F;
+        if (nibble <= 9)
+        {
+            UNITY_OUTPUT_CHAR((char)('0' + nibble));
+        }
+        else
+        {
+            UNITY_OUTPUT_CHAR((char)('A' - 10 + nibble));
+        }
+    }
+}
+
+//-----------------------------------------------
+void UnityPrintMask(const _U_UINT mask, const _U_UINT number)
+{
+    _U_UINT current_bit = (_U_UINT)1 << (UNITY_INT_WIDTH - 1);
+    _US32 i;
+
+    for (i = 0; i < UNITY_INT_WIDTH; i++)
+    {
+        if (current_bit & mask)
+        {
+            if (current_bit & number)
+            {
+                UNITY_OUTPUT_CHAR('1');
+            }
+            else
+            {
+                UNITY_OUTPUT_CHAR('0');
+            }
+        }
+        else
+        {
+            UNITY_OUTPUT_CHAR('X');
+        }
+        current_bit = current_bit >> 1;
+    }
+}
+
+//-----------------------------------------------
+#ifdef UNITY_FLOAT_VERBOSE
+#include 
+void UnityPrintFloat(_UF number)
+{
+    char TempBuffer[32];
+    sprintf(TempBuffer, "%.6f", number);
+    UnityPrint(TempBuffer);
+}
+#endif
+
+//-----------------------------------------------
+
+void UnityPrintFail(void)
+{
+    UnityPrint(UnityStrFail);
+}
+
+void UnityPrintOk(void)
+{
+    UnityPrint(UnityStrOk);
+}
+
+//-----------------------------------------------
+static void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
+{
+    UnityPrint(file);
+    UNITY_OUTPUT_CHAR(':');
+    UnityPrintNumber((_U_SINT)line);
+    UNITY_OUTPUT_CHAR(':');
+    UnityPrint(Unity.CurrentTestName);
+    UNITY_OUTPUT_CHAR(':');
+}
+
+//-----------------------------------------------
+static void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line)
+{
+    UnityTestResultsBegin(Unity.TestFile, line);
+	if (Unity.isExpectingFail)
+	{
+		UnityPrint(UnityStrXFAIL);
+	}
+	else
+	{
+		UnityPrint(UnityStrFail);
+	}
+
+    UNITY_OUTPUT_CHAR(':');
+}
+
+//-----------------------------------------------
+void UnityConcludeTest(void)
+{
+#if 0
+	if (Unity.isExpectingFail == 1 && Unity.CurrentTestFailed == 0)
+	{
+		printf("FAIL WAS EXPECTED, BUT IT DIDN'T HAPPEN?!");
+		Unity.TestXPASSES++;
+	}
+
+	else
+#endif
+	//cant be ignored and accepting fail at the same time!
+	if (Unity.isExpectingFail == 1 && Unity.CurrentTestFailed == 1)
+	{
+		Unity.TestXFAILS++; //error message?!
+		if (Unity.XFAILMessage != NULL)
+		{
+			if (Unity.XFAILMessage[0] != ' ')
+			{
+				printf(" ");
+			}
+
+			printf("| ");
+			printf(Unity.XFAILMessage);
+			Unity.XFAILMessage = NULL;
+		}
+		else
+		{
+			printf(" - EXPECTED FAIL!");
+		}
+
+	}
+
+	else
+
+    if (Unity.CurrentTestIgnored)
+    {
+        Unity.TestIgnores++;
+    }
+    else if (!Unity.CurrentTestFailed)
+    {
+	if(Unity.isExpectingFail == 0) {
+		UnityTestResultsBegin(Unity.TestFile, Unity.CurrentTestLineNumber);
+		UnityPrint(UnityStrPass);
+		Unity.TestPasses++;
+	}
+
+	//probably should remove the if... part
+	else if (Unity.isExpectingFail == 1 && Unity.CurrentTestFailed == 0)
+	{
+
+		UnityTestResultsBegin(Unity.TestFile, Unity.CurrentTestLineNumber);
+		UnityPrint(UnityStrXPASS);
+		Unity.TestXPASSES++;
+
+		printf(" - FAIL WAS EXPECTED, BUT DIDN'T HAPPEN?!");
+		//if (Unity.TestPasses > 0) { Unity.TestPasses--; }
+	}
+    }
+    else
+    {
+        Unity.TestFailures++;
+    }
+
+    Unity.CurrentTestFailed = 0;
+    Unity.CurrentTestIgnored = 0;
+    Unity.isExpectingFail = 0;
+
+    UNITY_PRINT_EOL;
+}
+
+//-----------------------------------------------
+static void UnityAddMsgIfSpecified(const char* msg)
+{
+    if (msg)
+    {
+        UnityPrint(UnityStrSpacer);
+        UnityPrint(msg);
+    }
+}
+
+//-----------------------------------------------
+static void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual)
+{
+    UnityPrint(UnityStrExpected);
+    if (expected != NULL)
+    {
+        UNITY_OUTPUT_CHAR('\'');
+        UnityPrint(expected);
+        UNITY_OUTPUT_CHAR('\'');
+    }
+    else
+    {
+      UnityPrint(UnityStrNull);
+    }
+    UnityPrint(UnityStrWas);
+    if (actual != NULL)
+    {
+        UNITY_OUTPUT_CHAR('\'');
+        UnityPrint(actual);
+        UNITY_OUTPUT_CHAR('\'');
+    }
+    else
+    {
+      UnityPrint(UnityStrNull);
+    }
+}
+
+//-----------------------------------------------
+// Assertion & Control Helpers
+//-----------------------------------------------
+
+static int UnityCheckArraysForNull(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_PTR_ATTRIBUTE const void* actual, const UNITY_LINE_TYPE lineNumber, const char* msg)
+{
+    //return true if they are both NULL
+    if ((expected == NULL) && (actual == NULL))
+        return 1;
+
+    //throw error if just expected is NULL
+    if (expected == NULL)
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrNullPointerForExpected);
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+
+    //throw error if just actual is NULL
+    if (actual == NULL)
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrNullPointerForActual);
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+
+    //return false if neither is NULL
+    return 0;
+}
+
+//-----------------------------------------------
+// Assertion Functions
+//-----------------------------------------------
+
+void UnityAssertBits(const _U_SINT mask,
+                     const _U_SINT expected,
+                     const _U_SINT actual,
+                     const char* msg,
+                     const UNITY_LINE_TYPE lineNumber)
+{
+    UNITY_SKIP_EXECUTION;
+
+    if ((mask & expected) != (mask & actual))
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrExpected);
+        UnityPrintMask((_U_UINT)mask, (_U_UINT)expected);
+        UnityPrint(UnityStrWas);
+        UnityPrintMask((_U_UINT)mask, (_U_UINT)actual);
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+}
+
+//-----------------------------------------------
+void UnityAssertEqualNumber(const _U_SINT expected,
+                            const _U_SINT actual,
+                            const char* msg,
+                            const UNITY_LINE_TYPE lineNumber,
+                            const UNITY_DISPLAY_STYLE_T style)
+{
+    UNITY_SKIP_EXECUTION;
+
+    if (expected != actual)
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrExpected);
+        UnityPrintNumberByStyle(expected, style);
+        UnityPrint(UnityStrWas);
+        UnityPrintNumberByStyle(actual, style);
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+}
+
+//-----------------------------------------------
+void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
+                              UNITY_PTR_ATTRIBUTE const void* actual,
+                              const _UU32 num_elements,
+                              const char* msg,
+                              const UNITY_LINE_TYPE lineNumber,
+                              const UNITY_DISPLAY_STYLE_T style)
+{
+    _UU32 elements = num_elements;
+    UNITY_PTR_ATTRIBUTE const _US8* ptr_exp = (UNITY_PTR_ATTRIBUTE const _US8*)expected;
+    UNITY_PTR_ATTRIBUTE const _US8* ptr_act = (UNITY_PTR_ATTRIBUTE const _US8*)actual;
+
+    UNITY_SKIP_EXECUTION;
+
+    if (elements == 0)
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrPointless);
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+
+    if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE const void*)expected, (UNITY_PTR_ATTRIBUTE const void*)actual, lineNumber, msg) == 1)
+        return;
+
+    // If style is UNITY_DISPLAY_STYLE_INT, we'll fall into the default case rather than the INT16 or INT32 (etc) case
+    // as UNITY_DISPLAY_STYLE_INT includes a flag for UNITY_DISPLAY_RANGE_AUTO, which the width-specific
+    // variants do not. Therefore remove this flag.
+    switch(style & (UNITY_DISPLAY_STYLE_T)(~UNITY_DISPLAY_RANGE_AUTO))
+    {
+        case UNITY_DISPLAY_STYLE_HEX8:
+        case UNITY_DISPLAY_STYLE_INT8:
+        case UNITY_DISPLAY_STYLE_UINT8:
+            while (elements--)
+            {
+                if (*ptr_exp != *ptr_act)
+                {
+                    UnityTestResultsFailBegin(lineNumber);
+                    UnityPrint(UnityStrElement);
+                    UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
+                    UnityPrint(UnityStrExpected);
+                    UnityPrintNumberByStyle(*ptr_exp, style);
+                    UnityPrint(UnityStrWas);
+                    UnityPrintNumberByStyle(*ptr_act, style);
+                    UnityAddMsgIfSpecified(msg);
+                    UNITY_FAIL_AND_BAIL;
+                }
+                ptr_exp += 1;
+                ptr_act += 1;
+            }
+            break;
+        case UNITY_DISPLAY_STYLE_HEX16:
+        case UNITY_DISPLAY_STYLE_INT16:
+        case UNITY_DISPLAY_STYLE_UINT16:
+            while (elements--)
+            {
+                if (*(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_act)
+                {
+                    UnityTestResultsFailBegin(lineNumber);
+                    UnityPrint(UnityStrElement);
+                    UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
+                    UnityPrint(UnityStrExpected);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_exp, style);
+                    UnityPrint(UnityStrWas);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_act, style);
+                    UnityAddMsgIfSpecified(msg);
+                    UNITY_FAIL_AND_BAIL;
+                }
+                ptr_exp += 2;
+                ptr_act += 2;
+            }
+            break;
+#ifdef UNITY_SUPPORT_64
+        case UNITY_DISPLAY_STYLE_HEX64:
+        case UNITY_DISPLAY_STYLE_INT64:
+        case UNITY_DISPLAY_STYLE_UINT64:
+            while (elements--)
+            {
+                if (*(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_act)
+                {
+                    UnityTestResultsFailBegin(lineNumber);
+                    UnityPrint(UnityStrElement);
+                    UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
+                    UnityPrint(UnityStrExpected);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_exp, style);
+                    UnityPrint(UnityStrWas);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_act, style);
+                    UnityAddMsgIfSpecified(msg);
+                    UNITY_FAIL_AND_BAIL;
+                }
+                ptr_exp += 8;
+                ptr_act += 8;
+            }
+            break;
+#endif
+        default:
+            while (elements--)
+            {
+                if (*(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_act)
+                {
+                    UnityTestResultsFailBegin(lineNumber);
+                    UnityPrint(UnityStrElement);
+                    UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
+                    UnityPrint(UnityStrExpected);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_exp, style);
+                    UnityPrint(UnityStrWas);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_act, style);
+                    UnityAddMsgIfSpecified(msg);
+                    UNITY_FAIL_AND_BAIL;
+                }
+                ptr_exp += 4;
+                ptr_act += 4;
+            }
+            break;
+    }
+}
+
+//-----------------------------------------------
+#ifndef UNITY_EXCLUDE_FLOAT
+void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected,
+                                UNITY_PTR_ATTRIBUTE const _UF* actual,
+                                const _UU32 num_elements,
+                                const char* msg,
+                                const UNITY_LINE_TYPE lineNumber)
+{
+    _UU32 elements = num_elements;
+    UNITY_PTR_ATTRIBUTE const _UF* ptr_expected = expected;
+    UNITY_PTR_ATTRIBUTE const _UF* ptr_actual = actual;
+    _UF diff, tol;
+
+    UNITY_SKIP_EXECUTION;
+
+    if (elements == 0)
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrPointless);
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+
+    if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE const void*)expected, (UNITY_PTR_ATTRIBUTE const void*)actual, lineNumber, msg) == 1)
+        return;
+
+    while (elements--)
+    {
+        diff = *ptr_expected - *ptr_actual;
+        if (diff < 0.0f)
+          diff = 0.0f - diff;
+        tol = UNITY_FLOAT_PRECISION * *ptr_expected;
+        if (tol < 0.0f)
+            tol = 0.0f - tol;
+
+        //This first part of this condition will catch any NaN or Infinite values
+        if ((diff * 0.0f != 0.0f) || (diff > tol))
+        {
+            UnityTestResultsFailBegin(lineNumber);
+            UnityPrint(UnityStrElement);
+            UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
+#ifdef UNITY_FLOAT_VERBOSE
+            UnityPrint(UnityStrExpected);
+            UnityPrintFloat(*ptr_expected);
+            UnityPrint(UnityStrWas);
+            UnityPrintFloat(*ptr_actual);
+#else
+            UnityPrint(UnityStrDelta);
+#endif
+            UnityAddMsgIfSpecified(msg);
+            UNITY_FAIL_AND_BAIL;
+        }
+        ptr_expected++;
+        ptr_actual++;
+    }
+}
+
+//-----------------------------------------------
+void UnityAssertFloatsWithin(const _UF delta,
+                             const _UF expected,
+                             const _UF actual,
+                             const char* msg,
+                             const UNITY_LINE_TYPE lineNumber)
+{
+    _UF diff = actual - expected;
+    _UF pos_delta = delta;
+
+    UNITY_SKIP_EXECUTION;
+
+    if (diff < 0.0f)
+    {
+        diff = 0.0f - diff;
+    }
+    if (pos_delta < 0.0f)
+    {
+        pos_delta = 0.0f - pos_delta;
+    }
+
+    //This first part of this condition will catch any NaN or Infinite values
+    if ((diff * 0.0f != 0.0f) || (pos_delta < diff))
+    {
+        UnityTestResultsFailBegin(lineNumber);
+#ifdef UNITY_FLOAT_VERBOSE
+        UnityPrint(UnityStrExpected);
+        UnityPrintFloat(expected);
+        UnityPrint(UnityStrWas);
+        UnityPrintFloat(actual);
+#else
+        UnityPrint(UnityStrDelta);
+#endif
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+}
+
+//-----------------------------------------------
+void UnityAssertFloatSpecial(const _UF actual,
+                             const char* msg,
+                             const UNITY_LINE_TYPE lineNumber,
+                             const UNITY_FLOAT_TRAIT_T style)
+{
+    const char* trait_names[] = { UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet };
+    _U_SINT should_be_trait   = ((_U_SINT)style & 1);
+    _U_SINT is_trait          = !should_be_trait;
+    _U_SINT trait_index       = style >> 1;
+
+    UNITY_SKIP_EXECUTION;
+
+    switch(style)
+    {
+        //To determine Inf / Neg Inf, we compare to an Inf / Neg Inf value we create on the fly
+        //We are using a variable to hold the zero value because some compilers complain about dividing by zero otherwise
+        case UNITY_FLOAT_IS_INF:
+        case UNITY_FLOAT_IS_NOT_INF:
+            is_trait = ((1.0f / f_zero) == actual) ? 1 : 0;
+            break;
+        case UNITY_FLOAT_IS_NEG_INF:
+        case UNITY_FLOAT_IS_NOT_NEG_INF:
+            is_trait = ((-1.0f / f_zero) == actual) ? 1 : 0;
+            break;
+
+        //NaN is the only floating point value that does NOT equal itself. Therefore if Actual == Actual, then it is NOT NaN.
+        case UNITY_FLOAT_IS_NAN:
+        case UNITY_FLOAT_IS_NOT_NAN:
+            is_trait = (actual == actual) ? 0 : 1;
+            break;
+
+        //A determinate number is non infinite and not NaN. (therefore the opposite of the two above)
+        case UNITY_FLOAT_IS_DET:
+        case UNITY_FLOAT_IS_NOT_DET:
+            if ( (actual != actual) || ((1.0f / f_zero) == actual) || ((-1.0f / f_zero) == actual) )
+                is_trait = 0;
+            else
+                is_trait = 1;
+            break;
+	default:
+	    ;
+    }
+
+    if (is_trait != should_be_trait)
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrExpected);
+        if (!should_be_trait)
+            UnityPrint(UnityStrNot);
+        UnityPrint(trait_names[trait_index]);
+        UnityPrint(UnityStrWas);
+#ifdef UNITY_FLOAT_VERBOSE
+        UnityPrintFloat(actual);
+#else
+        if (should_be_trait)
+            UnityPrint(UnityStrNot);
+        UnityPrint(trait_names[trait_index]);
+#endif
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+}
+
+#endif //not UNITY_EXCLUDE_FLOAT
+
+//-----------------------------------------------
+#ifndef UNITY_EXCLUDE_DOUBLE
+void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected,
+                                 UNITY_PTR_ATTRIBUTE const _UD* actual,
+                                 const _UU32 num_elements,
+                                 const char* msg,
+                                 const UNITY_LINE_TYPE lineNumber)
+{
+    _UU32 elements = num_elements;
+    UNITY_PTR_ATTRIBUTE const _UD* ptr_expected = expected;
+    UNITY_PTR_ATTRIBUTE const _UD* ptr_actual = actual;
+    _UD diff, tol;
+
+    UNITY_SKIP_EXECUTION;
+
+    if (elements == 0)
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrPointless);
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+
+    if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1)
+        return;
+
+    while (elements--)
+    {
+        diff = *ptr_expected - *ptr_actual;
+        if (diff < 0.0)
+          diff = 0.0 - diff;
+        tol = UNITY_DOUBLE_PRECISION * *ptr_expected;
+        if (tol < 0.0)
+            tol = 0.0 - tol;
+
+        //This first part of this condition will catch any NaN or Infinite values
+        if ((diff * 0.0 != 0.0) || (diff > tol))
+        {
+            UnityTestResultsFailBegin(lineNumber);
+            UnityPrint(UnityStrElement);
+            UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
+#ifdef UNITY_DOUBLE_VERBOSE
+            UnityPrint(UnityStrExpected);
+            UnityPrintFloat((float)(*ptr_expected));
+            UnityPrint(UnityStrWas);
+            UnityPrintFloat((float)(*ptr_actual));
+#else
+            UnityPrint(UnityStrDelta);
+#endif
+            UnityAddMsgIfSpecified(msg);
+            UNITY_FAIL_AND_BAIL;
+        }
+        ptr_expected++;
+        ptr_actual++;
+    }
+}
+
+//-----------------------------------------------
+void UnityAssertDoublesWithin(const _UD delta,
+                              const _UD expected,
+                              const _UD actual,
+                              const char* msg,
+                              const UNITY_LINE_TYPE lineNumber)
+{
+    _UD diff = actual - expected;
+    _UD pos_delta = delta;
+
+    UNITY_SKIP_EXECUTION;
+
+    if (diff < 0.0)
+    {
+        diff = 0.0 - diff;
+    }
+    if (pos_delta < 0.0)
+    {
+        pos_delta = 0.0 - pos_delta;
+    }
+
+    //This first part of this condition will catch any NaN or Infinite values
+    if ((diff * 0.0 != 0.0) || (pos_delta < diff))
+    {
+        UnityTestResultsFailBegin(lineNumber);
+#ifdef UNITY_DOUBLE_VERBOSE
+        UnityPrint(UnityStrExpected);
+        UnityPrintFloat((float)expected);
+        UnityPrint(UnityStrWas);
+        UnityPrintFloat((float)actual);
+#else
+        UnityPrint(UnityStrDelta);
+#endif
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+}
+
+//-----------------------------------------------
+
+void UnityAssertDoubleSpecial(const _UD actual,
+                              const char* msg,
+                              const UNITY_LINE_TYPE lineNumber,
+                              const UNITY_FLOAT_TRAIT_T style)
+{
+    const char* trait_names[] = { UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet };
+    _U_SINT should_be_trait   = ((_U_SINT)style & 1);
+    _U_SINT is_trait          = !should_be_trait;
+    _U_SINT trait_index       = style >> 1;
+
+    UNITY_SKIP_EXECUTION;
+
+    switch(style)
+    {
+        //To determine Inf / Neg Inf, we compare to an Inf / Neg Inf value we create on the fly
+        //We are using a variable to hold the zero value because some compilers complain about dividing by zero otherwise
+        case UNITY_FLOAT_IS_INF:
+        case UNITY_FLOAT_IS_NOT_INF:
+            is_trait = ((1.0 / d_zero) == actual) ? 1 : 0;
+            break;
+        case UNITY_FLOAT_IS_NEG_INF:
+        case UNITY_FLOAT_IS_NOT_NEG_INF:
+            is_trait = ((-1.0 / d_zero) == actual) ? 1 : 0;
+            break;
+
+        //NaN is the only floating point value that does NOT equal itself. Therefore if Actual == Actual, then it is NOT NaN.
+        case UNITY_FLOAT_IS_NAN:
+        case UNITY_FLOAT_IS_NOT_NAN:
+            is_trait = (actual == actual) ? 0 : 1;
+            break;
+
+        //A determinate number is non infinite and not NaN. (therefore the opposite of the two above)
+        case UNITY_FLOAT_IS_DET:
+        case UNITY_FLOAT_IS_NOT_DET:
+            if ( (actual != actual) || ((1.0 / d_zero) == actual) || ((-1.0 / d_zero) == actual) )
+                is_trait = 0;
+            else
+                is_trait = 1;
+            break;
+	default:
+	    ;
+    }
+
+    if (is_trait != should_be_trait)
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrExpected);
+        if (!should_be_trait)
+            UnityPrint(UnityStrNot);
+        UnityPrint(trait_names[trait_index]);
+        UnityPrint(UnityStrWas);
+#ifdef UNITY_DOUBLE_VERBOSE
+        UnityPrintFloat(actual);
+#else
+        if (should_be_trait)
+            UnityPrint(UnityStrNot);
+        UnityPrint(trait_names[trait_index]);
+#endif
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+}
+
+
+#endif // not UNITY_EXCLUDE_DOUBLE
+
+//-----------------------------------------------
+void UnityAssertNumbersWithin( const _U_SINT delta,
+                               const _U_SINT expected,
+                               const _U_SINT actual,
+                               const char* msg,
+                               const UNITY_LINE_TYPE lineNumber,
+                               const UNITY_DISPLAY_STYLE_T style)
+{
+    UNITY_SKIP_EXECUTION;
+
+    if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT)
+    {
+        if (actual > expected)
+          Unity.CurrentTestFailed = ((actual - expected) > delta);
+        else
+          Unity.CurrentTestFailed = ((expected - actual) > delta);
+    }
+    else
+    {
+        if ((_U_UINT)actual > (_U_UINT)expected)
+            Unity.CurrentTestFailed = ((_U_UINT)(actual - expected) > (_U_UINT)delta);
+        else
+            Unity.CurrentTestFailed = ((_U_UINT)(expected - actual) > (_U_UINT)delta);
+    }
+
+    if (Unity.CurrentTestFailed)
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrDelta);
+        UnityPrintNumberByStyle(delta, style);
+        UnityPrint(UnityStrExpected);
+        UnityPrintNumberByStyle(expected, style);
+        UnityPrint(UnityStrWas);
+        UnityPrintNumberByStyle(actual, style);
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+}
+
+//-----------------------------------------------
+void UnityAssertEqualString(const char* expected,
+                            const char* actual,
+                            const char* msg,
+                            const UNITY_LINE_TYPE lineNumber)
+{
+    _UU32 i;
+
+    UNITY_SKIP_EXECUTION;
+
+    // if both pointers not null compare the strings
+    if (expected && actual)
+    {
+        for (i = 0; expected[i] || actual[i]; i++)
+        {
+            if (expected[i] != actual[i])
+            {
+                Unity.CurrentTestFailed = 1;
+                break;
+            }
+        }
+    }
+    else
+    { // handle case of one pointers being null (if both null, test should pass)
+        if (expected != actual)
+        {
+            Unity.CurrentTestFailed = 1;
+        }
+    }
+
+    if (Unity.CurrentTestFailed)
+    {
+      UnityTestResultsFailBegin(lineNumber);
+      UnityPrintExpectedAndActualStrings(expected, actual);
+      UnityAddMsgIfSpecified(msg);
+      UNITY_FAIL_AND_BAIL;
+    }
+}
+
+//-----------------------------------------------
+void UnityAssertEqualStringArray( const char** expected,
+                                  const char** actual,
+                                  const _UU32 num_elements,
+                                  const char* msg,
+                                  const UNITY_LINE_TYPE lineNumber)
+{
+    _UU32 i, j = 0;
+
+    UNITY_SKIP_EXECUTION;
+
+    // if no elements, it's an error
+    if (num_elements == 0)
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrPointless);
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+
+    if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1)
+        return;
+
+    do
+    {
+        // if both pointers not null compare the strings
+        if (expected[j] && actual[j])
+        {
+            for (i = 0; expected[j][i] || actual[j][i]; i++)
+            {
+                if (expected[j][i] != actual[j][i])
+                {
+                    Unity.CurrentTestFailed = 1;
+                    break;
+                }
+            }
+        }
+        else
+        { // handle case of one pointers being null (if both null, test should pass)
+            if (expected[j] != actual[j])
+            {
+                Unity.CurrentTestFailed = 1;
+            }
+        }
+
+        if (Unity.CurrentTestFailed)
+        {
+            UnityTestResultsFailBegin(lineNumber);
+            if (num_elements > 1)
+            {
+                UnityPrint(UnityStrElement);
+                UnityPrintNumberByStyle((j), UNITY_DISPLAY_STYLE_UINT);
+            }
+            UnityPrintExpectedAndActualStrings((const char*)(expected[j]), (const char*)(actual[j]));
+            UnityAddMsgIfSpecified(msg);
+            UNITY_FAIL_AND_BAIL;
+        }
+    } while (++j < num_elements);
+}
+
+//-----------------------------------------------
+void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected,
+                             UNITY_PTR_ATTRIBUTE const void* actual,
+                             const _UU32 length,
+                             const _UU32 num_elements,
+                             const char* msg,
+                             const UNITY_LINE_TYPE lineNumber)
+{
+    UNITY_PTR_ATTRIBUTE const unsigned char* ptr_exp = (UNITY_PTR_ATTRIBUTE const unsigned char*)expected;
+    UNITY_PTR_ATTRIBUTE const unsigned char* ptr_act = (UNITY_PTR_ATTRIBUTE const unsigned char*)actual;
+    _UU32 elements = num_elements;
+    _UU32 bytes;
+
+    UNITY_SKIP_EXECUTION;
+
+    if ((elements == 0) || (length == 0))
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrPointless);
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+
+    if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE const void*)expected, (UNITY_PTR_ATTRIBUTE const void*)actual, lineNumber, msg) == 1)
+        return;
+
+    while (elements--)
+    {
+        /////////////////////////////////////
+        bytes = length;
+        while (bytes--)
+        {
+            if (*ptr_exp != *ptr_act)
+            {
+                UnityTestResultsFailBegin(lineNumber);
+                UnityPrint(UnityStrMemory);
+                if (num_elements > 1)
+                {
+                    UnityPrint(UnityStrElement);
+                    UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
+                }
+                UnityPrint(UnityStrByte);
+                UnityPrintNumberByStyle((length - bytes - 1), UNITY_DISPLAY_STYLE_UINT);
+                UnityPrint(UnityStrExpected);
+                UnityPrintNumberByStyle(*ptr_exp, UNITY_DISPLAY_STYLE_HEX8);
+                UnityPrint(UnityStrWas);
+                UnityPrintNumberByStyle(*ptr_act, UNITY_DISPLAY_STYLE_HEX8);
+                UnityAddMsgIfSpecified(msg);
+                UNITY_FAIL_AND_BAIL;
+            }
+            ptr_exp += 1;
+            ptr_act += 1;
+        }
+        /////////////////////////////////////
+
+    }
+}
+
+//-----------------------------------------------
+// Control Functions
+//-----------------------------------------------
+
+void UnityFail(const char* msg, const UNITY_LINE_TYPE line)
+{
+    UNITY_SKIP_EXECUTION;
+
+    UnityTestResultsBegin(Unity.TestFile, line);
+    UnityPrintFail();
+    if (msg != NULL)
+    {
+      UNITY_OUTPUT_CHAR(':');
+      if (msg[0] != ' ')
+      {
+        UNITY_OUTPUT_CHAR(' ');
+      }
+      UnityPrint(msg);
+    }
+    UNITY_FAIL_AND_BAIL;
+}
+
+//-----------------------------------------------
+void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
+{
+    UNITY_SKIP_EXECUTION;
+
+    UnityTestResultsBegin(Unity.TestFile, line);
+    UnityPrint(UnityStrIgnore);
+    if (msg != NULL)
+    {
+      UNITY_OUTPUT_CHAR(':');
+      UNITY_OUTPUT_CHAR(' ');
+      UnityPrint(msg);
+    }
+    UNITY_IGNORE_AND_BAIL;
+}
+
+//----------------------------------------------
+
+void UnityExpectFail(){
+
+	Unity.isExpectingFail = 1;
+
+}
+
+void UnityExpectFailMessage(const char* msg, const UNITY_LINE_TYPE line ){
+
+	Unity.isExpectingFail = 1;
+	  if (msg != NULL)
+    {
+		Unity.XFAILMessage = msg;
+    }
+}
+
+//-----------------------------------------------
+#if defined(UNITY_WEAK_ATTRIBUTE)
+    void setUp(void);
+    void tearDown(void);
+    UNITY_WEAK_ATTRIBUTE void setUp(void) { }
+    UNITY_WEAK_ATTRIBUTE void tearDown(void) { }
+#elif defined(UNITY_WEAK_PRAGMA)
+#   pragma weak setUp
+    void setUp(void);
+#   pragma weak tearDown
+    void tearDown(void);
+#else
+    void setUp(void);
+    void tearDown(void);
+#endif
+
+//-----------------------------------------------
+void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum)
+{
+    Unity.CurrentTestName = FuncName;
+    Unity.CurrentTestLineNumber = (UNITY_LINE_TYPE)FuncLineNum;
+    Unity.NumberOfTests++;
+
+    if (TEST_PROTECT())
+    {
+        setUp();
+        Func();
+    }
+    if (TEST_PROTECT() && !(Unity.CurrentTestIgnored))
+    {
+        tearDown();
+    }
+
+    UnityConcludeTest();
+}
+
+
+//-----------------------------------------------
+void UnityBegin(const char* filename)
+{
+    Unity.TestFile = filename;
+    Unity.CurrentTestName = NULL;
+    Unity.CurrentTestLineNumber = 0;
+    Unity.NumberOfTests = 0;
+    Unity.TestFailures = 0;
+    Unity.TestIgnores = 0;
+    Unity.CurrentTestFailed = 0;
+    Unity.CurrentTestIgnored = 0;
+    Unity.TestXFAILS = 0;
+    Unity.isExpectingFail = 0;
+    Unity.TestPasses = 0;
+    Unity.TestXPASSES = 0;
+    Unity.XFAILMessage = NULL;
+
+    UNITY_OUTPUT_START();
+}
+
+
+//-----------------------------------------------
+int UnityEnd(void)
+{
+    UNITY_PRINT_EOL;
+    UnityPrint(UnityStrBreaker);
+    UNITY_PRINT_EOL;
+    UnityPrintNumber((_U_SINT)(Unity.NumberOfTests));
+    UnityPrint(UnityStrResultsTests);
+    UNITY_PRINT_EOL;
+    UnityPrintNumber((_U_SINT)(Unity.TestPasses));
+    UnityPrint(UnityStrResultsPass);
+    UNITY_PRINT_EOL;
+    UnityPrintNumber((_U_SINT)(Unity.TestXFAILS));
+    UnityPrint(UnityStrResultsXFAIL);
+    UNITY_PRINT_EOL;
+    UnityPrintNumber((_U_SINT)(Unity.TestFailures));
+    UnityPrint(UnityStrResultsFailures);
+    UNITY_PRINT_EOL;
+    UnityPrintNumber((_U_SINT)(Unity.TestXPASSES));
+    UnityPrint(UnityStrResultsXPASS);
+    UNITY_PRINT_EOL;
+    UnityPrintNumber((_U_SINT)(Unity.TestIgnores));
+    UnityPrint(UnityStrResultsIgnored);
+    UNITY_PRINT_EOL;
+
+    UNITY_PRINT_EOL;
+    if (Unity.TestFailures == 0U && Unity.TestXPASSES == 0U)
+    {
+        UnityPrintOk();
+    }
+    else
+    {
+        UnityPrintFail();
+    }
+    UNITY_PRINT_EOL;
+    UNITY_OUTPUT_COMPLETE();
+    return (int)(Unity.TestFailures);
+}
+
+
+//-----------------------------------------------
diff --git a/contrib/ntp/sntp/unity/unity.h b/contrib/ntp/sntp/unity/unity.h
new file mode 100644
index 000000000000..d1decd042b3c
--- /dev/null
+++ b/contrib/ntp/sntp/unity/unity.h
@@ -0,0 +1,272 @@
+/* ==========================================
+    Unity Project - A Test Framework for C
+    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
+    [Released under MIT License. Please refer to license.txt for details]
+========================================== */
+
+#ifndef UNITY_FRAMEWORK_H
+#define UNITY_FRAMEWORK_H
+#define UNITY
+
+#include "unity_internals.h"
+
+//-------------------------------------------------------
+// Configuration Options
+//-------------------------------------------------------
+// All options described below should be passed as a compiler flag to all files using Unity. If you must add #defines, place them BEFORE the #include above.
+
+// Integers/longs/pointers
+//     - Unity attempts to automatically discover your integer sizes
+//       - define UNITY_EXCLUDE_STDINT_H to stop attempting to look in 
+//       - define UNITY_EXCLUDE_LIMITS_H to stop attempting to look in 
+//       - define UNITY_EXCLUDE_SIZEOF to stop attempting to use sizeof in macros
+//     - If you cannot use the automatic methods above, you can force Unity by using these options:
+//       - define UNITY_SUPPORT_64
+//       - define UNITY_INT_WIDTH
+//       - UNITY_LONG_WIDTH
+//       - UNITY_POINTER_WIDTH
+
+// Floats
+//     - define UNITY_EXCLUDE_FLOAT to disallow floating point comparisons
+//     - define UNITY_FLOAT_PRECISION to specify the precision to use when doing TEST_ASSERT_EQUAL_FLOAT
+//     - define UNITY_FLOAT_TYPE to specify doubles instead of single precision floats
+//     - define UNITY_FLOAT_VERBOSE to print floating point values in errors (uses sprintf)
+//     - define UNITY_INCLUDE_DOUBLE to allow double floating point comparisons
+//     - define UNITY_EXCLUDE_DOUBLE to disallow double floating point comparisons (default)
+//     - define UNITY_DOUBLE_PRECISION to specify the precision to use when doing TEST_ASSERT_EQUAL_DOUBLE
+//     - define UNITY_DOUBLE_TYPE to specify something other than double
+//     - define UNITY_DOUBLE_VERBOSE to print floating point values in errors (uses sprintf)
+
+// Output
+//     - by default, Unity prints to standard out with putchar.  define UNITY_OUTPUT_CHAR(a) with a different function if desired
+
+// Optimization
+//     - by default, line numbers are stored in unsigned shorts.  Define UNITY_LINE_TYPE with a different type if your files are huge
+//     - by default, test and failure counters are unsigned shorts.  Define UNITY_COUNTER_TYPE with a different type if you want to save space or have more than 65535 Tests.
+
+// Test Cases
+//     - define UNITY_SUPPORT_TEST_CASES to include the TEST_CASE macro, though really it's mostly about the runner generator script
+
+// Parameterized Tests
+//     - you'll want to create a define of TEST_CASE(...) which basically evaluates to nothing
+
+//-------------------------------------------------------
+// Basic Fail and Ignore
+//-------------------------------------------------------
+
+#define TEST_FAIL_MESSAGE(message)                                                                 UNITY_TEST_FAIL(__LINE__, message)
+#define TEST_FAIL()                                                                                UNITY_TEST_FAIL(__LINE__, NULL)
+#define TEST_IGNORE_MESSAGE(message)                                                               UNITY_TEST_IGNORE(__LINE__, message)
+#define TEST_IGNORE()                                                                              UNITY_TEST_IGNORE(__LINE__, NULL)
+#define TEST_ONLY()
+
+//-------------------------------------------------------
+// Test Asserts (simple)
+//-------------------------------------------------------
+
+//Boolean
+#define TEST_ASSERT(condition)                                                                     UNITY_TEST_ASSERT(       (condition), __LINE__, " Expression Evaluated To FALSE")
+#define TEST_ASSERT_TRUE(condition)                                                                UNITY_TEST_ASSERT(       (condition), __LINE__, " Expected TRUE Was FALSE")
+#define TEST_ASSERT_UNLESS(condition)                                                              UNITY_TEST_ASSERT(      !(condition), __LINE__, " Expression Evaluated To TRUE")
+#define TEST_ASSERT_FALSE(condition)                                                               UNITY_TEST_ASSERT(      !(condition), __LINE__, " Expected FALSE Was TRUE")
+#define TEST_ASSERT_NULL(pointer)                                                                  UNITY_TEST_ASSERT_NULL(    (pointer), __LINE__, " Expected NULL")
+#define TEST_ASSERT_NOT_NULL(pointer)                                                              UNITY_TEST_ASSERT_NOT_NULL((pointer), __LINE__, " Expected Non-NULL")
+
+//Integers (of all sizes)
+#define TEST_ASSERT_EQUAL_INT(expected, actual)                                                    UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_INT8(expected, actual)                                                   UNITY_TEST_ASSERT_EQUAL_INT8((expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_INT16(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_INT16((expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_INT32(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_INT32((expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_INT64(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_INT64((expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL(expected, actual)                                                        UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_NOT_EQUAL(expected, actual)                                                    UNITY_TEST_ASSERT(((expected) !=  (actual)), __LINE__, " Expected Not-Equal")
+#define TEST_ASSERT_EQUAL_UINT(expected, actual)                                                   UNITY_TEST_ASSERT_EQUAL_UINT( (expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_UINT8(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_UINT8( (expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_UINT16(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_UINT16( (expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_UINT32(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_UINT32( (expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_UINT64(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_UINT64( (expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_HEX(expected, actual)                                                    UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_HEX8(expected, actual)                                                   UNITY_TEST_ASSERT_EQUAL_HEX8( (expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_HEX16(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_HEX16((expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_HEX32(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_HEX64(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_HEX64((expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_BITS(mask, expected, actual)                                                   UNITY_TEST_ASSERT_BITS((mask), (expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_BITS_HIGH(mask, actual)                                                        UNITY_TEST_ASSERT_BITS((mask), (_UU32)(-1), (actual), __LINE__, NULL)
+#define TEST_ASSERT_BITS_LOW(mask, actual)                                                         UNITY_TEST_ASSERT_BITS((mask), (_UU32)(0), (actual), __LINE__, NULL)
+#define TEST_ASSERT_BIT_HIGH(bit, actual)                                                          UNITY_TEST_ASSERT_BITS(((_UU32)1 << bit), (_UU32)(-1), (actual), __LINE__, NULL)
+#define TEST_ASSERT_BIT_LOW(bit, actual)                                                           UNITY_TEST_ASSERT_BITS(((_UU32)1 << bit), (_UU32)(0), (actual), __LINE__, NULL)
+
+//Integer Ranges (of all sizes)
+#define TEST_ASSERT_INT_WITHIN(delta, expected, actual)                                            UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_INT8_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_INT8_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_INT16_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_INT16_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_INT32_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_INT32_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_INT64_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_UINT_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_UINT8_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_UINT8_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_UINT16_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_UINT16_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_UINT32_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_UINT32_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_UINT64_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_HEX_WITHIN(delta, expected, actual)                                            UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_HEX8_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_HEX16_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_HEX32_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_HEX64_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, __LINE__, NULL)
+
+//Structs and Strings
+#define TEST_ASSERT_EQUAL_PTR(expected, actual)                                                    UNITY_TEST_ASSERT_EQUAL_PTR((expected), (actual), __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_STRING(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_MEMORY(expected, actual, len)                                            UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, __LINE__, NULL)
+
+//Arrays
+#define TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_HEX_ARRAY(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements)                        UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, __LINE__, NULL)
+
+//Floating Point (If Enabled)
+#define TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_FLOAT(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_FLOAT_IS_INF(actual)                                                           UNITY_TEST_ASSERT_FLOAT_IS_INF(actual, __LINE__, NULL)
+#define TEST_ASSERT_FLOAT_IS_NEG_INF(actual)                                                       UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF(actual, __LINE__, NULL)
+#define TEST_ASSERT_FLOAT_IS_NAN(actual)                                                           UNITY_TEST_ASSERT_FLOAT_IS_NAN(actual, __LINE__, NULL)
+#define TEST_ASSERT_FLOAT_IS_DETERMINATE(actual)                                                   UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE(actual, __LINE__, NULL)
+#define TEST_ASSERT_FLOAT_IS_NOT_INF(actual)                                                       UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF(actual, __LINE__, NULL)
+#define TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual)                                                   UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual, __LINE__, NULL)
+#define TEST_ASSERT_FLOAT_IS_NOT_NAN(actual)                                                       UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN(actual, __LINE__, NULL)
+#define TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual)                                               UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual, __LINE__, NULL)
+
+//Double (If Enabled)
+#define TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_DOUBLE(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+#define TEST_ASSERT_DOUBLE_IS_INF(actual)                                                          UNITY_TEST_ASSERT_DOUBLE_IS_INF(actual, __LINE__, NULL)
+#define TEST_ASSERT_DOUBLE_IS_NEG_INF(actual)                                                      UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF(actual, __LINE__, NULL)
+#define TEST_ASSERT_DOUBLE_IS_NAN(actual)                                                          UNITY_TEST_ASSERT_DOUBLE_IS_NAN(actual, __LINE__, NULL)
+#define TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual)                                                  UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual, __LINE__, NULL)
+#define TEST_ASSERT_DOUBLE_IS_NOT_INF(actual)                                                      UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF(actual, __LINE__, NULL)
+#define TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual)                                                  UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual, __LINE__, NULL)
+#define TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual)                                                      UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual, __LINE__, NULL)
+#define TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual)                                              UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, __LINE__, NULL)
+
+//-------------------------------------------------------
+// Test Asserts (with additional messages)
+//-------------------------------------------------------
+
+//Boolean
+#define TEST_ASSERT_MESSAGE(condition, message)                                                    UNITY_TEST_ASSERT(       (condition), __LINE__, message)
+#define TEST_ASSERT_TRUE_MESSAGE(condition, message)                                               UNITY_TEST_ASSERT(       (condition), __LINE__, message)
+#define TEST_ASSERT_UNLESS_MESSAGE(condition, message)                                             UNITY_TEST_ASSERT(      !(condition), __LINE__, message)
+#define TEST_ASSERT_FALSE_MESSAGE(condition, message)                                              UNITY_TEST_ASSERT(      !(condition), __LINE__, message)
+#define TEST_ASSERT_NULL_MESSAGE(pointer, message)                                                 UNITY_TEST_ASSERT_NULL(    (pointer), __LINE__, message)
+#define TEST_ASSERT_NOT_NULL_MESSAGE(pointer, message)                                             UNITY_TEST_ASSERT_NOT_NULL((pointer), __LINE__, message)
+
+//Integers (of all sizes)
+#define TEST_ASSERT_EQUAL_INT_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_INT8_MESSAGE(expected, actual, message)                                  UNITY_TEST_ASSERT_EQUAL_INT8((expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_INT16_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_INT16((expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_INT32_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_INT32((expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_INT64_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_INT64((expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_MESSAGE(expected, actual, message)                                       UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, message)
+#define TEST_ASSERT_NOT_EQUAL_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT(((expected) !=  (actual)), __LINE__, message)
+#define TEST_ASSERT_EQUAL_UINT_MESSAGE(expected, actual, message)                                  UNITY_TEST_ASSERT_EQUAL_UINT( (expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_UINT8_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_UINT8( (expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_UINT16_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_UINT16( (expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_UINT32_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_UINT32( (expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_UINT64_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_UINT64( (expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_HEX_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_HEX8_MESSAGE(expected, actual, message)                                  UNITY_TEST_ASSERT_EQUAL_HEX8( (expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_HEX16_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_HEX16((expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_HEX32_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, message)
+#define TEST_ASSERT_EQUAL_HEX64_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_HEX64((expected), (actual), __LINE__, message)
+#define TEST_ASSERT_BITS_MESSAGE(mask, expected, actual, message)                                  UNITY_TEST_ASSERT_BITS((mask), (expected), (actual), __LINE__, message)
+#define TEST_ASSERT_BITS_HIGH_MESSAGE(mask, actual, message)                                       UNITY_TEST_ASSERT_BITS((mask), (_UU32)(-1), (actual), __LINE__, message)
+#define TEST_ASSERT_BITS_LOW_MESSAGE(mask, actual, message)                                        UNITY_TEST_ASSERT_BITS((mask), (_UU32)(0), (actual), __LINE__, message)
+#define TEST_ASSERT_BIT_HIGH_MESSAGE(bit, actual, message)                                         UNITY_TEST_ASSERT_BITS(((_UU32)1 << bit), (_UU32)(-1), (actual), __LINE__, message)
+#define TEST_ASSERT_BIT_LOW_MESSAGE(bit, actual, message)                                          UNITY_TEST_ASSERT_BITS(((_UU32)1 << bit), (_UU32)(0), (actual), __LINE__, message)
+
+//Integer Ranges (of all sizes)
+#define TEST_ASSERT_INT_WITHIN_MESSAGE(delta, expected, actual, message)                           UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_INT8_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_INT8_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_INT16_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_INT16_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_INT32_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_INT32_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_INT64_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_UINT_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_UINT8_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_UINT8_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_UINT16_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_UINT16_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_UINT32_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_UINT32_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_UINT64_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_HEX_WITHIN_MESSAGE(delta, expected, actual, message)                           UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_HEX8_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_HEX16_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_HEX32_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_HEX64_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, __LINE__, message)
+
+//Structs and Strings
+#define TEST_ASSERT_EQUAL_PTR_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, __LINE__, message)
+#define TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, __LINE__, message)
+#define TEST_ASSERT_EQUAL_MEMORY_MESSAGE(expected, actual, len, message)                           UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, __LINE__, message)
+
+//Arrays
+#define TEST_ASSERT_EQUAL_INT_ARRAY_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_INT8_ARRAY_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_INT16_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_INT32_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_INT64_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_UINT_ARRAY_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_UINT8_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_UINT16_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_UINT32_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_UINT64_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_HEX_ARRAY_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_HEX8_ARRAY_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_HEX16_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_HEX32_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_HEX64_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_PTR_ARRAY_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_STRING_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_EQUAL_MEMORY_ARRAY_MESSAGE(expected, actual, len, num_elements, message)       UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, __LINE__, message)
+
+//Floating Point (If Enabled)
+#define TEST_ASSERT_FLOAT_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_EQUAL_FLOAT_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, __LINE__, message)
+#define TEST_ASSERT_EQUAL_FLOAT_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_FLOAT_IS_INF_MESSAGE(actual, message)                                          UNITY_TEST_ASSERT_FLOAT_IS_INF(actual, __LINE__, message)
+#define TEST_ASSERT_FLOAT_IS_NEG_INF_MESSAGE(actual, message)                                      UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF(actual, __LINE__, message)
+#define TEST_ASSERT_FLOAT_IS_NAN_MESSAGE(actual, message)                                          UNITY_TEST_ASSERT_FLOAT_IS_NAN(actual, __LINE__, message)
+#define TEST_ASSERT_FLOAT_IS_DETERMINATE_MESSAGE(actual, message)                                  UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE(actual, __LINE__, message)
+#define TEST_ASSERT_FLOAT_IS_NOT_INF_MESSAGE(actual, message)                                      UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF(actual, __LINE__, message)
+#define TEST_ASSERT_FLOAT_IS_NOT_NEG_INF_MESSAGE(actual, message)                                  UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual, __LINE__, message)
+#define TEST_ASSERT_FLOAT_IS_NOT_NAN_MESSAGE(actual, message)                                      UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN(actual, __LINE__, message)
+#define TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE_MESSAGE(actual, message)                              UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual, __LINE__, message)
+
+//Double (If Enabled)
+#define TEST_ASSERT_DOUBLE_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_EQUAL_DOUBLE_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, __LINE__, message)
+#define TEST_ASSERT_EQUAL_DOUBLE_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, __LINE__, message)
+#define TEST_ASSERT_DOUBLE_IS_INF_MESSAGE(actual, message)                                         UNITY_TEST_ASSERT_DOUBLE_IS_INF(actual, __LINE__, message)
+#define TEST_ASSERT_DOUBLE_IS_NEG_INF_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF(actual, __LINE__, message)
+#define TEST_ASSERT_DOUBLE_IS_NAN_MESSAGE(actual, message)                                         UNITY_TEST_ASSERT_DOUBLE_IS_NAN(actual, __LINE__, message)
+#define TEST_ASSERT_DOUBLE_IS_DETERMINATE_MESSAGE(actual, message)                                 UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual, __LINE__, message)
+#define TEST_ASSERT_DOUBLE_IS_NOT_INF_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF(actual, __LINE__, message)
+#define TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF_MESSAGE(actual, message)                                 UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual, __LINE__, message)
+#define TEST_ASSERT_DOUBLE_IS_NOT_NAN_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual, __LINE__, message)
+#define TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE_MESSAGE(actual, message)                             UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, __LINE__, message)
+
+//end of UNITY_FRAMEWORK_H
+#endif
diff --git a/contrib/ntp/sntp/unity/unity_fixture.c b/contrib/ntp/sntp/unity/unity_fixture.c
new file mode 100644
index 000000000000..6bdbe5b82143
--- /dev/null
+++ b/contrib/ntp/sntp/unity/unity_fixture.c
@@ -0,0 +1,398 @@
+//- Copyright (c) 2010 James Grenning and Contributed to Unity Project
+/* ==========================================
+    Unity Project - A Test Framework for C
+    Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+    [Released under MIT License. Please refer to license.txt for details]
+========================================== */
+
+#include 
+#include 
+#include "unity_fixture.h"
+#include "unity_internals.h"
+
+UNITY_FIXTURE_T UnityFixture;
+
+//If you decide to use the function pointer approach.
+int (*outputChar)(int) = putchar;
+
+int verbose = 0;
+
+void setUp(void);
+void tearDown(void);
+void setUp(void)    { /*does nothing*/ }
+void tearDown(void) { /*does nothing*/ }
+
+static void announceTestRun(unsigned int runNumber)
+{
+    UnityPrint("Unity test run ");
+    UnityPrintNumber(runNumber+1);
+    UnityPrint(" of ");
+    UnityPrintNumber(UnityFixture.RepeatCount);
+    UNITY_OUTPUT_CHAR('\n');
+}
+
+int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
+{
+    int result = UnityGetCommandLineOptions(argc, argv);
+    unsigned int r;
+    if (result != 0)
+        return result;
+
+    for (r = 0; r < UnityFixture.RepeatCount; r++)
+    {
+        UnityBegin(argv[0]);
+        announceTestRun(r);
+        runAllTests();
+        UNITY_OUTPUT_CHAR('\n');
+        UnityEnd();
+    }
+
+    return UnityFailureCount();
+}
+
+static int selected(const char * filter, const char * name)
+{
+    if (filter == 0)
+        return 1;
+    return strstr(name, filter) ? 1 : 0;
+}
+
+static int testSelected(const char* test)
+{
+    return selected(UnityFixture.NameFilter, test);
+}
+
+static int groupSelected(const char* group)
+{
+    return selected(UnityFixture.GroupFilter, group);
+}
+
+static void runTestCase(void)
+{
+
+}
+
+void UnityTestRunner(unityfunction* setup,
+        unityfunction* testBody,
+        unityfunction* teardown,
+        const char * printableName,
+        const char * group,
+        const char * name,
+        const char * file, int line)
+{
+    if (testSelected(name) && groupSelected(group))
+    {
+        Unity.CurrentTestFailed = 0;
+        Unity.TestFile = file;
+        Unity.CurrentTestName = printableName;
+        Unity.CurrentTestLineNumber = line;
+        if (!UnityFixture.Verbose)
+            UNITY_OUTPUT_CHAR('.');
+        else
+            UnityPrint(printableName);
+
+        Unity.NumberOfTests++;
+        UnityMalloc_StartTest();
+        UnityPointer_Init();
+
+        runTestCase();
+        if (TEST_PROTECT())
+        {
+            setup();
+            testBody();
+        }
+        if (TEST_PROTECT())
+        {
+            teardown();
+        }
+        if (TEST_PROTECT())
+        {
+            UnityPointer_UndoAllSets();
+            if (!Unity.CurrentTestFailed)
+                UnityMalloc_EndTest();
+        }
+        UnityConcludeFixtureTest();
+    }
+}
+
+void UnityIgnoreTest(const char * printableName)
+{
+    Unity.NumberOfTests++;
+    Unity.CurrentTestIgnored = 1;
+    if (!UnityFixture.Verbose)
+        UNITY_OUTPUT_CHAR('!');
+    else
+        UnityPrint(printableName);
+    UnityConcludeFixtureTest();
+}
+
+
+//-------------------------------------------------
+//Malloc and free stuff
+//
+#define MALLOC_DONT_FAIL -1
+static int malloc_count;
+static int malloc_fail_countdown = MALLOC_DONT_FAIL;
+
+void UnityMalloc_StartTest(void)
+{
+    malloc_count = 0;
+    malloc_fail_countdown = MALLOC_DONT_FAIL;
+}
+
+void UnityMalloc_EndTest(void)
+{
+    malloc_fail_countdown = MALLOC_DONT_FAIL;
+    if (malloc_count != 0)
+    {
+        TEST_FAIL_MESSAGE("This test leaks!");
+    }
+}
+
+void UnityMalloc_MakeMallocFailAfterCount(int countdown)
+{
+    malloc_fail_countdown = countdown;
+}
+
+#ifdef malloc
+#undef malloc
+#endif
+
+#ifdef free
+#undef free
+#endif
+
+#ifdef calloc
+#undef calloc
+#endif
+
+#ifdef realloc
+#undef realloc
+#endif
+
+#include 
+#include 
+
+typedef struct GuardBytes
+{
+    size_t size;
+    char guard[sizeof(size_t)];
+} Guard;
+
+
+static const char * end = "END";
+
+void * unity_malloc(size_t size)
+{
+    char* mem;
+    Guard* guard;
+
+    if (malloc_fail_countdown != MALLOC_DONT_FAIL)
+    {
+        if (malloc_fail_countdown == 0)
+            return 0;
+        malloc_fail_countdown--;
+    }
+
+    malloc_count++;
+
+    guard = (Guard*)malloc(size + sizeof(Guard) + 4);
+    guard->size = size;
+    mem = (char*)&(guard[1]);
+    memcpy(&mem[size], end, strlen(end) + 1);
+
+    return (void*)mem;
+}
+
+static int isOverrun(void * mem)
+{
+    Guard* guard = (Guard*)mem;
+    char* memAsChar = (char*)mem;
+    guard--;
+
+    return strcmp(&memAsChar[guard->size], end) != 0;
+}
+
+static void release_memory(void * mem)
+{
+    Guard* guard = (Guard*)mem;
+    guard--;
+
+    malloc_count--;
+    free(guard);
+}
+
+void unity_free(void * mem)
+{
+    int overrun = isOverrun(mem);//strcmp(&memAsChar[guard->size], end) != 0;
+    release_memory(mem);
+    if (overrun)
+    {
+        TEST_FAIL_MESSAGE("Buffer overrun detected during free()");
+    }
+}
+
+void* unity_calloc(size_t num, size_t size)
+{
+    void* mem = unity_malloc(num * size);
+    memset(mem, 0, num*size);
+    return mem;
+}
+
+void* unity_realloc(void * oldMem, size_t size)
+{
+    Guard* guard = (Guard*)oldMem;
+//    char* memAsChar = (char*)oldMem;
+    void* newMem;
+
+    if (oldMem == 0)
+        return unity_malloc(size);
+
+    guard--;
+    if (isOverrun(oldMem))
+    {
+        release_memory(oldMem);
+        TEST_FAIL_MESSAGE("Buffer overrun detected during realloc()");
+    }
+
+    if (size == 0)
+    {
+        release_memory(oldMem);
+        return 0;
+    }
+
+    if (guard->size >= size)
+        return oldMem;
+
+    newMem = unity_malloc(size);
+    memcpy(newMem, oldMem, guard->size);
+    unity_free(oldMem);
+    return newMem;
+}
+
+
+//--------------------------------------------------------
+//Automatic pointer restoration functions
+typedef struct _PointerPair
+{
+    struct _PointerPair * next;
+    void ** pointer;
+    void * old_value;
+} PointerPair;
+
+enum {MAX_POINTERS=50};
+static PointerPair pointer_store[MAX_POINTERS];
+static int pointer_index = 0;
+
+void UnityPointer_Init(void)
+{
+    pointer_index = 0;
+}
+
+void UnityPointer_Set(void ** pointer, void * newValue)
+{
+    if (pointer_index >= MAX_POINTERS)
+        TEST_FAIL_MESSAGE("Too many pointers set");
+
+    pointer_store[pointer_index].pointer = pointer;
+    pointer_store[pointer_index].old_value = *pointer;
+    *pointer = newValue;
+    pointer_index++;
+}
+
+void UnityPointer_UndoAllSets(void)
+{
+    while (pointer_index > 0)
+    {
+        pointer_index--;
+        *(pointer_store[pointer_index].pointer) =
+        pointer_store[pointer_index].old_value;
+
+    }
+}
+
+int UnityFailureCount(void)
+{
+    return Unity.TestFailures;
+}
+
+int UnityGetCommandLineOptions(int argc, const char* argv[])
+{
+    int i;
+    UnityFixture.Verbose = 0;
+    UnityFixture.GroupFilter = 0;
+    UnityFixture.NameFilter = 0;
+    UnityFixture.RepeatCount = 1;
+
+    if (argc == 1)
+        return 0;
+
+    for (i = 1; i < argc; )
+    {
+        if (strcmp(argv[i], "-v") == 0)
+        {
+            UnityFixture.Verbose = 1;
+            i++;
+        }
+        else if (strcmp(argv[i], "-g") == 0)
+        {
+            i++;
+            if (i >= argc)
+                return 1;
+            UnityFixture.GroupFilter = argv[i];
+            i++;
+        }
+        else if (strcmp(argv[i], "-n") == 0)
+        {
+            i++;
+            if (i >= argc)
+                return 1;
+            UnityFixture.NameFilter = argv[i];
+            i++;
+        }
+        else if (strcmp(argv[i], "-r") == 0)
+        {
+            UnityFixture.RepeatCount = 2;
+            i++;
+            if (i < argc)
+            {
+                if (*(argv[i]) >= '0' && *(argv[i]) <= '9')
+                {
+                    UnityFixture.RepeatCount = atoi(argv[i]);
+                    i++;
+                }
+            }
+        } else {
+            // ignore unknown parameter
+            i++;
+        }
+    }
+    return 0;
+}
+
+void UnityConcludeFixtureTest(void)
+{
+    if (Unity.CurrentTestIgnored)
+    {
+        if (UnityFixture.Verbose)
+        {
+            UNITY_OUTPUT_CHAR('\n');
+        }
+        Unity.TestIgnores++;
+    }
+    else if (!Unity.CurrentTestFailed)
+    {
+        if (UnityFixture.Verbose)
+        {
+            UnityPrint(" PASS");
+            UNITY_OUTPUT_CHAR('\n');
+        }
+    }
+    else if (Unity.CurrentTestFailed)
+    {
+        Unity.TestFailures++;
+    }
+
+    Unity.CurrentTestFailed = 0;
+    Unity.CurrentTestIgnored = 0;
+}
diff --git a/contrib/ntp/sntp/unity/unity_fixture.h b/contrib/ntp/sntp/unity/unity_fixture.h
new file mode 100644
index 000000000000..e176bbda8a7c
--- /dev/null
+++ b/contrib/ntp/sntp/unity/unity_fixture.h
@@ -0,0 +1,86 @@
+//- Copyright (c) 2010 James Grenning and Contributed to Unity Project
+/* ==========================================
+    Unity Project - A Test Framework for C
+    Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+    [Released under MIT License. Please refer to license.txt for details]
+========================================== */
+
+#ifndef UNITY_FIXTURE_H_
+#define UNITY_FIXTURE_H_
+
+#include "unity.h"
+#include "unity_internals.h"
+#include "unity_fixture_malloc_overrides.h"
+#include "unity_fixture_internals.h"
+
+int UnityMain(int argc, const char* argv[], void (*runAllTests)(void));
+
+
+#define TEST_GROUP(group)\
+    static const char* TEST_GROUP_##group = #group
+
+#define TEST_SETUP(group) void TEST_##group##_SETUP(void);\
+    void TEST_##group##_SETUP(void)
+
+#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN(void);\
+    void TEST_##group##_TEAR_DOWN(void)
+
+
+#define TEST(group, name) \
+    void TEST_##group##_##name##_(void);\
+    void TEST_##group##_##name##_run(void);\
+    void TEST_##group##_##name##_run(void)\
+    {\
+        UnityTestRunner(TEST_##group##_SETUP,\
+            TEST_##group##_##name##_,\
+            TEST_##group##_TEAR_DOWN,\
+            "TEST(" #group ", " #name ")",\
+            TEST_GROUP_##group, #name,\
+            __FILE__, __LINE__);\
+    }\
+    void  TEST_##group##_##name##_(void)
+
+#define IGNORE_TEST(group, name) \
+    void TEST_##group##_##name##_(void);\
+    void TEST_##group##_##name##_run(void);\
+    void TEST_##group##_##name##_run(void)\
+    {\
+        UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")");\
+    }\
+    void TEST_##group##_##name##_(void)
+
+#define DECLARE_TEST_CASE(group, name) \
+    void TEST_##group##_##name##_run(void)
+
+#define RUN_TEST_CASE(group, name) \
+    { DECLARE_TEST_CASE(group, name);\
+      TEST_##group##_##name##_run(); }
+
+//This goes at the bottom of each test file or in a separate c file
+#define TEST_GROUP_RUNNER(group)\
+    void TEST_##group##_GROUP_RUNNER_runAll(void);\
+    void TEST_##group##_GROUP_RUNNER(void);\
+    void TEST_##group##_GROUP_RUNNER(void)\
+    {\
+        TEST_##group##_GROUP_RUNNER_runAll();\
+    }\
+    void TEST_##group##_GROUP_RUNNER_runAll(void)
+
+//Call this from main
+#define RUN_TEST_GROUP(group)\
+    { void TEST_##group##_GROUP_RUNNER(void);\
+      TEST_##group##_GROUP_RUNNER(); }
+
+//CppUTest Compatibility Macros
+#define UT_PTR_SET(ptr, newPointerValue)               UnityPointer_Set((void**)&ptr, (void*)newPointerValue)
+#define TEST_ASSERT_POINTERS_EQUAL(expected, actual)   TEST_ASSERT_EQUAL_PTR(expected, actual)
+#define TEST_ASSERT_BYTES_EQUAL(expected, actual)      TEST_ASSERT_EQUAL_HEX8(0xff & (expected), 0xff & (actual))
+#define FAIL(message)                                  TEST_FAIL((message))
+#define CHECK(condition)                               TEST_ASSERT_TRUE((condition))
+#define LONGS_EQUAL(expected, actual)                  TEST_ASSERT_EQUAL_INT((expected), (actual))
+#define STRCMP_EQUAL(expected, actual)                 TEST_ASSERT_EQUAL_STRING((expected), (actual))
+#define DOUBLES_EQUAL(expected, actual, delta)         TEST_ASSERT_FLOAT_WITHIN(((expected), (actual), (delta))
+
+void UnityMalloc_MakeMallocFailAfterCount(int count);
+
+#endif /* UNITY_FIXTURE_H_ */
diff --git a/contrib/ntp/sntp/unity/unity_fixture_internals.h b/contrib/ntp/sntp/unity/unity_fixture_internals.h
new file mode 100644
index 000000000000..c4099fab5577
--- /dev/null
+++ b/contrib/ntp/sntp/unity/unity_fixture_internals.h
@@ -0,0 +1,44 @@
+//- Copyright (c) 2010 James Grenning and Contributed to Unity Project
+/* ==========================================
+    Unity Project - A Test Framework for C
+    Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+    [Released under MIT License. Please refer to license.txt for details]
+========================================== */
+
+#ifndef UNITY_FIXTURE_INTERNALS_H_
+#define UNITY_FIXTURE_INTERNALS_H_
+
+typedef struct _UNITY_FIXTURE_T
+{
+    int Verbose;
+    unsigned int RepeatCount;
+    const char* NameFilter;
+    const char* GroupFilter;
+} UNITY_FIXTURE_T;
+
+typedef void unityfunction(void);
+void UnityTestRunner(unityfunction * setup,
+        unityfunction * body,
+        unityfunction * teardown,
+        const char * printableName,
+        const char * group,
+        const char * name,
+        const char * file, int line);
+
+void UnityIgnoreTest(const char * printableName);
+void UnityMalloc_StartTest(void);
+void UnityMalloc_EndTest(void);
+int UnityFailureCount(void);
+int UnityGetCommandLineOptions(int argc, const char* argv[]);
+void UnityConcludeFixtureTest(void);
+
+void UnityPointer_Set(void ** ptr, void * newValue);
+void UnityPointer_UndoAllSets(void);
+void UnityPointer_Init(void);
+
+void UnityAssertEqualPointer(const void * expected,
+                            const void * actual,
+                            const char* msg,
+                            const UNITY_LINE_TYPE lineNumber);
+
+#endif /* UNITY_FIXTURE_INTERNALS_H_ */
diff --git a/contrib/ntp/sntp/unity/unity_fixture_malloc_overrides.h b/contrib/ntp/sntp/unity/unity_fixture_malloc_overrides.h
new file mode 100644
index 000000000000..1e1001453d0d
--- /dev/null
+++ b/contrib/ntp/sntp/unity/unity_fixture_malloc_overrides.h
@@ -0,0 +1,21 @@
+//- Copyright (c) 2010 James Grenning and Contributed to Unity Project
+/* ==========================================
+    Unity Project - A Test Framework for C
+    Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+    [Released under MIT License. Please refer to license.txt for details]
+========================================== */
+
+#ifndef UNITY_FIXTURE_MALLOC_OVERRIDES_H_
+#define UNITY_FIXTURE_MALLOC_OVERRIDES_H_
+
+#define malloc  unity_malloc
+#define calloc  unity_calloc
+#define realloc unity_realloc
+#define free    unity_free
+
+void* unity_malloc(size_t size);
+void* unity_calloc(size_t num, size_t size);
+void* unity_realloc(void * oldMem, size_t size);
+void unity_free(void * mem);
+
+#endif /* UNITY_FIXTURE_MALLOC_OVERRIDES_H_ */
diff --git a/contrib/ntp/sntp/unity/unity_internals.h b/contrib/ntp/sntp/unity/unity_internals.h
new file mode 100644
index 000000000000..a38e1014a007
--- /dev/null
+++ b/contrib/ntp/sntp/unity/unity_internals.h
@@ -0,0 +1,703 @@
+/* ==========================================
+    Unity Project - A Test Framework for C
+    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
+    [Released under MIT License. Please refer to license.txt for details]
+========================================== */
+
+#ifndef UNITY_INTERNALS_H
+#define UNITY_INTERNALS_H
+
+#ifdef UNITY_INCLUDE_CONFIG_H
+#include "unity_config.h"
+#endif
+
+#include 
+
+// Unity Attempts to Auto-Detect Integer Types
+// Attempt 1: UINT_MAX, ULONG_MAX, etc in 
+// Attempt 2: UINT_MAX, ULONG_MAX, etc in 
+// Attempt 3: Deduced from sizeof() macros
+#ifndef UNITY_EXCLUDE_STDINT_H
+#include 
+#endif
+
+#ifndef UNITY_EXCLUDE_LIMITS_H
+#include 
+#endif
+
+#ifndef UNITY_EXCLUDE_SIZEOF
+#ifndef UINT_MAX
+#define UINT_MAX     (sizeof(unsigned int) * 256 - 1)
+#endif
+#ifndef ULONG_MAX
+#define ULONG_MAX    (sizeof(unsigned long) * 256 - 1)
+#endif
+#ifndef UINTPTR_MAX
+//apparently this is not a constant expression: (sizeof(unsigned int *) * 256 - 1) so we have to just let this fall through
+#endif
+#endif
+//-------------------------------------------------------
+// Guess Widths If Not Specified
+//-------------------------------------------------------
+
+// Determine the size of an int, if not already specificied.
+// We cannot use sizeof(int), because it is not yet defined
+// at this stage in the trnslation of the C program.
+// Therefore, infer it from UINT_MAX if possible.
+#ifndef UNITY_INT_WIDTH
+  #ifdef UINT_MAX
+    #if (UINT_MAX == 0xFFFF)
+      #define UNITY_INT_WIDTH (16)
+    #elif (UINT_MAX == 0xFFFFFFFF)
+      #define UNITY_INT_WIDTH (32)
+    #elif (UINT_MAX == 0xFFFFFFFFFFFFFFFF)
+      #define UNITY_INT_WIDTH (64)
+    #endif
+  #endif
+#endif
+#ifndef UNITY_INT_WIDTH
+  #define UNITY_INT_WIDTH (32)
+#endif
+
+// Determine the size of a long, if not already specified,
+// by following the process used above to define
+// UNITY_INT_WIDTH.
+#ifndef UNITY_LONG_WIDTH
+  #ifdef ULONG_MAX
+    #if (ULONG_MAX == 0xFFFF)
+      #define UNITY_LONG_WIDTH (16)
+    #elif (ULONG_MAX == 0xFFFFFFFF)
+      #define UNITY_LONG_WIDTH (32)
+    #elif (ULONG_MAX == 0xFFFFFFFFFFFFFFFF)
+      #define UNITY_LONG_WIDTH (64)
+    #endif
+  #endif
+#endif
+#ifndef UNITY_LONG_WIDTH
+  #define UNITY_LONG_WIDTH (32)
+#endif
+
+// Determine the size of a pointer, if not already specified,
+// by following the process used above to define
+// UNITY_INT_WIDTH.
+#ifndef UNITY_POINTER_WIDTH
+  #ifdef UINTPTR_MAX
+    #if (UINTPTR_MAX <= 0xFFFF)
+      #define UNITY_POINTER_WIDTH (16)
+    #elif (UINTPTR_MAX <= 0xFFFFFFFF)
+      #define UNITY_POINTER_WIDTH (32)
+    #elif (UINTPTR_MAX <= 0xFFFFFFFFFFFFFFFF)
+      #define UNITY_POINTER_WIDTH (64)
+    #endif
+  #endif
+#endif
+#ifndef UNITY_POINTER_WIDTH
+  #ifdef INTPTR_MAX
+    #if (INTPTR_MAX <= 0x7FFF)
+      #define UNITY_POINTER_WIDTH (16)
+    #elif (INTPTR_MAX <= 0x7FFFFFFF)
+      #define UNITY_POINTER_WIDTH (32)
+    #elif (INTPTR_MAX <= 0x7FFFFFFFFFFFFFFF)
+      #define UNITY_POINTER_WIDTH (64)
+    #endif
+  #endif
+#endif
+#ifndef UNITY_POINTER_WIDTH
+  #define UNITY_POINTER_WIDTH UNITY_LONG_WIDTH
+#endif
+
+//-------------------------------------------------------
+// Int Support (Define types based on detected sizes)
+//-------------------------------------------------------
+
+#if (UNITY_INT_WIDTH == 32)
+    typedef unsigned char   _UU8;
+    typedef unsigned short  _UU16;
+    typedef unsigned int    _UU32;
+    typedef signed char     _US8;
+    typedef signed short    _US16;
+    typedef signed int      _US32;
+#elif (UNITY_INT_WIDTH == 16)
+    typedef unsigned char   _UU8;
+    typedef unsigned int    _UU16;
+    typedef unsigned long   _UU32;
+    typedef signed char     _US8;
+    typedef signed int      _US16;
+    typedef signed long     _US32;
+#else
+    #error Invalid UNITY_INT_WIDTH specified! (16 or 32 are supported)
+#endif
+
+//-------------------------------------------------------
+// 64-bit Support
+//-------------------------------------------------------
+
+#ifndef UNITY_SUPPORT_64
+#if UNITY_LONG_WIDTH > 32
+#define UNITY_SUPPORT_64
+#endif
+#endif
+#ifndef UNITY_SUPPORT_64
+#if UNITY_POINTER_WIDTH > 32
+#define UNITY_SUPPORT_64
+#endif
+#endif
+
+#ifndef UNITY_SUPPORT_64
+
+//No 64-bit Support
+typedef _UU32 _U_UINT;
+typedef _US32 _U_SINT;
+
+#else
+
+//64-bit Support
+#if (UNITY_LONG_WIDTH == 32)
+    typedef unsigned long long _UU64;
+    typedef signed long long   _US64;
+#elif (UNITY_LONG_WIDTH == 64)
+    typedef unsigned long      _UU64;
+    typedef signed long        _US64;
+#else
+    #error Invalid UNITY_LONG_WIDTH specified! (32 or 64 are supported)
+#endif
+typedef _UU64 _U_UINT;
+typedef _US64 _U_SINT;
+
+#endif
+
+//-------------------------------------------------------
+// Pointer Support
+//-------------------------------------------------------
+
+#if (UNITY_POINTER_WIDTH == 32)
+    typedef _UU32 _UP;
+#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX32
+#elif (UNITY_POINTER_WIDTH == 64)
+    typedef _UU64 _UP;
+#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX64
+#elif (UNITY_POINTER_WIDTH == 16)
+    typedef _UU16 _UP;
+#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX16
+#else
+    #error Invalid UNITY_POINTER_WIDTH specified! (16, 32 or 64 are supported)
+#endif
+
+#ifndef UNITY_PTR_ATTRIBUTE
+  #define UNITY_PTR_ATTRIBUTE
+#endif
+
+//-------------------------------------------------------
+// Float Support
+//-------------------------------------------------------
+
+#ifdef UNITY_EXCLUDE_FLOAT
+
+//No Floating Point Support
+#undef UNITY_INCLUDE_FLOAT
+#undef UNITY_FLOAT_PRECISION
+#undef UNITY_FLOAT_TYPE
+#undef UNITY_FLOAT_VERBOSE
+
+#else
+
+#ifndef UNITY_INCLUDE_FLOAT
+#define UNITY_INCLUDE_FLOAT
+#endif
+
+//Floating Point Support
+#ifndef UNITY_FLOAT_PRECISION
+#define UNITY_FLOAT_PRECISION (0.00001f)
+#endif
+#ifndef UNITY_FLOAT_TYPE
+#define UNITY_FLOAT_TYPE float
+#endif
+typedef UNITY_FLOAT_TYPE _UF;
+
+#endif
+
+//-------------------------------------------------------
+// Double Float Support
+//-------------------------------------------------------
+
+//unlike FLOAT, we DON'T include by default
+#ifndef UNITY_EXCLUDE_DOUBLE
+#ifndef UNITY_INCLUDE_DOUBLE
+#define UNITY_EXCLUDE_DOUBLE
+#endif
+#endif
+
+#ifdef UNITY_EXCLUDE_DOUBLE
+
+//No Floating Point Support
+#undef UNITY_DOUBLE_PRECISION
+#undef UNITY_DOUBLE_TYPE
+#undef UNITY_DOUBLE_VERBOSE
+
+#ifdef UNITY_INCLUDE_DOUBLE
+#undef UNITY_INCLUDE_DOUBLE
+#endif
+
+#else
+
+//Double Floating Point Support
+#ifndef UNITY_DOUBLE_PRECISION
+#define UNITY_DOUBLE_PRECISION (1e-12f)
+#endif
+#ifndef UNITY_DOUBLE_TYPE
+#define UNITY_DOUBLE_TYPE double
+#endif
+typedef UNITY_DOUBLE_TYPE _UD;
+
+#endif
+
+#ifdef UNITY_DOUBLE_VERBOSE
+#ifndef UNITY_FLOAT_VERBOSE
+#define UNITY_FLOAT_VERBOSE
+#endif
+#endif
+
+//-------------------------------------------------------
+// Output Method: stdout (DEFAULT)
+//-------------------------------------------------------
+#ifndef UNITY_OUTPUT_CHAR
+//Default to using putchar, which is defined in stdio.h
+#include 
+#define UNITY_OUTPUT_CHAR(a) putchar(a)
+#else
+//If defined as something else, make sure we declare it here so it's ready for use
+extern int UNITY_OUTPUT_CHAR(int);
+#endif
+
+#ifndef UNITY_OUTPUT_START
+#define UNITY_OUTPUT_START()
+#endif
+
+#ifndef UNITY_OUTPUT_COMPLETE
+#define UNITY_OUTPUT_COMPLETE()
+#endif
+
+//-------------------------------------------------------
+// Footprint
+//-------------------------------------------------------
+
+#ifndef UNITY_LINE_TYPE
+#define UNITY_LINE_TYPE _U_UINT
+#endif
+
+#ifndef UNITY_COUNTER_TYPE
+#define UNITY_COUNTER_TYPE _U_UINT
+#endif
+
+//-------------------------------------------------------
+// Language Features Available
+//-------------------------------------------------------
+#if !defined(UNITY_WEAK_ATTRIBUTE) && !defined(UNITY_WEAK_PRAGMA)
+#   ifdef __GNUC__ // includes clang
+#       if !(defined(__WIN32__) && defined(__clang__))
+#           define UNITY_WEAK_ATTRIBUTE __attribute__((weak))
+#       endif
+#   endif
+#endif
+
+#ifdef UNITY_NO_WEAK
+#   undef UNITY_WEAK_ATTRIBUTE
+#   undef UNITY_WEAK_PRAGMA
+#endif
+
+
+//-------------------------------------------------------
+// Internal Structs Needed
+//-------------------------------------------------------
+
+typedef void (*UnityTestFunction)(void);
+
+#define UNITY_DISPLAY_RANGE_INT  (0x10)
+#define UNITY_DISPLAY_RANGE_UINT (0x20)
+#define UNITY_DISPLAY_RANGE_HEX  (0x40)
+#define UNITY_DISPLAY_RANGE_AUTO (0x80)
+
+typedef enum
+{
+#if (UNITY_INT_WIDTH == 16)
+    UNITY_DISPLAY_STYLE_INT      = 2 + UNITY_DISPLAY_RANGE_INT + UNITY_DISPLAY_RANGE_AUTO,
+#elif (UNITY_INT_WIDTH  == 32)
+    UNITY_DISPLAY_STYLE_INT      = 4 + UNITY_DISPLAY_RANGE_INT + UNITY_DISPLAY_RANGE_AUTO,
+#elif (UNITY_INT_WIDTH  == 64)
+    UNITY_DISPLAY_STYLE_INT      = 8 + UNITY_DISPLAY_RANGE_INT + UNITY_DISPLAY_RANGE_AUTO,
+#endif
+    UNITY_DISPLAY_STYLE_INT8     = 1 + UNITY_DISPLAY_RANGE_INT,
+    UNITY_DISPLAY_STYLE_INT16    = 2 + UNITY_DISPLAY_RANGE_INT,
+    UNITY_DISPLAY_STYLE_INT32    = 4 + UNITY_DISPLAY_RANGE_INT,
+#ifdef UNITY_SUPPORT_64
+    UNITY_DISPLAY_STYLE_INT64    = 8 + UNITY_DISPLAY_RANGE_INT,
+#endif
+
+#if (UNITY_INT_WIDTH == 16)
+    UNITY_DISPLAY_STYLE_UINT     = 2 + UNITY_DISPLAY_RANGE_UINT + UNITY_DISPLAY_RANGE_AUTO,
+#elif (UNITY_INT_WIDTH  == 32)
+    UNITY_DISPLAY_STYLE_UINT     = 4 + UNITY_DISPLAY_RANGE_UINT + UNITY_DISPLAY_RANGE_AUTO,
+#elif (UNITY_INT_WIDTH  == 64)
+    UNITY_DISPLAY_STYLE_UINT     = 8 + UNITY_DISPLAY_RANGE_UINT + UNITY_DISPLAY_RANGE_AUTO,
+#endif
+    UNITY_DISPLAY_STYLE_UINT8    = 1 + UNITY_DISPLAY_RANGE_UINT,
+    UNITY_DISPLAY_STYLE_UINT16   = 2 + UNITY_DISPLAY_RANGE_UINT,
+    UNITY_DISPLAY_STYLE_UINT32   = 4 + UNITY_DISPLAY_RANGE_UINT,
+#ifdef UNITY_SUPPORT_64
+    UNITY_DISPLAY_STYLE_UINT64   = 8 + UNITY_DISPLAY_RANGE_UINT,
+#endif
+    UNITY_DISPLAY_STYLE_HEX8     = 1 + UNITY_DISPLAY_RANGE_HEX,
+    UNITY_DISPLAY_STYLE_HEX16    = 2 + UNITY_DISPLAY_RANGE_HEX,
+    UNITY_DISPLAY_STYLE_HEX32    = 4 + UNITY_DISPLAY_RANGE_HEX,
+#ifdef UNITY_SUPPORT_64
+    UNITY_DISPLAY_STYLE_HEX64    = 8 + UNITY_DISPLAY_RANGE_HEX,
+#endif
+    UNITY_DISPLAY_STYLE_UNKNOWN
+} UNITY_DISPLAY_STYLE_T;
+
+#ifndef UNITY_EXCLUDE_FLOAT
+typedef enum _UNITY_FLOAT_TRAIT_T
+{
+    UNITY_FLOAT_IS_NOT_INF       = 0,
+    UNITY_FLOAT_IS_INF,
+    UNITY_FLOAT_IS_NOT_NEG_INF,
+    UNITY_FLOAT_IS_NEG_INF,
+    UNITY_FLOAT_IS_NOT_NAN,
+    UNITY_FLOAT_IS_NAN,
+    UNITY_FLOAT_IS_NOT_DET,
+    UNITY_FLOAT_IS_DET,
+} UNITY_FLOAT_TRAIT_T;
+#endif
+
+struct _Unity
+{
+    const char* TestFile;
+    const char* CurrentTestName;
+    UNITY_LINE_TYPE CurrentTestLineNumber;
+    UNITY_COUNTER_TYPE NumberOfTests;
+    UNITY_COUNTER_TYPE TestFailures;
+    UNITY_COUNTER_TYPE TestIgnores;
+    UNITY_COUNTER_TYPE CurrentTestFailed;
+    UNITY_COUNTER_TYPE CurrentTestIgnored;
+    jmp_buf AbortFrame;
+	int isExpectingFail;
+	UNITY_COUNTER_TYPE TestXFAILS;
+	UNITY_COUNTER_TYPE TestPasses;
+	UNITY_COUNTER_TYPE TestXPASSES;
+	const char* XFAILMessage;
+};
+
+extern struct _Unity Unity;
+
+//-------------------------------------------------------
+// Test Suite Management
+//-------------------------------------------------------
+
+void UnityBegin(const char* filename);
+int  UnityEnd(void);
+void UnityConcludeTest(void);
+void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum);
+
+//-------------------------------------------------------
+// Test Output
+//-------------------------------------------------------
+
+void UnityPrint(const char* string);
+void UnityPrintMask(const _U_UINT mask, const _U_UINT number);
+void UnityPrintNumberByStyle(const _U_SINT number, const UNITY_DISPLAY_STYLE_T style);
+void UnityPrintNumber(const _U_SINT number);
+void UnityPrintNumberUnsigned(const _U_UINT number);
+void UnityPrintNumberHex(const _U_UINT number, const char nibbles);
+
+#ifdef UNITY_FLOAT_VERBOSE
+void UnityPrintFloat(const _UF number);
+#endif
+
+//-------------------------------------------------------
+// Test Assertion Fuctions
+//-------------------------------------------------------
+//  Use the macros below this section instead of calling
+//  these directly. The macros have a consistent naming
+//  convention and will pull in file and line information
+//  for you.
+
+void UnityAssertEqualNumber(const _U_SINT expected,
+                            const _U_SINT actual,
+                            const char* msg,
+                            const UNITY_LINE_TYPE lineNumber,
+                            const UNITY_DISPLAY_STYLE_T style);
+
+void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
+                              UNITY_PTR_ATTRIBUTE const void* actual,
+                              const _UU32 num_elements,
+                              const char* msg,
+                              const UNITY_LINE_TYPE lineNumber,
+                              const UNITY_DISPLAY_STYLE_T style);
+
+void UnityAssertBits(const _U_SINT mask,
+                     const _U_SINT expected,
+                     const _U_SINT actual,
+                     const char* msg,
+                     const UNITY_LINE_TYPE lineNumber);
+
+void UnityAssertEqualString(const char* expected,
+                            const char* actual,
+                            const char* msg,
+                            const UNITY_LINE_TYPE lineNumber);
+
+void UnityAssertEqualStringArray( const char** expected,
+                                  const char** actual,
+                                  const _UU32 num_elements,
+                                  const char* msg,
+                                  const UNITY_LINE_TYPE lineNumber);
+
+void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected,
+                             UNITY_PTR_ATTRIBUTE const void* actual,
+                             const _UU32 length,
+                             const _UU32 num_elements,
+                             const char* msg,
+                             const UNITY_LINE_TYPE lineNumber);
+
+void UnityAssertNumbersWithin(const _U_SINT delta,
+                              const _U_SINT expected,
+                              const _U_SINT actual,
+                              const char* msg,
+                              const UNITY_LINE_TYPE lineNumber,
+                              const UNITY_DISPLAY_STYLE_T style);
+
+void UnityFail(const char* message, const UNITY_LINE_TYPE line);
+
+void UnityIgnore(const char* message, const UNITY_LINE_TYPE line);
+
+#ifndef UNITY_EXCLUDE_FLOAT
+void UnityAssertFloatsWithin(const _UF delta,
+                             const _UF expected,
+                             const _UF actual,
+                             const char* msg,
+                             const UNITY_LINE_TYPE lineNumber);
+
+void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected,
+                                UNITY_PTR_ATTRIBUTE const _UF* actual,
+                                const _UU32 num_elements,
+                                const char* msg,
+                                const UNITY_LINE_TYPE lineNumber);
+
+void UnityAssertFloatSpecial(const _UF actual,
+                             const char* msg,
+                             const UNITY_LINE_TYPE lineNumber,
+                             const UNITY_FLOAT_TRAIT_T style);
+#endif
+
+#ifndef UNITY_EXCLUDE_DOUBLE
+void UnityAssertDoublesWithin(const _UD delta,
+                              const _UD expected,
+                              const _UD actual,
+                              const char* msg,
+                              const UNITY_LINE_TYPE lineNumber);
+
+void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected,
+                                 UNITY_PTR_ATTRIBUTE const _UD* actual,
+                                 const _UU32 num_elements,
+                                 const char* msg,
+                                 const UNITY_LINE_TYPE lineNumber);
+
+void UnityAssertDoubleSpecial(const _UD actual,
+                              const char* msg,
+                              const UNITY_LINE_TYPE lineNumber,
+                              const UNITY_FLOAT_TRAIT_T style);
+#endif
+
+//-------------------------------------------------------
+// Error Strings We Might Need
+//-------------------------------------------------------
+
+extern const char UnityStrErrFloat[];
+extern const char UnityStrErrDouble[];
+extern const char UnityStrErr64[];
+
+//-------------------------------------------------------
+// Test Running Macros
+//-------------------------------------------------------
+
+#define TEST_PROTECT() (setjmp(Unity.AbortFrame) == 0)
+
+#define TEST_ABORT() {longjmp(Unity.AbortFrame, 1);}
+
+//This tricky series of macros gives us an optional line argument to treat it as RUN_TEST(func, num=__LINE__)
+#ifndef RUN_TEST
+#ifdef __STDC_VERSION__
+#if __STDC_VERSION__ >= 199901L
+#define RUN_TEST(...) UnityDefaultTestRun(RUN_TEST_FIRST(__VA_ARGS__), RUN_TEST_SECOND(__VA_ARGS__))
+#define RUN_TEST_FIRST(...) RUN_TEST_FIRST_HELPER(__VA_ARGS__, throwaway)
+#define RUN_TEST_FIRST_HELPER(first,...) first, #first
+#define RUN_TEST_SECOND(...) RUN_TEST_SECOND_HELPER(__VA_ARGS__, __LINE__, throwaway)
+#define RUN_TEST_SECOND_HELPER(first,second,...) second
+#endif
+#endif
+#endif
+
+//If we can't do the tricky version, we'll just have to require them to always include the line number
+#ifndef RUN_TEST
+#ifdef CMOCK
+#define RUN_TEST(func, num) UnityDefaultTestRun(func, #func, num)
+#else
+#define RUN_TEST(func) UnityDefaultTestRun(func, #func, __LINE__)
+#endif
+#endif
+
+#define TEST_LINE_NUM (Unity.CurrentTestLineNumber)
+#define TEST_IS_IGNORED (Unity.CurrentTestIgnored)
+#define UNITY_NEW_TEST(a) \
+    Unity.CurrentTestName = a; \
+    Unity.CurrentTestLineNumber = (UNITY_LINE_TYPE)(__LINE__); \
+    Unity.NumberOfTests++;
+
+#ifndef UNITY_BEGIN
+#define UNITY_BEGIN() UnityBegin(__FILE__)
+#endif
+
+#ifndef UNITY_END
+#define UNITY_END() UnityEnd()
+#endif
+
+//-------------------------------------------------------
+// Basic Fail and Ignore
+//-------------------------------------------------------
+
+#define UNITY_TEST_FAIL(line, message)   UnityFail(   (message), (UNITY_LINE_TYPE)line);
+#define UNITY_TEST_IGNORE(line, message) UnityIgnore( (message), (UNITY_LINE_TYPE)line);
+
+//-------------------------------------------------------
+// Test Asserts
+//-------------------------------------------------------
+
+#define UNITY_TEST_ASSERT(condition, line, message)                                              if (condition) {} else {UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, message);}
+#define UNITY_TEST_ASSERT_NULL(pointer, line, message)                                           UNITY_TEST_ASSERT(((pointer) == NULL),  (UNITY_LINE_TYPE)line, message)
+#define UNITY_TEST_ASSERT_NOT_NULL(pointer, line, message)                                       UNITY_TEST_ASSERT(((pointer) != NULL),  (UNITY_LINE_TYPE)line, message)
+
+#define UNITY_TEST_ASSERT_EQUAL_INT(expected, actual, line, message)                             UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
+#define UNITY_TEST_ASSERT_EQUAL_INT8(expected, actual, line, message)                            UnityAssertEqualNumber((_U_SINT)(_US8 )(expected), (_U_SINT)(_US8 )(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT8)
+#define UNITY_TEST_ASSERT_EQUAL_INT16(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(_US16)(expected), (_U_SINT)(_US16)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT16)
+#define UNITY_TEST_ASSERT_EQUAL_INT32(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(_US32)(expected), (_U_SINT)(_US32)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT32)
+#define UNITY_TEST_ASSERT_EQUAL_UINT(expected, actual, line, message)                            UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
+#define UNITY_TEST_ASSERT_EQUAL_UINT8(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(_UU8 )(expected), (_U_SINT)(_UU8 )(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT8)
+#define UNITY_TEST_ASSERT_EQUAL_UINT16(expected, actual, line, message)                          UnityAssertEqualNumber((_U_SINT)(_UU16)(expected), (_U_SINT)(_UU16)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT16)
+#define UNITY_TEST_ASSERT_EQUAL_UINT32(expected, actual, line, message)                          UnityAssertEqualNumber((_U_SINT)(_UU32)(expected), (_U_SINT)(_UU32)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT32)
+#define UNITY_TEST_ASSERT_EQUAL_HEX8(expected, actual, line, message)                            UnityAssertEqualNumber((_U_SINT)(_US8 )(expected), (_U_SINT)(_US8 )(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8)
+#define UNITY_TEST_ASSERT_EQUAL_HEX16(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(_US16)(expected), (_U_SINT)(_US16)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16)
+#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(_US32)(expected), (_U_SINT)(_US32)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
+#define UNITY_TEST_ASSERT_BITS(mask, expected, actual, line, message)                            UnityAssertBits((_U_SINT)(mask), (_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line)
+
+#define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message)                     UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
+#define UNITY_TEST_ASSERT_INT8_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((_U_SINT)(_US8 )(delta), (_U_SINT)(_US8 )(expected), (_U_SINT)(_US8 )(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT8)
+#define UNITY_TEST_ASSERT_INT16_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(_US16)(delta), (_U_SINT)(_US16)(expected), (_U_SINT)(_US16)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT16)
+#define UNITY_TEST_ASSERT_INT32_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(_US32)(delta), (_U_SINT)(_US32)(expected), (_U_SINT)(_US32)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT32)
+#define UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
+#define UNITY_TEST_ASSERT_UINT8_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU8 )(delta), (_U_SINT)(_U_UINT)(_UU8 )(expected), (_U_SINT)(_U_UINT)(_UU8 )(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT8)
+#define UNITY_TEST_ASSERT_UINT16_WITHIN(delta, expected, actual, line, message)                  UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU16)(delta), (_U_SINT)(_U_UINT)(_UU16)(expected), (_U_SINT)(_U_UINT)(_UU16)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT16)
+#define UNITY_TEST_ASSERT_UINT32_WITHIN(delta, expected, actual, line, message)                  UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU32)(delta), (_U_SINT)(_U_UINT)(_UU32)(expected), (_U_SINT)(_U_UINT)(_UU32)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT32)
+#define UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU8 )(delta), (_U_SINT)(_U_UINT)(_UU8 )(expected), (_U_SINT)(_U_UINT)(_UU8 )(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8)
+#define UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU16)(delta), (_U_SINT)(_U_UINT)(_UU16)(expected), (_U_SINT)(_U_UINT)(_UU16)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16)
+#define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU32)(delta), (_U_SINT)(_U_UINT)(_UU32)(expected), (_U_SINT)(_U_UINT)(_UU32)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
+
+#define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message)                             UnityAssertEqualNumber((_U_SINT)(_UP)(expected), (_U_SINT)(_UP)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER)
+#define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message)                          UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)line)
+#define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message)                     UnityAssertEqualMemory((UNITY_PTR_ATTRIBUTE void*)(expected), (UNITY_PTR_ATTRIBUTE void*)(actual), (_UU32)(len), 1, (message), (UNITY_LINE_TYPE)line)
+
+#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
+#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT8)
+#define UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT16)
+#define UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT32)
+#define UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
+#define UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT8)
+#define UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT16)
+#define UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT32)
+#define UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8)
+#define UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16)
+#define UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
+#define UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(_UP*)(expected), (const void*)(_UP*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER)
+#define UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualStringArray((const char**)(expected), (const char**)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line)
+#define UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, line, message) UnityAssertEqualMemory((UNITY_PTR_ATTRIBUTE void*)(expected), (UNITY_PTR_ATTRIBUTE void*)(actual), (_UU32)(len), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line)
+
+#ifdef UNITY_SUPPORT_64
+#define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT64)
+#define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message)                          UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT64)
+#define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64)
+#define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT64)
+#define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT64)
+#define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64)
+#define UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT64)
+#define UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, line, message)                  UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT64)
+#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64)
+#else
+#define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErr64)
+#define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message)                          UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErr64)
+#define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErr64)
+#define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErr64)
+#define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message)      UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErr64)
+#define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErr64)
+#define UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErr64)
+#define UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErr64)
+#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErr64)
+#endif
+
+#ifdef UNITY_EXCLUDE_FLOAT
+#define UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrFloat)
+#define UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrFloat)
+#define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrFloat)
+#define UNITY_TEST_ASSERT_FLOAT_IS_INF(actual, line, message)                                    UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrFloat)
+#define UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF(actual, line, message)                                UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrFloat)
+#define UNITY_TEST_ASSERT_FLOAT_IS_NAN(actual, line, message)                                    UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrFloat)
+#define UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE(actual, line, message)                            UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrFloat)
+#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF(actual, line, message)                                UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrFloat)
+#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual, line, message)                            UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrFloat)
+#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN(actual, line, message)                                UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrFloat)
+#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual, line, message)                        UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrFloat)
+#else
+#define UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, line, message)                   UnityAssertFloatsWithin((_UF)(delta), (_UF)(expected), (_UF)(actual), (message), (UNITY_LINE_TYPE)line)
+#define UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, line, message)                           UNITY_TEST_ASSERT_FLOAT_WITHIN((_UF)(expected) * (_UF)UNITY_FLOAT_PRECISION, (_UF)expected, (_UF)actual, (UNITY_LINE_TYPE)line, message)
+#define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualFloatArray((_UF*)(expected), (_UF*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line)
+#define UNITY_TEST_ASSERT_FLOAT_IS_INF(actual, line, message)                                    UnityAssertFloatSpecial((_UF)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_INF)
+#define UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF(actual, line, message)                                UnityAssertFloatSpecial((_UF)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NEG_INF)
+#define UNITY_TEST_ASSERT_FLOAT_IS_NAN(actual, line, message)                                    UnityAssertFloatSpecial((_UF)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NAN)
+#define UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE(actual, line, message)                            UnityAssertFloatSpecial((_UF)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_DET)
+#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF(actual, line, message)                                UnityAssertFloatSpecial((_UF)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NOT_INF)
+#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual, line, message)                            UnityAssertFloatSpecial((_UF)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NOT_NEG_INF)
+#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN(actual, line, message)                                UnityAssertFloatSpecial((_UF)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NOT_NAN)
+#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual, line, message)                        UnityAssertFloatSpecial((_UF)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NOT_DET)
+#endif
+
+#ifdef UNITY_EXCLUDE_DOUBLE
+#define UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrDouble)
+#define UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, line, message)                          UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrDouble)
+#define UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, line, message)      UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrDouble)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_INF(actual, line, message)                                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrDouble)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF(actual, line, message)                               UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrDouble)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_NAN(actual, line, message)                                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrDouble)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrDouble)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF(actual, line, message)                               UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrDouble)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrDouble)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual, line, message)                               UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrDouble)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, line, message)                       UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, UnityStrErrDouble)
+#else
+#define UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, line, message)                  UnityAssertDoublesWithin((_UD)(delta), (_UD)(expected), (_UD)(actual), (message), (UNITY_LINE_TYPE)line)
+#define UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, line, message)                          UNITY_TEST_ASSERT_DOUBLE_WITHIN((_UD)(expected) * (_UD)UNITY_DOUBLE_PRECISION, (_UD)expected, (_UD)actual, (UNITY_LINE_TYPE)line, message)
+#define UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualDoubleArray((_UD*)(expected), (_UD*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_INF(actual, line, message)                                   UnityAssertDoubleSpecial((_UD)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_INF)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF(actual, line, message)                               UnityAssertDoubleSpecial((_UD)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NEG_INF)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_NAN(actual, line, message)                                   UnityAssertDoubleSpecial((_UD)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NAN)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual, line, message)                           UnityAssertDoubleSpecial((_UD)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_DET)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF(actual, line, message)                               UnityAssertDoubleSpecial((_UD)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NOT_INF)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual, line, message)                           UnityAssertDoubleSpecial((_UD)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NOT_NEG_INF)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual, line, message)                               UnityAssertDoubleSpecial((_UD)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NOT_NAN)
+#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, line, message)                       UnityAssertDoubleSpecial((_UD)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NOT_DET)
+#endif
+
+//End of UNITY_INTERNALS_H
+#endif
+
+//#define TEST_EXPECT_FAIL()																		Unity.isExpectingFail = 1;
+//#define TEST_EXPECT_FAIL_MESSAGE(message)														Unity.isExpectingFail = 1; Unity.XFAILMessage = message; //PROBLEM : does this work on all compilers?
+
+#define TEST_EXPECT_FAIL()																		UnityExpectFail();
+#define TEST_EXPECT_FAIL_MESSAGE(message)														UnityExpectFailMessage( (message) );
diff --git a/contrib/ntp/sntp/version.c b/contrib/ntp/sntp/version.c
new file mode 100644
index 000000000000..885dd31b0f77
--- /dev/null
+++ b/contrib/ntp/sntp/version.c
@@ -0,0 +1,5 @@
+/*
+ * version file for sntp
+ */
+#include 
+const char * Version = "sntp 4.2.8p3-RCGO@1.3265-o Mon Jun 29 20:23:24 UTC 2015 (21)";
diff --git a/contrib/ntp/tests/Makefile.am b/contrib/ntp/tests/Makefile.am
index a7d7c3c7e8d3..75890a42c22a 100644
--- a/contrib/ntp/tests/Makefile.am
+++ b/contrib/ntp/tests/Makefile.am
@@ -1,9 +1,24 @@
 NULL =
 SUBDIRS = 
+DIST_SUBDIRS = 
 
 if GTEST_AVAILABLE
-SUBDIRS +=	libntp	\
-		ntpd	\
-		$(NULL)
+SUBDIRS +=	\
+	ntpd	\
+	$(NULL)
 endif
 
+SUBDIRS +=		\
+	bug-2803	\
+	libntp		\
+	sec-2853	\
+	$(NULL)
+
+DIST_SUBDIRS +=		\
+	bug-2803	\
+	libntp		\
+	ntpd		\
+	sandbox		\
+	sec-2853	\
+	$(NULL)
+
diff --git a/contrib/ntp/tests/Makefile.in b/contrib/ntp/tests/Makefile.in
index 0b88e406c5e2..ac29e8e3f466 100644
--- a/contrib/ntp/tests/Makefile.in
+++ b/contrib/ntp/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -15,6 +14,61 @@
 
 @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@
@@ -33,12 +87,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@GTEST_AVAILABLE_TRUE@am__append_1 = libntp	\
-@GTEST_AVAILABLE_TRUE@		ntpd	\
-@GTEST_AVAILABLE_TRUE@		$(NULL)
+@GTEST_AVAILABLE_TRUE@am__append_1 = \
+@GTEST_AVAILABLE_TRUE@	ntpd	\
+@GTEST_AVAILABLE_TRUE@	$(NULL)
 
 subdir = tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
@@ -69,6 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -78,33 +132,66 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = libntp ntpd
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -180,6 +267,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -296,6 +384,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -393,7 +482,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
-SUBDIRS = $(am__append_1)
+SUBDIRS = $(am__append_1) bug-2803 libntp sec-2853 $(NULL)
+DIST_SUBDIRS = bug-2803 libntp ntpd sandbox sec-2853 $(NULL)
 all: all-recursive
 
 .SUFFIXES:
@@ -409,7 +499,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign tests/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -435,22 +524,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -465,57 +557,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -531,12 +578,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -548,15 +590,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -565,6 +603,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -601,13 +654,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -642,10 +692,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -723,22 +778,22 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/contrib/ntp/tests/bug-2803/Makefile.am b/contrib/ntp/tests/bug-2803/Makefile.am
new file mode 100644
index 000000000000..eaf825feaab0
--- /dev/null
+++ b/contrib/ntp/tests/bug-2803/Makefile.am
@@ -0,0 +1,70 @@
+#AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects
+NULL =
+BUILT_SOURCES =
+CLEANFILES =
+
+std_unity_list = 						\
+	$(top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
+	$(NULL)
+
+run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+
+check_PROGRAMS = bug-2803
+
+# HMS: we may not need some of these:
+LDADD =					\
+	$(top_builddir)/sntp/unity/libunity.a	\
+	$(top_builddir)/libntp/libntp.a	\
+	$(LDADD_LIBNTP)			\
+	$(PTHREAD_LIBS)			\
+	$(LDADD_NTP)			\
+	$(NULL)
+
+AM_CFLAGS   = $(CFLAGS_NTP)
+
+# HMS: we may not need some of these:
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
+AM_CPPFLAGS += -I$(top_srcdir)/include
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
+
+AM_LDFLAGS = $(LDFLAGS_NTP)
+
+bug_2803_SOURCES = 			\
+	bug-2803.c			\
+	run-bug-2803.c			\
+	$(NULL)
+
+$(srcdir)/run-bug-2803.c: $(srcdir)/bug-2803.c $(std_unity_list)
+	$(run_unity) bug-2803.c run-bug-2803.c
+
+# HMS: we may not need some of these:
+#noinst_HEADERS =	ntpdtest.h	\
+#			$(NULL)
+
+TESTS =
+
+if !NTP_CROSSCOMPILE
+TESTS += $(check_PROGRAMS)
+endif
+
+## check-libntp.mf - automake fragment
+## slightly adapted for deeper directory
+
+BUILT_SOURCES	+= check-libntp check-libunity
+CLEANFILES	+= check-libntp check-libunity
+
+check-libntp: ../../libntp/libntp.a
+	@echo stamp > $@
+
+../../libntp/libntp.a:
+	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+
+check-libunity: ../../sntp/unity/libunity.a
+	@echo stamp > $@
+
+../../sntp/unity/libunity.a:
+	cd ../../sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
+
+include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
diff --git a/contrib/ntp/tests/bug-2803/Makefile.in b/contrib/ntp/tests/bug-2803/Makefile.in
new file mode 100644
index 000000000000..920c01b9ac3f
--- /dev/null
+++ b/contrib/ntp/tests/bug-2803/Makefile.in
@@ -0,0 +1,1262 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+check_PROGRAMS = bug-2803$(EXEEXT)
+@NTP_CROSSCOMPILE_FALSE@am__append_1 = $(check_PROGRAMS)
+subdir = tests/bug-2803
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
+	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
+	$(top_srcdir)/sntp/m4/ax_c99_struct_init.m4 \
+	$(top_srcdir)/sntp/m4/define_dir.m4 \
+	$(top_srcdir)/sntp/m4/hms_search_lib.m4 \
+	$(top_srcdir)/sntp/m4/libtool.m4 \
+	$(top_srcdir)/sntp/m4/ltoptions.m4 \
+	$(top_srcdir)/sntp/m4/ltsugar.m4 \
+	$(top_srcdir)/sntp/m4/ltversion.m4 \
+	$(top_srcdir)/sntp/m4/lt~obsolete.m4 \
+	$(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \
+	$(top_srcdir)/sntp/m4/ntp_compiler.m4 \
+	$(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \
+	$(top_srcdir)/sntp/m4/ntp_crypto_rand.m4 \
+	$(top_srcdir)/sntp/m4/ntp_debug.m4 \
+	$(top_srcdir)/sntp/m4/ntp_dir_sep.m4 \
+	$(top_srcdir)/sntp/m4/ntp_facilitynames.m4 \
+	$(top_srcdir)/sntp/m4/ntp_googletest.m4 \
+	$(top_srcdir)/sntp/m4/ntp_ipv6.m4 \
+	$(top_srcdir)/sntp/m4/ntp_lib_m.m4 \
+	$(top_srcdir)/sntp/m4/ntp_libevent.m4 \
+	$(top_srcdir)/sntp/m4/ntp_libntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_lineeditlibs.m4 \
+	$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
+	$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
+	$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
+	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
+	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
+	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
+	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
+	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
+	$(top_srcdir)/sntp/m4/openldap.m4 \
+	$(top_srcdir)/sntp/m4/os_cflags.m4 \
+	$(top_srcdir)/sntp/m4/snprintf.m4 \
+	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__objects_1 =
+am_bug_2803_OBJECTS = bug-2803.$(OBJEXT) run-bug-2803.$(OBJEXT) \
+	$(am__objects_1)
+bug_2803_OBJECTS = $(am_bug_2803_OBJECTS)
+bug_2803_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+bug_2803_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \
+	$(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(bug_2803_SOURCES)
+DIST_SOURCES = $(bug_2803_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \
+	$(top_srcdir)/includes.mf \
+	$(top_srcdir)/sntp/libevent/build-aux/depcomp \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
+CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
+CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
+CALC_TICKADJ_MS = @CALC_TICKADJ_MS@
+CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAGS_NTP = @CFLAGS_NTP@
+CHUTEST = @CHUTEST@
+CONFIG_SHELL = @CONFIG_SHELL@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_LIBEVENT = @CPPFLAGS_LIBEVENT@
+CPPFLAGS_NTP = @CPPFLAGS_NTP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DCFD = @DCFD@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EDITLINE_LIBS = @EDITLINE_LIBS@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+GTEST_CONFIG = @GTEST_CONFIG@
+GTEST_CPPFLAGS = @GTEST_CPPFLAGS@
+GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
+GTEST_LDFLAGS = @GTEST_LDFLAGS@
+GTEST_LIBS = @GTEST_LIBS@
+HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
+HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
+HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDADD_LIBEVENT = @LDADD_LIBEVENT@
+LDADD_LIBNTP = @LDADD_LIBNTP@
+LDADD_LIBUTIL = @LDADD_LIBUTIL@
+LDADD_NLIST = @LDADD_NLIST@
+LDADD_NTP = @LDADD_NTP@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_NTP = @LDFLAGS_NTP@
+LIBISC_PTHREADS_NOTHREADS = @LIBISC_PTHREADS_NOTHREADS@
+LIBM = @LIBM@
+LIBOBJS = @LIBOBJS@
+LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@
+LIBOPTS_DIR = @LIBOPTS_DIR@
+LIBOPTS_LDADD = @LIBOPTS_LDADD@
+LIBPARSE = @LIBPARSE@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LSCF = @LSCF@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_LAYOUT = @MAKE_CHECK_LAYOUT@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
+MAKE_LIBNTPSIM = @MAKE_LIBNTPSIM@
+MAKE_LIBPARSE = @MAKE_LIBPARSE@
+MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
+MAKE_NTPDSIM = @MAKE_NTPDSIM@
+MAKE_NTPSNMPD = @MAKE_NTPSNMPD@
+MAKE_NTPTIME = @MAKE_NTPTIME@
+MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
+MAKE_TICKADJ = @MAKE_TICKADJ@
+MAKE_TIMETRIM = @MAKE_TIMETRIM@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MANTAGFMT = @MANTAGFMT@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NTPDATE_DB = @NTPDATE_DB@
+NTPDATE_DL = @NTPDATE_DL@
+NTPDATE_DS = @NTPDATE_DS@
+NTPDATE_MS = @NTPDATE_MS@
+NTPDATE_NI = @NTPDATE_NI@
+NTPDC_DB = @NTPDC_DB@
+NTPDC_DL = @NTPDC_DL@
+NTPDC_DS = @NTPDC_DS@
+NTPDC_MS = @NTPDC_MS@
+NTPDC_NI = @NTPDC_NI@
+NTPDSIM_DB = @NTPDSIM_DB@
+NTPDSIM_DL = @NTPDSIM_DL@
+NTPDSIM_DS = @NTPDSIM_DS@
+NTPDSIM_MS = @NTPDSIM_MS@
+NTPDSIM_NI = @NTPDSIM_NI@
+NTPD_DB = @NTPD_DB@
+NTPD_DL = @NTPD_DL@
+NTPD_DS = @NTPD_DS@
+NTPD_MS = @NTPD_MS@
+NTPD_NI = @NTPD_NI@
+NTPQ_DB = @NTPQ_DB@
+NTPQ_DL = @NTPQ_DL@
+NTPQ_DS = @NTPQ_DS@
+NTPQ_MS = @NTPQ_MS@
+NTPQ_NI = @NTPQ_NI@
+NTPSNMPD_DB = @NTPSNMPD_DB@
+NTPSNMPD_DL = @NTPSNMPD_DL@
+NTPSNMPD_DS = @NTPSNMPD_DS@
+NTPSNMPD_MS = @NTPSNMPD_MS@
+NTPSNMPD_NI = @NTPSNMPD_NI@
+NTPSWEEP_DB = @NTPSWEEP_DB@
+NTPSWEEP_DL = @NTPSWEEP_DL@
+NTPSWEEP_DS = @NTPSWEEP_DS@
+NTPSWEEP_MS = @NTPSWEEP_MS@
+NTPSWEEP_NI = @NTPSWEEP_NI@
+NTPTIME_DB = @NTPTIME_DB@
+NTPTIME_DL = @NTPTIME_DL@
+NTPTIME_DS = @NTPTIME_DS@
+NTPTIME_MS = @NTPTIME_MS@
+NTPTIME_NI = @NTPTIME_NI@
+NTPTRACE_DB = @NTPTRACE_DB@
+NTPTRACE_DL = @NTPTRACE_DL@
+NTPTRACE_DS = @NTPTRACE_DS@
+NTPTRACE_MS = @NTPTRACE_MS@
+NTPTRACE_NI = @NTPTRACE_NI@
+NTP_KEYGEN_DB = @NTP_KEYGEN_DB@
+NTP_KEYGEN_DL = @NTP_KEYGEN_DL@
+NTP_KEYGEN_DS = @NTP_KEYGEN_DS@
+NTP_KEYGEN_MS = @NTP_KEYGEN_MS@
+NTP_KEYGEN_NI = @NTP_KEYGEN_NI@
+NTP_KEYSDIR = @NTP_KEYSDIR@
+NTP_WAIT_DB = @NTP_WAIT_DB@
+NTP_WAIT_DL = @NTP_WAIT_DL@
+NTP_WAIT_DS = @NTP_WAIT_DS@
+NTP_WAIT_MS = @NTP_WAIT_MS@
+NTP_WAIT_NI = @NTP_WAIT_NI@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
+PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PATH_TEST = @PATH_TEST@
+PERLLIBDIR = @PERLLIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+POSIX_SHELL = @POSIX_SHELL@
+PROPDELAY = @PROPDELAY@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SNMP_CFLAGS = @SNMP_CFLAGS@
+SNMP_CPPFLAGS = @SNMP_CPPFLAGS@
+SNMP_LIBS = @SNMP_LIBS@
+SNTP = @SNTP@
+SNTP_DB = @SNTP_DB@
+SNTP_DL = @SNTP_DL@
+SNTP_DS = @SNTP_DS@
+SNTP_MS = @SNTP_MS@
+SNTP_NI = @SNTP_NI@
+STDNORETURN_H = @STDNORETURN_H@
+STRIP = @STRIP@
+TESTDCF = @TESTDCF@
+TICKADJ_DB = @TICKADJ_DB@
+TICKADJ_DL = @TICKADJ_DL@
+TICKADJ_DS = @TICKADJ_DS@
+TICKADJ_MS = @TICKADJ_MS@
+TICKADJ_NI = @TICKADJ_NI@
+TIMETRIM_DB = @TIMETRIM_DB@
+TIMETRIM_DL = @TIMETRIM_DL@
+TIMETRIM_DS = @TIMETRIM_DS@
+TIMETRIM_MS = @TIMETRIM_MS@
+TIMETRIM_NI = @TIMETRIM_NI@
+UPDATE_LEAP_DB = @UPDATE_LEAP_DB@
+UPDATE_LEAP_DL = @UPDATE_LEAP_DL@
+UPDATE_LEAP_DS = @UPDATE_LEAP_DS@
+UPDATE_LEAP_MS = @UPDATE_LEAP_MS@
+UPDATE_LEAP_NI = @UPDATE_LEAP_NI@
+VERSION = @VERSION@
+VER_SUFFIX = @VER_SUFFIX@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+#AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects
+NULL = 
+BUILT_SOURCES = check-libntp check-libunity .deps-ver
+CLEANFILES = check-libntp check-libunity .deps-ver
+std_unity_list = \
+	$(top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
+	$(NULL)
+
+run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+
+# HMS: we may not need some of these:
+LDADD = \
+	$(top_builddir)/sntp/unity/libunity.a	\
+	$(top_builddir)/libntp/libntp.a	\
+	$(LDADD_LIBNTP)			\
+	$(PTHREAD_LIBS)			\
+	$(LDADD_NTP)			\
+	$(NULL)
+
+AM_CFLAGS = $(CFLAGS_NTP)
+
+# HMS: we may not need some of these:
+AM_CPPFLAGS = $(NTP_INCS) -I$(top_srcdir)/sntp/unity \
+	-I$(top_srcdir)/include $(CPPFLAGS_NTP)
+AM_LDFLAGS = $(LDFLAGS_NTP)
+bug_2803_SOURCES = \
+	bug-2803.c			\
+	run-bug-2803.c			\
+	$(NULL)
+
+
+# HMS: we may not need some of these:
+#noinst_HEADERS =	ntpdtest.h	\
+#			$(NULL)
+TESTS = $(am__append_1)
+NTP_INCS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
+	-I$(top_srcdir)/lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include \
+	-I$(top_srcdir)/lib/isc/unix/include
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/bug-2803/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign tests/bug-2803/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+bug-2803$(EXEEXT): $(bug_2803_OBJECTS) $(bug_2803_DEPENDENCIES) $(EXTRA_bug_2803_DEPENDENCIES) 
+	@rm -f bug-2803$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(bug_2803_OBJECTS) $(bug_2803_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bug-2803.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-bug-2803.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+bug-2803.log: bug-2803$(EXEEXT)
+	@p='bug-2803$(EXEEXT)'; \
+	b='bug-2803'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile
+installdirs:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: all check check-am install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	recheck tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+$(srcdir)/run-bug-2803.c: $(srcdir)/bug-2803.c $(std_unity_list)
+	$(run_unity) bug-2803.c run-bug-2803.c
+
+check-libntp: ../../libntp/libntp.a
+	@echo stamp > $@
+
+../../libntp/libntp.a:
+	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+
+check-libunity: ../../sntp/unity/libunity.a
+	@echo stamp > $@
+
+../../sntp/unity/libunity.a:
+	cd ../../sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
+$(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
+	@[ -f $@ ] ||							\
+		cp $(top_srcdir)/deps-ver $@
+	@[ -w $@ ] ||							\
+		chmod ug+w $@
+	@cmp $(top_srcdir)/deps-ver $@ > /dev/null || (			\
+		$(MAKE) $(AM_MAKEFLAGS) clean &&					\
+		echo -n "Prior $(subdir)/$(DEPDIR) version " &&		\
+		cat $@ &&						\
+		rm -rf $(DEPDIR) &&					\
+		mkdir $(DEPDIR) && 					\
+		case "$(top_builddir)" in				\
+		 .)							\
+		    ./config.status Makefile depfiles			\
+		    ;;							\
+		 *)							\
+		    cd "$(top_builddir)" &&				\
+		    ./config.status $(subdir)/Makefile depfiles &&	\
+		    cd $(subdir)					\
+		    ;;							\
+		esac &&							\
+		echo -n "Cleaned $(subdir)/$(DEPDIR) version " &&	\
+		cat $(top_srcdir)/deps-ver				\
+	)
+	cp $(top_srcdir)/deps-ver $@
+
+.deps-ver: $(top_srcdir)/deps-ver
+	@[ ! -d $(DEPDIR) ] || $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/deps-ver
+	@touch $@
+
+#
+# depsver.mf	included in Makefile.am for directories with .deps
+#
+# When building in the same directory with sources that change over
+# time, such as when tracking using bk, the .deps files can become
+# stale with respect to moved, deleted, or superceded headers.  Most
+# commonly, this would exhibit as make reporting a failure to make a
+# header file which is no longer in the location given.  To address
+# this issue, we use a deps-ver file which is updated with each change
+# that breaks old .deps files.  A copy of deps-ver is made into
+# $(DEPDIR) if not already present.  If $(DEPDIR)/deps-ver is present
+# with different contents than deps-ver, we make clean to ensure all
+# .o files built before the incompatible change are rebuilt along with
+# their updated .deps files, then remove $(DEPDIR) and recreate it as
+# empty stubs.
+#
+# It is normal when configured with --disable-dependency-tracking for
+# the DEPDIR to not have been created.  For this reason, we use the
+# intermediate target .deps-ver, which invokes make recursively if
+# DEPDIR exists.
+#
+# If you modify depsver.mf, please make the changes to the master
+# copy, the one in sntp is copied by the bootstrap script from it.
+#
+# This comment block follows rather than leads the related code so that
+# it stays with it in the generated Makefile.in and Makefile.
+#
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/contrib/ntp/tests/bug-2803/bug-2803.c b/contrib/ntp/tests/bug-2803/bug-2803.c
new file mode 100644
index 000000000000..4ee6f02532a1
--- /dev/null
+++ b/contrib/ntp/tests/bug-2803/bug-2803.c
@@ -0,0 +1,123 @@
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+
+#include "unity.h"
+//#include "bug-2803.h"
+
+/* microseconds per second */
+#define MICROSECONDS 1000000
+
+int simpleTest(void);
+void setUp(void);
+void tearDown(void);
+//void test_main(void);
+
+static int verbose = 1;        // if not 0, also print results if test passed
+static int exit_on_err = 0;    // if not 0, exit if test failed
+
+
+/*
+ * Test function calling the old and new code mentioned in
+ * http://bugs.ntp.org/show_bug.cgi?id=2803#c22
+ */
+static int do_test( struct timeval timetv, struct timeval tvlast )
+{
+	struct timeval tvdiff_old;
+	struct timeval tvdiff_new;
+
+	int cond_old;
+	int cond_new;
+	int failed;
+
+	cond_old = 0;
+	cond_new = 0;
+
+	// Here is the old code:
+	tvdiff_old = abs_tval(sub_tval(timetv, tvlast));
+	if (tvdiff_old.tv_sec > 0) {
+		cond_old = 1;
+	}
+
+	// Here is the new code:
+	tvdiff_new = sub_tval(timetv, tvlast);
+	if (tvdiff_new.tv_sec != 0) {
+		cond_new = 1;
+	}
+
+	failed = cond_new != cond_old;
+
+	if ( failed || verbose )
+		printf( "timetv %lli|%07li, tvlast  %lli|%07li: tvdiff_old: %lli|%07li -> %i, tvdiff_new: %lli|%07li -> %i, same cond: %s\n",
+			(long long) timetv.tv_sec, timetv.tv_usec,
+			(long long) tvlast.tv_sec, tvlast.tv_usec,
+			(long long) tvdiff_old.tv_sec, tvdiff_old.tv_usec, cond_old,
+			(long long) tvdiff_new.tv_sec, tvdiff_new.tv_usec, cond_new,
+			failed ? "NO <<" : "yes" );
+
+	return failed ? -1 : 0;
+}
+
+
+
+/*
+ * Call the test function in a loop for a given set of parameters.
+ * Both timetv and tvlast iterate over the given range, in all combinations.
+ */
+static
+int test_loop( long long start_sec, long start_usec,
+	       long long stop_sec, long stop_usec,
+	       long long step_sec, long step_usec )
+{
+	struct timeval timetv;
+	struct timeval tvlast;
+
+	for ( timetv.tv_sec = start_sec; timetv.tv_sec <= stop_sec; timetv.tv_sec += step_sec )
+	  for ( timetv.tv_usec = start_usec; timetv.tv_usec <= stop_usec; timetv.tv_usec += step_usec )
+	    for ( tvlast.tv_sec = start_sec; tvlast.tv_sec <= stop_sec; tvlast.tv_sec += step_sec )
+	      for ( tvlast.tv_usec = start_usec; tvlast.tv_usec <= stop_usec; tvlast.tv_usec += step_usec )
+	      {
+		int rc = do_test( timetv, tvlast );
+		if (rc < 0 && exit_on_err )
+			return rc;
+	      }
+
+	return 0;
+}
+
+
+
+int simpleTest( void )
+{
+	int x;
+	// loop from {0.0} to {1.1000000} stepping by tv_sec by 1 and tv_usec by 100000
+	x = test_loop( 0, 0,   1,  MICROSECONDS,   1,  MICROSECONDS / 10 );
+
+	// x = test_loop( 0, 0,   5,  MICROSECONDS,   1,  MICROSECONDS / 1000 );
+	// x = test_loop( 0, 0,  -5, -MICROSECONDS,  -1, -MICROSECONDS / 1000 );
+
+	return x;
+}
+
+
+
+
+
+void setUp(void)
+{
+  
+}
+
+void tearDown(void)
+{
+}
+
+
+void test_main( void )
+{
+	TEST_ASSERT_EQUAL(0, simpleTest());
+}
diff --git a/contrib/ntp/tests/bug-2803/run-bug-2803.c b/contrib/ntp/tests/bug-2803/run-bug-2803.c
new file mode 100644
index 000000000000..8382c5aa898a
--- /dev/null
+++ b/contrib/ntp/tests/bug-2803/run-bug-2803.c
@@ -0,0 +1,52 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_main(void );
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "bug-2803.c";
+  UnityBegin("bug-2803.c");
+  RUN_TEST(test_main, 18);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/Makefile.am b/contrib/ntp/tests/libntp/Makefile.am
index 2f19a89fe731..288d38c79b7b 100644
--- a/contrib/ntp/tests/libntp/Makefile.am
+++ b/contrib/ntp/tests/libntp/Makefile.am
@@ -2,18 +2,76 @@ NULL =
 BUILT_SOURCES =
 CLEANFILES =
 
-check_PROGRAMS = tests
+run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+
+#removed test-libntp
+check_PROGRAMS =		\
+	test-a_md5encrypt	\
+	test-atoint		\
+	test-atouint		\
+	test-authkeys		\
+	test-buftvtots		\
+	test-calendar		\
+	test-caljulian		\
+	test-caltontp		\
+	test-calyearstart	\
+	test-clocktime		\
+	test-decodenetnum	\
+	test-hextoint		\
+	test-hextolfp		\
+	test-humandate		\
+	test-lfpfunc		\
+	test-lfptostr		\
+	test-modetoa		\
+	test-msyslog		\
+	test-netof		\
+	test-numtoa		\
+	test-numtohost		\
+	test-octtoint		\
+	test-prettydate		\
+	test-recvbuff		\
+	test-refidsmear		\
+	test-refnumtoa		\
+	test-sfptostr		\
+	test-socktoa		\
+	test-ssl_init		\
+	test-statestr		\
+	test-strtolfp		\
+	test-timespecops	\
+	test-timevalops		\
+	test-tstotv		\
+	test-tvtots		\
+	test-uglydate		\
+	test-vi64ops		\
+	test-ymd2yd		\
+	$(NULL)
+
+if GTEST_AVAILABLE
+check_PROGRAMS += tests
+else
+EXTRA_PROGRAMS = tests
+endif
 
 LDADD =					\
 	$(top_builddir)/libntp/libntp.a	\
 	$(LDADD_LIBNTP)			\
 	$(PTHREAD_LIBS)			\
 	$(LDADD_NTP)			\
+	$(LIBM)				\
+	$(NULL)
+
+tests_LDADD =				\
+	$(LDADD)			\
 	$(GTEST_LDFLAGS)		\
 	$(GTEST_LIBS)			\
 	$(NULL)
 
-AM_CFLAGS   = $(CFLAGS_NTP)
+unity_tests_LDADD =				\
+	$(LDADD)				\
+	$(top_builddir)/sntp/unity/libunity.a	\
+	$(NULL)
+
+AM_CFLAGS = $(CFLAGS_NTP)
 AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 
 AM_CPPFLAGS  = $(NTP_INCS)
@@ -23,65 +81,809 @@ AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 AM_LDFLAGS = $(LDFLAGS_NTP)
 
-tests_SOURCES = $(top_srcdir)/sntp/tests_main.cpp	\
-		libntptest.cpp		\
-		a_md5encrypt.cpp	\
-		atoint.cpp		\
-		atouint.cpp		\
-		authkeys.cpp		\
-		buftvtots.cpp		\
-		calendar.cpp		\
-		caljulian.cpp		\
-		caltontp.cpp		\
-		calyearstart.cpp	\
-		clocktime.cpp		\
-		decodenetnum.cpp	\
-		hextoint.cpp		\
-		hextolfp.cpp		\
-		humandate.cpp		\
-		lfpfunc.cpp		\
-		lfptostr.cpp		\
-		modetoa.cpp		\
-		msyslog.cpp		\
-		netof.cpp		\
-		numtoa.cpp		\
-		numtohost.cpp		\
-		octtoint.cpp		\
-		prettydate.cpp		\
-		recvbuff.cpp		\
-		refnumtoa.cpp		\
-		sfptostr.cpp		\
-		socktoa.cpp		\
-		ssl_init.cpp		\
-		statestr.cpp		\
-		strtolfp.cpp		\
-		timespecops.cpp		\
-		timestructs.cpp		\
-		timevalops.cpp		\
-		tstotv.cpp		\
-		tvtots.cpp		\
-		uglydate.cpp		\
-		vi64ops.cpp		\
-		ymd2yd.cpp		\
-		$(NULL)
+tests_SOURCES =					\
+	$(top_srcdir)/sntp/tests_main.cpp	\
+	g_libntptest.cpp	\
+	g_a_md5encrypt.cpp	\
+	g_atoint.cpp		\
+	g_atouint.cpp		\
+	g_authkeys.cpp		\
+	g_buftvtots.cpp		\
+	g_calendar.cpp		\
+	g_caljulian.cpp		\
+	g_caltontp.cpp		\
+	g_calyearstart.cpp	\
+	g_clocktime.cpp		\
+	g_decodenetnum.cpp	\
+	g_hextoint.cpp		\
+	g_hextolfp.cpp		\
+	g_humandate.cpp		\
+	g_lfpfunc.cpp		\
+	g_lfptostr.cpp		\
+	g_modetoa.cpp		\
+	g_msyslog.cpp		\
+	g_netof.cpp		\
+	g_numtoa.cpp		\
+	g_numtohost.cpp		\
+	g_octtoint.cpp		\
+	g_prettydate.cpp	\
+	g_recvbuff.cpp		\
+	g_refnumtoa.cpp		\
+	g_sfptostr.cpp		\
+	g_socktoa.cpp		\
+	g_ssl_init.cpp		\
+	g_statestr.cpp		\
+	g_strtolfp.cpp		\
+	g_timespecops.cpp	\
+	g_timestructs.cpp	\
+	g_timevalops.cpp	\
+	g_tstotv.cpp		\
+	g_tvtots.cpp		\
+	g_uglydate.cpp		\
+	g_vi64ops.cpp		\
+	g_ymd2yd.cpp		\
+	$(NULL)
 
-noinst_HEADERS =	lfptest.h	\
-			libntptest.h	\
-			sockaddrtest.h	\
-			timestructs.h	\
-			$(NULL)
+BUILT_SOURCES +=			\
+	$(srcdir)/run-a_md5encrypt.c	\
+	$(srcdir)/run-atoint.c		\
+	$(srcdir)/run-atouint.c		\
+	$(srcdir)/run-authkeys.c	\
+	$(srcdir)/run-buftvtots.c	\
+	$(srcdir)/run-calendar.c	\
+	$(srcdir)/run-caljulian.c	\
+	$(srcdir)/run-caltontp.c	\
+	$(srcdir)/run-calyearstart.c	\
+	$(srcdir)/run-clocktime.c	\
+	$(srcdir)/run-decodenetnum.c	\
+	$(srcdir)/run-hextoint.c	\
+	$(srcdir)/run-hextolfp.c	\
+	$(srcdir)/run-humandate.c	\
+	$(srcdir)/run-lfpfunc.c		\
+	$(srcdir)/run-lfptostr.c	\
+	$(srcdir)/run-modetoa.c		\
+	$(srcdir)/run-msyslog.c		\
+	$(srcdir)/run-netof.c		\
+	$(srcdir)/run-numtoa.c		\
+	$(srcdir)/run-numtohost.c	\
+	$(srcdir)/run-octtoint.c	\
+	$(srcdir)/run-prettydate.c	\
+	$(srcdir)/run-recvbuff.c	\
+	$(srcdir)/run-refidsmear.c	\
+	$(srcdir)/run-refnumtoa.c	\
+	$(srcdir)/run-sfptostr.c	\
+	$(srcdir)/run-socktoa.c		\
+	$(srcdir)/run-ssl_init.c	\
+	$(srcdir)/run-statestr.c	\
+	$(srcdir)/run-strtolfp.c	\
+	$(srcdir)/run-timevalops.c	\
+	$(srcdir)/run-timespecops.c	\
+	$(srcdir)/run-tstotv.c		\
+	$(srcdir)/run-tvtots.c		\
+	$(srcdir)/run-uglydate.c	\
+	$(srcdir)/run-vi64ops.c		\
+	$(srcdir)/run-ymd2yd.c		\
+	$(NULL)
+
+noinst_HEADERS =	\
+	g_lfptest.h	\
+	lfptest.h	\
+	g_libntptest.h	\
+	g_sockaddrtest.h	\
+	sockaddrtest.h	\
+	g_timestructs.h	\
+	test-libntp.h	\
+	$(NULL)
+
+###
+
+test_a_md5encrypt_CFLAGS =		\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_a_md5encrypt_LDADD =		\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_a_md5encrypt_SOURCES =		\
+	a_md5encrypt.c			\
+	run-a_md5encrypt.c		\
+	$(NULL)
+
+$(srcdir)/run-a_md5encrypt.c: $(srcdir)/a_md5encrypt.c $(std_unity_list)
+	$(run_unity) a_md5encrypt.c run-a_md5encrypt.c
+
+###
+
+test_atoint_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_atoint_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_atoint_SOURCES =			\
+	atoint.c			\
+	run-atoint.c			\
+	$(NULL)
+
+$(srcdir)/run-atoint.c: $(srcdir)/atoint.c $(std_unity_list)
+	$(run_unity) atoint.c run-atoint.c
+
+###
+
+test_atouint_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_atouint_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_atouint_SOURCES =			\
+	atouint.c			\
+	run-atouint.c			\
+	$(NULL)
+
+$(srcdir)/run-atouint.c: $(srcdir)/atouint.c $(std_unity_list)
+	$(run_unity) atouint.c run-atouint.c
+
+###
+
+test_authkeys_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_authkeys_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_authkeys_SOURCES =			\
+	authkeys.c			\
+	run-authkeys.c			\
+	$(NULL)
+
+$(srcdir)/run-authkeys.c: $(srcdir)/authkeys.c $(std_unity_list)
+	$(run_unity) authkeys.c run-authkeys.c
+
+###
+
+test_buftvtots_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_buftvtots_SOURCES =		\
+	buftvtots.c			\
+	run-buftvtots.c			\
+	$(NULL)
+
+test_buftvtots_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	-DUNITY_INCLUDE_DOUBLE		\
+	$(NULL)
+
+$(srcdir)/run-buftvtots.c: $(srcdir)/buftvtots.c $(std_unity_list)
+	$(run_unity) buftvtots.c run-buftvtots.c
+
+###
+
+test_calendar_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_calendar_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_calendar_SOURCES =			\
+	calendar.c			\
+	run-calendar.c			\
+	test-libntp.c			\
+	$(NULL)
+
+$(srcdir)/run-calendar.c: $(srcdir)/calendar.c $(std_unity_list)
+	$(run_unity) calendar.c run-calendar.c
+
+###
+
+test_caltontp_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_caltontp_LDADD =			\
+	$(unity_tests_LDADD)		\
+	-lpthread			\
+	$(NULL)
+
+test_caltontp_SOURCES =			\
+	caltontp.c			\
+	run-caltontp.c			\
+	$(NULL)
+
+$(srcdir)/run-caltontp.c: $(srcdir)/caltontp.c $(std_unity_list)
+	$(run_unity) caltontp.c run-caltontp.c
+
+###
+
+test_caljulian_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_caljulian_LDADD =			\
+	$(unity_tests_LDADD)		\
+	-lpthread			\
+	$(NULL)
+
+test_caljulian_SOURCES =		\
+	caljulian.c			\
+	run-caljulian.c			\
+	test-libntp.c			\
+	$(NULL)
+
+$(srcdir)/run-caljulian.c: $(srcdir)/caljulian.c $(std_unity_list)
+	$(run_unity) caljulian.c run-caljulian.c
+
+###
+
+test_calyearstart_CFLAGS =		\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_calyearstart_LDADD =		\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_calyearstart_SOURCES =		\
+	calyearstart.c			\
+	run-calyearstart.c		\
+	test-libntp.c			\
+	$(NULL)
+
+$(srcdir)/run-calyearstart.c: $(srcdir)/calyearstart.c $(std_unity_list)
+	$(run_unity) calyearstart.c run-calyearstart.c
+
+###
+
+test_clocktime_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_clocktime_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_clocktime_SOURCES =		\
+	clocktime.c			\
+	run-clocktime.c			\
+	test-libntp.c			\
+	$(NULL)
+
+$(srcdir)/run-clocktime.c: $(srcdir)/clocktime.c $(std_unity_list)
+	$(run_unity) clocktime.c run-clocktime.c
+
+###
+
+test_decodenetnum_CFLAGS =		\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_decodenetnum_LDADD =		\
+	$(unity_tests_LDADD)		\
+	-lpthread			\
+	$(NULL)
+
+test_decodenetnum_SOURCES =		\
+	decodenetnum.c			\
+	run-decodenetnum.c		\
+	$(NULL)
+
+$(srcdir)/run-decodenetnum.c: $(srcdir)/decodenetnum.c $(std_unity_list)
+	$(run_unity) decodenetnum.c run-decodenetnum.c
+
+###
+
+test_hextoint_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_hextoint_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_hextoint_SOURCES =			\
+	hextoint.c			\
+	run-hextoint.c			\
+	$(NULL)
+
+$(srcdir)/run-hextoint.c: $(srcdir)/hextoint.c $(std_unity_list)
+	$(run_unity) hextoint.c run-hextoint.c
+
+###
+
+test_hextolfp_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_hextolfp_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_hextolfp_SOURCES =			\
+	hextolfp.c			\
+	run-hextolfp.c			\
+	$(NULL)
+
+$(srcdir)/run-hextolfp.c: $(srcdir)/hextolfp.c $(std_unity_list)
+	$(run_unity) hextolfp.c run-hextolfp.c
+
+###
+
+test_humandate_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_humandate_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_humandate_SOURCES =		\
+	humandate.c			\
+	run-humandate.c			\
+	$(NULL)
+
+$(srcdir)/run-humandate.c: $(srcdir)/humandate.c $(std_unity_list)
+	$(run_unity) humandate.c run-humandate.c
+
+###
+
+test_lfpfunc_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	-DUNITY_INCLUDE_DOUBLE		\
+	$(NULL)
+
+test_lfpfunc_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_lfpfunc_SOURCES =			\
+	lfpfunc.c			\
+	run-lfpfunc.c			\
+	$(NULL)
+
+$(srcdir)/run-lfpfunc.c: $(srcdir)/lfpfunc.c $(std_unity_list)
+	$(run_unity) lfpfunc.c run-lfpfunc.c
+
+###
+
+test_lfptostr_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_lfptostr_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_lfptostr_SOURCES =			\
+	lfptostr.c			\
+	run-lfptostr.c			\
+	$(NULL)
+
+$(srcdir)/run-lfptostr.c: $(srcdir)/lfptostr.c $(std_unity_list)
+	$(run_unity) lfptostr.c run-lfptostr.c
+
+###
+
+test_modetoa_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_modetoa_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_modetoa_SOURCES =			\
+	modetoa.c			\
+	run-modetoa.c			\
+	$(NULL)
+
+$(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list)
+	$(run_unity) modetoa.c run-modetoa.c
+
+###
+
+test_msyslog_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_msyslog_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_msyslog_SOURCES =			\
+	msyslog.c			\
+	run-msyslog.c			\
+	$(NULL)
+
+$(srcdir)/run-msyslog.c: $(srcdir)/msyslog.c $(std_unity_list)
+	$(run_unity) msyslog.c run-msyslog.c
+
+###
+
+test_netof_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_netof_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_netof_SOURCES =			\
+	netof.c				\
+	run-netof.c			\
+	$(NULL)
+
+$(srcdir)/run-netof.c: $(srcdir)/netof.c $(std_unity_list)
+	$(run_unity) netof.c run-netof.c
+
+###
+
+test_numtoa_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_numtoa_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_numtoa_SOURCES =			\
+	numtoa.c			\
+	run-numtoa.c			\
+	$(NULL)
+
+$(srcdir)/run-numtoa.c: $(srcdir)/numtoa.c $(std_unity_list)
+	$(run_unity) numtoa.c run-numtoa.c
+
+###
+
+test_numtohost_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_numtohost_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_numtohost_SOURCES =		\
+	numtohost.c			\
+	run-numtohost.c			\
+	$(NULL)
+
+$(srcdir)/run-numtohost.c: $(srcdir)/numtohost.c $(std_unity_list)
+	$(run_unity) numtohost.c run-numtohost.c
+
+###
+
+test_octtoint_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_octtoint_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_octtoint_SOURCES =			\
+	octtoint.c			\
+	run-octtoint.c			\
+	$(NULL)
+
+$(srcdir)/run-octtoint.c: $(srcdir)/octtoint.c $(std_unity_list)
+	$(run_unity) octtoint.c run-octtoint.c
+
+###
+
+test_prettydate_CFLAGS =		\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_prettydate_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_prettydate_SOURCES =		\
+	prettydate.c			\
+	run-prettydate.c		\
+	$(NULL)
+
+$(srcdir)/run-prettydate.c: $(srcdir)/prettydate.c $(std_unity_list)
+	$(run_unity) prettydate.c run-prettydate.c
+
+###
+
+test_recvbuff_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_recvbuff_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_recvbuff_SOURCES =			\
+	recvbuff.c			\
+	run-recvbuff.c			\
+	$(NULL)
+
+$(srcdir)/run-recvbuff.c: $(srcdir)/recvbuff.c $(std_unity_list)
+	$(run_unity) recvbuff.c run-recvbuff.c
+
+###
+
+test_refidsmear_CFLAGS =		\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_refidsmear_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_refidsmear_SOURCES =		\
+	refidsmear.c			\
+	run-refidsmear.c		\
+	$(NULL)
+
+$(srcdir)/run-refidsmear.c: $(srcdir)/refidsmear.c $(std_unity_list)
+	$(run_unity) refidsmear.c run-refidsmear.c
+
+###
+
+test_refnumtoa_CFLAGS =				\
+	-I$(top_srcdir)/sntp/unity		\
+	$(NULL)
+
+test_refnumtoa_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_refnumtoa_SOURCES =		\
+	refnumtoa.c			\
+	run-refnumtoa.c			\
+	$(NULL)
+
+$(srcdir)/run-refnumtoa.c: $(srcdir)/refnumtoa.c $(std_unity_list)
+	$(run_unity) refnumtoa.c run-refnumtoa.c
+
+###
+
+test_sfptostr_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	-DUNITY_INCLUDE_DOUBLE		\
+	$(NULL)
+
+test_sfptostr_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_sfptostr_SOURCES =			\
+	sfptostr.c			\
+	run-sfptostr.c			\
+	$(NULL)
+
+$(srcdir)/run-sfptostr.c: $(srcdir)/sfptostr.c $(std_unity_list)
+	$(run_unity) sfptostr.c run-sfptostr.c
+
+###
+
+test_socktoa_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_socktoa_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_socktoa_SOURCES =			\
+	socktoa.c			\
+	run-socktoa.c			\
+	$(NULL)
+
+$(srcdir)/run-socktoa.c: $(srcdir)/socktoa.c $(std_unity_list)
+	$(run_unity) socktoa.c run-socktoa.c
+
+###
+
+test_ssl_init_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_ssl_init_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_ssl_init_SOURCES =			\
+	ssl_init.c			\
+	run-ssl_init.c			\
+	$(NULL)
+
+$(srcdir)/run-ssl_init.c: $(srcdir)/ssl_init.c $(std_unity_list)
+	$(run_unity) ssl_init.c run-ssl_init.c
+
+###
+
+test_statestr_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_statestr_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_statestr_SOURCES =			\
+	statestr.c			\
+	run-statestr.c			\
+	$(NULL)
+
+$(srcdir)/run-statestr.c: $(srcdir)/statestr.c $(std_unity_list)
+	$(run_unity) statestr.c run-statestr.c
+
+###
+
+test_strtolfp_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_strtolfp_LDADD =			\
+	$(unity_tests_LDADD)		\
+	-lpthread			\
+	$(NULL)
+
+test_strtolfp_SOURCES =			\
+	strtolfp.c			\
+	run-strtolfp.c			\
+	$(NULL)
+
+$(srcdir)/run-strtolfp.c: $(srcdir)/strtolfp.c $(std_unity_list)
+	$(run_unity) strtolfp.c run-strtolfp.c
+
+###
+
+test_timespecops_CFLAGS =		\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_timespecops_LDADD =		\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_timespecops_SOURCES =		\
+	timespecops.c			\
+	run-timespecops.c		\
+	$(NULL)
+
+$(srcdir)/run-timespecops.c: $(srcdir)/timespecops.c $(std_unity_list)
+	$(run_unity) timespecops.c run-timespecops.c
+
+###
+
+test_timevalops_CFLAGS =		\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_timevalops_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_timevalops_SOURCES =		\
+	timevalops.c			\
+	run-timevalops.c		\
+	$(NULL)
+
+$(srcdir)/run-timevalops.c: $(srcdir)/timevalops.c $(std_unity_list)
+	$(run_unity) timevalops.c run-timevalops.c
+
+###
+
+test_tstotv_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_tstotv_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_tstotv_SOURCES =			\
+	tstotv.c			\
+	run-tstotv.c			\
+	$(NULL)
+
+$(srcdir)/run-tstotv.c: $(srcdir)/tstotv.c $(std_unity_list)
+	$(run_unity) tstotv.c run-tstotv.c
+
+###
+
+test_tvtots_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	-DUNITY_INCLUDE_DOUBLE		\
+	$(NULL)
+
+test_tvtots_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_tvtots_SOURCES =			\
+	tvtots.c			\
+	run-tvtots.c			\
+	$(NULL)
+
+$(srcdir)/run-tvtots.c: $(srcdir)/tvtots.c $(std_unity_list)
+	$(run_unity) tvtots.c run-tvtots.c
+
+###
+
+test_uglydate_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_uglydate_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_uglydate_SOURCES =			\
+	uglydate.c			\
+	run-uglydate.c			\
+	$(NULL)
+
+$(srcdir)/run-uglydate.c: $(srcdir)/uglydate.c $(std_unity_list)
+	$(run_unity) uglydate.c run-uglydate.c
+
+###
+
+test_vi64ops_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_vi64ops_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_vi64ops_SOURCES =			\
+	vi64ops.c			\
+	run-vi64ops.c			\
+	$(NULL)
+
+$(srcdir)/run-vi64ops.c: $(srcdir)/vi64ops.c $(std_unity_list)
+	$(run_unity) vi64ops.c run-vi64ops.c
+
+###
+
+test_ymd2yd_CFLAGS =			\
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_ymd2yd_LDADD =			\
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_ymd2yd_SOURCES =			\
+	ymd2yd.c			\
+	run-ymd2yd.c			\
+	$(NULL)
+
+$(srcdir)/run-ymd2yd.c: $(srcdir)/ymd2yd.c $(std_unity_list)
+	$(run_unity) ymd2yd.c run-ymd2yd.c
+
+###
 
 TESTS =
 
 if !NTP_CROSSCOMPILE
-TESTS += tests
+TESTS += $(check_PROGRAMS)
 endif
 
 ## check-libntp.mf - automake fragment
 ## slightly adapted for deeper directory
 
-BUILT_SOURCES	+= check-libntp
-CLEANFILES	+= check-libntp
+BUILT_SOURCES	+= check-libntp check-libunity
+CLEANFILES	+= check-libntp check-libunity
 
 check-libntp: ../../libntp/libntp.a
 	@echo stamp > $@
@@ -89,5 +891,11 @@ check-libntp: ../../libntp/libntp.a
 ../../libntp/libntp.a:
 	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 
+check-libunity: ../../sntp/unity/libunity.a
+	@echo stamp > $@
+
+../../sntp/unity/libunity.a:
+	cd ../../sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
+
 include $(top_srcdir)/depsver.mf
 include $(top_srcdir)/includes.mf
diff --git a/contrib/ntp/tests/libntp/Makefile.in b/contrib/ntp/tests/libntp/Makefile.in
index 233c3ef19353..e0f9222f4fff 100644
--- a/contrib/ntp/tests/libntp/Makefile.in
+++ b/contrib/ntp/tests/libntp/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -16,6 +15,61 @@
 @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@
@@ -34,12 +88,29 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-check_PROGRAMS = tests$(EXEEXT)
-TESTS = $(am__EXEEXT_1)
-@NTP_CROSSCOMPILE_FALSE@am__append_1 = tests
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \
-	$(top_srcdir)/includes.mf
+check_PROGRAMS = test-a_md5encrypt$(EXEEXT) test-atoint$(EXEEXT) \
+	test-atouint$(EXEEXT) test-authkeys$(EXEEXT) \
+	test-buftvtots$(EXEEXT) test-calendar$(EXEEXT) \
+	test-caljulian$(EXEEXT) test-caltontp$(EXEEXT) \
+	test-calyearstart$(EXEEXT) test-clocktime$(EXEEXT) \
+	test-decodenetnum$(EXEEXT) test-hextoint$(EXEEXT) \
+	test-hextolfp$(EXEEXT) test-humandate$(EXEEXT) \
+	test-lfpfunc$(EXEEXT) test-lfptostr$(EXEEXT) \
+	test-modetoa$(EXEEXT) test-msyslog$(EXEEXT) \
+	test-netof$(EXEEXT) test-numtoa$(EXEEXT) \
+	test-numtohost$(EXEEXT) test-octtoint$(EXEEXT) \
+	test-prettydate$(EXEEXT) test-recvbuff$(EXEEXT) \
+	test-refidsmear$(EXEEXT) test-refnumtoa$(EXEEXT) \
+	test-sfptostr$(EXEEXT) test-socktoa$(EXEEXT) \
+	test-ssl_init$(EXEEXT) test-statestr$(EXEEXT) \
+	test-strtolfp$(EXEEXT) test-timespecops$(EXEEXT) \
+	test-timevalops$(EXEEXT) test-tstotv$(EXEEXT) \
+	test-tvtots$(EXEEXT) test-uglydate$(EXEEXT) \
+	test-vi64ops$(EXEEXT) test-ymd2yd$(EXEEXT) $(am__EXEEXT_1) \
+	$(am__EXEEXT_2)
+@GTEST_AVAILABLE_TRUE@am__append_1 = tests
+@GTEST_AVAILABLE_FALSE@EXTRA_PROGRAMS = tests$(EXEEXT)
+@NTP_CROSSCOMPILE_FALSE@am__append_2 = $(check_PROGRAMS)
 subdir = tests/libntp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -71,6 +142,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -80,70 +152,691 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+am__EXEEXT_1 =
+@GTEST_AVAILABLE_TRUE@am__EXEEXT_2 = tests$(EXEEXT)
 am__objects_1 =
-am_tests_OBJECTS = tests_main.$(OBJEXT) libntptest.$(OBJEXT) \
-	a_md5encrypt.$(OBJEXT) atoint.$(OBJEXT) atouint.$(OBJEXT) \
-	authkeys.$(OBJEXT) buftvtots.$(OBJEXT) calendar.$(OBJEXT) \
-	caljulian.$(OBJEXT) caltontp.$(OBJEXT) calyearstart.$(OBJEXT) \
-	clocktime.$(OBJEXT) decodenetnum.$(OBJEXT) hextoint.$(OBJEXT) \
-	hextolfp.$(OBJEXT) humandate.$(OBJEXT) lfpfunc.$(OBJEXT) \
-	lfptostr.$(OBJEXT) modetoa.$(OBJEXT) msyslog.$(OBJEXT) \
-	netof.$(OBJEXT) numtoa.$(OBJEXT) numtohost.$(OBJEXT) \
-	octtoint.$(OBJEXT) prettydate.$(OBJEXT) recvbuff.$(OBJEXT) \
-	refnumtoa.$(OBJEXT) sfptostr.$(OBJEXT) socktoa.$(OBJEXT) \
-	ssl_init.$(OBJEXT) statestr.$(OBJEXT) strtolfp.$(OBJEXT) \
-	timespecops.$(OBJEXT) timestructs.$(OBJEXT) \
-	timevalops.$(OBJEXT) tstotv.$(OBJEXT) tvtots.$(OBJEXT) \
-	uglydate.$(OBJEXT) vi64ops.$(OBJEXT) ymd2yd.$(OBJEXT) \
+am_test_a_md5encrypt_OBJECTS =  \
+	test_a_md5encrypt-a_md5encrypt.$(OBJEXT) \
+	test_a_md5encrypt-run-a_md5encrypt.$(OBJEXT) $(am__objects_1)
+test_a_md5encrypt_OBJECTS = $(am_test_a_md5encrypt_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/libntp/libntp.a \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1)
+test_a_md5encrypt_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+test_a_md5encrypt_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_a_md5encrypt_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_test_atoint_OBJECTS = test_atoint-atoint.$(OBJEXT) \
+	test_atoint-run-atoint.$(OBJEXT) $(am__objects_1)
+test_atoint_OBJECTS = $(am_test_atoint_OBJECTS)
+test_atoint_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1)
+test_atoint_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_atoint_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_atouint_OBJECTS = test_atouint-atouint.$(OBJEXT) \
+	test_atouint-run-atouint.$(OBJEXT) $(am__objects_1)
+test_atouint_OBJECTS = $(am_test_atouint_OBJECTS)
+test_atouint_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_atouint_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_atouint_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_authkeys_OBJECTS = test_authkeys-authkeys.$(OBJEXT) \
+	test_authkeys-run-authkeys.$(OBJEXT) $(am__objects_1)
+test_authkeys_OBJECTS = $(am_test_authkeys_OBJECTS)
+test_authkeys_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_authkeys_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_authkeys_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_buftvtots_OBJECTS = test_buftvtots-buftvtots.$(OBJEXT) \
+	test_buftvtots-run-buftvtots.$(OBJEXT) $(am__objects_1)
+test_buftvtots_OBJECTS = $(am_test_buftvtots_OBJECTS)
+test_buftvtots_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_buftvtots_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_buftvtots_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+	$@
+am_test_calendar_OBJECTS = test_calendar-calendar.$(OBJEXT) \
+	test_calendar-run-calendar.$(OBJEXT) \
+	test_calendar-test-libntp.$(OBJEXT) $(am__objects_1)
+test_calendar_OBJECTS = $(am_test_calendar_OBJECTS)
+test_calendar_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_calendar_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_calendar_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_caljulian_OBJECTS = test_caljulian-caljulian.$(OBJEXT) \
+	test_caljulian-run-caljulian.$(OBJEXT) \
+	test_caljulian-test-libntp.$(OBJEXT) $(am__objects_1)
+test_caljulian_OBJECTS = $(am_test_caljulian_OBJECTS)
+test_caljulian_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_caljulian_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_caljulian_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+	$@
+am_test_caltontp_OBJECTS = test_caltontp-caltontp.$(OBJEXT) \
+	test_caltontp-run-caltontp.$(OBJEXT) $(am__objects_1)
+test_caltontp_OBJECTS = $(am_test_caltontp_OBJECTS)
+test_caltontp_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_caltontp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_caltontp_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_calyearstart_OBJECTS =  \
+	test_calyearstart-calyearstart.$(OBJEXT) \
+	test_calyearstart-run-calyearstart.$(OBJEXT) \
+	test_calyearstart-test-libntp.$(OBJEXT) $(am__objects_1)
+test_calyearstart_OBJECTS = $(am_test_calyearstart_OBJECTS)
+test_calyearstart_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_calyearstart_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_calyearstart_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_test_clocktime_OBJECTS = test_clocktime-clocktime.$(OBJEXT) \
+	test_clocktime-run-clocktime.$(OBJEXT) \
+	test_clocktime-test-libntp.$(OBJEXT) $(am__objects_1)
+test_clocktime_OBJECTS = $(am_test_clocktime_OBJECTS)
+test_clocktime_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_clocktime_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_clocktime_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+	$@
+am_test_decodenetnum_OBJECTS =  \
+	test_decodenetnum-decodenetnum.$(OBJEXT) \
+	test_decodenetnum-run-decodenetnum.$(OBJEXT) $(am__objects_1)
+test_decodenetnum_OBJECTS = $(am_test_decodenetnum_OBJECTS)
+test_decodenetnum_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_decodenetnum_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_decodenetnum_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_test_hextoint_OBJECTS = test_hextoint-hextoint.$(OBJEXT) \
+	test_hextoint-run-hextoint.$(OBJEXT) $(am__objects_1)
+test_hextoint_OBJECTS = $(am_test_hextoint_OBJECTS)
+test_hextoint_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_hextoint_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_hextoint_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_hextolfp_OBJECTS = test_hextolfp-hextolfp.$(OBJEXT) \
+	test_hextolfp-run-hextolfp.$(OBJEXT) $(am__objects_1)
+test_hextolfp_OBJECTS = $(am_test_hextolfp_OBJECTS)
+test_hextolfp_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_hextolfp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_hextolfp_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_humandate_OBJECTS = test_humandate-humandate.$(OBJEXT) \
+	test_humandate-run-humandate.$(OBJEXT) $(am__objects_1)
+test_humandate_OBJECTS = $(am_test_humandate_OBJECTS)
+test_humandate_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_humandate_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_humandate_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+	$@
+am_test_lfpfunc_OBJECTS = test_lfpfunc-lfpfunc.$(OBJEXT) \
+	test_lfpfunc-run-lfpfunc.$(OBJEXT) $(am__objects_1)
+test_lfpfunc_OBJECTS = $(am_test_lfpfunc_OBJECTS)
+test_lfpfunc_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_lfpfunc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_lfpfunc_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_lfptostr_OBJECTS = test_lfptostr-lfptostr.$(OBJEXT) \
+	test_lfptostr-run-lfptostr.$(OBJEXT) $(am__objects_1)
+test_lfptostr_OBJECTS = $(am_test_lfptostr_OBJECTS)
+test_lfptostr_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_lfptostr_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_lfptostr_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_modetoa_OBJECTS = test_modetoa-modetoa.$(OBJEXT) \
+	test_modetoa-run-modetoa.$(OBJEXT) $(am__objects_1)
+test_modetoa_OBJECTS = $(am_test_modetoa_OBJECTS)
+test_modetoa_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_modetoa_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_modetoa_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_msyslog_OBJECTS = test_msyslog-msyslog.$(OBJEXT) \
+	test_msyslog-run-msyslog.$(OBJEXT) $(am__objects_1)
+test_msyslog_OBJECTS = $(am_test_msyslog_OBJECTS)
+test_msyslog_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_msyslog_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_msyslog_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_netof_OBJECTS = test_netof-netof.$(OBJEXT) \
+	test_netof-run-netof.$(OBJEXT) $(am__objects_1)
+test_netof_OBJECTS = $(am_test_netof_OBJECTS)
+test_netof_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1)
+test_netof_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_netof_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_numtoa_OBJECTS = test_numtoa-numtoa.$(OBJEXT) \
+	test_numtoa-run-numtoa.$(OBJEXT) $(am__objects_1)
+test_numtoa_OBJECTS = $(am_test_numtoa_OBJECTS)
+test_numtoa_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1)
+test_numtoa_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_numtoa_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_numtohost_OBJECTS = test_numtohost-numtohost.$(OBJEXT) \
+	test_numtohost-run-numtohost.$(OBJEXT) $(am__objects_1)
+test_numtohost_OBJECTS = $(am_test_numtohost_OBJECTS)
+test_numtohost_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_numtohost_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_numtohost_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+	$@
+am_test_octtoint_OBJECTS = test_octtoint-octtoint.$(OBJEXT) \
+	test_octtoint-run-octtoint.$(OBJEXT) $(am__objects_1)
+test_octtoint_OBJECTS = $(am_test_octtoint_OBJECTS)
+test_octtoint_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_octtoint_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_octtoint_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_prettydate_OBJECTS = test_prettydate-prettydate.$(OBJEXT) \
+	test_prettydate-run-prettydate.$(OBJEXT) $(am__objects_1)
+test_prettydate_OBJECTS = $(am_test_prettydate_OBJECTS)
+test_prettydate_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_prettydate_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_prettydate_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_test_recvbuff_OBJECTS = test_recvbuff-recvbuff.$(OBJEXT) \
+	test_recvbuff-run-recvbuff.$(OBJEXT) $(am__objects_1)
+test_recvbuff_OBJECTS = $(am_test_recvbuff_OBJECTS)
+test_recvbuff_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_recvbuff_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_recvbuff_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_refidsmear_OBJECTS = test_refidsmear-refidsmear.$(OBJEXT) \
+	test_refidsmear-run-refidsmear.$(OBJEXT) $(am__objects_1)
+test_refidsmear_OBJECTS = $(am_test_refidsmear_OBJECTS)
+test_refidsmear_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_refidsmear_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_refidsmear_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_test_refnumtoa_OBJECTS = test_refnumtoa-refnumtoa.$(OBJEXT) \
+	test_refnumtoa-run-refnumtoa.$(OBJEXT) $(am__objects_1)
+test_refnumtoa_OBJECTS = $(am_test_refnumtoa_OBJECTS)
+test_refnumtoa_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_refnumtoa_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_refnumtoa_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+	$@
+am_test_sfptostr_OBJECTS = test_sfptostr-sfptostr.$(OBJEXT) \
+	test_sfptostr-run-sfptostr.$(OBJEXT) $(am__objects_1)
+test_sfptostr_OBJECTS = $(am_test_sfptostr_OBJECTS)
+test_sfptostr_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_sfptostr_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_sfptostr_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_socktoa_OBJECTS = test_socktoa-socktoa.$(OBJEXT) \
+	test_socktoa-run-socktoa.$(OBJEXT) $(am__objects_1)
+test_socktoa_OBJECTS = $(am_test_socktoa_OBJECTS)
+test_socktoa_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_socktoa_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_socktoa_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_ssl_init_OBJECTS = test_ssl_init-ssl_init.$(OBJEXT) \
+	test_ssl_init-run-ssl_init.$(OBJEXT) $(am__objects_1)
+test_ssl_init_OBJECTS = $(am_test_ssl_init_OBJECTS)
+test_ssl_init_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_ssl_init_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_ssl_init_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_statestr_OBJECTS = test_statestr-statestr.$(OBJEXT) \
+	test_statestr-run-statestr.$(OBJEXT) $(am__objects_1)
+test_statestr_OBJECTS = $(am_test_statestr_OBJECTS)
+test_statestr_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_statestr_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_statestr_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_strtolfp_OBJECTS = test_strtolfp-strtolfp.$(OBJEXT) \
+	test_strtolfp-run-strtolfp.$(OBJEXT) $(am__objects_1)
+test_strtolfp_OBJECTS = $(am_test_strtolfp_OBJECTS)
+test_strtolfp_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_strtolfp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_strtolfp_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_timespecops_OBJECTS = test_timespecops-timespecops.$(OBJEXT) \
+	test_timespecops-run-timespecops.$(OBJEXT) $(am__objects_1)
+test_timespecops_OBJECTS = $(am_test_timespecops_OBJECTS)
+test_timespecops_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_timespecops_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_timespecops_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_test_timevalops_OBJECTS = test_timevalops-timevalops.$(OBJEXT) \
+	test_timevalops-run-timevalops.$(OBJEXT) $(am__objects_1)
+test_timevalops_OBJECTS = $(am_test_timevalops_OBJECTS)
+test_timevalops_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_timevalops_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_timevalops_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_test_tstotv_OBJECTS = test_tstotv-tstotv.$(OBJEXT) \
+	test_tstotv-run-tstotv.$(OBJEXT) $(am__objects_1)
+test_tstotv_OBJECTS = $(am_test_tstotv_OBJECTS)
+test_tstotv_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1)
+test_tstotv_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_tstotv_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_tvtots_OBJECTS = test_tvtots-tvtots.$(OBJEXT) \
+	test_tvtots-run-tvtots.$(OBJEXT) $(am__objects_1)
+test_tvtots_OBJECTS = $(am_test_tvtots_OBJECTS)
+test_tvtots_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1)
+test_tvtots_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_tvtots_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_uglydate_OBJECTS = test_uglydate-uglydate.$(OBJEXT) \
+	test_uglydate-run-uglydate.$(OBJEXT) $(am__objects_1)
+test_uglydate_OBJECTS = $(am_test_uglydate_OBJECTS)
+test_uglydate_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_uglydate_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_uglydate_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_vi64ops_OBJECTS = test_vi64ops-vi64ops.$(OBJEXT) \
+	test_vi64ops-run-vi64ops.$(OBJEXT) $(am__objects_1)
+test_vi64ops_OBJECTS = $(am_test_vi64ops_OBJECTS)
+test_vi64ops_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_1)
+test_vi64ops_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_vi64ops_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_ymd2yd_OBJECTS = test_ymd2yd-ymd2yd.$(OBJEXT) \
+	test_ymd2yd-run-ymd2yd.$(OBJEXT) $(am__objects_1)
+test_ymd2yd_OBJECTS = $(am_test_ymd2yd_OBJECTS)
+test_ymd2yd_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1)
+test_ymd2yd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_ymd2yd_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_tests_OBJECTS = tests_main.$(OBJEXT) g_libntptest.$(OBJEXT) \
+	g_a_md5encrypt.$(OBJEXT) g_atoint.$(OBJEXT) \
+	g_atouint.$(OBJEXT) g_authkeys.$(OBJEXT) g_buftvtots.$(OBJEXT) \
+	g_calendar.$(OBJEXT) g_caljulian.$(OBJEXT) \
+	g_caltontp.$(OBJEXT) g_calyearstart.$(OBJEXT) \
+	g_clocktime.$(OBJEXT) g_decodenetnum.$(OBJEXT) \
+	g_hextoint.$(OBJEXT) g_hextolfp.$(OBJEXT) \
+	g_humandate.$(OBJEXT) g_lfpfunc.$(OBJEXT) g_lfptostr.$(OBJEXT) \
+	g_modetoa.$(OBJEXT) g_msyslog.$(OBJEXT) g_netof.$(OBJEXT) \
+	g_numtoa.$(OBJEXT) g_numtohost.$(OBJEXT) g_octtoint.$(OBJEXT) \
+	g_prettydate.$(OBJEXT) g_recvbuff.$(OBJEXT) \
+	g_refnumtoa.$(OBJEXT) g_sfptostr.$(OBJEXT) g_socktoa.$(OBJEXT) \
+	g_ssl_init.$(OBJEXT) g_statestr.$(OBJEXT) g_strtolfp.$(OBJEXT) \
+	g_timespecops.$(OBJEXT) g_timestructs.$(OBJEXT) \
+	g_timevalops.$(OBJEXT) g_tstotv.$(OBJEXT) g_tvtots.$(OBJEXT) \
+	g_uglydate.$(OBJEXT) g_vi64ops.$(OBJEXT) g_ymd2yd.$(OBJEXT) \
 	$(am__objects_1)
 tests_OBJECTS = $(am_tests_OBJECTS)
-tests_LDADD = $(LDADD)
-am__DEPENDENCIES_1 =
-tests_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+tests_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_$(V))
-am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_$(V))
-am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(tests_SOURCES)
-DIST_SOURCES = $(tests_SOURCES)
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(test_a_md5encrypt_SOURCES) $(test_atoint_SOURCES) \
+	$(test_atouint_SOURCES) $(test_authkeys_SOURCES) \
+	$(test_buftvtots_SOURCES) $(test_calendar_SOURCES) \
+	$(test_caljulian_SOURCES) $(test_caltontp_SOURCES) \
+	$(test_calyearstart_SOURCES) $(test_clocktime_SOURCES) \
+	$(test_decodenetnum_SOURCES) $(test_hextoint_SOURCES) \
+	$(test_hextolfp_SOURCES) $(test_humandate_SOURCES) \
+	$(test_lfpfunc_SOURCES) $(test_lfptostr_SOURCES) \
+	$(test_modetoa_SOURCES) $(test_msyslog_SOURCES) \
+	$(test_netof_SOURCES) $(test_numtoa_SOURCES) \
+	$(test_numtohost_SOURCES) $(test_octtoint_SOURCES) \
+	$(test_prettydate_SOURCES) $(test_recvbuff_SOURCES) \
+	$(test_refidsmear_SOURCES) $(test_refnumtoa_SOURCES) \
+	$(test_sfptostr_SOURCES) $(test_socktoa_SOURCES) \
+	$(test_ssl_init_SOURCES) $(test_statestr_SOURCES) \
+	$(test_strtolfp_SOURCES) $(test_timespecops_SOURCES) \
+	$(test_timevalops_SOURCES) $(test_tstotv_SOURCES) \
+	$(test_tvtots_SOURCES) $(test_uglydate_SOURCES) \
+	$(test_vi64ops_SOURCES) $(test_ymd2yd_SOURCES) \
+	$(tests_SOURCES)
+DIST_SOURCES = $(test_a_md5encrypt_SOURCES) $(test_atoint_SOURCES) \
+	$(test_atouint_SOURCES) $(test_authkeys_SOURCES) \
+	$(test_buftvtots_SOURCES) $(test_calendar_SOURCES) \
+	$(test_caljulian_SOURCES) $(test_caltontp_SOURCES) \
+	$(test_calyearstart_SOURCES) $(test_clocktime_SOURCES) \
+	$(test_decodenetnum_SOURCES) $(test_hextoint_SOURCES) \
+	$(test_hextolfp_SOURCES) $(test_humandate_SOURCES) \
+	$(test_lfpfunc_SOURCES) $(test_lfptostr_SOURCES) \
+	$(test_modetoa_SOURCES) $(test_msyslog_SOURCES) \
+	$(test_netof_SOURCES) $(test_numtoa_SOURCES) \
+	$(test_numtohost_SOURCES) $(test_octtoint_SOURCES) \
+	$(test_prettydate_SOURCES) $(test_recvbuff_SOURCES) \
+	$(test_refidsmear_SOURCES) $(test_refnumtoa_SOURCES) \
+	$(test_sfptostr_SOURCES) $(test_socktoa_SOURCES) \
+	$(test_ssl_init_SOURCES) $(test_statestr_SOURCES) \
+	$(test_strtolfp_SOURCES) $(test_timespecops_SOURCES) \
+	$(test_timevalops_SOURCES) $(test_tstotv_SOURCES) \
+	$(test_tvtots_SOURCES) $(test_uglydate_SOURCES) \
+	$(test_vi64ops_SOURCES) $(test_ymd2yd_SOURCES) \
+	$(tests_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
-@NTP_CROSSCOMPILE_FALSE@am__EXEEXT_1 = tests$(EXEEXT)
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \
+	$(top_srcdir)/includes.mf \
+	$(top_srcdir)/sntp/libevent/build-aux/depcomp \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -194,6 +887,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -310,6 +1004,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -407,70 +1102,690 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
-BUILT_SOURCES = check-libntp .deps-ver
-CLEANFILES = check-libntp .deps-ver
+BUILT_SOURCES = $(srcdir)/run-a_md5encrypt.c $(srcdir)/run-atoint.c \
+	$(srcdir)/run-atouint.c $(srcdir)/run-authkeys.c \
+	$(srcdir)/run-buftvtots.c $(srcdir)/run-calendar.c \
+	$(srcdir)/run-caljulian.c $(srcdir)/run-caltontp.c \
+	$(srcdir)/run-calyearstart.c $(srcdir)/run-clocktime.c \
+	$(srcdir)/run-decodenetnum.c $(srcdir)/run-hextoint.c \
+	$(srcdir)/run-hextolfp.c $(srcdir)/run-humandate.c \
+	$(srcdir)/run-lfpfunc.c $(srcdir)/run-lfptostr.c \
+	$(srcdir)/run-modetoa.c $(srcdir)/run-msyslog.c \
+	$(srcdir)/run-netof.c $(srcdir)/run-numtoa.c \
+	$(srcdir)/run-numtohost.c $(srcdir)/run-octtoint.c \
+	$(srcdir)/run-prettydate.c $(srcdir)/run-recvbuff.c \
+	$(srcdir)/run-refidsmear.c $(srcdir)/run-refnumtoa.c \
+	$(srcdir)/run-sfptostr.c $(srcdir)/run-socktoa.c \
+	$(srcdir)/run-ssl_init.c $(srcdir)/run-statestr.c \
+	$(srcdir)/run-strtolfp.c $(srcdir)/run-timevalops.c \
+	$(srcdir)/run-timespecops.c $(srcdir)/run-tstotv.c \
+	$(srcdir)/run-tvtots.c $(srcdir)/run-uglydate.c \
+	$(srcdir)/run-vi64ops.c $(srcdir)/run-ymd2yd.c $(NULL) \
+	check-libntp check-libunity .deps-ver
+CLEANFILES = check-libntp check-libunity .deps-ver
+run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
 LDADD = \
 	$(top_builddir)/libntp/libntp.a	\
 	$(LDADD_LIBNTP)			\
 	$(PTHREAD_LIBS)			\
 	$(LDADD_NTP)			\
+	$(LIBM)				\
+	$(NULL)
+
+tests_LDADD = \
+	$(LDADD)			\
 	$(GTEST_LDFLAGS)		\
 	$(GTEST_LIBS)			\
 	$(NULL)
 
+unity_tests_LDADD = \
+	$(LDADD)				\
+	$(top_builddir)/sntp/unity/libunity.a	\
+	$(NULL)
+
 AM_CFLAGS = $(CFLAGS_NTP)
 AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 AM_CPPFLAGS = $(NTP_INCS) -I$(top_srcdir)/sntp $(GTEST_CPPFLAGS) \
 	$(CPPFLAGS_NTP)
 AM_LDFLAGS = $(LDFLAGS_NTP)
-tests_SOURCES = $(top_srcdir)/sntp/tests_main.cpp	\
-		libntptest.cpp		\
-		a_md5encrypt.cpp	\
-		atoint.cpp		\
-		atouint.cpp		\
-		authkeys.cpp		\
-		buftvtots.cpp		\
-		calendar.cpp		\
-		caljulian.cpp		\
-		caltontp.cpp		\
-		calyearstart.cpp	\
-		clocktime.cpp		\
-		decodenetnum.cpp	\
-		hextoint.cpp		\
-		hextolfp.cpp		\
-		humandate.cpp		\
-		lfpfunc.cpp		\
-		lfptostr.cpp		\
-		modetoa.cpp		\
-		msyslog.cpp		\
-		netof.cpp		\
-		numtoa.cpp		\
-		numtohost.cpp		\
-		octtoint.cpp		\
-		prettydate.cpp		\
-		recvbuff.cpp		\
-		refnumtoa.cpp		\
-		sfptostr.cpp		\
-		socktoa.cpp		\
-		ssl_init.cpp		\
-		statestr.cpp		\
-		strtolfp.cpp		\
-		timespecops.cpp		\
-		timestructs.cpp		\
-		timevalops.cpp		\
-		tstotv.cpp		\
-		tvtots.cpp		\
-		uglydate.cpp		\
-		vi64ops.cpp		\
-		ymd2yd.cpp		\
-		$(NULL)
+tests_SOURCES = \
+	$(top_srcdir)/sntp/tests_main.cpp	\
+	g_libntptest.cpp	\
+	g_a_md5encrypt.cpp	\
+	g_atoint.cpp		\
+	g_atouint.cpp		\
+	g_authkeys.cpp		\
+	g_buftvtots.cpp		\
+	g_calendar.cpp		\
+	g_caljulian.cpp		\
+	g_caltontp.cpp		\
+	g_calyearstart.cpp	\
+	g_clocktime.cpp		\
+	g_decodenetnum.cpp	\
+	g_hextoint.cpp		\
+	g_hextolfp.cpp		\
+	g_humandate.cpp		\
+	g_lfpfunc.cpp		\
+	g_lfptostr.cpp		\
+	g_modetoa.cpp		\
+	g_msyslog.cpp		\
+	g_netof.cpp		\
+	g_numtoa.cpp		\
+	g_numtohost.cpp		\
+	g_octtoint.cpp		\
+	g_prettydate.cpp	\
+	g_recvbuff.cpp		\
+	g_refnumtoa.cpp		\
+	g_sfptostr.cpp		\
+	g_socktoa.cpp		\
+	g_ssl_init.cpp		\
+	g_statestr.cpp		\
+	g_strtolfp.cpp		\
+	g_timespecops.cpp	\
+	g_timestructs.cpp	\
+	g_timevalops.cpp	\
+	g_tstotv.cpp		\
+	g_tvtots.cpp		\
+	g_uglydate.cpp		\
+	g_vi64ops.cpp		\
+	g_ymd2yd.cpp		\
+	$(NULL)
 
-noinst_HEADERS = lfptest.h	\
-			libntptest.h	\
-			sockaddrtest.h	\
-			timestructs.h	\
-			$(NULL)
+noinst_HEADERS = \
+	g_lfptest.h	\
+	lfptest.h	\
+	g_libntptest.h	\
+	g_sockaddrtest.h	\
+	sockaddrtest.h	\
+	g_timestructs.h	\
+	test-libntp.h	\
+	$(NULL)
 
+
+###
+test_a_md5encrypt_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_a_md5encrypt_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_a_md5encrypt_SOURCES = \
+	a_md5encrypt.c			\
+	run-a_md5encrypt.c		\
+	$(NULL)
+
+
+###
+test_atoint_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_atoint_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_atoint_SOURCES = \
+	atoint.c			\
+	run-atoint.c			\
+	$(NULL)
+
+
+###
+test_atouint_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_atouint_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_atouint_SOURCES = \
+	atouint.c			\
+	run-atouint.c			\
+	$(NULL)
+
+
+###
+test_authkeys_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_authkeys_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_authkeys_SOURCES = \
+	authkeys.c			\
+	run-authkeys.c			\
+	$(NULL)
+
+
+###
+test_buftvtots_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_buftvtots_SOURCES = \
+	buftvtots.c			\
+	run-buftvtots.c			\
+	$(NULL)
+
+test_buftvtots_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	-DUNITY_INCLUDE_DOUBLE		\
+	$(NULL)
+
+
+###
+test_calendar_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_calendar_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_calendar_SOURCES = \
+	calendar.c			\
+	run-calendar.c			\
+	test-libntp.c			\
+	$(NULL)
+
+
+###
+test_caltontp_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_caltontp_LDADD = \
+	$(unity_tests_LDADD)		\
+	-lpthread			\
+	$(NULL)
+
+test_caltontp_SOURCES = \
+	caltontp.c			\
+	run-caltontp.c			\
+	$(NULL)
+
+
+###
+test_caljulian_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_caljulian_LDADD = \
+	$(unity_tests_LDADD)		\
+	-lpthread			\
+	$(NULL)
+
+test_caljulian_SOURCES = \
+	caljulian.c			\
+	run-caljulian.c			\
+	test-libntp.c			\
+	$(NULL)
+
+
+###
+test_calyearstart_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_calyearstart_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_calyearstart_SOURCES = \
+	calyearstart.c			\
+	run-calyearstart.c		\
+	test-libntp.c			\
+	$(NULL)
+
+
+###
+test_clocktime_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_clocktime_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_clocktime_SOURCES = \
+	clocktime.c			\
+	run-clocktime.c			\
+	test-libntp.c			\
+	$(NULL)
+
+
+###
+test_decodenetnum_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_decodenetnum_LDADD = \
+	$(unity_tests_LDADD)		\
+	-lpthread			\
+	$(NULL)
+
+test_decodenetnum_SOURCES = \
+	decodenetnum.c			\
+	run-decodenetnum.c		\
+	$(NULL)
+
+
+###
+test_hextoint_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_hextoint_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_hextoint_SOURCES = \
+	hextoint.c			\
+	run-hextoint.c			\
+	$(NULL)
+
+
+###
+test_hextolfp_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_hextolfp_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_hextolfp_SOURCES = \
+	hextolfp.c			\
+	run-hextolfp.c			\
+	$(NULL)
+
+
+###
+test_humandate_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_humandate_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_humandate_SOURCES = \
+	humandate.c			\
+	run-humandate.c			\
+	$(NULL)
+
+
+###
+test_lfpfunc_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	-DUNITY_INCLUDE_DOUBLE		\
+	$(NULL)
+
+test_lfpfunc_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_lfpfunc_SOURCES = \
+	lfpfunc.c			\
+	run-lfpfunc.c			\
+	$(NULL)
+
+
+###
+test_lfptostr_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_lfptostr_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_lfptostr_SOURCES = \
+	lfptostr.c			\
+	run-lfptostr.c			\
+	$(NULL)
+
+
+###
+test_modetoa_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_modetoa_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_modetoa_SOURCES = \
+	modetoa.c			\
+	run-modetoa.c			\
+	$(NULL)
+
+
+###
+test_msyslog_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_msyslog_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_msyslog_SOURCES = \
+	msyslog.c			\
+	run-msyslog.c			\
+	$(NULL)
+
+
+###
+test_netof_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_netof_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_netof_SOURCES = \
+	netof.c				\
+	run-netof.c			\
+	$(NULL)
+
+
+###
+test_numtoa_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_numtoa_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_numtoa_SOURCES = \
+	numtoa.c			\
+	run-numtoa.c			\
+	$(NULL)
+
+
+###
+test_numtohost_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_numtohost_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_numtohost_SOURCES = \
+	numtohost.c			\
+	run-numtohost.c			\
+	$(NULL)
+
+
+###
+test_octtoint_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_octtoint_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_octtoint_SOURCES = \
+	octtoint.c			\
+	run-octtoint.c			\
+	$(NULL)
+
+
+###
+test_prettydate_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_prettydate_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_prettydate_SOURCES = \
+	prettydate.c			\
+	run-prettydate.c		\
+	$(NULL)
+
+
+###
+test_recvbuff_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_recvbuff_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_recvbuff_SOURCES = \
+	recvbuff.c			\
+	run-recvbuff.c			\
+	$(NULL)
+
+
+###
+test_refidsmear_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_refidsmear_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_refidsmear_SOURCES = \
+	refidsmear.c			\
+	run-refidsmear.c		\
+	$(NULL)
+
+
+###
+test_refnumtoa_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity		\
+	$(NULL)
+
+test_refnumtoa_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_refnumtoa_SOURCES = \
+	refnumtoa.c			\
+	run-refnumtoa.c			\
+	$(NULL)
+
+
+###
+test_sfptostr_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	-DUNITY_INCLUDE_DOUBLE		\
+	$(NULL)
+
+test_sfptostr_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_sfptostr_SOURCES = \
+	sfptostr.c			\
+	run-sfptostr.c			\
+	$(NULL)
+
+
+###
+test_socktoa_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_socktoa_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_socktoa_SOURCES = \
+	socktoa.c			\
+	run-socktoa.c			\
+	$(NULL)
+
+
+###
+test_ssl_init_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_ssl_init_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_ssl_init_SOURCES = \
+	ssl_init.c			\
+	run-ssl_init.c			\
+	$(NULL)
+
+
+###
+test_statestr_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_statestr_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_statestr_SOURCES = \
+	statestr.c			\
+	run-statestr.c			\
+	$(NULL)
+
+
+###
+test_strtolfp_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_strtolfp_LDADD = \
+	$(unity_tests_LDADD)		\
+	-lpthread			\
+	$(NULL)
+
+test_strtolfp_SOURCES = \
+	strtolfp.c			\
+	run-strtolfp.c			\
+	$(NULL)
+
+
+###
+test_timespecops_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_timespecops_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_timespecops_SOURCES = \
+	timespecops.c			\
+	run-timespecops.c		\
+	$(NULL)
+
+
+###
+test_timevalops_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_timevalops_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_timevalops_SOURCES = \
+	timevalops.c			\
+	run-timevalops.c		\
+	$(NULL)
+
+
+###
+test_tstotv_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_tstotv_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_tstotv_SOURCES = \
+	tstotv.c			\
+	run-tstotv.c			\
+	$(NULL)
+
+
+###
+test_tvtots_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	-DUNITY_INCLUDE_DOUBLE		\
+	$(NULL)
+
+test_tvtots_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_tvtots_SOURCES = \
+	tvtots.c			\
+	run-tvtots.c			\
+	$(NULL)
+
+
+###
+test_uglydate_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_uglydate_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_uglydate_SOURCES = \
+	uglydate.c			\
+	run-uglydate.c			\
+	$(NULL)
+
+
+###
+test_vi64ops_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_vi64ops_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_vi64ops_SOURCES = \
+	vi64ops.c			\
+	run-vi64ops.c			\
+	$(NULL)
+
+
+###
+test_ymd2yd_CFLAGS = \
+	-I$(top_srcdir)/sntp/unity	\
+	$(NULL)
+
+test_ymd2yd_LDADD = \
+	$(unity_tests_LDADD)		\
+	$(NULL)
+
+test_ymd2yd_SOURCES = \
+	ymd2yd.c			\
+	run-ymd2yd.c			\
+	$(NULL)
+
+
+###
+TESTS = $(am__append_2)
 NTP_INCS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
 	-I$(top_srcdir)/lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include \
 	-I$(top_srcdir)/lib/isc/unix/include
@@ -478,7 +1793,7 @@ all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
+.SUFFIXES: .c .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -491,7 +1806,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_src
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/libntp/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign tests/libntp/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -500,6 +1814,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -518,7 +1833,160 @@ clean-checkPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-tests$(EXEEXT): $(tests_OBJECTS) $(tests_DEPENDENCIES) 
+
+test-a_md5encrypt$(EXEEXT): $(test_a_md5encrypt_OBJECTS) $(test_a_md5encrypt_DEPENDENCIES) $(EXTRA_test_a_md5encrypt_DEPENDENCIES) 
+	@rm -f test-a_md5encrypt$(EXEEXT)
+	$(AM_V_CCLD)$(test_a_md5encrypt_LINK) $(test_a_md5encrypt_OBJECTS) $(test_a_md5encrypt_LDADD) $(LIBS)
+
+test-atoint$(EXEEXT): $(test_atoint_OBJECTS) $(test_atoint_DEPENDENCIES) $(EXTRA_test_atoint_DEPENDENCIES) 
+	@rm -f test-atoint$(EXEEXT)
+	$(AM_V_CCLD)$(test_atoint_LINK) $(test_atoint_OBJECTS) $(test_atoint_LDADD) $(LIBS)
+
+test-atouint$(EXEEXT): $(test_atouint_OBJECTS) $(test_atouint_DEPENDENCIES) $(EXTRA_test_atouint_DEPENDENCIES) 
+	@rm -f test-atouint$(EXEEXT)
+	$(AM_V_CCLD)$(test_atouint_LINK) $(test_atouint_OBJECTS) $(test_atouint_LDADD) $(LIBS)
+
+test-authkeys$(EXEEXT): $(test_authkeys_OBJECTS) $(test_authkeys_DEPENDENCIES) $(EXTRA_test_authkeys_DEPENDENCIES) 
+	@rm -f test-authkeys$(EXEEXT)
+	$(AM_V_CCLD)$(test_authkeys_LINK) $(test_authkeys_OBJECTS) $(test_authkeys_LDADD) $(LIBS)
+
+test-buftvtots$(EXEEXT): $(test_buftvtots_OBJECTS) $(test_buftvtots_DEPENDENCIES) $(EXTRA_test_buftvtots_DEPENDENCIES) 
+	@rm -f test-buftvtots$(EXEEXT)
+	$(AM_V_CCLD)$(test_buftvtots_LINK) $(test_buftvtots_OBJECTS) $(test_buftvtots_LDADD) $(LIBS)
+
+test-calendar$(EXEEXT): $(test_calendar_OBJECTS) $(test_calendar_DEPENDENCIES) $(EXTRA_test_calendar_DEPENDENCIES) 
+	@rm -f test-calendar$(EXEEXT)
+	$(AM_V_CCLD)$(test_calendar_LINK) $(test_calendar_OBJECTS) $(test_calendar_LDADD) $(LIBS)
+
+test-caljulian$(EXEEXT): $(test_caljulian_OBJECTS) $(test_caljulian_DEPENDENCIES) $(EXTRA_test_caljulian_DEPENDENCIES) 
+	@rm -f test-caljulian$(EXEEXT)
+	$(AM_V_CCLD)$(test_caljulian_LINK) $(test_caljulian_OBJECTS) $(test_caljulian_LDADD) $(LIBS)
+
+test-caltontp$(EXEEXT): $(test_caltontp_OBJECTS) $(test_caltontp_DEPENDENCIES) $(EXTRA_test_caltontp_DEPENDENCIES) 
+	@rm -f test-caltontp$(EXEEXT)
+	$(AM_V_CCLD)$(test_caltontp_LINK) $(test_caltontp_OBJECTS) $(test_caltontp_LDADD) $(LIBS)
+
+test-calyearstart$(EXEEXT): $(test_calyearstart_OBJECTS) $(test_calyearstart_DEPENDENCIES) $(EXTRA_test_calyearstart_DEPENDENCIES) 
+	@rm -f test-calyearstart$(EXEEXT)
+	$(AM_V_CCLD)$(test_calyearstart_LINK) $(test_calyearstart_OBJECTS) $(test_calyearstart_LDADD) $(LIBS)
+
+test-clocktime$(EXEEXT): $(test_clocktime_OBJECTS) $(test_clocktime_DEPENDENCIES) $(EXTRA_test_clocktime_DEPENDENCIES) 
+	@rm -f test-clocktime$(EXEEXT)
+	$(AM_V_CCLD)$(test_clocktime_LINK) $(test_clocktime_OBJECTS) $(test_clocktime_LDADD) $(LIBS)
+
+test-decodenetnum$(EXEEXT): $(test_decodenetnum_OBJECTS) $(test_decodenetnum_DEPENDENCIES) $(EXTRA_test_decodenetnum_DEPENDENCIES) 
+	@rm -f test-decodenetnum$(EXEEXT)
+	$(AM_V_CCLD)$(test_decodenetnum_LINK) $(test_decodenetnum_OBJECTS) $(test_decodenetnum_LDADD) $(LIBS)
+
+test-hextoint$(EXEEXT): $(test_hextoint_OBJECTS) $(test_hextoint_DEPENDENCIES) $(EXTRA_test_hextoint_DEPENDENCIES) 
+	@rm -f test-hextoint$(EXEEXT)
+	$(AM_V_CCLD)$(test_hextoint_LINK) $(test_hextoint_OBJECTS) $(test_hextoint_LDADD) $(LIBS)
+
+test-hextolfp$(EXEEXT): $(test_hextolfp_OBJECTS) $(test_hextolfp_DEPENDENCIES) $(EXTRA_test_hextolfp_DEPENDENCIES) 
+	@rm -f test-hextolfp$(EXEEXT)
+	$(AM_V_CCLD)$(test_hextolfp_LINK) $(test_hextolfp_OBJECTS) $(test_hextolfp_LDADD) $(LIBS)
+
+test-humandate$(EXEEXT): $(test_humandate_OBJECTS) $(test_humandate_DEPENDENCIES) $(EXTRA_test_humandate_DEPENDENCIES) 
+	@rm -f test-humandate$(EXEEXT)
+	$(AM_V_CCLD)$(test_humandate_LINK) $(test_humandate_OBJECTS) $(test_humandate_LDADD) $(LIBS)
+
+test-lfpfunc$(EXEEXT): $(test_lfpfunc_OBJECTS) $(test_lfpfunc_DEPENDENCIES) $(EXTRA_test_lfpfunc_DEPENDENCIES) 
+	@rm -f test-lfpfunc$(EXEEXT)
+	$(AM_V_CCLD)$(test_lfpfunc_LINK) $(test_lfpfunc_OBJECTS) $(test_lfpfunc_LDADD) $(LIBS)
+
+test-lfptostr$(EXEEXT): $(test_lfptostr_OBJECTS) $(test_lfptostr_DEPENDENCIES) $(EXTRA_test_lfptostr_DEPENDENCIES) 
+	@rm -f test-lfptostr$(EXEEXT)
+	$(AM_V_CCLD)$(test_lfptostr_LINK) $(test_lfptostr_OBJECTS) $(test_lfptostr_LDADD) $(LIBS)
+
+test-modetoa$(EXEEXT): $(test_modetoa_OBJECTS) $(test_modetoa_DEPENDENCIES) $(EXTRA_test_modetoa_DEPENDENCIES) 
+	@rm -f test-modetoa$(EXEEXT)
+	$(AM_V_CCLD)$(test_modetoa_LINK) $(test_modetoa_OBJECTS) $(test_modetoa_LDADD) $(LIBS)
+
+test-msyslog$(EXEEXT): $(test_msyslog_OBJECTS) $(test_msyslog_DEPENDENCIES) $(EXTRA_test_msyslog_DEPENDENCIES) 
+	@rm -f test-msyslog$(EXEEXT)
+	$(AM_V_CCLD)$(test_msyslog_LINK) $(test_msyslog_OBJECTS) $(test_msyslog_LDADD) $(LIBS)
+
+test-netof$(EXEEXT): $(test_netof_OBJECTS) $(test_netof_DEPENDENCIES) $(EXTRA_test_netof_DEPENDENCIES) 
+	@rm -f test-netof$(EXEEXT)
+	$(AM_V_CCLD)$(test_netof_LINK) $(test_netof_OBJECTS) $(test_netof_LDADD) $(LIBS)
+
+test-numtoa$(EXEEXT): $(test_numtoa_OBJECTS) $(test_numtoa_DEPENDENCIES) $(EXTRA_test_numtoa_DEPENDENCIES) 
+	@rm -f test-numtoa$(EXEEXT)
+	$(AM_V_CCLD)$(test_numtoa_LINK) $(test_numtoa_OBJECTS) $(test_numtoa_LDADD) $(LIBS)
+
+test-numtohost$(EXEEXT): $(test_numtohost_OBJECTS) $(test_numtohost_DEPENDENCIES) $(EXTRA_test_numtohost_DEPENDENCIES) 
+	@rm -f test-numtohost$(EXEEXT)
+	$(AM_V_CCLD)$(test_numtohost_LINK) $(test_numtohost_OBJECTS) $(test_numtohost_LDADD) $(LIBS)
+
+test-octtoint$(EXEEXT): $(test_octtoint_OBJECTS) $(test_octtoint_DEPENDENCIES) $(EXTRA_test_octtoint_DEPENDENCIES) 
+	@rm -f test-octtoint$(EXEEXT)
+	$(AM_V_CCLD)$(test_octtoint_LINK) $(test_octtoint_OBJECTS) $(test_octtoint_LDADD) $(LIBS)
+
+test-prettydate$(EXEEXT): $(test_prettydate_OBJECTS) $(test_prettydate_DEPENDENCIES) $(EXTRA_test_prettydate_DEPENDENCIES) 
+	@rm -f test-prettydate$(EXEEXT)
+	$(AM_V_CCLD)$(test_prettydate_LINK) $(test_prettydate_OBJECTS) $(test_prettydate_LDADD) $(LIBS)
+
+test-recvbuff$(EXEEXT): $(test_recvbuff_OBJECTS) $(test_recvbuff_DEPENDENCIES) $(EXTRA_test_recvbuff_DEPENDENCIES) 
+	@rm -f test-recvbuff$(EXEEXT)
+	$(AM_V_CCLD)$(test_recvbuff_LINK) $(test_recvbuff_OBJECTS) $(test_recvbuff_LDADD) $(LIBS)
+
+test-refidsmear$(EXEEXT): $(test_refidsmear_OBJECTS) $(test_refidsmear_DEPENDENCIES) $(EXTRA_test_refidsmear_DEPENDENCIES) 
+	@rm -f test-refidsmear$(EXEEXT)
+	$(AM_V_CCLD)$(test_refidsmear_LINK) $(test_refidsmear_OBJECTS) $(test_refidsmear_LDADD) $(LIBS)
+
+test-refnumtoa$(EXEEXT): $(test_refnumtoa_OBJECTS) $(test_refnumtoa_DEPENDENCIES) $(EXTRA_test_refnumtoa_DEPENDENCIES) 
+	@rm -f test-refnumtoa$(EXEEXT)
+	$(AM_V_CCLD)$(test_refnumtoa_LINK) $(test_refnumtoa_OBJECTS) $(test_refnumtoa_LDADD) $(LIBS)
+
+test-sfptostr$(EXEEXT): $(test_sfptostr_OBJECTS) $(test_sfptostr_DEPENDENCIES) $(EXTRA_test_sfptostr_DEPENDENCIES) 
+	@rm -f test-sfptostr$(EXEEXT)
+	$(AM_V_CCLD)$(test_sfptostr_LINK) $(test_sfptostr_OBJECTS) $(test_sfptostr_LDADD) $(LIBS)
+
+test-socktoa$(EXEEXT): $(test_socktoa_OBJECTS) $(test_socktoa_DEPENDENCIES) $(EXTRA_test_socktoa_DEPENDENCIES) 
+	@rm -f test-socktoa$(EXEEXT)
+	$(AM_V_CCLD)$(test_socktoa_LINK) $(test_socktoa_OBJECTS) $(test_socktoa_LDADD) $(LIBS)
+
+test-ssl_init$(EXEEXT): $(test_ssl_init_OBJECTS) $(test_ssl_init_DEPENDENCIES) $(EXTRA_test_ssl_init_DEPENDENCIES) 
+	@rm -f test-ssl_init$(EXEEXT)
+	$(AM_V_CCLD)$(test_ssl_init_LINK) $(test_ssl_init_OBJECTS) $(test_ssl_init_LDADD) $(LIBS)
+
+test-statestr$(EXEEXT): $(test_statestr_OBJECTS) $(test_statestr_DEPENDENCIES) $(EXTRA_test_statestr_DEPENDENCIES) 
+	@rm -f test-statestr$(EXEEXT)
+	$(AM_V_CCLD)$(test_statestr_LINK) $(test_statestr_OBJECTS) $(test_statestr_LDADD) $(LIBS)
+
+test-strtolfp$(EXEEXT): $(test_strtolfp_OBJECTS) $(test_strtolfp_DEPENDENCIES) $(EXTRA_test_strtolfp_DEPENDENCIES) 
+	@rm -f test-strtolfp$(EXEEXT)
+	$(AM_V_CCLD)$(test_strtolfp_LINK) $(test_strtolfp_OBJECTS) $(test_strtolfp_LDADD) $(LIBS)
+
+test-timespecops$(EXEEXT): $(test_timespecops_OBJECTS) $(test_timespecops_DEPENDENCIES) $(EXTRA_test_timespecops_DEPENDENCIES) 
+	@rm -f test-timespecops$(EXEEXT)
+	$(AM_V_CCLD)$(test_timespecops_LINK) $(test_timespecops_OBJECTS) $(test_timespecops_LDADD) $(LIBS)
+
+test-timevalops$(EXEEXT): $(test_timevalops_OBJECTS) $(test_timevalops_DEPENDENCIES) $(EXTRA_test_timevalops_DEPENDENCIES) 
+	@rm -f test-timevalops$(EXEEXT)
+	$(AM_V_CCLD)$(test_timevalops_LINK) $(test_timevalops_OBJECTS) $(test_timevalops_LDADD) $(LIBS)
+
+test-tstotv$(EXEEXT): $(test_tstotv_OBJECTS) $(test_tstotv_DEPENDENCIES) $(EXTRA_test_tstotv_DEPENDENCIES) 
+	@rm -f test-tstotv$(EXEEXT)
+	$(AM_V_CCLD)$(test_tstotv_LINK) $(test_tstotv_OBJECTS) $(test_tstotv_LDADD) $(LIBS)
+
+test-tvtots$(EXEEXT): $(test_tvtots_OBJECTS) $(test_tvtots_DEPENDENCIES) $(EXTRA_test_tvtots_DEPENDENCIES) 
+	@rm -f test-tvtots$(EXEEXT)
+	$(AM_V_CCLD)$(test_tvtots_LINK) $(test_tvtots_OBJECTS) $(test_tvtots_LDADD) $(LIBS)
+
+test-uglydate$(EXEEXT): $(test_uglydate_OBJECTS) $(test_uglydate_DEPENDENCIES) $(EXTRA_test_uglydate_DEPENDENCIES) 
+	@rm -f test-uglydate$(EXEEXT)
+	$(AM_V_CCLD)$(test_uglydate_LINK) $(test_uglydate_OBJECTS) $(test_uglydate_LDADD) $(LIBS)
+
+test-vi64ops$(EXEEXT): $(test_vi64ops_OBJECTS) $(test_vi64ops_DEPENDENCIES) $(EXTRA_test_vi64ops_DEPENDENCIES) 
+	@rm -f test-vi64ops$(EXEEXT)
+	$(AM_V_CCLD)$(test_vi64ops_LINK) $(test_vi64ops_OBJECTS) $(test_vi64ops_LDADD) $(LIBS)
+
+test-ymd2yd$(EXEEXT): $(test_ymd2yd_OBJECTS) $(test_ymd2yd_DEPENDENCIES) $(EXTRA_test_ymd2yd_DEPENDENCIES) 
+	@rm -f test-ymd2yd$(EXEEXT)
+	$(AM_V_CCLD)$(test_ymd2yd_LINK) $(test_ymd2yd_OBJECTS) $(test_ymd2yd_LDADD) $(LIBS)
+
+tests$(EXEEXT): $(tests_OBJECTS) $(tests_DEPENDENCIES) $(EXTRA_tests_DEPENDENCIES) 
 	@rm -f tests$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(tests_OBJECTS) $(tests_LDADD) $(LIBS)
 
@@ -528,86 +1996,1302 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a_md5encrypt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atouint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authkeys.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buftvtots.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calendar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caljulian.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caltontp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calyearstart.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clocktime.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decodenetnum.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hextoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hextolfp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/humandate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lfpfunc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lfptostr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libntptest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetoa.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msyslog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netof.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/numtoa.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/numtohost.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/octtoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prettydate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recvbuff.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refnumtoa.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfptostr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socktoa.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl_init.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statestr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtolfp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_a_md5encrypt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_atoint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_atouint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_authkeys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_buftvtots.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_calendar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_caljulian.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_caltontp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_calyearstart.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_clocktime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_decodenetnum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_hextoint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_hextolfp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_humandate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_lfpfunc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_lfptostr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_libntptest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_modetoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_msyslog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_netof.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_numtoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_numtohost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_octtoint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_prettydate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_recvbuff.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_refnumtoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_sfptostr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_socktoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_ssl_init.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_statestr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_strtolfp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_timespecops.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_timestructs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_timevalops.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_tstotv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_tvtots.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_uglydate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_vi64ops.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_ymd2yd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_a_md5encrypt-a_md5encrypt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_a_md5encrypt-run-a_md5encrypt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_atoint-atoint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_atoint-run-atoint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_atouint-atouint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_atouint-run-atouint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_authkeys-authkeys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_authkeys-run-authkeys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_buftvtots-buftvtots.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_buftvtots-run-buftvtots.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_calendar-calendar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_calendar-run-calendar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_calendar-test-libntp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_caljulian-caljulian.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_caljulian-run-caljulian.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_caljulian-test-libntp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_caltontp-caltontp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_caltontp-run-caltontp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_calyearstart-calyearstart.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_calyearstart-run-calyearstart.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_calyearstart-test-libntp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_clocktime-clocktime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_clocktime-run-clocktime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_clocktime-test-libntp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_decodenetnum-decodenetnum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_decodenetnum-run-decodenetnum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hextoint-hextoint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hextoint-run-hextoint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hextolfp-hextolfp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hextolfp-run-hextolfp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_humandate-humandate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_humandate-run-humandate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_lfpfunc-lfpfunc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_lfpfunc-run-lfpfunc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_lfptostr-lfptostr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_lfptostr-run-lfptostr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_modetoa-modetoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_modetoa-run-modetoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_msyslog-msyslog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_msyslog-run-msyslog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_netof-netof.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_netof-run-netof.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_numtoa-numtoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_numtoa-run-numtoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_numtohost-numtohost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_numtohost-run-numtohost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_octtoint-octtoint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_octtoint-run-octtoint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_prettydate-prettydate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_prettydate-run-prettydate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_recvbuff-recvbuff.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_recvbuff-run-recvbuff.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_refidsmear-refidsmear.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_refidsmear-run-refidsmear.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_refnumtoa-refnumtoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_refnumtoa-run-refnumtoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_sfptostr-run-sfptostr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_sfptostr-sfptostr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_socktoa-run-socktoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_socktoa-socktoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ssl_init-run-ssl_init.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ssl_init-ssl_init.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_statestr-run-statestr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_statestr-statestr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_strtolfp-run-strtolfp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_strtolfp-strtolfp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_timespecops-run-timespecops.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_timespecops-timespecops.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_timevalops-run-timevalops.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_timevalops-timevalops.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tstotv-run-tstotv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tstotv-tstotv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tvtots-run-tvtots.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tvtots-tvtots.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_uglydate-run-uglydate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_uglydate-uglydate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_vi64ops-run-vi64ops.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_vi64ops-vi64ops.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ymd2yd-run-ymd2yd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ymd2yd-ymd2yd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timespecops.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timestructs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timevalops.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tstotv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tvtots.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uglydate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vi64ops.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ymd2yd.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+test_a_md5encrypt-a_md5encrypt.o: a_md5encrypt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_a_md5encrypt_CFLAGS) $(CFLAGS) -MT test_a_md5encrypt-a_md5encrypt.o -MD -MP -MF $(DEPDIR)/test_a_md5encrypt-a_md5encrypt.Tpo -c -o test_a_md5encrypt-a_md5encrypt.o `test -f 'a_md5encrypt.c' || echo '$(srcdir)/'`a_md5encrypt.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_a_md5encrypt-a_md5encrypt.Tpo $(DEPDIR)/test_a_md5encrypt-a_md5encrypt.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='a_md5encrypt.c' object='test_a_md5encrypt-a_md5encrypt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_a_md5encrypt_CFLAGS) $(CFLAGS) -c -o test_a_md5encrypt-a_md5encrypt.o `test -f 'a_md5encrypt.c' || echo '$(srcdir)/'`a_md5encrypt.c
+
+test_a_md5encrypt-a_md5encrypt.obj: a_md5encrypt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_a_md5encrypt_CFLAGS) $(CFLAGS) -MT test_a_md5encrypt-a_md5encrypt.obj -MD -MP -MF $(DEPDIR)/test_a_md5encrypt-a_md5encrypt.Tpo -c -o test_a_md5encrypt-a_md5encrypt.obj `if test -f 'a_md5encrypt.c'; then $(CYGPATH_W) 'a_md5encrypt.c'; else $(CYGPATH_W) '$(srcdir)/a_md5encrypt.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_a_md5encrypt-a_md5encrypt.Tpo $(DEPDIR)/test_a_md5encrypt-a_md5encrypt.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='a_md5encrypt.c' object='test_a_md5encrypt-a_md5encrypt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_a_md5encrypt_CFLAGS) $(CFLAGS) -c -o test_a_md5encrypt-a_md5encrypt.obj `if test -f 'a_md5encrypt.c'; then $(CYGPATH_W) 'a_md5encrypt.c'; else $(CYGPATH_W) '$(srcdir)/a_md5encrypt.c'; fi`
+
+test_a_md5encrypt-run-a_md5encrypt.o: run-a_md5encrypt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_a_md5encrypt_CFLAGS) $(CFLAGS) -MT test_a_md5encrypt-run-a_md5encrypt.o -MD -MP -MF $(DEPDIR)/test_a_md5encrypt-run-a_md5encrypt.Tpo -c -o test_a_md5encrypt-run-a_md5encrypt.o `test -f 'run-a_md5encrypt.c' || echo '$(srcdir)/'`run-a_md5encrypt.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_a_md5encrypt-run-a_md5encrypt.Tpo $(DEPDIR)/test_a_md5encrypt-run-a_md5encrypt.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-a_md5encrypt.c' object='test_a_md5encrypt-run-a_md5encrypt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_a_md5encrypt_CFLAGS) $(CFLAGS) -c -o test_a_md5encrypt-run-a_md5encrypt.o `test -f 'run-a_md5encrypt.c' || echo '$(srcdir)/'`run-a_md5encrypt.c
+
+test_a_md5encrypt-run-a_md5encrypt.obj: run-a_md5encrypt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_a_md5encrypt_CFLAGS) $(CFLAGS) -MT test_a_md5encrypt-run-a_md5encrypt.obj -MD -MP -MF $(DEPDIR)/test_a_md5encrypt-run-a_md5encrypt.Tpo -c -o test_a_md5encrypt-run-a_md5encrypt.obj `if test -f 'run-a_md5encrypt.c'; then $(CYGPATH_W) 'run-a_md5encrypt.c'; else $(CYGPATH_W) '$(srcdir)/run-a_md5encrypt.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_a_md5encrypt-run-a_md5encrypt.Tpo $(DEPDIR)/test_a_md5encrypt-run-a_md5encrypt.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-a_md5encrypt.c' object='test_a_md5encrypt-run-a_md5encrypt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_a_md5encrypt_CFLAGS) $(CFLAGS) -c -o test_a_md5encrypt-run-a_md5encrypt.obj `if test -f 'run-a_md5encrypt.c'; then $(CYGPATH_W) 'run-a_md5encrypt.c'; else $(CYGPATH_W) '$(srcdir)/run-a_md5encrypt.c'; fi`
+
+test_atoint-atoint.o: atoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoint_CFLAGS) $(CFLAGS) -MT test_atoint-atoint.o -MD -MP -MF $(DEPDIR)/test_atoint-atoint.Tpo -c -o test_atoint-atoint.o `test -f 'atoint.c' || echo '$(srcdir)/'`atoint.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_atoint-atoint.Tpo $(DEPDIR)/test_atoint-atoint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoint.c' object='test_atoint-atoint.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoint_CFLAGS) $(CFLAGS) -c -o test_atoint-atoint.o `test -f 'atoint.c' || echo '$(srcdir)/'`atoint.c
+
+test_atoint-atoint.obj: atoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoint_CFLAGS) $(CFLAGS) -MT test_atoint-atoint.obj -MD -MP -MF $(DEPDIR)/test_atoint-atoint.Tpo -c -o test_atoint-atoint.obj `if test -f 'atoint.c'; then $(CYGPATH_W) 'atoint.c'; else $(CYGPATH_W) '$(srcdir)/atoint.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_atoint-atoint.Tpo $(DEPDIR)/test_atoint-atoint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoint.c' object='test_atoint-atoint.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoint_CFLAGS) $(CFLAGS) -c -o test_atoint-atoint.obj `if test -f 'atoint.c'; then $(CYGPATH_W) 'atoint.c'; else $(CYGPATH_W) '$(srcdir)/atoint.c'; fi`
+
+test_atoint-run-atoint.o: run-atoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoint_CFLAGS) $(CFLAGS) -MT test_atoint-run-atoint.o -MD -MP -MF $(DEPDIR)/test_atoint-run-atoint.Tpo -c -o test_atoint-run-atoint.o `test -f 'run-atoint.c' || echo '$(srcdir)/'`run-atoint.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_atoint-run-atoint.Tpo $(DEPDIR)/test_atoint-run-atoint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-atoint.c' object='test_atoint-run-atoint.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoint_CFLAGS) $(CFLAGS) -c -o test_atoint-run-atoint.o `test -f 'run-atoint.c' || echo '$(srcdir)/'`run-atoint.c
+
+test_atoint-run-atoint.obj: run-atoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoint_CFLAGS) $(CFLAGS) -MT test_atoint-run-atoint.obj -MD -MP -MF $(DEPDIR)/test_atoint-run-atoint.Tpo -c -o test_atoint-run-atoint.obj `if test -f 'run-atoint.c'; then $(CYGPATH_W) 'run-atoint.c'; else $(CYGPATH_W) '$(srcdir)/run-atoint.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_atoint-run-atoint.Tpo $(DEPDIR)/test_atoint-run-atoint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-atoint.c' object='test_atoint-run-atoint.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoint_CFLAGS) $(CFLAGS) -c -o test_atoint-run-atoint.obj `if test -f 'run-atoint.c'; then $(CYGPATH_W) 'run-atoint.c'; else $(CYGPATH_W) '$(srcdir)/run-atoint.c'; fi`
+
+test_atouint-atouint.o: atouint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atouint_CFLAGS) $(CFLAGS) -MT test_atouint-atouint.o -MD -MP -MF $(DEPDIR)/test_atouint-atouint.Tpo -c -o test_atouint-atouint.o `test -f 'atouint.c' || echo '$(srcdir)/'`atouint.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_atouint-atouint.Tpo $(DEPDIR)/test_atouint-atouint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atouint.c' object='test_atouint-atouint.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atouint_CFLAGS) $(CFLAGS) -c -o test_atouint-atouint.o `test -f 'atouint.c' || echo '$(srcdir)/'`atouint.c
+
+test_atouint-atouint.obj: atouint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atouint_CFLAGS) $(CFLAGS) -MT test_atouint-atouint.obj -MD -MP -MF $(DEPDIR)/test_atouint-atouint.Tpo -c -o test_atouint-atouint.obj `if test -f 'atouint.c'; then $(CYGPATH_W) 'atouint.c'; else $(CYGPATH_W) '$(srcdir)/atouint.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_atouint-atouint.Tpo $(DEPDIR)/test_atouint-atouint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atouint.c' object='test_atouint-atouint.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atouint_CFLAGS) $(CFLAGS) -c -o test_atouint-atouint.obj `if test -f 'atouint.c'; then $(CYGPATH_W) 'atouint.c'; else $(CYGPATH_W) '$(srcdir)/atouint.c'; fi`
+
+test_atouint-run-atouint.o: run-atouint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atouint_CFLAGS) $(CFLAGS) -MT test_atouint-run-atouint.o -MD -MP -MF $(DEPDIR)/test_atouint-run-atouint.Tpo -c -o test_atouint-run-atouint.o `test -f 'run-atouint.c' || echo '$(srcdir)/'`run-atouint.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_atouint-run-atouint.Tpo $(DEPDIR)/test_atouint-run-atouint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-atouint.c' object='test_atouint-run-atouint.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atouint_CFLAGS) $(CFLAGS) -c -o test_atouint-run-atouint.o `test -f 'run-atouint.c' || echo '$(srcdir)/'`run-atouint.c
+
+test_atouint-run-atouint.obj: run-atouint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atouint_CFLAGS) $(CFLAGS) -MT test_atouint-run-atouint.obj -MD -MP -MF $(DEPDIR)/test_atouint-run-atouint.Tpo -c -o test_atouint-run-atouint.obj `if test -f 'run-atouint.c'; then $(CYGPATH_W) 'run-atouint.c'; else $(CYGPATH_W) '$(srcdir)/run-atouint.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_atouint-run-atouint.Tpo $(DEPDIR)/test_atouint-run-atouint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-atouint.c' object='test_atouint-run-atouint.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atouint_CFLAGS) $(CFLAGS) -c -o test_atouint-run-atouint.obj `if test -f 'run-atouint.c'; then $(CYGPATH_W) 'run-atouint.c'; else $(CYGPATH_W) '$(srcdir)/run-atouint.c'; fi`
+
+test_authkeys-authkeys.o: authkeys.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_authkeys_CFLAGS) $(CFLAGS) -MT test_authkeys-authkeys.o -MD -MP -MF $(DEPDIR)/test_authkeys-authkeys.Tpo -c -o test_authkeys-authkeys.o `test -f 'authkeys.c' || echo '$(srcdir)/'`authkeys.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_authkeys-authkeys.Tpo $(DEPDIR)/test_authkeys-authkeys.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='authkeys.c' object='test_authkeys-authkeys.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_authkeys_CFLAGS) $(CFLAGS) -c -o test_authkeys-authkeys.o `test -f 'authkeys.c' || echo '$(srcdir)/'`authkeys.c
+
+test_authkeys-authkeys.obj: authkeys.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_authkeys_CFLAGS) $(CFLAGS) -MT test_authkeys-authkeys.obj -MD -MP -MF $(DEPDIR)/test_authkeys-authkeys.Tpo -c -o test_authkeys-authkeys.obj `if test -f 'authkeys.c'; then $(CYGPATH_W) 'authkeys.c'; else $(CYGPATH_W) '$(srcdir)/authkeys.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_authkeys-authkeys.Tpo $(DEPDIR)/test_authkeys-authkeys.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='authkeys.c' object='test_authkeys-authkeys.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_authkeys_CFLAGS) $(CFLAGS) -c -o test_authkeys-authkeys.obj `if test -f 'authkeys.c'; then $(CYGPATH_W) 'authkeys.c'; else $(CYGPATH_W) '$(srcdir)/authkeys.c'; fi`
+
+test_authkeys-run-authkeys.o: run-authkeys.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_authkeys_CFLAGS) $(CFLAGS) -MT test_authkeys-run-authkeys.o -MD -MP -MF $(DEPDIR)/test_authkeys-run-authkeys.Tpo -c -o test_authkeys-run-authkeys.o `test -f 'run-authkeys.c' || echo '$(srcdir)/'`run-authkeys.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_authkeys-run-authkeys.Tpo $(DEPDIR)/test_authkeys-run-authkeys.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-authkeys.c' object='test_authkeys-run-authkeys.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_authkeys_CFLAGS) $(CFLAGS) -c -o test_authkeys-run-authkeys.o `test -f 'run-authkeys.c' || echo '$(srcdir)/'`run-authkeys.c
+
+test_authkeys-run-authkeys.obj: run-authkeys.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_authkeys_CFLAGS) $(CFLAGS) -MT test_authkeys-run-authkeys.obj -MD -MP -MF $(DEPDIR)/test_authkeys-run-authkeys.Tpo -c -o test_authkeys-run-authkeys.obj `if test -f 'run-authkeys.c'; then $(CYGPATH_W) 'run-authkeys.c'; else $(CYGPATH_W) '$(srcdir)/run-authkeys.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_authkeys-run-authkeys.Tpo $(DEPDIR)/test_authkeys-run-authkeys.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-authkeys.c' object='test_authkeys-run-authkeys.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_authkeys_CFLAGS) $(CFLAGS) -c -o test_authkeys-run-authkeys.obj `if test -f 'run-authkeys.c'; then $(CYGPATH_W) 'run-authkeys.c'; else $(CYGPATH_W) '$(srcdir)/run-authkeys.c'; fi`
+
+test_buftvtots-buftvtots.o: buftvtots.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_buftvtots_CFLAGS) $(CFLAGS) -MT test_buftvtots-buftvtots.o -MD -MP -MF $(DEPDIR)/test_buftvtots-buftvtots.Tpo -c -o test_buftvtots-buftvtots.o `test -f 'buftvtots.c' || echo '$(srcdir)/'`buftvtots.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_buftvtots-buftvtots.Tpo $(DEPDIR)/test_buftvtots-buftvtots.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='buftvtots.c' object='test_buftvtots-buftvtots.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_buftvtots_CFLAGS) $(CFLAGS) -c -o test_buftvtots-buftvtots.o `test -f 'buftvtots.c' || echo '$(srcdir)/'`buftvtots.c
+
+test_buftvtots-buftvtots.obj: buftvtots.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_buftvtots_CFLAGS) $(CFLAGS) -MT test_buftvtots-buftvtots.obj -MD -MP -MF $(DEPDIR)/test_buftvtots-buftvtots.Tpo -c -o test_buftvtots-buftvtots.obj `if test -f 'buftvtots.c'; then $(CYGPATH_W) 'buftvtots.c'; else $(CYGPATH_W) '$(srcdir)/buftvtots.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_buftvtots-buftvtots.Tpo $(DEPDIR)/test_buftvtots-buftvtots.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='buftvtots.c' object='test_buftvtots-buftvtots.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_buftvtots_CFLAGS) $(CFLAGS) -c -o test_buftvtots-buftvtots.obj `if test -f 'buftvtots.c'; then $(CYGPATH_W) 'buftvtots.c'; else $(CYGPATH_W) '$(srcdir)/buftvtots.c'; fi`
+
+test_buftvtots-run-buftvtots.o: run-buftvtots.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_buftvtots_CFLAGS) $(CFLAGS) -MT test_buftvtots-run-buftvtots.o -MD -MP -MF $(DEPDIR)/test_buftvtots-run-buftvtots.Tpo -c -o test_buftvtots-run-buftvtots.o `test -f 'run-buftvtots.c' || echo '$(srcdir)/'`run-buftvtots.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_buftvtots-run-buftvtots.Tpo $(DEPDIR)/test_buftvtots-run-buftvtots.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-buftvtots.c' object='test_buftvtots-run-buftvtots.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_buftvtots_CFLAGS) $(CFLAGS) -c -o test_buftvtots-run-buftvtots.o `test -f 'run-buftvtots.c' || echo '$(srcdir)/'`run-buftvtots.c
+
+test_buftvtots-run-buftvtots.obj: run-buftvtots.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_buftvtots_CFLAGS) $(CFLAGS) -MT test_buftvtots-run-buftvtots.obj -MD -MP -MF $(DEPDIR)/test_buftvtots-run-buftvtots.Tpo -c -o test_buftvtots-run-buftvtots.obj `if test -f 'run-buftvtots.c'; then $(CYGPATH_W) 'run-buftvtots.c'; else $(CYGPATH_W) '$(srcdir)/run-buftvtots.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_buftvtots-run-buftvtots.Tpo $(DEPDIR)/test_buftvtots-run-buftvtots.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-buftvtots.c' object='test_buftvtots-run-buftvtots.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_buftvtots_CFLAGS) $(CFLAGS) -c -o test_buftvtots-run-buftvtots.obj `if test -f 'run-buftvtots.c'; then $(CYGPATH_W) 'run-buftvtots.c'; else $(CYGPATH_W) '$(srcdir)/run-buftvtots.c'; fi`
+
+test_calendar-calendar.o: calendar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calendar_CFLAGS) $(CFLAGS) -MT test_calendar-calendar.o -MD -MP -MF $(DEPDIR)/test_calendar-calendar.Tpo -c -o test_calendar-calendar.o `test -f 'calendar.c' || echo '$(srcdir)/'`calendar.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_calendar-calendar.Tpo $(DEPDIR)/test_calendar-calendar.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='calendar.c' object='test_calendar-calendar.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calendar_CFLAGS) $(CFLAGS) -c -o test_calendar-calendar.o `test -f 'calendar.c' || echo '$(srcdir)/'`calendar.c
+
+test_calendar-calendar.obj: calendar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calendar_CFLAGS) $(CFLAGS) -MT test_calendar-calendar.obj -MD -MP -MF $(DEPDIR)/test_calendar-calendar.Tpo -c -o test_calendar-calendar.obj `if test -f 'calendar.c'; then $(CYGPATH_W) 'calendar.c'; else $(CYGPATH_W) '$(srcdir)/calendar.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_calendar-calendar.Tpo $(DEPDIR)/test_calendar-calendar.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='calendar.c' object='test_calendar-calendar.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calendar_CFLAGS) $(CFLAGS) -c -o test_calendar-calendar.obj `if test -f 'calendar.c'; then $(CYGPATH_W) 'calendar.c'; else $(CYGPATH_W) '$(srcdir)/calendar.c'; fi`
+
+test_calendar-run-calendar.o: run-calendar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calendar_CFLAGS) $(CFLAGS) -MT test_calendar-run-calendar.o -MD -MP -MF $(DEPDIR)/test_calendar-run-calendar.Tpo -c -o test_calendar-run-calendar.o `test -f 'run-calendar.c' || echo '$(srcdir)/'`run-calendar.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_calendar-run-calendar.Tpo $(DEPDIR)/test_calendar-run-calendar.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-calendar.c' object='test_calendar-run-calendar.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calendar_CFLAGS) $(CFLAGS) -c -o test_calendar-run-calendar.o `test -f 'run-calendar.c' || echo '$(srcdir)/'`run-calendar.c
+
+test_calendar-run-calendar.obj: run-calendar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calendar_CFLAGS) $(CFLAGS) -MT test_calendar-run-calendar.obj -MD -MP -MF $(DEPDIR)/test_calendar-run-calendar.Tpo -c -o test_calendar-run-calendar.obj `if test -f 'run-calendar.c'; then $(CYGPATH_W) 'run-calendar.c'; else $(CYGPATH_W) '$(srcdir)/run-calendar.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_calendar-run-calendar.Tpo $(DEPDIR)/test_calendar-run-calendar.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-calendar.c' object='test_calendar-run-calendar.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calendar_CFLAGS) $(CFLAGS) -c -o test_calendar-run-calendar.obj `if test -f 'run-calendar.c'; then $(CYGPATH_W) 'run-calendar.c'; else $(CYGPATH_W) '$(srcdir)/run-calendar.c'; fi`
+
+test_calendar-test-libntp.o: test-libntp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calendar_CFLAGS) $(CFLAGS) -MT test_calendar-test-libntp.o -MD -MP -MF $(DEPDIR)/test_calendar-test-libntp.Tpo -c -o test_calendar-test-libntp.o `test -f 'test-libntp.c' || echo '$(srcdir)/'`test-libntp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_calendar-test-libntp.Tpo $(DEPDIR)/test_calendar-test-libntp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-libntp.c' object='test_calendar-test-libntp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calendar_CFLAGS) $(CFLAGS) -c -o test_calendar-test-libntp.o `test -f 'test-libntp.c' || echo '$(srcdir)/'`test-libntp.c
+
+test_calendar-test-libntp.obj: test-libntp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calendar_CFLAGS) $(CFLAGS) -MT test_calendar-test-libntp.obj -MD -MP -MF $(DEPDIR)/test_calendar-test-libntp.Tpo -c -o test_calendar-test-libntp.obj `if test -f 'test-libntp.c'; then $(CYGPATH_W) 'test-libntp.c'; else $(CYGPATH_W) '$(srcdir)/test-libntp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_calendar-test-libntp.Tpo $(DEPDIR)/test_calendar-test-libntp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-libntp.c' object='test_calendar-test-libntp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calendar_CFLAGS) $(CFLAGS) -c -o test_calendar-test-libntp.obj `if test -f 'test-libntp.c'; then $(CYGPATH_W) 'test-libntp.c'; else $(CYGPATH_W) '$(srcdir)/test-libntp.c'; fi`
+
+test_caljulian-caljulian.o: caljulian.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caljulian_CFLAGS) $(CFLAGS) -MT test_caljulian-caljulian.o -MD -MP -MF $(DEPDIR)/test_caljulian-caljulian.Tpo -c -o test_caljulian-caljulian.o `test -f 'caljulian.c' || echo '$(srcdir)/'`caljulian.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_caljulian-caljulian.Tpo $(DEPDIR)/test_caljulian-caljulian.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='caljulian.c' object='test_caljulian-caljulian.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caljulian_CFLAGS) $(CFLAGS) -c -o test_caljulian-caljulian.o `test -f 'caljulian.c' || echo '$(srcdir)/'`caljulian.c
+
+test_caljulian-caljulian.obj: caljulian.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caljulian_CFLAGS) $(CFLAGS) -MT test_caljulian-caljulian.obj -MD -MP -MF $(DEPDIR)/test_caljulian-caljulian.Tpo -c -o test_caljulian-caljulian.obj `if test -f 'caljulian.c'; then $(CYGPATH_W) 'caljulian.c'; else $(CYGPATH_W) '$(srcdir)/caljulian.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_caljulian-caljulian.Tpo $(DEPDIR)/test_caljulian-caljulian.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='caljulian.c' object='test_caljulian-caljulian.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caljulian_CFLAGS) $(CFLAGS) -c -o test_caljulian-caljulian.obj `if test -f 'caljulian.c'; then $(CYGPATH_W) 'caljulian.c'; else $(CYGPATH_W) '$(srcdir)/caljulian.c'; fi`
+
+test_caljulian-run-caljulian.o: run-caljulian.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caljulian_CFLAGS) $(CFLAGS) -MT test_caljulian-run-caljulian.o -MD -MP -MF $(DEPDIR)/test_caljulian-run-caljulian.Tpo -c -o test_caljulian-run-caljulian.o `test -f 'run-caljulian.c' || echo '$(srcdir)/'`run-caljulian.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_caljulian-run-caljulian.Tpo $(DEPDIR)/test_caljulian-run-caljulian.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-caljulian.c' object='test_caljulian-run-caljulian.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caljulian_CFLAGS) $(CFLAGS) -c -o test_caljulian-run-caljulian.o `test -f 'run-caljulian.c' || echo '$(srcdir)/'`run-caljulian.c
+
+test_caljulian-run-caljulian.obj: run-caljulian.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caljulian_CFLAGS) $(CFLAGS) -MT test_caljulian-run-caljulian.obj -MD -MP -MF $(DEPDIR)/test_caljulian-run-caljulian.Tpo -c -o test_caljulian-run-caljulian.obj `if test -f 'run-caljulian.c'; then $(CYGPATH_W) 'run-caljulian.c'; else $(CYGPATH_W) '$(srcdir)/run-caljulian.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_caljulian-run-caljulian.Tpo $(DEPDIR)/test_caljulian-run-caljulian.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-caljulian.c' object='test_caljulian-run-caljulian.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caljulian_CFLAGS) $(CFLAGS) -c -o test_caljulian-run-caljulian.obj `if test -f 'run-caljulian.c'; then $(CYGPATH_W) 'run-caljulian.c'; else $(CYGPATH_W) '$(srcdir)/run-caljulian.c'; fi`
+
+test_caljulian-test-libntp.o: test-libntp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caljulian_CFLAGS) $(CFLAGS) -MT test_caljulian-test-libntp.o -MD -MP -MF $(DEPDIR)/test_caljulian-test-libntp.Tpo -c -o test_caljulian-test-libntp.o `test -f 'test-libntp.c' || echo '$(srcdir)/'`test-libntp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_caljulian-test-libntp.Tpo $(DEPDIR)/test_caljulian-test-libntp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-libntp.c' object='test_caljulian-test-libntp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caljulian_CFLAGS) $(CFLAGS) -c -o test_caljulian-test-libntp.o `test -f 'test-libntp.c' || echo '$(srcdir)/'`test-libntp.c
+
+test_caljulian-test-libntp.obj: test-libntp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caljulian_CFLAGS) $(CFLAGS) -MT test_caljulian-test-libntp.obj -MD -MP -MF $(DEPDIR)/test_caljulian-test-libntp.Tpo -c -o test_caljulian-test-libntp.obj `if test -f 'test-libntp.c'; then $(CYGPATH_W) 'test-libntp.c'; else $(CYGPATH_W) '$(srcdir)/test-libntp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_caljulian-test-libntp.Tpo $(DEPDIR)/test_caljulian-test-libntp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-libntp.c' object='test_caljulian-test-libntp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caljulian_CFLAGS) $(CFLAGS) -c -o test_caljulian-test-libntp.obj `if test -f 'test-libntp.c'; then $(CYGPATH_W) 'test-libntp.c'; else $(CYGPATH_W) '$(srcdir)/test-libntp.c'; fi`
+
+test_caltontp-caltontp.o: caltontp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caltontp_CFLAGS) $(CFLAGS) -MT test_caltontp-caltontp.o -MD -MP -MF $(DEPDIR)/test_caltontp-caltontp.Tpo -c -o test_caltontp-caltontp.o `test -f 'caltontp.c' || echo '$(srcdir)/'`caltontp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_caltontp-caltontp.Tpo $(DEPDIR)/test_caltontp-caltontp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='caltontp.c' object='test_caltontp-caltontp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caltontp_CFLAGS) $(CFLAGS) -c -o test_caltontp-caltontp.o `test -f 'caltontp.c' || echo '$(srcdir)/'`caltontp.c
+
+test_caltontp-caltontp.obj: caltontp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caltontp_CFLAGS) $(CFLAGS) -MT test_caltontp-caltontp.obj -MD -MP -MF $(DEPDIR)/test_caltontp-caltontp.Tpo -c -o test_caltontp-caltontp.obj `if test -f 'caltontp.c'; then $(CYGPATH_W) 'caltontp.c'; else $(CYGPATH_W) '$(srcdir)/caltontp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_caltontp-caltontp.Tpo $(DEPDIR)/test_caltontp-caltontp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='caltontp.c' object='test_caltontp-caltontp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caltontp_CFLAGS) $(CFLAGS) -c -o test_caltontp-caltontp.obj `if test -f 'caltontp.c'; then $(CYGPATH_W) 'caltontp.c'; else $(CYGPATH_W) '$(srcdir)/caltontp.c'; fi`
+
+test_caltontp-run-caltontp.o: run-caltontp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caltontp_CFLAGS) $(CFLAGS) -MT test_caltontp-run-caltontp.o -MD -MP -MF $(DEPDIR)/test_caltontp-run-caltontp.Tpo -c -o test_caltontp-run-caltontp.o `test -f 'run-caltontp.c' || echo '$(srcdir)/'`run-caltontp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_caltontp-run-caltontp.Tpo $(DEPDIR)/test_caltontp-run-caltontp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-caltontp.c' object='test_caltontp-run-caltontp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caltontp_CFLAGS) $(CFLAGS) -c -o test_caltontp-run-caltontp.o `test -f 'run-caltontp.c' || echo '$(srcdir)/'`run-caltontp.c
+
+test_caltontp-run-caltontp.obj: run-caltontp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caltontp_CFLAGS) $(CFLAGS) -MT test_caltontp-run-caltontp.obj -MD -MP -MF $(DEPDIR)/test_caltontp-run-caltontp.Tpo -c -o test_caltontp-run-caltontp.obj `if test -f 'run-caltontp.c'; then $(CYGPATH_W) 'run-caltontp.c'; else $(CYGPATH_W) '$(srcdir)/run-caltontp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_caltontp-run-caltontp.Tpo $(DEPDIR)/test_caltontp-run-caltontp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-caltontp.c' object='test_caltontp-run-caltontp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_caltontp_CFLAGS) $(CFLAGS) -c -o test_caltontp-run-caltontp.obj `if test -f 'run-caltontp.c'; then $(CYGPATH_W) 'run-caltontp.c'; else $(CYGPATH_W) '$(srcdir)/run-caltontp.c'; fi`
+
+test_calyearstart-calyearstart.o: calyearstart.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calyearstart_CFLAGS) $(CFLAGS) -MT test_calyearstart-calyearstart.o -MD -MP -MF $(DEPDIR)/test_calyearstart-calyearstart.Tpo -c -o test_calyearstart-calyearstart.o `test -f 'calyearstart.c' || echo '$(srcdir)/'`calyearstart.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_calyearstart-calyearstart.Tpo $(DEPDIR)/test_calyearstart-calyearstart.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='calyearstart.c' object='test_calyearstart-calyearstart.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calyearstart_CFLAGS) $(CFLAGS) -c -o test_calyearstart-calyearstart.o `test -f 'calyearstart.c' || echo '$(srcdir)/'`calyearstart.c
+
+test_calyearstart-calyearstart.obj: calyearstart.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calyearstart_CFLAGS) $(CFLAGS) -MT test_calyearstart-calyearstart.obj -MD -MP -MF $(DEPDIR)/test_calyearstart-calyearstart.Tpo -c -o test_calyearstart-calyearstart.obj `if test -f 'calyearstart.c'; then $(CYGPATH_W) 'calyearstart.c'; else $(CYGPATH_W) '$(srcdir)/calyearstart.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_calyearstart-calyearstart.Tpo $(DEPDIR)/test_calyearstart-calyearstart.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='calyearstart.c' object='test_calyearstart-calyearstart.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calyearstart_CFLAGS) $(CFLAGS) -c -o test_calyearstart-calyearstart.obj `if test -f 'calyearstart.c'; then $(CYGPATH_W) 'calyearstart.c'; else $(CYGPATH_W) '$(srcdir)/calyearstart.c'; fi`
+
+test_calyearstart-run-calyearstart.o: run-calyearstart.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calyearstart_CFLAGS) $(CFLAGS) -MT test_calyearstart-run-calyearstart.o -MD -MP -MF $(DEPDIR)/test_calyearstart-run-calyearstart.Tpo -c -o test_calyearstart-run-calyearstart.o `test -f 'run-calyearstart.c' || echo '$(srcdir)/'`run-calyearstart.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_calyearstart-run-calyearstart.Tpo $(DEPDIR)/test_calyearstart-run-calyearstart.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-calyearstart.c' object='test_calyearstart-run-calyearstart.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calyearstart_CFLAGS) $(CFLAGS) -c -o test_calyearstart-run-calyearstart.o `test -f 'run-calyearstart.c' || echo '$(srcdir)/'`run-calyearstart.c
+
+test_calyearstart-run-calyearstart.obj: run-calyearstart.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calyearstart_CFLAGS) $(CFLAGS) -MT test_calyearstart-run-calyearstart.obj -MD -MP -MF $(DEPDIR)/test_calyearstart-run-calyearstart.Tpo -c -o test_calyearstart-run-calyearstart.obj `if test -f 'run-calyearstart.c'; then $(CYGPATH_W) 'run-calyearstart.c'; else $(CYGPATH_W) '$(srcdir)/run-calyearstart.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_calyearstart-run-calyearstart.Tpo $(DEPDIR)/test_calyearstart-run-calyearstart.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-calyearstart.c' object='test_calyearstart-run-calyearstart.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calyearstart_CFLAGS) $(CFLAGS) -c -o test_calyearstart-run-calyearstart.obj `if test -f 'run-calyearstart.c'; then $(CYGPATH_W) 'run-calyearstart.c'; else $(CYGPATH_W) '$(srcdir)/run-calyearstart.c'; fi`
+
+test_calyearstart-test-libntp.o: test-libntp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calyearstart_CFLAGS) $(CFLAGS) -MT test_calyearstart-test-libntp.o -MD -MP -MF $(DEPDIR)/test_calyearstart-test-libntp.Tpo -c -o test_calyearstart-test-libntp.o `test -f 'test-libntp.c' || echo '$(srcdir)/'`test-libntp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_calyearstart-test-libntp.Tpo $(DEPDIR)/test_calyearstart-test-libntp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-libntp.c' object='test_calyearstart-test-libntp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calyearstart_CFLAGS) $(CFLAGS) -c -o test_calyearstart-test-libntp.o `test -f 'test-libntp.c' || echo '$(srcdir)/'`test-libntp.c
+
+test_calyearstart-test-libntp.obj: test-libntp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calyearstart_CFLAGS) $(CFLAGS) -MT test_calyearstart-test-libntp.obj -MD -MP -MF $(DEPDIR)/test_calyearstart-test-libntp.Tpo -c -o test_calyearstart-test-libntp.obj `if test -f 'test-libntp.c'; then $(CYGPATH_W) 'test-libntp.c'; else $(CYGPATH_W) '$(srcdir)/test-libntp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_calyearstart-test-libntp.Tpo $(DEPDIR)/test_calyearstart-test-libntp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-libntp.c' object='test_calyearstart-test-libntp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_calyearstart_CFLAGS) $(CFLAGS) -c -o test_calyearstart-test-libntp.obj `if test -f 'test-libntp.c'; then $(CYGPATH_W) 'test-libntp.c'; else $(CYGPATH_W) '$(srcdir)/test-libntp.c'; fi`
+
+test_clocktime-clocktime.o: clocktime.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_clocktime_CFLAGS) $(CFLAGS) -MT test_clocktime-clocktime.o -MD -MP -MF $(DEPDIR)/test_clocktime-clocktime.Tpo -c -o test_clocktime-clocktime.o `test -f 'clocktime.c' || echo '$(srcdir)/'`clocktime.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_clocktime-clocktime.Tpo $(DEPDIR)/test_clocktime-clocktime.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clocktime.c' object='test_clocktime-clocktime.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_clocktime_CFLAGS) $(CFLAGS) -c -o test_clocktime-clocktime.o `test -f 'clocktime.c' || echo '$(srcdir)/'`clocktime.c
+
+test_clocktime-clocktime.obj: clocktime.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_clocktime_CFLAGS) $(CFLAGS) -MT test_clocktime-clocktime.obj -MD -MP -MF $(DEPDIR)/test_clocktime-clocktime.Tpo -c -o test_clocktime-clocktime.obj `if test -f 'clocktime.c'; then $(CYGPATH_W) 'clocktime.c'; else $(CYGPATH_W) '$(srcdir)/clocktime.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_clocktime-clocktime.Tpo $(DEPDIR)/test_clocktime-clocktime.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clocktime.c' object='test_clocktime-clocktime.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_clocktime_CFLAGS) $(CFLAGS) -c -o test_clocktime-clocktime.obj `if test -f 'clocktime.c'; then $(CYGPATH_W) 'clocktime.c'; else $(CYGPATH_W) '$(srcdir)/clocktime.c'; fi`
+
+test_clocktime-run-clocktime.o: run-clocktime.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_clocktime_CFLAGS) $(CFLAGS) -MT test_clocktime-run-clocktime.o -MD -MP -MF $(DEPDIR)/test_clocktime-run-clocktime.Tpo -c -o test_clocktime-run-clocktime.o `test -f 'run-clocktime.c' || echo '$(srcdir)/'`run-clocktime.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_clocktime-run-clocktime.Tpo $(DEPDIR)/test_clocktime-run-clocktime.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-clocktime.c' object='test_clocktime-run-clocktime.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_clocktime_CFLAGS) $(CFLAGS) -c -o test_clocktime-run-clocktime.o `test -f 'run-clocktime.c' || echo '$(srcdir)/'`run-clocktime.c
+
+test_clocktime-run-clocktime.obj: run-clocktime.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_clocktime_CFLAGS) $(CFLAGS) -MT test_clocktime-run-clocktime.obj -MD -MP -MF $(DEPDIR)/test_clocktime-run-clocktime.Tpo -c -o test_clocktime-run-clocktime.obj `if test -f 'run-clocktime.c'; then $(CYGPATH_W) 'run-clocktime.c'; else $(CYGPATH_W) '$(srcdir)/run-clocktime.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_clocktime-run-clocktime.Tpo $(DEPDIR)/test_clocktime-run-clocktime.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-clocktime.c' object='test_clocktime-run-clocktime.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_clocktime_CFLAGS) $(CFLAGS) -c -o test_clocktime-run-clocktime.obj `if test -f 'run-clocktime.c'; then $(CYGPATH_W) 'run-clocktime.c'; else $(CYGPATH_W) '$(srcdir)/run-clocktime.c'; fi`
+
+test_clocktime-test-libntp.o: test-libntp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_clocktime_CFLAGS) $(CFLAGS) -MT test_clocktime-test-libntp.o -MD -MP -MF $(DEPDIR)/test_clocktime-test-libntp.Tpo -c -o test_clocktime-test-libntp.o `test -f 'test-libntp.c' || echo '$(srcdir)/'`test-libntp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_clocktime-test-libntp.Tpo $(DEPDIR)/test_clocktime-test-libntp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-libntp.c' object='test_clocktime-test-libntp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_clocktime_CFLAGS) $(CFLAGS) -c -o test_clocktime-test-libntp.o `test -f 'test-libntp.c' || echo '$(srcdir)/'`test-libntp.c
+
+test_clocktime-test-libntp.obj: test-libntp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_clocktime_CFLAGS) $(CFLAGS) -MT test_clocktime-test-libntp.obj -MD -MP -MF $(DEPDIR)/test_clocktime-test-libntp.Tpo -c -o test_clocktime-test-libntp.obj `if test -f 'test-libntp.c'; then $(CYGPATH_W) 'test-libntp.c'; else $(CYGPATH_W) '$(srcdir)/test-libntp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_clocktime-test-libntp.Tpo $(DEPDIR)/test_clocktime-test-libntp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-libntp.c' object='test_clocktime-test-libntp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_clocktime_CFLAGS) $(CFLAGS) -c -o test_clocktime-test-libntp.obj `if test -f 'test-libntp.c'; then $(CYGPATH_W) 'test-libntp.c'; else $(CYGPATH_W) '$(srcdir)/test-libntp.c'; fi`
+
+test_decodenetnum-decodenetnum.o: decodenetnum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_decodenetnum_CFLAGS) $(CFLAGS) -MT test_decodenetnum-decodenetnum.o -MD -MP -MF $(DEPDIR)/test_decodenetnum-decodenetnum.Tpo -c -o test_decodenetnum-decodenetnum.o `test -f 'decodenetnum.c' || echo '$(srcdir)/'`decodenetnum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_decodenetnum-decodenetnum.Tpo $(DEPDIR)/test_decodenetnum-decodenetnum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='decodenetnum.c' object='test_decodenetnum-decodenetnum.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_decodenetnum_CFLAGS) $(CFLAGS) -c -o test_decodenetnum-decodenetnum.o `test -f 'decodenetnum.c' || echo '$(srcdir)/'`decodenetnum.c
+
+test_decodenetnum-decodenetnum.obj: decodenetnum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_decodenetnum_CFLAGS) $(CFLAGS) -MT test_decodenetnum-decodenetnum.obj -MD -MP -MF $(DEPDIR)/test_decodenetnum-decodenetnum.Tpo -c -o test_decodenetnum-decodenetnum.obj `if test -f 'decodenetnum.c'; then $(CYGPATH_W) 'decodenetnum.c'; else $(CYGPATH_W) '$(srcdir)/decodenetnum.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_decodenetnum-decodenetnum.Tpo $(DEPDIR)/test_decodenetnum-decodenetnum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='decodenetnum.c' object='test_decodenetnum-decodenetnum.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_decodenetnum_CFLAGS) $(CFLAGS) -c -o test_decodenetnum-decodenetnum.obj `if test -f 'decodenetnum.c'; then $(CYGPATH_W) 'decodenetnum.c'; else $(CYGPATH_W) '$(srcdir)/decodenetnum.c'; fi`
+
+test_decodenetnum-run-decodenetnum.o: run-decodenetnum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_decodenetnum_CFLAGS) $(CFLAGS) -MT test_decodenetnum-run-decodenetnum.o -MD -MP -MF $(DEPDIR)/test_decodenetnum-run-decodenetnum.Tpo -c -o test_decodenetnum-run-decodenetnum.o `test -f 'run-decodenetnum.c' || echo '$(srcdir)/'`run-decodenetnum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_decodenetnum-run-decodenetnum.Tpo $(DEPDIR)/test_decodenetnum-run-decodenetnum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-decodenetnum.c' object='test_decodenetnum-run-decodenetnum.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_decodenetnum_CFLAGS) $(CFLAGS) -c -o test_decodenetnum-run-decodenetnum.o `test -f 'run-decodenetnum.c' || echo '$(srcdir)/'`run-decodenetnum.c
+
+test_decodenetnum-run-decodenetnum.obj: run-decodenetnum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_decodenetnum_CFLAGS) $(CFLAGS) -MT test_decodenetnum-run-decodenetnum.obj -MD -MP -MF $(DEPDIR)/test_decodenetnum-run-decodenetnum.Tpo -c -o test_decodenetnum-run-decodenetnum.obj `if test -f 'run-decodenetnum.c'; then $(CYGPATH_W) 'run-decodenetnum.c'; else $(CYGPATH_W) '$(srcdir)/run-decodenetnum.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_decodenetnum-run-decodenetnum.Tpo $(DEPDIR)/test_decodenetnum-run-decodenetnum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-decodenetnum.c' object='test_decodenetnum-run-decodenetnum.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_decodenetnum_CFLAGS) $(CFLAGS) -c -o test_decodenetnum-run-decodenetnum.obj `if test -f 'run-decodenetnum.c'; then $(CYGPATH_W) 'run-decodenetnum.c'; else $(CYGPATH_W) '$(srcdir)/run-decodenetnum.c'; fi`
+
+test_hextoint-hextoint.o: hextoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextoint_CFLAGS) $(CFLAGS) -MT test_hextoint-hextoint.o -MD -MP -MF $(DEPDIR)/test_hextoint-hextoint.Tpo -c -o test_hextoint-hextoint.o `test -f 'hextoint.c' || echo '$(srcdir)/'`hextoint.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_hextoint-hextoint.Tpo $(DEPDIR)/test_hextoint-hextoint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hextoint.c' object='test_hextoint-hextoint.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextoint_CFLAGS) $(CFLAGS) -c -o test_hextoint-hextoint.o `test -f 'hextoint.c' || echo '$(srcdir)/'`hextoint.c
+
+test_hextoint-hextoint.obj: hextoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextoint_CFLAGS) $(CFLAGS) -MT test_hextoint-hextoint.obj -MD -MP -MF $(DEPDIR)/test_hextoint-hextoint.Tpo -c -o test_hextoint-hextoint.obj `if test -f 'hextoint.c'; then $(CYGPATH_W) 'hextoint.c'; else $(CYGPATH_W) '$(srcdir)/hextoint.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_hextoint-hextoint.Tpo $(DEPDIR)/test_hextoint-hextoint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hextoint.c' object='test_hextoint-hextoint.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextoint_CFLAGS) $(CFLAGS) -c -o test_hextoint-hextoint.obj `if test -f 'hextoint.c'; then $(CYGPATH_W) 'hextoint.c'; else $(CYGPATH_W) '$(srcdir)/hextoint.c'; fi`
+
+test_hextoint-run-hextoint.o: run-hextoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextoint_CFLAGS) $(CFLAGS) -MT test_hextoint-run-hextoint.o -MD -MP -MF $(DEPDIR)/test_hextoint-run-hextoint.Tpo -c -o test_hextoint-run-hextoint.o `test -f 'run-hextoint.c' || echo '$(srcdir)/'`run-hextoint.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_hextoint-run-hextoint.Tpo $(DEPDIR)/test_hextoint-run-hextoint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-hextoint.c' object='test_hextoint-run-hextoint.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextoint_CFLAGS) $(CFLAGS) -c -o test_hextoint-run-hextoint.o `test -f 'run-hextoint.c' || echo '$(srcdir)/'`run-hextoint.c
+
+test_hextoint-run-hextoint.obj: run-hextoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextoint_CFLAGS) $(CFLAGS) -MT test_hextoint-run-hextoint.obj -MD -MP -MF $(DEPDIR)/test_hextoint-run-hextoint.Tpo -c -o test_hextoint-run-hextoint.obj `if test -f 'run-hextoint.c'; then $(CYGPATH_W) 'run-hextoint.c'; else $(CYGPATH_W) '$(srcdir)/run-hextoint.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_hextoint-run-hextoint.Tpo $(DEPDIR)/test_hextoint-run-hextoint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-hextoint.c' object='test_hextoint-run-hextoint.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextoint_CFLAGS) $(CFLAGS) -c -o test_hextoint-run-hextoint.obj `if test -f 'run-hextoint.c'; then $(CYGPATH_W) 'run-hextoint.c'; else $(CYGPATH_W) '$(srcdir)/run-hextoint.c'; fi`
+
+test_hextolfp-hextolfp.o: hextolfp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextolfp_CFLAGS) $(CFLAGS) -MT test_hextolfp-hextolfp.o -MD -MP -MF $(DEPDIR)/test_hextolfp-hextolfp.Tpo -c -o test_hextolfp-hextolfp.o `test -f 'hextolfp.c' || echo '$(srcdir)/'`hextolfp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_hextolfp-hextolfp.Tpo $(DEPDIR)/test_hextolfp-hextolfp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hextolfp.c' object='test_hextolfp-hextolfp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextolfp_CFLAGS) $(CFLAGS) -c -o test_hextolfp-hextolfp.o `test -f 'hextolfp.c' || echo '$(srcdir)/'`hextolfp.c
+
+test_hextolfp-hextolfp.obj: hextolfp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextolfp_CFLAGS) $(CFLAGS) -MT test_hextolfp-hextolfp.obj -MD -MP -MF $(DEPDIR)/test_hextolfp-hextolfp.Tpo -c -o test_hextolfp-hextolfp.obj `if test -f 'hextolfp.c'; then $(CYGPATH_W) 'hextolfp.c'; else $(CYGPATH_W) '$(srcdir)/hextolfp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_hextolfp-hextolfp.Tpo $(DEPDIR)/test_hextolfp-hextolfp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hextolfp.c' object='test_hextolfp-hextolfp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextolfp_CFLAGS) $(CFLAGS) -c -o test_hextolfp-hextolfp.obj `if test -f 'hextolfp.c'; then $(CYGPATH_W) 'hextolfp.c'; else $(CYGPATH_W) '$(srcdir)/hextolfp.c'; fi`
+
+test_hextolfp-run-hextolfp.o: run-hextolfp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextolfp_CFLAGS) $(CFLAGS) -MT test_hextolfp-run-hextolfp.o -MD -MP -MF $(DEPDIR)/test_hextolfp-run-hextolfp.Tpo -c -o test_hextolfp-run-hextolfp.o `test -f 'run-hextolfp.c' || echo '$(srcdir)/'`run-hextolfp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_hextolfp-run-hextolfp.Tpo $(DEPDIR)/test_hextolfp-run-hextolfp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-hextolfp.c' object='test_hextolfp-run-hextolfp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextolfp_CFLAGS) $(CFLAGS) -c -o test_hextolfp-run-hextolfp.o `test -f 'run-hextolfp.c' || echo '$(srcdir)/'`run-hextolfp.c
+
+test_hextolfp-run-hextolfp.obj: run-hextolfp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextolfp_CFLAGS) $(CFLAGS) -MT test_hextolfp-run-hextolfp.obj -MD -MP -MF $(DEPDIR)/test_hextolfp-run-hextolfp.Tpo -c -o test_hextolfp-run-hextolfp.obj `if test -f 'run-hextolfp.c'; then $(CYGPATH_W) 'run-hextolfp.c'; else $(CYGPATH_W) '$(srcdir)/run-hextolfp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_hextolfp-run-hextolfp.Tpo $(DEPDIR)/test_hextolfp-run-hextolfp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-hextolfp.c' object='test_hextolfp-run-hextolfp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hextolfp_CFLAGS) $(CFLAGS) -c -o test_hextolfp-run-hextolfp.obj `if test -f 'run-hextolfp.c'; then $(CYGPATH_W) 'run-hextolfp.c'; else $(CYGPATH_W) '$(srcdir)/run-hextolfp.c'; fi`
+
+test_humandate-humandate.o: humandate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_humandate_CFLAGS) $(CFLAGS) -MT test_humandate-humandate.o -MD -MP -MF $(DEPDIR)/test_humandate-humandate.Tpo -c -o test_humandate-humandate.o `test -f 'humandate.c' || echo '$(srcdir)/'`humandate.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_humandate-humandate.Tpo $(DEPDIR)/test_humandate-humandate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='humandate.c' object='test_humandate-humandate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_humandate_CFLAGS) $(CFLAGS) -c -o test_humandate-humandate.o `test -f 'humandate.c' || echo '$(srcdir)/'`humandate.c
+
+test_humandate-humandate.obj: humandate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_humandate_CFLAGS) $(CFLAGS) -MT test_humandate-humandate.obj -MD -MP -MF $(DEPDIR)/test_humandate-humandate.Tpo -c -o test_humandate-humandate.obj `if test -f 'humandate.c'; then $(CYGPATH_W) 'humandate.c'; else $(CYGPATH_W) '$(srcdir)/humandate.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_humandate-humandate.Tpo $(DEPDIR)/test_humandate-humandate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='humandate.c' object='test_humandate-humandate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_humandate_CFLAGS) $(CFLAGS) -c -o test_humandate-humandate.obj `if test -f 'humandate.c'; then $(CYGPATH_W) 'humandate.c'; else $(CYGPATH_W) '$(srcdir)/humandate.c'; fi`
+
+test_humandate-run-humandate.o: run-humandate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_humandate_CFLAGS) $(CFLAGS) -MT test_humandate-run-humandate.o -MD -MP -MF $(DEPDIR)/test_humandate-run-humandate.Tpo -c -o test_humandate-run-humandate.o `test -f 'run-humandate.c' || echo '$(srcdir)/'`run-humandate.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_humandate-run-humandate.Tpo $(DEPDIR)/test_humandate-run-humandate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-humandate.c' object='test_humandate-run-humandate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_humandate_CFLAGS) $(CFLAGS) -c -o test_humandate-run-humandate.o `test -f 'run-humandate.c' || echo '$(srcdir)/'`run-humandate.c
+
+test_humandate-run-humandate.obj: run-humandate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_humandate_CFLAGS) $(CFLAGS) -MT test_humandate-run-humandate.obj -MD -MP -MF $(DEPDIR)/test_humandate-run-humandate.Tpo -c -o test_humandate-run-humandate.obj `if test -f 'run-humandate.c'; then $(CYGPATH_W) 'run-humandate.c'; else $(CYGPATH_W) '$(srcdir)/run-humandate.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_humandate-run-humandate.Tpo $(DEPDIR)/test_humandate-run-humandate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-humandate.c' object='test_humandate-run-humandate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_humandate_CFLAGS) $(CFLAGS) -c -o test_humandate-run-humandate.obj `if test -f 'run-humandate.c'; then $(CYGPATH_W) 'run-humandate.c'; else $(CYGPATH_W) '$(srcdir)/run-humandate.c'; fi`
+
+test_lfpfunc-lfpfunc.o: lfpfunc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfpfunc_CFLAGS) $(CFLAGS) -MT test_lfpfunc-lfpfunc.o -MD -MP -MF $(DEPDIR)/test_lfpfunc-lfpfunc.Tpo -c -o test_lfpfunc-lfpfunc.o `test -f 'lfpfunc.c' || echo '$(srcdir)/'`lfpfunc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_lfpfunc-lfpfunc.Tpo $(DEPDIR)/test_lfpfunc-lfpfunc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lfpfunc.c' object='test_lfpfunc-lfpfunc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfpfunc_CFLAGS) $(CFLAGS) -c -o test_lfpfunc-lfpfunc.o `test -f 'lfpfunc.c' || echo '$(srcdir)/'`lfpfunc.c
+
+test_lfpfunc-lfpfunc.obj: lfpfunc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfpfunc_CFLAGS) $(CFLAGS) -MT test_lfpfunc-lfpfunc.obj -MD -MP -MF $(DEPDIR)/test_lfpfunc-lfpfunc.Tpo -c -o test_lfpfunc-lfpfunc.obj `if test -f 'lfpfunc.c'; then $(CYGPATH_W) 'lfpfunc.c'; else $(CYGPATH_W) '$(srcdir)/lfpfunc.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_lfpfunc-lfpfunc.Tpo $(DEPDIR)/test_lfpfunc-lfpfunc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lfpfunc.c' object='test_lfpfunc-lfpfunc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfpfunc_CFLAGS) $(CFLAGS) -c -o test_lfpfunc-lfpfunc.obj `if test -f 'lfpfunc.c'; then $(CYGPATH_W) 'lfpfunc.c'; else $(CYGPATH_W) '$(srcdir)/lfpfunc.c'; fi`
+
+test_lfpfunc-run-lfpfunc.o: run-lfpfunc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfpfunc_CFLAGS) $(CFLAGS) -MT test_lfpfunc-run-lfpfunc.o -MD -MP -MF $(DEPDIR)/test_lfpfunc-run-lfpfunc.Tpo -c -o test_lfpfunc-run-lfpfunc.o `test -f 'run-lfpfunc.c' || echo '$(srcdir)/'`run-lfpfunc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_lfpfunc-run-lfpfunc.Tpo $(DEPDIR)/test_lfpfunc-run-lfpfunc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-lfpfunc.c' object='test_lfpfunc-run-lfpfunc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfpfunc_CFLAGS) $(CFLAGS) -c -o test_lfpfunc-run-lfpfunc.o `test -f 'run-lfpfunc.c' || echo '$(srcdir)/'`run-lfpfunc.c
+
+test_lfpfunc-run-lfpfunc.obj: run-lfpfunc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfpfunc_CFLAGS) $(CFLAGS) -MT test_lfpfunc-run-lfpfunc.obj -MD -MP -MF $(DEPDIR)/test_lfpfunc-run-lfpfunc.Tpo -c -o test_lfpfunc-run-lfpfunc.obj `if test -f 'run-lfpfunc.c'; then $(CYGPATH_W) 'run-lfpfunc.c'; else $(CYGPATH_W) '$(srcdir)/run-lfpfunc.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_lfpfunc-run-lfpfunc.Tpo $(DEPDIR)/test_lfpfunc-run-lfpfunc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-lfpfunc.c' object='test_lfpfunc-run-lfpfunc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfpfunc_CFLAGS) $(CFLAGS) -c -o test_lfpfunc-run-lfpfunc.obj `if test -f 'run-lfpfunc.c'; then $(CYGPATH_W) 'run-lfpfunc.c'; else $(CYGPATH_W) '$(srcdir)/run-lfpfunc.c'; fi`
+
+test_lfptostr-lfptostr.o: lfptostr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfptostr_CFLAGS) $(CFLAGS) -MT test_lfptostr-lfptostr.o -MD -MP -MF $(DEPDIR)/test_lfptostr-lfptostr.Tpo -c -o test_lfptostr-lfptostr.o `test -f 'lfptostr.c' || echo '$(srcdir)/'`lfptostr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_lfptostr-lfptostr.Tpo $(DEPDIR)/test_lfptostr-lfptostr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lfptostr.c' object='test_lfptostr-lfptostr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfptostr_CFLAGS) $(CFLAGS) -c -o test_lfptostr-lfptostr.o `test -f 'lfptostr.c' || echo '$(srcdir)/'`lfptostr.c
+
+test_lfptostr-lfptostr.obj: lfptostr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfptostr_CFLAGS) $(CFLAGS) -MT test_lfptostr-lfptostr.obj -MD -MP -MF $(DEPDIR)/test_lfptostr-lfptostr.Tpo -c -o test_lfptostr-lfptostr.obj `if test -f 'lfptostr.c'; then $(CYGPATH_W) 'lfptostr.c'; else $(CYGPATH_W) '$(srcdir)/lfptostr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_lfptostr-lfptostr.Tpo $(DEPDIR)/test_lfptostr-lfptostr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lfptostr.c' object='test_lfptostr-lfptostr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfptostr_CFLAGS) $(CFLAGS) -c -o test_lfptostr-lfptostr.obj `if test -f 'lfptostr.c'; then $(CYGPATH_W) 'lfptostr.c'; else $(CYGPATH_W) '$(srcdir)/lfptostr.c'; fi`
+
+test_lfptostr-run-lfptostr.o: run-lfptostr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfptostr_CFLAGS) $(CFLAGS) -MT test_lfptostr-run-lfptostr.o -MD -MP -MF $(DEPDIR)/test_lfptostr-run-lfptostr.Tpo -c -o test_lfptostr-run-lfptostr.o `test -f 'run-lfptostr.c' || echo '$(srcdir)/'`run-lfptostr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_lfptostr-run-lfptostr.Tpo $(DEPDIR)/test_lfptostr-run-lfptostr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-lfptostr.c' object='test_lfptostr-run-lfptostr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfptostr_CFLAGS) $(CFLAGS) -c -o test_lfptostr-run-lfptostr.o `test -f 'run-lfptostr.c' || echo '$(srcdir)/'`run-lfptostr.c
+
+test_lfptostr-run-lfptostr.obj: run-lfptostr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfptostr_CFLAGS) $(CFLAGS) -MT test_lfptostr-run-lfptostr.obj -MD -MP -MF $(DEPDIR)/test_lfptostr-run-lfptostr.Tpo -c -o test_lfptostr-run-lfptostr.obj `if test -f 'run-lfptostr.c'; then $(CYGPATH_W) 'run-lfptostr.c'; else $(CYGPATH_W) '$(srcdir)/run-lfptostr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_lfptostr-run-lfptostr.Tpo $(DEPDIR)/test_lfptostr-run-lfptostr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-lfptostr.c' object='test_lfptostr-run-lfptostr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_lfptostr_CFLAGS) $(CFLAGS) -c -o test_lfptostr-run-lfptostr.obj `if test -f 'run-lfptostr.c'; then $(CYGPATH_W) 'run-lfptostr.c'; else $(CYGPATH_W) '$(srcdir)/run-lfptostr.c'; fi`
+
+test_modetoa-modetoa.o: modetoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_modetoa_CFLAGS) $(CFLAGS) -MT test_modetoa-modetoa.o -MD -MP -MF $(DEPDIR)/test_modetoa-modetoa.Tpo -c -o test_modetoa-modetoa.o `test -f 'modetoa.c' || echo '$(srcdir)/'`modetoa.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_modetoa-modetoa.Tpo $(DEPDIR)/test_modetoa-modetoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modetoa.c' object='test_modetoa-modetoa.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_modetoa_CFLAGS) $(CFLAGS) -c -o test_modetoa-modetoa.o `test -f 'modetoa.c' || echo '$(srcdir)/'`modetoa.c
+
+test_modetoa-modetoa.obj: modetoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_modetoa_CFLAGS) $(CFLAGS) -MT test_modetoa-modetoa.obj -MD -MP -MF $(DEPDIR)/test_modetoa-modetoa.Tpo -c -o test_modetoa-modetoa.obj `if test -f 'modetoa.c'; then $(CYGPATH_W) 'modetoa.c'; else $(CYGPATH_W) '$(srcdir)/modetoa.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_modetoa-modetoa.Tpo $(DEPDIR)/test_modetoa-modetoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modetoa.c' object='test_modetoa-modetoa.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_modetoa_CFLAGS) $(CFLAGS) -c -o test_modetoa-modetoa.obj `if test -f 'modetoa.c'; then $(CYGPATH_W) 'modetoa.c'; else $(CYGPATH_W) '$(srcdir)/modetoa.c'; fi`
+
+test_modetoa-run-modetoa.o: run-modetoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_modetoa_CFLAGS) $(CFLAGS) -MT test_modetoa-run-modetoa.o -MD -MP -MF $(DEPDIR)/test_modetoa-run-modetoa.Tpo -c -o test_modetoa-run-modetoa.o `test -f 'run-modetoa.c' || echo '$(srcdir)/'`run-modetoa.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_modetoa-run-modetoa.Tpo $(DEPDIR)/test_modetoa-run-modetoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-modetoa.c' object='test_modetoa-run-modetoa.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_modetoa_CFLAGS) $(CFLAGS) -c -o test_modetoa-run-modetoa.o `test -f 'run-modetoa.c' || echo '$(srcdir)/'`run-modetoa.c
+
+test_modetoa-run-modetoa.obj: run-modetoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_modetoa_CFLAGS) $(CFLAGS) -MT test_modetoa-run-modetoa.obj -MD -MP -MF $(DEPDIR)/test_modetoa-run-modetoa.Tpo -c -o test_modetoa-run-modetoa.obj `if test -f 'run-modetoa.c'; then $(CYGPATH_W) 'run-modetoa.c'; else $(CYGPATH_W) '$(srcdir)/run-modetoa.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_modetoa-run-modetoa.Tpo $(DEPDIR)/test_modetoa-run-modetoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-modetoa.c' object='test_modetoa-run-modetoa.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_modetoa_CFLAGS) $(CFLAGS) -c -o test_modetoa-run-modetoa.obj `if test -f 'run-modetoa.c'; then $(CYGPATH_W) 'run-modetoa.c'; else $(CYGPATH_W) '$(srcdir)/run-modetoa.c'; fi`
+
+test_msyslog-msyslog.o: msyslog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_msyslog_CFLAGS) $(CFLAGS) -MT test_msyslog-msyslog.o -MD -MP -MF $(DEPDIR)/test_msyslog-msyslog.Tpo -c -o test_msyslog-msyslog.o `test -f 'msyslog.c' || echo '$(srcdir)/'`msyslog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_msyslog-msyslog.Tpo $(DEPDIR)/test_msyslog-msyslog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='msyslog.c' object='test_msyslog-msyslog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_msyslog_CFLAGS) $(CFLAGS) -c -o test_msyslog-msyslog.o `test -f 'msyslog.c' || echo '$(srcdir)/'`msyslog.c
+
+test_msyslog-msyslog.obj: msyslog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_msyslog_CFLAGS) $(CFLAGS) -MT test_msyslog-msyslog.obj -MD -MP -MF $(DEPDIR)/test_msyslog-msyslog.Tpo -c -o test_msyslog-msyslog.obj `if test -f 'msyslog.c'; then $(CYGPATH_W) 'msyslog.c'; else $(CYGPATH_W) '$(srcdir)/msyslog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_msyslog-msyslog.Tpo $(DEPDIR)/test_msyslog-msyslog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='msyslog.c' object='test_msyslog-msyslog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_msyslog_CFLAGS) $(CFLAGS) -c -o test_msyslog-msyslog.obj `if test -f 'msyslog.c'; then $(CYGPATH_W) 'msyslog.c'; else $(CYGPATH_W) '$(srcdir)/msyslog.c'; fi`
+
+test_msyslog-run-msyslog.o: run-msyslog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_msyslog_CFLAGS) $(CFLAGS) -MT test_msyslog-run-msyslog.o -MD -MP -MF $(DEPDIR)/test_msyslog-run-msyslog.Tpo -c -o test_msyslog-run-msyslog.o `test -f 'run-msyslog.c' || echo '$(srcdir)/'`run-msyslog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_msyslog-run-msyslog.Tpo $(DEPDIR)/test_msyslog-run-msyslog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-msyslog.c' object='test_msyslog-run-msyslog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_msyslog_CFLAGS) $(CFLAGS) -c -o test_msyslog-run-msyslog.o `test -f 'run-msyslog.c' || echo '$(srcdir)/'`run-msyslog.c
+
+test_msyslog-run-msyslog.obj: run-msyslog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_msyslog_CFLAGS) $(CFLAGS) -MT test_msyslog-run-msyslog.obj -MD -MP -MF $(DEPDIR)/test_msyslog-run-msyslog.Tpo -c -o test_msyslog-run-msyslog.obj `if test -f 'run-msyslog.c'; then $(CYGPATH_W) 'run-msyslog.c'; else $(CYGPATH_W) '$(srcdir)/run-msyslog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_msyslog-run-msyslog.Tpo $(DEPDIR)/test_msyslog-run-msyslog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-msyslog.c' object='test_msyslog-run-msyslog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_msyslog_CFLAGS) $(CFLAGS) -c -o test_msyslog-run-msyslog.obj `if test -f 'run-msyslog.c'; then $(CYGPATH_W) 'run-msyslog.c'; else $(CYGPATH_W) '$(srcdir)/run-msyslog.c'; fi`
+
+test_netof-netof.o: netof.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_netof_CFLAGS) $(CFLAGS) -MT test_netof-netof.o -MD -MP -MF $(DEPDIR)/test_netof-netof.Tpo -c -o test_netof-netof.o `test -f 'netof.c' || echo '$(srcdir)/'`netof.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_netof-netof.Tpo $(DEPDIR)/test_netof-netof.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='netof.c' object='test_netof-netof.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_netof_CFLAGS) $(CFLAGS) -c -o test_netof-netof.o `test -f 'netof.c' || echo '$(srcdir)/'`netof.c
+
+test_netof-netof.obj: netof.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_netof_CFLAGS) $(CFLAGS) -MT test_netof-netof.obj -MD -MP -MF $(DEPDIR)/test_netof-netof.Tpo -c -o test_netof-netof.obj `if test -f 'netof.c'; then $(CYGPATH_W) 'netof.c'; else $(CYGPATH_W) '$(srcdir)/netof.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_netof-netof.Tpo $(DEPDIR)/test_netof-netof.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='netof.c' object='test_netof-netof.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_netof_CFLAGS) $(CFLAGS) -c -o test_netof-netof.obj `if test -f 'netof.c'; then $(CYGPATH_W) 'netof.c'; else $(CYGPATH_W) '$(srcdir)/netof.c'; fi`
+
+test_netof-run-netof.o: run-netof.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_netof_CFLAGS) $(CFLAGS) -MT test_netof-run-netof.o -MD -MP -MF $(DEPDIR)/test_netof-run-netof.Tpo -c -o test_netof-run-netof.o `test -f 'run-netof.c' || echo '$(srcdir)/'`run-netof.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_netof-run-netof.Tpo $(DEPDIR)/test_netof-run-netof.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-netof.c' object='test_netof-run-netof.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_netof_CFLAGS) $(CFLAGS) -c -o test_netof-run-netof.o `test -f 'run-netof.c' || echo '$(srcdir)/'`run-netof.c
+
+test_netof-run-netof.obj: run-netof.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_netof_CFLAGS) $(CFLAGS) -MT test_netof-run-netof.obj -MD -MP -MF $(DEPDIR)/test_netof-run-netof.Tpo -c -o test_netof-run-netof.obj `if test -f 'run-netof.c'; then $(CYGPATH_W) 'run-netof.c'; else $(CYGPATH_W) '$(srcdir)/run-netof.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_netof-run-netof.Tpo $(DEPDIR)/test_netof-run-netof.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-netof.c' object='test_netof-run-netof.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_netof_CFLAGS) $(CFLAGS) -c -o test_netof-run-netof.obj `if test -f 'run-netof.c'; then $(CYGPATH_W) 'run-netof.c'; else $(CYGPATH_W) '$(srcdir)/run-netof.c'; fi`
+
+test_numtoa-numtoa.o: numtoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtoa_CFLAGS) $(CFLAGS) -MT test_numtoa-numtoa.o -MD -MP -MF $(DEPDIR)/test_numtoa-numtoa.Tpo -c -o test_numtoa-numtoa.o `test -f 'numtoa.c' || echo '$(srcdir)/'`numtoa.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_numtoa-numtoa.Tpo $(DEPDIR)/test_numtoa-numtoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='numtoa.c' object='test_numtoa-numtoa.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtoa_CFLAGS) $(CFLAGS) -c -o test_numtoa-numtoa.o `test -f 'numtoa.c' || echo '$(srcdir)/'`numtoa.c
+
+test_numtoa-numtoa.obj: numtoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtoa_CFLAGS) $(CFLAGS) -MT test_numtoa-numtoa.obj -MD -MP -MF $(DEPDIR)/test_numtoa-numtoa.Tpo -c -o test_numtoa-numtoa.obj `if test -f 'numtoa.c'; then $(CYGPATH_W) 'numtoa.c'; else $(CYGPATH_W) '$(srcdir)/numtoa.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_numtoa-numtoa.Tpo $(DEPDIR)/test_numtoa-numtoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='numtoa.c' object='test_numtoa-numtoa.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtoa_CFLAGS) $(CFLAGS) -c -o test_numtoa-numtoa.obj `if test -f 'numtoa.c'; then $(CYGPATH_W) 'numtoa.c'; else $(CYGPATH_W) '$(srcdir)/numtoa.c'; fi`
+
+test_numtoa-run-numtoa.o: run-numtoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtoa_CFLAGS) $(CFLAGS) -MT test_numtoa-run-numtoa.o -MD -MP -MF $(DEPDIR)/test_numtoa-run-numtoa.Tpo -c -o test_numtoa-run-numtoa.o `test -f 'run-numtoa.c' || echo '$(srcdir)/'`run-numtoa.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_numtoa-run-numtoa.Tpo $(DEPDIR)/test_numtoa-run-numtoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-numtoa.c' object='test_numtoa-run-numtoa.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtoa_CFLAGS) $(CFLAGS) -c -o test_numtoa-run-numtoa.o `test -f 'run-numtoa.c' || echo '$(srcdir)/'`run-numtoa.c
+
+test_numtoa-run-numtoa.obj: run-numtoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtoa_CFLAGS) $(CFLAGS) -MT test_numtoa-run-numtoa.obj -MD -MP -MF $(DEPDIR)/test_numtoa-run-numtoa.Tpo -c -o test_numtoa-run-numtoa.obj `if test -f 'run-numtoa.c'; then $(CYGPATH_W) 'run-numtoa.c'; else $(CYGPATH_W) '$(srcdir)/run-numtoa.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_numtoa-run-numtoa.Tpo $(DEPDIR)/test_numtoa-run-numtoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-numtoa.c' object='test_numtoa-run-numtoa.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtoa_CFLAGS) $(CFLAGS) -c -o test_numtoa-run-numtoa.obj `if test -f 'run-numtoa.c'; then $(CYGPATH_W) 'run-numtoa.c'; else $(CYGPATH_W) '$(srcdir)/run-numtoa.c'; fi`
+
+test_numtohost-numtohost.o: numtohost.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtohost_CFLAGS) $(CFLAGS) -MT test_numtohost-numtohost.o -MD -MP -MF $(DEPDIR)/test_numtohost-numtohost.Tpo -c -o test_numtohost-numtohost.o `test -f 'numtohost.c' || echo '$(srcdir)/'`numtohost.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_numtohost-numtohost.Tpo $(DEPDIR)/test_numtohost-numtohost.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='numtohost.c' object='test_numtohost-numtohost.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtohost_CFLAGS) $(CFLAGS) -c -o test_numtohost-numtohost.o `test -f 'numtohost.c' || echo '$(srcdir)/'`numtohost.c
+
+test_numtohost-numtohost.obj: numtohost.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtohost_CFLAGS) $(CFLAGS) -MT test_numtohost-numtohost.obj -MD -MP -MF $(DEPDIR)/test_numtohost-numtohost.Tpo -c -o test_numtohost-numtohost.obj `if test -f 'numtohost.c'; then $(CYGPATH_W) 'numtohost.c'; else $(CYGPATH_W) '$(srcdir)/numtohost.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_numtohost-numtohost.Tpo $(DEPDIR)/test_numtohost-numtohost.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='numtohost.c' object='test_numtohost-numtohost.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtohost_CFLAGS) $(CFLAGS) -c -o test_numtohost-numtohost.obj `if test -f 'numtohost.c'; then $(CYGPATH_W) 'numtohost.c'; else $(CYGPATH_W) '$(srcdir)/numtohost.c'; fi`
+
+test_numtohost-run-numtohost.o: run-numtohost.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtohost_CFLAGS) $(CFLAGS) -MT test_numtohost-run-numtohost.o -MD -MP -MF $(DEPDIR)/test_numtohost-run-numtohost.Tpo -c -o test_numtohost-run-numtohost.o `test -f 'run-numtohost.c' || echo '$(srcdir)/'`run-numtohost.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_numtohost-run-numtohost.Tpo $(DEPDIR)/test_numtohost-run-numtohost.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-numtohost.c' object='test_numtohost-run-numtohost.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtohost_CFLAGS) $(CFLAGS) -c -o test_numtohost-run-numtohost.o `test -f 'run-numtohost.c' || echo '$(srcdir)/'`run-numtohost.c
+
+test_numtohost-run-numtohost.obj: run-numtohost.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtohost_CFLAGS) $(CFLAGS) -MT test_numtohost-run-numtohost.obj -MD -MP -MF $(DEPDIR)/test_numtohost-run-numtohost.Tpo -c -o test_numtohost-run-numtohost.obj `if test -f 'run-numtohost.c'; then $(CYGPATH_W) 'run-numtohost.c'; else $(CYGPATH_W) '$(srcdir)/run-numtohost.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_numtohost-run-numtohost.Tpo $(DEPDIR)/test_numtohost-run-numtohost.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-numtohost.c' object='test_numtohost-run-numtohost.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_numtohost_CFLAGS) $(CFLAGS) -c -o test_numtohost-run-numtohost.obj `if test -f 'run-numtohost.c'; then $(CYGPATH_W) 'run-numtohost.c'; else $(CYGPATH_W) '$(srcdir)/run-numtohost.c'; fi`
+
+test_octtoint-octtoint.o: octtoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_octtoint_CFLAGS) $(CFLAGS) -MT test_octtoint-octtoint.o -MD -MP -MF $(DEPDIR)/test_octtoint-octtoint.Tpo -c -o test_octtoint-octtoint.o `test -f 'octtoint.c' || echo '$(srcdir)/'`octtoint.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_octtoint-octtoint.Tpo $(DEPDIR)/test_octtoint-octtoint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='octtoint.c' object='test_octtoint-octtoint.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_octtoint_CFLAGS) $(CFLAGS) -c -o test_octtoint-octtoint.o `test -f 'octtoint.c' || echo '$(srcdir)/'`octtoint.c
+
+test_octtoint-octtoint.obj: octtoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_octtoint_CFLAGS) $(CFLAGS) -MT test_octtoint-octtoint.obj -MD -MP -MF $(DEPDIR)/test_octtoint-octtoint.Tpo -c -o test_octtoint-octtoint.obj `if test -f 'octtoint.c'; then $(CYGPATH_W) 'octtoint.c'; else $(CYGPATH_W) '$(srcdir)/octtoint.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_octtoint-octtoint.Tpo $(DEPDIR)/test_octtoint-octtoint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='octtoint.c' object='test_octtoint-octtoint.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_octtoint_CFLAGS) $(CFLAGS) -c -o test_octtoint-octtoint.obj `if test -f 'octtoint.c'; then $(CYGPATH_W) 'octtoint.c'; else $(CYGPATH_W) '$(srcdir)/octtoint.c'; fi`
+
+test_octtoint-run-octtoint.o: run-octtoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_octtoint_CFLAGS) $(CFLAGS) -MT test_octtoint-run-octtoint.o -MD -MP -MF $(DEPDIR)/test_octtoint-run-octtoint.Tpo -c -o test_octtoint-run-octtoint.o `test -f 'run-octtoint.c' || echo '$(srcdir)/'`run-octtoint.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_octtoint-run-octtoint.Tpo $(DEPDIR)/test_octtoint-run-octtoint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-octtoint.c' object='test_octtoint-run-octtoint.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_octtoint_CFLAGS) $(CFLAGS) -c -o test_octtoint-run-octtoint.o `test -f 'run-octtoint.c' || echo '$(srcdir)/'`run-octtoint.c
+
+test_octtoint-run-octtoint.obj: run-octtoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_octtoint_CFLAGS) $(CFLAGS) -MT test_octtoint-run-octtoint.obj -MD -MP -MF $(DEPDIR)/test_octtoint-run-octtoint.Tpo -c -o test_octtoint-run-octtoint.obj `if test -f 'run-octtoint.c'; then $(CYGPATH_W) 'run-octtoint.c'; else $(CYGPATH_W) '$(srcdir)/run-octtoint.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_octtoint-run-octtoint.Tpo $(DEPDIR)/test_octtoint-run-octtoint.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-octtoint.c' object='test_octtoint-run-octtoint.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_octtoint_CFLAGS) $(CFLAGS) -c -o test_octtoint-run-octtoint.obj `if test -f 'run-octtoint.c'; then $(CYGPATH_W) 'run-octtoint.c'; else $(CYGPATH_W) '$(srcdir)/run-octtoint.c'; fi`
+
+test_prettydate-prettydate.o: prettydate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_prettydate_CFLAGS) $(CFLAGS) -MT test_prettydate-prettydate.o -MD -MP -MF $(DEPDIR)/test_prettydate-prettydate.Tpo -c -o test_prettydate-prettydate.o `test -f 'prettydate.c' || echo '$(srcdir)/'`prettydate.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_prettydate-prettydate.Tpo $(DEPDIR)/test_prettydate-prettydate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='prettydate.c' object='test_prettydate-prettydate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_prettydate_CFLAGS) $(CFLAGS) -c -o test_prettydate-prettydate.o `test -f 'prettydate.c' || echo '$(srcdir)/'`prettydate.c
+
+test_prettydate-prettydate.obj: prettydate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_prettydate_CFLAGS) $(CFLAGS) -MT test_prettydate-prettydate.obj -MD -MP -MF $(DEPDIR)/test_prettydate-prettydate.Tpo -c -o test_prettydate-prettydate.obj `if test -f 'prettydate.c'; then $(CYGPATH_W) 'prettydate.c'; else $(CYGPATH_W) '$(srcdir)/prettydate.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_prettydate-prettydate.Tpo $(DEPDIR)/test_prettydate-prettydate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='prettydate.c' object='test_prettydate-prettydate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_prettydate_CFLAGS) $(CFLAGS) -c -o test_prettydate-prettydate.obj `if test -f 'prettydate.c'; then $(CYGPATH_W) 'prettydate.c'; else $(CYGPATH_W) '$(srcdir)/prettydate.c'; fi`
+
+test_prettydate-run-prettydate.o: run-prettydate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_prettydate_CFLAGS) $(CFLAGS) -MT test_prettydate-run-prettydate.o -MD -MP -MF $(DEPDIR)/test_prettydate-run-prettydate.Tpo -c -o test_prettydate-run-prettydate.o `test -f 'run-prettydate.c' || echo '$(srcdir)/'`run-prettydate.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_prettydate-run-prettydate.Tpo $(DEPDIR)/test_prettydate-run-prettydate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-prettydate.c' object='test_prettydate-run-prettydate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_prettydate_CFLAGS) $(CFLAGS) -c -o test_prettydate-run-prettydate.o `test -f 'run-prettydate.c' || echo '$(srcdir)/'`run-prettydate.c
+
+test_prettydate-run-prettydate.obj: run-prettydate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_prettydate_CFLAGS) $(CFLAGS) -MT test_prettydate-run-prettydate.obj -MD -MP -MF $(DEPDIR)/test_prettydate-run-prettydate.Tpo -c -o test_prettydate-run-prettydate.obj `if test -f 'run-prettydate.c'; then $(CYGPATH_W) 'run-prettydate.c'; else $(CYGPATH_W) '$(srcdir)/run-prettydate.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_prettydate-run-prettydate.Tpo $(DEPDIR)/test_prettydate-run-prettydate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-prettydate.c' object='test_prettydate-run-prettydate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_prettydate_CFLAGS) $(CFLAGS) -c -o test_prettydate-run-prettydate.obj `if test -f 'run-prettydate.c'; then $(CYGPATH_W) 'run-prettydate.c'; else $(CYGPATH_W) '$(srcdir)/run-prettydate.c'; fi`
+
+test_recvbuff-recvbuff.o: recvbuff.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_recvbuff_CFLAGS) $(CFLAGS) -MT test_recvbuff-recvbuff.o -MD -MP -MF $(DEPDIR)/test_recvbuff-recvbuff.Tpo -c -o test_recvbuff-recvbuff.o `test -f 'recvbuff.c' || echo '$(srcdir)/'`recvbuff.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_recvbuff-recvbuff.Tpo $(DEPDIR)/test_recvbuff-recvbuff.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='recvbuff.c' object='test_recvbuff-recvbuff.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_recvbuff_CFLAGS) $(CFLAGS) -c -o test_recvbuff-recvbuff.o `test -f 'recvbuff.c' || echo '$(srcdir)/'`recvbuff.c
+
+test_recvbuff-recvbuff.obj: recvbuff.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_recvbuff_CFLAGS) $(CFLAGS) -MT test_recvbuff-recvbuff.obj -MD -MP -MF $(DEPDIR)/test_recvbuff-recvbuff.Tpo -c -o test_recvbuff-recvbuff.obj `if test -f 'recvbuff.c'; then $(CYGPATH_W) 'recvbuff.c'; else $(CYGPATH_W) '$(srcdir)/recvbuff.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_recvbuff-recvbuff.Tpo $(DEPDIR)/test_recvbuff-recvbuff.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='recvbuff.c' object='test_recvbuff-recvbuff.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_recvbuff_CFLAGS) $(CFLAGS) -c -o test_recvbuff-recvbuff.obj `if test -f 'recvbuff.c'; then $(CYGPATH_W) 'recvbuff.c'; else $(CYGPATH_W) '$(srcdir)/recvbuff.c'; fi`
+
+test_recvbuff-run-recvbuff.o: run-recvbuff.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_recvbuff_CFLAGS) $(CFLAGS) -MT test_recvbuff-run-recvbuff.o -MD -MP -MF $(DEPDIR)/test_recvbuff-run-recvbuff.Tpo -c -o test_recvbuff-run-recvbuff.o `test -f 'run-recvbuff.c' || echo '$(srcdir)/'`run-recvbuff.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_recvbuff-run-recvbuff.Tpo $(DEPDIR)/test_recvbuff-run-recvbuff.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-recvbuff.c' object='test_recvbuff-run-recvbuff.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_recvbuff_CFLAGS) $(CFLAGS) -c -o test_recvbuff-run-recvbuff.o `test -f 'run-recvbuff.c' || echo '$(srcdir)/'`run-recvbuff.c
+
+test_recvbuff-run-recvbuff.obj: run-recvbuff.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_recvbuff_CFLAGS) $(CFLAGS) -MT test_recvbuff-run-recvbuff.obj -MD -MP -MF $(DEPDIR)/test_recvbuff-run-recvbuff.Tpo -c -o test_recvbuff-run-recvbuff.obj `if test -f 'run-recvbuff.c'; then $(CYGPATH_W) 'run-recvbuff.c'; else $(CYGPATH_W) '$(srcdir)/run-recvbuff.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_recvbuff-run-recvbuff.Tpo $(DEPDIR)/test_recvbuff-run-recvbuff.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-recvbuff.c' object='test_recvbuff-run-recvbuff.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_recvbuff_CFLAGS) $(CFLAGS) -c -o test_recvbuff-run-recvbuff.obj `if test -f 'run-recvbuff.c'; then $(CYGPATH_W) 'run-recvbuff.c'; else $(CYGPATH_W) '$(srcdir)/run-recvbuff.c'; fi`
+
+test_refidsmear-refidsmear.o: refidsmear.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refidsmear_CFLAGS) $(CFLAGS) -MT test_refidsmear-refidsmear.o -MD -MP -MF $(DEPDIR)/test_refidsmear-refidsmear.Tpo -c -o test_refidsmear-refidsmear.o `test -f 'refidsmear.c' || echo '$(srcdir)/'`refidsmear.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_refidsmear-refidsmear.Tpo $(DEPDIR)/test_refidsmear-refidsmear.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='refidsmear.c' object='test_refidsmear-refidsmear.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refidsmear_CFLAGS) $(CFLAGS) -c -o test_refidsmear-refidsmear.o `test -f 'refidsmear.c' || echo '$(srcdir)/'`refidsmear.c
+
+test_refidsmear-refidsmear.obj: refidsmear.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refidsmear_CFLAGS) $(CFLAGS) -MT test_refidsmear-refidsmear.obj -MD -MP -MF $(DEPDIR)/test_refidsmear-refidsmear.Tpo -c -o test_refidsmear-refidsmear.obj `if test -f 'refidsmear.c'; then $(CYGPATH_W) 'refidsmear.c'; else $(CYGPATH_W) '$(srcdir)/refidsmear.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_refidsmear-refidsmear.Tpo $(DEPDIR)/test_refidsmear-refidsmear.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='refidsmear.c' object='test_refidsmear-refidsmear.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refidsmear_CFLAGS) $(CFLAGS) -c -o test_refidsmear-refidsmear.obj `if test -f 'refidsmear.c'; then $(CYGPATH_W) 'refidsmear.c'; else $(CYGPATH_W) '$(srcdir)/refidsmear.c'; fi`
+
+test_refidsmear-run-refidsmear.o: run-refidsmear.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refidsmear_CFLAGS) $(CFLAGS) -MT test_refidsmear-run-refidsmear.o -MD -MP -MF $(DEPDIR)/test_refidsmear-run-refidsmear.Tpo -c -o test_refidsmear-run-refidsmear.o `test -f 'run-refidsmear.c' || echo '$(srcdir)/'`run-refidsmear.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_refidsmear-run-refidsmear.Tpo $(DEPDIR)/test_refidsmear-run-refidsmear.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-refidsmear.c' object='test_refidsmear-run-refidsmear.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refidsmear_CFLAGS) $(CFLAGS) -c -o test_refidsmear-run-refidsmear.o `test -f 'run-refidsmear.c' || echo '$(srcdir)/'`run-refidsmear.c
+
+test_refidsmear-run-refidsmear.obj: run-refidsmear.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refidsmear_CFLAGS) $(CFLAGS) -MT test_refidsmear-run-refidsmear.obj -MD -MP -MF $(DEPDIR)/test_refidsmear-run-refidsmear.Tpo -c -o test_refidsmear-run-refidsmear.obj `if test -f 'run-refidsmear.c'; then $(CYGPATH_W) 'run-refidsmear.c'; else $(CYGPATH_W) '$(srcdir)/run-refidsmear.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_refidsmear-run-refidsmear.Tpo $(DEPDIR)/test_refidsmear-run-refidsmear.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-refidsmear.c' object='test_refidsmear-run-refidsmear.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refidsmear_CFLAGS) $(CFLAGS) -c -o test_refidsmear-run-refidsmear.obj `if test -f 'run-refidsmear.c'; then $(CYGPATH_W) 'run-refidsmear.c'; else $(CYGPATH_W) '$(srcdir)/run-refidsmear.c'; fi`
+
+test_refnumtoa-refnumtoa.o: refnumtoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refnumtoa_CFLAGS) $(CFLAGS) -MT test_refnumtoa-refnumtoa.o -MD -MP -MF $(DEPDIR)/test_refnumtoa-refnumtoa.Tpo -c -o test_refnumtoa-refnumtoa.o `test -f 'refnumtoa.c' || echo '$(srcdir)/'`refnumtoa.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_refnumtoa-refnumtoa.Tpo $(DEPDIR)/test_refnumtoa-refnumtoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='refnumtoa.c' object='test_refnumtoa-refnumtoa.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refnumtoa_CFLAGS) $(CFLAGS) -c -o test_refnumtoa-refnumtoa.o `test -f 'refnumtoa.c' || echo '$(srcdir)/'`refnumtoa.c
+
+test_refnumtoa-refnumtoa.obj: refnumtoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refnumtoa_CFLAGS) $(CFLAGS) -MT test_refnumtoa-refnumtoa.obj -MD -MP -MF $(DEPDIR)/test_refnumtoa-refnumtoa.Tpo -c -o test_refnumtoa-refnumtoa.obj `if test -f 'refnumtoa.c'; then $(CYGPATH_W) 'refnumtoa.c'; else $(CYGPATH_W) '$(srcdir)/refnumtoa.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_refnumtoa-refnumtoa.Tpo $(DEPDIR)/test_refnumtoa-refnumtoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='refnumtoa.c' object='test_refnumtoa-refnumtoa.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refnumtoa_CFLAGS) $(CFLAGS) -c -o test_refnumtoa-refnumtoa.obj `if test -f 'refnumtoa.c'; then $(CYGPATH_W) 'refnumtoa.c'; else $(CYGPATH_W) '$(srcdir)/refnumtoa.c'; fi`
+
+test_refnumtoa-run-refnumtoa.o: run-refnumtoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refnumtoa_CFLAGS) $(CFLAGS) -MT test_refnumtoa-run-refnumtoa.o -MD -MP -MF $(DEPDIR)/test_refnumtoa-run-refnumtoa.Tpo -c -o test_refnumtoa-run-refnumtoa.o `test -f 'run-refnumtoa.c' || echo '$(srcdir)/'`run-refnumtoa.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_refnumtoa-run-refnumtoa.Tpo $(DEPDIR)/test_refnumtoa-run-refnumtoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-refnumtoa.c' object='test_refnumtoa-run-refnumtoa.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refnumtoa_CFLAGS) $(CFLAGS) -c -o test_refnumtoa-run-refnumtoa.o `test -f 'run-refnumtoa.c' || echo '$(srcdir)/'`run-refnumtoa.c
+
+test_refnumtoa-run-refnumtoa.obj: run-refnumtoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refnumtoa_CFLAGS) $(CFLAGS) -MT test_refnumtoa-run-refnumtoa.obj -MD -MP -MF $(DEPDIR)/test_refnumtoa-run-refnumtoa.Tpo -c -o test_refnumtoa-run-refnumtoa.obj `if test -f 'run-refnumtoa.c'; then $(CYGPATH_W) 'run-refnumtoa.c'; else $(CYGPATH_W) '$(srcdir)/run-refnumtoa.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_refnumtoa-run-refnumtoa.Tpo $(DEPDIR)/test_refnumtoa-run-refnumtoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-refnumtoa.c' object='test_refnumtoa-run-refnumtoa.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_refnumtoa_CFLAGS) $(CFLAGS) -c -o test_refnumtoa-run-refnumtoa.obj `if test -f 'run-refnumtoa.c'; then $(CYGPATH_W) 'run-refnumtoa.c'; else $(CYGPATH_W) '$(srcdir)/run-refnumtoa.c'; fi`
+
+test_sfptostr-sfptostr.o: sfptostr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sfptostr_CFLAGS) $(CFLAGS) -MT test_sfptostr-sfptostr.o -MD -MP -MF $(DEPDIR)/test_sfptostr-sfptostr.Tpo -c -o test_sfptostr-sfptostr.o `test -f 'sfptostr.c' || echo '$(srcdir)/'`sfptostr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_sfptostr-sfptostr.Tpo $(DEPDIR)/test_sfptostr-sfptostr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sfptostr.c' object='test_sfptostr-sfptostr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sfptostr_CFLAGS) $(CFLAGS) -c -o test_sfptostr-sfptostr.o `test -f 'sfptostr.c' || echo '$(srcdir)/'`sfptostr.c
+
+test_sfptostr-sfptostr.obj: sfptostr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sfptostr_CFLAGS) $(CFLAGS) -MT test_sfptostr-sfptostr.obj -MD -MP -MF $(DEPDIR)/test_sfptostr-sfptostr.Tpo -c -o test_sfptostr-sfptostr.obj `if test -f 'sfptostr.c'; then $(CYGPATH_W) 'sfptostr.c'; else $(CYGPATH_W) '$(srcdir)/sfptostr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_sfptostr-sfptostr.Tpo $(DEPDIR)/test_sfptostr-sfptostr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sfptostr.c' object='test_sfptostr-sfptostr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sfptostr_CFLAGS) $(CFLAGS) -c -o test_sfptostr-sfptostr.obj `if test -f 'sfptostr.c'; then $(CYGPATH_W) 'sfptostr.c'; else $(CYGPATH_W) '$(srcdir)/sfptostr.c'; fi`
+
+test_sfptostr-run-sfptostr.o: run-sfptostr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sfptostr_CFLAGS) $(CFLAGS) -MT test_sfptostr-run-sfptostr.o -MD -MP -MF $(DEPDIR)/test_sfptostr-run-sfptostr.Tpo -c -o test_sfptostr-run-sfptostr.o `test -f 'run-sfptostr.c' || echo '$(srcdir)/'`run-sfptostr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_sfptostr-run-sfptostr.Tpo $(DEPDIR)/test_sfptostr-run-sfptostr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-sfptostr.c' object='test_sfptostr-run-sfptostr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sfptostr_CFLAGS) $(CFLAGS) -c -o test_sfptostr-run-sfptostr.o `test -f 'run-sfptostr.c' || echo '$(srcdir)/'`run-sfptostr.c
+
+test_sfptostr-run-sfptostr.obj: run-sfptostr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sfptostr_CFLAGS) $(CFLAGS) -MT test_sfptostr-run-sfptostr.obj -MD -MP -MF $(DEPDIR)/test_sfptostr-run-sfptostr.Tpo -c -o test_sfptostr-run-sfptostr.obj `if test -f 'run-sfptostr.c'; then $(CYGPATH_W) 'run-sfptostr.c'; else $(CYGPATH_W) '$(srcdir)/run-sfptostr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_sfptostr-run-sfptostr.Tpo $(DEPDIR)/test_sfptostr-run-sfptostr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-sfptostr.c' object='test_sfptostr-run-sfptostr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sfptostr_CFLAGS) $(CFLAGS) -c -o test_sfptostr-run-sfptostr.obj `if test -f 'run-sfptostr.c'; then $(CYGPATH_W) 'run-sfptostr.c'; else $(CYGPATH_W) '$(srcdir)/run-sfptostr.c'; fi`
+
+test_socktoa-socktoa.o: socktoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_socktoa_CFLAGS) $(CFLAGS) -MT test_socktoa-socktoa.o -MD -MP -MF $(DEPDIR)/test_socktoa-socktoa.Tpo -c -o test_socktoa-socktoa.o `test -f 'socktoa.c' || echo '$(srcdir)/'`socktoa.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_socktoa-socktoa.Tpo $(DEPDIR)/test_socktoa-socktoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='socktoa.c' object='test_socktoa-socktoa.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_socktoa_CFLAGS) $(CFLAGS) -c -o test_socktoa-socktoa.o `test -f 'socktoa.c' || echo '$(srcdir)/'`socktoa.c
+
+test_socktoa-socktoa.obj: socktoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_socktoa_CFLAGS) $(CFLAGS) -MT test_socktoa-socktoa.obj -MD -MP -MF $(DEPDIR)/test_socktoa-socktoa.Tpo -c -o test_socktoa-socktoa.obj `if test -f 'socktoa.c'; then $(CYGPATH_W) 'socktoa.c'; else $(CYGPATH_W) '$(srcdir)/socktoa.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_socktoa-socktoa.Tpo $(DEPDIR)/test_socktoa-socktoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='socktoa.c' object='test_socktoa-socktoa.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_socktoa_CFLAGS) $(CFLAGS) -c -o test_socktoa-socktoa.obj `if test -f 'socktoa.c'; then $(CYGPATH_W) 'socktoa.c'; else $(CYGPATH_W) '$(srcdir)/socktoa.c'; fi`
+
+test_socktoa-run-socktoa.o: run-socktoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_socktoa_CFLAGS) $(CFLAGS) -MT test_socktoa-run-socktoa.o -MD -MP -MF $(DEPDIR)/test_socktoa-run-socktoa.Tpo -c -o test_socktoa-run-socktoa.o `test -f 'run-socktoa.c' || echo '$(srcdir)/'`run-socktoa.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_socktoa-run-socktoa.Tpo $(DEPDIR)/test_socktoa-run-socktoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-socktoa.c' object='test_socktoa-run-socktoa.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_socktoa_CFLAGS) $(CFLAGS) -c -o test_socktoa-run-socktoa.o `test -f 'run-socktoa.c' || echo '$(srcdir)/'`run-socktoa.c
+
+test_socktoa-run-socktoa.obj: run-socktoa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_socktoa_CFLAGS) $(CFLAGS) -MT test_socktoa-run-socktoa.obj -MD -MP -MF $(DEPDIR)/test_socktoa-run-socktoa.Tpo -c -o test_socktoa-run-socktoa.obj `if test -f 'run-socktoa.c'; then $(CYGPATH_W) 'run-socktoa.c'; else $(CYGPATH_W) '$(srcdir)/run-socktoa.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_socktoa-run-socktoa.Tpo $(DEPDIR)/test_socktoa-run-socktoa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-socktoa.c' object='test_socktoa-run-socktoa.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_socktoa_CFLAGS) $(CFLAGS) -c -o test_socktoa-run-socktoa.obj `if test -f 'run-socktoa.c'; then $(CYGPATH_W) 'run-socktoa.c'; else $(CYGPATH_W) '$(srcdir)/run-socktoa.c'; fi`
+
+test_ssl_init-ssl_init.o: ssl_init.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ssl_init_CFLAGS) $(CFLAGS) -MT test_ssl_init-ssl_init.o -MD -MP -MF $(DEPDIR)/test_ssl_init-ssl_init.Tpo -c -o test_ssl_init-ssl_init.o `test -f 'ssl_init.c' || echo '$(srcdir)/'`ssl_init.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_ssl_init-ssl_init.Tpo $(DEPDIR)/test_ssl_init-ssl_init.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ssl_init.c' object='test_ssl_init-ssl_init.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ssl_init_CFLAGS) $(CFLAGS) -c -o test_ssl_init-ssl_init.o `test -f 'ssl_init.c' || echo '$(srcdir)/'`ssl_init.c
+
+test_ssl_init-ssl_init.obj: ssl_init.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ssl_init_CFLAGS) $(CFLAGS) -MT test_ssl_init-ssl_init.obj -MD -MP -MF $(DEPDIR)/test_ssl_init-ssl_init.Tpo -c -o test_ssl_init-ssl_init.obj `if test -f 'ssl_init.c'; then $(CYGPATH_W) 'ssl_init.c'; else $(CYGPATH_W) '$(srcdir)/ssl_init.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_ssl_init-ssl_init.Tpo $(DEPDIR)/test_ssl_init-ssl_init.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ssl_init.c' object='test_ssl_init-ssl_init.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ssl_init_CFLAGS) $(CFLAGS) -c -o test_ssl_init-ssl_init.obj `if test -f 'ssl_init.c'; then $(CYGPATH_W) 'ssl_init.c'; else $(CYGPATH_W) '$(srcdir)/ssl_init.c'; fi`
+
+test_ssl_init-run-ssl_init.o: run-ssl_init.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ssl_init_CFLAGS) $(CFLAGS) -MT test_ssl_init-run-ssl_init.o -MD -MP -MF $(DEPDIR)/test_ssl_init-run-ssl_init.Tpo -c -o test_ssl_init-run-ssl_init.o `test -f 'run-ssl_init.c' || echo '$(srcdir)/'`run-ssl_init.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_ssl_init-run-ssl_init.Tpo $(DEPDIR)/test_ssl_init-run-ssl_init.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-ssl_init.c' object='test_ssl_init-run-ssl_init.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ssl_init_CFLAGS) $(CFLAGS) -c -o test_ssl_init-run-ssl_init.o `test -f 'run-ssl_init.c' || echo '$(srcdir)/'`run-ssl_init.c
+
+test_ssl_init-run-ssl_init.obj: run-ssl_init.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ssl_init_CFLAGS) $(CFLAGS) -MT test_ssl_init-run-ssl_init.obj -MD -MP -MF $(DEPDIR)/test_ssl_init-run-ssl_init.Tpo -c -o test_ssl_init-run-ssl_init.obj `if test -f 'run-ssl_init.c'; then $(CYGPATH_W) 'run-ssl_init.c'; else $(CYGPATH_W) '$(srcdir)/run-ssl_init.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_ssl_init-run-ssl_init.Tpo $(DEPDIR)/test_ssl_init-run-ssl_init.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-ssl_init.c' object='test_ssl_init-run-ssl_init.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ssl_init_CFLAGS) $(CFLAGS) -c -o test_ssl_init-run-ssl_init.obj `if test -f 'run-ssl_init.c'; then $(CYGPATH_W) 'run-ssl_init.c'; else $(CYGPATH_W) '$(srcdir)/run-ssl_init.c'; fi`
+
+test_statestr-statestr.o: statestr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_statestr_CFLAGS) $(CFLAGS) -MT test_statestr-statestr.o -MD -MP -MF $(DEPDIR)/test_statestr-statestr.Tpo -c -o test_statestr-statestr.o `test -f 'statestr.c' || echo '$(srcdir)/'`statestr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_statestr-statestr.Tpo $(DEPDIR)/test_statestr-statestr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='statestr.c' object='test_statestr-statestr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_statestr_CFLAGS) $(CFLAGS) -c -o test_statestr-statestr.o `test -f 'statestr.c' || echo '$(srcdir)/'`statestr.c
+
+test_statestr-statestr.obj: statestr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_statestr_CFLAGS) $(CFLAGS) -MT test_statestr-statestr.obj -MD -MP -MF $(DEPDIR)/test_statestr-statestr.Tpo -c -o test_statestr-statestr.obj `if test -f 'statestr.c'; then $(CYGPATH_W) 'statestr.c'; else $(CYGPATH_W) '$(srcdir)/statestr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_statestr-statestr.Tpo $(DEPDIR)/test_statestr-statestr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='statestr.c' object='test_statestr-statestr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_statestr_CFLAGS) $(CFLAGS) -c -o test_statestr-statestr.obj `if test -f 'statestr.c'; then $(CYGPATH_W) 'statestr.c'; else $(CYGPATH_W) '$(srcdir)/statestr.c'; fi`
+
+test_statestr-run-statestr.o: run-statestr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_statestr_CFLAGS) $(CFLAGS) -MT test_statestr-run-statestr.o -MD -MP -MF $(DEPDIR)/test_statestr-run-statestr.Tpo -c -o test_statestr-run-statestr.o `test -f 'run-statestr.c' || echo '$(srcdir)/'`run-statestr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_statestr-run-statestr.Tpo $(DEPDIR)/test_statestr-run-statestr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-statestr.c' object='test_statestr-run-statestr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_statestr_CFLAGS) $(CFLAGS) -c -o test_statestr-run-statestr.o `test -f 'run-statestr.c' || echo '$(srcdir)/'`run-statestr.c
+
+test_statestr-run-statestr.obj: run-statestr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_statestr_CFLAGS) $(CFLAGS) -MT test_statestr-run-statestr.obj -MD -MP -MF $(DEPDIR)/test_statestr-run-statestr.Tpo -c -o test_statestr-run-statestr.obj `if test -f 'run-statestr.c'; then $(CYGPATH_W) 'run-statestr.c'; else $(CYGPATH_W) '$(srcdir)/run-statestr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_statestr-run-statestr.Tpo $(DEPDIR)/test_statestr-run-statestr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-statestr.c' object='test_statestr-run-statestr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_statestr_CFLAGS) $(CFLAGS) -c -o test_statestr-run-statestr.obj `if test -f 'run-statestr.c'; then $(CYGPATH_W) 'run-statestr.c'; else $(CYGPATH_W) '$(srcdir)/run-statestr.c'; fi`
+
+test_strtolfp-strtolfp.o: strtolfp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtolfp_CFLAGS) $(CFLAGS) -MT test_strtolfp-strtolfp.o -MD -MP -MF $(DEPDIR)/test_strtolfp-strtolfp.Tpo -c -o test_strtolfp-strtolfp.o `test -f 'strtolfp.c' || echo '$(srcdir)/'`strtolfp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_strtolfp-strtolfp.Tpo $(DEPDIR)/test_strtolfp-strtolfp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='strtolfp.c' object='test_strtolfp-strtolfp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtolfp_CFLAGS) $(CFLAGS) -c -o test_strtolfp-strtolfp.o `test -f 'strtolfp.c' || echo '$(srcdir)/'`strtolfp.c
+
+test_strtolfp-strtolfp.obj: strtolfp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtolfp_CFLAGS) $(CFLAGS) -MT test_strtolfp-strtolfp.obj -MD -MP -MF $(DEPDIR)/test_strtolfp-strtolfp.Tpo -c -o test_strtolfp-strtolfp.obj `if test -f 'strtolfp.c'; then $(CYGPATH_W) 'strtolfp.c'; else $(CYGPATH_W) '$(srcdir)/strtolfp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_strtolfp-strtolfp.Tpo $(DEPDIR)/test_strtolfp-strtolfp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='strtolfp.c' object='test_strtolfp-strtolfp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtolfp_CFLAGS) $(CFLAGS) -c -o test_strtolfp-strtolfp.obj `if test -f 'strtolfp.c'; then $(CYGPATH_W) 'strtolfp.c'; else $(CYGPATH_W) '$(srcdir)/strtolfp.c'; fi`
+
+test_strtolfp-run-strtolfp.o: run-strtolfp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtolfp_CFLAGS) $(CFLAGS) -MT test_strtolfp-run-strtolfp.o -MD -MP -MF $(DEPDIR)/test_strtolfp-run-strtolfp.Tpo -c -o test_strtolfp-run-strtolfp.o `test -f 'run-strtolfp.c' || echo '$(srcdir)/'`run-strtolfp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_strtolfp-run-strtolfp.Tpo $(DEPDIR)/test_strtolfp-run-strtolfp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-strtolfp.c' object='test_strtolfp-run-strtolfp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtolfp_CFLAGS) $(CFLAGS) -c -o test_strtolfp-run-strtolfp.o `test -f 'run-strtolfp.c' || echo '$(srcdir)/'`run-strtolfp.c
+
+test_strtolfp-run-strtolfp.obj: run-strtolfp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtolfp_CFLAGS) $(CFLAGS) -MT test_strtolfp-run-strtolfp.obj -MD -MP -MF $(DEPDIR)/test_strtolfp-run-strtolfp.Tpo -c -o test_strtolfp-run-strtolfp.obj `if test -f 'run-strtolfp.c'; then $(CYGPATH_W) 'run-strtolfp.c'; else $(CYGPATH_W) '$(srcdir)/run-strtolfp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_strtolfp-run-strtolfp.Tpo $(DEPDIR)/test_strtolfp-run-strtolfp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-strtolfp.c' object='test_strtolfp-run-strtolfp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtolfp_CFLAGS) $(CFLAGS) -c -o test_strtolfp-run-strtolfp.obj `if test -f 'run-strtolfp.c'; then $(CYGPATH_W) 'run-strtolfp.c'; else $(CYGPATH_W) '$(srcdir)/run-strtolfp.c'; fi`
+
+test_timespecops-timespecops.o: timespecops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timespecops_CFLAGS) $(CFLAGS) -MT test_timespecops-timespecops.o -MD -MP -MF $(DEPDIR)/test_timespecops-timespecops.Tpo -c -o test_timespecops-timespecops.o `test -f 'timespecops.c' || echo '$(srcdir)/'`timespecops.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_timespecops-timespecops.Tpo $(DEPDIR)/test_timespecops-timespecops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='timespecops.c' object='test_timespecops-timespecops.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timespecops_CFLAGS) $(CFLAGS) -c -o test_timespecops-timespecops.o `test -f 'timespecops.c' || echo '$(srcdir)/'`timespecops.c
+
+test_timespecops-timespecops.obj: timespecops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timespecops_CFLAGS) $(CFLAGS) -MT test_timespecops-timespecops.obj -MD -MP -MF $(DEPDIR)/test_timespecops-timespecops.Tpo -c -o test_timespecops-timespecops.obj `if test -f 'timespecops.c'; then $(CYGPATH_W) 'timespecops.c'; else $(CYGPATH_W) '$(srcdir)/timespecops.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_timespecops-timespecops.Tpo $(DEPDIR)/test_timespecops-timespecops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='timespecops.c' object='test_timespecops-timespecops.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timespecops_CFLAGS) $(CFLAGS) -c -o test_timespecops-timespecops.obj `if test -f 'timespecops.c'; then $(CYGPATH_W) 'timespecops.c'; else $(CYGPATH_W) '$(srcdir)/timespecops.c'; fi`
+
+test_timespecops-run-timespecops.o: run-timespecops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timespecops_CFLAGS) $(CFLAGS) -MT test_timespecops-run-timespecops.o -MD -MP -MF $(DEPDIR)/test_timespecops-run-timespecops.Tpo -c -o test_timespecops-run-timespecops.o `test -f 'run-timespecops.c' || echo '$(srcdir)/'`run-timespecops.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_timespecops-run-timespecops.Tpo $(DEPDIR)/test_timespecops-run-timespecops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-timespecops.c' object='test_timespecops-run-timespecops.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timespecops_CFLAGS) $(CFLAGS) -c -o test_timespecops-run-timespecops.o `test -f 'run-timespecops.c' || echo '$(srcdir)/'`run-timespecops.c
+
+test_timespecops-run-timespecops.obj: run-timespecops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timespecops_CFLAGS) $(CFLAGS) -MT test_timespecops-run-timespecops.obj -MD -MP -MF $(DEPDIR)/test_timespecops-run-timespecops.Tpo -c -o test_timespecops-run-timespecops.obj `if test -f 'run-timespecops.c'; then $(CYGPATH_W) 'run-timespecops.c'; else $(CYGPATH_W) '$(srcdir)/run-timespecops.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_timespecops-run-timespecops.Tpo $(DEPDIR)/test_timespecops-run-timespecops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-timespecops.c' object='test_timespecops-run-timespecops.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timespecops_CFLAGS) $(CFLAGS) -c -o test_timespecops-run-timespecops.obj `if test -f 'run-timespecops.c'; then $(CYGPATH_W) 'run-timespecops.c'; else $(CYGPATH_W) '$(srcdir)/run-timespecops.c'; fi`
+
+test_timevalops-timevalops.o: timevalops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timevalops_CFLAGS) $(CFLAGS) -MT test_timevalops-timevalops.o -MD -MP -MF $(DEPDIR)/test_timevalops-timevalops.Tpo -c -o test_timevalops-timevalops.o `test -f 'timevalops.c' || echo '$(srcdir)/'`timevalops.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_timevalops-timevalops.Tpo $(DEPDIR)/test_timevalops-timevalops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='timevalops.c' object='test_timevalops-timevalops.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timevalops_CFLAGS) $(CFLAGS) -c -o test_timevalops-timevalops.o `test -f 'timevalops.c' || echo '$(srcdir)/'`timevalops.c
+
+test_timevalops-timevalops.obj: timevalops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timevalops_CFLAGS) $(CFLAGS) -MT test_timevalops-timevalops.obj -MD -MP -MF $(DEPDIR)/test_timevalops-timevalops.Tpo -c -o test_timevalops-timevalops.obj `if test -f 'timevalops.c'; then $(CYGPATH_W) 'timevalops.c'; else $(CYGPATH_W) '$(srcdir)/timevalops.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_timevalops-timevalops.Tpo $(DEPDIR)/test_timevalops-timevalops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='timevalops.c' object='test_timevalops-timevalops.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timevalops_CFLAGS) $(CFLAGS) -c -o test_timevalops-timevalops.obj `if test -f 'timevalops.c'; then $(CYGPATH_W) 'timevalops.c'; else $(CYGPATH_W) '$(srcdir)/timevalops.c'; fi`
+
+test_timevalops-run-timevalops.o: run-timevalops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timevalops_CFLAGS) $(CFLAGS) -MT test_timevalops-run-timevalops.o -MD -MP -MF $(DEPDIR)/test_timevalops-run-timevalops.Tpo -c -o test_timevalops-run-timevalops.o `test -f 'run-timevalops.c' || echo '$(srcdir)/'`run-timevalops.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_timevalops-run-timevalops.Tpo $(DEPDIR)/test_timevalops-run-timevalops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-timevalops.c' object='test_timevalops-run-timevalops.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timevalops_CFLAGS) $(CFLAGS) -c -o test_timevalops-run-timevalops.o `test -f 'run-timevalops.c' || echo '$(srcdir)/'`run-timevalops.c
+
+test_timevalops-run-timevalops.obj: run-timevalops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timevalops_CFLAGS) $(CFLAGS) -MT test_timevalops-run-timevalops.obj -MD -MP -MF $(DEPDIR)/test_timevalops-run-timevalops.Tpo -c -o test_timevalops-run-timevalops.obj `if test -f 'run-timevalops.c'; then $(CYGPATH_W) 'run-timevalops.c'; else $(CYGPATH_W) '$(srcdir)/run-timevalops.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_timevalops-run-timevalops.Tpo $(DEPDIR)/test_timevalops-run-timevalops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-timevalops.c' object='test_timevalops-run-timevalops.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timevalops_CFLAGS) $(CFLAGS) -c -o test_timevalops-run-timevalops.obj `if test -f 'run-timevalops.c'; then $(CYGPATH_W) 'run-timevalops.c'; else $(CYGPATH_W) '$(srcdir)/run-timevalops.c'; fi`
+
+test_tstotv-tstotv.o: tstotv.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tstotv_CFLAGS) $(CFLAGS) -MT test_tstotv-tstotv.o -MD -MP -MF $(DEPDIR)/test_tstotv-tstotv.Tpo -c -o test_tstotv-tstotv.o `test -f 'tstotv.c' || echo '$(srcdir)/'`tstotv.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_tstotv-tstotv.Tpo $(DEPDIR)/test_tstotv-tstotv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tstotv.c' object='test_tstotv-tstotv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tstotv_CFLAGS) $(CFLAGS) -c -o test_tstotv-tstotv.o `test -f 'tstotv.c' || echo '$(srcdir)/'`tstotv.c
+
+test_tstotv-tstotv.obj: tstotv.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tstotv_CFLAGS) $(CFLAGS) -MT test_tstotv-tstotv.obj -MD -MP -MF $(DEPDIR)/test_tstotv-tstotv.Tpo -c -o test_tstotv-tstotv.obj `if test -f 'tstotv.c'; then $(CYGPATH_W) 'tstotv.c'; else $(CYGPATH_W) '$(srcdir)/tstotv.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_tstotv-tstotv.Tpo $(DEPDIR)/test_tstotv-tstotv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tstotv.c' object='test_tstotv-tstotv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tstotv_CFLAGS) $(CFLAGS) -c -o test_tstotv-tstotv.obj `if test -f 'tstotv.c'; then $(CYGPATH_W) 'tstotv.c'; else $(CYGPATH_W) '$(srcdir)/tstotv.c'; fi`
+
+test_tstotv-run-tstotv.o: run-tstotv.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tstotv_CFLAGS) $(CFLAGS) -MT test_tstotv-run-tstotv.o -MD -MP -MF $(DEPDIR)/test_tstotv-run-tstotv.Tpo -c -o test_tstotv-run-tstotv.o `test -f 'run-tstotv.c' || echo '$(srcdir)/'`run-tstotv.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_tstotv-run-tstotv.Tpo $(DEPDIR)/test_tstotv-run-tstotv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-tstotv.c' object='test_tstotv-run-tstotv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tstotv_CFLAGS) $(CFLAGS) -c -o test_tstotv-run-tstotv.o `test -f 'run-tstotv.c' || echo '$(srcdir)/'`run-tstotv.c
+
+test_tstotv-run-tstotv.obj: run-tstotv.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tstotv_CFLAGS) $(CFLAGS) -MT test_tstotv-run-tstotv.obj -MD -MP -MF $(DEPDIR)/test_tstotv-run-tstotv.Tpo -c -o test_tstotv-run-tstotv.obj `if test -f 'run-tstotv.c'; then $(CYGPATH_W) 'run-tstotv.c'; else $(CYGPATH_W) '$(srcdir)/run-tstotv.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_tstotv-run-tstotv.Tpo $(DEPDIR)/test_tstotv-run-tstotv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-tstotv.c' object='test_tstotv-run-tstotv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tstotv_CFLAGS) $(CFLAGS) -c -o test_tstotv-run-tstotv.obj `if test -f 'run-tstotv.c'; then $(CYGPATH_W) 'run-tstotv.c'; else $(CYGPATH_W) '$(srcdir)/run-tstotv.c'; fi`
+
+test_tvtots-tvtots.o: tvtots.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tvtots_CFLAGS) $(CFLAGS) -MT test_tvtots-tvtots.o -MD -MP -MF $(DEPDIR)/test_tvtots-tvtots.Tpo -c -o test_tvtots-tvtots.o `test -f 'tvtots.c' || echo '$(srcdir)/'`tvtots.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_tvtots-tvtots.Tpo $(DEPDIR)/test_tvtots-tvtots.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tvtots.c' object='test_tvtots-tvtots.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tvtots_CFLAGS) $(CFLAGS) -c -o test_tvtots-tvtots.o `test -f 'tvtots.c' || echo '$(srcdir)/'`tvtots.c
+
+test_tvtots-tvtots.obj: tvtots.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tvtots_CFLAGS) $(CFLAGS) -MT test_tvtots-tvtots.obj -MD -MP -MF $(DEPDIR)/test_tvtots-tvtots.Tpo -c -o test_tvtots-tvtots.obj `if test -f 'tvtots.c'; then $(CYGPATH_W) 'tvtots.c'; else $(CYGPATH_W) '$(srcdir)/tvtots.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_tvtots-tvtots.Tpo $(DEPDIR)/test_tvtots-tvtots.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tvtots.c' object='test_tvtots-tvtots.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tvtots_CFLAGS) $(CFLAGS) -c -o test_tvtots-tvtots.obj `if test -f 'tvtots.c'; then $(CYGPATH_W) 'tvtots.c'; else $(CYGPATH_W) '$(srcdir)/tvtots.c'; fi`
+
+test_tvtots-run-tvtots.o: run-tvtots.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tvtots_CFLAGS) $(CFLAGS) -MT test_tvtots-run-tvtots.o -MD -MP -MF $(DEPDIR)/test_tvtots-run-tvtots.Tpo -c -o test_tvtots-run-tvtots.o `test -f 'run-tvtots.c' || echo '$(srcdir)/'`run-tvtots.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_tvtots-run-tvtots.Tpo $(DEPDIR)/test_tvtots-run-tvtots.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-tvtots.c' object='test_tvtots-run-tvtots.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tvtots_CFLAGS) $(CFLAGS) -c -o test_tvtots-run-tvtots.o `test -f 'run-tvtots.c' || echo '$(srcdir)/'`run-tvtots.c
+
+test_tvtots-run-tvtots.obj: run-tvtots.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tvtots_CFLAGS) $(CFLAGS) -MT test_tvtots-run-tvtots.obj -MD -MP -MF $(DEPDIR)/test_tvtots-run-tvtots.Tpo -c -o test_tvtots-run-tvtots.obj `if test -f 'run-tvtots.c'; then $(CYGPATH_W) 'run-tvtots.c'; else $(CYGPATH_W) '$(srcdir)/run-tvtots.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_tvtots-run-tvtots.Tpo $(DEPDIR)/test_tvtots-run-tvtots.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-tvtots.c' object='test_tvtots-run-tvtots.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tvtots_CFLAGS) $(CFLAGS) -c -o test_tvtots-run-tvtots.obj `if test -f 'run-tvtots.c'; then $(CYGPATH_W) 'run-tvtots.c'; else $(CYGPATH_W) '$(srcdir)/run-tvtots.c'; fi`
+
+test_uglydate-uglydate.o: uglydate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_uglydate_CFLAGS) $(CFLAGS) -MT test_uglydate-uglydate.o -MD -MP -MF $(DEPDIR)/test_uglydate-uglydate.Tpo -c -o test_uglydate-uglydate.o `test -f 'uglydate.c' || echo '$(srcdir)/'`uglydate.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_uglydate-uglydate.Tpo $(DEPDIR)/test_uglydate-uglydate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='uglydate.c' object='test_uglydate-uglydate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_uglydate_CFLAGS) $(CFLAGS) -c -o test_uglydate-uglydate.o `test -f 'uglydate.c' || echo '$(srcdir)/'`uglydate.c
+
+test_uglydate-uglydate.obj: uglydate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_uglydate_CFLAGS) $(CFLAGS) -MT test_uglydate-uglydate.obj -MD -MP -MF $(DEPDIR)/test_uglydate-uglydate.Tpo -c -o test_uglydate-uglydate.obj `if test -f 'uglydate.c'; then $(CYGPATH_W) 'uglydate.c'; else $(CYGPATH_W) '$(srcdir)/uglydate.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_uglydate-uglydate.Tpo $(DEPDIR)/test_uglydate-uglydate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='uglydate.c' object='test_uglydate-uglydate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_uglydate_CFLAGS) $(CFLAGS) -c -o test_uglydate-uglydate.obj `if test -f 'uglydate.c'; then $(CYGPATH_W) 'uglydate.c'; else $(CYGPATH_W) '$(srcdir)/uglydate.c'; fi`
+
+test_uglydate-run-uglydate.o: run-uglydate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_uglydate_CFLAGS) $(CFLAGS) -MT test_uglydate-run-uglydate.o -MD -MP -MF $(DEPDIR)/test_uglydate-run-uglydate.Tpo -c -o test_uglydate-run-uglydate.o `test -f 'run-uglydate.c' || echo '$(srcdir)/'`run-uglydate.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_uglydate-run-uglydate.Tpo $(DEPDIR)/test_uglydate-run-uglydate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-uglydate.c' object='test_uglydate-run-uglydate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_uglydate_CFLAGS) $(CFLAGS) -c -o test_uglydate-run-uglydate.o `test -f 'run-uglydate.c' || echo '$(srcdir)/'`run-uglydate.c
+
+test_uglydate-run-uglydate.obj: run-uglydate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_uglydate_CFLAGS) $(CFLAGS) -MT test_uglydate-run-uglydate.obj -MD -MP -MF $(DEPDIR)/test_uglydate-run-uglydate.Tpo -c -o test_uglydate-run-uglydate.obj `if test -f 'run-uglydate.c'; then $(CYGPATH_W) 'run-uglydate.c'; else $(CYGPATH_W) '$(srcdir)/run-uglydate.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_uglydate-run-uglydate.Tpo $(DEPDIR)/test_uglydate-run-uglydate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-uglydate.c' object='test_uglydate-run-uglydate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_uglydate_CFLAGS) $(CFLAGS) -c -o test_uglydate-run-uglydate.obj `if test -f 'run-uglydate.c'; then $(CYGPATH_W) 'run-uglydate.c'; else $(CYGPATH_W) '$(srcdir)/run-uglydate.c'; fi`
+
+test_vi64ops-vi64ops.o: vi64ops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_vi64ops_CFLAGS) $(CFLAGS) -MT test_vi64ops-vi64ops.o -MD -MP -MF $(DEPDIR)/test_vi64ops-vi64ops.Tpo -c -o test_vi64ops-vi64ops.o `test -f 'vi64ops.c' || echo '$(srcdir)/'`vi64ops.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_vi64ops-vi64ops.Tpo $(DEPDIR)/test_vi64ops-vi64ops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='vi64ops.c' object='test_vi64ops-vi64ops.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_vi64ops_CFLAGS) $(CFLAGS) -c -o test_vi64ops-vi64ops.o `test -f 'vi64ops.c' || echo '$(srcdir)/'`vi64ops.c
+
+test_vi64ops-vi64ops.obj: vi64ops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_vi64ops_CFLAGS) $(CFLAGS) -MT test_vi64ops-vi64ops.obj -MD -MP -MF $(DEPDIR)/test_vi64ops-vi64ops.Tpo -c -o test_vi64ops-vi64ops.obj `if test -f 'vi64ops.c'; then $(CYGPATH_W) 'vi64ops.c'; else $(CYGPATH_W) '$(srcdir)/vi64ops.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_vi64ops-vi64ops.Tpo $(DEPDIR)/test_vi64ops-vi64ops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='vi64ops.c' object='test_vi64ops-vi64ops.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_vi64ops_CFLAGS) $(CFLAGS) -c -o test_vi64ops-vi64ops.obj `if test -f 'vi64ops.c'; then $(CYGPATH_W) 'vi64ops.c'; else $(CYGPATH_W) '$(srcdir)/vi64ops.c'; fi`
+
+test_vi64ops-run-vi64ops.o: run-vi64ops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_vi64ops_CFLAGS) $(CFLAGS) -MT test_vi64ops-run-vi64ops.o -MD -MP -MF $(DEPDIR)/test_vi64ops-run-vi64ops.Tpo -c -o test_vi64ops-run-vi64ops.o `test -f 'run-vi64ops.c' || echo '$(srcdir)/'`run-vi64ops.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_vi64ops-run-vi64ops.Tpo $(DEPDIR)/test_vi64ops-run-vi64ops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-vi64ops.c' object='test_vi64ops-run-vi64ops.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_vi64ops_CFLAGS) $(CFLAGS) -c -o test_vi64ops-run-vi64ops.o `test -f 'run-vi64ops.c' || echo '$(srcdir)/'`run-vi64ops.c
+
+test_vi64ops-run-vi64ops.obj: run-vi64ops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_vi64ops_CFLAGS) $(CFLAGS) -MT test_vi64ops-run-vi64ops.obj -MD -MP -MF $(DEPDIR)/test_vi64ops-run-vi64ops.Tpo -c -o test_vi64ops-run-vi64ops.obj `if test -f 'run-vi64ops.c'; then $(CYGPATH_W) 'run-vi64ops.c'; else $(CYGPATH_W) '$(srcdir)/run-vi64ops.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_vi64ops-run-vi64ops.Tpo $(DEPDIR)/test_vi64ops-run-vi64ops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-vi64ops.c' object='test_vi64ops-run-vi64ops.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_vi64ops_CFLAGS) $(CFLAGS) -c -o test_vi64ops-run-vi64ops.obj `if test -f 'run-vi64ops.c'; then $(CYGPATH_W) 'run-vi64ops.c'; else $(CYGPATH_W) '$(srcdir)/run-vi64ops.c'; fi`
+
+test_ymd2yd-ymd2yd.o: ymd2yd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ymd2yd_CFLAGS) $(CFLAGS) -MT test_ymd2yd-ymd2yd.o -MD -MP -MF $(DEPDIR)/test_ymd2yd-ymd2yd.Tpo -c -o test_ymd2yd-ymd2yd.o `test -f 'ymd2yd.c' || echo '$(srcdir)/'`ymd2yd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_ymd2yd-ymd2yd.Tpo $(DEPDIR)/test_ymd2yd-ymd2yd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ymd2yd.c' object='test_ymd2yd-ymd2yd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ymd2yd_CFLAGS) $(CFLAGS) -c -o test_ymd2yd-ymd2yd.o `test -f 'ymd2yd.c' || echo '$(srcdir)/'`ymd2yd.c
+
+test_ymd2yd-ymd2yd.obj: ymd2yd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ymd2yd_CFLAGS) $(CFLAGS) -MT test_ymd2yd-ymd2yd.obj -MD -MP -MF $(DEPDIR)/test_ymd2yd-ymd2yd.Tpo -c -o test_ymd2yd-ymd2yd.obj `if test -f 'ymd2yd.c'; then $(CYGPATH_W) 'ymd2yd.c'; else $(CYGPATH_W) '$(srcdir)/ymd2yd.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_ymd2yd-ymd2yd.Tpo $(DEPDIR)/test_ymd2yd-ymd2yd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ymd2yd.c' object='test_ymd2yd-ymd2yd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ymd2yd_CFLAGS) $(CFLAGS) -c -o test_ymd2yd-ymd2yd.obj `if test -f 'ymd2yd.c'; then $(CYGPATH_W) 'ymd2yd.c'; else $(CYGPATH_W) '$(srcdir)/ymd2yd.c'; fi`
+
+test_ymd2yd-run-ymd2yd.o: run-ymd2yd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ymd2yd_CFLAGS) $(CFLAGS) -MT test_ymd2yd-run-ymd2yd.o -MD -MP -MF $(DEPDIR)/test_ymd2yd-run-ymd2yd.Tpo -c -o test_ymd2yd-run-ymd2yd.o `test -f 'run-ymd2yd.c' || echo '$(srcdir)/'`run-ymd2yd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_ymd2yd-run-ymd2yd.Tpo $(DEPDIR)/test_ymd2yd-run-ymd2yd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-ymd2yd.c' object='test_ymd2yd-run-ymd2yd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ymd2yd_CFLAGS) $(CFLAGS) -c -o test_ymd2yd-run-ymd2yd.o `test -f 'run-ymd2yd.c' || echo '$(srcdir)/'`run-ymd2yd.c
+
+test_ymd2yd-run-ymd2yd.obj: run-ymd2yd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ymd2yd_CFLAGS) $(CFLAGS) -MT test_ymd2yd-run-ymd2yd.obj -MD -MP -MF $(DEPDIR)/test_ymd2yd-run-ymd2yd.Tpo -c -o test_ymd2yd-run-ymd2yd.obj `if test -f 'run-ymd2yd.c'; then $(CYGPATH_W) 'run-ymd2yd.c'; else $(CYGPATH_W) '$(srcdir)/run-ymd2yd.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_ymd2yd-run-ymd2yd.Tpo $(DEPDIR)/test_ymd2yd-run-ymd2yd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-ymd2yd.c' object='test_ymd2yd-run-ymd2yd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ymd2yd_CFLAGS) $(CFLAGS) -c -o test_ymd2yd-run-ymd2yd.obj `if test -f 'run-ymd2yd.c'; then $(CYGPATH_W) 'run-ymd2yd.c'; else $(CYGPATH_W) '$(srcdir)/run-ymd2yd.c'; fi`
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 tests_main.o: $(top_srcdir)/sntp/tests_main.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tests_main.o -MD -MP -MF $(DEPDIR)/tests_main.Tpo -c -o tests_main.o `test -f '$(top_srcdir)/sntp/tests_main.cpp' || echo '$(srcdir)/'`$(top_srcdir)/sntp/tests_main.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tests_main.Tpo $(DEPDIR)/tests_main.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/sntp/tests_main.cpp' object='tests_main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(top_srcdir)/sntp/tests_main.cpp' object='tests_main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.o `test -f '$(top_srcdir)/sntp/tests_main.cpp' || echo '$(srcdir)/'`$(top_srcdir)/sntp/tests_main.cpp
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.o `test -f '$(top_srcdir)/sntp/tests_main.cpp' || echo '$(srcdir)/'`$(top_srcdir)/sntp/tests_main.cpp
 
 tests_main.obj: $(top_srcdir)/sntp/tests_main.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tests_main.obj -MD -MP -MF $(DEPDIR)/tests_main.Tpo -c -o tests_main.obj `if test -f '$(top_srcdir)/sntp/tests_main.cpp'; then $(CYGPATH_W) '$(top_srcdir)/sntp/tests_main.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/sntp/tests_main.cpp'; fi`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tests_main.Tpo $(DEPDIR)/tests_main.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/sntp/tests_main.cpp' object='tests_main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(top_srcdir)/sntp/tests_main.cpp' object='tests_main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.obj `if test -f '$(top_srcdir)/sntp/tests_main.cpp'; then $(CYGPATH_W) '$(top_srcdir)/sntp/tests_main.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/sntp/tests_main.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.obj `if test -f '$(top_srcdir)/sntp/tests_main.cpp'; then $(CYGPATH_W) '$(top_srcdir)/sntp/tests_main.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/sntp/tests_main.cpp'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -615,26 +3299,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -646,15 +3319,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -663,101 +3332,453 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
 	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      color_start= color_end=; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
-	  else \
-	    echo "$$red$$dashes"; \
-	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+test-a_md5encrypt.log: test-a_md5encrypt$(EXEEXT)
+	@p='test-a_md5encrypt$(EXEEXT)'; \
+	b='test-a_md5encrypt'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-atoint.log: test-atoint$(EXEEXT)
+	@p='test-atoint$(EXEEXT)'; \
+	b='test-atoint'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-atouint.log: test-atouint$(EXEEXT)
+	@p='test-atouint$(EXEEXT)'; \
+	b='test-atouint'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-authkeys.log: test-authkeys$(EXEEXT)
+	@p='test-authkeys$(EXEEXT)'; \
+	b='test-authkeys'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-buftvtots.log: test-buftvtots$(EXEEXT)
+	@p='test-buftvtots$(EXEEXT)'; \
+	b='test-buftvtots'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-calendar.log: test-calendar$(EXEEXT)
+	@p='test-calendar$(EXEEXT)'; \
+	b='test-calendar'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-caljulian.log: test-caljulian$(EXEEXT)
+	@p='test-caljulian$(EXEEXT)'; \
+	b='test-caljulian'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-caltontp.log: test-caltontp$(EXEEXT)
+	@p='test-caltontp$(EXEEXT)'; \
+	b='test-caltontp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-calyearstart.log: test-calyearstart$(EXEEXT)
+	@p='test-calyearstart$(EXEEXT)'; \
+	b='test-calyearstart'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-clocktime.log: test-clocktime$(EXEEXT)
+	@p='test-clocktime$(EXEEXT)'; \
+	b='test-clocktime'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-decodenetnum.log: test-decodenetnum$(EXEEXT)
+	@p='test-decodenetnum$(EXEEXT)'; \
+	b='test-decodenetnum'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-hextoint.log: test-hextoint$(EXEEXT)
+	@p='test-hextoint$(EXEEXT)'; \
+	b='test-hextoint'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-hextolfp.log: test-hextolfp$(EXEEXT)
+	@p='test-hextolfp$(EXEEXT)'; \
+	b='test-hextolfp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-humandate.log: test-humandate$(EXEEXT)
+	@p='test-humandate$(EXEEXT)'; \
+	b='test-humandate'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-lfpfunc.log: test-lfpfunc$(EXEEXT)
+	@p='test-lfpfunc$(EXEEXT)'; \
+	b='test-lfpfunc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-lfptostr.log: test-lfptostr$(EXEEXT)
+	@p='test-lfptostr$(EXEEXT)'; \
+	b='test-lfptostr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-modetoa.log: test-modetoa$(EXEEXT)
+	@p='test-modetoa$(EXEEXT)'; \
+	b='test-modetoa'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-msyslog.log: test-msyslog$(EXEEXT)
+	@p='test-msyslog$(EXEEXT)'; \
+	b='test-msyslog'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-netof.log: test-netof$(EXEEXT)
+	@p='test-netof$(EXEEXT)'; \
+	b='test-netof'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-numtoa.log: test-numtoa$(EXEEXT)
+	@p='test-numtoa$(EXEEXT)'; \
+	b='test-numtoa'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-numtohost.log: test-numtohost$(EXEEXT)
+	@p='test-numtohost$(EXEEXT)'; \
+	b='test-numtohost'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-octtoint.log: test-octtoint$(EXEEXT)
+	@p='test-octtoint$(EXEEXT)'; \
+	b='test-octtoint'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-prettydate.log: test-prettydate$(EXEEXT)
+	@p='test-prettydate$(EXEEXT)'; \
+	b='test-prettydate'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-recvbuff.log: test-recvbuff$(EXEEXT)
+	@p='test-recvbuff$(EXEEXT)'; \
+	b='test-recvbuff'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-refidsmear.log: test-refidsmear$(EXEEXT)
+	@p='test-refidsmear$(EXEEXT)'; \
+	b='test-refidsmear'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-refnumtoa.log: test-refnumtoa$(EXEEXT)
+	@p='test-refnumtoa$(EXEEXT)'; \
+	b='test-refnumtoa'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-sfptostr.log: test-sfptostr$(EXEEXT)
+	@p='test-sfptostr$(EXEEXT)'; \
+	b='test-sfptostr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-socktoa.log: test-socktoa$(EXEEXT)
+	@p='test-socktoa$(EXEEXT)'; \
+	b='test-socktoa'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ssl_init.log: test-ssl_init$(EXEEXT)
+	@p='test-ssl_init$(EXEEXT)'; \
+	b='test-ssl_init'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-statestr.log: test-statestr$(EXEEXT)
+	@p='test-statestr$(EXEEXT)'; \
+	b='test-statestr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-strtolfp.log: test-strtolfp$(EXEEXT)
+	@p='test-strtolfp$(EXEEXT)'; \
+	b='test-strtolfp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-timespecops.log: test-timespecops$(EXEEXT)
+	@p='test-timespecops$(EXEEXT)'; \
+	b='test-timespecops'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-timevalops.log: test-timevalops$(EXEEXT)
+	@p='test-timevalops$(EXEEXT)'; \
+	b='test-timevalops'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-tstotv.log: test-tstotv$(EXEEXT)
+	@p='test-tstotv$(EXEEXT)'; \
+	b='test-tstotv'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-tvtots.log: test-tvtots$(EXEEXT)
+	@p='test-tvtots$(EXEEXT)'; \
+	b='test-tvtots'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-uglydate.log: test-uglydate$(EXEEXT)
+	@p='test-uglydate$(EXEEXT)'; \
+	b='test-uglydate'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-vi64ops.log: test-vi64ops$(EXEEXT)
+	@p='test-vi64ops$(EXEEXT)'; \
+	b='test-vi64ops'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ymd2yd.log: test-ymd2yd$(EXEEXT)
+	@p='test-ymd2yd$(EXEEXT)'; \
+	b='test-ymd2yd'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+tests.log: tests$(EXEEXT)
+	@p='tests$(EXEEXT)'; \
+	b='tests'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -807,11 +3828,19 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -897,9 +3926,9 @@ uninstall-am:
 
 .MAKE: all check check-am install install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -909,14 +3938,136 @@ uninstall-am:
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
+	recheck tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
+
+$(srcdir)/run-a_md5encrypt.c: $(srcdir)/a_md5encrypt.c $(std_unity_list)
+	$(run_unity) a_md5encrypt.c run-a_md5encrypt.c
+
+$(srcdir)/run-atoint.c: $(srcdir)/atoint.c $(std_unity_list)
+	$(run_unity) atoint.c run-atoint.c
+
+$(srcdir)/run-atouint.c: $(srcdir)/atouint.c $(std_unity_list)
+	$(run_unity) atouint.c run-atouint.c
+
+$(srcdir)/run-authkeys.c: $(srcdir)/authkeys.c $(std_unity_list)
+	$(run_unity) authkeys.c run-authkeys.c
+
+$(srcdir)/run-buftvtots.c: $(srcdir)/buftvtots.c $(std_unity_list)
+	$(run_unity) buftvtots.c run-buftvtots.c
+
+$(srcdir)/run-calendar.c: $(srcdir)/calendar.c $(std_unity_list)
+	$(run_unity) calendar.c run-calendar.c
+
+$(srcdir)/run-caltontp.c: $(srcdir)/caltontp.c $(std_unity_list)
+	$(run_unity) caltontp.c run-caltontp.c
+
+$(srcdir)/run-caljulian.c: $(srcdir)/caljulian.c $(std_unity_list)
+	$(run_unity) caljulian.c run-caljulian.c
+
+$(srcdir)/run-calyearstart.c: $(srcdir)/calyearstart.c $(std_unity_list)
+	$(run_unity) calyearstart.c run-calyearstart.c
+
+$(srcdir)/run-clocktime.c: $(srcdir)/clocktime.c $(std_unity_list)
+	$(run_unity) clocktime.c run-clocktime.c
+
+$(srcdir)/run-decodenetnum.c: $(srcdir)/decodenetnum.c $(std_unity_list)
+	$(run_unity) decodenetnum.c run-decodenetnum.c
+
+$(srcdir)/run-hextoint.c: $(srcdir)/hextoint.c $(std_unity_list)
+	$(run_unity) hextoint.c run-hextoint.c
+
+$(srcdir)/run-hextolfp.c: $(srcdir)/hextolfp.c $(std_unity_list)
+	$(run_unity) hextolfp.c run-hextolfp.c
+
+$(srcdir)/run-humandate.c: $(srcdir)/humandate.c $(std_unity_list)
+	$(run_unity) humandate.c run-humandate.c
+
+$(srcdir)/run-lfpfunc.c: $(srcdir)/lfpfunc.c $(std_unity_list)
+	$(run_unity) lfpfunc.c run-lfpfunc.c
+
+$(srcdir)/run-lfptostr.c: $(srcdir)/lfptostr.c $(std_unity_list)
+	$(run_unity) lfptostr.c run-lfptostr.c
+
+$(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list)
+	$(run_unity) modetoa.c run-modetoa.c
+
+$(srcdir)/run-msyslog.c: $(srcdir)/msyslog.c $(std_unity_list)
+	$(run_unity) msyslog.c run-msyslog.c
+
+$(srcdir)/run-netof.c: $(srcdir)/netof.c $(std_unity_list)
+	$(run_unity) netof.c run-netof.c
+
+$(srcdir)/run-numtoa.c: $(srcdir)/numtoa.c $(std_unity_list)
+	$(run_unity) numtoa.c run-numtoa.c
+
+$(srcdir)/run-numtohost.c: $(srcdir)/numtohost.c $(std_unity_list)
+	$(run_unity) numtohost.c run-numtohost.c
+
+$(srcdir)/run-octtoint.c: $(srcdir)/octtoint.c $(std_unity_list)
+	$(run_unity) octtoint.c run-octtoint.c
+
+$(srcdir)/run-prettydate.c: $(srcdir)/prettydate.c $(std_unity_list)
+	$(run_unity) prettydate.c run-prettydate.c
+
+$(srcdir)/run-recvbuff.c: $(srcdir)/recvbuff.c $(std_unity_list)
+	$(run_unity) recvbuff.c run-recvbuff.c
+
+$(srcdir)/run-refidsmear.c: $(srcdir)/refidsmear.c $(std_unity_list)
+	$(run_unity) refidsmear.c run-refidsmear.c
+
+$(srcdir)/run-refnumtoa.c: $(srcdir)/refnumtoa.c $(std_unity_list)
+	$(run_unity) refnumtoa.c run-refnumtoa.c
+
+$(srcdir)/run-sfptostr.c: $(srcdir)/sfptostr.c $(std_unity_list)
+	$(run_unity) sfptostr.c run-sfptostr.c
+
+$(srcdir)/run-socktoa.c: $(srcdir)/socktoa.c $(std_unity_list)
+	$(run_unity) socktoa.c run-socktoa.c
+
+$(srcdir)/run-ssl_init.c: $(srcdir)/ssl_init.c $(std_unity_list)
+	$(run_unity) ssl_init.c run-ssl_init.c
+
+$(srcdir)/run-statestr.c: $(srcdir)/statestr.c $(std_unity_list)
+	$(run_unity) statestr.c run-statestr.c
+
+$(srcdir)/run-strtolfp.c: $(srcdir)/strtolfp.c $(std_unity_list)
+	$(run_unity) strtolfp.c run-strtolfp.c
+
+$(srcdir)/run-timespecops.c: $(srcdir)/timespecops.c $(std_unity_list)
+	$(run_unity) timespecops.c run-timespecops.c
+
+$(srcdir)/run-timevalops.c: $(srcdir)/timevalops.c $(std_unity_list)
+	$(run_unity) timevalops.c run-timevalops.c
+
+$(srcdir)/run-tstotv.c: $(srcdir)/tstotv.c $(std_unity_list)
+	$(run_unity) tstotv.c run-tstotv.c
+
+$(srcdir)/run-tvtots.c: $(srcdir)/tvtots.c $(std_unity_list)
+	$(run_unity) tvtots.c run-tvtots.c
+
+$(srcdir)/run-uglydate.c: $(srcdir)/uglydate.c $(std_unity_list)
+	$(run_unity) uglydate.c run-uglydate.c
+
+$(srcdir)/run-vi64ops.c: $(srcdir)/vi64ops.c $(std_unity_list)
+	$(run_unity) vi64ops.c run-vi64ops.c
+
+$(srcdir)/run-ymd2yd.c: $(srcdir)/ymd2yd.c $(std_unity_list)
+	$(run_unity) ymd2yd.c run-ymd2yd.c
 
 check-libntp: ../../libntp/libntp.a
 	@echo stamp > $@
 
 ../../libntp/libntp.a:
 	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+
+check-libunity: ../../sntp/unity/libunity.a
+	@echo stamp > $@
+
+../../sntp/unity/libunity.a:
+	cd ../../sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
 $(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
 	@[ -f $@ ] ||							\
 		cp $(top_srcdir)/deps-ver $@
diff --git a/contrib/ntp/tests/libntp/a_md5encrypt.c b/contrib/ntp/tests/libntp/a_md5encrypt.c
new file mode 100644
index 000000000000..1738200d314f
--- /dev/null
+++ b/contrib/ntp/tests/libntp/a_md5encrypt.c
@@ -0,0 +1,99 @@
+#include "config.h"
+#include "unity.h"
+
+#ifdef OPENSSL
+# include "openssl/err.h"
+# include "openssl/rand.h"
+# include "openssl/evp.h"
+#endif
+#include "ntp.h"
+#include "ntp_stdlib.h"
+
+u_long current_time = 4;
+
+
+void setUp(void)
+{
+}
+
+void tearDown(void)
+{
+}
+
+/*
+ * Example packet with MD5 hash calculated manually.
+ */
+const int keytype = KEY_TYPE_MD5;
+const char *key = "abcdefgh";
+const u_short keyLength = 8;
+const char *packet = "ijklmnopqrstuvwx";
+#define packetLength 16		//const int packetLength = 16;
+#define keyIdLength  4		//const int keyIdLength = 4;
+#define digestLength 16		//const int digestLength = 16;
+const int totalLength = packetLength + keyIdLength + digestLength;
+const char *expectedPacket = "ijklmnopqrstuvwx\0\0\0\0\x0c\x0e\x84\xcf\x0b\xb7\xa8\x68\x8e\x52\x38\xdb\xbc\x1c\x39\x53";
+
+void test_Encrypt() {
+	char *packetPtr = malloc(totalLength*sizeof(*packetPtr)); //new char[totalLength];
+
+	memset(packetPtr+packetLength, 0, keyIdLength);
+	memcpy(packetPtr, packet, packetLength);
+
+	cache_secretsize = keyLength;
+
+	int length = MD5authencrypt(keytype, (u_char*)key, (u_int32*)packetPtr, packetLength);
+
+	TEST_ASSERT_TRUE(MD5authdecrypt(keytype, (u_char*)key, (u_int32*)packetPtr, packetLength, length));
+
+	TEST_ASSERT_EQUAL(20, length);
+	TEST_ASSERT_TRUE(memcmp(expectedPacket, packetPtr, totalLength) == 0);
+
+	free(packetPtr); //delete[] packetPtr;
+}
+
+void test_DecryptValid() {
+	cache_secretsize = keyLength;
+
+	TEST_ASSERT_TRUE(MD5authdecrypt(keytype, (u_char*)key, (u_int32*)expectedPacket, packetLength, 20));
+}
+
+void test_DecryptInvalid() {
+	cache_secretsize = keyLength;
+
+	const char *invalidPacket = "ijklmnopqrstuvwx\0\0\0\0\x0c\x0e\x84\xcf\x0b\xb7\xa8\x68\x8e\x52\x38\xdb\xbc\x1c\x39\x54";
+
+	TEST_ASSERT_FALSE(MD5authdecrypt(keytype, (u_char*)key, (u_int32*)invalidPacket, packetLength, 20));
+}
+
+void test_IPv4AddressToRefId() {
+	sockaddr_u addr;
+	addr.sa4.sin_family = AF_INET;
+	addr.sa4.sin_port = htons(80);
+
+	u_int32 address = inet_addr("192.0.2.1");
+	addr.sa4.sin_addr.s_addr = address;
+
+	TEST_ASSERT_EQUAL(address, addr2refid(&addr));
+}
+
+void test_IPv6AddressToRefId() {
+	const struct in6_addr address = {
+		0x20, 0x01, 0x0d, 0xb8,
+		0x85, 0xa3, 0x08, 0xd3,
+		0x13, 0x19, 0x8a, 0x2e,
+		0x03, 0x70, 0x73, 0x34
+	};
+	sockaddr_u addr;
+
+	addr.sa6.sin6_family = AF_INET6;
+
+	addr.sa6.sin6_addr = address;
+
+	const int expected = 0x75cffd52;
+
+#if 0
+	TEST_ASSERT_EQUAL(expected, addr2refid(&addr));
+#else
+	TEST_IGNORE_MESSAGE("Skipping because of big endian problem?");
+#endif
+}
diff --git a/contrib/ntp/tests/libntp/atoint.c b/contrib/ntp/tests/libntp/atoint.c
new file mode 100644
index 000000000000..aca6ef596655
--- /dev/null
+++ b/contrib/ntp/tests/libntp/atoint.c
@@ -0,0 +1,51 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+#include "unity.h"
+
+void test_RegularPositive(void) {
+        const char *str = "17";
+        long val;
+
+        TEST_ASSERT_TRUE(atoint(str, &val));
+        TEST_ASSERT_EQUAL(17, val);
+}
+
+void test_RegularNegative(void) {
+        const char *str = "-20";
+        long val;
+
+        TEST_ASSERT_TRUE(atoint(str, &val));
+        TEST_ASSERT_EQUAL(-20, val);
+}
+
+void test_PositiveOverflowBoundary(void) {
+        const char *str = "2147483648";
+        long val;
+
+        TEST_ASSERT_FALSE(atoint(str, &val));
+}
+
+void test_NegativeOverflowBoundary(void) {
+        const char *str = "-2147483649";
+        long val;
+
+        TEST_ASSERT_FALSE(atoint(str, &val));
+}
+
+void test_PositiveOverflowBig(void) {
+        const char *str = "2300000000";
+        long val;
+
+        TEST_ASSERT_FALSE(atoint(str, &val));
+}
+
+void test_IllegalCharacter(void) {
+        const char *str = "4500l";
+        long val;
+
+        TEST_ASSERT_FALSE(atoint(str, &val));
+}
+
+
diff --git a/contrib/ntp/tests/libntp/atouint.c b/contrib/ntp/tests/libntp/atouint.c
new file mode 100644
index 000000000000..33c15a9141c3
--- /dev/null
+++ b/contrib/ntp/tests/libntp/atouint.c
@@ -0,0 +1,43 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+#include "ntp_fp.h"
+
+#include "unity.h"
+
+void test_RegularPositive() {
+	const char *str = "305";
+	u_long actual;
+
+	TEST_ASSERT_TRUE(atouint(str, &actual));
+	TEST_ASSERT_EQUAL(305, actual);
+}
+
+void test_PositiveOverflowBoundary() {
+	const char *str = "4294967296";
+	u_long actual;
+
+	TEST_ASSERT_FALSE(atouint(str, &actual));
+}
+
+void test_PositiveOverflowBig() {
+	const char *str = "8000000000";
+	u_long actual;
+
+	TEST_ASSERT_FALSE(atouint(str, &actual));
+}
+
+void test_Negative() {
+	const char *str = "-1";
+	u_long actual;
+
+	TEST_ASSERT_FALSE(atouint(str, &actual));
+}
+
+void test_IllegalChar() {
+	const char *str = "50c3";
+	u_long actual;
+
+	TEST_ASSERT_FALSE(atouint(str, &actual));
+}
diff --git a/contrib/ntp/tests/libntp/authkeys.c b/contrib/ntp/tests/libntp/authkeys.c
new file mode 100644
index 000000000000..b949628da3bd
--- /dev/null
+++ b/contrib/ntp/tests/libntp/authkeys.c
@@ -0,0 +1,119 @@
+/* This file contains test for both libntp/authkeys.c and libntp/authusekey.c */
+
+#include "config.h"
+
+#include "ntp.h"
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+
+#include "unity.h"
+
+#ifdef OPENSSL
+# include "openssl/err.h"
+# include "openssl/rand.h"
+# include "openssl/evp.h"
+#endif
+
+u_long current_time = 4;
+int counter = 0;
+
+
+// old code from google test framework, moved to SetUp() for unity
+void setUp(void)
+{ 
+//	init_lib();
+	if(counter ==0){
+	counter++;
+	init_auth(); //causes segfault if called more than once
+	}
+/*
+	 * init_auth() is called by tests_main.cpp earlier.  It
+	 * does not initialize global variables like
+	 * authnumkeys, so let's reset them to zero here.
+	 */
+	authnumkeys = 0;
+
+	/*
+	 * Especially, empty the key cache!
+	 */
+	cache_keyid = 0;
+	cache_type = 0;
+	cache_flags = 0;
+	cache_secret = NULL;
+	cache_secretsize = 0;
+
+}
+
+void tearDown(void)
+{
+}
+
+
+static const int KEYTYPE = KEY_TYPE_MD5;
+
+
+
+
+void AddTrustedKey(keyid_t keyno) {
+	/*
+	 * We need to add a MD5-key in addition to setting the
+	 * trust, because authhavekey() requires type != 0.
+	 */
+	MD5auth_setkey(keyno, KEYTYPE, NULL, 0);
+
+	authtrust(keyno, TRUE);
+}
+
+void AddUntrustedKey(keyid_t keyno) {
+	authtrust(keyno, FALSE);
+}
+
+void test_AddTrustedKeys() {
+	const keyid_t KEYNO1 = 5;
+	const keyid_t KEYNO2 = 8;
+
+	AddTrustedKey(KEYNO1);
+	AddTrustedKey(KEYNO2);
+
+	TEST_ASSERT_TRUE(authistrusted(KEYNO1));
+	TEST_ASSERT_TRUE(authistrusted(KEYNO2));
+}
+
+void test_AddUntrustedKey() {
+	const keyid_t KEYNO = 3;
+   
+	AddUntrustedKey(KEYNO);
+
+	TEST_ASSERT_FALSE(authistrusted(KEYNO));
+}
+
+void test_HaveKeyCorrect() {
+	const keyid_t KEYNO = 3;
+
+	AddTrustedKey(KEYNO);
+
+	TEST_ASSERT_TRUE(auth_havekey(KEYNO));
+	TEST_ASSERT_TRUE(authhavekey(KEYNO));
+}
+
+void test_HaveKeyIncorrect() {
+	const keyid_t KEYNO = 2;
+
+	TEST_ASSERT_FALSE(auth_havekey(KEYNO));
+	TEST_ASSERT_FALSE(authhavekey(KEYNO));
+}
+
+void test_AddWithAuthUseKey() {
+	const keyid_t KEYNO = 5;
+	const char* KEY = "52a";
+
+	TEST_ASSERT_TRUE(authusekey(KEYNO, KEYTYPE, (u_char*)KEY));	
+}
+
+void test_EmptyKey() {
+	const keyid_t KEYNO = 3;
+	const char* KEY = "";
+
+
+	TEST_ASSERT_FALSE(authusekey(KEYNO, KEYTYPE, (u_char*)KEY));
+}
diff --git a/contrib/ntp/tests/libntp/buftvtots.c b/contrib/ntp/tests/libntp/buftvtots.c
new file mode 100644
index 000000000000..edeedf63ad2b
--- /dev/null
+++ b/contrib/ntp/tests/libntp/buftvtots.c
@@ -0,0 +1,78 @@
+#include "config.h"
+#include "ntp_types.h"
+#include "ntp_stdlib.h"
+
+#include "lfptest.h"
+
+#include "ntp_unixtime.h"
+
+#include "unity.h"
+
+// Required for Solaris.
+#include 
+
+
+
+void test_ZeroBuffer() {
+#ifndef SYS_WINNT
+	const struct timeval input = {0, 0};
+	const l_fp expected = {0 + JAN_1970, 0};
+
+	l_fp actual;
+
+	TEST_ASSERT_TRUE(buftvtots((const char*)(&input), &actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+#else
+	TEST_IGNORE_MESSAGE("Test only for Windows, skipping...");
+#endif
+}
+
+void test_IntegerAndFractionalBuffer() {
+#ifndef SYS_WINNT
+	const struct timeval input = {5, 500000}; // 5.5
+	const l_fp expected = {5 + JAN_1970, HALF};
+
+	l_fp actual;
+
+	TEST_ASSERT_TRUE(buftvtots((const char*)(&input), &actual));
+
+	// Compare the fractional part with an absolute error given.
+	TEST_ASSERT_EQUAL(expected.l_ui, actual.l_ui);
+
+	double expectedDouble, actualDouble;
+	M_LFPTOD(0, expected.l_uf, expectedDouble);
+	M_LFPTOD(0, actual.l_uf, actualDouble);
+
+	// The error should be less than 0.5 us
+	TEST_ASSERT_DOUBLE_WITHIN(0.0000005,expectedDouble,actualDouble);  //delta,epected,actual //_EXPECT_NEAR(expectedDouble, actualDouble, 0.0000005);
+#else
+	TEST_IGNORE_MESSAGE("Test only for Windows, skipping...");
+#endif
+}
+
+void test_IllegalMicroseconds() {
+#ifndef SYS_WINNT
+	const struct timeval input = {0, 1100000}; // > 999 999 microseconds.
+	
+	l_fp actual;
+
+	TEST_ASSERT_FALSE(buftvtots((const char*)(&input), &actual));
+#else
+	TEST_IGNORE_MESSAGE("Test only for Windows, skipping...");
+#endif
+}
+
+
+void test_AlwaysFalseOnWindows() {
+#ifdef SYS_WINNT
+	/*
+	 * Under Windows, buftvtots will just return
+	 * 0 (false).
+	 */
+	l_fp actual;
+	TEST_ASSERT_FALSE(buftvtots("", &actual));
+#else
+	TEST_IGNORE_MESSAGE("Non-Windows test, skipping...");
+#endif
+}
+
diff --git a/contrib/ntp/tests/libntp/calendar.c b/contrib/ntp/tests/libntp/calendar.c
new file mode 100644
index 000000000000..4ac1df469c70
--- /dev/null
+++ b/contrib/ntp/tests/libntp/calendar.c
@@ -0,0 +1,416 @@
+#include "config.h"
+
+#include "ntp_stdlib.h" //test fail without this include, for some reason
+#include "ntp_calendar.h"
+#include "unity.h"
+
+//#include "test-libntp.h"
+
+
+#include 
+//#include 
+
+static int leapdays(int year);
+
+char * CalendarFromCalToString(const struct calendar cal); //&
+char * CalendarFromIsoToString(const struct isodate iso); //&
+
+//tehnically, booleans
+int IsEqualCal(const struct calendar expected, const struct calendar actual);  //&&
+int IsEqualIso(const struct isodate expected, const struct isodate actual); //&&
+
+char * DateFromCalToStringCal(const struct calendar cal); //&
+char * DateFromIsoToStringIso(const struct isodate iso); //&
+
+//tehnically, booleans
+int sEqualDateCal(const struct calendar expected, const struct calendar actual); //&&
+int IsEqualDateIso(const struct isodate expected, const struct isodate actual); //&&
+
+
+
+// ---------------------------------------------------------------------
+// test support stuff
+// ---------------------------------------------------------------------
+
+//function which, in combination with TEST_ASSERT_TRUE replaces google test framework's EXPECT_GT(a,b); -> GT means Greather Than
+//boolean
+int isGT(int first,int second){
+	if(first > second){
+	
+	return TRUE;
+	}
+
+	else return FALSE;
+}
+
+
+int leapdays(int year)
+{
+	if (year % 400 == 0)
+		return 1;
+	if (year % 100 == 0)
+		return 0;
+	if (year % 4 == 0)
+		return 1;
+	return 0;
+}
+
+char * CalendarFromCalToString(const struct calendar cal) { //&
+	char * ss = malloc (sizeof (char) * 100);
+	
+	char buffer[100] ="";
+	sprintf(buffer, "%u", cal.year);
+	strcat(ss,buffer);
+	strcat(ss,"-");
+	sprintf(buffer, "%u", (u_int)cal.month);
+	strcat(ss,buffer);
+	strcat(ss,"-");
+	sprintf(buffer, "%u", (u_int)cal.monthday);
+	strcat(ss,buffer);
+	strcat(ss," (");
+	sprintf(buffer, "%u", cal.yearday);
+	strcat(ss,buffer);
+	strcat(ss,") ");
+	sprintf(buffer, "%u", (u_int)cal.hour);
+	strcat(ss,buffer);
+	strcat(ss,":");
+	sprintf(buffer, "%u", (u_int)cal.minute);
+	strcat(ss,buffer);
+	strcat(ss,":");
+	sprintf(buffer, "%u", (u_int)cal.second);
+	strcat(ss,buffer);
+	//ss << cal.year << "-" << (u_int)cal.month << "-" << (u_int)cal.monthday << " (" << cal.yearday << ") " << (u_int)cal.hour << ":" << (u_int)cal.minute << ":" << (u_int)cal.second;
+	return ss;	
+
+}
+
+char * CalendarFromIsoToString(const struct isodate iso) { //&
+
+	char * ss = malloc (sizeof (char) * 100);
+	
+	char buffer[100] ="";
+	sprintf(buffer, "%u", iso.year);
+	strcat(ss,buffer);
+	strcat(ss,"-");
+	sprintf(buffer, "%u", (u_int)iso.week);
+	strcat(ss,buffer);
+	strcat(ss,"-");
+	sprintf(buffer, "%u", (u_int)iso.weekday);
+	strcat(ss,buffer);
+	sprintf(buffer, "%u", (u_int)iso.hour);
+	strcat(ss,buffer);
+	strcat(ss,":");
+	sprintf(buffer, "%u", (u_int)iso.minute);
+	strcat(ss,buffer);
+	strcat(ss,":");
+	sprintf(buffer, "%u", (u_int)iso.second);
+	strcat(ss,buffer);
+	//ss << iso.year << "-" << (u_int)iso.week << "-" << (u_int)iso.weekday << (u_int)iso.hour << ":" << (u_int)iso.minute << ":" << (u_int)iso.second;	
+	return ss;	
+
+}
+
+int IsEqualCal(const struct calendar expected, const struct calendar actual) { //&&
+	if (expected.year == actual.year &&
+	    (!expected.yearday || expected.yearday == actual.yearday) &&
+	    expected.month == actual.month &&
+	    expected.monthday == actual.monthday &&
+	    expected.hour == actual.hour &&
+	    expected.minute == actual.minute &&
+	    expected.second == actual.second) {
+		return TRUE;
+	} else {
+		printf("expected: %s but was %s", CalendarFromCalToString(expected) , CalendarFromCalToString(actual));
+		return FALSE;		  
+	}
+}
+
+int IsEqualIso(const struct isodate expected, const struct isodate actual) { //&&
+	if (expected.year == actual.year &&
+	    expected.week == actual.week &&
+	    expected.weekday == actual.weekday &&
+	    expected.hour == actual.hour &&
+	    expected.minute == actual.minute &&
+	    expected.second == actual.second) {
+		return TRUE;
+	} else {
+		printf("expected: %s but was %s", CalendarFromIsoToString(expected) , CalendarFromIsoToString(actual));
+		return FALSE;	   
+	}
+}
+
+char * DateFromCalToString(const struct calendar cal) { //&
+
+	char * ss = malloc (sizeof (char) * 100);
+	
+	char buffer[100] ="";
+	sprintf(buffer, "%u", cal.year);
+	strcat(ss,buffer);
+	strcat(ss,"-");
+	sprintf(buffer, "%u", (u_int)cal.month);
+	strcat(ss,buffer);
+	strcat(ss,"-");
+	sprintf(buffer, "%u", (u_int)cal.monthday);
+	strcat(ss,buffer);
+	strcat(ss," (");
+	sprintf(buffer, "%u", cal.yearday);
+	strcat(ss,buffer);
+	strcat(ss,")");
+	
+	return ss;
+	//ss << cal.year << "-" << (u_int)cal.month << "-" << (u_int)cal.monthday << " (" << cal.yearday << ")";
+}
+
+char * DateFromIsoToString(const struct isodate iso) { //&
+
+	char * ss = malloc (sizeof (char) * 100);
+	
+	char buffer[100] ="";
+	sprintf(buffer, "%u", iso.year);
+	strcat(ss,buffer);
+	strcat(ss,"-");
+	sprintf(buffer, "%u", (u_int)iso.week);
+	strcat(ss,buffer);
+	strcat(ss,"-");
+	sprintf(buffer, "%u", (u_int)iso.weekday);
+	strcat(ss,buffer);
+
+	return ss;
+	//ss << iso.year << "-" << (u_int)iso.week << "-" << (u_int)iso.weekday;
+	
+}
+
+//boolean 
+int IsEqualDateCal(const struct calendar expected, const struct calendar actual) { //&&
+	if (expected.year == actual.year &&
+	    (!expected.yearday || expected.yearday == actual.yearday) &&
+	    expected.month == actual.month &&
+	    expected.monthday == actual.monthday) {
+		return TRUE;
+	} else {
+		printf("expected: %s but was %s", DateFromCalToString(expected) ,DateFromCalToString(actual));
+		return FALSE;
+	}
+}
+
+//boolean
+int IsEqualDateIso(const struct isodate expected, const struct isodate actual) { //&&
+	if (expected.year == actual.year &&
+	    expected.week == actual.week &&
+	    expected.weekday == actual.weekday) {
+		return TRUE;
+	} else {
+		printf("expected: %s but was %s", DateFromIsoToString(expected) ,DateFromIsoToString(actual));
+		return FALSE;	    
+	}
+}
+
+
+// ---------------------------------------------------------------------
+// test cases
+// ---------------------------------------------------------------------
+static const u_short real_month_table[2][13] = {
+	/* -*- table for regular years -*- */
+	{ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
+	/* -*- table for leap years -*- */
+	{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
+};
+
+// days in month, with one month wrap-around at both ends
+static const u_short real_month_days[2][14] = {
+	/* -*- table for regular years -*- */
+	{ 31, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31 },
+	/* -*- table for leap years -*- */
+	{ 31, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31 }
+};
+
+// test the day/sec join & split ops, making sure that 32bit
+// intermediate results would definitely overflow and the hi DWORD of
+// the 'vint64' is definitely needed.
+void test_DaySplitMerge() {
+	int32 day,sec;
+	for (day = -1000000; day <= 1000000; day += 100) {
+		for (sec = -100000; sec <= 186400; sec += 10000) {
+			vint64	     merge = ntpcal_dayjoin(day, sec);
+			ntpcal_split split = ntpcal_daysplit(&merge);
+			int32	     eday  = day;
+			int32	     esec  = sec;
+
+			while (esec >= 86400) {
+				eday += 1;
+				esec -= 86400;
+			}
+			while (esec < 0) {
+				eday -= 1;
+				esec += 86400;
+			}
+
+			TEST_ASSERT_EQUAL(eday, split.hi);
+			TEST_ASSERT_EQUAL(esec, split.lo);
+		}
+	}
+}
+
+void test_SplitYearDays1() {
+	int32 eyd;
+	for (eyd = -1; eyd <= 365; eyd++) {
+		ntpcal_split split = ntpcal_split_yeardays(eyd, 0);
+		if (split.lo >= 0 && split.hi >= 0) {
+			TEST_ASSERT_TRUE(isGT(12,split.hi));//EXPECT_GT(12, split.hi);
+			TEST_ASSERT_TRUE(isGT(real_month_days[0][split.hi+1], split.lo));//EXPECT_GT(real_month_days[0][split.hi+1], split.lo);
+			int32 tyd = real_month_table[0][split.hi] + split.lo;
+			TEST_ASSERT_EQUAL(eyd, tyd);
+		} else
+			TEST_ASSERT_TRUE(eyd < 0 || eyd > 364);
+	}
+}
+		
+void test_SplitYearDays2() {
+	int32 eyd;
+	for (eyd = -1; eyd <= 366; eyd++) {
+		ntpcal_split split = ntpcal_split_yeardays(eyd, 1);
+		if (split.lo >= 0 && split.hi >= 0) {
+			//TEST_ASSERT_TRUE(12 > split.hi); //simpler version, works for basic types, doesn't work for complex structs
+			TEST_ASSERT_TRUE(isGT(12,split.hi));//EXPECT_GT(12, split.hi);
+			TEST_ASSERT_TRUE(isGT(real_month_days[1][split.hi+1], split.lo));//EXPECT_GT(real_month_days[1][split.hi+1], split.lo);
+			int32 tyd = real_month_table[1][split.hi] + split.lo;
+			TEST_ASSERT_EQUAL(eyd, tyd);
+		} else
+			TEST_ASSERT_TRUE(eyd < 0 || eyd > 365);
+		}
+}
+		
+void test_RataDie1() {
+	int32	 testDate = 1; // 0001-01-01 (proleptic date)
+	struct calendar expected = { 1, 1, 1, 1 };
+	struct calendar actual;
+
+	ntpcal_rd_to_date(&actual, testDate);
+	TEST_ASSERT_TRUE(IsEqualDateCal(expected, actual));
+}
+
+// check last day of february for first 10000 years
+void test_LeapYears1() {
+	struct calendar dateIn, dateOut;
+
+	for (dateIn.year = 1; dateIn.year < 10000; ++dateIn.year) {
+		dateIn.month	= 2;
+		dateIn.monthday = 28 + leapdays(dateIn.year);
+		dateIn.yearday	= 31 + dateIn.monthday;
+
+		ntpcal_rd_to_date(&dateOut, ntpcal_date_to_rd(&dateIn));
+
+		TEST_ASSERT_TRUE(IsEqualDateCal(dateIn, dateOut));
+	}
+}
+
+// check first day of march for first 10000 years
+void test_LeapYears2() {
+	struct calendar dateIn, dateOut;
+
+	for (dateIn.year = 1; dateIn.year < 10000; ++dateIn.year) {
+		dateIn.month	= 3;
+		dateIn.monthday = 1;
+		dateIn.yearday	= 60 + leapdays(dateIn.year);
+
+		ntpcal_rd_to_date(&dateOut, ntpcal_date_to_rd(&dateIn));
+		TEST_ASSERT_TRUE(IsEqualDateCal(dateIn, dateOut));
+	}
+}
+
+// Full roundtrip for 1601-01-01 to 2400-12-31
+// checks sequence of rata die numbers and validates date output
+// (since the input is all nominal days of the calendar in that range
+// and the result of the inverse calculation must match the input no
+// invalid output can occur.)
+void test_RoundTripDate() {
+	struct calendar truDate, expDate = { 1600, 0, 12, 31 };;
+	int32	 truRdn, expRdn	= ntpcal_date_to_rd(&expDate);
+	int	 leaps;
+
+	while (expDate.year < 2400) {
+		expDate.year++;
+		expDate.month	= 0;
+		expDate.yearday = 0;
+		leaps = leapdays(expDate.year);
+		while (expDate.month < 12) {
+			expDate.month++;			
+			expDate.monthday = 0;
+			while (expDate.monthday < real_month_days[leaps][expDate.month]) {
+				expDate.monthday++;
+				expDate.yearday++;
+				expRdn++;
+
+				truRdn = ntpcal_date_to_rd(&expDate);
+				TEST_ASSERT_EQUAL(expRdn, truRdn);
+
+				ntpcal_rd_to_date(&truDate, truRdn);
+				TEST_ASSERT_TRUE(IsEqualDateCal(expDate, truDate));
+			}
+		}
+	}
+}
+
+// Roundtrip testing on calyearstart
+void test_RoundTripYearStart() {
+	static const time_t pivot = 0;
+	u_int32 ntp, expys, truys;
+	struct calendar date;
+
+	for (ntp = 0; ntp < 0xFFFFFFFFu - 30000000u; ntp += 30000000u) {
+		truys = calyearstart(ntp, &pivot);
+		ntpcal_ntp_to_date(&date, ntp, &pivot);
+		date.month = date.monthday = 1;
+		date.hour = date.minute = date.second = 0;
+		expys = ntpcal_date_to_ntp(&date);
+		TEST_ASSERT_EQUAL(expys, truys);
+	}
+}	
+
+// Roundtrip testing on calymonthstart
+void test_RoundTripMonthStart() {
+	static const time_t pivot = 0;
+	u_int32 ntp, expms, trums;
+	struct calendar date;
+
+	for (ntp = 0; ntp < 0xFFFFFFFFu - 2000000u; ntp += 2000000u) {
+		trums = calmonthstart(ntp, &pivot);
+		ntpcal_ntp_to_date(&date, ntp, &pivot);
+		date.monthday = 1;
+		date.hour = date.minute = date.second = 0;
+		expms = ntpcal_date_to_ntp(&date);
+		TEST_ASSERT_EQUAL(expms, trums);
+	}
+}	
+
+// Roundtrip testing on calweekstart
+void test_RoundTripWeekStart() {
+	static const time_t pivot = 0;
+	u_int32 ntp, expws, truws;
+	struct isodate date;
+
+	for (ntp = 0; ntp < 0xFFFFFFFFu - 600000u; ntp += 600000u) {
+		truws = calweekstart(ntp, &pivot);
+		isocal_ntp_to_date(&date, ntp, &pivot);
+		date.hour = date.minute = date.second = 0;
+		date.weekday = 1;
+		expws = isocal_date_to_ntp(&date);
+		TEST_ASSERT_EQUAL(expws, truws);
+	}
+}	
+
+// Roundtrip testing on caldaystart
+void test_RoundTripDayStart() {
+	static const time_t pivot = 0;
+	u_int32 ntp, expds, truds;
+	struct calendar date;
+
+	for (ntp = 0; ntp < 0xFFFFFFFFu - 80000u; ntp += 80000u) {
+		truds = caldaystart(ntp, &pivot);
+		ntpcal_ntp_to_date(&date, ntp, &pivot);
+		date.hour = date.minute = date.second = 0;
+		expds = ntpcal_date_to_ntp(&date);
+		TEST_ASSERT_EQUAL(expds, truds);
+	}
+}	
+
diff --git a/contrib/ntp/tests/libntp/caljulian.c b/contrib/ntp/tests/libntp/caljulian.c
new file mode 100644
index 000000000000..907f25d86edc
--- /dev/null
+++ b/contrib/ntp/tests/libntp/caljulian.c
@@ -0,0 +1,116 @@
+#include "config.h"
+
+#include "ntp_calendar.h"
+#include "ntp_stdlib.h"
+#include "unity.h"
+
+#include "test-libntp.h"
+
+
+#include 
+//#include 
+
+//added struct to calendar!
+
+char * CalendarToString(const struct calendar cal) {
+	char * ss = malloc (sizeof (char) * 100);
+	
+	char buffer[100] ="";
+	sprintf(buffer, "%u", cal.year);
+	strcat(ss,buffer);
+	strcat(ss,"-");
+	sprintf(buffer, "%u", (u_int)cal.month);
+	strcat(ss,buffer);
+	strcat(ss,"-");
+	sprintf(buffer, "%u", (u_int)cal.monthday);
+	strcat(ss,buffer);
+	strcat(ss," (");
+	sprintf(buffer, "%u", (u_int) cal.yearday);
+	strcat(ss,buffer);
+	strcat(ss,") ");
+	sprintf(buffer, "%u", (u_int)cal.hour);
+	strcat(ss,buffer);
+	strcat(ss,":");
+	sprintf(buffer, "%u", (u_int)cal.minute);
+	strcat(ss,buffer);
+	strcat(ss,":");
+	sprintf(buffer, "%u", (u_int)cal.second);
+	strcat(ss,buffer);
+	//ss << cal.year << "-" << (u_int)cal.month << "-" << (u_int)cal.monthday << " (" << cal.yearday << ") " << (u_int)cal.hour << ":" << (u_int)cal.minute << ":" << (u_int)cal.second;
+	return ss;
+}
+
+//tehnically boolean
+int IsEqual(const struct calendar expected, const struct calendar actual) {
+	if (expected.year == actual.year &&
+		(expected.yearday == actual.yearday ||
+		 (expected.month == actual.month &&
+		  expected.monthday == actual.monthday)) &&
+		expected.hour == actual.hour &&
+		expected.minute == actual.minute &&
+		expected.second == actual.second) {
+		return TRUE;
+	} else {
+		printf("expected: %s but was %s", CalendarToString(expected) ,CalendarToString(actual));
+		return FALSE;
+			
+	}
+}
+
+
+void setUp()
+{
+
+    ntpcal_set_timefunc(timefunc);
+    settime(1970, 1, 1, 0, 0, 0);
+}
+
+void tearDown()
+{
+    ntpcal_set_timefunc(NULL);
+}
+
+
+void test_RegularTime() {
+	u_long testDate = 3485080800UL; // 2010-06-09 14:00:00
+	struct calendar expected = {2010,160,6,9,14,0,0};
+
+	struct calendar actual;
+
+	caljulian(testDate, &actual);
+
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_LeapYear() {
+	u_long input = 3549902400UL; // 2012-06-28 20:00:00Z
+	struct calendar expected = {2012, 179, 6, 28, 20, 0, 0};
+
+	struct calendar actual;
+
+	caljulian(input, &actual);
+
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_uLongBoundary() {
+	u_long time = 4294967295UL; // 2036-02-07 6:28:15
+	struct calendar expected = {2036,0,2,7,6,28,15};
+
+	struct calendar actual;
+
+	caljulian(time, &actual);
+
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_uLongWrapped() {
+	u_long time = 0;
+	struct calendar expected = {2036,0,2,7,6,28,16};
+
+	struct calendar actual;
+
+	caljulian(time, &actual);
+
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
diff --git a/contrib/ntp/tests/libntp/caltontp.c b/contrib/ntp/tests/libntp/caltontp.c
new file mode 100644
index 000000000000..9ce485440502
--- /dev/null
+++ b/contrib/ntp/tests/libntp/caltontp.c
@@ -0,0 +1,48 @@
+#include "config.h"
+#include "unity.h"
+#include "ntp_calendar.h"
+
+void
+test_DateGivenMonthDay(void) {
+	// 2010-06-24 12:50:00
+	struct calendar input = {2010, 0, 6, 24, 12, 50, 0};
+
+	u_long expected = 3486372600UL; // This is the timestamp above.
+
+	TEST_ASSERT_EQUAL_UINT(expected, caltontp(&input));
+}
+
+void
+test_DateGivenYearDay(void) {
+	// 2010-06-24 12:50:00
+	// This is the 175th day of 2010.
+	struct calendar input = {2010, 175, 0, 0, 12, 50, 0};
+
+	u_long expected = 3486372600UL; // This is the timestamp above.
+
+	TEST_ASSERT_EQUAL_UINT(expected, caltontp(&input));
+}
+
+void
+test_DateLeapYear(void) {
+	// 2012-06-24 12:00:00
+	// This is the 176th day of 2012 (since 2012 is a leap year).
+	struct calendar inputYd = {2012, 176, 0, 0, 12, 00, 00};
+	struct calendar inputMd = {2012, 0, 6, 24, 12, 00, 00};
+
+	u_long expected = 3549528000UL;
+
+	TEST_ASSERT_EQUAL_UINT(expected, caltontp(&inputYd));
+	TEST_ASSERT_EQUAL_UINT(expected, caltontp(&inputMd));
+}
+
+void
+test_WraparoundDateIn2036(void) {
+	// 2036-02-07 06:28:16
+	// This is (one) wrapping boundary where we go from ULONG_MAX to 0.
+	struct calendar input = {2036, 0, 2, 7, 6, 28, 16};
+
+	u_long expected = 0UL;
+
+	TEST_ASSERT_EQUAL_UINT(expected, caltontp(&input));
+}
diff --git a/contrib/ntp/tests/libntp/calyearstart.c b/contrib/ntp/tests/libntp/calyearstart.c
new file mode 100644
index 000000000000..b293c9339d97
--- /dev/null
+++ b/contrib/ntp/tests/libntp/calyearstart.c
@@ -0,0 +1,44 @@
+#include "config.h"
+
+#include "ntp_stdlib.h" //test fail without this include, for some reason
+#include "ntp_calendar.h"
+#include "unity.h"
+
+#include "test-libntp.h"
+
+
+void setUp()
+{
+    ntpcal_set_timefunc(timefunc);
+    settime(1970, 1, 1, 0, 0, 0);
+}
+
+void tearDown()
+{
+    ntpcal_set_timefunc(NULL);
+}
+
+
+void test_NoWrapInDateRange() {
+	const u_int32 input = 3486372600UL; // 2010-06-24 12:50:00.
+	const u_int32 expected = 3471292800UL; // 2010-01-01 00:00:00
+
+	TEST_ASSERT_EQUAL(expected, calyearstart(input, &nowtime));
+	TEST_ASSERT_EQUAL(expected, calyearstart(input, NULL));
+}
+
+void test_NoWrapInDateRangeLeapYear() {
+	const u_int32 input = 3549528000UL; // 2012-06-24 12:00:00
+	const u_int32 expected = 3534364800UL; // 2012-01-01 00:00:00
+
+	TEST_ASSERT_EQUAL(expected, calyearstart(input, &nowtime));
+	TEST_ASSERT_EQUAL(expected, calyearstart(input, NULL));
+}
+
+void test_WrapInDateRange() {
+	const u_int32 input = 19904UL; // 2036-02-07 12:00:00
+	const u_int32 expected = 4291747200UL; // 2036-01-01 00:00:00
+
+	TEST_ASSERT_EQUAL(expected, calyearstart(input, &nowtime));
+	TEST_ASSERT_EQUAL(expected, calyearstart(input, NULL));
+}
diff --git a/contrib/ntp/tests/libntp/clocktime.c b/contrib/ntp/tests/libntp/clocktime.c
new file mode 100644
index 000000000000..a9c0fec82648
--- /dev/null
+++ b/contrib/ntp/tests/libntp/clocktime.c
@@ -0,0 +1,201 @@
+#include "config.h"
+
+#include "ntp_calendar.h"
+#include "ntp_stdlib.h"
+
+#include "unity.h"
+#include "test-libntp.h"
+
+
+// ---------------------------------------------------------------------
+// test fixture
+//
+// The clocktimeTest uses the NTP calendar feature to use a mockup
+// function for getting the current system time, so the tests are not
+// dependent on the actual system time.
+
+
+void setUp()
+{
+    ntpcal_set_timefunc(timefunc);
+    settime(2000, 1, 1, 0, 0, 0);
+}
+
+void tearDown()
+{
+    ntpcal_set_timefunc(NULL);
+}
+
+// ---------------------------------------------------------------------
+// test cases
+
+void test_CurrentYear() {
+	// Timestamp: 2010-06-24 12:50:00Z
+	const u_int32 timestamp = 3486372600UL;
+	const u_int32 expected	= timestamp; // exactly the same.
+
+	const int yday=175, hour=12, minute=50, second=0, tzoff=0;
+
+	u_long yearstart=0;
+	u_int32 actual;
+
+	TEST_ASSERT_TRUE(clocktime(yday, hour, minute, second, tzoff, timestamp,
+						  &yearstart, &actual));
+	TEST_ASSERT_EQUAL(expected, actual);
+}
+
+void test_CurrentYearFuzz() {
+	/* 
+	 * Timestamp (rec_ui) is: 2010-06-24 12:50:00
+	 * Time sent into function is 12:00:00.
+	 *
+	 * Since the fuzz is rather small, we should get a NTP
+	 * timestamp for the 12:00:00 time.
+	 */
+
+	const u_int32 timestamp = 3486372600UL; // 2010-06-24 12:50:00Z
+	const u_int32 expected	= 3486369600UL; // 2010-06-24 12:00:00Z
+
+	const int yday=175, hour=12, minute=0, second=0, tzoff=0;
+
+	u_long yearstart=0;
+	u_int32 actual;
+
+	TEST_ASSERT_TRUE(clocktime(yday, hour, minute, second, tzoff, timestamp,
+						  &yearstart, &actual));
+	TEST_ASSERT_EQUAL(expected, actual);
+}
+
+void test_TimeZoneOffset() {
+	/*
+	 * Timestamp (rec_ui) is: 2010-06-24 12:00:00 +0800
+	 * (which is 2010-06-24 04:00:00Z)
+	 *
+	 * Time sent into function is 04:00:00 +0800
+	 */
+	const u_int32 timestamp = 3486369600UL;
+	const u_int32 expected	= timestamp;
+
+	const int yday=175, hour=4, minute=0, second=0, tzoff=8;
+
+	u_long yearstart=0;
+	u_int32 actual;
+
+	TEST_ASSERT_TRUE(clocktime(yday, hour, minute, second, tzoff, timestamp,
+						  &yearstart, &actual));
+	TEST_ASSERT_EQUAL(expected, actual);
+}
+
+void test_WrongYearStart() {
+	/* 
+	 * Timestamp (rec_ui) is: 2010-01-02 11:00:00Z
+	 * Time sent into function is 11:00:00.
+	 * Yearstart sent into function is the yearstart of 2009!
+	 */
+	const u_int32 timestamp = 3471418800UL;
+	const u_int32 expected	= timestamp;
+
+	const int yday=2, hour=11, minute=0, second=0, tzoff=0;
+
+	u_long yearstart = 302024100UL; // Yearstart of 2009.
+	u_int32 actual;
+
+	TEST_ASSERT_TRUE(clocktime(yday, hour, minute, second, tzoff, timestamp,
+						  &yearstart, &actual));
+	TEST_ASSERT_EQUAL(expected, actual);
+}
+
+void test_PreviousYear() {
+	/*
+	 * Timestamp is: 2010-01-01 01:00:00Z
+	 * Time sent into function is 23:00:00
+	 * (which is meant to be 2009-12-31 23:00:00Z)
+	 */
+	const u_int32 timestamp = 3471296400UL;
+	const u_int32 expected	= 3471289200UL;
+
+	const int yday=365, hour=23, minute=0, second=0, tzoff=0;
+
+	u_long yearstart = 0;
+	u_int32 actual;
+
+	TEST_ASSERT_TRUE(clocktime(yday, hour, minute, second, tzoff, timestamp,
+						  &yearstart, &actual));
+	TEST_ASSERT_EQUAL(expected, actual);
+}
+
+void test_NextYear() {
+	/*
+	 * Timestamp is: 2009-12-31 23:00:00Z
+	 * Time sent into function is 01:00:00
+	 * (which is meant to be 2010-01-01 01:00:00Z)
+	 */
+	const u_int32 timestamp = 3471289200UL;
+	const u_int32 expected	= 3471296400UL;
+
+	const int yday=1, hour=1, minute=0, second=0, tzoff=0;
+	u_long yearstart = 0;
+	u_int32 actual;
+
+	TEST_ASSERT_TRUE(clocktime(yday, hour, minute, second, tzoff, timestamp,
+						  &yearstart, &actual));
+	TEST_ASSERT_EQUAL(expected, actual);
+}
+
+void test_NoReasonableConversion() {
+	/* Timestamp is: 2010-01-02 11:00:00Z */
+	const u_int32 timestamp = 3471418800UL;
+	
+	const int yday=100, hour=12, minute=0, second=0, tzoff=0;
+	u_long yearstart = 0;
+	u_int32 actual;
+
+	TEST_ASSERT_FALSE(clocktime(yday, hour, minute, second, tzoff, timestamp,
+						   &yearstart, &actual));
+}
+
+// *** FUNCTION isLE, to simulate gtest's ASSERT_LE using Unity's TEST_ASSERT_TRUE
+//tehnically boolean
+int isLE(u_int32 diff,u_int32 actual){
+	if(diff <= actual){
+		return TRUE;
+	}
+	else return FALSE;
+}
+
+
+void test_AlwaysInLimit() {
+	/* Timestamp is: 2010-01-02 11:00:00Z */
+	const u_int32 timestamp = 3471418800UL;
+	const u_short prime_incs[] = { 127, 151, 163, 179 };
+	int	cyc;
+	int	yday;
+	u_char	whichprime;
+	u_short	ydayinc;
+	int	hour;
+	int	minute;
+	int	second;
+	u_long	yearstart;
+	u_int32	actual;
+	u_int32	diff;
+
+	yearstart = 0;
+	for (cyc = 0; cyc < 5; cyc++) {
+		settime(1900 + cyc * 65, 1, 1, 0, 0, 0);
+		for (yday = -26000; yday < 26000; yday += ydayinc) {
+			whichprime = abs(yday) % COUNTOF(prime_incs);
+			ydayinc = prime_incs[whichprime];
+			for (hour = -204; hour < 204; hour += 2) {
+				for (minute = -60; minute < 60; minute++) {
+					clocktime(yday, hour, minute, 30, 0,
+						  timestamp, &yearstart, &actual);
+					diff = actual - timestamp;
+					if (diff >= 0x80000000UL)
+						diff = ~diff + 1;
+					TEST_ASSERT_TRUE(isLE(diff, (183u * SECSPERDAY))); // adding new function to return TRUE if first number is less or equal the second
+					//TEST_ASSERT_LE(diff, (183u * SECSPERDAY));
+				}
+			}
+		}
+	}
+}
diff --git a/contrib/ntp/tests/libntp/decodenetnum.c b/contrib/ntp/tests/libntp/decodenetnum.c
new file mode 100644
index 000000000000..681b7125a017
--- /dev/null
+++ b/contrib/ntp/tests/libntp/decodenetnum.c
@@ -0,0 +1,96 @@
+#include "config.h"
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+#include "unity.h"
+
+#include "sockaddrtest.h"
+
+
+void test_IPv4AddressOnly(void) {
+	const char *str = "192.0.2.1";
+	sockaddr_u actual;
+
+	sockaddr_u expected;
+	expected.sa4.sin_family = AF_INET;
+	expected.sa4.sin_addr.s_addr = inet_addr("192.0.2.1");
+	SET_PORT(&expected, NTP_PORT);
+
+	TEST_ASSERT_TRUE(decodenetnum(str, &actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_IPv4AddressWithPort(void) {
+	const char *str = "192.0.2.2:2000";
+	sockaddr_u actual;
+
+	sockaddr_u expected;
+	expected.sa4.sin_family = AF_INET;
+	expected.sa4.sin_addr.s_addr = inet_addr("192.0.2.2");
+	SET_PORT(&expected, 2000);
+
+	TEST_ASSERT_TRUE(decodenetnum(str, &actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_IPv6AddressOnly(void) {
+	const struct in6_addr address = {
+		0x20, 0x01, 0x0d, 0xb8,
+        0x85, 0xa3, 0x08, 0xd3, 
+        0x13, 0x19, 0x8a, 0x2e,
+        0x03, 0x70, 0x73, 0x34
+	};
+
+	const char *str = "2001:0db8:85a3:08d3:1319:8a2e:0370:7334";
+	sockaddr_u actual;
+
+	sockaddr_u expected;
+	expected.sa6.sin6_family = AF_INET6;
+	expected.sa6.sin6_addr = address;
+	SET_PORT(&expected, NTP_PORT);
+
+	TEST_ASSERT_TRUE(decodenetnum(str, &actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_IPv6AddressWithPort(void) {
+	const struct in6_addr address = {
+		0x20, 0x01, 0x0d, 0xb8,
+        0x85, 0xa3, 0x08, 0xd3, 
+        0x13, 0x19, 0x8a, 0x2e,
+        0x03, 0x70, 0x73, 0x34
+	};
+
+	const char *str = "[2001:0db8:85a3:08d3:1319:8a2e:0370:7334]:3000";
+	sockaddr_u actual;
+
+	sockaddr_u expected;
+	expected.sa6.sin6_family = AF_INET6;
+	expected.sa6.sin6_addr = address;
+	SET_PORT(&expected, 3000);
+
+	TEST_ASSERT_TRUE(decodenetnum(str, &actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_IllegalAddress(void) {
+	const char *str = "192.0.2.270:2000";
+	sockaddr_u actual;
+
+	TEST_ASSERT_FALSE(decodenetnum(str, &actual));
+}
+
+void test_IllegalCharInPort(void) {
+	/* An illegal port does not make the decodenetnum fail, but instead
+	 * makes it use the standard port.
+	 */
+	const char *str = "192.0.2.1:a700";
+	sockaddr_u actual;
+
+	sockaddr_u expected;
+	expected.sa4.sin_family = AF_INET;
+	expected.sa4.sin_addr.s_addr = inet_addr("192.0.2.1");
+	SET_PORT(&expected, NTP_PORT);
+
+	TEST_ASSERT_TRUE(decodenetnum(str, &actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
diff --git a/contrib/ntp/tests/libntp/a_md5encrypt.cpp b/contrib/ntp/tests/libntp/g_a_md5encrypt.cpp
similarity index 98%
rename from contrib/ntp/tests/libntp/a_md5encrypt.cpp
rename to contrib/ntp/tests/libntp/g_a_md5encrypt.cpp
index f4cea7e54981..691bf78e2722 100644
--- a/contrib/ntp/tests/libntp/a_md5encrypt.cpp
+++ b/contrib/ntp/tests/libntp/g_a_md5encrypt.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #ifdef OPENSSL
diff --git a/contrib/ntp/tests/libntp/atoint.cpp b/contrib/ntp/tests/libntp/g_atoint.cpp
similarity index 96%
rename from contrib/ntp/tests/libntp/atoint.cpp
rename to contrib/ntp/tests/libntp/g_atoint.cpp
index 371f3fe0a2a1..9a8283fd2a26 100644
--- a/contrib/ntp/tests/libntp/atoint.cpp
+++ b/contrib/ntp/tests/libntp/g_atoint.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 class atointTest : public libntptest {
 };
diff --git a/contrib/ntp/tests/libntp/atouint.cpp b/contrib/ntp/tests/libntp/g_atouint.cpp
similarity index 96%
rename from contrib/ntp/tests/libntp/atouint.cpp
rename to contrib/ntp/tests/libntp/g_atouint.cpp
index cc8cc394b840..ba261dbb10ac 100644
--- a/contrib/ntp/tests/libntp/atouint.cpp
+++ b/contrib/ntp/tests/libntp/g_atouint.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 class atouintTest : public libntptest {
 };
diff --git a/contrib/ntp/tests/libntp/authkeys.cpp b/contrib/ntp/tests/libntp/g_authkeys.cpp
similarity index 98%
rename from contrib/ntp/tests/libntp/authkeys.cpp
rename to contrib/ntp/tests/libntp/g_authkeys.cpp
index 8dd33a9accfe..773112e52323 100644
--- a/contrib/ntp/tests/libntp/authkeys.cpp
+++ b/contrib/ntp/tests/libntp/g_authkeys.cpp
@@ -1,6 +1,6 @@
 /* This file contains test for both libntp/authkeys.c and libntp/authusekey.c */
 
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #ifdef OPENSSL
diff --git a/contrib/ntp/tests/libntp/buftvtots.cpp b/contrib/ntp/tests/libntp/g_buftvtots.cpp
similarity index 98%
rename from contrib/ntp/tests/libntp/buftvtots.cpp
rename to contrib/ntp/tests/libntp/g_buftvtots.cpp
index bb8a32d35bfa..050398b28369 100644
--- a/contrib/ntp/tests/libntp/buftvtots.cpp
+++ b/contrib/ntp/tests/libntp/g_buftvtots.cpp
@@ -1,4 +1,4 @@
-#include "lfptest.h"
+#include "g_lfptest.h"
 
 extern "C" {
 #include "ntp_unixtime.h"
diff --git a/contrib/ntp/tests/libntp/calendar.cpp b/contrib/ntp/tests/libntp/g_calendar.cpp
similarity index 99%
rename from contrib/ntp/tests/libntp/calendar.cpp
rename to contrib/ntp/tests/libntp/g_calendar.cpp
index 35b39c7e529f..2db9ff78f496 100644
--- a/contrib/ntp/tests/libntp/calendar.cpp
+++ b/contrib/ntp/tests/libntp/g_calendar.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #include "ntp_calendar.h"
diff --git a/contrib/ntp/tests/libntp/caljulian.cpp b/contrib/ntp/tests/libntp/g_caljulian.cpp
similarity index 98%
rename from contrib/ntp/tests/libntp/caljulian.cpp
rename to contrib/ntp/tests/libntp/g_caljulian.cpp
index d9cc952933e7..7ed38c43b6d9 100644
--- a/contrib/ntp/tests/libntp/caljulian.cpp
+++ b/contrib/ntp/tests/libntp/g_caljulian.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #include "ntp_calendar.h"
diff --git a/contrib/ntp/tests/libntp/caltontp.cpp b/contrib/ntp/tests/libntp/g_caltontp.cpp
similarity index 97%
rename from contrib/ntp/tests/libntp/caltontp.cpp
rename to contrib/ntp/tests/libntp/g_caltontp.cpp
index b9732db3273d..7dafec0ab19c 100644
--- a/contrib/ntp/tests/libntp/caltontp.cpp
+++ b/contrib/ntp/tests/libntp/g_caltontp.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #include "ntp_calendar.h"
diff --git a/contrib/ntp/tests/libntp/calyearstart.cpp b/contrib/ntp/tests/libntp/g_calyearstart.cpp
similarity index 97%
rename from contrib/ntp/tests/libntp/calyearstart.cpp
rename to contrib/ntp/tests/libntp/g_calyearstart.cpp
index 774edf3eae44..59859be61c57 100644
--- a/contrib/ntp/tests/libntp/calyearstart.cpp
+++ b/contrib/ntp/tests/libntp/g_calyearstart.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 class calyearstartTest : public libntptest {
 protected:
diff --git a/contrib/ntp/tests/libntp/clocktime.cpp b/contrib/ntp/tests/libntp/g_clocktime.cpp
similarity index 99%
rename from contrib/ntp/tests/libntp/clocktime.cpp
rename to contrib/ntp/tests/libntp/g_clocktime.cpp
index a24df1af48e3..ee496d252773 100644
--- a/contrib/ntp/tests/libntp/clocktime.cpp
+++ b/contrib/ntp/tests/libntp/g_clocktime.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 // ---------------------------------------------------------------------
 // test fixture
diff --git a/contrib/ntp/tests/libntp/decodenetnum.cpp b/contrib/ntp/tests/libntp/g_decodenetnum.cpp
similarity index 98%
rename from contrib/ntp/tests/libntp/decodenetnum.cpp
rename to contrib/ntp/tests/libntp/g_decodenetnum.cpp
index c6766de288ee..059642890601 100644
--- a/contrib/ntp/tests/libntp/decodenetnum.cpp
+++ b/contrib/ntp/tests/libntp/g_decodenetnum.cpp
@@ -1,4 +1,4 @@
-#include "sockaddrtest.h"
+#include "g_sockaddrtest.h"
 
 class decodenetnumTest : public sockaddrtest {
 };
diff --git a/contrib/ntp/tests/libntp/hextoint.cpp b/contrib/ntp/tests/libntp/g_hextoint.cpp
similarity index 96%
rename from contrib/ntp/tests/libntp/hextoint.cpp
rename to contrib/ntp/tests/libntp/g_hextoint.cpp
index 54c9a67aa149..c20821a9b5e8 100644
--- a/contrib/ntp/tests/libntp/hextoint.cpp
+++ b/contrib/ntp/tests/libntp/g_hextoint.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 class hextointTest : public libntptest {
 };
diff --git a/contrib/ntp/tests/libntp/hextolfp.cpp b/contrib/ntp/tests/libntp/g_hextolfp.cpp
similarity index 98%
rename from contrib/ntp/tests/libntp/hextolfp.cpp
rename to contrib/ntp/tests/libntp/g_hextolfp.cpp
index 2e9f072cd6d1..bcfb094f902b 100644
--- a/contrib/ntp/tests/libntp/hextolfp.cpp
+++ b/contrib/ntp/tests/libntp/g_hextolfp.cpp
@@ -1,4 +1,4 @@
-#include "lfptest.h"
+#include "g_lfptest.h"
 
 class hextolfpTest : public lfptest {
 };
diff --git a/contrib/ntp/tests/libntp/humandate.cpp b/contrib/ntp/tests/libntp/g_humandate.cpp
similarity index 97%
rename from contrib/ntp/tests/libntp/humandate.cpp
rename to contrib/ntp/tests/libntp/g_humandate.cpp
index 742aa28724ab..a50ae5340893 100644
--- a/contrib/ntp/tests/libntp/humandate.cpp
+++ b/contrib/ntp/tests/libntp/g_humandate.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 #include 
 #include 
diff --git a/contrib/ntp/tests/libntp/lfpfunc.cpp b/contrib/ntp/tests/libntp/g_lfpfunc.cpp
similarity index 99%
rename from contrib/ntp/tests/libntp/lfpfunc.cpp
rename to contrib/ntp/tests/libntp/g_lfpfunc.cpp
index 275918cdc50f..c9aaf9f2352f 100644
--- a/contrib/ntp/tests/libntp/lfpfunc.cpp
+++ b/contrib/ntp/tests/libntp/g_lfpfunc.cpp
@@ -1,5 +1,5 @@
-#include "libntptest.h"
-#include "timestructs.h"
+#include "g_libntptest.h"
+#include "g_timestructs.h"
 
 extern "C" {
 #include "ntp_fp.h"
diff --git a/contrib/ntp/tests/libntp/g_lfptest.h b/contrib/ntp/tests/libntp/g_lfptest.h
new file mode 100644
index 000000000000..1daffef944d7
--- /dev/null
+++ b/contrib/ntp/tests/libntp/g_lfptest.h
@@ -0,0 +1,32 @@
+#ifndef NTP_TESTS_LFPTEST_H
+#define NTP_TESTS_LFPTEST_H
+
+#include "g_libntptest.h"
+
+extern "C" {
+#include "ntp_fp.h"
+};
+
+class lfptest : public libntptest {
+protected:
+	::testing::AssertionResult IsEqual(const l_fp &expected, const l_fp &actual) {
+		if (L_ISEQU(&expected, &actual)) {
+			return ::testing::AssertionSuccess();
+		} else {
+			return ::testing::AssertionFailure()
+				<< " expected: " << lfptoa(&expected, FRACTION_PREC)
+				<< " (" << expected.l_ui << "." << expected.l_uf << ")"
+				<< " but was: " << lfptoa(&actual, FRACTION_PREC)
+				<< " (" << actual.l_ui << "." << actual.l_uf << ")";
+		}
+	}
+
+	static const int32 HALF = -2147483647L - 1L;
+	static const int32 HALF_PROMILLE_UP = 2147484; // slightly more than 0.0005
+	static const int32 HALF_PROMILLE_DOWN = 2147483; // slightly less than 0.0005
+	static const int32 QUARTER = 1073741824L;
+	static const int32 QUARTER_PROMILLE_APPRX = 1073742L;
+};
+
+#endif
+/* NTP_TESTS_LFPTEST_H */
diff --git a/contrib/ntp/tests/libntp/lfptostr.cpp b/contrib/ntp/tests/libntp/g_lfptostr.cpp
similarity index 99%
rename from contrib/ntp/tests/libntp/lfptostr.cpp
rename to contrib/ntp/tests/libntp/g_lfptostr.cpp
index aa5f5112d663..ae594a67cf9a 100644
--- a/contrib/ntp/tests/libntp/lfptostr.cpp
+++ b/contrib/ntp/tests/libntp/g_lfptostr.cpp
@@ -4,7 +4,7 @@
  * a macro.
  */
 
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #include "ntp_fp.h"
diff --git a/contrib/ntp/tests/libntp/libntptest.cpp b/contrib/ntp/tests/libntp/g_libntptest.cpp
similarity index 95%
rename from contrib/ntp/tests/libntp/libntptest.cpp
rename to contrib/ntp/tests/libntp/g_libntptest.cpp
index c3363b008bdb..8897b5c098c3 100644
--- a/contrib/ntp/tests/libntp/libntptest.cpp
+++ b/contrib/ntp/tests/libntp/g_libntptest.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 /* This file contains various constants that libntp needs to be set
  *  and that is normally defined in ntpd/ntpq/...
diff --git a/contrib/ntp/tests/libntp/libntptest.h b/contrib/ntp/tests/libntp/g_libntptest.h
similarity index 100%
rename from contrib/ntp/tests/libntp/libntptest.h
rename to contrib/ntp/tests/libntp/g_libntptest.h
diff --git a/contrib/ntp/tests/libntp/modetoa.cpp b/contrib/ntp/tests/libntp/g_modetoa.cpp
similarity index 91%
rename from contrib/ntp/tests/libntp/modetoa.cpp
rename to contrib/ntp/tests/libntp/g_modetoa.cpp
index cb7404d0393f..96bf3ce59952 100644
--- a/contrib/ntp/tests/libntp/modetoa.cpp
+++ b/contrib/ntp/tests/libntp/g_modetoa.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 class modetoaTest : public libntptest {
 };
diff --git a/contrib/ntp/tests/libntp/msyslog.cpp b/contrib/ntp/tests/libntp/g_msyslog.cpp
similarity index 99%
rename from contrib/ntp/tests/libntp/msyslog.cpp
rename to contrib/ntp/tests/libntp/g_msyslog.cpp
index 5b00703e6a7d..273600d3a84a 100644
--- a/contrib/ntp/tests/libntp/msyslog.cpp
+++ b/contrib/ntp/tests/libntp/g_msyslog.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #include 
diff --git a/contrib/ntp/tests/libntp/netof.cpp b/contrib/ntp/tests/libntp/g_netof.cpp
similarity index 98%
rename from contrib/ntp/tests/libntp/netof.cpp
rename to contrib/ntp/tests/libntp/g_netof.cpp
index 67b9df4e7cf7..8fc9ac7689be 100644
--- a/contrib/ntp/tests/libntp/netof.cpp
+++ b/contrib/ntp/tests/libntp/g_netof.cpp
@@ -1,4 +1,4 @@
-#include "sockaddrtest.h"
+#include "g_sockaddrtest.h"
 
 class netofTest : public sockaddrtest  {
 };
diff --git a/contrib/ntp/tests/libntp/numtoa.cpp b/contrib/ntp/tests/libntp/g_numtoa.cpp
similarity index 93%
rename from contrib/ntp/tests/libntp/numtoa.cpp
rename to contrib/ntp/tests/libntp/g_numtoa.cpp
index 58e00c4c27ec..a68e80dbd65d 100644
--- a/contrib/ntp/tests/libntp/numtoa.cpp
+++ b/contrib/ntp/tests/libntp/g_numtoa.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 class numtoaTest : public libntptest {
 };
diff --git a/contrib/ntp/tests/libntp/numtohost.cpp b/contrib/ntp/tests/libntp/g_numtohost.cpp
similarity index 92%
rename from contrib/ntp/tests/libntp/numtohost.cpp
rename to contrib/ntp/tests/libntp/g_numtohost.cpp
index ffc574ee85b3..e04cad8a6833 100644
--- a/contrib/ntp/tests/libntp/numtohost.cpp
+++ b/contrib/ntp/tests/libntp/g_numtohost.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 class numtohostTest : public libntptest {
 };
diff --git a/contrib/ntp/tests/libntp/octtoint.cpp b/contrib/ntp/tests/libntp/g_octtoint.cpp
similarity index 97%
rename from contrib/ntp/tests/libntp/octtoint.cpp
rename to contrib/ntp/tests/libntp/g_octtoint.cpp
index 14a993e035a1..8731eed63240 100644
--- a/contrib/ntp/tests/libntp/octtoint.cpp
+++ b/contrib/ntp/tests/libntp/g_octtoint.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 class octtointTest : public libntptest {
 };
diff --git a/contrib/ntp/tests/libntp/prettydate.cpp b/contrib/ntp/tests/libntp/g_prettydate.cpp
similarity index 92%
rename from contrib/ntp/tests/libntp/prettydate.cpp
rename to contrib/ntp/tests/libntp/g_prettydate.cpp
index 391ac29a85f5..45741b5a93de 100644
--- a/contrib/ntp/tests/libntp/prettydate.cpp
+++ b/contrib/ntp/tests/libntp/g_prettydate.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #include "ntp_fp.h"
diff --git a/contrib/ntp/tests/libntp/recvbuff.cpp b/contrib/ntp/tests/libntp/g_recvbuff.cpp
similarity index 96%
rename from contrib/ntp/tests/libntp/recvbuff.cpp
rename to contrib/ntp/tests/libntp/g_recvbuff.cpp
index e9505bd7c1cf..799802d8b484 100644
--- a/contrib/ntp/tests/libntp/recvbuff.cpp
+++ b/contrib/ntp/tests/libntp/g_recvbuff.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #include "recvbuff.h"
diff --git a/contrib/ntp/tests/libntp/refnumtoa.cpp b/contrib/ntp/tests/libntp/g_refnumtoa.cpp
similarity index 97%
rename from contrib/ntp/tests/libntp/refnumtoa.cpp
rename to contrib/ntp/tests/libntp/g_refnumtoa.cpp
index 75460c0b52ba..91648aa024b4 100644
--- a/contrib/ntp/tests/libntp/refnumtoa.cpp
+++ b/contrib/ntp/tests/libntp/g_refnumtoa.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 #include "ntp_net.h"
 #include "ntp_refclock.h"
diff --git a/contrib/ntp/tests/libntp/sfptostr.cpp b/contrib/ntp/tests/libntp/g_sfptostr.cpp
similarity index 98%
rename from contrib/ntp/tests/libntp/sfptostr.cpp
rename to contrib/ntp/tests/libntp/g_sfptostr.cpp
index 5cef47e3cdc2..c31b30c90be5 100644
--- a/contrib/ntp/tests/libntp/sfptostr.cpp
+++ b/contrib/ntp/tests/libntp/g_sfptostr.cpp
@@ -3,7 +3,7 @@
  * since all these functions are very similar.
  */
 
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #include "ntp_fp.h"
diff --git a/contrib/ntp/tests/libntp/g_sockaddrtest.h b/contrib/ntp/tests/libntp/g_sockaddrtest.h
new file mode 100644
index 000000000000..819a54f711dc
--- /dev/null
+++ b/contrib/ntp/tests/libntp/g_sockaddrtest.h
@@ -0,0 +1,59 @@
+#ifndef TESTS_SOCKADDRTEST_H
+#define TESTS_SOCKADDRTEST_H
+
+#include "g_libntptest.h"
+
+extern "C" {
+#include "ntp.h"
+};
+
+class sockaddrtest : public libntptest {
+protected:
+	::testing::AssertionResult IsEqual(const sockaddr_u &expected, const sockaddr_u &actual) {
+		if (expected.sa.sa_family != actual.sa.sa_family) {
+			return ::testing::AssertionFailure()
+				<< "Expected sa_family: " << expected.sa.sa_family
+				<< " but got: " << actual.sa.sa_family;
+		}
+
+		if (actual.sa.sa_family == AF_INET) { // IPv4
+			if (expected.sa4.sin_port == actual.sa4.sin_port &&
+				memcmp(&expected.sa4.sin_addr, &actual.sa4.sin_addr,
+					   sizeof(in_addr)) == 0) {
+				return ::testing::AssertionSuccess();
+			} else {
+				return ::testing::AssertionFailure()
+					<< "IPv4 comparision failed, expected: "
+					<< expected.sa4.sin_addr.s_addr
+					<< "(" << socktoa(&expected) << ")"
+					<< " but was: "
+					<< actual.sa4.sin_addr.s_addr
+					<< "(" << socktoa(&actual) << ")";
+			}
+		} else if (actual.sa.sa_family == AF_INET6) { //IPv6
+			if (expected.sa6.sin6_port == actual.sa6.sin6_port &&
+				memcmp(&expected.sa6.sin6_addr, &actual.sa6.sin6_addr,
+					   sizeof(in6_addr)) == 0) {
+				return ::testing::AssertionSuccess();
+			} else {
+				return ::testing::AssertionFailure()
+					<< "IPv6 comparision failed";
+			}
+		} else { // Unknown family
+			return ::testing::AssertionFailure()
+				<< "Unknown sa_family: " << actual.sa.sa_family;
+		}
+	}
+
+	sockaddr_u CreateSockaddr4(const char* address, unsigned int port) {
+		sockaddr_u s;
+		s.sa4.sin_family = AF_INET;
+		s.sa4.sin_addr.s_addr = inet_addr(address);
+		SET_PORT(&s, port);
+
+		return s;
+	}
+};
+
+#endif // TESTS_SOCKADDRTEST_H
+
diff --git a/contrib/ntp/tests/libntp/socktoa.cpp b/contrib/ntp/tests/libntp/g_socktoa.cpp
similarity index 98%
rename from contrib/ntp/tests/libntp/socktoa.cpp
rename to contrib/ntp/tests/libntp/g_socktoa.cpp
index 6c70b6d8ddc1..2bb2fb1e779c 100644
--- a/contrib/ntp/tests/libntp/socktoa.cpp
+++ b/contrib/ntp/tests/libntp/g_socktoa.cpp
@@ -1,4 +1,4 @@
-#include "sockaddrtest.h"
+#include "g_sockaddrtest.h"
 
 class socktoaTest : public sockaddrtest {
 };
diff --git a/contrib/ntp/tests/libntp/ssl_init.cpp b/contrib/ntp/tests/libntp/g_ssl_init.cpp
similarity index 97%
rename from contrib/ntp/tests/libntp/ssl_init.cpp
rename to contrib/ntp/tests/libntp/g_ssl_init.cpp
index 8812656c3142..16b2f4d4384a 100644
--- a/contrib/ntp/tests/libntp/ssl_init.cpp
+++ b/contrib/ntp/tests/libntp/g_ssl_init.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #ifdef OPENSSL
diff --git a/contrib/ntp/tests/libntp/statestr.cpp b/contrib/ntp/tests/libntp/g_statestr.cpp
similarity index 95%
rename from contrib/ntp/tests/libntp/statestr.cpp
rename to contrib/ntp/tests/libntp/g_statestr.cpp
index 506b079aa478..dedbf5b002b0 100644
--- a/contrib/ntp/tests/libntp/statestr.cpp
+++ b/contrib/ntp/tests/libntp/g_statestr.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #include "ntp.h" // Needed for MAX_MAC_LEN used in ntp_control.h
@@ -25,3 +25,4 @@ TEST_F(statestrTest, ClockCodeExists) {
 TEST_F(statestrTest, ClockCodeUnknown) {
 	EXPECT_STREQ("clk_-1", ceventstr(-1));
 }
+
diff --git a/contrib/ntp/tests/libntp/strtolfp.cpp b/contrib/ntp/tests/libntp/g_strtolfp.cpp
similarity index 99%
rename from contrib/ntp/tests/libntp/strtolfp.cpp
rename to contrib/ntp/tests/libntp/g_strtolfp.cpp
index 729996e0b17d..d1b361e86e99 100644
--- a/contrib/ntp/tests/libntp/strtolfp.cpp
+++ b/contrib/ntp/tests/libntp/g_strtolfp.cpp
@@ -1,4 +1,4 @@
-#include "lfptest.h"
+#include "g_lfptest.h"
 
 /* This class tests both atolfp and mstolfp */
 
diff --git a/contrib/ntp/tests/libntp/timespecops.cpp b/contrib/ntp/tests/libntp/g_timespecops.cpp
similarity index 99%
rename from contrib/ntp/tests/libntp/timespecops.cpp
rename to contrib/ntp/tests/libntp/g_timespecops.cpp
index 392d271020a5..0cc573ff4f14 100644
--- a/contrib/ntp/tests/libntp/timespecops.cpp
+++ b/contrib/ntp/tests/libntp/g_timespecops.cpp
@@ -1,5 +1,5 @@
-#include "libntptest.h"
-#include "timestructs.h"
+#include "g_libntptest.h"
+#include "g_timestructs.h"
 
 extern "C" {
 #include 
diff --git a/contrib/ntp/tests/libntp/timestructs.cpp b/contrib/ntp/tests/libntp/g_timestructs.cpp
similarity index 98%
rename from contrib/ntp/tests/libntp/timestructs.cpp
rename to contrib/ntp/tests/libntp/g_timestructs.cpp
index 3cd0c543fb00..15b5ec164aa3 100644
--- a/contrib/ntp/tests/libntp/timestructs.cpp
+++ b/contrib/ntp/tests/libntp/g_timestructs.cpp
@@ -4,8 +4,8 @@
  * Written by Juergen Perlinger (perlinger@ntp.org) for the NTP project.
  * The contents of 'html/copyright.html' apply.
  */
-#include "libntptest.h"
-#include "timestructs.h"
+#include "g_libntptest.h"
+#include "g_timestructs.h"
 
 extern "C" {
 #include "timetoa.h"
diff --git a/contrib/ntp/tests/libntp/timestructs.h b/contrib/ntp/tests/libntp/g_timestructs.h
similarity index 100%
rename from contrib/ntp/tests/libntp/timestructs.h
rename to contrib/ntp/tests/libntp/g_timestructs.h
diff --git a/contrib/ntp/tests/libntp/timevalops.cpp b/contrib/ntp/tests/libntp/g_timevalops.cpp
similarity index 99%
rename from contrib/ntp/tests/libntp/timevalops.cpp
rename to contrib/ntp/tests/libntp/g_timevalops.cpp
index 7232615b91bc..8c171fca0928 100644
--- a/contrib/ntp/tests/libntp/timevalops.cpp
+++ b/contrib/ntp/tests/libntp/g_timevalops.cpp
@@ -1,5 +1,5 @@
-#include "libntptest.h"
-#include "timestructs.h"
+#include "g_libntptest.h"
+#include "g_timestructs.h"
 
 extern "C" {
 #include 
diff --git a/contrib/ntp/tests/libntp/tstotv.cpp b/contrib/ntp/tests/libntp/g_tstotv.cpp
similarity index 97%
rename from contrib/ntp/tests/libntp/tstotv.cpp
rename to contrib/ntp/tests/libntp/g_tstotv.cpp
index 41f44d70e00b..30f4ca6a758f 100644
--- a/contrib/ntp/tests/libntp/tstotv.cpp
+++ b/contrib/ntp/tests/libntp/g_tstotv.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #include "ntp_fp.h"
diff --git a/contrib/ntp/tests/libntp/tvtots.cpp b/contrib/ntp/tests/libntp/g_tvtots.cpp
similarity index 98%
rename from contrib/ntp/tests/libntp/tvtots.cpp
rename to contrib/ntp/tests/libntp/g_tvtots.cpp
index c51b7f59e63f..fcb82a30bdc6 100644
--- a/contrib/ntp/tests/libntp/tvtots.cpp
+++ b/contrib/ntp/tests/libntp/g_tvtots.cpp
@@ -1,4 +1,4 @@
-#include "lfptest.h"
+#include "g_lfptest.h"
 
 extern "C" {
 #include "timevalops.h"
diff --git a/contrib/ntp/tests/libntp/uglydate.cpp b/contrib/ntp/tests/libntp/g_uglydate.cpp
similarity index 92%
rename from contrib/ntp/tests/libntp/uglydate.cpp
rename to contrib/ntp/tests/libntp/g_uglydate.cpp
index 6d9e6c6aceb8..12aa0025cab2 100644
--- a/contrib/ntp/tests/libntp/uglydate.cpp
+++ b/contrib/ntp/tests/libntp/g_uglydate.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #include "ntp_fp.h"
diff --git a/contrib/ntp/tests/libntp/vi64ops.cpp b/contrib/ntp/tests/libntp/g_vi64ops.cpp
similarity index 98%
rename from contrib/ntp/tests/libntp/vi64ops.cpp
rename to contrib/ntp/tests/libntp/g_vi64ops.cpp
index 7b839ab371d4..29f7932b37a0 100644
--- a/contrib/ntp/tests/libntp/vi64ops.cpp
+++ b/contrib/ntp/tests/libntp/g_vi64ops.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 extern "C" {
 #include "vint64ops.h"
diff --git a/contrib/ntp/tests/libntp/ymd2yd.cpp b/contrib/ntp/tests/libntp/g_ymd2yd.cpp
similarity index 95%
rename from contrib/ntp/tests/libntp/ymd2yd.cpp
rename to contrib/ntp/tests/libntp/g_ymd2yd.cpp
index e6f46f8c080b..7e2599960124 100644
--- a/contrib/ntp/tests/libntp/ymd2yd.cpp
+++ b/contrib/ntp/tests/libntp/g_ymd2yd.cpp
@@ -1,4 +1,4 @@
-#include "libntptest.h"
+#include "g_libntptest.h"
 
 class ymd2ydTest : public libntptest {
 };
diff --git a/contrib/ntp/tests/libntp/hextoint.c b/contrib/ntp/tests/libntp/hextoint.c
new file mode 100644
index 000000000000..e9f0d398fee8
--- /dev/null
+++ b/contrib/ntp/tests/libntp/hextoint.c
@@ -0,0 +1,47 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+#include "ntp_fp.h"
+
+#include "unity.h"
+
+
+void test_SingleDigit(void) {
+        const char *str = "a"; // 10 decimal
+        u_long actual;
+
+        TEST_ASSERT_TRUE(hextoint(str, &actual));
+        TEST_ASSERT_EQUAL(10, actual);
+}
+
+void test_MultipleDigits(void) {
+        const char *str = "8F3"; // 2291 decimal
+        u_long actual;
+
+        TEST_ASSERT_TRUE(hextoint(str, &actual));
+        TEST_ASSERT_EQUAL(2291, actual);
+}
+
+void test_MaxUnsigned(void) {
+        const char *str = "ffffffff"; // 4294967295 decimal
+        u_long actual;
+
+        TEST_ASSERT_TRUE(hextoint(str, &actual));
+        TEST_ASSERT_EQUAL(4294967295UL, actual);
+}
+
+void test_Overflow(void) {
+        const char *str = "100000000"; // Overflow by 1
+        u_long actual;
+
+        TEST_ASSERT_FALSE(hextoint(str, &actual));
+}
+
+void test_IllegalChar(void) {
+        const char *str = "5gb"; // Illegal character g
+        u_long actual;
+
+        TEST_ASSERT_FALSE(hextoint(str, &actual));
+}
+
diff --git a/contrib/ntp/tests/libntp/hextolfp.c b/contrib/ntp/tests/libntp/hextolfp.c
new file mode 100644
index 000000000000..a2f548f56644
--- /dev/null
+++ b/contrib/ntp/tests/libntp/hextolfp.c
@@ -0,0 +1,63 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+
+#include "unity.h"
+#include "lfptest.h"
+
+
+void test_PositiveInteger(void) {
+	const char *str = "00001000.00000000";
+	l_fp actual;
+
+	l_fp expected = {4096, 0}; // 16^3, no fraction part.
+
+	TEST_ASSERT_TRUE(hextolfp(str, &actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_NegativeInteger(void) {
+	const char *str = "ffffffff.00000000"; // -1 decimal
+	l_fp actual;
+
+	l_fp expected = {-1, 0};
+
+	TEST_ASSERT_TRUE(hextolfp(str, &actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_PositiveFraction(void) {
+	const char *str = "00002000.80000000"; // 8196.5 decimal
+	l_fp actual;
+
+	l_fp expected = {8192, HALF};
+
+	TEST_ASSERT_TRUE(hextolfp(str, &actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_NegativeFraction(void) {
+	const char *str = "ffffffff.40000000"; // -1 + 0.25 decimal
+	l_fp actual;
+
+	l_fp expected = {-1, QUARTER}; //-1 + 0.25
+
+	TEST_ASSERT_TRUE(hextolfp(str, &actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_IllegalNumberOfInteger(void) {
+	const char *str = "1000000.00000000"; // Missing one digit in integral part.
+	l_fp actual;
+
+	TEST_ASSERT_FALSE(hextolfp(str, &actual));
+}
+
+void test_IllegalChar(void) {
+	const char *str = "10000000.0000h000"; // Illegal character h.
+	l_fp actual;
+
+	TEST_ASSERT_FALSE(hextolfp(str, &actual));
+}
+
diff --git a/contrib/ntp/tests/libntp/humandate.c b/contrib/ntp/tests/libntp/humandate.c
new file mode 100644
index 000000000000..071fa4159900
--- /dev/null
+++ b/contrib/ntp/tests/libntp/humandate.c
@@ -0,0 +1,36 @@
+#include "config.h"
+
+#include "ntp_calendar.h"
+#include "ntp_stdlib.h"
+
+#include "unity.h"
+
+void test_RegularTime(void)
+{
+	time_t sample = 1276601278;
+	char expected[15];
+
+	struct tm* time;
+	time = localtime(&sample);
+	TEST_ASSERT_TRUE(time != NULL);
+
+	snprintf(expected, 15, "%02d:%02d:%02d", time->tm_hour, time->tm_min, time->tm_sec);
+
+	TEST_ASSERT_EQUAL_STRING(expected, humantime(sample));
+}
+
+void test_CurrentTime(void)
+{
+	time_t sample;
+	char expected[15];
+
+	time(&sample);
+
+	struct tm* time;
+	time = localtime(&sample);
+	TEST_ASSERT_TRUE(time != NULL);
+
+	snprintf(expected, 15, "%02d:%02d:%02d", time->tm_hour, time->tm_min, time->tm_sec);
+
+	TEST_ASSERT_EQUAL_STRING(expected, humantime(sample));
+}
diff --git a/contrib/ntp/tests/libntp/lfpfunc.c b/contrib/ntp/tests/libntp/lfpfunc.c
new file mode 100644
index 000000000000..188478d10c07
--- /dev/null
+++ b/contrib/ntp/tests/libntp/lfpfunc.c
@@ -0,0 +1,561 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+#include "ntp_fp.h"
+
+#include "unity.h"
+
+#include 
+#include 
+
+
+//replaced TEST_ASSERT_EQUAL_MEMORY(&a,&b,sizeof(a)) with TEST_ASSERT_EQUAL_l_fp(a,b). It's safer this way, because structs can be compared even if they aren't initiated with memset (due to padding bytes)
+#define TEST_ASSERT_EQUAL_l_fp(a, b) { \
+    TEST_ASSERT_EQUAL_MESSAGE(a.l_i, b.l_i, "Field l_i"); \
+    TEST_ASSERT_EQUAL_UINT_MESSAGE(a.l_uf, b.l_uf, "Field l_uf");	\
+}
+
+typedef struct  {
+	uint32_t h, l;
+} lfp_hl;
+
+
+static int cmp_work(u_int32 a[3], u_int32 b[3]);
+
+/*
+//----------------------------------------------------------------------
+// OO-wrapper for 'l_fp'
+//----------------------------------------------------------------------
+
+
+	~LFP();
+	LFP();
+	LFP(const LFP& rhs);
+	LFP(int32 i, u_int32 f);
+
+	LFP  operator+ (const LFP &rhs) const;
+	LFP& operator+=(const LFP &rhs);
+
+	LFP  operator- (const LFP &rhs) const;
+	LFP& operator-=(const LFP &rhs);
+
+	LFP& operator=(const LFP &rhs);
+	LFP  operator-() const;
+
+	bool operator==(const LFP &rhs) const;
+
+	LFP  neg() const;
+	LFP  abs() const;
+	int  signum() const;
+
+	
+
+	int  ucmp(const LFP & rhs) const;
+	int  scmp(const LFP & rhs) const;
+	
+	std::string   toString() const;
+	std::ostream& toStream(std::ostream &oo) const;
+	
+	operator double() const;
+	explicit LFP(double);
+	
+
+	LFP(const l_fp &rhs);
+
+	static int cmp_work(u_int32 a[3], u_int32 b[3]);
+	
+	l_fp _v;
+
+	
+static std::ostream& operator<<(std::ostream &oo, const LFP& rhs)
+{
+	return rhs.toStream(oo);
+}
+*/
+//----------------------------------------------------------------------
+// reference comparision
+// This is implementad as a full signed MP-subtract in 3 limbs, where
+// the operands are zero or sign extended before the subtraction is
+// executed.
+//----------------------------------------------------------------------
+int  l_fp_scmp(const l_fp first, const l_fp second)
+{
+	u_int32 a[3], b[3];
+	
+	const l_fp op1 = first;
+	const l_fp op2 = second;
+	//const l_fp &op1(_v), &op2(rhs._v);
+	
+	a[0] = op1.l_uf; a[1] = op1.l_ui; a[2] = 0;
+	b[0] = op2.l_uf; b[1] = op2.l_ui; b[2] = 0;
+
+	a[2] -= (op1.l_i < 0);
+	b[2] -= (op2.l_i < 0);
+
+	return cmp_work(a,b);
+}
+
+int  l_fp_ucmp(const l_fp first, l_fp second )
+{
+	u_int32 a[3], b[3];
+	const l_fp op1 = first; 
+	const l_fp op2 = second;
+	
+	a[0] = op1.l_uf; a[1] = op1.l_ui; a[2] = 0;
+	b[0] = op2.l_uf; b[1] = op2.l_ui; b[2] = 0;
+
+	return cmp_work(a,b);
+}
+
+
+//maybe rename it to lf_cmp_work ???
+int cmp_work(u_int32 a[3], u_int32 b[3])
+{
+	u_int32 cy, idx, tmp;
+	for (cy = idx = 0; idx < 3; ++idx) {
+		tmp = a[idx]; cy  = (a[idx] -=   cy  ) > tmp;
+		tmp = a[idx]; cy |= (a[idx] -= b[idx]) > tmp;
+	}
+	if (a[2])
+		return -1;
+	return a[0] || a[1];
+}
+
+
+//----------------------------------------------------------------------
+// imlementation of the LFP stuff
+// This should be easy enough...
+//----------------------------------------------------------------------
+
+
+
+l_fp l_fp_init(int32 i, u_int32 f)
+{
+	l_fp temp;
+	temp.l_i  = i;
+	temp.l_uf = f;
+
+	return temp;
+}
+
+
+
+l_fp l_fp_add(const l_fp first, const l_fp second)
+{
+	l_fp temp;
+	temp = first;
+	L_ADD(&temp, &second);
+	return temp;
+}
+
+l_fp l_fp_subtract(const l_fp first, const l_fp second)
+{
+	l_fp temp;
+	temp = first;
+	L_SUB(&temp, &second);
+	
+	return temp;
+}
+
+l_fp l_fp_negate(const l_fp first)
+{
+	l_fp temp;
+	temp = first; //is this line really necessary?
+	L_NEG(&temp);
+	
+	return temp;
+}
+
+l_fp l_fp_abs(const l_fp first)
+{
+	l_fp temp = first;
+	if (L_ISNEG(&temp))
+		L_NEG(&temp);
+	return temp;
+}
+
+int l_fp_signum(const l_fp first)
+{
+	if (first.l_ui & 0x80000000u)
+		return -1;
+	return (first.l_ui || first.l_uf);
+}
+
+double l_fp_convert_to_double(const l_fp first)
+{
+	double res;
+	LFPTOD(&first, res);
+	return res;
+}
+
+l_fp l_fp_init_from_double( double rhs)
+{
+	l_fp temp;
+	DTOLFP(rhs, &temp);
+	return temp;
+}
+
+
+
+void l_fp_swap(l_fp * first, l_fp *second){
+	l_fp temp = *second;
+
+	*second = *first;
+	*first = temp;
+
+}
+
+
+/*
+LFP::LFP()
+{
+	_v.l_ui = 0;
+	_v.l_uf = 0;
+}
+
+
+
+std::string
+LFP::toString() const
+{
+	std::ostringstream oss;
+	toStream(oss);
+	return oss.str();
+}
+
+std::ostream&
+LFP::toStream(std::ostream &os) const
+{
+	return os
+	    << mfptoa(_v.l_ui, _v.l_uf, 9)
+	    << " [$" << std::setw(8) << std::setfill('0') << std::hex << _v.l_ui
+	    <<  ':'  << std::setw(8) << std::setfill('0') << std::hex << _v.l_uf
+	    << ']';
+}
+
+bool LFP::operator==(const LFP &rhs) const
+{
+	return L_ISEQU(&_v, &rhs._v);
+}
+
+
+
+*/
+
+//----------------------------------------------------------------------
+// testing the relational macros works better with proper predicate
+// formatting functions; it slows down the tests a bit, but makes for
+// readable failure messages.
+//----------------------------------------------------------------------
+
+
+typedef int bool; //typedef enum { FALSE, TRUE } boolean; -> can't use this because TRUE and FALSE are already defined
+
+
+bool l_isgt (const l_fp first, const l_fp second)
+	{ return L_ISGT(&first, &second); }
+bool l_isgtu(const l_fp first, const l_fp second)
+	{ return L_ISGTU(&first, &second); }
+bool l_ishis(const l_fp first, const l_fp second)
+	{ return L_ISHIS(&first, &second); }
+bool l_isgeq(const l_fp first, const l_fp second)
+	{ return L_ISGEQ(&first, &second); }
+bool l_isequ(const l_fp first, const l_fp second)
+	{ return L_ISEQU(&first, &second); }
+
+
+//----------------------------------------------------------------------
+// test data table for add/sub and compare
+//----------------------------------------------------------------------
+
+
+static const lfp_hl addsub_tab[][3] = {
+	// trivial idendity:
+	{{0 ,0         }, { 0,0         }, { 0,0}},
+	// with carry from fraction and sign change:
+	{{-1,0x80000000}, { 0,0x80000000}, { 0,0}},
+	// without carry from fraction
+	{{ 1,0x40000000}, { 1,0x40000000}, { 2,0x80000000}},
+	// with carry from fraction:
+	{{ 1,0xC0000000}, { 1,0xC0000000}, { 3,0x80000000}},
+	// with carry from fraction and sign change:
+	{{0x7FFFFFFF, 0x7FFFFFFF}, {0x7FFFFFFF,0x7FFFFFFF}, {0xFFFFFFFE,0xFFFFFFFE}},
+	// two tests w/o carry (used for l_fp<-->double):
+	{{0x55555555,0xAAAAAAAA}, {0x11111111,0x11111111}, {0x66666666,0xBBBBBBBB}},
+	{{0x55555555,0x55555555}, {0x11111111,0x11111111}, {0x66666666,0x66666666}},
+	// wide-range test, triggers compare trouble
+	{{0x80000000,0x00000001}, {0xFFFFFFFF,0xFFFFFFFE}, {0x7FFFFFFF,0xFFFFFFFF}}
+};
+static const size_t addsub_cnt = (sizeof(addsub_tab)/sizeof(addsub_tab[0]));
+static const size_t addsub_tot = (sizeof(addsub_tab)/sizeof(addsub_tab[0][0]));
+
+
+
+//----------------------------------------------------------------------
+// epsilon estimation for the precision of a conversion double --> l_fp
+//
+// The error estimation limit is as follows:
+//  * The 'l_fp' fixed point fraction has 32 bits precision, so we allow
+//    for the LSB to toggle by clamping the epsilon to be at least 2^(-31)
+//
+//  * The double mantissa has a precsion 54 bits, so the other minimum is
+//    dval * (2^(-53))
+//
+//  The maximum of those two boundaries is used for the check.
+//
+// Note: once there are more than 54 bits between the highest and lowest
+// '1'-bit of the l_fp value, the roundtrip *will* create truncation
+// errors. This is an inherent property caused by the 54-bit mantissa of
+// the 'double' type.
+double eps(double d)
+{
+	return fmax(ldexp(1.0, -31), ldexp(fabs(d), -53)); //max
+}
+
+
+
+//----------------------------------------------------------------------
+// test addition
+//----------------------------------------------------------------------
+void test_AdditionLR() {
+	
+	size_t idx=0;
+	for (idx=0; idx < addsub_cnt; ++idx) {
+
+
+		l_fp op1 = l_fp_init(addsub_tab[idx][0].h, addsub_tab[idx][0].l);
+		//LFP op1(addsub_tab[idx][0].h, addsub_tab[idx][0].l);
+		l_fp op2 = l_fp_init(addsub_tab[idx][1].h, addsub_tab[idx][1].l);
+		//LFP exp(addsub_tab[idx][2].h, addsub_tab[idx][2].l);
+		l_fp exp = l_fp_init(addsub_tab[idx][2].h, addsub_tab[idx][2].l);
+		//LFP res(op1 + op2);
+		l_fp res = l_fp_add(op1,op2);		
+
+		TEST_ASSERT_EQUAL_l_fp(exp,res);
+		//TEST_ASSERT_EQUAL_MEMORY(&exp, &res,sizeof(exp));
+	}	
+}
+
+void test_AdditionRL() {
+
+	size_t idx=0;
+	for (idx=0; idx < addsub_cnt; ++idx) {
+		l_fp op2 = l_fp_init(addsub_tab[idx][0].h, addsub_tab[idx][0].l);
+		l_fp op1 = l_fp_init(addsub_tab[idx][1].h, addsub_tab[idx][1].l);
+		l_fp exp = l_fp_init(addsub_tab[idx][2].h, addsub_tab[idx][2].l);
+		l_fp res = l_fp_add(op1,op2);
+
+		TEST_ASSERT_EQUAL_l_fp(exp,res);
+		//TEST_ASSERT_EQUAL_MEMORY(&exp, &res,sizeof(exp));
+	}	
+}
+
+
+
+//----------------------------------------------------------------------
+// test subtraction
+//----------------------------------------------------------------------
+void test_SubtractionLR() {
+
+	size_t idx=0;
+	for (idx=0; idx < addsub_cnt; ++idx) {
+		l_fp op2 = l_fp_init(addsub_tab[idx][0].h, addsub_tab[idx][0].l);
+		l_fp exp = l_fp_init(addsub_tab[idx][1].h, addsub_tab[idx][1].l);
+		l_fp op1 = l_fp_init(addsub_tab[idx][2].h, addsub_tab[idx][2].l);
+		l_fp res = l_fp_subtract(op1,op2);
+		//LFP res(op1 - op2);
+		
+		TEST_ASSERT_EQUAL_l_fp(exp,res);		
+		//TEST_ASSERT_EQUAL_MEMORY(&exp, &res,sizeof(exp));
+	}	
+}
+
+void test_SubtractionRL() {
+
+	size_t idx=0;
+	for (idx=0; idx < addsub_cnt; ++idx) {
+		l_fp exp = l_fp_init(addsub_tab[idx][0].h, addsub_tab[idx][0].l);
+		l_fp op2 = l_fp_init(addsub_tab[idx][1].h, addsub_tab[idx][1].l);
+		l_fp op1 = l_fp_init(addsub_tab[idx][2].h, addsub_tab[idx][2].l);
+		l_fp res = l_fp_subtract(op1,op2);
+
+		TEST_ASSERT_EQUAL_l_fp(exp,res);
+		//TEST_ASSERT_EQUAL_MEMORY(&exp, &res,sizeof(exp));
+	}	
+}
+
+//----------------------------------------------------------------------
+// test negation
+//----------------------------------------------------------------------
+
+void test_Negation() {
+
+	size_t idx=0;
+	for (idx=0; idx < addsub_cnt; ++idx) {
+		l_fp op1 = l_fp_init(addsub_tab[idx][0].h, addsub_tab[idx][0].l);
+		l_fp op2 = l_fp_negate(op1);
+		l_fp sum = l_fp_add(op1, op2);
+		
+		l_fp zero = l_fp_init(0,0);
+
+		TEST_ASSERT_EQUAL_l_fp(zero,sum);
+		//TEST_ASSERT_EQUAL_MEMORY(&zero, &sum,sizeof(sum));
+	
+	}	
+}
+
+
+
+//----------------------------------------------------------------------
+// test absolute value
+//----------------------------------------------------------------------
+void test_Absolute() {
+	size_t idx=0;
+	for (idx=0; idx < addsub_cnt; ++idx) {
+		l_fp op1 = l_fp_init(addsub_tab[idx][0].h, addsub_tab[idx][0].l);
+		l_fp op2 = l_fp_abs(op1);
+
+		TEST_ASSERT_TRUE(l_fp_signum(op2) >= 0);		
+
+		if (l_fp_signum(op1) >= 0)
+			op1 = l_fp_subtract(op1,op2); //op1 -= op2;
+			
+		else
+			op1 = l_fp_add(op1,op2);
+		
+		l_fp zero = l_fp_init(0,0);
+		
+		TEST_ASSERT_EQUAL_l_fp(zero,op1);
+		//TEST_ASSERT_EQUAL_MEMORY(&zero, &op1,sizeof(op1));
+	}
+
+	// There is one special case we have to check: the minimum
+	// value cannot be negated, or, to be more precise, the
+	// negation reproduces the original pattern.
+	l_fp minVal = l_fp_init(0x80000000, 0x00000000);
+	l_fp minAbs = l_fp_abs(minVal);
+	TEST_ASSERT_EQUAL(-1, l_fp_signum(minVal));
+
+	TEST_ASSERT_EQUAL_l_fp(minVal,minAbs);
+	//TEST_ASSERT_EQUAL_MEMORY(&minVal, &minAbs,sizeof(minAbs));
+}
+
+
+//----------------------------------------------------------------------
+// fp -> double -> fp rountrip test
+//----------------------------------------------------------------------
+void test_FDF_RoundTrip() {
+	// since a l_fp has 64 bits in it's mantissa and a double has
+	// only 54 bits available (including the hidden '1') we have to
+	// make a few concessions on the roundtrip precision. The 'eps()'
+	// function makes an educated guess about the avilable precision
+	// and checks the difference in the two 'l_fp' values against
+	// that limit.
+	size_t idx=0;
+	for (idx=0; idx < addsub_cnt; ++idx) {
+		l_fp op1 = l_fp_init(addsub_tab[idx][0].h, addsub_tab[idx][0].l);
+		double op2 = l_fp_convert_to_double(op1);
+		l_fp op3 = l_fp_init_from_double(op2); 
+
+		// for manual checks only:
+		// std::cout << std::setprecision(16) << op2 << std::endl;
+
+		l_fp temp = l_fp_subtract(op1,op3);
+		double d = l_fp_convert_to_double(temp);
+ 		TEST_ASSERT_DOUBLE_WITHIN(eps(op2),0.0, fabs(d)); //delta,epected,actual
+		  		
+		//ASSERT_LE(fabs(op1-op3), eps(op2)); //unity has no equivalent of LE!!!
+		//you could use TEST_ASSERT_TRUE(IsLE(fabs(op1-op3), eps(op2)));
+	}	
+}
+
+
+//----------------------------------------------------------------------
+// test the compare stuff
+//
+// This uses the local compare and checks if the operations using the
+// macros in 'ntp_fp.h' produce mathing results.
+// ----------------------------------------------------------------------
+void test_SignedRelOps() {
+	//const lfp_hl * tv(&addsub_tab[0][0]);
+	const lfp_hl * tv = (&addsub_tab[0][0]);
+	size_t lc ;
+	for (lc=addsub_tot-1; lc; --lc,++tv) {
+		l_fp op1 = l_fp_init(tv[0].h,tv[0].l);
+		l_fp op2 = l_fp_init(tv[1].h,tv[1].l);
+		//int cmp(op1.scmp(op2));
+		int cmp = l_fp_scmp(op1,op2);		
+		
+		switch (cmp) {
+		case -1:
+			//printf("op1:%d %d, op2:%d %d\n",op1.l_uf,op1.l_ui,op2.l_uf,op2.l_ui);
+			//std::swap(op1, op2);
+			l_fp_swap(&op1,&op2);
+			//printf("op1:%d %d, op2:%d %d\n",op1.l_uf,op1.l_ui,op2.l_uf,op2.l_ui);
+		case 1:
+			TEST_ASSERT_TRUE (l_isgt(op1,op2));
+			TEST_ASSERT_FALSE(l_isgt(op2,op1));
+
+			TEST_ASSERT_TRUE (l_isgeq(op1,op2));
+			TEST_ASSERT_FALSE(l_isgeq(op2,op1));
+
+			TEST_ASSERT_FALSE(l_isequ(op1,op2));
+			TEST_ASSERT_FALSE(l_isequ(op2,op1));
+			break;
+		case 0:
+			TEST_ASSERT_FALSE(l_isgt(op1,op2));
+			TEST_ASSERT_FALSE(l_isgt(op2,op1));
+
+			TEST_ASSERT_TRUE (l_isgeq(op1,op2));
+			TEST_ASSERT_TRUE (l_isgeq(op2,op1));
+
+			TEST_ASSERT_TRUE (l_isequ(op1,op2));
+			TEST_ASSERT_TRUE (l_isequ(op2,op1));
+			break;
+		default:
+			TEST_FAIL_MESSAGE("unexpected UCMP result: " );	
+			//TEST_ASSERT_FAIL() << "unexpected SCMP result: " << cmp;
+		}
+	}
+}
+
+void test_UnsignedRelOps() {
+	const lfp_hl * tv =(&addsub_tab[0][0]);	
+	size_t lc;
+	for (lc=addsub_tot-1; lc; --lc,++tv) {
+		l_fp op1 = l_fp_init(tv[0].h,tv[0].l);
+		l_fp op2 = l_fp_init(tv[1].h,tv[1].l);
+		int cmp = l_fp_ucmp(op1,op2);
+
+		switch (cmp) {
+		case -1:
+			//printf("op1:%d %d, op2:%d %d\n",op1.l_uf,op1.l_ui,op2.l_uf,op2.l_ui);
+			l_fp_swap(&op1, &op2);
+			//printf("op1:%d %d, op2:%d %d\n",op1.l_uf,op1.l_ui,op2.l_uf,op2.l_ui);
+		case 1:
+			TEST_ASSERT_TRUE (l_isgtu(op1,op2));
+			TEST_ASSERT_FALSE(l_isgtu(op2,op1));
+
+			TEST_ASSERT_TRUE (l_ishis(op1,op2));
+			TEST_ASSERT_FALSE(l_ishis(op2,op1));
+			break;
+		case 0:
+			TEST_ASSERT_FALSE(l_isgtu(op1,op2));
+			TEST_ASSERT_FALSE(l_isgtu(op2,op1));
+
+			TEST_ASSERT_TRUE (l_ishis(op1,op2));
+			TEST_ASSERT_TRUE (l_ishis(op2,op1));
+			break;
+		default:
+			TEST_FAIL_MESSAGE("unexpected UCMP result: " );	
+			//FAIL() << "unexpected UCMP result: " << cmp;
+		}
+	}
+}
+/*
+*/
+
+//----------------------------------------------------------------------
+// that's all folks... but feel free to add things!
+//----------------------------------------------------------------------
diff --git a/contrib/ntp/tests/libntp/lfptest.h b/contrib/ntp/tests/libntp/lfptest.h
index 034eb41dd6ce..7949821a2063 100644
--- a/contrib/ntp/tests/libntp/lfptest.h
+++ b/contrib/ntp/tests/libntp/lfptest.h
@@ -1,31 +1,30 @@
 #ifndef NTP_TESTS_LFPTEST_H
 #define NTP_TESTS_LFPTEST_H
 
-#include "libntptest.h"
-
-extern "C" {
 #include "ntp_fp.h"
-};
 
-class lfptest : public libntptest {
-protected:
-	::testing::AssertionResult IsEqual(const l_fp &expected, const l_fp &actual) {
-		if (L_ISEQU(&expected, &actual)) {
-			return ::testing::AssertionSuccess();
-		} else {
-			return ::testing::AssertionFailure()
-				<< " expected: " << lfptoa(&expected, FRACTION_PREC)
+int IsEqual(const l_fp expected, const l_fp actual) {
+	if (L_ISEQU(&expected, &actual)) {
+		return TRUE;
+	} else {
+		//printf(" expected: ...");
+		/*
+		<< " expected: " << lfptoa(&expected, FRACTION_PREC)
 				<< " (" << expected.l_ui << "." << expected.l_uf << ")"
 				<< " but was: " << lfptoa(&actual, FRACTION_PREC)
 				<< " (" << actual.l_ui << "." << actual.l_uf << ")";
-		}
+		*/
+		return FALSE;
 	}
 
-	static const int32 HALF = -2147483647L - 1L;
-	static const int32 HALF_PROMILLE_UP = 2147484; // slightly more than 0.0005
-	static const int32 HALF_PROMILLE_DOWN = 2147483; // slightly less than 0.0005
-	static const int32 QUARTER = 1073741824L;
-	static const int32 QUARTER_PROMILLE_APPRX = 1073742L;
-};
+}
+
+static const int32 HALF = -2147483647L - 1L;
+static const int32 HALF_PROMILLE_UP = 2147484; // slightly more than 0.0005
+static const int32 HALF_PROMILLE_DOWN = 2147483; // slightly less than 0.0005
+static const int32 QUARTER = 1073741824L;
+static const int32 QUARTER_PROMILLE_APPRX = 1073742L;
+
+#endif
+
 
-#endif /* NTP_TESTS_LFPTEST_H */
diff --git a/contrib/ntp/tests/libntp/lfptostr.c b/contrib/ntp/tests/libntp/lfptostr.c
new file mode 100644
index 000000000000..c76e07fb0ed8
--- /dev/null
+++ b/contrib/ntp/tests/libntp/lfptostr.c
@@ -0,0 +1,103 @@
+/* 
+ * This file contains test for both mfptoa and mfptoms (which uses dolfptoa),
+ * since all these functions are very similar. It also tests ulfptoa, which is
+ * a macro.
+ */
+
+#include "config.h"
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+#include "ntp_fp.h"
+
+#include "unity.h"
+
+static const int LFP_MAX_PRECISION = 10;
+static const int LFP_MAX_PRECISION_MS = 7;
+
+static const int ONE_FOURTH = 1073741824; // (1 << 30)
+static const int HALF = (1 << 31);
+static const int THREE_FOURTH = -1073741824;
+static const int HALF_PROMILLE_UP = 2147484; // slightly more than 0.0005
+static const int HALF_PROMILLE_DOWN = 2147483; // slightly less than 0.0005
+
+void test_PositiveInteger(void) {
+	l_fp test = {200, 0}; // exact 200.0000000000
+
+	TEST_ASSERT_EQUAL_STRING("200.0000000000", mfptoa(test.l_ui, test.l_uf, LFP_MAX_PRECISION));
+	TEST_ASSERT_EQUAL_STRING("200000.0000000", mfptoms(test.l_ui, test.l_uf, LFP_MAX_PRECISION_MS));
+}
+
+void test_NegativeInteger(void) {
+	l_fp test = {-100, 0}; // -100
+
+	TEST_ASSERT_EQUAL_STRING("-100.0000000000", lfptoa(&test, LFP_MAX_PRECISION));
+	TEST_ASSERT_EQUAL_STRING("-100000.0000000", lfptoms(&test, LFP_MAX_PRECISION_MS));
+}
+
+void test_PositiveIntegerWithFraction(void) {
+	l_fp test = {200, ONE_FOURTH}; // 200.25
+
+	TEST_ASSERT_EQUAL_STRING("200.2500000000", lfptoa(&test, LFP_MAX_PRECISION));
+	TEST_ASSERT_EQUAL_STRING("200250.0000000", lfptoms(&test, LFP_MAX_PRECISION_MS));
+}
+
+void test_NegativeIntegerWithFraction(void) {
+	l_fp test = {-100, ONE_FOURTH}; // -99.75
+
+	TEST_ASSERT_EQUAL_STRING("-99.7500000000", lfptoa(&test, LFP_MAX_PRECISION));
+	TEST_ASSERT_EQUAL_STRING("-99750.0000000", lfptoms(&test, LFP_MAX_PRECISION_MS));
+}
+
+void test_RoundingDownToInteger(void) {
+	l_fp test = {10, ONE_FOURTH}; // 10.25
+
+	TEST_ASSERT_EQUAL_STRING("10", lfptoa(&test, 0));
+	TEST_ASSERT_EQUAL_STRING("10250", lfptoms(&test, 0));
+}
+
+void test_RoundingMiddleToInteger(void) {
+	l_fp test = {10, HALF}; // 10.5
+
+	TEST_ASSERT_EQUAL_STRING("11", lfptoa(&test, 0));
+	TEST_ASSERT_EQUAL_STRING("10500", lfptoms(&test, 0));
+}
+
+void test_RoundingUpToInteger(void) {
+	l_fp test = {5, THREE_FOURTH}; // 5.75
+
+	TEST_ASSERT_EQUAL_STRING("6", lfptoa(&test, 0));
+	TEST_ASSERT_EQUAL_STRING("5750", lfptoms(&test, 0));
+}
+
+void test_SingleDecimal(void) {
+	l_fp test = {8, ONE_FOURTH}; // 8.25
+
+	TEST_ASSERT_EQUAL_STRING("8.3", lfptoa(&test, 1));
+	TEST_ASSERT_EQUAL_STRING("8250.0", lfptoms(&test, 1));
+}
+
+void test_MillisecondsRoundingUp(void) {
+	l_fp test = {1, HALF_PROMILLE_UP}; //slightly more than 1.0005
+
+	TEST_ASSERT_EQUAL_STRING("1.0", lfptoa(&test, 1));
+
+	TEST_ASSERT_EQUAL_STRING("1000.5", lfptoms(&test, 1));
+	TEST_ASSERT_EQUAL_STRING("1001", lfptoms(&test, 0));
+}
+
+void test_MillisecondsRoundingDown(void) {
+	l_fp test = {1, HALF_PROMILLE_DOWN}; // slightly less than 1.0005
+
+	TEST_ASSERT_EQUAL_STRING("1.0", lfptoa(&test, 1));
+
+	TEST_ASSERT_EQUAL_STRING("1000.5", lfptoms(&test, 1));
+	TEST_ASSERT_EQUAL_STRING("1000", lfptoms(&test, 0));
+}
+
+void test_UnsignedInteger(void) {
+	l_fp test = {3000000000UL, 0};
+
+	TEST_ASSERT_EQUAL_STRING("3000000000.0", ulfptoa(&test, 1));
+}
+
+
diff --git a/contrib/ntp/tests/libntp/modetoa.c b/contrib/ntp/tests/libntp/modetoa.c
new file mode 100644
index 000000000000..19a76d5851ed
--- /dev/null
+++ b/contrib/ntp/tests/libntp/modetoa.c
@@ -0,0 +1,20 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+
+#include "unity.h"
+
+
+void test_KnownMode(void) {
+	const int MODE = 3; // Should be "client"
+	TEST_ASSERT_EQUAL_STRING("client", modetoa(MODE));
+
+}
+
+void test_UnknownMode(void) {
+	const int MODE = 100;
+
+	TEST_ASSERT_EQUAL_STRING("mode#100", modetoa(MODE));
+//	EXPECT_STREQ("mode#100", modetoa(MODE));
+}
diff --git a/contrib/ntp/tests/libntp/msyslog.c b/contrib/ntp/tests/libntp/msyslog.c
new file mode 100644
index 000000000000..23ec40110557
--- /dev/null
+++ b/contrib/ntp/tests/libntp/msyslog.c
@@ -0,0 +1,136 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+
+#include "unity.h"
+
+#ifndef VSNPRINTF_PERCENT_M
+// format_errmsg() is normally private to msyslog.c
+void	format_errmsg	(char *, size_t, const char *, int);
+#endif
+
+
+
+void test_msnprintf(void) {
+#define FMT_PREFIX "msyslog.cpp ENOENT: "
+	char	exp_buf[512];
+	char	act_buf[512];
+	int	exp_cnt;
+	int	act_cnt;
+
+	exp_cnt = snprintf(exp_buf, sizeof(exp_buf), FMT_PREFIX "%s",
+			   strerror(ENOENT));
+	errno = ENOENT;
+	act_cnt = msnprintf(act_buf, sizeof(act_buf), FMT_PREFIX "%m");
+	TEST_ASSERT_EQUAL(exp_cnt, act_cnt);
+	TEST_ASSERT_EQUAL_STRING(exp_buf, act_buf);
+}
+
+void
+test_msnprintfLiteralPercentm(void)
+{
+	char	exp_buf[32];
+	char	act_buf[32];
+	int	exp_cnt;
+	int	act_cnt;
+
+	exp_cnt = snprintf(exp_buf, sizeof(exp_buf), "%%m");
+	errno = ENOENT;
+	act_cnt = msnprintf(act_buf, sizeof(act_buf), "%%m");
+	TEST_ASSERT_EQUAL(exp_cnt, act_cnt);
+	TEST_ASSERT_EQUAL_STRING(exp_buf, act_buf);
+}
+
+void
+test_msnprintfBackslashLiteralPercentm(void) {
+	char	exp_buf[32];
+	char	act_buf[32];
+	int	exp_cnt;
+	int	act_cnt;
+
+	exp_cnt = snprintf(exp_buf, sizeof(exp_buf), "\%%m");
+	errno = ENOENT;
+	act_cnt = msnprintf(act_buf, sizeof(act_buf), "\%%m");
+	TEST_ASSERT_EQUAL(exp_cnt, act_cnt);
+	TEST_ASSERT_EQUAL_STRING(exp_buf, act_buf);
+}
+
+void
+test_msnprintfBackslashPercent(void) {
+	char	exp_buf[32];
+	char	act_buf[32];
+	int	exp_cnt;
+	int	act_cnt;
+
+	exp_cnt = snprintf(exp_buf, sizeof(exp_buf), "\%s",
+			   strerror(ENOENT));
+	errno = ENOENT;
+	act_cnt = msnprintf(act_buf, sizeof(act_buf), "\%m");
+	TEST_ASSERT_EQUAL(exp_cnt, act_cnt);
+	TEST_ASSERT_EQUAL_STRING(exp_buf, act_buf);
+}
+
+void
+test_msnprintfHangingPercent(void) {
+	static char fmt[] = "percent then nul term then non-nul %\0oops!";
+	char exp_buf[64];
+	char act_buf[64];
+	int	exp_cnt;
+	int	act_cnt;
+
+	ZERO(exp_buf);
+	ZERO(act_buf);
+	exp_cnt = snprintf(exp_buf, sizeof(exp_buf), "%s", fmt);
+	act_cnt = msnprintf(act_buf, sizeof(act_buf), "%s", fmt);
+	TEST_ASSERT_EQUAL(exp_cnt, act_cnt);
+	TEST_ASSERT_EQUAL_STRING(exp_buf, act_buf);
+	TEST_ASSERT_EQUAL_STRING("", act_buf + 1 + strlen(act_buf));
+}
+
+void
+test_format_errmsgHangingPercent(void) {
+#ifndef VSNPRINTF_PERCENT_M
+	static char fmt[] = "percent then nul term then non-nul %\0oops!";
+	char act_buf[64];
+
+	ZERO(act_buf);
+	format_errmsg(act_buf, sizeof(act_buf), fmt, ENOENT);
+	TEST_ASSERT_EQUAL_STRING(fmt, act_buf);
+	TEST_ASSERT_EQUAL_STRING("", act_buf + 1 + strlen(act_buf));
+#else
+	TEST_IGNORE_MESSAGE("VSNPRINTF_PERCENT_M is defined")
+#endif
+}
+
+void
+test_msnprintfNullTarget(void) {
+	int	exp_cnt;
+	int	act_cnt;
+
+	exp_cnt = snprintf(NULL, 0, "%d", 123);
+	errno = ENOENT;
+	act_cnt = msnprintf(NULL, 0, "%d", 123);
+	TEST_ASSERT_EQUAL(exp_cnt, act_cnt);
+}
+
+void
+test_msnprintfTruncate(void) {
+	char	undist[] = "undisturbed";
+	char	exp_buf[512];
+	char	act_buf[512];
+	int	exp_cnt;
+	int	act_cnt;
+
+	memcpy(exp_buf + 3, undist, sizeof(undist));
+	memcpy(act_buf + 3, undist, sizeof(undist));
+	exp_cnt = snprintf(exp_buf, 3, "%s", strerror(ENOENT));
+	errno = ENOENT;
+	act_cnt = msnprintf(act_buf, 3, "%m");
+	TEST_ASSERT_EQUAL('\0', exp_buf[2]);
+	TEST_ASSERT_EQUAL('\0', act_buf[2]);
+	TEST_ASSERT_TRUE(act_cnt > 0);
+	TEST_ASSERT_EQUAL(exp_cnt, act_cnt);
+	TEST_ASSERT_EQUAL_STRING(exp_buf, act_buf);
+	TEST_ASSERT_EQUAL_STRING(exp_buf + 3, undist);
+	TEST_ASSERT_EQUAL_STRING(act_buf + 3, undist);
+}
diff --git a/contrib/ntp/tests/libntp/netof.c b/contrib/ntp/tests/libntp/netof.c
new file mode 100644
index 000000000000..010b16429365
--- /dev/null
+++ b/contrib/ntp/tests/libntp/netof.c
@@ -0,0 +1,74 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+
+#include "unity.h"
+
+#include "sockaddrtest.h"
+
+void test_ClassBAddress(void) {
+	sockaddr_u input = CreateSockaddr4("172.16.2.1", NTP_PORT);
+	sockaddr_u expected = CreateSockaddr4("172.16.0.0", NTP_PORT);
+
+	sockaddr_u* actual = netof(&input);
+
+	TEST_ASSERT_TRUE(actual != NULL);
+	TEST_ASSERT_TRUE(IsEqual(expected, *actual));
+}
+
+void test_ClassCAddress(void) {
+	sockaddr_u input = CreateSockaddr4("192.0.2.255", NTP_PORT);
+	sockaddr_u expected = CreateSockaddr4("192.0.2.0", NTP_PORT);
+
+	sockaddr_u* actual = netof(&input);
+
+	TEST_ASSERT_TRUE(actual != NULL);
+	TEST_ASSERT_TRUE(IsEqual(expected, *actual));
+}
+
+void  test_ClassAAddress(void) {
+	/* Class A addresses are assumed to be classless,
+	 * thus the same address should be returned.
+	 */
+	sockaddr_u input = CreateSockaddr4("10.20.30.40", NTP_PORT);
+	sockaddr_u expected = CreateSockaddr4("10.20.30.40", NTP_PORT);
+
+	sockaddr_u* actual = netof(&input);
+
+	TEST_ASSERT_TRUE(actual != NULL);
+	TEST_ASSERT_TRUE(IsEqual(expected, *actual));
+}
+
+void  test_IPv6Address(void) {
+	/* IPv6 addresses are assumed to have 64-bit host- and 64-bit network parts. */
+	const struct in6_addr input_address = {
+		0x20, 0x01, 0x0d, 0xb8,
+        0x85, 0xa3, 0x08, 0xd3, 
+        0x13, 0x19, 0x8a, 0x2e,
+        0x03, 0x70, 0x73, 0x34
+	}; // 2001:0db8:85a3:08d3:1319:8a2e:0370:7334
+
+	const struct in6_addr expected_address = {
+		0x20, 0x01, 0x0d, 0xb8,
+        0x85, 0xa3, 0x08, 0xd3, 
+        0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00
+	}; // 2001:0db8:85a3:08d3:0000:0000:0000:0000
+	
+	sockaddr_u input;
+	input.sa6.sin6_family = AF_INET6;
+	input.sa6.sin6_addr = input_address;
+	SET_PORT(&input, 3000);
+
+	sockaddr_u expected;
+	expected.sa6.sin6_family = AF_INET6;
+	expected.sa6.sin6_addr = expected_address;
+	SET_PORT(&expected, 3000);
+
+	sockaddr_u* actual = netof(&input);
+
+	TEST_ASSERT_TRUE(actual != NULL);
+	TEST_ASSERT_TRUE(IsEqual(expected, *actual));
+}
+
diff --git a/contrib/ntp/tests/libntp/numtoa.c b/contrib/ntp/tests/libntp/numtoa.c
new file mode 100644
index 000000000000..1d01c7843856
--- /dev/null
+++ b/contrib/ntp/tests/libntp/numtoa.c
@@ -0,0 +1,31 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+#include "ntp_fp.h"
+
+#include "unity.h"
+
+
+void setUp(void)
+{ 
+}
+
+void tearDown(void)
+{
+}
+
+void test_Address(void) {
+        u_int32 input = htonl(3221225472UL+512UL+1UL); // 192.0.2.1
+
+        TEST_ASSERT_EQUAL_STRING("192.0.2.1", numtoa(input));
+}
+
+void test_Netmask(void) {
+        // 255.255.255.0
+        u_int32 hostOrder = 255UL*256UL*256UL*256UL + 255UL*256UL*256UL + 255UL*256UL;
+        u_int32 input = htonl(hostOrder);
+
+        TEST_ASSERT_EQUAL_STRING("255.255.255.0", numtoa(input));
+}
+
diff --git a/contrib/ntp/tests/libntp/numtohost.c b/contrib/ntp/tests/libntp/numtohost.c
new file mode 100644
index 000000000000..7472f46f66fa
--- /dev/null
+++ b/contrib/ntp/tests/libntp/numtohost.c
@@ -0,0 +1,19 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+#include "ntp_fp.h"
+
+#include "unity.h"
+
+void test_LoopbackNetNonResolve(void) {
+	/* A loopback address in 127.0.0.0/8 is chosen, and
+	 * numtohost() should not try to resolve it unless
+	 * it is 127.0.0.1
+	 */
+
+	u_int32 input = 127*256*256*256 + 1*256 + 1; // 127.0.1.1
+	
+	TEST_ASSERT_EQUAL_STRING("127.0.1.1", numtohost(htonl(input)));
+}
+
diff --git a/contrib/ntp/tests/libntp/octtoint.c b/contrib/ntp/tests/libntp/octtoint.c
new file mode 100644
index 000000000000..4b0f94ceaa36
--- /dev/null
+++ b/contrib/ntp/tests/libntp/octtoint.c
@@ -0,0 +1,64 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+
+#include "unity.h"
+
+void test_SingleDigit(void) {
+	const char* str = "5";
+	u_long actual;
+
+	TEST_ASSERT_TRUE(octtoint(str, &actual) );
+	TEST_ASSERT_EQUAL(5, actual);
+}
+
+void test_MultipleDigits(void){
+	const char* str = "271";
+	u_long actual;
+
+	TEST_ASSERT_TRUE(octtoint(str, &actual) );
+	TEST_ASSERT_EQUAL(185, actual);
+
+}
+
+void test_Zero(void){
+	const char* str = "0";
+	u_long actual;
+
+	TEST_ASSERT_TRUE(octtoint(str, &actual) );
+	TEST_ASSERT_EQUAL(0, actual);
+
+}
+
+void test_MaximumUnsigned32bit(void){
+	const char* str = "37777777777";
+	u_long actual;
+
+	TEST_ASSERT_TRUE(octtoint(str, &actual) );
+	TEST_ASSERT_EQUAL(4294967295UL, actual);
+
+}
+
+void test_Overflow(void){
+	const char* str = "40000000000";
+	u_long actual;
+
+	TEST_ASSERT_FALSE(octtoint(str, &actual) );
+
+}
+
+void test_IllegalCharacter(void){
+	const char* str = "5ac2";
+	u_long actual;
+
+	TEST_ASSERT_FALSE(octtoint(str, &actual) );
+
+}
+
+void test_IllegalDigit(void){
+	const char* str = "5283";
+	u_long actual;
+
+	TEST_ASSERT_FALSE(octtoint(str, &actual) );
+
+}
diff --git a/contrib/ntp/tests/libntp/prettydate.c b/contrib/ntp/tests/libntp/prettydate.c
new file mode 100644
index 000000000000..9a331e828db4
--- /dev/null
+++ b/contrib/ntp/tests/libntp/prettydate.c
@@ -0,0 +1,17 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+#include "ntp_fp.h"
+
+#include "unity.h"
+
+void
+test_ConstantDate(void) {
+	const u_int32 HALF = 2147483648UL;
+
+	l_fp time = {3485080800UL, HALF}; // 2010-06-09 14:00:00.5
+
+	TEST_ASSERT_EQUAL_STRING("cfba1ce0.80000000  Wed, Jun  9 2010 14:00:00.500",
+		gmprettydate(&time));
+}
diff --git a/contrib/ntp/tests/libntp/recvbuff.c b/contrib/ntp/tests/libntp/recvbuff.c
new file mode 100644
index 000000000000..e9c14da88cdd
--- /dev/null
+++ b/contrib/ntp/tests/libntp/recvbuff.c
@@ -0,0 +1,42 @@
+#include "config.h"
+
+#include "recvbuff.h"
+
+#include "unity.h"
+
+
+void
+setUp(void)
+{
+	init_recvbuff(RECV_INIT);
+}
+
+void
+test_Initialization(void) {
+	TEST_ASSERT_EQUAL_UINT(RECV_INIT, free_recvbuffs());
+	TEST_ASSERT_EQUAL_UINT(0, full_recvbuffs());
+	TEST_ASSERT_FALSE(has_full_recv_buffer());
+	TEST_ASSERT_NULL(get_full_recv_buffer());
+}
+
+void
+test_GetAndFree(void) {
+	u_long initial = free_recvbuffs();
+	recvbuf_t* buf = get_free_recv_buffer();
+
+	TEST_ASSERT_EQUAL_UINT(initial-1, free_recvbuffs());
+	freerecvbuf(buf);
+	TEST_ASSERT_EQUAL_UINT(initial, free_recvbuffs());
+}
+
+
+void
+test_GetAndFill(void) {
+	int initial = free_recvbuffs();
+	recvbuf_t* buf = get_free_recv_buffer();
+
+	add_full_recv_buffer(buf);
+	TEST_ASSERT_EQUAL_UINT(1, full_recvbuffs());
+	TEST_ASSERT_TRUE(has_full_recv_buffer());
+	TEST_ASSERT_EQUAL_PTR(buf, get_full_recv_buffer());
+}
diff --git a/contrib/ntp/tests/libntp/refidsmear.c b/contrib/ntp/tests/libntp/refidsmear.c
new file mode 100644
index 000000000000..5e9d27c72a3d
--- /dev/null
+++ b/contrib/ntp/tests/libntp/refidsmear.c
@@ -0,0 +1,141 @@
+#include "config.h"
+
+#include 
+#include 
+#include 
+
+//#include "ntp_stdlib.h"
+//#include "ntp_calendar.h"
+
+#include "unity.h"
+
+#include 
+
+/*
+ * we want to test a refid format of:
+ * 254.x.y.x
+ *
+ * where x.y.z are 24 bits containing 2 (signed) integer bits
+ * and 22 fractional bits.
+ *
+ * we want functions to convert to/from this format, with unit tests.
+ *
+ * Interesting test cases include:
+ * 254.0.0.0
+ * 254.0.0.1
+ * 254.127.255.255
+ * 254.128.0.0
+ * 254.255.255.255
+ */
+
+void rtol(uint32_t r, char *es);
+
+void
+rtol(uint32_t r, char *es)
+{
+	l_fp l;
+	char *as;
+	char msg[100];
+
+	TEST_ASSERT_NOT_NULL(es);
+
+	snprintf(msg, 100, "rtol was called with r=%#.8x, es=%s", r, es);
+
+	l = convertRefIDToLFP(htonl(r));
+	as = lfptoa(&l, 8);
+	
+	//printf("refid %#x, smear %s\n", r, as);
+
+	TEST_ASSERT_NOT_NULL_MESSAGE(as, msg);
+	TEST_ASSERT_EQUAL_STRING_MESSAGE(es, as, msg);
+
+	return;
+}
+
+
+void rtoltor(uint32_t er, char *es);
+
+void
+rtoltor(uint32_t er, char *es)
+{
+	l_fp l;
+	char *as;
+	uint32_t ar;
+	char msg[100];
+
+	TEST_ASSERT_NOT_NULL(es);
+
+	snprintf(msg, 100, "rtoltor was called with er=%#.8x, es=%s", er, es);
+
+	l = convertRefIDToLFP(htonl(er));
+	as = lfptoa(&l, 8);
+
+	ar = convertLFPToRefID(l);
+
+	//printf("smear %s, refid %#.8x\n", lfptoa(&l, 8), ntohl(ar));
+
+	TEST_ASSERT_NOT_NULL_MESSAGE(as, msg);
+	TEST_ASSERT_EQUAL_STRING_MESSAGE(es, as, msg);
+	TEST_ASSERT_EQUAL_UINT_MESSAGE(er, ntohl(ar), msg);
+
+	return;
+}
+
+
+void ltor(l_fp l, char *er);
+
+void
+ltor(l_fp l, char *er)
+{
+	uint32_t r;
+
+	printf("ltor: ");
+
+	r = convertLFPToRefID(l);
+	printf("smear %s, refid %#.8x\n", lfptoa(&l, 8), ntohl(r));
+
+	return;
+}
+
+
+void test_refidsmear(void)
+{
+
+	rtol(0xfe800000, "-2.00000000");
+	rtol(0xfe800001, "-1.99999976");
+	rtol(0xfe8ffffe, "-1.75000048");
+	rtol(0xfe8fffff, "-1.75000024");
+	rtol(0xfef00000, "-0.25000000");
+	rtol(0xfef00001, "-0.24999976");
+	rtol(0xfefffffe, "-0.00000048");
+	rtol(0xfeffffff, "-0.00000024");
+
+	rtol(0xfe000000, "0.00000000");
+	rtol(0xfe000001, "0.00000024");
+	rtol(0xfe6ffffe, "1.74999952");
+	rtol(0xfe6fffff, "1.74999976");
+	rtol(0xfe700000, "1.75000000");
+	rtol(0xfe700001, "1.75000024");
+	rtol(0xfe7ffffe, "1.99999952");
+	rtol(0xfe7fffff, "1.99999976");
+
+	rtoltor(0xfe800000, "-2.00000000");
+	rtoltor(0xfe800001, "-1.99999976");
+	rtoltor(0xfe8ffffe, "-1.75000048");
+	rtoltor(0xfe8fffff, "-1.75000024");
+	rtoltor(0xfef00000, "-0.25000000");
+	rtoltor(0xfef00001, "-0.24999976");
+	rtoltor(0xfefffffe, "-0.00000048");
+	rtoltor(0xfeffffff, "-0.00000024");
+
+	rtoltor(0xfe000000, "0.00000000");
+	rtoltor(0xfe000001, "0.00000024");
+	rtoltor(0xfe6ffffe, "1.74999952");
+	rtoltor(0xfe6fffff, "1.74999976");
+	rtoltor(0xfe700000, "1.75000000");
+	rtoltor(0xfe700001, "1.75000024");
+	rtoltor(0xfe7ffffe, "1.99999952");
+	rtoltor(0xfe7fffff, "1.99999976");
+
+	return;
+}
diff --git a/contrib/ntp/tests/libntp/refnumtoa.c b/contrib/ntp/tests/libntp/refnumtoa.c
new file mode 100644
index 000000000000..8a37690ce200
--- /dev/null
+++ b/contrib/ntp/tests/libntp/refnumtoa.c
@@ -0,0 +1,64 @@
+#include "config.h"
+
+#include "ntp_net.h"
+#include "ntp_refclock.h"
+
+#include "unity.h"
+
+
+/* Might need to be updated if a new refclock gets this id. */
+static const int UNUSED_REFCLOCK_ID = 250;
+
+
+void test_LocalClock() {
+#ifdef REFCLOCK		/* clockname() is useless otherwise */
+	/* We test with a refclock address of type LOCALCLOCK.
+	 * with id 8
+	 */
+	u_int32 addr = REFCLOCK_ADDR;
+	addr |= REFCLK_LOCALCLOCK << 8;
+	addr |= 0x8;
+
+	sockaddr_u address;
+	address.sa4.sin_family = AF_INET;
+	address.sa4.sin_addr.s_addr = htonl(addr);
+	
+	char stringStart [100]= "";
+
+	strcat(stringStart,clockname(REFCLK_LOCALCLOCK));
+	strcat(stringStart,"(8)");
+
+	char * expected = stringStart;
+
+	TEST_ASSERT_EQUAL_STRING(expected, refnumtoa(&address));
+#else	
+	TEST_IGNORE_MESSAGE("REFCLOCK NOT DEFINED, SKIPPING TEST");
+#endif	/* REFCLOCK */
+}
+
+
+
+void test_UnknownId() {
+#ifdef REFCLOCK		/* refnumtoa() is useless otherwise */
+	/* We test with a currently unused refclock ID */
+	u_int32 addr = REFCLOCK_ADDR;
+	addr |= UNUSED_REFCLOCK_ID << 8;
+	addr |= 0x4;
+
+	sockaddr_u address;
+	address.sa4.sin_family = AF_INET;
+	address.sa4.sin_addr.s_addr = htonl(addr);
+	
+	char stringStart [100]= "REFCLK(";
+	char value [100] ;	
+	snprintf(value, sizeof(value), "%d", UNUSED_REFCLOCK_ID);
+	strcat(stringStart,value);
+	strcat(stringStart,",4)");
+	char * expected = stringStart;
+
+	TEST_ASSERT_EQUAL_STRING(expected, refnumtoa(&address));
+#else 	
+	TEST_IGNORE_MESSAGE("REFCLOCK NOT DEFINED, SKIPPING TEST");
+#endif	/* REFCLOCK */
+}
+
diff --git a/contrib/ntp/tests/libntp/run-a_md5encrypt.c b/contrib/ntp/tests/libntp/run-a_md5encrypt.c
new file mode 100644
index 000000000000..1c46e3f83673
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-a_md5encrypt.c
@@ -0,0 +1,59 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_Encrypt();
+extern void test_DecryptValid();
+extern void test_DecryptInvalid();
+extern void test_IPv4AddressToRefId();
+extern void test_IPv6AddressToRefId();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "a_md5encrypt.c";
+  UnityBegin("a_md5encrypt.c");
+  RUN_TEST(test_Encrypt, 36);
+  RUN_TEST(test_DecryptValid, 54);
+  RUN_TEST(test_DecryptInvalid, 60);
+  RUN_TEST(test_IPv4AddressToRefId, 68);
+  RUN_TEST(test_IPv6AddressToRefId, 79);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-atoint.c b/contrib/ntp/tests/libntp/run-atoint.c
new file mode 100644
index 000000000000..2764c9a47706
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-atoint.c
@@ -0,0 +1,61 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_RegularPositive(void);
+extern void test_RegularNegative(void);
+extern void test_PositiveOverflowBoundary(void);
+extern void test_NegativeOverflowBoundary(void);
+extern void test_PositiveOverflowBig(void);
+extern void test_IllegalCharacter(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "atoint.c";
+  UnityBegin("atoint.c");
+  RUN_TEST(test_RegularPositive, 7);
+  RUN_TEST(test_RegularNegative, 15);
+  RUN_TEST(test_PositiveOverflowBoundary, 23);
+  RUN_TEST(test_NegativeOverflowBoundary, 30);
+  RUN_TEST(test_PositiveOverflowBig, 37);
+  RUN_TEST(test_IllegalCharacter, 44);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-atouint.c b/contrib/ntp/tests/libntp/run-atouint.c
new file mode 100644
index 000000000000..7adb0840c923
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-atouint.c
@@ -0,0 +1,59 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_RegularPositive();
+extern void test_PositiveOverflowBoundary();
+extern void test_PositiveOverflowBig();
+extern void test_Negative();
+extern void test_IllegalChar();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "atouint.c";
+  UnityBegin("atouint.c");
+  RUN_TEST(test_RegularPositive, 9);
+  RUN_TEST(test_PositiveOverflowBoundary, 17);
+  RUN_TEST(test_PositiveOverflowBig, 24);
+  RUN_TEST(test_Negative, 31);
+  RUN_TEST(test_IllegalChar, 38);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-authkeys.c b/contrib/ntp/tests/libntp/run-authkeys.c
new file mode 100644
index 000000000000..5e65cc9dc517
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-authkeys.c
@@ -0,0 +1,61 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_AddTrustedKeys();
+extern void test_AddUntrustedKey();
+extern void test_HaveKeyCorrect();
+extern void test_HaveKeyIncorrect();
+extern void test_AddWithAuthUseKey();
+extern void test_EmptyKey();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "authkeys.c";
+  UnityBegin("authkeys.c");
+  RUN_TEST(test_AddTrustedKeys, 71);
+  RUN_TEST(test_AddUntrustedKey, 82);
+  RUN_TEST(test_HaveKeyCorrect, 90);
+  RUN_TEST(test_HaveKeyIncorrect, 99);
+  RUN_TEST(test_AddWithAuthUseKey, 106);
+  RUN_TEST(test_EmptyKey, 113);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-buftvtots.c b/contrib/ntp/tests/libntp/run-buftvtots.c
new file mode 100644
index 000000000000..c54c33912ab7
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-buftvtots.c
@@ -0,0 +1,57 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_ZeroBuffer();
+extern void test_IntegerAndFractionalBuffer();
+extern void test_IllegalMicroseconds();
+extern void test_AlwaysFalseOnWindows();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "buftvtots.c";
+  UnityBegin("buftvtots.c");
+  RUN_TEST(test_ZeroBuffer, 16);
+  RUN_TEST(test_IntegerAndFractionalBuffer, 30);
+  RUN_TEST(test_IllegalMicroseconds, 53);
+  RUN_TEST(test_AlwaysFalseOnWindows, 66);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-calendar.c b/contrib/ntp/tests/libntp/run-calendar.c
new file mode 100644
index 000000000000..07a5092f3fae
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-calendar.c
@@ -0,0 +1,71 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_DaySplitMerge();
+extern void test_SplitYearDays1();
+extern void test_SplitYearDays2();
+extern void test_RataDie1();
+extern void test_LeapYears1();
+extern void test_LeapYears2();
+extern void test_RoundTripDate();
+extern void test_RoundTripYearStart();
+extern void test_RoundTripMonthStart();
+extern void test_RoundTripWeekStart();
+extern void test_RoundTripDayStart();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "calendar.c";
+  UnityBegin("calendar.c");
+  RUN_TEST(test_DaySplitMerge, 230);
+  RUN_TEST(test_SplitYearDays1, 254);
+  RUN_TEST(test_SplitYearDays2, 268);
+  RUN_TEST(test_RataDie1, 283);
+  RUN_TEST(test_LeapYears1, 293);
+  RUN_TEST(test_LeapYears2, 308);
+  RUN_TEST(test_RoundTripDate, 326);
+  RUN_TEST(test_RoundTripYearStart, 355);
+  RUN_TEST(test_RoundTripMonthStart, 371);
+  RUN_TEST(test_RoundTripWeekStart, 387);
+  RUN_TEST(test_RoundTripDayStart, 403);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-caljulian.c b/contrib/ntp/tests/libntp/run-caljulian.c
new file mode 100644
index 000000000000..b4e3f480ec7c
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-caljulian.c
@@ -0,0 +1,58 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_RegularTime();
+extern void test_LeapYear();
+extern void test_uLongBoundary();
+extern void test_uLongWrapped();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "caljulian.c";
+  UnityBegin("caljulian.c");
+  RUN_TEST(test_RegularTime, 74);
+  RUN_TEST(test_LeapYear, 85);
+  RUN_TEST(test_uLongBoundary, 96);
+  RUN_TEST(test_uLongWrapped, 107);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-caltontp.c b/contrib/ntp/tests/libntp/run-caltontp.c
new file mode 100644
index 000000000000..b7b6626bfd05
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-caltontp.c
@@ -0,0 +1,57 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_DateGivenMonthDay(void);
+extern void test_DateGivenYearDay(void);
+extern void test_DateLeapYear(void);
+extern void test_WraparoundDateIn2036(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "caltontp.c";
+  UnityBegin("caltontp.c");
+  RUN_TEST(test_DateGivenMonthDay, 6);
+  RUN_TEST(test_DateGivenYearDay, 16);
+  RUN_TEST(test_DateLeapYear, 27);
+  RUN_TEST(test_WraparoundDateIn2036, 40);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-calyearstart.c b/contrib/ntp/tests/libntp/run-calyearstart.c
new file mode 100644
index 000000000000..d54a0b5625e8
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-calyearstart.c
@@ -0,0 +1,55 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_NoWrapInDateRange();
+extern void test_NoWrapInDateRangeLeapYear();
+extern void test_WrapInDateRange();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "calyearstart.c";
+  UnityBegin("calyearstart.c");
+  RUN_TEST(test_NoWrapInDateRange, 22);
+  RUN_TEST(test_NoWrapInDateRangeLeapYear, 30);
+  RUN_TEST(test_WrapInDateRange, 38);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-clocktime.c b/contrib/ntp/tests/libntp/run-clocktime.c
new file mode 100644
index 000000000000..f21de83eac00
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-clocktime.c
@@ -0,0 +1,65 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_CurrentYear();
+extern void test_CurrentYearFuzz();
+extern void test_TimeZoneOffset();
+extern void test_WrongYearStart();
+extern void test_PreviousYear();
+extern void test_NextYear();
+extern void test_NoReasonableConversion();
+extern void test_AlwaysInLimit();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "clocktime.c";
+  UnityBegin("clocktime.c");
+  RUN_TEST(test_CurrentYear, 32);
+  RUN_TEST(test_CurrentYearFuzz, 47);
+  RUN_TEST(test_TimeZoneOffset, 69);
+  RUN_TEST(test_WrongYearStart, 89);
+  RUN_TEST(test_PreviousYear, 108);
+  RUN_TEST(test_NextYear, 127);
+  RUN_TEST(test_NoReasonableConversion, 145);
+  RUN_TEST(test_AlwaysInLimit, 167);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-decodenetnum.c b/contrib/ntp/tests/libntp/run-decodenetnum.c
new file mode 100644
index 000000000000..2e0a7e593214
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-decodenetnum.c
@@ -0,0 +1,62 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_IPv4AddressOnly(void);
+extern void test_IPv4AddressWithPort(void);
+extern void test_IPv6AddressOnly(void);
+extern void test_IPv6AddressWithPort(void);
+extern void test_IllegalAddress(void);
+extern void test_IllegalCharInPort(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "decodenetnum.c";
+  UnityBegin("decodenetnum.c");
+  RUN_TEST(test_IPv4AddressOnly, 9);
+  RUN_TEST(test_IPv4AddressWithPort, 22);
+  RUN_TEST(test_IPv6AddressOnly, 35);
+  RUN_TEST(test_IPv6AddressWithPort, 55);
+  RUN_TEST(test_IllegalAddress, 75);
+  RUN_TEST(test_IllegalCharInPort, 82);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-hextoint.c b/contrib/ntp/tests/libntp/run-hextoint.c
new file mode 100644
index 000000000000..a69792177116
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-hextoint.c
@@ -0,0 +1,59 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_SingleDigit(void);
+extern void test_MultipleDigits(void);
+extern void test_MaxUnsigned(void);
+extern void test_Overflow(void);
+extern void test_IllegalChar(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "hextoint.c";
+  UnityBegin("hextoint.c");
+  RUN_TEST(test_SingleDigit, 10);
+  RUN_TEST(test_MultipleDigits, 18);
+  RUN_TEST(test_MaxUnsigned, 26);
+  RUN_TEST(test_Overflow, 34);
+  RUN_TEST(test_IllegalChar, 41);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-hextolfp.c b/contrib/ntp/tests/libntp/run-hextolfp.c
new file mode 100644
index 000000000000..0ef9f63b863f
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-hextolfp.c
@@ -0,0 +1,62 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_PositiveInteger(void);
+extern void test_NegativeInteger(void);
+extern void test_PositiveFraction(void);
+extern void test_NegativeFraction(void);
+extern void test_IllegalNumberOfInteger(void);
+extern void test_IllegalChar(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "hextolfp.c";
+  UnityBegin("hextolfp.c");
+  RUN_TEST(test_PositiveInteger, 10);
+  RUN_TEST(test_NegativeInteger, 20);
+  RUN_TEST(test_PositiveFraction, 30);
+  RUN_TEST(test_NegativeFraction, 40);
+  RUN_TEST(test_IllegalNumberOfInteger, 50);
+  RUN_TEST(test_IllegalChar, 57);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-humandate.c b/contrib/ntp/tests/libntp/run-humandate.c
new file mode 100644
index 000000000000..291415f532e4
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-humandate.c
@@ -0,0 +1,53 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_RegularTime(void);
+extern void test_CurrentTime(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "humandate.c";
+  UnityBegin("humandate.c");
+  RUN_TEST(test_RegularTime, 8);
+  RUN_TEST(test_CurrentTime, 22);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-lfpfunc.c b/contrib/ntp/tests/libntp/run-lfpfunc.c
new file mode 100644
index 000000000000..2f0e1c254d13
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-lfpfunc.c
@@ -0,0 +1,68 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_AdditionLR();
+extern void test_AdditionRL();
+extern void test_SubtractionLR();
+extern void test_SubtractionRL();
+extern void test_Negation();
+extern void test_Absolute();
+extern void test_FDF_RoundTrip();
+extern void test_SignedRelOps();
+extern void test_UnsignedRelOps();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "lfpfunc.c";
+  UnityBegin("lfpfunc.c");
+  RUN_TEST(test_AdditionLR, 320);
+  RUN_TEST(test_AdditionRL, 339);
+  RUN_TEST(test_SubtractionLR, 358);
+  RUN_TEST(test_SubtractionRL, 373);
+  RUN_TEST(test_Negation, 391);
+  RUN_TEST(test_Absolute, 412);
+  RUN_TEST(test_FDF_RoundTrip, 447);
+  RUN_TEST(test_SignedRelOps, 479);
+  RUN_TEST(test_UnsignedRelOps, 522);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-lfptostr.c b/contrib/ntp/tests/libntp/run-lfptostr.c
new file mode 100644
index 000000000000..7e54a4f0c370
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-lfptostr.c
@@ -0,0 +1,71 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_PositiveInteger(void);
+extern void test_NegativeInteger(void);
+extern void test_PositiveIntegerWithFraction(void);
+extern void test_NegativeIntegerWithFraction(void);
+extern void test_RoundingDownToInteger(void);
+extern void test_RoundingMiddleToInteger(void);
+extern void test_RoundingUpToInteger(void);
+extern void test_SingleDecimal(void);
+extern void test_MillisecondsRoundingUp(void);
+extern void test_MillisecondsRoundingDown(void);
+extern void test_UnsignedInteger(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "lfptostr.c";
+  UnityBegin("lfptostr.c");
+  RUN_TEST(test_PositiveInteger, 23);
+  RUN_TEST(test_NegativeInteger, 30);
+  RUN_TEST(test_PositiveIntegerWithFraction, 37);
+  RUN_TEST(test_NegativeIntegerWithFraction, 44);
+  RUN_TEST(test_RoundingDownToInteger, 51);
+  RUN_TEST(test_RoundingMiddleToInteger, 58);
+  RUN_TEST(test_RoundingUpToInteger, 65);
+  RUN_TEST(test_SingleDecimal, 72);
+  RUN_TEST(test_MillisecondsRoundingUp, 79);
+  RUN_TEST(test_MillisecondsRoundingDown, 88);
+  RUN_TEST(test_UnsignedInteger, 97);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-modetoa.c b/contrib/ntp/tests/libntp/run-modetoa.c
new file mode 100644
index 000000000000..334e08d63afc
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-modetoa.c
@@ -0,0 +1,53 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_KnownMode(void);
+extern void test_UnknownMode(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "modetoa.c";
+  UnityBegin("modetoa.c");
+  RUN_TEST(test_KnownMode, 9);
+  RUN_TEST(test_UnknownMode, 15);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-msyslog.c b/contrib/ntp/tests/libntp/run-msyslog.c
new file mode 100644
index 000000000000..ea566a716abc
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-msyslog.c
@@ -0,0 +1,66 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_msnprintf(void);
+extern void test_msnprintfLiteralPercentm(void);
+extern void test_msnprintfBackslashLiteralPercentm(void);
+extern void test_msnprintfBackslashPercent(void);
+extern void test_msnprintfHangingPercent(void);
+extern void test_format_errmsgHangingPercent(void);
+extern void test_msnprintfNullTarget(void);
+extern void test_msnprintfTruncate(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "msyslog.c";
+  UnityBegin("msyslog.c");
+  RUN_TEST(test_msnprintf, 14);
+  RUN_TEST(test_msnprintfLiteralPercentm, 30);
+  RUN_TEST(test_msnprintfBackslashLiteralPercentm, 45);
+  RUN_TEST(test_msnprintfBackslashPercent, 59);
+  RUN_TEST(test_msnprintfHangingPercent, 74);
+  RUN_TEST(test_format_errmsgHangingPercent, 91);
+  RUN_TEST(test_msnprintfNullTarget, 106);
+  RUN_TEST(test_msnprintfTruncate, 117);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-netof.c b/contrib/ntp/tests/libntp/run-netof.c
new file mode 100644
index 000000000000..401192d26d67
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-netof.c
@@ -0,0 +1,58 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_ClassBAddress(void);
+extern void test_ClassCAddress(void);
+extern void test_ClassAAddress(void);
+extern void test_IPv6Address(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "netof.c";
+  UnityBegin("netof.c");
+  RUN_TEST(test_ClassBAddress, 10);
+  RUN_TEST(test_ClassCAddress, 20);
+  RUN_TEST(test_ClassAAddress, 30);
+  RUN_TEST(test_IPv6Address, 43);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-numtoa.c b/contrib/ntp/tests/libntp/run-numtoa.c
new file mode 100644
index 000000000000..5468b72e938f
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-numtoa.c
@@ -0,0 +1,53 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_Address(void);
+extern void test_Netmask(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "numtoa.c";
+  UnityBegin("numtoa.c");
+  RUN_TEST(test_Address, 18);
+  RUN_TEST(test_Netmask, 24);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-numtohost.c b/contrib/ntp/tests/libntp/run-numtohost.c
new file mode 100644
index 000000000000..3ec4fdff039c
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-numtohost.c
@@ -0,0 +1,51 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_LoopbackNetNonResolve(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "numtohost.c";
+  UnityBegin("numtohost.c");
+  RUN_TEST(test_LoopbackNetNonResolve, 9);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-octtoint.c b/contrib/ntp/tests/libntp/run-octtoint.c
new file mode 100644
index 000000000000..dc2bed566e17
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-octtoint.c
@@ -0,0 +1,63 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_SingleDigit(void);
+extern void test_MultipleDigits(void);
+extern void test_Zero(void);
+extern void test_MaximumUnsigned32bit(void);
+extern void test_Overflow(void);
+extern void test_IllegalCharacter(void);
+extern void test_IllegalDigit(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "octtoint.c";
+  UnityBegin("octtoint.c");
+  RUN_TEST(test_SingleDigit, 7);
+  RUN_TEST(test_MultipleDigits, 15);
+  RUN_TEST(test_Zero, 24);
+  RUN_TEST(test_MaximumUnsigned32bit, 33);
+  RUN_TEST(test_Overflow, 42);
+  RUN_TEST(test_IllegalCharacter, 50);
+  RUN_TEST(test_IllegalDigit, 58);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-prettydate.c b/contrib/ntp/tests/libntp/run-prettydate.c
new file mode 100644
index 000000000000..2067b13c5e76
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-prettydate.c
@@ -0,0 +1,51 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_ConstantDate(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "prettydate.c";
+  UnityBegin("prettydate.c");
+  RUN_TEST(test_ConstantDate, 10);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-recvbuff.c b/contrib/ntp/tests/libntp/run-recvbuff.c
new file mode 100644
index 000000000000..8060105e316d
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-recvbuff.c
@@ -0,0 +1,55 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_Initialization(void);
+extern void test_GetAndFree(void);
+extern void test_GetAndFill(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "recvbuff.c";
+  UnityBegin("recvbuff.c");
+  RUN_TEST(test_Initialization, 15);
+  RUN_TEST(test_GetAndFree, 23);
+  RUN_TEST(test_GetAndFill, 34);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-refidsmear.c b/contrib/ntp/tests/libntp/run-refidsmear.c
new file mode 100644
index 000000000000..30651f35f0a9
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-refidsmear.c
@@ -0,0 +1,52 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_refidsmear(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "refidsmear.c";
+  UnityBegin("refidsmear.c");
+  RUN_TEST(test_refidsmear, 100);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-refnumtoa.c b/contrib/ntp/tests/libntp/run-refnumtoa.c
new file mode 100644
index 000000000000..60981ca5aa02
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-refnumtoa.c
@@ -0,0 +1,53 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_LocalClock();
+extern void test_UnknownId();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "refnumtoa.c";
+  UnityBegin("refnumtoa.c");
+  RUN_TEST(test_LocalClock, 13);
+  RUN_TEST(test_UnknownId, 41);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-sfptostr.c b/contrib/ntp/tests/libntp/run-sfptostr.c
new file mode 100644
index 000000000000..1c28fe8c57ff
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-sfptostr.c
@@ -0,0 +1,66 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_PositiveInteger(void);
+extern void test_NegativeInteger(void);
+extern void test_PositiveIntegerPositiveFraction(void);
+extern void test_NegativeIntegerNegativeFraction(void);
+extern void test_PositiveIntegerNegativeFraction(void);
+extern void test_NegativeIntegerPositiveFraction(void);
+extern void test_SingleDecimalInteger(void);
+extern void test_SingleDecimalRounding(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "sfptostr.c";
+  UnityBegin("sfptostr.c");
+  RUN_TEST(test_PositiveInteger, 11);
+  RUN_TEST(test_NegativeInteger, 19);
+  RUN_TEST(test_PositiveIntegerPositiveFraction, 27);
+  RUN_TEST(test_NegativeIntegerNegativeFraction, 35);
+  RUN_TEST(test_PositiveIntegerNegativeFraction, 43);
+  RUN_TEST(test_NegativeIntegerPositiveFraction, 51);
+  RUN_TEST(test_SingleDecimalInteger, 59);
+  RUN_TEST(test_SingleDecimalRounding, 67);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-socktoa.c b/contrib/ntp/tests/libntp/run-socktoa.c
new file mode 100644
index 000000000000..a6fa77834121
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-socktoa.c
@@ -0,0 +1,61 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_IPv4AddressWithPort(void);
+extern void test_IPv6AddressWithPort(void);
+extern void test_ScopedIPv6AddressWithPort(void);
+extern void test_HashEqual(void);
+extern void test_HashNotEqual(void);
+extern void test_IgnoreIPv6Fields(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "socktoa.c";
+  UnityBegin("socktoa.c");
+  RUN_TEST(test_IPv4AddressWithPort, 11);
+  RUN_TEST(test_IPv6AddressWithPort, 18);
+  RUN_TEST(test_ScopedIPv6AddressWithPort, 42);
+  RUN_TEST(test_HashEqual, 67);
+  RUN_TEST(test_HashNotEqual, 75);
+  RUN_TEST(test_IgnoreIPv6Fields, 88);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-ssl_init.c b/contrib/ntp/tests/libntp/run-ssl_init.c
new file mode 100644
index 000000000000..452a60a9a62c
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-ssl_init.c
@@ -0,0 +1,59 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_MD5KeyTypeWithoutDigestLength();
+extern void test_MD5KeyTypeWithDigestLength();
+extern void test_SHA1KeyTypeWithDigestLength();
+extern void test_MD5KeyName();
+extern void test_SHA1KeyName();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "ssl_init.c";
+  UnityBegin("ssl_init.c");
+  RUN_TEST(test_MD5KeyTypeWithoutDigestLength, 19);
+  RUN_TEST(test_MD5KeyTypeWithDigestLength, 23);
+  RUN_TEST(test_SHA1KeyTypeWithDigestLength, 32);
+  RUN_TEST(test_MD5KeyName, 47);
+  RUN_TEST(test_SHA1KeyName, 51);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-statestr.c b/contrib/ntp/tests/libntp/run-statestr.c
new file mode 100644
index 000000000000..6083eee0f558
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-statestr.c
@@ -0,0 +1,57 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_PeerRestart(void);
+extern void test_SysUnspecified(void);
+extern void test_ClockCodeExists(void);
+extern void test_ClockCodeUnknown(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "statestr.c";
+  UnityBegin("statestr.c");
+  RUN_TEST(test_PeerRestart, 20);
+  RUN_TEST(test_SysUnspecified, 24);
+  RUN_TEST(test_ClockCodeExists, 29);
+  RUN_TEST(test_ClockCodeUnknown, 33);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-strtolfp.c b/contrib/ntp/tests/libntp/run-strtolfp.c
new file mode 100644
index 000000000000..0a2912bee0cb
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-strtolfp.c
@@ -0,0 +1,63 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_PositiveInteger(void);
+extern void test_NegativeInteger(void);
+extern void test_PositiveFraction(void);
+extern void test_NegativeFraction(void);
+extern void test_PositiveMsFraction(void);
+extern void test_NegativeMsFraction(void);
+extern void test_InvalidChars(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "strtolfp.c";
+  UnityBegin("strtolfp.c");
+  RUN_TEST(test_PositiveInteger, 11);
+  RUN_TEST(test_NegativeInteger, 25);
+  RUN_TEST(test_PositiveFraction, 42);
+  RUN_TEST(test_NegativeFraction, 56);
+  RUN_TEST(test_PositiveMsFraction, 73);
+  RUN_TEST(test_NegativeMsFraction, 89);
+  RUN_TEST(test_InvalidChars, 107);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-timespecops.c b/contrib/ntp/tests/libntp/run-timespecops.c
new file mode 100644
index 000000000000..b56e7560f636
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-timespecops.c
@@ -0,0 +1,105 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_Helpers1();
+extern void test_Normalise();
+extern void test_SignNoFrac();
+extern void test_SignWithFrac();
+extern void test_CmpFracEQ();
+extern void test_CmpFracGT();
+extern void test_CmpFracLT();
+extern void test_AddFullNorm();
+extern void test_AddFullOflow1();
+extern void test_AddNsecNorm();
+extern void test_AddNsecOflow1();
+extern void test_SubFullNorm();
+extern void test_SubFullOflow();
+extern void test_SubNsecNorm();
+extern void test_SubNsecOflow();
+extern void test_Neg();
+extern void test_AbsNoFrac();
+extern void test_AbsWithFrac();
+extern void test_Helpers2();
+extern void test_ToLFPbittest();
+extern void test_ToLFPrelPos();
+extern void test_ToLFPrelNeg();
+extern void test_ToLFPabs();
+extern void test_FromLFPbittest();
+extern void test_FromLFPrelPos();
+extern void test_FromLFPrelNeg();
+extern void test_LFProundtrip();
+extern void test_ToString();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "timespecops.c";
+  UnityBegin("timespecops.c");
+  RUN_TEST(test_Helpers1, 155);
+  RUN_TEST(test_Normalise, 175);
+  RUN_TEST(test_SignNoFrac, 189);
+  RUN_TEST(test_SignWithFrac, 201);
+  RUN_TEST(test_CmpFracEQ, 215);
+  RUN_TEST(test_CmpFracGT, 228);
+  RUN_TEST(test_CmpFracLT, 241);
+  RUN_TEST(test_AddFullNorm, 258);
+  RUN_TEST(test_AddFullOflow1, 272);
+  RUN_TEST(test_AddNsecNorm, 286);
+  RUN_TEST(test_AddNsecOflow1, 298);
+  RUN_TEST(test_SubFullNorm, 314);
+  RUN_TEST(test_SubFullOflow, 328);
+  RUN_TEST(test_SubNsecNorm, 342);
+  RUN_TEST(test_SubNsecOflow, 354);
+  RUN_TEST(test_Neg, 370);
+  RUN_TEST(test_AbsNoFrac, 387);
+  RUN_TEST(test_AbsWithFrac, 398);
+  RUN_TEST(test_Helpers2, 413);
+  RUN_TEST(test_ToLFPbittest, 445);
+  RUN_TEST(test_ToLFPrelPos, 458);
+  RUN_TEST(test_ToLFPrelNeg, 470);
+  RUN_TEST(test_ToLFPabs, 482);
+  RUN_TEST(test_FromLFPbittest, 497);
+  RUN_TEST(test_FromLFPrelPos, 516);
+  RUN_TEST(test_FromLFPrelNeg, 529);
+  RUN_TEST(test_LFProundtrip, 544);
+  RUN_TEST(test_ToString, 563);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-timevalops.c b/contrib/ntp/tests/libntp/run-timevalops.c
new file mode 100644
index 000000000000..013aae1f2a52
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-timevalops.c
@@ -0,0 +1,105 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_Helpers1();
+extern void test_Normalise();
+extern void test_SignNoFrac();
+extern void test_SignWithFrac();
+extern void test_CmpFracEQ();
+extern void test_CmpFracGT();
+extern void test_CmpFracLT();
+extern void test_AddFullNorm();
+extern void test_AddFullOflow1();
+extern void test_AddUsecNorm();
+extern void test_AddUsecOflow1();
+extern void test_SubFullNorm();
+extern void test_SubFullOflow();
+extern void test_SubUsecNorm();
+extern void test_SubUsecOflow();
+extern void test_Neg();
+extern void test_AbsNoFrac();
+extern void test_AbsWithFrac();
+extern void test_Helpers2();
+extern void test_ToLFPbittest();
+extern void test_ToLFPrelPos();
+extern void test_ToLFPrelNeg();
+extern void test_ToLFPabs();
+extern void test_FromLFPbittest();
+extern void test_FromLFPrelPos();
+extern void test_FromLFPrelNeg();
+extern void test_LFProundtrip();
+extern void test_ToString();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "timevalops.c";
+  UnityBegin("timevalops.c");
+  RUN_TEST(test_Helpers1, 153);
+  RUN_TEST(test_Normalise, 173);
+  RUN_TEST(test_SignNoFrac, 187);
+  RUN_TEST(test_SignWithFrac, 199);
+  RUN_TEST(test_CmpFracEQ, 214);
+  RUN_TEST(test_CmpFracGT, 228);
+  RUN_TEST(test_CmpFracLT, 242);
+  RUN_TEST(test_AddFullNorm, 260);
+  RUN_TEST(test_AddFullOflow1, 274);
+  RUN_TEST(test_AddUsecNorm, 288);
+  RUN_TEST(test_AddUsecOflow1, 300);
+  RUN_TEST(test_SubFullNorm, 316);
+  RUN_TEST(test_SubFullOflow, 330);
+  RUN_TEST(test_SubUsecNorm, 344);
+  RUN_TEST(test_SubUsecOflow, 356);
+  RUN_TEST(test_Neg, 372);
+  RUN_TEST(test_AbsNoFrac, 389);
+  RUN_TEST(test_AbsWithFrac, 400);
+  RUN_TEST(test_Helpers2, 416);
+  RUN_TEST(test_ToLFPbittest, 449);
+  RUN_TEST(test_ToLFPrelPos, 464);
+  RUN_TEST(test_ToLFPrelNeg, 478);
+  RUN_TEST(test_ToLFPabs, 491);
+  RUN_TEST(test_FromLFPbittest, 509);
+  RUN_TEST(test_FromLFPrelPos, 527);
+  RUN_TEST(test_FromLFPrelNeg, 540);
+  RUN_TEST(test_LFProundtrip, 554);
+  RUN_TEST(test_ToString, 573);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-tstotv.c b/contrib/ntp/tests/libntp/run-tstotv.c
new file mode 100644
index 000000000000..cf7dd1794a66
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-tstotv.c
@@ -0,0 +1,55 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_Seconds(void);
+extern void test_MicrosecondsExact(void);
+extern void test_MicrosecondsRounding(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "tstotv.c";
+  UnityBegin("tstotv.c");
+  RUN_TEST(test_Seconds, 9);
+  RUN_TEST(test_MicrosecondsExact, 21);
+  RUN_TEST(test_MicrosecondsRounding, 35);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-tvtots.c b/contrib/ntp/tests/libntp/run-tvtots.c
new file mode 100644
index 000000000000..468aae5e09ec
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-tvtots.c
@@ -0,0 +1,55 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_Seconds(void);
+extern void test_MicrosecondsRounded(void);
+extern void test_MicrosecondsExact(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "tvtots.c";
+  UnityBegin("tvtots.c");
+  RUN_TEST(test_Seconds, 10);
+  RUN_TEST(test_MicrosecondsRounded, 21);
+  RUN_TEST(test_MicrosecondsExact, 36);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-uglydate.c b/contrib/ntp/tests/libntp/run-uglydate.c
new file mode 100644
index 000000000000..4e67713638cf
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-uglydate.c
@@ -0,0 +1,51 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_ConstantDateTime(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "uglydate.c";
+  UnityBegin("uglydate.c");
+  RUN_TEST(test_ConstantDateTime, 11);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-vi64ops.c b/contrib/ntp/tests/libntp/run-vi64ops.c
new file mode 100644
index 000000000000..7e8c2cbeba93
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-vi64ops.c
@@ -0,0 +1,56 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_ParseVUI64_pos();
+extern void test_ParseVUI64_neg();
+extern void test_ParseVUI64_case();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "vi64ops.c";
+  UnityBegin("vi64ops.c");
+  RUN_TEST(test_ParseVUI64_pos, 33);
+  RUN_TEST(test_ParseVUI64_neg, 47);
+  RUN_TEST(test_ParseVUI64_case, 60);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/run-ymd2yd.c b/contrib/ntp/tests/libntp/run-ymd2yd.c
new file mode 100644
index 000000000000..faf2fcb683c6
--- /dev/null
+++ b/contrib/ntp/tests/libntp/run-ymd2yd.c
@@ -0,0 +1,57 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_NonLeapYearFebruary(void);
+extern void test_NonLeapYearJune(void);
+extern void test_LeapYearFebruary(void);
+extern void test_LeapYearDecember(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "ymd2yd.c";
+  UnityBegin("ymd2yd.c");
+  RUN_TEST(test_NonLeapYearFebruary, 17);
+  RUN_TEST(test_NonLeapYearJune, 21);
+  RUN_TEST(test_LeapYearFebruary, 26);
+  RUN_TEST(test_LeapYearDecember, 30);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/libntp/sfptostr.c b/contrib/ntp/tests/libntp/sfptostr.c
new file mode 100644
index 000000000000..fd56114eaadd
--- /dev/null
+++ b/contrib/ntp/tests/libntp/sfptostr.c
@@ -0,0 +1,73 @@
+/* 
+ * This file contains test for both fptoa and fptoms (which uses dofptoa),
+ * since all these functions are very similar.
+ */
+#include "config.h"
+#include "ntp_fp.h"
+#include "unity.h"
+ 
+#define SFP_MAX_PRECISION 6
+
+void test_PositiveInteger(void)
+{
+	s_fp test = 300 << 16; // exact 300.000000
+
+	TEST_ASSERT_EQUAL_STRING("300.000000", fptoa(test, SFP_MAX_PRECISION));
+	TEST_ASSERT_EQUAL_STRING("300000.000", fptoms(test, SFP_MAX_PRECISION));
+}
+
+void test_NegativeInteger(void)
+{
+	s_fp test = -200 << 16; // exact -200.000000
+
+	TEST_ASSERT_EQUAL_STRING("-200.000000", fptoa(test, SFP_MAX_PRECISION));
+	TEST_ASSERT_EQUAL_STRING("-200000.000", fptoms(test, SFP_MAX_PRECISION));
+}
+
+void test_PositiveIntegerPositiveFraction(void)
+{
+	s_fp test = (300 << 16) + (1 << 15); // 300 + 0.5
+
+	TEST_ASSERT_EQUAL_STRING("300.500000", fptoa(test, SFP_MAX_PRECISION));
+	TEST_ASSERT_EQUAL_STRING("300500.000", fptoms(test, SFP_MAX_PRECISION));
+}
+
+void test_NegativeIntegerNegativeFraction(void)
+{
+	s_fp test = (-200 << 16) - (1 << 15); // -200 - 0.5
+
+	TEST_ASSERT_EQUAL_STRING("-200.500000", fptoa(test, SFP_MAX_PRECISION));
+	TEST_ASSERT_EQUAL_STRING("-200500.000", fptoms(test, SFP_MAX_PRECISION));
+}
+
+void test_PositiveIntegerNegativeFraction(void)
+{
+	s_fp test = (300 << 16) - (1 << 14); // 300 - 0.25
+
+	TEST_ASSERT_EQUAL_STRING("299.750000", fptoa(test, SFP_MAX_PRECISION));
+	TEST_ASSERT_EQUAL_STRING("299750.000", fptoms(test, SFP_MAX_PRECISION));
+}
+
+void test_NegativeIntegerPositiveFraction(void)
+{
+	s_fp test = (-200 << 16) + (1 << 14)*3; // -200 + 0.75
+
+	TEST_ASSERT_EQUAL_STRING("-199.250000", fptoa(test, SFP_MAX_PRECISION));
+	TEST_ASSERT_EQUAL_STRING("-199250.000", fptoms(test, SFP_MAX_PRECISION));
+}
+
+void test_SingleDecimalInteger(void)
+{
+	s_fp test = 300 << 16; // 300
+
+	TEST_ASSERT_EQUAL_STRING("300.0", fptoa(test, 1));
+	TEST_ASSERT_EQUAL_STRING("300000.0", fptoms(test, 1));
+}
+
+void test_SingleDecimalRounding(void)
+{
+	s_fp test = (2 << 16) + (1 << 14)*3; // 2 + 0.25*3 = 2.75
+
+	TEST_ASSERT_EQUAL_STRING("2.8", fptoa(test, 1));
+	TEST_ASSERT_EQUAL_STRING("2750.0", fptoms(test, 1));
+}
diff --git a/contrib/ntp/tests/libntp/sockaddrtest.h b/contrib/ntp/tests/libntp/sockaddrtest.h
index 4baac4dd73ee..f9a9fde41ee8 100644
--- a/contrib/ntp/tests/libntp/sockaddrtest.h
+++ b/contrib/ntp/tests/libntp/sockaddrtest.h
@@ -1,58 +1,57 @@
 #ifndef TESTS_SOCKADDRTEST_H
 #define TESTS_SOCKADDRTEST_H
 
-#include "libntptest.h"
-
-extern "C" {
 #include "ntp.h"
-};
+#include "ntp_stdlib.h"
 
-class sockaddrtest : public libntptest {
-protected:
-	::testing::AssertionResult IsEqual(const sockaddr_u &expected, const sockaddr_u &actual) {
-		if (expected.sa.sa_family != actual.sa.sa_family) {
-			return ::testing::AssertionFailure()
-				<< "Expected sa_family: " << expected.sa.sa_family
-				<< " but got: " << actual.sa.sa_family;
-		}
+sockaddr_u CreateSockaddr4(const char* address, unsigned int port) {
+	sockaddr_u s;
+	s.sa4.sin_family = AF_INET;
+	s.sa4.sin_addr.s_addr = inet_addr(address);
+	SET_PORT(&s, port);
 
-		if (actual.sa.sa_family == AF_INET) { // IPv4
-			if (expected.sa4.sin_port == actual.sa4.sin_port &&
-				memcmp(&expected.sa4.sin_addr, &actual.sa4.sin_addr,
-					   sizeof(in_addr)) == 0) {
-				return ::testing::AssertionSuccess();
-			} else {
-				return ::testing::AssertionFailure()
-					<< "IPv4 comparision failed, expected: "
-					<< expected.sa4.sin_addr.s_addr
-					<< "(" << socktoa(&expected) << ")"
-					<< " but was: "
-					<< actual.sa4.sin_addr.s_addr
-					<< "(" << socktoa(&actual) << ")";
-			}
-		} else if (actual.sa.sa_family == AF_INET6) { //IPv6
-			if (expected.sa6.sin6_port == actual.sa6.sin6_port &&
-				memcmp(&expected.sa6.sin6_addr, &actual.sa6.sin6_addr,
-					   sizeof(in6_addr)) == 0) {
-				return ::testing::AssertionSuccess();
-			} else {
-				return ::testing::AssertionFailure()
-					<< "IPv6 comparision failed";
-			}
-		} else { // Unknown family
-			return ::testing::AssertionFailure()
-				<< "Unknown sa_family: " << actual.sa.sa_family;
-		}
+	return s;
+}
+
+int IsEqual(const sockaddr_u expected, const sockaddr_u actual) {
+	struct in_addr in;
+	struct in6_addr in6;
+
+	if (expected.sa.sa_family != actual.sa.sa_family) {
+		//<< "Expected sa_family: " << expected.sa.sa_family
+		//<< " but got: " << actual.sa.sa_family;
+		return FALSE;
 	}
 
-	sockaddr_u CreateSockaddr4(const char* address, unsigned int port) {
-		sockaddr_u s;
-		s.sa4.sin_family = AF_INET;
-		s.sa4.sin_addr.s_addr = inet_addr(address);
-		SET_PORT(&s, port);
-
-		return s;
+	if (actual.sa.sa_family == AF_INET) { // IPv4
+		if (expected.sa4.sin_port == actual.sa4.sin_port &&
+			memcmp(&expected.sa4.sin_addr, &actual.sa4.sin_addr,
+				   sizeof( in )) == 0) {
+			return TRUE;
+		} else {
+			//<< "IPv4 comparision failed, expected: "
+			//<< expected.sa4.sin_addr.s_addr
+			//<< "(" << socktoa(&expected) << ") but was: "
+			//<< actual.sa4.sin_addr.s_addr "(" << socktoa(&actual) << ")";
+			return FALSE;
+		}
+	} else if (actual.sa.sa_family == AF_INET6) { //IPv6
+		if (expected.sa6.sin6_port == actual.sa6.sin6_port &&
+			memcmp(&expected.sa6.sin6_addr, &actual.sa6.sin6_addr,
+				   sizeof(in6)) == 0) {
+			return TRUE;
+		} else {
+			printf("IPv6 comparision failed");
+			return FALSE;
+		}
+	} else { // Unknown family
+		printf("Unknown sa_family: ");// << actual.sa.sa_family;
+		return FALSE;
 	}
-};
+}
+
 
 #endif // TESTS_SOCKADDRTEST_H
+
+
+
diff --git a/contrib/ntp/tests/libntp/socktoa.c b/contrib/ntp/tests/libntp/socktoa.c
new file mode 100644
index 000000000000..537df1e44407
--- /dev/null
+++ b/contrib/ntp/tests/libntp/socktoa.c
@@ -0,0 +1,109 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+
+#include "unity.h"
+
+#include "sockaddrtest.h"
+
+
+void test_IPv4AddressWithPort(void) {
+	sockaddr_u input = CreateSockaddr4("192.0.2.10", 123);
+
+	TEST_ASSERT_EQUAL_STRING("192.0.2.10", socktoa(&input));
+	TEST_ASSERT_EQUAL_STRING("192.0.2.10:123", sockporttoa(&input));
+}
+
+void test_IPv6AddressWithPort(void) {
+	const struct in6_addr address = {
+		0x20, 0x01, 0x0d, 0xb8,
+		0x85, 0xa3, 0x08, 0xd3, 
+		0x13, 0x19, 0x8a, 0x2e,
+		0x03, 0x70, 0x73, 0x34
+	};
+
+	const char* expected =
+		"2001:db8:85a3:8d3:1319:8a2e:370:7334";
+	const char* expected_port = 
+		"[2001:db8:85a3:8d3:1319:8a2e:370:7334]:123";
+
+	sockaddr_u input;
+	memset(&input, 0, sizeof(input));
+	AF(&input) = AF_INET6;
+	SET_ADDR6N(&input, address);
+	SET_PORT(&input, 123);
+
+	TEST_ASSERT_EQUAL_STRING(expected, socktoa(&input));
+	TEST_ASSERT_EQUAL_STRING(expected_port, sockporttoa(&input));
+}
+
+#ifdef ISC_PLATFORM_HAVESCOPEID
+void test_ScopedIPv6AddressWithPort(void) {
+	const struct in6_addr address = {
+		0xfe, 0x80, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00,
+		0x02, 0x12, 0x3f, 0xff, 
+		0xfe, 0x29, 0xff, 0xfa
+	};
+
+	const char* expected =
+		"fe80::212:3fff:fe29:fffa%5";
+	const char* expected_port = 
+		"[fe80::212:3fff:fe29:fffa%5]:123";
+
+	sockaddr_u input;
+	memset(&input, 0, sizeof(input));
+	AF(&input) = AF_INET6;
+	SET_ADDR6N(&input, address);
+	SET_PORT(&input, 123);
+	SCOPE_VAR(&input) = 5;
+
+	TEST_ASSERT_EQUAL_STRING(expected, socktoa(&input));
+	TEST_ASSERT_EQUAL_STRING(expected_port, sockporttoa(&input));
+}
+#endif	/* ISC_PLATFORM_HAVESCOPEID */
+
+void test_HashEqual(void) {
+	sockaddr_u input1 = CreateSockaddr4("192.00.2.2", 123);
+	sockaddr_u input2 = CreateSockaddr4("192.0.2.2", 123);
+
+	TEST_ASSERT_TRUE(IsEqual(input1, input2));
+	TEST_ASSERT_EQUAL(sock_hash(&input1), sock_hash(&input2));
+}
+
+void test_HashNotEqual(void) {
+	/* These two addresses should not generate the same hash. */
+	sockaddr_u input1 = CreateSockaddr4("192.0.2.1", 123);
+	sockaddr_u input2 = CreateSockaddr4("192.0.2.2", 123);
+
+	TEST_ASSERT_FALSE(IsEqual(input1, input2));
+	//TODO : EXPECT_NE(sock_hash(&input1), sock_hash(&input2));
+	//Damir's suggestion below:
+	TEST_ASSERT_FALSE(sock_hash(&input1) == sock_hash(&input2)); 
+	//NOTE: sock_hash returns u_short, so you can compare it with ==
+	//for complex structures you have to write an additional function like bool compare(a,b) 
+}
+
+void test_IgnoreIPv6Fields(void) {
+	const struct in6_addr address = {
+		0x20, 0x01, 0x0d, 0xb8,
+        0x85, 0xa3, 0x08, 0xd3, 
+        0x13, 0x19, 0x8a, 0x2e,
+        0x03, 0x70, 0x73, 0x34
+	};
+
+	sockaddr_u input1, input2;
+
+	input1.sa6.sin6_family = AF_INET6;
+	input1.sa6.sin6_addr = address;
+	input1.sa6.sin6_flowinfo = 30L; // This value differs from input2.
+	SET_PORT(&input1, NTP_PORT);
+
+	input2.sa6.sin6_family = AF_INET6;
+	input2.sa6.sin6_addr = address;
+	input2.sa6.sin6_flowinfo = 10L; // This value differs from input1.
+	SET_PORT(&input2, NTP_PORT);
+
+	TEST_ASSERT_EQUAL(sock_hash(&input1), sock_hash(&input2));
+}
diff --git a/contrib/ntp/tests/libntp/ssl_init.c b/contrib/ntp/tests/libntp/ssl_init.c
new file mode 100644
index 000000000000..fe22414e3339
--- /dev/null
+++ b/contrib/ntp/tests/libntp/ssl_init.c
@@ -0,0 +1,58 @@
+#include "config.h"
+
+#include "ntp.h"
+
+#ifdef OPENSSL
+# include "openssl/err.h"
+# include "openssl/rand.h"
+# include "openssl/evp.h"
+#endif
+
+#include "unity.h"
+
+
+static const size_t TEST_MD5_DIGEST_LENGTH = 16;
+static const size_t TEST_SHA1_DIGEST_LENGTH = 20;
+
+
+// keytype_from_text()
+void test_MD5KeyTypeWithoutDigestLength() {
+	TEST_ASSERT_EQUAL(KEY_TYPE_MD5, keytype_from_text("MD5", NULL));
+}
+
+void test_MD5KeyTypeWithDigestLength() {
+	size_t digestLength;
+	size_t expected = TEST_MD5_DIGEST_LENGTH;
+
+	TEST_ASSERT_EQUAL(KEY_TYPE_MD5, keytype_from_text("MD5", &digestLength));
+	TEST_ASSERT_EQUAL(expected, digestLength);
+}
+
+
+void test_SHA1KeyTypeWithDigestLength() {
+#ifdef OPENSSL
+	size_t digestLength;
+	size_t expected = TEST_SHA1_DIGEST_LENGTH;
+
+	TEST_ASSERT_EQUAL(NID_sha, keytype_from_text("SHA", &digestLength));
+	TEST_ASSERT_EQUAL(expected, digestLength);
+	/* OPENSSL */
+#else 
+	TEST_IGNORE_MESSAGE("Skipping because OPENSSL isn't defined");
+#endif
+}
+
+
+// keytype_name()
+void test_MD5KeyName() {
+	TEST_ASSERT_EQUAL_STRING("MD5", keytype_name(KEY_TYPE_MD5));
+}
+
+void test_SHA1KeyName() {
+#ifdef OPENSSL
+	TEST_ASSERT_EQUAL_STRING("SHA", keytype_name(NID_sha));
+#else
+	TEST_IGNORE_MESSAGE("Skipping because OPENSSL isn't defined");
+#endif	/* OPENSSL */
+}
+
diff --git a/contrib/ntp/tests/libntp/statestr.c b/contrib/ntp/tests/libntp/statestr.c
new file mode 100644
index 000000000000..5f7babe4537b
--- /dev/null
+++ b/contrib/ntp/tests/libntp/statestr.c
@@ -0,0 +1,36 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+#include "ntp.h"	// Needed for MAX_MAC_LEN used in ntp_control.h
+#include "ntp_control.h"
+
+#include "unity.h"
+
+void setUp(void)
+{ 
+}
+
+void tearDown(void)
+{
+}
+
+
+// eventstr()
+void test_PeerRestart(void) {
+	TEST_ASSERT_EQUAL_STRING("restart", eventstr(PEVNT_RESTART));
+}
+
+void test_SysUnspecified(void) {
+	TEST_ASSERT_EQUAL_STRING("unspecified", eventstr(EVNT_UNSPEC));
+}
+
+// ceventstr()
+void test_ClockCodeExists(void) {
+	TEST_ASSERT_EQUAL_STRING("clk_unspec", ceventstr(CTL_CLK_OKAY));
+}
+
+void test_ClockCodeUnknown(void) {
+	TEST_ASSERT_EQUAL_STRING("clk_-1", ceventstr(-1));
+}
+
diff --git a/contrib/ntp/tests/libntp/strtolfp.c b/contrib/ntp/tests/libntp/strtolfp.c
new file mode 100644
index 000000000000..de9f1119c6a1
--- /dev/null
+++ b/contrib/ntp/tests/libntp/strtolfp.c
@@ -0,0 +1,114 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+
+#include "unity.h"
+#include "lfptest.h"
+
+/* This file tests both atolfp and mstolfp */
+
+void test_PositiveInteger(void) {
+	const char *str = "500";
+	const char *str_ms = "500000";
+
+	l_fp expected = {500,0};
+	l_fp actual, actual_ms;
+
+	TEST_ASSERT_TRUE(atolfp(str, &actual));
+	TEST_ASSERT_TRUE(mstolfp(str_ms, &actual_ms));
+
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual_ms));
+}
+
+void test_NegativeInteger(void) {
+	const char *str = "-300";
+	const char *str_ms = "-300000";
+
+	l_fp expected;
+	expected.l_i = -300;
+	expected.l_uf = 0;
+
+	l_fp actual, actual_ms;
+
+	TEST_ASSERT_TRUE(atolfp(str, &actual));
+	TEST_ASSERT_TRUE(mstolfp(str_ms, &actual_ms));
+
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual_ms));
+}
+
+void test_PositiveFraction(void) {
+	const char *str = "+500.5";
+	const char *str_ms = "500500.0";
+
+	l_fp expected = {500, HALF};
+	l_fp actual, actual_ms;
+
+	TEST_ASSERT_TRUE(atolfp(str, &actual));
+	TEST_ASSERT_TRUE(mstolfp(str_ms, &actual_ms));
+
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual_ms));
+}
+
+void test_NegativeFraction(void) {
+	const char *str = "-300.75";
+	const char *str_ms = "-300750";
+
+	l_fp expected;
+	expected.l_i = -301;
+	expected.l_uf = QUARTER;
+
+	l_fp actual, actual_ms;
+
+	TEST_ASSERT_TRUE(atolfp(str, &actual));
+	TEST_ASSERT_TRUE(mstolfp(str_ms, &actual_ms));
+
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual_ms));
+}
+
+void test_PositiveMsFraction(void) {
+	const char *str = "300.00025";
+	const char *str_ms = "300000.25";
+
+	l_fp expected = {300, QUARTER_PROMILLE_APPRX};
+	l_fp actual, actual_ms;
+
+
+	TEST_ASSERT_TRUE(atolfp(str, &actual));
+	TEST_ASSERT_TRUE(mstolfp(str_ms, &actual_ms));
+
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual_ms));
+
+}
+
+void test_NegativeMsFraction(void) {
+	const char *str = "-199.99975";
+	const char *str_ms = "-199999.75";
+
+	l_fp expected;
+	expected.l_i = -200;
+	expected.l_uf = QUARTER_PROMILLE_APPRX;
+
+	l_fp actual, actual_ms;
+
+	TEST_ASSERT_TRUE(atolfp(str, &actual));
+	TEST_ASSERT_TRUE(mstolfp(str_ms, &actual_ms));
+
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+	TEST_ASSERT_TRUE(IsEqual(expected, actual_ms));
+
+}
+
+void test_InvalidChars(void) {
+	const char *str = "500.4a2";
+	l_fp actual, actual_ms;
+
+	TEST_ASSERT_FALSE(atolfp(str, &actual));
+	TEST_ASSERT_FALSE(mstolfp(str, &actual_ms));
+}
+
diff --git a/contrib/ntp/tests/libntp/test-libntp.c b/contrib/ntp/tests/libntp/test-libntp.c
new file mode 100644
index 000000000000..e489f673fc76
--- /dev/null
+++ b/contrib/ntp/tests/libntp/test-libntp.c
@@ -0,0 +1,32 @@
+#include 
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+
+#include "test-libntp.h"
+
+//const char *progname = "test-libntp";
+
+// current_time is needed by authkeys. Used only in to calculate lifetime.
+//u_long current_time = 4;
+
+
+time_t nowtime = 0;
+
+time_t timefunc(time_t *ptr)
+{
+    if (ptr)
+	*ptr = nowtime;
+    return nowtime;
+}
+
+void settime(int y, int m, int d, int H, int M, int S)
+{
+
+    time_t days = ntpcal_edate_to_eradays(y-1, m-1, d-1) + 1 - DAY_UNIX_STARTS;
+    time_t secs = ntpcal_etime_to_seconds(H, M, S);
+
+    nowtime = days * SECSPERDAY + secs;
+}
+
+
diff --git a/contrib/ntp/tests/libntp/test-libntp.h b/contrib/ntp/tests/libntp/test-libntp.h
new file mode 100644
index 000000000000..eb113cd52c53
--- /dev/null
+++ b/contrib/ntp/tests/libntp/test-libntp.h
@@ -0,0 +1,3 @@
+time_t timefunc(time_t *ptr);
+void settime(int y, int m, int d, int H, int M, int S);
+time_t nowtime;
diff --git a/contrib/ntp/tests/libntp/timespecops.c b/contrib/ntp/tests/libntp/timespecops.c
new file mode 100644
index 000000000000..bb2619a079af
--- /dev/null
+++ b/contrib/ntp/tests/libntp/timespecops.c
@@ -0,0 +1,587 @@
+#include "config.h"
+
+#include "ntp_types.h"
+#include "ntp_fp.h"
+
+#include 
+#include "timespecops.h"
+
+#include "unity.h"
+
+
+#include 
+
+//in unity_helper.h :
+#define TEST_ASSERT_EQUAL_timespec(a, b) { \
+    TEST_ASSERT_EQUAL_MESSAGE(a.tv_sec, b.tv_sec, "Field tv_sec"); \
+    TEST_ASSERT_EQUAL_MESSAGE(a.tv_nsec, b.tv_nsec, "Field tv_nsec");	\
+}
+
+//what about l_fp.l_ui  ??? it's a union so it's either l_fp.l_ui or l_fp.l_i?
+#define TEST_ASSERT_EQUAL_l_fp(a, b) { \
+    TEST_ASSERT_EQUAL_MESSAGE(a.l_i, b.l_i, "Field l_i"); \
+    TEST_ASSERT_EQUAL_UINT_MESSAGE(a.l_uf, b.l_uf, "Field l_uf");	\
+}
+
+//timespec has time_t, long, and time_t is basically long uint, 4 or 8 bytes size, depending on 32/64bit
+
+static u_int32 my_tick_to_tsf(u_int32 ticks);
+static u_int32 my_tsf_to_tick(u_int32 tsf);
+
+// that's it...
+struct lfpfracdata {
+	long	nsec;
+	u_int32 frac;
+};
+
+//******************************************MY CUSTOM FUNCTIONS*******************************
+
+typedef int bool; //TRUE and FALSE are already defined somewhere, so I can't do typedef enum { FALSE, TRUE } boolean;
+
+const bool timespec_isValid(struct timespec V)
+		{ return V.tv_nsec >= 0 && V.tv_nsec < 1000000000; }
+
+struct timespec timespec_init(time_t hi, long lo){
+	struct timespec V;	
+	V.tv_sec = hi;
+	V.tv_nsec = lo;
+	return V;
+}
+
+//taken from lfpfunc.c -> maybe remove this from timevalops.c and lfpfunc. and put in c_timstructs.h ????!!!!!
+l_fp l_fp_init(int32 i, u_int32 f)
+{
+	l_fp temp;
+	temp.l_i  = i;
+	temp.l_uf = f;
+
+	return temp;
+}
+
+//also in timelalops.c!!!!!!
+bool AssertFpClose(const l_fp m,const l_fp n, const l_fp limit)
+{
+	l_fp diff;
+
+	if (L_ISGEQ(&m, &n)) {
+		diff = m;
+		L_SUB(&diff, &n);
+	} else {
+		diff = n;
+		L_SUB(&diff, &m);
+	}
+	if (L_ISGEQ(&limit, &diff)){
+		return TRUE;
+	}
+	else {
+		//<< m_expr << " which is " << l_fp_wrap(m)
+		//<< "\nand\n"
+		//<< n_expr << " which is " << l_fp_wrap(n)
+		//<< "\nare not close; diff=" << l_fp_wrap(diff);
+		return FALSE;
+	}
+}
+
+
+bool AssertTimespecClose(const struct timespec m,const struct timespec n, const struct timespec limit)
+{
+	struct timespec diff;
+
+	diff = abs_tspec(sub_tspec(m, n));
+	if (cmp_tspec(limit, diff) >= 0)
+		return TRUE;
+	else
+	{
+		//<< m_expr << " which is " << timespec_wrap(m)
+		//<< "\nand\n"
+		//<< n_expr << " which is " << timespec_wrap(n)
+		//<< "\nare not close; diff=" << timespec_wrap(diff);
+		return FALSE;
+	}
+}
+
+//-----------------------------------------------
+
+static const struct lfpfracdata fdata[] = {
+	{	  0, 0x00000000 }, {   2218896, 0x00916ae6 },
+	{  16408100, 0x0433523d }, { 125000000, 0x20000000 },
+	{ 250000000, 0x40000000 }, { 287455871, 0x4996b53d },
+	{ 375000000, 0x60000000 }, { 500000000, 0x80000000 },
+	{ 518978897, 0x84dbcd0e }, { 563730222, 0x90509fb3 },
+	{ 563788007, 0x9054692c }, { 583289882, 0x95527c57 },
+	{ 607074509, 0x9b693c2a }, { 625000000, 0xa0000000 },
+	{ 645184059, 0xa52ac851 }, { 676497788, 0xad2ef583 },
+	{ 678910895, 0xadcd1abb }, { 679569625, 0xadf84663 },
+	{ 690926741, 0xb0e0932d }, { 705656483, 0xb4a5e73d },
+	{ 723553854, 0xb93ad34c }, { 750000000, 0xc0000000 },
+	{ 763550253, 0xc3780785 }, { 775284917, 0xc6791284 },
+	{ 826190764, 0xd3813ce8 }, { 875000000, 0xe0000000 },
+	{ 956805507, 0xf4f134a9 }, { 982570733, 0xfb89c16c }
+	};
+
+
+u_int32 my_tick_to_tsf(u_int32 ticks)
+{
+	// convert nanoseconds to l_fp fractional units, using double
+	// precision float calculations or, if available, 64bit integer
+	// arithmetic. This should give the precise fraction, rounded to
+	// the nearest representation.
+#ifdef HAVE_U_INT64
+	return (u_int32)((( ((u_int64)(ticks)) << 32) + 500000000) / 1000000000);
+#else
+	return (u_int32)((double(ticks)) * 4.294967296 + 0.5);
+#endif
+	// And before you ask: if ticks >= 1000000000, the result is
+	// truncated nonsense, so don't use it out-of-bounds.
+}
+
+u_int32 my_tsf_to_tick(u_int32 tsf)
+{
+	// Inverse operation: converts fraction to microseconds.
+#ifdef HAVE_U_INT64
+	return (u_int32)(( ((u_int64)(tsf)) * 1000000000 + 0x80000000) >> 32);
+#else
+	return (u_int32)(double(tsf) / 4.294967296 + 0.5);
+#endif
+	// Beware: The result might be 10^9 due to rounding!
+}
+
+
+
+// ---------------------------------------------------------------------
+// test support stuff -- part 1
+// ---------------------------------------------------------------------
+
+void test_Helpers1() {
+	struct timespec x;
+
+	for (x.tv_sec = -2; x.tv_sec < 3; x.tv_sec++) {
+		x.tv_nsec = -1;
+		TEST_ASSERT_FALSE(timespec_isValid(x));
+		x.tv_nsec = 0;
+		TEST_ASSERT_TRUE(timespec_isValid(x));
+		x.tv_nsec = 999999999;
+		TEST_ASSERT_TRUE(timespec_isValid(x));
+		x.tv_nsec = 1000000000;
+		TEST_ASSERT_FALSE(timespec_isValid(x));
+	}
+}
+
+
+//----------------------------------------------------------------------
+// test normalisation
+//----------------------------------------------------------------------
+
+void test_Normalise() {
+	long ns;
+	for ( ns = -2000000000; ns <= 2000000000; ns += 10000000) {
+		struct timespec x = timespec_init(0, ns);
+
+		x = normalize_tspec(x);
+		TEST_ASSERT_TRUE(timespec_isValid(x));
+	}
+}
+
+//----------------------------------------------------------------------
+// test classification
+//----------------------------------------------------------------------
+
+void test_SignNoFrac() {
+	// sign test, no fraction
+	int i;
+	for (i = -4; i <= 4; ++i) {
+		struct timespec a = timespec_init(i, 0);
+		int E = (i > 0) - (i < 0);
+		int r = test_tspec(a);
+
+		TEST_ASSERT_EQUAL(E, r);
+	}
+}
+
+void test_SignWithFrac() {
+	// sign test, with fraction
+	int i;
+	for (i = -4; i <= 4; ++i) {
+		struct timespec a = timespec_init(i, 10);
+		int E = (i >= 0) - (i < 0);
+		int r = test_tspec(a);
+		TEST_ASSERT_EQUAL(E, r);
+	}
+}
+
+//----------------------------------------------------------------------
+// test compare
+//----------------------------------------------------------------------
+void test_CmpFracEQ() {
+	// fractions are equal
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timespec a = timespec_init( i , 200);
+			struct timespec b = timespec_init( j , 200);
+			int   E = (i > j) - (i < j);
+			int   r = cmp_tspec_denorm(a, b);
+			TEST_ASSERT_EQUAL(E, r);
+		}
+}
+
+void test_CmpFracGT() {
+	// fraction a bigger fraction b
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timespec a = timespec_init(i, 999999800);
+			struct timespec b = timespec_init(j, 200);
+			int   E = (i >= j) - (i < j);
+			int   r = cmp_tspec_denorm(a, b);
+			TEST_ASSERT_EQUAL(E, r);
+		}
+}
+
+void test_CmpFracLT() {
+	// fraction a less fraction b
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timespec a = timespec_init(i, 200);
+			struct timespec b = timespec_init(j, 999999800);
+			int   E = (i > j) - (i <= j);
+			int   r = cmp_tspec_denorm(a, b);
+			TEST_ASSERT_EQUAL(E, r);
+		}
+}
+
+//----------------------------------------------------------------------
+// Test addition (sum)
+//----------------------------------------------------------------------
+
+void test_AddFullNorm() {
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timespec a = timespec_init(i, 200);
+			struct timespec b = timespec_init(j, 400);
+			struct timespec E = timespec_init(i + j, 200 + 400);
+			struct timespec c;
+
+			c = add_tspec(a, b);
+			TEST_ASSERT_EQUAL_timespec(E, c);
+		}
+}
+
+void test_AddFullOflow1() {
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timespec a = timespec_init(i, 200);
+			struct timespec b = timespec_init(j, 999999900);
+			struct timespec E = timespec_init(i + j + 1, 100);
+			struct timespec c;
+
+			c = add_tspec(a, b);
+			TEST_ASSERT_EQUAL_timespec(E, c);
+		}
+}
+
+void test_AddNsecNorm() {
+	int i;
+	for (i = -4; i <= 4; ++i) {
+		struct timespec a = timespec_init(i, 200);
+		struct timespec E = timespec_init(i, 600);
+		struct timespec c;
+
+		c = add_tspec_ns(a, 600 - 200);
+		TEST_ASSERT_EQUAL_timespec(E, c);
+	}
+}
+
+void test_AddNsecOflow1() {
+	int i;
+	for (i = -4; i <= 4; ++i) {
+		struct timespec a = timespec_init(i, 200);
+		struct timespec E = timespec_init(i + 1, 100);
+		struct timespec c;
+
+		c = add_tspec_ns(a, NANOSECONDS - 100);
+		TEST_ASSERT_EQUAL_timespec(E, c);
+	}
+}
+
+//----------------------------------------------------------------------
+// test subtraction (difference)
+//----------------------------------------------------------------------
+
+void test_SubFullNorm() {
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timespec a = timespec_init( i , 600);
+			struct timespec b = timespec_init( j , 400);
+			struct timespec E = timespec_init(i-j, 200);
+			struct timespec c;
+
+			c = sub_tspec(a, b);
+			TEST_ASSERT_EQUAL_timespec(E, c);
+		}
+}
+
+void test_SubFullOflow() {
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timespec a = timespec_init(  i  , 100);
+			struct timespec b = timespec_init(  j  , 999999900);
+			struct timespec E = timespec_init(i-j-1, 200);
+			struct timespec c;
+
+			c = sub_tspec(a, b);
+			TEST_ASSERT_EQUAL_timespec(E, c);
+		}
+}
+
+void test_SubNsecNorm() {
+	int i;
+	for (i = -4; i <= 4; ++i) {
+		struct timespec a = timespec_init(i, 600);
+		struct timespec E = timespec_init(i, 200);
+		struct timespec c;
+
+		c = sub_tspec_ns(a, 600 - 200);
+		TEST_ASSERT_EQUAL_timespec(E, c);
+	}
+}
+
+void test_SubNsecOflow() {
+	int i;
+	for (i = -4; i <= 4; ++i) {
+		struct timespec a = timespec_init( i , 100);
+		struct timespec E = timespec_init(i-1, 200);
+		struct timespec c;
+
+		c = sub_tspec_ns(a, NANOSECONDS - 100);
+		TEST_ASSERT_EQUAL_timespec(E, c);
+	}
+}
+
+//----------------------------------------------------------------------
+// test negation
+//----------------------------------------------------------------------
+
+void test_Neg() {
+	int i;
+	for (i = -4; i <= 4; ++i) {
+		struct timespec a = timespec_init(i, 100);
+		struct timespec b;
+		struct timespec c;
+
+		b = neg_tspec(a);
+		c = add_tspec(a, b);
+		TEST_ASSERT_EQUAL(0, test_tspec(c));
+	}
+}
+
+//----------------------------------------------------------------------
+// test abs value
+//----------------------------------------------------------------------
+
+void test_AbsNoFrac() {
+	int i;
+	for (i = -4; i <= 4; ++i) {
+		struct timespec a = timespec_init(i , 0);
+		struct timespec b;
+
+		b = abs_tspec(a);
+		TEST_ASSERT_EQUAL((i != 0), test_tspec(b));
+	}
+}
+
+void test_AbsWithFrac() {
+	int i;
+	for (i = -4; i <= 4; ++i) {
+		struct timespec a = timespec_init(i, 100);
+		struct timespec b;
+
+		b = abs_tspec(a);
+		TEST_ASSERT_EQUAL(1, test_tspec(b));
+	}
+}
+
+// ---------------------------------------------------------------------
+// test support stuff -- part 2
+// ---------------------------------------------------------------------
+
+void test_Helpers2() {
+	struct timespec limit = timespec_init(0,2);
+	
+	struct timespec x, y;
+	long i;
+
+	for (x.tv_sec = -2; x.tv_sec < 3; x.tv_sec++)
+		for (x.tv_nsec = 1;
+		     x.tv_nsec < 1000000000;
+		     x.tv_nsec += 499999999) {
+			for (i = -4; i < 5; i++) {
+				y = x;
+				y.tv_nsec += i;
+				if (i >= -2 && i <= 2){
+					TEST_ASSERT_TRUE(AssertTimespecClose(x,y,limit));//ASSERT_PRED_FORMAT2(isClose, x, y);
+				}
+				else
+				{
+					TEST_ASSERT_FALSE(AssertTimespecClose(x,y,limit));//ASSERT_PRED_FORMAT2(!isClose, x, y);
+				}
+			}
+		}
+}
+
+// global predicate instances we're using here
+//static l_fp lfpClose =  l_fp_init(0,1); //static AssertFpClose FpClose(0, 1);
+//static struct timespec limit = timespec_init(0,2); //static AssertTimespecClose TimespecClose(0, 2);
+
+//----------------------------------------------------------------------
+// conversion to l_fp
+//----------------------------------------------------------------------
+
+void test_ToLFPbittest() {
+	l_fp lfpClose =  l_fp_init(0,1);
+	u_int32 i;
+	for (i = 0; i < 1000000000; i+=1000) {
+		struct timespec a = timespec_init(1, i);
+		l_fp E= l_fp_init(1, my_tick_to_tsf(i));
+		l_fp r;
+
+		r = tspec_intv_to_lfp(a);
+		TEST_ASSERT_TRUE(AssertFpClose(E,r,lfpClose)); //ASSERT_PRED_FORMAT2(FpClose, E, r);
+	}
+}
+
+void test_ToLFPrelPos() {
+	int i;
+	for (i = 0; i < COUNTOF(fdata); i++) {
+		struct timespec a = timespec_init(1, fdata[i].nsec);
+		l_fp E = l_fp_init(1, fdata[i].frac);
+		l_fp r;
+
+		r = tspec_intv_to_lfp(a);
+		TEST_ASSERT_EQUAL_l_fp(E, r);
+	}
+}
+
+void test_ToLFPrelNeg() {
+	int i;
+	for (i = 0; i < COUNTOF(fdata); i++) {
+		struct timespec a = timespec_init(-1, fdata[i].nsec);
+		l_fp E = l_fp_init(~0, fdata[i].frac);
+		l_fp r;
+
+		r = tspec_intv_to_lfp(a);
+		TEST_ASSERT_EQUAL_l_fp(E, r);
+	}
+}
+
+void test_ToLFPabs() {
+	int i;
+	for (i = 0; i < COUNTOF(fdata); i++) {
+		struct timespec a = timespec_init(1, fdata[i].nsec);
+		l_fp E = l_fp_init(1 + JAN_1970, fdata[i].frac);
+		l_fp r;
+
+		r = tspec_stamp_to_lfp(a);
+		TEST_ASSERT_EQUAL_l_fp(E, r);
+	}
+}
+
+//----------------------------------------------------------------------
+// conversion from l_fp
+//----------------------------------------------------------------------
+void test_FromLFPbittest() {
+	struct timespec limit = timespec_init(0,2);
+
+	// Not *exactly* a bittest, because 2**32 tests would take a
+	// really long time even on very fast machines! So we do test
+	// every 1000 fractional units.
+	u_int32 tsf;
+	for (tsf = 0; tsf < ~((u_int32)(1000)); tsf += 1000) {
+		struct timespec E = timespec_init(1, my_tsf_to_tick(tsf));
+		l_fp a = l_fp_init(1, tsf);
+		struct timespec r;
+
+		r = lfp_intv_to_tspec(a);
+		// The conversion might be off by one nanosecond when
+		// comparing to calculated value.
+		TEST_ASSERT_TRUE(AssertTimespecClose(E,r,limit)); //ASSERT_PRED_FORMAT2(TimespecClose, E, r);
+	}
+}
+
+void test_FromLFPrelPos() {
+	struct timespec limit = timespec_init(0,2);
+	int i;
+	for (i = 0; i < COUNTOF(fdata); i++) {
+		l_fp a = l_fp_init(1, fdata[i].frac);
+		struct timespec E = timespec_init(1, fdata[i].nsec);
+		struct timespec r;
+
+		r = lfp_intv_to_tspec(a);
+		TEST_ASSERT_TRUE(AssertTimespecClose(E,r,limit)); //ASSERT_PRED_FORMAT2(TimespecClose, E, r);
+	}
+}
+
+void test_FromLFPrelNeg() {
+	struct timespec limit = timespec_init(0,2);
+	int i;
+	for (i = 0; i < COUNTOF(fdata); i++) {
+		l_fp a = l_fp_init(~0, fdata[i].frac);
+		struct timespec E = timespec_init(-1, fdata[i].nsec);
+		struct timespec r;
+
+		r = lfp_intv_to_tspec(a);
+		TEST_ASSERT_TRUE(AssertTimespecClose(E,r,limit)); //ASSERT_PRED_FORMAT2(TimespecClose, E, r);
+	}
+}
+
+
+// nsec -> frac -> nsec roundtrip, using a prime start and increment
+void test_LFProundtrip() {
+	int32_t t;
+	u_int32 i;
+	for (t = -1; t < 2; ++t)
+		for (i = 4999; i < 1000000000; i+=10007) {
+			struct timespec E = timespec_init(t, i);
+			l_fp a;
+			struct timespec r;
+
+			a = tspec_intv_to_lfp(E);
+			r = lfp_intv_to_tspec(a);
+			TEST_ASSERT_EQUAL_timespec(E, r);
+		}
+}
+
+//----------------------------------------------------------------------
+// string formatting
+//----------------------------------------------------------------------
+
+void test_ToString() {
+	static const struct {
+		time_t		sec;
+		long		nsec;
+		const char *	repr;
+	} data [] = {
+		{ 0, 0,	 "0.000000000" },
+		{ 2, 0,	 "2.000000000" },
+		{-2, 0, "-2.000000000" },
+		{ 0, 1,	 "0.000000001" },
+		{ 0,-1,	"-0.000000001" },
+		{ 1,-1,	 "0.999999999" },
+		{-1, 1, "-0.999999999" },
+		{-1,-1, "-1.000000001" },
+	};
+	int i;
+	for (i = 0; i < COUNTOF(data); i++) {
+		struct timespec a = timespec_init(data[i].sec, data[i].nsec);
+		const char * E = data[i].repr;
+		const char * r = tspectoa(a);
+		TEST_ASSERT_EQUAL_STRING(E, r);
+	}
+}
+
+// -*- EOF -*-
diff --git a/contrib/ntp/tests/libntp/timevalops.c b/contrib/ntp/tests/libntp/timevalops.c
new file mode 100644
index 000000000000..080dfb737d17
--- /dev/null
+++ b/contrib/ntp/tests/libntp/timevalops.c
@@ -0,0 +1,598 @@
+#include "config.h"
+
+//some unused features are still in the wrapper, unconverted
+
+#include "ntp_types.h"
+#include "ntp_fp.h"
+
+#include 
+#include "timevalops.h"
+
+#include "unity.h"
+
+
+//in unity_helper.h :
+#define TEST_ASSERT_EQUAL_timeval(a, b) { \
+    TEST_ASSERT_EQUAL_MESSAGE(a.tv_sec, b.tv_sec, "Field tv_sec"); \
+    TEST_ASSERT_EQUAL_MESSAGE(a.tv_usec, b.tv_usec, "Field tv_usec");	\
+}
+
+//timeval has time_t, long, and time_t is basically uint
+
+static u_int32 my_tick_to_tsf(u_int32 ticks);
+static u_int32 my_tsf_to_tick(u_int32 tsf);
+
+// that's it...
+typedef struct {
+	long	usec;
+	u_int32	frac;
+} lfpfracdata ;
+
+
+//******************************************MY CUSTOM FUNCTIONS*******************************
+
+typedef int bool; //TRUE and FALSE are already defined somewhere, so I can't do typedef enum { FALSE, TRUE } boolean;
+
+struct timeval timeval_init( time_t hi, long lo){
+	struct timeval V; 
+	V.tv_sec = hi; 
+	V.tv_usec = lo;
+	return V;
+}
+
+const bool timeval_isValid(struct timeval V)
+	{ return V.tv_usec >= 0 && V.tv_usec < 1000000; }
+
+//taken from lfpfunc.c -> maybe remove this from timevalops.c and lfpfunc. and put in c_timstructs.h ????!!!!!
+l_fp l_fp_init(int32 i, u_int32 f)
+{
+	l_fp temp;
+	temp.l_i  = i;
+	temp.l_uf = f;
+
+	return temp;
+}
+
+bool AssertTimevalClose(const struct timeval m, const struct timeval n, const struct timeval limit)
+{
+	struct timeval diff;
+
+	diff = abs_tval(sub_tval(m, n));
+	if (cmp_tval(limit, diff) >= 0)
+		return TRUE;
+	
+	else 
+	{
+		//printf("");
+		//<< m_expr << " which is " << timeval_wrap(m)
+		//<< "\nand\n"
+		//<< n_expr << " which is " << timeval_wrap(n)
+		//<< "\nare not close; diff=" << timeval_wrap(diff);
+		return FALSE;
+	}
+}
+
+bool AssertFpClose(const l_fp m,const l_fp n, const l_fp limit)
+{
+	l_fp diff;
+
+	if (L_ISGEQ(&m, &n)) {
+		diff = m;
+		L_SUB(&diff, &n);
+	} else {
+		diff = n;
+		L_SUB(&diff, &m);
+	}
+	if (L_ISGEQ(&limit, &diff)){
+		return TRUE;
+	}
+	else {
+		//<< m_expr << " which is " << l_fp_wrap(m)
+		//<< "\nand\n"
+		//<< n_expr << " which is " << l_fp_wrap(n)
+		//<< "\nare not close; diff=" << l_fp_wrap(diff);
+		return FALSE;
+	}
+}
+
+
+//---------------------------------------------------
+
+static const lfpfracdata fdata[] = {
+	{      0, 0x00000000 }, {   7478, 0x01ea1405 },
+	{  22077, 0x05a6d699 }, { 125000, 0x20000000 },
+	{ 180326, 0x2e29d841 }, { 207979, 0x353e1c9b },
+	{ 250000, 0x40000000 }, { 269509, 0x44fe8ab5 },
+	{ 330441, 0x5497c808 }, { 333038, 0x5541fa76 },
+	{ 375000, 0x60000000 }, { 394734, 0x650d4995 },
+	{ 446327, 0x72427c7c }, { 500000, 0x80000000 },
+	{ 517139, 0x846338b4 }, { 571953, 0x926b8306 },
+	{ 587353, 0x965cc426 }, { 625000, 0xa0000000 },
+	{ 692136, 0xb12fd32c }, { 750000, 0xc0000000 },
+	{ 834068, 0xd5857aff }, { 848454, 0xd9344806 },
+	{ 854222, 0xdaae4b02 }, { 861465, 0xdc88f862 },
+	{ 875000, 0xe0000000 }, { 910661, 0xe921144d },
+	{ 922162, 0xec12cf10 }, { 942190, 0xf1335d25 }
+};
+
+
+u_int32 my_tick_to_tsf(u_int32 ticks)
+{
+	// convert microseconds to l_fp fractional units, using double
+	// precision float calculations or, if available, 64bit integer
+	// arithmetic. This should give the precise fraction, rounded to
+	// the nearest representation.
+#ifdef HAVE_U_INT64
+	return (u_int32)((( ((u_int64)(ticks)) << 32) + 500000) / 1000000); //I put too much () when casting just to be safe
+#else
+	return (u_int32)( ((double)(ticks)) * 4294.967296 + 0.5);
+#endif
+	// And before you ask: if ticks >= 1000000, the result is
+	// truncated nonsense, so don't use it out-of-bounds.
+}
+
+u_int32 my_tsf_to_tick(u_int32 tsf)
+{
+	// Inverse operation: converts fraction to microseconds.
+#ifdef HAVE_U_INT64
+	return (u_int32)( ((u_int64)(tsf) * 1000000 + 0x80000000) >> 32); //CHECK ME!!!
+#else
+	return (u_int32)(double(tsf) / 4294.967296 + 0.5);
+#endif
+	// Beware: The result might be 10^6 due to rounding!
+}
+
+
+//***************************************END OF CUSTOM FUNCTIONS*****************************
+
+
+// ---------------------------------------------------------------------
+// test support stuff - part1
+// ---------------------------------------------------------------------
+
+void test_Helpers1() {
+	struct timeval x;
+
+	for (x.tv_sec = -2; x.tv_sec < 3; x.tv_sec++) {
+		x.tv_usec = -1;
+		TEST_ASSERT_FALSE(timeval_isValid(x));
+		x.tv_usec = 0;
+		TEST_ASSERT_TRUE(timeval_isValid(x));
+		x.tv_usec = 999999;
+		TEST_ASSERT_TRUE(timeval_isValid(x));
+		x.tv_usec = 1000000;
+		TEST_ASSERT_FALSE(timeval_isValid(x));
+	}
+}
+
+
+//----------------------------------------------------------------------
+// test normalisation
+//----------------------------------------------------------------------
+
+void test_Normalise() {
+	long ns;
+	for (ns = -2000000000; ns <= 2000000000; ns += 10000000) {
+		struct timeval x = timeval_init(0, ns);
+		
+		x = normalize_tval(x);
+		TEST_ASSERT_TRUE(timeval_isValid(x));
+	}
+}
+
+//----------------------------------------------------------------------
+// test classification
+//----------------------------------------------------------------------
+
+void test_SignNoFrac() {
+	int i;
+	// sign test, no fraction
+	for (i = -4; i <= 4; ++i) {
+		struct timeval a = timeval_init(i, 0);
+		int	     E = (i > 0) - (i < 0);
+		int	     r = test_tval(a);
+
+		TEST_ASSERT_EQUAL(E, r);
+	}
+}
+
+void test_SignWithFrac() {
+	// sign test, with fraction
+	int i;
+	for (i = -4; i <= 4; ++i) {
+		struct timeval a = timeval_init(i, 10);
+		int	     E = (i >= 0) - (i < 0);
+		int	     r = test_tval(a);
+
+		TEST_ASSERT_EQUAL(E, r);
+	}
+}
+
+//----------------------------------------------------------------------
+// test compare
+//----------------------------------------------------------------------
+void test_CmpFracEQ() {
+	int i,j;
+	// fractions are equal
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timeval a = timeval_init(i, 200);
+			struct timeval b = timeval_init(j, 200);
+			int	     E = (i > j) - (i < j);
+			int	     r = cmp_tval_denorm(a, b);
+
+			TEST_ASSERT_EQUAL(E, r);
+		}
+}
+
+void test_CmpFracGT() {
+	// fraction a bigger fraction b
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timeval a = timeval_init( i , 999800);
+			struct timeval b = timeval_init( j , 200);
+			int	     E = (i >= j) - (i < j);
+			int	     r = cmp_tval_denorm(a, b);
+
+			TEST_ASSERT_EQUAL(E, r);
+		}
+}
+
+void test_CmpFracLT() {
+	// fraction a less fraction b
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timeval a = timeval_init(i, 200);
+			struct timeval b = timeval_init(j, 999800);
+			int	     E = (i > j) - (i <= j);
+			int	     r = cmp_tval_denorm(a, b);
+
+			TEST_ASSERT_EQUAL(E, r);
+		}
+}
+
+//----------------------------------------------------------------------
+// Test addition (sum)
+//----------------------------------------------------------------------
+
+void test_AddFullNorm() {
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timeval a = timeval_init(i, 200);
+			struct timeval b = timeval_init(j, 400);
+			struct timeval E = timeval_init(i + j, 200 + 400);
+			struct timeval c;
+
+			c = add_tval(a, b);
+			TEST_ASSERT_EQUAL_timeval(E, c);
+		}
+}
+
+void test_AddFullOflow1() {
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timeval a = timeval_init(i, 200);
+			struct timeval b = timeval_init(j, 999900);
+			struct timeval E = timeval_init(i + j + 1, 100);
+			struct timeval c;
+
+			c = add_tval(a, b);
+			TEST_ASSERT_EQUAL_timeval(E, c);
+		}
+}
+
+void test_AddUsecNorm() {
+	int i;
+	for (i = -4; i <= 4; ++i) {
+		struct timeval a = timeval_init(i, 200);
+		struct timeval E = timeval_init(i, 600);
+		struct timeval c;
+
+		c = add_tval_us(a, 600 - 200);
+		TEST_ASSERT_EQUAL_timeval(E, c);
+	}
+}
+
+void test_AddUsecOflow1() {
+	int i;
+	for (i = -4; i <= 4; ++i) {
+		struct timeval a = timeval_init(i, 200);
+		struct timeval E = timeval_init(i + 1, 100);
+		struct timeval c;
+
+		c = add_tval_us(a, MICROSECONDS - 100);
+		TEST_ASSERT_EQUAL_timeval(E, c);
+	}
+}
+
+//----------------------------------------------------------------------
+// test subtraction (difference)
+//----------------------------------------------------------------------
+
+void test_SubFullNorm() {
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timeval a = timeval_init(i, 600);
+			struct timeval b = timeval_init(j, 400);
+			struct timeval E = timeval_init(i - j, 600 - 400);
+			struct timeval c;
+
+			c = sub_tval(a, b);
+			TEST_ASSERT_EQUAL_timeval(E, c);
+		}
+}
+
+void test_SubFullOflow() {
+	int i,j;
+	for (i = -4; i <= 4; ++i)
+		for (j = -4; j <= 4; ++j) {
+			struct timeval a = timeval_init(i, 100);
+			struct timeval b = timeval_init(j, 999900);
+			struct timeval E = timeval_init(i - j - 1, 200);
+			struct timeval c;
+
+			c = sub_tval(a, b);
+			TEST_ASSERT_EQUAL_timeval(E, c);
+		}
+}
+
+void test_SubUsecNorm() {
+	int i = -4;
+	for (i = -4; i <= 4; ++i) {
+		struct timeval a = timeval_init(i, 600);
+		struct timeval E = timeval_init(i, 200);
+		struct timeval c;
+
+		c = sub_tval_us(a, 600 - 200);
+		TEST_ASSERT_EQUAL_timeval(E, c);
+	}
+}
+
+void test_SubUsecOflow() {
+	int i = -4;
+	for (i = -4; i <= 4; ++i) {
+		struct timeval a = timeval_init(i, 100);
+		struct timeval E = timeval_init(i - 1, 200);
+		struct timeval c;
+
+		c = sub_tval_us(a, MICROSECONDS - 100);
+		TEST_ASSERT_EQUAL_timeval(E, c);
+	}
+}
+
+//----------------------------------------------------------------------
+// test negation
+//----------------------------------------------------------------------
+
+void test_Neg() {
+	int i = -4;
+	for (i = -4; i <= 4; ++i) {
+		struct timeval a = timeval_init(i, 100);
+		struct timeval b;
+		struct timeval c;
+
+		b = neg_tval(a);
+		c = add_tval(a, b);
+		TEST_ASSERT_EQUAL(0, test_tval(c));
+	}
+}
+
+//----------------------------------------------------------------------
+// test abs value
+//----------------------------------------------------------------------
+
+void test_AbsNoFrac() {
+	int i = -4;
+	for (i = -4; i <= 4; ++i) {
+		struct timeval a = timeval_init(i, 0);
+		struct timeval b;
+
+		b = abs_tval(a);
+		TEST_ASSERT_EQUAL((i != 0), test_tval(b));
+	}
+}
+
+void test_AbsWithFrac() {
+	int i = -4;
+	for (i = -4; i <= 4; ++i) {
+		struct timeval a = timeval_init(i, 100);
+		struct timeval b;
+
+		b = abs_tval(a);
+		TEST_ASSERT_EQUAL(1, test_tval(b));
+	}
+}
+
+// ---------------------------------------------------------------------
+// test support stuff -- part 2
+// ---------------------------------------------------------------------
+
+
+void test_Helpers2() {
+	//struct AssertTimevalClose isClose = AssertTimevalClose_init(0, 2);
+	struct timeval limit = timeval_init(0, 2);
+	struct timeval x, y;
+	long i;	
+
+	for (x.tv_sec = -2; x.tv_sec < 3; x.tv_sec++){
+		for (x.tv_usec = 1;
+		     x.tv_usec < 1000000;
+		     x.tv_usec += 499999) {
+			for (i = -4; i < 5; i++) {
+				y = x;
+				y.tv_usec += i;
+				if (i >= -2 && i <= 2){
+					TEST_ASSERT_TRUE(AssertTimevalClose(x,y,limit));//ASSERT_PRED_FORMAT2(isClose, x, y);
+				}
+				else {
+					TEST_ASSERT_FALSE(AssertTimevalClose(x,y,limit));//ASSERT_PRED_FORMAT2(!isClose, x, y);
+				}
+			}
+		}
+	}
+}
+
+// and the global predicate instances we're using here
+
+//static l_fp lfpClose =  l_fp_init(0,1); //static AssertFpClose FpClose(0, 1);
+//static struct timeval timevalClose = timeval_init(0,1); //static AssertTimevalClose TimevalClose(0, 1);
+
+//----------------------------------------------------------------------
+// conversion to l_fp
+//----------------------------------------------------------------------
+
+void test_ToLFPbittest() {
+	l_fp lfpClose =  l_fp_init(0,1);	
+
+	u_int32 i = 0;
+	for (i = 0; i < 1000000; i++) {
+		struct timeval a = timeval_init(1, i);
+		l_fp E = l_fp_init(1,my_tick_to_tsf(i));
+		l_fp r;
+
+		r = tval_intv_to_lfp(a);
+		TEST_ASSERT_TRUE(AssertFpClose(E,r,lfpClose));	//ASSERT_PRED_FORMAT2(FpClose, E, r);
+	}
+}
+
+
+void test_ToLFPrelPos() {
+	l_fp lfpClose =  l_fp_init(0,1);
+
+	int i = 0;
+	for (i = 0; i < COUNTOF(fdata); i++) {
+		struct timeval a = timeval_init(1, fdata[i].usec);
+		l_fp E = l_fp_init(1, fdata[i].frac);
+		l_fp r;
+
+		r = tval_intv_to_lfp(a);
+		TEST_ASSERT_TRUE(AssertFpClose(E,r,lfpClose)); //ASSERT_PRED_FORMAT2(FpClose, E, r);
+	}
+}
+
+void test_ToLFPrelNeg() {
+	l_fp lfpClose =  l_fp_init(0,1);
+	int i = 0;
+	for (i = 0; i < COUNTOF(fdata); i++) {
+		struct timeval a = timeval_init(-1, fdata[i].usec);
+		l_fp E = l_fp_init(~0, fdata[i].frac);
+		l_fp    r;
+
+		r = tval_intv_to_lfp(a);
+		TEST_ASSERT_TRUE(AssertFpClose(E,r,lfpClose)); //ASSERT_PRED_FORMAT2(FpClose,E, r);
+	}
+}
+
+void test_ToLFPabs() {
+	l_fp lfpClose =  l_fp_init(0,1);
+
+	int i = 0;
+	for (i = 0; i < COUNTOF(fdata); i++) {
+		struct timeval a = timeval_init(1, fdata[i].usec);
+		l_fp E = l_fp_init(1 + JAN_1970, fdata[i].frac);
+		l_fp    r;
+
+		r = tval_stamp_to_lfp(a);
+		TEST_ASSERT_TRUE(AssertFpClose(E,r,lfpClose)); //ASSERT_PRED_FORMAT2(FpClose, E, r);
+	}
+}
+
+//----------------------------------------------------------------------
+// conversion from l_fp
+//----------------------------------------------------------------------
+
+void test_FromLFPbittest() {
+	struct timeval timevalClose = timeval_init(0,1);
+	// Not *exactly* a bittest, because 2**32 tests would take a
+	// really long time even on very fast machines! So we do test
+	// every 1000 fractional units.
+	u_int32 tsf = 0;
+	for (tsf = 0; tsf < ~((u_int32)(1000)); tsf += 1000) {
+		struct timeval E = timeval_init(1, my_tsf_to_tick(tsf));
+		l_fp a = l_fp_init(1, tsf);
+		struct timeval r;
+
+		r = lfp_intv_to_tval(a);
+		// The conversion might be off by one microsecond when
+		// comparing to calculated value.
+		TEST_ASSERT_TRUE(AssertTimevalClose(E,r,timevalClose)); //ASSERT_PRED_FORMAT2(TimevalClose, E, r);
+	}
+}
+
+void test_FromLFPrelPos() {
+	struct timeval timevalClose = timeval_init(0,1);
+	int i = 0;	
+	for (i = 0; i < COUNTOF(fdata); i++) {
+		l_fp a = l_fp_init(1, fdata[i].frac);
+		struct timeval E = timeval_init(1, fdata[i].usec);
+		struct timeval r;
+
+		r = lfp_intv_to_tval(a);
+		TEST_ASSERT_TRUE(AssertTimevalClose(E,r,timevalClose)); //ASSERT_PRED_FORMAT2(TimevalClose, E, r);
+	}
+}
+
+void test_FromLFPrelNeg() {
+	struct timeval timevalClose = timeval_init(0,1);
+	int i = 0;
+	for (i = 0; i < COUNTOF(fdata); i++) {
+		l_fp a = l_fp_init(~0, fdata[i].frac);
+		struct timeval E = timeval_init(-1, fdata[i].usec);
+		struct timeval r;
+
+		r = lfp_intv_to_tval(a);
+		TEST_ASSERT_TRUE(AssertTimevalClose(E,r,timevalClose)); //ASSERT_PRED_FORMAT2(TimevalClose, E, r);
+	}
+}
+
+// usec -> frac -> usec roundtrip, using a prime start and increment
+void test_LFProundtrip() {
+	int32_t t = -1;
+	u_int32 i = 5;
+	for (t = -1; t < 2; ++t)
+		for (i = 5; i < 1000000; i+=11) {
+			struct timeval E = timeval_init(t, i);
+			l_fp a;
+			struct timeval r;
+
+			a = tval_intv_to_lfp(E);
+			r = lfp_intv_to_tval(a);
+			TEST_ASSERT_EQUAL_timeval(E, r);
+		}
+}
+
+//----------------------------------------------------------------------
+// string formatting
+//----------------------------------------------------------------------
+
+void test_ToString() {
+	static const struct {
+		time_t	     sec;
+		long	     usec;
+		const char * repr;
+	} data [] = {
+		{ 0, 0,	 "0.000000" },
+		{ 2, 0,	 "2.000000" },
+		{-2, 0, "-2.000000" },
+		{ 0, 1,	 "0.000001" },
+		{ 0,-1,	"-0.000001" },
+		{ 1,-1,	 "0.999999" },
+		{-1, 1, "-0.999999" },
+		{-1,-1, "-1.000001" },
+	};
+	int i;
+	for (i = 0; i < COUNTOF(data); ++i) {
+		struct timeval a = timeval_init(data[i].sec, data[i].usec);
+		const char *  E = data[i].repr; //??
+		const char *  r = tvaltoa(a);
+
+		TEST_ASSERT_EQUAL_STRING(E, r);
+	}
+}
+
+// -*- EOF -*-
diff --git a/contrib/ntp/tests/libntp/tstotv.c b/contrib/ntp/tests/libntp/tstotv.c
new file mode 100644
index 000000000000..080172752fda
--- /dev/null
+++ b/contrib/ntp/tests/libntp/tstotv.c
@@ -0,0 +1,44 @@
+#include "config.h"
+
+#include "ntp_fp.h"
+#include "timevalops.h"
+
+#include "unity.h"
+
+void
+test_Seconds(void) {
+	const l_fp input = {50, 0}; // 50.0 s
+	const struct timeval expected = {50, 0};
+	struct timeval actual;
+
+	TSTOTV(&input, &actual);
+
+	TEST_ASSERT_EQUAL(expected.tv_sec, actual.tv_sec);
+	TEST_ASSERT_EQUAL(expected.tv_usec, actual.tv_usec);
+}
+
+void
+test_MicrosecondsExact(void) {
+	const u_long HALF = 2147483648UL;
+	const l_fp input = {50, HALF}; // 50.5 s
+	const struct timeval expected = {50, 500000};
+	struct timeval actual;
+
+	TSTOTV(&input, &actual);
+
+	TEST_ASSERT_EQUAL(expected.tv_sec, actual.tv_sec);
+	TEST_ASSERT_EQUAL(expected.tv_usec, actual.tv_usec);
+
+}
+
+void
+test_MicrosecondsRounding(void) {
+	const l_fp input = {50, 3865471UL}; // Should round to 50.0009
+	const struct timeval expected = {50, 900};
+	struct timeval actual;
+
+	TSTOTV(&input, &actual);
+
+	TEST_ASSERT_EQUAL(expected.tv_sec, actual.tv_sec);
+	TEST_ASSERT_EQUAL(expected.tv_usec, actual.tv_usec);
+}
diff --git a/contrib/ntp/tests/libntp/tvtots.c b/contrib/ntp/tests/libntp/tvtots.c
new file mode 100644
index 000000000000..6c8345aaaa1b
--- /dev/null
+++ b/contrib/ntp/tests/libntp/tvtots.c
@@ -0,0 +1,54 @@
+#include "config.h"
+
+#include "lfptest.h"
+#include "timevalops.h"
+
+#include "unity.h"
+#include // Required on Solaris for ldexp.
+
+
+void test_Seconds(void)
+{
+	struct timeval input = {500, 0}; // 500.0 s
+	l_fp expected = {500, 0};
+	l_fp actual;
+
+	TVTOTS(&input, &actual);
+
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_MicrosecondsRounded(void)
+{
+	/* 0.0005 can not be represented exact in a l_fp structure.
+	 * It would equal to 2147483,648. This means that
+	 * HALF_PROMILLE_UP (which is 2147484) should be
+	 * the correct rounding. */
+
+	struct timeval input = {0, 500}; // 0.0005 exact
+	l_fp expected = {0, HALF_PROMILLE_UP};
+	l_fp actual;
+
+	TVTOTS(&input, &actual);
+	TEST_ASSERT_TRUE(IsEqual(expected, actual));
+}
+
+void test_MicrosecondsExact(void)
+{
+	// 0.5 can be represented exact in both l_fp and timeval.
+	const struct timeval input = {10, 500000}; // 0.5 exact
+	const l_fp expected = {10, HALF}; // 0.5 exact
+	l_fp actual;
+
+	TVTOTS(&input, &actual);
+
+	// Compare the fractional part with an absolute error given.
+	TEST_ASSERT_EQUAL_UINT(expected.l_ui, actual.l_ui);
+
+	double expectedDouble, actualDouble;
+	M_LFPTOD(0, expected.l_uf, expectedDouble);
+	M_LFPTOD(0, actual.l_uf, actualDouble);
+
+	// The error should be less than 0.5 us
+	TEST_ASSERT_DOUBLE_WITHIN(0000005, expectedDouble, actualDouble);
+}
diff --git a/contrib/ntp/tests/libntp/uglydate.c b/contrib/ntp/tests/libntp/uglydate.c
new file mode 100644
index 000000000000..a8d02d15b910
--- /dev/null
+++ b/contrib/ntp/tests/libntp/uglydate.c
@@ -0,0 +1,18 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+#include "ntp_fp.h"
+
+#include "unity.h"
+
+
+void
+test_ConstantDateTime(void) {
+	const u_int32 HALF = 2147483648UL;
+
+	l_fp time = {3485080800UL, HALF}; // 2010-06-09 14:00:00.5
+
+	TEST_ASSERT_EQUAL_STRING("3485080800.500000 10:159:14:00:00.500",
+				 uglydate(&time));
+}
diff --git a/contrib/ntp/tests/libntp/vi64ops.c b/contrib/ntp/tests/libntp/vi64ops.c
new file mode 100644
index 000000000000..af7dd1b7bfeb
--- /dev/null
+++ b/contrib/ntp/tests/libntp/vi64ops.c
@@ -0,0 +1,72 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+
+#include "unity.h"
+
+#include "vint64ops.h"
+
+//technically bool
+//int IsEqual(const vint64 &expected, const vint64 &actual) {
+int IsEqual(const vint64 expected, const vint64 actual) {
+	if (0 == memcmp(&expected, &actual, sizeof(vint64))) {
+		printf( "%x.", expected.D_s.hi); //<< std::hex << expected.D_s.hi << '.'
+		printf("%x",expected.D_s.lo);//<< std::hex << expected.D_s.lo
+		printf(" but was ");
+		printf("%x.",actual.D_s.hi); //<< std::hex << actual.D_s.hi << '.'
+		printf("%x\n",actual.D_s.lo); //<< std::hex << actual.D_s.lo;
+		return TRUE;
+	} else {
+		
+		printf("expected: ");
+		printf( "%d.", expected.D_s.hi); //<< std::hex << expected.D_s.hi << '.'
+		printf("%d",expected.D_s.lo);//<< std::hex << expected.D_s.lo
+		printf(" but was ");
+		printf("%d",actual.D_s.lo); //<< std::hex << actual.D_s.hi << '.'
+		printf("%d",actual.D_s.lo); //<< std::hex << actual.D_s.lo;
+		return FALSE;
+	}
+}
+
+// ----------------------------------------------------------------------
+// test number parser
+void test_ParseVUI64_pos() {
+	vint64 act, exp;
+	const char *sp;
+	char       *ep;
+
+	sp         = "1234x";
+	exp.D_s.hi = 0;
+	exp.D_s.lo = 1234;
+	act        = strtouv64(sp, &ep, 0);
+
+	TEST_ASSERT_TRUE(IsEqual(exp, act));
+	TEST_ASSERT_EQUAL(*ep, 'x');
+}
+
+void test_ParseVUI64_neg() {
+	vint64 act, exp;
+	const char *sp;
+	char       *ep;
+
+	sp         = "-1234x";
+	exp.D_s.hi = ~0;
+	exp.D_s.lo = -1234;
+	act        = strtouv64(sp, &ep, 0);
+	TEST_ASSERT_TRUE(IsEqual(exp, act));
+	TEST_ASSERT_EQUAL(*ep, 'x');
+}
+
+void test_ParseVUI64_case() {
+	vint64 act, exp;
+	const char *sp;
+	char       *ep;
+
+	sp         = "0123456789AbCdEf";
+	exp.D_s.hi = 0x01234567;
+	exp.D_s.lo = 0x89ABCDEF;
+	act        = strtouv64(sp, &ep, 16);
+	TEST_ASSERT_TRUE(IsEqual(exp, act));
+	TEST_ASSERT_EQUAL(*ep, '\0');
+}
+
diff --git a/contrib/ntp/tests/libntp/ymd2yd.c b/contrib/ntp/tests/libntp/ymd2yd.c
new file mode 100644
index 000000000000..8e0725c13866
--- /dev/null
+++ b/contrib/ntp/tests/libntp/ymd2yd.c
@@ -0,0 +1,35 @@
+#include "config.h"
+
+#include "ntp_stdlib.h"
+#include "ntp_calendar.h"
+
+#include "unity.h"
+
+void setUp(void)
+{ 
+}
+
+void tearDown(void)
+{
+}
+
+
+void test_NonLeapYearFebruary (void) {
+	TEST_ASSERT_EQUAL(31+20, ymd2yd(2010,2,20)); //2010-02-20
+}
+
+void test_NonLeapYearJune (void) {
+	int expected = 31+28+31+30+31+18; // 18 June non-leap year
+	TEST_ASSERT_EQUAL(expected, ymd2yd(2011,6,18));
+}
+
+void test_LeapYearFebruary (void) {
+	TEST_ASSERT_EQUAL(31+20, ymd2yd(2012,2,20)); //2012-02-20 (leap year)
+}
+
+void test_LeapYearDecember (void) {
+	// 2012-12-31
+	int expected = 31+29+31+30+31+30+31+31+30+31+30+31;
+	TEST_ASSERT_EQUAL(expected, ymd2yd(2012,12,31));
+}
+
diff --git a/contrib/ntp/tests/ntpd/Makefile.in b/contrib/ntp/tests/ntpd/Makefile.in
index bb51457a5c6c..e6ad905b7a95 100644
--- a/contrib/ntp/tests/ntpd/Makefile.in
+++ b/contrib/ntp/tests/ntpd/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -16,6 +15,61 @@
 @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@
@@ -37,9 +91,6 @@ host_triplet = @host@
 check_PROGRAMS = tests$(EXEEXT)
 TESTS = $(am__EXEEXT_1)
 @NTP_CROSSCOMPILE_FALSE@am__append_1 = tests
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \
-	$(top_srcdir)/includes.mf
 subdir = tests/ntpd
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -71,6 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -80,6 +132,8 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -94,9 +148,22 @@ tests_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -107,46 +174,274 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_$(V))
-am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
-am__v_CXX_0 = @echo "  CXX   " $@;
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_$(V))
-am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(tests_SOURCES)
 DIST_SOURCES = $(tests_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
 @NTP_CROSSCOMPILE_FALSE@am__EXEEXT_1 = tests$(EXEEXT)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \
+	$(top_srcdir)/includes.mf \
+	$(top_srcdir)/sntp/libevent/build-aux/depcomp \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -197,6 +492,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -313,6 +609,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -442,7 +739,7 @@ all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .cpp .lo .o .obj
+.SUFFIXES: .c .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -455,7 +752,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_src
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/ntpd/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign tests/ntpd/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -464,6 +760,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -482,7 +779,8 @@ clean-checkPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-tests$(EXEEXT): $(tests_OBJECTS) $(tests_DEPENDENCIES) 
+
+tests$(EXEEXT): $(tests_OBJECTS) $(tests_DEPENDENCIES) $(EXTRA_tests_DEPENDENCIES) 
 	@rm -f tests$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(tests_OBJECTS) $(tests_LDADD) $(LIBS)
 
@@ -500,82 +798,72 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 ntp_leapsec.o: $(top_srcdir)/ntpd/ntp_leapsec.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntp_leapsec.o -MD -MP -MF $(DEPDIR)/ntp_leapsec.Tpo -c -o ntp_leapsec.o `test -f '$(top_srcdir)/ntpd/ntp_leapsec.c' || echo '$(srcdir)/'`$(top_srcdir)/ntpd/ntp_leapsec.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ntp_leapsec.Tpo $(DEPDIR)/ntp_leapsec.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/ntpd/ntp_leapsec.c' object='ntp_leapsec.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/ntpd/ntp_leapsec.c' object='ntp_leapsec.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntp_leapsec.o `test -f '$(top_srcdir)/ntpd/ntp_leapsec.c' || echo '$(srcdir)/'`$(top_srcdir)/ntpd/ntp_leapsec.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntp_leapsec.o `test -f '$(top_srcdir)/ntpd/ntp_leapsec.c' || echo '$(srcdir)/'`$(top_srcdir)/ntpd/ntp_leapsec.c
 
 ntp_leapsec.obj: $(top_srcdir)/ntpd/ntp_leapsec.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ntp_leapsec.obj -MD -MP -MF $(DEPDIR)/ntp_leapsec.Tpo -c -o ntp_leapsec.obj `if test -f '$(top_srcdir)/ntpd/ntp_leapsec.c'; then $(CYGPATH_W) '$(top_srcdir)/ntpd/ntp_leapsec.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/ntpd/ntp_leapsec.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ntp_leapsec.Tpo $(DEPDIR)/ntp_leapsec.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/ntpd/ntp_leapsec.c' object='ntp_leapsec.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/ntpd/ntp_leapsec.c' object='ntp_leapsec.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntp_leapsec.obj `if test -f '$(top_srcdir)/ntpd/ntp_leapsec.c'; then $(CYGPATH_W) '$(top_srcdir)/ntpd/ntp_leapsec.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/ntpd/ntp_leapsec.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ntp_leapsec.obj `if test -f '$(top_srcdir)/ntpd/ntp_leapsec.c'; then $(CYGPATH_W) '$(top_srcdir)/ntpd/ntp_leapsec.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/ntpd/ntp_leapsec.c'; fi`
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 tests_main.o: $(top_srcdir)/sntp/tests_main.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tests_main.o -MD -MP -MF $(DEPDIR)/tests_main.Tpo -c -o tests_main.o `test -f '$(top_srcdir)/sntp/tests_main.cpp' || echo '$(srcdir)/'`$(top_srcdir)/sntp/tests_main.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tests_main.Tpo $(DEPDIR)/tests_main.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/sntp/tests_main.cpp' object='tests_main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(top_srcdir)/sntp/tests_main.cpp' object='tests_main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.o `test -f '$(top_srcdir)/sntp/tests_main.cpp' || echo '$(srcdir)/'`$(top_srcdir)/sntp/tests_main.cpp
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.o `test -f '$(top_srcdir)/sntp/tests_main.cpp' || echo '$(srcdir)/'`$(top_srcdir)/sntp/tests_main.cpp
 
 tests_main.obj: $(top_srcdir)/sntp/tests_main.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tests_main.obj -MD -MP -MF $(DEPDIR)/tests_main.Tpo -c -o tests_main.obj `if test -f '$(top_srcdir)/sntp/tests_main.cpp'; then $(CYGPATH_W) '$(top_srcdir)/sntp/tests_main.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/sntp/tests_main.cpp'; fi`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tests_main.Tpo $(DEPDIR)/tests_main.Po
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/sntp/tests_main.cpp' object='tests_main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(top_srcdir)/sntp/tests_main.cpp' object='tests_main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.obj `if test -f '$(top_srcdir)/sntp/tests_main.cpp'; then $(CYGPATH_W) '$(top_srcdir)/sntp/tests_main.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/sntp/tests_main.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.obj `if test -f '$(top_srcdir)/sntp/tests_main.cpp'; then $(CYGPATH_W) '$(top_srcdir)/sntp/tests_main.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/sntp/tests_main.cpp'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -583,26 +871,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -614,15 +891,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -631,101 +904,187 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
 	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      color_start= color_end=; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
-	  else \
-	    echo "$$red$$dashes"; \
-	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+tests.log: tests$(EXEEXT)
+	@p='tests$(EXEEXT)'; \
+	b='tests'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -775,11 +1134,19 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -865,9 +1232,9 @@ uninstall-am:
 
 .MAKE: all check check-am install install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -877,7 +1244,9 @@ uninstall-am:
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
+	recheck tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 check-libntp: ../../libntp/libntp.a
diff --git a/contrib/ntp/tests/ntpd/leapsec.cpp b/contrib/ntp/tests/ntpd/leapsec.cpp
index 6ae0cee34c31..ada43945e14f 100644
--- a/contrib/ntp/tests/ntpd/leapsec.cpp
+++ b/contrib/ntp/tests/ntpd/leapsec.cpp
@@ -222,8 +222,10 @@ static const char leap_gthash [] = {
     "#h	1151a8f e85a5069 9000fcdb 3d5e5365 1d505b37"
 };
 
-static uint32_t lsec2009 = 3439756800u; // 1 Jan 2009, 00:00:00 utc
-static uint32_t lsec2012 = 3550089600u; // 1 Jul 2012, 00:00:00 utc
+static const uint32_t lsec2006 = 3345062400u; // +33, 1 Jan 2006, 00:00:00 utc
+static const uint32_t lsec2009 = 3439756800u; // +34, 1 Jan 2009, 00:00:00 utc
+static const uint32_t lsec2012 = 3550089600u; // +35, 1 Jul 2012, 00:00:00 utc
+static const uint32_t lsec2015 = 3644697600u; // +36, 1 Jul 2015, 00:00:00 utc
 
 int stringreader(void* farg)
 {
@@ -292,7 +294,7 @@ void leapsecTest::SetUp()
 {
     ntpcal_set_timefunc(timefunc);
     settime(1970, 1, 1, 0, 0, 0);
-    leapsec_electric(1);
+    leapsec_ut_pristine();
 }
 
 void leapsecTest::TearDown()
@@ -395,9 +397,9 @@ TEST_F(leapsecTest, loadFileExpire) {
 	rc =   leapsec_load(pt, stringreader, &cp, FALSE)
 	    && leapsec_set_table(pt);
 	EXPECT_EQ(1, rc);
-	rc = leapsec_expired(3439756800, NULL);
+	rc = leapsec_expired(3439756800u, NULL);
 	EXPECT_EQ(0, rc);
-	rc = leapsec_expired(3610569601, NULL);
+	rc = leapsec_expired(3610569601u, NULL);
 	EXPECT_EQ(1, rc);
 }
 
@@ -407,7 +409,7 @@ TEST_F(leapsecTest, loadFileTTL) {
 	const char *cp = leap1;
 	int rc;
 	leap_table_t * pt = leapsec_get_table(0);
-	time_t         pivot = 0x70000000;
+	time_t         pivot = 0x70000000u;
 
 	const uint32_t limit = 3610569600u;
 
@@ -429,6 +431,22 @@ TEST_F(leapsecTest, loadFileTTL) {
 	EXPECT_EQ(-1, rc);	
 }
 
+// =====================================================================
+// RANDOM QUERY TESTS
+// =====================================================================
+
+// ----------------------------------------------------------------------
+// test query in pristine state (bug#2745 misbehaviour)
+TEST_F(leapsecTest, lsQueryPristineState) {
+	int            rc;
+	leap_result_t  qr;
+	
+	rc = leapsec_query(&qr, lsec2012, NULL);
+	EXPECT_EQ(FALSE, rc);
+	EXPECT_EQ(0,             qr.warped   );
+	EXPECT_EQ(LSPROX_NOWARN, qr.proximity);
+}
+
 // ----------------------------------------------------------------------
 // ad-hoc jump: leap second at 2009.01.01 -60days
 TEST_F(leapsecTest, ls2009faraway) {
@@ -540,14 +558,85 @@ TEST_F(leapsecTest, ls2009limdata) {
 	rc = setup_load_table(leap1, TRUE);
 	EXPECT_EQ(1, rc);
 
-	// test on-spot with limted table - does not work if build before 2013!
+	// test on-spot with limited table - this is tricky.
+	// The table used ends 2012; depending on the build date, the 2009 entry
+	// might be included or culled. The resulting TAI offset must be either
+	// 34 or 35 seconds, depending on the build date of the test. 
 	rc = leapsec_query(&qr, lsec2009, NULL);
 	EXPECT_EQ(FALSE, rc);
-	EXPECT_EQ(35, qr.tai_offs);
+	EXPECT_LE(34, qr.tai_offs);
+	EXPECT_GE(35, qr.tai_offs);
 	EXPECT_EQ(0,  qr.tai_diff);
 	EXPECT_EQ(LSPROX_NOWARN, qr.proximity);
 }
 
+// ----------------------------------------------------------------------
+// Far-distance forward jump into a transiton window.
+TEST_F(leapsecTest, qryJumpFarAhead) {
+	int            rc;
+	leap_result_t  qr;
+	int            last, idx;
+
+	for (int mode=0; mode < 2; ++mode) {
+		leapsec_ut_pristine();
+		rc = setup_load_table(leap1, FALSE);
+		EXPECT_EQ(1, rc);
+		leapsec_electric(mode);
+
+		rc = leapsec_query(&qr, lsec2006, NULL);
+		EXPECT_EQ(FALSE, rc);
+
+		rc = leapsec_query(&qr, lsec2012, NULL);
+		EXPECT_EQ(FALSE, rc);
+	}
+}
+
+// ----------------------------------------------------------------------
+// Forward jump into the next transition window
+TEST_F(leapsecTest, qryJumpAheadToTransition) {
+	int            rc;
+	leap_result_t  qr;
+	int            last, idx;
+
+	for (int mode=0; mode < 2; ++mode) {
+		leapsec_ut_pristine();
+		rc = setup_load_table(leap1, FALSE);
+		EXPECT_EQ(1, rc);
+		leapsec_electric(mode);
+
+		rc = leapsec_query(&qr, lsec2009-SECSPERDAY, NULL);
+		EXPECT_EQ(FALSE, rc);
+
+		rc = leapsec_query(&qr, lsec2009+1, NULL);
+		EXPECT_EQ(TRUE, rc);
+	}
+}
+
+// ----------------------------------------------------------------------
+// Forward jump over the next transition window
+TEST_F(leapsecTest, qryJumpAheadOverTransition) {
+	int            rc;
+	leap_result_t  qr;
+	int            last, idx;
+
+	for (int mode=0; mode < 2; ++mode) {
+		leapsec_ut_pristine();
+		rc = setup_load_table(leap1, FALSE);
+		EXPECT_EQ(1, rc);
+		leapsec_electric(mode);
+
+		rc = leapsec_query(&qr, lsec2009-SECSPERDAY, NULL);
+		EXPECT_EQ(FALSE, rc);
+
+		rc = leapsec_query(&qr, lsec2009+5, NULL);
+		EXPECT_EQ(FALSE, rc);
+	}
+}
+
+// =====================================================================
+// TABLE MODIFICATION AT RUNTIME
+// =====================================================================
+
 // ----------------------------------------------------------------------
 // add dynamic leap second (like from peer/clock)
 TEST_F(leapsecTest, addDynamic) {
@@ -555,13 +644,13 @@ TEST_F(leapsecTest, addDynamic) {
 	leap_result_t  qr;
 
 	static const uint32_t insns[] = {
-		2982009600,	//	29	# 1 Jul 1994
-		3029443200,	//	30	# 1 Jan 1996
-		3076704000,	//	31	# 1 Jul 1997
-		3124137600,	//	32	# 1 Jan 1999
-		3345062400,	//	33	# 1 Jan 2006
-		3439756800,	//	34	# 1 Jan 2009
-		3550089600,	//	35	# 1 Jul 2012
+		2982009600u,	//	29	# 1 Jul 1994
+		3029443200u,	//	30	# 1 Jan 1996
+		3076704000u,	//	31	# 1 Jul 1997
+		3124137600u,	//	32	# 1 Jan 1999
+		3345062400u,	//	33	# 1 Jan 2006
+		3439756800u,	//	34	# 1 Jan 2009
+		3550089600u,	//	35	# 1 Jul 2012
 		0 // sentinel
 	};
 
@@ -570,7 +659,7 @@ TEST_F(leapsecTest, addDynamic) {
 
 	leap_table_t * pt = leapsec_get_table(0);
 	for (int idx=1; insns[idx]; ++idx) {
-	    rc = leapsec_add_dyn(TRUE, insns[idx] - 20*SECSPERDAY - 100, NULL);
+		rc = leapsec_add_dyn(TRUE, insns[idx] - 20*SECSPERDAY - 100, NULL);
 		EXPECT_EQ(TRUE, rc);
 	}
 	// try to slip in a previous entry
@@ -581,18 +670,19 @@ TEST_F(leapsecTest, addDynamic) {
 
 // ----------------------------------------------------------------------
 // add fixed leap seconds (like from network packet)
+#if 0 /* currently unused -- possibly revived later */
 TEST_F(leapsecTest, addFixed) {
 	int            rc;
 	leap_result_t  qr;
 
 	static const struct { uint32_t tt; int of; } insns[] = {
-		{2982009600, 29},//	# 1 Jul 1994
-		{3029443200, 30},//	# 1 Jan 1996
-		{3076704000, 31},//	# 1 Jul 1997
-		{3124137600, 32},//	# 1 Jan 1999
-		{3345062400, 33},//	# 1 Jan 2006
-		{3439756800, 34},//	# 1 Jan 2009
-		{3550089600, 35},//	# 1 Jul 2012
+		{2982009600u, 29},//	# 1 Jul 1994
+		{3029443200u, 30},//	# 1 Jan 1996
+		{3076704000u, 31},//	# 1 Jul 1997
+		{3124137600u, 32},//	# 1 Jan 1999
+		{3345062400u, 33},//	# 1 Jan 2006
+		{3439756800u, 34},//	# 1 Jan 2009
+		{3550089600u, 35},//	# 1 Jul 2012
 		{0,0} // sentinel
 	};
 
@@ -609,7 +699,7 @@ TEST_F(leapsecTest, addFixed) {
 		NULL);
 		EXPECT_EQ(FALSE, rc);
 	}
-	// no do it right
+	// now do it right
 	for (int idx=0; insns[idx].tt; ++idx) {
 		rc = leapsec_add_fix(
 		    insns[idx].of,
@@ -627,6 +717,167 @@ TEST_F(leapsecTest, addFixed) {
 	EXPECT_EQ(FALSE, rc);
 	//leapsec_dump(pt, (leapsec_dumper)fprintf, stdout);
 }
+#endif
+
+// ----------------------------------------------------------------------
+// add fixed leap seconds (like from network packet)
+#if 0 /* currently unused -- possibly revived later */
+TEST_F(leapsecTest, addFixedExtend) {
+	int            rc;
+	leap_result_t  qr;
+	int            last, idx;
+
+	static const struct { uint32_t tt; int of; } insns[] = {
+		{2982009600u, 29},//	# 1 Jul 1994
+		{3029443200u, 30},//	# 1 Jan 1996
+		{0,0} // sentinel
+	};
+
+	rc = setup_load_table(leap2, FALSE);
+	EXPECT_EQ(1, rc);
+
+	leap_table_t * pt = leapsec_get_table(FALSE);
+	for (last=idx=0; insns[idx].tt; ++idx) {
+		last = idx;
+		rc = leapsec_add_fix(
+		    insns[idx].of,
+		    insns[idx].tt,
+		    insns[idx].tt + SECSPERDAY,
+		    NULL);
+		EXPECT_EQ(TRUE, rc);
+	}
+	
+	// try to extend the expiration of the last entry
+	rc = leapsec_add_fix(
+	    insns[last].of,
+	    insns[last].tt,
+	    insns[last].tt + 128*SECSPERDAY,
+	    NULL);
+	EXPECT_EQ(TRUE, rc);
+	
+	// try to extend the expiration of the last entry with wrong offset
+	rc = leapsec_add_fix(
+	    insns[last].of+1,
+	    insns[last].tt,
+	    insns[last].tt + 129*SECSPERDAY,
+	    NULL);
+	EXPECT_EQ(FALSE, rc);
+	//leapsec_dump(pt, (leapsec_dumper)fprintf, stdout);
+}
+#endif
+
+// ----------------------------------------------------------------------
+// add fixed leap seconds (like from network packet) in an otherwise
+// empty table and test queries before / between /after the tabulated
+// values.
+#if 0 /* currently unused -- possibly revived later */
+TEST_F(leapsecTest, setFixedExtend) {
+	int            rc;
+	leap_result_t  qr;
+	int            last, idx;
+
+	static const struct { uint32_t tt; int of; } insns[] = {
+		{2982009600u, 29},//	# 1 Jul 1994
+		{3029443200u, 30},//	# 1 Jan 1996
+		{0,0} // sentinel
+	};
+
+	leap_table_t * pt = leapsec_get_table(0);
+	for (last=idx=0; insns[idx].tt; ++idx) {
+		last = idx;
+		rc = leapsec_add_fix(
+		    insns[idx].of,
+		    insns[idx].tt,
+		    insns[idx].tt + 128*SECSPERDAY,
+		    NULL);
+		EXPECT_EQ(TRUE, rc);
+	}
+	
+	rc = leapsec_query(&qr, insns[0].tt - 86400, NULL);
+	EXPECT_EQ(28, qr.tai_offs);
+
+	rc = leapsec_query(&qr, insns[0].tt + 86400, NULL);
+	EXPECT_EQ(29, qr.tai_offs);
+
+	rc = leapsec_query(&qr, insns[1].tt - 86400, NULL);
+	EXPECT_EQ(29, qr.tai_offs);
+
+	rc = leapsec_query(&qr, insns[1].tt + 86400, NULL);
+	EXPECT_EQ(30, qr.tai_offs);
+
+	//leapsec_dump(pt, (leapsec_dumper)fprintf, stdout);
+}
+#endif
+
+// =====================================================================
+// AUTOKEY LEAP TRANSFER TESTS
+// =====================================================================
+
+// ----------------------------------------------------------------------
+// Check if the offset can be applied to an empty table ONCE
+TEST_F(leapsecTest, taiEmptyTable) {
+	int rc;
+
+	rc = leapsec_autokey_tai(35, lsec2015-30*86400, NULL);	
+	EXPECT_EQ(TRUE, rc);
+
+	rc = leapsec_autokey_tai(35, lsec2015-29*86400, NULL);
+	EXPECT_EQ(FALSE, rc);
+}
+
+// ----------------------------------------------------------------------
+// Check that with fixed entries the operation fails
+TEST_F(leapsecTest, taiTableFixed) {
+	int rc;
+
+	rc = setup_load_table(leap1, FALSE);
+	EXPECT_EQ(1, rc);
+
+	rc = leapsec_autokey_tai(35, lsec2015-30*86400, NULL);
+	EXPECT_EQ(FALSE, rc);
+}
+
+// ----------------------------------------------------------------------
+// test adjustment with a dynamic entry already there
+TEST_F(leapsecTest, taiTableDynamic) {
+	int        rc;
+	leap_era_t era;
+
+	rc = leapsec_add_dyn(TRUE, lsec2015-20*SECSPERDAY, NULL);
+	EXPECT_EQ(TRUE, rc);
+
+	leapsec_query_era(&era, lsec2015-10, NULL);
+	EXPECT_EQ(0, era.taiof);
+	leapsec_query_era(&era, lsec2015+10, NULL);
+	EXPECT_EQ(1, era.taiof);
+
+	rc = leapsec_autokey_tai(35, lsec2015-19*86400, NULL);	
+	EXPECT_EQ(TRUE, rc);
+
+	rc = leapsec_autokey_tai(35, lsec2015-19*86400, NULL);
+	EXPECT_EQ(FALSE, rc);
+
+	leapsec_query_era(&era, lsec2015-10, NULL);
+	EXPECT_EQ(35, era.taiof);
+	leapsec_query_era(&era, lsec2015+10, NULL);
+	EXPECT_EQ(36, era.taiof);
+}
+
+// ----------------------------------------------------------------------
+// test adjustment with a dynamic entry already there in dead zone
+TEST_F(leapsecTest, taiTableDynamicDeadZone) {
+	int rc;
+
+	rc = leapsec_add_dyn(TRUE, lsec2015-20*SECSPERDAY, NULL);
+	EXPECT_EQ(TRUE, rc);
+
+	rc = leapsec_autokey_tai(35, lsec2015-5, NULL);	
+	EXPECT_EQ(FALSE, rc);
+
+	rc = leapsec_autokey_tai(35, lsec2015+5, NULL);
+	EXPECT_EQ(FALSE, rc);
+}
+
 
 // =====================================================================
 // SEQUENCE TESTS
@@ -641,6 +892,7 @@ TEST_F(leapsecTest, ls2009seqInsElectric) {
 	rc = setup_load_table(leap1);
 	EXPECT_EQ(1, rc);
 	leapsec_electric(1);
+	EXPECT_EQ(1, leapsec_electric(-1));
 
 	rc = leapsec_query(&qr, lsec2009 - 60*SECSPERDAY, NULL);
 	EXPECT_EQ(FALSE, rc);
@@ -682,7 +934,7 @@ TEST_F(leapsecTest, ls2009seqInsDumb) {
 
 	rc = setup_load_table(leap1);
 	EXPECT_EQ(1, rc);
-	leapsec_electric(0);
+	EXPECT_EQ(0, leapsec_electric(-1));
 
 	rc = leapsec_query(&qr, lsec2009 - 60*SECSPERDAY, NULL);
 	EXPECT_EQ(FALSE, rc);
@@ -731,6 +983,7 @@ TEST_F(leapsecTest, ls2009seqDelElectric) {
 	rc = setup_load_table(leap3);
 	EXPECT_EQ(1, rc);
 	leapsec_electric(1);
+	EXPECT_EQ(1, leapsec_electric(-1));
 
 	rc = leapsec_query(&qr, lsec2009 - 60*SECSPERDAY, NULL);
 	EXPECT_EQ(FALSE, rc);
@@ -772,7 +1025,7 @@ TEST_F(leapsecTest, ls2009seqDelDumb) {
 
 	rc = setup_load_table(leap3);
 	EXPECT_EQ(1, rc);
-	leapsec_electric(0);
+	EXPECT_EQ(0, leapsec_electric(-1));
 
 	rc = leapsec_query(&qr, lsec2009 - 60*SECSPERDAY, NULL);
 	EXPECT_EQ(FALSE, rc);
@@ -814,6 +1067,8 @@ TEST_F(leapsecTest, ls2012seqInsElectric) {
 
 	rc = setup_load_table(leap1);
 	EXPECT_EQ(1, rc);
+	leapsec_electric(1);
+	EXPECT_EQ(1, leapsec_electric(-1));
 
 	rc = leapsec_query(&qr, lsec2012 - 60*SECSPERDAY, NULL);
 	EXPECT_EQ(FALSE, rc);
@@ -853,12 +1108,9 @@ TEST_F(leapsecTest, ls2012seqInsDumb) {
 	int            rc;
 	leap_result_t  qr;
 
-	leapsec_electric(0);
-	EXPECT_EQ(0, leapsec_electric(-1));
-	EXPECT_EQ(0, leapsec_electric(-1));
-
 	rc = setup_load_table(leap1);
 	EXPECT_EQ(1, rc);
+	EXPECT_EQ(0, leapsec_electric(-1));
 
 	rc = leapsec_query(&qr, lsec2012 - 60*SECSPERDAY, NULL);
 	EXPECT_EQ(FALSE, rc);
@@ -899,3 +1151,43 @@ TEST_F(leapsecTest, ls2012seqInsDumb) {
 	EXPECT_EQ(LSPROX_NOWARN, qr.proximity);
 }
 
+// ----------------------------------------------------------------------
+// test repeated query on empty table in dumb mode
+TEST_F(leapsecTest, lsEmptyTableDumb) {
+	int            rc;
+	leap_result_t  qr;
+
+	const time_t   pivot(lsec2012);	
+	const uint32_t t0   (lsec2012 - 10);
+	const uint32_t tE   (lsec2012 + 10);
+
+	EXPECT_EQ(0, leapsec_electric(-1));
+
+	for (uint32_t t = t0; t != tE; ++t) {
+		rc = leapsec_query(&qr, t, &pivot);
+		EXPECT_EQ(FALSE, rc);
+		EXPECT_EQ(0,             qr.warped   );
+		EXPECT_EQ(LSPROX_NOWARN, qr.proximity);
+	}
+}
+
+// ----------------------------------------------------------------------
+// test repeated query on empty table in electric mode
+TEST_F(leapsecTest, lsEmptyTableElectric) {
+	int            rc;
+	leap_result_t  qr;
+	
+	leapsec_electric(1);
+	EXPECT_EQ(1, leapsec_electric(-1));
+
+	const time_t   pivot(lsec2012);	
+	const uint32_t t0   (lsec2012 - 10);
+	const uint32_t tE   (lsec2012 + 10);
+
+	for (time_t t = t0; t != tE; ++t) {
+		rc = leapsec_query(&qr, t, &pivot);
+		EXPECT_EQ(FALSE, rc);
+		EXPECT_EQ(0,             qr.warped   );
+		EXPECT_EQ(LSPROX_NOWARN, qr.proximity);
+	}
+}
diff --git a/contrib/ntp/tests/sandbox/Makefile.am b/contrib/ntp/tests/sandbox/Makefile.am
new file mode 100644
index 000000000000..489ceab57d0d
--- /dev/null
+++ b/contrib/ntp/tests/sandbox/Makefile.am
@@ -0,0 +1,83 @@
+#AUTOMAKE_OPTIONS = foreign 2.9 subdir-objects
+NULL =
+BUILT_SOURCES =
+CLEANFILES =
+
+run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+
+check_PROGRAMS = bug-2803 first-test second-test smeartest
+
+# HMS: we may not need some of these:
+LDADD =					\
+	$(top_builddir)/sntp/unity/libunity.a	\
+	$(top_builddir)/libntp/libntp.a	\
+	$(LDADD_LIBNTP)			\
+	$(PTHREAD_LIBS)			\
+	$(LDADD_NTP)			\
+	$(NULL)
+
+AM_CFLAGS	= $(CFLAGS_NTP)
+
+# HMS: we may not need some of these:
+AM_CPPFLAGS	= $(NTP_INCS)
+AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
+AM_CPPFLAGS += -I$(top_srcdir)/include
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
+
+AM_LDFLAGS = $(LDFLAGS_NTP)
+
+bug_2803_SOURCES =			\
+	bug-2803.c			\
+	run-ut-2803.c			\
+	ut-2803.c			\
+	$(NULL)
+
+$(srcdir)/run-ut-2803.c: $(srcdir)/ut-2803.c $(std_unity_list)
+	$(run_unity) ut-2803.c run-ut-2803.c
+BUILT_SOURCES	+= run-ut-2803.c
+
+first_test_SOURCES =		\
+	uglydate.c		\
+	run-uglydate.c		\
+	$(NULL)
+
+$(srcdir)/run-uglydate.c: $(srcdir)/uglydate.c $(std_unity_list)
+	$(run_unity) uglydate.c run-uglydate.c
+BUILT_SOURCES	+= run-uglydate.c
+
+second_test_SOURCES =		\
+	modetoa.c		\
+	run-modetoa.c		\
+	$(NULL)
+
+$(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list)
+	$(run_unity) modetoa.c run-modetoa.c
+BUILT_SOURCES	+= run-modetoa.c
+
+
+TESTS =
+
+if !NTP_CROSSCOMPILE
+TESTS += $(check_PROGRAMS)
+endif
+
+## check-libntp.mf - automake fragment
+## slightly adapted for deeper directory
+
+BUILT_SOURCES	+= check-libntp check-libunity
+CLEANFILES	+= check-libntp check-libunity
+
+check-libntp: ../../libntp/libntp.a
+	@echo stamp > $@
+
+../../libntp/libntp.a:
+	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+
+check-libunity: ../../sntp/unity/libunity.a
+	@echo stamp > $@
+
+../../sntp/unity/libunity.a:
+	cd ../../libunity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
+
+include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
diff --git a/contrib/ntp/tests/sandbox/Makefile.in b/contrib/ntp/tests/sandbox/Makefile.in
new file mode 100644
index 000000000000..70edbc9d5b19
--- /dev/null
+++ b/contrib/ntp/tests/sandbox/Makefile.in
@@ -0,0 +1,1337 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+check_PROGRAMS = bug-2803$(EXEEXT) first-test$(EXEEXT) \
+	second-test$(EXEEXT) smeartest$(EXEEXT)
+@NTP_CROSSCOMPILE_FALSE@am__append_1 = $(check_PROGRAMS)
+subdir = tests/sandbox
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
+	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
+	$(top_srcdir)/sntp/m4/ax_c99_struct_init.m4 \
+	$(top_srcdir)/sntp/m4/define_dir.m4 \
+	$(top_srcdir)/sntp/m4/hms_search_lib.m4 \
+	$(top_srcdir)/sntp/m4/libtool.m4 \
+	$(top_srcdir)/sntp/m4/ltoptions.m4 \
+	$(top_srcdir)/sntp/m4/ltsugar.m4 \
+	$(top_srcdir)/sntp/m4/ltversion.m4 \
+	$(top_srcdir)/sntp/m4/lt~obsolete.m4 \
+	$(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \
+	$(top_srcdir)/sntp/m4/ntp_compiler.m4 \
+	$(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \
+	$(top_srcdir)/sntp/m4/ntp_crypto_rand.m4 \
+	$(top_srcdir)/sntp/m4/ntp_debug.m4 \
+	$(top_srcdir)/sntp/m4/ntp_dir_sep.m4 \
+	$(top_srcdir)/sntp/m4/ntp_facilitynames.m4 \
+	$(top_srcdir)/sntp/m4/ntp_googletest.m4 \
+	$(top_srcdir)/sntp/m4/ntp_ipv6.m4 \
+	$(top_srcdir)/sntp/m4/ntp_lib_m.m4 \
+	$(top_srcdir)/sntp/m4/ntp_libevent.m4 \
+	$(top_srcdir)/sntp/m4/ntp_libntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_lineeditlibs.m4 \
+	$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
+	$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
+	$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
+	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
+	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
+	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
+	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
+	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
+	$(top_srcdir)/sntp/m4/openldap.m4 \
+	$(top_srcdir)/sntp/m4/os_cflags.m4 \
+	$(top_srcdir)/sntp/m4/snprintf.m4 \
+	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__objects_1 =
+am_bug_2803_OBJECTS = bug-2803.$(OBJEXT) run-ut-2803.$(OBJEXT) \
+	ut-2803.$(OBJEXT) $(am__objects_1)
+bug_2803_OBJECTS = $(am_bug_2803_OBJECTS)
+bug_2803_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+bug_2803_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \
+	$(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am_first_test_OBJECTS = uglydate.$(OBJEXT) run-uglydate.$(OBJEXT) \
+	$(am__objects_1)
+first_test_OBJECTS = $(am_first_test_OBJECTS)
+first_test_LDADD = $(LDADD)
+first_test_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \
+	$(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am_second_test_OBJECTS = modetoa.$(OBJEXT) run-modetoa.$(OBJEXT) \
+	$(am__objects_1)
+second_test_OBJECTS = $(am_second_test_OBJECTS)
+second_test_LDADD = $(LDADD)
+second_test_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \
+	$(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+smeartest_SOURCES = smeartest.c
+smeartest_OBJECTS = smeartest.$(OBJEXT)
+smeartest_LDADD = $(LDADD)
+smeartest_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \
+	$(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(bug_2803_SOURCES) $(first_test_SOURCES) \
+	$(second_test_SOURCES) smeartest.c
+DIST_SOURCES = $(bug_2803_SOURCES) $(first_test_SOURCES) \
+	$(second_test_SOURCES) smeartest.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \
+	$(top_srcdir)/includes.mf \
+	$(top_srcdir)/sntp/libevent/build-aux/depcomp \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
+CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
+CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
+CALC_TICKADJ_MS = @CALC_TICKADJ_MS@
+CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAGS_NTP = @CFLAGS_NTP@
+CHUTEST = @CHUTEST@
+CONFIG_SHELL = @CONFIG_SHELL@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_LIBEVENT = @CPPFLAGS_LIBEVENT@
+CPPFLAGS_NTP = @CPPFLAGS_NTP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DCFD = @DCFD@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EDITLINE_LIBS = @EDITLINE_LIBS@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+GTEST_CONFIG = @GTEST_CONFIG@
+GTEST_CPPFLAGS = @GTEST_CPPFLAGS@
+GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
+GTEST_LDFLAGS = @GTEST_LDFLAGS@
+GTEST_LIBS = @GTEST_LIBS@
+HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
+HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
+HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDADD_LIBEVENT = @LDADD_LIBEVENT@
+LDADD_LIBNTP = @LDADD_LIBNTP@
+LDADD_LIBUTIL = @LDADD_LIBUTIL@
+LDADD_NLIST = @LDADD_NLIST@
+LDADD_NTP = @LDADD_NTP@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_NTP = @LDFLAGS_NTP@
+LIBISC_PTHREADS_NOTHREADS = @LIBISC_PTHREADS_NOTHREADS@
+LIBM = @LIBM@
+LIBOBJS = @LIBOBJS@
+LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@
+LIBOPTS_DIR = @LIBOPTS_DIR@
+LIBOPTS_LDADD = @LIBOPTS_LDADD@
+LIBPARSE = @LIBPARSE@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LSCF = @LSCF@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_LAYOUT = @MAKE_CHECK_LAYOUT@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
+MAKE_LIBNTPSIM = @MAKE_LIBNTPSIM@
+MAKE_LIBPARSE = @MAKE_LIBPARSE@
+MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
+MAKE_NTPDSIM = @MAKE_NTPDSIM@
+MAKE_NTPSNMPD = @MAKE_NTPSNMPD@
+MAKE_NTPTIME = @MAKE_NTPTIME@
+MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
+MAKE_TICKADJ = @MAKE_TICKADJ@
+MAKE_TIMETRIM = @MAKE_TIMETRIM@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MANTAGFMT = @MANTAGFMT@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NTPDATE_DB = @NTPDATE_DB@
+NTPDATE_DL = @NTPDATE_DL@
+NTPDATE_DS = @NTPDATE_DS@
+NTPDATE_MS = @NTPDATE_MS@
+NTPDATE_NI = @NTPDATE_NI@
+NTPDC_DB = @NTPDC_DB@
+NTPDC_DL = @NTPDC_DL@
+NTPDC_DS = @NTPDC_DS@
+NTPDC_MS = @NTPDC_MS@
+NTPDC_NI = @NTPDC_NI@
+NTPDSIM_DB = @NTPDSIM_DB@
+NTPDSIM_DL = @NTPDSIM_DL@
+NTPDSIM_DS = @NTPDSIM_DS@
+NTPDSIM_MS = @NTPDSIM_MS@
+NTPDSIM_NI = @NTPDSIM_NI@
+NTPD_DB = @NTPD_DB@
+NTPD_DL = @NTPD_DL@
+NTPD_DS = @NTPD_DS@
+NTPD_MS = @NTPD_MS@
+NTPD_NI = @NTPD_NI@
+NTPQ_DB = @NTPQ_DB@
+NTPQ_DL = @NTPQ_DL@
+NTPQ_DS = @NTPQ_DS@
+NTPQ_MS = @NTPQ_MS@
+NTPQ_NI = @NTPQ_NI@
+NTPSNMPD_DB = @NTPSNMPD_DB@
+NTPSNMPD_DL = @NTPSNMPD_DL@
+NTPSNMPD_DS = @NTPSNMPD_DS@
+NTPSNMPD_MS = @NTPSNMPD_MS@
+NTPSNMPD_NI = @NTPSNMPD_NI@
+NTPSWEEP_DB = @NTPSWEEP_DB@
+NTPSWEEP_DL = @NTPSWEEP_DL@
+NTPSWEEP_DS = @NTPSWEEP_DS@
+NTPSWEEP_MS = @NTPSWEEP_MS@
+NTPSWEEP_NI = @NTPSWEEP_NI@
+NTPTIME_DB = @NTPTIME_DB@
+NTPTIME_DL = @NTPTIME_DL@
+NTPTIME_DS = @NTPTIME_DS@
+NTPTIME_MS = @NTPTIME_MS@
+NTPTIME_NI = @NTPTIME_NI@
+NTPTRACE_DB = @NTPTRACE_DB@
+NTPTRACE_DL = @NTPTRACE_DL@
+NTPTRACE_DS = @NTPTRACE_DS@
+NTPTRACE_MS = @NTPTRACE_MS@
+NTPTRACE_NI = @NTPTRACE_NI@
+NTP_KEYGEN_DB = @NTP_KEYGEN_DB@
+NTP_KEYGEN_DL = @NTP_KEYGEN_DL@
+NTP_KEYGEN_DS = @NTP_KEYGEN_DS@
+NTP_KEYGEN_MS = @NTP_KEYGEN_MS@
+NTP_KEYGEN_NI = @NTP_KEYGEN_NI@
+NTP_KEYSDIR = @NTP_KEYSDIR@
+NTP_WAIT_DB = @NTP_WAIT_DB@
+NTP_WAIT_DL = @NTP_WAIT_DL@
+NTP_WAIT_DS = @NTP_WAIT_DS@
+NTP_WAIT_MS = @NTP_WAIT_MS@
+NTP_WAIT_NI = @NTP_WAIT_NI@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
+PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PATH_TEST = @PATH_TEST@
+PERLLIBDIR = @PERLLIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+POSIX_SHELL = @POSIX_SHELL@
+PROPDELAY = @PROPDELAY@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SNMP_CFLAGS = @SNMP_CFLAGS@
+SNMP_CPPFLAGS = @SNMP_CPPFLAGS@
+SNMP_LIBS = @SNMP_LIBS@
+SNTP = @SNTP@
+SNTP_DB = @SNTP_DB@
+SNTP_DL = @SNTP_DL@
+SNTP_DS = @SNTP_DS@
+SNTP_MS = @SNTP_MS@
+SNTP_NI = @SNTP_NI@
+STDNORETURN_H = @STDNORETURN_H@
+STRIP = @STRIP@
+TESTDCF = @TESTDCF@
+TICKADJ_DB = @TICKADJ_DB@
+TICKADJ_DL = @TICKADJ_DL@
+TICKADJ_DS = @TICKADJ_DS@
+TICKADJ_MS = @TICKADJ_MS@
+TICKADJ_NI = @TICKADJ_NI@
+TIMETRIM_DB = @TIMETRIM_DB@
+TIMETRIM_DL = @TIMETRIM_DL@
+TIMETRIM_DS = @TIMETRIM_DS@
+TIMETRIM_MS = @TIMETRIM_MS@
+TIMETRIM_NI = @TIMETRIM_NI@
+UPDATE_LEAP_DB = @UPDATE_LEAP_DB@
+UPDATE_LEAP_DL = @UPDATE_LEAP_DL@
+UPDATE_LEAP_DS = @UPDATE_LEAP_DS@
+UPDATE_LEAP_MS = @UPDATE_LEAP_MS@
+UPDATE_LEAP_NI = @UPDATE_LEAP_NI@
+VERSION = @VERSION@
+VER_SUFFIX = @VER_SUFFIX@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+#AUTOMAKE_OPTIONS = foreign 2.9 subdir-objects
+NULL = 
+BUILT_SOURCES = run-ut-2803.c run-uglydate.c run-modetoa.c \
+	check-libntp check-libunity .deps-ver
+CLEANFILES = check-libntp check-libunity .deps-ver
+run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+
+# HMS: we may not need some of these:
+LDADD = \
+	$(top_builddir)/sntp/unity/libunity.a	\
+	$(top_builddir)/libntp/libntp.a	\
+	$(LDADD_LIBNTP)			\
+	$(PTHREAD_LIBS)			\
+	$(LDADD_NTP)			\
+	$(NULL)
+
+AM_CFLAGS = $(CFLAGS_NTP)
+
+# HMS: we may not need some of these:
+AM_CPPFLAGS = $(NTP_INCS) -I$(top_srcdir)/sntp/unity \
+	-I$(top_srcdir)/include $(CPPFLAGS_NTP)
+AM_LDFLAGS = $(LDFLAGS_NTP)
+bug_2803_SOURCES = \
+	bug-2803.c			\
+	run-ut-2803.c			\
+	ut-2803.c			\
+	$(NULL)
+
+first_test_SOURCES = \
+	uglydate.c		\
+	run-uglydate.c		\
+	$(NULL)
+
+second_test_SOURCES = \
+	modetoa.c		\
+	run-modetoa.c		\
+	$(NULL)
+
+TESTS = $(am__append_1)
+NTP_INCS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
+	-I$(top_srcdir)/lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include \
+	-I$(top_srcdir)/lib/isc/unix/include
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/sandbox/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign tests/sandbox/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+bug-2803$(EXEEXT): $(bug_2803_OBJECTS) $(bug_2803_DEPENDENCIES) $(EXTRA_bug_2803_DEPENDENCIES) 
+	@rm -f bug-2803$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(bug_2803_OBJECTS) $(bug_2803_LDADD) $(LIBS)
+
+first-test$(EXEEXT): $(first_test_OBJECTS) $(first_test_DEPENDENCIES) $(EXTRA_first_test_DEPENDENCIES) 
+	@rm -f first-test$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(first_test_OBJECTS) $(first_test_LDADD) $(LIBS)
+
+second-test$(EXEEXT): $(second_test_OBJECTS) $(second_test_DEPENDENCIES) $(EXTRA_second_test_DEPENDENCIES) 
+	@rm -f second-test$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(second_test_OBJECTS) $(second_test_LDADD) $(LIBS)
+
+smeartest$(EXEEXT): $(smeartest_OBJECTS) $(smeartest_DEPENDENCIES) $(EXTRA_smeartest_DEPENDENCIES) 
+	@rm -f smeartest$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(smeartest_OBJECTS) $(smeartest_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bug-2803.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-modetoa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-uglydate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-ut-2803.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smeartest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uglydate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ut-2803.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+bug-2803.log: bug-2803$(EXEEXT)
+	@p='bug-2803$(EXEEXT)'; \
+	b='bug-2803'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+first-test.log: first-test$(EXEEXT)
+	@p='first-test$(EXEEXT)'; \
+	b='first-test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+second-test.log: second-test$(EXEEXT)
+	@p='second-test$(EXEEXT)'; \
+	b='second-test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+smeartest.log: smeartest$(EXEEXT)
+	@p='smeartest$(EXEEXT)'; \
+	b='smeartest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile
+installdirs:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: all check check-am install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	recheck tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+$(srcdir)/run-ut-2803.c: $(srcdir)/ut-2803.c $(std_unity_list)
+	$(run_unity) ut-2803.c run-ut-2803.c
+
+$(srcdir)/run-uglydate.c: $(srcdir)/uglydate.c $(std_unity_list)
+	$(run_unity) uglydate.c run-uglydate.c
+
+$(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list)
+	$(run_unity) modetoa.c run-modetoa.c
+
+check-libntp: ../../libntp/libntp.a
+	@echo stamp > $@
+
+../../libntp/libntp.a:
+	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+
+check-libunity: ../../sntp/unity/libunity.a
+	@echo stamp > $@
+
+../../sntp/unity/libunity.a:
+	cd ../../libunity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
+$(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
+	@[ -f $@ ] ||							\
+		cp $(top_srcdir)/deps-ver $@
+	@[ -w $@ ] ||							\
+		chmod ug+w $@
+	@cmp $(top_srcdir)/deps-ver $@ > /dev/null || (			\
+		$(MAKE) $(AM_MAKEFLAGS) clean &&					\
+		echo -n "Prior $(subdir)/$(DEPDIR) version " &&		\
+		cat $@ &&						\
+		rm -rf $(DEPDIR) &&					\
+		mkdir $(DEPDIR) && 					\
+		case "$(top_builddir)" in				\
+		 .)							\
+		    ./config.status Makefile depfiles			\
+		    ;;							\
+		 *)							\
+		    cd "$(top_builddir)" &&				\
+		    ./config.status $(subdir)/Makefile depfiles &&	\
+		    cd $(subdir)					\
+		    ;;							\
+		esac &&							\
+		echo -n "Cleaned $(subdir)/$(DEPDIR) version " &&	\
+		cat $(top_srcdir)/deps-ver				\
+	)
+	cp $(top_srcdir)/deps-ver $@
+
+.deps-ver: $(top_srcdir)/deps-ver
+	@[ ! -d $(DEPDIR) ] || $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/deps-ver
+	@touch $@
+
+#
+# depsver.mf	included in Makefile.am for directories with .deps
+#
+# When building in the same directory with sources that change over
+# time, such as when tracking using bk, the .deps files can become
+# stale with respect to moved, deleted, or superceded headers.  Most
+# commonly, this would exhibit as make reporting a failure to make a
+# header file which is no longer in the location given.  To address
+# this issue, we use a deps-ver file which is updated with each change
+# that breaks old .deps files.  A copy of deps-ver is made into
+# $(DEPDIR) if not already present.  If $(DEPDIR)/deps-ver is present
+# with different contents than deps-ver, we make clean to ensure all
+# .o files built before the incompatible change are rebuilt along with
+# their updated .deps files, then remove $(DEPDIR) and recreate it as
+# empty stubs.
+#
+# It is normal when configured with --disable-dependency-tracking for
+# the DEPDIR to not have been created.  For this reason, we use the
+# intermediate target .deps-ver, which invokes make recursively if
+# DEPDIR exists.
+#
+# If you modify depsver.mf, please make the changes to the master
+# copy, the one in sntp is copied by the bootstrap script from it.
+#
+# This comment block follows rather than leads the related code so that
+# it stays with it in the generated Makefile.in and Makefile.
+#
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/contrib/ntp/tests/sandbox/bug-2803.c b/contrib/ntp/tests/sandbox/bug-2803.c
new file mode 100644
index 000000000000..1806c6d78194
--- /dev/null
+++ b/contrib/ntp/tests/sandbox/bug-2803.c
@@ -0,0 +1,99 @@
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+
+/* microseconds per second */
+#define MICROSECONDS 1000000
+
+
+static int verbose = 1;        // if not 0, also print results if test passed
+static int exit_on_err = 0;    // if not 0, exit if test failed
+
+
+/*
+ * Test function calling the old and new code mentioned in
+ * http://bugs.ntp.org/show_bug.cgi?id=2803#c22
+ */
+static
+int do_test( struct timeval timetv, struct timeval tvlast )
+{
+	struct timeval tvdiff_old;
+	struct timeval tvdiff_new;
+
+	int cond_old;
+	int cond_new;
+	int failed;
+
+	cond_old = 0;
+	cond_new = 0;
+
+	// Here is the old code:
+	tvdiff_old = abs_tval(sub_tval(timetv, tvlast));
+	if (tvdiff_old.tv_sec > 0) {
+		cond_old = 1;
+	}
+
+	// Here is the new code:
+	tvdiff_new = sub_tval(timetv, tvlast);
+	if (tvdiff_new.tv_sec != 0) {
+		cond_new = 1;
+	}
+
+	failed = cond_new != cond_old;
+
+	if ( failed || verbose )
+		printf( "timetv %lli|%07li, tvlast  %lli|%07li: tvdiff_old: %lli|%07li -> %i, tvdiff_new: %lli|%07li -> %i, same cond: %s\n",
+			(long long) timetv.tv_sec, timetv.tv_usec,
+			(long long) tvlast.tv_sec, tvlast.tv_usec,
+			(long long) tvdiff_old.tv_sec, tvdiff_old.tv_usec, cond_old,
+			(long long) tvdiff_new.tv_sec, tvdiff_new.tv_usec, cond_new,
+			failed ? "NO <<" : "yes" );
+
+	return failed ? -1 : 0;
+}
+
+
+
+/*
+ * Call the test function in a loop for a given set of parameters.
+ * Both timetv and tvlast iterate over the given range, in all combinations.
+ */
+static
+int test_loop( long long start_sec, long start_usec,
+	       long long stop_sec, long stop_usec,
+	       long long step_sec, long step_usec )
+{
+	struct timeval timetv;
+	struct timeval tvlast;
+
+	for ( timetv.tv_sec = start_sec; timetv.tv_sec <= stop_sec; timetv.tv_sec += step_sec )
+	  for ( timetv.tv_usec = start_usec; timetv.tv_usec <= stop_usec; timetv.tv_usec += step_usec )
+	    for ( tvlast.tv_sec = start_sec; tvlast.tv_sec <= stop_sec; tvlast.tv_sec += step_sec )
+	      for ( tvlast.tv_usec = start_usec; tvlast.tv_usec <= stop_usec; tvlast.tv_usec += step_usec )
+	      {
+		int rc = do_test( timetv, tvlast );
+		if (rc < 0 && exit_on_err )
+			return rc;
+	      }
+
+	return 0;
+}
+
+
+
+int main2( void )
+{
+
+	// loop from {0.0} to {1.1000000} stepping by tv_sec by 1 and tv_usec by 100000
+	test_loop( 0, 0,   1,  MICROSECONDS,   1,  MICROSECONDS / 10 );
+
+	// test_loop( 0, 0,   5,  MICROSECONDS,   1,  MICROSECONDS / 1000 );
+	// test_loop( 0, 0,  -5, -MICROSECONDS,  -1, -MICROSECONDS / 1000 );
+
+	return 0;
+}
+
diff --git a/contrib/ntp/tests/sandbox/modetoa.c b/contrib/ntp/tests/sandbox/modetoa.c
new file mode 100644
index 000000000000..811eef626c8f
--- /dev/null
+++ b/contrib/ntp/tests/sandbox/modetoa.c
@@ -0,0 +1,20 @@
+//#include "config.h"
+//#include "libntptest.h"
+#include "unity.h"
+//#include "ntp_stdlib.h"
+
+
+
+void test_KnownMode(void) {
+	const int MODE = 3; // Should be "client"
+	TEST_ASSERT_EQUAL_STRING("client", modetoa(MODE));
+
+//	EXPECT_STREQ("client", modetoa(MODE));
+}
+
+void test_UnknownMode(void) {
+	const int MODE = 100;
+
+	 TEST_ASSERT_EQUAL_STRING("mode#1001", modetoa(MODE));
+//	EXPECT_STREQ("mode#100", modetoa(MODE));
+}
diff --git a/contrib/ntp/tests/sandbox/run-modetoa.c b/contrib/ntp/tests/sandbox/run-modetoa.c
new file mode 100644
index 000000000000..776dda485dd5
--- /dev/null
+++ b/contrib/ntp/tests/sandbox/run-modetoa.c
@@ -0,0 +1,50 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_KnownMode(void);
+extern void test_UnknownMode(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "modetoa.c";
+  UnityBegin("");
+  RUN_TEST(test_KnownMode, 8);
+  RUN_TEST(test_UnknownMode, 15);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/sandbox/run-uglydate.c b/contrib/ntp/tests/sandbox/run-uglydate.c
new file mode 100644
index 000000000000..dd909adb046a
--- /dev/null
+++ b/contrib/ntp/tests/sandbox/run-uglydate.c
@@ -0,0 +1,48 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_ConstantDateTime(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "uglydate.c";
+  UnityBegin("");
+  RUN_TEST(test_ConstantDateTime, 9);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/sandbox/run-ut-2803.c b/contrib/ntp/tests/sandbox/run-ut-2803.c
new file mode 100644
index 000000000000..d6ca2ee7df17
--- /dev/null
+++ b/contrib/ntp/tests/sandbox/run-ut-2803.c
@@ -0,0 +1,58 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_main(void );
+extern void test_XPASS(void);
+extern void test_XFAIL(void);
+extern void test_XFAIL_WITH_MESSAGE(void);
+extern void test_main_incorrect(void);
+extern void test_ignored(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "ut-2803.c";
+  UnityBegin("");
+  RUN_TEST(test_main, 30);
+  RUN_TEST(test_XPASS, 37);
+  RUN_TEST(test_XFAIL, 49);
+  RUN_TEST(test_XFAIL_WITH_MESSAGE, 61);
+  RUN_TEST(test_main_incorrect, 73);
+  RUN_TEST(test_ignored, 77);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/sandbox/smeartest.c b/contrib/ntp/tests/sandbox/smeartest.c
new file mode 100644
index 000000000000..e1b04e5e3758
--- /dev/null
+++ b/contrib/ntp/tests/sandbox/smeartest.c
@@ -0,0 +1,168 @@
+#include 
+
+#include 
+#include 
+
+/*
+ * we want to test a refid format of:
+ * 254.x.y.x
+ *
+ * where x.y.z are 24 bits containing 2 (signed) integer bits
+ * and 22 fractional bits.
+ *
+ * we want functions to convert to/from this format, with unit tests.
+ *
+ * Interesting test cases include:
+ * 254.0.0.0
+ * 254.0.0.1
+ * 254.127.255.255
+ * 254.128.0.0
+ * 254.255.255.255
+ */
+
+char *progname = "";
+
+l_fp convertRefIDToLFP(uint32_t r);
+uint32_t convertLFPToRefID(l_fp num);
+
+
+/*
+ * The smear data in the refid is the bottom 3 bytes of the refid,
+ * 2 bits of integer
+ * 22 bits of fraction
+ */
+l_fp
+convertRefIDToLFP(uint32_t r)
+{
+	l_fp temp;
+
+	r = ntohl(r);
+
+	printf("%03d %08x: ", (r >> 24) & 0xFF, (r & 0x00FFFFFF) );
+
+	temp.l_uf = (r << 10);	/* 22 fractional bits */
+
+	temp.l_ui = (r >> 22) & 0x3;
+	temp.l_ui |= ~(temp.l_ui & 2) + 1;
+
+	return temp;
+}
+
+
+uint32_t
+convertLFPToRefID(l_fp num)
+{
+	uint32_t temp;
+
+	/* round the input with the highest bit to shift out from the
+	 * fraction, then keep just two bits from the integral part.
+	 *
+	 * TODO: check for overflows; should we clamp/saturate or just
+	 * complain?
+	 */
+	L_ADDUF(&num, 0x200);
+	num.l_ui &= 3;
+
+	/* combine integral and fractional part to 24 bits */
+	temp  = (num.l_ui << 22) | (num.l_uf >> 10);
+
+	/* put in the leading 254.0.0.0 */
+	temp |= UINT32_C(0xFE000000);
+
+	printf("%03d %08x: ", (temp >> 24) & 0xFF, (temp & 0x00FFFFFF) );
+
+	return htonl(temp);
+}
+
+/* Tests start here */
+
+void rtol(uint32_t r);
+
+void
+rtol(uint32_t r)
+{
+	l_fp l;
+
+	printf("rtol: ");
+
+	l = convertRefIDToLFP(htonl(r));
+	printf("refid %#x, smear %s\n", r, lfptoa(&l, 8));
+
+	return;
+}
+
+
+void rtoltor(uint32_t r);
+
+void
+rtoltor(uint32_t r)
+{
+	l_fp l;
+
+	printf("rtoltor: ");
+	l = convertRefIDToLFP(htonl(r));
+
+	r = convertLFPToRefID(l);
+	printf("smear %s, refid %#.8x\n", lfptoa(&l, 8), ntohl(r));
+
+	return;
+}
+
+
+void ltor(l_fp l);
+
+void
+ltor(l_fp l)
+{
+	uint32_t r;
+
+	printf("ltor: ");
+
+	r = convertLFPToRefID(l);
+	printf("smear %s, refid %#.8x\n", lfptoa(&l, 8), ntohl(r));
+
+	return;
+}
+
+
+main()
+{
+
+	rtol(0xfe800000);
+	rtol(0xfe800001);
+	rtol(0xfe8ffffe);
+	rtol(0xfe8fffff);
+	rtol(0xfef00000);
+	rtol(0xfef00001);
+	rtol(0xfefffffe);
+	rtol(0xfeffffff);
+
+	rtol(0xfe000000);
+	rtol(0xfe000001);
+	rtol(0xfe6ffffe);
+	rtol(0xfe6fffff);
+	rtol(0xfe700000);
+	rtol(0xfe700001);
+	rtol(0xfe7ffffe);
+	rtol(0xfe7fffff);
+
+	rtoltor(0xfe800000);
+	rtoltor(0xfe800001);
+	rtoltor(0xfe8ffffe);
+	rtoltor(0xfe8fffff);
+	rtoltor(0xfef00000);
+	rtoltor(0xfef00001);
+	rtoltor(0xfefffffe);
+	rtoltor(0xfeffffff);
+
+	rtoltor(0xfe000000);
+	rtoltor(0xfe000001);
+	rtoltor(0xfe6ffffe);
+	rtoltor(0xfe6fffff);
+	rtoltor(0xfe700000);
+	rtoltor(0xfe700001);
+	rtoltor(0xfe7ffffe);
+	rtoltor(0xfe7fffff);
+
+	return 0;
+}
diff --git a/contrib/ntp/tests/sandbox/uglydate.c b/contrib/ntp/tests/sandbox/uglydate.c
new file mode 100644
index 000000000000..a7879c117acd
--- /dev/null
+++ b/contrib/ntp/tests/sandbox/uglydate.c
@@ -0,0 +1,16 @@
+#include "config.h"
+#include "ntp_fp.h"
+#include "unity.h"
+
+//#include "ntp_stdlib.h"
+//#include "libntptest.h"
+
+void
+test_ConstantDateTime(void) {
+	const u_int32 HALF = 2147483648UL;
+
+	l_fp time = {3485080800UL, HALF}; // 2010-06-09 14:00:00.5
+
+	TEST_ASSERT_EQUAL_STRING("3485080800.500000 10:159:14:00:00.500",
+				 uglydate(&time));
+}
diff --git a/contrib/ntp/tests/sandbox/ut-2803.c b/contrib/ntp/tests/sandbox/ut-2803.c
new file mode 100644
index 000000000000..bb3ee975df0f
--- /dev/null
+++ b/contrib/ntp/tests/sandbox/ut-2803.c
@@ -0,0 +1,80 @@
+//#include "bug-2803.h"
+#include "unity.h"
+//#include "code-2803.h"
+
+#define VERSION 5 //change this to 5 and the test wont fail.
+
+
+void setUp(void)
+{
+  
+}
+
+void tearDown(void)
+{
+}
+
+/*
+int main( void )
+{
+
+	// loop from {0.0} to {1.1000000} stepping by tv_sec by 1 and tv_usec by 100000
+	test_loop( 0, 0,   1,  MICROSECONDS,   1,  MICROSECONDS / 10 );
+
+	// test_loop( 0, 0,   5,  MICROSECONDS,   1,  MICROSECONDS / 1000 );
+	// test_loop( 0, 0,  -5, -MICROSECONDS,  -1, -MICROSECONDS / 1000 );
+
+	return 0;
+}
+*/
+void test_main( void )
+{
+	TEST_ASSERT_EQUAL(0, main2());
+}
+
+//VERSION defined at the top of the file
+
+void test_XPASS(void)  //expecting fail but passes, should we get an alert about that?
+{	
+	//TEST_ABORT
+	TEST_EXPECT_FAIL();
+
+	if(VERSION < 4 ){	
+		TEST_FAIL_MESSAGE("expected to fail");
+	}
+
+	else TEST_ASSERT_EQUAL(1,1);
+}
+
+void test_XFAIL(void) //expecting fail, and XFAILs
+{	
+
+	TEST_EXPECT_FAIL();
+
+	if(VERSION < 4 ){	
+		TEST_FAIL_MESSAGE("Expected to fail");
+	}
+
+	else TEST_ASSERT_EQUAL(1,2); 
+}
+
+void test_XFAIL_WITH_MESSAGE(void) //expecting fail, and XFAILs
+{	
+	//TEST_ABORT
+	TEST_EXPECT_FAIL_MESSAGE("Doesn't work on this OS");
+
+	if(VERSION < 4 ){	
+		TEST_FAIL_MESSAGE("Expected to fail");
+	}
+
+	else TEST_ASSERT_EQUAL(1,2); 
+}
+
+void test_main_incorrect(void){
+	TEST_ASSERT_EQUAL(3, main2());
+}
+
+void test_ignored(void){
+	//TEST_IGNORE();
+	TEST_IGNORE_MESSAGE("This test is being ignored!");   
+}
diff --git a/contrib/ntp/tests/sec-2853/Makefile.am b/contrib/ntp/tests/sec-2853/Makefile.am
new file mode 100644
index 000000000000..417ff6bd9854
--- /dev/null
+++ b/contrib/ntp/tests/sec-2853/Makefile.am
@@ -0,0 +1,78 @@
+#AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects
+NULL =
+BUILT_SOURCES =
+CLEANFILES =
+
+std_unity_list = 						\
+	$(top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
+	$(NULL)
+
+run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+
+check_PROGRAMS = sec-2853
+
+# HMS: we may not need some of these:
+LDADD =					\
+	$(top_builddir)/sntp/unity/libunity.a	\
+	$(top_builddir)/ntpd/rc_cmdlength.o	\
+	$(LDADD_LIBNTP)			\
+	$(PTHREAD_LIBS)			\
+	$(LDADD_NTP)			\
+	$(NULL)
+
+AM_CFLAGS   = $(CFLAGS_NTP)
+
+# HMS: we may not need some of these:
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
+AM_CPPFLAGS += -I$(top_srcdir)/include
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
+
+AM_LDFLAGS = $(LDFLAGS_NTP)
+
+sec_2853_SOURCES = 			\
+	run-sec-2853.c			\
+	sec-2853.c			\
+	$(NULL)
+
+BUILT_SOURCES += $(srcdir)/run-sec-2853.c
+
+$(srcdir)/run-sec-2853.c: $(srcdir)/sec-2853.c $(std_unity_list)
+	$(run_unity) sec-2853.c run-sec-2853.c
+
+# HMS: we may not need some of these:
+#noinst_HEADERS =	ntpdtest.h	\
+#			$(NULL)
+
+TESTS =
+
+if !NTP_CROSSCOMPILE
+TESTS += $(check_PROGRAMS)
+endif
+
+## check-libntp.mf - automake fragment
+## slightly adapted for deeper directory
+
+BUILT_SOURCES	+= check-libntp check-libunity check-rc-cmdlength
+CLEANFILES	+= check-libntp check-libunity check-rc-cmdlength
+
+check-libntp: ../../libntp/libntp.a
+	@echo stamp > $@
+
+../../libntp/libntp.a:
+	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+
+check-libunity: ../../sntp/unity/libunity.a
+	@echo stamp > $@
+
+../../sntp/unity/libunity.a:
+	cd ../../libunity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
+
+check-rc-cmdlength: ../../ntpd/rc_cmdlength.o
+	@echo stamp > $@
+
+../../ntpd/rc_cmdlength.o:
+	cd ../../ntpd && $(MAKE) $(AM_MAKEFLAGS) rc_cmdlength.o
+
+include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
diff --git a/contrib/ntp/tests/sec-2853/Makefile.in b/contrib/ntp/tests/sec-2853/Makefile.in
new file mode 100644
index 000000000000..4336e59cb6f6
--- /dev/null
+++ b/contrib/ntp/tests/sec-2853/Makefile.in
@@ -0,0 +1,1270 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+check_PROGRAMS = sec-2853$(EXEEXT)
+@NTP_CROSSCOMPILE_FALSE@am__append_1 = $(check_PROGRAMS)
+subdir = tests/sec-2853
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
+	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
+	$(top_srcdir)/sntp/m4/ax_c99_struct_init.m4 \
+	$(top_srcdir)/sntp/m4/define_dir.m4 \
+	$(top_srcdir)/sntp/m4/hms_search_lib.m4 \
+	$(top_srcdir)/sntp/m4/libtool.m4 \
+	$(top_srcdir)/sntp/m4/ltoptions.m4 \
+	$(top_srcdir)/sntp/m4/ltsugar.m4 \
+	$(top_srcdir)/sntp/m4/ltversion.m4 \
+	$(top_srcdir)/sntp/m4/lt~obsolete.m4 \
+	$(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \
+	$(top_srcdir)/sntp/m4/ntp_compiler.m4 \
+	$(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \
+	$(top_srcdir)/sntp/m4/ntp_crypto_rand.m4 \
+	$(top_srcdir)/sntp/m4/ntp_debug.m4 \
+	$(top_srcdir)/sntp/m4/ntp_dir_sep.m4 \
+	$(top_srcdir)/sntp/m4/ntp_facilitynames.m4 \
+	$(top_srcdir)/sntp/m4/ntp_googletest.m4 \
+	$(top_srcdir)/sntp/m4/ntp_ipv6.m4 \
+	$(top_srcdir)/sntp/m4/ntp_lib_m.m4 \
+	$(top_srcdir)/sntp/m4/ntp_libevent.m4 \
+	$(top_srcdir)/sntp/m4/ntp_libntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_lineeditlibs.m4 \
+	$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
+	$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
+	$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
+	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
+	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
+	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
+	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
+	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
+	$(top_srcdir)/sntp/m4/openldap.m4 \
+	$(top_srcdir)/sntp/m4/os_cflags.m4 \
+	$(top_srcdir)/sntp/m4/snprintf.m4 \
+	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__objects_1 =
+am_sec_2853_OBJECTS = run-sec-2853.$(OBJEXT) sec-2853.$(OBJEXT) \
+	$(am__objects_1)
+sec_2853_OBJECTS = $(am_sec_2853_OBJECTS)
+sec_2853_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+sec_2853_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \
+	$(top_builddir)/ntpd/rc_cmdlength.o $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(sec_2853_SOURCES)
+DIST_SOURCES = $(sec_2853_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \
+	$(top_srcdir)/includes.mf \
+	$(top_srcdir)/sntp/libevent/build-aux/depcomp \
+	$(top_srcdir)/sntp/libevent/build-aux/test-driver
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
+CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
+CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
+CALC_TICKADJ_MS = @CALC_TICKADJ_MS@
+CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAGS_NTP = @CFLAGS_NTP@
+CHUTEST = @CHUTEST@
+CONFIG_SHELL = @CONFIG_SHELL@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_LIBEVENT = @CPPFLAGS_LIBEVENT@
+CPPFLAGS_NTP = @CPPFLAGS_NTP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DCFD = @DCFD@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EDITLINE_LIBS = @EDITLINE_LIBS@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+GTEST_CONFIG = @GTEST_CONFIG@
+GTEST_CPPFLAGS = @GTEST_CPPFLAGS@
+GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
+GTEST_LDFLAGS = @GTEST_LDFLAGS@
+GTEST_LIBS = @GTEST_LIBS@
+HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
+HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
+HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDADD_LIBEVENT = @LDADD_LIBEVENT@
+LDADD_LIBNTP = @LDADD_LIBNTP@
+LDADD_LIBUTIL = @LDADD_LIBUTIL@
+LDADD_NLIST = @LDADD_NLIST@
+LDADD_NTP = @LDADD_NTP@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_NTP = @LDFLAGS_NTP@
+LIBISC_PTHREADS_NOTHREADS = @LIBISC_PTHREADS_NOTHREADS@
+LIBM = @LIBM@
+LIBOBJS = @LIBOBJS@
+LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@
+LIBOPTS_DIR = @LIBOPTS_DIR@
+LIBOPTS_LDADD = @LIBOPTS_LDADD@
+LIBPARSE = @LIBPARSE@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LSCF = @LSCF@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_LAYOUT = @MAKE_CHECK_LAYOUT@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
+MAKE_LIBNTPSIM = @MAKE_LIBNTPSIM@
+MAKE_LIBPARSE = @MAKE_LIBPARSE@
+MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
+MAKE_NTPDSIM = @MAKE_NTPDSIM@
+MAKE_NTPSNMPD = @MAKE_NTPSNMPD@
+MAKE_NTPTIME = @MAKE_NTPTIME@
+MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
+MAKE_TICKADJ = @MAKE_TICKADJ@
+MAKE_TIMETRIM = @MAKE_TIMETRIM@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MANTAGFMT = @MANTAGFMT@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NTPDATE_DB = @NTPDATE_DB@
+NTPDATE_DL = @NTPDATE_DL@
+NTPDATE_DS = @NTPDATE_DS@
+NTPDATE_MS = @NTPDATE_MS@
+NTPDATE_NI = @NTPDATE_NI@
+NTPDC_DB = @NTPDC_DB@
+NTPDC_DL = @NTPDC_DL@
+NTPDC_DS = @NTPDC_DS@
+NTPDC_MS = @NTPDC_MS@
+NTPDC_NI = @NTPDC_NI@
+NTPDSIM_DB = @NTPDSIM_DB@
+NTPDSIM_DL = @NTPDSIM_DL@
+NTPDSIM_DS = @NTPDSIM_DS@
+NTPDSIM_MS = @NTPDSIM_MS@
+NTPDSIM_NI = @NTPDSIM_NI@
+NTPD_DB = @NTPD_DB@
+NTPD_DL = @NTPD_DL@
+NTPD_DS = @NTPD_DS@
+NTPD_MS = @NTPD_MS@
+NTPD_NI = @NTPD_NI@
+NTPQ_DB = @NTPQ_DB@
+NTPQ_DL = @NTPQ_DL@
+NTPQ_DS = @NTPQ_DS@
+NTPQ_MS = @NTPQ_MS@
+NTPQ_NI = @NTPQ_NI@
+NTPSNMPD_DB = @NTPSNMPD_DB@
+NTPSNMPD_DL = @NTPSNMPD_DL@
+NTPSNMPD_DS = @NTPSNMPD_DS@
+NTPSNMPD_MS = @NTPSNMPD_MS@
+NTPSNMPD_NI = @NTPSNMPD_NI@
+NTPSWEEP_DB = @NTPSWEEP_DB@
+NTPSWEEP_DL = @NTPSWEEP_DL@
+NTPSWEEP_DS = @NTPSWEEP_DS@
+NTPSWEEP_MS = @NTPSWEEP_MS@
+NTPSWEEP_NI = @NTPSWEEP_NI@
+NTPTIME_DB = @NTPTIME_DB@
+NTPTIME_DL = @NTPTIME_DL@
+NTPTIME_DS = @NTPTIME_DS@
+NTPTIME_MS = @NTPTIME_MS@
+NTPTIME_NI = @NTPTIME_NI@
+NTPTRACE_DB = @NTPTRACE_DB@
+NTPTRACE_DL = @NTPTRACE_DL@
+NTPTRACE_DS = @NTPTRACE_DS@
+NTPTRACE_MS = @NTPTRACE_MS@
+NTPTRACE_NI = @NTPTRACE_NI@
+NTP_KEYGEN_DB = @NTP_KEYGEN_DB@
+NTP_KEYGEN_DL = @NTP_KEYGEN_DL@
+NTP_KEYGEN_DS = @NTP_KEYGEN_DS@
+NTP_KEYGEN_MS = @NTP_KEYGEN_MS@
+NTP_KEYGEN_NI = @NTP_KEYGEN_NI@
+NTP_KEYSDIR = @NTP_KEYSDIR@
+NTP_WAIT_DB = @NTP_WAIT_DB@
+NTP_WAIT_DL = @NTP_WAIT_DL@
+NTP_WAIT_DS = @NTP_WAIT_DS@
+NTP_WAIT_MS = @NTP_WAIT_MS@
+NTP_WAIT_NI = @NTP_WAIT_NI@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
+PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PATH_TEST = @PATH_TEST@
+PERLLIBDIR = @PERLLIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
+POSIX_SHELL = @POSIX_SHELL@
+PROPDELAY = @PROPDELAY@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SNMP_CFLAGS = @SNMP_CFLAGS@
+SNMP_CPPFLAGS = @SNMP_CPPFLAGS@
+SNMP_LIBS = @SNMP_LIBS@
+SNTP = @SNTP@
+SNTP_DB = @SNTP_DB@
+SNTP_DL = @SNTP_DL@
+SNTP_DS = @SNTP_DS@
+SNTP_MS = @SNTP_MS@
+SNTP_NI = @SNTP_NI@
+STDNORETURN_H = @STDNORETURN_H@
+STRIP = @STRIP@
+TESTDCF = @TESTDCF@
+TICKADJ_DB = @TICKADJ_DB@
+TICKADJ_DL = @TICKADJ_DL@
+TICKADJ_DS = @TICKADJ_DS@
+TICKADJ_MS = @TICKADJ_MS@
+TICKADJ_NI = @TICKADJ_NI@
+TIMETRIM_DB = @TIMETRIM_DB@
+TIMETRIM_DL = @TIMETRIM_DL@
+TIMETRIM_DS = @TIMETRIM_DS@
+TIMETRIM_MS = @TIMETRIM_MS@
+TIMETRIM_NI = @TIMETRIM_NI@
+UPDATE_LEAP_DB = @UPDATE_LEAP_DB@
+UPDATE_LEAP_DL = @UPDATE_LEAP_DL@
+UPDATE_LEAP_DS = @UPDATE_LEAP_DS@
+UPDATE_LEAP_MS = @UPDATE_LEAP_MS@
+UPDATE_LEAP_NI = @UPDATE_LEAP_NI@
+VERSION = @VERSION@
+VER_SUFFIX = @VER_SUFFIX@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+#AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects
+NULL = 
+BUILT_SOURCES = $(srcdir)/run-sec-2853.c check-libntp check-libunity \
+	check-rc-cmdlength .deps-ver
+CLEANFILES = check-libntp check-libunity check-rc-cmdlength .deps-ver
+std_unity_list = \
+	$(top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
+	$(NULL)
+
+run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+
+# HMS: we may not need some of these:
+LDADD = \
+	$(top_builddir)/sntp/unity/libunity.a	\
+	$(top_builddir)/ntpd/rc_cmdlength.o	\
+	$(LDADD_LIBNTP)			\
+	$(PTHREAD_LIBS)			\
+	$(LDADD_NTP)			\
+	$(NULL)
+
+AM_CFLAGS = $(CFLAGS_NTP)
+
+# HMS: we may not need some of these:
+AM_CPPFLAGS = $(NTP_INCS) -I$(top_srcdir)/sntp/unity \
+	-I$(top_srcdir)/include $(CPPFLAGS_NTP)
+AM_LDFLAGS = $(LDFLAGS_NTP)
+sec_2853_SOURCES = \
+	run-sec-2853.c			\
+	sec-2853.c			\
+	$(NULL)
+
+
+# HMS: we may not need some of these:
+#noinst_HEADERS =	ntpdtest.h	\
+#			$(NULL)
+TESTS = $(am__append_1)
+NTP_INCS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
+	-I$(top_srcdir)/lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include \
+	-I$(top_srcdir)/lib/isc/unix/include
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/sec-2853/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign tests/sec-2853/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+sec-2853$(EXEEXT): $(sec_2853_OBJECTS) $(sec_2853_DEPENDENCIES) $(EXTRA_sec_2853_DEPENDENCIES) 
+	@rm -f sec-2853$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(sec_2853_OBJECTS) $(sec_2853_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-sec-2853.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sec-2853.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+sec-2853.log: sec-2853$(EXEEXT)
+	@p='sec-2853$(EXEEXT)'; \
+	b='sec-2853'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile
+installdirs:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: all check check-am install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	recheck tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+$(srcdir)/run-sec-2853.c: $(srcdir)/sec-2853.c $(std_unity_list)
+	$(run_unity) sec-2853.c run-sec-2853.c
+
+check-libntp: ../../libntp/libntp.a
+	@echo stamp > $@
+
+../../libntp/libntp.a:
+	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+
+check-libunity: ../../sntp/unity/libunity.a
+	@echo stamp > $@
+
+../../sntp/unity/libunity.a:
+	cd ../../libunity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
+
+check-rc-cmdlength: ../../ntpd/rc_cmdlength.o
+	@echo stamp > $@
+
+../../ntpd/rc_cmdlength.o:
+	cd ../../ntpd && $(MAKE) $(AM_MAKEFLAGS) rc_cmdlength.o
+$(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
+	@[ -f $@ ] ||							\
+		cp $(top_srcdir)/deps-ver $@
+	@[ -w $@ ] ||							\
+		chmod ug+w $@
+	@cmp $(top_srcdir)/deps-ver $@ > /dev/null || (			\
+		$(MAKE) $(AM_MAKEFLAGS) clean &&					\
+		echo -n "Prior $(subdir)/$(DEPDIR) version " &&		\
+		cat $@ &&						\
+		rm -rf $(DEPDIR) &&					\
+		mkdir $(DEPDIR) && 					\
+		case "$(top_builddir)" in				\
+		 .)							\
+		    ./config.status Makefile depfiles			\
+		    ;;							\
+		 *)							\
+		    cd "$(top_builddir)" &&				\
+		    ./config.status $(subdir)/Makefile depfiles &&	\
+		    cd $(subdir)					\
+		    ;;							\
+		esac &&							\
+		echo -n "Cleaned $(subdir)/$(DEPDIR) version " &&	\
+		cat $(top_srcdir)/deps-ver				\
+	)
+	cp $(top_srcdir)/deps-ver $@
+
+.deps-ver: $(top_srcdir)/deps-ver
+	@[ ! -d $(DEPDIR) ] || $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/deps-ver
+	@touch $@
+
+#
+# depsver.mf	included in Makefile.am for directories with .deps
+#
+# When building in the same directory with sources that change over
+# time, such as when tracking using bk, the .deps files can become
+# stale with respect to moved, deleted, or superceded headers.  Most
+# commonly, this would exhibit as make reporting a failure to make a
+# header file which is no longer in the location given.  To address
+# this issue, we use a deps-ver file which is updated with each change
+# that breaks old .deps files.  A copy of deps-ver is made into
+# $(DEPDIR) if not already present.  If $(DEPDIR)/deps-ver is present
+# with different contents than deps-ver, we make clean to ensure all
+# .o files built before the incompatible change are rebuilt along with
+# their updated .deps files, then remove $(DEPDIR) and recreate it as
+# empty stubs.
+#
+# It is normal when configured with --disable-dependency-tracking for
+# the DEPDIR to not have been created.  For this reason, we use the
+# intermediate target .deps-ver, which invokes make recursively if
+# DEPDIR exists.
+#
+# If you modify depsver.mf, please make the changes to the master
+# copy, the one in sntp is copied by the bootstrap script from it.
+#
+# This comment block follows rather than leads the related code so that
+# it stays with it in the generated Makefile.in and Makefile.
+#
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/contrib/ntp/tests/sec-2853/run-sec-2853.c b/contrib/ntp/tests/sec-2853/run-sec-2853.c
new file mode 100644
index 000000000000..c8771bf2022e
--- /dev/null
+++ b/contrib/ntp/tests/sec-2853/run-sec-2853.c
@@ -0,0 +1,54 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include 
+#include 
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+void resetTest(void);
+extern void test_main(void );
+extern void test_main(void );
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "sec-2853.c";
+  UnityBegin("sec-2853.c");
+  RUN_TEST(test_main, 8);
+  RUN_TEST(test_main, 8);
+
+  return (UnityEnd());
+}
diff --git a/contrib/ntp/tests/sec-2853/sec-2853.c b/contrib/ntp/tests/sec-2853/sec-2853.c
new file mode 100644
index 000000000000..6499fdf1f85a
--- /dev/null
+++ b/contrib/ntp/tests/sec-2853/sec-2853.c
@@ -0,0 +1,120 @@
+#include 
+
+#include "unity.h"
+
+void setUp(void);
+void tearDown(void);
+
+void test_main( void );
+int basic_good( void );
+int embedded_nul( void );
+int trailing_space( void );
+
+extern size_t remoteconfig_cmdlength(const char *, const char *);
+
+static int verbose = 1;        // if not 0, also print results if test passed
+static int exit_on_err = 0;    // if not 0, exit if test failed
+
+
+void setUp(void)
+{
+}
+
+
+void tearDown(void)
+{
+}
+
+
+/*
+ * Test function calling the remote config buffer checker
+ * http://bugs.ntp.org/show_bug.cgi?id=2853
+ *
+ * size_t remoteconfig_cmdlength(const char *src_buf, const char *src_end)
+ * - trims whitespace & garbage from the right
+ * then looks for only \tSP-\127 starting from the left.
+ * It returns the number of "good" characters it found.
+ */
+
+
+void test_main( void )
+{
+	TEST_ASSERT_EQUAL(0, basic_good());
+	TEST_ASSERT_EQUAL(0, embedded_nul());
+	TEST_ASSERT_EQUAL(0, trailing_space());
+}
+
+
+int basic_good( void )
+{
+	const char string[] = "good";
+	const char *EOstring;
+	char *cp;
+	size_t len;
+	int failed;
+
+	EOstring = string + sizeof string;
+
+	len = remoteconfig_cmdlength(string, EOstring);
+
+	failed = ( 4 != len );
+
+	if ( failed || verbose )
+		printf( "remoteconfig_cmdlength(\"%s\") returned %d, expected %d: %s\n",
+			string,
+			len,
+			4,
+			failed ? "NO <<" : "yes" );
+
+	return failed ? -1 : 0;
+}
+
+
+int embedded_nul( void )
+{
+	const char string[] = "nul\0 there";
+	const char *EOstring;
+	char *cp;
+	size_t len;
+	int failed;
+
+	EOstring = string + sizeof string;
+
+	len = remoteconfig_cmdlength(string, EOstring);
+
+	failed = ( 3 != len );
+
+	if ( failed || verbose )
+		printf( "remoteconfig_cmdlength(\"%s\") returned %d, expected %d: %s\n",
+			string,
+			len,
+			3,
+			failed ? "NO <<" : "yes" );
+
+	return failed ? -1 : 0;
+}
+
+
+int trailing_space( void )
+{
+	const char string[] = "trailing space ";
+	const char *EOstring;
+	char *cp;
+	size_t len;
+	int failed;
+
+	EOstring = string + sizeof string;
+
+	len = remoteconfig_cmdlength(string, EOstring);
+
+	failed = ( 14 != len );
+
+	if ( failed || verbose )
+		printf( "remoteconfig_cmdlength(\"%s\") returned %d, expected %d: %s\n",
+			string,
+			len,
+			14,
+			failed ? "NO <<" : "yes" );
+
+	return failed ? -1 : 0;
+}
diff --git a/contrib/ntp/util/Makefile.in b/contrib/ntp/util/Makefile.in
index f4fc7124331a..9160af2cb45b 100644
--- a/contrib/ntp/util/Makefile.in
+++ b/contrib/ntp/util/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 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.
@@ -21,6 +20,61 @@
 
 
 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@
@@ -44,10 +98,6 @@ EXTRA_PROGRAMS = audio-pcm$(EXEEXT) byteorder$(EXEEXT) hist$(EXEEXT) \
 	ntp-keygen$(EXEEXT) ntptime$(EXEEXT) pps-api$(EXEEXT) \
 	precision$(EXEEXT) sht$(EXEEXT) testrs6000$(EXEEXT) \
 	tg$(EXEEXT) tg2$(EXEEXT) tickadj$(EXEEXT) timetrim$(EXEEXT)
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/bincheck.mf $(top_srcdir)/check-libopts.mf \
-	$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \
-	$(top_srcdir)/sntp/check-libntp.mf ansi2knr.1 ansi2knr.c
 subdir = util
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -79,6 +129,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
 	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
 	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_unitytest.m4 \
 	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
 	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
 	$(top_srcdir)/sntp/m4/openldap-thread-check.m4 \
@@ -88,6 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
 	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -102,9 +154,10 @@ audio_pcm_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 audio_pcm_DEPENDENCIES = ../libntp/libntp.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 byteorder_SOURCES = byteorder.c
 byteorder_OBJECTS = byteorder.$(OBJEXT)
 byteorder_LDADD = $(LDADD)
@@ -178,6 +231,18 @@ timetrim_OBJECTS = timetrim.$(OBJEXT)
 timetrim_LDADD = $(LDADD)
 timetrim_DEPENDENCIES = ../libntp/libntp.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -188,28 +253,29 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = audio-pcm.c byteorder.c hist.c $(jitter_SOURCES) kern.c \
 	longsize.c $(ntp_keygen_SOURCES) ntptime.c pps-api.c \
 	precision.c sht.c testrs6000.c tg.c tg2.c tickadj.c timetrim.c
 DIST_SOURCES = audio-pcm.c byteorder.c hist.c $(jitter_SOURCES) kern.c \
 	longsize.c $(ntp_keygen_SOURCES) ntptime.c pps-api.c \
 	precision.c sht.c testrs6000.c tg.c tg2.c tickadj.c timetrim.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -231,13 +297,40 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man1_MANS) $(man8_MANS) $(man_MANS)
 DATA = $(html_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/bincheck.mf \
+	$(top_srcdir)/check-libopts.mf $(top_srcdir)/depsver.mf \
+	$(top_srcdir)/includes.mf $(top_srcdir)/sntp/check-libntp.mf \
+	$(top_srcdir)/sntp/libevent/build-aux/depcomp README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -288,6 +381,7 @@ GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
 GTEST_LDFLAGS = @GTEST_LDFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@
 HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
 HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
@@ -404,6 +498,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
+PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PATH_TEST = @PATH_TEST@
 PERLLIBDIR = @PERLLIBDIR@
@@ -582,7 +677,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/bincheck.mf $(top_sr
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign util/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -591,6 +685,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/bincheck.mf $(top_srcdir)/sntp/check-libntp.mf $(top_srcdir)/check-libopts.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -602,14 +697,19 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -630,7 +730,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -645,14 +746,19 @@ clean-binPROGRAMS:
 	rm -f $$list
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -673,7 +779,8 @@ uninstall-libexecPROGRAMS:
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
@@ -688,14 +795,19 @@ clean-libexecPROGRAMS:
 	rm -f $$list
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -716,7 +828,8 @@ uninstall-sbinPROGRAMS:
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
@@ -729,52 +842,68 @@ clean-sbinPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-audio-pcm$(EXEEXT): $(audio_pcm_OBJECTS) $(audio_pcm_DEPENDENCIES) 
+
+audio-pcm$(EXEEXT): $(audio_pcm_OBJECTS) $(audio_pcm_DEPENDENCIES) $(EXTRA_audio_pcm_DEPENDENCIES) 
 	@rm -f audio-pcm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(audio_pcm_OBJECTS) $(audio_pcm_LDADD) $(LIBS)
-byteorder$(EXEEXT): $(byteorder_OBJECTS) $(byteorder_DEPENDENCIES) 
+
+byteorder$(EXEEXT): $(byteorder_OBJECTS) $(byteorder_DEPENDENCIES) $(EXTRA_byteorder_DEPENDENCIES) 
 	@rm -f byteorder$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(byteorder_OBJECTS) $(byteorder_LDADD) $(LIBS)
-hist$(EXEEXT): $(hist_OBJECTS) $(hist_DEPENDENCIES) 
+
+hist$(EXEEXT): $(hist_OBJECTS) $(hist_DEPENDENCIES) $(EXTRA_hist_DEPENDENCIES) 
 	@rm -f hist$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(hist_OBJECTS) $(hist_LDADD) $(LIBS)
-jitter$(EXEEXT): $(jitter_OBJECTS) $(jitter_DEPENDENCIES) 
+
+jitter$(EXEEXT): $(jitter_OBJECTS) $(jitter_DEPENDENCIES) $(EXTRA_jitter_DEPENDENCIES) 
 	@rm -f jitter$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(jitter_OBJECTS) $(jitter_LDADD) $(LIBS)
-kern$(EXEEXT): $(kern_OBJECTS) $(kern_DEPENDENCIES) 
+
+kern$(EXEEXT): $(kern_OBJECTS) $(kern_DEPENDENCIES) $(EXTRA_kern_DEPENDENCIES) 
 	@rm -f kern$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(kern_OBJECTS) $(kern_LDADD) $(LIBS)
-longsize$(EXEEXT): $(longsize_OBJECTS) $(longsize_DEPENDENCIES) 
+
+longsize$(EXEEXT): $(longsize_OBJECTS) $(longsize_DEPENDENCIES) $(EXTRA_longsize_DEPENDENCIES) 
 	@rm -f longsize$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(longsize_OBJECTS) $(longsize_LDADD) $(LIBS)
-ntp-keygen$(EXEEXT): $(ntp_keygen_OBJECTS) $(ntp_keygen_DEPENDENCIES) 
+
+ntp-keygen$(EXEEXT): $(ntp_keygen_OBJECTS) $(ntp_keygen_DEPENDENCIES) $(EXTRA_ntp_keygen_DEPENDENCIES) 
 	@rm -f ntp-keygen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ntp_keygen_OBJECTS) $(ntp_keygen_LDADD) $(LIBS)
-ntptime$(EXEEXT): $(ntptime_OBJECTS) $(ntptime_DEPENDENCIES) 
+
+ntptime$(EXEEXT): $(ntptime_OBJECTS) $(ntptime_DEPENDENCIES) $(EXTRA_ntptime_DEPENDENCIES) 
 	@rm -f ntptime$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ntptime_OBJECTS) $(ntptime_LDADD) $(LIBS)
-pps-api$(EXEEXT): $(pps_api_OBJECTS) $(pps_api_DEPENDENCIES) 
+
+pps-api$(EXEEXT): $(pps_api_OBJECTS) $(pps_api_DEPENDENCIES) $(EXTRA_pps_api_DEPENDENCIES) 
 	@rm -f pps-api$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(pps_api_OBJECTS) $(pps_api_LDADD) $(LIBS)
-precision$(EXEEXT): $(precision_OBJECTS) $(precision_DEPENDENCIES) 
+
+precision$(EXEEXT): $(precision_OBJECTS) $(precision_DEPENDENCIES) $(EXTRA_precision_DEPENDENCIES) 
 	@rm -f precision$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(precision_OBJECTS) $(precision_LDADD) $(LIBS)
-sht$(EXEEXT): $(sht_OBJECTS) $(sht_DEPENDENCIES) 
+
+sht$(EXEEXT): $(sht_OBJECTS) $(sht_DEPENDENCIES) $(EXTRA_sht_DEPENDENCIES) 
 	@rm -f sht$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sht_OBJECTS) $(sht_LDADD) $(LIBS)
-testrs6000$(EXEEXT): $(testrs6000_OBJECTS) $(testrs6000_DEPENDENCIES) 
+
+testrs6000$(EXEEXT): $(testrs6000_OBJECTS) $(testrs6000_DEPENDENCIES) $(EXTRA_testrs6000_DEPENDENCIES) 
 	@rm -f testrs6000$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(testrs6000_OBJECTS) $(testrs6000_LDADD) $(LIBS)
-tg$(EXEEXT): $(tg_OBJECTS) $(tg_DEPENDENCIES) 
+
+tg$(EXEEXT): $(tg_OBJECTS) $(tg_DEPENDENCIES) $(EXTRA_tg_DEPENDENCIES) 
 	@rm -f tg$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tg_OBJECTS) $(tg_LDADD) $(LIBS)
-tg2$(EXEEXT): $(tg2_OBJECTS) $(tg2_DEPENDENCIES) 
+
+tg2$(EXEEXT): $(tg2_OBJECTS) $(tg2_DEPENDENCIES) $(EXTRA_tg2_DEPENDENCIES) 
 	@rm -f tg2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tg2_OBJECTS) $(tg2_LDADD) $(LIBS)
-tickadj$(EXEEXT): $(tickadj_OBJECTS) $(tickadj_DEPENDENCIES) 
+
+tickadj$(EXEEXT): $(tickadj_OBJECTS) $(tickadj_DEPENDENCIES) $(EXTRA_tickadj_DEPENDENCIES) 
 	@rm -f tickadj$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tickadj_OBJECTS) $(tickadj_LDADD) $(LIBS)
-timetrim$(EXEEXT): $(timetrim_OBJECTS) $(timetrim_DEPENDENCIES) 
+
+timetrim$(EXEEXT): $(timetrim_OBJECTS) $(timetrim_DEPENDENCIES) $(EXTRA_timetrim_DEPENDENCIES) 
 	@rm -f timetrim$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(timetrim_OBJECTS) $(timetrim_LDADD) $(LIBS)
 
@@ -805,26 +934,23 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -833,11 +959,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1='$(man1_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -866,16 +999,21 @@ uninstall-man1:
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1='$(man8_MANS)'; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -904,13 +1042,14 @@ uninstall-man8:
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 install-htmlDATA: $(html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -924,30 +1063,17 @@ uninstall-htmlDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -959,15 +1085,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -976,24 +1098,26 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1042,10 +1166,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1138,24 +1267,27 @@ uninstall-man: uninstall-man1 uninstall-man8
 
 .MAKE: all check install install-am install-exec-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libexecPROGRAMS clean-libtool \
-	clean-sbinPROGRAMS ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-exec-hook \
-	install-html install-html-am install-htmlDATA install-info \
-	install-info-am install-libexecPROGRAMS install-man \
-	install-man1 install-man8 install-pdf install-pdf-am \
-	install-ps install-ps-am install-sbinPROGRAMS install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+	clean-libtool clean-sbinPROGRAMS cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-hook install-html \
+	install-html-am install-htmlDATA install-info install-info-am \
+	install-libexecPROGRAMS install-man install-man1 install-man8 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-sbinPROGRAMS install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-htmlDATA uninstall-libexecPROGRAMS uninstall-man \
 	uninstall-man1 uninstall-man8 uninstall-sbinPROGRAMS
 
+.PRECIOUS: Makefile
+
 
 $(srcdir)/ntp-keygen-opts.h: $(srcdir)/ntp-keygen-opts.c
 	@: do-nothing action to avoid default SCCS get, .h built with .c
diff --git a/contrib/ntp/util/ansi2knr.1 b/contrib/ntp/util/ansi2knr.1
deleted file mode 100644
index f9ee5a631c2e..000000000000
--- a/contrib/ntp/util/ansi2knr.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH ANSI2KNR 1 "19 Jan 1996"
-.SH NAME
-ansi2knr \- convert ANSI C to Kernighan & Ritchie C
-.SH SYNOPSIS
-.I ansi2knr
-[--varargs] input_file [output_file]
-.SH DESCRIPTION
-If no output_file is supplied, output goes to stdout.
-.br
-There are no error messages.
-.sp
-.I ansi2knr
-recognizes function definitions by seeing a non-keyword identifier at the left
-margin, followed by a left parenthesis, with a right parenthesis as the last
-character on the line, and with a left brace as the first token on the
-following line (ignoring possible intervening comments).  It will recognize a
-multi-line header provided that no intervening line ends with a left or right
-brace or a semicolon.  These algorithms ignore whitespace and comments, except
-that the function name must be the first thing on the line.
-.sp
-The following constructs will confuse it:
-.br
-     - Any other construct that starts at the left margin and follows the
-above syntax (such as a macro or function call).
-.br
-     - Some macros that tinker with the syntax of the function header.
-.sp
-The --varargs switch is obsolete, and is recognized only for
-backwards compatibility.  The present version of
-.I ansi2knr
-will always attempt to convert a ... argument to va_alist and va_dcl.
-.SH AUTHOR
-L. Peter Deutsch  wrote the original ansi2knr and
-continues to maintain the current version; most of the code in the current
-version is his work.  ansi2knr also includes contributions by Francois
-Pinard  and Jim Avera .
diff --git a/contrib/ntp/util/ansi2knr.c b/contrib/ntp/util/ansi2knr.c
deleted file mode 100644
index a042674d5c1b..000000000000
--- a/contrib/ntp/util/ansi2knr.c
+++ /dev/null
@@ -1,739 +0,0 @@
-/* Copyright (C) 1989, 2000 Aladdin Enterprises.  All rights reserved. */
-
-/*$Id: ansi2knr.c,v 1.3 2000/04/13 03:41:48 lpd Exp $*/
-/* Convert ANSI C function definitions to K&R ("traditional C") syntax */
-
-/*
-ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY.  No author or distributor accepts responsibility to anyone for the
-consequences of using it or for whether it serves any particular purpose or
-works at all, unless he says so in writing.  Refer to the GNU General Public
-License (the "GPL") for full details.
-
-Everyone is granted permission to copy, modify and redistribute ansi2knr,
-but only under the conditions described in the GPL.  A copy of this license
-is supposed to have been given to you along with ansi2knr so you can know
-your rights and responsibilities.  It should be in a file named COPYLEFT,
-or, if there is no file named COPYLEFT, a file named COPYING.  Among other
-things, the copyright notice and this notice must be preserved on all
-copies.
-
-We explicitly state here what we believe is already implied by the GPL: if
-the ansi2knr program is distributed as a separate set of sources and a
-separate executable file which are aggregated on a storage medium together
-with another program, this in itself does not bring the other program under
-the GPL, nor does the mere fact that such a program or the procedures for
-constructing it invoke the ansi2knr executable bring any other part of the
-program under the GPL.
-*/
-
-/*
- * Usage:
-	ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]
- * --filename provides the file name for the #line directive in the output,
- * overriding input_file (if present).
- * If no input_file is supplied, input is read from stdin.
- * If no output_file is supplied, output goes to stdout.
- * There are no error messages.
- *
- * ansi2knr recognizes function definitions by seeing a non-keyword
- * identifier at the left margin, followed by a left parenthesis, with a
- * right parenthesis as the last character on the line, and with a left
- * brace as the first token on the following line (ignoring possible
- * intervening comments and/or preprocessor directives), except that a line
- * consisting of only
- *	identifier1(identifier2)
- * will not be considered a function definition unless identifier2 is
- * the word "void", and a line consisting of
- *	identifier1(identifier2, <>)
- * will not be considered a function definition.
- * ansi2knr will recognize a multi-line header provided that no intervening
- * line ends with a left or right brace or a semicolon.  These algorithms
- * ignore whitespace, comments, and preprocessor directives, except that
- * the function name must be the first thing on the line.  The following
- * constructs will confuse it:
- *	- Any other construct that starts at the left margin and
- *	    follows the above syntax (such as a macro or function call).
- *	- Some macros that tinker with the syntax of function headers.
- */
-
-/*
- * The original and principal author of ansi2knr is L. Peter Deutsch
- * .  Other authors are noted in the change history
- * that follows (in reverse chronological order):
-
-	lpd 2000-04-12 backs out Eggert's changes because of bugs:
-	- concatlits didn't declare the type of its bufend argument;
-	- concatlits didn't recognize when it was inside a comment;
-	- scanstring could scan backward past the beginning of the string; when
-	- the check for \ + newline in scanstring was unnecessary.
-
-	2000-03-05  Paul Eggert  
-
-	Add support for concatenated string literals.
-	* ansi2knr.c (concatlits): New decl.
-	(main): Invoke concatlits to concatenate string literals.
-	(scanstring): Handle backslash-newline correctly.  Work with
-	character constants.  Fix bug when scanning backwards through
-	backslash-quote.  Check for unterminated strings.
-	(convert1): Parse character constants, too.
-	(appendline, concatlits): New functions.
-	* ansi2knr.1: Document this.
-
-	lpd 1999-08-17 added code to allow preprocessor directives
-		wherever comments are allowed
-	lpd 1999-04-12 added minor fixes from Pavel Roskin
-		 for clean compilation with
-		gcc -W -Wall
-	lpd 1999-03-22 added hack to recognize lines consisting of
-		identifier1(identifier2, xxx) as *not* being procedures
-	lpd 1999-02-03 made indentation of preprocessor commands consistent
-	lpd 1999-01-28 fixed two bugs: a '/' in an argument list caused an
-		endless loop; quoted strings within an argument list
-		confused the parser
-	lpd 1999-01-24 added a check for write errors on the output,
-		suggested by Jim Meyering 
-	lpd 1998-11-09 added further hack to recognize identifier(void)
-		as being a procedure
-	lpd 1998-10-23 added hack to recognize lines consisting of
-		identifier1(identifier2) as *not* being procedures
-	lpd 1997-12-08 made input_file optional; only closes input and/or
-		output file if not stdin or stdout respectively; prints
-		usage message on stderr rather than stdout; adds
-		--filename switch (changes suggested by
-		)
-	lpd 1996-01-21 added code to cope with not HAVE_CONFIG_H and with
-		compilers that don't understand void, as suggested by
-		Tom Lane
-	lpd 1996-01-15 changed to require that the first non-comment token
-		on the line following a function header be a left brace,
-		to reduce sensitivity to macros, as suggested by Tom Lane
-		
-	lpd 1995-06-22 removed #ifndefs whose sole purpose was to define
-		undefined preprocessor symbols as 0; changed all #ifdefs
-		for configuration symbols to #ifs
-	lpd 1995-04-05 changed copyright notice to make it clear that
-		including ansi2knr in a program does not bring the entire
-		program under the GPL
-	lpd 1994-12-18 added conditionals for systems where ctype macros
-		don't handle 8-bit characters properly, suggested by
-		Francois Pinard ;
-		removed --varargs switch (this is now the default)
-	lpd 1994-10-10 removed CONFIG_BROKETS conditional
-	lpd 1994-07-16 added some conditionals to help GNU `configure',
-		suggested by Francois Pinard ;
-		properly erase prototype args in function parameters,
-		contributed by Jim Avera ;
-		correct error in writeblanks (it shouldn't erase EOLs)
-	lpd 1989-xx-xx original version
- */
-
-/* Most of the conditionals here are to make ansi2knr work with */
-/* or without the GNU configure machinery. */
-
-#if HAVE_CONFIG_H
-# include 
-#endif
-
-#include 
-#include 
-
-#if HAVE_CONFIG_H
-
-/*
-   For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
-   This will define HAVE_CONFIG_H and so, activate the following lines.
- */
-
-# if STDC_HEADERS || HAVE_STRING_H
-#  include 
-# else
-#  include 
-# endif
-
-#else /* not HAVE_CONFIG_H */
-
-/* Otherwise do it the hard way */
-
-# ifdef BSD
-#  include 
-# else
-#  ifdef VMS
-    extern int strlen(), strncmp();
-#  else
-#   include 
-#  endif
-# endif
-
-#endif /* not HAVE_CONFIG_H */
-
-#if STDC_HEADERS
-# include 
-#else
-/*
-   malloc and free should be declared in stdlib.h,
-   but if you've got a K&R compiler, they probably aren't.
- */
-# ifdef MSDOS
-#  include 
-# else
-#  ifdef VMS
-     extern char *malloc();
-     extern void free();
-#  else
-     extern char *malloc();
-     extern int free();
-#  endif
-# endif
-
-#endif
-
-/* Define NULL (for *very* old compilers). */
-#ifndef NULL
-# define NULL (0)
-#endif
-
-/*
- * The ctype macros don't always handle 8-bit characters correctly.
- * Compensate for this here.
- */
-#ifdef isascii
-# undef HAVE_ISASCII		/* just in case */
-# define HAVE_ISASCII 1
-#else
-#endif
-#if STDC_HEADERS || !HAVE_ISASCII
-# define is_ascii(c) 1
-#else
-# define is_ascii(c) isascii(c)
-#endif
-
-#define is_space(c) (is_ascii(c) && isspace(c))
-#define is_alpha(c) (is_ascii(c) && isalpha(c))
-#define is_alnum(c) (is_ascii(c) && isalnum(c))
-
-/* Scanning macros */
-#define isidchar(ch) (is_alnum(ch) || (ch) == '_')
-#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')
-
-/* Forward references */
-char *ppdirforward();
-char *ppdirbackward();
-char *skipspace();
-char *scanstring();
-int writeblanks();
-int test1();
-int convert1();
-
-/* The main program */
-int
-main(argc, argv)
-    int argc;
-    char *argv[];
-{	FILE *in = stdin;
-	FILE *out = stdout;
-	char *filename = 0;
-	char *program_name = argv[0];
-	char *output_name = 0;
-#define bufsize 5000			/* arbitrary size */
-	char *buf;
-	char *line;
-	char *more;
-	char *usage =
-	  "Usage: ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]\n";
-	/*
-	 * In previous versions, ansi2knr recognized a --varargs switch.
-	 * If this switch was supplied, ansi2knr would attempt to convert
-	 * a ... argument to va_alist and va_dcl; if this switch was not
-	 * supplied, ansi2knr would simply drop any such arguments.
-	 * Now, ansi2knr always does this conversion, and we only
-	 * check for this switch for backward compatibility.
-	 */
-	int convert_varargs = 1;
-	int output_error;
-
-	while ( argc > 1 && argv[1][0] == '-' ) {
-	  if ( !strcmp(argv[1], "--varargs") ) {
-	    convert_varargs = 1;
-	    argc--;
-	    argv++;
-	    continue;
-	  }
-	  if ( !strcmp(argv[1], "--filename") && argc > 2 ) {
-	    filename = argv[2];
-	    argc -= 2;
-	    argv += 2;
-	    continue;
-	  }
-	  fprintf(stderr, "%s: Unrecognized switch: %s\n", program_name,
-		  argv[1]);
-	  fprintf(stderr, usage);
-	  exit(1);
-	}
-	switch ( argc )
-	   {
-	default:
-		fprintf(stderr, usage);
-		exit(0);
-	case 3:
-		output_name = argv[2];
-		out = fopen(output_name, "w");
-		if ( out == NULL ) {
-		  fprintf(stderr, "%s: Cannot open output file %s\n",
-			  program_name, output_name);
-		  exit(1);
-		}
-		/* falls through */
-	case 2:
-		in = fopen(argv[1], "r");
-		if ( in == NULL ) {
-		  fprintf(stderr, "%s: Cannot open input file %s\n",
-			  program_name, argv[1]);
-		  exit(1);
-		}
-		if ( filename == 0 )
-		  filename = argv[1];
-		/* falls through */
-	case 1:
-		break;
-	   }
-	if ( filename )
-	  fprintf(out, "#line 1 \"%s\"\n", filename);
-	buf = malloc(bufsize);
-	if ( buf == NULL )
-	   {
-		fprintf(stderr, "Unable to allocate read buffer!\n");
-		exit(1);
-	   }
-	line = buf;
-	while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
-	   {
-test:		line += strlen(line);
-		switch ( test1(buf) )
-		   {
-		case 2:			/* a function header */
-			convert1(buf, out, 1, convert_varargs);
-			break;
-		case 1:			/* a function */
-			/* Check for a { at the start of the next line. */
-			more = ++line;
-f:			if ( line >= buf + (bufsize - 1) ) /* overflow check */
-			  goto wl;
-			if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL )
-			  goto wl;
-			switch ( *skipspace(ppdirforward(more), 1) )
-			  {
-			  case '{':
-			    /* Definitely a function header. */
-			    convert1(buf, out, 0, convert_varargs);
-			    fputs(more, out);
-			    break;
-			  case 0:
-			    /* The next line was blank or a comment: */
-			    /* keep scanning for a non-comment. */
-			    line += strlen(line);
-			    goto f;
-			  default:
-			    /* buf isn't a function header, but */
-			    /* more might be. */
-			    fputs(buf, out);
-			    strcpy(buf, more);
-			    line = buf;
-			    goto test;
-			  }
-			break;
-		case -1:		/* maybe the start of a function */
-			if ( line != buf + (bufsize - 1) ) /* overflow check */
-			  continue;
-			/* falls through */
-		default:		/* not a function */
-wl:			fputs(buf, out);
-			break;
-		   }
-		line = buf;
-	   }
-	if ( line != buf )
-	  fputs(buf, out);
-	free(buf);
-	if ( output_name ) {
-	  output_error = ferror(out);
-	  output_error |= fclose(out);
-	} else {		/* out == stdout */
-	  fflush(out);
-	  output_error = ferror(out);
-	}
-	if ( output_error ) {
-	  fprintf(stderr, "%s: error writing to %s\n", program_name,
-		  (output_name ? output_name : "stdout"));
-	  exit(1);
-	}
-	if ( in != stdin )
-	  fclose(in);
-	return 0;
-}
-
-/*
- * Skip forward or backward over one or more preprocessor directives.
- */
-char *
-ppdirforward(p)
-    char *p;
-{
-    for (; *p == '#'; ++p) {
-	for (; *p != '\r' && *p != '\n'; ++p)
-	    if (*p == 0)
-		return p;
-	if (*p == '\r' && p[1] == '\n')
-	    ++p;
-    }
-    return p;
-}
-char *
-ppdirbackward(p, limit)
-    char *p;
-    char *limit;
-{
-    char *np = p;
-
-    for (;; p = --np) {
-	if (*np == '\n' && np[-1] == '\r')
-	    --np;
-	for (; np > limit && np[-1] != '\r' && np[-1] != '\n'; --np)
-	    if (np[-1] == 0)
-		return np;
-	if (*np != '#')
-	    return p;
-    }
-}
-
-/*
- * Skip over whitespace, comments, and preprocessor directives,
- * in either direction.
- */
-char *
-skipspace(p, dir)
-    char *p;
-    int dir;			/* 1 for forward, -1 for backward */
-{
-    for ( ; ; ) {
-	while ( is_space(*p) )
-	    p += dir;
-	if ( !(*p == '/' && p[dir] == '*') )
-	    break;
-	p += dir;  p += dir;
-	while ( !(*p == '*' && p[dir] == '/') ) {
-	    if ( *p == 0 )
-		return p;	/* multi-line comment?? */
-	    p += dir;
-	}
-	p += dir;  p += dir;
-    }
-    return p;
-}
-
-/* Scan over a quoted string, in either direction. */
-char *
-scanstring(p, dir)
-    char *p;
-    int dir;
-{
-    for (p += dir; ; p += dir)
-	if (*p == '"' && p[-dir] != '\\')
-	    return p + dir;
-}
-
-/*
- * Write blanks over part of a string.
- * Don't overwrite end-of-line characters.
- */
-int
-writeblanks(start, end)
-    char *start;
-    char *end;
-{	char *p;
-	for ( p = start; p < end; p++ )
-	  if ( *p != '\r' && *p != '\n' )
-	    *p = ' ';
-	return 0;
-}
-
-/*
- * Test whether the string in buf is a function definition.
- * The string may contain and/or end with a newline.
- * Return as follows:
- *	0 - definitely not a function definition;
- *	1 - definitely a function definition;
- *	2 - definitely a function prototype (NOT USED);
- *	-1 - may be the beginning of a function definition,
- *		append another line and look again.
- * The reason we don't attempt to convert function prototypes is that
- * Ghostscript's declaration-generating macros look too much like
- * prototypes, and confuse the algorithms.
- */
-int
-test1(buf)
-    char *buf;
-{	char *p = buf;
-	char *bend;
-	char *endfn;
-	int contin;
-
-	if ( !isidfirstchar(*p) )
-	  return 0;		/* no name at left margin */
-	bend = skipspace(ppdirbackward(buf + strlen(buf) - 1, buf), -1);
-	switch ( *bend )
-	   {
-	   case ';': contin = 0 /*2*/; break;
-	   case ')': contin = 1; break;
-	   case '{': return 0;		/* not a function */
-	   case '}': return 0;		/* not a function */
-	   default: contin = -1;
-	   }
-	while ( isidchar(*p) )
-	  p++;
-	endfn = p;
-	p = skipspace(p, 1);
-	if ( *p++ != '(' )
-	  return 0;		/* not a function */
-	p = skipspace(p, 1);
-	if ( *p == ')' )
-	  return 0;		/* no parameters */
-	/* Check that the apparent function name isn't a keyword. */
-	/* We only need to check for keywords that could be followed */
-	/* by a left parenthesis (which, unfortunately, is most of them). */
-	   {	static char *words[] =
-		   {	"asm", "auto", "case", "char", "const", "double",
-			"extern", "float", "for", "if", "int", "long",
-			"register", "return", "short", "signed", "sizeof",
-			"static", "switch", "typedef", "unsigned",
-			"void", "volatile", "while", 0
-		   };
-		char **key = words;
-		char *kp;
-		unsigned len = endfn - buf;
-
-		while ( (kp = *key) != 0 )
-		   {	if ( strlen(kp) == len && !strncmp(kp, buf, len) )
-			  return 0;	/* name is a keyword */
-			key++;
-		   }
-	   }
-	   {
-	       char *id = p;
-	       int len;
-	       /*
-		* Check for identifier1(identifier2) and not
-		* identifier1(void), or identifier1(identifier2, xxxx).
-		*/
-
-	       while ( isidchar(*p) )
-		   p++;
-	       len = p - id;
-	       p = skipspace(p, 1);
-	       if (*p == ',' ||
-		   (*p == ')' && (len != 4 || strncmp(id, "void", 4)))
-		   )
-		   return 0;	/* not a function */
-	   }
-	/*
-	 * If the last significant character was a ), we need to count
-	 * parentheses, because it might be part of a formal parameter
-	 * that is a procedure.
-	 */
-	if (contin > 0) {
-	    int level = 0;
-
-	    for (p = skipspace(buf, 1); *p; p = skipspace(p + 1, 1))
-		level += (*p == '(' ? 1 : *p == ')' ? -1 : 0);
-	    if (level > 0)
-		contin = -1;
-	}
-	return contin;
-}
-
-/* Convert a recognized function definition or header to K&R syntax. */
-int
-convert1(buf, out, header, convert_varargs)
-    char *buf;
-    FILE *out;
-    int header;			/* Boolean */
-    int convert_varargs;	/* Boolean */
-{	char *endfn;
-	char *p;
-	/*
-	 * The breaks table contains pointers to the beginning and end
-	 * of each argument.
-	 */
-	char **breaks;
-	unsigned num_breaks = 2;	/* for testing */
-	char **btop;
-	char **bp;
-	char **ap;
-	char *vararg = 0;
-
-	/* Pre-ANSI implementations don't agree on whether strchr */
-	/* is called strchr or index, so we open-code it here. */
-	for ( endfn = buf; *(endfn++) != '('; )
-	  ;
-top:	p = endfn;
-	breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
-	if ( breaks == NULL )
-	   {	/* Couldn't allocate break table, give up */
-		fprintf(stderr, "Unable to allocate break table!\n");
-		fputs(buf, out);
-		return -1;
-	   }
-	btop = breaks + num_breaks * 2 - 2;
-	bp = breaks;
-	/* Parse the argument list */
-	do
-	   {	int level = 0;
-		char *lp = NULL;
-		char *rp = NULL;
-		char *end = NULL;
-
-		if ( bp >= btop )
-		   {	/* Filled up break table. */
-			/* Allocate a bigger one and start over. */
-			free((char *)breaks);
-			num_breaks <<= 1;
-			goto top;
-		   }
-		*bp++ = p;
-		/* Find the end of the argument */
-		for ( ; end == NULL; p++ )
-		   {	switch(*p)
-			   {
-			   case ',':
-				if ( !level ) end = p;
-				break;
-			   case '(':
-				if ( !level ) lp = p;
-				level++;
-				break;
-			   case ')':
-				if ( --level < 0 ) end = p;
-				else rp = p;
-				break;
-			   case '/':
-				if (p[1] == '*')
-				    p = skipspace(p, 1) - 1;
-				break;
-			   case '"':
-			       p = scanstring(p, 1) - 1;
-			       break;
-			   default:
-				;
-			   }
-		   }
-		/* Erase any embedded prototype parameters. */
-		if ( lp && rp )
-		  writeblanks(lp + 1, rp);
-		p--;			/* back up over terminator */
-		/* Find the name being declared. */
-		/* This is complicated because of procedure and */
-		/* array modifiers. */
-		for ( ; ; )
-		   {	p = skipspace(p - 1, -1);
-			switch ( *p )
-			   {
-			   case ']':	/* skip array dimension(s) */
-			   case ')':	/* skip procedure args OR name */
-			   {	int level = 1;
-				while ( level )
-				 switch ( *--p )
-				   {
-				   case ']': case ')':
-				       level++;
-				       break;
-				   case '[': case '(':
-				       level--;
-				       break;
-				   case '/':
-				       if (p > buf && p[-1] == '*')
-					   p = skipspace(p, -1) + 1;
-				       break;
-				   case '"':
-				       p = scanstring(p, -1) + 1;
-				       break;
-				   default: ;
-				   }
-			   }
-				if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
-				   {	/* We found the name being declared */
-					while ( !isidfirstchar(*p) )
-					  p = skipspace(p, 1) + 1;
-					goto found;
-				   }
-				break;
-			   default:
-				goto found;
-			   }
-		   }
-found:		if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
-		  {	if ( convert_varargs )
-			  {	*bp++ = "va_alist";
-				vararg = p-2;
-			  }
-			else
-			  {	p++;
-				if ( bp == breaks + 1 )	/* sole argument */
-				  writeblanks(breaks[0], p);
-				else
-				  writeblanks(bp[-1] - 1, p);
-				bp--;
-			  }
-		   }
-		else
-		   {	while ( isidchar(*p) ) p--;
-			*bp++ = p+1;
-		   }
-		p = end;
-	   }
-	while ( *p++ == ',' );
-	*bp = p;
-	/* Make a special check for 'void' arglist */
-	if ( bp == breaks+2 )
-	   {	p = skipspace(breaks[0], 1);
-		if ( !strncmp(p, "void", 4) )
-		   {	p = skipspace(p+4, 1);
-			if ( p == breaks[2] - 1 )
-			   {	bp = breaks;	/* yup, pretend arglist is empty */
-				writeblanks(breaks[0], p + 1);
-			   }
-		   }
-	   }
-	/* Put out the function name and left parenthesis. */
-	p = buf;
-	while ( p != endfn ) putc(*p, out), p++;
-	/* Put out the declaration. */
-	if ( header )
-	  {	fputs(");", out);
-		for ( p = breaks[0]; *p; p++ )
-		  if ( *p == '\r' || *p == '\n' )
-		    putc(*p, out);
-	  }
-	else
-	  {	for ( ap = breaks+1; ap < bp; ap += 2 )
-		  {	p = *ap;
-			while ( isidchar(*p) )
-			  putc(*p, out), p++;
-			if ( ap < bp - 1 )
-			  fputs(", ", out);
-		  }
-		fputs(")  ", out);
-		/* Put out the argument declarations */
-		for ( ap = breaks+2; ap <= bp; ap += 2 )
-		  (*ap)[-1] = ';';
-		if ( vararg != 0 )
-		  {	*vararg = 0;
-			fputs(breaks[0], out);		/* any prior args */
-			fputs("va_dcl", out);		/* the final arg */
-			fputs(bp[0], out);
-		  }
-		else
-		  fputs(breaks[0], out);
-	  }
-	free((char *)breaks);
-	return 0;
-}
diff --git a/contrib/ntp/util/invoke-ntp-keygen.texi b/contrib/ntp/util/invoke-ntp-keygen.texi
index 0412485d4883..974e453b3989 100644
--- a/contrib/ntp/util/invoke-ntp-keygen.texi
+++ b/contrib/ntp/util/invoke-ntp-keygen.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-keygen.texi)
 #
-# It has been AutoGen-ed  April  7, 2015 at 04:27:46 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  June 29, 2015 at 04:32:15 PM by AutoGen 5.18.5
 # From the definitions    ntp-keygen-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -886,7 +886,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p2
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p3
 Usage:  ntp-keygen [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
diff --git a/contrib/ntp/util/ntp-keygen-opts.c b/contrib/ntp/util/ntp-keygen-opts.c
index 8521861ebbbb..6a05a68f1d4d 100644
--- a/contrib/ntp/util/ntp-keygen-opts.c
+++ b/contrib/ntp/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *
- *  It has been AutoGen-ed  April  7, 2015 at 04:27:30 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  June 29, 2015 at 04:32:00 PM by AutoGen 5.18.5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntp-keygen options
  */
 static char const ntp_keygen_opt_strs[2419] =
-/*     0 */ "ntp-keygen (ntp) 4.2.8p2\n"
+/*     0 */ "ntp-keygen (ntp) 4.2.8p3\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -164,14 +164,14 @@ static char const ntp_keygen_opt_strs[2419] =
 /*  2202 */ "no-load-opts\0"
 /*  2215 */ "no\0"
 /*  2218 */ "NTP_KEYGEN\0"
-/*  2229 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p2\n"
+/*  2229 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p3\n"
             "Usage:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  2343 */ "$HOME\0"
 /*  2349 */ ".\0"
 /*  2351 */ ".ntprc\0"
 /*  2358 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2392 */ "\n\0"
-/*  2394 */ "ntp-keygen (ntp) 4.2.8p2";
+/*  2394 */ "ntp-keygen (ntp) 4.2.8p3";
 
 /**
  *  imbits option description:
@@ -1048,7 +1048,7 @@ doOptImbits(tOptions* pOptions, tOptDesc* pOptDesc)
     option_usage_fp = stderr;
 
  emit_ranges:
-    optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
+optionShowRange(pOptions, pOptDesc, VOIDP(rng), 1);
 }
 #endif /* defined AUTOKEY */
 
@@ -1107,10 +1107,10 @@ doOptModulus(tOptions* pOptions, tOptDesc* pOptDesc)
     option_usage_fp = stderr;
 
  emit_ranges:
-    optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
+optionShowRange(pOptions, pOptDesc, VOIDP(rng), 1);
 }
 #endif /* defined AUTOKEY */
-/* extracted from optmain.tlib near line 1245 */
+/* extracted from optmain.tlib near line 1250 */
 
 /**
  * The directory containing the data associated with ntp-keygen.
@@ -1223,11 +1223,11 @@ AO_gettext(char const * pz)
     if (option_xlateable_txt.field_ct != 0) {
         res = dgettext("libopts", pz);
         if (res == pz)
-            res = (char *)(void *)_(pz);
+            res = (char *)VOIDP(_(pz));
     } else
-        res = (char *)(void *)_(pz);
+        res = (char *)VOIDP(_(pz));
 #else
-    res = (char *)(void *)_(pz);
+    res = (char *)VOIDP(_(pz));
 #endif
     if (res == pz)
         return res;
@@ -1264,7 +1264,7 @@ translate_option_strings(void)
          *  Do the translations.  The first pointer follows the field count
          *  field.  The field count field is the size of a pointer.
          */
-        char ** ppz = (char**)(void*)&(option_xlateable_txt);
+        char ** ppz = (char**)VOIDP(&(option_xlateable_txt));
         int     ix  = option_xlateable_txt.field_ct;
 
         do {
@@ -1274,16 +1274,16 @@ translate_option_strings(void)
         /* prevent re-translation and disable "libopts" domain lookup */
         option_xlateable_txt.field_ct = 0;
 
-        coerce_it((void*)&(opts->pzCopyright));
-        coerce_it((void*)&(opts->pzCopyNotice));
-        coerce_it((void*)&(opts->pzFullVersion));
-        coerce_it((void*)&(opts->pzUsageTitle));
-        coerce_it((void*)&(opts->pzExplain));
-        coerce_it((void*)&(opts->pzDetail));
+        coerce_it(VOIDP(&(opts->pzCopyright)));
+        coerce_it(VOIDP(&(opts->pzCopyNotice)));
+        coerce_it(VOIDP(&(opts->pzFullVersion)));
+        coerce_it(VOIDP(&(opts->pzUsageTitle)));
+        coerce_it(VOIDP(&(opts->pzExplain)));
+        coerce_it(VOIDP(&(opts->pzDetail)));
         {
             tOptDesc * od = opts->pOptDesc;
             for (ix = opts->optCt; ix > 0; ix--, od++)
-                coerce_it((void*)&(od->pzText));
+                coerce_it(VOIDP(&(od->pzText)));
         }
     }
 }
@@ -1309,7 +1309,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntp_keygenOptions.pzCopyright */
-  puts(_("ntp-keygen (ntp) 4.2.8p2\n\
+  puts(_("ntp-keygen (ntp) 4.2.8p3\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -1408,14 +1408,14 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntp_keygenOptions.pzUsageTitle */
-  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p2\n\
+  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p3\n\
 Usage:  %s [ - [] | --[{=| }] ]...\n"));
 
   /* referenced via ntp_keygenOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntp_keygenOptions.pzFullVersion */
-  puts(_("ntp-keygen (ntp) 4.2.8p2"));
+  puts(_("ntp-keygen (ntp) 4.2.8p3"));
 
   /* referenced via ntp_keygenOptions.pzFullUsage */
   puts(_("<<>>"));
@@ -1441,7 +1441,7 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2014 by Bruce Korb - all rights reserved\n"));
-#line 82 "../makeshell.c"
+#line 87 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
@@ -1465,9 +1465,9 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 89 "../makeshell.c"
+#line 94 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 301 "../makeshell.c"
+#line 306 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -1545,9 +1545,9 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("standard output"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("standard output"));
 #line 274 "../usage.c"
   puts(_("standard output"));
@@ -1565,9 +1565,9 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 203 "../makeshell.c"
+#line 208 "../makeshell.c"
   puts(_("write"));
-#line 938 "../makeshell.c"
+#line 943 "../makeshell.c"
   puts(_("write"));
 #line 273 "../usage.c"
   puts(_("write"));
@@ -1619,7 +1619,7 @@ Usage:  %s [ - [] | --[{=| }] ]...\n"));
 #line 380 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 916 "../makeshell.c"
+#line 921 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
diff --git a/contrib/ntp/util/ntp-keygen-opts.h b/contrib/ntp/util/ntp-keygen-opts.h
index 54f1ac400794..ef58041d6622 100644
--- a/contrib/ntp/util/ntp-keygen-opts.h
+++ b/contrib/ntp/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *
- *  It has been AutoGen-ed  April  7, 2015 at 04:27:29 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  June 29, 2015 at 04:32:00 PM by AutoGen 5.18.5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -94,9 +94,9 @@ typedef enum {
 /** count of all options for ntp-keygen */
 #define OPTION_CT    26
 /** ntp-keygen version */
-#define NTP_KEYGEN_VERSION       "4.2.8p2"
+#define NTP_KEYGEN_VERSION       "4.2.8p3"
 /** Full ntp-keygen version text */
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.8p2"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.8p3"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/contrib/ntp/util/ntp-keygen.1ntp-keygenman b/contrib/ntp/util/ntp-keygen.1ntp-keygenman
index b600ed4b830f..21dbfa70e9fe 100644
--- a/contrib/ntp/util/ntp-keygen.1ntp-keygenman
+++ b/contrib/ntp/util/ntp-keygen.1ntp-keygenman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-keygen 1ntp-keygenman "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Kfaqzc/ag-Wfaiyc)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-M4aiZI/ag-Y4aaYI)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:27:42 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:32:11 PM by AutoGen 5.18.5
 .\" From the definitions ntp-keygen-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -63,9 +63,9 @@ The message digest keys file must be distributed and stored
 using secure means beyond the scope of NTP itself.
 Besides the keys used for ordinary NTP associations, additional keys
 can be defined as passwords for the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 utility programs.
 .sp \n(Ppu
 .ne 2
@@ -87,7 +87,7 @@ option specifies the password for local encrypted files and the
 \f\*[B-Font]\-q\f[]
 option the password for encrypted files sent to remote sites.
 If no password is specified, the host name returned by the Unix
-\fBgethostname\fR()\f[]
+\fBgethostname\f[]\fR()\f[]
 function, normally the DNS name of the host is used.
 .sp \n(Ppu
 .ne 2
@@ -204,7 +204,7 @@ page.
 .ne 2
 
 The
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 configuration command
 \f\*[B-Font]crypto\f[] \f\*[B-Font]pw\f[] \f\*[I-Font]password\f[]
 specifies the read password for previously encrypted files.
@@ -278,7 +278,7 @@ by changing the link.
 If a link is present, ntpd follows it to the file name
 to extract the filestamp.
 If a link is not present,
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 extracts the filestamp from the file itself.
 This allows clients to verify that the file and generation times
 are always current.
@@ -412,7 +412,7 @@ by changing the link.
 If a link is present, ntpd follows it to the file name
 to extract the filestamp.
 If a link is not present,
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 extracts the filestamp from the file itself.
 This allows clients to verify that the file and generation times
 are always current.
@@ -516,7 +516,7 @@ and identification scheme, called a cryptotype,
 as explained in the
 \fIAuthentication\f[] \fIOptions\f[]
 section of
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 The default cryptotype uses RSA encryption, MD5 message digest
 and TC identification.
 First, configure a NTP subnet including one or more low-stratum
@@ -532,7 +532,7 @@ The trail is defined by static configuration file entries
 or dynamic means described on the
 \fIAutomatic\f[] \fINTP\f[] \fIConfiguration\f[] \fIOptions\f[]
 section of
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 .sp \n(Ppu
 .ne 2
 
@@ -588,10 +588,10 @@ Simply run
 with the same flags as before to generate new certificates
 using existing keys.
 However, if the host or sign key is changed,
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 should be restarted.
 When
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 is restarted, it loads any new files and restarts the protocol.
 Other dependent hosts will continue as usual until signatures are refreshed,
 at which time the protocol is restarted.
@@ -888,7 +888,7 @@ The second contains the datestamp in conventional Unix date format.
 Lines beginning with # are considered comments and ignored by the
 \f\*[B-Font]ntp-keygen\fP
 program and
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 daemon.
 Cryptographic values are encoded first using ASN.1 rules,
 then encrypted if necessary, and finally written PEM-encoded
@@ -921,9 +921,9 @@ character.
 .ne 2
 
 Note that the keys used by the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 programs
 are checked against passwords requested by the programs
 and entered by hand, so it is generally appropriate to specify these keys
@@ -948,9 +948,9 @@ or automated means on the other subnet hosts.
 While this file is not used with the Autokey Version 2 protocol,
 it is needed to authenticate some remote configuration commands
 used by the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 utilities.
 .SH "OPTIONS"
 .TP
diff --git a/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc b/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
index ad8a96d786ea..4299b0bfd0cf 100644
--- a/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
+++ b/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:27:49 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:32:18 PM by AutoGen 5.18.5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/util/ntp-keygen.html b/contrib/ntp/util/ntp-keygen.html
index 1aad39b3d396..e366734fce01 100644
--- a/contrib/ntp/util/ntp-keygen.html
+++ b/contrib/ntp/util/ntp-keygen.html
@@ -70,7 +70,7 @@ All other files are in PEM-encoded
 printable ASCII format so they can be embedded as MIME attachments in
 mail to other sites.
 
-  
        This document applies to version 4.2.8p2 of ntp-keygen.
+  
        This document applies to version 4.2.8p3 of ntp-keygen.
 
 
        
 
        
@@ -1085,7 +1085,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
        ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p2-RC3
+
        ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p3-RC3
 Usage:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
diff --git a/contrib/ntp/util/ntp-keygen.man.in b/contrib/ntp/util/ntp-keygen.man.in
index b47691b9eabc..e1e838e43df5 100644
--- a/contrib/ntp/util/ntp-keygen.man.in
+++ b/contrib/ntp/util/ntp-keygen.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-keygen @NTP_KEYGEN_MS@ "07 Apr 2015" "ntp (4.2.8p2)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "29 Jun 2015" "ntp (4.2.8p3)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Kfaqzc/ag-Wfaiyc)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-M4aiZI/ag-Y4aaYI)
 .\"
-.\" It has been AutoGen-ed April 7, 2015 at 04:27:42 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed June 29, 2015 at 04:32:11 PM by AutoGen 5.18.5
 .\" From the definitions ntp-keygen-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -63,9 +63,9 @@ The message digest keys file must be distributed and stored
 using secure means beyond the scope of NTP itself.
 Besides the keys used for ordinary NTP associations, additional keys
 can be defined as passwords for the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 utility programs.
 .sp \n(Ppu
 .ne 2
@@ -87,7 +87,7 @@ option specifies the password for local encrypted files and the
 \f\*[B-Font]\-q\f[]
 option the password for encrypted files sent to remote sites.
 If no password is specified, the host name returned by the Unix
-\fBgethostname\fR()\f[]
+\fBgethostname\f[]\fR()\f[]
 function, normally the DNS name of the host is used.
 .sp \n(Ppu
 .ne 2
@@ -204,7 +204,7 @@ page.
 .ne 2
 
 The
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 configuration command
 \f\*[B-Font]crypto\f[] \f\*[B-Font]pw\f[] \f\*[I-Font]password\f[]
 specifies the read password for previously encrypted files.
@@ -278,7 +278,7 @@ by changing the link.
 If a link is present, ntpd follows it to the file name
 to extract the filestamp.
 If a link is not present,
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 extracts the filestamp from the file itself.
 This allows clients to verify that the file and generation times
 are always current.
@@ -412,7 +412,7 @@ by changing the link.
 If a link is present, ntpd follows it to the file name
 to extract the filestamp.
 If a link is not present,
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 extracts the filestamp from the file itself.
 This allows clients to verify that the file and generation times
 are always current.
@@ -516,7 +516,7 @@ and identification scheme, called a cryptotype,
 as explained in the
 \fIAuthentication\f[] \fIOptions\f[]
 section of
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 The default cryptotype uses RSA encryption, MD5 message digest
 and TC identification.
 First, configure a NTP subnet including one or more low-stratum
@@ -532,7 +532,7 @@ The trail is defined by static configuration file entries
 or dynamic means described on the
 \fIAutomatic\f[] \fINTP\f[] \fIConfiguration\f[] \fIOptions\f[]
 section of
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 .sp \n(Ppu
 .ne 2
 
@@ -588,10 +588,10 @@ Simply run
 with the same flags as before to generate new certificates
 using existing keys.
 However, if the host or sign key is changed,
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 should be restarted.
 When
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 is restarted, it loads any new files and restarts the protocol.
 Other dependent hosts will continue as usual until signatures are refreshed,
 at which time the protocol is restarted.
@@ -888,7 +888,7 @@ The second contains the datestamp in conventional Unix date format.
 Lines beginning with # are considered comments and ignored by the
 \f\*[B-Font]ntp-keygen\fP
 program and
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 daemon.
 Cryptographic values are encoded first using ASN.1 rules,
 then encrypted if necessary, and finally written PEM-encoded
@@ -921,9 +921,9 @@ character.
 .ne 2
 
 Note that the keys used by the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 programs
 are checked against passwords requested by the programs
 and entered by hand, so it is generally appropriate to specify these keys
@@ -948,9 +948,9 @@ or automated means on the other subnet hosts.
 While this file is not used with the Autokey Version 2 protocol,
 it is needed to authenticate some remote configuration commands
 used by the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 utilities.
 .SH "OPTIONS"
 .TP
diff --git a/contrib/ntp/util/ntp-keygen.mdoc.in b/contrib/ntp/util/ntp-keygen.mdoc.in
index 540ff4f36b7f..7a505a215ba5 100644
--- a/contrib/ntp/util/ntp-keygen.mdoc.in
+++ b/contrib/ntp/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd April 7 2015
+.Dd June 29 2015
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  April  7, 2015 at 04:27:49 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  June 29, 2015 at 04:32:18 PM by AutoGen 5.18.5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/sendmail/CACerts b/contrib/sendmail/CACerts
index 618c3dcfee20..b5deb36b19b1 100644
--- a/contrib/sendmail/CACerts
+++ b/contrib/sendmail/CACerts
@@ -6,6 +6,102 @@
 # a certificate signed by one of these CA certificates.
 #
 
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            92:91:67:de:e0:ef:2c:e4
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2015/emailAddress=ca+ca-rsa2015@esmtp.org
+        Validity
+            Not Before: Mar  2 19:15:29 2015 GMT
+            Not After : Mar  1 19:15:29 2018 GMT
+        Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2015/emailAddress=ca+ca-rsa2015@esmtp.org
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:b9:1a:a1:56:ce:cb:16:af:4f:96:ba:2a:70:31:
+                    70:d3:86:6c:7a:46:26:47:42:3f:de:49:57:3e:08:
+                    1e:10:25:bf:06:8f:ca:fd:f4:5e:6a:01:7d:31:4d:
+                    50:88:18:43:71:66:65:42:9c:90:97:0d:95:f2:14:
+                    ef:d7:5e:77:ef:7d:b5:49:3f:02:bb:83:20:f7:e6:
+                    fc:9a:cd:13:df:60:41:28:8e:39:07:a6:a4:40:98:
+                    15:1e:46:b6:04:2e:f9:ab:32:d1:8b:fe:52:81:f1:
+                    d2:e1:c3:cf:bf:ab:40:a7:f0:e4:e5:a2:82:37:30:
+                    8c:10:7d:aa:a8:7c:7e:76:cc:5f:1a:24:d0:8c:94:
+                    f6:f2:7f:4a:be:2f:38:67:c0:06:e6:9e:51:ad:55:
+                    d0:cb:26:71:cf:f4:af:7d:5a:41:81:16:fb:26:ec:
+                    f0:35:01:6e:db:f9:e9:00:d7:d0:89:7b:cf:88:16:
+                    8b:1c:8f:77:1f:5d:ef:70:04:28:76:c5:1b:c6:23:
+                    8d:49:6b:f0:b8:21:56:d6:7d:68:6c:be:21:e3:e6:
+                    e3:1d:6f:a5:ea:dc:83:e4:27:b3:6f:5f:1b:3d:33:
+                    a1:d5:d3:f0:73:1a:12:eb:d9:95:00:71:59:16:b4:
+                    e4:60:38:b2:2e:7f:b7:d4:c5:e9:3f:74:e4:48:38:
+                    29:89
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                B1:69:DB:5E:9B:CE:1A:B4:1D:B2:6A:FC:5A:22:97:B6:24:14:6F:32
+            X509v3 Authority Key Identifier: 
+                keyid:B1:69:DB:5E:9B:CE:1A:B4:1D:B2:6A:FC:5A:22:97:B6:24:14:6F:32
+                DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=Claus Assmann CA RSA 2015/emailAddress=ca+ca-rsa2015@esmtp.org
+                serial:92:91:67:DE:E0:EF:2C:E4
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+            X509v3 Subject Alternative Name: 
+                email:ca+ca-rsa2015@esmtp.org
+            X509v3 Issuer Alternative Name: 
+                email:ca+ca-rsa2015@esmtp.org
+    Signature Algorithm: sha1WithRSAEncryption
+         0a:ce:07:39:77:08:c5:3a:00:04:e8:a0:3b:f7:d2:4c:79:02:
+         23:0b:da:c0:55:39:82:71:0a:0c:83:e2:de:f2:3b:fe:23:bc:
+         9b:13:34:d1:29:0a:16:3f:01:7d:9f:fb:4b:aa:12:dc:3b:7e:
+         b9:27:7b:ec:0c:3f:c0:d9:f5:d8:a8:a1:9c:1c:3a:2f:40:df:
+         27:1a:1a:a0:74:00:19:b7:82:0e:f9:45:86:bf:32:da:0e:72:
+         0a:4c:2c:39:21:63:c3:1f:61:6e:e2:4d:ba:7a:26:1a:15:ce:
+         b1:f6:1a:59:04:70:ed:e8:72:05:4c:fc:84:c6:a5:f4:e2:4a:
+         40:e4:42:70:87:9a:a7:02:26:3a:47:34:09:e0:7b:88:ca:fb:
+         99:d9:9b:bb:0c:52:8a:93:d5:59:30:0b:55:42:b4:bb:d2:b1:
+         49:55:81:a4:70:a0:49:19:f2:4f:61:94:af:e9:d7:62:68:65:
+         97:67:00:26:b8:9b:b2:2c:d0:2c:83:7d:3e:b3:31:73:b9:55:
+         49:53:fa:a3:ad:1b:02:67:08:9e:ce:9e:eb:9f:47:0d:6c:95:
+         e9:6c:30:92:c1:94:67:ad:d9:e3:b9:61:ea:a9:72:98:81:3a:
+         62:80:70:20:9a:3e:c4:1f:6f:bd:b4:00:ec:b1:fe:71:da:91:
+         15:89:f7:8f
+-----BEGIN CERTIFICATE-----
+MIIFJzCCBA+gAwIBAgIJAJKRZ97g7yzkMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UEBwwIQmVya2VsZXkx
+FDASBgNVBAoMC0VuZG1haWwgT3JnMQwwCgYDVQQLDANNVEExIjAgBgNVBAMMGUNs
+YXVzIEFzc21hbm4gQ0EgUlNBIDIwMTUxJjAkBgkqhkiG9w0BCQEWF2NhK2NhLXJz
+YTIwMTVAZXNtdHAub3JnMB4XDTE1MDMwMjE5MTUyOVoXDTE4MDMwMTE5MTUyOVow
+gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhC
+ZXJrZWxleTEUMBIGA1UECgwLRW5kbWFpbCBPcmcxDDAKBgNVBAsMA01UQTEiMCAG
+A1UEAwwZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAxNTEmMCQGCSqGSIb3DQEJARYX
+Y2ErY2EtcnNhMjAxNUBlc210cC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC5GqFWzssWr0+WuipwMXDThmx6RiZHQj/eSVc+CB4QJb8Gj8r99F5q
+AX0xTVCIGENxZmVCnJCXDZXyFO/XXnfvfbVJPwK7gyD35vyazRPfYEEojjkHpqRA
+mBUeRrYELvmrMtGL/lKB8dLhw8+/q0Cn8OTlooI3MIwQfaqofH52zF8aJNCMlPby
+f0q+LzhnwAbmnlGtVdDLJnHP9K99WkGBFvsm7PA1AW7b+ekA19CJe8+IFoscj3cf
+Xe9wBCh2xRvGI41Ja/C4IVbWfWhsviHj5uMdb6Xq3IPkJ7NvXxs9M6HV0/BzGhLr
+2ZUAcVkWtORgOLIuf7fUxek/dORIOCmJAgMBAAGjggFWMIIBUjAdBgNVHQ4EFgQU
+sWnbXpvOGrQdsmr8WiKXtiQUbzIwgdoGA1UdIwSB0jCBz4AUsWnbXpvOGrQdsmr8
+WiKXtiQUbzKhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9y
+bmlhMREwDwYDVQQHDAhCZXJrZWxleTEUMBIGA1UECgwLRW5kbWFpbCBPcmcxDDAK
+BgNVBAsMA01UQTEiMCAGA1UEAwwZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAxNTEm
+MCQGCSqGSIb3DQEJARYXY2ErY2EtcnNhMjAxNUBlc210cC5vcmeCCQCSkWfe4O8s
+5DAMBgNVHRMEBTADAQH/MCIGA1UdEQQbMBmBF2NhK2NhLXJzYTIwMTVAZXNtdHAu
+b3JnMCIGA1UdEgQbMBmBF2NhK2NhLXJzYTIwMTVAZXNtdHAub3JnMA0GCSqGSIb3
+DQEBBQUAA4IBAQAKzgc5dwjFOgAE6KA799JMeQIjC9rAVTmCcQoMg+Le8jv+I7yb
+EzTRKQoWPwF9n/tLqhLcO365J3vsDD/A2fXYqKGcHDovQN8nGhqgdAAZt4IO+UWG
+vzLaDnIKTCw5IWPDH2Fu4k26eiYaFc6x9hpZBHDt6HIFTPyExqX04kpA5EJwh5qn
+AiY6RzQJ4HuIyvuZ2Zu7DFKKk9VZMAtVQrS70rFJVYGkcKBJGfJPYZSv6ddiaGWX
+ZwAmuJuyLNAsg30+szFzuVVJU/qjrRsCZwiezp7rn0cNbJXpbDCSwZRnrdnjuWHq
+qXKYgTpigHAgmj7EH2+9tADssf5x2pEVifeP
+-----END CERTIFICATE-----
+
+
 Certificate:
     Data:
         Version: 3 (0x2)
diff --git a/contrib/sendmail/FAQ b/contrib/sendmail/FAQ
index 4bab6b4c8700..dd7ac046d961 100644
--- a/contrib/sendmail/FAQ
+++ b/contrib/sendmail/FAQ
@@ -1,8 +1,4 @@
 The FAQ is no longer maintained with the sendmail release.  It is
 available at http://www.sendmail.org/faq/ .
 
-A plain-text version of the questions only, with URLs referring to
-the answers, is posted to comp.mail.sendmail on the 10th and 25th
-of each month.
-
-$Revision: 8.24 $, Last updated $Date: 1999-02-07 03:21:03 $
+$Revision: 8.25 $, Last updated $Date: 2014-01-27 12:49:52 $
diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade
index 57426e23b7ce..64adce45b37f 100644
--- a/contrib/sendmail/FREEBSD-upgrade
+++ b/contrib/sendmail/FREEBSD-upgrade
@@ -1,6 +1,6 @@
 $FreeBSD$
 
-sendmail 8.14.9
+sendmail 8.15.2
 	originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
 
 For the import of sendmail, the following directories were renamed:
@@ -97,4 +97,4 @@ infrastructure in FreeBSD:
 	usr.sbin/mailwrapper/Makefile
 
 gshapiro@FreeBSD.org
-21-May-2014
+06-July-2015
diff --git a/contrib/sendmail/INSTALL b/contrib/sendmail/INSTALL
index 1f76d77e64b5..565cc42e0398 100644
--- a/contrib/sendmail/INSTALL
+++ b/contrib/sendmail/INSTALL
@@ -28,8 +28,9 @@ sendmail/SECURITY for more installation information.
    /etc/mail/submit.cf.  This can be done in the cf/cf by using
    "sh ./Build install-cf".
 
-   Please read sendmail/SECURITY before continuing; you have to create a
-   new user smmsp and a new group smmsp for the default installation.
+   Please read sendmail/SECURITY before continuing; you may have to create
+   a new user smmsp and a new group smmsp for the default installation
+   if you are updating from a really old version.
    Then install the sendmail binary built in step 3 by cd-ing back to
    sendmail/ and running "sh ./Build install".
 
diff --git a/contrib/sendmail/KNOWNBUGS b/contrib/sendmail/KNOWNBUGS
index fb5e44e2d327..de8bd0e15638 100644
--- a/contrib/sendmail/KNOWNBUGS
+++ b/contrib/sendmail/KNOWNBUGS
@@ -62,9 +62,9 @@ This list is not guaranteed to be complete.
   libmilter and hence the communication fails.  This can be avoided by
   increasing the constant MILTER_CHUNK_SIZE in
   include/libmilter/mfdef.h and recompiling sendmail, libmilter, and
-  all (statically linked) milters (or by using an undocumented compile
-  time option:  _FFR_MAXDATASIZE; you have to read the source code in
-  order to use this properly).
+  all (statically linked) milters (or by using undocumented compile
+  time options: _FFR_MAXDATASIZE/_FFR_MDS_NEGOTIATE; you have to
+  read the source code in order to use these properly).
 
 * Sender addresses whose domain part cause a temporary A record lookup
   failure but have a valid MX record will be temporarily rejected in
@@ -102,6 +102,11 @@ Kresolve sequence dnsmx canon
   Header addresses that have the \231 character (and possibly others
   in the range \201 - \237) behave in odd and usually unexpected ways.
 
+* AuthRealm for Cyrus SASL may not work as expected. The man page
+  and the actual usage for sasl_server_new() seem to differ.
+  Feedback for the "correct" usage is welcome, a patch to match
+  the description of the man page is in contrib/AuthRealm.p0.
+
 * accept() problem on SVR4.
 
   Apparently, the sendmail daemon loop (doing accept()s on the network)
@@ -252,7 +257,7 @@ Kresolve sequence dnsmx canon
 
 * Race condition for delivery to set-user-ID files
 
-  Sendmail will deliver to a fail if the file is owned by the DefaultUser
+  Sendmail will deliver to a file if the file is owned by the DefaultUser
   or has the set-user-ID bit set.  Unfortunately, some systems clear that bit
   when a file is modified.  Sendmail compensates by resetting the file mode
   back to it's original settings.  Unfortunately, there's still a
diff --git a/contrib/sendmail/PGPKEYS b/contrib/sendmail/PGPKEYS
index eb77d9cfa799..361d3e7b8e15 100644
--- a/contrib/sendmail/PGPKEYS
+++ b/contrib/sendmail/PGPKEYS
@@ -141,6 +141,185 @@ gpExpdV7qPrw9k01j5rod5PjZlG8zV0=
 =SR28
 -----END PGP PUBLIC KEY BLOCK-----
 
+
+pub   2048R/0xAAF5B5DE05BDCC53 2015-01-02
+fingerprint: 30BC A747 05FA 4154 5573  1D7B AAF5 B5DE 05BD CC53
+uid  Sendmail Signing Key/2015 
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBFSl4rQBCADRCzgFSJkzyoOHw9/9L/+G3mzA1fWR7TgCE0WxGX7PDzyLDaUS
+a4XpCDtadjXyr7c5YPo1T7ybxUH39yvUgEHBiPQDssik+bbpOiHL7V0sUDAYfKSq
+YC8/MG42Oj/zd+0WUhnI+RckFYPBNDQ+sZC6ErLDxCYDZMYhG4vhJOGqAKpglNTb
+w4Fdx4LNmL3e4t3z4IEtnzAqeGVxIZm8MGGFhKkb8ufpgh8Jiz4Q6cOis0ZD9K6f
+LvMPRJXSBy9jBtmS2oI2e9Q5LLhmzd1PVyA8jwAlK0QfJLmlRrgRUfHFKhkf+EuW
+tTi592OYCZ9bw7QVSiGVQUK+7VACfM+FQR81ABEBAAG0MVNlbmRtYWlsIFNpZ25p
+bmcgS2V5LzIwMTUgPHNlbmRtYWlsQFNlbmRtYWlsLk9SRz6JATgEEwECACIFAlSl
+4rQCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEKr1td4FvcxTTPMH/29J
+kNmt6EGNo/eLQySB8HTenfJjZaQxwPRhq22kWgr/7WP1BR2411bopyNk4IZ0rcDr
+tnyeJj4UWKJljVuXyTDQPtU8uUlgiOT8QiHEbge7MOzxrn0cy6KIOgKq+vtuxa28
+McaxjENR7XVIDFkesQ7P/yLkcCjlE6jaD4r9OIKpqEVMPs1WUFff+rsgTo7mdcgR
+QowQOgYqNil5awQ5Y2Gol71hZ6oRcpqMwSd6w4dEEx2U8rF8oqJuoxeUTgNCSv0n
+iFtewLznocmxlrxe1mQAeLfRmUAG4LSL6p5wx1lRjJA3gtyWRjY0404jGxkATLG4
+AtK2OkHj8MbrWLP7PKyJARwEEAECAAYFAlSl5AQACgkQYd4R7OJ2OnPHXAf/Y6Rk
+rROF45+SgbsEIiDXQBcBOoO1GKe0nFTc1jfAKUHAQ94fqcDxNeFRA9fNIA2d7XNI
+0Lw6W7X3RcEkF58xytIe/Y+EXDmOt/BUbpch9KIz6J9pqBhPdyHvG+ZeyA3A+TGT
+ZGnnnAxNFtCjt2IID9lzZSLuWhH8+DNC2Vp15NngDTa1VIk17n5iIvi7r3V5cdIE
+MblKLGm+ZaiTeccVLjwMKIUSgrLP87+yF/aaZH2kotuI7f3tD1ycN0sVZJxcFS+c
+GFw7uvOarDBSm0Q/FgfhDUOJLy4w5SqVmgPEIAeogz94q0JXxSSr1XWQBD8X9XwF
+f3+dPXmgMHXLGRWclYkBHAQQAQIABgUCVKXkPAAKCRA9aLJdUgfK08cnB/96BV+v
+xyBx35TPg8eI/WIskdQAIpCQsm6FoO1ejbMzfWn9bImCewOp1UMlowdfQC52Hdp8
+EXnuwCpJ3rtnZctRld5dNM/clbZ+r3lr78wX7hqPUajlvxe+TMpyZbJirLn1f5Ba
+yoysE4oICfzJivPfixZd7oFVr9EkftbatYenl0rgf/0lJTKRDIqNGezeeyfxaKdX
+qd545wqis7PrrXDOrEq815aosG09KQBhIoPgti2us1R95nSm9z6dVCY/nSDOxL+a
+Vyq/XD5KSUqbZVocY+fbR3dNX5haTvawuG0GPvl+YvYb2lW4hhi7Q4aUL7Dd4c9c
+vk5+WAvfJwHtbxrgiQEcBBABAgAGBQJUpeREAAoJEI5a6fvO7vQ7OWUH/2NNxhlI
+JEtvD+Nj2oPGgVQJrlFI1pbzyMCtD+6iy8Lfnp2DK+qKPMjBw96LUqcXC32VFPQr
+17iyZDv26MSb/acmdIfTPpPTwJ6zEmMI8mXradeuoiWxeVHSg7n+D3u0xtikmb9Y
+uRKv0yx43fcL70bqV5DzyXQte0chfRnOiwMrImWdgDekkmxE9udbtgK24rifNVGa
+TBB6eHJAsFVu5Y38hsZLe10bCKyUCqT6Qywfy3RCMpXYeo6fXOk0fKatG2oi3CZp
+LI+AnjmAJ0t2oMkrwUxogkK3LkShJT/aJYIR24eZm0GdzwRHZxXKClGFvdJslIea
+TKHSXNK41eEIfreJARwEEAECAAYFAlSl5EgACgkQOaTHfal4hLAXfwf+M0YmlHd4
+1sfvckYhOYf99n1BGnfQx5RJn+X+EBjGyOfPKMBPQuZIlwAI20T+cFnR3WmgrmlO
+IBG8qVcSDoValzNPcr0V3WGDrT75fYhf5iYj2ZsZDBUqE1VF3dAVUw40x2c1n+98
+7lbq3NtolSPYk07h5rhEhmkjdNcixv/exVCTGVwaT4X9ZHY8heETmF5tsCtPavpr
+i/DjcDQQQ0sQ8um1eX41j2bhrN4MERUC5oadvSULaA2QUoWgCrzVG8zx715Au77N
+jLtfA31hJI0GP/dpSREaYlqA0nwVDR5tz1TyTNwPN1ylxjQmjKXtJwx3jUtlT9Zh
+qxRf+ngYHpWArokBHAQQAQIABgUCVKXkTAAKCRBgTfvyhUEKvl11B/9aYJBEEQZp
+JWAT6HPmQK//i2x4y1euQfaHsjqJALvvPrgiTp/ZE3o6dKHhs+SbawsB57RtootN
+maQr7x2drvBojWhJJdaouAh345qOfZYb0bD9klkr6W+Mjl5T0xWIKFEyIZn0Tcbr
+8ekHgSIx2trL8LduSJou2bdPMh46PORzEpuQQ4IAyV0uRyBdNFOPwTy2OdXs51fr
+M7lp1hJp84+y2a6z3vz3VCs2A9LzlnXKZ6bXljpd5dQfrmrSNXltPKA3jVLkWi8+
+rh9f1rAGsj1e6N1aVF2uJ1Y3u+U0XQ/dwa1vDF3y4KVObxYM9eNGbF4J8lGkUy2a
+gZ1s1X8QzEDUiJwEEAECAAYFAlSl5FAACgkQEolum6d/JCmUSQP+KEz6xSvPSbFP
+Hip4JiX1Wbvd+t3TyL0u9Fv/POwUrFIHVpTkCwOz6jsBH3TdGGiYOP5F8k/US2jU
+3WB0J1mK5Rn3GwLhUGNTEeuaJZCuKE+j3qwMFmDqC/2IxEvlWtrIbTqkgf7cRv/O
+O7VNv+EL0axtsrOcwZlUWe6Lc4571oaInAQQAQIABgUCVKXkUwAKCRDYqvDK9rMH
+KX7xBACUFTBRCmboY/GRTHMZW1DGfcO2vMxwnYKqWomuzi/YonDCWtoTpeMDaAhY
+NnIchC1mlYteIE94/+ZsoYsZeaR3fe7CN6h/deBu4tW/dQ+TW1ZPF6EuVhoviKgz
+rd3rb+gcS0f0PgSPyg5LGtoMGMD9/gx1NJOTFec83jmBI95Gb4icBBABAgAGBQJU
+peRXAAoJEJdDARhwk7hBAUED/0oyeD2Z4wMQ6IQEprOAWbR+vIRzaThemmCGobRw
+UlM44nUXqKSM1+naLEVz/JzBuKWG00zTz6Su3NesWoFzDDUGYcIJggbOm39Pc+V8
+eXV86An64/v3P6gypJc+q9P+FFGGO884wFmYN634Mi4SDBVFUzffcghueAFcxtzt
+0mH5iJwEEAECAAYFAlSl5FoACgkQHnuzyK+VliVGdwP/fmdK9MdWIzPD/6eYm6JZ
+zbksaGWiqpwgp9IEr/OhSmGkXuwUsP35PFJ8FsJbEV5x/y6pP3UNp6EFRN/116ue
+jp5vVM7nnj2K3V8f85J4dXCRbv+kek+Ufo1Qzm5kgvRuBxX1sXpxFX6yBM0Y6WuV
+gszdbTVNlS04q6bnPFE9L4uInAQQAQIABgUCVKXkXgAKCRBwoCRNHvmSUZ/7A/9W
+yQJrrdrs2SuYtoxov/pL/TVMejbnxsF8Y0dRtM/KiquP57PMQSmLqy4fTRzAMHBv
+XK1aKfewTVfGKLcHIzfMfv2XcPpWfwcyMeZKtcSr25lWl9GJZP221rCok76XYwqk
+BPPp0pjSwdy0Qq4sd3N3ESZmqAMWJ7ouMmlQ7VWReYicBBABAgAGBQJUpeRhAAoJ
+EMjV7SmV9hdxLv0EALX3yjI2KDNG1mo5ctCSYlIlhXHQ6csHuUK9lzj9R1gVEzDU
+0dEZH0+a5UXh5xf8nyTDLytUe8PxTtPit3AOP6TvTJlANULh/3MKS6317RwUe2e0
+OitWbhQAOYfpYAkSdXZACzPacxrefkxmSM3Pq+SYoumZTI2N6AvVu8MeCS0GiJwE
+EAECAAYFAlSl5GQACgkQIYPhsTlvB4mWJgP/XAlvlBityADJkdN+3mp/OtdYzw04
++dBdNtmLqWUiMZg6rPPHUQi7dfBKi95FFe2U8hxSRk8oLzSzmh/M/CP72mxKh4pi
+PbmEkmKHYlNdyfCCNqXdjkBXFAKXAes/4DaBlZwvLjPtrupEaW2eYdU8cSrdeGuv
+1PMLRPxRr3nPCb+InAQQAQIABgUCVKXkaAAKCRCJaWK4Z4wKA3ZVA/4iYD+xrYv0
+8I+0GZJRdEL5f7T97a7Vtf5xSxUhHDww4xC9gs8LzEGWZXoNaZEVl4j+63EnCIbY
+o4g+c4m81D5NWFqeJWhWpcyvejo9hfGM3ZK/XbiF+ZTzznU5YJclGaZ7t8TY8gcx
+GSWxUzxBJQcSEzAKKi286ielMAXocNx10oicBBABAgAGBQJUpeRrAAoJEDgi20fM
+N08tDkwD/2F5j5irsDw+MQyLKpfPv3GRJ5J3ebOPpLQkQ5T34+qeIw4LkcXW9OJA
+ohW47JLb7R8zwAlUoqmmNXtxTM0r0FlTYGPOVEnSEkMqqa3KR68B3jWAGXXdqig9
+yBxYRleawQ4ltnegBn8q7gC4MwnIAZxzK+Y8cM0Rk/FjC9+NhwrviJwEEAECAAYF
+AlSl5G8ACgkQnBy94uNcVjUfvgQAlQijnoE3de1CanB0JqIN+h+XOLOpalFti+B7
+Swc2ZlnlQ9mofYPK5UHlbsiC7/TilD6xm4YEFKim9sOIMi8FNka8+EH+/d1DmS4M
+qVPDssxTG6VOzn7tYOuC9qIw15IpfbHW2bk/YIImwP9nViKCMLIGw+ZgK+uiRQx9
+fT8O1NqInAQQAQIABgUCVKXkcgAKCRBvUpPYo5umVYKeA/9n63K1nF3DNY3Hckvz
+tN8OrPmyCIOh+7t4sc5NHhTK0+BQTv+cgG6ig7K2cdI6VBAovs/c/u7+RrcMhp7l
+45AVnycfKcNaMHKFyMHDk9FZgpRG/bv1zwDxdh+scUc3IekqkSiQ2wTjDQ5Q/BMK
+L5zfOSnTOoltWjpVgsjdM75Ol4icBBABAgAGBQJUpeR2AAoJEO9YlmTUMuGd8R0D
+/3mhriMu/cp3DXHnlDykqLJI1q5K4xCHOWwFYZ8DxW116AVjluJYYW1HmWcJrjK3
+cwuN3FUcsIjafanIJWCsdeZaPAyFEfUBEW0YXIIpBXRw2N7jNtrd5X6Zjptd+zW+
+4dUzvT1pqVtdPHjova3fcGLSmcdZYbddotaGi7xi7kXviJwEEAECAAYFAlSl5HoA
+CgkQwZwdJRLTRh0iwwP/Y/pwp9ttAMuQUz6oH71BTkUrzu9LiI7vhrYxEquFdzCO
+dE4jBNB3LGfwzjhJRtjmQ/gVhjXWWrDYnOXt3gNxb9KzmTHmSDu65cBxX54Un0pZ
++MXjjWOT2l8+GA1lXeICIoZjJL88/zEZAiaH67ch2LEix1fOaJmXJzUSmP1pR3KI
+nAQQAQIABgUCVKXkfgAKCRDAKcpAFvTM6XVwA/9Eb+Dwn2lmEFFo64gj8ocpWzP8
+/sD86PP5KkZ+b/HQnGB3lsQTwsGytDvJfutLDa05sS/HWZ9wXPltX/G3omp/A1G5
+qEKzVSe0vEWedpf9wn82Ll6hzaiS5qX7r0+FpyUjY8arNrze5S4Q6Q2kjl8YduXl
+wG877igRHkGpAtApxYhGBBARAgAGBQJUpeSHAAoJEBj1A4AkwngCRCMAnjHfd5db
+KK6DJxrWVnEbyXs/QJGKAJsErKkiUX55B8k/P3cyzyXIaOujBYicBBABAgAGBQJU
+peSOAAoJEHxLZ22gDhVjCDQD/j7DE5wyhpjHrtf0hsQcaQoVHWZb2JTLZUMRAQyj
+zKMTSs0GslamlxLZmyV1HqkB+41zuJeBQtRV4gjqa5DQmWDRC2mHl7o9A40v4SDa
+O1jmfU5hfJSMecucPyEcfaAG4BIMvBo6TL484uHBi45SN4Ik3f2wc6D1XOluD1vB
+gIwpiJwEEAECAAYFAlSl5JMACgkQ1uCh/k++Kt2s6gP/RNcMKtx4u61vz+Aji/Fa
+H9q03JxQaRgmN1q2AvZQ/NTWTXU7Y5GnH4kW/8rOoUQiR+agJsvTt4ciM+y33pZ/
+ZZLkAuo0uKelEHhdQhtRbSktKBHSgDWbiqaJJIxazeLpxcSgaoM6RW/7aIFdMtEl
+ALAzTACYlTN/nKWWICn8GnGIRgQQEQIABgUCVKXkmAAKCRAh+cW892qb9aWOAKCg
+aznvUX8PIvKPzoHld39xWlJ+FgCg76wrEc1h9IiIgUoqH5NWVCxcHneInAQQAQIA
+BgUCVKXkngAKCRC92o/WP+p9/ancA/0Z4JHZT7NRBMr47zQvSwE4eLpSE5QDGXi7
+RNmOUgZxrxsFWRZLJCVupXDBQVZEhOBRZYqXPw1eDglOU952oj5OjaHsYnSEu7jz
+VUwlp2BxZQ3mnepdUcQz1A3k2cPZ0I6KFP9hP88GU+77nubB7IqRH/Q3QKMgO0eW
+yd5kYugyYYkBHAQQAQIABgUCVKXkpwAKCRC9J20ub8+ohR46CADMEvAns+L+BkVN
+d9INsiR1rONrNRPT6w4dnBeTLaykkuMjc6+7s+UuXm6AMAelI28pG+fJyt/lZAGx
+QLS9zFgREge0lVbOZVeAYeC1YyFsrJE4Lr2quq3fajj23tnsHmCv16znMHrh/E1m
+Udm4145NprijrZn+PsjuVWYV+pxiLpLM0YBdGNwCEMi/KCQ1fcaiAZZWSqLmHIe0
+ubWDdqq8/5JRQ22SEnqP2FT/lfOmKTxMNmE0uEr4+C4fG2nd38BvzpHu9eN/4Nwx
+IwzK5DhbAj+I57+VDncgkNGe1q4QY/5LaZQh/nHIcmX1ln23f9Lxkr6EYYZ1ptq+
+A8buvD+XiQEcBBABAgAGBQJUp+zrAAoJEBCQryClqlvm6AgIAKAR8HY4G9AD2jDb
+ouS4Al4QICagwQ0Y7Rc2/fHyPQEAP714EimakPFVFDbSD6SW569Qtdxr+ggH4wFI
+bzd21pCgIUC6nVoDotIjplMdYkNfq8AODpxn3HTBnNQ7e609xnWxFo/+httKoWok
+fEP9qZk4MJq7lE75iX+wohjLwoF6v0tCB8CrBFJcfKrDvXQSGvKiaEp4g0sEfyXv
+gL6X0xKMflupofdnFLJliV0WqGhBOGUghPdLsA02E3e1utj6WABmudMytRxWB8is
+SWGaywaEKLSdCgi+XlQVypKeWNMbZZZcftVZ91r4iNTAkw4cv5Wea+YnngfurGCq
+J/jUq7aJAiIEEgEKAAwFAlSn7r4FgweGH4AACgkQZhs61tgqu9C9Aw/+JMTXzwni
+NPwBxkbcNWbnWODVEElmDloHNpr3z+ryF1XNgbiOY8dn7uwRnPoeCDhIDwvNkK+x
+h4xmjH0970v1ltbzcZv0wnK6UeHQssqN9NGsXM9rbodYRIam4yxbwd1ddOC9QZFM
+ToRVWiqCzGOVYL50a24OYKClGjm4ncRznXJrNwYMEjxQ3j5FOkXIn0096z3szWCY
+6yDpPzOsl2TPwdjMKZWoMEDh/SvY3AxAXo1XqDCj2/+C8dDwO7kn+QAl3fUGmkI6
+dUHCAJm/WtSyvINdphzhZ1ZdkPhqDUKcR0JTX03QJ6bnu5vmmOncWm2NA7rP74fq
+KE9XzT808xP0GBwR1co7Eq+/751j2TA33JSlt/hIgi5aEWc4laCingJ02yaW8tUS
+DCoVNITaXcF/B47hjBgovQk8TOTsQ0nkSYvOoh05OYBmzl17G57QuPx1stRJ29QA
+VLGem1v1mXAuNdHH0kNE+/Rv0A2vGqauLx9ba84RfbXMM4SJw8CjhX6OxhAM8xoU
+tO6T56XZS8qLtWLkNQNZNdNlAo6tYk/cTrjdX1M63nYjoVbuc0nic6Wp+dQk/DEb
+wsiIpFoisvMK6EH49v70/c9Gtg6rk5z2yBHMZsjo2Y0TheTKwKIUEz0MuTncH8jD
+yB/NtQkrbiBdEqRJUoKKUtS0B4cUYTUyd+SJAhwEEAEKAAYFAlSn8agACgkQ8Ar2
+6sJF0gs2yA//cgc+g1wPRFzJeQGv5UFR3TCAMtS+/bzY3UU/eG2Jmbv2qwPbn+kx
+RH5dYlZ72VHXEggBaEweCBrBWsweX5dGEMNDLNlI9ArAjjhBAZFFUQKj55EzIZpp
+YTbvgxOD2ENKU2HfeQYCGFYZr3L2DXQ1k0U7VnaElBQV3o88CMi7bIsQq2aWk+c6
+Cy15UVr0niVLm95EUZM4yYm2gOGJXUeaGIExSBtiwuzvAiDEGaqfPGAi1ePkNmLJ
+3UzYfgiQumSh1kDVlQkCc8UQiF6ckEma618cmmaHs5vZvHsTX5O2/qPkLpXunA/7
+5yM/Jde8a5VbNGWyZ4rmstlWR5rPd7r3uP85miHn7Arait3aGo8RQeAHzOdTvMqS
+n3oCotQlOvBhOo7qA8oYQVlU0+77gOfZZeEXDZG13lU95ptFhdsGstIQH67jPQ6z
+TpVnd28ip92ysrwvxPhOzO74yKcYoKtzwLctcvptlKTkrFMHP3wJwqbaSfJGK4JE
+rjT8WnnWyHY465nTDN9AKkoH4WQNozniWX8OkF3CpPj7ow8roFXlPOxXH4QsaQu3
+Kk31APn/A925d4xyYuWYHZ7A/FzsHafFHPMoG3iwZyuFhfl1UXVvEd8w9mEcxXoh
+2iCy87TdpesG0GDzSmWwEYEPkg20BD2+vdc0EekALDjAGM+lfBxN67KIRgQQEQIA
+BgUCVKgM0gAKCRAJp6JK0eWCB94UAJ98O6S6r1hFnCLrbU3GeqrA4DCtBQCfcza/
+WoVLc3/+bOf1jzjJ/eJ20IyJAiIEEwEKAAwFAlSoCRMFgweGH4AACgkQhS2G+DXA
+JIrWURAAvgl1LkqB9pRPViK1U+xa3b5zt0O/fLbov59aLhA4uPJ10BgaKptflLim
+aE2EsS4Mnk0DQgGEBjlywJ5Ft3aMk3vbRz7lDE3zQ3oWa7+N4fcG7WWsAxmh0NtX
+Ak7orN6rQcyGgWgpF7wOau79i4VO7oLHKeS7QNs7X59CW+k64TAJabxi74PRoVMz
+843qWPjsuFIYM7n/nF0vdECwhSE8zUgcYG2n5CdA0Lq7XRE+II11VOT2XEXFMyR/
+Qh2m7l+jy12MEzHQfGC1HYBo/Zi/MRIN53Rd2LLJWQdMxz/BDiuSxZhKVeCRe7gT
+Mc2k3VrmfViBoaUE0zqMbx0j29XUbNQNU3afE8MOBkmyd6AQjoswBEsgU9uyCJYD
+Jq3V1stwSVBm9G7X/l8GFlPawLg/uM9gTYb2JYUYPlphTAwVcL469rKQNMhPj2ww
+zT7NzjwFb9XrmyiIrqH5z2ieG+LRjajOPVPwBsqZ3gOA+z9QkU1lRYEJOTlEYCkv
+8oA6ZeFm31S4JoeogbCDaMiqDszkFtYGBUgGEbnHoCgXi7aINSb17VZ8LTzpD4V9
+vGdFVuE3vJf2POMERP+buLV8OiG38cBJXb+JVSC+pkpm+32nY0UR5ccDPwAC3cGq
+SbI6ftKlQeaYp3UEncFUaB8NNZings3jzRexPjzUzo0vhRkkIs2InAQQAQIABgUC
+VKg5iQAKCRBfHshviAyeVbEVBACL9Vve0dF0UqO+DN4PzrTOx2JzRw7ujhcrZ6I/
+TCXjANGLWUheylRWhvxMojvbhZEg2835+9l6tpD7BVnrfkBE+LYIKFTusye+WYre
+dAaHFpuN6XfmsXmhXaSodhH9gKS+oftYX61qUmiE7L98nvINNBMnFVkptCQVDl8o
+GWiMRYhGBBMRAgAGBQJUqBAmAAoJEMSxB5iFeWojCtoAoLa2/SUyfC5EiKdvEbap
+49v6XPyxAJ9mPvhe75aTOU7uWoa+c0wn6fXIcrkBDQRUpeK0AQgA7ctg3cJD4eTw
+j4sQ94AtSYjwT+Yp7r2s6h4cHUge6AMZy9ixtyg87JnviRFob2zeo2JFDAwtl7Zs
+GHo+py/mJwfQKmUsXUmQqgHJFXDiiux+4+dYOXZyVYKP5bTV0JVlKjRjSWNnh7Bv
+yZNUZlrLz5ZKF1NAYKJAw4fx3TFbC4K3hvDwHQW3croPQYq0wNq6as956LHYjUOB
+Q5K0uy4TXY2EcIyAy253UX9MAFgacuP1jf3ITEVZpcebzl+gcaB54gXqOfmgQQP5
+PmQDyb96ZxFsKa5UfsS3Kh0PeERa5TDlgiw55O55pUSGKKfYfOXvqpJ/ZKYl+ado
+wgsmbq09UwARAQABiQEfBBgBAgAJBQJUpeK0AhsMAAoJEKr1td4FvcxTNO0IAJ2b
+V48mulcdCS8G3t8qRHlEXGbxgYBQRa500M9fdgRyIWBxubP7r6/nLFDGiIpdUVmT
+g9F3r1JsyK6Q7+VUp9XLirj/gT1kwxXT/UHHIQO8ObtPbfFtqISaBjaklTOUPCud
++nOpzRIfct6CZM0xAVIoqm4kaRFaWefxRiyeosDQ7tCD4lDRwxNJE2deE1WmOeN1
+YCJHa8QaewJXtUvqMq6pRmTlzSn+5/w3gV3XVF+CHjGD/COeSm7CGazLmlypN4n8
+ib9eRg0K2rAqKfUbn+aFwmqSBhBcw/UhOoXnteNQvd9KNdKiHERJEI3qZ2rLAlYf
+uYT6oSAR9rPSpsZpyTI=
+=Jib4
+-----END PGP PUBLIC KEY BLOCK-----
+
+
 Type Bits KeyID      Created    Expires    Algorithm       Use
 pub  2048 E2763A73   2014-01-02 -------    RSA             Sign & Encrypt
 fingerprint: 49F6 A8BE 8473 3949 5191  6F3B 61DE 11EC E276 3A73
@@ -2613,4 +2792,3 @@ DnF3FZZEzV7oqPwC2jzv/1dD6GFhtgy0cnyoPGUJCyc=
 =nES8
 -----END PGP PUBLIC KEY BLOCK-----
 
-$Revision: 8.46 $, Last updated $Date: 2014-01-18 00:20:24 $
diff --git a/contrib/sendmail/README b/contrib/sendmail/README
index 56f4c59ecc48..a87989846590 100644
--- a/contrib/sendmail/README
+++ b/contrib/sendmail/README
@@ -211,29 +211,11 @@ There are other files you should read.  Rooted in this directory are:
 +--------------+
 
 There are several related RFCs that you may wish to read -- they are
-available via anonymous FTP to several sites.  For a list of the
-primary repositories see:
-
-	http://www.isi.edu/in-notes/rfc-retrieval.txt
-
-They are also online at:
+available from several sites, see
 
+	http://www.rfc-editor.org/
 	http://www.ietf.org/
 
-They can also be retrieved via electronic mail by sending
-email to one of:
-
-	mail-server@nisc.sri.com
-		Put "send rfcNNN" in message body
-	nis-info@nis.nsf.net
-		Put "send RFCnnn.TXT-1" in message body
-	sendrfc@jvnc.net
-		Put "RFCnnn" as Subject: line
-
-For further instructions see:
-
-	http://www.isi.edu/in-notes/rfc-editor/rfc-info
-
 Important RFCs for electronic mail are:
 
 	RFC821	SMTP protocol
diff --git a/contrib/sendmail/RELEASE_NOTES b/contrib/sendmail/RELEASE_NOTES
index f581712635e3..18a7cae9faca 100644
--- a/contrib/sendmail/RELEASE_NOTES
+++ b/contrib/sendmail/RELEASE_NOTES
@@ -5,6 +5,165 @@ This listing shows the version of the sendmail binary, the version
 of the sendmail configuration files, the date of release, and a
 summary of the changes in that release.
 
+8.15.2/8.15.2	2015/07/03
+	If FEATURE(`nopercenthack') is used then some bogus input triggered
+		a recursion which was caught and logged as
+		SYSERR: rewrite: excessive recursion (max 50) ...
+		Fix based on patch from Ondrej Holas.
+	DHParameters now by default uses an included 2048 bit prime.
+		The value 'none' previously caused a log entry claiming
+		there was an error "cannot read or set DH parameters".
+		Also note that this option applies to the server side only.
+	The U= mailer field didn't accept group names containing hyphens,
+		underbars, or periods.  Based on patch from David Gwynne
+		of the University of Queensland.
+	CONFIG: Allow connections from IPv6:0:0:0:0:0:0:0:1 to relay again.
+		Patch from Lars-Johan Liman of Netnod Internet Exchange.
+	CONFIG: New option UseCompressedIPv6Addresses to select between
+		compressed and uncompressed IPv6 addresses.  The default
+		value depends on the compile-time option IPV6_FULL:
+		For 1 the default is False, for 0 it is True, thus
+		preserving the current behaviour.  Based on patch from
+		John Beck of Oracle.
+	CONFIG: Account for IPv6 localhost addresses in
+		FEATURE(`block_bad_helo').  Suggested by Andrey Chernov
+		from FreeBSD and Robert Scheck from the Fedora Project.
+	CONFIG: Account for IPv6 localhost addresses in check_mail ruleset.
+	LIBMILTER: Deal with more invalid protocol data to avoid potential
+		crashes.  Problem noted by Dimitri Kirchner.
+	LIBMILTER: Allow a milter to specify an empty macro list ("", not
+		NULL) in smfi_setsymlist() so no macro is sent for the
+		selected stage.
+	MAKEMAP: A change to check TrustedUser in fewer cases which was
+		made in 2013 caused a potential regression when makemap
+		was run as root (which should not be done anyway).
+	Note: sendmail often contains options "For Future Releases"
+		(prefix _FFR_) which might be enabled in a subsequent
+		version or might simply be removed as they turned out not
+		to be really useful.  These features are usually not
+		documented but if they are, then the required (FFR)
+		options are listed in
+		- doc/op/op.* for rulesets and macros,
+		- cf/README for mc/cf options.
+
+8.15.1/8.15.1	2014/12/06
+	SECURITY: Properly set the close-on-exec flag for file descriptors
+		(except stdin, stdout, and stderr) before executing mailers.
+	If header rewriting fails due to a temporary map lookup failure,
+		queue the mail for later retry instead of sending it
+		without rewriting the header.  Note: this is done
+		while the mail is being sent and hence the transaction
+		is aborted, which only works for SMTP/LMTP mailers
+		hence the handling of temporary map failures is
+		suppressed for other mailers. SMTP/LMTP servers may
+		complain about aborted transactions when this problem
+		occurs.
+		See also "DNS Lookups" in sendmail/TUNING.
+	Incompatible Change: Use uncompressed IPv6 addresses by default,
+		i.e., they will not contain "::".  For example,
+		instead of ::1 it will be 0:0:0:0:0:0:0:1.  This
+		permits a zero subnet to have a more specific match,
+		such as different map entries for IPv6:0:0 vs IPv6:0.
+		This change requires that configuration data
+		(including maps, files, classes, custom ruleset,
+		etc) must use the same format, so make certain such
+		configuration data is updated before using 8.15.
+		As a very simple check search for patterns like
+		'IPv6:[0-9a-fA-F:]*::' and 'IPv6::'. If necessary,
+		the prior format can be retained by compiling with:
+		APPENDDEF(`conf_sendmail_ENVDEF', `-DIPV6_FULL=0')
+		in your devtools/Site/site.config.m4 file.
+	If debugging is turned on (-d0.14) also print the OpenSSL
+		versions, both build time and run time
+		(provided STARTTLS is compiled in).
+	If a connection to the MTA is dropped by the client before its
+		hostname can be validated, treat it as "may be forged",
+		so that the unvalidated hostname is not passed to a
+		milter in xxfi_connect().
+	Add a timeout for communication with socket map servers
+		which can be specified using the -d option.
+	Add a compile time option HESIOD_ALLOW_NUMERIC_LOGIN to allow
+		numeric logins even if HESIOD is enabled.
+	The new option CertFingerprintAlgorithm specifies the finger-
+		print algorithm (digest) to use for the presented cert.
+		If the option is not set, md5 is used and the macro
+		{cert_md5} contains the cert fingerprint.
+		However, if the option is set, the specified algorithm
+		(e.g., sha1) is used and the macro {cert_fp} contains
+		the cert fingerprint.
+		That is, as long as the option is not set, the behaviour
+		does not change, but otherwise, {cert_md5} is superseded
+		by {cert_fp} even if you set CertFingerprintAlgorithm
+		to md5.
+	The options ServerSSLOptions and ClientSSLOptions can be used
+		to set SSL options for the server and client side
+		respectively. See SSL_CTX_set_options(3) for a list.
+		Note: this change turns on SSL_OP_NO_SSLv2 and
+		SSL_OP_NO_TICKET for the client. See doc/op/op.me
+		for details.
+	The option CipherList sets the list of ciphers for STARTTLS.
+		See ciphers(1) for possible values.
+	Do not log "STARTTLS: internal error: tls_verify_cb: ssl == NULL"
+		if a CRLFfile is in use (and LogLevel is 14 or higher.)
+	Store a more specific TLS protocol version in ${tls_version}
+		instead of a generic one, e.g., TLSv1 instead of
+		TLSv1/SSLv3.
+	Properly set {client_port} value on little endian machines.
+		Patch from Kelsey Cummings of Sonic.net.
+	Per RFC 3848, indicate in the Received: header whether SSL or
+		SMTP AUTH was negotiated by setting the protocol clause
+		to ESMTPS, ESMTPA, or ESMTPSA instead of ESMTP.
+	If the 'C' flag is listed as TLSSrvOptions the requirement for the
+		TLS server to have a cert is removed.  This only works
+		under very specific circumstances and should only be used
+		if the consequences are understood, e.g., clients
+		may not work with a server using this.
+	The options ClientCertFile, ClientKeyFile, ServerCertFile, and
+		ServerKeyFile can take a second file name, which must be
+		separated from the first with a comma (note: do not use
+		any spaces) to set up a second cert/key pair. This can
+		be used to have certs of different types, e.g., RSA
+		and DSA.
+	A new map type "arpa" is available to reverse an IP (IPv4 or IPv6)
+		address. It returns the string for the PTR lookup, but
+		without trailing {ip6,in-addr}.arpa.
+	New operation mode  'C' just checks the configuration file, e.g.,
+		sendmail -C new.cf -bC
+		will perform a basic syntax/consistency check of new.cf.
+	The mailer flag 'I' is deprecated and will be removed in a
+		future version.
+	Allow local (not just TCP) socket connections to the server, e.g.,
+		O DaemonPortOptions=Family=local, Addr=/var/mta/server.sock
+		can be used.
+	If the new option MaxQueueAge is set to a value greater than zero,
+		entries in the queue will be retried during a queue run
+		only if the individual retry time has been reached which
+		is doubled for each attempt.  The maximum retry time is
+		limited by the specified value.
+	New DontBlameSendmail option GroupReadableDefaultAuthInfoFile
+		to relax requirement for DefaultAuthInfo file.
+	Reset timeout after receiving a message to appropriate value if
+		STARTTLS is in use.  Based on patch by Kelsey Cummings
+		of Sonic.net.
+	Report correct error messages from the LDAP library for a range of
+		small negative return values covering those used by OpenLDAP.
+	Fix compilation with Berkeley DB 5.0 and 6.0.  Patch from
+		Allan E Johannesen of Worcester Polytechnic Institute.
+	CONFIG: FEATURE(`nopercenthack') takes one parameter: reject or
+		nospecial which describes whether to disallow "%" in the
+		local part of an address.
+	DEVTOOLS: Fix regression in auto-detection of libraries when only
+		shared libraries are available.  Problem reported by
+		Bryan Costales.
+	LIBMILTER: Mark communication socket as close-on-exec in case
+		a user's filter starts other applications.
+		Based on patch from Paul Howarth.
+	Portability:
+		SunOS 5.12 has changed the API for sigwait(2) to conform
+		with XPG7.  Based on patch from Roger Faulkner of Oracle.
+	Deleted Files:
+		libsm/path.c
+
 8.14.9/8.14.9	2014/05/21
 	SECURITY: Properly set the close-on-exec flag for file descriptors
 		(except stdin, stdout, and stderr) before executing mailers.
@@ -681,7 +840,7 @@ summary of the changes in that release.
 	LIBMILTER: The "hostname" argument of the xxfi_connect() callback
 		previously was the equivalent of {client_ptr}.  However,
 		this did not match the documentation of the function, hence
-		it has been changed to {client_name}.  See doc/op/op.*
+		it has been changed to {client_name}.  See doc/op/op.me
 		about these macros.
 
 8.13.7/8.13.7	2006/06/14
@@ -3509,11 +3668,11 @@ summary of the changes in that release.
 	Add new STARTTLS related options CACERTPath, CACERTFile,
 		ClientCertFile, ClientKeyFile, DHParameters, RandFile,
 		ServerCertFile, and ServerKeyFile.  These are documented in
-		cf/README and doc/op/op.*.
+		cf/README and doc/op/op.me.
 	New STARTTLS related macros: ${cert_issuer}, ${cert_subject},
 		${tls_version}, ${cipher}, ${cipher_bits}, ${verify},
 		${server_name}, and ${server_addr}.  These are documented
-		in cf/README and doc/op/op.*.
+		in cf/README and doc/op/op.me.
 	Add support for the Entropy Gathering Daemon (EGD) for better
 		random data.
 	New DontBlameSendmail option InsufficientEntropy for systems which
diff --git a/contrib/sendmail/cf/README b/contrib/sendmail/cf/README
index b26c99c6aaf3..91e69a918223 100644
--- a/contrib/sendmail/cf/README
+++ b/contrib/sendmail/cf/README
@@ -158,6 +158,26 @@ FEATURE(`local_procmail').
 *******************************************************************
 
 
+Note:
+Some rulesets, features, and options are only useful if the sendmail
+binary has been compiled with the appropriate options, e.g., the
+ruleset tls_server is only invoked if sendmail has been compiled
+with STARTTLS. This is usually obvious from the context and hence
+not further specified here.
+There are also so called "For Future Releases" (FFR) compile time
+options which might be included in a subsequent version or might
+simply be removed as they turned out not to be really useful.
+These are generally not documented but if they are, then the required
+compile time options are listed in doc/op/op.* for rulesets and
+macros, and for mc/cf specific options they are usually listed here.
+In addition to compile time options for the sendmail binary, there
+can also be FFRs for mc/cf which in general can be enabled when the
+configuration file is generated by defining them at the top of your
+.mc file:
+
+define(`_FFR_NAME_HERE', 1)
+
+
 +----------------------------+
 | A BRIEF INTRODUCTION TO M4 |
 +----------------------------+
@@ -397,6 +417,10 @@ SMTP_MAILER_CHARSET	[undefined] If defined, messages containing 8-bit data
 			that ARRIVE from an address that resolves to one of
 			the SMTP mailers and which are converted to MIME will
 			be labeled with this character set.
+RELAY_MAILER_CHARSET	[undefined] If defined, messages containing 8-bit data
+			that ARRIVE from an address that resolves to the
+			relay mailers and which are converted to MIME will
+			be labeled with this character set.
 SMTP_MAILER_LL		[990] The maximum line length for SMTP mailers
 			(except the relay mailer).
 RELAY_MAILER_LL		[2040] The maximum line length for the relay mailer.
@@ -743,6 +767,16 @@ nouucp		Don't route UUCP addresses.  This feature takes one
 		2. don't remove "!" from OperatorChars if `reject' is
 		given as parameter.
 
+nopercenthack	Don't treat % as routing character.  This feature takes one
+		parameter:
+		`reject': reject addresses which have % in the local
+			part unless it originates from a system
+			that is allowed to relay.
+		`nospecial': don't do anything special with %.
+		Warnings: 1. See the notice in the anti-spam section.
+		2. Don't remove % from OperatorChars if `reject' is
+		given as parameter.
+
 nocanonify	Don't pass addresses to $[ ... $] for canonification
 		by default, i.e., host/domain names are considered canonical,
 		except for unqualified names, which must not be used in this
@@ -1441,7 +1475,7 @@ msp		Defines config file for Message Submission Program.
 		by default.  If you have a machine with IPv6 only,
 		change it to
 
-			FEATURE(`msp', `[IPv6:::1]')
+			FEATURE(`msp', `[IPv6:0:0:0:0:0:0:0:1]')
 
 		If you want to continue using '[localhost]', (the behavior
 		up to 8.12.6), use
@@ -1499,8 +1533,12 @@ block_bad_helo	Reject messages from SMTP clients which provide a HELO/EHLO
 		- connections from IP addresses in class $={R}.
 		Currently access_db lookups can not be used to
 		(selectively) disable this test, moreover,
+
 		FEATURE(`delay_checks')
-		is required.
+
+		is required.  Note, the block_bad_helo feature automatically
+		adds the IPv6 and IPv4 localhost IP addresses to $={w} (local
+		host names) and $={R} (relay permitted).
 
 require_rdns	Reject mail from connecting SMTP clients without proper
 		rDNS (reverse DNS), functional gethostbyaddr() resolution.
@@ -2442,17 +2480,19 @@ should only be used for sites which have no control over the addresses
 that they provide a gateway for.  Use this FEATURE with caution as it
 can allow spammers to relay through your server if not setup properly.
 
-NOTICE: It is possible to relay mail through a system which the anti-relay
-rules do not prevent: the case of a system that does use FEATURE(`nouucp',
-`nospecial') (system A) and relays local messages to a mail hub (e.g., via
-LOCAL_RELAY or LUSER_RELAY) (system B).  If system B doesn't use
-FEATURE(`nouucp') at all, addresses of the form
- would be relayed to .
-System A doesn't recognize `!' as an address separator and therefore
-forwards it to the mail hub which in turns relays it because it came from
-a trusted local host.  So if a mailserver allows UUCP (bang-format)
-addresses, all systems from which it allows relaying should do the same
-or reject those addresses.
+NOTICE: It is possible to relay mail through a system which the
+anti-relay rules do not prevent: the case of a system that does use
+FEATURE(`nouucp', `nospecial') / FEATURE(`nopercenthack', `nospecial')
+(system A) and relays local messages to a mail hub (e.g., via
+LOCAL_RELAY or LUSER_RELAY) (system B).  If system B doesn't use the
+same feature (nouucp / nopercenthack) at all, addresses of the form
+ / 
+would be relayed to .
+System A doesn't recognize `!' / `%' as an address separator and
+therefore forwards it to the mail hub which in turns relays it
+because it came from a trusted local host.  So if a mailserver
+allows UUCP (bang-format) / %-hack addresses, all systems from which
+it allows relaying should do the same or reject those addresses.
 
 As of 8.9, sendmail will refuse mail if the MAIL FROM: parameter has
 an unresolvable domain (i.e., one that DNS, your local name service,
@@ -3160,17 +3200,49 @@ TLS_Clt:laptop.example.com      PERM+VERIFY:112
 TLS_Rcpt:darth@endmail.org	ENCR:112+CN:smtp.endmail.org
 
 
-Disabling STARTTLS And Setting SMTP Server Features
----------------------------------------------------
+TLS Options per Session
+-----------------------
 
 By default STARTTLS is used whenever possible.  However, there are
-some broken MTAs that don't properly implement STARTTLS.  To be able
-to send to (or receive from) those MTAs, the ruleset try_tls
-(srv_features) can be used that work together with the access map.
-Entries for the access map must be tagged with Try_TLS (Srv_Features)
-and refer to the hostname or IP address of the connecting system.
-A default case can be specified by using just the tag.  For example,
-the following entries in the access map:
+MTAs with STARTTLS interoperability issues.  To be able to send to
+(or receive from) those MTAs several features are available:
+
+1) Various TLS options be be set per IP/domain.
+2) STARTTLS can be turned off for specific IP addresses/domains.
+
+About 1): the rulesets tls_srv_features and tls_clt_features can
+be used to return a (semicolon separated) list of TLS related
+options:
+
+- Options: compare {Server,Client}SSLOptions.
+- CipherList: same as the global option.
+- CertFile, KeyFile: {Server,Client}{Cert,Key}File
+
+If FEATURE(`tls_session_features') is used, then default rulesets
+are activated which look up entries in the access map with the tags
+TLS_Srv_features and TLS_Clt_features, respectively.
+For example, these entries:
+
+	TLS_Srv_features:10.0.2.4	CipherList=MEDIUM+aRSA;
+	TLS_Clt_features:10.1.0.1	Options=SSL_OP_NO_TLSv1_2; CipherList=ALL:-EXPORT
+
+specify a cipherlist with MEDIUM strength ciphers that use RSA
+certificates only for the client with the IP address 10.0.2.4,
+and turn off TLSv1.2 when connecting to the server with the IP
+address 10.1.0.1 as well as setting a specific cipherlist.
+If FEATURE(`tls_session_features') is not used the user can provide
+their own rulesets which must return the appropriate data.
+If the rulesets are not defined or do not return a value, the
+default TLS options are not modified.
+(These rulesets require the sendmail binary to be built with
+_FFR_TLS_SE_OPTS enabled.)
+
+About 2): the ruleset try_tls (srv_features) can be used that work
+together with the access map.  Entries for the access map must be
+tagged with Try_TLS (Srv_Features) and refer to the hostname or IP
+address of the connecting system.  A default case can be specified
+by using just the tag.  For example, the following entries in the
+access map:
 
 	Try_TLS:broken.server	NO
 	Srv_Features:my.domain	v
@@ -3756,6 +3828,12 @@ confSINGLE_THREAD_DELIVERY  SingleThreadDelivery
 					cached but otherwise idle connection
 					to a host will prevent other sendmails
 					from connecting to the other host.
+confUSE_COMPRESSED_IPV6_ADDRESSES
+			UseCompressedIPv6Addresses
+					[undefined] If set, use the compressed
+					form of IPv6 addresses, such as
+					IPV6:::1, instead of the uncompressed
+					form, such as IPv6:0:0:0:0:0:0:0:1.
 confUSE_ERRORS_TO*	UseErrorsTo	[False] Use the Errors-To: header to
 					deliver error messages.  This should
 					not be necessary because of general
@@ -3990,6 +4068,13 @@ confWORK_TIME_FACTOR	RetryFactor	[90000] Cost of each delivery attempt.
 confQUEUE_SORT_ORDER	QueueSortOrder	[Priority] Queue sort algorithm:
 					Priority, Host, Filename, Random,
 					Modification, or Time.
+confMAX_QUEUE_AGE	MaxQueueAge	[undefined] If set to a value greater
+					than zero, entries in the queue
+					will be retried during a queue run
+					only if the individual retry time
+					has been reached which is doubled
+					for each attempt.  The maximum retry
+					time is limited by the specified value.
 confMIN_QUEUE_AGE	MinQueueAge	[0] The minimum amount of time a job
 					must sit in the queue between queue
 					runs.  This allows you to set the
@@ -4208,7 +4293,7 @@ confAUTH_MECHANISMS	AuthMechanisms	[GSSAPI KERBEROS_V4 DIGEST-MD5
 confAUTH_REALM		AuthRealm	[undefined] The authentication realm
 					that is passed to the Cyrus SASL
 					library.  If no realm is specified,
-					$j is used.
+					$j is used.  See KNOWNBUGS.
 confDEF_AUTH_INFO	DefaultAuthInfo	[undefined] Name of file that contains
 					authentication information for
 					outgoing connections.  This file must
@@ -4241,6 +4326,14 @@ confTLS_SRV_OPTIONS	TLSSrvOptions	If this option is 'V' no client
 					verification is performed, i.e.,
 					the server doesn't ask for a
 					certificate.
+confSERVER_SSL_OPTIONS	ServerSSLOptions	[undefined] SSL related
+					options for server side.  See
+					SSL_CTX_set_options(3) for a list.
+confCLIENT_SSL_OPTIONS	ClientSSLOptions	[undefined] SSL related
+					options for client side. See
+					SSL_CTX_set_options(3) for a list.
+confCIPHER_LIST		CipherList	[undefined] Cipher list for TLS.
+					See ciphers(1) for possible values.
 confLDAP_DEFAULT_SPEC	LDAPDefaultSpec	[undefined] Default map
 					specification for LDAP maps.  The
 					value should only contain LDAP
@@ -4250,10 +4343,11 @@ confLDAP_DEFAULT_SPEC	LDAPDefaultSpec	[undefined] Default map
 					maps unless they are specified in
 					the individual map specification
 					('K' command).
-confCACERT_PATH		CACertPath	[undefined] Path to directory
-					with certs of CAs.
-confCACERT		CACertFile	[undefined] File containing one CA
-					cert.
+confCACERT_PATH		CACertPath	[undefined] Path to directory with
+					certificates of CAs which must contain
+					their hashes as filenames or links.
+confCACERT		CACertFile	[undefined] File containing at least
+					one CA certificate.
 confSERVER_CERT		ServerCertFile	[undefined] File containing the
 					cert of the server, i.e., this cert
 					is used when sendmail acts as
@@ -4281,6 +4375,10 @@ confRAND_FILE		RandFile	[undefined] File containing random
 					requires this option if the compile
 					flag HASURANDOM is not set (see
 					sendmail/README).
+confCERT_FINGERPRINT_ALGORITHM	CertFingerprintAlgorithm
+					[undefined] The fingerprint algorithm
+					(digest) to use for the presented
+					cert.
 confNICE_QUEUE_RUN	NiceQueueRun	[undefined]  If set, the priority of
 					queue runners is set the given value
 					(nice(3)).
diff --git a/contrib/sendmail/cf/cf/Makefile b/contrib/sendmail/cf/cf/Makefile
index 00b75a8a0caf..efec478cb95a 100644
--- a/contrib/sendmail/cf/cf/Makefile
+++ b/contrib/sendmail/cf/cf/Makefile
@@ -100,6 +100,7 @@ M4FILES=\
 	${CFDIR}/feature/access_db.m4 \
 	${CFDIR}/feature/allmasquerade.m4 \
 	${CFDIR}/feature/always_add_domain.m4 \
+	${CFDIR}/feature/bcc.m4 \
 	${CFDIR}/feature/bestmx_is_local.m4 \
 	${CFDIR}/feature/bitdomain.m4 \
 	${CFDIR}/feature/blacklist_recipients.m4 \
@@ -118,9 +119,11 @@ M4FILES=\
 	${CFDIR}/feature/masquerade_envelope.m4 \
 	${CFDIR}/feature/no_default_msa.m4 \
 	${CFDIR}/feature/nocanonify.m4 \
+	${CFDIR}/feature/nopercenthack.m4 \
 	${CFDIR}/feature/notsticky.m4 \
 	${CFDIR}/feature/nouucp.m4 \
 	${CFDIR}/feature/nullclient.m4 \
+	${CFDIR}/feature/prefixmod.m4 \
 	${CFDIR}/feature/promiscuous_relay.m4 \
 	${CFDIR}/feature/redirect.m4 \
 	${CFDIR}/feature/ratecontrol.m4 \
@@ -131,12 +134,14 @@ M4FILES=\
 	${CFDIR}/feature/relay_mail_from.m4 \
 	${CFDIR}/feature/smrsh.m4 \
 	${CFDIR}/feature/stickyhost.m4 \
+	${CFDIR}/feature/tls_session_features.m4 \
 	${CFDIR}/feature/use_ct_file.m4 \
 	${CFDIR}/feature/use_cw_file.m4 \
 	${CFDIR}/feature/uucpdomain.m4 \
 	${CFDIR}/feature/virtuser_entire_domain.m4 \
 	${CFDIR}/feature/virtusertable.m4 \
 	${CFDIR}/hack/cssubdomain.m4 \
+	${CFDIR}/hack/xconnect.m4 \
 	${CFDIR}/m4/cf.m4 \
 	${CFDIR}/m4/cfhead.m4 \
 	${CFDIR}/m4/proto.m4 \
diff --git a/contrib/sendmail/cf/cf/submit.cf b/contrib/sendmail/cf/cf/submit.cf
index 498b8f9f632e..6295d32db006 100644
--- a/contrib/sendmail/cf/cf/submit.cf
+++ b/contrib/sendmail/cf/cf/submit.cf
@@ -16,8 +16,8 @@
 #####
 #####		SENDMAIL CONFIGURATION FILE
 #####
-##### built by ca@lab.smi.sendmail.com on Tue May 20 12:12:52 PDT 2014
-##### in /home/ca/sm8.git/sendmail/OpenSource/sendmail-8.14.9/cf/cf
+##### built by ca@sandman.dev-lab.sendmail.com on Thu Jul 2 05:24:31 PDT 2015
+##### in /x/ca/smi.git/sendmail/OpenSource/sendmail-8.15.2/cf/cf
 ##### using ../ as configuration include directory
 #####
 ######################################################################
@@ -114,7 +114,7 @@ D{MTAHost}[127.0.0.1]
 
 
 # Configuration version number
-DZ8.14.9/Submit
+DZ8.15.2/Submit
 
 
 ###############
@@ -202,6 +202,9 @@ O ConnectionCacheTimeout=5m
 # use Errors-To: header?
 O UseErrorsTo=False
 
+# use compressed IPv6 address format?
+#O UseCompressedIPv6Addresses
+
 # log level
 O LogLevel=9
 
@@ -251,6 +254,9 @@ O PrivacyOptions=goaway,noetrn,restrictqrun
 # minimum time in queue before retry
 #O MinQueueAge=30m
 
+# maximum time in queue before retry (if > 0; only for exponential delay)
+#O MaxQueueAge
+
 # how many jobs can you process in the queue?
 #O MaxQueueRunSize=0
 
@@ -501,6 +507,12 @@ O PidFile=/var/spool/clientmqueue/sm-client.pid
 # SMTP STARTTLS server options
 #O TLSSrvOptions
 
+# SSL cipherlist
+#O CipherList
+# server side SSL options
+#O ServerSSLOptions
+# client side SSL options
+#O ClientSSLOptions
 
 # Input mail filters
 #O InputMailFilters
@@ -524,6 +536,8 @@ O PidFile=/var/spool/clientmqueue/sm-client.pid
 #O DHParameters
 # Random data source (required for systems without /dev/urandom under OpenSSL)
 #O RandFile
+# fingerprint algorithm (digest) to use for the presented cert
+#O CertFingerprintAlgorithm
 
 # Maximum number of "useless" commands before slowing down
 #O MaxNOOPCommands=20
@@ -531,6 +545,8 @@ O PidFile=/var/spool/clientmqueue/sm-client.pid
 # Name to use for EHLO (defaults to $j)
 #O HeloName
 
+
+
 ############################
 # QUEUE GROUP DEFINITIONS  #
 ############################
@@ -645,6 +661,7 @@ R$- . $- :: $+		$@ $>Canonify2 $3 < @ $1.$2 .DECNET >	numeric DECnet addr
 # if we have % signs, take the rightmost one
 R$* % $*		$1 @ $2				First make them all @s.
 R$* @ $* @ $*		$1 % $2 @ $3			Undo all but the last.
+
 R$* @ $*		$@ $>Canonify2 $1 < @ $2 >	Insert < > and finish
 
 # else we must be a local name
@@ -781,6 +798,7 @@ R$* $=O $* < @ *LOCAL* >
 			$@ $>Parse0 $>canonify $1 $2 $3	...@*LOCAL* -> ...
 R$* < @ *LOCAL* >	$: $1
 
+
 #
 #  Parse1 -- the bottom half of ruleset 0.
 #
@@ -818,6 +836,8 @@ R$* < @$* > $*		$#esmtp $@ $2 $: $1 < @ $2 > $3	user@host.domain
 R$=L			$#local $: @ $1		special local names
 R$+			$#local $: $1			regular local names
 
+
+
 ###########################################################################
 ###   Ruleset 5 -- special rewriting after aliases have been expanded   ###
 ###########################################################################
@@ -1027,6 +1047,10 @@ R$* $| $*		$: $2
 R<@> < $* @ localhost >	$: < ? $&{client_name} > < $1 @ localhost >
 R<@> < $* @ [127.0.0.1] >
 			$: < ? $&{client_name} > < $1 @ [127.0.0.1] >
+R<@> < $* @ [IPv6:0:0:0:0:0:0:0:1] >
+			$: < ? $&{client_name} > < $1 @ [IPv6:0:0:0:0:0:0:0:1] >
+R<@> < $* @ [IPv6:::1] >
+			$: < ? $&{client_name} > < $1 @ [IPv6:::1] >
 R<@> < $* @ localhost.$m >
 			$: < ? $&{client_name} > < $1 @ localhost.$m >
 R<@> < $* @ localhost.UUCP >
@@ -1141,6 +1165,7 @@ R$*			$: $&{client_addr}
 R$@			$@ RELAY		originated locally
 R0			$@ RELAY		originated locally
 R127.0.0.1		$@ RELAY		originated locally
+RIPv6:0:0:0:0:0:0:0:1	$@ RELAY		originated locally
 RIPv6:::1		$@ RELAY		originated locally
 R$=R $*			$@ RELAY		relayable IP address
 R$*			$: [ $1 ]		put brackets around it...
@@ -1245,6 +1270,8 @@ STLS_connection
 RSOFTWARE	$#error $@ 4.7.0 $: "403 TLS handshake."
 
 
+
+
 ######################################################################
 ###  RelayTLS: allow relaying based on TLS authentication
 ###
@@ -1442,7 +1469,7 @@ Mrelay,		P=[IPC], F=mDFMuXa8k, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L=
 ### submit.mc ###
 # divert(-1)
 # #
-# # Copyright (c) 2001-2003 Proofpoint, Inc. and its suppliers.
+# # Copyright (c) 2001-2003, 2014 Proofpoint, Inc. and its suppliers.
 # #	All rights reserved.
 # #
 # # By using this file, you agree to the terms and conditions set
@@ -1464,5 +1491,5 @@ Mrelay,		P=[IPC], F=mDFMuXa8k, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L=
 # define(`confTIME_ZONE', `USE_TZ')dnl
 # define(`confDONT_INIT_GROUPS', `True')dnl
 # dnl
-# dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1]
+# dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:0:0:0:0:0:0:0:1]
 # FEATURE(`msp', `[127.0.0.1]')dnl
diff --git a/contrib/sendmail/cf/cf/submit.mc b/contrib/sendmail/cf/cf/submit.mc
index 580f4ff46e36..fc3cceec6b8f 100644
--- a/contrib/sendmail/cf/cf/submit.mc
+++ b/contrib/sendmail/cf/cf/submit.mc
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2001-2003 Proofpoint, Inc. and its suppliers.
+# Copyright (c) 2001-2003, 2014 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -22,5 +22,5 @@ define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
 define(`confTIME_ZONE', `USE_TZ')dnl
 define(`confDONT_INIT_GROUPS', `True')dnl
 dnl
-dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1]
+dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:0:0:0:0:0:0:0:1]
 FEATURE(`msp', `[127.0.0.1]')dnl
diff --git a/contrib/sendmail/cf/feature/bcc.m4 b/contrib/sendmail/cf/feature/bcc.m4
new file mode 100644
index 000000000000..9454143f2060
--- /dev/null
+++ b/contrib/sendmail/cf/feature/bcc.m4
@@ -0,0 +1,90 @@
+divert(-1)
+#
+# Copyright (c) 2014 Proofpoint, Inc. and its suppliers.
+#	All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+
+divert(-1)
+# Arguments:
+# 1: Map to use
+#   - empty/none: default map bcctable
+#   - `access': to use access_db (with bcc: as tag)
+#   - map definition
+#   The map contains domain names and the RHS should be simply "ok".
+#   If the access map is used, then its lookup algorithm is used.
+#   Otherwise:
+#    domain	ok
+#   matches anything@domain
+#    .domain	ok
+#   matches any subdomain, e.g., l@sub.domain and l@sub.dom.domain
+#   On a match, the original address will be used as bcc address unless
+#   argument 3 is set.
+# 2: Name of host ([mailer:]host)
+# 3: Default bcc address: if set, this will be always used.
+#   Only one of 2/3 can be empty.
+#   Note: if Bcc address is used then only one copy will be sent!
+#   (due to duplicate elimination)
+# 4: Map definition for canonicalRcpt map of address rewriting to
+#   apply to the added bcc envelope recipients.
+#   The option -T is required to handle temporary map failures.
+#
+# The ruleset must return either
+# - an e-mail address (user@dom.ain) which is then added as "bcc" recipient.
+# - an empty string: do not add a "bcc" recipient, or
+# - $#error: fail the SMTP transaction (e.g., temporary lookup failure)
+#
+# This feature sets O AddBcc=true
+
+ifelse(lower(_ARG_),`access',`define(`_BCC_ACCESS_', `1')')
+define(`_ADD_BCC_', `1')
+
+ifdef(`_BCC_ACCESS_', `dnl
+ifdef(`_ACCESS_TABLE_', `',
+	`errprint(`*** ERROR: FEATURE(`bcc') requires FEATURE(`access_db')
+')')')
+
+ifdef(`_BCC_ACCESS_', `', `
+LOCAL_CONFIG
+Kbcctable ifelse(defn(`_ARG_'), `', DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`bcctable', `_ARG_')')
+
+LOCAL_CONFIG
+O AddBcc=true
+ifelse(len(X`'_ARG2_),`1', `', `
+DA`'_ARG2_')
+
+ifelse(len(X`'_ARG4_), `1', `',
+`define(`_CANONIFY_BCC_', `1')dnl
+define(`_NEED_SMTPOPMODES_', `1')dnl
+# canonical address look up for AddBcc recipients
+KcanonicalRcpt _ARG4_
+')dnl
+
+LOCAL_RULESETS
+Sbcc
+R< $+ >			$1
+ifdef(`_BCC_ACCESS_', `dnl
+R$+ @ $+		$: $1@$2 $| $>SearchList  $|  <>',
+`R$+ @ $+		$: $1@$2 $| $>BCC $2')
+R$* $| 		$@
+R$* $| $*		$: ifelse(len(X`'_ARG3_),`1', `$1', `_ARG3_')
+
+ifdef(`_CANONIFY_BCC_', `dnl
+R$+ @ $+		$: $1@$2 $| <$(canonicalRcpt $1 @ $2 $: $)>
+R$* $| <>		$@
+R$* $| <$* >	$#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."
+R$* $| <$+>		$@ $2			map matched?
+')
+
+
+ifdef(`_BCC_ACCESS_', `', `
+SBCC
+R$+		$: $1 < $(bcctable $1 $: ? $) >
+R$- . $+ 	$: $2 < $(bcctable .$2 $: ? $) >
+R$- . $+ 	$: $>BCC $2
+R$* <$*>	$: <$2>
+')
diff --git a/contrib/sendmail/cf/feature/block_bad_helo.m4 b/contrib/sendmail/cf/feature/block_bad_helo.m4
index e720be129c82..c6cf54d05b36 100644
--- a/contrib/sendmail/cf/feature/block_bad_helo.m4
+++ b/contrib/sendmail/cf/feature/block_bad_helo.m4
@@ -15,4 +15,6 @@ divert(-1)
 
 define(`_BLOCK_BAD_HELO_', `')dnl
 RELAY_DOMAIN(`127.0.0.1')dnl
+RELAY_DOMAIN(`IPv6:0:0:0:0:0:0:0:1 IPv6:::1')dnl
 LOCAL_DOMAIN(`[127.0.0.1]')dnl
+LOCAL_DOMAIN(`[IPv6:0:0:0:0:0:0:0:1] [IPv6:::1]')dnl
diff --git a/contrib/sendmail/cf/feature/ldap_routing.m4 b/contrib/sendmail/cf/feature/ldap_routing.m4
index 9310600f1a28..0d8ccb9730c2 100644
--- a/contrib/sendmail/cf/feature/ldap_routing.m4
+++ b/contrib/sendmail/cf/feature/ldap_routing.m4
@@ -35,6 +35,8 @@ ifelse(len(X`'_ARG6_), `1', `define(`_LDAP_ROUTE_MAPTEMP_', `_QUEUE_')',
        _ARG6_, `tempfail', `define(`_LDAP_ROUTE_MAPTEMP_', `_TEMPFAIL_')',
        _ARG6_, `queue', `define(`_LDAP_ROUTE_MAPTEMP_', `_QUEUE_')')
 
+define(`_NEED_SMTPOPMODES_', `1')
+
 LOCAL_CONFIG
 # LDAP routing maps
 Kldapmh ifelse(len(X`'_ARG1_), `1',
diff --git a/contrib/sendmail/cf/feature/nopercenthack.m4 b/contrib/sendmail/cf/feature/nopercenthack.m4
new file mode 100644
index 000000000000..f6c9621c970d
--- /dev/null
+++ b/contrib/sendmail/cf/feature/nopercenthack.m4
@@ -0,0 +1,27 @@
+divert(-1)
+#
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
+#	All rights reserved.
+# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+
+divert(0)
+VERSIONID(`$Id: nopercenthack.m4,v 8.14 2013/01/31 15:07:00 ca Exp $')
+divert(-1)
+
+ifelse(defn(`_ARG_'), `', 
+	`errprint(`*** ERROR: missing argument for FEATURE(nopercenthack):
+		use `reject' or `nospecial'. See cf/README.
+')define(`_NO_PERCENTHACK_', `e')',
+	substr(_ARG_,0,1), `r', `define(`_NO_PERCENTHACK_', `r')',
+	substr(_ARG_,0,1), `n', `define(`_NO_PERCENTHACK_', `n')',
+	`errprint(`*** ERROR: illegal argument _ARG_ for FEATURE(nopercenthack)
+')
+	')
diff --git a/contrib/sendmail/cf/feature/prefixmod.m4 b/contrib/sendmail/cf/feature/prefixmod.m4
new file mode 100644
index 000000000000..abafe18da650
--- /dev/null
+++ b/contrib/sendmail/cf/feature/prefixmod.m4
@@ -0,0 +1,24 @@
+divert(-1)
+#
+# Copyright (c) 2014 Proofpoint, Inc. and its suppliers.
+#	All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+
+divert(-1)
+# Arguments:
+# 1: prefix to match; must be one or more tokens
+#    (this is not a "substring" match)
+# 2: flags to set
+# NYI: 3: replacement for 1 (empty for now)
+
+ifelse(defn(`_ARG_'), `', `errprint(`Feature "prefixmod" requires argument')',
+	`define(`_PREFIX_MOD_', _ARG_)')
+ifelse(len(X`'_ARG2_),`1', `errprint(`Feature "prefixmod" requires two arguments')',
+	`define(`_PREFIX_FLAGS_', _ARG2_)')
+
+define(`_NEED_MACRO_MAP_', `1')
diff --git a/contrib/sendmail/cf/feature/tls_session_features.m4 b/contrib/sendmail/cf/feature/tls_session_features.m4
new file mode 100644
index 000000000000..b45fb361333b
--- /dev/null
+++ b/contrib/sendmail/cf/feature/tls_session_features.m4
@@ -0,0 +1,16 @@
+divert(-1)
+#
+# Copyright (c) 2015 Proofpoint, Inc. and its suppliers.
+#	All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+
+divert(0)
+VERSIONID(`$Id: tls_session_features.m4,v 8.1 2015-02-25 20:51:11 ca Exp $')
+divert(-1)
+
+define(`_TLS_SESSION_FEATURES_', 1)
diff --git a/contrib/sendmail/cf/hack/xconnect.m4 b/contrib/sendmail/cf/hack/xconnect.m4
new file mode 100644
index 000000000000..72fba31d7bdb
--- /dev/null
+++ b/contrib/sendmail/cf/hack/xconnect.m4
@@ -0,0 +1,37 @@
+divert(-1)
+#
+# Copyright (c) 1998-2011 Proofpoint, Inc. and its suppliers.
+#	All rights reserved.
+# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+
+divert(0)
+VERSIONID(`$Id: xconnect.m4,v 1.3 2013-11-22 20:51:13 ca Exp $')
+divert(-1)
+
+ifdef(`_ACCESS_TABLE_', `dnl
+LOCAL_RULESETS
+#
+# x_connect ruleset for looking up XConnect: tag in access DB to enable
+# XCONNECT support in MTA
+#
+Sx_connect
+dnl workspace: {client_name} $| {client_addr}
+R$+ $| $+		$: $>D < $1 >   < $2 >
+dnl workspace:  <{client_addr}>
+dnl OR $| $+ if client_name is empty
+R   $| $+		$: $>A < $1 >   <>	empty client_name
+dnl workspace:  <{client_addr}>
+R <$+>		$: $>A < $1 >   <>	no: another lookup
+dnl workspace:  (<>|<{client_addr}>)
+R <$*>		$# no					found nothing
+dnl workspace:  (<>|<{client_addr}>) | OK
+R<$+> <$*>		$@ yes					found in access DB',
+	`errprint(`*** ERROR: HACK(xconnect) requires FEATURE(access_db)
+')')
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4
index 51f676cb855f..d808955db389 100644
--- a/contrib/sendmail/cf/m4/cfhead.m4
+++ b/contrib/sendmail/cf/m4/cfhead.m4
@@ -17,7 +17,7 @@
 #####
 #####		SENDMAIL CONFIGURATION FILE
 #####
-ifdef(`__win32__', `dnl', `dnl
+ifdef(`_NO_MAKEINFO_', `dnl', `dnl
 ifdef(`TEMPFILE', `dnl', `define(`TEMPFILE', maketemp(/tmp/cfXXXXXX))dnl
 syscmd(sh _CF_DIR_`'sh/makeinfo.sh _CF_DIR_ > TEMPFILE)dnl
 ifdef(`_NO_MAKEINFO_',, `include(TEMPFILE)')dnl
diff --git a/contrib/sendmail/cf/m4/proto.m4 b/contrib/sendmail/cf/m4/proto.m4
index 4089bf6a0350..696bf36a5357 100644
--- a/contrib/sendmail/cf/m4/proto.m4
+++ b/contrib/sendmail/cf/m4/proto.m4
@@ -149,7 +149,7 @@ DL`'LUSER_RELAY',
 `dnl')
 
 # operators that cannot be in local usernames (i.e., network indicators)
-CO @ % ifdef(`_NO_UUCP_', `', `!')
+CO @ ifdef(`_NO_PERCENTHACK_', `', `%') ifdef(`_NO_UUCP_', `', `!')
 
 # a class with just dot (for identifying canonical names)
 C..
@@ -326,6 +326,9 @@ _OPTION(SingleThreadDelivery, `confSINGLE_THREAD_DELIVERY', `False')
 # use Errors-To: header?
 _OPTION(UseErrorsTo, `confUSE_ERRORS_TO', `False')
 
+# use compressed IPv6 address format?
+_OPTION(UseCompressedIPv6Addresses, `confUSE_COMPRESSED_IPV6_ADDRESSES', `')
+
 # log level
 _OPTION(LogLevel, `confLOG_LEVEL', `10')
 
@@ -387,6 +390,9 @@ _OPTION(QueueSortOrder, `confQUEUE_SORT_ORDER', `priority')
 # minimum time in queue before retry
 _OPTION(MinQueueAge, `confMIN_QUEUE_AGE', `30m')
 
+# maximum time in queue before retry (if > 0; only for exponential delay)
+_OPTION(MaxQueueAge, `confMAX_QUEUE_AGE', `')
+
 # how many jobs can you process in the queue?
 _OPTION(MaxQueueRunSize, `confMAX_QUEUE_RUN_SIZE', `0')
 
@@ -641,6 +647,12 @@ _OPTION(AuthMaxBits, `confAUTH_MAX_BITS', `')
 # SMTP STARTTLS server options
 _OPTION(TLSSrvOptions, `confTLS_SRV_OPTIONS', `')
 
+# SSL cipherlist
+_OPTION(CipherList, `confCIPHER_LIST', `')
+# server side SSL options
+_OPTION(ServerSSLOptions, `confSERVER_SSL_OPTIONS', `')
+# client side SSL options
+_OPTION(ClientSSLOptions, `confCLIENT_SSL_OPTIONS', `')
 
 # Input mail filters
 _OPTION(InputMailFilters, `confINPUT_MAIL_FILTERS', `')
@@ -674,6 +686,8 @@ _OPTION(CRLFile, `confCRL', `')
 _OPTION(DHParameters, `confDH_PARAMETERS', `')
 # Random data source (required for systems without /dev/urandom under OpenSSL)
 _OPTION(RandFile, `confRAND_FILE', `')
+# fingerprint algorithm (digest) to use for the presented cert
+_OPTION(CertFingerprintAlgorithm, `confCERT_FINGERPRINT_ALGORITHM', `')
 
 # Maximum number of "useless" commands before slowing down
 _OPTION(MaxNOOPCommands, `confMAX_NOOP_COMMANDS', `20')
@@ -681,6 +695,10 @@ _OPTION(MaxNOOPCommands, `confMAX_NOOP_COMMANDS', `20')
 # Name to use for EHLO (defaults to $j)
 _OPTION(HeloName, `confHELO_NAME')
 
+ifdef(`_NEED_SMTPOPMODES_', `dnl
+# SMTP operation modes
+C{SMTPOpModes} s d D')
+
 ############################
 `# QUEUE GROUP DEFINITIONS  #'
 ############################
@@ -808,9 +826,11 @@ R$- :: $+		$@ $>Canonify2 $2 < @ $1 .DECNET >	resolve DECnet names
 R$- . $- :: $+		$@ $>Canonify2 $3 < @ $1.$2 .DECNET >	numeric DECnet addr
 ',
 	`dnl')
-# if we have % signs, take the rightmost one
+ifdef(`_NO_PERCENTHACK_', `dnl',
+`# if we have % signs, take the rightmost one
 R$* % $*		$1 @ $2				First make them all @s.
 R$* @ $* @ $*		$1 % $2 @ $3			Undo all but the last.
+')
 R$* @ $*		$@ $>Canonify2 $1 < @ $2 >	Insert < > and finish
 
 # else we must be a local name
@@ -1036,6 +1056,13 @@ R$* $=O $* < @ *LOCAL* >
 			$@ $>Parse0 $>canonify $1 $2 $3	...@*LOCAL* -> ...
 R$* < @ *LOCAL* >	$: $1
 
+ifdef(`_ADD_BCC_', `dnl
+R$+			$: $>ParseBcc $1', `dnl')
+ifdef(`_PREFIX_MOD_', `dnl
+dnl do this only for addr_type=e r?
+R _PREFIX_MOD_ $+	$: $1 $(macro {rcpt_flags} $@ _PREFIX_FLAGS_ $)
+')dnl
+
 #
 #  Parse1 -- the bottom half of ruleset 0.
 #
@@ -1198,6 +1225,13 @@ ifdef(`_MAILER_smtp_',
 R$=L			$#_LOCAL_ $: @ $1		special local names
 R$+			$#_LOCAL_ $: $1			regular local names
 
+ifdef(`_ADD_BCC_', `dnl
+SParseBcc
+R$+			$: $&{addr_type} $| $&A $| $1
+Re b $| $+ $| $+	$>MailerToTriple < $1 > $2	copy?
+R$* $| $* $| $+		$@ $3				no copy
+')
+
 ###########################################################################
 ###   Ruleset 5 -- special rewriting after aliases have been expanded   ###
 ###########################################################################
@@ -1457,9 +1491,6 @@ ifdef(`_LDAP_ROUTING_', `dnl
 ###		Parsed address (user < @ domain . >)
 ######################################################################
 
-# SMTP operation modes
-C{SMTPOpModes} s d D
-
 SLDAPExpand
 # do the LDAP lookups
 R<$+><$+><$*>	$: <$(ldapmra $2 $: $)> <$(ldapmh $2 $: $)> <$1> <$2> <$3>
@@ -1861,6 +1892,10 @@ R$* $| $*		$: $2
 R<@> < $* @ localhost >	$: < ? $&{client_name} > < $1 @ localhost >
 R<@> < $* @ [127.0.0.1] >
 			$: < ? $&{client_name} > < $1 @ [127.0.0.1] >
+R<@> < $* @ [IPv6:0:0:0:0:0:0:0:1] >
+			$: < ? $&{client_name} > < $1 @ [IPv6:0:0:0:0:0:0:0:1] >
+R<@> < $* @ [IPv6:::1] >
+			$: < ? $&{client_name} > < $1 @ [IPv6:::1] >
 R<@> < $* @ localhost.$m >
 			$: < ? $&{client_name} > < $1 @ localhost.$m >
 ifdef(`_NO_UUCP_', `dnl',
@@ -2137,6 +2172,9 @@ dnl workspace: localpart<@domain> | localpart
 ifelse(defn(`_NO_UUCP_'), `r',
 `R$* ! $* < @ $* >	$:  $2 < @ BANG_PATH >
 R$* ! $* 		$:  $2 < @ BANG_PATH >', `dnl')
+ifelse(defn(`_NO_PERCENTHACK_'), `r',
+`R$* % $* < @ $* >	$:  $1 < @ PERCENT_HACK >
+R$* % $* 		$:  $1 < @ PERCENT_HACK >', `dnl')
 # anything terminating locally is ok
 ifdef(`_RELAY_ENTIRE_DOMAIN_', `dnl
 R$+ < @ $* $=m >	$@ RELAY', `dnl')
@@ -2217,6 +2255,8 @@ R$*			$: $&{client_addr}
 R$@			$@ RELAY		originated locally
 R0			$@ RELAY		originated locally
 R127.0.0.1		$@ RELAY		originated locally
+RIPv6:0:0:0:0:0:0:0:1	$@ RELAY		originated locally
+dnl if compiled with IPV6_FULL=0
 RIPv6:::1		$@ RELAY		originated locally
 R$=R $*			$@ RELAY		relayable IP address
 ifdef(`_ACCESS_TABLE_', `dnl
@@ -2889,6 +2929,26 @@ R$-:$-:$-	$: $2
 dnl endif _ACCESS_TABLE_
 divert(0)
 
+ifdef(`_TLS_SESSION_FEATURES_', `dnl
+Stls_srv_features
+ifdef(`_ACCESS_TABLE_', `dnl
+R$* $| $*		$: $>D <$1>   <$2>
+R <$*> 		$: $>A <$1>   <$1>
+R <$*> 		$@ ""
+R<$+> <$*> 		$@ $1
+', `dnl
+R$* 		$@ ""')
+
+Stls_clt_features
+ifdef(`_ACCESS_TABLE_', `dnl
+R$* $| $*		$: $>D <$1>   <$2>
+R <$*> 		$: $>A <$1>   <$1>
+R <$*> 		$@ ""
+R<$+> <$*> 		$@ $1
+', `dnl
+R$* 		$@ ""')
+')
+
 ######################################################################
 ###  RelayTLS: allow relaying based on TLS authentication
 ###
diff --git a/contrib/sendmail/cf/m4/version.m4 b/contrib/sendmail/cf/m4/version.m4
index 31f6ffeac385..8d2680534a4a 100644
--- a/contrib/sendmail/cf/m4/version.m4
+++ b/contrib/sendmail/cf/m4/version.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2014 Proofpoint, Inc. and its suppliers.
+# Copyright (c) 1998-2015 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -11,8 +11,8 @@ divert(-1)
 # the sendmail distribution.
 #
 #
-VERSIONID(`$Id: version.m4,v 8.236 2013-11-27 00:38:51 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.237 2014-01-27 12:55:17 ca Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.14.9`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.15.2`'ifdef(`confCF_VERSION', `/confCF_VERSION')
diff --git a/contrib/sendmail/contrib/AuthRealm.p0 b/contrib/sendmail/contrib/AuthRealm.p0
new file mode 100644
index 000000000000..1ba8f58057fc
--- /dev/null
+++ b/contrib/sendmail/contrib/AuthRealm.p0
@@ -0,0 +1,44 @@
+Patch from John Marshall (slightly modified).
+
+diff --git a/sendmail/srvrsmtp.c b/sendmail/srvrsmtp.c
+index 7dba983..bf804ab 100644
+--- a/sendmail/srvrsmtp.c
++++ b/sendmail/srvrsmtp.c
+@@ -84,7 +84,7 @@ static int reset_saslconn __P((sasl_conn_t **_conn, char *_hostname,
+ # define RESET_SASLCONN	\
+ 	do							\
+ 	{							\
+-		result = reset_saslconn(&conn, AuthRealm, remoteip, \
++		result = reset_saslconn(&conn, hostname, remoteip, \
+ 					localip, auth_id, &ext_ssf); \
+ 		if (result != SASL_OK)				\
+ 			sasl_ok = false;			\
+@@ -938,8 +938,6 @@ smtp(nullserver, d_flags, e)
+ 	e->e_features = features;
+ 	hostname = macvalue('j', e);
+ #if SASL
+-	if (AuthRealm == NULL)
+-		AuthRealm = hostname;
+ 	sasl_ok = bitset(SRV_OFFER_AUTH, features);
+ 	n_mechs = 0;
+ 	authenticating = SASL_NOT_AUTH;
+@@ -948,8 +946,8 @@ smtp(nullserver, d_flags, e)
+ 	if (sasl_ok)
+ 	{
+ # if SASL >= 20000
+-		result = sasl_server_new("smtp", AuthRealm, NULL, NULL, NULL,
+-					 NULL, 0, &conn);
++		result = sasl_server_new("smtp", hostname, AuthRealm, NULL,
++					 NULL, NULL, 0, &conn);
+ # elif SASL > 10505
+ 		/* use empty realm: only works in SASL > 1.5.5 */
+ 		result = sasl_server_new("smtp", AuthRealm, "", NULL, 0, &conn);
+@@ -5392,7 +5390,7 @@ reset_saslconn(sasl_conn_t **conn, char *hostname,
+ 
+ 	sasl_dispose(conn);
+ # if SASL >= 20000
+-	result = sasl_server_new("smtp", hostname, NULL, NULL, NULL,
++	result = sasl_server_new("smtp", hostname, AuthRealm, NULL, NULL,
+ 				 NULL, 0, conn);
+ # elif SASL > 10505
+ 	/* use empty realm: only works in SASL > 1.5.5 */
diff --git a/contrib/sendmail/doc/op/op.me b/contrib/sendmail/doc/op/op.me
index 7534667ddf7b..57e25cd0940f 100644
--- a/contrib/sendmail/doc/op/op.me
+++ b/contrib/sendmail/doc/op/op.me
@@ -93,7 +93,7 @@ Version \\$2
 .Ve $Revision: 8.759 $
 .rm Ve
 .sp
-For Sendmail Version 8.14
+For Sendmail Version 8.15
 .)l
 .(f
 Sendmail is a trademark of Proofpoint, Inc.
@@ -3262,6 +3262,8 @@ to program and files.
 Accept a group-readable key file for STARTTLS.
 .ip GroupReadableSASLDBFile
 Accept a group-readable Cyrus SASL password file.
+.ip GroupReadableDefaultAuthInfoFile
+Accept a group-readable DefaultAuthInfo file for SASL.
 .ip GroupWritableAliasFile
 Allow group-writable alias files.
 .ip GroupWritableDirPathSafe
@@ -4481,8 +4483,76 @@ ruleset is called when sendmail connects to another MTA.
 If the ruleset does resolve to the
 .q error
 mailer, sendmail does not try STARTTLS even if it is offered.
-This is useful to interact with MTAs that have broken
-STARTTLS implementations by simply not using it.
+This is useful to deal with STARTTLS interoperability issues
+by simply not using it.
+.sh 4 "tls_srv_features and tls_clt_features"
+.pp
+The
+.i tls_clt_features
+ruleset is called when sendmail connects to another MTA
+and the
+.i tls_srv_features
+ruleset is called when a client connects to
+.i sendmail .
+The arguments for the rulesets are the host name and IP address
+of the other side separated by
+.b $|
+(which is a metacharacter).
+They should return a list of
+.i key=value
+pairs separated by semicolons;
+the list can be empty if no options should be applied to the connection.
+Available keys are and their allowed values are:
+.nr ii 0.2i
+.ip Options
+A comma separated list of SSL related options.
+See
+.i ServerSSLOptions
+and
+.i ClientSSLOptions
+for details, as well as
+.i SSL_set_options (3)
+and note this warning:
+Options already set before are not cleared!
+.ip CipherList
+Specify cipher list for STARTTLS,
+see
+.i ciphers (1)
+for possible values.
+This overrides the global
+.i CipherList
+for the session.
+.ip CertFile
+File containing a certificate.
+.ip KeyFile
+File containing the private key for the certificate.
+.lp
+.lp
+Example:
+.(b
+.ta 1.5i
+Stls_srv_features
+R$* $| 10.$+		$: cipherlist=HIGH
+.)b
+.lp
+Notes:
+.pp
+Errors in these features (e.g., unknown keys or invalid values)
+are logged
+and the current session is aborted to avoid using STARTTLS
+with features that should have been changed.
+.pp
+The keys are case-insensitive.
+.pp
+Both
+.i CertFile
+and
+.i KeyFile
+must be specified together;
+specifying only one is an error.
+.pp
+These rulesets require the sendmail binary to be built with _FFR_TLS_SE_OPTS
+enabled (see the "For Future Release" section).
 .sh 4 "authinfo"
 .pp
 The
@@ -4870,12 +4940,28 @@ used for the security layer of a SASL mechanism.
 The message body type
 (7BIT or 8BITMIME),
 as determined from the envelope.
+.ip ${cert_fp}
+The fingerprint of the presented certificate (STARTTLS only).
+Note: this macro is only defined if the option
+.b CertFingerprintAlgorithm
+is set,
+in which case the specified fingerprint algorithm is used.
+The valid algorithms depend on the OpenSSL version,
+but usually md5, sha1, and sha256 are available.
+See
+.(b
+openssl dgst -h
+.)b
+for a list.
 .ip ${cert_issuer}
 The DN (distinguished name) of the CA (certificate authority)
 that signed the presented certificate (the cert issuer)
 (STARTTLS only).
 .ip ${cert_md5}
 The MD5 hash of the presented certificate (STARTTLS only).
+Note: this macro is only defined if the option
+.b CertFingerprintAlgorithm
+is not set.
 .ip ${cert_subject}
 The DN of the presented certificate (called the cert subject)
 (STARTTLS only).
@@ -5756,6 +5842,8 @@ for this mailer.
 .ip i
 Do User Database rewriting on envelope sender address.
 .ip I
+This flag is deprecated
+and will be removed from a future version.
 This mailer will be speaking SMTP
 to another
 .i sendmail
@@ -6534,6 +6622,7 @@ The authentication realm that is passed to the Cyrus SASL library.
 If no realm is specified,
 .b $j
 is used.
+See also KNOWNBUGS.
 .ip BadRcptThrottle=\fIN\fP
 [no short name]
 If set and the specified number of recipients in a single SMTP
@@ -6554,6 +6643,22 @@ as filenames (or as links to them).
 [no short name]
 File containing one or more CA certificates;
 see section about STARTTLS for more information.
+.ip CertFingerprintAlgorithm
+Specify the fingerprint algorithm (digest) to use for the presented cert.
+If the option is not set,
+md5 is used and the macro
+.p ${cert_md5}
+contains the cert fingerprint.
+If the option is explicitly set,
+the specified algorithm (e.g., sha1) is used
+and the macro
+.b ${cert_fp}
+contains the cert fingerprint.
+.ip CipherList
+Specify cipher list for STARTTLS.
+See
+.i ciphers (1)
+for possible values.
 .ip CheckAliases
 [n]
 Validate the RHS of aliases when rebuilding the alias database.
@@ -6636,6 +6741,24 @@ in order to give settings for each protocol family
 (e.g., one for Family=inet and one for Family=inet6).
 A restriction placed on one family only affects
 outgoing connections on that particular family.
+.ip ClientSSLOptions
+A space or comma separated list of SSL related options for the client side.
+See
+.i SSL_CTX_set_options (3)
+for a list;
+the available values depend on the OpenSSL version against which
+.i sendmail
+is compiled.
+By default,
+.i SSL_OP_ALL
+.i SSL_OP_NO_SSLv2
+.i SSL_OP_NO_TICKET
+.i -SSL_OP_TLSEXT_PADDING
+are used
+(if those options are available).
+Options can be cleared by preceeding them with a minus sign.
+It is also possible to specify numerical values, e.g.,
+.b -0x0010 .
 .ip ColonOkInAddr
 [no short name]
 If set, colons are acceptable in e-mail addresses
@@ -6732,26 +6855,35 @@ CRL checking requires at least OpenSSL version 0.9.7.
 Note: if a CRLFile is specified but the file is unusable,
 STARTTLS is disabled.
 .ip DHParameters
+This option applies to the server side only.
 Possible values are:
 .(b
-.ta 1i
-5	use precomputed 512 bit prime
+.ta 2i
+5	use precomputed 512 bit prime.
 1	generate 1024 bit prime
-2	generate 2048 bit prime
-none	do not use Diffie-Hellman
-NAME	load prime from file
+2	generate 2048 bit prime.
+i	use included precomputed 2048 bit prime (default).
+none	do not use Diffie-Hellman.
+/path/to/file	load prime from file.
 .)b
 This is only required if a ciphersuite containing DSA/DH is used.
+The default is ``i'' which selects a precomputed, fixed 2048 bit prime.
 If ``5'' is selected, then precomputed, fixed primes are used.
-This is the default for the client side.
+Note: this option should not be used
+(unless necessary for compatibility with old implementations).
 If ``1'' or ``2'' is selected, then prime values are computed during startup.
-The server side default is ``1''.
 Note: this operation can take a significant amount of time on a
 slow machine (several seconds), but it is only done once at startup.
 If ``none'' is selected, then TLS ciphersuites containing DSA/DH
 cannot be used.
 If a file name is specified (which must be an absolute path),
 then the primes are read from it.
+It is recommended to generate such a file using a command like this:
+.(b
+	openssl dhparam -out /etc/mail/dhparams.pem 2048
+.)b
+If the file is not readable or contains unusable data,
+the default ``i'' is used instead.
 .ip DaemonPortOptions=\fIoptions\fP
 [O]
 Set server SMTP options.
@@ -6784,8 +6916,10 @@ The
 key is used for error messages and logging.
 The
 .i Addr ess
-mask may be a numeric address in IPv4 dot notation or IPv6 colon notation
-or a network name.
+mask may be
+a numeric address in IPv4 dot notation or IPv6 colon notation,
+or a network name,
+or a path to a local socket.
 Note that if a network name is specified,
 only the first IP address returned for it will be used.
 This may cause indeterminate behavior for network names
@@ -6798,6 +6932,10 @@ IPv6 users who wish to also accept IPv6 connections
 should add additional Family=inet6
 .b DaemonPortOptions
 lines.
+For a local socket, use
+Family=local
+or
+Family=unix.
 The
 .i InputMailFilters
 key overrides the default list of input mail filters listed in the
@@ -7543,6 +7681,13 @@ If there is insufficient space
 gives a 452 response
 to the MAIL command.
 This invites the sender to try again later.
+.ip MaxQueueAge=\fIage\fP
+[no short name]
+If this is set to a value greater than zero,
+entries in the queue will be retried during a queue run
+only if the individual retry time has been reached
+which is doubled for each attempt.
+The maximum retry time is limited by the specified value.
 .ip MinQueueAge=\fIage\fP
 [no short name]
 Don't process any queued jobs
@@ -8031,6 +8176,22 @@ is used when sendmail acts as server
 [no short name]
 File containing the private key belonging to the server certificate
 (used for STARTTLS).
+.ip ServerSSLOptions
+A space or comma separated list of SSL related options for the server side.
+See
+.i SSL_CTX_set_options (3)
+for a list;
+the available values depend on the OpenSSL version against which
+.i sendmail
+is compiled.
+By default,
+.i SSL_OP_ALL
+.i -SSL_OP_TLSEXT_PADDING
+are used
+(if those options are available).
+Options can be cleared by preceeding them with a minus sign.
+It is also possible to specify numerical values, e.g.,
+.b -0x0010 .
 .ip ServiceSwitchFile=\fIfilename\fP
 [no short name]
 If your host operating system has a service switch abstraction
@@ -8186,7 +8347,11 @@ consisting of single characters
 with intervening white space or commas.
 The flag ``V'' disables client verification, and hence
 it is not possible to use a client certificate for relaying.
-Currently there are no other flags available.
+The flag ``C'' removes the requirement for the TLS server
+to have a cert.
+This only works under very specific circumstances
+and should only be used if the consequences are understood,
+e.g., clients may not work with a server using this.
 .ip TempFileMode=\fImode\fP
 [F]
 The file mode for transcript files, files to which
@@ -8272,6 +8437,12 @@ are always unsafe.
 Note: use
 .b DontBlameSendmail
 instead; this option is deprecated.
+.ip UseCompressedIPv6Addresses
+[no short name]
+If set, the compressed format of IPv6 addresses,
+such as IPV6:::1, will be used,
+instead of the uncompressed format,
+such as IPv6:0:0:0:0:0:0:0:1.
 .ip UseErrorsTo
 [l]
 If there is an
@@ -8786,6 +8957,31 @@ A, AAAA, AFSDB, CNAME, MX, NS, PTR, SRV, and TXT.
 A map lookup will return only one record.
 Hence for some types, e.g., MX records, the return value might be a random
 element of the list due to randomizing in the DNS resolver.
+.ip arpa
+Returns the ``reverse'' for the given IP (IPv4 or IPv6) address,
+i.e., the string for the PTR lookup,
+but without trailing
+.b ip6.arpa
+or
+.b in-addr.arpa .
+For example, the following configuration lines:
+.(b
+Karpa arpa
+SArpa
+R$+	$: $(arpa $1 $)
+.)b 
+work like this in test mode:
+.(b
+sendmail -bt
+ADDRESS TEST MODE (ruleset 3 NOT automatically invoked)
+Enter  
        
+> Arpa IPv6:1:2:dead:beef:9876:0:0:1
+Arpa               input: IPv6 : 1 : 2 : dead : beef : 9876 : 0 : 0 : 1
+Arpa             returns: 1 . 0 . 0 . 0 . 0 . 0 . 0 . 0 . 0 . 0 . 0 . 0 . 6 . 7 . 8 . 9 . f . e . e . b . d . a . e . d . 2 . 0 . 0 . 0 . 1 . 0 . 0 . 0
+> Arpa 1.2.3.4
+Arpa               input: 1 . 2 . 3 . 4
+Arpa             returns: 4 . 3 . 2 . 1
+.)b
 .ip sequence
 The arguments on the `K' line are a list of maps;
 the resulting map searches the argument maps in order
@@ -9211,6 +9407,11 @@ The dns map has another flag:
 .ip "\-B"
 basedomain: specify a domain that is always appended to queries.
 .pp
+Socket maps have an optional flag:
+.ip "\-d"
+timeout: specify the timeout (in seconds) for communication
+with the socket map server.
+.pp
 The following additional flags are present in the ldap map only:
 .ip "\-R"
 Do not auto chase referrals.  sendmail must be compiled with
@@ -9851,6 +10052,26 @@ and
 .q _SCO_unix_ .
 See the sendmail/README
 file for the latest scoop on these flags.
+.sh 3 "For Future Releases"
+.pp
+.i sendmail
+often contains compile time options
+.i "For Future Releases"
+(prefix _FFR_)
+which might be enabled in a subsequent version
+or might simply be removed as they turned out not to be really useful.
+These features are usually not documented but if they are,
+then the required (FFR) compile
+time options are listed here for rulesets and macros,
+and in
+.i cf/README
+for mc/cf options.
+FFR compile times options must be enabled when the sendmail binary
+is built from source.
+Enabled FFRs in a binary can be listed with
+.(b
+sendmail -d0.13 < /dev/null | grep FFR
+.)b
 .sh 2 "Parameters in sendmail/conf.h"
 .pp
 Parameters and compilation options
@@ -10653,7 +10874,7 @@ one as certificate for the server (ServerCertFile and corresponding
 private ServerKeyFile)
 at least one root CA (CACertFile),
 i.e., a certificate that is used to sign other certificates,
-and a path to a directory which contains other CAs (CACertPath).
+and a path to a directory which contains (zero or more) other CAs (CACertPath).
 The file specified via
 CACertFile
 can contain several certificates of CAs.
@@ -10699,6 +10920,19 @@ To allow for automatic startup of sendmail, private keys
 must be stored unencrypted.
 The keys are only protected by the permissions of the file system.
 Never make a private key available to a third party.
+.pp
+The options
+.i ClientCertFile ,
+.i ClientKeyFile ,
+.i ServerCertFile ,
+and
+.i ServerKeyFile
+can take a second file name,
+which must be separated from the first with a comma
+(note: do not use any spaces)
+to set up a second cert/key pair.
+This can be used to have certs of different types,
+e.g., RSA and DSA.
 .sh 3 "PRNG for STARTTLS"
 .pp
 STARTTLS requires a strong pseudo random number generator (PRNG)
@@ -10883,6 +11117,7 @@ Operation modes are:
 m	Deliver mail (default)
 s	Speak SMTP on input side
 a\(dg	``Arpanet'' mode (get envelope sender information from header)
+C	Check the configuration file
 d	Run as a daemon in background
 D	Run as a daemon in foreground
 t	Run in test mode
diff --git a/contrib/sendmail/editmap/editmap.c b/contrib/sendmail/editmap/editmap.c
index 3c1b8b9a8c5a..66ee5793d5d7 100644
--- a/contrib/sendmail/editmap/editmap.c
+++ b/contrib/sendmail/editmap/editmap.c
@@ -76,7 +76,6 @@ main(argc, argv)
 {
 	char *progname;
 	char *cfile;
-	bool verbose = false;
 	bool query = false;
 	bool update = false;
 	bool remove = false;
@@ -131,7 +130,7 @@ main(argc, argv)
 	(void) sm_strlcpy(user_info.smdbu_name, RunAsUserName,
 			  SMDB_MAX_USER_NAME_LEN);
 
-#define OPTIONS		"C:fquxvN"
+#define OPTIONS		"C:fquxN"
 	while ((opt = getopt(argc, argv, OPTIONS)) != -1)
 	{
 		switch (opt)
@@ -159,10 +158,6 @@ main(argc, argv)
 			nops++;
 			break;
 
-		  case 'v':
-			verbose = true;
-			break;
-
 		  case 'N':
 			inclnull = true;
 			break;
diff --git a/contrib/sendmail/include/sendmail/sendmail.h b/contrib/sendmail/include/sendmail/sendmail.h
index fbd85d3b1f9d..c79072299b60 100644
--- a/contrib/sendmail/include/sendmail/sendmail.h
+++ b/contrib/sendmail/include/sendmail/sendmail.h
@@ -117,9 +117,7 @@ extern bool	filechanged __P((char *, int, struct stat *));
 #define DBS_WORLDWRITABLEFORWARDFILE			39
 #define DBS_WORLDWRITABLEINCLUDEFILE			40
 #define DBS_GROUPREADABLEKEYFILE			41
-#if _FFR_GROUPREADABLEAUTHINFOFILE
-# define DBS_GROUPREADABLEAUTHINFOFILE			42
-#endif /* _FFR_GROUPREADABLEAUTHINFOFILE */
+#define DBS_GROUPREADABLEAUTHINFOFILE			42
 
 /* struct defining such things */
 struct dbsval
diff --git a/contrib/sendmail/include/sm/bdb.h b/contrib/sendmail/include/sm/bdb.h
index a8a977a82947..893d815229fe 100644
--- a/contrib/sendmail/include/sm/bdb.h
+++ b/contrib/sendmail/include/sm/bdb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003 Proofpoint, Inc. and its suppliers.
+ * Copyright (c) 2002, 2003, 2014 Proofpoint, Inc. and its suppliers.
  *	All rights reserved.
  *
  * By using this file, you agree to the terms and conditions set
@@ -19,7 +19,7 @@
 #  define DB_VERSION_MAJOR 1
 # endif /* ! DB_VERSION_MAJOR */
 
-# if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
+# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
 
 #  define DBTXN	NULL ,
 
@@ -32,7 +32,7 @@
 
 #  define SM_DB_FLAG_ADD(flag)	(flag) |= DB_FCNTL_LOCKING
 
-# else /* DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 */
+# else /* (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 */
 
 #  define DBTXN
 #  if !HASFLOCK && defined(DB_FCNTL_LOCKING)
@@ -41,7 +41,7 @@
 #   define SM_DB_FLAG_ADD(flag)	((void) 0)
 #  endif /* !HASFLOCK && defined(DB_FCNTL_LOCKING) */
 
-# endif /* DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 */
+# endif /* (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 */
 #endif /* NEWDB */
 
 #endif /* ! SM_BDB_H */
diff --git a/contrib/sendmail/include/sm/cdefs.h b/contrib/sendmail/include/sm/cdefs.h
index d288aa0f71cf..0802d5941c97 100644
--- a/contrib/sendmail/include/sm/cdefs.h
+++ b/contrib/sendmail/include/sm/cdefs.h
@@ -121,11 +121,11 @@
 */
 
 # ifndef SM_CONF_FORMAT_TEST
-#  if __GNUC__ == 2 && __GNUC_MINOR__ >= 7
+#  if (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) || __GNUC__ > 2
 #   define SM_CONF_FORMAT_TEST	1
-#  else /* __GNUC__ == 2 && __GNUC_MINOR__ >= 7 */
+#  else
 #   define SM_CONF_FORMAT_TEST	0
-#  endif /* __GNUC__ == 2 && __GNUC_MINOR__ >= 7 */
+#  endif
 # endif /* SM_CONF_FORMAT_TEST */
 
 # ifndef PRINTFLIKE
diff --git a/contrib/sendmail/include/sm/conf.h b/contrib/sendmail/include/sm/conf.h
index bea380aad494..459eda4cc7d9 100644
--- a/contrib/sendmail/include/sm/conf.h
+++ b/contrib/sendmail/include/sm/conf.h
@@ -473,6 +473,9 @@ typedef int		pid_t;
 #   ifndef HASGETUSERSHELL
 #    define HASGETUSERSHELL 0	/* getusershell(3) causes core dumps pre-2.7 */
 #   endif /* ! HASGETUSERSHELL */
+#   if SOLARIS < 21200
+#    define SIGWAIT_TAKES_1_ARG	1	/* S12 moves to UNIX V7 semantic */
+#   endif /* SOLARIS < 21200 */
 
 #  else /* SOLARIS */
 			/* SunOS 4.0.3 or 4.1.x */
@@ -1906,6 +1909,7 @@ extern struct passwd *	sendmail_mpe_getpwuid __P((uid_t));
 #  define GIDSET_T		gid_t
 #  define SOCKADDR_LEN_T	size_t
 #  define SOCKOPT_LEN_T		size_t
+#  define SIGWAIT_TAKES_1_ARG	1
 #  ifndef _PATH_UNIX
 #   define _PATH_UNIX		"/stand/unix"
 #  endif /* ! _PATH_UNIX */
@@ -2920,6 +2924,10 @@ typedef void		(*sigfunc_t) __P((int));
 # define FD_SETSIZE	256
 #endif /* ! FD_SETSIZE */
 
+#ifndef SIGWAIT_TAKES_1_ARG
+# define SIGWAIT_TAKES_1_ARG	0
+#endif /* ! SIGWAIT_TAKES_1_ARG */
+
 /*
 **  Size of prescan buffer.
 **	Despite comments in the _sendmail_ book, this probably should
@@ -2970,6 +2978,12 @@ typedef void		(*sigfunc_t) __P((int));
 #  define SM_UINT16	uint16_t
 # endif /* ! SM_UINT16 */
 
+/* additional valid chars in user/group names in passwd */
+# ifndef SM_PWN_CHARS
+#  define SM_PWN_CHARS "-_."
+# endif
+
+
 /*
 **  SVr4 and similar systems use different routines for setjmp/longjmp
 **  with signal support
diff --git a/contrib/sendmail/include/sm/errstring.h b/contrib/sendmail/include/sm/errstring.h
index 836fe14f70c4..14c100773202 100644
--- a/contrib/sendmail/include/sm/errstring.h
+++ b/contrib/sendmail/include/sm/errstring.h
@@ -49,9 +49,17 @@ extern int errno;
 #define E_SM_WRFILE	(E_PSEUDOBASE + 11)	/* o readable file */
 #define E_DNSBASE	(E_PSEUDOBASE + 20)	/* base for DNS h_errno */
 #define E_SMDBBASE	(E_PSEUDOBASE + 40)	/* base for libsmdb errors */
-#define E_LDAPBASE	(E_PSEUDOBASE + 70)	/* base for LDAP errors */
-#define E_LDAPURLBASE	(E_PSEUDOBASE + 200)	/* base for LDAP URL errors */
+#define E_LDAPREALBASE	(E_PSEUDOBASE + 70)	/* start of range for LDAP */
+#define E_LDAPBASE	(E_LDAPREALBASE + E_LDAP_SHIM)	/* LDAP error zero */
+#define E_LDAPURLBASE	(E_PSEUDOBASE + 230)	/* base for LDAP URL errors */
 
+/*
+**  OpenLDAP uses small negative errors for internal (non-protocol)
+**  errors.  We expect them to be between zero and -E_LDAP_SHIM
+**  (and then offset by E_LDAPBASE).
+*/
+
+#define E_LDAP_SHIM	30
 
 /* libsmdb */
 #define SMDBE_OK			0
diff --git a/contrib/sendmail/include/sm/fdset.h b/contrib/sendmail/include/sm/fdset.h
index 8a5a1d4db453..b4a1e7dec87b 100644
--- a/contrib/sendmail/include/sm/fdset.h
+++ b/contrib/sendmail/include/sm/fdset.h
@@ -17,9 +17,9 @@
 **	before.
 */
 
-#  define SM_FD_SET(fd, pfdset)		FD_SET(fd, pfdset)
-#  define SM_FD_ISSET(fd, pfdset)	FD_ISSET(fd, pfdset)
-#  define SM_FD_SETSIZE			FD_SETSIZE
-#  define SM_FD_OK_SELECT(fd)		(FD_SETSIZE <= 0 || (fd) < FD_SETSIZE)
+#define SM_FD_SET(fd, pfdset)	FD_SET(fd, pfdset)
+#define SM_FD_ISSET(fd, pfdset)	FD_ISSET(fd, pfdset)
+#define SM_FD_SETSIZE		FD_SETSIZE
+#define SM_FD_OK_SELECT(fd)	(SM_FD_SETSIZE <= 0 || (fd) < SM_FD_SETSIZE)
 
 #endif /* SM_FDSET_H */
diff --git a/contrib/sendmail/libmilter/docs/smfi_setsymlist.html b/contrib/sendmail/libmilter/docs/smfi_setsymlist.html
index 1b879c447049..c270d0b5647b 100644
--- a/contrib/sendmail/libmilter/docs/smfi_setsymlist.html
+++ b/contrib/sendmail/libmilter/docs/smfi_setsymlist.html
@@ -62,6 +62,9 @@ milter wants to receive from the MTA.
     macros
 	list of macros (separated by space).
 	Example: "{rcpt_mailer} {rcpt_host}"
+	
        
+	An empty string ("", not NULL) can be used to specify that no macros
+	should be sent.
 	
 
     
@@ -74,7 +77,7 @@ milter wants to receive from the MTA.
 MI_FAILURE is returned if
 
          
 
        • there is not enough free memory to make a copy of the macro list,
-
        • macros is NULL or empty,
+
        • macros is NULL,
 
        • stage is not a valid protocol stage,
 
        • the macro list for
 stage has been set before.
diff --git a/contrib/sendmail/libmilter/engine.c b/contrib/sendmail/libmilter/engine.c
index e557a59ea54f..808ffdbf608a 100644
--- a/contrib/sendmail/libmilter/engine.c
+++ b/contrib/sendmail/libmilter/engine.c
@@ -42,13 +42,8 @@ struct cmdfct_t
 typedef struct cmdfct_t cmdfct;
 
 /* possible values for cm_argt */
-#define	CM_ARG0	0	/* no args */
-#define	CM_ARG1	1	/* one arg (string) */
-#define	CM_ARG2	2	/* two args (strings) */
-#define	CM_ARGA	4	/* one string and _SOCK_ADDR */
-#define	CM_ARGO	5	/* two integers */
-#define	CM_ARGV	8	/* \0 separated list of args, NULL-terminated */
-#define	CM_ARGN	9	/* \0 separated list of args (strings) */
+#define	CM_BUF	0
+#define	CM_NULLOK 1
 
 /* possible values for cm_todo */
 #define	CT_CONT		0x0000	/* continue reading commands */
@@ -200,21 +195,21 @@ static int next_states[] =
 /* commands received by milter */
 static cmdfct cmds[] =
 {
-  {SMFIC_ABORT,	CM_ARG0, ST_ABRT,  CT_CONT,	CI_NONE, st_abortfct	}
-, {SMFIC_MACRO,	CM_ARGV, ST_NONE,  CT_KEEP,	CI_NONE, st_macros	}
-, {SMFIC_BODY,	CM_ARG1, ST_BODY,  CT_CONT,	CI_NONE, st_bodychunk	}
-, {SMFIC_CONNECT, CM_ARG2, ST_CONN,  CT_CONT,	CI_CONN, st_connectinfo	}
-, {SMFIC_BODYEOB, CM_ARG1, ST_ENDM,  CT_CONT,	CI_EOM,  st_bodyend	}
-, {SMFIC_HELO,	CM_ARG1, ST_HELO,  CT_CONT,	CI_HELO, st_helo	}
-, {SMFIC_HEADER, CM_ARG2, ST_HDRS,  CT_CONT,	CI_NONE, st_header	}
-, {SMFIC_MAIL,	CM_ARGV, ST_MAIL,  CT_CONT,	CI_MAIL, st_sender	}
-, {SMFIC_OPTNEG, CM_ARGO, ST_OPTS,  CT_CONT,	CI_NONE, st_optionneg	}
-, {SMFIC_EOH,	CM_ARG0, ST_EOHS,  CT_CONT,	CI_EOH,  st_eoh		}
-, {SMFIC_QUIT,	CM_ARG0, ST_QUIT,  CT_END,	CI_NONE, st_quit	}
-, {SMFIC_DATA,	CM_ARG0, ST_DATA,  CT_CONT,	CI_DATA, st_data	}
-, {SMFIC_RCPT,	CM_ARGV, ST_RCPT,  CT_IGNO,	CI_RCPT, st_rcpt	}
-, {SMFIC_UNKNOWN, CM_ARG1, ST_UNKN,  CT_IGNO,	CI_NONE, st_unknown	}
-, {SMFIC_QUIT_NC, CM_ARG0, ST_Q_NC,  CT_CONT,	CI_NONE, st_quit	}
+  {SMFIC_ABORT,		CM_NULLOK,	ST_ABRT,  CT_CONT,  CI_NONE, st_abortfct}
+, {SMFIC_MACRO,		CM_BUF,		ST_NONE,  CT_KEEP,  CI_NONE, st_macros	}
+, {SMFIC_BODY,		CM_BUF,		ST_BODY,  CT_CONT,  CI_NONE, st_bodychunk}
+, {SMFIC_CONNECT,	CM_BUF,		ST_CONN,  CT_CONT,  CI_CONN, st_connectinfo}
+, {SMFIC_BODYEOB,	CM_NULLOK,	ST_ENDM,  CT_CONT,  CI_EOM,  st_bodyend	}
+, {SMFIC_HELO,		CM_BUF,		ST_HELO,  CT_CONT,  CI_HELO, st_helo	}
+, {SMFIC_HEADER,	CM_BUF,		ST_HDRS,  CT_CONT,  CI_NONE, st_header	}
+, {SMFIC_MAIL,		CM_BUF,		ST_MAIL,  CT_CONT,  CI_MAIL, st_sender	}
+, {SMFIC_OPTNEG,	CM_BUF,		ST_OPTS,  CT_CONT,  CI_NONE, st_optionneg}
+, {SMFIC_EOH,		CM_NULLOK,	ST_EOHS,  CT_CONT,  CI_EOH,  st_eoh	}
+, {SMFIC_QUIT,		CM_NULLOK,	ST_QUIT,  CT_END,   CI_NONE, st_quit	}
+, {SMFIC_DATA,		CM_NULLOK,	ST_DATA,  CT_CONT,  CI_DATA, st_data	}
+, {SMFIC_RCPT,		CM_BUF,		ST_RCPT,  CT_IGNO,  CI_RCPT, st_rcpt	}
+, {SMFIC_UNKNOWN,	CM_BUF,		ST_UNKN,  CT_IGNO,  CI_NONE, st_unknown	}
+, {SMFIC_QUIT_NC,	CM_NULLOK,	ST_Q_NC,  CT_CONT,  CI_NONE, st_quit	}
 };
 
 /*
@@ -390,6 +385,15 @@ mi_engine(ctx)
 				continue;
 			}
 		}
+		if (cmds[i].cm_argt != CM_NULLOK && buf == NULL)
+		{
+			/* stop for now */
+			if (ctx->ctx_dbg > 1)
+				sm_dprintf("[%lu] cmd='%c', buf=NULL\n",
+					(long) ctx->ctx_id, cmd);
+			ret = MI_FAILURE;
+			break;
+		}
 		arg.a_len = len;
 		arg.a_buf = buf;
 		if (newstate != ST_NONE)
@@ -726,7 +730,7 @@ sendreply(r, sd, timeout_ptr, ctx)
 }
 
 /*
-**  CLR_MACROS -- clear set of macros starting from a given index
+**  MI_CLR_MACROS -- clear set of macros starting from a given index
 **
 **	Parameters:
 **		ctx -- context structure
@@ -1816,7 +1820,7 @@ dec_arg2(buf, len, s1, s2)
 }
 
 /*
-**  SENDOK -- is it ok for the filter to send stuff to the MTA?
+**  MI_SENDOK -- is it ok for the filter to send stuff to the MTA?
 **
 **	Parameters:
 **		ctx -- context structure
diff --git a/contrib/sendmail/libmilter/handler.c b/contrib/sendmail/libmilter/handler.c
index 5b4073b8533e..7622839d65e4 100644
--- a/contrib/sendmail/libmilter/handler.c
+++ b/contrib/sendmail/libmilter/handler.c
@@ -15,7 +15,7 @@ SM_RCSID("@(#)$Id: handler.c,v 8.40 2013-11-22 20:51:36 ca Exp $")
 
 #if !_FFR_WORKERS_POOL
 /*
-**  HANDLE_SESSION -- Handle a connected session in its own context
+**  MI_HANDLE_SESSION -- Handle a connected session in its own context
 **
 **	Parameters:
 **		ctx -- context structure
diff --git a/contrib/sendmail/libmilter/listener.c b/contrib/sendmail/libmilter/listener.c
index b0a1362d46cd..11d92bb09fdf 100644
--- a/contrib/sendmail/libmilter/listener.c
+++ b/contrib/sendmail/libmilter/listener.c
@@ -728,6 +728,7 @@ mi_listener(conn, dbg, smfi, timeout, backlog)
 	int acnt = 0;	/* error count for accept() failures */
 	int scnt = 0;	/* error count for select() failures */
 	int save_errno = 0;
+	int fdflags;
 #if !_FFR_WORKERS_POOL
 	sthread_t thread_id;
 #endif /* !_FFR_WORKERS_POOL */
@@ -885,6 +886,20 @@ mi_listener(conn, dbg, smfi, timeout, backlog)
 		}
 #endif /* _FFR_DUP_FD */
 
+ 		/*
+		**  Need to set close-on-exec for connfd in case a user's
+		**  filter starts other applications.
+		**  Note: errors will not stop processing (for now).
+		*/
+
+		if ((fdflags = fcntl(connfd, F_GETFD, 0)) == -1 ||
+		    fcntl(connfd, F_SETFD, fdflags | FD_CLOEXEC) == -1)
+		{
+			smi_log(SMI_LOG_ERR,
+				"%s: Unable to set close-on-exec: %s",
+				smfi->xxfi_name, sm_errstring(errno));
+		}
+
 		if (setsockopt(connfd, SOL_SOCKET, SO_KEEPALIVE,
 				(void *) &sockopt, sizeof sockopt) < 0)
 		{
diff --git a/contrib/sendmail/libmilter/signal.c b/contrib/sendmail/libmilter/signal.c
index 4f8ec6e2d999..8d4c8b2f49a0 100644
--- a/contrib/sendmail/libmilter/signal.c
+++ b/contrib/sendmail/libmilter/signal.c
@@ -104,11 +104,11 @@ mi_signal_thread(name)
 	for (;;)
 	{
 		sigerr = sig = 0;
-#if defined(SOLARIS) || defined(__svr5__)
+#if SIGWAIT_TAKES_1_ARG
 		if ((sig = sigwait(&set)) < 0)
-#else /* defined(SOLARIS) || defined(__svr5__) */
+#else
 		if ((sigerr = sigwait(&set, &sig)) != 0)
-#endif /* defined(SOLARIS) || defined(__svr5__) */
+#endif
 		{
 			/* some OS return -1 and set errno: copy it */
 			if (sigerr <= 0)
diff --git a/contrib/sendmail/libmilter/smfi.c b/contrib/sendmail/libmilter/smfi.c
index 2148f3c18cac..d6c63a2ce800 100644
--- a/contrib/sendmail/libmilter/smfi.c
+++ b/contrib/sendmail/libmilter/smfi.c
@@ -325,7 +325,7 @@ smfi_setsymlist(ctx, where, macros)
 {
 	SM_ASSERT(ctx != NULL);
 
-	if (macros == NULL || *macros == '\0')
+	if (macros == NULL)
 		return MI_FAILURE;
 	if (where < SMFIM_FIRST || where > SMFIM_LAST)
 		return MI_FAILURE;
diff --git a/contrib/sendmail/libmilter/worker.c b/contrib/sendmail/libmilter/worker.c
index 75a1f7caa852..bf7086a95187 100644
--- a/contrib/sendmail/libmilter/worker.c
+++ b/contrib/sendmail/libmilter/worker.c
@@ -254,7 +254,7 @@ nonblocking(int fd, const char *name)
 }
 
 /*
-**  MI_POOL_CONTROLER_INIT -- Launch the worker pool controller
+**  MI_POOL_CONTROLLER_INIT -- Launch the worker pool controller
 **		Must be called before starting sessions.
 **
 **	Parameters:
diff --git a/contrib/sendmail/libsm/Makefile.m4 b/contrib/sendmail/libsm/Makefile.m4
index 3901fe887af5..5882bb63f4e6 100644
--- a/contrib/sendmail/libsm/Makefile.m4
+++ b/contrib/sendmail/libsm/Makefile.m4
@@ -6,7 +6,7 @@ define(`confREQUIRE_LIBSM', `true')
 define(`confREQUIRE_SM_OS_H', `true')
 PREPENDDEF(`confENVDEF', `confMAPDEF')
 bldPRODUCT_START(`library', `libsm')
-define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c inet6_ntop.c ')
+define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c inet6_ntop.c ')
 bldPRODUCT_END
 dnl msg.c
 dnl syslogio.c
diff --git a/contrib/sendmail/libsm/errstring.c b/contrib/sendmail/libsm/errstring.c
index 7233c5a9b3f7..01d5a6419f41 100644
--- a/contrib/sendmail/libsm/errstring.c
+++ b/contrib/sendmail/libsm/errstring.c
@@ -264,10 +264,12 @@ sm_errstring(errnum)
 #if LDAPMAP
 
 	/*
-	**  LDAP error messages.
+	**  LDAP error messages.  Handle small negative errors from
+	**  libldap (in the range -E_LDAP_SHIM to zero, offset by E_LDAPBASE)
+	**  as well.
 	*/
 
-	if (errnum >= E_LDAPBASE)
+	if (errnum >= E_LDAPBASE - E_LDAP_SHIM)
 		return ldap_err2string(errnum - E_LDAPBASE);
 #endif /* LDAPMAP */
 
diff --git a/contrib/sendmail/libsm/local.h b/contrib/sendmail/libsm/local.h
index 8532ad8db6b6..304a52e292ce 100644
--- a/contrib/sendmail/libsm/local.h
+++ b/contrib/sendmail/libsm/local.h
@@ -20,6 +20,7 @@
 */
 
 #include 
+#include 
 #if !SM_CONF_MEMCHR
 # include 
 #endif /* !SM_CONF_MEMCHR */
@@ -244,7 +245,7 @@ int sm_flags __P((int));
 		sm_io_to.tv_sec = (to) / 1000; \
 		sm_io_to.tv_usec = ((to) - (sm_io_to.tv_sec * 1000)) * 1000; \
 	} \
-	if (FD_SETSIZE > 0 && (fd) >= FD_SETSIZE) \
+	if (!SM_FD_OK_SELECT(fd)) \
 	{ \
 		errno = EINVAL; \
 		return SM_IO_EOF; \
diff --git a/contrib/sendmail/libsm/mbdb.c b/contrib/sendmail/libsm/mbdb.c
index d68d3b124923..3d7426cd5315 100644
--- a/contrib/sendmail/libsm/mbdb.c
+++ b/contrib/sendmail/libsm/mbdb.c
@@ -315,7 +315,7 @@ mbdb_pw_lookup(name, user)
 {
 	struct passwd *pw;
 
-#ifdef HESIOD
+#if HESIOD && !HESIOD_ALLOW_NUMERIC_LOGIN
 	/* DEC Hesiod getpwnam accepts numeric strings -- short circuit it */
 	{
 		char *p;
@@ -326,7 +326,7 @@ mbdb_pw_lookup(name, user)
 		if (*p == '\0')
 			return EX_NOUSER;
 	}
-#endif /* HESIOD */
+#endif /* HESIOD && !HESIOD_ALLOW_NUMERIC_LOGIN */
 
 	errno = 0;
 	pw = getpwnam(name);
diff --git a/contrib/sendmail/libsm/path.c b/contrib/sendmail/libsm/path.c
deleted file mode 100644
index 0819c3e08dcf..000000000000
--- a/contrib/sendmail/libsm/path.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
- *	All rights reserved.
- *
- * By using this file, you agree to the terms and conditions set
- * forth in the LICENSE file which can be found at the top level of
- * the sendmail distribution.
- */
-
-#include 
-SM_RCSID("@(#)$Id: path.c,v 1.10 2013-11-22 20:51:43 ca Exp $")
-
-#include 
-#include 
-
diff --git a/contrib/sendmail/libsm/refill.c b/contrib/sendmail/libsm/refill.c
index 43eee97382d7..e13c831bed42 100644
--- a/contrib/sendmail/libsm/refill.c
+++ b/contrib/sendmail/libsm/refill.c
@@ -25,6 +25,7 @@ SM_RCSID("@(#)$Id: refill.c,v 1.54 2013-11-22 20:51:43 ca Exp $")
 #include 
 #include 
 #include 
+#include 
 #include "local.h"
 
 static int sm_lflush __P((SM_FILE_T *, int *));
@@ -65,7 +66,7 @@ static int sm_lflush __P((SM_FILE_T *, int *));
 		errno = EAGAIN;						\
 		return SM_IO_EOF;					\
 	}								\
-	if (FD_SETSIZE > 0 && (fd) >= FD_SETSIZE)			\
+	if (!SM_FD_OK_SELECT(fd))					\
 	{								\
 		errno = EINVAL;						\
 		return SM_IO_EOF;					\
diff --git a/contrib/sendmail/libsm/stdio.c b/contrib/sendmail/libsm/stdio.c
index a13f2ffd6c77..16277c09a8ec 100644
--- a/contrib/sendmail/libsm/stdio.c
+++ b/contrib/sendmail/libsm/stdio.c
@@ -317,7 +317,7 @@ sm_stdsetinfo(fp, what, valp)
 }
 
 /*
-**  SM_GETINFO -- get information about the open file
+**  SM_STDGETINFO -- get information about the open file
 **
 **	Parameters:
 **		fp -- file to get info for
diff --git a/contrib/sendmail/libsm/vfprintf.c b/contrib/sendmail/libsm/vfprintf.c
index 860938d3168d..87c353c1bf14 100644
--- a/contrib/sendmail/libsm/vfprintf.c
+++ b/contrib/sendmail/libsm/vfprintf.c
@@ -156,7 +156,7 @@ sm_bprintf(fp, fmt, ap)
 #define FPT		0x100		/* Floating point number */
 
 /*
-**  SM_IO_VPRINTF -- performs actual formating for o/p
+**  SM_IO_VFPRINTF -- performs actual formating for o/p
 **
 **	Parameters:
 **		fp -- file pointer for o/p
diff --git a/contrib/sendmail/libsmdb/smdb.c b/contrib/sendmail/libsmdb/smdb.c
index 74d42e299139..96473b89b173 100644
--- a/contrib/sendmail/libsmdb/smdb.c
+++ b/contrib/sendmail/libsmdb/smdb.c
@@ -198,12 +198,16 @@ smdb_open_database(database, db_name, mode, mode_mask, sff, type, user_info,
 	SMDB_USER_INFO *user_info;
 	SMDB_DBPARAMS *params;
 {
+#if defined(NEWDB) && defined(NDBM)
 	bool type_was_default = false;
+#endif
 
 	if (type == SMDB_TYPE_DEFAULT)
 	{
-		type_was_default = true;
 #ifdef NEWDB
+# ifdef NDBM
+		type_was_default = true;
+# endif
 		type = SMDB_TYPE_HASH;
 #else /* NEWDB */
 # ifdef NDBM
diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c
index fa889447c5df..cf1f62c8ea9e 100644
--- a/contrib/sendmail/makemap/makemap.c
+++ b/contrib/sendmail/makemap/makemap.c
@@ -234,71 +234,67 @@ main(argc, argv)
 	}
 
 #if HASFCHOWN
-	if (!unmake && geteuid() == 0)
+	/* Find TrustedUser value in sendmail.cf */
+	if ((cfp = sm_io_open(SmFtStdio, SM_TIME_DEFAULT, cfile, SM_IO_RDONLY,
+			      NULL)) == NULL)
 	{
-		/* Find TrustedUser value in sendmail.cf */
-		if ((cfp = sm_io_open(SmFtStdio, SM_TIME_DEFAULT, cfile,
-				      SM_IO_RDONLY, NULL)) == NULL)
-		{
-			sm_io_fprintf(smioerr, SM_TIME_DEFAULT,
-				      "makemap: %s: %s\n",
-				      cfile, sm_errstring(errno));
-			exit(EX_NOINPUT);
-		}
-		while (sm_io_fgets(cfp, SM_TIME_DEFAULT, buf, sizeof(buf)) >= 0)
-		{
-			register char *b;
+		sm_io_fprintf(smioerr, SM_TIME_DEFAULT, "makemap: %s: %s\n",
+			      cfile, sm_errstring(errno));
+		exit(EX_NOINPUT);
+	}
+	while (sm_io_fgets(cfp, SM_TIME_DEFAULT, buf, sizeof(buf)) >= 0)
+	{
+		register char *b;
 
-			if ((b = strchr(buf, '\n')) != NULL)
-				*b = '\0';
+		if ((b = strchr(buf, '\n')) != NULL)
+			*b = '\0';
 
-			b = buf;
-			switch (*b++)
+		b = buf;
+		switch (*b++)
+		{
+		  case 'O':		/* option */
+			if (strncasecmp(b, " TrustedUser", 12) == 0 &&
+			    !(isascii(b[12]) && isalnum(b[12])))
 			{
-			  case 'O':		/* option */
-				if (strncasecmp(b, " TrustedUser", 12) == 0 &&
-				    !(isascii(b[12]) && isalnum(b[12])))
+				b = strchr(b, '=');
+				if (b == NULL)
+					continue;
+				while (isascii(*++b) && isspace(*b))
+					continue;
+				if (isascii(*b) && isdigit(*b))
+					TrustedUid = atoi(b);
+				else
 				{
-					b = strchr(b, '=');
-					if (b == NULL)
-						continue;
-					while (isascii(*++b) && isspace(*b))
-						continue;
-					if (isascii(*b) && isdigit(*b))
-						TrustedUid = atoi(b);
-					else
-					{
-						TrustedUid = 0;
-						pw = getpwnam(b);
-						if (pw == NULL)
-							(void) sm_io_fprintf(smioerr,
-									     SM_TIME_DEFAULT,
-									     "TrustedUser: unknown user %s\n", b);
-						else
-							TrustedUid = pw->pw_uid;
-					}
-
-# ifdef UID_MAX
-					if (TrustedUid > UID_MAX)
-					{
+					TrustedUid = 0;
+					pw = getpwnam(b);
+					if (pw == NULL)
 						(void) sm_io_fprintf(smioerr,
 								     SM_TIME_DEFAULT,
-								     "TrustedUser: uid value (%ld) > UID_MAX (%ld)",
-							(long) TrustedUid,
-							(long) UID_MAX);
-						TrustedUid = 0;
-					}
-# endif /* UID_MAX */
-					break;
+								     "TrustedUser: unknown user %s\n", b);
+					else
+						TrustedUid = pw->pw_uid;
 				}
 
-
-			  default:
-				continue;
+# ifdef UID_MAX
+				if (TrustedUid > UID_MAX)
+				{
+					(void) sm_io_fprintf(smioerr,
+							     SM_TIME_DEFAULT,
+							     "TrustedUser: uid value (%ld) > UID_MAX (%ld)",
+						(long) TrustedUid,
+						(long) UID_MAX);
+					TrustedUid = 0;
+				}
+# endif /* UID_MAX */
+				break;
 			}
+
+
+		  default:
+			continue;
 		}
-		(void) sm_io_close(cfp, SM_TIME_DEFAULT);
 	}
+	(void) sm_io_close(cfp, SM_TIME_DEFAULT);
 #endif /* HASFCHOWN */
 
 	if (!params.smdbp_allow_dup && !allowreplace)
diff --git a/contrib/sendmail/src/README b/contrib/sendmail/src/README
index c437b1e88906..fddce9d36f3b 100644
--- a/contrib/sendmail/src/README
+++ b/contrib/sendmail/src/README
@@ -189,10 +189,11 @@ replies are text based and encoded as netstrings.  The socket map
 uses the same syntax as milters the specify the remote endpoint,
 e.g.:
 
-Ksocket mySocketMap inet:12345@127.0.0.1
+KmySocketMap socket inet:12345@127.0.0.1
 
 See doc/op/op.me for details.
 
+
 +---------------+
 | COMPILE FLAGS |
 +---------------+
@@ -630,8 +631,7 @@ EGD		Define this if your system has EGD installed, see
 		http://egd.sourceforge.net/ .  It should be used to
 		seed the PRNG for STARTTLS if HASURANDOMDEV is not defined.
 STARTTLS	Enables SMTP STARTTLS (RFC 2487).  This requires OpenSSL
-		(http://www.OpenSSL.org/); use OpenSSL 0.9.5a or later
-		(if compatible with this version), do not use 0.9.3.
+		(http://www.OpenSSL.org/); use OpenSSL 0.9.8zc or later.
 		See STARTTLS COMPILATION AND CONFIGURATION for further
 		information.
 TLS_NO_RSA	Turn off support for RSA algorithms in STARTTLS.
@@ -653,6 +653,9 @@ REQUIRES_DIR_FSYNC	Turn on support for file systems that require to
 		chattr +S on Linux.
 DBMMODE		The default file permissions to use when creating new
 		database files for maps and aliases.  Defaults to 0640.
+IPV6_FULL	Use uncompressed IPv6 addresses (set by default).  This
+		permits a zero subnet to have a more specific match,
+		such as different map entries for IPv6:0:0 vs IPv6:0.
 
 Generic notice: If you enable a compile time option that needs
 libraries or include files that don't come with sendmail or are
@@ -1733,6 +1736,7 @@ Fedora Core 5, 64 bit version
 	Problem noted by Daniel Krones, solution suggested by
 	Anthony Howe.
 
+
 +--------------+
 | MANUAL PAGES |
 +--------------+
diff --git a/contrib/sendmail/src/TRACEFLAGS b/contrib/sendmail/src/TRACEFLAGS
index e73ed10edb34..06efaa91c75f 100644
--- a/contrib/sendmail/src/TRACEFLAGS
+++ b/contrib/sendmail/src/TRACEFLAGS
@@ -87,11 +87,17 @@
 71,>99	milter.c	quarantine on errors
 73	queue.c		shared memory updates
 74,>99	map.c		LDAP map defer
+#if _FFR_XCNCT
+75			debug FFR_XC*
+#endif /* _FFR_XCNCT */
 80			content length
 81			sun remote mode
 83	collect.c	timeout
 84	deliver.c	timeout
 85	map.c		dprintf map
+#if _FFR_PROXY
+87	srvrsmtp.c	proxy mode
+#endif
 89	conf.c		>=8 use sm_dprintf() instead of syslog()
 91	mci.c		syslogging of MCI cache information
 93,>99	*		Prevent daemon connection fork for profiling/debugging
diff --git a/contrib/sendmail/src/TUNING b/contrib/sendmail/src/TUNING
index 77c3f64f6901..8df58030a729 100644
--- a/contrib/sendmail/src/TUNING
+++ b/contrib/sendmail/src/TUNING
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2003 Proofpoint, Inc. and its suppliers.
+# Copyright (c) 2001-2003, 2014 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -135,6 +135,17 @@ to send e-mail then either the -G option should be used or
 
 should be added to the .mc file.
 
+Note: starting with 8.15, sendmail will not ignore temporary map
+lookup failures during header rewriting, which means that DNS lookup
+problems even for headers will cause messages to stay in the queue.
+Hence it is strongly suggested to use the nocanonify feature;
+at least turning it on for the MTA, but maybe disabling it for the
+MSA, i.e., use Modifiers for DaemonPortOptions accordingly.
+As a last resort, it is possible to override the host map to ignore
+temporary failures, e.g.,
+Khost host -t
+However, this can cause inconsistent header rewriting.
+
 
 * Mailing Lists and Large Aliases (1-n Mailing)
 -----------------------------------------------
diff --git a/contrib/sendmail/src/bf.c b/contrib/sendmail/src/bf.c
index 7d908560dbad..0f2c9c0195eb 100644
--- a/contrib/sendmail/src/bf.c
+++ b/contrib/sendmail/src/bf.c
@@ -695,7 +695,8 @@ sm_bfcommit(fp)
 			sm_dprintf("bfcommit(%s): to disk\n", bfp->bf_filename);
 			if (tTd(58, 32))
 				sm_dprintf("bfcommit(): filemode %o flags %ld\n",
-					   bfp->bf_filemode, bfp->bf_flags);
+					   (unsigned int) bfp->bf_filemode,
+					   bfp->bf_flags);
 		}
 
 		if (stat(bfp->bf_filename, &st) == 0)
diff --git a/contrib/sendmail/src/collect.c b/contrib/sendmail/src/collect.c
index 8d90acb827ea..5f090b23a042 100644
--- a/contrib/sendmail/src/collect.c
+++ b/contrib/sendmail/src/collect.c
@@ -59,7 +59,7 @@ collect_eoh(e, numhdrs, hdrslen)
 		sm_dprintf("collect: rscheck(\"check_eoh\", \"%s $| %s\")\n",
 			   hnum, hsize);
 	(void) rscheck("check_eoh", hnum, hsize, e, RSF_UNSTRUCTURED|RSF_COUNT,
-			3, NULL, e->e_id, NULL);
+			3, NULL, e->e_id, NULL, NULL);
 
 	/*
 	**  Process the header,
@@ -297,6 +297,7 @@ collect(fp, smtpmode, hdrp, e, rsetsize)
 	int hdrslen;
 	int numhdrs;
 	int afd;
+	int old_rd_tmo;
 	unsigned char *pbp;
 	unsigned char peekbuf[8];
 	char bufbuf[MAXLINE];
@@ -311,7 +312,7 @@ collect(fp, smtpmode, hdrp, e, rsetsize)
 	dbto = smtpmode ? ((int) TimeOuts.to_datablock * 1000)
 			: SM_TIME_FOREVER;
 	sm_io_setinfo(fp, SM_IO_WHAT_TIMEOUT, &dbto);
-	set_tls_rd_tmo(TimeOuts.to_datablock);
+	old_rd_tmo = set_tls_rd_tmo(TimeOuts.to_datablock);
 	c = SM_IO_EOF;
 	inputerr = false;
 	headeronly = hdrp != NULL;
@@ -720,7 +721,7 @@ collect(fp, smtpmode, hdrp, e, rsetsize)
 	}
 
 	if (headeronly)
-		return;
+		goto end;
 
 	if (mstate != MS_BODY)
 	{
@@ -940,6 +941,9 @@ collect(fp, smtpmode, hdrp, e, rsetsize)
 				 + e->e_nrcpts * WkRecipFact;
 		markstats(e, (ADDRESS *) NULL, STATS_NORMAL);
 	}
+
+  end:
+	(void) set_tls_rd_tmo(old_rd_tmo);
 }
 
 /*
@@ -1026,8 +1030,8 @@ dferror(df, msg, e)
 #endif /* 0 */
 	}
 	else
-		syserr("421 4.3.0 collect: Cannot write %s (%s, uid=%d, gid=%d)",
-			dfname, msg, (int) geteuid(), (int) getegid());
+		syserr("421 4.3.0 collect: Cannot write %s (%s, uid=%ld, gid=%ld)",
+			dfname, msg, (long) geteuid(), (long) getegid());
 	if (sm_io_reopen(SmFtStdio, SM_TIME_DEFAULT, SM_PATH_DEVNULL,
 			 SM_IO_WRONLY, NULL, df) == NULL)
 		sm_syslog(LOG_ERR, e->e_id,
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c
index b64f3c7fab71..c73334e27241 100644
--- a/contrib/sendmail/src/conf.c
+++ b/contrib/sendmail/src/conf.c
@@ -13,7 +13,7 @@
 
 #include 
 
-SM_RCSID("@(#)$Id: conf.c,v 8.1191 2014-01-08 17:03:14 ca Exp $")
+SM_RCSID("@(#)$Id: conf.c,v 8.1192 2014-01-27 18:23:21 ca Exp $")
 
 #include 
 #include 
@@ -229,10 +229,8 @@ struct dbsval DontBlameSendmailValues[] =
 	{ "worldwritableforwardfile",	DBS_WORLDWRITABLEFORWARDFILE	},
 	{ "worldwritableincludefile",	DBS_WORLDWRITABLEINCLUDEFILE	},
 	{ "groupreadablekeyfile",	DBS_GROUPREADABLEKEYFILE	},
-#if _FFR_GROUPREADABLEAUTHINFOFILE
-	{ "groupreadableadefaultauthinfofile",
+	{ "groupreadabledefaultauthinfofile",
 					DBS_GROUPREADABLEAUTHINFOFILE	},
-#endif /* _FFR_GROUPREADABLEAUTHINFOFILE */
 	{ NULL,				0				}
 };
 
@@ -304,9 +302,9 @@ setdefaults(e)
 	}
 	TrustedUid = 0;
 	if (tTd(37, 4))
-		sm_dprintf("setdefaults: DefUser=%s, DefUid=%d, DefGid=%d\n",
+		sm_dprintf("setdefaults: DefUser=%s, DefUid=%ld, DefGid=%ld\n",
 			DefUser != NULL ? DefUser : "<1:1>",
-			(int) DefUid, (int) DefGid);
+			(long) DefUid, (long) DefGid);
 	CheckpointInterval = 10;		/* option C */
 	MaxHopCount = 25;			/* option h */
 	set_delivery_mode(SM_FORK, e);		/* option d */
@@ -365,6 +363,8 @@ setdefaults(e)
 #endif /* SASL */
 #if STARTTLS
 	TLS_Srv_Opts = TLS_I_SRV;
+	if (NULL == EVP_digest)
+		EVP_digest = EVP_md5();
 #endif /* STARTTLS */
 #ifdef HESIOD_INIT
 	HesiodContext = NULL;
@@ -379,6 +379,9 @@ setdefaults(e)
 	}
 	else
 		InetMode = AF_INET;
+#if !IPV6_FULL
+	UseCompressedIPv6Addresses = true;
+#endif
 #else /* NETINET6 */
 	InetMode = AF_INET;
 #endif /* NETINET6 */
@@ -399,6 +402,9 @@ setdefaults(e)
 	BadRcptThrottleDelay = 1;
 #endif /* _FFR_RCPTTHROTDELAY */
 	ConnectionRateWindowSize = 60;
+#if _FFR_BOUNCE_QUEUE
+	BounceQueue = NOQGRP;
+#endif /* _FFR_BOUNCE_QUEUE */
 	setupmaps();
 	setupqueues();
 	setupmailers();
@@ -423,8 +429,8 @@ setdefuser()
 			   ? "nobody" : defpwent->pw_name,
 			  sizeof(defuserbuf));
 	if (tTd(37, 4))
-		sm_dprintf("setdefuser: DefUid=%d, DefUser=%s\n",
-			   (int) DefUid, DefUser);
+		sm_dprintf("setdefuser: DefUid=%ld, DefUser=%s\n",
+			   (long) DefUid, DefUser);
 }
 /*
 **  SETUPQUEUES -- initialize default queues
@@ -665,12 +671,10 @@ setupmaps()
 		dequote_init, null_map_open, null_map_close,
 		arith_map_lookup, null_map_store);
 
-#if _FFR_ARPA_MAP
 	/* "arpa" map -- IP -> arpa */
 	MAPDEF("arpa", NULL, 0,
 		dequote_init, null_map_open, null_map_close,
 		arpa_map_lookup, null_map_store);
-#endif /* _FFR_ARPA_MAP */
 
 #if SOCKETMAP
 	/* arbitrary daemons */
@@ -2299,7 +2303,7 @@ refuseconnections(e, dn, active)
 # define D_MSG_LA "delaying connections on daemon %s: load average=%d >= %d"
 		/* sleep to flatten out connection load */
 		sm_setproctitle(true, e, D_MSG_LA, Daemons[dn].d_name,
-			        CurrentLA, limit);
+				CurrentLA, limit);
 		if (LogLevel > 8 && (now = curtime()) > log_delay)
 		{
 			sm_syslog(LOG_INFO, NOQID, D_MSG_LA,
@@ -2780,7 +2784,7 @@ reapchild(sig)
 	return SIGFUNC_RETURN;
 }
 /*
-**  GETDTABLESIZE -- return number of file descriptors
+**  GETDTSIZE -- return number of file descriptors
 **
 **	Only on non-BSD systems
 **
@@ -3601,8 +3605,8 @@ lockfile(fd, filename, ext, type)
 		uid_t euid = geteuid();
 
 		errno = save_errno;
-		syserr("cannot lockf(%s%s, fd=%d, type=%o, omode=%o, euid=%d)",
-		       filename, ext, fd, type, omode, euid);
+		syserr("cannot lockf(%s%s, fd=%d, type=%o, omode=%o, euid=%ld)",
+		       filename, ext, fd, type, omode, (long) euid);
 		dumpfd(fd, true, true);
 	}
 # else /* !HASFLOCK */
@@ -3631,8 +3635,8 @@ lockfile(fd, filename, ext, type)
 		uid_t euid = geteuid();
 
 		errno = save_errno;
-		syserr("cannot flock(%s%s, fd=%d, type=%o, omode=%o, euid=%d)",
-			filename, ext, fd, type, omode, euid);
+		syserr("cannot flock(%s%s, fd=%d, type=%o, omode=%o, euid=%ld)",
+			filename, ext, fd, type, omode, (long) euid);
 		dumpfd(fd, true, true);
 	}
 # endif /* !HASFLOCK */
@@ -4009,8 +4013,8 @@ validate_connection(sap, hostname, e)
 			hostname, anynet_ntoa(sap));
 
 	connection_rate_check(sap, e);
-	if (rscheck("check_relay", hostname, anynet_ntoa(sap),
-		    e, RSF_RMCOMM|RSF_COUNT, 3, NULL, NOQID, NULL) != EX_OK)
+	if (rscheck("check_relay", hostname, anynet_ntoa(sap), e,
+		    RSF_RMCOMM|RSF_COUNT, 3, NULL, NOQID, NULL, NULL) != EX_OK)
 	{
 		static char reject[BUFSIZ*2];
 		extern char MsgBuf[];
@@ -5406,7 +5410,7 @@ sm_syslog(level, id, fmt, va_alist)
 		SM_VA_START(ap, fmt);
 		n = sm_vsnprintf(buf, bufsize, fmt, ap);
 		SM_VA_END(ap);
-		SM_ASSERT(n > 0);
+		SM_ASSERT(n >= 0);
 		if (n < bufsize)
 			break;
 
@@ -5736,148 +5740,155 @@ char	*CompileOptions[] =
 {
 #if ALLOW_255
 	"ALLOW_255",
-#endif /* ALLOW_255 */
+#endif
 #if NAMED_BIND
 # if DNSMAP
 	"DNSMAP",
-# endif /* DNSMAP */
-#endif /* NAMED_BIND */
+# endif
+#endif
 #if EGD
 	"EGD",
-#endif /* EGD */
+#endif
 #if HESIOD
 	"HESIOD",
-#endif /* HESIOD */
+#endif
+#if HESIOD_ALLOW_NUMERIC_LOGIN
+	"HESIOD_ALLOW_NUMERIC_LOGIN",
+#endif
 #if HES_GETMAILHOST
 	"HES_GETMAILHOST",
-#endif /* HES_GETMAILHOST */
+#endif
+#if IPV6_FULL
+	/* Use uncompressed IPv6 address format (no "::") by default */
+	"IPV6_FULL",
+#endif
 #if LDAPMAP
 	"LDAPMAP",
-#endif /* LDAPMAP */
+#endif
 #if LDAP_REFERRALS
 	"LDAP_REFERRALS",
-#endif /* LDAP_REFERRALS */
+#endif
 #if LOG
 	"LOG",
-#endif /* LOG */
+#endif
 #if MAP_NSD
 	"MAP_NSD",
-#endif /* MAP_NSD */
+#endif
 #if MAP_REGEX
 	"MAP_REGEX",
-#endif /* MAP_REGEX */
+#endif
 #if MATCHGECOS
 	"MATCHGECOS",
-#endif /* MATCHGECOS */
+#endif
 #if MILTER
 	"MILTER",
-#endif /* MILTER */
+#endif
 #if MIME7TO8
 	"MIME7TO8",
-#endif /* MIME7TO8 */
+#endif
 #if MIME7TO8_OLD
 	"MIME7TO8_OLD",
-#endif /* MIME7TO8_OLD */
+#endif
 #if MIME8TO7
 	"MIME8TO7",
-#endif /* MIME8TO7 */
+#endif
 #if NAMED_BIND
 	"NAMED_BIND",
-#endif /* NAMED_BIND */
+#endif
 #if NDBM
 	"NDBM",
-#endif /* NDBM */
+#endif
 #if NETINET
 	"NETINET",
-#endif /* NETINET */
+#endif
 #if NETINET6
 	"NETINET6",
-#endif /* NETINET6 */
+#endif
 #if NETINFO
 	"NETINFO",
-#endif /* NETINFO */
+#endif
 #if NETISO
 	"NETISO",
-#endif /* NETISO */
+#endif
 #if NETNS
 	"NETNS",
-#endif /* NETNS */
+#endif
 #if NETUNIX
 	"NETUNIX",
-#endif /* NETUNIX */
+#endif
 #if NETX25
 	"NETX25",
-#endif /* NETX25 */
+#endif
 #if NEWDB
 	"NEWDB",
-#endif /* NEWDB */
+#endif
 #if NIS
 	"NIS",
-#endif /* NIS */
+#endif
 #if NISPLUS
 	"NISPLUS",
-#endif /* NISPLUS */
+#endif
 #if NO_DH
 	"NO_DH",
-#endif /* NO_DH */
+#endif
 #if PH_MAP
 	"PH_MAP",
-#endif /* PH_MAP */
+#endif
 #ifdef PICKY_HELO_CHECK
 	"PICKY_HELO_CHECK",
-#endif /* PICKY_HELO_CHECK */
+#endif
 #if PIPELINING
 	"PIPELINING",
-#endif /* PIPELINING */
+#endif
 #if SASL
 # if SASL >= 20000
 	"SASLv2",
 # else /* SASL >= 20000 */
 	"SASL",
-# endif /* SASL >= 20000 */
-#endif /* SASL */
+# endif
+#endif
 #if SCANF
 	"SCANF",
-#endif /* SCANF */
+#endif
 #if SM_LDAP_ERROR_ON_MISSING_ARGS
 	"SM_LDAP_ERROR_ON_MISSING_ARGS",
-#endif /* SM_LDAP_ERROR_ON_MISSING_ARGS */
+#endif
 #if SMTPDEBUG
 	"SMTPDEBUG",
-#endif /* SMTPDEBUG */
+#endif
 #if SOCKETMAP
 	"SOCKETMAP",
-#endif /* SOCKETMAP */
+#endif
 #if STARTTLS
 	"STARTTLS",
-#endif /* STARTTLS */
+#endif
 #if SUID_ROOT_FILES_OK
 	"SUID_ROOT_FILES_OK",
-#endif /* SUID_ROOT_FILES_OK */
+#endif
 #if TCPWRAPPERS
 	"TCPWRAPPERS",
-#endif /* TCPWRAPPERS */
+#endif
 #if TLS_NO_RSA
 	"TLS_NO_RSA",
-#endif /* TLS_NO_RSA */
+#endif
 #if TLS_VRFY_PER_CTX
 	"TLS_VRFY_PER_CTX",
-#endif /* TLS_VRFY_PER_CTX */
+#endif
 #if USERDB
 	"USERDB",
-#endif /* USERDB */
+#endif
 #if USE_LDAP_INIT
 	"USE_LDAP_INIT",
-#endif /* USE_LDAP_INIT */
+#endif
 #if USE_TTYPATH
 	"USE_TTYPATH",
-#endif /* USE_TTYPATH */
+#endif
 #if XDEBUG
 	"XDEBUG",
-#endif /* XDEBUG */
+#endif
 #if XLA
 	"XLA",
-#endif /* XLA */
+#endif
 	NULL
 };
 
@@ -5890,169 +5901,169 @@ char	*OsCompileOptions[] =
 {
 #if ADDRCONFIG_IS_BROKEN
 	"ADDRCONFIG_IS_BROKEN",
-#endif /* ADDRCONFIG_IS_BROKEN */
+#endif
 #ifdef AUTO_NETINFO_HOSTS
 	"AUTO_NETINFO_HOSTS",
-#endif /* AUTO_NETINFO_HOSTS */
+#endif
 #ifdef AUTO_NIS_ALIASES
 	"AUTO_NIS_ALIASES",
-#endif /* AUTO_NIS_ALIASES */
+#endif
 #if BROKEN_RES_SEARCH
 	"BROKEN_RES_SEARCH",
-#endif /* BROKEN_RES_SEARCH */
+#endif
 #ifdef BSD4_4_SOCKADDR
 	"BSD4_4_SOCKADDR",
-#endif /* BSD4_4_SOCKADDR */
+#endif
 #if BOGUS_O_EXCL
 	"BOGUS_O_EXCL",
-#endif /* BOGUS_O_EXCL */
+#endif
 #if DEC_OSF_BROKEN_GETPWENT
 	"DEC_OSF_BROKEN_GETPWENT",
-#endif /* DEC_OSF_BROKEN_GETPWENT */
+#endif
 #if FAST_PID_RECYCLE
 	"FAST_PID_RECYCLE",
-#endif /* FAST_PID_RECYCLE */
+#endif
 #if HASCLOSEFROM
 	"HASCLOSEFROM",
-#endif /* HASCLOSEFROM */
+#endif
 #if HASFCHOWN
 	"HASFCHOWN",
-#endif /* HASFCHOWN */
+#endif
 #if HASFCHMOD
 	"HASFCHMOD",
-#endif /* HASFCHMOD */
+#endif
 #if HASFDWALK
 	"HASFDWALK",
-#endif /* HASFDWALK */
+#endif
 #if HASFLOCK
 	"HASFLOCK",
-#endif /* HASFLOCK */
+#endif
 #if HASGETDTABLESIZE
 	"HASGETDTABLESIZE",
-#endif /* HASGETDTABLESIZE */
+#endif
 #if HASGETUSERSHELL
 	"HASGETUSERSHELL",
-#endif /* HASGETUSERSHELL */
+#endif
 #if HASINITGROUPS
 	"HASINITGROUPS",
-#endif /* HASINITGROUPS */
+#endif
 #if HASLDAPGETALIASBYNAME
 	"HASLDAPGETALIASBYNAME",
-#endif /* HASLDAPGETALIASBYNAME */
+#endif
 #if HASLSTAT
 	"HASLSTAT",
-#endif /* HASLSTAT */
+#endif
 #if HASNICE
 	"HASNICE",
-#endif /* HASNICE */
+#endif
 #if HASRANDOM
 	"HASRANDOM",
-#endif /* HASRANDOM */
+#endif
 #if HASRRESVPORT
 	"HASRRESVPORT",
-#endif /* HASRRESVPORT */
+#endif
 #if HASSETEGID
 	"HASSETEGID",
-#endif /* HASSETEGID */
+#endif
 #if HASSETLOGIN
 	"HASSETLOGIN",
-#endif /* HASSETLOGIN */
+#endif
 #if HASSETREGID
 	"HASSETREGID",
-#endif /* HASSETREGID */
+#endif
 #if HASSETRESGID
 	"HASSETRESGID",
-#endif /* HASSETRESGID */
+#endif
 #if HASSETREUID
 	"HASSETREUID",
-#endif /* HASSETREUID */
+#endif
 #if HASSETRLIMIT
 	"HASSETRLIMIT",
-#endif /* HASSETRLIMIT */
+#endif
 #if HASSETSID
 	"HASSETSID",
-#endif /* HASSETSID */
+#endif
 #if HASSETUSERCONTEXT
 	"HASSETUSERCONTEXT",
-#endif /* HASSETUSERCONTEXT */
+#endif
 #if HASSETVBUF
 	"HASSETVBUF",
-#endif /* HASSETVBUF */
+#endif
 #if HAS_ST_GEN
 	"HAS_ST_GEN",
-#endif /* HAS_ST_GEN */
+#endif
 #if HASSRANDOMDEV
 	"HASSRANDOMDEV",
-#endif /* HASSRANDOMDEV */
+#endif
 #if HASURANDOMDEV
 	"HASURANDOMDEV",
-#endif /* HASURANDOMDEV */
+#endif
 #if HASSTRERROR
 	"HASSTRERROR",
-#endif /* HASSTRERROR */
+#endif
 #if HASULIMIT
 	"HASULIMIT",
-#endif /* HASULIMIT */
+#endif
 #if HASUNAME
 	"HASUNAME",
-#endif /* HASUNAME */
+#endif
 #if HASUNSETENV
 	"HASUNSETENV",
-#endif /* HASUNSETENV */
+#endif
 #if HASWAITPID
 	"HASWAITPID",
-#endif /* HASWAITPID */
+#endif
 #if HAVE_NANOSLEEP
 	"HAVE_NANOSLEEP",
-#endif /* HAVE_NANOSLEEP */
+#endif
 #if IDENTPROTO
 	"IDENTPROTO",
-#endif /* IDENTPROTO */
+#endif
 #if IP_SRCROUTE
 	"IP_SRCROUTE",
-#endif /* IP_SRCROUTE */
+#endif
 #if O_EXLOCK && HASFLOCK && !BOGUS_O_EXCL
 	"LOCK_ON_OPEN",
-#endif /* O_EXLOCK && HASFLOCK && !BOGUS_O_EXCL */
+#endif
 #if MILTER_NO_NAGLE
 	"MILTER_NO_NAGLE ",
-#endif /* MILTER_NO_NAGLE */
+#endif
 #if NEEDFSYNC
 	"NEEDFSYNC",
-#endif /* NEEDFSYNC */
+#endif
 #if NEEDLINK
 	"NEEDLINK",
-#endif /* NEEDLINK */
+#endif
 #if NEEDLOCAL_HOSTNAME_LENGTH
 	"NEEDLOCAL_HOSTNAME_LENGTH",
-#endif /* NEEDLOCAL_HOSTNAME_LENGTH */
+#endif
 #if NEEDSGETIPNODE
 	"NEEDSGETIPNODE",
-#endif /* NEEDSGETIPNODE */
+#endif
 #if NEEDSTRSTR
 	"NEEDSTRSTR",
-#endif /* NEEDSTRSTR */
+#endif
 #if NEEDSTRTOL
 	"NEEDSTRTOL",
-#endif /* NEEDSTRTOL */
+#endif
 #ifdef NO_GETSERVBYNAME
 	"NO_GETSERVBYNAME",
-#endif /* NO_GETSERVBYNAME */
+#endif
 #if NOFTRUNCATE
 	"NOFTRUNCATE",
-#endif /* NOFTRUNCATE */
+#endif
 #if REQUIRES_DIR_FSYNC
 	"REQUIRES_DIR_FSYNC",
-#endif /* REQUIRES_DIR_FSYNC */
+#endif
 #if RLIMIT_NEEDS_SYS_TIME_H
 	"RLIMIT_NEEDS_SYS_TIME_H",
-#endif /* RLIMIT_NEEDS_SYS_TIME_H */
+#endif
 #if SAFENFSPATHCONF
 	"SAFENFSPATHCONF",
-#endif /* SAFENFSPATHCONF */
+#endif
 #if SECUREWARE
 	"SECUREWARE",
-#endif /* SECUREWARE */
+#endif
 #if SFS_TYPE == SFS_4ARGS
 	"SFS_4ARGS",
 #elif SFS_TYPE == SFS_MOUNT
@@ -6072,55 +6083,55 @@ char	*OsCompileOptions[] =
 #endif
 #if SHARE_V1
 	"SHARE_V1",
-#endif /* SHARE_V1 */
+#endif
 #if SIOCGIFCONF_IS_BROKEN
 	"SIOCGIFCONF_IS_BROKEN",
-#endif /* SIOCGIFCONF_IS_BROKEN */
+#endif
 #if SIOCGIFNUM_IS_BROKEN
 	"SIOCGIFNUM_IS_BROKEN",
-#endif /* SIOCGIFNUM_IS_BROKEN */
+#endif
 #if SNPRINTF_IS_BROKEN
 	"SNPRINTF_IS_BROKEN",
-#endif /* SNPRINTF_IS_BROKEN */
+#endif
 #if SO_REUSEADDR_IS_BROKEN
 	"SO_REUSEADDR_IS_BROKEN",
-#endif /* SO_REUSEADDR_IS_BROKEN */
+#endif
 #if SYS5SETPGRP
 	"SYS5SETPGRP",
-#endif /* SYS5SETPGRP */
+#endif
 #if SYSTEM5
 	"SYSTEM5",
-#endif /* SYSTEM5 */
+#endif
 #if USE_DOUBLE_FORK
 	"USE_DOUBLE_FORK",
-#endif /* USE_DOUBLE_FORK */
+#endif
 #if USE_ENVIRON
 	"USE_ENVIRON",
-#endif /* USE_ENVIRON */
+#endif
 #if USE_SA_SIGACTION
 	"USE_SA_SIGACTION",
-#endif /* USE_SA_SIGACTION */
+#endif
 #if USE_SIGLONGJMP
 	"USE_SIGLONGJMP",
-#endif /* USE_SIGLONGJMP */
+#endif
 #if USEGETCONFATTR
 	"USEGETCONFATTR",
-#endif /* USEGETCONFATTR */
+#endif
 #if USESETEUID
 	"USESETEUID",
-#endif /* USESETEUID */
+#endif
 #ifdef USESYSCTL
 	"USESYSCTL",
-#endif /* USESYSCTL */
+#endif
 #if USE_OPENSSL_ENGINE
 	"USE_OPENSSL_ENGINE",
-#endif /* USE_OPENSSL_ENGINE */
+#endif
 #if USING_NETSCAPE_LDAP
 	"USING_NETSCAPE_LDAP",
-#endif /* USING_NETSCAPE_LDAP */
+#endif
 #ifdef WAITUNION
 	"WAITUNION",
-#endif /* WAITUNION */
+#endif
 	NULL
 };
 
@@ -6130,77 +6141,73 @@ char	*OsCompileOptions[] =
 
 char	*FFRCompileOptions[] =
 {
+#if _FFR_ADD_BCC
+	"_FFR_ADD_BCC",
+#endif
 #if _FFR_ADDR_TYPE_MODES
 	/* more info in {addr_type}, requires m4 changes! */
 	"_FFR_ADDR_TYPE_MODES",
-#endif /* _FFR_ADDR_TYPE_MODES */
+#endif
+#if _FFR_ALIAS_DETAIL
+	/* try to handle +detail for aliases */
+	"_FFR_ALIAS_DETAIL",
+#endif
 #if _FFR_ALLOW_SASLINFO
 	/* DefaultAuthInfo can be specified by user. */
 	/* DefaultAuthInfo doesn't really work in 8.13 anymore. */
 	"_FFR_ALLOW_SASLINFO",
-#endif /* _FFR_ALLOW_SASLINFO */
-#if _FFR_ARPA_MAP
-	/* arpa map to reverse an IPv(4,6) address */
-	"_FFR_ARPA_MAP",
-#endif /* _FFR_ARPA_MAP */
+#endif
 #if _FFR_BADRCPT_SHUTDOWN
 	/* shut down connection (421) if there are too many bad RCPTs */
 	"_FFR_BADRCPT_SHUTDOWN",
-#endif /* _FFR_BADRCPT_SHUTDOWN */
+#endif
 #if _FFR_BESTMX_BETTER_TRUNCATION
 	/* Better truncation of list of MX records for dns map. */
 	"_FFR_BESTMX_BETTER_TRUNCATION",
-#endif /* _FFR_BESTMX_BETTER_TRUNCATION */
+#endif
+#if _FFR_BOUNCE_QUEUE
+	/* Separate, unprocessed queue for DSNs */
+	/* John Gardiner Myers of Proofpoint */
+	"_FFR_BOUNCE_QUEUE",
+#endif
 #if _FFR_CATCH_BROKEN_MTAS
 	/* Deal with MTAs that send a reply during the DATA phase. */
 	"_FFR_CATCH_BROKEN_MTAS",
-#endif /* _FFR_CATCH_BROKEN_MTAS */
-#if _FFR_CHECKCONFIG
-	/* New OpMode to check the configuration file */
-	"_FFR_CHECKCONFIG",
-#endif /* _FFR_CHECKCONFIG */
+#endif
 #if _FFR_CHK_QUEUE
 	/* Stricter checks about queue directory permissions. */
 	"_FFR_CHK_QUEUE",
-#endif /* _FFR_CHK_QUEUE */
+#endif
 #if _FFR_CLIENT_SIZE
 	/* Don't try to send mail if its size exceeds SIZE= of server. */
 	"_FFR_CLIENT_SIZE",
-#endif /* _FFR_CLIENT_SIZE */
+#endif
 #if _FFR_CRLPATH
 	/* CRLPath; needs documentation; Al Smith */
 	"_FFR_CRLPATH",
-#endif /* _FFR_CRLPATH */
-#if _FFR_DAEMON_NETUNIX
-	/* Allow local (not just TCP) socket connection to server. */
-	"_FFR_DAEMON_NETUNIX",
-#endif /* _FFR_DAEMON_NETUNIX */
-#if _FFR_DEPRECATE_MAILER_FLAG_I
-	/* What it says :-) */
-	"_FFR_DEPRECATE_MAILER_FLAG_I",
-#endif /* _FFR_DEPRECATE_MAILER_FLAG_I */
+#endif
 #if _FFR_DM_ONE
 	/* deliver first TA in background, then queue */
 	"_FFR_DM_ONE",
-#endif /* _FFR_DM_ONE */
+#endif
 #if _FFR_DIGUNIX_SAFECHOWN
 	/* Properly set SAFECHOWN (include/sm/conf.h) for Digital UNIX */
 /* Problem noted by Anne Bennett of Concordia University */
 	"_FFR_DIGUNIX_SAFECHOWN",
-#endif /* _FFR_DIGUNIX_SAFECHOWN */
+#endif
 #if _FFR_DNSMAP_ALIASABLE
 	/* Allow dns map type to be used for aliases. */
 /* Don Lewis of TDK */
 	"_FFR_DNSMAP_ALIASABLE",
-#endif /* _FFR_DNSMAP_ALIASABLE */
+#endif
 #if _FFR_DONTLOCKFILESFORREAD_OPTION
 	/* Enable DontLockFilesForRead option. */
 	"_FFR_DONTLOCKFILESFORREAD_OPTION",
-#endif /* _FFR_DONTLOCKFILESFORREAD_OPTION */
+#endif
 #if _FFR_DOTTED_USERNAMES
 	/* Allow usernames with '.' */
 	"_FFR_DOTTED_USERNAMES",
-#endif /* _FFR_DOTTED_USERNAMES */
+#endif
 #if _FFR_DPO_CS
 	/*
 	**  Make DaemonPortOptions case sensitive.
@@ -6215,11 +6222,11 @@ char	*FFRCompileOptions[] =
 	*/
 
 	"_FFR_DPO_CS",
-#endif /* _FFR_DPO_CS */
+#endif
 #if _FFR_DPRINTF_MAP
 	/* dprintf map for logging */
 	"_FFR_DPRINTF_MAP",
-#endif /* _FFR_DPRINTF_MAP */
+#endif
 #if _FFR_DROP_TRUSTUSER_WARNING
 	/*
 	**  Don't issue this warning:
@@ -6228,24 +6235,20 @@ char	*FFRCompileOptions[] =
 	*/
 
 	"_FFR_DROP_TRUSTUSER_WARNING",
-#endif /* _FFR_DROP_TRUSTUSER_WARNING */
+#endif
 #if _FFR_EIGHT_BIT_ADDR_OK
 	/* EightBitAddrOK: allow 8-bit e-mail addresses */
 	"_FFR_EIGHT_BIT_ADDR_OK",
-#endif /* _FFR_EIGHT_BIT_ADDR_OK */
-#if _FFR_EXPDELAY
-	/* exponential queue delay */
-	"_FFR_EXPDELAY",
-#endif /* _FFR_EXPDELAY */
+#endif
 #if _FFR_EXTRA_MAP_CHECK
 	/* perform extra checks on $( $) in R lines */
 	"_FFR_EXTRA_MAP_CHECK",
-#endif /* _FFR_EXTRA_MAP_CHECK */
+#endif
 #if _FFR_GETHBN_ExFILE
 	/*
 	**  According to Motonori Nakamura some gethostbyname()
 	**  implementations (TurboLinux?) may (temporarily) fail
-	**  due to a lack of file discriptors. Enabling this FFR
+	**  due to a lack of file descriptors. Enabling this FFR
 	**  will check errno for EMFILE and ENFILE and in case of a match
 	**  cause a temporary error instead of a permanent error.
 	**  The right solution is of course to file a bug against those
@@ -6253,11 +6256,11 @@ char	*FFRCompileOptions[] =
 	*/
 
 	"_FFR_GETHBN_ExFILE",
-#endif /* _FFR_GETHBN_ExFILE */
+#endif
 #if _FFR_FIPSMODE
 	/* FIPSMode (if supported by OpenSSL library) */
 	"_FFR_FIPSMODE",
-#endif /* _FFR_FIPSMODE */
+#endif
 #if _FFR_FIX_DASHT
 	/*
 	**  If using -t, force not sending to argv recipients, even
@@ -6265,55 +6268,66 @@ char	*FFRCompileOptions[] =
 	*/
 
 	"_FFR_FIX_DASHT",
-#endif /* _FFR_FIX_DASHT */
+#endif
 #if _FFR_FORWARD_SYSERR
 	/* Cause a "syserr" if forward file isn't "safe". */
 	"_FFR_FORWARD_SYSERR",
-#endif /* _FFR_FORWARD_SYSERR */
+#endif
 #if _FFR_GEN_ORCPT
 	/* Generate a ORCPT DSN arg if not already provided */
 	"_FFR_GEN_ORCPT",
-#endif /* _FFR_GEN_ORCPT */
-#if _FFR_GROUPREADABLEAUTHINFOFILE
-	/* Allow group readable DefaultAuthInfo file. */
-	"_FFR_GROUPREADABLEAUTHINFOFILE",
-#endif /* _FFR_GROUPREADABLEAUTHINFOFILE */
+#endif
 #if _FFR_HANDLE_ISO8859_GECOS
 	/*
 	**  Allow ISO 8859 characters in GECOS field: replace them
-	**  ith ASCII "equivalent".
+	**  with ASCII "equivalent".
 	*/
 
 /* Peter Eriksson of Linkopings universitet */
 	"_FFR_HANDLE_ISO8859_GECOS",
-#endif /* _FFR_HANDLE_ISO8859_GECOS */
+#endif
+#if _FFR_HANDLE_HDR_RW_TEMPFAIL
+	/*
+	**  Temporary header rewriting problems from remotename() etc
+	**  are not "sticky" for mci (e.g., during queue runs).
+	*/
+
+	"_FFR_HANDLE_HDR_RW_TEMPFAIL",
+#endif
 #if _FFR_HPUX_NSSWITCH
 	/* Use nsswitch on HP-UX */
 	"_FFR_HPUX_NSSWITCH",
-#endif /* _FFR_HPUX_NSSWITCH */
+#endif
 #if _FFR_IGNORE_BOGUS_ADDR
 	/* Ignore addresses for which prescan() failed */
 	"_FFR_IGNORE_BOGUS_ADDR",
-#endif /* _FFR_IGNORE_BOGUS_ADDR */
+#endif
 #if _FFR_IGNORE_EXT_ON_HELO
 	/* Ignore extensions offered in response to HELO */
 	"_FFR_IGNORE_EXT_ON_HELO",
-#endif /* _FFR_IGNORE_EXT_ON_HELO */
-#if _FFR_IPV6_FULL
-	/* Use uncompressed IPv6 address format (no "::") */
-	"_FFR_IPV6_FULL",
-#endif /* _FFR_IPV6_FULL */
+#endif
 #if _FFR_LINUX_MHNL
 	/* Set MAXHOSTNAMELEN to 256 (Linux) */
 	"_FFR_LINUX_MHNL",
-#endif /* _FFR_LINUX_MHNL */
+#endif
 #if _FFR_LOCAL_DAEMON
 	/* Local daemon mode (-bl) which only accepts loopback connections */
 	"_FFR_LOCAL_DAEMON",
-#endif /* _FFR_LOCAL_DAEMON */
+#endif
+#if _FFR_LOG_MORE1
+	/* log some TLS/AUTH info in from= too */
+	"_FFR_LOG_MORE1",
+#endif
+#if _FFR_LOG_MORE2
+	/* log some TLS info in to= too */
+	"_FFR_LOG_MORE2",
+#endif
+#if _FFR_LOGREPLY
+	"_FFR_LOGREPLY",
+#endif
 #if _FFR_MAIL_MACRO
 	"_FFR_MAIL_MACRO",
-#endif /* _FFR_MAIL_MACRO */
+#endif
 #if _FFR_MAXDATASIZE
 	/*
 	**  It is possible that a header is larger than MILTER_CHUNK_SIZE,
@@ -6323,28 +6337,33 @@ char	*FFRCompileOptions[] =
 	*/
 
 	"_FFR_MAXDATASIZE",
-#endif /* _FFR_MAXDATASIZE */
+#endif
 #if _FFR_MAX_FORWARD_ENTRIES
 	/* Try to limit number of .forward entries */
 	/* (doesn't work) */
 /* Randall S. Winchester of the University of Maryland */
 	"_FFR_MAX_FORWARD_ENTRIES",
-#endif /* _FFR_MAX_FORWARD_ENTRIES */
+#endif
 #if _FFR_MAX_SLEEP_TIME
 	/* Limit sleep(2) time in libsm/clock.c */
 	"_FFR_MAX_SLEEP_TIME",
-#endif /* _FFR_MAX_SLEEP_TIME */
+#endif
 #if _FFR_MDS_NEGOTIATE
 	/* MaxDataSize negotation with libmilter */
 	"_FFR_MDS_NEGOTIATE",
-#endif /* _FFR_MDS_NEGOTIATE */
+#endif
 #if _FFR_MEMSTAT
 	/* Check free memory */
 	"_FFR_MEMSTAT",
-#endif /* _FFR_MEMSTAT */
+#endif
 #if _FFR_MILTER_CHECK
 	"_FFR_MILTER_CHECK",
-#endif /* _FFR_MILTER_CHECK */
+#endif
+#if _FFR_MILTER_CONNECT_REPLYCODE
+	/* milter: propagate replycode returned by connect commands */
+	/* John Gardiner Myers of Proofpoint */
+	"_FFR_MILTER_CONNECT_REPLYCODE ",
+#endif
 #if _FFR_MILTER_CONVERT_ALL_LF_TO_CRLF
 	/*
 	**  milter_body() uses the same conversion algorithm as putbody()
@@ -6362,7 +6381,7 @@ char	*FFRCompileOptions[] =
 	*/
 
 	"_FFR_MILTER_CONVERT_ALL_LF_TO_CRLF",
-#endif /* _FFR_MILTER_CONVERT_ALL_LF_TO_CRLF */
+#endif
 #if _FFR_MILTER_CHECK_REJECTIONS_TOO
 	/*
 	**  Also send RCPTs that are rejected by check_rcpt to a milter
@@ -6370,68 +6389,71 @@ char	*FFRCompileOptions[] =
 	*/
 
 	"_FFR_MILTER_CHECK_REJECTIONS_TOO",
-#endif /* _FFR_MILTER_CHECK_REJECTIONS_TOO */
+#endif
 #if _FFR_MILTER_ENHSC
 	/* extract enhanced status code from milter replies for dsn= logging */
 	"_FFR_MILTER_ENHSC",
-#endif /* _FFR_MILTER_ENHSC */
+#endif
 #if _FFR_MIME7TO8_OLD
 	/* Old mime7to8 code, the new is broken for at least one example. */
 	"_FFR_MIME7TO8_OLD",
-#endif /* _FFR_MAX_SLEEP_TIME */
+#endif
 #if _FFR_MORE_MACROS
 	/* allow more long macro names ("unprintable" characters). */
 	"_FFR_MORE_MACROS",
-#endif /* _FFR_MORE_MACROS */
+#endif
 #if _FFR_MSG_ACCEPT
 	/* allow to override "Message accepted for delivery" */
 	"_FFR_MSG_ACCEPT",
-#endif /* _FFR_MSG_ACCEPT */
+#endif
 #if _FFR_NODELAYDSN_ON_HOLD
 	/* Do not issue a DELAY DSN for mailers that use the hold flag. */
 /* Steven Pitzl */
 	"_FFR_NODELAYDSN_ON_HOLD",
-#endif /* _FFR_NODELAYDSN_ON_HOLD */
+#endif
 #if _FFR_NO_PIPE
 	/* Disable PIPELINING, delay client if used. */
 	"_FFR_NO_PIPE",
-#endif /* _FFR_NO_PIPE */
+#endif
 #if _FFR_LDAP_NETWORK_TIMEOUT
 	/* set LDAP_OPT_NETWORK_TIMEOUT if available (-c) */
 	"_FFR_LDAP_NETWORK_TIMEOUT",
-#endif /* _FFR_LDAP_NETWORK_TIMEOUT */
+#endif
 #if _FFR_LOG_NTRIES
 	/* log ntries=, from Nik Clayton of FreeBSD */
 	"_FFR_LOG_NTRIES",
-#endif /* _FFR_LOG_NTRIES */
+#endif
+#if _FFR_PROXY
+	/* "proxy" (synchronous) delivery mode */
+	"_FFR_PROXY",
+#endif
 #if _FFR_QF_PARANOIA
 	"_FFR_QF_PARANOIA",
-#endif /* _FFR_QF_PARANOIA */
-#if _FFR_QUEUEDELAY
-	/* Exponential queue delay; disabled in 8.13 since it isn't used. */
-	"_FFR_QUEUEDELAY",
-#endif /* _FFR_QUEUEDELAY */
+#endif
 #if _FFR_QUEUE_GROUP_SORTORDER
 	/* Allow QueueSortOrder per queue group. */
 /* XXX: Still need to actually use qgrp->qg_sortorder */
 	"_FFR_QUEUE_GROUP_SORTORDER",
-#endif /* _FFR_QUEUE_GROUP_SORTORDER */
+#endif
 #if _FFR_QUEUE_MACRO
 	/* Define {queue} macro. */
 	"_FFR_QUEUE_MACRO",
-#endif /* _FFR_QUEUE_MACRO */
+#endif
 #if _FFR_QUEUE_RUN_PARANOIA
 	/* Additional checks when doing queue runs; interval of checks */
 	"_FFR_QUEUE_RUN_PARANOIA",
-#endif /* _FFR_QUEUE_RUN_PARANOIA */
+#endif
 #if _FFR_QUEUE_SCHED_DBG
 	/* Debug output for the queue scheduler. */
 	"_FFR_QUEUE_SCHED_DBG",
-#endif /* _FFR_QUEUE_SCHED_DBG */
+#endif
+#if _FFR_RCPTFLAGS
+	"_FFR_RCPTFLAGS",
+#endif
 #if _FFR_RCPTTHROTDELAY
 	/* configurable delay for BadRcptThrottle */
 	"_FFR_RCPTTHROTDELAY",
-#endif /* _FFR_RCPTTHROTDELAY */
+#endif
 #if _FFR_REDIRECTEMPTY
 	/*
 	**  envelope <> can't be sent to mailing lists, only owner-
@@ -6440,19 +6462,19 @@ char	*FFRCompileOptions[] =
 	*/
 
 	"_FFR_REDIRECTEMPTY",
-#endif /* _FFR_REDIRECTEMPTY */
+#endif
 #if _FFR_REJECT_NUL_BYTE
 	/* reject NUL bytes in body */
 	"_FFR_REJECT_NUL_BYTE",
-#endif /* _FFR_REJECT_NUL_BYTE */
+#endif
 #if _FFR_RESET_MACRO_GLOBALS
 	/* Allow macro 'j' to be set dynamically via rulesets. */
 	"_FFR_RESET_MACRO_GLOBALS",
-#endif /* _FFR_RESET_MACRO_GLOBALS */
+#endif
 #if _FFR_RHS
 	/* Random shuffle for queue sorting. */
 	"_FFR_RHS",
-#endif /* _FFR_RHS */
+#endif
 #if _FFR_RUNPQG
 	/*
 	**  allow -qGqueue_group -qp to work, i.e.,
@@ -6460,15 +6482,15 @@ char	*FFRCompileOptions[] =
 	*/
 
 	"_FFR_RUNPQG",
-#endif /* _FFR_RUNPQG */
+#endif
 #if _FFR_SESSID
 	/* session id (for logging) */
 	"_FFR_SESSID",
-#endif /* _FFR_SESSID */
+#endif
 #if _FFR_SHM_STATUS
 	/* Donated code (unused). */
 	"_FFR_SHM_STATUS",
-#endif /* _FFR_SHM_STATUS */
+#endif
 #if _FFR_LDAP_SINGLEDN
 	/*
 	**  The LDAP database map code in Sendmail 8.12.10, when
@@ -6487,15 +6509,15 @@ char	*FFRCompileOptions[] =
 	*/
 
 	"_FFR_LDAP_SINGLEDN",
-#endif /* _FFR_LDAP_SINGLEDN */
+#endif
 #if _FFR_SKIP_DOMAINS
 	/* process every N'th domain instead of every N'th message */
 	"_FFR_SKIP_DOMAINS",
-#endif /* _FFR_SKIP_DOMAINS */
+#endif
 #if _FFR_SLEEP_USE_SELECT
 	/* Use select(2) in libsm/clock.c to emulate sleep(2) */
 	"_FFR_SLEEP_USE_SELECT ",
-#endif /* _FFR_SLEEP_USE_SELECT */
+#endif
 #if _FFR_SPT_ALIGN
 	/*
 	**  It looks like the Compaq Tru64 5.1A now aligns argv and envp to 64
@@ -6507,26 +6529,34 @@ char	*FFRCompileOptions[] =
 
 /* Chris Adams of HiWAAY Informations Services */
 	"_FFR_SPT_ALIGN",
-#endif /* _FFR_SPT_ALIGN */
+#endif
 #if _FFR_SS_PER_DAEMON
 	/* SuperSafe per DaemonPortOptions: 'T' (better letter?) */
 	"_FFR_SS_PER_DAEMON",
-#endif /* _FFR_SS_PER_DAEMON */
+#endif
 #if _FFR_TESTS
 	/* enable some test code */
 	"_FFR_TESTS",
-#endif /* _FFR_TESTS */
+#endif
 #if _FFR_TIMERS
 	/* Donated code (unused). */
 	"_FFR_TIMERS",
-#endif /* _FFR_TIMERS */
-#if _FFR_TLS_1
-	/* More STARTTLS options, e.g., secondary certs. */
-	"_FFR_TLS_1",
-#endif /* _FFR_TLS_1 */
+#endif
 #if _FFR_TLS_EC
 	"_FFR_TLS_EC",
-#endif /* _FFR_TLS_EC */
+#endif
+#if _FFR_TLS_USE_CERTIFICATE_CHAIN_FILE
+	/*
+	**  Use SSL_CTX_use_certificate_chain_file()
+	**  instead of SSL_CTX_use_certificate_file()
+	*/
+
+	"_FFR_TLS_USE_CERTIFICATE_CHAIN_FILE",
+#endif
+#if _FFR_TLS_SE_OPTS
+	/* TLS session options */
+	"_FFR_TLS_SE_OPTS",
+#endif
 #if _FFR_TRUSTED_QF
 	/*
 	**  If we don't own the file mark it as unsafe.
@@ -6535,7 +6565,7 @@ char	*FFRCompileOptions[] =
 	*/
 
 	"_FFR_TRUSTED_QF",
-#endif /* _FFR_TRUSTED_QF */
+#endif
 #if _FFR_USE_GETPWNAM_ERRNO
 	/*
 	**  See libsm/mbdb.c: only enable this on OSs
@@ -6545,15 +6575,18 @@ char	*FFRCompileOptions[] =
 	*/
 
 	"_FFR_USE_GETPWNAM_ERRNO",
-#endif /* _FFR_USE_GETPWNAM_ERRNO */
+#endif
 #if _FFR_USE_SEM_LOCKING
 	"_FFR_USE_SEM_LOCKING",
-#endif /* _FFR_USE_SEM_LOCKING */
+#endif
 #if _FFR_USE_SETLOGIN
 	/* Use setlogin() */
 /* Peter Philipp */
 	"_FFR_USE_SETLOGIN",
-#endif /* _FFR_USE_SETLOGIN */
+#endif
+#if _FFR_XCNCT
+	"_FFR_XCNCT",
+#endif
 	NULL
 };
 
diff --git a/contrib/sendmail/src/daemon.c b/contrib/sendmail/src/daemon.c
index d6b3f497ac10..42883658db89 100644
--- a/contrib/sendmail/src/daemon.c
+++ b/contrib/sendmail/src/daemon.c
@@ -32,7 +32,7 @@ SM_RCSID("@(#)$Id: daemon.c,v 8.698 2013-11-22 20:51:55 ca Exp $")
 #endif /* defined(USE_SOCK_STREAM) */
 
 #if STARTTLS
-#  include 
+# include 
 #endif /* STARTTLS */
 
 #include 
@@ -517,14 +517,12 @@ getrequests(e)
 				macdefine(&BlankEnvelope.e_macro, A_PERM,
 					macid("{daemon_family}"), "unspec");
 				break;
-#if _FFR_DAEMON_NETUNIX
-# if NETUNIX
+#if NETUNIX
 			  case AF_UNIX:
 				macdefine(&BlankEnvelope.e_macro, A_PERM,
 					macid("{daemon_family}"), "local");
 				break;
-# endif /* NETUNIX */
-#endif /* _FFR_DAEMON_NETUNIX */
+#endif /* NETUNIX */
 #if NETINET
 			  case AF_INET:
 				macdefine(&BlankEnvelope.e_macro, A_PERM,
@@ -827,6 +825,17 @@ getrequests(e)
 			OutChannel = outchannel;
 			DisConnected = false;
 
+#if _FFR_XCNCT
+			t = xconnect(inchannel);
+			if (t <= 0)
+			{
+				clrbitn(D_XCNCT, Daemons[curdaemon].d_flags);
+				clrbitn(D_XCNCT_M, Daemons[curdaemon].d_flags);
+			}
+			else
+				setbitn(t, Daemons[curdaemon].d_flags);
+
+#endif /* _FFR_XCNCT */
 
 #if XLA
 			if (!xla_host_ok(RealHostName))
@@ -1060,8 +1069,7 @@ opendaemonsocket(d, firsttime)
 			(void) sleep(5);
 		if (firsttime || d->d_socket < 0)
 		{
-#if _FFR_DAEMON_NETUNIX
-# if NETUNIX
+#if NETUNIX
 			if (d->d_addr.sa.sa_family == AF_UNIX)
 			{
 				int rval;
@@ -1084,8 +1092,7 @@ opendaemonsocket(d, firsttime)
 				/* Don't try to overtake an existing socket */
 				(void) unlink(d->d_addr.sunix.sun_path);
 			}
-# endif /* NETUNIX */
-#endif /* _FFR_DOMAIN_NETUNIX */
+#endif /* NETUNIX */
 			d->d_socket = socket(d->d_addr.sa.sa_family,
 					     SOCK_STREAM, 0);
 			if (d->d_socket < 0)
@@ -1113,7 +1120,7 @@ opendaemonsocket(d, firsttime)
 				continue;
 			}
 
-			if (SM_FD_SETSIZE > 0 && d->d_socket >= SM_FD_SETSIZE)
+			if (!SM_FD_OK_SELECT(d->d_socket))
 			{
 				save_errno = EINVAL;
 				syserr("opendaemonsocket: daemon %s: server SMTP socket (%d) too large",
@@ -1168,13 +1175,11 @@ opendaemonsocket(d, firsttime)
 
 			switch (d->d_addr.sa.sa_family)
 			{
-#if _FFR_DAEMON_NETUNIX
-# ifdef NETUNIX
+#ifdef NETUNIX
 			  case AF_UNIX:
 				socksize = sizeof(d->d_addr.sunix);
 				break;
-# endif /* NETUNIX */
-#endif /* _FFR_DAEMON_NETUNIX */
+#endif /* NETUNIX */
 #if NETINET
 			  case AF_INET:
 				socksize = sizeof(d->d_addr.sin);
@@ -1493,6 +1498,9 @@ setsockaddroptions(p, d)
 			  case SM_DEFER:
 			  case SM_DELIVER:
 			  case SM_FORK:
+#if _FFR_PROXY
+			  case SM_PROXY_REQ:
+#endif /* _FFR_PROXY */
 				d->d_dm = *v;
 				break;
 			  default:
@@ -1512,13 +1520,11 @@ setsockaddroptions(p, d)
 #endif /* !_FFR_DPO_CS */
 			if (isascii(*v) && isdigit(*v))
 				d->d_addr.sa.sa_family = atoi(v);
-#if _FFR_DAEMON_NETUNIX
-# ifdef NETUNIX
+#ifdef NETUNIX
 			else if (sm_strcasecmp(v, "unix") == 0 ||
 				 sm_strcasecmp(v, "local") == 0)
 				d->d_addr.sa.sa_family = AF_UNIX;
-# endif /* NETUNIX */
-#endif /* _FFR_DAEMON_NETUNIX */
+#endif /* NETUNIX */
 #if NETINET
 			else if (sm_strcasecmp(v, "inet") == 0)
 				d->d_addr.sa.sa_family = AF_INET;
@@ -1628,14 +1634,14 @@ setsockaddroptions(p, d)
 	{
 		switch (d->d_addr.sa.sa_family)
 		{
-#if _FFR_DAEMON_NETUNIX
-# if NETUNIX
+#if NETUNIX
 		  case AF_UNIX:
 			if (strlen(addr) >= sizeof(d->d_addr.sunix.sun_path))
 			{
 				errno = ENAMETOOLONG;
-				syserr("setsockaddroptions: domain socket name too long: %s > %d",
-				       addr, sizeof(d->d_addr.sunix.sun_path));
+				syserr("setsockaddroptions: domain socket name too long: %s > %ld",
+				       addr,
+				       (long) sizeof(d->d_addr.sunix.sun_path));
 				break;
 			}
 
@@ -1646,8 +1652,7 @@ setsockaddroptions(p, d)
 					  addr,
 					  sizeof(d->d_addr.sunix.sun_path));
 			break;
-# endif /* NETUNIX */
-#endif	/* _FFR_DAEMON_NETUNIX */
+#endif /* NETUNIX */
 #if NETINET
 		  case AF_INET:
 			if (!isascii(*addr) || !isdigit(*addr) ||
@@ -1998,16 +2003,14 @@ addr_family(addr)
 		return AF_INET6;
 	}
 #endif /* NETINET6 */
-#if _FFR_DAEMON_NETUNIX
-# if NETUNIX
+#if NETUNIX
 	if (*addr == '/')
 	{
 		if (tTd(16, 9))
 			sm_dprintf("addr_family(%s): LOCAL\n", addr);
 		return AF_UNIX;
 	}
-# endif /* NETUNIX */
-#endif	/* _FFR_DAEMON_NETUNIX */
+#endif /* NETUNIX */
 	if (tTd(16, 9))
 		sm_dprintf("addr_family(%s): UNSPEC\n", addr);
 	return AF_UNSPEC;
@@ -2045,7 +2048,7 @@ chkclientmodifiers(flag)
 
 #if MILTER
 /*
-**  SETUP_DAEMON_FILTERS -- Parse per-socket filters
+**  SETUP_DAEMON_MILTERS -- Parse per-socket filters
 **
 **	Parameters:
 **		none
@@ -3047,8 +3050,7 @@ shutdown_daemon()
 			(void) close(Daemons[i].d_socket);
 			Daemons[i].d_socket = -1;
 
-#if _FFR_DAEMON_NETUNIX
-# if NETUNIX
+#if NETUNIX
 			/* Remove named sockets */
 			if (Daemons[i].d_addr.sa.sa_family == AF_UNIX)
 			{
@@ -3070,8 +3072,7 @@ shutdown_daemon()
 						  sm_errstring(errno));
 				}
 			}
-# endif /* NETUNIX */
-#endif	/* _FFR_DAEMON_NETUNIX */
+#endif /* NETUNIX */
 		}
 	}
 
@@ -3413,7 +3414,7 @@ getauthinfo(fd, may_be_forged)
 	char ibuf[MAXNAME + 1];
 	static char hbuf[MAXNAME + MAXAUTHINFO + 11];
 
-	*may_be_forged = false;
+	*may_be_forged = true;
 	falen = sizeof(RealHostAddr);
 	if (isatty(fd) || (i = getpeername(fd, &RealHostAddr.sa, &falen)) < 0 ||
 	    falen <= 0 || RealHostAddr.sa.sa_family == 0)
@@ -3430,6 +3431,8 @@ getauthinfo(fd, may_be_forged)
 				return NULL;
 			errno = 0;
 		}
+
+		*may_be_forged = false;
 		(void) sm_strlcpyn(hbuf, sizeof(hbuf), 2, RealUserName,
 				   "@localhost");
 		if (tTd(9, 1))
@@ -3446,8 +3449,10 @@ getauthinfo(fd, may_be_forged)
 	}
 
 	/* cross check RealHostName with forward DNS lookup */
-	if (anynet_ntoa(&RealHostAddr)[0] != '[' &&
-	    RealHostName[0] != '[')
+	if (anynet_ntoa(&RealHostAddr)[0] == '[' ||
+	    RealHostName[0] == '[')
+		*may_be_forged = false;
+	else
 	{
 		int family;
 
@@ -3473,19 +3478,16 @@ getauthinfo(fd, may_be_forged)
 
 		/* try to match the reverse against the forward lookup */
 		hp = sm_gethostbyname(RealHostName, family);
-		if (hp == NULL)
-		{
-			/* XXX: Could be a temporary error on forward lookup */
-			*may_be_forged = true;
-		}
-		else
+		if (hp != NULL)
 		{
 			for (ha = hp->h_addr_list; *ha != NULL; ha++)
 			{
 				if (addrcmp(hp, *ha, &RealHostAddr) == 0)
+				{
+					*may_be_forged = false;
 					break;
+				}
 			}
-			*may_be_forged = *ha == NULL;
 #if NETINET6
 			freehostent(hp);
 			hp = NULL;
@@ -4259,12 +4261,10 @@ anynet_ntop(s6a, dst, dst_len)
 			return NULL;
 		dst += sz;
 		dst_len -= sz;
-# if _FFR_IPV6_FULL
-		ap = sm_inet6_ntop(s6a, dst, dst_len);
-# else /* _FFR_IPV6_FULL */
-		ap = (char *) inet_ntop(AF_INET6, s6a, dst, dst_len);
-# endif /* _FFR_IPV6_FULL */
-
+		if (UseCompressedIPv6Addresses)
+			ap = (char *) inet_ntop(AF_INET6, s6a, dst, dst_len);
+		else
+			ap = sm_inet6_ntop(s6a, dst, dst_len);
 		/* Restore pointer to beginning of string */
 		if (ap != NULL)
 			ap = d;
diff --git a/contrib/sendmail/src/deliver.c b/contrib/sendmail/src/deliver.c
index 39c484c1a09f..62d02b168b7f 100644
--- a/contrib/sendmail/src/deliver.c
+++ b/contrib/sendmail/src/deliver.c
@@ -37,7 +37,7 @@ static void	sendenvelope __P((ENVELOPE *, int));
 static int	coloncmp __P((const char *, const char *));
 
 #if STARTTLS
-#  include 
+# include 
 static int	starttls __P((MAILER *, MCI *, ENVELOPE *));
 static int	endtlsclt __P((MCI *));
 #endif /* STARTTLS */
@@ -1223,6 +1223,7 @@ should_try_fbsh(e, tried_fallbacksmarthost, hostbuf, hbsz, status)
 	}
 	return false;
 }
+
 /*
 **  DELIVER -- Deliver a message to a list of addresses.
 **
@@ -1392,6 +1393,8 @@ deliver(e, firstto)
 	else
 		p = e->e_from.q_paddr;
 	rpath = remotename(p, m, RF_SENDERADDR|RF_CANONICAL, &rcode, e);
+	if (rcode != EX_OK && bitnset(M_xSMTP, m->m_flags))
+		goto cleanup;
 	if (strlen(rpath) > MAXNAME)
 	{
 		rpath = shortenstring(rpath, MAXSHORTSTR);
@@ -1468,6 +1471,7 @@ deliver(e, firstto)
 		/* running LMTP or SMTP */
 		clever = true;
 		*pvp = NULL;
+		setbitn(M_xSMTP, m->m_flags);
 	}
 	else if (bitnset(M_LMTP, m->m_flags))
 	{
@@ -1600,7 +1604,7 @@ deliver(e, firstto)
 		quarantine = (e->e_quarmsg != NULL);
 		rcode = rscheck("check_compat", e->e_from.q_paddr, to->q_paddr,
 				e, RSF_RMCOMM|RSF_COUNT, 3, NULL,
-				e->e_id, NULL);
+				e->e_id, NULL, NULL);
 		if (rcode == EX_OK)
 		{
 			/* do in-code checking if not discarding */
@@ -2465,8 +2469,8 @@ deliver(e, firstto)
 						       ctladdr->q_gid) == -1
 					    && suidwarn)
 					{
-						syserr("openmailer: initgroups(%s, %d) failed",
-							user, ctladdr->q_gid);
+						syserr("openmailer: initgroups(%s, %ld) failed",
+							user, (long) ctladdr->q_gid);
 						exit(EX_TEMPFAIL);
 					}
 				}
@@ -2492,8 +2496,8 @@ deliver(e, firstto)
 					if (initgroups(DefUser, DefGid) == -1 &&
 					    suidwarn)
 					{
-						syserr("openmailer: initgroups(%s, %d) failed",
-						       DefUser, DefGid);
+						syserr("openmailer: initgroups(%s, %ld) failed",
+						       DefUser, (long) DefGid);
 						exit(EX_TEMPFAIL);
 					}
 				}
@@ -2522,9 +2526,9 @@ deliver(e, firstto)
 				    new_gid != getegid())
 				{
 					/* Only root can change the gid */
-					syserr("openmailer: insufficient privileges to change gid, RunAsUid=%d, new_gid=%d, gid=%d, egid=%d",
-					       (int) RunAsUid, (int) new_gid,
-					       (int) getgid(), (int) getegid());
+					syserr("openmailer: insufficient privileges to change gid, RunAsUid=%ld, new_gid=%ld, gid=%ld, egid=%ld",
+					       (long) RunAsUid, (long) new_gid,
+					       (long) getgid(), (long) getegid());
 					exit(EX_TEMPFAIL);
 				}
 
@@ -2619,8 +2623,8 @@ deliver(e, firstto)
 				if (RunAsUid != 0 && new_euid != RunAsUid)
 				{
 					/* Only root can change the uid */
-					syserr("openmailer: insufficient privileges to change uid, new_euid=%d, RunAsUid=%d",
-					       (int) new_euid, (int) RunAsUid);
+					syserr("openmailer: insufficient privileges to change uid, new_euid=%ld, RunAsUid=%ld",
+					       (long) new_euid, (long) RunAsUid);
 					exit(EX_TEMPFAIL);
 				}
 
@@ -2662,9 +2666,9 @@ deliver(e, firstto)
 			}
 
 			if (tTd(11, 2))
-				sm_dprintf("openmailer: running as r/euid=%d/%d, r/egid=%d/%d\n",
-					   (int) getuid(), (int) geteuid(),
-					   (int) getgid(), (int) getegid());
+				sm_dprintf("openmailer: running as r/euid=%ld/%ld, r/egid=%ld/%ld\n",
+					   (long) getuid(), (long) geteuid(),
+					   (long) getgid(), (long) getegid());
 
 			/* move into some "safe" directory */
 			if (m->m_execdir != NULL)
@@ -2964,8 +2968,8 @@ deliver(e, firstto)
 				QuickAbort = false;
 				SuprErrs = true;
 				if (rscheck("try_tls", host, NULL, e,
-					    RSF_RMCOMM, 7, host, NOQID, NULL)
-								!= EX_OK
+					    RSF_RMCOMM, 7, host, NOQID, NULL,
+					    NULL) != EX_OK
 				    || Errors > olderrors)
 				{
 					usetls = false;
@@ -3039,7 +3043,7 @@ deliver(e, firstto)
 			if (rscheck("tls_server",
 				    macvalue(macid("{verify}"), e),
 				    NULL, e, RSF_RMCOMM|RSF_COUNT, 5,
-				    host, NOQID, NULL) != EX_OK ||
+				    host, NOQID, NULL, NULL) != EX_OK ||
 			    Errors > olderrors ||
 			    rcode == EX_SOFTWARE)
 			{
@@ -3364,7 +3368,7 @@ deliver(e, firstto)
 # if STARTTLS
 				i = rscheck("tls_rcpt", to->q_user, NULL, e,
 					    RSF_RMCOMM|RSF_COUNT, 3,
-					    mci->mci_host, e->e_id, NULL);
+					    mci->mci_host, e->e_id, NULL, NULL);
 				if (i != EX_OK)
 				{
 					markfailure(e, to, mci, i, false);
@@ -3590,7 +3594,7 @@ deliver(e, firstto)
 
 	if (tobuf[0] != '\0')
 	{
-		giveresponse(rcode, NULL, m, mci, ctladdr, xstart, e, tochain);
+		giveresponse(rcode, NULL, m, mci, ctladdr, xstart, e, NULL);
 #if 0
 		/*
 		**  This code is disabled for now because I am not
@@ -4166,14 +4170,13 @@ giveresponse(status, dsn, m, mci, ctladdr, xstart, e, to)
 
 	/*
 	**  Final cleanup.
-	**	Log a record of the transaction.  Compute the new
-	**	ExitStat -- if we already had an error, stick with
-	**	that.
+	**	Log a record of the transaction.  Compute the new ExitStat
+	**	-- if we already had an error, stick with that.
 	*/
 
 	if (OpMode != MD_VERIFY && !bitset(EF_VRFYONLY, e->e_flags) &&
 	    LogLevel > ((status == EX_TEMPFAIL) ? 8 : (status == EX_OK) ? 7 : 6))
-		logdelivery(m, mci, dsn, statmsg + off, ctladdr, xstart, e);
+		logdelivery(m, mci, dsn, statmsg + off, ctladdr, xstart, e, to, status);
 
 	if (tTd(11, 2))
 		sm_dprintf("giveresponse: status=%d, dsn=%s, e->e_message=%s, errnum=%d\n",
@@ -4215,6 +4218,8 @@ giveresponse(status, dsn, m, mci, ctladdr, xstart, e, to)
 **		xstart -- the transaction start time, used for
 **			computing transaction delay.
 **		e -- the current envelope.
+**		to -- the current recipient (NULL if none).
+**		rcode -- status code
 **
 **	Returns:
 **		none
@@ -4224,7 +4229,7 @@ giveresponse(status, dsn, m, mci, ctladdr, xstart, e, to)
 */
 
 void
-logdelivery(m, mci, dsn, status, ctladdr, xstart, e)
+logdelivery(m, mci, dsn, status, ctladdr, xstart, e, to, rcode)
 	MAILER *m;
 	register MCI *mci;
 	char *dsn;
@@ -4232,6 +4237,8 @@ logdelivery(m, mci, dsn, status, ctladdr, xstart, e)
 	ADDRESS *ctladdr;
 	time_t xstart;
 	register ENVELOPE *e;
+	ADDRESS *to;
+	int rcode;
 {
 	register char *bp;
 	register char *p;
@@ -4276,6 +4283,16 @@ logdelivery(m, mci, dsn, status, ctladdr, xstart, e)
 		bp += strlen(bp);
 	}
 
+# if _FFR_LOG_MORE2
+#  if STARTTLS
+	p = macvalue(macid("{verify}"), e);
+	if (p == NULL || *p == '\0')
+		p = "NONE";
+	(void) sm_snprintf(bp, SPACELEFT(buf, bp), ", tls_verify=%.20s", p);
+	bp += strlen(bp);
+#  endif /* STARTTLS */
+# endif /* _FFR_LOG_MORE2 */
+
 	/* pri: changes with each delivery attempt */
 	(void) sm_snprintf(bp, SPACELEFT(buf, bp), ", pri=%ld",
 		PRT_NONNEGL(e->e_msgpriority));
@@ -4342,6 +4359,43 @@ logdelivery(m, mci, dsn, status, ctladdr, xstart, e)
 #  define STATLEN	203
 # endif /* (STATLEN) > 203 */
 
+#if _FFR_LOGREPLY
+	/*
+	**  Notes:
+	**  per-rcpt status: to->q_rstatus
+	**  global status: e->e_text
+	**
+	**  We (re)use STATLEN here, is that a good choice?
+	**
+	**  stat=Deferred: ...
+	**  has sometimes the same text?
+	**
+	**  Note: this doesn't show the stage at which the error happened.
+	**  can/should we log that?
+	**  XS_* in reply() basically encodes the state.
+	*/
+
+	/* only show errors */
+	if (rcode != EX_OK && to != NULL && to->q_rstatus != NULL &&
+	    *to->q_rstatus != '\0')
+	{
+		(void) sm_snprintf(bp, SPACELEFT(buf, bp),
+			", reply=%s",
+			shortenstring(to->q_rstatus, STATLEN));
+		bp += strlen(bp);
+	}
+	else if (rcode != EX_OK && e->e_text != NULL)
+	{
+		(void) sm_snprintf(bp, SPACELEFT(buf, bp),
+			", reply=%d %s%s%s",
+			e->e_rcode,
+			e->e_renhsc,
+			(e->e_renhsc[0] != '\0') ? " " : "",
+			shortenstring(e->e_text, STATLEN));
+		bp += strlen(bp);
+	}
+#endif
+
 	/* stat: max 210 bytes */
 	if ((bp - buf) > (sizeof(buf) - ((STATLEN) + 20)))
 	{
@@ -4368,6 +4422,7 @@ logdelivery(m, mci, dsn, status, ctladdr, xstart, e)
 
 		for (q = p + l; q > p; q--)
 		{
+			/* XXX a comma in an address will break this! */
 			if (*q == ',')
 				break;
 		}
@@ -5327,8 +5382,8 @@ mailfile(filename, mailer, ctladdr, sfflags, e)
 				if (RunAsUid != 0 && RealUid != RunAsUid)
 				{
 					/* Only root can change the uid */
-					syserr("mailfile: insufficient privileges to change uid, RunAsUid=%d, RealUid=%d",
-						(int) RunAsUid, (int) RealUid);
+					syserr("mailfile: insufficient privileges to change uid, RunAsUid=%ld, RealUid=%ld",
+						(long) RunAsUid, (long) RealUid);
 					RETURN(EX_TEMPFAIL);
 				}
 			}
@@ -5368,9 +5423,9 @@ mailfile(filename, mailer, ctladdr, sfflags, e)
 				     RealGid != getegid()))
 				{
 					/* Only root can change the gid */
-					syserr("mailfile: insufficient privileges to change gid, RealGid=%d, RunAsUid=%d, gid=%d, egid=%d",
-					       (int) RealGid, (int) RunAsUid,
-					       (int) getgid(), (int) getegid());
+					syserr("mailfile: insufficient privileges to change gid, RealGid=%ld, RunAsUid=%ld, gid=%ld, egid=%ld",
+					       (long) RealGid, (long) RunAsUid,
+					       (long) getgid(), (long) getegid());
 					RETURN(EX_TEMPFAIL);
 				}
 			}
@@ -5411,8 +5466,8 @@ mailfile(filename, mailer, ctladdr, sfflags, e)
 		{
 			if (initgroups(RealUserName, RealGid) == -1 && suidwarn)
 			{
-				syserr("mailfile: initgroups(%s, %d) failed",
-					RealUserName, RealGid);
+				syserr("mailfile: initgroups(%s, %ld) failed",
+					RealUserName, (long) RealGid);
 				RETURN(EX_TEMPFAIL);
 			}
 		}
@@ -5474,9 +5529,9 @@ mailfile(filename, mailer, ctladdr, sfflags, e)
 		}
 
 		if (tTd(11, 2))
-			sm_dprintf("mailfile: running as r/euid=%d/%d, r/egid=%d/%d\n",
-				(int) getuid(), (int) geteuid(),
-				(int) getgid(), (int) getegid());
+			sm_dprintf("mailfile: running as r/euid=%ld/%ld, r/egid=%ld/%ld\n",
+				(long) getuid(), (long) geteuid(),
+				(long) getgid(), (long) getegid());
 
 
 		/* move into some "safe" directory */
@@ -6163,11 +6218,18 @@ starttls(m, mci, e)
 		}
 		return EX_SOFTWARE;
 	}
+	/* SSL_clear(clt_ssl); ? */
+
+	if (get_tls_se_options(e, clt_ssl, false) != 0)
+	{
+		sm_syslog(LOG_ERR, NOQID,
+			  "STARTTLS=client, get_tls_se_options=fail");
+		return EX_SOFTWARE;
+	}
 
 	rfd = sm_io_getinfo(mci->mci_in, SM_IO_WHAT_FD, NULL);
 	wfd = sm_io_getinfo(mci->mci_out, SM_IO_WHAT_FD, NULL);
 
-	/* SSL_clear(clt_ssl); ? */
 	if (rfd < 0 || wfd < 0 ||
 	    (result = SSL_set_rfd(clt_ssl, rfd)) != 1 ||
 	    (result = SSL_set_wfd(clt_ssl, wfd)) != 1)
@@ -6189,6 +6251,7 @@ starttls(m, mci, e)
 	if ((result = SSL_connect(clt_ssl)) <= 0)
 	{
 		int i, ssl_err;
+		int save_errno = errno;
 
 		ssl_err = SSL_get_error(clt_ssl, result);
 		i = tls_retry(clt_ssl, rfd, wfd, tlsstart,
@@ -6206,7 +6269,7 @@ starttls(m, mci, e)
 			sm_syslog(LOG_WARNING, NOQID,
 				  "STARTTLS=client, error: connect failed=%d, reason=%s, SSL_error=%d, errno=%d, retry=%d",
 				  result, sr == NULL ? "unknown" : sr, ssl_err,
-				  errno, i);
+				  save_errno, i);
 			if (LogLevel > 9)
 				tlslogerr(LOG_WARNING, "client");
 		}
diff --git a/contrib/sendmail/src/envelope.c b/contrib/sendmail/src/envelope.c
index df6c5c781fcd..bae6b0010db7 100644
--- a/contrib/sendmail/src/envelope.c
+++ b/contrib/sendmail/src/envelope.c
@@ -42,11 +42,9 @@ clrsessenvelope(e)
 	macdefine(&e->e_macro, A_PERM, macid("{cipher}"), "");
 	macdefine(&e->e_macro, A_PERM, macid("{tls_version}"), "");
 	macdefine(&e->e_macro, A_PERM, macid("{verify}"), "");
-# if _FFR_TLS_1
 	macdefine(&e->e_macro, A_PERM, macid("{alg_bits}"), "");
 	macdefine(&e->e_macro, A_PERM, macid("{cn_issuer}"), "");
 	macdefine(&e->e_macro, A_PERM, macid("{cn_subject}"), "");
-# endif /* _FFR_TLS_1 */
 #endif /* STARTTLS */
 }
 
@@ -246,6 +244,16 @@ dropenvelope(e, fulldrop, split)
 		e->e_flags |= EF_FATALERRS|EF_CLRQUEUE;
 	}
 
+#if _FFR_PROXY
+	if (tTd(87, 2))
+	{
+		q = e->e_sendqueue;
+		sm_dprintf("dropenvelope: mode=%c, e=%p, sibling=%p, nrcpts=%d, sendqueue=%p, next=%p, state=%d\n",
+			e->e_sendmode, e, e->e_sibling, e->e_nrcpts, q,
+			(q == NULL) ? (void *)0 : q->q_next,
+			(q == NULL) ? -1 : q->q_state);
+	}
+#endif /* _FFR_PROXY */
 
 	e->e_flags &= ~EF_QUEUERUN;
 	for (q = e->e_sendqueue; q != NULL; q = q->q_next)
@@ -253,6 +261,10 @@ dropenvelope(e, fulldrop, split)
 		if (QS_IS_UNDELIVERED(q->q_state))
 			queueit = true;
 
+#if _FFR_PROXY
+		if (queueit && e->e_sendmode == SM_PROXY)
+			queueit = false;
+#endif /* _FFR_PROXY */
 
 		/* see if a notification is needed */
 		if (bitset(QPINGONFAILURE, q->q_flags) &&
@@ -577,9 +589,9 @@ dropenvelope(e, fulldrop, split)
 			if (!split_by_recipient(e) &&
 			    bitset(EF_FATALERRS, e->e_flags))
 			{
-				syserr("!dropenvelope(%s): cannot commit data file %s, uid=%d",
+				syserr("!dropenvelope(%s): cannot commit data file %s, uid=%ld",
 					e->e_id, queuename(e, DATAFL_LETTER),
-					(int) geteuid());
+					(long) geteuid());
 			}
 			for (ee = e->e_sibling; ee != NULL; ee = ee->e_sibling)
 				queueup(ee, false, true);
diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c
index 835fa4b10610..0594eb9ba16c 100644
--- a/contrib/sendmail/src/err.c
+++ b/contrib/sendmail/src/err.c
@@ -94,7 +94,7 @@ fatal_error(exc)
 **	reply code defaults to 451 or 554, depending on errno.
 **
 **	Parameters:
-**		fmt -- the format string.  An optional '!' or '@',
+**		fmt -- the format string.  An optional '!', '@', or '+',
 **			followed by an optional three-digit SMTP
 **			reply code, followed by message text.
 **		(others) -- parameters
@@ -127,8 +127,7 @@ syserr(fmt, va_alist)
 {
 	register char *p;
 	int save_errno = errno;
-	bool panic;
-	bool exiting;
+	bool panic, exiting, keep;
 	char *user;
 	char *enhsc;
 	char *errtxt;
@@ -136,21 +135,22 @@ syserr(fmt, va_alist)
 	char ubuf[80];
 	SM_VA_LOCAL_DECL
 
+	panic = exiting = keep = false;
 	switch (*fmt)
 	{
 	  case '!':
 		++fmt;
-		panic = true;
-		exiting = true;
+		panic = exiting = true;
 		break;
 	  case '@':
 		++fmt;
-		panic = false;
 		exiting = true;
 		break;
+	  case '+':
+		++fmt;
+		keep = true;
+		break;
 	  default:
-		panic = false;
-		exiting = false;
 		break;
 	}
 
@@ -182,7 +182,7 @@ syserr(fmt, va_alist)
 	puterrmsg(MsgBuf);
 
 	/* save this message for mailq printing */
-	if (!panic && CurEnv != NULL)
+	if (!panic && CurEnv != NULL && (!keep || CurEnv->e_message == NULL))
 	{
 		char *nmsg = sm_rpool_strdup_x(CurEnv->e_rpool, errtxt);
 
@@ -479,6 +479,108 @@ message(msg, va_alist)
 	}
 }
 
+#if _FFR_PROXY
+/*
+**  EMESSAGE -- print message (not necessarily an error)
+**	(same as message() but requires reply code and enhanced status code)
+**
+**	Parameters:
+**		replycode -- SMTP reply code.
+**		enhsc -- enhanced status code.
+**		msg -- the message (sm_io_printf fmt) -- it can begin with
+**			an SMTP reply code.  If not, 050 is assumed.
+**		(others) -- sm_io_printf arguments
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		none.
+*/
+
+/*VARARGS3*/
+void
+# ifdef __STDC__
+emessage(const char *replycode, const char *enhsc, const char *msg, ...)
+# else /* __STDC__ */
+emessage(replycode, enhsc, msg, va_alist)
+	const char *replycode;
+	const char *enhsc;
+	const char *msg;
+	va_dcl
+# endif /* __STDC__ */
+{
+	char *errtxt;
+	SM_VA_LOCAL_DECL
+
+	errno = 0;
+	SM_VA_START(ap, msg);
+	errtxt = fmtmsg(MsgBuf, CurEnv->e_to, replycode, enhsc, 0, msg, ap);
+	SM_VA_END(ap);
+	putoutmsg(MsgBuf, false, false);
+
+	/* save this message for mailq printing */
+	switch (MsgBuf[0])
+	{
+	  case '4':
+	  case '8':
+		if (CurEnv->e_message != NULL)
+			break;
+		/* FALLTHROUGH */
+
+	  case '5':
+		if (CurEnv->e_rpool == NULL && CurEnv->e_message != NULL)
+			sm_free(CurEnv->e_message);
+		CurEnv->e_message = sm_rpool_strdup_x(CurEnv->e_rpool, errtxt);
+		break;
+	}
+}
+
+/*
+**  EXTSC -- check and extract a status codes
+**
+**	Parameters:
+**		msg -- string with possible enhanced status code.
+**		delim -- delim for enhanced status code.
+**		replycode -- pointer to storage for SMTP reply code;
+**			must be != NULL and have space for at least
+**			4 characters.
+**		enhsc -- pointer to storage for enhanced status code;
+**			must be != NULL and have space for at least
+**			10 characters ([245].[0-9]{1,3}.[0-9]{1,3})
+**
+**	Returns:
+**		-1  -- no SMTP reply code.
+**		>=3 -- offset of error text in msg.
+**		(<=4  -- no enhanced status code)
+*/
+
+int
+extsc(msg, delim, replycode, enhsc)
+	const char *msg;
+	int delim;
+	char *replycode;
+	char *enhsc;
+{
+	int offset;
+
+	SM_REQUIRE(replycode != NULL);
+	SM_REQUIRE(enhsc != NULL);
+	replycode[0] = '\0';
+	enhsc[0] = '\0';
+	if (msg == NULL)
+		return -1;
+	if (!ISSMTPREPLY(msg))
+		return -1;
+	sm_strlcpy(replycode, msg, 4);
+	if (msg[3] == '\0')
+		return 3;
+	offset = 4;
+	if (isenhsc(msg + 4, delim))
+		offset = extenhsc(msg + 4, delim, enhsc) + 4;
+	return offset;
+}
+#endif /* _FFR_PROXY */
 
 /*
 **  NMESSAGE -- print message (not necessarily an error)
@@ -1138,7 +1240,7 @@ sm_errstring(errnum)
 	}
 
 #if LDAPMAP
-	if (errnum >= E_LDAPBASE)
+	if (errnum >= E_LDAPBASE - E_LDAP_SHIM)
 		return ldap_err2string(errnum - E_LDAPBASE);
 #endif /* LDAPMAP */
 
diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c
index 3c59a40d3ca6..0af72436f7f2 100644
--- a/contrib/sendmail/src/headers.c
+++ b/contrib/sendmail/src/headers.c
@@ -360,7 +360,7 @@ dochompheader(line, pflag, hdrp, e)
 				macdefine(&e->e_macro, A_PERM,
 					macid("{addr_type}"), "h");
 			(void) rscheck(rs, fvalue, NULL, e, rscheckflags, 3,
-				       NULL, e->e_id, NULL);
+				       NULL, e->e_id, NULL, NULL);
 		}
 	}
 
@@ -415,7 +415,7 @@ dochompheader(line, pflag, hdrp, e)
 				**  the RCPT mailer.
 				*/
 
-		    		if (bitnset(M_NOMHHACK,
+				if (bitnset(M_NOMHHACK,
 					    e->e_from.q_mailer->m_flags))
 				{
 					h->h_flags &= ~H_CHECK;
@@ -1194,6 +1194,22 @@ logsender(e, msgid)
 				", daemon=%.20s", p);
 		sbp += strlen(sbp);
 	}
+# if _FFR_LOG_MORE1
+#  if STARTTLS
+	p = macvalue(macid("{verify}"), e);
+	if (p == NULL || *p == '\0')
+		p = "NONE";
+	(void) sm_snprintf(sbp, SPACELEFT(sbuf, sbp), ", tls_verify=%.20s", p);
+	sbp += strlen(sbp);
+#  endif /* STARTTLS */
+#  if SASL
+	p = macvalue(macid("{auth_type}"), e);
+	if (p == NULL || *p == '\0')
+		p = "NONE";
+	(void) sm_snprintf(sbp, SPACELEFT(sbuf, sbp), ", auth=%.20s", p);
+	sbp += strlen(sbp);
+#  endif /* SASL */
+# endif /* _FFR_LOG_MORE1 */
 	sm_syslog(LOG_INFO, e->e_id, "%.850s, relay=%s", sbuf, name);
 
 #else /* (SYSLOG_BUFSIZE) >= 256 */
@@ -1892,8 +1908,10 @@ putheader(mci, hdr, e, flags)
 
 			if (bitset(H_FROM, h->h_flags))
 				oldstyle = false;
-			commaize(h, p, oldstyle, mci, e,
-				 PXLF_HEADER | PXLF_STRIPMQUOTE);
+			if (!commaize(h, p, oldstyle, mci, e,
+				      PXLF_HEADER | PXLF_STRIPMQUOTE)
+			    && bitnset(M_xSMTP, mci->mci_mailer->m_flags))
+				goto writeerr;
 		}
 		else
 		{
@@ -2169,6 +2187,12 @@ commaize(h, p, oldstyle, mci, e, putflags)
 #endif /* USERDB */
 		status = EX_OK;
 		name = remotename(name, mci->mci_mailer, flags, &status, e);
+		if (status != EX_OK && bitnset(M_xSMTP, mci->mci_mailer->m_flags))
+		{
+			if (status == EX_TEMPFAIL)
+				mci->mci_flags |= MCIF_NOTSTICKY;
+			goto writeerr;
+		}
 		if (*name == '\0')
 		{
 			*p = savechar;
diff --git a/contrib/sendmail/src/main.c b/contrib/sendmail/src/main.c
index 511eb023fbf6..38eebbfe2945 100644
--- a/contrib/sendmail/src/main.c
+++ b/contrib/sendmail/src/main.c
@@ -406,9 +406,7 @@ main(argc, argv, envp)
 			  case MD_HOSTSTAT:
 			  case MD_PURGESTAT:
 			  case MD_ARPAFTP:
-#if _FFR_CHECKCONFIG
 			  case MD_CHECKCONFIG:
-#endif /* _FFR_CHECKCONFIG */
 				OpMode = j;
 				break;
 
@@ -645,6 +643,17 @@ main(argc, argv, envp)
 		sm_printoptions(FFRCompileOptions);
 	}
 
+#if STARTTLS
+	if (tTd(0, 14))
+	{
+		/* exit(EX_CONFIG) if different? */
+		sm_dprintf("       OpenSSL: compiled 0x%08x\n",
+			   (uint) OPENSSL_VERSION_NUMBER);
+		sm_dprintf("       OpenSSL: linked   0x%08x\n",
+			   (uint) SSLeay());
+	}
+#endif /* STARTTLS */
+
 	/* clear sendmail's environment */
 	ExternalEnviron = environ;
 	emptyenviron[0] = NULL;
@@ -2566,6 +2575,38 @@ main(argc, argv, envp)
 		**  Set _ macro in BlankEnvelope before calling newenvelope().
 		*/
 
+#if _FFR_XCNCT
+		if (bitnset(D_XCNCT, *p_flags) || bitnset(D_XCNCT_M, *p_flags))
+		{
+			/* copied from getauthinfo() */
+			if (RealHostName == NULL)
+			{
+				RealHostName = newstr(hostnamebyanyaddr(&RealHostAddr));
+				if (strlen(RealHostName) > MAXNAME)
+					RealHostName[MAXNAME] = '\0'; /* XXX - 1 ? */
+			}
+			snprintf(buf, sizeof(buf), "%s [%s]",
+				RealHostName, anynet_ntoa(&RealHostAddr));
+
+			forged = bitnset(D_XCNCT_M, *p_flags);
+			if (forged)
+			{
+				(void) sm_strlcat(buf, " (may be forged)",
+						sizeof(buf));
+				macdefine(&BlankEnvelope.e_macro, A_PERM,
+					  macid("{client_resolve}"), "FORGED");
+			}
+
+			/* HACK! variable used only two times right below */
+			authinfo = buf;
+			if (tTd(75, 9))
+				sm_syslog(LOG_INFO, NOQID,
+					"main: where=not_calling_getauthinfo, RealHostAddr=%s",
+					anynet_ntoa(&RealHostAddr));
+		}
+		else
+		/* WARNING: "non-braced" else */
+#endif /* _FFR_XCNCT */
 		authinfo = getauthinfo(sm_io_getinfo(InChannel, SM_IO_WHAT_FD,
 						     NULL), &forged);
 		macdefine(&BlankEnvelope.e_macro, A_TEMP, '_', authinfo);
@@ -2622,13 +2663,13 @@ main(argc, argv, envp)
 #if NETINET
 		  case AF_INET:
 			(void) sm_snprintf(pbuf, sizeof(pbuf), "%d",
-					   RealHostAddr.sin.sin_port);
+					   ntohs(RealHostAddr.sin.sin_port));
 			break;
 #endif /* NETINET */
 #if NETINET6
 		  case AF_INET6:
 			(void) sm_snprintf(pbuf, sizeof(pbuf), "%d",
-					   RealHostAddr.sin6.sin6_port);
+					   ntohs(RealHostAddr.sin6.sin6_port));
 			break;
 #endif /* NETINET6 */
 		  default:
@@ -3696,12 +3737,12 @@ drop_privileges(to_real_uid)
 	GIDSET_T emptygidset[1];
 
 	if (tTd(47, 1))
-		sm_dprintf("drop_privileges(%d): Real[UG]id=%d:%d, get[ug]id=%d:%d, gete[ug]id=%d:%d, RunAs[UG]id=%d:%d\n",
+		sm_dprintf("drop_privileges(%d): Real[UG]id=%ld:%ld, get[ug]id=%ld:%ld, gete[ug]id=%ld:%ld, RunAs[UG]id=%ld:%ld\n",
 			   (int) to_real_uid,
-			   (int) RealUid, (int) RealGid,
-			   (int) getuid(), (int) getgid(),
-			   (int) geteuid(), (int) getegid(),
-			   (int) RunAsUid, (int) RunAsGid);
+			   (long) RealUid, (long) RealGid,
+			   (long) getuid(), (long) getgid(),
+			   (long) geteuid(), (long) getegid(),
+			   (long) RunAsUid, (long) RunAsGid);
 
 	if (to_real_uid)
 	{
@@ -3776,15 +3817,15 @@ drop_privileges(to_real_uid)
 	{
 		if (setgid(RunAsGid) < 0 && (!UseMSP || getegid() != RunAsGid))
 		{
-			syserr("drop_privileges: setgid(%d) failed",
-			       (int) RunAsGid);
+			syserr("drop_privileges: setgid(%ld) failed",
+			       (long) RunAsGid);
 			rval = EX_OSERR;
 		}
 		errno = 0;
 		if (rval == EX_OK && getegid() != RunAsGid)
 		{
-			syserr("drop_privileges: Unable to set effective gid=%d to RunAsGid=%d",
-			       (int) getegid(), (int) RunAsGid);
+			syserr("drop_privileges: Unable to set effective gid=%ld to RunAsGid=%ld",
+			       (long) getegid(), (long) RunAsGid);
 			rval = EX_OSERR;
 		}
 	}
diff --git a/contrib/sendmail/src/map.c b/contrib/sendmail/src/map.c
index b79f59174864..2cc283e5f52c 100644
--- a/contrib/sendmail/src/map.c
+++ b/contrib/sendmail/src/map.c
@@ -204,6 +204,20 @@ map_parseargs(map, ap)
 			map->map_app = ++p;
 			break;
 
+		  case 'd':
+			{
+				char *h;
+
+				++p;
+				h = strchr(p, ' ');
+				if (h != NULL)
+					*h = '\0';
+				map->map_timeout = convtime(p, 's');
+				if (h != NULL)
+					*h = ' ';
+			}
+			break;
+
 		  case 'T':
 			map->map_tapp = ++p;
 			break;
@@ -1826,7 +1840,7 @@ ndbm_map_store(map, lhs, rhs)
 				data.dptr = buf;
 				if (tTd(38, 9))
 					sm_dprintf("ndbm_map_store append=%s\n",
-						data.dptr);
+						(char *)data.dptr);
 			}
 		}
 		status = dbm_store((DBM *) map->map_db1,
@@ -7366,7 +7380,6 @@ arith_map_lookup(map, name, av, statp)
 	return NULL;
 }
 
-#if _FFR_ARPA_MAP
 char *
 arpa_map_lookup(map, name, av, statp)
 	MAP *map;
@@ -7419,7 +7432,7 @@ arpa_map_lookup(map, name, av, statp)
 	{
 		struct in_addr in_addr;
 
-		r = anynet_pton(AF_INET, name, &in_addr);
+		r = inet_pton(AF_INET, name, &in_addr);
 		if (r == 1)
 		{
 			unsigned char *src;
@@ -7445,7 +7458,6 @@ arpa_map_lookup(map, name, av, statp)
 	}
 	return rval;
 }
-#endif /* _FFR_ARPA_MAP */
 
 #if SOCKETMAP
 
@@ -7466,6 +7478,7 @@ socket_map_open(map, mode)
 {
 	STAB *s;
 	int sock = 0;
+	int tmo;
 	SOCKADDR_LEN_T addrlen = 0;
 	int addrno = 0;
 	int save_errno;
@@ -7865,6 +7878,13 @@ socket_map_open(map, mode)
 		return false;
 	}
 
+	tmo = map->map_timeout;
+	if (tmo == 0)
+		tmo = 30000;	/* default: 30s */
+	else
+		tmo *= 1000;	/* s -> ms */
+	sm_io_setinfo(map->map_db1, SM_IO_WHAT_TIMEOUT, &tmo);
+
 	/* Save connection for reuse */
 	s->s_socketmap = map;
 	return true;
@@ -7999,8 +8019,16 @@ socket_map_lookup(map, name, av, statp)
 
 	if (sm_io_fscanf(f, SM_TIME_DEFAULT, "%9u", &replylen) != 1)
 	{
-		syserr("451 4.3.0 socket_map_lookup(%s): failed to read length parameter of reply",
-			map->map_mname);
+		if (errno == EAGAIN)
+		{
+			syserr("451 4.3.0 socket_map_lookup(%s): read timeout",
+				map->map_mname);
+		}
+		else
+		{
+			syserr("451 4.3.0 socket_map_lookup(%s): failed to read length parameter of reply %d",
+				map->map_mname, errno);
+		}
 		*statp = EX_TEMPFAIL;
 		goto errcl;
 	}
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c
index 773eb16e58ac..c3f925f3cb25 100644
--- a/contrib/sendmail/src/mci.c
+++ b/contrib/sendmail/src/mci.c
@@ -352,6 +352,7 @@ mci_get(host, m)
 #if PIPELINING
 	mci->mci_okrcpts = 0;
 #endif /* PIPELINING */
+	mci->mci_flags &= ~MCIF_NOTSTICKY;
 
 	if (mci->mci_rpool == NULL)
 		mci->mci_rpool = sm_rpool_new_x(NULL);
diff --git a/contrib/sendmail/src/milter.c b/contrib/sendmail/src/milter.c
index cbc4d35bc474..9b3667dc573a 100644
--- a/contrib/sendmail/src/milter.c
+++ b/contrib/sendmail/src/milter.c
@@ -204,7 +204,7 @@ static size_t MilterMaxDataSize = MILTER_MAX_DATA_SIZE;
 	fd_set fds; \
 	struct timeval tv; \
  \
-	if (SM_FD_SETSIZE > 0 && m->mf_sock >= SM_FD_SETSIZE) \
+	if (!SM_FD_OK_SELECT(m->mf_sock)) \
 	{ \
 		if (tTd(64, 5)) \
 			sm_dprintf("milter_%s(%s): socket %d is larger than FD_SETSIZE %d\n", \
@@ -1642,8 +1642,8 @@ milter_set_option(name, val, sticky)
 		    MilterMaxDataSize != MILTER_MDS_1M)
 		{
 			sm_syslog(LOG_WARNING, NOQID,
-				"WARNING: Milter.%s=%d, allowed are only %d, %d, and %d",
-				name, MilterMaxDataSize,
+				"WARNING: Milter.%s=%lu, allowed are only %d, %d, and %d",
+				name, (unsigned long) MilterMaxDataSize,
 				MILTER_MDS_64K, MILTER_MDS_256K,
 				MILTER_MDS_1M);
 			if (MilterMaxDataSize < MILTER_MDS_64K)
@@ -2317,6 +2317,8 @@ milter_getsymlist(m, buf, rlen, offset)
 		offset += MILTER_LEN_BYTES;
 		macros = NULL;
 
+#define SM_M_MACRO_NAME(i) (((i) < SM_ARRAY_SIZE(MilterOptTab) && (i) >= 0) \
+				?  MilterOptTab[i].mo_name : "?")
 		switch (i)
 		{
 		  case SMFIM_CONNECT:
@@ -2330,23 +2332,23 @@ milter_getsymlist(m, buf, rlen, offset)
 			macros = MilterMacros[i][m->mf_idx];
 			m->mf_lflags |= MI_LFLAGS_SYM(i);
 			len = strlen(buf + offset);
-			if (len > 0)
+			if (len >= 0)
 			{
 				r = milter_set_macros(m->mf_name, macros,
 						buf + offset, nummac);
 				if (r >= 0)
 					nummac = r;
 				if (tTd(64, 5))
-					sm_dprintf("milter_getsymlist(%s, %s)=%d\n",
-						m->mf_name, buf + offset, r);
+					sm_dprintf("milter_getsymlist(%s, %s, \"%s\")=%d\n",
+						m->mf_name,
+						SM_M_MACRO_NAME(i),
+						buf + offset, r);
 			}
 			break;
 
 		  default:
 			return -1;
 		}
-		if (len == 0)
-			return -1;
 		offset += len + 1;
 	}
 
@@ -2421,7 +2423,9 @@ milter_negotiate(m, e, milters)
 
 	if (tTd(64, 5))
 		sm_dprintf("milter_negotiate(%s): send: version %lu, fflags 0x%lx, pflags 0x%lx\n",
-			m->mf_name, ntohl(fvers), ntohl(fflags), ntohl(pflags));
+			m->mf_name, (unsigned long) ntohl(fvers),
+			(unsigned long) ntohl(fflags),
+			(unsigned long) ntohl(pflags));
 
 	response = milter_read(m, &rcmd, &rlen, m->mf_timeout[SMFTO_READ], e,
 				"negotiate");
@@ -2526,8 +2530,9 @@ milter_negotiate(m, e, milters)
 		{
 			/* this should not happen... */
 			sm_syslog(LOG_WARNING, NOQID,
-				  "WARNING: Milter.maxdatasize: configured=%d, set by libmilter=%d",
-		    		  MilterMaxDataSize, MILTER_MDS_1M);
+				  "WARNING: Milter.maxdatasize: configured=%lu, set by libmilter=%d",
+				  (unsigned long) MilterMaxDataSize,
+				  MILTER_MDS_1M);
 			MilterMaxDataSize = MILTER_MDS_1M;
 		}
 	}
@@ -2536,16 +2541,18 @@ milter_negotiate(m, e, milters)
 		if (MilterMaxDataSize != MILTER_MDS_256K)
 		{
 			sm_syslog(LOG_WARNING, NOQID,
-				  "WARNING: Milter.maxdatasize: configured=%d, set by libmilter=%d",
-		    		  MilterMaxDataSize, MILTER_MDS_256K);
+				  "WARNING: Milter.maxdatasize: configured=%lu, set by libmilter=%d",
+				  (unsigned long) MilterMaxDataSize,
+				  MILTER_MDS_256K);
 			MilterMaxDataSize = MILTER_MDS_256K;
 		}
 	}
 	else if (MilterMaxDataSize != MILTER_MDS_64K)
 	{
 		sm_syslog(LOG_WARNING, NOQID,
-			  "WARNING: Milter.maxdatasize: configured=%d, set by libmilter=%d",
-	    		  MilterMaxDataSize, MILTER_MDS_64K);
+			  "WARNING: Milter.maxdatasize: configured=%lu, set by libmilter=%d",
+			  (unsigned long) MilterMaxDataSize,
+			  MILTER_MDS_64K);
 		MilterMaxDataSize = MILTER_MDS_64K;
 	}
 	m->mf_pflags &= ~SMFI_INTERNAL;
@@ -3976,6 +3983,7 @@ milter_connect(hostname, addr, e, state)
 	else
 		milter_per_connection_check(e);
 
+#if !_FFR_MILTER_CONNECT_REPLYCODE
 	/*
 	**  SMFIR_REPLYCODE can't work with connect due to
 	**  the requirements of SMTP.  Therefore, ignore the
@@ -4000,6 +4008,7 @@ milter_connect(hostname, addr, e, state)
 			response = NULL;
 		}
 	}
+#endif /* !_FFR_MILTER_CONNECT_REPLYCODE */
 	return response;
 }
 
diff --git a/contrib/sendmail/src/parseaddr.c b/contrib/sendmail/src/parseaddr.c
index 4c787204d734..2adb39caf0c4 100644
--- a/contrib/sendmail/src/parseaddr.c
+++ b/contrib/sendmail/src/parseaddr.c
@@ -2204,8 +2204,9 @@ buildaddr(tv, a, flags, e)
 **			use entire pvp.
 **		buf -- buffer to build the string into.
 **		sz -- size of buf.
-**		spacesub -- the space separator character; if '\0',
-**			use SpaceSub.
+**		spacesub -- the space separator character;
+**			'\0': SpaceSub.
+**			NOSPACESEP: no separator
 **		external -- convert to external form?
 **			(no metacharacters; METAQUOTEs removed, see below)
 **
@@ -2268,7 +2269,7 @@ cataddr(pvp, evp, buf, sz, spacesub, external)
 		char *q;
 
 		natomtok = (IntTokenTab[**pvp & 0xff] == ATM);
-		if (oatomtok && natomtok)
+		if (oatomtok && natomtok && spacesub != NOSPACESEP)
 		{
 			*p++ = spacesub;
 			if (--sz <= 0)
@@ -2362,6 +2363,10 @@ sameaddr(a, b)
 	if (strcmp(a->q_user, b->q_user) != 0)
 		return false;
 
+	/* do the required flags match? */
+	if (!ADDR_FLAGS_MATCH(a, b))
+		return false;
+
 	/* if we have good uids for both but they differ, these are different */
 	if (a->q_mailer == ProgMailer)
 	{
@@ -2409,6 +2414,7 @@ struct qflags
 	unsigned long	qf_bit;
 };
 
+/* :'a,.s;^#define \(Q[A-Z]*\)	.*;	{ "\1",	\1	},; */
 static struct qflags	AddressFlags[] =
 {
 	{ "QGOODUID",		QGOODUID	},
@@ -2426,6 +2432,12 @@ static struct qflags	AddressFlags[] =
 	{ "QDELIVERED",		QDELIVERED	},
 	{ "QDELAYED",		QDELAYED	},
 	{ "QTHISPASS",		QTHISPASS	},
+	{ "QALIAS",		QALIAS		},
+	{ "QBYTRACE",		QBYTRACE	},
+	{ "QBYNDELAY",		QBYNDELAY	},
+	{ "QBYNRELAY",		QBYNRELAY	},
+	{ "QINTBCC",		QINTBCC		},
+	{ "QDYNMAILER",		QDYNMAILER	},
 	{ "QRCPTOK",		QRCPTOK		},
 	{ NULL,			0		}
 };
@@ -2789,7 +2801,7 @@ remotename(name, m, flags, pstat, e)
 	{
 		sm_dprintf("remotename => `");
 		xputs(sm_debug_file(), buf);
-		sm_dprintf("'\n");
+		sm_dprintf("', stat=%d\n", *pstat);
 	}
 	return buf;
 }
@@ -3060,6 +3072,8 @@ dequote_map(map, name, av, statp)
 **		logid -- id for sm_syslog.
 **		addr -- if not NULL and ruleset returns $#error:
 **				store mailer triple here.
+**		addrstr -- if not NULL and ruleset does not return $#:
+**				address string
 **
 **	Returns:
 **		EX_OK -- if the rwset doesn't resolve to $#error
@@ -3067,7 +3081,7 @@ dequote_map(map, name, av, statp)
 */
 
 int
-rscheck(rwset, p1, p2, e, flags, logl, host, logid, addr)
+rscheck(rwset, p1, p2, e, flags, logl, host, logid, addr, addrstr)
 	char *rwset;
 	char *p1;
 	char *p2;
@@ -3077,6 +3091,7 @@ rscheck(rwset, p1, p2, e, flags, logl, host, logid, addr)
 	char *host;
 	char *logid;
 	ADDRESS *addr;
+	char **addrstr;
 {
 	char *volatile buf;
 	size_t bufsize;
@@ -3150,6 +3165,17 @@ rscheck(rwset, p1, p2, e, flags, logl, host, logid, addr)
 		(void) REWRITE(pvp, rsno, e);
 		if (bitset(RSF_UNSTRUCTURED, flags))
 			SuprErrs = saveSuprErrs;
+
+		if (pvp[0] != NULL && (pvp[0][0] & 0377) != CANONNET &&
+		    bitset(RSF_ADDR, flags) && addrstr != NULL)
+		{
+			cataddr(&(pvp[0]), NULL, ubuf, sizeof(ubuf),
+				bitset(RSF_STRING, flags) ? NOSPACESEP : ' ',
+				true);
+			*addrstr = sm_rpool_strdup_x(e->e_rpool, ubuf);
+			goto finis;
+		}
+
 		if (pvp[0] == NULL || (pvp[0][0] & 0377) != CANONNET ||
 		    pvp[1] == NULL || (strcmp(pvp[1], "error") != 0 &&
 				       strcmp(pvp[1], "discard") != 0))
diff --git a/contrib/sendmail/src/queue.c b/contrib/sendmail/src/queue.c
index db339f2e3a4f..a323301fd62b 100644
--- a/contrib/sendmail/src/queue.c
+++ b/contrib/sendmail/src/queue.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2009, 2011, 2012 Proofpoint, Inc. and its suppliers.
+ * Copyright (c) 1998-2009, 2011, 2012, 2014 Proofpoint, Inc. and its suppliers.
  *	All rights reserved.
  * Copyright (c) 1983, 1995-1997 Eric P. Allman.  All rights reserved.
  * Copyright (c) 1988, 1993
@@ -125,13 +125,6 @@ static SM_DEBUG_T DebugLeakQ = SM_DEBUG_INITIALIZER("leak_q",
 	"@(#)$Debug: leak_q - trace memory leaks during queue processing $");
 #endif /* SM_HEAP_CHECK */
 
-/*
-**  We use EmptyString instead of "" to avoid
-**  'zero-length format string' warnings from gcc
-*/
-
-static const char EmptyString[] = "";
-
 static void	grow_wlist __P((int, int));
 static int	multiqueue_cache __P((char *, int, QUEUEGRP *, int, unsigned int *));
 static int	gatherq __P((int, int, bool, bool *, bool *, int *));
@@ -304,7 +297,7 @@ hash_q(p, h)
 **	d	data file directory name (added in 8.12)
 **	E	error recipient
 **	F	flag bits
-**	G	free (was: queue delay algorithm if _FFR_QUEUEDELAY)
+**	G	free
 **	H	header
 **	I	data file's inode number
 **	K	time of last delivery attempt
@@ -320,7 +313,7 @@ hash_q(p, h)
 **	T	init time
 **	V	queue file version
 **	X	free (was: character set if _FFR_SAVE_CHARSET)
-**	Y	free (was: current delay if _FFR_QUEUEDELAY)
+**	Y	free
 **	Z	original envelope id from ESMTP
 **	!	deliver by (added in 8.12)
 **	$	define macro
@@ -404,8 +397,8 @@ queueup(e, announce, msync)
 
 			printopenfds(true);
 			errno = save_errno;
-			syserr("!queueup: cannot create queue file %s, euid=%d, fd=%d, fp=%p",
-				tf, (int) geteuid(), tfd, tfp);
+			syserr("!queueup: cannot create queue file %s, euid=%ld, fd=%d, fp=%p",
+				tf, (long) geteuid(), tfd, tfp);
 			/* NOTREACHED */
 		}
 		e->e_lockfp = tfp;
@@ -427,8 +420,8 @@ queueup(e, announce, msync)
 						break;
 					if (LogLevel > 0 && (i % 32) == 0)
 						sm_syslog(LOG_ALERT, e->e_id,
-							  "queueup: cannot create %s, euid=%d: %s",
-							  tf, (int) geteuid(),
+							  "queueup: cannot create %s, euid=%ld: %s",
+							  tf, (long) geteuid(),
 							  sm_errstring(errno));
 				}
 #if SM_OPEN_EXLOCK
@@ -473,8 +466,8 @@ queueup(e, announce, msync)
 
 			printopenfds(true);
 			errno = save_errno;
-			syserr("!queueup: cannot create queue temp file %s, uid=%d",
-				tf, (int) geteuid());
+			syserr("!queueup: cannot create queue temp file %s, uid=%ld",
+				tf, (long) geteuid());
 		}
 	}
 
@@ -518,8 +511,8 @@ queueup(e, announce, msync)
 		    sm_io_setinfo(e->e_dfp, SM_BF_COMMIT, NULL) < 0 &&
 		    errno != EINVAL)
 		{
-			syserr("!queueup: cannot commit data file %s, uid=%d",
-			       queuename(e, DATAFL_LETTER), (int) geteuid());
+			syserr("!queueup: cannot commit data file %s, uid=%ld",
+			       queuename(e, DATAFL_LETTER), (long) geteuid());
 		}
 		if (e->e_dfp != NULL &&
 		    SuperSafe == SAFE_INTERACTIVE && msync)
@@ -560,8 +553,8 @@ queueup(e, announce, msync)
 		if (dfd < 0 || (dfp = sm_io_open(SmFtStdiofd, SM_TIME_DEFAULT,
 						 (void *) &dfd, SM_IO_WRONLY_B,
 						 NULL)) == NULL)
-			syserr("!queueup: cannot create data temp file %s, uid=%d",
-				df, (int) geteuid());
+			syserr("!queueup: cannot create data temp file %s, uid=%ld",
+				df, (long) geteuid());
 		if (fstat(dfd, &stbuf) < 0)
 			e->e_dfino = -1;
 		else
@@ -595,8 +588,8 @@ queueup(e, announce, msync)
 		}
 
 		if (sm_io_close(dfp, SM_TIME_DEFAULT) < 0)
-			syserr("!queueup: cannot save data temp file %s, uid=%d",
-				df, (int) geteuid());
+			syserr("!queueup: cannot save data temp file %s, uid=%ld",
+				df, (long) geteuid());
 		e->e_putbody = putbody;
 	}
 
@@ -733,9 +726,15 @@ queueup(e, announce, msync)
 			(void) sm_io_putc(tfp, SM_TIME_DEFAULT, 'F');
 		if (bitset(QPINGONDELAY, q->q_flags))
 			(void) sm_io_putc(tfp, SM_TIME_DEFAULT, 'D');
+		if (bitset(QINTBCC, q->q_flags))
+			(void) sm_io_putc(tfp, SM_TIME_DEFAULT, 'B');
 		if (q->q_alias != NULL &&
 		    bitset(QALIAS, q->q_alias->q_flags))
 			(void) sm_io_putc(tfp, SM_TIME_DEFAULT, 'A');
+
+		/* _FFR_RCPTFLAGS */
+		if (bitset(QDYNMAILER, q->q_flags))
+			(void) sm_io_putc(tfp, SM_TIME_DEFAULT, QDYNMAILFLG);
 		(void) sm_io_putc(tfp, SM_TIME_DEFAULT, ':');
 		(void) sm_io_fprintf(tfp, SM_TIME_DEFAULT, "%s\n",
 				     denlstring(q->q_paddr, true, false));
@@ -747,10 +746,10 @@ queueup(e, announce, msync)
 				tag = "quarantined";
 
 			e->e_to = q->q_paddr;
-			message(tag);
+			message("%s", tag);
 			if (LogLevel > 8)
 				logdelivery(q->q_mailer, NULL, q->q_status,
-					    tag, NULL, (time_t) 0, e);
+					    tag, NULL, (time_t) 0, e, q, EX_OK);
 			e->e_to = NULL;
 		}
 		if (tTd(40, 1))
@@ -888,8 +887,8 @@ queueup(e, announce, msync)
 		(void) sm_strlcpy(qf, queuename(e, ANYQFL_LETTER),
 				  sizeof(qf));
 		if (rename(tf, qf) < 0)
-			syserr("cannot rename(%s, %s), uid=%d",
-				tf, qf, (int) geteuid());
+			syserr("cannot rename(%s, %s), uid=%ld",
+				tf, qf, (long) geteuid());
 		else
 		{
 			/*
@@ -1785,7 +1784,7 @@ runner_work(e, sequenceno, didfork, skip, njobs)
 		if (shouldqueue(w->w_pri, w->w_ctime))
 		{
 			if (Verbose)
-				message(EmptyString);
+				message("%s", "");
 			if (QueueSortOrder == QSO_BYPRIORITY)
 			{
 				if (Verbose)
@@ -1813,7 +1812,7 @@ runner_work(e, sequenceno, didfork, skip, njobs)
 		{
 			if (Verbose)
 			{
-				message(EmptyString);
+				message("%s", "");
 				message("Running %s/%s (sequence %d of %d)",
 					qid_printqueue(w->w_qgrp, w->w_qdir),
 					w->w_name + 2, sequenceno, njobs);
@@ -2042,9 +2041,7 @@ run_work_group(wgrp, flags)
 	{
 		IgnoreHostStatus = true;
 		MinQueueAge = 0;
-#if _FFR_EXPDELAY
 		MaxQueueAge = 0;
-#endif /* _FFR_EXPDELAY */
 	}
 
 	/*
@@ -2871,7 +2868,6 @@ gatherq(qgrp, qdir, doall, full, more, pnentries)
 				break;
 
 			  case 'K':
-#if _FFR_EXPDELAY
 				if (MaxQueueAge > 0)
 				{
 					time_t lasttry, delay;
@@ -2884,7 +2880,6 @@ gatherq(qgrp, qdir, doall, full, more, pnentries)
 						w->w_tooyoung = true;
 					break;
 				}
-#endif /* _FFR_EXPDELAY */
 
 				age = curtime() - (time_t) atol(&lbuf[1]);
 				if (age >= 0 && MinQueueAge > 0 &&
@@ -4096,8 +4091,9 @@ readqf(e, openonly)
 		if (LogLevel > 0)
 		{
 			sm_syslog(LOG_ALERT, e->e_id,
-				  "bogus queue file, uid=%d, gid=%d, mode=%o",
-				  st.st_uid, st.st_gid, st.st_mode);
+				  "bogus queue file, uid=%ld, gid=%ld, mode=%o",
+				  (long) st.st_uid, (long) st.st_gid,
+				  (unsigned int) st.st_mode);
 		}
 		if (tTd(40, 8))
 			sm_dprintf("readqf(%s): bogus file\n", qf);
@@ -4418,6 +4414,14 @@ readqf(e, openonly)
 							ctladdr->q_flags |= QALIAS;
 						break;
 
+					  case 'B':
+						qflags |= QINTBCC;
+						break;
+
+					  case QDYNMAILFLG:
+						qflags |= QDYNMAILER;
+						break;
+
 					  default: /* ignore or complain? */
 						break;
 					}
@@ -4426,7 +4430,7 @@ readqf(e, openonly)
 			else
 				qflags |= QPRIMARY;
 			macdefine(&e->e_macro, A_PERM, macid("{addr_type}"),
-				"e r");
+				((qflags & QINTBCC) != 0) ? "e b" : "e r");
 			if (*p != '\0')
 				q = parseaddr(++p, NULLADDR, RF_COPYALL, '\0',
 						NULL, e, true);
@@ -4443,6 +4447,10 @@ readqf(e, openonly)
 				q->q_flags |= qflags;
 				q->q_finalrcpt = frcpt;
 				q->q_orcpt = orcpt;
+#if _FFR_RCPTFLAGS
+				if (bitset(QDYNMAILER, qflags))
+					newmodmailer(q, QDYNMAILFLG);
+#endif
 				(void) recipient(q, &e->e_sendqueue, 0, e);
 			}
 			frcpt = NULL;
@@ -4500,24 +4508,6 @@ readqf(e, openonly)
 			nomore = true;
 			break;
 
-#if _FFR_QUEUEDELAY
-		  case 'G':
-		  case 'Y':
-
-			/*
-			**  Maintain backward compatibility for
-			**  users who defined _FFR_QUEUEDELAY in
-			**  previous releases.  Remove this
-			**  code in 8.14 or 8.15.
-			*/
-
-			if (qfver == 5 || qfver == 7)
-				break;
-
-			/* If not qfver 5 or 7, then 'G' or 'Y' is invalid */
-			/* FALLTHROUGH */
-#endif /* _FFR_QUEUEDELAY */
-
 		  default:
 			syserr("readqf: %s: line %d: bad line \"%s\"",
 				qf, LineNumber, shortenstring(bp, MAXSHORTSTR));
@@ -4635,6 +4625,14 @@ readqf(e, openonly)
 
 static void prtstr __P((char *, int));
 
+#if _FFR_BOUNCE_QUEUE
+# define SKIP_BOUNCE_QUEUE	\
+		if (i == BounceQueue)	\
+			continue;
+#else
+# define SKIP_BOUNCE_QUEUE
+#endif
+
 static void
 prtstr(s, ml)
 	char *s;
@@ -4698,6 +4696,7 @@ printnqe(out, prefix)
 	{
 		int j;
 
+		SKIP_BOUNCE_QUEUE
 		k++;
 		for (j = 0; j < Queue[i]->qg_numqueues; j++)
 		{
@@ -5643,8 +5642,8 @@ loseqfile(e, why)
 	{
 		p = queuename(e, LOSEQF_LETTER);
 		if (rename(buf, p) < 0)
-			syserr("cannot rename(%s, %s), uid=%d",
-			       buf, p, (int) geteuid());
+			syserr("cannot rename(%s, %s), uid=%ld",
+			       buf, p, (long) geteuid());
 		else if (LogLevel > 0)
 			sm_syslog(LOG_ALERT, e->e_id,
 				  "Losing %s: %s", buf, why);
@@ -6656,8 +6655,8 @@ init_sem(owner)
 		r = sm_semsetowner(SemId, RunAsUid, RunAsGid, 0660);
 		if (r != 0)
 			sm_syslog(LOG_ERR, NOQID,
-				"key=%ld, sm_semsetowner=%d, RunAsUid=%d, RunAsGid=%d",
-				(long) SemKey, r, RunAsUid, RunAsGid);
+				"key=%ld, sm_semsetowner=%d, RunAsUid=%ld, RunAsGid=%ld",
+				(long) SemKey, r, (long) RunAsUid, (long) RunAsGid);
 	}
 #endif /* SM_CONF_SEM */
 #endif /* _FFR_USE_SEM_LOCKING */
@@ -6734,11 +6733,12 @@ upd_qs(e, count, space, where)
 	if (QSHM_ENTRIES(idx) >= 0 && count != 0)
 	{
 # if _FFR_USE_SEM_LOCKING
-		r = sm_sem_acq(SemId, 0, 1);
+		if (SemId >= 0)
+			r = sm_sem_acq(SemId, 0, 1);
 # endif /* _FFR_USE_SEM_LOCKING */
 		QSHM_ENTRIES(idx) += count;
 # if _FFR_USE_SEM_LOCKING
-		if (r >= 0)
+		if (SemId >= 0 && r >= 0)
 			r = sm_sem_rel(SemId, 0, 1);
 # endif /* _FFR_USE_SEM_LOCKING */
 	}
@@ -6815,8 +6815,8 @@ write_key_file(keypath, key)
 				int err = errno;
 
 				sm_syslog(LOG_ALERT, NOQID,
-					  "ownership change on %s to %d failed: %s",
-					  keypath, RunAsUid, sm_errstring(err));
+					  "ownership change on %s to %ld failed: %s",
+					  keypath, (long) RunAsUid, sm_errstring(err));
 			}
 #  endif /* HASFCHOWN */
 		}
@@ -6966,8 +6966,8 @@ init_shm(qn, owner, hash)
 			i = sm_shmsetowner(ShmId, RunAsUid, RunAsGid, 0660);
 			if (i != 0)
 				sm_syslog(LOG_ERR, NOQID,
-					"key=%ld, sm_shmsetowner=%d, RunAsUid=%d, RunAsGid=%d",
-					(long) ShmKey, i, RunAsUid, RunAsGid);
+					"key=%ld, sm_shmsetowner=%d, RunAsUid=%ld, RunAsGid=%ld",
+					(long) ShmKey, i, (long) RunAsUid, (long) RunAsGid);
 		}
 		p = (int *) Pshm;
 		if (owner)
@@ -7155,19 +7155,19 @@ setup_queues(owner)
 		    safefile(" ", RunAsUid, RunAsGid, RunAsUserName, sff,
 			     QueueFileMode, NULL) != 0)
 		{
-			syserr("can not write to queue directory %s (RunAsGid=%d, required=%d)",
-				basedir, (int) RunAsGid, (int) st.st_gid);
+			syserr("can not write to queue directory %s (RunAsGid=%ld, required=%ld)",
+				basedir, (long) RunAsGid, (long) st.st_gid);
 		}
 		if (bitset(S_IWOTH|S_IXOTH, st.st_mode))
 		{
 #if _FFR_MSP_PARANOIA
 			syserr("dangerous permissions=%o on queue directory %s",
-				(int) st.st_mode, basedir);
+				(unsigned int) st.st_mode, basedir);
 #else /* _FFR_MSP_PARANOIA */
 			if (LogLevel > 0)
 				sm_syslog(LOG_ERR, NOQID,
 					  "dangerous permissions=%o on queue directory %s",
-					  (int) st.st_mode, basedir);
+					  (unsigned int) st.st_mode, basedir);
 #endif /* _FFR_MSP_PARANOIA */
 		}
 #if _FFR_MSP_PARANOIA
@@ -7619,7 +7619,7 @@ cmpidx(a, b)
 }
 
 /*
-**  MAKEWORKGROUP -- balance queue groups into work groups per MaxQueueChildren
+**  MAKEWORKGROUPS -- balance queue groups into work groups per MaxQueueChildren
 **
 **  Take the now defined queue groups and assign them to work groups.
 **  This is done to balance out the number of concurrently active
@@ -7691,6 +7691,7 @@ makeworkgroups()
 	NumWorkGroups = 0;
 	for (i = 0; i < NumQueue; i++)
 	{
+		SKIP_BOUNCE_QUEUE
 		total_runners += si[i].sg_maxqrun;
 		if (MaxQueueChildren <= 0 || total_runners <= MaxQueueChildren)
 			NumWorkGroups++;
@@ -7716,6 +7717,8 @@ makeworkgroups()
 	dir = 1;
 	for (i = 0; i < NumQueue; i++)
 	{
+		SKIP_BOUNCE_QUEUE
+
 		/* a to-and-fro packing scheme, continue from last position */
 		if (j >= NumWorkGroups)
 		{
diff --git a/contrib/sendmail/src/readcf.c b/contrib/sendmail/src/readcf.c
index fc3bb900f896..2b0fbf711cf5 100644
--- a/contrib/sendmail/src/readcf.c
+++ b/contrib/sendmail/src/readcf.c
@@ -33,6 +33,51 @@ static void	toomany __P((int, int));
 static char	*extrquotstr __P((char *, char **, char *, bool *));
 static void	parse_class_words __P((int, char *));
 
+
+#if _FFR_BOUNCE_QUEUE
+static char *bouncequeue = NULL;
+static void initbouncequeue __P((void));
+
+/*
+**  INITBOUNCEQUEUE -- determine BounceQueue if option is set.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		sets BounceQueue
+*/
+
+static void
+initbouncequeue()
+{
+	STAB *s;
+
+	BounceQueue = NOQGRP;
+	if (bouncequeue == NULL || bouncequeue[0] == '\0')
+		return;
+
+	s = stab(bouncequeue, ST_QUEUE, ST_FIND);
+	if (s == NULL)
+	{
+		(void) sm_io_fprintf(smioout, SM_TIME_DEFAULT,
+			"Warning: option BounceQueue: unknown queue group %s\n",
+			bouncequeue);
+	}
+	else
+		BounceQueue = s->s_quegrp->qg_index;
+}
+#endif /* _FFR_BOUNCE_QUEUE */
+
+#if _FFR_RCPTFLAGS
+void setupdynmailers __P((void));
+#else
+#define setupdynmailers()
+#endif
+
 /*
 **  READCF -- read configuration file.
 **
@@ -117,12 +162,12 @@ readcf(cfname, safe, e)
 #if STARTTLS
 	Srv_SSL_Options = SSL_OP_ALL;
 	Clt_SSL_Options = SSL_OP_ALL
-#ifdef SSL_OP_NO_SSLv2
+# ifdef SSL_OP_NO_SSLv2
 		| SSL_OP_NO_SSLv2
-#endif
-#ifdef SSL_OP_NO_TICKET
+# endif
+# ifdef SSL_OP_NO_TICKET
 		| SSL_OP_NO_TICKET
-#endif
+# endif
 		;
 # ifdef SSL_OP_TLSEXT_PADDING
 	/* SSL_OP_TLSEXT_PADDING breaks compatibility with some sites */
@@ -730,6 +775,10 @@ readcf(cfname, safe, e)
 	(void) sm_io_close(cf, SM_TIME_DEFAULT);
 	FileName = NULL;
 
+#if _FFR_BOUNCE_QUEUE
+	initbouncequeue();
+#endif
+
 	/* initialize host maps from local service tables */
 	inithostmaps();
 
@@ -756,6 +805,7 @@ readcf(cfname, safe, e)
 			}
 		}
 	}
+	setupdynmailers();
 }
 
 /*
@@ -1175,6 +1225,125 @@ fileclass(class, filename, fmt, ismap, safe, optional)
 	if (pid > 0)
 		(void) waitfor(pid);
 }
+
+#if _FFR_RCPTFLAGS
+/* first character for dynamically created mailers */
+static char dynmailerp = ' ';
+
+/* list of first characters for cf defined mailers */
+static char frst[MAXMAILERS + 1];
+
+/*
+**  SETUPDYNMAILERS -- find a char that isn't used as first element of any
+**		mailer name.
+**
+**	Parameters:
+**		none
+**
+**	Returns:
+**		none
+**	
+**	Note: space is not valid in cf defined mailers hence the function
+**		will always find a char. It's not nice, but this is for
+**		internal names only.
+*/
+
+void
+setupdynmailers()
+{
+	int i;
+	char pp[] = "YXZ0123456789ABCDEFGHIJKLMNOPQRSTUVWyxzabcfghijkmnoqtuvw ";
+
+	frst[MAXMAILERS] = '\0';
+	for (i = 0; i < strlen(pp); i++)
+	{
+		if (strchr(frst, pp[i]) == NULL)
+		{
+			dynmailerp = pp[i];
+			if (tTd(25, 8))
+				sm_dprintf("dynmailerp=%c\n", dynmailerp);
+			return;
+		}
+	}
+
+	/* NOTREACHED */
+	SM_ASSERT(0);
+}
+
+/*
+**  NEWMODMAILER -- Create a new mailer with modifications
+**
+**	Parameters:
+**		rcpt -- current RCPT
+**		fl -- flag to set
+**
+**	Returns:
+**		true iff successful.
+**
+**	Note: this creates a copy of the mailer for the rcpt and
+**		modifies exactly one flag.  It does not work
+**		for multiple flags!
+*/
+
+bool
+newmodmailer(rcpt, fl)
+	ADDRESS *rcpt;
+	int fl;
+{
+	int idx;
+	struct mailer *m;
+	STAB *s;
+	char mname[256];
+
+	SM_REQUIRE(rcpt != NULL);
+	if (rcpt->q_mailer == NULL)
+		return false;
+	if (tTd(25, 8))
+		sm_dprintf("newmodmailer: rcpt=%s\n", rcpt->q_paddr);
+	SM_REQUIRE(rcpt->q_mailer->m_name != NULL);
+	SM_REQUIRE(rcpt->q_mailer->m_name[0] != '\0');
+	sm_strlcpy(mname, rcpt->q_mailer->m_name, sizeof(mname));
+	mname[0] = dynmailerp;
+	if (tTd(25, 8))
+		sm_dprintf("newmodmailer: name=%s\n", mname);
+	s = stab(mname, ST_MAILER, ST_ENTER);
+	if (s->s_mailer != NULL)
+	{
+		idx = s->s_mailer->m_mno;
+		if (tTd(25, 6))
+			sm_dprintf("newmodmailer: found idx=%d\n", idx);
+	}
+	else
+	{
+		idx = rcpt->q_mailer->m_mno;
+		idx += MAXMAILERS;
+		if (tTd(25, 6))
+			sm_dprintf("newmodmailer: idx=%d\n", idx);
+		if (idx > SM_ARRAY_SIZE(Mailer))
+			return false;
+	}
+
+	m = Mailer[idx];
+	if (m == NULL)
+		m = (struct mailer *) xalloc(sizeof(*m));
+	memset((char *) m, '\0', sizeof(*m));
+	STRUCTCOPY(*rcpt->q_mailer, *m);
+	Mailer[idx] = m;
+
+	/* "modify" the mailer */
+	setbitn(bitidx(fl), m->m_flags);
+	rcpt->q_mailer = m;
+	m->m_mno = idx;
+	m->m_name = newstr(mname);
+	if (tTd(25, 1))
+		sm_dprintf("newmodmailer: mailer[%d]=%s %p\n",
+			idx, Mailer[idx]->m_name, Mailer[idx]);
+
+	return true;
+}
+
+#endif /* _FFR_RCPTFLAGS */
+
 /*
 **  MAKEMAILER -- define a new mailer.
 **
@@ -1208,6 +1377,7 @@ fileclass(class, filename, fmt, ismap, safe, optional)
 **		enters the mailer into the mailer table.
 */
 
+
 void
 makemailer(line)
 	char *line;
@@ -1238,6 +1408,9 @@ makemailer(line)
 		return;
 	}
 	m->m_name = newstr(line);
+#if _FFR_RCPTFLAGS
+	frst[nextmailer] = line[0];
+#endif
 	m->m_qgrp = NOQGRP;
 	m->m_uid = NO_UID;
 	m->m_gid = NO_GID;
@@ -1279,12 +1452,10 @@ makemailer(line)
 			{
 				if (!(isascii(*p) && isspace(*p)))
 				{
-#if _FFR_DEPRECATE_MAILER_FLAG_I
 					if (*p == M_INTERNAL)
 						sm_syslog(LOG_WARNING, NOQID,
 							  "WARNING: mailer=%s, flag=%c deprecated",
 							  m->m_name, *p);
-#endif /* _FFR_DEPRECATE_MAILER_FLAG_I */
 					setbitn(bitidx(*p), m->m_flags);
 				}
 			}
@@ -1416,7 +1587,11 @@ makemailer(line)
 				struct passwd *pw;
 
 				while (*p != '\0' && isascii(*p) &&
+# if _FFR_DOTTED_USERNAMES
+				       (isalnum(*p) || strchr(SM_PWN_CHARS, *p) != NULL))
+# else /* _FFR_DOTTED_USERNAMES */
 				       (isalnum(*p) || strchr("-_", *p) != NULL))
+# endif /* _FFR_DOTTED_USERNAMES */
 					p++;
 				while (isascii(*p) && isspace(*p))
 					*p++ = '\0';
@@ -1460,7 +1635,8 @@ makemailer(line)
 				char *q = p;
 				struct group *gr;
 
-				while (isascii(*p) && isalnum(*p))
+				while (isascii(*p) &&
+				       (isalnum(*p) || strchr(SM_PWN_CHARS, *p) != NULL))
 					p++;
 				*p++ = '\0';
 				if (*q == '\0')
@@ -1939,6 +2115,439 @@ printmailer(fp, m)
 	}
 	(void) sm_io_fprintf(fp, SM_TIME_DEFAULT, "\n");
 }
+
+#if STARTTLS
+static struct ssl_options
+{
+	const char	*sslopt_name;	/* name of the flag */
+	long		sslopt_bits;	/* bits to set/clear */
+} SSL_Option[] =
+{
+/* Workaround for bugs are turned on by default (as well as some others) */
+#ifdef SSL_OP_MICROSOFT_SESS_ID_BUG
+	{ "SSL_OP_MICROSOFT_SESS_ID_BUG",	SSL_OP_MICROSOFT_SESS_ID_BUG	},
+#endif
+#ifdef SSL_OP_NETSCAPE_CHALLENGE_BUG
+	{ "SSL_OP_NETSCAPE_CHALLENGE_BUG",	SSL_OP_NETSCAPE_CHALLENGE_BUG	},
+#endif
+#ifdef SSL_OP_LEGACY_SERVER_CONNECT
+	{ "SSL_OP_LEGACY_SERVER_CONNECT",	SSL_OP_LEGACY_SERVER_CONNECT	},
+#endif
+#ifdef SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG
+	{ "SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG",	SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG	},
+#endif
+#ifdef SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG
+	{ "SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG",	SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG	},
+#endif
+#ifdef SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER
+	{ "SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER",	SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER	},
+#endif
+#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING
+	{ "SSL_OP_MSIE_SSLV2_RSA_PADDING",	SSL_OP_MSIE_SSLV2_RSA_PADDING	},
+#endif
+#ifdef SSL_OP_SSLEAY_080_CLIENT_DH_BUG
+	{ "SSL_OP_SSLEAY_080_CLIENT_DH_BUG",	SSL_OP_SSLEAY_080_CLIENT_DH_BUG	},
+#endif
+#ifdef SSL_OP_TLS_D5_BUG
+	{ "SSL_OP_TLS_D5_BUG",	SSL_OP_TLS_D5_BUG	},
+#endif
+#ifdef SSL_OP_TLS_BLOCK_PADDING_BUG
+	{ "SSL_OP_TLS_BLOCK_PADDING_BUG",	SSL_OP_TLS_BLOCK_PADDING_BUG	},
+#endif
+#ifdef SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
+	{ "SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS",	SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS	},
+#endif
+#ifdef SSL_OP_ALL
+	{ "SSL_OP_ALL",	SSL_OP_ALL	},
+#endif
+#ifdef SSL_OP_NO_QUERY_MTU
+	{ "SSL_OP_NO_QUERY_MTU",	SSL_OP_NO_QUERY_MTU	},
+#endif
+#ifdef SSL_OP_COOKIE_EXCHANGE
+	{ "SSL_OP_COOKIE_EXCHANGE",	SSL_OP_COOKIE_EXCHANGE	},
+#endif
+#ifdef SSL_OP_NO_TICKET
+	{ "SSL_OP_NO_TICKET",	SSL_OP_NO_TICKET	},
+#endif
+#ifdef SSL_OP_CISCO_ANYCONNECT
+	{ "SSL_OP_CISCO_ANYCONNECT",	SSL_OP_CISCO_ANYCONNECT	},
+#endif
+#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
+	{ "SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION",	SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION	},
+#endif
+#ifdef SSL_OP_NO_COMPRESSION
+	{ "SSL_OP_NO_COMPRESSION",	SSL_OP_NO_COMPRESSION	},
+#endif
+#ifdef SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
+	{ "SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION",	SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION	},
+#endif
+#ifdef SSL_OP_SINGLE_ECDH_USE
+	{ "SSL_OP_SINGLE_ECDH_USE",	SSL_OP_SINGLE_ECDH_USE	},
+#endif
+#ifdef SSL_OP_SINGLE_DH_USE
+	{ "SSL_OP_SINGLE_DH_USE",	SSL_OP_SINGLE_DH_USE	},
+#endif
+#ifdef SSL_OP_EPHEMERAL_RSA
+	{ "SSL_OP_EPHEMERAL_RSA",	SSL_OP_EPHEMERAL_RSA	},
+#endif
+#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE
+	{ "SSL_OP_CIPHER_SERVER_PREFERENCE",	SSL_OP_CIPHER_SERVER_PREFERENCE	},
+#endif
+#ifdef SSL_OP_TLS_ROLLBACK_BUG
+	{ "SSL_OP_TLS_ROLLBACK_BUG",	SSL_OP_TLS_ROLLBACK_BUG	},
+#endif
+#ifdef SSL_OP_NO_SSLv2
+	{ "SSL_OP_NO_SSLv2",	SSL_OP_NO_SSLv2	},
+#endif
+#ifdef SSL_OP_NO_SSLv3
+	{ "SSL_OP_NO_SSLv3",	SSL_OP_NO_SSLv3	},
+#endif
+#ifdef SSL_OP_NO_TLSv1
+	{ "SSL_OP_NO_TLSv1",	SSL_OP_NO_TLSv1	},
+#endif
+#ifdef SSL_OP_NO_TLSv1_2
+	{ "SSL_OP_NO_TLSv1_2",	SSL_OP_NO_TLSv1_2	},
+#endif
+#ifdef SSL_OP_NO_TLSv1_1
+	{ "SSL_OP_NO_TLSv1_1",	SSL_OP_NO_TLSv1_1	},
+#endif
+#ifdef SSL_OP_PKCS1_CHECK_1
+	{ "SSL_OP_PKCS1_CHECK_1",	SSL_OP_PKCS1_CHECK_1	},
+#endif
+#ifdef SSL_OP_PKCS1_CHECK_2
+	{ "SSL_OP_PKCS1_CHECK_2",	SSL_OP_PKCS1_CHECK_2	},
+#endif
+#ifdef SSL_OP_NETSCAPE_CA_DN_BUG
+	{ "SSL_OP_NETSCAPE_CA_DN_BUG",	SSL_OP_NETSCAPE_CA_DN_BUG	},
+#endif
+#ifdef SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG
+	{ "SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG",	SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG	},
+#endif
+#ifdef SSL_OP_CRYPTOPRO_TLSEXT_BUG
+	{ "SSL_OP_CRYPTOPRO_TLSEXT_BUG",	SSL_OP_CRYPTOPRO_TLSEXT_BUG	},
+#endif
+#ifdef SSL_OP_TLSEXT_PADDING
+	{ "SSL_OP_TLSEXT_PADDING",	SSL_OP_TLSEXT_PADDING	},
+#endif
+	{ NULL,		0		}
+};
+
+/*
+** READSSLOPTIONS  -- read SSL_OP_* values
+**
+**	Parameters:
+**		opt -- name of option (can be NULL)
+**		val -- string with SSL_OP_* values or hex value
+**		delim -- end of string (e.g., '\0' or ';')
+**		pssloptions -- return value (output)
+**
+**	Returns:
+**		0 on success.
+*/
+
+#define SSLOPERR_NAN	1
+#define SSLOPERR_NOTFOUND	2
+#define SM_ISSPACE(c)	(isascii(c) && isspace(c))
+
+static int
+readssloptions(opt, val, pssloptions, delim)
+	char *opt;
+	char *val;
+	unsigned long *pssloptions;
+	int delim;
+{
+	char *p;
+	int ret;
+
+	ret = 0;
+	for (p = val; *p != '\0' && *p != delim; )
+	{
+		bool clearmode;
+		char *q;
+		unsigned long sslopt_val;
+		struct ssl_options *sslopts;
+
+		while (*p == ' ')
+			p++;
+		if (*p == '\0')
+			break;
+		clearmode = false;
+		if (*p == '-' || *p == '+')
+			clearmode = *p++ == '-';
+		q = p;
+		while (*p != '\0' && !(SM_ISSPACE(*p)) && *p != ',')
+			p++;
+		if (*p != '\0')
+			*p++ = '\0';
+		sslopt_val = 0;
+		if (isdigit(*q))
+		{
+			char *end;
+
+			sslopt_val = strtoul(q, &end, 0);
+
+			/* not a complete "syntax" check but good enough */
+			if (end == q)
+			{
+				errno = 0;
+				ret = SSLOPERR_NAN;
+				if (opt != NULL)
+					syserr("readcf: %s option value %s not a number",
+						opt, q);
+				sslopt_val = 0;
+			}
+		}
+		else
+		{
+			for (sslopts = SSL_Option;
+			     sslopts->sslopt_name != NULL; sslopts++)
+			{
+				if (sm_strcasecmp(q, sslopts->sslopt_name) == 0)
+				{
+					sslopt_val = sslopts->sslopt_bits;
+					break;
+				}
+			}
+			if (sslopts->sslopt_name == NULL)
+			{
+				errno = 0;
+				ret = SSLOPERR_NOTFOUND;
+				if (opt != NULL)
+					syserr("readcf: %s option value %s unrecognized",
+						opt, q);
+			}
+		}
+		if (sslopt_val != 0)
+		{
+			if (clearmode)
+				*pssloptions &= ~sslopt_val;
+			else
+				*pssloptions |= sslopt_val;
+		}
+	}
+	return ret;
+}
+
+# if _FFR_TLS_SE_OPTS
+/*
+** GET_TLS_SE_OPTIONS -- get TLS session options (from ruleset)
+**
+**	Parameters:
+**		e -- envelope
+**		ssl -- TLS session context
+**		srv -- server?
+**
+**	Returns:
+**		0 on success.
+*/
+
+int
+get_tls_se_options(e, ssl, srv)
+	ENVELOPE *e;
+	SSL *ssl;
+	bool srv;
+{
+	bool saveQuickAbort, saveSuprErrs, ok;
+	char *optionlist, *opt, *val;
+	char *keyfile, *certfile;
+	size_t len, i;
+	int ret;
+
+#  define who (srv ? "server" : "client")
+#  define NAME_C_S macvalue(macid(srv ? "{client_name}" : "{server_name}"), e)
+#  define ADDR_C_S macvalue(macid(srv ? "{client_addr}" : "{server_addr}"), e)
+#  define WHICH srv ? "srv" : "clt"
+
+	ret = 0;
+	keyfile = certfile = opt = val = NULL;
+	saveQuickAbort = QuickAbort;
+	saveSuprErrs = SuprErrs;
+	SuprErrs = true;
+	QuickAbort = false;
+
+	optionlist = NULL;
+	ok = rscheck(srv ? "tls_srv_features" : "tls_clt_features",
+		     NAME_C_S, ADDR_C_S, e,
+		     RSF_RMCOMM|RSF_ADDR|RSF_STRING,
+		     5, NULL, NOQID, NULL, &optionlist) == EX_OK;
+	if (!ok && LogLevel > 8)
+	{
+		sm_syslog(LOG_NOTICE, NOQID,
+			  "rscheck(tls_%s_features)=failed, relay=%s [%s], errors=%d",
+			  WHICH, NAME_C_S, ADDR_C_S,
+			  Errors);
+	}
+	QuickAbort = saveQuickAbort;
+	SuprErrs = saveSuprErrs;
+	if (ok && LogLevel > 9)
+	{
+		sm_syslog(LOG_INFO, NOQID,
+			  "tls_%s_features=%s, relay=%s [%s]",
+			  WHICH, optionlist, NAME_C_S, ADDR_C_S);
+	}
+	if (!ok || optionlist == NULL || (len = strlen(optionlist)) < 2)
+	{
+		if (LogLevel > 9)
+			sm_syslog(LOG_INFO, NOQID,
+				  "tls_%s_features=empty, relay=%s [%s]",
+			  	  WHICH, NAME_C_S, ADDR_C_S);
+
+		return ok ? 0 : 1;
+	}
+
+	i = 0;
+	if (optionlist[0] == '"' && optionlist[len - 1] == '"')
+	{
+		optionlist[0] = ' ';
+		optionlist[--len] = '\0';
+		if (len <= 2)
+		{
+			if (LogLevel > 9 && len > 1)
+				sm_syslog(LOG_INFO, NOQID,
+				  "tls_%s_features=too_short, relay=%s [%s]",
+			  	  WHICH, NAME_C_S, ADDR_C_S);
+
+			/* this is not treated as error! */
+			return 0;
+		}
+		i = 1;
+	}
+
+#  define INVALIDSYNTAX	\
+	do {	\
+		if (LogLevel > 7)	\
+			sm_syslog(LOG_INFO, NOQID,	\
+				  "tls_%s_features=invalid_syntax, opt=%s, relay=%s [%s]",	\
+		  		  WHICH, opt, NAME_C_S, ADDR_C_S);	\
+		return -1;	\
+	} while (0)
+
+#  define CHECKLEN	\
+	do {	\
+		if (i >= len)	\
+			INVALIDSYNTAX;	\
+	} while (0)
+
+#  define SKIPWS	\
+	do {	\
+		while (i < len && SM_ISSPACE(optionlist[i]))	\
+			++i;	\
+		CHECKLEN;	\
+	} while (0)
+
+	/* parse and handle opt=val; */
+	do {
+		char sep;
+
+		SKIPWS;
+		opt = optionlist + i;
+		sep = '=';
+		while (i < len && optionlist[i] != sep
+			&& optionlist[i] != '\0' && !SM_ISSPACE(optionlist[i]))
+			++i;
+		CHECKLEN;
+		while (i < len && SM_ISSPACE(optionlist[i]))
+			optionlist[i++] = '\0';
+		CHECKLEN;
+		if (optionlist[i] != sep)
+			INVALIDSYNTAX;
+		optionlist[i++] = '\0';
+
+		SKIPWS;
+		val = optionlist + i;
+		sep = ';';
+		while (i < len && optionlist[i] != sep && optionlist[i] != '\0')
+			++i;
+		if (optionlist[i] != '\0')
+		{
+			CHECKLEN;
+			optionlist[i++] = '\0';
+		}
+
+		if (LogLevel > 13)
+			sm_syslog(LOG_DEBUG, NOQID,
+				  "tls_%s_features=parsed, %s=%s, relay=%s [%s]",
+				  WHICH, opt, val, NAME_C_S, ADDR_C_S);
+
+		if (sm_strcasecmp(opt, "options") == 0)
+		{
+			unsigned long ssloptions;
+
+			ssloptions = 0;
+			ret = readssloptions(NULL, val, &ssloptions, ';');
+			if (ret == 0)
+				(void) SSL_set_options(ssl, (long) ssloptions);
+			else if (LogLevel > 8)
+			{
+				sm_syslog(LOG_WARNING, NOQID,
+					  "tls_%s_features=%s, error=%s, relay=%s [%s]",
+					  WHICH, val,
+					  (ret == SSLOPERR_NAN) ? "not a number" :
+					  ((ret == SSLOPERR_NOTFOUND) ? "SSL_OP not found" :
+					  "unknown"),
+					  NAME_C_S, ADDR_C_S);
+			}
+		}
+		else if (sm_strcasecmp(opt, "cipherlist") == 0)
+		{
+			if (SSL_set_cipher_list(ssl, val) <= 0)
+			{
+				ret = 1;
+				if (LogLevel > 7)
+				{
+					sm_syslog(LOG_WARNING, NOQID,
+						  "STARTTLS=%s, error: SSL_set_cipher_list(%s) failed",
+						  who, val);
+
+					if (LogLevel > 9)
+						tlslogerr(LOG_WARNING, who);
+				}
+			}
+		}
+		else if (sm_strcasecmp(opt, "keyfile") == 0)
+			keyfile = val;
+		else if (sm_strcasecmp(opt, "certfile") == 0)
+			certfile = val;
+		else
+		{
+			ret = 1;
+			if (LogLevel > 7)
+			{
+				sm_syslog(LOG_INFO, NOQID,
+					  "tls_%s_features=unknown_option, opt=%s, relay=%s [%s]",
+				  	  WHICH, opt, NAME_C_S, ADDR_C_S);
+			}
+		}
+
+	} while (optionlist[i] != '\0' && i < len);
+
+	/* need cert and key before we can use the options */
+	/* does not implement the "," hack for 2nd cert/key pair */
+	if (keyfile != NULL && certfile != NULL)
+	{
+		load_certkey(ssl, srv, certfile, keyfile);
+		keyfile = certfile = NULL;
+	}
+	else if (keyfile != NULL || certfile != NULL)
+	{
+		ret = 1;
+		if (LogLevel > 7)
+		{
+			sm_syslog(LOG_INFO, NOQID,
+				  "tls_%s_features=only_one_of_CertFile/KeyFile_specified, relay=%s [%s]",
+			  	  WHICH, NAME_C_S, ADDR_C_S);
+		}
+	}
+
+	return ret;
+#  undef who
+#  undef NAME_C_S
+#  undef ADDR_C_S
+#  undef WHICH
+}
+# endif /* _FFR_TLS_SE_OPTS */
+#endif /* STARTTLS */
+
 /*
 **  SETOPTION -- set global processing option
 **
@@ -2180,12 +2789,10 @@ static struct optioninfo
 	{ "AuthOptions",		O_SASLOPTS,	OI_NONE	},
 #define O_QUEUE_FILE_MODE	0xbe
 	{ "QueueFileMode",		O_QUEUE_FILE_MODE, OI_NONE	},
-#if _FFR_TLS_1
-# define O_DHPARAMS5	0xbf
-	{ "DHParameters512",		O_DHPARAMS5,	OI_NONE	},
-# define O_CIPHERLIST	0xc0
+#define O_DIG_ALG	0xbf
+	{ "CertFingerprintAlgorithm",		O_DIG_ALG,	OI_NONE	},
+#define O_CIPHERLIST	0xc0
 	{ "CipherList",			O_CIPHERLIST,	OI_NONE	},
-#endif /* _FFR_TLS_1 */
 #define O_RANDFILE	0xc1
 	{ "RandFile",			O_RANDFILE,	OI_NONE	},
 #define O_TLS_SRV_OPTS	0xc2
@@ -2271,16 +2878,12 @@ static struct optioninfo
 # define O_RCPTSHUTDG	0xe2
 	{ "BadRcptShutdownGood",	O_RCPTSHUTDG,	OI_SAFE	},
 #endif /* _FFR_BADRCPT_SHUTDOWN */
-#if STARTTLS && _FFR_TLS_1
-# define O_SRV_SSL_OPTIONS	0xe3
+#define O_SRV_SSL_OPTIONS	0xe3
 	{ "ServerSSLOptions",		O_SRV_SSL_OPTIONS,	OI_NONE	},
-# define O_CLT_SSL_OPTIONS	0xe4
+#define O_CLT_SSL_OPTIONS	0xe4
 	{ "ClientSSLOptions",		O_CLT_SSL_OPTIONS,	OI_NONE	},
-#endif /* STARTTLS && _FFR_TLS_1 */
-#if _FFR_EXPDELAY
-# define O_MAX_QUEUE_AGE	0xe5
+#define O_MAX_QUEUE_AGE	0xe5
 	{ "MaxQueueAge",	O_MAX_QUEUE_AGE,	OI_NONE },
-#endif /* _FFR_EXPDELAY */
 #if _FFR_RCPTTHROTDELAY
 # define O_RCPTTHROTDELAY	0xe6
 	{ "BadRcptThrottleDelay",	O_RCPTTHROTDELAY,	OI_SAFE	},
@@ -2297,128 +2900,20 @@ static struct optioninfo
 # define O_REJECTNUL	0xe9
 	{ "RejectNUL",	O_REJECTNUL,	OI_SAFE	},
 #endif /* _FFR_REJECT_NUL_BYTE */
+#if _FFR_BOUNCE_QUEUE
+# define O_BOUNCEQUEUE 0xea
+	{ "BounceQueue",		O_BOUNCEQUEUE,	OI_NONE },
+#endif /* _FFR_BOUNCE_QUEUE */
+#if _FFR_ADD_BCC
+# define O_ADDBCC 0xeb
+	{ "AddBcc",			O_ADDBCC,	OI_NONE },
+#endif
+#define O_USECOMPRESSEDIPV6ADDRESSES 0xec
+	{ "UseCompressedIPv6Addresses",	O_USECOMPRESSEDIPV6ADDRESSES, OI_NONE },
 
 	{ NULL,				'\0',		OI_NONE	}
 };
 
-#if STARTTLS && _FFR_TLS_1
-static struct ssl_options
-{
-	const char	*sslopt_name;	/* name of the flag */
-	long		sslopt_bits;	/* bits to set/clear */
-} SSL_Option[] =
-{
-/* Workaround for bugs are turned on by default (as well as some others) */
-#ifdef SSL_OP_MICROSOFT_SESS_ID_BUG
-	{ "SSL_OP_MICROSOFT_SESS_ID_BUG",	SSL_OP_MICROSOFT_SESS_ID_BUG	},
-#endif
-#ifdef SSL_OP_NETSCAPE_CHALLENGE_BUG
-	{ "SSL_OP_NETSCAPE_CHALLENGE_BUG",	SSL_OP_NETSCAPE_CHALLENGE_BUG	},
-#endif
-#ifdef SSL_OP_LEGACY_SERVER_CONNECT
-	{ "SSL_OP_LEGACY_SERVER_CONNECT",	SSL_OP_LEGACY_SERVER_CONNECT	},
-#endif
-#ifdef SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG
-	{ "SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG",	SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG	},
-#endif
-#ifdef SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG
-	{ "SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG",	SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG	},
-#endif
-#ifdef SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER
-	{ "SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER",	SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER	},
-#endif
-#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING
-	{ "SSL_OP_MSIE_SSLV2_RSA_PADDING",	SSL_OP_MSIE_SSLV2_RSA_PADDING	},
-#endif
-#ifdef SSL_OP_SSLEAY_080_CLIENT_DH_BUG
-	{ "SSL_OP_SSLEAY_080_CLIENT_DH_BUG",	SSL_OP_SSLEAY_080_CLIENT_DH_BUG	},
-#endif
-#ifdef SSL_OP_TLS_D5_BUG
-	{ "SSL_OP_TLS_D5_BUG",	SSL_OP_TLS_D5_BUG	},
-#endif
-#ifdef SSL_OP_TLS_BLOCK_PADDING_BUG
-	{ "SSL_OP_TLS_BLOCK_PADDING_BUG",	SSL_OP_TLS_BLOCK_PADDING_BUG	},
-#endif
-#ifdef SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
-	{ "SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS",	SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS	},
-#endif
-#ifdef SSL_OP_ALL
-	{ "SSL_OP_ALL",	SSL_OP_ALL	},
-#endif
-#ifdef SSL_OP_NO_QUERY_MTU
-	{ "SSL_OP_NO_QUERY_MTU",	SSL_OP_NO_QUERY_MTU	},
-#endif
-#ifdef SSL_OP_COOKIE_EXCHANGE
-	{ "SSL_OP_COOKIE_EXCHANGE",	SSL_OP_COOKIE_EXCHANGE	},
-#endif
-#ifdef SSL_OP_NO_TICKET
-	{ "SSL_OP_NO_TICKET",	SSL_OP_NO_TICKET	},
-#endif
-#ifdef SSL_OP_CISCO_ANYCONNECT
-	{ "SSL_OP_CISCO_ANYCONNECT",	SSL_OP_CISCO_ANYCONNECT	},
-#endif
-#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
-	{ "SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION",	SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION	},
-#endif
-#ifdef SSL_OP_NO_COMPRESSION
-	{ "SSL_OP_NO_COMPRESSION",	SSL_OP_NO_COMPRESSION	},
-#endif
-#ifdef SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
-	{ "SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION",	SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION	},
-#endif
-#ifdef SSL_OP_SINGLE_ECDH_USE
-	{ "SSL_OP_SINGLE_ECDH_USE",	SSL_OP_SINGLE_ECDH_USE	},
-#endif
-#ifdef SSL_OP_SINGLE_DH_USE
-	{ "SSL_OP_SINGLE_DH_USE",	SSL_OP_SINGLE_DH_USE	},
-#endif
-#ifdef SSL_OP_EPHEMERAL_RSA
-	{ "SSL_OP_EPHEMERAL_RSA",	SSL_OP_EPHEMERAL_RSA	},
-#endif
-#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE
-	{ "SSL_OP_CIPHER_SERVER_PREFERENCE",	SSL_OP_CIPHER_SERVER_PREFERENCE	},
-#endif
-#ifdef SSL_OP_TLS_ROLLBACK_BUG
-	{ "SSL_OP_TLS_ROLLBACK_BUG",	SSL_OP_TLS_ROLLBACK_BUG	},
-#endif
-#ifdef SSL_OP_NO_SSLv2
-	{ "SSL_OP_NO_SSLv2",	SSL_OP_NO_SSLv2	},
-#endif
-#ifdef SSL_OP_NO_SSLv3
-	{ "SSL_OP_NO_SSLv3",	SSL_OP_NO_SSLv3	},
-#endif
-#ifdef SSL_OP_NO_TLSv1
-	{ "SSL_OP_NO_TLSv1",	SSL_OP_NO_TLSv1	},
-#endif
-#ifdef SSL_OP_NO_TLSv1_2
-	{ "SSL_OP_NO_TLSv1_2",	SSL_OP_NO_TLSv1_2	},
-#endif
-#ifdef SSL_OP_NO_TLSv1_1
-	{ "SSL_OP_NO_TLSv1_1",	SSL_OP_NO_TLSv1_1	},
-#endif
-#ifdef SSL_OP_PKCS1_CHECK_1
-	{ "SSL_OP_PKCS1_CHECK_1",	SSL_OP_PKCS1_CHECK_1	},
-#endif
-#ifdef SSL_OP_PKCS1_CHECK_2
-	{ "SSL_OP_PKCS1_CHECK_2",	SSL_OP_PKCS1_CHECK_2	},
-#endif
-#ifdef SSL_OP_NETSCAPE_CA_DN_BUG
-	{ "SSL_OP_NETSCAPE_CA_DN_BUG",	SSL_OP_NETSCAPE_CA_DN_BUG	},
-#endif
-#ifdef SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG
-	{ "SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG",	SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG	},
-#endif
-#ifdef SSL_OP_CRYPTOPRO_TLSEXT_BUG
-	{ "SSL_OP_CRYPTOPRO_TLSEXT_BUG",	SSL_OP_CRYPTOPRO_TLSEXT_BUG	},
-#endif
-#ifdef SSL_OP_TLSEXT_PADDING
-	{ "SSL_OP_TLSEXT_PADDING",	SSL_OP_TLSEXT_PADDING	},
-#endif
-	{ NULL,		0		}
-};
-#endif /* STARTTLS && _FFR_TLS_1 */
-
-
 # define CANONIFY(val)
 
 # define SET_OPT_DEFAULT(opt, val)	opt = val
@@ -2459,9 +2954,9 @@ setoption(opt, val, safe, sticky, e)
 	char *newval;
 	char exbuf[MAXLINE];
 #endif /* STARTTLS || SM_CONF_SHM */
-#if STARTTLS && _FFR_TLS_1
-	long *pssloptions = NULL;
-#endif /* STARTTLS && _FFR_TLS_1 */
+#if STARTTLS
+	unsigned long *pssloptions = NULL;
+#endif
 
 	errno = 0;
 	if (opt == ' ')
@@ -2706,6 +3201,11 @@ setoption(opt, val, safe, sticky, e)
 			set_delivery_mode(*val, e);
 			break;
 
+#if _FFR_PROXY
+		  case SM_PROXY_REQ:
+			set_delivery_mode(*val, e);
+			break;
+#endif /* _FFR_PROXY */
 
 		  default:
 			syserr("Unknown delivery mode %c", *val);
@@ -3159,11 +3659,9 @@ setoption(opt, val, safe, sticky, e)
 		MinQueueAge = convtime(val, 'm');
 		break;
 
-#if _FFR_EXPDELAY
 	  case O_MAX_QUEUE_AGE:
 		MaxQueueAge = convtime(val, 'm');
 		break;
-#endif /* _FFR_EXPDELAY */
 
 	  case O_DEFCHARSET:	/* default character set for mimefying */
 		DefaultCharSet = newstr(denlstring(val, true, true));
@@ -3378,9 +3876,9 @@ setoption(opt, val, safe, sticky, e)
 				RunAsGid = pw->pw_gid;
 			else if (UseMSP && *p == '\0')
 				(void) sm_io_fprintf(smioout, SM_TIME_DEFAULT,
-						     "WARNING: RunAsUser for MSP ignored, check group ids (egid=%d, want=%d)\n",
-						     (int) EffGid,
-						     (int) pw->pw_gid);
+						     "WARNING: RunAsUser for MSP ignored, check group ids (egid=%ld, want=%ld)\n",
+						     (long) EffGid,
+						     (long) pw->pw_gid);
 		}
 # ifdef UID_MAX
 		if (RunAsUid > UID_MAX)
@@ -3402,9 +3900,9 @@ setoption(opt, val, safe, sticky, e)
 				else if (UseMSP)
 					(void) sm_io_fprintf(smioout,
 							     SM_TIME_DEFAULT,
-							     "WARNING: RunAsUser for MSP ignored, check group ids (egid=%d, want=%d)\n",
-							     (int) EffGid,
-							     (int) runasgid);
+							     "WARNING: RunAsUser for MSP ignored, check group ids (egid=%ld, want=%ld)\n",
+							     (long) EffGid,
+							     (long) runasgid);
 			}
 			else
 			{
@@ -3419,9 +3917,9 @@ setoption(opt, val, safe, sticky, e)
 				else if (UseMSP)
 					(void) sm_io_fprintf(smioout,
 							     SM_TIME_DEFAULT,
-							     "WARNING: RunAsUser for MSP ignored, check group ids (egid=%d, want=%d)\n",
-							     (int) EffGid,
-							     (int) gr->gr_gid);
+							     "WARNING: RunAsUser for MSP ignored, check group ids (egid=%ld, want=%ld)\n",
+							     (long) EffGid,
+							     (long) gr->gr_gid);
 			}
 		}
 		if (tTd(47, 5))
@@ -3749,56 +4247,22 @@ setoption(opt, val, safe, sticky, e)
 		SET_STRING_EXP(CACertPath);
 	  case O_DHPARAMS:
 		SET_STRING_EXP(DHParams);
-# if _FFR_TLS_1
-	  case O_DHPARAMS5:
-		SET_STRING_EXP(DHParams5);
 	  case O_CIPHERLIST:
 		SET_STRING_EXP(CipherList);
+	  case O_DIG_ALG:
+		SET_STRING_EXP(CertFingerprintAlgorithm);
 	  case O_SRV_SSL_OPTIONS:
 		pssloptions = &Srv_SSL_Options;
 	  case O_CLT_SSL_OPTIONS:
 		if (pssloptions == NULL)
 			pssloptions = &Clt_SSL_Options;
-		for (p = val; *p != 0; )
-		{
-			bool clearmode;
-			char *q;
-			struct ssl_options *sslopts;
+		(void) readssloptions(o->o_name, val, pssloptions, '\0');
+		if (tTd(37, 8))
+			sm_dprintf("ssloptions=%#lx\n", *pssloptions);
 
-			while (*p == ' ')
-				p++;
-			if (*p == '\0')
-				break;
-			clearmode = false;
-			if (*p == '-' || *p == '+')
-				clearmode = *p++ == '-';
-			q = p;
-			while (*p != '\0' && !(isascii(*p) && isspace(*p)))
-				p++;
-			if (*p != '\0')
-				*p++ = '\0';
-			for (sslopts = SSL_Option;
-			     sslopts->sslopt_name != NULL; sslopts++)
-			{
-				if (sm_strcasecmp(q, sslopts->sslopt_name) == 0)
-					break;
-			}
-			if (sslopts->sslopt_name == NULL)
-			{
-				errno = 0;
-				syserr("readcf: %s option value %s unrecognized",
-					o->o_name, q);
-			}
-			else if (clearmode)
-				*pssloptions &= ~sslopts->sslopt_bits;
-			else
-				*pssloptions |= sslopts->sslopt_bits;
-		}
 		pssloptions = NULL;
 		break;
 
-# endif /* _FFR_TLS_1 */
-
 	  case O_CRLFILE:
 # if OPENSSL_VERSION_NUMBER > 0x00907000L
 		SET_STRING_EXP(CRLFile);
@@ -3839,7 +4303,6 @@ setoption(opt, val, safe, sticky, e)
 			  case 'V':
 				TLS_Srv_Opts |= TLS_I_NO_VRFY;
 				break;
-# if _FFR_TLS_1
 			/*
 			**  Server without a cert? That works only if
 			**  AnonDH is enabled as cipher, which is not in the
@@ -3851,7 +4314,6 @@ setoption(opt, val, safe, sticky, e)
 			  case 'C':
 				TLS_Srv_Opts &= ~TLS_I_SRV_CERT;
 				break;
-# endif /* _FFR_TLS_1 */
 			  case ' ':	/* ignore */
 			  case '\t':	/* ignore */
 			  case ',':	/* ignore */
@@ -3884,10 +4346,9 @@ setoption(opt, val, safe, sticky, e)
 	  case O_CACERTFILE:
 	  case O_CACERTPATH:
 	  case O_DHPARAMS:
-# if _FFR_TLS_1
-	  case O_DHPARAMS5:
+	  case O_SRV_SSL_OPTIONS:
+	  case O_CLT_SSL_OPTIONS:
 	  case O_CIPHERLIST:
-# endif /* _FFR_TLS_1 */
 	  case O_CRLFILE:
 # if _FFR_CRLPATH
 	  case O_CRLPATH:
@@ -4064,6 +4525,21 @@ setoption(opt, val, safe, sticky, e)
 		break;
 #endif /* _FFR_REJECT_NUL_BYTE */
 
+#if _FFR_BOUNCE_QUEUE
+	  case O_BOUNCEQUEUE:
+		bouncequeue = newstr(val);
+		break;
+#endif /* _FFR_BOUNCE_QUEUE */
+
+#if _FFR_ADD_BCC
+	  case O_ADDBCC:
+		AddBcc = atobool(val);
+		break;
+#endif
+	  case O_USECOMPRESSEDIPV6ADDRESSES:
+		UseCompressedIPv6Addresses = atobool(val);
+		break;
+
 	  default:
 		if (tTd(37, 1))
 		{
diff --git a/contrib/sendmail/src/recipient.c b/contrib/sendmail/src/recipient.c
index ff3a3b9d3638..3fad95717d6b 100644
--- a/contrib/sendmail/src/recipient.c
+++ b/contrib/sendmail/src/recipient.c
@@ -667,8 +667,8 @@ recipient(new, sendq, aliaslevel, e)
 			new->q_status = "5.7.1";
 			if (new->q_alias->q_ruser == NULL)
 				usrerrenh(new->q_status,
-					  "550 UID %d is an unknown user: cannot mail to programs",
-					  new->q_alias->q_uid);
+					  "550 UID %ld is an unknown user: cannot mail to programs",
+					  (long) new->q_alias->q_uid);
 			else
 				usrerrenh(new->q_status,
 					  "550 User %s@%s doesn't have a valid shell for mailing to programs",
@@ -890,8 +890,8 @@ recipient(new, sendq, aliaslevel, e)
 			new->q_status = "5.7.1";
 			if (new->q_alias->q_ruser == NULL)
 				usrerrenh(new->q_status,
-					  "550 UID %d is an unknown user: cannot mail to files",
-					  new->q_alias->q_uid);
+					  "550 UID %ld is an unknown user: cannot mail to files",
+					  (long) new->q_alias->q_uid);
 			else
 				usrerrenh(new->q_status,
 					  "550 User %s@%s doesn't have a valid shell for mailing to files",
@@ -1174,7 +1174,7 @@ finduser(name, fuzzyp, user)
 
 	*fuzzyp = false;
 
-#if HESIOD
+#if HESIOD && !HESIOD_ALLOW_NUMERIC_LOGIN
 	/* DEC Hesiod getpwnam accepts numeric strings -- short circuit it */
 	for (p = name; *p != '\0'; p++)
 		if (!isascii(*p) || !isdigit(*p))
@@ -1185,7 +1185,7 @@ finduser(name, fuzzyp, user)
 			sm_dprintf("failed (numeric input)\n");
 		return EX_NOUSER;
 	}
-#endif /* HESIOD */
+#endif /* HESIOD && !HESIOD_ALLOW_NUMERIC_LOGIN */
 
 	/* look up this login name using fast path */
 	status = sm_mbdb_lookup(name, user);
@@ -1446,8 +1446,8 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
 	if (tTd(27, 2))
 		sm_dprintf("include(%s)\n", fname);
 	if (tTd(27, 4))
-		sm_dprintf("   ruid=%d euid=%d\n",
-			(int) getuid(), (int) geteuid());
+		sm_dprintf("   ruid=%ld euid=%ld\n",
+			(long) getuid(), (long) geteuid());
 	if (tTd(27, 14))
 	{
 		sm_dprintf("ctladdr ");
@@ -1455,8 +1455,8 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
 	}
 
 	if (tTd(27, 9))
-		sm_dprintf("include: old uid = %d/%d\n",
-			   (int) getuid(), (int) geteuid());
+		sm_dprintf("include: old uid = %ld/%ld\n",
+			   (long) getuid(), (long) geteuid());
 
 	if (forwarding)
 	{
@@ -1483,8 +1483,8 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
 	    !bitnset(DBS_NONROOTSAFEADDR, DontBlameSendmail))
 	{
 		if (tTd(27, 4))
-			sm_dprintf("include: not safe (euid=%d, RunAsUid=%d)\n",
-				   (int) geteuid(), (int) RunAsUid);
+			sm_dprintf("include: not safe (euid=%ld, RunAsUid=%ld)\n",
+				   (long) geteuid(), (long) RunAsUid);
 		ctladdr->q_flags |= QUNSAFEADDR;
 	}
 
@@ -1512,8 +1512,8 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
 			if (initgroups(user, gid) == -1)
 			{
 				rval = EAGAIN;
-				syserr("include: initgroups(%s, %d) failed",
-					user, gid);
+				syserr("include: initgroups(%s, %ld) failed",
+					user, (long) gid);
 				goto resetuid;
 			}
 		}
@@ -1533,7 +1533,7 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
 		if (gid != 0 && setgid(gid) < -1)
 		{
 			rval = EAGAIN;
-			syserr("setgid(%d) failure", gid);
+			syserr("setgid(%ld) failure", (long) gid);
 			goto resetuid;
 		}
 		if (uid != 0)
@@ -1542,8 +1542,8 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
 			if (seteuid(uid) < 0)
 			{
 				rval = EAGAIN;
-				syserr("seteuid(%d) failure (real=%d, eff=%d)",
-					uid, (int) getuid(), (int) geteuid());
+				syserr("seteuid(%ld) failure (real=%ld, eff=%ld)",
+					(long) uid, (long) getuid(), (long) geteuid());
 				goto resetuid;
 			}
 # endif /* MAILER_SETUID_METHOD == USE_SETEUID */
@@ -1551,8 +1551,8 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
 			if (setreuid(0, uid) < 0)
 			{
 				rval = EAGAIN;
-				syserr("setreuid(0, %d) failure (real=%d, eff=%d)",
-					uid, (int) getuid(), (int) geteuid());
+				syserr("setreuid(0, %ld) failure (real=%ld, eff=%ld)",
+					(long) uid, (long) getuid(), (long) geteuid());
 				goto resetuid;
 			}
 # endif /* MAILER_SETUID_METHOD == USE_SETREUID */
@@ -1561,8 +1561,8 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
 #endif /* MAILER_SETUID_METHOD != USE_SETUID */
 
 	if (tTd(27, 9))
-		sm_dprintf("include: new uid = %d/%d\n",
-			   (int) getuid(), (int) geteuid());
+		sm_dprintf("include: new uid = %ld/%ld\n",
+			   (long) getuid(), (long) geteuid());
 
 	/*
 	**  If home directory is remote mounted but server is down,
@@ -1655,8 +1655,8 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
 	{
 		/* don't use this :include: file */
 		if (tTd(27, 4))
-			sm_dprintf("include: not safe (uid=%d): %s\n",
-				   (int) uid, sm_errstring(rval));
+			sm_dprintf("include: not safe (uid=%ld): %s\n",
+				   (long) uid, sm_errstring(rval));
 	}
 	else if ((fp = sm_io_open(SmFtStdio, SM_TIME_DEFAULT, fname,
 				  SM_IO_RDONLY, NULL)) == NULL)
@@ -1683,28 +1683,28 @@ include(fname, forwarding, ctladdr, sendq, aliaslevel, e)
 		{
 # if USESETEUID
 			if (seteuid(0) < 0)
-				syserr("!seteuid(0) failure (real=%d, eff=%d)",
-				       (int) getuid(), (int) geteuid());
+				syserr("!seteuid(0) failure (real=%ld, eff=%ld)",
+				       (long) getuid(), (long) geteuid());
 # else /* USESETEUID */
 			if (setreuid(-1, 0) < 0)
-				syserr("!setreuid(-1, 0) failure (real=%d, eff=%d)",
-				       (int) getuid(), (int) geteuid());
+				syserr("!setreuid(-1, 0) failure (real=%ld, eff=%ld)",
+				       (long) getuid(), (long) geteuid());
 			if (setreuid(RealUid, 0) < 0)
-				syserr("!setreuid(%d, 0) failure (real=%d, eff=%d)",
-				       (int) RealUid, (int) getuid(),
-				       (int) geteuid());
+				syserr("!setreuid(%ld, 0) failure (real=%ld, eff=%ld)",
+				       (long) RealUid, (long) getuid(),
+				       (long) geteuid());
 # endif /* USESETEUID */
 		}
 		if (setgid(savedgid) < 0)
-			syserr("!setgid(%d) failure (real=%d eff=%d)",
-			       (int) savedgid, (int) getgid(),
-			       (int) getegid());
+			syserr("!setgid(%ld) failure (real=%ld eff=%ld)",
+			       (long) savedgid, (long) getgid(),
+			       (long) getegid());
 	}
 #endif /* HASSETREUID || USESETEUID */
 
 	if (tTd(27, 9))
-		sm_dprintf("include: reset uid = %d/%d\n",
-			   (int) getuid(), (int) geteuid());
+		sm_dprintf("include: reset uid = %ld/%ld\n",
+			   (long) getuid(), (long) geteuid());
 
 	if (rval == E_SM_OPENTIMEOUT)
 		usrerr("451 4.4.1 open timeout on %s", fname);
diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c
index 07c3c90ffa39..6de8f2f1957e 100644
--- a/contrib/sendmail/src/savemail.c
+++ b/contrib/sendmail/src/savemail.c
@@ -581,6 +581,10 @@ returntosender(msg, returnq, flags, e)
 	else
 		ee->e_flags |= EF_NO_BODY_RETN;
 
+#if _FFR_BOUNCE_QUEUE
+	if (BounceQueue != NOQGRP)
+		ee->e_qgrp = ee->e_dfqgrp = BounceQueue;
+#endif /* _FFR_BOUNCE_QUEUE */
 	if (!setnewqueue(ee))
 	{
 		syserr("554 5.3.0 returntosender: cannot select queue for %s",
@@ -702,8 +706,15 @@ returntosender(msg, returnq, flags, e)
 	/* mark statistics */
 	markstats(ee, NULLADDR, STATS_NORMAL);
 
-	/* actually deliver the error message */
-	sendall(ee, SM_DELIVER);
+#if _FFR_BOUNCE_QUEUE
+	if (BounceQueue == NOQGRP)
+	{
+#endif
+		/* actually deliver the error message */
+		sendall(ee, SM_DELIVER);
+#if _FFR_BOUNCE_QUEUE
+	}
+#endif
 	(void) dropenvelope(ee, true, false);
 
 	/* check for delivery errors */
diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8
index a6c47fecfb20..f525c3e29806 100644
--- a/contrib/sendmail/src/sendmail.8
+++ b/contrib/sendmail/src/sendmail.8
@@ -92,6 +92,9 @@ Also,
 the ``From:'' and ``Sender:'' 
 fields are examined for the name of the sender.
 .TP
+.B \-bC
+Check the configuration file.
+.TP
 .B \-bd
 Run as a daemon.
 .B Sendmail
diff --git a/contrib/sendmail/src/sendmail.h b/contrib/sendmail/src/sendmail.h
index 07a58e9f921e..b2d0211ee0f5 100644
--- a/contrib/sendmail/src/sendmail.h
+++ b/contrib/sendmail/src/sendmail.h
@@ -122,7 +122,7 @@ SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail.h,v 8.1104 2013-11-22 20:5
 # endif /* HESIOD */
 
 #if STARTTLS
-#  include 
+# include 
 # if !TLS_NO_RSA
 #  if _FFR_FIPSMODE
 #   define RSA_KEYLENGTH	1024
@@ -199,10 +199,19 @@ typedef int (*sasl_callback_ft)(void);
 # define INADDR_NONE	0xffffffff
 #endif /* ! INADDR_NONE */
 
+/* By default use uncompressed IPv6 address format (no "::") */
+#ifndef IPV6_FULL
+# define IPV6_FULL	1
+#endif
 
 /* (f)open() modes for queue files */
-# define QF_O_EXTRA	0
+#define QF_O_EXTRA	0
 
+#if _FFR_PROXY || _FFR_LOGREPLY
+# define _FFR_ERRCODE	1
+#endif
+
+#define SM_ARRAY_SIZE(array)   (sizeof(array) / sizeof((array)[0]))
 
 /*
 **  An 'argument class' describes the storage allocation status
@@ -283,11 +292,23 @@ typedef struct address ADDRESS;
 #define QBYTRACE	0x00008000	/* DeliverBy: trace */
 #define QBYNDELAY	0x00010000	/* DeliverBy: notify, delay */
 #define QBYNRELAY	0x00020000	/* DeliverBy: notify, relayed */
+#define QINTBCC		0x00040000	/* internal Bcc */
+#define QDYNMAILER	0x00080000	/* "dynamic mailer" */
 #define QTHISPASS	0x40000000	/* temp: address set this pass */
 #define QRCPTOK		0x80000000	/* recipient() processed address */
 
+#define QDYNMAILFLG	'Y'
+
 #define Q_PINGFLAGS	(QPINGONSUCCESS|QPINGONFAILURE|QPINGONDELAY)
 
+#if _FFR_RCPTFLAGS
+# define QMATCHFLAGS (QINTBCC|QDYNMAILER)
+# define QMATCH_FLAG(a) ((a)->q_flags & QMATCHFLAGS)
+# define ADDR_FLAGS_MATCH(a, b)	(QMATCH_FLAG(a) == QMATCH_FLAG(b))
+#else
+# define ADDR_FLAGS_MATCH(a, b)	true
+#endif
+
 /* values for q_state */
 #define QS_OK		0		/* address ok (for now)/not yet tried */
 #define QS_SENT		1		/* good address, delivery complete */
@@ -342,6 +363,9 @@ typedef struct address ADDRESS;
 
 extern ADDRESS	NullAddress;	/* a null (template) address [main.c] */
 
+/* for cataddr() */
+#define NOSPACESEP	256
+
 /* functions */
 extern void	cataddr __P((char **, char **, char *, int, int, bool));
 extern char	*crackaddr __P((char *, ENVELOPE *));
@@ -422,6 +446,7 @@ struct mailer
 };
 
 /* bits for m_flags */
+#define M_xSMTP		0x01	/* internal: {ES,S,L}MTP */
 #define M_ESMTP		'a'	/* run Extended SMTP */
 #define M_ALIASABLE	'A'	/* user can be LHS of an alias */
 #define M_BLANKEND	'b'	/* ensure blank line at end of message */
@@ -449,6 +474,7 @@ struct mailer
 #define M_NHDR		'n'	/* don't insert From line */
 #define M_MANYSTATUS	'N'	/* MAIL11V3: DATA returns multi-status */
 #define M_RUNASRCPT	'o'	/* always run mailer as recipient */
+		/*	'O'	   free? */
 #define M_FROMPATH	'p'	/* use reverse-path in MAIL FROM: */
 		/*	'P'	   CF: include Return-Path: */
 #define M_VRFY250	'q'	/* VRFY command returns 250 instead of 252 */
@@ -464,11 +490,14 @@ struct mailer
 #define M_NOHOSTSTAT	'W'	/* ignore long term host status information */
 		/*	'x'	   CF: include Full-Name: */
 #define M_XDOT		'X'	/* use hidden-dot algorithm */
+		/*	'y'	   free? */
+		/*	'Y'	   free? */
 #define M_LMTP		'z'	/* run Local Mail Transport Protocol */
 #define M_DIALDELAY	'Z'	/* apply dial delay sleeptime */
 #define M_NOMX		'0'	/* turn off MX lookups */
 #define M_NONULLS	'1'	/* don't send null bytes */
 #define M_FSMTP		'2'	/* force SMTP (no ESMTP even if offered) */
+		/*	'4'	   free? */
 #define M_EBCDIC	'3'	/* extend Q-P encoding for EBCDIC */
 #define M_TRYRULESET5	'5'	/* use ruleset 5 after local aliasing */
 #define M_7BITHDRS	'6'	/* strip headers to 7 bits even in 8 bit path */
@@ -498,7 +527,11 @@ EXTERN MAILER	*FileMailer;	/* ptr to *file* mailer */
 EXTERN MAILER	*InclMailer;	/* ptr to *include* mailer */
 EXTERN MAILER	*LocalMailer;	/* ptr to local mailer */
 EXTERN MAILER	*ProgMailer;	/* ptr to program mailer */
+#if _FFR_RCPTFLAGS
+EXTERN MAILER	*Mailer[MAXMAILERS * 2 + 1];
+#else
 EXTERN MAILER	*Mailer[MAXMAILERS + 1];
+#endif
 
 /*
 **  Queue group definition structure.
@@ -742,6 +775,12 @@ MCI
 #define MCIF_INLONGLINE 0x01000000	/* in the middle of a long line */
 #define MCIF_AUTH2	0x02000000	/* got 2 AUTH lines */
 #define MCIF_ONLY_EHLO	0x10000000	/* use only EHLO in smtpinit */
+#if _FFR_HANDLE_HDR_RW_TEMPFAIL
+/* an error is not sticky (if put{header,body}() etc fail) */
+# define MCIF_NOTSTICKY	0x20000000
+#else
+# define MCIF_NOTSTICKY	0
+#endif
 
 #define MCIF_EXTENS	(MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS | MCIF_AUTH2)
 
@@ -945,10 +984,16 @@ struct envelope
 	int		e_dlvr_flag;	/* deliver by flag */
 	SM_RPOOL_T	*e_rpool;	/* resource pool for this envelope */
 	unsigned int	e_features;	/* server features */
-#if _FFR_MILTER_ENHSC
 #define ENHSC_LEN	11
+#if _FFR_MILTER_ENHSC
 	char		e_enhsc[ENHSC_LEN];	/* enhanced status code */
 #endif /* _FFR_MILTER_ENHSC */
+#if _FFR_ERRCODE
+	/* smtp error codes during delivery */
+	int		e_rcode;	/* reply code */
+	char		e_renhsc[ENHSC_LEN];	/* enhanced status code */
+	char		*e_text;	/* reply text */
+#endif /* _FFR_ERRCODE */
 };
 
 #define PRT_NONNEGL(v)	((v) < 0 ? LONG_MAX : (v))
@@ -1141,7 +1186,7 @@ extern int	macid_parse __P((char *, char **));
 #define macid(name)  macid_parse(name, NULL)
 extern char	*macname __P((int));
 extern char	*macvalue __P((int, ENVELOPE *));
-extern int	rscheck __P((char *, char *, char *, ENVELOPE *, int, int, char *, char *, ADDRESS *));
+extern int	rscheck __P((char *, char *, char *, ENVELOPE *, int, int, char *, char *, ADDRESS *, char **));
 extern int	rscap __P((char *, char *, char *, ENVELOPE *, char ***, char *, int));
 extern void	setclass __P((int, char *));
 extern int	strtorwset __P((char *, char **, int));
@@ -1305,15 +1350,6 @@ MAP
 #define MA_UNAVAIL	1		/* member map is not available */
 #define MA_TRYAGAIN	2		/* member map returns temp failure */
 
-/* macros to handle MapTempFail */
-#define BIT_IS_MTP	0x01	/* temp.failure occurred */
-#define BIT_ASK_MTP	0x02	/* do we care about MapTempFail? */
-#define RESET_MAPTEMPFAIL	MapTempFail = 0
-#define INIT_MAPTEMPFAIL	MapTempFail = BIT_ASK_MTP
-#define SET_MAPTEMPFAIL		MapTempFail |= BIT_IS_MTP
-#define IS_MAPTEMPFAIL		bitset(BIT_IS_MTP, MapTempFail)
-#define ASK_MAPTEMPFAIL		bitset(BIT_ASK_MTP, MapTempFail)
-
 /*
 **  The class of a map -- essentially the functions to call
 */
@@ -1633,6 +1669,10 @@ EXTERN bool	V6LoopbackAddrFound;	/* found an IPv6 loopback address */
 
 /* values for e_sendmode -- send modes */
 #define SM_DELIVER	'i'		/* interactive delivery */
+#if _FFR_PROXY
+#define SM_PROXY_REQ	's'		/* synchronous mode requested */
+#define SM_PROXY	'S'		/* synchronous mode activated */
+#endif /* _FFR_PROXY */
 #define SM_FORK		'b'		/* deliver in background */
 #if _FFR_DM_ONE
 #define SM_DM_ONE	'o' /* deliver first TA in background, then queue */
@@ -1641,7 +1681,11 @@ EXTERN bool	V6LoopbackAddrFound;	/* found an IPv6 loopback address */
 #define SM_DEFER	'd'		/* defer map lookups as well as queue */
 #define SM_VERIFY	'v'		/* verify only (used internally) */
 #define DM_NOTSET	(-1)	/* DeliveryMode (per daemon) option not set */
+#if _FFR_PROXY
+# define SM_IS_INTERACTIVE(m)	((m) == SM_DELIVER || (m) == SM_PROXY_REQ || (m) == SM_PROXY)
+#else /* _FFR_PROXY */
 # define SM_IS_INTERACTIVE(m)	((m) == SM_DELIVER)
+#endif /* _FFR_PROXY */
 
 #define WILL_BE_QUEUED(m)	((m) == SM_QUEUE || (m) == SM_DEFER)
 
@@ -1736,6 +1780,8 @@ EXTERN unsigned long	PrivacyFlags;	/* privacy flags */
 #define RSF_RMCOMM		0x0001	/* strip comments */
 #define RSF_UNSTRUCTURED	0x0002	/* unstructured, ignore syntax errors */
 #define RSF_COUNT		0x0004	/* count rejections (statistics)? */
+#define RSF_ADDR		0x0008	/* reassemble address */
+#define RSF_STRING		0x0010	/* reassemble address as string */
 
 /*
 **  Flags passed to mime8to7 and putheader.
@@ -1893,6 +1939,10 @@ struct termescape
 #define D_OPTIONAL	'O'	/* optional socket */
 #define D_DISABLE	((char)0x02)	/* optional socket disabled */
 #define D_ISSET		((char)0x03)	/* this client struct is set */
+#if _FFR_XCNCT
+#define D_XCNCT	((char)0x04)	/* X-Connect was used */
+#define D_XCNCT_M	((char)0x05)	/* X-Connect was used + "forged" */
+#endif /* _FFR_XCNCT */
 
 #if STARTTLS
 /*
@@ -1926,6 +1976,7 @@ struct termescape
 #define TLS_I_KEY_OUNR	0x00400000	/* Key must be other unreadable */
 #define TLS_I_CRLF_EX	0x00800000	/* CRL file must exist */
 #define TLS_I_CRLF_UNR	0x01000000	/* CRL file must be g/o unreadable */
+#define TLS_I_DHFIXED	0x02000000	/* use fixed DH param */
 
 /* require server cert */
 #define TLS_I_SRV_CERT	 (TLS_I_CERT_EX | TLS_I_KEY_EX | \
@@ -1935,8 +1986,7 @@ struct termescape
 
 /* server requirements */
 #define TLS_I_SRV	(TLS_I_SRV_CERT | TLS_I_RSA_TMP | TLS_I_VRFY_PATH | \
-			 TLS_I_VRFY_LOC | TLS_I_TRY_DH | TLS_I_DH1024 | \
-			 TLS_I_CACHE)
+			 TLS_I_VRFY_LOC | TLS_I_TRY_DH | TLS_I_CACHE)
 
 /* client requirements */
 #define TLS_I_CLT	(TLS_I_KEY_UNR | TLS_I_KEY_OUNR)
@@ -1947,7 +1997,7 @@ struct termescape
 
 /* functions */
 extern bool	init_tls_library __P((bool _fipsmode));
-extern bool	inittls __P((SSL_CTX **, unsigned long, long, bool, char *, char *, char *, char *, char *));
+extern bool	inittls __P((SSL_CTX **, unsigned long, unsigned long, bool, char *, char *, char *, char *, char *));
 extern bool	initclttls __P((bool));
 extern void	setclttls __P((bool));
 extern bool	initsrvtls __P((bool));
@@ -1960,10 +2010,9 @@ EXTERN char	*CACertPath;	/* path to CA certificates (dir. with hashes) */
 EXTERN char	*CACertFile;	/* file with CA certificate */
 EXTERN char	*CltCertFile;	/* file with client certificate */
 EXTERN char	*CltKeyFile;	/* file with client private key */
-# if _FFR_TLS_1
 EXTERN char	*CipherList;	/* list of ciphers */
-EXTERN char	*DHParams5;	/* file with DH parameters (512) */
-# endif /* _FFR_TLS_1 */
+EXTERN char	*CertFingerprintAlgorithm;	/* name of fingerprint alg */
+EXTERN const EVP_MD	*EVP_digest;	/* digest for cert fp */
 EXTERN char	*DHParams;	/* file with DH parameters */
 EXTERN char	*RandFile;	/* source of random data */
 EXTERN char	*SrvCertFile;	/* file with server certificate */
@@ -1973,7 +2022,7 @@ EXTERN char	*CRLFile;	/* file CRLs */
 EXTERN char	*CRLPath;	/* path to CRLs (dir. with hashes) */
 #endif /* _FFR_CRLPATH */
 EXTERN unsigned long	TLS_Srv_Opts;	/* TLS server options */
-EXTERN long	Srv_SSL_Options, Clt_SSL_Options; /* SSL options */
+EXTERN unsigned long	Srv_SSL_Options, Clt_SSL_Options; /* SSL options */
 #endif /* STARTTLS */
 
 /*
@@ -2054,9 +2103,7 @@ EXTERN int	QueueFileMode;	/* mode on files in mail queue */
 EXTERN int	QueueMode;	/* which queue items to act upon */
 EXTERN int	QueueSortOrder;	/* queue sorting order algorithm */
 EXTERN time_t	MinQueueAge;	/* min delivery interval */
-#if _FFR_EXPDELAY
 EXTERN time_t	MaxQueueAge;	/* max delivery interval */
-#endif /* _FFR_EXPDELAY */
 EXTERN time_t	QueueIntvl;	/* intervals between running the queue */
 EXTERN char	*QueueDir;	/* location of queue directory */
 EXTERN QUEUE_CHAR	*QueueLimitId;		/* limit queue run to id */
@@ -2064,6 +2111,9 @@ EXTERN QUEUE_CHAR	*QueueLimitQuarantine;	/* limit queue run to quarantine reason
 EXTERN QUEUE_CHAR	*QueueLimitRecipient;	/* limit queue run to rcpt */
 EXTERN QUEUE_CHAR	*QueueLimitSender;	/* limit queue run to sender */
 EXTERN QUEUEGRP	*Queue[MAXQUEUEGROUPS + 1];	/* queue groups */
+#if _FFR_BOUNCE_QUEUE
+EXTERN int	BounceQueue;
+#endif
 
 /* functions */
 extern void	assign_queueid __P((ENVELOPE *));
@@ -2265,7 +2315,7 @@ extern unsigned char	tTdvect[100];	/* trace vector */
 	} while (0)
 
 /* reply types (text in SmtpMsgBuffer) */
-#define XS_DEFAULT	0
+#define XS_DEFAULT	0	/* other commands, e.g., RSET */
 #define XS_STARTTLS	1
 #define XS_AUTH		2
 #define XS_GREET	3
@@ -2274,14 +2324,16 @@ extern unsigned char	tTdvect[100];	/* trace vector */
 #define XS_RCPT		6
 #define XS_DATA		7
 #define XS_EOM		8
-#define XS_DATA2	9
-#define XS_RCPT2	10
-#define XS_QUIT		15
+#define XS_DATA2	9	/* LMTP */
+#define XS_QUIT		10
 
 /*
 **  Global variables.
 */
 
+#if _FFR_ADD_BCC
+EXTERN bool AddBcc;
+#endif
 #if _FFR_ADDR_TYPE_MODES
 EXTERN bool	AddrTypeModes;	/* addr_type: extra "mode" information */
 #endif /* _FFR_ADDR_TYPE_MODES */
@@ -2337,6 +2389,7 @@ EXTERN bool	UseMSP;		/* mail submission: group writable queue ok? */
 EXTERN bool	WorkAroundBrokenAAAA;	/* some nameservers return SERVFAIL on AAAA queries */
 EXTERN bool	UseErrorsTo;	/* use Errors-To: header (back compat) */
 EXTERN bool	UseNameServer;	/* using DNS -- interpret h_errno & MX RRs */
+EXTERN bool	UseCompressedIPv6Addresses;	/* for more specific zero-subnet matches */
 EXTERN char	InetMode;		/* default network for daemon mode */
 EXTERN char	OpMode;		/* operation mode, see below */
 EXTERN char	SpaceSub;	/* substitution for  */
@@ -2504,6 +2557,10 @@ extern void	buffer_errors __P((void));
 extern void	flush_errors __P((bool));
 extern void PRINTFLIKE(1, 2)	message __P((const char *, ...));
 extern void PRINTFLIKE(1, 2)	nmessage __P((const char *, ...));
+#if _FFR_PROXY
+extern void PRINTFLIKE(3, 4)	emessage __P((const char *, const char *, const char *, ...));
+extern int extsc __P((const char *, int, char *, char *));
+#endif /* _FFR_PROXY */
 extern void PRINTFLIKE(1, 2)	syserr __P((const char *, ...));
 extern void PRINTFLIKE(2, 3)	usrerrenh __P((char *, const char *, ...));
 extern void PRINTFLIKE(1, 2)	usrerr __P((const char *, ...));
@@ -2519,7 +2576,7 @@ extern bool	rebuildaliases __P((MAP *, bool));
 extern void	setalias __P((char *));
 
 /* logging */
-extern void	logdelivery __P((MAILER *, MCI *, char *, const char *, ADDRESS *, time_t, ENVELOPE *));
+extern void	logdelivery __P((MAILER *, MCI *, char *, const char *, ADDRESS *, time_t, ENVELOPE *, ADDRESS *, int));
 extern void	logsender __P((ENVELOPE *, char *));
 extern void PRINTFLIKE(3, 4) sm_syslog __P((int, const char *, const char *, ...));
 
@@ -2656,6 +2713,14 @@ extern int	getla __P((void));
 extern char	*getmodifiers __P((char *, BITMAP256));
 extern BITMAP256	*getrequests __P((ENVELOPE *));
 extern char	*getvendor __P((int));
+#if _FFR_TLS_SE_OPTS && STARTTLS
+# ifndef TLS_VRFY_PER_CTX
+#  define TLS_VRFY_PER_CTX 1
+# endif
+extern int	get_tls_se_options __P((ENVELOPE *, SSL *, bool));
+#else
+# define get_tls_se_options(e, s, w)	0
+#endif
 extern void	help __P((char *, ENVELOPE *));
 extern void	init_md __P((int, char **));
 extern void	initdaemon __P((void));
@@ -2666,6 +2731,9 @@ extern void	init_vendor_macros __P((ENVELOPE *));
 extern SIGFUNC_DECL	intsig __P((int));
 extern bool	isatom __P((const char *));
 extern bool	isloopback __P((SOCKADDR sa));
+#if _FFR_TLS_SE_OPTS && STARTTLS
+extern bool	load_certkey __P((SSL *, bool, char *, char *));
+#endif
 extern void	load_if_names __P((void));
 extern bool	lockfile __P((int, char *, char *, int));
 extern void	log_sendmail_pid __P((ENVELOPE *));
@@ -2719,10 +2787,10 @@ extern sigfunc_t	setsignal __P((int, sigfunc_t));
 extern void	sm_setuserenv __P((const char *, const char *));
 extern void	settime __P((ENVELOPE *));
 #if STARTTLS
-extern void	set_tls_rd_tmo __P((int));
-#else /* STARTTLS */
-#define set_tls_rd_tmo(rd_tmo)
-#endif /* STARTTLS */
+extern int	set_tls_rd_tmo __P((int));
+#else
+# define set_tls_rd_tmo(rd_tmo)	0
+#endif
 extern char	*sfgets __P((char *, int, SM_FILE_T *, time_t, char *));
 extern char	*shortenstring __P((const char *, size_t));
 extern char	*shorten_hostname __P((char []));
@@ -2774,16 +2842,22 @@ extern int	waitfor __P((pid_t));
 extern bool	writable __P((char *, ADDRESS *, long));
 #if SM_HEAP_CHECK
 # define xalloc(size)	xalloc_tagged(size, __FILE__, __LINE__)
-extern char *xalloc_tagged __P((int, char*, int));
+extern char *xalloc_tagged __P((int, char *, int));
 #else /* SM_HEAP_CHECK */
 extern char *xalloc __P((int));
 #endif /* SM_HEAP_CHECK */
+#if _FFR_XCNCT
+extern int xconnect __P((SM_FILE_T *));
+#endif /* _FFR_XCNCT */
 extern void	xputs __P((SM_FILE_T *, const char *));
 extern char	*xtextify __P((char *, char *));
 extern bool	xtextok __P((char *));
 extern int	xunlink __P((char *));
 extern char	*xuntextify __P((char *));
 
+#if _FFR_RCPTFLAGS
+extern bool	newmodmailer __P((ADDRESS *, int));
+#endif
 
 #undef EXTERN
 #endif /* ! _SENDMAIL_H */
diff --git a/contrib/sendmail/src/sfsasl.c b/contrib/sendmail/src/sfsasl.c
index 0593a2577d7d..5209dfa1c3b2 100644
--- a/contrib/sendmail/src/sfsasl.c
+++ b/contrib/sendmail/src/sfsasl.c
@@ -13,6 +13,7 @@ SM_RCSID("@(#)$Id: sfsasl.c,v 8.121 2013-11-22 20:51:56 ca Exp $")
 #include 
 #include 
 #include 
+#include 
 #include 
 
 /* allow to disable error handling code just in case... */
@@ -415,7 +416,7 @@ sfdcsasl(fin, fout, conn, tmo)
 
 #if STARTTLS
 # include "sfsasl.h"
-#  include 
+# include 
 
 /* Structure used by the "tls" file type */
 struct tls_obj
@@ -618,17 +619,16 @@ tls_retry(ssl, rfd, wfd, tlsstart, timeout, err, where)
 			  where, rfd, wfd, err);
 	}
 
-	if (FD_SETSIZE > 0 &&
-	    ((err == SSL_ERROR_WANT_READ && rfd >= FD_SETSIZE) ||
-	     (err == SSL_ERROR_WANT_WRITE && wfd >= FD_SETSIZE)))
+	if ((err == SSL_ERROR_WANT_READ && !SM_FD_OK_SELECT(rfd)) ||
+	    (err == SSL_ERROR_WANT_WRITE && !SM_FD_OK_SELECT(wfd)))
 	{
 		if (LogLevel > 5)
 		{
 			sm_syslog(LOG_ERR, NOQID,
 				  "STARTTLS=%s, error: fd %d/%d too large",
 				  where, rfd, wfd);
-		if (LogLevel > 8)
-			tlslogerr(LOG_WARNING, where);
+			if (LogLevel > 8)
+				tlslogerr(LOG_WARNING, where);
 		}
 		errno = EINVAL;
 	}
@@ -685,17 +685,21 @@ tls_retry(ssl, rfd, wfd, tlsstart, timeout, err, where)
 **		rd_tmo -- read timeout
 **
 **	Results:
-**		none
+**		previous read timeout
 **	This is a hack: there is no way to pass it in
 */
 
 static int tls_rd_tmo = -1;
 
-void
+int
 set_tls_rd_tmo(rd_tmo)
 	int rd_tmo;
 {
+	int old_rd_tmo;
+
+	old_rd_tmo = tls_rd_tmo;
 	tls_rd_tmo = rd_tmo;
+	return old_rd_tmo;
 }
 
 /*
@@ -820,7 +824,7 @@ tls_read(fp, buf, size)
 		}
 		else if (LogLevel > 7)
 			sm_syslog(LOG_WARNING, NOQID,
-				  "STARTTLS: read error=%s (%d), retry=%d, ssl_err=%d",
+				  "STARTTLS: read error=%s (%d), errno=%d, retry=%d, ssl_err=%d",
 				  err, r, errno, try, ssl_err);
 		errno = save_errno;
 	}
diff --git a/contrib/sendmail/src/sm_resolve.c b/contrib/sendmail/src/sm_resolve.c
index 662eaa5cb4fe..8ec2cb68e6bf 100644
--- a/contrib/sendmail/src/sm_resolve.c
+++ b/contrib/sendmail/src/sm_resolve.c
@@ -235,7 +235,7 @@ parse_dns_reply(data, len)
 			if (LogLevel > 5)
 				sm_syslog(LOG_WARNING, NOQID,
 					  "ERROR: DNS RDLENGTH=%d > data len=%d",
-					  size, len - (p - data));
+					  size, len - (int)(p - data));
 			dns_free_data(r);
 			return NULL;
 		}
diff --git a/contrib/sendmail/src/srvrsmtp.c b/contrib/sendmail/src/srvrsmtp.c
index 1a5356782908..b05348d4b2e2 100644
--- a/contrib/sendmail/src/srvrsmtp.c
+++ b/contrib/sendmail/src/srvrsmtp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2010, 2012, 2013 Proofpoint, Inc. and its suppliers.
+ * Copyright (c) 1998-2010, 2012-2014 Proofpoint, Inc. and its suppliers.
  *	All rights reserved.
  * Copyright (c) 1983, 1995-1997 Eric P. Allman.  All rights reserved.
  * Copyright (c) 1988, 1993
@@ -30,7 +30,7 @@ SM_RCSID("@(#)$Id: srvrsmtp.c,v 8.1016 2013-11-22 20:51:56 ca Exp $")
 static int saslmechs __P((sasl_conn_t *, char **));
 #endif /* SASL */
 #if STARTTLS
-#  include 
+# include 
 # include 
 
 static SSL_CTX	*srv_ctx = NULL;	/* TLS server context */
@@ -204,6 +204,174 @@ parse_esmtp_args(e, addr_st, p, delimptr, which, args, esmtp_args)
 		args[argno] = NULL;
 }
 
+#if _FFR_ADD_BCC
+
+/*
+**  ADDRCPT -- Add a rcpt to sendq list
+**
+**	Parameters:
+**		rcpt -- rcpt
+**		sendq -- a pointer to the head of a queue to put
+**			these people into.
+**		e -- the envelope in which to add these recipients.
+**
+**	Returns:
+**		The number of addresses added to the list.
+*/
+
+static int
+addrcpt(rcpt, sendq, e)
+	char *rcpt;
+	ADDRESS **sendq;
+	ENVELOPE *e;
+{
+	int r;
+	char *oldto;
+	ADDRESS *a;
+
+	SM_REQUIRE(rcpt != NULL);
+	SM_REQUIRE(sendq != NULL);
+	SM_REQUIRE(e != NULL);
+	oldto = e->e_to;
+	if (tTd(25, 1))
+		sm_dprintf("addrcpt: rcpt=%s\n", rcpt);
+	r = Errors;
+	a = NULL;
+	SM_TRY
+	{
+		macdefine(&e->e_macro, A_PERM, macid("{addr_type}"), "e b");
+		a = parseaddr(rcpt, NULLADDR, RF_COPYALL, ' ', NULL, e, true);
+		if (a == NULL)
+			return 0;
+
+		a->q_flags &= ~Q_PINGFLAGS;
+		a->q_flags |= QINTBCC;
+		a->q_owner = "<>";
+
+		/* disable alias expansion? */
+		a = recipient(a, sendq, 0, e);
+	}
+	SM_FINALLY
+	{
+		e->e_to = oldto;
+		macdefine(&e->e_macro, A_PERM, macid("{addr_type}"), NULL);
+	}
+	SM_END_TRY
+	if (tTd(25, 1))
+		sm_dprintf("addrcpt: rcpt=%s, flags=%#lx\n", rcpt,
+			a != NULL ? a->q_flags : 0);
+	Errors = r;
+	return 1;
+}
+
+/*
+**  ADDBCC -- Maybe create a copy of an e-mail
+**
+**	Parameters:
+**		a -- current RCPT
+**		e -- the envelope.
+**
+**	Returns:
+**		nothing
+**
+**	Side Effects:
+**		rscheck() can trigger an "exception"
+*/
+
+static void
+addbcc(a, e)
+	ADDRESS *a;
+	ENVELOPE *e;
+{
+	int nobcc;
+	char *newrcpt, empty[1];
+
+	if (!AddBcc)
+		return;
+
+	nobcc = false;
+	empty[0] = '\0';
+	newrcpt = empty;
+
+	nobcc = rscheck("bcc", a->q_paddr, NULL, e, RSF_ADDR, 12, NULL, NOQID,
+			NULL, &newrcpt);
+	if (tTd(25, 1))
+		sm_dprintf("addbcc: nobcc=%d, Errors=%d, newrcpt=<%s>\n", nobcc, Errors, newrcpt);
+	if (nobcc != EX_OK || Errors > 0 || *newrcpt == '\0')
+		return;
+
+	(void) addrcpt(newrcpt, &e->e_sendqueue, e);
+	return;
+}
+#else /* _FFR_ADD_BCC */
+# define addbcc(a, e)
+#endif /* _FFR_ADD_BCC */
+
+#if _FFR_RCPTFLAGS
+/*
+**  RCPTMODS -- Perform rcpt modifications if requested
+**
+**	Parameters:
+**		rcpt -- current RCPT
+**		e -- the envelope.
+**
+**	Returns:
+**		nothing.
+*/
+
+void
+rcptmods(rcpt, e)
+	ADDRESS *rcpt;
+	ENVELOPE *e;
+{
+	char *fl;
+
+	SM_REQUIRE(rcpt != NULL);
+	SM_REQUIRE(e != NULL);
+
+	fl = macvalue(macid("{rcpt_flags}"), e);
+	if (fl == NULL || *fl == '\0')
+		return;
+	if (tTd(25, 1))
+		sm_dprintf("rcptmods: rcpt=%s, flags=%s\n", rcpt->q_paddr, fl);
+
+	/* parse flags */
+	for ( ; *fl != '\0'; ++fl)
+	{
+		switch (*fl)
+		{
+		  case 'n':
+			rcpt->q_flags &= ~Q_PINGFLAGS;
+			rcpt->q_flags |= QINTBCC;
+			rcpt->q_owner = "<>";
+			break;
+
+		  case 'N':
+			rcpt->q_flags &= ~Q_PINGFLAGS;
+			rcpt->q_owner = "<>";
+			break;
+
+		  case QDYNMAILFLG:
+			rcpt->q_flags |= QDYNMAILER;
+			newmodmailer(rcpt, *fl);
+			break;
+
+		  default:
+			sm_syslog(LOG_INFO, e->e_id,
+				  "rcpt=%s, rcpt_flags=%s, status=unknown",
+				  rcpt->q_paddr, fl);
+			break;
+		}
+	}
+
+	/* reset macro to avoid confusion later on */
+	macdefine(&e->e_macro, A_PERM, macid("{rcpt_flags}"), NULL);
+
+}
+#else /* _FFR_RCPTFLAGS */
+# define rcptmods(a, e)
+#endif /* _FFR_RCPTFLAGS */
+
 /*
 **  SMTP -- run the SMTP protocol.
 **
@@ -541,6 +709,24 @@ do								\
 				qid_printname(e), CurSmtpClient, inp);	\
 	}
 
+/*
+**  Determine the correct protocol keyword to use in the
+**  Received: header, following RFC 3848.
+*/
+
+#if !STARTTLS
+# define tls_active	false
+#endif
+#if SASL
+# define auth_active	(authenticating == SASL_IS_AUTH)
+#else
+# define auth_active	false
+#endif
+#define GET_PROTOCOL()					\
+	(auth_active					\
+	    ? (tls_active ? "ESMTPSA" : "ESMTPA")	\
+	    : (tls_active ? "ESMTPS"  : "ESMTP"))
+
 static bool SevenBitInput_Saved;	/* saved version of SevenBitInput */
 
 void
@@ -577,6 +763,7 @@ smtp(nullserver, d_flags, e)
 	SMTP_T smtp;
 	char *addr;
 	char *greetcode = "220";
+	const char *greetmsg = "not accepting messages";
 	char *hostname;			/* my hostname ($j) */
 	QUEUE_CHAR *new;
 	char *args[MAXSMTPARGS];
@@ -907,11 +1094,7 @@ smtp(nullserver, d_flags, e)
 	}
 #endif /* SASL */
 
-#if STARTTLS
-
-
-	set_tls_rd_tmo(TimeOuts.to_nextcommand);
-#endif /* STARTTLS */
+	(void) set_tls_rd_tmo(TimeOuts.to_nextcommand);
 
 #if MILTER
 	if (smtp.sm_milterize)
@@ -968,7 +1151,73 @@ smtp(nullserver, d_flags, e)
 		response = milter_connect(q, RealHostAddr, e, &state);
 		switch (state)
 		{
+#if _FFR_MILTER_CONNECT_REPLYCODE
+		  case SMFIR_REPLYCODE:
+			if (*response == '5')
+			{
+				if (MilterLogLevel > 3)
+					sm_syslog(LOG_INFO, e->e_id,
+						  "Milter: connect: host=%s, addr=%s, reject=%s",
+						  peerhostname,
+						  anynet_ntoa(&RealHostAddr),
+						  response);
+				greetcode = "554"; /* Required by 2821 3.1 */
+				nullserver = newstr(response);
+				if (strlen(nullserver) > 4)
+				{
+					int skip;
+
+					greetmsg = nullserver + 4;
+
+					/* skip over enhanced status code */
+					skip = isenhsc(greetmsg, ' ');
+					if (skip > 0)
+						greetmsg += skip + 1;
+				}
+				smtp.sm_milterize = false;
+				break;
+			}
+			else if (strncmp(response, "421 ", 4) == 0)
+			{
+				int skip;
+				const char *msg = response + 4;
+
+				if (MilterLogLevel > 3)
+					sm_syslog(LOG_INFO, e->e_id,
+						  "Milter: connect: host=%s, addr=%s, shutdown=%s",
+						  peerhostname,
+						  anynet_ntoa(&RealHostAddr),
+						  response);
+				tempfail = true;
+				smtp.sm_milterize = false;
+
+				/* skip over enhanced status code */
+				skip = isenhsc(msg, ' ');
+				if (skip > 0)
+					msg += skip + 1;
+				message("421 %s %s", MyHostName, msg);
+
+				/* arrange to ignore send list */
+				e->e_sendqueue = NULL;
+				goto doquit;
+			}
+			else
+			{
+				if (MilterLogLevel > 3)
+					sm_syslog(LOG_INFO, e->e_id,
+						  "Milter: connect: host=%s, addr=%s, temp failing commands=%s",
+						  peerhostname,
+						  anynet_ntoa(&RealHostAddr),
+						  response);
+				/*tempfail = true;*/
+				smtp.sm_milterize = false;
+				nullserver = newstr(response);
+				break;
+			}
+
+#else /* _FFR_MILTER_CONNECT_REPLYCODE */
 		  case SMFIR_REPLYCODE:	/* REPLYCODE shouldn't happen */
+#endif /* _FFR_MILTER_CONNECT_REPLYCODE */
 		  case SMFIR_REJECT:
 			if (MilterLogLevel > 3)
 				sm_syslog(LOG_INFO, e->e_id,
@@ -1006,7 +1255,7 @@ smtp(nullserver, d_flags, e)
 			goto doquit;
 		}
 		if (response != NULL)
-			sm_free(response); /* XXX */
+			sm_free(response);
 	}
 #endif /* MILTER */
 
@@ -1097,8 +1346,8 @@ smtp(nullserver, d_flags, e)
 
 	/* output the first line, inserting "ESMTP" as second word */
 	if (*greetcode == '5')
-		(void) sm_snprintf(inp, sizeof(inp),
-				"%s not accepting messages", hostname);
+		(void) sm_snprintf(inp, sizeof(inp), "%s %s", hostname,
+				   greetmsg);
 	else
 		expand(SmtpGreeting, inp, sizeof(inp), e);
 
@@ -1400,6 +1649,8 @@ smtp(nullserver, d_flags, e)
 							   *ssf);
 				}
 
+				protocol = GET_PROTOCOL();
+
 				/*
 				**  Only switch to encrypted connection
 				**  if a security layer has been negotiated
@@ -1868,6 +2119,14 @@ smtp(nullserver, d_flags, e)
 				goto tls_done;
 			}
 
+			if (get_tls_se_options(e, srv_ssl, true) != 0)
+			{
+				message("454 4.3.3 TLS not available: error setting options");
+				SSL_free(srv_ssl);
+				srv_ssl = NULL;
+				goto tls_done;
+			}
+
 # if !TLS_VRFY_PER_CTX
 			/*
 			**  this could be used if it were possible to set
@@ -1898,13 +2157,12 @@ smtp(nullserver, d_flags, e)
 
 			SSL_set_accept_state(srv_ssl);
 
-#  define SSL_ACC(s)	SSL_accept(s)
-
 			tlsstart = curtime();
   ssl_retry:
-			if ((r = SSL_ACC(srv_ssl)) <= 0)
+			if ((r = SSL_accept(srv_ssl)) <= 0)
 			{
 				int i, ssl_err;
+				int save_errno = errno;
 
 				ssl_err = SSL_get_error(srv_ssl, r);
 				i = tls_retry(srv_ssl, rfd, wfd, tlsstart,
@@ -1924,7 +2182,7 @@ smtp(nullserver, d_flags, e)
 						  "STARTTLS=server, error: accept failed=%d, reason=%s, SSL_error=%d, errno=%d, retry=%d, relay=%.100s",
 						  r, sr == NULL ? "unknown"
 								: sr,
-						  ssl_err, errno, i,
+						  ssl_err, save_errno, i,
 						  CurSmtpClient);
 					if (LogLevel > 9)
 						tlslogerr(LOG_WARNING, "server");
@@ -1962,7 +2220,7 @@ smtp(nullserver, d_flags, e)
 				     macvalue(macid("{verify}"), e),
 				     "STARTTLS", e,
 				     RSF_RMCOMM|RSF_COUNT,
-				     5, NULL, NOQID, NULL) != EX_OK ||
+				     5, NULL, NOQID, NULL, NULL) != EX_OK ||
 			    Errors > 0)
 			{
 				extern char MsgBuf[];
@@ -2052,7 +2310,7 @@ smtp(nullserver, d_flags, e)
 			DELAY_CONN("EHLO");
 			if (c->cmd_code == CMDEHLO)
 			{
-				protocol = "ESMTP";
+				protocol = GET_PROTOCOL();
 				SmtpPhase = "server EHLO";
 			}
 			else
@@ -2468,7 +2726,7 @@ smtp(nullserver, d_flags, e)
 #endif /* _FFR_MAIL_MACRO */
 			if (rscheck("check_mail", addr,
 				    NULL, e, RSF_RMCOMM|RSF_COUNT, 3,
-				    NULL, e->e_id, NULL) != EX_OK ||
+				    NULL, e->e_id, NULL, NULL) != EX_OK ||
 			    Errors > 0)
 				sm_exc_raisenew_x(&EtypeQuickAbort, 1);
 			macdefine(&e->e_macro, A_PERM,
@@ -2731,7 +2989,7 @@ smtp(nullserver, d_flags, e)
 				macid("{addr_type}"), "e r");
 			if (rscheck("check_rcpt", addr,
 				    NULL, e, RSF_RMCOMM|RSF_COUNT, 3,
-				    NULL, e->e_id, p_addr_st) != EX_OK ||
+				    NULL, e->e_id, p_addr_st, NULL) != EX_OK ||
 			    Errors > 0)
 				goto rcpt_done;
 			macdefine(&e->e_macro, A_PERM,
@@ -2744,6 +3002,9 @@ smtp(nullserver, d_flags, e)
 			milter_cmd_safe = true;
 #endif
 
+			addbcc(a, e);
+			rcptmods(a, e);
+
 			/* save in recipient list after ESMTP mods */
 			a = recipient(a, &e->e_sendqueue, 0, e);
 			/* may trigger exception... */
@@ -2821,6 +3082,7 @@ smtp(nullserver, d_flags, e)
 #if !MILTER
 		rcpt_done:
 #endif /* !MILTER */
+		
 			macdefine(&e->e_macro, A_PERM,
 				macid("{rcpt_mailer}"), NULL);
 			macdefine(&e->e_macro, A_PERM,
@@ -2974,8 +3236,8 @@ smtp(nullserver, d_flags, e)
 			{
 				/* do config file checking of the address */
 				if (rscheck(vrfy ? "check_vrfy" : "check_expn",
-					    p, NULL, e, RSF_RMCOMM,
-					    3, NULL, NOQID, NULL) != EX_OK ||
+					    p, NULL, e, RSF_RMCOMM, 3, NULL,
+					    NOQID, NULL, NULL) != EX_OK ||
 				    Errors > 0)
 					sm_exc_raisenew_x(&EtypeQuickAbort, 1);
 				(void) sendtolist(p, NULLADDR, &vrfyqueue, 0, e);
@@ -3070,9 +3332,8 @@ smtp(nullserver, d_flags, e)
 			**  available to make a decision.
 			*/
 
-			if (rscheck("check_etrn", p, NULL, e,
-				    RSF_RMCOMM, 3, NULL, NOQID, NULL)
-								!= EX_OK ||
+			if (rscheck("check_etrn", p, NULL, e, RSF_RMCOMM, 3,
+				    NULL, NOQID, NULL, NULL) != EX_OK ||
 			    Errors > 0)
 				break;
 
@@ -3371,7 +3632,7 @@ smtp_data(smtp, e)
 	(void) sm_snprintf(buf, sizeof(buf), "%u", smtp->sm_nrcpts);
 	if (rscheck("check_data", buf, NULL, e,
 		    RSF_RMCOMM|RSF_UNSTRUCTURED|RSF_COUNT, 3, NULL,
-		    e->e_id, NULL) != EX_OK)
+		    e->e_id, NULL, NULL) != EX_OK)
 		return true;
 
 #if MILTER && SMFI_VERSION > 3
@@ -3494,7 +3755,7 @@ smtp_data(smtp, e)
 
 	/* rscheck() will set Errors or EF_DISCARD if it trips */
 	(void) rscheck("check_eom", buf, NULL, e, RSF_UNSTRUCTURED|RSF_COUNT,
-		       3, NULL, e->e_id, NULL);
+		       3, NULL, e->e_id, NULL, NULL);
 
 #if MILTER
 	milteraccept = true;
@@ -3735,6 +3996,38 @@ smtp_data(smtp, e)
 	_res.retrans = TimeOuts.res_retrans[RES_TO_FIRST];
 #endif /* NAMED_BIND */
 
+#if _FFR_PROXY
+	if (SM_PROXY_REQ == e->e_sendmode)
+	{
+		/* is proxy mode possible? */
+		if (e->e_sibling == NULL && e->e_nrcpts == 1
+		    && smtp->sm_nrcpts == 1
+		    && (a = e->e_sendqueue) != NULL && a->q_next == NULL)
+		{
+			a->q_flags &= ~(QPINGONFAILURE|QPINGONSUCCESS|
+					QPINGONDELAY);
+			e->e_errormode = EM_QUIET;
+			e->e_sendmode = SM_PROXY;
+		}
+		else
+		{
+			if (tTd(87, 2))
+			{
+				a = e->e_sendqueue;
+				sm_dprintf("srv: mode=%c, e=%p, sibling=%p, nrcpts=%d, sm_nrcpts=%d, sendqueue=%p, next=%p\n",
+				e->e_sendmode, e, e->e_sibling, e->e_nrcpts,
+				smtp->sm_nrcpts, a,
+				(a == NULL) ? (void *)0 : a->q_next);
+			}
+
+			/* switch to interactive mode */
+			e->e_sendmode = SM_DELIVER;
+			if (LogLevel > 9)
+				sm_syslog(LOG_DEBUG, e->e_id,
+					  "proxy mode requested but not possible");
+		}
+	}
+#endif /* _FFR_PROXY */
 
 	for (ee = e; ee != NULL; ee = ee->e_sibling)
 	{
@@ -3779,6 +4072,84 @@ smtp_data(smtp, e)
 	oldid = CurEnv->e_id;
 	CurEnv->e_id = id;
 
+#if _FFR_PROXY
+	a = e->e_sendqueue;
+	if (tTd(87, 1))
+	{
+		sm_dprintf("srv: mode=%c, e=%p, sibling=%p, nrcpts=%d, msg=%s, sendqueue=%p, next=%p, state=%d, SmtpError=%s, rcode=%d, renhsc=%s, text=%s\n",
+		e->e_sendmode, e, e->e_sibling, e->e_nrcpts, e->e_message, a,
+		(a == NULL) ? (void *)0 : a->q_next,
+		(a == NULL) ? -1 : a->q_state, SmtpError, e->e_rcode,
+		e->e_renhsc, e->e_text);
+	}
+
+	if (SM_PROXY == e->e_sendmode && a->q_state != QS_SENT &&
+	    a->q_state != QS_VERIFIED) /* discarded! */
+	{
+		char *m, *errtext;
+		char replycode[4];
+		char enhsc[10];
+		int offset;
+
+#define NN_MSG(e)	(((e)->e_message != NULL) ? (e)->e_message : "")
+		m = e->e_message;
+#define SM_MSG_DEFERRED "Deferred: "
+		if (m != NULL && strncmp(SM_MSG_DEFERRED, m,
+					 sizeof(SM_MSG_DEFERRED) - 1) == 0)
+			m += sizeof(SM_MSG_DEFERRED) - 1;
+		offset = extsc(m, ' ', replycode, enhsc);
+
+		if (tTd(87, 2))
+		{
+			sm_dprintf("srv: SmtpError=%s, rcode=%d, renhsc=%s, replycode=%s, enhsc=%s, offset=%d\n",
+				SmtpError, e->e_rcode, e->e_renhsc,
+				replycode, enhsc, offset);
+		}
+
+#define DIG2CHAR(d)	((d) + '0')
+		if (e->e_rcode != 0 && (replycode[0] == '\0' ||
+		    replycode[0] == DIG2CHAR(REPLYTYPE(e->e_rcode))))
+		{
+			replycode[0] = DIG2CHAR(REPLYTYPE(e->e_rcode));
+			replycode[1] = DIG2CHAR(REPLYCLASS(e->e_rcode));
+			replycode[2] = DIG2CHAR(REPLYMINOR(e->e_rcode));
+			replycode[3] = '\0';
+			if (e->e_renhsc[0] == replycode[0])
+				sm_strlcpy(enhsc, e->e_renhsc, sizeof(enhsc));
+			if (offset < 0)
+				offset = 0;
+		}
+		if (e->e_text != NULL)
+		{
+			(void) strreplnonprt(e->e_text, '_');
+			errtext = e->e_text;
+		}
+		else
+			errtext = m + offset;
+
+		if (replycode[0] != '\0' && enhsc[0] != '\0')
+			emessage(replycode, enhsc, "%s", errtext);
+		else if (replycode[0] != '\0')
+			emessage(replycode, smtptodsn(atoi(replycode)),
+				 "%s", errtext);
+		else if (QS_IS_TEMPFAIL(a->q_state))
+		{
+			if (m != NULL)
+				message("450 4.5.1 %s", m);
+			else
+				message("450 4.5.1 Temporary error");
+		}
+		else
+		{
+			if (m != NULL)
+				message("550 5.5.1 %s", m);
+			else
+				message("550 5.0.0 Permanent error");
+		}
+	}
+	else
+	{
+#endif /* _FFR_PROXY */
 		/* issue success message */
 #if _FFR_MSG_ACCEPT
 		if (MessageAccept != NULL && *MessageAccept != '\0')
@@ -3791,6 +4162,9 @@ smtp_data(smtp, e)
 		else
 #endif /* _FFR_MSG_ACCEPT */
 		message("250 2.0.0 %s Message accepted for delivery", id);
+#if _FFR_PROXY
+	}
+#endif /* _FFR_PROXY */
 	CurEnv->e_id = oldid;
 
 	/* if we just queued, poke it */
@@ -3937,7 +4311,7 @@ logundelrcpts(e, msg, level, all)
 			    ? e->e_enhsc :
 #endif /* _FFR_MILTER_ENHSC */
 			    a->q_status,
-			    msg, NULL, (time_t) 0, e);
+			    msg, NULL, (time_t) 0, e, a, EX_OK /* ??? */);
 	}
 	e->e_to = NULL;
 }
@@ -4339,8 +4713,8 @@ mail_esmtp_args(a, kp, vp, e)
 		SuprErrs = true;
 		QuickAbort = false;
 		if (strcmp(auth_param, "<>") != 0 &&
-		     (rscheck("trust_auth", auth_param, NULL, e, RSF_RMCOMM,
-			      9, NULL, NOQID, NULL) != EX_OK || Errors > 0))
+		     (rscheck("trust_auth", auth_param, NULL, e, RSF_RMCOMM, 9,
+			      NULL, NOQID, NULL, NULL) != EX_OK || Errors > 0))
 		{
 			if (tTd(95, 8))
 			{
diff --git a/contrib/sendmail/src/tls.c b/contrib/sendmail/src/tls.c
index ca93ee8b730f..6b0ea25da255 100644
--- a/contrib/sendmail/src/tls.c
+++ b/contrib/sendmail/src/tls.c
@@ -13,21 +13,21 @@
 SM_RCSID("@(#)$Id: tls.c,v 8.127 2013-11-27 02:51:11 gshapiro Exp $")
 
 #if STARTTLS
-#  include 
-#  include 
-#  include 
-#  ifndef HASURANDOMDEV
-#   include 
-#  endif /* ! HASURANDOMDEV */
+# include 
+# include 
+# include 
+# ifndef HASURANDOMDEV
+#  include 
+# endif /* ! HASURANDOMDEV */
 # if !TLS_NO_RSA
 static RSA *rsa_tmp = NULL;	/* temporary RSA key */
 static RSA *tmp_rsa_key __P((SSL *, int, int));
 # endif /* !TLS_NO_RSA */
-#  if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x00907000L
+# if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x00907000L
 static int	tls_verify_cb __P((X509_STORE_CTX *));
-#  else /* !defined() || OPENSSL_VERSION_NUMBER < 0x00907000L */
+# else /* !defined() || OPENSSL_VERSION_NUMBER < 0x00907000L */
 static int	tls_verify_cb __P((X509_STORE_CTX *, void *));
-#  endif /* !defined() || OPENSSL_VERSION_NUMBER < 0x00907000L */
+# endif /* !defined() || OPENSSL_VERSION_NUMBER < 0x00907000L */
 
 # if OPENSSL_VERSION_NUMBER > 0x00907000L
 static int x509_verify_cb __P((int, X509_STORE_CTX *));
@@ -41,7 +41,7 @@ static int x509_verify_cb __P((int, X509_STORE_CTX *));
 static void	apps_ssl_info_cb __P((CONST097 SSL *, int , int));
 static bool	tls_ok_f __P((char *, char *, int));
 static bool	tls_safe_f __P((char *, long, bool));
-static int	tls_verify_log __P((int, X509_STORE_CTX *, char *));
+static int	tls_verify_log __P((int, X509_STORE_CTX *, const char *));
 
 # if !NO_DH
 static DH *get_dh512 __P((void));
@@ -73,6 +73,62 @@ get_dh512()
 		return NULL;
 	return dh;
 }
+
+#  if 0
+
+This is the data from which the C code has been generated:
+
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEArDcgcLpxEksQHPlolRKCUJ2szKRziseWV9cUSQNZGxoGw7KkROz4
+HF9QSbg5axyNIG+QbZYtx0jp3l6/GWq1dLOj27yZkgYgaYgFrvKPiZ2jJ5xETQVH
+UpZwbjRcyjyWkWYJVsx1aF4F/iY4kT0n/+iGEoimI3C9V3KXTJ2S6jIkyJ6M/CrN
+EtrDynMlUMGlc7S1ouXVOTrtKeqy3S2L9eBLxVI+sChEijGIfELupdVeXihK006p
+MgnABPDbkTx6OOtYmSZaGQX+OLW2FPmwvcrzgCz9t9cAsuUcBZv1LeHEqZZttyLU
+oK0jjSXgFyeU4/NfyA+zuNeWzUL6bHmigwIBAg==
+-----END DH PARAMETERS-----
+#  endif /* 0 */
+
+static DH *
+get_dh2048()
+{
+	static unsigned char dh2048_p[]={
+		0xAC,0x37,0x20,0x70,0xBA,0x71,0x12,0x4B,0x10,0x1C,0xF9,0x68,
+		0x95,0x12,0x82,0x50,0x9D,0xAC,0xCC,0xA4,0x73,0x8A,0xC7,0x96,
+		0x57,0xD7,0x14,0x49,0x03,0x59,0x1B,0x1A,0x06,0xC3,0xB2,0xA4,
+		0x44,0xEC,0xF8,0x1C,0x5F,0x50,0x49,0xB8,0x39,0x6B,0x1C,0x8D,
+		0x20,0x6F,0x90,0x6D,0x96,0x2D,0xC7,0x48,0xE9,0xDE,0x5E,0xBF,
+		0x19,0x6A,0xB5,0x74,0xB3,0xA3,0xDB,0xBC,0x99,0x92,0x06,0x20,
+		0x69,0x88,0x05,0xAE,0xF2,0x8F,0x89,0x9D,0xA3,0x27,0x9C,0x44,
+		0x4D,0x05,0x47,0x52,0x96,0x70,0x6E,0x34,0x5C,0xCA,0x3C,0x96,
+		0x91,0x66,0x09,0x56,0xCC,0x75,0x68,0x5E,0x05,0xFE,0x26,0x38,
+		0x91,0x3D,0x27,0xFF,0xE8,0x86,0x12,0x88,0xA6,0x23,0x70,0xBD,
+		0x57,0x72,0x97,0x4C,0x9D,0x92,0xEA,0x32,0x24,0xC8,0x9E,0x8C,
+		0xFC,0x2A,0xCD,0x12,0xDA,0xC3,0xCA,0x73,0x25,0x50,0xC1,0xA5,
+		0x73,0xB4,0xB5,0xA2,0xE5,0xD5,0x39,0x3A,0xED,0x29,0xEA,0xB2,
+		0xDD,0x2D,0x8B,0xF5,0xE0,0x4B,0xC5,0x52,0x3E,0xB0,0x28,0x44,
+		0x8A,0x31,0x88,0x7C,0x42,0xEE,0xA5,0xD5,0x5E,0x5E,0x28,0x4A,
+		0xD3,0x4E,0xA9,0x32,0x09,0xC0,0x04,0xF0,0xDB,0x91,0x3C,0x7A,
+		0x38,0xEB,0x58,0x99,0x26,0x5A,0x19,0x05,0xFE,0x38,0xB5,0xB6,
+		0x14,0xF9,0xB0,0xBD,0xCA,0xF3,0x80,0x2C,0xFD,0xB7,0xD7,0x00,
+		0xB2,0xE5,0x1C,0x05,0x9B,0xF5,0x2D,0xE1,0xC4,0xA9,0x96,0x6D,
+		0xB7,0x22,0xD4,0xA0,0xAD,0x23,0x8D,0x25,0xE0,0x17,0x27,0x94,
+		0xE3,0xF3,0x5F,0xC8,0x0F,0xB3,0xB8,0xD7,0x96,0xCD,0x42,0xFA,
+		0x6C,0x79,0xA2,0x83,
+		};
+	static unsigned char dh2048_g[]={ 0x02, };
+	DH *dh;
+
+	if ((dh=DH_new()) == NULL)
+		return(NULL);
+	dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
+	dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+	if ((dh->p == NULL) || (dh->g == NULL))
+	{
+		DH_free(dh);
+		return(NULL);
+	}
+	return(dh);
+}
 # endif /* !NO_DH */
 
 
@@ -311,15 +367,32 @@ init_tls_library(fipsmode)
 		}
 	}
 #endif /* _FFR_FIPSMODE  */
+	if (bv && CertFingerprintAlgorithm != NULL)
+	{
+		const EVP_MD *md;
+
+		md = EVP_get_digestbyname(CertFingerprintAlgorithm);
+		if (NULL == md)
+		{
+			bv = false;
+			if (LogLevel > 0)
+				sm_syslog(LOG_ERR, NOQID,
+					"STARTTLS=init, CertFingerprintAlgorithm=%s, status=invalid"
+					, CertFingerprintAlgorithm);
+		}
+		else
+			EVP_digest = md;
+	}
 	return bv;
 }
+
 /*
 **  TLS_SET_VERIFY -- request client certificate?
 **
 **	Parameters:
 **		ctx -- TLS context
 **		ssl -- TLS structure
-**		vrfy -- require certificate?
+**		vrfy -- request certificate?
 **
 **	Returns:
 **		none.
@@ -369,12 +442,10 @@ tls_set_verify(ctx, ssl, vrfy)
 # define TLS_S_CRLF_EX	0x00000100	/* CRL file exists */
 # define TLS_S_CRLF_OK	0x00000200	/* CRL file is ok */
 
-# if _FFR_TLS_1
-#  define TLS_S_CERT2_EX	0x00001000	/* 2nd cert file exists */
-#  define TLS_S_CERT2_OK	0x00002000	/* 2nd cert file is ok */
-#  define TLS_S_KEY2_EX	0x00004000	/* 2nd key file exists */
-#  define TLS_S_KEY2_OK	0x00008000	/* 2nd key file is ok */
-# endif /* _FFR_TLS_1 */
+# define TLS_S_CERT2_EX	0x00001000	/* 2nd cert file exists */
+# define TLS_S_CERT2_OK	0x00002000	/* 2nd cert file is ok */
+# define TLS_S_KEY2_EX	0x00004000	/* 2nd key file exists */
+# define TLS_S_KEY2_OK	0x00008000	/* 2nd key file is ok */
 
 # define TLS_S_DH_OK	0x00200000	/* DH cert is ok */
 # define TLS_S_DHPAR_EX	0x00400000	/* DH param file exists */
@@ -507,6 +578,109 @@ tls_safe_f(var, sff, srv)
 			ok = false;	\
 	}
 
+# if _FFR_TLS_SE_OPTS
+/*
+**  LOAD_CERTKEY -- load cert/key for TLS session
+**
+**	Parameters:
+**		ssl -- TLS session context
+**		certfile -- filename of certificate
+**		keyfile -- filename of private key
+**
+**	Returns:
+**		succeeded?
+*/
+
+bool
+load_certkey(ssl, srv, certfile, keyfile)
+	SSL *ssl;
+	bool srv;
+	char *certfile;
+	char *keyfile;
+{
+	bool ok;
+	int r;
+	long sff, status;
+	unsigned long req;
+	char *who;
+
+	ok = true;
+	who = srv ? "server" : "client";
+	status = TLS_S_NONE;
+	req = TLS_I_CERT_EX|TLS_I_KEY_EX;
+	TLS_OK_F(certfile, "CertFile", bitset(TLS_I_CERT_EX, req),
+		 TLS_S_CERT_EX, srv ? TLS_T_SRV : TLS_T_CLT);
+	TLS_OK_F(keyfile, "KeyFile", bitset(TLS_I_KEY_EX, req),
+		 TLS_S_KEY_EX, srv ? TLS_T_SRV : TLS_T_CLT);
+
+	/* certfile etc. must be "safe". */
+	sff = SFF_REGONLY | SFF_SAFEDIRPATH | SFF_NOWLINK
+	     | SFF_NOGWFILES | SFF_NOWWFILES
+	     | SFF_MUSTOWN | SFF_ROOTOK | SFF_OPENASROOT;
+	if (DontLockReadFiles)
+		sff |= SFF_NOLOCK;
+
+	TLS_SAFE_F(certfile, sff | TLS_UNR(TLS_I_CERT_UNR, req),
+		   bitset(TLS_I_CERT_EX, req),
+		   bitset(TLS_S_CERT_EX, status), TLS_S_CERT_OK, srv);
+	TLS_SAFE_F(keyfile, sff | TLS_KEYSFF(req),
+		   bitset(TLS_I_KEY_EX, req),
+		   bitset(TLS_S_KEY_EX, status), TLS_S_KEY_OK, srv);
+
+# define SSL_use_cert(ssl, certfile) \
+	SSL_use_certificate_file(ssl, certfile, SSL_FILETYPE_PEM)
+# define SSL_USE_CERT "SSL_use_certificate_file"
+
+	if (bitset(TLS_S_CERT_OK, status) &&
+	    SSL_use_cert(ssl, certfile) <= 0)
+	{
+		if (LogLevel > 7)
+		{
+			sm_syslog(LOG_WARNING, NOQID,
+				  "STARTTLS=%s, error: %s(%s) failed",
+				  who, SSL_USE_CERT, certfile);
+			if (LogLevel > 9)
+				tlslogerr(LOG_WARNING, who);
+		}
+		if (bitset(TLS_I_USE_CERT, req))
+			return false;
+	}
+	if (bitset(TLS_S_KEY_OK, status) &&
+	    SSL_use_PrivateKey_file(ssl, keyfile, SSL_FILETYPE_PEM) <= 0)
+	{
+		if (LogLevel > 7)
+		{
+			sm_syslog(LOG_WARNING, NOQID,
+				  "STARTTLS=%s, error: SSL_use_PrivateKey_file(%s) failed",
+				  who, keyfile);
+			if (LogLevel > 9)
+				tlslogerr(LOG_WARNING, who);
+		}
+		if (bitset(TLS_I_USE_KEY, req))
+			return false;
+	}
+
+	/* check the private key */
+	if (bitset(TLS_S_KEY_OK, status) &&
+	    (r = SSL_check_private_key(ssl)) <= 0)
+	{
+		/* Private key does not match the certificate public key */
+		if (LogLevel > 5)
+		{
+			sm_syslog(LOG_WARNING, NOQID,
+				  "STARTTLS=%s, error: SSL_check_private_key failed(%s): %d",
+				  who, keyfile, r);
+			if (LogLevel > 9)
+				tlslogerr(LOG_WARNING, who);
+		}
+		if (bitset(TLS_I_USE_KEY, req))
+			return false;
+	}
+
+	return true;
+}
+# endif /* _FFR_TLS_SE_OPTS */
+
 /*
 **  INITTLS -- initialize TLS
 **
@@ -545,7 +719,7 @@ bool
 inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhparam)
 	SSL_CTX **ctx;
 	unsigned long req;
-	long options;
+	unsigned long options;
 	bool srv;
 	char *certfile, *keyfile, *cacertpath, *cacertfile, *dhparam;
 {
@@ -556,12 +730,10 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 	bool ok;
 	long sff, status;
 	char *who;
-# if _FFR_TLS_1
 	char *cf2, *kf2;
-# endif /* _FFR_TLS_1 */
-#  if SM_CONF_SHM
+# if SM_CONF_SHM
 	extern int ShmId;
-#  endif /* SM_CONF_SHM */
+# endif /* SM_CONF_SHM */
 # if OPENSSL_VERSION_NUMBER > 0x00907000L
 	BIO *crl_file;
 	X509_CRL *crl;
@@ -586,7 +758,6 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 		return true;
 	ok = true;
 
-# if _FFR_TLS_1
 	/*
 	**  look for a second filename: it must be separated by a ','
 	**  no blanks allowed (they won't be skipped).
@@ -605,7 +776,6 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 		if (keyfile != NULL && (kf2 = strchr(keyfile, ',')) != NULL)
 			*kf2++ = '\0';
 	}
-# endif /* _FFR_TLS_1 */
 
 	/*
 	**  Check whether files/paths are defined
@@ -625,7 +795,6 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 		 TLS_S_CRLF_EX, TLS_T_OTHER);
 # endif /* OPENSSL_VERSION_NUMBER > 0x00907000L */
 
-# if _FFR_TLS_1
 	/*
 	**  if the second file is specified it must exist
 	**  XXX: it is possible here to define only one of those files
@@ -641,18 +810,23 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 		TLS_OK_F(kf2, "KeyFile", bitset(TLS_I_KEY_EX, req),
 			 TLS_S_KEY2_EX, srv ? TLS_T_SRV : TLS_T_CLT);
 	}
-# endif /* _FFR_TLS_1 */
 
 	/*
 	**  valid values for dhparam are (only the first char is checked)
 	**  none	no parameters: don't use DH
+	**  i		use precomputed 2048 bit parameters
 	**  512		use precomputed 512 bit parameters
 	**  1024	generate 1024 bit parameters
 	**  2048	generate 2048 bit parameters
 	**  /file/name	read parameters from /file/name
-	**  default is: 1024
 	*/
 
+#define SET_DH_DFL	\
+	do {	\
+		dhparam = "I";	\
+		req |= TLS_I_DHFIXED;	\
+	} while (0)
+
 	if (bitset(TLS_I_TRY_DH, req))
 	{
 		if (dhparam != NULL)
@@ -661,24 +835,25 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 
 			if (c == '1')
 				req |= TLS_I_DH1024;
+			else if (c == 'I' || c == 'i')
+				req |= TLS_I_DHFIXED;
 			else if (c == '2')
 				req |= TLS_I_DH2048;
 			else if (c == '5')
 				req |= TLS_I_DH512;
-			else if (c != 'n' && c != 'N' && c != '/')
+			else if (c == 'n' || c == 'N')
+				req &= ~TLS_I_TRY_DH;
+			else if (c != '/')
 			{
 				if (LogLevel > 12)
 					sm_syslog(LOG_WARNING, NOQID,
-						  "STARTTLS=%s, error: illegal value '%s' for DHParam",
+						  "STARTTLS=%s, error: illegal value '%s' for DHParameters",
 						  who, dhparam);
 				dhparam = NULL;
 			}
 		}
 		if (dhparam == NULL)
-		{
-			dhparam = "1";
-			req |= TLS_I_DH1024;
-		}
+			SET_DH_DFL;
 		else if (*dhparam == '/')
 		{
 			TLS_OK_F(dhparam, "DHParameters",
@@ -705,9 +880,14 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 	TLS_SAFE_F(cacertfile, sff | TLS_UNR(TLS_I_CERTF_UNR, req),
 		   bitset(TLS_I_CERTF_EX, req),
 		   bitset(TLS_S_CERTF_EX, status), TLS_S_CERTF_OK, srv);
-	TLS_SAFE_F(dhparam, sff | TLS_UNR(TLS_I_DHPAR_UNR, req),
-		   bitset(TLS_I_DHPAR_EX, req),
-		   bitset(TLS_S_DHPAR_EX, status), TLS_S_DHPAR_OK, srv);
+	if (dhparam != NULL && *dhparam == '/')
+	{
+		TLS_SAFE_F(dhparam, sff | TLS_UNR(TLS_I_DHPAR_UNR, req),
+			   bitset(TLS_I_DHPAR_EX, req),
+			   bitset(TLS_S_DHPAR_EX, status), TLS_S_DHPAR_OK, srv);
+		if (!bitset(TLS_S_DHPAR_OK, status))
+			SET_DH_DFL;
+	}
 # if OPENSSL_VERSION_NUMBER > 0x00907000L
 	TLS_SAFE_F(CRLFile, sff | TLS_UNR(TLS_I_CRLF_UNR, req),
 		   bitset(TLS_I_CRLF_EX, req),
@@ -715,7 +895,6 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 # endif /* OPENSSL_VERSION_NUMBER > 0x00907000L */
 	if (!ok)
 		return ok;
-# if _FFR_TLS_1
 	if (cf2 != NULL)
 	{
 		TLS_SAFE_F(cf2, sff | TLS_UNR(TLS_I_CERT_UNR, req),
@@ -728,7 +907,6 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 			   bitset(TLS_I_KEY_EX, req),
 			   bitset(TLS_S_KEY2_EX, status), TLS_S_KEY2_OK, srv);
 	}
-# endif /* _FFR_TLS_1 */
 
 	/* create a method and a new context */
 	if ((*ctx = SSL_CTX_new(srv ? SSLv23_server_method() :
@@ -823,13 +1001,13 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 	*/
 
 	if (bitset(TLS_I_RSA_TMP, req)
-#   if SM_CONF_SHM
+#  if SM_CONF_SHM
 	    && ShmId != SM_SHM_NO_ID &&
 	    (rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL,
 					NULL)) == NULL
-#   else /* SM_CONF_SHM */
+#  else /* SM_CONF_SHM */
 	    && 0	/* no shared memory: no need to generate key now */
-#   endif /* SM_CONF_SHM */
+#  endif /* SM_CONF_SHM */
 	   )
 	{
 		if (LogLevel > 7)
@@ -865,16 +1043,25 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 			return false;
 	}
 
+#if _FFR_TLS_USE_CERTIFICATE_CHAIN_FILE
+# define SSL_CTX_use_cert(ssl_ctx, certfile) \
+	SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile)
+# define SSL_CTX_USE_CERT "SSL_CTX_use_certificate_chain_file"
+#else
+# define SSL_CTX_use_cert(ssl_ctx, certfile) \
+	SSL_CTX_use_certificate_file(ssl_ctx, certfile, SSL_FILETYPE_PEM)
+# define SSL_CTX_USE_CERT "SSL_CTX_use_certificate_file"
+#endif
+
 	/* get the certificate file */
 	if (bitset(TLS_S_CERT_OK, status) &&
-	    SSL_CTX_use_certificate_file(*ctx, certfile,
-					 SSL_FILETYPE_PEM) <= 0)
+	    SSL_CTX_use_cert(*ctx, certfile) <= 0)
 	{
 		if (LogLevel > 7)
 		{
 			sm_syslog(LOG_WARNING, NOQID,
-				  "STARTTLS=%s, error: SSL_CTX_use_certificate_file(%s) failed",
-				  who, certfile);
+				  "STARTTLS=%s, error: %s(%s) failed",
+				  who, SSL_CTX_USE_CERT, certfile);
 			if (LogLevel > 9)
 				tlslogerr(LOG_WARNING, who);
 		}
@@ -899,7 +1086,6 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 			return false;
 	}
 
-# if _FFR_TLS_1
 	/* XXX this code is pretty much duplicated from above! */
 
 	/* load private key */
@@ -918,13 +1104,13 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 
 	/* get the certificate file */
 	if (bitset(TLS_S_CERT2_OK, status) &&
-	    SSL_CTX_use_certificate_file(*ctx, cf2, SSL_FILETYPE_PEM) <= 0)
+	    SSL_CTX_use_cert(*ctx, cf2) <= 0)
 	{
 		if (LogLevel > 7)
 		{
 			sm_syslog(LOG_WARNING, NOQID,
-				  "STARTTLS=%s, error: SSL_CTX_use_certificate_file(%s) failed",
-				  who, cf2);
+				  "STARTTLS=%s, error: %s(%s) failed",
+				  who, SSL_CTX_USE_CERT, cf2);
 			if (LogLevel > 9)
 				tlslogerr(LOG_WARNING, who);
 		}
@@ -944,7 +1130,6 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 				tlslogerr(LOG_WARNING, who);
 		}
 	}
-# endif /* _FFR_TLS_1 */
 
 	/* SSL_CTX_set_quiet_shutdown(*ctx, 1); violation of standard? */
 
@@ -968,7 +1153,7 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 			options &= ~SSL_OP_TLS_BLOCK_PADDING_BUG;
 	}
 #endif
-	SSL_CTX_set_options(*ctx, options);
+	SSL_CTX_set_options(*ctx, (long) options);
 
 # if !NO_DH
 	/* Diffie-Hellman initialization */
@@ -977,6 +1162,10 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 #if _FFR_TLS_EC
 		EC_KEY *ecdh;
 #endif /* _FFR_TLS_EC */
+
+		if (tTd(96, 8))
+			sm_dprintf("inittls: req=%#lx, status=%#lx\n",
+				req, status);
 		if (bitset(TLS_S_DHPAR_OK, status))
 		{
 			BIO *bio;
@@ -996,6 +1185,7 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 						  ERR_error_string(err, NULL));
 					if (LogLevel > 9)
 						tlslogerr(LOG_WARNING, who);
+					SET_DH_DFL;
 				}
 			}
 			else
@@ -1025,8 +1215,13 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 			dh = DSA_dup_DH(dsa);
 			DSA_free(dsa);
 		}
-		else
-		if (dh == NULL && bitset(TLS_I_DH512, req))
+		else if (dh == NULL && bitset(TLS_I_DHFIXED, req))
+		{
+			if (tTd(96, 2))
+				sm_dprintf("inittls: Using precomputed 2048 bit DH parameters\n");
+			dh = get_dh2048();
+		}
+		else if (dh == NULL && bitset(TLS_I_DH512, req))
 		{
 			if (tTd(96, 2))
 				sm_dprintf("inittls: Using precomputed 512 bit DH parameters\n");
@@ -1153,7 +1348,6 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 	if (tTd(96, 9))
 		SSL_CTX_set_info_callback(*ctx, apps_ssl_info_cb);
 
-# if _FFR_TLS_1
 	/* install our own cipher list */
 	if (CipherList != NULL && *CipherList != '\0')
 	{
@@ -1171,29 +1365,73 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 			/* failure if setting to this list is required? */
 		}
 	}
-# endif /* _FFR_TLS_1 */
+
 	if (LogLevel > 12)
 		sm_syslog(LOG_INFO, NOQID, "STARTTLS=%s, init=%d", who, ok);
 
-# if _FFR_TLS_1
-#  if 0
+# if 0
 	/*
 	**  this label is required if we want to have a "clean" exit
 	**  see the comments above at the initialization of cf2
 	*/
 
     endinittls:
-#  endif /* 0 */
+# endif /* 0 */
 
 	/* undo damage to global variables */
 	if (cf2 != NULL)
 		*--cf2 = ',';
 	if (kf2 != NULL)
 		*--kf2 = ',';
-# endif /* _FFR_TLS_1 */
 
 	return ok;
 }
+
+/*
+**  CERT_FP -- get cert fingerprint
+**
+**	Parameters:
+**		cert -- TLS cert
+**		mac -- macro storage
+**		macro -- where to store cert fp
+**
+**	Returns:
+**		<=0: cert fp calculation failed
+**		>0: cert fp calculation ok
+*/
+
+static int
+cert_fp(cert, evp_digest, mac, macro)
+	X509 *cert;
+	const EVP_MD *evp_digest;
+	MACROS_T *mac;
+	char *macro;
+{
+	unsigned int n;
+	int r;
+	unsigned char md[EVP_MAX_MD_SIZE];
+	char md5h[EVP_MAX_MD_SIZE * 3];
+	static const char hexcodes[] = "0123456789ABCDEF";
+
+	n = 0;
+	if (X509_digest(cert, EVP_digest, md, &n) == 0 || n <= 0)
+	{
+		macdefine(mac, A_TEMP, macid(macro), "");
+		return 0;
+	}
+
+	SM_ASSERT((n * 3) + 2 < sizeof(md5h));
+	for (r = 0; r < (int) n; r++)
+	{
+		md5h[r * 3] = hexcodes[(md[r] & 0xf0) >> 4];
+		md5h[(r * 3) + 1] = hexcodes[(md[r] & 0x0f)];
+		md5h[(r * 3) + 2] = ':';
+	}
+	md5h[(n * 3) - 1] = '\0';
+	macdefine(mac, A_TEMP, macid(macro), md5h);
+	return 1;
+}
+
 /*
 **  TLS_GET_INFO -- get information about TLS connection
 **
@@ -1208,9 +1446,7 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar
 **		result of authentication.
 **
 **	Side Effects:
-**		sets macros: {cipher}, {tls_version}, {verify},
-**		{cipher_bits}, {alg_bits}, {cert}, {cert_subject},
-**		{cert_issuer}, {cn_subject}, {cn_issuer}
+**		sets various TLS related macros.
 */
 
 int
@@ -1238,7 +1474,7 @@ tls_get_info(ssl, srv, host, mac, certreq)
 	macdefine(mac, A_TEMP, macid("{cipher_bits}"), bitstr);
 	(void) sm_snprintf(bitstr, sizeof(bitstr), "%d", r);
 	macdefine(mac, A_TEMP, macid("{alg_bits}"), bitstr);
-	s = SSL_CIPHER_get_version(c);
+	s = (char *) SSL_get_version(ssl);
 	if (s == NULL)
 		s = "UNKNOWN";
 	macdefine(mac, A_TEMP, macid("{tls_version}"), s);
@@ -1252,9 +1488,7 @@ tls_get_info(ssl, srv, host, mac, certreq)
 			  who, verifyok, (unsigned long) cert);
 	if (cert != NULL)
 	{
-		unsigned int n;
 		X509_NAME *subj, *issuer;
-		unsigned char md[EVP_MAX_MD_SIZE];
 		char buf[MAXNAME];
 
 		subj = X509_get_subject_name(cert);
@@ -1268,6 +1502,8 @@ tls_get_info(ssl, srv, host, mac, certreq)
 
 # define LL_BADCERT	8
 
+#define CERTFPMACRO (CertFingerprintAlgorithm != NULL ? "{cert_fp}" : "{cert_md5}")
+
 #define CHECK_X509_NAME(which)	\
 	do {	\
 		if (r == -1)	\
@@ -1313,24 +1549,7 @@ tls_get_info(ssl, srv, host, mac, certreq)
 		CHECK_X509_NAME("cn_issuer");
 		macdefine(mac, A_TEMP, macid("{cn_issuer}"),
 			 xtextify(buf, "<>\")"));
-		n = 0;
-		if (X509_digest(cert, EVP_md5(), md, &n) != 0 && n > 0)
-		{
-			char md5h[EVP_MAX_MD_SIZE * 3];
-			static const char hexcodes[] = "0123456789ABCDEF";
-
-			SM_ASSERT((n * 3) + 2 < sizeof(md5h));
-			for (r = 0; r < (int) n; r++)
-			{
-				md5h[r * 3] = hexcodes[(md[r] & 0xf0) >> 4];
-				md5h[(r * 3) + 1] = hexcodes[(md[r] & 0x0f)];
-				md5h[(r * 3) + 2] = ':';
-			}
-			md5h[(n * 3) - 1] = '\0';
-			macdefine(mac, A_TEMP, macid("{cert_md5}"), md5h);
-		}
-		else
-			macdefine(mac, A_TEMP, macid("{cert_md5}"), "");
+		(void) cert_fp(cert, EVP_digest, mac, CERTFPMACRO);
 	}
 	else
 	{
@@ -1338,7 +1557,7 @@ tls_get_info(ssl, srv, host, mac, certreq)
 		macdefine(mac, A_PERM, macid("{cert_issuer}"), "");
 		macdefine(mac, A_PERM, macid("{cn_subject}"), "");
 		macdefine(mac, A_PERM, macid("{cn_issuer}"), "");
-		macdefine(mac, A_TEMP, macid("{cert_md5}"), "");
+		macdefine(mac, A_TEMP, macid(CERTFPMACRO), "");
 	}
 	switch (verifyok)
 	{
@@ -1633,9 +1852,9 @@ apps_ssl_info_cb(s, where, ret)
 **	Parameters:
 **		ok -- verify ok?
 **		ctx -- x509 context
+**		name -- from where is this called?
 **
 **	Returns:
-**		0 -- fatal error
 **		1 -- ok
 */
 
@@ -1643,9 +1862,8 @@ static int
 tls_verify_log(ok, ctx, name)
 	int ok;
 	X509_STORE_CTX *ctx;
-	char *name;
+	const char *name;
 {
-	SSL *ssl;
 	X509 *cert;
 	int reason, depth;
 	char buf[512];
@@ -1653,17 +1871,6 @@ tls_verify_log(ok, ctx, name)
 	cert = X509_STORE_CTX_get_current_cert(ctx);
 	reason = X509_STORE_CTX_get_error(ctx);
 	depth = X509_STORE_CTX_get_error_depth(ctx);
-	ssl = (SSL *) X509_STORE_CTX_get_ex_data(ctx,
-			SSL_get_ex_data_X509_STORE_CTX_idx());
-
-	if (ssl == NULL)
-	{
-		/* internal error */
-		sm_syslog(LOG_ERR, NOQID,
-			  "STARTTLS: internal error: tls_verify_cb: ssl == NULL");
-		return 0;
-	}
-
 	X509_NAME_oneline(X509_get_subject_name(cert), buf, sizeof(buf));
 	sm_syslog(LOG_INFO, NOQID,
 		  "STARTTLS: %s cert verify: depth=%d %s, state=%d, reason=%s",
@@ -1729,10 +1936,10 @@ tlslogerr(level, who)
 	unsigned long es;
 	char *file, *data;
 	char buf[256];
-#  define CP (const char **)
 
 	es = CRYPTO_thread_id();
-	while ((l = ERR_get_error_line_data(CP &file, &line, CP &data, &flags))
+	while ((l = ERR_get_error_line_data((const char **) &file, &line,
+					    (const char **) &data, &flags))
 		!= 0)
 	{
 		sm_syslog(level, NOQID,
diff --git a/contrib/sendmail/src/usersmtp.c b/contrib/sendmail/src/usersmtp.c
index f3ddcf2c8115..24d38ee4f945 100644
--- a/contrib/sendmail/src/usersmtp.c
+++ b/contrib/sendmail/src/usersmtp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2006, 2008-2010 Proofpoint, Inc. and its suppliers.
+ * Copyright (c) 1998-2006, 2008-2010, 2014 Proofpoint, Inc. and its suppliers.
  *	All rights reserved.
  * Copyright (c) 1983, 1995-1997 Eric P. Allman.  All rights reserved.
  * Copyright (c) 1988, 1993
@@ -92,6 +92,11 @@ smtpinit(m, mci, e, onlyhelo)
 		CurHostName = MyHostName;
 	SmtpNeedIntro = true;
 	state = mci->mci_state;
+#if _FFR_ERRCODE
+	e->e_rcode = 0;
+	e->e_renhsc[0] = '\0';
+	e->e_text = NULL;
+#endif /* _FFR_ERRCODE */
 	switch (state)
 	{
 	  case MCIS_MAIL:
@@ -227,10 +232,7 @@ smtpinit(m, mci, e, onlyhelo)
 	*/
 
 	if ((UseMSP && Verbose && bitset(MCIF_VERB, mci->mci_flags))
-# if !_FFR_DEPRECATE_MAILER_FLAG_I
-	    || bitnset(M_INTERNAL, m->m_flags)
-# endif /* !_FFR_DEPRECATE_MAILER_FLAG_I */
-	   )
+	    || bitnset(M_INTERNAL, m->m_flags))
 	{
 		/* tell it to be verbose */
 		smtpmessage("VERB", m, mci);
@@ -768,9 +770,7 @@ readauth(filename, safe, sai, rpool)
 		pid = -1;
 		sff = SFF_REGONLY|SFF_SAFEDIRPATH|SFF_NOWLINK
 		      |SFF_NOGWFILES|SFF_NOWWFILES|SFF_NOWRFILES;
-# if _FFR_GROUPREADABLEAUTHINFOFILE
 		if (!bitnset(DBS_GROUPREADABLEAUTHINFOFILE, DontBlameSendmail))
-# endif /* _FFR_GROUPREADABLEAUTHINFOFILE */
 			sff |= SFF_NOGRFILES;
 		if (DontLockReadFiles)
 			sff |= SFF_NOLOCK;
@@ -2770,7 +2770,10 @@ smtpdata(m, mci, e, ctladdr, xstart)
   writeerr:
 	mci->mci_errno = errno;
 	mci->mci_state = MCIS_ERROR;
-	mci_setstat(mci, EX_TEMPFAIL, "4.4.2", NULL);
+	mci_setstat(mci, bitset(MCIF_NOTSTICKY, mci->mci_flags)
+			 ? EX_NOTSTICKY: EX_TEMPFAIL,
+		    "4.4.2", NULL);
+	mci->mci_flags &= ~MCIF_NOTSTICKY;
 
 	/*
 	**  If putbody() couldn't finish due to a timeout,
@@ -2782,7 +2785,7 @@ smtpdata(m, mci, e, ctladdr, xstart)
 		(void) bfrewind(e->e_dfp);
 
 	errno = mci->mci_errno;
-	syserr("451 4.4.1 timeout writing message to %s", CurHostName);
+	syserr("+451 4.4.1 timeout writing message to %s", CurHostName);
 	smtpquit(m, mci, e);
 	return EX_TEMPFAIL;
 }
@@ -3085,7 +3088,7 @@ reply(m, mci, e, timeout, pfunc, enhstat, rtype)
 	*/
 
 	bufp = SmtpReplyBuffer;
-	set_tls_rd_tmo(timeout);
+	(void) set_tls_rd_tmo(timeout);
 	for (;;)
 	{
 		register char *p;
@@ -3247,6 +3250,48 @@ reply(m, mci, e, timeout, pfunc, enhstat, rtype)
 			firstline = false;
 			continue;
 		}
+#if _FFR_ERRCODE
+# if _FFR_PROXY
+		if ((e->e_rcode == 0 || REPLYTYPE(e->e_rcode) < 5)
+		    && REPLYTYPE(r) > 3 && firstline)
+# endif
+# if _FFR_LOGREPLY
+		if (REPLYTYPE(r) > 3 && firstline)
+# endif
+		{
+			int o = -1;
+# if PIPELINING
+			/*
+			**  ignore error iff: DATA, 5xy error, but we had
+			**  "retryable" recipients. XREF: smtpdata()
+			*/
+
+			if (!(rtype == XS_DATA && REPLYTYPE(r) == 5 &&
+			      mci->mci_okrcpts <= 0 && mci->mci_retryrcpt))
+# endif /* PIPELINING */
+			{
+				o = extenhsc(bufp + 4, ' ', enhstatcode);
+				if (o > 0)
+				{
+					sm_strlcpy(e->e_renhsc, enhstatcode,
+						sizeof(e->e_renhsc));
+
+					/* skip SMTP reply code, delimiters */
+					o += 5;
+				}
+				else
+					o = 4;
+				e->e_rcode = r;
+				e->e_text = sm_rpool_strdup_x(e->e_rpool,
+							      bufp + o);
+			}
+			if (tTd(87, 2))
+			{
+				sm_dprintf("user: offset=%d, bufp=%s, rcode=%d, enhstat=%s, text=%s\n",
+					o, bufp, r, e->e_renhsc, e->e_text);
+			}
+		}
+#endif /* _FFR_ERRCODE */
 
 		firstline = false;
 
diff --git a/contrib/sendmail/src/util.c b/contrib/sendmail/src/util.c
index 02e8ec204ad9..9775915d6260 100644
--- a/contrib/sendmail/src/util.c
+++ b/contrib/sendmail/src/util.c
@@ -1833,7 +1833,7 @@ dumpfd(fd, printclosed, logit)
 	}
 
 	(void) sm_snprintf(p, SPACELEFT(buf, p), "mode=%o: ",
-			(int) st.st_mode);
+			(unsigned int) st.st_mode);
 	p += strlen(p);
 	switch (st.st_mode & S_IFMT)
 	{
@@ -1936,11 +1936,11 @@ dumpfd(fd, printclosed, logit)
 	  default:
 defprint:
 		(void) sm_snprintf(p, SPACELEFT(buf, p),
-			 "dev=%d/%d, ino=%llu, nlink=%d, u/gid=%d/%d, ",
-			 major(st.st_dev), minor(st.st_dev),
+			 "dev=%ld/%ld, ino=%llu, nlink=%d, u/gid=%ld/%ld, ",
+			 (long) major(st.st_dev), (long) minor(st.st_dev),
 			 (ULONGLONG_T) st.st_ino,
-			 (int) st.st_nlink, (int) st.st_uid,
-			 (int) st.st_gid);
+			 (int) st.st_nlink, (long) st.st_uid,
+			 (long) st.st_gid);
 		p += strlen(p);
 		(void) sm_snprintf(p, SPACELEFT(buf, p), "size=%llu",
 			 (ULONGLONG_T) st.st_size);
@@ -2866,3 +2866,139 @@ count_open_connections(hostaddr)
 	return n;
 }
 
+#if _FFR_XCNCT
+/*
+**  XCONNECT -- get X-CONNECT info
+**
+**	Parameters:
+**		inchannel -- FILE to check
+**
+**	Returns:
+**		-1 on error
+**		0 if X-CONNECT was not given
+**		>0 if X-CONNECT was used successfully (D_XCNCT*)
+*/
+
+int
+xconnect(inchannel)
+	SM_FILE_T *inchannel;
+{
+	int r, i;
+	char *p, *b, delim, inp[MAXINPLINE];
+	SOCKADDR addr;
+	char **pvp;
+	char pvpbuf[PSBUFSIZE];
+	char *peerhostname;	/* name of SMTP peer or "localhost" */
+	extern ENVELOPE BlankEnvelope;
+
+#define XCONNECT "X-CONNECT "
+#define XCNNCTLEN (sizeof(XCONNECT) - 1)
+
+	/* Ask the ruleset whether to use x-connect */
+	pvp = NULL;
+	peerhostname = RealHostName;
+	if (peerhostname == NULL)
+		peerhostname = "localhost";
+	r = rscap("x_connect", peerhostname,
+		  anynet_ntoa(&RealHostAddr), &BlankEnvelope,
+		  &pvp, pvpbuf, sizeof(pvpbuf));
+	if (tTd(75, 8))
+		sm_syslog(LOG_INFO, NOQID, "x-connect: rscap=%d", r);
+	if (r == EX_UNAVAILABLE)
+		return 0;
+	if (r != EX_OK)
+	{
+		/* ruleset error */
+		sm_syslog(LOG_INFO, NOQID, "x-connect: rscap=%d", r);
+		return 0;
+	}
+	if (pvp != NULL && pvp[0] != NULL && (pvp[0][0] & 0377) == CANONNET)
+	{
+		/* $#: no x-connect */
+		if (tTd(75, 7))
+			sm_syslog(LOG_INFO, NOQID, "x-connect: nope");
+		return 0;
+	}
+
+	p = sfgets(inp, sizeof(inp), InChannel, TimeOuts.to_nextcommand, "pre");
+	if (tTd(75, 6))
+		sm_syslog(LOG_INFO, NOQID, "x-connect: input=%s", p);
+	if (p == NULL || strncasecmp(p, XCONNECT, XCNNCTLEN) != 0)
+		return -1;
+	p += XCNNCTLEN;
+	while (isascii(*p) && isspace(*p))
+		p++;
+
+	/* parameters: IPAddress [Hostname[ M]] */
+	b = p;
+	while (*p != '\0' && isascii(*p) &&
+	       (isalnum(*p) || *p == '.' || *p== ':'))
+		p++;
+	delim = *p;
+	*p = '\0';
+
+	memset(&addr, '\0', sizeof(addr));
+	addr.sin.sin_addr.s_addr = inet_addr(b);
+	if (addr.sin.sin_addr.s_addr != INADDR_NONE)
+	{
+		addr.sa.sa_family = AF_INET;
+		memcpy(&RealHostAddr, &addr, sizeof(addr));
+		if (tTd(75, 2))
+			sm_syslog(LOG_INFO, NOQID, "x-connect: addr=%s",
+				anynet_ntoa(&RealHostAddr));
+	}
+# if NETINET6
+	else if ((r = inet_pton(AF_INET6, b, &addr.sin6.sin6_addr)) == 1)
+	{
+		addr.sa.sa_family = AF_INET6;
+		memcpy(&RealHostAddr, &addr, sizeof(addr));
+	}
+# endif /* NETINET6 */
+	else
+		return -1;
+
+	/* more parameters? */
+	if (delim != ' ')
+		return D_XCNCT;
+	while (*p != '\0' && isascii(*p) && isspace(*p))
+		p++;
+
+	for (b = ++p, i = 0;
+	     *p != '\0' && isascii(*p) && (isalnum(*p) || *p == '.' || *p == '-');
+	     p++, i++)
+		;
+	if (i == 0)
+		return D_XCNCT;
+	delim = *p;
+	if (i > MAXNAME)
+		b[MAXNAME] = '\0';
+	else
+		b[i] = '\0';
+	SM_FREE_CLR(RealHostName);
+	RealHostName = newstr(b);
+	if (tTd(75, 2))
+		sm_syslog(LOG_INFO, NOQID, "x-connect: host=%s", b);
+	*p = delim;
+
+	b = p;
+	if (*p != ' ')
+		return D_XCNCT;
+
+	while (*p != '\0' && isascii(*p) && isspace(*p))
+		p++;
+
+	if (tTd(75, 4))
+	{
+		char *e;
+
+		e = strpbrk(p, "\r\n");
+		if (e != NULL)
+			*e = '\0';
+		sm_syslog(LOG_INFO, NOQID, "x-connect: rest=%s", p);
+	}
+	if (*p == 'M')
+		return D_XCNCT_M;
+
+	return D_XCNCT;
+}
+#endif /* _FFR_XCNCT */
diff --git a/contrib/sendmail/src/version.c b/contrib/sendmail/src/version.c
index 14767780b7c2..7145ce219840 100644
--- a/contrib/sendmail/src/version.c
+++ b/contrib/sendmail/src/version.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2014 Proofpoint, Inc. and its suppliers.
+ * Copyright (c) 1998-2015 Proofpoint, Inc. and its suppliers.
  *	All rights reserved.
  * Copyright (c) 1983 Eric P. Allman.  All rights reserved.
  * Copyright (c) 1988, 1993
@@ -13,6 +13,6 @@
 
 #include 
 
-SM_RCSID("@(#)$Id: version.c,v 8.249 2013-11-27 00:38:50 ca Exp $")
+SM_RCSID("@(#)$Id: version.c,v 8.250 2014-01-27 12:55:16 ca Exp $")
 
-char	Version[] = "8.14.9";
+char	Version[] = "8.15.2";
diff --git a/contrib/tcpdump/CHANGES b/contrib/tcpdump/CHANGES
index 62e57ebab7ca..38769f2c4ea7 100644
--- a/contrib/tcpdump/CHANGES
+++ b/contrib/tcpdump/CHANGES
@@ -1,4 +1,35 @@
+Friday April 10, 2015 guy@alum.mit.edu
+  Summary for 4.7.4 tcpdump release
+	RPKI to Router Protocol: Fix Segmentation Faults and other problems
+	RPKI to Router Protocol: print strings with fn_printn()
+	wb: fix some bounds checks
+
+Wednesday March 11, 2015 mcr@sandelman.ca
+  Summary for 4.7.3 tcpdump release
+	Capsicum fixes for FreeBSD 10
+
+Tuesday March 10, 2015 mcr@sandelman.ca
+  Summary for 4.7.2 tcpdump release
+	DCCP: update Packet Types with RFC4340/IANA names
+        fixes for CVE-2015-0261: IPv6 mobility header check issue
+        fixes for CVE-2015-2153, 2154, 2155: kday packets
+
+Friday Nov. 12, 2014 guy@alum.mit.edu
+  Summary for 4.7.0 tcpdump release
+        changes to hex printing of CDP packets
+	Fix PPI printing
+	Radius: update Packet Type Codes and Attribute Types with RFC/IANA names
+	Add a routine to print "text protocols", and add FTP/HTTP/SMTP/RTSP support.
+	improvements to telnet printer, even if not -v
+	omit length for bcp, print-tcp uses it
+	formatting fixes for a bunch of protocols
+	new bounds checks for a number of protocols
+	split netflow 1,6, and 6 dissector up.
+	added geneve dissector
+        CVE-2014-9140 PPP dissector fixed.
+
 Tuesday  Sep.  2, 2014 mcr@sandelman.ca
+  Summary for 4.6.2 tcpdump release
 	fix out-of-source-tree builds: find libpcap that is out of source
 	better configure check for libsmi
 
diff --git a/contrib/tcpdump/CREDITS b/contrib/tcpdump/CREDITS
index b8ef1e07a93c..a21311abc48d 100644
--- a/contrib/tcpdump/CREDITS
+++ b/contrib/tcpdump/CREDITS
@@ -2,7 +2,7 @@ This file lists people who have contributed to tcpdump:
 
 The current maintainers:
     Bill Fenner                   
-    Denis Ovsienko                
+    Denis Ovsienko                
     Fulvio Risso                  
     Guy Harris                    
     Hannes Gredler                
@@ -85,6 +85,7 @@ Additional people who have contributed patches:
     Harry Raaymakers              
     Heinz-Ado Arnolds             
     Hendrik Scholz                
+    Herwin Weststrate             
     Ian McDonald                  
     Ilpo Järvinen                 
     Jacek Tobiasz                 
@@ -95,6 +96,7 @@ Additional people who have contributed patches:
     Jefferson Ogata               
     Jeffrey Hutzelman             
     Jesper Peterson               
+    Jesse Gross                   
     Jim Hutchins                  
     João Medeiros                 
     Joerg Mayer                   
diff --git a/contrib/tcpdump/INSTALL.txt b/contrib/tcpdump/INSTALL.txt
index 6a0e6b8e1437..dcb52b86894b 100644
--- a/contrib/tcpdump/INSTALL.txt
+++ b/contrib/tcpdump/INSTALL.txt
@@ -52,7 +52,6 @@ appletalk.h	- AppleTalk definitions
 atime.awk	- TCP ack awk script
 atm.h		- ATM traffic type definitions
 atmuni31.h	- ATM Q.2931 definitions
-bootp.h		- BOOTP definitions
 bpf_dump.c	- BPF program printing routines, in case libpcap doesn't
 		  have them
 chdlc.h		- Cisco HDLC definitions
diff --git a/contrib/tcpdump/Makefile.in b/contrib/tcpdump/Makefile.in
index a6f1cf77c800..1004a5d9dadd 100644
--- a/contrib/tcpdump/Makefile.in
+++ b/contrib/tcpdump/Makefile.in
@@ -124,13 +124,17 @@ LIBNETDISSECT_SRC=\
 	print-fddi.c \
 	print-forces.c \
 	print-fr.c \
+	print-ftp.c \
+	print-geneve.c \
 	print-geonet.c \
 	print-gre.c \
 	print-hsrp.c \
+	print-http.c \
 	print-icmp.c \
 	print-igmp.c \
 	print-igrp.c \
 	print-ip.c \
+	print-ip6.c \
 	print-ipcomp.c \
 	print-ipfc.c \
 	print-ipnet.c \
@@ -178,6 +182,7 @@ LIBNETDISSECT_SRC=\
 	print-rpki-rtr.c \
 	print-rrcp.c \
 	print-rsvp.c \
+	print-rtsp.c \
 	print-rx.c \
 	print-sctp.c \
 	print-sflow.c \
@@ -185,6 +190,7 @@ LIBNETDISSECT_SRC=\
 	print-sl.c \
 	print-sll.c \
 	print-slow.c \
+	print-smtp.c \
 	print-snmp.c \
 	print-stp.c \
 	print-sunatm.c \
@@ -231,7 +237,6 @@ HDR = \
 	appletalk.h \
 	atm.h \
 	atmuni31.h \
-	bootp.h \
 	chdlc.h \
 	cpack.h \
 	ether.h \
@@ -241,7 +246,6 @@ HDR = \
 	gmpls.h \
 	gmt2local.h \
 	interface.h \
-	interface.h \
 	ip.h \
 	ip6.h \
 	ipproto.h \
@@ -330,7 +334,6 @@ EXTRA_DIST = \
 	print-dhcp6.c \
 	print-frag6.c \
 	print-icmp6.c \
-	print-ip6.c \
 	print-ip6opts.c \
 	print-mobility.c \
 	print-ospf6.c \
diff --git a/contrib/tcpdump/VERSION b/contrib/tcpdump/VERSION
index c78c4964cac9..b48b2de9d963 100644
--- a/contrib/tcpdump/VERSION
+++ b/contrib/tcpdump/VERSION
@@ -1 +1 @@
-4.6.2
+4.7.4
diff --git a/contrib/tcpdump/addrtoname.c b/contrib/tcpdump/addrtoname.c
index e208f54bd9ab..b02d0f78e120 100644
--- a/contrib/tcpdump/addrtoname.c
+++ b/contrib/tcpdump/addrtoname.c
@@ -576,7 +576,7 @@ linkaddr_string(netdissect_options *ndo, const u_char *ep, const unsigned int ty
 		return (etheraddr_string(ndo, ep));
 
 	if (type == LINKADDR_FRELAY)
-		return (q922_string(ep));
+		return (q922_string(ndo, ep, len));
 
 	tp = lookup_bytestring(ep, len);
 	if (tp->e_name)
@@ -1236,3 +1236,15 @@ newh6namemem(void)
 	return (p);
 }
 #endif /* INET6 */
+
+/* Represent TCI part of the 802.1Q 4-octet tag as text. */
+const char *
+ieee8021q_tci_string(const uint16_t tci)
+{
+	static char buf[128];
+	snprintf(buf, sizeof(buf), "vlan %u, p %u%s",
+	         tci & 0xfff,
+	         tci >> 13,
+	         (tci & 0x1000) ? ", DEI" : "");
+	return buf;
+}
diff --git a/contrib/tcpdump/addrtoname.h b/contrib/tcpdump/addrtoname.h
index 252c570e401d..b07d8b29e4cf 100644
--- a/contrib/tcpdump/addrtoname.h
+++ b/contrib/tcpdump/addrtoname.h
@@ -51,6 +51,7 @@ extern struct hnamemem *newhnamemem(void);
 #ifdef INET6
 extern struct h6namemem *newh6namemem(void);
 #endif
+extern const char * ieee8021q_tci_string(const uint16_t);
 
 #define ipaddr_string(ndo, p) getname(ndo, (const u_char *)(p))
 #ifdef INET6
diff --git a/contrib/tcpdump/bootp.h b/contrib/tcpdump/bootp.h
deleted file mode 100644
index b6aac4c3c439..000000000000
--- a/contrib/tcpdump/bootp.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Bootstrap Protocol (BOOTP).  RFC951 and RFC1048.
- *
- * This file specifies the "implementation-independent" BOOTP protocol
- * information which is common to both client and server.
- *
- * Copyright 1988 by Carnegie Mellon.
- *
- * Permission to use, copy, modify, and distribute this program for any
- * purpose and without fee is hereby granted, provided that this copyright
- * and permission notice appear on all copies and supporting documentation,
- * the name of Carnegie Mellon not be used in advertising or publicity
- * pertaining to distribution of the program without specific prior
- * permission, and notice be given in supporting documentation that copying
- * and distribution is by permission of Carnegie Mellon and Stanford
- * University.  Carnegie Mellon makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-
-
-struct bootp {
-	uint8_t		bp_op;		/* packet opcode type */
-	uint8_t		bp_htype;	/* hardware addr type */
-	uint8_t		bp_hlen;	/* hardware addr length */
-	uint8_t		bp_hops;	/* gateway hops */
-	uint32_t	bp_xid;		/* transaction ID */
-	uint16_t	bp_secs;	/* seconds since boot began */
-	uint16_t	bp_flags;	/* flags - see bootp_flag_values[]
-					   in print-bootp.c */
-	struct in_addr	bp_ciaddr;	/* client IP address */
-	struct in_addr	bp_yiaddr;	/* 'your' IP address */
-	struct in_addr	bp_siaddr;	/* server IP address */
-	struct in_addr	bp_giaddr;	/* gateway IP address */
-	uint8_t		bp_chaddr[16];	/* client hardware address */
-	uint8_t		bp_sname[64];	/* server host name */
-	uint8_t		bp_file[128];	/* boot file name */
-	uint8_t		bp_vend[64];	/* vendor-specific area */
-} UNALIGNED;
-
-/*
- * UDP port numbers, server and client.
- */
-#define	IPPORT_BOOTPS		67
-#define	IPPORT_BOOTPC		68
-
-#define BOOTPREPLY		2
-#define BOOTPREQUEST		1
-
-/*
- * Vendor magic cookie (v_magic) for CMU
- */
-#define VM_CMU		"CMU"
-
-/*
- * Vendor magic cookie (v_magic) for RFC1048
- */
-#define VM_RFC1048	{ 99, 130, 83, 99 }
-
-
-
-/*
- * RFC1048 tag values used to specify what information is being supplied in
- * the vendor field of the packet.
- */
-
-#define TAG_PAD			((uint8_t)   0)
-#define TAG_SUBNET_MASK		((uint8_t)   1)
-#define TAG_TIME_OFFSET		((uint8_t)   2)
-#define TAG_GATEWAY		((uint8_t)   3)
-#define TAG_TIME_SERVER		((uint8_t)   4)
-#define TAG_NAME_SERVER		((uint8_t)   5)
-#define TAG_DOMAIN_SERVER	((uint8_t)   6)
-#define TAG_LOG_SERVER		((uint8_t)   7)
-#define TAG_COOKIE_SERVER	((uint8_t)   8)
-#define TAG_LPR_SERVER		((uint8_t)   9)
-#define TAG_IMPRESS_SERVER	((uint8_t)  10)
-#define TAG_RLP_SERVER		((uint8_t)  11)
-#define TAG_HOSTNAME		((uint8_t)  12)
-#define TAG_BOOTSIZE		((uint8_t)  13)
-#define TAG_END			((uint8_t) 255)
-/* RFC1497 tags */
-#define	TAG_DUMPPATH		((uint8_t)  14)
-#define	TAG_DOMAINNAME		((uint8_t)  15)
-#define	TAG_SWAP_SERVER		((uint8_t)  16)
-#define	TAG_ROOTPATH		((uint8_t)  17)
-#define	TAG_EXTPATH		((uint8_t)  18)
-/* RFC2132 */
-#define	TAG_IP_FORWARD		((uint8_t)  19)
-#define	TAG_NL_SRCRT		((uint8_t)  20)
-#define	TAG_PFILTERS		((uint8_t)  21)
-#define	TAG_REASS_SIZE		((uint8_t)  22)
-#define	TAG_DEF_TTL		((uint8_t)  23)
-#define	TAG_MTU_TIMEOUT		((uint8_t)  24)
-#define	TAG_MTU_TABLE		((uint8_t)  25)
-#define	TAG_INT_MTU		((uint8_t)  26)
-#define	TAG_LOCAL_SUBNETS	((uint8_t)  27)
-#define	TAG_BROAD_ADDR		((uint8_t)  28)
-#define	TAG_DO_MASK_DISC	((uint8_t)  29)
-#define	TAG_SUPPLY_MASK		((uint8_t)  30)
-#define	TAG_DO_RDISC		((uint8_t)  31)
-#define	TAG_RTR_SOL_ADDR	((uint8_t)  32)
-#define	TAG_STATIC_ROUTE	((uint8_t)  33)
-#define	TAG_USE_TRAILERS	((uint8_t)  34)
-#define	TAG_ARP_TIMEOUT		((uint8_t)  35)
-#define	TAG_ETH_ENCAP		((uint8_t)  36)
-#define	TAG_TCP_TTL		((uint8_t)  37)
-#define	TAG_TCP_KEEPALIVE	((uint8_t)  38)
-#define	TAG_KEEPALIVE_GO	((uint8_t)  39)
-#define	TAG_NIS_DOMAIN		((uint8_t)  40)
-#define	TAG_NIS_SERVERS		((uint8_t)  41)
-#define	TAG_NTP_SERVERS		((uint8_t)  42)
-#define	TAG_VENDOR_OPTS		((uint8_t)  43)
-#define	TAG_NETBIOS_NS		((uint8_t)  44)
-#define	TAG_NETBIOS_DDS		((uint8_t)  45)
-#define	TAG_NETBIOS_NODE	((uint8_t)  46)
-#define	TAG_NETBIOS_SCOPE	((uint8_t)  47)
-#define	TAG_XWIN_FS		((uint8_t)  48)
-#define	TAG_XWIN_DM		((uint8_t)  49)
-#define	TAG_NIS_P_DOMAIN	((uint8_t)  64)
-#define	TAG_NIS_P_SERVERS	((uint8_t)  65)
-#define	TAG_MOBILE_HOME		((uint8_t)  68)
-#define	TAG_SMPT_SERVER		((uint8_t)  69)
-#define	TAG_POP3_SERVER		((uint8_t)  70)
-#define	TAG_NNTP_SERVER		((uint8_t)  71)
-#define	TAG_WWW_SERVER		((uint8_t)  72)
-#define	TAG_FINGER_SERVER	((uint8_t)  73)
-#define	TAG_IRC_SERVER		((uint8_t)  74)
-#define	TAG_STREETTALK_SRVR	((uint8_t)  75)
-#define	TAG_STREETTALK_STDA	((uint8_t)  76)
-/* DHCP options */
-#define	TAG_REQUESTED_IP	((uint8_t)  50)
-#define	TAG_IP_LEASE		((uint8_t)  51)
-#define	TAG_OPT_OVERLOAD	((uint8_t)  52)
-#define	TAG_TFTP_SERVER		((uint8_t)  66)
-#define	TAG_BOOTFILENAME	((uint8_t)  67)
-#define	TAG_DHCP_MESSAGE	((uint8_t)  53)
-#define	TAG_SERVER_ID		((uint8_t)  54)
-#define	TAG_PARM_REQUEST	((uint8_t)  55)
-#define	TAG_MESSAGE		((uint8_t)  56)
-#define	TAG_MAX_MSG_SIZE	((uint8_t)  57)
-#define	TAG_RENEWAL_TIME	((uint8_t)  58)
-#define	TAG_REBIND_TIME		((uint8_t)  59)
-#define	TAG_VENDOR_CLASS	((uint8_t)  60)
-#define	TAG_CLIENT_ID		((uint8_t)  61)
-/* RFC 2241 */
-#define	TAG_NDS_SERVERS		((uint8_t)  85)
-#define	TAG_NDS_TREE_NAME	((uint8_t)  86)
-#define	TAG_NDS_CONTEXT		((uint8_t)  87)
-/* RFC 2242 */
-#define	TAG_NDS_IPDOMAIN	((uint8_t)  62)
-#define	TAG_NDS_IPINFO		((uint8_t)  63)
-/* RFC 2485 */
-#define	TAG_OPEN_GROUP_UAP	((uint8_t)  98)
-/* RFC 2563 */
-#define	TAG_DISABLE_AUTOCONF	((uint8_t) 116)
-/* RFC 2610 */
-#define	TAG_SLP_DA		((uint8_t)  78)
-#define	TAG_SLP_SCOPE		((uint8_t)  79)
-/* RFC 2937 */
-#define	TAG_NS_SEARCH		((uint8_t) 117)
-/* RFC 3011 */
-#define	TAG_IP4_SUBNET_SELECT	((uint8_t) 118)
-/* RFC 3442 */
-#define TAG_CLASSLESS_STATIC_RT	((uint8_t) 121)
-#define TAG_CLASSLESS_STA_RT_MS	((uint8_t) 249)
-/* ftp://ftp.isi.edu/.../assignments/bootp-dhcp-extensions */
-#define	TAG_USER_CLASS		((uint8_t)  77)
-#define	TAG_SLP_NAMING_AUTH	((uint8_t)  80)
-#define	TAG_CLIENT_FQDN		((uint8_t)  81)
-#define	TAG_AGENT_CIRCUIT	((uint8_t)  82)
-#define	TAG_AGENT_REMOTE	((uint8_t)  83)
-#define	TAG_AGENT_MASK		((uint8_t)  84)
-#define	TAG_TZ_STRING		((uint8_t)  88)
-#define	TAG_FQDN_OPTION		((uint8_t)  89)
-#define	TAG_AUTH		((uint8_t)  90)
-#define	TAG_VINES_SERVERS	((uint8_t)  91)
-#define	TAG_SERVER_RANK		((uint8_t)  92)
-#define	TAG_CLIENT_ARCH		((uint8_t)  93)
-#define	TAG_CLIENT_NDI		((uint8_t)  94)
-#define	TAG_CLIENT_GUID		((uint8_t)  97)
-#define	TAG_LDAP_URL		((uint8_t)  95)
-#define	TAG_6OVER4		((uint8_t)  96)
-#define	TAG_PRINTER_NAME	((uint8_t) 100)
-#define	TAG_MDHCP_SERVER	((uint8_t) 101)
-#define	TAG_IPX_COMPAT		((uint8_t) 110)
-#define	TAG_NETINFO_PARENT	((uint8_t) 112)
-#define	TAG_NETINFO_PARENT_TAG	((uint8_t) 113)
-#define	TAG_URL			((uint8_t) 114)
-#define	TAG_FAILOVER		((uint8_t) 115)
-#define	TAG_EXTENDED_REQUEST	((uint8_t) 126)
-#define	TAG_EXTENDED_OPTION	((uint8_t) 127)
-
-
-/* DHCP Message types (values for TAG_DHCP_MESSAGE option) */
-#define		DHCPDISCOVER	1
-#define		DHCPOFFER	2
-#define		DHCPREQUEST	3
-#define		DHCPDECLINE	4
-#define		DHCPACK		5
-#define		DHCPNAK		6
-#define		DHCPRELEASE	7
-#define		DHCPINFORM	8
-
-
-/*
- * "vendor" data permitted for CMU bootp clients.
- */
-
-struct cmu_vend {
-	uint8_t		v_magic[4];	/* magic number */
-	uint32_t	v_flags;	/* flags/opcodes, etc. */
-	struct in_addr	v_smask;	/* Subnet mask */
-	struct in_addr	v_dgate;	/* Default gateway */
-	struct in_addr	v_dns1, v_dns2; /* Domain name servers */
-	struct in_addr	v_ins1, v_ins2; /* IEN-116 name servers */
-	struct in_addr	v_ts1, v_ts2;	/* Time servers */
-	uint8_t		v_unused[24];	/* currently unused */
-} UNALIGNED;
-
-
-/* v_flags values */
-#define VF_SMASK	1	/* Subnet mask field contains valid data */
-
-/* RFC 4702 DHCP Client FQDN Option */
-
-#define CLIENT_FQDN_FLAGS_S	0x01
-#define CLIENT_FQDN_FLAGS_O	0x02
-#define CLIENT_FQDN_FLAGS_E	0x04
-#define CLIENT_FQDN_FLAGS_N	0x08
diff --git a/contrib/tcpdump/config.guess b/contrib/tcpdump/config.guess
index d622a44e551f..44290b838cd0 100755
--- a/contrib/tcpdump/config.guess
+++ b/contrib/tcpdump/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2015-02-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-02-10'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to  and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches to .
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include 
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -153,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
 	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
@@ -182,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -198,7 +227,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
 	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
@@ -302,7 +335,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -560,8 +593,9 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -801,10 +835,13 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -852,21 +889,21 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -879,59 +916,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -950,54 +982,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1201,6 +1242,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1227,19 +1271,31 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1256,7 +1312,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,157 +1386,6 @@ EOF
 	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <
-# include 
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include 
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include 
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
 cat >&2 < header file. */
+#undef HAVE_CAP_NG_H
 
 /* Define to 1 if you have the `cap_rights_limit' function. */
 #undef HAVE_CAP_RIGHTS_LIMIT
@@ -55,6 +55,9 @@
 /* Define to 1 if you have the  header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `cap-ng' library (-lcap-ng). */
+#undef HAVE_LIBCAP_NG
+
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
 #undef HAVE_LIBCRYPTO
 
@@ -136,6 +139,9 @@
 /* Define to 1 if you have the `pcap_set_datalink' function. */
 #undef HAVE_PCAP_SET_DATALINK
 
+/* Define to 1 if you have the `pcap_set_immediate_mode' function. */
+#undef HAVE_PCAP_SET_IMMEDIATE_MODE
+
 /* Define to 1 if you have the `pcap_set_tstamp_precision' function. */
 #undef HAVE_PCAP_SET_TSTAMP_PRECISION
 
@@ -211,6 +217,9 @@
 /* Define to 1 if you have the  header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if the system has the type `uintptr_t'. */
+#undef HAVE_UINTPTR_T
+
 /* Define to 1 if you have the  header file. */
 #undef HAVE_UNISTD_H
 
@@ -382,3 +391,7 @@
 /* Define to the type of an unsigned integer type of width exactly 8 bits if
    such a type exists and the standard includes do not define it. */
 #undef uint8_t
+
+/* Define to the type of an unsigned integer type wide enough to hold a
+   pointer, if such a type exists, and if the system does not define it. */
+#undef uintptr_t
diff --git a/contrib/tcpdump/config.sub b/contrib/tcpdump/config.sub
index 59bb593f109c..bc855a2a910e 100755
--- a/contrib/tcpdump/config.sub
+++ b/contrib/tcpdump/config.sub
@@ -1,24 +1,18 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2012-04-18'
+timestamp='2015-02-22'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see .
@@ -26,11 +20,12 @@ timestamp='2012-04-18'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to .  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches to .
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to ."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,8 +116,8 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -156,7 +149,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -259,21 +252,24 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
-	| fido | fr30 | frv \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -287,23 +283,26 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -314,6 +313,7 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -328,7 +328,10 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -370,13 +373,13 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -385,11 +388,13 @@ case $basic_machine in
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -403,18 +408,22 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -432,6 +441,7 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -769,6 +779,9 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -788,11 +801,15 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -820,6 +837,10 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -828,7 +849,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1019,7 +1040,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1346,29 +1371,29 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1492,9 +1517,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1543,6 +1565,12 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
diff --git a/contrib/tcpdump/configure b/contrib/tcpdump/configure
index 83a07eff6c5f..43b3068aab43 100755
--- a/contrib/tcpdump/configure
+++ b/contrib/tcpdump/configure
@@ -705,7 +705,9 @@ with_user
 with_chroot
 with_sandbox_capsicum
 enable_ipv6
+with_system_libpcap
 with_crypto
+with_cap_ng
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1341,8 +1343,11 @@ Optional Packages:
   --without-smi           don't link with libsmi
   --with-user=USERNAME    drop privileges by default to USERNAME
   --with-chroot=DIRECTORY when dropping privileges, chroot to DIRECTORY
- --with-sandbox-capsicum
+  --with-sandbox-capsicum use Capsicum security functions [default=yes, if
+                          available]
+  --with-system-libpcap   don't use local pcap library
   --with-crypto           use OpenSSL libcrypto [default=yes, if available]
+  --with-cap-ng           use libcap-ng [default=yes, if available]
 
 Some influential environment variables:
   CC          C compiler command
@@ -4531,10 +4536,18 @@ fi
 # ac_lbl_capsicum_function_seen to yes; if any are not, set
 # ac_lbl_capsicum_function_not_seen to yes.
 #
-# All of them must be available in order to enable capsicum sandboxing.
+# We don't check cap_rights_init(), as it's a macro, wrapping another
+# function, in at least some versions of FreeBSD, and AC_CHECK_FUNCS()
+# doesn't handle that.
+#
+# All of the ones we check for must be available in order to enable
+# capsicum sandboxing.
+#
+# XXX - do we need to check for all of them, or are there some that, if
+# present, imply others are present?
 #
 if test ! -z "$with_sandbox-capsicum" && test "$with_sandbox-capsicum" != "no" ; then
-	for ac_func in cap_enter cap_rights_init cap_rights_limit cap_ioctls_limit openat
+	for ac_func in cap_enter cap_rights_limit cap_ioctls_limit openat
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -4836,7 +4849,7 @@ if test "${enable_ipv6+set}" = set; then :
   enableval=$enable_ipv6;  case "$enableval" in
 yes)   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-       LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
+       LOCALSRC="print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
 
 $as_echo "#define INET6 1" >>confdefs.h
 
@@ -4871,7 +4884,7 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-  LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
+  LOCALSRC="print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
 
 $as_echo "#define INET6 1" >>confdefs.h
 
@@ -5107,7 +5120,7 @@ $as_echo_n "checking getaddrinfo bug... " >&6; }
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
-  td_cv_buggygetaddrinfo=yes
+  td_cv_buggygetaddrinfo=unknown
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5221,6 +5234,9 @@ fi
 	if test "$td_cv_buggygetaddrinfo" = no; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: good" >&5
 $as_echo "good" >&6; }
+	elif test "$td_cv_buggygetaddrinfo" = unknown; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5
+$as_echo "unknown (cross-compiling)" >&6; }
 	else
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: buggy" >&5
 $as_echo "buggy" >&6; }
@@ -5799,26 +5815,34 @@ $as_echo "Using $pfopen" >&6; }
 		    LIBS="$LIBS $pfopen"
 	    fi
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for local pcap library" >&5
+	libpcap=FAIL
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for local pcap library" >&5
 $as_echo_n "checking for local pcap library... " >&6; }
-    libpcap=FAIL
-    lastdir=FAIL
-    places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
-	egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'`
-    places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \
-	egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'`
-    for dir in $places $srcdir/../libpcap ../libpcap $srcdir/libpcap $places2 ; do
-	    basedir=`echo $dir | sed -e 's/[ab][0-9]*$//' | \
-	        sed -e 's/-PRE-GIT$//' `
-	    if test $lastdir = $basedir ; then
-		    		    continue;
-	    fi
-	    lastdir=$dir
-	    if test -r $dir/libpcap.a ; then
-		    libpcap=$dir/libpcap.a
-		    d=$dir
-		    	    fi
-    done
+
+# Check whether --with-system-libpcap was given.
+if test "${with_system_libpcap+set}" = set; then :
+  withval=$with_system_libpcap;
+fi
+
+	if test "x$with_system_libpcap" != xyes ; then
+		lastdir=FAIL
+    	places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
+		egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'`
+    	places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \
+		egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'`
+    	for dir in $places $srcdir/../libpcap ../libpcap $srcdir/libpcap $places2 ; do
+	    	basedir=`echo $dir | sed -e 's/[ab][0-9]*$//' | \
+	        	sed -e 's/-PRE-GIT$//' `
+	    	if test $lastdir = $basedir ; then
+		    			    	continue;
+	    	fi
+	    	lastdir=$dir
+	    	if test -r $dir/libpcap.a ; then
+		    	libpcap=$dir/libpcap.a
+		    	d=$dir
+		    		    	fi
+		done
+	fi
     if test $libpcap = FAIL ; then
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
@@ -6131,110 +6155,6 @@ not be able to determine why this is happening, and thus will not be
 able to fix it, without that information, as we have not been able to
 reproduce this problem ourselves." "$LINENO" 5
 
-fi
-
-
-                        ac_fn_c_check_func "$LINENO" "pcap_list_datalinks" "ac_cv_func_pcap_list_datalinks"
-if test "x$ac_cv_func_pcap_list_datalinks" = xyes; then :
-
-
-$as_echo "#define HAVE_PCAP_LIST_DATALINKS 1" >>confdefs.h
-
-	    for ac_func in pcap_free_datalinks
-do :
-  ac_fn_c_check_func "$LINENO" "pcap_free_datalinks" "ac_cv_func_pcap_free_datalinks"
-if test "x$ac_cv_func_pcap_free_datalinks" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PCAP_FREE_DATALINKS 1
-_ACEOF
-
-fi
-done
-
-
-else
-
-	    case " $LIBOBJS " in
-  *" datalinks.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS datalinks.$ac_objext"
- ;;
-esac
-
-
-fi
-
-    for ac_func in pcap_set_datalink
-do :
-  ac_fn_c_check_func "$LINENO" "pcap_set_datalink" "ac_cv_func_pcap_set_datalink"
-if test "x$ac_cv_func_pcap_set_datalink" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PCAP_SET_DATALINK 1
-_ACEOF
-
-fi
-done
-
-    ac_fn_c_check_func "$LINENO" "pcap_datalink_name_to_val" "ac_cv_func_pcap_datalink_name_to_val"
-if test "x$ac_cv_func_pcap_datalink_name_to_val" = xyes; then :
-
-
-$as_echo "#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1" >>confdefs.h
-
-	    ac_fn_c_check_func "$LINENO" "pcap_datalink_val_to_description" "ac_cv_func_pcap_datalink_val_to_description"
-if test "x$ac_cv_func_pcap_datalink_val_to_description" = xyes; then :
-
-$as_echo "#define HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION 1" >>confdefs.h
-
-else
-
-		    case " $LIBOBJS " in
-  *" dlnames.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS dlnames.$ac_objext"
- ;;
-esac
-
-
-fi
-
-
-else
-
-	    case " $LIBOBJS " in
-  *" dlnames.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS dlnames.$ac_objext"
- ;;
-esac
-
-
-fi
-
-
-                        for ac_func in pcap_breakloop
-do :
-  ac_fn_c_check_func "$LINENO" "pcap_breakloop" "ac_cv_func_pcap_breakloop"
-if test "x$ac_cv_func_pcap_breakloop" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PCAP_BREAKLOOP 1
-_ACEOF
-
-fi
-done
-
-
-                    ac_fn_c_check_func "$LINENO" "pcap_dump_ftell" "ac_cv_func_pcap_dump_ftell"
-if test "x$ac_cv_func_pcap_dump_ftell" = xyes; then :
-
-$as_echo "#define HAVE_PCAP_DUMP_FTELL 1" >>confdefs.h
-
-else
-
-	    case " $LIBOBJS " in
-  *" pcap_dump_ftell.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS pcap_dump_ftell.$ac_objext"
- ;;
-esac
-
-
 fi
 
 
@@ -6606,6 +6526,110 @@ if test "$ac_cv_sockaddr_has_sa_len" = no; then
 	missing_includes=yes
 fi
 
+ac_fn_c_check_func "$LINENO" "pcap_list_datalinks" "ac_cv_func_pcap_list_datalinks"
+if test "x$ac_cv_func_pcap_list_datalinks" = xyes; then :
+
+
+$as_echo "#define HAVE_PCAP_LIST_DATALINKS 1" >>confdefs.h
+
+	    for ac_func in pcap_free_datalinks
+do :
+  ac_fn_c_check_func "$LINENO" "pcap_free_datalinks" "ac_cv_func_pcap_free_datalinks"
+if test "x$ac_cv_func_pcap_free_datalinks" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PCAP_FREE_DATALINKS 1
+_ACEOF
+
+fi
+done
+
+
+else
+
+	    case " $LIBOBJS " in
+  *" datalinks.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS datalinks.$ac_objext"
+ ;;
+esac
+
+
+fi
+
+for ac_func in pcap_set_datalink
+do :
+  ac_fn_c_check_func "$LINENO" "pcap_set_datalink" "ac_cv_func_pcap_set_datalink"
+if test "x$ac_cv_func_pcap_set_datalink" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PCAP_SET_DATALINK 1
+_ACEOF
+
+fi
+done
+
+ac_fn_c_check_func "$LINENO" "pcap_datalink_name_to_val" "ac_cv_func_pcap_datalink_name_to_val"
+if test "x$ac_cv_func_pcap_datalink_name_to_val" = xyes; then :
+
+
+$as_echo "#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1" >>confdefs.h
+
+	    ac_fn_c_check_func "$LINENO" "pcap_datalink_val_to_description" "ac_cv_func_pcap_datalink_val_to_description"
+if test "x$ac_cv_func_pcap_datalink_val_to_description" = xyes; then :
+
+$as_echo "#define HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION 1" >>confdefs.h
+
+else
+
+		    case " $LIBOBJS " in
+  *" dlnames.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS dlnames.$ac_objext"
+ ;;
+esac
+
+
+fi
+
+
+else
+
+	    case " $LIBOBJS " in
+  *" dlnames.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS dlnames.$ac_objext"
+ ;;
+esac
+
+
+fi
+
+
+for ac_func in pcap_breakloop
+do :
+  ac_fn_c_check_func "$LINENO" "pcap_breakloop" "ac_cv_func_pcap_breakloop"
+if test "x$ac_cv_func_pcap_breakloop" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PCAP_BREAKLOOP 1
+_ACEOF
+
+fi
+done
+
+
+ac_fn_c_check_func "$LINENO" "pcap_dump_ftell" "ac_cv_func_pcap_dump_ftell"
+if test "x$ac_cv_func_pcap_dump_ftell" = xyes; then :
+
+$as_echo "#define HAVE_PCAP_DUMP_FTELL 1" >>confdefs.h
+
+else
+
+	    case " $LIBOBJS " in
+  *" pcap_dump_ftell.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS pcap_dump_ftell.$ac_objext"
+ ;;
+esac
+
+
+fi
+
+
 #
 # Do we have the new open API?  Check for pcap_create, and assume that,
 # if we do, we also have pcap_activate() and the other new routines
@@ -6655,7 +6679,11 @@ done
 
 fi
 
-for ac_func in pcap_findalldevs pcap_dump_flush pcap_lib_version pcap_setdirection
+#
+# Check for a miscellaneous collection of functions which we use
+# if we have them.
+#
+for ac_func in pcap_findalldevs pcap_dump_flush pcap_lib_version pcap_setdirection pcap_set_immediate_mode
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -6710,7 +6738,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     if test "$ac_lbl_cv_pcap_version_defined" = yes ; then
-    	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 $as_echo "#define HAVE_PCAP_VERSION 1" >>confdefs.h
@@ -6969,6 +6997,48 @@ _ACEOF
   esac
 
 
+#
+# Make sure we have a definition for C99's uintptr_t (regardless of
+# whether the environment is a C99 environment or not).
+#
+
+  ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_uintptr_t" = xyes; then :
+
+$as_echo "#define HAVE_UINTPTR_T 1" >>confdefs.h
+
+else
+  for ac_type in 'unsigned int' 'unsigned long int' \
+	'unsigned long long int'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define uintptr_t $ac_type
+_ACEOF
+
+	  ac_type=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       test -z "$ac_type" && break
+     done
+fi
+
+
+
 #
 # Define the old BSD specified-width types in terms of the C99 types;
 # we may need them with libpcap include files.
@@ -8150,6 +8220,98 @@ done
 
 fi
 
+# Check for libcap-ng
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use libcap-ng" >&5
+$as_echo_n "checking whether to use libcap-ng... " >&6; }
+# Specify location for both includes and libraries.
+want_libcap_ng=ifavailable
+
+# Check whether --with-cap_ng was given.
+if test "${with_cap_ng+set}" = set; then :
+  withval=$with_cap_ng;
+	if test $withval = no
+	then
+		want_libcap_ng=no
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	elif test $withval = yes
+	then
+		want_libcap_ng=yes
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	fi
+
+else
+
+	#
+	# Use libcap-ng if it's present, otherwise don't.
+	#
+	want_libcap_ng=ifavailable
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, if available" >&5
+$as_echo "yes, if available" >&6; }
+
+fi
+
+if test "$want_libcap_ng" != "no"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for capng_change_id in -lcap-ng" >&5
+$as_echo_n "checking for capng_change_id in -lcap-ng... " >&6; }
+if ${ac_cv_lib_cap_ng_capng_change_id+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcap-ng  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char capng_change_id ();
+int
+main ()
+{
+return capng_change_id ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_cap_ng_capng_change_id=yes
+else
+  ac_cv_lib_cap_ng_capng_change_id=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_ng_capng_change_id" >&5
+$as_echo "$ac_cv_lib_cap_ng_capng_change_id" >&6; }
+if test "x$ac_cv_lib_cap_ng_capng_change_id" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBCAP_NG 1
+_ACEOF
+
+  LIBS="-lcap-ng $LIBS"
+
+fi
+
+	for ac_header in cap-ng.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "cap-ng.h" "ac_cv_header_cap_ng_h" "$ac_includes_default"
+if test "x$ac_cv_header_cap_ng_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CAP_NG_H 1
+_ACEOF
+
+fi
+
+done
+
+fi
+
 if test "$missing_includes" = "yes"; then
 	CPPFLAGS="$CPPFLAGS -I$srcdir/missing"
 	V_INCLS="$V_INCLS -I$srcdir/missing"
diff --git a/contrib/tcpdump/configure.in b/contrib/tcpdump/configure.in
index 5d0f771b3753..a629559ed1cb 100644
--- a/contrib/tcpdump/configure.in
+++ b/contrib/tcpdump/configure.in
@@ -197,16 +197,26 @@ else
        AC_MSG_RESULT(no)
 fi
 
-AC_ARG_WITH(sandbox-capsicum, [ --with-sandbox-capsicum ])
+AC_ARG_WITH(sandbox-capsicum,
+	AS_HELP_STRING([--with-sandbox-capsicum],
+		       [use Capsicum security functions @<:@default=yes, if available@:>@]))
 #
 # Check whether various functions are available.  If any are, set
 # ac_lbl_capsicum_function_seen to yes; if any are not, set
 # ac_lbl_capsicum_function_not_seen to yes.
 #
-# All of them must be available in order to enable capsicum sandboxing.
+# We don't check cap_rights_init(), as it's a macro, wrapping another
+# function, in at least some versions of FreeBSD, and AC_CHECK_FUNCS()
+# doesn't handle that.
+#
+# All of the ones we check for must be available in order to enable
+# capsicum sandboxing.
+#
+# XXX - do we need to check for all of them, or are there some that, if
+# present, imply others are present?
 #
 if test ! -z "$with_sandbox-capsicum" && test "$with_sandbox-capsicum" != "no" ; then
-	AC_CHECK_FUNCS(cap_enter cap_rights_init cap_rights_limit cap_ioctls_limit openat,
+	AC_CHECK_FUNCS(cap_enter cap_rights_limit cap_ioctls_limit openat,
 	    ac_lbl_capsicum_function_seen=yes,
 	    ac_lbl_capsicum_function_not_seen=yes)
 fi
@@ -231,7 +241,7 @@ AC_ARG_ENABLE(ipv6,
   --disable-ipv6          disable ipv6 support],
 [ case "$enableval" in
 yes)   AC_MSG_RESULT(yes)
-       LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
+       LOCALSRC="print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
        AC_DEFINE(INET6, 1, [Define if you enable IPv6 support])
        ipv6=yes
        ;;
@@ -260,7 +270,7 @@ foo(struct in6_addr *addr)
         ]])
     ],
 [ AC_MSG_RESULT(yes)
-  LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
+  LOCALSRC="print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
   AC_DEFINE(INET6, 1, [Define if you enable IPv6 support])
   ipv6=yes],
 [ AC_MSG_RESULT(no)
@@ -495,9 +505,11 @@ main()
 ],
 	td_cv_buggygetaddrinfo=no,
 	td_cv_buggygetaddrinfo=yes,
-	td_cv_buggygetaddrinfo=yes)])
+	td_cv_buggygetaddrinfo=unknown)])
 	if test "$td_cv_buggygetaddrinfo" = no; then
 		AC_MSG_RESULT(good)
+	elif test "$td_cv_buggygetaddrinfo" = unknown; then
+		AC_MSG_RESULT([unknown (cross-compiling)])
 	else
 		AC_MSG_RESULT(buggy)
 	fi
@@ -749,6 +761,54 @@ if test "$ac_cv_sockaddr_has_sa_len" = no; then
 	missing_includes=yes
 fi
 
+dnl
+dnl Check for "pcap_list_datalinks()", "pcap_set_datalink()",
+dnl and "pcap_datalink_name_to_val()", and use substitute versions
+dnl if they're not present.
+dnl
+AC_CHECK_FUNC(pcap_list_datalinks,
+	[
+	    AC_DEFINE(HAVE_PCAP_LIST_DATALINKS, 1,
+		[define if libpcap has pcap_list_datalinks()])
+	    AC_CHECK_FUNCS(pcap_free_datalinks)
+	],
+	[
+	    AC_LIBOBJ(datalinks)
+	])
+AC_CHECK_FUNCS(pcap_set_datalink)
+AC_CHECK_FUNC(pcap_datalink_name_to_val,
+	[
+	    AC_DEFINE(HAVE_PCAP_DATALINK_NAME_TO_VAL, 1,
+		[define if libpcap has pcap_datalink_name_to_val()])
+	    AC_CHECK_FUNC(pcap_datalink_val_to_description,
+		AC_DEFINE(HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION, 1,
+		    [define if libpcap has pcap_datalink_val_to_description()]),
+		[
+		    AC_LIBOBJ(dlnames)
+		])
+	],
+	[
+	    AC_LIBOBJ(dlnames)
+	])
+
+dnl
+dnl Check for "pcap_breakloop()"; you can't substitute for it if
+dnl it's absent (it has hooks into the live capture routines),
+dnl so just define the HAVE_ value if it's there.
+dnl
+AC_CHECK_FUNCS(pcap_breakloop)
+
+dnl
+dnl Check for "pcap_dump_ftell()" and use a substitute version
+dnl if it's not present.
+dnl
+AC_CHECK_FUNC(pcap_dump_ftell,
+	AC_DEFINE(HAVE_PCAP_DUMP_FTELL, 1,
+	    [define if libpcap has pcap_dump_ftell()]),
+	[
+	    AC_LIBOBJ(pcap_dump_ftell)
+	])
+
 #
 # Do we have the new open API?  Check for pcap_create, and assume that,
 # if we do, we also have pcap_activate() and the other new routines
@@ -768,7 +828,11 @@ if test $ac_cv_func_pcap_create = "yes" ; then
 	AC_CHECK_FUNCS(pcap_set_tstamp_precision)
 fi
 
-AC_CHECK_FUNCS(pcap_findalldevs pcap_dump_flush pcap_lib_version pcap_setdirection)
+#
+# Check for a miscellaneous collection of functions which we use
+# if we have them.
+#
+AC_CHECK_FUNCS(pcap_findalldevs pcap_dump_flush pcap_lib_version pcap_setdirection pcap_set_immediate_mode)
 if test $ac_cv_func_pcap_findalldevs = "yes" ; then
 dnl Check for Mac OS X, which may ship pcap.h from 0.6 but libpcap may
 dnl be 0.8; this means that lib has pcap_findalldevs but header doesn't
@@ -790,7 +854,7 @@ if test $ac_cv_func_pcap_lib_version = "no" ; then
        ac_lbl_cv_pcap_version_defined=yes,
        ac_lbl_cv_pcap_version_defined=no)
     if test "$ac_lbl_cv_pcap_version_defined" = yes ; then
-    	AC_MSG_RESULT(yes)
+	AC_MSG_RESULT(yes)
 	AC_DEFINE(HAVE_PCAP_VERSION, 1, [define if libpcap has pcap_version])
     else
 	AC_MSG_RESULT(no)
@@ -904,6 +968,12 @@ AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 
+#
+# Make sure we have a definition for C99's uintptr_t (regardless of
+# whether the environment is a C99 environment or not).
+#
+AC_TYPE_UINTPTR_T
+
 #
 # Define the old BSD specified-width types in terms of the C99 types;
 # we may need them with libpcap include files.
@@ -1046,6 +1116,35 @@ if test "$want_libcrypto" != "no"; then
 	AC_CHECK_HEADERS(openssl/evp.h)
 fi
 
+# Check for libcap-ng
+AC_MSG_CHECKING(whether to use libcap-ng)
+# Specify location for both includes and libraries.
+want_libcap_ng=ifavailable
+AC_ARG_WITH(cap_ng,
+    AS_HELP_STRING([--with-cap-ng],
+		   [use libcap-ng @<:@default=yes, if available@:>@]),
+[
+	if test $withval = no
+	then
+		want_libcap_ng=no
+		AC_MSG_RESULT(no)
+	elif test $withval = yes
+	then
+		want_libcap_ng=yes
+		AC_MSG_RESULT(yes)
+	fi
+],[
+	#
+	# Use libcap-ng if it's present, otherwise don't.
+	#
+	want_libcap_ng=ifavailable
+	AC_MSG_RESULT([yes, if available])
+])
+if test "$want_libcap_ng" != "no"; then
+	AC_CHECK_LIB(cap-ng, capng_change_id)
+	AC_CHECK_HEADERS(cap-ng.h)
+fi
+
 dnl
 dnl set additional include path if necessary
 if test "$missing_includes" = "yes"; then
diff --git a/contrib/tcpdump/extract.h b/contrib/tcpdump/extract.h
index d2174ba2c542..cb62ebddb61e 100644
--- a/contrib/tcpdump/extract.h
+++ b/contrib/tcpdump/extract.h
@@ -116,22 +116,22 @@ EXTRACT_64BITS(const void *p)
  * assemble them.
  */
 #define EXTRACT_16BITS(p) \
-	((uint16_t)((uint16_t)*((const uint8_t *)(p) + 0) << 8 | \
-		     (uint16_t)*((const uint8_t *)(p) + 1)))
+	((uint16_t)(((uint16_t)(*((const uint8_t *)(p) + 0)) << 8) | \
+	            ((uint16_t)(*((const uint8_t *)(p) + 1)) << 0)))
 #define EXTRACT_32BITS(p) \
-	((uint32_t)((uint32_t)*((const uint8_t *)(p) + 0) << 24 | \
-		     (uint32_t)*((const uint8_t *)(p) + 1) << 16 | \
-		     (uint32_t)*((const uint8_t *)(p) + 2) << 8 | \
-		     (uint32_t)*((const uint8_t *)(p) + 3)))
+	((uint32_t)(((uint32_t)(*((const uint8_t *)(p) + 0)) << 24) | \
+	            ((uint32_t)(*((const uint8_t *)(p) + 1)) << 16) | \
+	            ((uint32_t)(*((const uint8_t *)(p) + 2)) << 8) | \
+	            ((uint32_t)(*((const uint8_t *)(p) + 3)) << 0)))
 #define EXTRACT_64BITS(p) \
-	((uint64_t)((uint64_t)*((const uint8_t *)(p) + 0) << 56 | \
-		     (uint64_t)*((const uint8_t *)(p) + 1) << 48 | \
-		     (uint64_t)*((const uint8_t *)(p) + 2) << 40 | \
-		     (uint64_t)*((const uint8_t *)(p) + 3) << 32 | \
-	             (uint64_t)*((const uint8_t *)(p) + 4) << 24 | \
-		     (uint64_t)*((const uint8_t *)(p) + 5) << 16 | \
-		     (uint64_t)*((const uint8_t *)(p) + 6) << 8 | \
-		     (uint64_t)*((const uint8_t *)(p) + 7)))
+	((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 56) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 1)) << 48) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 2)) << 40) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 3)) << 32) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 4)) << 24) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 5)) << 16) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 6)) << 8) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 7)) << 0)))
 #endif /* must special-case unaligned accesses */
 #else /* LBL_ALIGN */
 /*
@@ -161,33 +161,33 @@ EXTRACT_64BITS(const void *p)
 #endif /* LBL_ALIGN */
 
 #define EXTRACT_24BITS(p) \
-	((uint32_t)((uint32_t)*((const uint8_t *)(p) + 0) << 16 | \
-		     (uint32_t)*((const uint8_t *)(p) + 1) << 8 | \
-		     (uint32_t)*((const uint8_t *)(p) + 2)))
+	((uint32_t)(((uint32_t)(*((const uint8_t *)(p) + 0)) << 16) | \
+	            ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \
+	            ((uint32_t)(*((const uint8_t *)(p) + 2)) << 0)))
 
 #define EXTRACT_40BITS(p) \
-	((uint64_t)((uint64_t)*((const uint8_t *)(p) + 0) << 32 | \
-		     (uint64_t)*((const uint8_t *)(p) + 1) << 24 | \
-		     (uint64_t)*((const uint8_t *)(p) + 2) << 16 | \
-		     (uint64_t)*((const uint8_t *)(p) + 3) << 8 | \
-		     (uint64_t)*((const uint8_t *)(p) + 4)))
+	((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 32) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 1)) << 24) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 2)) << 16) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 3)) << 8) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 4)) << 0)))
 
 #define EXTRACT_48BITS(p) \
-	((uint64_t)((uint64_t)*((const uint8_t *)(p) + 0) << 40 | \
-		     (uint64_t)*((const uint8_t *)(p) + 1) << 32 | \
-		     (uint64_t)*((const uint8_t *)(p) + 2) << 24 | \
-		     (uint64_t)*((const uint8_t *)(p) + 3) << 16 | \
-		     (uint64_t)*((const uint8_t *)(p) + 4) << 8 | \
-		     (uint64_t)*((const uint8_t *)(p) + 5)))
+	((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 40) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 1)) << 32) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 2)) << 24) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 3)) << 16) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 4)) << 8) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 5)) << 0)))
 
 #define EXTRACT_56BITS(p) \
-	((uint64_t)((uint64_t)*((const uint8_t *)(p) + 0) << 48 | \
-		     (uint64_t)*((const uint8_t *)(p) + 1) << 40 | \
-		     (uint64_t)*((const uint8_t *)(p) + 2) << 32 | \
-		     (uint64_t)*((const uint8_t *)(p) + 3) << 24 | \
-		     (uint64_t)*((const uint8_t *)(p) + 4) << 16 | \
-		     (uint64_t)*((const uint8_t *)(p) + 5) << 8 | \
-		     (uint64_t)*((const uint8_t *)(p) + 6)))
+	((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 48) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 1)) << 40) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 2)) << 32) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 3)) << 24) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 4)) << 16) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 5)) << 8) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 6)) << 0)))
 
 /*
  * Macros to extract possibly-unaligned little-endian integral values.
@@ -195,23 +195,23 @@ EXTRACT_64BITS(const void *p)
  */
 #define EXTRACT_LE_8BITS(p) (*(p))
 #define EXTRACT_LE_16BITS(p) \
-	((uint16_t)((uint16_t)*((const uint8_t *)(p) + 1) << 8 | \
-		     (uint16_t)*((const uint8_t *)(p) + 0)))
+	((uint16_t)(((uint16_t)(*((const uint8_t *)(p) + 1)) << 8) | \
+	            ((uint16_t)(*((const uint8_t *)(p) + 0)) << 0)))
 #define EXTRACT_LE_32BITS(p) \
-	((uint32_t)((uint32_t)*((const uint8_t *)(p) + 3) << 24 | \
-		     (uint32_t)*((const uint8_t *)(p) + 2) << 16 | \
-		     (uint32_t)*((const uint8_t *)(p) + 1) << 8 | \
-		     (uint32_t)*((const uint8_t *)(p) + 0)))
+	((uint32_t)(((uint32_t)(*((const uint8_t *)(p) + 3)) << 24) | \
+	            ((uint32_t)(*((const uint8_t *)(p) + 2)) << 16) | \
+	            ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \
+	            ((uint32_t)(*((const uint8_t *)(p) + 0)) << 0)))
 #define EXTRACT_LE_24BITS(p) \
-	((uint32_t)((uint32_t)*((const uint8_t *)(p) + 2) << 16 | \
-		     (uint32_t)*((const uint8_t *)(p) + 1) << 8 | \
-		     (uint32_t)*((const uint8_t *)(p) + 0)))
+	((uint32_t)(((uint32_t)(*((const uint8_t *)(p) + 2)) << 16) | \
+	            ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \
+	            ((uint32_t)(*((const uint8_t *)(p) + 0)) << 0)))
 #define EXTRACT_LE_64BITS(p) \
-	((uint64_t)((uint64_t)*((const uint8_t *)(p) + 7) << 56 | \
-		     (uint64_t)*((const uint8_t *)(p) + 6) << 48 | \
-		     (uint64_t)*((const uint8_t *)(p) + 5) << 40 | \
-		     (uint64_t)*((const uint8_t *)(p) + 4) << 32 | \
-	             (uint64_t)*((const uint8_t *)(p) + 3) << 24 | \
-		     (uint64_t)*((const uint8_t *)(p) + 2) << 16 | \
-		     (uint64_t)*((const uint8_t *)(p) + 1) << 8 | \
-		     (uint64_t)*((const uint8_t *)(p) + 0)))
+	((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 7)) << 56) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 6)) << 48) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 5)) << 40) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 4)) << 32) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 3)) << 24) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 2)) << 16) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 1)) << 8) | \
+	            ((uint64_t)(*((const uint8_t *)(p) + 0)) << 0)))
diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h
index 299d010ea279..59c1eefdb790 100644
--- a/contrib/tcpdump/interface.h
+++ b/contrib/tcpdump/interface.h
@@ -104,9 +104,21 @@ extern int32_t thiszone;	/* seconds offset from gmt to local time */
  * that "snapend - (l)" underflows.
  *
  * The check is for <= rather than < because "l" might be 0.
+ *
+ * We cast the pointers to uintptr_t to make sure that the compiler
+ * doesn't optimize away any of these tests (which it is allowed to
+ * do, as adding an integer to, or subtracting an integer from, a
+ * pointer assumes that the pointer is a pointer to an element of an
+ * array and that the result of the addition or subtraction yields a
+ * pointer to another member of the array, so that, for example, if
+ * you subtract a positive integer from a pointer, the result is
+ * guaranteed to be less than the original pointer value). See
+ *
+ *	http://www.kb.cert.org/vuls/id/162289
  */
-#define TTEST2(var, l) (snapend - (l) <= snapend && \
-			(const u_char *)&(var) <= snapend - (l))
+#define TTEST2(var, l) \
+	((uintptr_t)snapend - (l) <= (uintptr_t)snapend && \
+	   (uintptr_t)&(var) <= (uintptr_t)snapend - (l))
 
 /* True if "var" was captured */
 #define TTEST(var) TTEST2(var, sizeof(var))
@@ -148,7 +160,6 @@ extern uint16_t create_osi_cksum(const uint8_t *, int, int);
 
 #include 
 
-extern char *q922_string(const u_char *);
 extern char *smb_errstr(int, int);
 extern const char *nt_errstr(uint32_t);
 
diff --git a/contrib/tcpdump/ip.h b/contrib/tcpdump/ip.h
index 891a89cd2d4d..72c8972680a3 100644
--- a/contrib/tcpdump/ip.h
+++ b/contrib/tcpdump/ip.h
@@ -36,6 +36,8 @@
 #ifndef TCPDUMP_IP_H
 #define TCPDUMP_IP_H
 
+#include "tcpdump-stdinc.h"
+
 /*
  * Definitions for internet protocol version 4.
  * Per RFC 791, September 1981.
diff --git a/contrib/tcpdump/machdep.c b/contrib/tcpdump/machdep.c
index 3b8c9664f266..7b259ae1c432 100644
--- a/contrib/tcpdump/machdep.c
+++ b/contrib/tcpdump/machdep.c
@@ -50,6 +50,15 @@ int snprintf(char *, size_t, const char *, ...)
 
 #include "machdep.h"
 
+/*
+ * On platforms where the CPU doesn't support unaligned loads, force
+ * unaligned accesses to abort with SIGBUS, rather than being fixed
+ * up (slowly) by the OS kernel; on those platforms, misaligned accesses
+ * are bugs, and we want tcpdump to crash so that the bugs are reported.
+ *
+ * The only OS on which this is necessary is DEC OSF/1^W^WDigital
+ * UNIX^W^WTru64 UNIX.
+ */
 int
 abort_on_misalignment(char *ebuf _U_, size_t ebufsiz _U_)
 {
diff --git a/contrib/tcpdump/missing/strsep.c b/contrib/tcpdump/missing/strsep.c
index bcce4c46861a..a1e6b3017b6f 100644
--- a/contrib/tcpdump/missing/strsep.c
+++ b/contrib/tcpdump/missing/strsep.c
@@ -39,6 +39,8 @@
 
 #include 
 
+#include "interface.h"
+
 /*
  * Get next token from string *stringp, where tokens are possibly-empty
  * strings separated by characters from delim.
diff --git a/contrib/tcpdump/mkdep b/contrib/tcpdump/mkdep
index 3062e642eab8..1486b185aa43 100755
--- a/contrib/tcpdump/mkdep
+++ b/contrib/tcpdump/mkdep
@@ -13,9 +13,6 @@
 #	@(#)mkdep.sh	5.11 (Berkeley) 5/5/88
 #
 
-PATH=/bin:/usr/bin:/usr/ucb:/usr/local:/usr/local/bin
-export PATH
-
 MAKE=Makefile			# default makefile name is "Makefile"
 CC=cc				# default C compiler is "cc"
 DEPENDENCY_CFLAG=-M		# default dependency-generation flag is -M
diff --git a/contrib/tcpdump/netdissect.h b/contrib/tcpdump/netdissect.h
index a40869c0fd89..bc120c321776 100644
--- a/contrib/tcpdump/netdissect.h
+++ b/contrib/tcpdump/netdissect.h
@@ -81,9 +81,9 @@ extern const char *tok2strbuf(const struct tok *, const char *, u_int,
 			      char *buf, size_t bufsize);
 
 /* tok2str is deprecated */
-extern const char *tok2str(const struct tok *, const char *, int);
-extern char *bittok2str(const struct tok *, const char *, int);
-extern char *bittok2str_nosep(const struct tok *, const char *, int);
+extern const char *tok2str(const struct tok *, const char *, u_int);
+extern char *bittok2str(const struct tok *, const char *, u_int);
+extern char *bittok2str_nosep(const struct tok *, const char *, u_int);
 
 
 typedef struct netdissect_options netdissect_options;
@@ -115,6 +115,7 @@ struct netdissect_options {
   int ndo_dlt;                  /* if != -1, ask libpcap for the DLT it names*/
   int ndo_jflag;                /* packet time stamp source */
   int ndo_pflag;                /* don't go promiscuous */
+  int ndo_immediate;            /* use immediate mode */
 
   int ndo_Cflag;                /* rotate dump files after this many bytes */
   int ndo_Cflag_count;      /* Keep track of which file number we're writing */
@@ -156,14 +157,18 @@ struct netdissect_options {
   /* pointer to void function to output stuff */
   void (*ndo_default_print)(netdissect_options *,
   		      register const u_char *bp, register u_int length);
+
+  /* pointer to function to print ^T output */
   void (*ndo_info)(netdissect_options *, int verbose);
 
+  /* pointer to function to do regular output */
   int  (*ndo_printf)(netdissect_options *,
 		     const char *fmt, ...)
 #ifdef __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS
 		     __attribute__ ((format (printf, 2, 3)))
 #endif
 		     ;
+  /* pointer to function to output errors */
   void (*ndo_error)(netdissect_options *,
 		    const char *fmt, ...)
 #ifdef __ATTRIBUTE___NORETURN_OK_FOR_FUNCTION_POINTERS
@@ -173,6 +178,7 @@ struct netdissect_options {
 		     __attribute__ ((format (printf, 2, 3)))
 #endif /* __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS */
 		     ;
+  /* pointer to function to output warnings */
   void (*ndo_warning)(netdissect_options *,
 		      const char *fmt, ...)
 #ifdef __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS
@@ -252,9 +258,22 @@ struct netdissect_options {
  * "l" isn't so large that "ndo->ndo_snapend - (l)" underflows.
  *
  * The check is for <= rather than < because "l" might be 0.
+ *
+ * We cast the pointers to uintptr_t to make sure that the compiler
+ * doesn't optimize away any of these tests (which it is allowed to
+ * do, as adding an integer to, or subtracting an integer from, a
+ * pointer assumes that the pointer is a pointer to an element of an
+ * array and that the result of the addition or subtraction yields a
+ * pointer to another member of the array, so that, for example, if
+ * you subtract a positive integer from a pointer, the result is
+ * guaranteed to be less than the original pointer value). See
+ *
+ *	http://www.kb.cert.org/vuls/id/162289
  */
-#define ND_TTEST2(var, l) (ndo->ndo_snapend - (l) <= ndo->ndo_snapend && \
-			(const u_char *)&(var) <= ndo->ndo_snapend - (l))
+#define ND_TTEST2(var, l) \
+  ((l) >= 0 && \
+	((uintptr_t)ndo->ndo_snapend - (l) <= (uintptr_t)ndo->ndo_snapend && \
+         (uintptr_t)&(var) <= (uintptr_t)ndo->ndo_snapend - (l)))
 
 /* True if "var" was captured */
 #define ND_TTEST(var) ND_TTEST2(var, sizeof(var))
@@ -274,7 +293,14 @@ extern void relts_print(netdissect_options *, int);
 extern int fn_print(netdissect_options *, const u_char *, const u_char *);
 extern int fn_printn(netdissect_options *, const u_char *, u_int, const u_char *);
 extern int fn_printzp(netdissect_options *, const u_char *, u_int, const u_char *);
-extern const char *tok2str(const struct tok *, const char *, int);
+
+/*
+ * Flags for txtproto_print().
+ */
+#define RESP_CODE_SECOND_TOKEN	0x00000001	/* response code is second token in response line */
+
+extern void txtproto_print(netdissect_options *, const u_char *, u_int,
+    const char *, const char **, u_int);
 
 #if 0
 extern char *read_infile(netdissect_options *, char *);
@@ -332,6 +358,8 @@ extern const char *dnnum_string(netdissect_options *, u_short);
 
 #include 
 
+extern char *q922_string(netdissect_options *ndo, const u_char *, u_int);
+
 typedef u_int (*if_ndo_printer)(struct netdissect_options *ndo,
 				const struct pcap_pkthdr *, const u_char *);
 typedef u_int (*if_printer)(const struct pcap_pkthdr *, const u_char *);
@@ -465,7 +493,7 @@ extern u_int atm_if_print(netdissect_options *, const struct pcap_pkthdr *, cons
 extern void vtp_print(netdissect_options *, const u_char *, u_int);
 extern int mptcp_print(netdissect_options *, const u_char *, u_int, u_char);
 extern void ntp_print(netdissect_options *, const u_char *, u_int);
-extern void cnfp_print(netdissect_options *, const u_char *, const u_char *);
+extern void cnfp_print(netdissect_options *, const u_char *);
 extern void dvmrp_print(netdissect_options *, const u_char *, u_int);
 extern void egp_print(netdissect_options *, const u_char *, u_int);
 extern u_int enc_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *);
@@ -539,6 +567,11 @@ extern void rsvp_print(netdissect_options *, const u_char *, u_int);
 extern void timed_print(netdissect_options *, const u_char *);
 extern void m3ua_print(netdissect_options *, const u_char *, const u_int);
 extern void aoe_print(netdissect_options *, const u_char *, const u_int);
+extern void ftp_print(netdissect_options *, const u_char *, u_int);
+extern void http_print(netdissect_options *, const u_char *, u_int);
+extern void rtsp_print(netdissect_options *, const u_char *, u_int);
+extern void smtp_print(netdissect_options *, const u_char *, u_int);
+extern void geneve_print(netdissect_options *, const u_char *, u_int);
 
 extern void pfsync_ip_print(netdissect_options *, const u_char *, u_int);
 
@@ -561,8 +594,8 @@ extern u_int ieee802_11_if_print(netdissect_options *, const struct pcap_pkthdr
 extern u_int ieee802_11_radio_avs_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *);
 extern u_int prism_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *);
 
-#ifdef INET6
 extern void ip6_print(netdissect_options *,const u_char *, u_int);
+#ifdef INET6
 extern int frag6_print(netdissect_options *, const u_char *, const u_char *);
 extern int rt6_print(netdissect_options *, const u_char *, const u_char *);
 extern int hbhopt_print(netdissect_options *, const u_char *);
diff --git a/contrib/tcpdump/openflow.h b/contrib/tcpdump/openflow.h
index d330f1ecf0a9..31ef03c42523 100644
--- a/contrib/tcpdump/openflow.h
+++ b/contrib/tcpdump/openflow.h
@@ -32,9 +32,20 @@
 
 #define OF_HEADER_LEN 8
 
+#define ONF_EXP_ONF               0x4f4e4600
+#define ONF_EXP_BUTE              0xff000001
+#define ONF_EXP_NOVIFLOW          0xff000002
+#define ONF_EXP_L3                0xff000003
+#define ONF_EXP_L4L7              0xff000004
+#define ONF_EXP_WMOB              0xff000005
+#define ONF_EXP_FABS              0xff000006
+#define ONF_EXP_OTRANS            0xff000007
+extern const struct tok onf_exp_str[];
+
 /*
  * Routines to print packets for various versions of OpenFlow.
  */
 extern const u_char *of10_header_body_print(netdissect_options *ndo,
 	const u_char *, const u_char *,
 	const uint8_t, const uint16_t, const uint32_t);
+extern const char * of_vendor_name(const uint32_t);
diff --git a/contrib/tcpdump/oui.c b/contrib/tcpdump/oui.c
index a6d5787f79b9..2aea5ad74d0a 100644
--- a/contrib/tcpdump/oui.c
+++ b/contrib/tcpdump/oui.c
@@ -39,6 +39,15 @@ const struct tok oui_values[] = {
     { OUI_IEEE_8023_PRIVATE, "IEEE 802.3 Private"},
     { OUI_TIA, "ANSI/TIA"},
     { OUI_DCBX, "DCBX"},
+    { OUI_NICIRA, "Nicira Networks" },
+    { OUI_BSN, "Big Switch Networks" },
+    { OUI_VELLO, "Vello Systems" },
+    { OUI_HP2, "HP" },
+    { OUI_HPLABS, "HP-Labs" },
+    { OUI_INFOBLOX, "Infoblox Inc" },
+    { OUI_ONLAB, "Open Networking Lab" },
+    { OUI_FREESCALE, "Freescale" },
+    { OUI_NETRONOME, "Netronome" },
     { 0, NULL }
 };
 
diff --git a/contrib/tcpdump/oui.h b/contrib/tcpdump/oui.h
index bf87099d26ce..4a983ecd3de8 100644
--- a/contrib/tcpdump/oui.h
+++ b/contrib/tcpdump/oui.h
@@ -30,6 +30,15 @@ extern const struct tok smi_values[];
 #define OUI_IEEE_8023_PRIVATE 0x00120f      /* IEEE 802.3 Organisation Specific - Annex G */
 #define OUI_TIA         0x0012bb        /* TIA - Telecommunications Industry Association - ANSI/TIA-1057- 2006 */
 #define OUI_DCBX        0x001B21        /* DCBX */
+#define OUI_NICIRA      0x002320        /* Nicira Networks */
+#define OUI_BSN         0x5c16c7        /* Big Switch Networks */
+#define OUI_VELLO       0xb0d2f5        /* Vello Systems */
+#define OUI_HP2         0x002481        /* HP too */
+#define OUI_HPLABS      0x0004ea        /* HP-Labs */
+#define OUI_INFOBLOX    0x748771        /* Infoblox Inc */
+#define OUI_ONLAB       0xa42305        /* Open Networking Lab */
+#define OUI_FREESCALE   0x00049f        /* Freescale */
+#define OUI_NETRONOME   0x0015ad        /* Netronome */
 
 /*
  * These are SMI Network Management Private Enterprise Codes for
diff --git a/contrib/tcpdump/print-ahcp.c b/contrib/tcpdump/print-ahcp.c
index 280372dadbfb..a9ae38a97233 100644
--- a/contrib/tcpdump/print-ahcp.c
+++ b/contrib/tcpdump/print-ahcp.c
@@ -100,7 +100,8 @@ static const struct tok ahcp1_opt_str[] = {
 };
 
 static int
-ahcp_time_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
+ahcp_time_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{
 	time_t t;
 	struct tm *tm;
 	char buf[BUFSIZE];
@@ -127,7 +128,8 @@ ahcp_time_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
 }
 
 static int
-ahcp_seconds_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
+ahcp_seconds_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{
 	if (cp + 4 != ep)
 		goto corrupt;
 	ND_TCHECK2(*cp, 4);
@@ -144,7 +146,8 @@ ahcp_seconds_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
 }
 
 static int
-ahcp_ipv6_addresses_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
+ahcp_ipv6_addresses_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{
 	const char *sep = ": ";
 
 	while (cp < ep) {
@@ -171,7 +174,8 @@ ahcp_ipv6_addresses_print(netdissect_options *ndo, const u_char *cp, const u_cha
 }
 
 static int
-ahcp_ipv4_addresses_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
+ahcp_ipv4_addresses_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{
 	const char *sep = ": ";
 
 	while (cp < ep) {
@@ -194,7 +198,8 @@ ahcp_ipv4_addresses_print(netdissect_options *ndo, const u_char *cp, const u_cha
 }
 
 static int
-ahcp_ipv6_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
+ahcp_ipv6_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{
 	const char *sep = ": ";
 
 	while (cp < ep) {
@@ -221,7 +226,8 @@ ahcp_ipv6_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char
 }
 
 static int
-ahcp_ipv4_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
+ahcp_ipv4_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{
 	const char *sep = ": ";
 
 	while (cp < ep) {
@@ -263,7 +269,8 @@ static int
 };
 
 static void
-ahcp1_options_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
+ahcp1_options_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{
 	uint8_t option_no, option_len;
 
 	while (cp < ep) {
@@ -303,7 +310,8 @@ ahcp1_options_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
 }
 
 static void
-ahcp1_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
+ahcp1_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{
 	uint8_t type, mbz;
 	uint16_t body_len;
 
@@ -347,7 +355,8 @@ ahcp1_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
 }
 
 void
-ahcp_print(netdissect_options *ndo, const u_char *cp, const u_int len) {
+ahcp_print(netdissect_options *ndo, const u_char *cp, const u_int len)
+{
 	const u_char *ep = cp + len;
 	uint8_t version;
 
@@ -410,4 +419,3 @@ ahcp_print(netdissect_options *ndo, const u_char *cp, const u_int len) {
 trunc:
 	ND_PRINT((ndo, "%s", tstr));
 }
-
diff --git a/contrib/tcpdump/print-aodv.c b/contrib/tcpdump/print-aodv.c
index 093e17480cfa..ef27eee6bc2d 100644
--- a/contrib/tcpdump/print-aodv.c
+++ b/contrib/tcpdump/print-aodv.c
@@ -37,9 +37,6 @@
 
 #include 
 
-/* for offsetof */
-#include 
-
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
@@ -146,13 +143,6 @@ struct aodv_rerr {
 	uint8_t		rerr_flags;	/* various flags */
 	uint8_t		rerr_zero0;	/* reserved, set to zero */
 	uint8_t		rerr_dc;	/* destination count */
-	union {
-		struct	rerr_unreach dest[1];
-#ifdef INET6
-		struct	rerr_unreach6 dest6[1];
-		struct	rerr_unreach6_draft_01 dest6_draft_01[1];
-#endif
-	} r;
 };
 
 #define RERR_NODELETE		0x80	/* don't delete the link */
@@ -163,19 +153,6 @@ struct aodv_rrep_ack {
 	uint8_t		ra_zero0;
 };
 
-union aodv {
-	struct aodv_rreq rreq;
-	struct aodv_rrep rrep;
-	struct aodv_rerr rerr;
-	struct aodv_rrep_ack rrep_ack;
-#ifdef INET6
-	struct aodv_rreq6 rreq6;
-	struct aodv_rreq6_draft_01 rreq6_draft_01;
-	struct aodv_rrep6 rrep6;
-	struct aodv_rrep6_draft_01 rrep6_draft_01;
-#endif
-};
-
 #define	AODV_RREQ		1	/* route request */
 #define	AODV_RREP		2	/* route response */
 #define	AODV_RERR		3	/* error report */
@@ -204,22 +181,14 @@ static void
 aodv_extension(netdissect_options *ndo,
                const struct aodv_ext *ep, u_int length)
 {
-	u_int i;
 	const struct aodv_hello *ah;
 
 	switch (ep->type) {
 	case AODV_EXT_HELLO:
-		if (ndo->ndo_snapend < (u_char *) ep) {
-			ND_PRINT((ndo, " [|hello]"));
-			return;
-		}
-		i = min(length, (u_int)(ndo->ndo_snapend - (u_char *)ep));
-		if (i < sizeof(struct aodv_hello)) {
-			ND_PRINT((ndo, " [|hello]"));
-			return;
-		}
-		i -= sizeof(struct aodv_hello);
-		ah = (void *)ep;
+		ah = (const struct aodv_hello *)(const void *)ep;
+		ND_TCHECK(*ah);
+		if (length < sizeof(struct aodv_hello))
+			goto trunc;
 		ND_PRINT((ndo, "\n\text HELLO %ld ms",
 		    (unsigned long)EXTRACT_32BITS(&ah->interval)));
 		break;
@@ -228,141 +197,135 @@ aodv_extension(netdissect_options *ndo,
 		ND_PRINT((ndo, "\n\text %u %u", ep->type, ep->length));
 		break;
 	}
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|hello]"));
 }
 
 static void
-aodv_rreq(netdissect_options *ndo,
-          const union aodv *ap, const u_char *dat, u_int length)
+aodv_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 {
 	u_int i;
+	const struct aodv_rreq *ap = (const struct aodv_rreq *)dat;
 
-	if (ndo->ndo_snapend < dat) {
-		ND_PRINT((ndo, " [|aodv]"));
-		return;
-	}
-	i = min(length, (u_int)(ndo->ndo_snapend - dat));
-	if (i < sizeof(ap->rreq)) {
-		ND_PRINT((ndo, " [|rreq]"));
-		return;
-	}
-	i -= sizeof(ap->rreq);
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
 	ND_PRINT((ndo, " rreq %u %s%s%s%s%shops %u id 0x%08lx\n"
 	    "\tdst %s seq %lu src %s seq %lu", length,
-	    ap->rreq.rreq_type & RREQ_JOIN ? "[J]" : "",
-	    ap->rreq.rreq_type & RREQ_REPAIR ? "[R]" : "",
-	    ap->rreq.rreq_type & RREQ_GRAT ? "[G]" : "",
-	    ap->rreq.rreq_type & RREQ_DEST ? "[D]" : "",
-	    ap->rreq.rreq_type & RREQ_UNKNOWN ? "[U] " : " ",
-	    ap->rreq.rreq_hops,
-	    (unsigned long)EXTRACT_32BITS(&ap->rreq.rreq_id),
-	    ipaddr_string(ndo, &ap->rreq.rreq_da),
-	    (unsigned long)EXTRACT_32BITS(&ap->rreq.rreq_ds),
-	    ipaddr_string(ndo, &ap->rreq.rreq_oa),
-	    (unsigned long)EXTRACT_32BITS(&ap->rreq.rreq_os)));
+	    ap->rreq_type & RREQ_JOIN ? "[J]" : "",
+	    ap->rreq_type & RREQ_REPAIR ? "[R]" : "",
+	    ap->rreq_type & RREQ_GRAT ? "[G]" : "",
+	    ap->rreq_type & RREQ_DEST ? "[D]" : "",
+	    ap->rreq_type & RREQ_UNKNOWN ? "[U] " : " ",
+	    ap->rreq_hops,
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_id),
+	    ipaddr_string(ndo, &ap->rreq_da),
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_ds),
+	    ipaddr_string(ndo, &ap->rreq_oa),
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_os)));
+	i = length - sizeof(*ap);
 	if (i >= sizeof(struct aodv_ext))
-		aodv_extension(ndo, (void *)(&ap->rreq + 1), i);
+		aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|rreq"));
 }
 
 static void
-aodv_rrep(netdissect_options *ndo,
-          const union aodv *ap, const u_char *dat, u_int length)
+aodv_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 {
 	u_int i;
+	const struct aodv_rrep *ap = (const struct aodv_rrep *)dat;
 
-	if (ndo->ndo_snapend < dat) {
-		ND_PRINT((ndo, " [|aodv]"));
-		return;
-	}
-	i = min(length, (u_int)(ndo->ndo_snapend - dat));
-	if (i < sizeof(ap->rrep)) {
-		ND_PRINT((ndo, " [|rrep]"));
-		return;
-	}
-	i -= sizeof(ap->rrep);
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
 	ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n"
 	    "\tdst %s dseq %lu src %s %lu ms", length,
-	    ap->rrep.rrep_type & RREP_REPAIR ? "[R]" : "",
-	    ap->rrep.rrep_type & RREP_ACK ? "[A] " : " ",
-	    ap->rrep.rrep_ps & RREP_PREFIX_MASK,
-	    ap->rrep.rrep_hops,
-	    ipaddr_string(ndo, &ap->rrep.rrep_da),
-	    (unsigned long)EXTRACT_32BITS(&ap->rrep.rrep_ds),
-	    ipaddr_string(ndo, &ap->rrep.rrep_oa),
-	    (unsigned long)EXTRACT_32BITS(&ap->rrep.rrep_life)));
+	    ap->rrep_type & RREP_REPAIR ? "[R]" : "",
+	    ap->rrep_type & RREP_ACK ? "[A] " : " ",
+	    ap->rrep_ps & RREP_PREFIX_MASK,
+	    ap->rrep_hops,
+	    ipaddr_string(ndo, &ap->rrep_da),
+	    (unsigned long)EXTRACT_32BITS(&ap->rrep_ds),
+	    ipaddr_string(ndo, &ap->rrep_oa),
+	    (unsigned long)EXTRACT_32BITS(&ap->rrep_life)));
+	i = length - sizeof(*ap);
 	if (i >= sizeof(struct aodv_ext))
-		aodv_extension(ndo, (void *)(&ap->rrep + 1), i);
+		aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|rreq"));
 }
 
 static void
-aodv_rerr(netdissect_options *ndo,
-          const union aodv *ap, const u_char *dat, u_int length)
+aodv_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 {
-	u_int i;
-	const struct rerr_unreach *dp = NULL;
-	int n, trunc;
+	u_int i, dc;
+	const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
+	const struct rerr_unreach *dp;
 
-	if (ndo->ndo_snapend < dat) {
-		ND_PRINT((ndo, " [|aodv]"));
-		return;
-	}
-	i = min(length, (u_int)(ndo->ndo_snapend - dat));
-	if (i < offsetof(struct aodv_rerr, r)) {
-		ND_PRINT((ndo, " [|rerr]"));
-		return;
-	}
-	i -= offsetof(struct aodv_rerr, r);
-	dp = &ap->rerr.r.dest[0];
-	n = ap->rerr.rerr_dc * sizeof(ap->rerr.r.dest[0]);
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
 	ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
-	    ap->rerr.rerr_flags & RERR_NODELETE ? "[D]" : "",
-	    ap->rerr.rerr_dc, length));
-	trunc = n - (i/sizeof(ap->rerr.r.dest[0]));
-	for (; i >= sizeof(ap->rerr.r.dest[0]);
-	    ++dp, i -= sizeof(ap->rerr.r.dest[0])) {
+	    ap->rerr_flags & RERR_NODELETE ? "[D]" : "",
+	    ap->rerr_dc, length));
+	dp = (struct rerr_unreach *)(dat + sizeof(*ap));
+	i = length - sizeof(*ap);
+	for (dc = ap->rerr_dc; dc != 0; dc--) {
+		ND_TCHECK(*dp);
+		if (i < sizeof(*dp))
+			goto trunc;
 		ND_PRINT((ndo, " {%s}(%ld)", ipaddr_string(ndo, &dp->u_da),
 		    (unsigned long)EXTRACT_32BITS(&dp->u_ds)));
+		dp++;
+		i -= sizeof(*dp);
 	}
-	if (trunc)
-		ND_PRINT((ndo, "[|rerr]"));
+	return;
+
+trunc:
+	ND_PRINT((ndo, "[|rerr]"));
 }
 
 static void
 #ifdef INET6
-aodv_v6_rreq(netdissect_options *ndo,
-             const union aodv *ap, const u_char *dat, u_int length)
+aodv_v6_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 #else
-aodv_v6_rreq(netdissect_options *ndo,
-             const union aodv *ap _U_, const u_char *dat _U_, u_int length)
+aodv_v6_rreq(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 #endif
 {
 #ifdef INET6
 	u_int i;
+	const struct aodv_rreq6 *ap = (const struct aodv_rreq6 *)dat;
 
-	if (ndo->ndo_snapend < dat) {
-		ND_PRINT((ndo, " [|aodv]"));
-		return;
-	}
-	i = min(length, (u_int)(ndo->ndo_snapend - dat));
-	if (i < sizeof(ap->rreq6)) {
-		ND_PRINT((ndo, " [|rreq6]"));
-		return;
-	}
-	i -= sizeof(ap->rreq6);
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
 	ND_PRINT((ndo, " v6 rreq %u %s%s%s%s%shops %u id 0x%08lx\n"
 	    "\tdst %s seq %lu src %s seq %lu", length,
-	    ap->rreq6.rreq_type & RREQ_JOIN ? "[J]" : "",
-	    ap->rreq6.rreq_type & RREQ_REPAIR ? "[R]" : "",
-	    ap->rreq6.rreq_type & RREQ_GRAT ? "[G]" : "",
-	    ap->rreq6.rreq_type & RREQ_DEST ? "[D]" : "",
-	    ap->rreq6.rreq_type & RREQ_UNKNOWN ? "[U] " : " ",
-	    ap->rreq6.rreq_hops,
-	    (unsigned long)EXTRACT_32BITS(&ap->rreq6.rreq_id),
-	    ip6addr_string(ndo, &ap->rreq6.rreq_da),
-	    (unsigned long)EXTRACT_32BITS(&ap->rreq6.rreq_ds),
-	    ip6addr_string(ndo, &ap->rreq6.rreq_oa),
-	    (unsigned long)EXTRACT_32BITS(&ap->rreq6.rreq_os)));
+	    ap->rreq_type & RREQ_JOIN ? "[J]" : "",
+	    ap->rreq_type & RREQ_REPAIR ? "[R]" : "",
+	    ap->rreq_type & RREQ_GRAT ? "[G]" : "",
+	    ap->rreq_type & RREQ_DEST ? "[D]" : "",
+	    ap->rreq_type & RREQ_UNKNOWN ? "[U] " : " ",
+	    ap->rreq_hops,
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_id),
+	    ip6addr_string(ndo, &ap->rreq_da),
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_ds),
+	    ip6addr_string(ndo, &ap->rreq_oa),
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_os)));
+	i = length - sizeof(*ap);
 	if (i >= sizeof(struct aodv_ext))
-		aodv_extension(ndo, (void *)(&ap->rreq6 + 1), i);
+		aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|rreq"));
 #else
 	ND_PRINT((ndo, " v6 rreq %u", length));
 #endif
@@ -370,38 +333,35 @@ aodv_v6_rreq(netdissect_options *ndo,
 
 static void
 #ifdef INET6
-aodv_v6_rrep(netdissect_options *ndo,
-             const union aodv *ap, const u_char *dat, u_int length)
+aodv_v6_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 #else
-aodv_v6_rrep(netdissect_options *ndo,
-             const union aodv *ap _U_, const u_char *dat _U_, u_int length)
+aodv_v6_rrep(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 #endif
 {
 #ifdef INET6
 	u_int i;
+	const struct aodv_rrep6 *ap = (const struct aodv_rrep6 *)dat;
 
-	if (ndo->ndo_snapend < dat) {
-		ND_PRINT((ndo, " [|aodv]"));
-		return;
-	}
-	i = min(length, (u_int)(ndo->ndo_snapend - dat));
-	if (i < sizeof(ap->rrep6)) {
-		ND_PRINT((ndo, " [|rrep6]"));
-		return;
-	}
-	i -= sizeof(ap->rrep6);
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
 	ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n"
 	   "\tdst %s dseq %lu src %s %lu ms", length,
-	    ap->rrep6.rrep_type & RREP_REPAIR ? "[R]" : "",
-	    ap->rrep6.rrep_type & RREP_ACK ? "[A] " : " ",
-	    ap->rrep6.rrep_ps & RREP_PREFIX_MASK,
-	    ap->rrep6.rrep_hops,
-	    ip6addr_string(ndo, &ap->rrep6.rrep_da),
-	    (unsigned long)EXTRACT_32BITS(&ap->rrep6.rrep_ds),
-	    ip6addr_string(ndo, &ap->rrep6.rrep_oa),
-	    (unsigned long)EXTRACT_32BITS(&ap->rrep6.rrep_life)));
+	    ap->rrep_type & RREP_REPAIR ? "[R]" : "",
+	    ap->rrep_type & RREP_ACK ? "[A] " : " ",
+	    ap->rrep_ps & RREP_PREFIX_MASK,
+	    ap->rrep_hops,
+	    ip6addr_string(ndo, &ap->rrep_da),
+	    (unsigned long)EXTRACT_32BITS(&ap->rrep_ds),
+	    ip6addr_string(ndo, &ap->rrep_oa),
+	    (unsigned long)EXTRACT_32BITS(&ap->rrep_life)));
+	i = length - sizeof(*ap);
 	if (i >= sizeof(struct aodv_ext))
-		aodv_extension(ndo, (void *)(&ap->rrep6 + 1), i);
+		aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|rreq"));
 #else
 	ND_PRINT((ndo, " rrep %u", length));
 #endif
@@ -409,31 +369,37 @@ aodv_v6_rrep(netdissect_options *ndo,
 
 static void
 #ifdef INET6
-aodv_v6_rerr(netdissect_options *ndo,
-             const union aodv *ap, u_int length)
+aodv_v6_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 #else
-aodv_v6_rerr(netdissect_options *ndo,
-             const union aodv *ap _U_, u_int length)
+aodv_v6_rerr(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 #endif
 {
 #ifdef INET6
-	const struct rerr_unreach6 *dp6 = NULL;
-	int i, j, n, trunc;
+	u_int i, dc;
+	const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
+	const struct rerr_unreach6 *dp6;
 
-	i = length - offsetof(struct aodv_rerr, r);
-	j = sizeof(ap->rerr.r.dest6[0]);
-	dp6 = &ap->rerr.r.dest6[0];
-	n = ap->rerr.rerr_dc * j;
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
 	ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
-	    ap->rerr.rerr_flags & RERR_NODELETE ? "[D]" : "",
-	    ap->rerr.rerr_dc, length));
-	trunc = n - (i/j);
-	for (; i -= j >= 0; ++dp6) {
+	    ap->rerr_flags & RERR_NODELETE ? "[D]" : "",
+	    ap->rerr_dc, length));
+	dp6 = (struct rerr_unreach6 *)(void *)(ap + 1);
+	i = length - sizeof(*ap);
+	for (dc = ap->rerr_dc; dc != 0; dc--) {
+		ND_TCHECK(*dp6);
+		if (i < sizeof(*dp6))
+			goto trunc;
 		ND_PRINT((ndo, " {%s}(%ld)", ip6addr_string(ndo, &dp6->u_da),
 		    (unsigned long)EXTRACT_32BITS(&dp6->u_ds)));
+		dp6++;
+		i -= sizeof(*dp6);
 	}
-	if (trunc)
-		ND_PRINT((ndo, "[|rerr]"));
+	return;
+
+trunc:
+	ND_PRINT((ndo, "[|rerr]"));
 #else
 	ND_PRINT((ndo, " rerr %u", length));
 #endif
@@ -441,42 +407,38 @@ aodv_v6_rerr(netdissect_options *ndo,
 
 static void
 #ifdef INET6
-aodv_v6_draft_01_rreq(netdissect_options *ndo,
-                      const union aodv *ap, const u_char *dat, u_int length)
+aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 #else
-aodv_v6_draft_01_rreq(netdissect_options *ndo,
-                      const union aodv *ap _U_, const u_char *dat _U_,
-    u_int length)
+aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 #endif
 {
 #ifdef INET6
 	u_int i;
+	const struct aodv_rreq6_draft_01 *ap = (const struct aodv_rreq6_draft_01 *)dat;
 
-	if (ndo->ndo_snapend < dat) {
-		ND_PRINT((ndo, " [|aodv]"));
-		return;
-	}
-	i = min(length, (u_int)(ndo->ndo_snapend - dat));
-	if (i < sizeof(ap->rreq6_draft_01)) {
-		ND_PRINT((ndo, " [|rreq6]"));
-		return;
-	}
-	i -= sizeof(ap->rreq6_draft_01);
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
 	ND_PRINT((ndo, " rreq %u %s%s%s%s%shops %u id 0x%08lx\n"
 	    "\tdst %s seq %lu src %s seq %lu", length,
-	    ap->rreq6_draft_01.rreq_type & RREQ_JOIN ? "[J]" : "",
-	    ap->rreq6_draft_01.rreq_type & RREQ_REPAIR ? "[R]" : "",
-	    ap->rreq6_draft_01.rreq_type & RREQ_GRAT ? "[G]" : "",
-	    ap->rreq6_draft_01.rreq_type & RREQ_DEST ? "[D]" : "",
-	    ap->rreq6_draft_01.rreq_type & RREQ_UNKNOWN ? "[U] " : " ",
-	    ap->rreq6_draft_01.rreq_hops,
-	    (unsigned long)EXTRACT_32BITS(&ap->rreq6_draft_01.rreq_id),
-	    ip6addr_string(ndo, &ap->rreq6_draft_01.rreq_da),
-	    (unsigned long)EXTRACT_32BITS(&ap->rreq6_draft_01.rreq_ds),
-	    ip6addr_string(ndo, &ap->rreq6_draft_01.rreq_oa),
-	    (unsigned long)EXTRACT_32BITS(&ap->rreq6_draft_01.rreq_os)));
+	    ap->rreq_type & RREQ_JOIN ? "[J]" : "",
+	    ap->rreq_type & RREQ_REPAIR ? "[R]" : "",
+	    ap->rreq_type & RREQ_GRAT ? "[G]" : "",
+	    ap->rreq_type & RREQ_DEST ? "[D]" : "",
+	    ap->rreq_type & RREQ_UNKNOWN ? "[U] " : " ",
+	    ap->rreq_hops,
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_id),
+	    ip6addr_string(ndo, &ap->rreq_da),
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_ds),
+	    ip6addr_string(ndo, &ap->rreq_oa),
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_os)));
+	i = length - sizeof(*ap);
 	if (i >= sizeof(struct aodv_ext))
-		aodv_extension(ndo, (void *)(&ap->rreq6_draft_01 + 1), i);
+		aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|rreq"));
 #else
 	ND_PRINT((ndo, " rreq %u", length));
 #endif
@@ -484,39 +446,35 @@ aodv_v6_draft_01_rreq(netdissect_options *ndo,
 
 static void
 #ifdef INET6
-aodv_v6_draft_01_rrep(netdissect_options *ndo,
-                      const union aodv *ap, const u_char *dat, u_int length)
+aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 #else
-aodv_v6_draft_01_rrep(netdissect_options *ndo,
-                      const union aodv *ap _U_, const u_char *dat _U_,
-    u_int length)
+aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 #endif
 {
 #ifdef INET6
 	u_int i;
+	const struct aodv_rrep6_draft_01 *ap = (const struct aodv_rrep6_draft_01 *)dat;
 
-	if (ndo->ndo_snapend < dat) {
-		ND_PRINT((ndo, " [|aodv]"));
-		return;
-	}
-	i = min(length, (u_int)(ndo->ndo_snapend - dat));
-	if (i < sizeof(ap->rrep6_draft_01)) {
-		ND_PRINT((ndo, " [|rrep6]"));
-		return;
-	}
-	i -= sizeof(ap->rrep6_draft_01);
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
 	ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n"
 	   "\tdst %s dseq %lu src %s %lu ms", length,
-	    ap->rrep6_draft_01.rrep_type & RREP_REPAIR ? "[R]" : "",
-	    ap->rrep6_draft_01.rrep_type & RREP_ACK ? "[A] " : " ",
-	    ap->rrep6_draft_01.rrep_ps & RREP_PREFIX_MASK,
-	    ap->rrep6_draft_01.rrep_hops,
-	    ip6addr_string(ndo, &ap->rrep6_draft_01.rrep_da),
-	    (unsigned long)EXTRACT_32BITS(&ap->rrep6_draft_01.rrep_ds),
-	    ip6addr_string(ndo, &ap->rrep6_draft_01.rrep_oa),
-	    (unsigned long)EXTRACT_32BITS(&ap->rrep6_draft_01.rrep_life)));
+	    ap->rrep_type & RREP_REPAIR ? "[R]" : "",
+	    ap->rrep_type & RREP_ACK ? "[A] " : " ",
+	    ap->rrep_ps & RREP_PREFIX_MASK,
+	    ap->rrep_hops,
+	    ip6addr_string(ndo, &ap->rrep_da),
+	    (unsigned long)EXTRACT_32BITS(&ap->rrep_ds),
+	    ip6addr_string(ndo, &ap->rrep_oa),
+	    (unsigned long)EXTRACT_32BITS(&ap->rrep_life)));
+	i = length - sizeof(*ap);
 	if (i >= sizeof(struct aodv_ext))
-		aodv_extension(ndo, (void *)(&ap->rrep6_draft_01 + 1), i);
+		aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|rreq"));
 #else
 	ND_PRINT((ndo, " rrep %u", length));
 #endif
@@ -524,31 +482,37 @@ aodv_v6_draft_01_rrep(netdissect_options *ndo,
 
 static void
 #ifdef INET6
-aodv_v6_draft_01_rerr(netdissect_options *ndo,
-                      const union aodv *ap, u_int length)
+aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 #else
-aodv_v6_draft_01_rerr(netdissect_options *ndo,
-                      const union aodv *ap _U_, u_int length)
+aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 #endif
 {
 #ifdef INET6
-	const struct rerr_unreach6_draft_01 *dp6 = NULL;
-	int i, j, n, trunc;
+	u_int i, dc;
+	const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
+	const struct rerr_unreach6_draft_01 *dp6;
 
-	i = length - offsetof(struct aodv_rerr, r);
-	j = sizeof(ap->rerr.r.dest6_draft_01[0]);
-	dp6 = &ap->rerr.r.dest6_draft_01[0];
-	n = ap->rerr.rerr_dc * j;
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
 	ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
-	    ap->rerr.rerr_flags & RERR_NODELETE ? "[D]" : "",
-	    ap->rerr.rerr_dc, length));
-	trunc = n - (i/j);
-	for (; i -= j >= 0; ++dp6) {
+	    ap->rerr_flags & RERR_NODELETE ? "[D]" : "",
+	    ap->rerr_dc, length));
+	dp6 = (struct rerr_unreach6_draft_01 *)(void *)(ap + 1);
+	i = length - sizeof(*ap);
+	for (dc = ap->rerr_dc; dc != 0; dc--) {
+		ND_TCHECK(*dp6);
+		if (i < sizeof(*dp6))
+			goto trunc;
 		ND_PRINT((ndo, " {%s}(%ld)", ip6addr_string(ndo, &dp6->u_da),
 		    (unsigned long)EXTRACT_32BITS(&dp6->u_ds)));
+		dp6++;
+		i -= sizeof(*dp6);
 	}
-	if (trunc)
-		ND_PRINT((ndo, "[|rerr]"));
+	return;
+
+trunc:
+	ND_PRINT((ndo, "[|rerr]"));
 #else
 	ND_PRINT((ndo, " rerr %u", length));
 #endif
@@ -558,40 +522,37 @@ void
 aodv_print(netdissect_options *ndo,
            const u_char *dat, u_int length, int is_ip6)
 {
-	const union aodv *ap;
+	uint8_t msg_type;
 
-	ap = (union aodv *)dat;
-	if (ndo->ndo_snapend < dat) {
-		ND_PRINT((ndo, " [|aodv]"));
-		return;
-	}
-	if (min(length, (u_int)(ndo->ndo_snapend - dat)) < sizeof(ap->rrep_ack)) {
-		ND_PRINT((ndo, " [|aodv]"));
-		return;
-	}
+	/*
+	 * The message type is the first byte; make sure we have it
+	 * and then fetch it.
+	 */
+	ND_TCHECK(*dat);
+	msg_type = *dat;
 	ND_PRINT((ndo, " aodv"));
 
-	switch (ap->rerr.rerr_type) {
+	switch (msg_type) {
 
 	case AODV_RREQ:
 		if (is_ip6)
-			aodv_v6_rreq(ndo, ap, dat, length);
+			aodv_v6_rreq(ndo, dat, length);
 		else
-			aodv_rreq(ndo, ap, dat, length);
+			aodv_rreq(ndo, dat, length);
 		break;
 
 	case AODV_RREP:
 		if (is_ip6)
-			aodv_v6_rrep(ndo, ap, dat, length);
+			aodv_v6_rrep(ndo, dat, length);
 		else
-			aodv_rrep(ndo, ap, dat, length);
+			aodv_rrep(ndo, dat, length);
 		break;
 
 	case AODV_RERR:
 		if (is_ip6)
-			aodv_v6_rerr(ndo, ap, length);
+			aodv_v6_rerr(ndo, dat, length);
 		else
-			aodv_rerr(ndo, ap, dat, length);
+			aodv_rerr(ndo, dat, length);
 		break;
 
 	case AODV_RREP_ACK:
@@ -599,15 +560,15 @@ aodv_print(netdissect_options *ndo,
 		break;
 
 	case AODV_V6_DRAFT_01_RREQ:
-		aodv_v6_draft_01_rreq(ndo, ap, dat, length);
+		aodv_v6_draft_01_rreq(ndo, dat, length);
 		break;
 
 	case AODV_V6_DRAFT_01_RREP:
-		aodv_v6_draft_01_rrep(ndo, ap, dat, length);
+		aodv_v6_draft_01_rrep(ndo, dat, length);
 		break;
 
 	case AODV_V6_DRAFT_01_RERR:
-		aodv_v6_draft_01_rerr(ndo, ap, length);
+		aodv_v6_draft_01_rerr(ndo, dat, length);
 		break;
 
 	case AODV_V6_DRAFT_01_RREP_ACK:
@@ -615,6 +576,10 @@ aodv_print(netdissect_options *ndo,
 		break;
 
 	default:
-		ND_PRINT((ndo, " %u %u", ap->rreq.rreq_type, length));
+		ND_PRINT((ndo, " type %u %u", msg_type, length));
 	}
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|aodv]"));
 }
diff --git a/contrib/tcpdump/print-arcnet.c b/contrib/tcpdump/print-arcnet.c
index cdd4a650513a..0ffb9220709b 100644
--- a/contrib/tcpdump/print-arcnet.c
+++ b/contrib/tcpdump/print-arcnet.c
@@ -181,7 +181,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 	u_int seqid = 0;
 	u_char arc_type;
 
-	if (caplen < ARC_HDRLEN) {
+	if (caplen < ARC_HDRLEN || length < ARC_HDRLEN) {
 		ND_PRINT((ndo, "[|arcnet]"));
 		return (caplen);
 	}
@@ -202,14 +202,14 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 	}
 
 	if (phds) {
-		if (caplen < ARC_HDRNEWLEN) {
+		if (caplen < ARC_HDRNEWLEN || length < ARC_HDRNEWLEN) {
 			arcnet_print(ndo, p, length, 0, 0, 0);
 			ND_PRINT((ndo, "[|phds]"));
 			return (caplen);
 		}
 
 		if (ap->arc_flag == 0xff) {
-			if (caplen < ARC_HDRNEWLEN_EXC) {
+			if (caplen < ARC_HDRNEWLEN_EXC || length < ARC_HDRNEWLEN_EXC) {
 				arcnet_print(ndo, p, length, 0, 0, 0);
 				ND_PRINT((ndo, "[|phds extended]"));
 				return (caplen);
@@ -268,7 +268,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
 	int archdrlen = 0;
 	u_char arc_type;
 
-	if (caplen < ARC_LINUX_HDRLEN) {
+	if (caplen < ARC_LINUX_HDRLEN || length < ARC_LINUX_HDRLEN) {
 		ND_PRINT((ndo, "[|arcnet]"));
 		return (caplen);
 	}
@@ -279,7 +279,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
 	switch (arc_type) {
 	default:
 		archdrlen = ARC_LINUX_HDRNEWLEN;
-		if (caplen < ARC_LINUX_HDRNEWLEN) {
+		if (caplen < ARC_LINUX_HDRNEWLEN || length < ARC_LINUX_HDRNEWLEN) {
 			ND_PRINT((ndo, "[|arcnet]"));
 			return (caplen);
 		}
@@ -326,11 +326,9 @@ arcnet_encap_print(netdissect_options *ndo, u_char arctype, const u_char *p,
 	        ip_print(ndo, p, length);
 		return (1);
 
-#ifdef INET6
 	case ARCTYPE_INET6:
 		ip6_print(ndo, p, length);
 		return (1);
-#endif /*INET6*/
 
 	case ARCTYPE_ARP_OLD:
 	case ARCTYPE_ARP:
diff --git a/contrib/tcpdump/print-arp.c b/contrib/tcpdump/print-arp.c
index e2f73ae6946d..883099b44741 100644
--- a/contrib/tcpdump/print-arp.c
+++ b/contrib/tcpdump/print-arp.c
@@ -391,8 +391,8 @@ arp_print(netdissect_options *ndo,
 
 	case ARPOP_INVREPLY:
 		ND_PRINT((ndo,"%s at %s",
-			  linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)),
-			  ipaddr_string(ndo, TPA(ap))));
+			  linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)),
+			  ipaddr_string(ndo, SPA(ap))));
 		break;
 
 	default:
diff --git a/contrib/tcpdump/print-ascii.c b/contrib/tcpdump/print-ascii.c
index 96410da8faf6..3cefef33aeb4 100644
--- a/contrib/tcpdump/print-ascii.c
+++ b/contrib/tcpdump/print-ascii.c
@@ -57,8 +57,12 @@ void
 ascii_print(netdissect_options *ndo,
             const u_char *cp, u_int length)
 {
+	u_int caplength;
 	register u_char s;
 
+	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+	if (length > caplength)
+		length = caplength;
 	ND_PRINT((ndo, "\n"));
 	while (length > 0) {
 		s = *cp++;
@@ -89,12 +93,16 @@ void
 hex_and_ascii_print_with_offset(netdissect_options *ndo, register const char *ident,
     register const u_char *cp, register u_int length, register u_int oset)
 {
+	u_int caplength;
 	register u_int i;
 	register int s1, s2;
 	register int nshorts;
 	char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
 	char asciistuff[ASCII_LINELENGTH+1], *asp;
 
+	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+	if (length > caplength)
+		length = caplength;
 	nshorts = length / sizeof(u_short);
 	i = 0;
 	hsp = hexstuff; asp = asciistuff;
@@ -147,9 +155,13 @@ hex_print_with_offset(netdissect_options *ndo,
                       const char *ident, const u_char *cp, u_int length,
 		      u_int oset)
 {
+	u_int caplength;
 	register u_int i, s;
 	register int nshorts;
 
+	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+	if (length > caplength)
+		length = caplength;
 	nshorts = (u_int) length / sizeof(u_short);
 	i = 0;
 	while (--nshorts >= 0) {
diff --git a/contrib/tcpdump/print-atm.c b/contrib/tcpdump/print-atm.c
index 1676a86471c4..8f1277b42548 100644
--- a/contrib/tcpdump/print-atm.c
+++ b/contrib/tcpdump/print-atm.c
@@ -364,8 +364,8 @@ struct oam_fm_ais_rdi_t {
 
 int
 oam_print (netdissect_options *ndo,
-           const u_char *p, u_int length, u_int hec) {
-
+           const u_char *p, u_int length, u_int hec)
+{
     uint32_t cell_header;
     uint16_t vpi, vci, cksum, cksum_shouldbe, idx;
     uint8_t  cell_type, func_type, payload, clp;
diff --git a/contrib/tcpdump/print-babel.c b/contrib/tcpdump/print-babel.c
index bb3401be5e07..75cb32cf19e9 100644
--- a/contrib/tcpdump/print-babel.c
+++ b/contrib/tcpdump/print-babel.c
@@ -46,7 +46,8 @@ static void babel_print_v2(netdissect_options *, const u_char *cp, u_int length)
 
 void
 babel_print(netdissect_options *ndo,
-            const u_char *cp, u_int length) {
+            const u_char *cp, u_int length)
+{
     ND_PRINT((ndo, "babel"));
 
     ND_TCHECK2(*cp, 4);
@@ -270,7 +271,8 @@ network_address(int ae, const unsigned char *a, unsigned int len,
  */
 static void
 subtlvs_print(netdissect_options *ndo,
-              const u_char *cp, const u_char *ep, const uint8_t tlv_type) {
+              const u_char *cp, const u_char *ep, const uint8_t tlv_type)
+{
     uint8_t subtype, sublen;
     const char *sep;
     uint32_t t1, t2;
@@ -340,7 +342,8 @@ subtlvs_print(netdissect_options *ndo,
 
 static void
 babel_print_v2(netdissect_options *ndo,
-               const u_char *cp, u_int length) {
+               const u_char *cp, u_int length)
+{
     u_int i;
     u_short bodylen;
     u_char v4_prefix[16] =
diff --git a/contrib/tcpdump/print-bgp.c b/contrib/tcpdump/print-bgp.c
index f5c02a1be985..c617c3bbbed3 100644
--- a/contrib/tcpdump/print-bgp.c
+++ b/contrib/tcpdump/print-bgp.c
@@ -530,7 +530,7 @@ decode_labeled_prefix4(netdissect_options *ndo,
            is added to the prefix length;
            we also do only read out just one label -
            there is no real application for advertisement of
-           stacked labels in a a single BGP message
+           stacked labels in a single BGP message
         */
 
 	if (24 > plen)
@@ -574,7 +574,8 @@ decode_labeled_prefix4(netdissect_options *ndo,
  */
 static char *
 bgp_vpn_ip_print(netdissect_options *ndo,
-                 const u_char *pptr, u_int addr_length) {
+                 const u_char *pptr, u_int addr_length)
+{
 
     /* worst case string is s fully formatted v6 address */
     static char addr[sizeof("1234:5678:89ab:cdef:1234:5678:89ab:cdef")];
@@ -622,8 +623,8 @@ bgp_vpn_ip_print(netdissect_options *ndo,
  */
 static int
 bgp_vpn_sg_print(netdissect_options *ndo,
-                 const u_char *pptr, char *buf, u_int buflen) {
-
+                 const u_char *pptr, char *buf, u_int buflen)
+{
     uint8_t addr_length;
     u_int total_length, offset;
 
@@ -667,8 +668,8 @@ bgp_vpn_sg_print(netdissect_options *ndo,
  * printing route targets inside a NLRI */
 char *
 bgp_vpn_rd_print(netdissect_options *ndo,
-                 const u_char *pptr) {
-
+                 const u_char *pptr)
+{
    /* allocate space for the largest possible string */
     static char rd[sizeof("xxxxxxxxxx:xxxxx (xxx.xxx.xxx.xxx:xxxxx)")];
     char *pos = rd;
@@ -716,8 +717,10 @@ decode_rt_routing_info(netdissect_options *ndo,
 	ND_TCHECK(pptr[0]);
 	plen = pptr[0];   /* get prefix length */
 
-	if (0 == plen)
-		return 1; /* default route target */
+	if (0 == plen) {
+		snprintf(buf, buflen, "default route target");
+		return 1;
+	}
 
 	if (32 > plen)
 		return -1;
@@ -2617,8 +2620,8 @@ bgp_notification_print(netdissect_options *ndo,
 
 static void
 bgp_route_refresh_print(netdissect_options *ndo,
-                        const u_char *pptr, int len) {
-
+                        const u_char *pptr, int len)
+{
         const struct bgp_route_refresh *bgp_route_refresh_header;
 	char tokbuf[TOKBUFSIZE];
 	char tokbuf2[TOKBUFSIZE];
@@ -2715,7 +2718,7 @@ bgp_print(netdissect_options *ndo,
 	if (ndo->ndo_snapend < dat + length)
 		ep = ndo->ndo_snapend;
 
-	ND_PRINT((ndo, ": BGP, length: %u", length));
+	ND_PRINT((ndo, ": BGP"));
 
         if (ndo->ndo_vflag < 1) /* lets be less chatty */
                 return;
diff --git a/contrib/tcpdump/print-bootp.c b/contrib/tcpdump/print-bootp.c
index dbca1f21ab6e..0cbc121d9c4e 100644
--- a/contrib/tcpdump/print-bootp.c
+++ b/contrib/tcpdump/print-bootp.c
@@ -35,23 +35,246 @@
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
-#include "bootp.h"
 
 static const char tstr[] = " [|bootp]";
 
+/*
+ * Bootstrap Protocol (BOOTP).  RFC951 and RFC1048.
+ *
+ * This file specifies the "implementation-independent" BOOTP protocol
+ * information which is common to both client and server.
+ *
+ * Copyright 1988 by Carnegie Mellon.
+ *
+ * Permission to use, copy, modify, and distribute this program for any
+ * purpose and without fee is hereby granted, provided that this copyright
+ * and permission notice appear on all copies and supporting documentation,
+ * the name of Carnegie Mellon not be used in advertising or publicity
+ * pertaining to distribution of the program without specific prior
+ * permission, and notice be given in supporting documentation that copying
+ * and distribution is by permission of Carnegie Mellon and Stanford
+ * University.  Carnegie Mellon makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+struct bootp {
+	uint8_t		bp_op;		/* packet opcode type */
+	uint8_t		bp_htype;	/* hardware addr type */
+	uint8_t		bp_hlen;	/* hardware addr length */
+	uint8_t		bp_hops;	/* gateway hops */
+	uint32_t	bp_xid;		/* transaction ID */
+	uint16_t	bp_secs;	/* seconds since boot began */
+	uint16_t	bp_flags;	/* flags - see bootp_flag_values[]
+					   in print-bootp.c */
+	struct in_addr	bp_ciaddr;	/* client IP address */
+	struct in_addr	bp_yiaddr;	/* 'your' IP address */
+	struct in_addr	bp_siaddr;	/* server IP address */
+	struct in_addr	bp_giaddr;	/* gateway IP address */
+	uint8_t		bp_chaddr[16];	/* client hardware address */
+	uint8_t		bp_sname[64];	/* server host name */
+	uint8_t		bp_file[128];	/* boot file name */
+	uint8_t		bp_vend[64];	/* vendor-specific area */
+} UNALIGNED;
+
+#define BOOTPREPLY	2
+#define BOOTPREQUEST	1
+
+/*
+ * Vendor magic cookie (v_magic) for CMU
+ */
+#define VM_CMU		"CMU"
+
+/*
+ * Vendor magic cookie (v_magic) for RFC1048
+ */
+#define VM_RFC1048	{ 99, 130, 83, 99 }
+
+/*
+ * RFC1048 tag values used to specify what information is being supplied in
+ * the vendor field of the packet.
+ */
+
+#define TAG_PAD			((uint8_t)   0)
+#define TAG_SUBNET_MASK		((uint8_t)   1)
+#define TAG_TIME_OFFSET		((uint8_t)   2)
+#define TAG_GATEWAY		((uint8_t)   3)
+#define TAG_TIME_SERVER		((uint8_t)   4)
+#define TAG_NAME_SERVER		((uint8_t)   5)
+#define TAG_DOMAIN_SERVER	((uint8_t)   6)
+#define TAG_LOG_SERVER		((uint8_t)   7)
+#define TAG_COOKIE_SERVER	((uint8_t)   8)
+#define TAG_LPR_SERVER		((uint8_t)   9)
+#define TAG_IMPRESS_SERVER	((uint8_t)  10)
+#define TAG_RLP_SERVER		((uint8_t)  11)
+#define TAG_HOSTNAME		((uint8_t)  12)
+#define TAG_BOOTSIZE		((uint8_t)  13)
+#define TAG_END			((uint8_t) 255)
+/* RFC1497 tags */
+#define	TAG_DUMPPATH		((uint8_t)  14)
+#define	TAG_DOMAINNAME		((uint8_t)  15)
+#define	TAG_SWAP_SERVER		((uint8_t)  16)
+#define	TAG_ROOTPATH		((uint8_t)  17)
+#define	TAG_EXTPATH		((uint8_t)  18)
+/* RFC2132 */
+#define	TAG_IP_FORWARD		((uint8_t)  19)
+#define	TAG_NL_SRCRT		((uint8_t)  20)
+#define	TAG_PFILTERS		((uint8_t)  21)
+#define	TAG_REASS_SIZE		((uint8_t)  22)
+#define	TAG_DEF_TTL		((uint8_t)  23)
+#define	TAG_MTU_TIMEOUT		((uint8_t)  24)
+#define	TAG_MTU_TABLE		((uint8_t)  25)
+#define	TAG_INT_MTU		((uint8_t)  26)
+#define	TAG_LOCAL_SUBNETS	((uint8_t)  27)
+#define	TAG_BROAD_ADDR		((uint8_t)  28)
+#define	TAG_DO_MASK_DISC	((uint8_t)  29)
+#define	TAG_SUPPLY_MASK		((uint8_t)  30)
+#define	TAG_DO_RDISC		((uint8_t)  31)
+#define	TAG_RTR_SOL_ADDR	((uint8_t)  32)
+#define	TAG_STATIC_ROUTE	((uint8_t)  33)
+#define	TAG_USE_TRAILERS	((uint8_t)  34)
+#define	TAG_ARP_TIMEOUT		((uint8_t)  35)
+#define	TAG_ETH_ENCAP		((uint8_t)  36)
+#define	TAG_TCP_TTL		((uint8_t)  37)
+#define	TAG_TCP_KEEPALIVE	((uint8_t)  38)
+#define	TAG_KEEPALIVE_GO	((uint8_t)  39)
+#define	TAG_NIS_DOMAIN		((uint8_t)  40)
+#define	TAG_NIS_SERVERS		((uint8_t)  41)
+#define	TAG_NTP_SERVERS		((uint8_t)  42)
+#define	TAG_VENDOR_OPTS		((uint8_t)  43)
+#define	TAG_NETBIOS_NS		((uint8_t)  44)
+#define	TAG_NETBIOS_DDS		((uint8_t)  45)
+#define	TAG_NETBIOS_NODE	((uint8_t)  46)
+#define	TAG_NETBIOS_SCOPE	((uint8_t)  47)
+#define	TAG_XWIN_FS		((uint8_t)  48)
+#define	TAG_XWIN_DM		((uint8_t)  49)
+#define	TAG_NIS_P_DOMAIN	((uint8_t)  64)
+#define	TAG_NIS_P_SERVERS	((uint8_t)  65)
+#define	TAG_MOBILE_HOME		((uint8_t)  68)
+#define	TAG_SMPT_SERVER		((uint8_t)  69)
+#define	TAG_POP3_SERVER		((uint8_t)  70)
+#define	TAG_NNTP_SERVER		((uint8_t)  71)
+#define	TAG_WWW_SERVER		((uint8_t)  72)
+#define	TAG_FINGER_SERVER	((uint8_t)  73)
+#define	TAG_IRC_SERVER		((uint8_t)  74)
+#define	TAG_STREETTALK_SRVR	((uint8_t)  75)
+#define	TAG_STREETTALK_STDA	((uint8_t)  76)
+/* DHCP options */
+#define	TAG_REQUESTED_IP	((uint8_t)  50)
+#define	TAG_IP_LEASE		((uint8_t)  51)
+#define	TAG_OPT_OVERLOAD	((uint8_t)  52)
+#define	TAG_TFTP_SERVER		((uint8_t)  66)
+#define	TAG_BOOTFILENAME	((uint8_t)  67)
+#define	TAG_DHCP_MESSAGE	((uint8_t)  53)
+#define	TAG_SERVER_ID		((uint8_t)  54)
+#define	TAG_PARM_REQUEST	((uint8_t)  55)
+#define	TAG_MESSAGE		((uint8_t)  56)
+#define	TAG_MAX_MSG_SIZE	((uint8_t)  57)
+#define	TAG_RENEWAL_TIME	((uint8_t)  58)
+#define	TAG_REBIND_TIME		((uint8_t)  59)
+#define	TAG_VENDOR_CLASS	((uint8_t)  60)
+#define	TAG_CLIENT_ID		((uint8_t)  61)
+/* RFC 2241 */
+#define	TAG_NDS_SERVERS		((uint8_t)  85)
+#define	TAG_NDS_TREE_NAME	((uint8_t)  86)
+#define	TAG_NDS_CONTEXT		((uint8_t)  87)
+/* RFC 2242 */
+#define	TAG_NDS_IPDOMAIN	((uint8_t)  62)
+#define	TAG_NDS_IPINFO		((uint8_t)  63)
+/* RFC 2485 */
+#define	TAG_OPEN_GROUP_UAP	((uint8_t)  98)
+/* RFC 2563 */
+#define	TAG_DISABLE_AUTOCONF	((uint8_t) 116)
+/* RFC 2610 */
+#define	TAG_SLP_DA		((uint8_t)  78)
+#define	TAG_SLP_SCOPE		((uint8_t)  79)
+/* RFC 2937 */
+#define	TAG_NS_SEARCH		((uint8_t) 117)
+/* RFC 3004 - The User Class Option for DHCP */
+#define	TAG_USER_CLASS		((uint8_t)  77)
+/* RFC 3011 */
+#define	TAG_IP4_SUBNET_SELECT	((uint8_t) 118)
+/* RFC 3442 */
+#define TAG_CLASSLESS_STATIC_RT	((uint8_t) 121)
+#define TAG_CLASSLESS_STA_RT_MS	((uint8_t) 249)
+/* RFC 5859 - TFTP Server Address Option for DHCPv4 */
+#define	TAG_TFTP_SERVER_ADDRESS	((uint8_t) 150)
+/* ftp://ftp.isi.edu/.../assignments/bootp-dhcp-extensions */
+#define	TAG_SLP_NAMING_AUTH	((uint8_t)  80)
+#define	TAG_CLIENT_FQDN		((uint8_t)  81)
+#define	TAG_AGENT_CIRCUIT	((uint8_t)  82)
+#define	TAG_AGENT_REMOTE	((uint8_t)  83)
+#define	TAG_AGENT_MASK		((uint8_t)  84)
+#define	TAG_TZ_STRING		((uint8_t)  88)
+#define	TAG_FQDN_OPTION		((uint8_t)  89)
+#define	TAG_AUTH		((uint8_t)  90)
+#define	TAG_VINES_SERVERS	((uint8_t)  91)
+#define	TAG_SERVER_RANK		((uint8_t)  92)
+#define	TAG_CLIENT_ARCH		((uint8_t)  93)
+#define	TAG_CLIENT_NDI		((uint8_t)  94)
+#define	TAG_CLIENT_GUID		((uint8_t)  97)
+#define	TAG_LDAP_URL		((uint8_t)  95)
+#define	TAG_6OVER4		((uint8_t)  96)
+#define	TAG_PRINTER_NAME	((uint8_t) 100)
+#define	TAG_MDHCP_SERVER	((uint8_t) 101)
+#define	TAG_IPX_COMPAT		((uint8_t) 110)
+#define	TAG_NETINFO_PARENT	((uint8_t) 112)
+#define	TAG_NETINFO_PARENT_TAG	((uint8_t) 113)
+#define	TAG_URL			((uint8_t) 114)
+#define	TAG_FAILOVER		((uint8_t) 115)
+#define	TAG_EXTENDED_REQUEST	((uint8_t) 126)
+#define	TAG_EXTENDED_OPTION	((uint8_t) 127)
+
+/* DHCP Message types (values for TAG_DHCP_MESSAGE option) */
+#define DHCPDISCOVER	1
+#define DHCPOFFER	2
+#define DHCPREQUEST	3
+#define DHCPDECLINE	4
+#define DHCPACK		5
+#define DHCPNAK		6
+#define DHCPRELEASE	7
+#define DHCPINFORM	8
+
+/*
+ * "vendor" data permitted for CMU bootp clients.
+ */
+
+struct cmu_vend {
+	uint8_t		v_magic[4];	/* magic number */
+	uint32_t	v_flags;	/* flags/opcodes, etc. */
+	struct in_addr	v_smask;	/* Subnet mask */
+	struct in_addr	v_dgate;	/* Default gateway */
+	struct in_addr	v_dns1, v_dns2; /* Domain name servers */
+	struct in_addr	v_ins1, v_ins2; /* IEN-116 name servers */
+	struct in_addr	v_ts1, v_ts2;	/* Time servers */
+	uint8_t		v_unused[24];	/* currently unused */
+} UNALIGNED;
+
+
+/* v_flags values */
+#define VF_SMASK	1	/* Subnet mask field contains valid data */
+
+/* RFC 4702 DHCP Client FQDN Option */
+
+#define CLIENT_FQDN_FLAGS_S	0x01
+#define CLIENT_FQDN_FLAGS_O	0x02
+#define CLIENT_FQDN_FLAGS_E	0x04
+#define CLIENT_FQDN_FLAGS_N	0x08
+/* end of original bootp.h */
+
 static void rfc1048_print(netdissect_options *, const u_char *);
 static void cmu_print(netdissect_options *, const u_char *);
 static char *client_fqdn_flags(u_int flags);
 
 static const struct tok bootp_flag_values[] = {
-    { 0x8000,                   "Broadcast" },
-    { 0, NULL}
+	{ 0x8000,	"Broadcast" },
+	{ 0, NULL}
 };
 
 static const struct tok bootp_op_values[] = {
-    { BOOTPREQUEST,             "Request" },
-    { BOOTPREPLY,               "Reply" },
-    { 0, NULL}
+	{ BOOTPREQUEST,	"Request" },
+	{ BOOTPREPLY,	"Reply" },
+	{ 0, NULL}
 };
 
 /*
@@ -59,7 +282,7 @@ static const struct tok bootp_op_values[] = {
  */
 void
 bootp_print(netdissect_options *ndo,
-            register const u_char *cp, u_int length)
+	    register const u_char *cp, u_int length)
 {
 	register const struct bootp *bp;
 	static const u_char vm_cmu[4] = VM_CMU;
@@ -69,7 +292,7 @@ bootp_print(netdissect_options *ndo,
 	ND_TCHECK(bp->bp_op);
 
 	ND_PRINT((ndo, "BOOTP/DHCP, %s",
-	          tok2str(bootp_op_values, "unknown (0x%02x)", bp->bp_op)));
+		  tok2str(bootp_op_values, "unknown (0x%02x)", bp->bp_op)));
 
 	if (bp->bp_htype == 1 && bp->bp_hlen == 6 && bp->bp_op == BOOTPREQUEST) {
 		ND_TCHECK2(bp->bp_chaddr[0], 6);
@@ -100,7 +323,7 @@ bootp_print(netdissect_options *ndo,
 		ND_PRINT((ndo, ", secs %d", EXTRACT_16BITS(&bp->bp_secs)));
 
 	ND_PRINT((ndo, ", Flags [%s]",
-		bittok2str(bootp_flag_values, "none", EXTRACT_16BITS(&bp->bp_flags))));
+		  bittok2str(bootp_flag_values, "none", EXTRACT_16BITS(&bp->bp_flags))));
 	if (ndo->ndo_vflag > 1)
 		ND_PRINT((ndo, " (0x%04x)", EXTRACT_16BITS(&bp->bp_flags)));
 
@@ -154,10 +377,10 @@ bootp_print(netdissect_options *ndo,
 	/* Decode the vendor buffer */
 	ND_TCHECK(bp->bp_vend[0]);
 	if (memcmp((const char *)bp->bp_vend, vm_rfc1048,
-		 sizeof(uint32_t)) == 0)
+		    sizeof(uint32_t)) == 0)
 		rfc1048_print(ndo, bp->bp_vend);
 	else if (memcmp((const char *)bp->bp_vend, vm_cmu,
-		      sizeof(uint32_t)) == 0)
+			sizeof(uint32_t)) == 0)
 		cmu_print(ndo, bp->bp_vend);
 	else {
 		uint32_t ul;
@@ -274,13 +497,16 @@ static const struct tok tag2str[] = {
 	{ TAG_SLP_SCOPE,	"bSLP-SCOPE" },	/*"b" is a little wrong */
 /* RFC 2937 */
 	{ TAG_NS_SEARCH,	"sNSSEARCH" },	/* XXX 's' */
+/* RFC 3004 - The User Class Option for DHCP */
+	{ TAG_USER_CLASS,	"$User-Class" },
 /* RFC 3011 */
 	{ TAG_IP4_SUBNET_SELECT, "iSUBNET" },
 /* RFC 3442 */
 	{ TAG_CLASSLESS_STATIC_RT, "$Classless-Static-Route" },
 	{ TAG_CLASSLESS_STA_RT_MS, "$Classless-Static-Route-Microsoft" },
+/* RFC 5859 - TFTP Server Address Option for DHCPv4 */
+	{ TAG_TFTP_SERVER_ADDRESS, "iTFTP-Server-Address" },
 /* http://www.iana.org/assignments/bootp-dhcp-extensions/index.htm */
-	{ TAG_USER_CLASS,	"aCLASS" },
 	{ TAG_SLP_NAMING_AUTH,	"aSLP-NA" },
 	{ TAG_CLIENT_FQDN,	"$FQDN" },
 	{ TAG_AGENT_CIRCUIT,	"$Agent-Information" },
@@ -303,67 +529,67 @@ static const struct tok tag2str[] = {
 	{ TAG_NETINFO_PARENT_TAG, "aNITAG" },
 	{ TAG_URL,		"aURL" },
 	{ TAG_FAILOVER,		"bFAIL" },	/* XXX 'b' */
-	{ 0,			NULL }
+	{ 0, NULL }
 };
 /* 2-byte extended tags */
 static const struct tok xtag2str[] = {
-	{ 0,			NULL }
+	{ 0, NULL }
 };
 
 /* DHCP "options overload" types */
 static const struct tok oo2str[] = {
-	{ 1,			"file" },
-	{ 2,			"sname" },
-	{ 3,			"file+sname" },
-	{ 0,			NULL }
+	{ 1,	"file" },
+	{ 2,	"sname" },
+	{ 3,	"file+sname" },
+	{ 0, NULL }
 };
 
 /* NETBIOS over TCP/IP node type options */
 static const struct tok nbo2str[] = {
-	{ 0x1,			"b-node" },
-	{ 0x2,			"p-node" },
-	{ 0x4,			"m-node" },
-	{ 0x8,			"h-node" },
-	{ 0,			NULL }
+	{ 0x1,	"b-node" },
+	{ 0x2,	"p-node" },
+	{ 0x4,	"m-node" },
+	{ 0x8,	"h-node" },
+	{ 0, NULL }
 };
 
 /* ARP Hardware types, for Client-ID option */
 static const struct tok arp2str[] = {
-	{ 0x1,			"ether" },
-	{ 0x6,			"ieee802" },
-	{ 0x7,			"arcnet" },
-	{ 0xf,			"frelay" },
-	{ 0x17,			"strip" },
-	{ 0x18,			"ieee1394" },
-	{ 0,			NULL }
+	{ 0x1,	"ether" },
+	{ 0x6,	"ieee802" },
+	{ 0x7,	"arcnet" },
+	{ 0xf,	"frelay" },
+	{ 0x17,	"strip" },
+	{ 0x18,	"ieee1394" },
+	{ 0, NULL }
 };
 
 static const struct tok dhcp_msg_values[] = {
-        { DHCPDISCOVER, "Discover" },
-        { DHCPOFFER, "Offer" },
-        { DHCPREQUEST, "Request" },
-        { DHCPDECLINE, "Decline" },
-        { DHCPACK, "ACK" },
-        { DHCPNAK, "NACK" },
-        { DHCPRELEASE, "Release" },
-        { DHCPINFORM, "Inform" },
-        { 0,			NULL }
+	{ DHCPDISCOVER,	"Discover" },
+	{ DHCPOFFER,	"Offer" },
+	{ DHCPREQUEST,	"Request" },
+	{ DHCPDECLINE,	"Decline" },
+	{ DHCPACK,	"ACK" },
+	{ DHCPNAK,	"NACK" },
+	{ DHCPRELEASE,	"Release" },
+	{ DHCPINFORM,	"Inform" },
+	{ 0, NULL }
 };
 
-#define AGENT_SUBOPTION_CIRCUIT_ID 	1	/* RFC 3046 */
-#define AGENT_SUBOPTION_REMOTE_ID  	2	/* RFC 3046 */
-#define AGENT_SUBOPTION_SUBSCRIBER_ID 	6	/* RFC 3993 */
+#define AGENT_SUBOPTION_CIRCUIT_ID	1	/* RFC 3046 */
+#define AGENT_SUBOPTION_REMOTE_ID	2	/* RFC 3046 */
+#define AGENT_SUBOPTION_SUBSCRIBER_ID	6	/* RFC 3993 */
 static const struct tok agent_suboption_values[] = {
-        { AGENT_SUBOPTION_CIRCUIT_ID, "Circuit-ID" },
-        { AGENT_SUBOPTION_REMOTE_ID, "Remote-ID" },
-        { AGENT_SUBOPTION_SUBSCRIBER_ID, "Subscriber-ID" },
-        { 0,			NULL }
+	{ AGENT_SUBOPTION_CIRCUIT_ID,    "Circuit-ID" },
+	{ AGENT_SUBOPTION_REMOTE_ID,     "Remote-ID" },
+	{ AGENT_SUBOPTION_SUBSCRIBER_ID, "Subscriber-ID" },
+	{ 0, NULL }
 };
 
 
 static void
 rfc1048_print(netdissect_options *ndo,
-              register const u_char *bp)
+	      register const u_char *bp)
 {
 	register uint16_t tag;
 	register u_int len;
@@ -408,7 +634,7 @@ rfc1048_print(netdissect_options *ndo,
 		}
 
 		ND_PRINT((ndo, "\n\t    %s Option %u, length %u%s", cp, tag, len,
-		    len > 0 ? ": " : ""));
+			  len > 0 ? ": " : ""));
 
 		if (tag == TAG_PAD && ndo->ndo_vflag > 2) {
 			u_int ntag = 1;
@@ -581,9 +807,8 @@ rfc1048_print(netdissect_options *ndo,
 
 			case TAG_NETBIOS_NODE:
 				/* this option should be at least 1 byte long */
-				if (len < 1)  {
-					ND_PRINT((ndo, "ERROR: option %u len %u < 1 bytes",
-					    TAG_NETBIOS_NODE, len));
+				if (len < 1) {
+					ND_PRINT((ndo, "ERROR: length < 1 bytes"));
 					break;
 				}
 				tag = *bp++;
@@ -593,9 +818,8 @@ rfc1048_print(netdissect_options *ndo,
 
 			case TAG_OPT_OVERLOAD:
 				/* this option should be at least 1 byte long */
-				if (len < 1)  {
-					ND_PRINT((ndo, "ERROR: option %u len %u < 1 bytes",
-					    TAG_OPT_OVERLOAD, len));
+				if (len < 1) {
+					ND_PRINT((ndo, "ERROR: length < 1 bytes"));
 					break;
 				}
 				tag = *bp++;
@@ -605,9 +829,8 @@ rfc1048_print(netdissect_options *ndo,
 
 			case TAG_CLIENT_FQDN:
 				/* this option should be at least 3 bytes long */
-				if (len < 3)  {
-					ND_PRINT((ndo, "ERROR: option %u len %u < 3 bytes",
-					    TAG_CLIENT_FQDN, len));
+				if (len < 3) {
+					ND_PRINT((ndo, "ERROR: length < 3 bytes"));
 					bp += len;
 					len = 0;
 					break;
@@ -629,12 +852,12 @@ rfc1048_print(netdissect_options *ndo,
 				break;
 
 			case TAG_CLIENT_ID:
-			    {	int type;
+			    {
+				int type;
 
 				/* this option should be at least 1 byte long */
-				if (len < 1)  {
-					ND_PRINT((ndo, "ERROR: option %u len %u < 1 bytes",
-					    TAG_CLIENT_ID, len));
+				if (len < 1) {
+					ND_PRINT((ndo, "ERROR: length < 1 bytes"));
 					break;
 				}
 				type = *bp++;
@@ -670,23 +893,24 @@ rfc1048_print(netdissect_options *ndo,
 					len -= 2;
 					if (suboptlen > len) {
 						ND_PRINT((ndo, "\n\t      %s SubOption %u, length %u: length goes past end of option",
-						   tok2str(agent_suboption_values, "Unknown", subopt),
-						   subopt,
-						   suboptlen));
+							  tok2str(agent_suboption_values, "Unknown", subopt),
+							  subopt,
+							  suboptlen));
 						bp += len;
 						len = 0;
 						break;
 					}
 					ND_PRINT((ndo, "\n\t      %s SubOption %u, length %u: ",
-					   tok2str(agent_suboption_values, "Unknown", subopt),
-					   subopt,
-					   suboptlen));
+						  tok2str(agent_suboption_values, "Unknown", subopt),
+						  subopt,
+						  suboptlen));
 					switch (subopt) {
 
 					case AGENT_SUBOPTION_CIRCUIT_ID: /* fall through */
 					case AGENT_SUBOPTION_REMOTE_ID:
 					case AGENT_SUBOPTION_SUBSCRIBER_ID:
-						fn_printn(ndo, bp, suboptlen, NULL);
+						if (fn_printn(ndo, bp, suboptlen, ndo->ndo_snapend))
+							goto trunc;
 						break;
 
 					default:
@@ -695,18 +919,17 @@ rfc1048_print(netdissect_options *ndo,
 
 					len -= suboptlen;
 					bp += suboptlen;
-			    }
-			    break;
+				}
+				break;
 
 			case TAG_CLASSLESS_STATIC_RT:
 			case TAG_CLASSLESS_STA_RT_MS:
-			{
+			    {
 				u_int mask_width, significant_octets, i;
 
 				/* this option should be at least 5 bytes long */
-				if (len < 5)  {
-					ND_PRINT((ndo, "ERROR: option %u len %u < 5 bytes",
-					    TAG_CLASSLESS_STATIC_RT, len));
+				if (len < 5) {
+					ND_PRINT((ndo, "ERROR: length < 5 bytes"));
 					bp += len;
 					len = 0;
 					break;
@@ -718,7 +941,7 @@ rfc1048_print(netdissect_options *ndo,
 					len--;
 					/* mask_width <= 32 */
 					if (mask_width > 32) {
-						ND_PRINT((ndo, "[ERROR: Mask width (%d) > 32]",  mask_width));
+						ND_PRINT((ndo, "[ERROR: Mask width (%d) > 32]", mask_width));
 						bp += len;
 						len = 0;
 						break;
@@ -726,7 +949,7 @@ rfc1048_print(netdissect_options *ndo,
 					significant_octets = (mask_width + 7) / 8;
 					/* significant octets + router(4) */
 					if (len < significant_octets + 4) {
-						ND_PRINT((ndo, "[ERROR: Remaining length (%u) < %u bytes]",  len, significant_octets + 4));
+						ND_PRINT((ndo, "[ERROR: Remaining length (%u) < %u bytes]", len, significant_octets + 4));
 						bp += len;
 						len = 0;
 						break;
@@ -750,12 +973,54 @@ rfc1048_print(netdissect_options *ndo,
 					len -= (significant_octets + 4);
 					first = 0;
 				}
-			}
-			break;
+				break;
+			    }
+
+			case TAG_USER_CLASS:
+			    {
+				u_int suboptnumber = 1;
+
+				first = 1;
+				if (len < 2) {
+					ND_PRINT((ndo, "ERROR: length < 2 bytes"));
+					bp += len;
+					len = 0;
+					break;
+				}
+				while (len > 0) {
+					suboptlen = *bp++;
+					len--;
+					ND_PRINT((ndo, "\n\t      "));
+					ND_PRINT((ndo, "instance#%u: ", suboptnumber));
+					if (suboptlen == 0) {
+						ND_PRINT((ndo, "ERROR: suboption length must be non-zero"));
+						bp += len;
+						len = 0;
+						break;
+					}
+					if (len < suboptlen) {
+						ND_PRINT((ndo, "ERROR: malformed option"));
+						bp += len;
+						len = 0;
+						break;
+					}
+					ND_PRINT((ndo, "\""));
+					if (fn_printn(ndo, bp, suboptlen, ndo->ndo_snapend)) {
+						ND_PRINT((ndo, "\""));
+						goto trunc;
+					}
+					ND_PRINT((ndo, "\""));
+					ND_PRINT((ndo, ", length %d", suboptlen));
+					suboptnumber++;
+					len -= suboptlen;
+					bp += suboptlen;
+				}
+				break;
+			    }
 
 			default:
 				ND_PRINT((ndo, "[unknown special tag %u, size %u]",
-				    tag, len));
+					  tag, len));
 				bp += len;
 				len = 0;
 				break;
@@ -775,7 +1040,7 @@ rfc1048_print(netdissect_options *ndo,
 
 static void
 cmu_print(netdissect_options *ndo,
-          register const u_char *bp)
+	  register const u_char *bp)
 {
 	register const struct cmu_vend *cmu;
 
diff --git a/contrib/tcpdump/print-cdp.c b/contrib/tcpdump/print-cdp.c
index 116f0fa522e8..932f7bccea68 100644
--- a/contrib/tcpdump/print-cdp.c
+++ b/contrib/tcpdump/print-cdp.c
@@ -40,7 +40,14 @@
 
 static const char tstr[] = "[|cdp]";
 
-#define CDP_HEADER_LEN  4
+#define CDP_HEADER_LEN             4
+#define CDP_HEADER_VERSION_OFFSET  0
+#define CDP_HEADER_TTL_OFFSET      1
+#define CDP_HEADER_CHECKSUM_OFFSET 2
+
+#define CDP_TLV_HEADER_LEN  4
+#define CDP_TLV_TYPE_OFFSET 0
+#define CDP_TLV_LEN_OFFSET  2
 
 static const struct tok cdp_tlv_values[] = {
     { 0x01,             "Device-ID"},
@@ -87,140 +94,167 @@ cdp_print(netdissect_options *ndo,
           const u_char *pptr, u_int length, u_int caplen)
 {
 	int type, len, i, j;
-        const u_char *tptr;
+	const u_char *tptr;
 
 	if (caplen < CDP_HEADER_LEN) {
 		ND_PRINT((ndo, "%s", tstr));
 		return;
 	}
 
-        tptr = pptr; /* temporary pointer */
+	tptr = pptr; /* temporary pointer */
 
 	ND_TCHECK2(*tptr, CDP_HEADER_LEN);
-	ND_PRINT((ndo, "CDPv%u, ttl: %us", *tptr, *(tptr + 1)));
+	ND_PRINT((ndo, "CDPv%u, ttl: %us", *(tptr + CDP_HEADER_VERSION_OFFSET),
+					   *(tptr + CDP_HEADER_TTL_OFFSET)));
 	if (ndo->ndo_vflag)
-		ND_PRINT((ndo, ", checksum: %u (unverified), length %u", EXTRACT_16BITS(tptr), length));
+		ND_PRINT((ndo, ", checksum: 0x%04x (unverified), length %u", EXTRACT_16BITS(tptr+CDP_HEADER_CHECKSUM_OFFSET), length));
 	tptr += CDP_HEADER_LEN;
 
 	while (tptr < (pptr+length)) {
-		ND_TCHECK2(*tptr, 4); /* read out Type and Length */
-		type = EXTRACT_16BITS(tptr);
-		len  = EXTRACT_16BITS(tptr+2); /* object length includes the 4 bytes header length */
-                tptr += 4;
-                len -= 4;
+		ND_TCHECK2(*tptr, CDP_TLV_HEADER_LEN); /* read out Type and Length */
+		type = EXTRACT_16BITS(tptr+CDP_TLV_TYPE_OFFSET);
+		len  = EXTRACT_16BITS(tptr+CDP_TLV_LEN_OFFSET); /* object length includes the 4 bytes header length */
+		if (len < CDP_TLV_HEADER_LEN) {
+		    if (ndo->ndo_vflag)
+			ND_PRINT((ndo, "\n\t%s (0x%02x), TLV length: %u byte%s (too short)",
+			       tok2str(cdp_tlv_values,"unknown field type", type),
+			       type,
+			       len,
+			       PLURAL_SUFFIX(len))); /* plural */
+		    else
+			ND_PRINT((ndo, ", %s TLV length %u too short",
+			       tok2str(cdp_tlv_values,"unknown field type", type),
+			       len));
+		    break;
+		}
+		tptr += CDP_TLV_HEADER_LEN;
+		len -= CDP_TLV_HEADER_LEN;
 
 		ND_TCHECK2(*tptr, len);
 
-                if (ndo->ndo_vflag || type == 1) { /* in non-verbose mode just print Device-ID */
+		if (ndo->ndo_vflag || type == 1) { /* in non-verbose mode just print Device-ID */
 
-                    if (ndo->ndo_vflag)
-                        ND_PRINT((ndo, "\n\t%s (0x%02x), length: %u byte%s: ",
-                               tok2str(cdp_tlv_values,"unknown field type", type),
-                               type,
-                               len,
-                               PLURAL_SUFFIX(len))); /* plural */
+		    if (ndo->ndo_vflag)
+			ND_PRINT((ndo, "\n\t%s (0x%02x), value length: %u byte%s: ",
+			       tok2str(cdp_tlv_values,"unknown field type", type),
+			       type,
+			       len,
+			       PLURAL_SUFFIX(len))); /* plural */
 
-                    switch (type) {
+		    switch (type) {
 
-                    case 0x01: /* Device-ID */
-                        if (!ndo->ndo_vflag)
-                            ND_PRINT((ndo, ", Device-ID "));
-                        ND_PRINT((ndo, "'"));
-                        fn_printn(ndo, tptr, len, NULL);
-                        ND_PRINT((ndo, "'"));
+		    case 0x01: /* Device-ID */
+			if (!ndo->ndo_vflag)
+			    ND_PRINT((ndo, ", Device-ID "));
+			ND_PRINT((ndo, "'"));
+			(void)fn_printn(ndo, tptr, len, NULL);
+			ND_PRINT((ndo, "'"));
 			break;
-                    case 0x02: /* Address */
-                        if (cdp_print_addr(ndo, tptr, len) < 0)
-                            goto trunc;
+		    case 0x02: /* Address */
+			if (cdp_print_addr(ndo, tptr, len) < 0)
+			    goto trunc;
 			break;
-                    case 0x03: /* Port-ID */
-                        ND_PRINT((ndo, "'"));
-                        fn_printn(ndo, tptr, len, NULL);
-                        ND_PRINT((ndo, "'"));
+		    case 0x03: /* Port-ID */
+			ND_PRINT((ndo, "'"));
+			(void)fn_printn(ndo, tptr, len, NULL);
+			ND_PRINT((ndo, "'"));
 			break;
-                    case 0x04: /* Capabilities */
+		    case 0x04: /* Capabilities */
+			if (len < 4)
+			    goto trunc;
 			ND_PRINT((ndo, "(0x%08x): %s",
-                               EXTRACT_32BITS(tptr),
-                               bittok2str(cdp_capability_values, "none", EXTRACT_32BITS(tptr))));
+			       EXTRACT_32BITS(tptr),
+			       bittok2str(cdp_capability_values, "none", EXTRACT_32BITS(tptr))));
 			break;
-                    case 0x05: /* Version */
-                        ND_PRINT((ndo, "\n\t  "));
-                        for (i=0;i 1) {
 				ND_PRINT((ndo, "/"));
-	                        fn_printn(ndo, tptr + 1, len - 1, NULL);
-	                }
+				(void)fn_printn(ndo, tptr + 1, len - 1, NULL);
+			}
 			break;
-                    default:
-                        print_unknown_data(ndo, tptr, "\n\t  ", len);
-			break;
-                    }
-                }
-		/* avoid infinite loop */
-		if (len == 0)
+		    default:
+			print_unknown_data(ndo, tptr, "\n\t  ", len);
 			break;
+		    }
+		}
 		tptr = tptr+len;
 	}
-        if (ndo->ndo_vflag < 1)
-            ND_PRINT((ndo, ", length %u", caplen));
+	if (ndo->ndo_vflag < 1)
+	    ND_PRINT((ndo, ", length %u", caplen));
 
 	return;
 trunc:
@@ -240,7 +274,7 @@ cdp_print(netdissect_options *ndo,
 
 static int
 cdp_print_addr(netdissect_options *ndo,
-               const u_char * p, int l)
+	       const u_char * p, int l)
 {
 	int pt, pl, al, num;
 	const u_char *endp = p + l;
@@ -250,7 +284,9 @@ cdp_print_addr(netdissect_options *ndo,
 	};
 #endif
 
-	ND_TCHECK2(*p, 2);
+	ND_TCHECK2(*p, 4);
+	if (p + 4 > endp)
+		goto trunc;
 	num = EXTRACT_32BITS(p);
 	p += 4;
 
@@ -335,7 +371,7 @@ cdp_print_addr(netdissect_options *ndo,
 
 static int
 cdp_print_prefixes(netdissect_options *ndo,
-                   const u_char * p, int l)
+		   const u_char * p, int l)
 {
 	if (l % 5)
 		goto trunc;
diff --git a/contrib/tcpdump/print-cfm.c b/contrib/tcpdump/print-cfm.c
index e6aec0b91f38..a85eec09139e 100644
--- a/contrib/tcpdump/print-cfm.c
+++ b/contrib/tcpdump/print-cfm.c
@@ -227,8 +227,8 @@ static const struct tok cfm_tlv_senderid_chassisid_values[] = {
 
 static int
 cfm_mgmt_addr_print(netdissect_options *ndo,
-                    register const u_char *tptr) {
-
+                    register const u_char *tptr)
+{
     u_int mgmt_addr_type;
     u_int hexdump =  FALSE;
 
@@ -268,7 +268,8 @@ cfm_mgmt_addr_print(netdissect_options *ndo,
  * The egress-ID string is a 16-Bit string plus a MAC address.
  */
 static const char *
-cfm_egress_id_string(netdissect_options *ndo, register const u_char *tptr) {
+cfm_egress_id_string(netdissect_options *ndo, register const u_char *tptr)
+{
     static char egress_id_buffer[80];
 
     snprintf(egress_id_buffer, sizeof(egress_id_buffer),
@@ -281,8 +282,8 @@ cfm_egress_id_string(netdissect_options *ndo, register const u_char *tptr) {
 
 void
 cfm_print(netdissect_options *ndo,
-          register const u_char *pptr, register u_int length) {
-
+          register const u_char *pptr, register u_int length)
+{
     const struct cfm_common_header_t *cfm_common_header;
     const struct cfm_tlv_header_t *cfm_tlv_header;
     const uint8_t *tptr, *tlv_ptr, *ma_name, *ma_nameformat, *ma_namelength;
diff --git a/contrib/tcpdump/print-chdlc.c b/contrib/tcpdump/print-chdlc.c
index c1f3d3464828..3951ef77cdff 100644
--- a/contrib/tcpdump/print-chdlc.c
+++ b/contrib/tcpdump/print-chdlc.c
@@ -56,7 +56,8 @@ chdlc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, register co
 }
 
 u_int
-chdlc_print(netdissect_options *ndo, register const u_char *p, u_int length) {
+chdlc_print(netdissect_options *ndo, register const u_char *p, u_int length)
+{
 	u_int proto;
 
 	proto = EXTRACT_16BITS(&p[2]);
@@ -75,11 +76,9 @@ chdlc_print(netdissect_options *ndo, register const u_char *p, u_int length) {
 	case ETHERTYPE_IP:
 		ip_print(ndo, p, length);
 		break;
-#ifdef INET6
 	case ETHERTYPE_IPV6:
 		ip6_print(ndo, p, length);
 		break;
-#endif
 	case CHDLC_TYPE_SLARP:
 		chdlc_slarp_print(ndo, p, length);
 		break;
diff --git a/contrib/tcpdump/print-cnfp.c b/contrib/tcpdump/print-cnfp.c
index 07c940cbc242..d80d7fd27442 100644
--- a/contrib/tcpdump/print-cnfp.c
+++ b/contrib/tcpdump/print-cnfp.c
@@ -30,7 +30,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* Cisco NetFlow protocol */
+/*
+ * Cisco NetFlow protocol
+ *
+ * See
+ *
+ *    http://www.cisco.com/c/en/us/td/docs/net_mgmt/netflow_collection_engine/3-6/user/guide/format.html#wp1005892
+ */
 
 #define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
@@ -49,8 +55,73 @@
 #include "tcp.h"
 #include "ipproto.h"
 
-struct nfhdr {
-	uint32_t	ver_cnt;	/* version [15], and # of records */
+struct nfhdr_v1 {
+	uint16_t	version;	/* version number */
+	uint16_t	count;		/* # of records */
+	uint32_t	msys_uptime;
+	uint32_t	utc_sec;
+	uint32_t	utc_nsec;
+};
+
+struct nfrec_v1 {
+	struct in_addr	src_ina;
+	struct in_addr	dst_ina;
+	struct in_addr	nhop_ina;
+	uint16_t	input;		/* SNMP index of input interface */
+	uint16_t	output;		/* SNMP index of output interface */
+	uint32_t	packets;	/* packets in the flow */
+	uint32_t	octets;		/* layer 3 octets in the packets of the flow */
+	uint32_t	start_time;	/* sys_uptime value at start of flow */
+	uint32_t	last_time;	/* sys_uptime value when last packet of flow was received */
+	uint16_t	srcport;	/* TCP/UDP source port or equivalent */
+	uint16_t	dstport;	/* TCP/UDP source port or equivalent */
+	uint16_t	pad1;		/* pad */
+	uint8_t		proto;		/* IP protocol type */
+	uint8_t		tos;		/* IP type of service */
+	uint8_t		tcp_flags;	/* cumulative OR of TCP flags */
+	uint8_t		pad[3];		/* padding */
+	uint32_t	reserved;	/* unused */
+};
+
+struct nfhdr_v5 {
+	uint16_t	version;	/* version number */
+	uint16_t	count;		/* # of records */
+	uint32_t	msys_uptime;
+	uint32_t	utc_sec;
+	uint32_t	utc_nsec;
+	uint32_t	sequence;	/* flow sequence number */
+	uint8_t		engine_type;	/* type of flow-switching engine */
+	uint8_t		engine_id;	/* slot number of the flow-switching engine */
+	uint16_t	sampling_interval; /* sampling mode and interval */
+};
+
+struct nfrec_v5 {
+	struct in_addr	src_ina;
+	struct in_addr	dst_ina;
+	struct in_addr	nhop_ina;
+	uint16_t	input;		/* SNMP index of input interface */
+	uint16_t	output;		/* SNMP index of output interface */
+	uint32_t	packets;	/* packets in the flow */
+	uint32_t	octets;		/* layer 3 octets in the packets of the flow */
+	uint32_t	start_time;	/* sys_uptime value at start of flow */
+	uint32_t	last_time;	/* sys_uptime value when last packet of flow was received */
+	uint16_t	srcport;	/* TCP/UDP source port or equivalent */
+	uint16_t	dstport;	/* TCP/UDP source port or equivalent */
+	uint8_t		pad1;		/* pad */
+	uint8_t		tcp_flags;	/* cumulative OR of TCP flags */
+	uint8_t		proto;		/* IP protocol type */
+	uint8_t		tos;		/* IP type of service */
+	uint16_t	src_as;		/* AS number of the source */
+	uint16_t	dst_as;		/* AS number of the destination */
+	uint8_t		src_mask;	/* source address mask bits */
+	uint8_t		dst_mask;	/* destination address prefix mask bits */
+	uint16_t	pad2;
+	struct in_addr	peer_nexthop;	/* v6: IP address of the nexthop within the peer (FIB)*/
+};
+
+struct nfhdr_v6 {
+	uint16_t	version;	/* version number */
+	uint16_t	count;		/* # of records */
 	uint32_t	msys_uptime;
 	uint32_t	utc_sec;
 	uint32_t	utc_nsec;
@@ -58,41 +129,46 @@ struct nfhdr {
 	uint32_t	reserved;	/* v5 only */
 };
 
-struct nfrec {
+struct nfrec_v6 {
 	struct in_addr	src_ina;
 	struct in_addr	dst_ina;
 	struct in_addr	nhop_ina;
-	uint32_t	ifaces;		/* src,dst ifaces */
-	uint32_t	packets;
-	uint32_t	octets;
-	uint32_t	start_time;	/* sys_uptime value */
-	uint32_t	last_time;	/* sys_uptime value */
-	uint32_t	ports;		/* src,dst ports */
-	uint32_t	proto_tos;	/* proto, tos, pad, flags(v5) */
-	uint32_t	asses;		/* v1: flags; v5: src,dst AS */
-	uint32_t	masks;		/* src,dst addr prefix; v6: encaps */
+	uint16_t	input;		/* SNMP index of input interface */
+	uint16_t	output;		/* SNMP index of output interface */
+	uint32_t	packets;	/* packets in the flow */
+	uint32_t	octets;		/* layer 3 octets in the packets of the flow */
+	uint32_t	start_time;	/* sys_uptime value at start of flow */
+	uint32_t	last_time;	/* sys_uptime value when last packet of flow was received */
+	uint16_t	srcport;	/* TCP/UDP source port or equivalent */
+	uint16_t	dstport;	/* TCP/UDP source port or equivalent */
+	uint8_t		pad1;		/* pad */
+	uint8_t		tcp_flags;	/* cumulative OR of TCP flags */
+	uint8_t		proto;		/* IP protocol type */
+	uint8_t		tos;		/* IP type of service */
+	uint16_t	src_as;		/* AS number of the source */
+	uint16_t	dst_as;		/* AS number of the destination */
+	uint8_t		src_mask;	/* source address mask bits */
+	uint8_t		dst_mask;	/* destination address prefix mask bits */
+	uint16_t	flags;
 	struct in_addr	peer_nexthop;	/* v6: IP address of the nexthop within the peer (FIB)*/
 };
 
-void
-cnfp_print(netdissect_options *ndo,
-           const u_char *cp, const u_char *bp _U_)
+static void
+cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
 {
-	register const struct nfhdr *nh;
-	register const struct nfrec *nr;
+	register const struct nfhdr_v1 *nh;
+	register const struct nfrec_v1 *nr;
 	struct protoent *pent;
 	int nrecs, ver;
 #if 0
 	time_t t;
 #endif
 
-	nh = (const struct nfhdr *)cp;
+	nh = (const struct nfhdr_v1 *)cp;
+	ND_TCHECK(*nh);
 
-	if ((const u_char *)(nh + 1) > ndo->ndo_snapend)
-		return;
-
-	nrecs = EXTRACT_32BITS(&nh->ver_cnt) & 0xffff;
-	ver = (EXTRACT_32BITS(&nh->ver_cnt) & 0xffff0000) >> 16;
+	ver = EXTRACT_16BITS(&nh->version);
+	nrecs = EXTRACT_32BITS(&nh->count);
 #if 0
 	/*
 	 * This is seconds since the UN*X epoch, and is followed by
@@ -107,21 +183,18 @@ cnfp_print(netdissect_options *ndo,
 	       EXTRACT_32BITS(&nh->msys_uptime)%1000,
 	       EXTRACT_32BITS(&nh->utc_sec), EXTRACT_32BITS(&nh->utc_nsec)));
 
-	if (ver == 5 || ver == 6) {
-		ND_PRINT((ndo, "#%u, ", EXTRACT_32BITS(&nh->sequence)));
-		nr = (const struct nfrec *)&nh[1];
-		ndo->ndo_snaplen -= 24;
-	} else {
-		nr = (const struct nfrec *)&nh->sequence;
-		ndo->ndo_snaplen -= 16;
-	}
+	nr = (const struct nfrec_v1 *)&nh[1];
 
 	ND_PRINT((ndo, "%2u recs", nrecs));
 
-	for (; nrecs-- && (const u_char *)(nr + 1) <= ndo->ndo_snapend; nr++) {
+	for (; nrecs != 0; nr++, nrecs--) {
 		char buf[20];
 		char asbuf[20];
 
+		/*
+		 * Make sure we have the entire record.
+		 */
+		ND_TCHECK(*nr);
 		ND_PRINT((ndo, "\n  started %u.%03u, last %u.%03u",
 		       EXTRACT_32BITS(&nr->start_time)/1000,
 		       EXTRACT_32BITS(&nr->start_time)%1000,
@@ -129,40 +202,24 @@ cnfp_print(netdissect_options *ndo,
 		       EXTRACT_32BITS(&nr->last_time)%1000));
 
 		asbuf[0] = buf[0] = '\0';
-		if (ver == 5 || ver == 6) {
-			snprintf(buf, sizeof(buf), "/%u",
-				 (EXTRACT_32BITS(&nr->masks) >> 24) & 0xff);
-			snprintf(asbuf, sizeof(asbuf), ":%u",
-				 (EXTRACT_32BITS(&nr->asses) >> 16) & 0xffff);
-		}
 		ND_PRINT((ndo, "\n    %s%s%s:%u ", intoa(nr->src_ina.s_addr), buf, asbuf,
-			EXTRACT_32BITS(&nr->ports) >> 16));
+			EXTRACT_16BITS(&nr->srcport)));
 
-		if (ver == 5 || ver ==6) {
-			snprintf(buf, sizeof(buf), "/%d",
-				 (EXTRACT_32BITS(&nr->masks) >> 16) & 0xff);
-			snprintf(asbuf, sizeof(asbuf), ":%u",
-				 EXTRACT_32BITS(&nr->asses) & 0xffff);
-		}
 		ND_PRINT((ndo, "> %s%s%s:%u ", intoa(nr->dst_ina.s_addr), buf, asbuf,
-			EXTRACT_32BITS(&nr->ports) & 0xffff));
+			EXTRACT_16BITS(&nr->dstport)));
 
 		ND_PRINT((ndo, ">> %s\n    ", intoa(nr->nhop_ina.s_addr)));
 
-		pent = getprotobynumber((EXTRACT_32BITS(&nr->proto_tos) >> 8) & 0xff);
+		pent = getprotobynumber(nr->proto);
 		if (!pent || ndo->ndo_nflag)
-			ND_PRINT((ndo, "%u ",
-			       (EXTRACT_32BITS(&nr->proto_tos) >> 8) & 0xff));
+			ND_PRINT((ndo, "%u ", nr->proto));
 		else
 			ND_PRINT((ndo, "%s ", pent->p_name));
 
 		/* tcp flags for tcp only */
 		if (pent && pent->p_proto == IPPROTO_TCP) {
 			int flags;
-			if (ver == 1)
-				flags = (EXTRACT_32BITS(&nr->asses) >> 24) & 0xff;
-			else
-				flags = (EXTRACT_32BITS(&nr->proto_tos) >> 16) & 0xff;
+			flags = nr->tcp_flags;
 			ND_PRINT((ndo, "%s%s%s%s%s%s%s",
 				flags & TH_FIN  ? "F" : "",
 				flags & TH_SYN  ? "S" : "",
@@ -174,14 +231,246 @@ cnfp_print(netdissect_options *ndo,
 		}
 
 		buf[0]='\0';
-		if (ver == 6) {
-			snprintf(buf, sizeof(buf), "(%u<>%u encaps)",
-				 (EXTRACT_32BITS(&nr->masks) >> 8) & 0xff,
-				 (EXTRACT_32BITS(&nr->masks)) & 0xff);
-		}
 		ND_PRINT((ndo, "tos %u, %u (%u octets) %s",
-		       EXTRACT_32BITS(&nr->proto_tos) & 0xff,
+		       nr->tos,
 		       EXTRACT_32BITS(&nr->packets),
 		       EXTRACT_32BITS(&nr->octets), buf));
 	}
+	return;
+
+trunc:
+	ND_PRINT((ndo, "[|cnfp]"));
+	return;
+}
+
+static void
+cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
+{
+	register const struct nfhdr_v5 *nh;
+	register const struct nfrec_v5 *nr;
+	struct protoent *pent;
+	int nrecs, ver;
+#if 0
+	time_t t;
+#endif
+
+	nh = (const struct nfhdr_v5 *)cp;
+	ND_TCHECK(*nh);
+
+	ver = EXTRACT_16BITS(&nh->version);
+	nrecs = EXTRACT_32BITS(&nh->count);
+#if 0
+	/*
+	 * This is seconds since the UN*X epoch, and is followed by
+	 * nanoseconds.  XXX - format it, rather than just dumping the
+	 * raw seconds-since-the-Epoch.
+	 */
+	t = EXTRACT_32BITS(&nh->utc_sec);
+#endif
+
+	ND_PRINT((ndo, "NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
+	       EXTRACT_32BITS(&nh->msys_uptime)/1000,
+	       EXTRACT_32BITS(&nh->msys_uptime)%1000,
+	       EXTRACT_32BITS(&nh->utc_sec), EXTRACT_32BITS(&nh->utc_nsec)));
+
+	ND_PRINT((ndo, "#%u, ", EXTRACT_32BITS(&nh->sequence)));
+	nr = (const struct nfrec_v5 *)&nh[1];
+
+	ND_PRINT((ndo, "%2u recs", nrecs));
+
+	for (; nrecs != 0; nr++, nrecs--) {
+		char buf[20];
+		char asbuf[20];
+
+		/*
+		 * Make sure we have the entire record.
+		 */
+		ND_TCHECK(*nr);
+		ND_PRINT((ndo, "\n  started %u.%03u, last %u.%03u",
+		       EXTRACT_32BITS(&nr->start_time)/1000,
+		       EXTRACT_32BITS(&nr->start_time)%1000,
+		       EXTRACT_32BITS(&nr->last_time)/1000,
+		       EXTRACT_32BITS(&nr->last_time)%1000));
+
+		asbuf[0] = buf[0] = '\0';
+		snprintf(buf, sizeof(buf), "/%u", nr->src_mask);
+		snprintf(asbuf, sizeof(asbuf), ":%u",
+			EXTRACT_16BITS(&nr->src_as));
+		ND_PRINT((ndo, "\n    %s%s%s:%u ", intoa(nr->src_ina.s_addr), buf, asbuf,
+			EXTRACT_16BITS(&nr->srcport)));
+
+		snprintf(buf, sizeof(buf), "/%d", nr->dst_mask);
+		snprintf(asbuf, sizeof(asbuf), ":%u",
+			 EXTRACT_16BITS(&nr->dst_as));
+		ND_PRINT((ndo, "> %s%s%s:%u ", intoa(nr->dst_ina.s_addr), buf, asbuf,
+			EXTRACT_16BITS(&nr->dstport)));
+
+		ND_PRINT((ndo, ">> %s\n    ", intoa(nr->nhop_ina.s_addr)));
+
+		pent = getprotobynumber(nr->proto);
+		if (!pent || ndo->ndo_nflag)
+			ND_PRINT((ndo, "%u ", nr->proto));
+		else
+			ND_PRINT((ndo, "%s ", pent->p_name));
+
+		/* tcp flags for tcp only */
+		if (pent && pent->p_proto == IPPROTO_TCP) {
+			int flags;
+			flags = nr->tcp_flags;
+			ND_PRINT((ndo, "%s%s%s%s%s%s%s",
+				flags & TH_FIN  ? "F" : "",
+				flags & TH_SYN  ? "S" : "",
+				flags & TH_RST  ? "R" : "",
+				flags & TH_PUSH ? "P" : "",
+				flags & TH_ACK  ? "A" : "",
+				flags & TH_URG  ? "U" : "",
+				flags           ? " " : ""));
+		}
+
+		buf[0]='\0';
+		ND_PRINT((ndo, "tos %u, %u (%u octets) %s",
+		       nr->tos,
+		       EXTRACT_32BITS(&nr->packets),
+		       EXTRACT_32BITS(&nr->octets), buf));
+	}
+	return;
+
+trunc:
+	ND_PRINT((ndo, "[|cnfp]"));
+	return;
+}
+
+static void
+cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
+{
+	register const struct nfhdr_v6 *nh;
+	register const struct nfrec_v6 *nr;
+	struct protoent *pent;
+	int nrecs, ver;
+#if 0
+	time_t t;
+#endif
+
+	nh = (const struct nfhdr_v6 *)cp;
+	ND_TCHECK(*nh);
+
+	ver = EXTRACT_16BITS(&nh->version);
+	nrecs = EXTRACT_32BITS(&nh->count);
+#if 0
+	/*
+	 * This is seconds since the UN*X epoch, and is followed by
+	 * nanoseconds.  XXX - format it, rather than just dumping the
+	 * raw seconds-since-the-Epoch.
+	 */
+	t = EXTRACT_32BITS(&nh->utc_sec);
+#endif
+
+	ND_PRINT((ndo, "NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
+	       EXTRACT_32BITS(&nh->msys_uptime)/1000,
+	       EXTRACT_32BITS(&nh->msys_uptime)%1000,
+	       EXTRACT_32BITS(&nh->utc_sec), EXTRACT_32BITS(&nh->utc_nsec)));
+
+	ND_PRINT((ndo, "#%u, ", EXTRACT_32BITS(&nh->sequence)));
+	nr = (const struct nfrec_v6 *)&nh[1];
+
+	ND_PRINT((ndo, "%2u recs", nrecs));
+
+	for (; nrecs != 0; nr++, nrecs--) {
+		char buf[20];
+		char asbuf[20];
+
+		/*
+		 * Make sure we have the entire record.
+		 */
+		ND_TCHECK(*nr);
+		ND_PRINT((ndo, "\n  started %u.%03u, last %u.%03u",
+		       EXTRACT_32BITS(&nr->start_time)/1000,
+		       EXTRACT_32BITS(&nr->start_time)%1000,
+		       EXTRACT_32BITS(&nr->last_time)/1000,
+		       EXTRACT_32BITS(&nr->last_time)%1000));
+
+		asbuf[0] = buf[0] = '\0';
+		snprintf(buf, sizeof(buf), "/%u", nr->src_mask);
+		snprintf(asbuf, sizeof(asbuf), ":%u",
+			EXTRACT_16BITS(&nr->src_as));
+		ND_PRINT((ndo, "\n    %s%s%s:%u ", intoa(nr->src_ina.s_addr), buf, asbuf,
+			EXTRACT_16BITS(&nr->srcport)));
+
+		snprintf(buf, sizeof(buf), "/%d", nr->dst_mask);
+		snprintf(asbuf, sizeof(asbuf), ":%u",
+			 EXTRACT_16BITS(&nr->dst_as));
+		ND_PRINT((ndo, "> %s%s%s:%u ", intoa(nr->dst_ina.s_addr), buf, asbuf,
+			EXTRACT_16BITS(&nr->dstport)));
+
+		ND_PRINT((ndo, ">> %s\n    ", intoa(nr->nhop_ina.s_addr)));
+
+		pent = getprotobynumber(nr->proto);
+		if (!pent || ndo->ndo_nflag)
+			ND_PRINT((ndo, "%u ", nr->proto));
+		else
+			ND_PRINT((ndo, "%s ", pent->p_name));
+
+		/* tcp flags for tcp only */
+		if (pent && pent->p_proto == IPPROTO_TCP) {
+			int flags;
+			flags = nr->tcp_flags;
+			ND_PRINT((ndo, "%s%s%s%s%s%s%s",
+				flags & TH_FIN  ? "F" : "",
+				flags & TH_SYN  ? "S" : "",
+				flags & TH_RST  ? "R" : "",
+				flags & TH_PUSH ? "P" : "",
+				flags & TH_ACK  ? "A" : "",
+				flags & TH_URG  ? "U" : "",
+				flags           ? " " : ""));
+		}
+
+		buf[0]='\0';
+		snprintf(buf, sizeof(buf), "(%u<>%u encaps)",
+			 (EXTRACT_16BITS(&nr->flags) >> 8) & 0xff,
+			 (EXTRACT_16BITS(&nr->flags)) & 0xff);
+		ND_PRINT((ndo, "tos %u, %u (%u octets) %s",
+		       nr->tos,
+		       EXTRACT_32BITS(&nr->packets),
+		       EXTRACT_32BITS(&nr->octets), buf));
+	}
+	return;
+
+trunc:
+	ND_PRINT((ndo, "[|cnfp]"));
+	return;
+}
+
+void
+cnfp_print(netdissect_options *ndo, const u_char *cp)
+{
+	int ver;
+
+	/*
+	 * First 2 bytes are the version number.
+	 */
+	ND_TCHECK2(*cp, 2);
+	ver = EXTRACT_16BITS(cp);
+	switch (ver) {
+
+	case 1:
+		cnfp_v1_print(ndo, cp);
+		break;
+
+	case 5:
+		cnfp_v5_print(ndo, cp);
+		break;
+
+	case 6:
+		cnfp_v6_print(ndo, cp);
+		break;
+
+	default:
+		ND_PRINT((ndo, "NetFlow v%x", ver));
+		break;
+	}
+	return;
+
+trunc:
+	ND_PRINT((ndo, "[|cnfp]"));
+	return;
 }
diff --git a/contrib/tcpdump/print-dccp.c b/contrib/tcpdump/print-dccp.c
index 34d78c3173b3..45468b555473 100644
--- a/contrib/tcpdump/print-dccp.c
+++ b/contrib/tcpdump/print-dccp.c
@@ -26,6 +26,8 @@
 #endif
 #include "ipproto.h"
 
+/* RFC4340: Datagram Congestion Control Protocol (DCCP) */
+
 /**
  * struct dccp_hdr - generic part of DCCP packet header, with a 24-bit
  * sequence number
@@ -123,8 +125,21 @@ enum dccp_pkt_type {
 	DCCP_PKT_CLOSE,
 	DCCP_PKT_RESET,
 	DCCP_PKT_SYNC,
-	DCCP_PKT_SYNCACK,
-	DCCP_PKT_INVALID
+	DCCP_PKT_SYNCACK
+};
+
+static const struct tok dccp_pkt_type_str[] = {
+	{ DCCP_PKT_REQUEST, "DCCP-Request" },
+	{ DCCP_PKT_RESPONSE, "DCCP-Response" },
+	{ DCCP_PKT_DATA, "DCCP-Data" },
+	{ DCCP_PKT_ACK, "DCCP-Ack" },
+	{ DCCP_PKT_DATAACK, "DCCP-DataAck" },
+	{ DCCP_PKT_CLOSEREQ, "DCCP-CloseReq" },
+	{ DCCP_PKT_CLOSE, "DCCP-Close" },
+	{ DCCP_PKT_RESET, "DCCP-Reset" },
+	{ DCCP_PKT_SYNC, "DCCP-Sync" },
+	{ DCCP_PKT_SYNCACK, "DCCP-SyncAck" },
+	{ 0, NULL}
 };
 
 enum dccp_reset_codes {
@@ -253,7 +268,7 @@ static int dccp_print_option(netdissect_options *, const u_char *, u_int);
  * @len - lenght of ip packet
  */
 void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
-                u_int len)
+		u_int len)
 {
 	const struct dccp_hdr *dh;
 	const struct ip *ip;
@@ -264,6 +279,7 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 	u_short sport, dport;
 	u_int hlen;
 	u_int fixed_hdrlen;
+	uint8_t	dccph_type;
 
 	dh = (const struct dccp_hdr *)bp;
 
@@ -283,7 +299,7 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 	}
 	if (len < sizeof(struct dccp_hdr)) {
 		ND_PRINT((ndo, "truncated-dccp - %u bytes missing!",
-			     len - (u_int)sizeof(struct dccp_hdr)));
+			  len - (u_int)sizeof(struct dccp_hdr)));
 		return;
 	}
 
@@ -291,7 +307,7 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 	fixed_hdrlen = dccp_basic_hdr_len(dh);
 	if (len < fixed_hdrlen) {
 		ND_PRINT((ndo, "truncated-dccp - %u bytes missing!",
-			     len - fixed_hdrlen));
+			  len - fixed_hdrlen));
 		return;
 	}
 	ND_TCHECK2(*dh, fixed_hdrlen);
@@ -303,28 +319,30 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 #ifdef INET6
 	if (ip6) {
 		ND_PRINT((ndo, "%s.%d > %s.%d: ",
-			     ip6addr_string(ndo, &ip6->ip6_src), sport,
-			     ip6addr_string(ndo, &ip6->ip6_dst), dport));
+			  ip6addr_string(ndo, &ip6->ip6_src), sport,
+			  ip6addr_string(ndo, &ip6->ip6_dst), dport));
 	} else
 #endif /*INET6*/
 	{
 		ND_PRINT((ndo, "%s.%d > %s.%d: ",
-			     ipaddr_string(ndo, &ip->ip_src), sport,
-			     ipaddr_string(ndo, &ip->ip_dst), dport));
+			  ipaddr_string(ndo, &ip->ip_src), sport,
+			  ipaddr_string(ndo, &ip->ip_dst), dport));
 	}
 
+	ND_PRINT((ndo, "DCCP"));
+
 	if (ndo->ndo_qflag) {
 		ND_PRINT((ndo, " %d", len - hlen));
 		if (hlen > len) {
-			ND_PRINT((ndo, "dccp [bad hdr length %u - too long, > %u]",
-			    hlen, len));
+			ND_PRINT((ndo, " [bad hdr length %u - too long, > %u]",
+				  hlen, len));
 		}
 		return;
 	}
 
 	/* other variables in generic header */
 	if (ndo->ndo_vflag) {
-		ND_PRINT((ndo, "CCVal %d, CsCov %d, ", DCCPH_CCVAL(dh), DCCPH_CSCOV(dh)));
+		ND_PRINT((ndo, " (CCVal %d, CsCov %d, ", DCCPH_CCVAL(dh), DCCPH_CSCOV(dh)));
 	}
 
 	/* checksum calculation */
@@ -340,24 +358,31 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 			sum = dccp6_cksum(ip6, dh, len);
 #endif
 		if (sum != 0)
-			ND_PRINT((ndo, "(incorrect -> 0x%04x), ",in_cksum_shouldbe(dccp_sum, sum)));
+			ND_PRINT((ndo, "(incorrect -> 0x%04x)",in_cksum_shouldbe(dccp_sum, sum)));
 		else
-			ND_PRINT((ndo, "(correct), "));
+			ND_PRINT((ndo, "(correct)"));
 	}
 
-	switch (DCCPH_TYPE(dh)) {
+	if (ndo->ndo_vflag)
+		ND_PRINT((ndo, ")"));
+	ND_PRINT((ndo, " "));
+
+	dccph_type = DCCPH_TYPE(dh);
+	switch (dccph_type) {
 	case DCCP_PKT_REQUEST: {
 		struct dccp_hdr_request *dhr =
 			(struct dccp_hdr_request *)(bp + fixed_hdrlen);
 		fixed_hdrlen += 4;
 		if (len < fixed_hdrlen) {
-			ND_PRINT((ndo, "truncated-dccp request - %u bytes missing!",
-				     len - fixed_hdrlen));
+			ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+				  tok2str(dccp_pkt_type_str, "", dccph_type),
+				  len - fixed_hdrlen));
 			return;
 		}
 		ND_TCHECK(*dhr);
-		ND_PRINT((ndo, "request (service=%d) ",
-			     EXTRACT_32BITS(&dhr->dccph_req_service)));
+		ND_PRINT((ndo, "%s (service=%d) ",
+			  tok2str(dccp_pkt_type_str, "", dccph_type),
+			  EXTRACT_32BITS(&dhr->dccph_req_service)));
 		break;
 	}
 	case DCCP_PKT_RESPONSE: {
@@ -365,90 +390,100 @@ void dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 			(struct dccp_hdr_response *)(bp + fixed_hdrlen);
 		fixed_hdrlen += 12;
 		if (len < fixed_hdrlen) {
-			ND_PRINT((ndo, "truncated-dccp response - %u bytes missing!",
-				     len - fixed_hdrlen));
+			ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+				  tok2str(dccp_pkt_type_str, "", dccph_type),
+				  len - fixed_hdrlen));
 			return;
 		}
 		ND_TCHECK(*dhr);
-		ND_PRINT((ndo, "response (service=%d) ",
-			     EXTRACT_32BITS(&dhr->dccph_resp_service)));
+		ND_PRINT((ndo, "%s (service=%d) ",
+			  tok2str(dccp_pkt_type_str, "", dccph_type),
+			  EXTRACT_32BITS(&dhr->dccph_resp_service)));
 		break;
 	}
 	case DCCP_PKT_DATA:
-		ND_PRINT((ndo, "data "));
+		ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
 		break;
 	case DCCP_PKT_ACK: {
 		fixed_hdrlen += 8;
 		if (len < fixed_hdrlen) {
-			ND_PRINT((ndo, "truncated-dccp ack - %u bytes missing!",
-				     len - fixed_hdrlen));
+			ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+				  tok2str(dccp_pkt_type_str, "", dccph_type),
+				  len - fixed_hdrlen));
 			return;
 		}
-		ND_PRINT((ndo, "ack "));
+		ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
 		break;
 	}
 	case DCCP_PKT_DATAACK: {
 		fixed_hdrlen += 8;
 		if (len < fixed_hdrlen) {
-			ND_PRINT((ndo, "truncated-dccp dataack - %u bytes missing!",
-				     len - fixed_hdrlen));
+			ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+				  tok2str(dccp_pkt_type_str, "", dccph_type),
+				  len - fixed_hdrlen));
 			return;
 		}
-		ND_PRINT((ndo, "dataack "));
+		ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
 		break;
 	}
 	case DCCP_PKT_CLOSEREQ:
 		fixed_hdrlen += 8;
 		if (len < fixed_hdrlen) {
-			ND_PRINT((ndo, "truncated-dccp closereq - %u bytes missing!",
-				     len - fixed_hdrlen));
+			ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+				  tok2str(dccp_pkt_type_str, "", dccph_type),
+				  len - fixed_hdrlen));
 			return;
 		}
-		ND_PRINT((ndo, "closereq "));
+		ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
 		break;
 	case DCCP_PKT_CLOSE:
 		fixed_hdrlen += 8;
 		if (len < fixed_hdrlen) {
-			ND_PRINT((ndo, "truncated-dccp close - %u bytes missing!",
-				     len - fixed_hdrlen));
+			ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+				  tok2str(dccp_pkt_type_str, "", dccph_type),
+				  len - fixed_hdrlen));
 			return;
 		}
-		ND_PRINT((ndo, "close "));
+		ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
 		break;
 	case DCCP_PKT_RESET: {
 		struct dccp_hdr_reset *dhr =
 			(struct dccp_hdr_reset *)(bp + fixed_hdrlen);
 		fixed_hdrlen += 12;
 		if (len < fixed_hdrlen) {
-			ND_PRINT((ndo, "truncated-dccp reset - %u bytes missing!",
-				     len - fixed_hdrlen));
+			ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+				  tok2str(dccp_pkt_type_str, "", dccph_type),
+				  len - fixed_hdrlen));
 			return;
 		}
 		ND_TCHECK(*dhr);
-		ND_PRINT((ndo, "reset (code=%s) ",
-			     dccp_reset_code(dhr->dccph_reset_code)));
+		ND_PRINT((ndo, "%s (code=%s) ",
+			  tok2str(dccp_pkt_type_str, "", dccph_type),
+			  dccp_reset_code(dhr->dccph_reset_code)));
 		break;
 	}
 	case DCCP_PKT_SYNC:
 		fixed_hdrlen += 8;
 		if (len < fixed_hdrlen) {
-			ND_PRINT((ndo, "truncated-dccp sync - %u bytes missing!",
-				     len - fixed_hdrlen));
+			ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+				  tok2str(dccp_pkt_type_str, "", dccph_type),
+				  len - fixed_hdrlen));
 			return;
 		}
-		ND_PRINT((ndo, "sync "));
+		ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
 		break;
 	case DCCP_PKT_SYNCACK:
 		fixed_hdrlen += 8;
 		if (len < fixed_hdrlen) {
-			ND_PRINT((ndo, "truncated-dccp syncack - %u bytes missing!",
-				     len - fixed_hdrlen));
+			ND_PRINT((ndo, "truncated-%s - %u bytes missing!",
+				  tok2str(dccp_pkt_type_str, "", dccph_type),
+				  len - fixed_hdrlen));
 			return;
 		}
-		ND_PRINT((ndo, "syncack "));
+		ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "", dccph_type)));
 		break;
 	default:
-		ND_PRINT((ndo, "invalid "));
+		ND_PRINT((ndo, "%s ", tok2str(dccp_pkt_type_str, "unknown-type-%u", dccph_type)));
 		break;
 	}
 
@@ -504,7 +539,7 @@ static const struct tok dccp_option_values[] = {
 	{ 42, "timestamp_echo" },
 	{ 43, "elapsed_time" },
 	{ 44, "data_checksum" },
-        { 0, NULL }
+	{ 0, NULL }
 };
 
 static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_int hlen)
@@ -521,7 +556,7 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
 				ND_PRINT((ndo, "CCID option %u optlen too short", *option));
 			else
 				ND_PRINT((ndo, "%s optlen too short",
-				    tok2str(dccp_option_values, "Option %u", *option)));
+					  tok2str(dccp_option_values, "Option %u", *option)));
 			return 0;
 		}
 	} else
@@ -530,10 +565,10 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
 	if (hlen < optlen) {
 		if (*option >= 128)
 			ND_PRINT((ndo, "CCID option %u optlen goes past header length",
-			    *option));
+				  *option));
 		else
 			ND_PRINT((ndo, "%s optlen goes past header length",
-			    tok2str(dccp_option_values, "Option %u", *option)));
+				  tok2str(dccp_option_values, "Option %u", *option)));
 		return 0;
 	}
 	ND_TCHECK2(*option, optlen);
diff --git a/contrib/tcpdump/print-decnet.c b/contrib/tcpdump/print-decnet.c
index 18045150c2d4..5414ec20b5cd 100644
--- a/contrib/tcpdump/print-decnet.c
+++ b/contrib/tcpdump/print-decnet.c
@@ -271,7 +271,7 @@ union controlmsg
 /* Macros for decoding routing-info fields */
 #define	RI_COST(x)	((x)&0777)
 #define	RI_HOPS(x)	(((x)>>10)&037)
-
+
 /*
  * NSP protocol fields and values.
  */
@@ -1315,10 +1315,15 @@ dnname_string(u_short dnaddr)
 {
 #ifdef HAVE_DNET_HTOA
 	struct dn_naddr dna;
+	char *dnname;
 
 	dna.a_len = sizeof(short);
 	memcpy((char *)dna.a_addr, (char *)&dnaddr, sizeof(short));
-	return (strdup(dnet_htoa(&dna)));
+	dnname = dnet_htoa(&dna);
+	if(dnname != NULL)
+		return (strdup(dnname));
+	else
+		return(dnnum_string(dnaddr));
 #else
 	return(dnnum_string(dnaddr));	/* punt */
 #endif
diff --git a/contrib/tcpdump/print-eigrp.c b/contrib/tcpdump/print-eigrp.c
index a3feb8ef4a7c..cab77ba509aa 100644
--- a/contrib/tcpdump/print-eigrp.c
+++ b/contrib/tcpdump/print-eigrp.c
@@ -205,8 +205,8 @@ static const struct tok eigrp_ext_proto_id_values[] = {
 };
 
 void
-eigrp_print(netdissect_options *ndo, register const u_char *pptr, register u_int len) {
-
+eigrp_print(netdissect_options *ndo, register const u_char *pptr, register u_int len)
+{
     const struct eigrp_common_header *eigrp_com_header;
     const struct eigrp_tlv_header *eigrp_tlv_header;
     const u_char *tptr,*tlv_tptr;
diff --git a/contrib/tcpdump/print-enc.c b/contrib/tcpdump/print-enc.c
index 89daae1bb4a3..7bd8631e5207 100644
--- a/contrib/tcpdump/print-enc.c
+++ b/contrib/tcpdump/print-enc.c
@@ -117,11 +117,11 @@ enc_if_print(netdissect_options *ndo,
 	case AF_INET:
 		ip_print(ndo, p, length);
 		break;
-#ifdef INET6
+#ifdef AF_INET6
 	case AF_INET6:
 		ip6_print(ndo, p, length);
 		break;
-#endif /*INET6*/
+#endif
 	}
 
 out:
diff --git a/contrib/tcpdump/print-ether.c b/contrib/tcpdump/print-ether.c
index 8258cf1154d2..b96620f69e7a 100644
--- a/contrib/tcpdump/print-ether.c
+++ b/contrib/tcpdump/print-ether.c
@@ -187,10 +187,7 @@ ether_print(netdissect_options *ndo,
 	        if (ndo->ndo_eflag) {
 	        	uint16_t tag = EXTRACT_16BITS(p);
 
-			ND_PRINT((ndo, "vlan %u, p %u%s, ",
-			    tag & 0xfff,
-			    tag >> 13,
-			    (tag & 0x1000) ? ", CFI" : ""));
+			ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag)));
 		}
 
 		ether_type = EXTRACT_16BITS(p + 2);
@@ -328,11 +325,9 @@ ethertype_print(netdissect_options *ndo,
 	        ip_print(ndo, p, length);
 		return (1);
 
-#ifdef INET6
 	case ETHERTYPE_IPV6:
 		ip6_print(ndo, p, length);
 		return (1);
-#endif /*INET6*/
 
 	case ETHERTYPE_ARP:
 	case ETHERTYPE_REVARP:
diff --git a/contrib/tcpdump/print-forces.c b/contrib/tcpdump/print-forces.c
index 45bd74f97009..6c02b256d71d 100644
--- a/contrib/tcpdump/print-forces.c
+++ b/contrib/tcpdump/print-forces.c
@@ -27,8 +27,8 @@
 static const char tstr[] = "[|forces]";
 
 /*
- * Per draft-ietf-forces-protocol-22
-*/
+ * RFC5810: Forwarding and Control Element Separation (ForCES) Protocol
+ */
 #define	ForCES_VERS	1
 #define	ForCES_HDRL	24
 #define	ForCES_ALNL	4U
@@ -187,26 +187,28 @@ static const struct tok ForCES_LFBs[] = {
 	{0, NULL}
 };
 
+/* this is defined in RFC5810 section A.2 */
+/*   http://www.iana.org/assignments/forces/forces.xhtml#oper-tlv-types */
 enum {
-	F_OP_RSV,
-	F_OP_SET,
-	F_OP_SETPROP,
-	F_OP_SETRESP,
-	F_OP_SETPRESP,
-	F_OP_DEL,
-	F_OP_DELRESP,
-	F_OP_GET,
-	F_OP_GETPROP,
-	F_OP_GETRESP,
-	F_OP_GETPRESP,
-	F_OP_REPORT,
-	F_OP_COMMIT,
-	F_OP_RCOMMIT,
-	F_OP_RTRCOMP,
+	F_OP_RSV        = 0,
+	F_OP_SET        = 1,
+	F_OP_SETPROP    = 2,
+	F_OP_SETRESP    = 3,
+	F_OP_SETPRESP   = 4,
+	F_OP_DEL        = 5,
+	F_OP_DELRESP    = 6,
+	F_OP_GET        = 7,
+	F_OP_GETPROP    = 8,
+	F_OP_GETRESP    = 9,
+	F_OP_GETPRESP   = 10,
+	F_OP_REPORT     = 11,
+	F_OP_COMMIT     = 12,
+	F_OP_RCOMMIT    = 13,
+	F_OP_RTRCOMP    = 14,
 	_F_OP_MAX
 };
-
 #define F_OP_MAX	(_F_OP_MAX - 1)
+
 enum {
 	B_OP_SET = 1 << (F_OP_SET - 1),
 	B_OP_SETPROP = 1 << (F_OP_SETPROP - 1),
@@ -1187,12 +1189,6 @@ otlv_print(netdissect_options *ndo,
 		ND_PRINT((ndo, "%sOper TLV %s(0x%x) length %d\n", ib, ops->s, type,
 		       EXTRACT_16BITS(&otlv->length)));
 	}
-	/* empty TLVs like COMMIT and TRCOMMIT are empty, we stop here .. */
-	if (!ops->flags & ZERO_TTLV) {
-		if (tll != 0)	/* instead of "if (tll)" - for readability .. */
-			ND_PRINT((ndo, "%s: Illegal - MUST be empty\n", ops->s));
-		return rc;
-	}
 	/* rest of ops must at least have 12B {pathinfo} */
 	if (tll < OP_MIN_SIZ) {
 		ND_PRINT((ndo, "\t\tOper TLV %s(0x%x) length %d\n", ops->s, type,
@@ -1203,7 +1199,10 @@ otlv_print(netdissect_options *ndo,
 
 	}
 
-	rc = ops->print(ndo, dp, tll, ops->op_msk, indent + 1);
+	/* XXX - do anything with ops->flags? */
+        if(ops->print) {
+                rc = ops->print(ndo, dp, tll, ops->op_msk, indent + 1);
+        }
 	return rc;
 
 trunc:
diff --git a/contrib/tcpdump/print-fr.c b/contrib/tcpdump/print-fr.c
index ba6d92b47bfc..b7bec4b7f7ea 100644
--- a/contrib/tcpdump/print-fr.c
+++ b/contrib/tcpdump/print-fr.c
@@ -34,6 +34,7 @@
 #include "interface.h"
 #include "addrtoname.h"
 #include "ethertype.h"
+#include "llc.h"
 #include "nlpid.h"
 #include "extract.h"
 #include "oui.h"
@@ -94,15 +95,21 @@ static const struct tok frf_flag_values[] = {
     { 0, NULL }
 };
 
-/* Finds out Q.922 address length, DLCI and flags. Returns 0 on success
+/* Finds out Q.922 address length, DLCI and flags. Returns 1 on success,
+ * 0 on invalid address, -1 on truncated packet
  * save the flags dep. on address length
  */
-static int parse_q922_addr(const u_char *p, u_int *dlci,
-                           u_int *addr_len, uint8_t *flags)
+static int parse_q922_addr(netdissect_options *ndo,
+                           const u_char *p, u_int *dlci,
+                           u_int *addr_len, uint8_t *flags, u_int length)
 {
-	if ((p[0] & FR_EA_BIT))
+	if (!ND_TTEST(p[0]) || length < 1)
 		return -1;
+	if ((p[0] & FR_EA_BIT))
+		return 0;
 
+	if (!ND_TTEST(p[1]) || length < 2)
+		return -1;
 	*addr_len = 2;
 	*dlci = ((p[0] & 0xFC) << 2) | ((p[1] & 0xF0) >> 4);
 
@@ -112,34 +119,42 @@ static int parse_q922_addr(const u_char *p, u_int *dlci,
         flags[3] = 0;
 
 	if (p[1] & FR_EA_BIT)
-		return 0;	/* 2-byte Q.922 address */
+		return 1;	/* 2-byte Q.922 address */
 
 	p += 2;
+	length -= 2;
+	if (!ND_TTEST(p[0]) || length < 1)
+		return -1;
 	(*addr_len)++;		/* 3- or 4-byte Q.922 address */
 	if ((p[0] & FR_EA_BIT) == 0) {
 		*dlci = (*dlci << 7) | (p[0] >> 1);
 		(*addr_len)++;	/* 4-byte Q.922 address */
 		p++;
+		length--;
 	}
 
+	if (!ND_TTEST(p[0]) || length < 1)
+		return -1;
 	if ((p[0] & FR_EA_BIT) == 0)
-		return -1; /* more than 4 bytes of Q.922 address? */
+		return 0; /* more than 4 bytes of Q.922 address? */
 
         flags[3] = p[0] & 0x02;
 
         *dlci = (*dlci << 6) | (p[0] >> 2);
 
-	return 0;
+	return 1;
 }
 
-char *q922_string(const u_char *p) {
+char *
+q922_string(netdissect_options *ndo, const u_char *p, u_int length)
+{
 
     static u_int dlci, addr_len;
     static uint8_t flags[4];
     static char buffer[sizeof("DLCI xxxxxxxxxx")];
     memset(buffer, 0, sizeof(buffer));
 
-    if (parse_q922_addr(p, &dlci, &addr_len, flags) == 0){
+    if (parse_q922_addr(ndo, p, &dlci, &addr_len, flags, length) == 1){
         snprintf(buffer, sizeof(buffer), "DLCI %u", dlci);
     }
 
@@ -173,15 +188,6 @@ char *q922_string(const u_char *p) {
              may optionally be increased to three or four octets.
 */
 
-static u_int
-fr_hdrlen(const u_char *p, u_int addr_len)
-{
-	if (!p[addr_len + 1] /* pad exist */)
-		return addr_len + 1 /* UI */ + 1 /* pad */ + 1 /* NLPID */;
-	else
-		return addr_len + 1 /* UI */ + 1 /* NLPID */;
-}
-
 static void
 fr_hdr_print(netdissect_options *ndo,
              int length, u_int addr_len, u_int dlci, uint8_t *flags, uint16_t nlpid)
@@ -232,6 +238,7 @@ u_int
 fr_print(netdissect_options *ndo,
          register const u_char *p, u_int length)
 {
+	int ret;
 	uint16_t extracted_ethertype;
 	u_int dlci;
 	u_int addr_len;
@@ -239,39 +246,70 @@ fr_print(netdissect_options *ndo,
 	u_int hdr_len;
 	uint8_t flags[4];
 
-	if (parse_q922_addr(p, &dlci, &addr_len, flags)) {
+	ret = parse_q922_addr(ndo, p, &dlci, &addr_len, flags, length);
+	if (ret == -1)
+		goto trunc;
+	if (ret == 0) {
 		ND_PRINT((ndo, "Q.922, invalid address"));
 		return 0;
 	}
 
-        ND_TCHECK2(*p, addr_len+1+1);
-	hdr_len = fr_hdrlen(p, addr_len);
-        ND_TCHECK2(*p, hdr_len);
+	ND_TCHECK(p[addr_len]);
+	if (length < addr_len + 1)
+		goto trunc;
 
-	if (p[addr_len] != 0x03 && dlci != 0) {
+	if (p[addr_len] != LLC_UI && dlci != 0) {
+                /*
+                 * Let's figure out if we have Cisco-style encapsulation,
+                 * with an Ethernet type (Cisco HDLC type?) following the
+                 * address.
+                 */
+		if (!ND_TTEST2(p[addr_len], 2) || length < addr_len + 2) {
+                        /* no Ethertype */
+                        ND_PRINT((ndo, "UI %02x! ", p[addr_len]));
+                } else {
+                        extracted_ethertype = EXTRACT_16BITS(p+addr_len);
 
-                /* lets figure out if we have cisco style encapsulation: */
-                extracted_ethertype = EXTRACT_16BITS(p+addr_len);
+                        if (ndo->ndo_eflag)
+                                fr_hdr_print(ndo, length, addr_len, dlci,
+                                    flags, extracted_ethertype);
 
-                if (ndo->ndo_eflag)
-                    fr_hdr_print(ndo, length, addr_len, dlci, flags, extracted_ethertype);
-
-                if (ethertype_print(ndo, extracted_ethertype,
-                                      p+addr_len+ETHERTYPE_LEN,
-                                      length-addr_len-ETHERTYPE_LEN,
-                                      length-addr_len-ETHERTYPE_LEN) == 0)
-                    /* ether_type not known, probably it wasn't one */
-                    ND_PRINT((ndo, "UI %02x! ", p[addr_len]));
-                else
-                    return hdr_len;
+                        if (ethertype_print(ndo, extracted_ethertype,
+                                            p+addr_len+ETHERTYPE_LEN,
+                                            length-addr_len-ETHERTYPE_LEN,
+                                            length-addr_len-ETHERTYPE_LEN) == 0)
+                                /* ether_type not known, probably it wasn't one */
+                                ND_PRINT((ndo, "UI %02x! ", p[addr_len]));
+                        else
+                                return addr_len + 2;
+                }
         }
 
-	if (!p[addr_len + 1]) {	/* pad byte should be used with 3-byte Q.922 */
+	ND_TCHECK(p[addr_len+1]);
+	if (length < addr_len + 2)
+		goto trunc;
+
+	if (p[addr_len + 1] == 0) {
+		/*
+		 * Assume a pad byte after the control (UI) byte.
+		 * A pad byte should only be used with 3-byte Q.922.
+		 */
 		if (addr_len != 3)
 			ND_PRINT((ndo, "Pad! "));
-	} else if (addr_len == 3)
-		ND_PRINT((ndo, "No pad! "));
+		hdr_len = addr_len + 1 /* UI */ + 1 /* pad */ + 1 /* NLPID */;
+	} else {
+		/*
+		 * Not a pad byte.
+		 * A pad byte should be used with 3-byte Q.922.
+		 */
+		if (addr_len == 3)
+			ND_PRINT((ndo, "No pad! "));
+		hdr_len = addr_len + 1 /* UI */ + 1 /* NLPID */;
+	}
 
+        ND_TCHECK(p[hdr_len - 1]);
+	if (length < hdr_len)
+		goto trunc;
 	nlpid = p[hdr_len - 1];
 
 	if (ndo->ndo_eflag)
@@ -284,11 +322,10 @@ fr_print(netdissect_options *ndo,
 	        ip_print(ndo, p, length);
 		break;
 
-#ifdef INET6
 	case NLPID_IP6:
 		ip6_print(ndo, p, length);
 		break;
-#endif
+
 	case NLPID_CLNP:
 	case NLPID_ESIS:
 	case NLPID_ISIS:
@@ -558,8 +595,8 @@ mfr_print(netdissect_options *ndo,
 
 static void
 frf15_print(netdissect_options *ndo,
-            const u_char *p, u_int length) {
-
+            const u_char *p, u_int length)
+{
     uint16_t sequence_num, flags;
 
     flags = p[0]&MFR_BEC_MASK;
diff --git a/contrib/tcpdump/print-ftp.c b/contrib/tcpdump/print-ftp.c
new file mode 100644
index 000000000000..547904208a03
--- /dev/null
+++ b/contrib/tcpdump/print-ftp.c
@@ -0,0 +1,35 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code
+ * distributions retain the above copyright notice and this paragraph
+ * in its entirety, and (2) distributions including binary code include
+ * the above copyright notice and this paragraph in its entirety in
+ * the documentation or other materials provided with the distribution.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND
+ * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
+ * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header$";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include 
+
+#include 
+#include 
+
+#include "netdissect.h"
+#include "extract.h"
+
+void
+ftp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
+{
+	txtproto_print(ndo, pptr, len, "ftp", NULL, 0);
+}
diff --git a/contrib/tcpdump/print-geneve.c b/contrib/tcpdump/print-geneve.c
new file mode 100644
index 000000000000..2187ab8e528f
--- /dev/null
+++ b/contrib/tcpdump/print-geneve.c
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2014 VMware, Inc. All Rights Reserved.
+ *
+ * Jesse Gross 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code
+ * distributions retain the above copyright notice and this paragraph
+ * in its entirety, and (2) distributions including binary code include
+ * the above copyright notice and this paragraph in its entirety in
+ * the documentation or other materials provided with the distribution.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND
+ * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
+ * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ */
+
+#define NETDISSECT_REWORKED
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include 
+
+#include "interface.h"
+#include "extract.h"
+#include "ethertype.h"
+
+/*
+ * Geneve header, draft-gross-geneve-02
+ *
+ *    0                   1                   2                   3
+ *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |Ver|  Opt Len  |O|C|    Rsvd.  |          Protocol Type        |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |        Virtual Network Identifier (VNI)       |    Reserved   |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |                    Variable Length Options                    |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ * Options:
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |          Option Class         |      Type     |R|R|R| Length  |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |                      Variable Option Data                     |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+#define VER_SHIFT 6
+#define HDR_OPTS_LEN_MASK 0x3F
+
+#define FLAG_OAM      (1 << 7)
+#define FLAG_CRITICAL (1 << 6)
+#define FLAG_R1       (1 << 5)
+#define FLAG_R2       (1 << 4)
+#define FLAG_R3       (1 << 3)
+#define FLAG_R4       (1 << 2)
+#define FLAG_R5       (1 << 1)
+#define FLAG_R6       (1 << 0)
+
+#define OPT_TYPE_CRITICAL (1 << 7)
+#define OPT_LEN_MASK 0x1F
+
+static const struct tok geneve_flag_values[] = {
+        { FLAG_OAM, "O" },
+        { FLAG_CRITICAL, "C" },
+        { FLAG_R1, "R1" },
+        { FLAG_R2, "R2" },
+        { FLAG_R3, "R3" },
+        { FLAG_R4, "R4" },
+        { FLAG_R5, "R5" },
+        { FLAG_R6, "R6" },
+        { 0, NULL }
+};
+
+static const char *
+format_opt_class(uint16_t opt_class)
+{
+    if (opt_class <= 0xff)
+        return "Standard";
+    else if (opt_class == 0xffff)
+        return "Experimental";
+    else
+        return "Unknown";
+}
+
+static void
+geneve_opts_print(netdissect_options *ndo, const u_char *bp, u_int len)
+{
+    const char *sep = "";
+
+    while (len > 0) {
+        uint16_t opt_class;
+        uint8_t opt_type;
+        uint8_t opt_len;
+
+        ND_PRINT((ndo, "%s", sep));
+        sep = ", ";
+
+        opt_class = EXTRACT_16BITS(bp);
+        opt_type = *(bp + 2);
+        opt_len = 4 + ((*(bp + 3) & OPT_LEN_MASK) * 4);
+
+        ND_PRINT((ndo, "class %s (0x%x) type 0x%x%s len %u",
+                  format_opt_class(opt_class), opt_class, opt_type,
+                  opt_type & OPT_TYPE_CRITICAL ? "(C)" : "", opt_len));
+
+        if (opt_len > len) {
+            ND_PRINT((ndo, " [bad length]"));
+            return;
+        }
+
+        if (ndo->ndo_vflag > 1 && opt_len > 4) {
+            uint32_t *print_data = (uint32_t *)(bp + 4);
+            int i;
+
+            ND_PRINT((ndo, " data"));
+
+            for (i = 4; i < opt_len; i += 4) {
+                ND_PRINT((ndo, " %08x", EXTRACT_32BITS(print_data)));
+                print_data++;
+            }
+        }
+
+        bp += opt_len;
+        len -= opt_len;
+    }
+}
+
+void
+geneve_print(netdissect_options *ndo, const u_char *bp, u_int len)
+{
+    uint8_t ver_opt;
+    uint version;
+    uint8_t flags;
+    uint16_t prot;
+    uint32_t vni;
+    uint8_t reserved;
+    u_int opts_len;
+
+    ND_PRINT((ndo, "Geneve"));
+
+    ND_TCHECK2(*bp, 8);
+
+    ver_opt = *bp;
+    bp += 1;
+    len -= 1;
+
+    version = ver_opt >> VER_SHIFT;
+    if (version != 0) {
+        ND_PRINT((ndo, " ERROR: unknown-version %u", version));
+        return;
+    }
+
+    flags = *bp;
+    bp += 1;
+    len -= 1;
+
+    prot = EXTRACT_16BITS(bp);
+    bp += 2;
+    len -= 2;
+
+    vni = EXTRACT_24BITS(bp);
+    bp += 3;
+    len -= 3;
+
+    reserved = *bp;
+    bp += 1;
+    len -= 1;
+
+    ND_PRINT((ndo, ", Flags [%s]",
+              bittok2str_nosep(geneve_flag_values, "none", flags)));
+    ND_PRINT((ndo, ", vni 0x%x", vni));
+
+    if (reserved)
+        ND_PRINT((ndo, ", rsvd 0x%x", reserved));
+
+    if (ndo->ndo_eflag)
+        ND_PRINT((ndo, ", proto %s (0x%04x)",
+                  tok2str(ethertype_values, "unknown", prot), prot));
+
+    opts_len = (ver_opt & HDR_OPTS_LEN_MASK) * 4;
+
+    if (len < opts_len) {
+        ND_PRINT((ndo, " truncated-geneve - %u bytes missing",
+                  len - opts_len));
+        return;
+    }
+
+    ND_TCHECK2(*bp, opts_len);
+
+    if (opts_len > 0) {
+        ND_PRINT((ndo, ", options ["));
+
+        if (ndo->ndo_vflag)
+            geneve_opts_print(ndo, bp, opts_len);
+        else
+            ND_PRINT((ndo, "%u bytes", opts_len));
+
+        ND_PRINT((ndo, "]"));
+    }
+
+    bp += opts_len;
+    len -= opts_len;
+
+    if (ndo->ndo_vflag < 1)
+        ND_PRINT((ndo, ": "));
+    else
+        ND_PRINT((ndo, "\n\t"));
+
+    if (ethertype_print(ndo, prot, bp, len, len) == 0) {
+        if (prot == ETHERTYPE_TEB)
+            ether_print(ndo, bp, len, len, NULL, NULL);
+        else
+            ND_PRINT((ndo, "geneve-proto-0x%x", prot));
+    }
+
+    return;
+
+trunc:
+    ND_PRINT((ndo, " [|geneve]"));
+}
diff --git a/contrib/tcpdump/print-geonet.c b/contrib/tcpdump/print-geonet.c
index d902066eff3a..edfb7f2d6c0e 100644
--- a/contrib/tcpdump/print-geonet.c
+++ b/contrib/tcpdump/print-geonet.c
@@ -56,16 +56,12 @@ static const struct tok msg_type_values[] = {
 
 static void
 print_btp_body(netdissect_options *ndo,
-               const u_char *bp, u_int length)
+               const u_char *bp)
 {
 	int version;
 	int msg_type;
 	const char *msg_type_str;
 
-	if (length <= 2) {
-		return;
-	}
-
 	/* Assuming ItsDpuHeader */
 	version = bp[0];
 	msg_type = bp[1];
@@ -83,7 +79,7 @@ print_btp(netdissect_options *ndo,
 	ND_PRINT((ndo, "; BTP Dst:%u Src:%u", dest, src));
 }
 
-static void
+static int
 print_long_pos_vector(netdissect_options *ndo,
                       const u_char *bp)
 {
@@ -91,10 +87,13 @@ print_long_pos_vector(netdissect_options *ndo,
 
 	ND_PRINT((ndo, "GN_ADDR:%s ", linkaddr_string (ndo, bp, 0, GEONET_ADDR_LEN)));
 
+	if (!ND_TTEST2(*(bp+12), 8))
+		return (-1);
 	lat = EXTRACT_32BITS(bp+12);
 	ND_PRINT((ndo, "lat:%d ", lat));
 	lon = EXTRACT_32BITS(bp+16);
 	ND_PRINT((ndo, "lon:%d", lon));
+	return (0);
 }
 
 
@@ -105,137 +104,170 @@ print_long_pos_vector(netdissect_options *ndo,
 void
 geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int length)
 {
+	int version;
+	int next_hdr;
+	int hdr_type;
+	int hdr_subtype;
+	uint16_t payload_length;
+	int hop_limit;
+	const char *next_hdr_txt = "Unknown";
+	const char *hdr_type_txt = "Unknown";
+	int hdr_size = -1;
+
 	ND_PRINT((ndo, "GeoNet src:%s; ", etheraddr_string(ndo, eth+6)));
 
-	if (length >= 36) {
-		/* Process Common Header */
-		int version = bp[0] >> 4;
-		int next_hdr = bp[0] & 0x0f;
-		int hdr_type = bp[1] >> 4;
-		int hdr_subtype = bp[1] & 0x0f;
-		uint16_t payload_length = EXTRACT_16BITS(bp+4);
-		int hop_limit = bp[7];
-		const char *next_hdr_txt = "Unknown";
-		const char *hdr_type_txt = "Unknown";
-		int hdr_size = -1;
+	/* Process Common Header */
+	if (length < 36)
+		goto malformed;
+		
+	ND_TCHECK2(*bp, 7);
+	version = bp[0] >> 4;
+	next_hdr = bp[0] & 0x0f;
+	hdr_type = bp[1] >> 4;
+	hdr_subtype = bp[1] & 0x0f;
+	payload_length = EXTRACT_16BITS(bp+4);
+	hop_limit = bp[7];
 
-		switch (next_hdr) {
-			case 0: next_hdr_txt = "Any"; break;
-			case 1: next_hdr_txt = "BTP-A"; break;
-			case 2: next_hdr_txt = "BTP-B"; break;
-			case 3: next_hdr_txt = "IPv6"; break;
-		}
+	switch (next_hdr) {
+		case 0: next_hdr_txt = "Any"; break;
+		case 1: next_hdr_txt = "BTP-A"; break;
+		case 2: next_hdr_txt = "BTP-B"; break;
+		case 3: next_hdr_txt = "IPv6"; break;
+	}
 
-		switch (hdr_type) {
-			case 0: hdr_type_txt = "Any"; break;
-			case 1: hdr_type_txt = "Beacon"; break;
-			case 2: hdr_type_txt = "GeoUnicast"; break;
-			case 3: switch (hdr_subtype) {
-					case 0: hdr_type_txt = "GeoAnycastCircle"; break;
-					case 1: hdr_type_txt = "GeoAnycastRect"; break;
-					case 2: hdr_type_txt = "GeoAnycastElipse"; break;
-				}
-				break;
-			case 4: switch (hdr_subtype) {
-					case 0: hdr_type_txt = "GeoBroadcastCircle"; break;
-					case 1: hdr_type_txt = "GeoBroadcastRect"; break;
-					case 2: hdr_type_txt = "GeoBroadcastElipse"; break;
-				}
-				break;
-			case 5: switch (hdr_subtype) {
-					case 0: hdr_type_txt = "TopoScopeBcast-SH"; break;
-					case 1: hdr_type_txt = "TopoScopeBcast-MH"; break;
-				}
-				break;
-			case 6: switch (hdr_subtype) {
-					case 0: hdr_type_txt = "LocService-Request"; break;
-					case 1: hdr_type_txt = "LocService-Reply"; break;
-				}
-				break;
-		}
+	switch (hdr_type) {
+		case 0: hdr_type_txt = "Any"; break;
+		case 1: hdr_type_txt = "Beacon"; break;
+		case 2: hdr_type_txt = "GeoUnicast"; break;
+		case 3: switch (hdr_subtype) {
+				case 0: hdr_type_txt = "GeoAnycastCircle"; break;
+				case 1: hdr_type_txt = "GeoAnycastRect"; break;
+				case 2: hdr_type_txt = "GeoAnycastElipse"; break;
+			}
+			break;
+		case 4: switch (hdr_subtype) {
+				case 0: hdr_type_txt = "GeoBroadcastCircle"; break;
+				case 1: hdr_type_txt = "GeoBroadcastRect"; break;
+				case 2: hdr_type_txt = "GeoBroadcastElipse"; break;
+			}
+			break;
+		case 5: switch (hdr_subtype) {
+				case 0: hdr_type_txt = "TopoScopeBcast-SH"; break;
+				case 1: hdr_type_txt = "TopoScopeBcast-MH"; break;
+			}
+			break;
+		case 6: switch (hdr_subtype) {
+				case 0: hdr_type_txt = "LocService-Request"; break;
+				case 1: hdr_type_txt = "LocService-Reply"; break;
+			}
+			break;
+	}
 
-		ND_PRINT((ndo, "v:%d ", version));
-		ND_PRINT((ndo, "NH:%d-%s ", next_hdr, next_hdr_txt));
-		ND_PRINT((ndo, "HT:%d-%d-%s ", hdr_type, hdr_subtype, hdr_type_txt));
-		ND_PRINT((ndo, "HopLim:%d ", hop_limit));
-		ND_PRINT((ndo, "Payload:%d ", payload_length));
-		print_long_pos_vector(ndo, bp + 8);
+	ND_PRINT((ndo, "v:%d ", version));
+	ND_PRINT((ndo, "NH:%d-%s ", next_hdr, next_hdr_txt));
+	ND_PRINT((ndo, "HT:%d-%d-%s ", hdr_type, hdr_subtype, hdr_type_txt));
+	ND_PRINT((ndo, "HopLim:%d ", hop_limit));
+	ND_PRINT((ndo, "Payload:%d ", payload_length));
+	if (print_long_pos_vector(ndo, bp + 8) == -1)
+		goto trunc;
 
-		/* Skip Common Header */
-		length -= 36;
-		bp += 36;
+	/* Skip Common Header */
+	length -= 36;
+	bp += 36;
 
-		/* Process Extended Headers */
-		switch (hdr_type) {
-			case 0: /* Any */
-				hdr_size = 0;
-				break;
-			case 1: /* Beacon */
-				hdr_size = 0;
-				break;
-			case 2: /* GeoUnicast */
-				break;
-			case 3: switch (hdr_subtype) {
-					case 0: /* GeoAnycastCircle */
-						break;
-					case 1: /* GeoAnycastRect */
-						break;
-					case 2: /* GeoAnycastElipse */
-						break;
-				}
-				break;
-			case 4: switch (hdr_subtype) {
-					case 0: /* GeoBroadcastCircle */
-						break;
-					case 1: /* GeoBroadcastRect */
-						break;
-					case 2: /* GeoBroadcastElipse */
-						break;
-				}
-				break;
-			case 5: switch (hdr_subtype) {
-					case 0: /* TopoScopeBcast-SH */
-						hdr_size = 0;
-						break;
-					case 1: /* TopoScopeBcast-MH */
-						hdr_size = 68 - 36;
-						break;
-				}
-				break;
-			case 6: switch (hdr_subtype) {
-					case 0: /* LocService-Request */
-						break;
-					case 1: /* LocService-Reply */
-						break;
-				}
-				break;
-		}
-
-		/* Skip Extended headers */
-		if (hdr_size >= 0) {
-			length -= hdr_size;
-			bp += hdr_size;
-			switch (next_hdr) {
-				case 0: /* Any */
+	/* Process Extended Headers */
+	switch (hdr_type) {
+		case 0: /* Any */
+			hdr_size = 0;
+			break;
+		case 1: /* Beacon */
+			hdr_size = 0;
+			break;
+		case 2: /* GeoUnicast */
+			break;
+		case 3: switch (hdr_subtype) {
+				case 0: /* GeoAnycastCircle */
 					break;
-				case 1:
-				case 2: /* BTP A/B */
-					print_btp(ndo, bp);
-					length -= 4;
-					bp += 4;
-					print_btp_body(ndo, bp, length);
+				case 1: /* GeoAnycastRect */
 					break;
-				case 3: /* IPv6 */
+				case 2: /* GeoAnycastElipse */
 					break;
 			}
+			break;
+		case 4: switch (hdr_subtype) {
+				case 0: /* GeoBroadcastCircle */
+					break;
+				case 1: /* GeoBroadcastRect */
+					break;
+				case 2: /* GeoBroadcastElipse */
+					break;
+			}
+			break;
+		case 5: switch (hdr_subtype) {
+				case 0: /* TopoScopeBcast-SH */
+					hdr_size = 0;
+					break;
+				case 1: /* TopoScopeBcast-MH */
+					hdr_size = 68 - 36;
+					break;
+			}
+			break;
+		case 6: switch (hdr_subtype) {
+				case 0: /* LocService-Request */
+					break;
+				case 1: /* LocService-Reply */
+					break;
+			}
+			break;
+	}
+
+	/* Skip Extended headers */
+	if (hdr_size >= 0) {
+		if (length < (u_int)hdr_size)
+			goto malformed;
+		ND_TCHECK2(*bp, hdr_size);
+		length -= hdr_size;
+		bp += hdr_size;
+		switch (next_hdr) {
+			case 0: /* Any */
+				break;
+			case 1:
+			case 2: /* BTP A/B */
+				if (length < 4)
+					goto malformed;
+				ND_TCHECK2(*bp, 4);
+				print_btp(ndo, bp);
+				length -= 4;
+				bp += 4;
+				if (length >= 2) {
+					/*
+					 * XXX - did print_btp_body()
+					 * return if length < 2
+					 * because this is optional,
+					 * or was that just not
+					 * reporting genuine errors?
+					 */
+					ND_TCHECK2(*bp, 2);
+					print_btp_body(ndo, bp);
+				}
+				break;
+			case 3: /* IPv6 */
+				break;
 		}
-	} else {
-		ND_PRINT((ndo, "Malformed (small) "));
 	}
 
 	/* Print user data part */
 	if (ndo->ndo_vflag)
 		ND_DEFAULTPRINT(bp, length);
+	return;
+
+malformed:
+	ND_PRINT((ndo, " Malformed (small) "));
+	/* XXX - print the remaining data as hex? */
+	return;
+
+trunc:
+	ND_PRINT((ndo, "[|geonet]"));
 }
 
 
diff --git a/contrib/tcpdump/print-gre.c b/contrib/tcpdump/print-gre.c
index 604a96960464..4d7705f80edc 100644
--- a/contrib/tcpdump/print-gre.c
+++ b/contrib/tcpdump/print-gre.c
@@ -200,11 +200,9 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
 	case ETHERTYPE_IP:
 	        ip_print(ndo, bp, len);
 		break;
-#ifdef INET6
 	case ETHERTYPE_IPV6:
 		ip6_print(ndo, bp, len);
 		break;
-#endif
 	case ETHERTYPE_MPLS:
 		mpls_print(ndo, bp, len);
 		break;
diff --git a/contrib/tcpdump/print-http.c b/contrib/tcpdump/print-http.c
new file mode 100644
index 000000000000..49df1748eded
--- /dev/null
+++ b/contrib/tcpdump/print-http.c
@@ -0,0 +1,80 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code
+ * distributions retain the above copyright notice and this paragraph
+ * in its entirety, and (2) distributions including binary code include
+ * the above copyright notice and this paragraph in its entirety in
+ * the documentation or other materials provided with the distribution.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND
+ * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
+ * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header$";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include 
+
+#include 
+#include 
+
+#include "interface.h"
+#include "extract.h"
+
+/*
+ * Includes WebDAV requests.
+ */
+static const char *httpcmds[] = {
+	"GET",
+	"PUT",
+	"COPY",
+	"HEAD",
+	"LOCK",
+	"MOVE",
+	"POLL",
+	"POST",
+	"BCOPY",
+	"BMOVE",
+	"MKCOL",
+	"TRACE",
+	"LABEL",
+	"MERGE",
+	"DELETE",
+	"SEARCH",
+	"UNLOCK",
+	"REPORT",
+	"UPDATE",
+	"NOTIFY",
+	"BDELETE",
+	"CONNECT",
+	"OPTIONS",
+	"CHECKIN",
+	"PROPFIND",
+	"CHECKOUT",
+	"CCM_POST",
+	"SUBSCRIBE",
+	"PROPPATCH",
+	"BPROPFIND",
+	"BPROPPATCH",
+	"UNCHECKOUT",
+	"MKACTIVITY",
+	"MKWORKSPACE",
+	"UNSUBSCRIBE",
+	"RPC_CONNECT",
+	"VERSION-CONTROL",
+	"BASELINE-CONTROL",
+	NULL
+};
+
+void
+http_print(netdissect_options *ndo, const u_char *pptr, u_int len)
+{
+	txtproto_print(ndo, pptr, len, "http", httpcmds, RESP_CODE_SECOND_TOKEN);
+}
diff --git a/contrib/tcpdump/print-icmp.c b/contrib/tcpdump/print-icmp.c
index 88df0e4c7876..a4d827563f1d 100644
--- a/contrib/tcpdump/print-icmp.c
+++ b/contrib/tcpdump/print-icmp.c
@@ -147,12 +147,10 @@ struct icmp {
 
 #define	ICMP_MAXTYPE		18
 
-#define	ICMP_INFOTYPE(type) \
-	((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
-	(type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
-	(type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \
-	(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
-	(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
+#define ICMP_ERRTYPE(type) \
+	((type) == ICMP_UNREACH || (type) == ICMP_SOURCEQUENCH || \
+	(type) == ICMP_REDIRECT || (type) == ICMP_TIMXCEED || \
+	(type) == ICMP_PARAMPROB)
 #define	ICMP_MPLS_EXT_TYPE(type) \
 	((type) == ICMP_UNREACH || \
          (type) == ICMP_TIMXCEED || \
@@ -315,7 +313,8 @@ const char *icmp_tstamp_print(u_int);
 
 /* print the milliseconds since midnight UTC */
 const char *
-icmp_tstamp_print(u_int tstamp) {
+icmp_tstamp_print(u_int tstamp)
+{
     u_int msec,sec,min,hrs;
 
     static char buf[64];
@@ -578,7 +577,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
          * print the remnants of the IP packet.
          * save the snaplength as this may get overidden in the IP printer.
          */
-	if (ndo->ndo_vflag >= 1 && !ICMP_INFOTYPE(dp->icmp_type)) {
+	if (ndo->ndo_vflag >= 1 && ICMP_ERRTYPE(dp->icmp_type)) {
 		bp += 8;
 		ND_PRINT((ndo, "\n\t"));
 		ip = (struct ip *)bp;
diff --git a/contrib/tcpdump/print-icmp6.c b/contrib/tcpdump/print-icmp6.c
index 553bb46ee23a..81563e6c8138 100644
--- a/contrib/tcpdump/print-icmp6.c
+++ b/contrib/tcpdump/print-icmp6.c
@@ -660,7 +660,7 @@ rpl_format_dagid(char dagid_str[65], const u_char *dagid)
                 if(isprint(dagid[i])) {
                         *d++ = dagid[i];
                 } else {
-                        snprintf(d,4,"0x%02x", dagid[i]);
+                        snprintf(d,5,"0x%02x", dagid[i]); /* 4 + null char */
                         d += 4;
                 }
         }
diff --git a/contrib/tcpdump/print-ip.c b/contrib/tcpdump/print-ip.c
index 0e3ae96530c8..edf00762434e 100644
--- a/contrib/tcpdump/print-ip.c
+++ b/contrib/tcpdump/print-ip.c
@@ -438,12 +438,10 @@ ip_print_demux(netdissect_options *ndo,
 		}
 		break;
 
-#ifdef INET6
 	case IPPROTO_IPV6:
 		/* ip6-in-ip encapsulation */
 		ip6_print(ndo, ipds->cp, ipds->len);
 		break;
-#endif /*INET6*/
 
 	case IPPROTO_RSVP:
 		rsvp_print(ndo, ipds->cp, ipds->len);
@@ -539,9 +537,10 @@ ip_print(netdissect_options *ndo,
 	ipds->ip = (const struct ip *)bp;
 	ND_TCHECK(ipds->ip->ip_vhl);
 	if (IP_V(ipds->ip) != 4) { /* print version if != 4 */
-	    ND_PRINT((ndo, "IP%u ", IP_V(ipds->ip)));
 	    if (IP_V(ipds->ip) == 6)
-	      ND_PRINT((ndo, ", wrong link-layer encapsulation"));
+	      ND_PRINT((ndo, "IP6, wrong link-layer encapsulation "));
+	    else
+	      ND_PRINT((ndo, "IP%u ", IP_V(ipds->ip)));
 	}
 	else if (!ndo->ndo_eflag)
 		ND_PRINT((ndo, "IP "));
@@ -696,11 +695,9 @@ ipN_print(netdissect_options *ndo, register const u_char *bp, register u_int len
 	case 4:
 		ip_print (ndo, bp, length);
 		return;
-#ifdef INET6
 	case 6:
 		ip6_print (ndo, bp, length);
 		return;
-#endif
 	default:
 		ND_PRINT((ndo, "unknown ip %d", IP_V(&hdr)));
 		return;
diff --git a/contrib/tcpdump/print-ip6.c b/contrib/tcpdump/print-ip6.c
index 2df96cbbc9d9..5318389a7cf6 100644
--- a/contrib/tcpdump/print-ip6.c
+++ b/contrib/tcpdump/print-ip6.c
@@ -26,8 +26,6 @@
 #include "config.h"
 #endif
 
-#ifdef INET6
-
 #include 
 
 #include 
@@ -36,6 +34,8 @@
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifdef INET6
+
 #include "ip6.h"
 #include "ipproto.h"
 
@@ -268,4 +268,12 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	ND_PRINT((ndo, "[|ip6]"));
 }
 
+#else /* INET6 */
+
+void
+ip6_print(netdissect_options *ndo, const u_char *bp _U_, u_int length)
+{
+	ND_PRINT((ndo, "IP6, length: %u (printing not supported)", length));
+}
+
 #endif /* INET6 */
diff --git a/contrib/tcpdump/print-ipnet.c b/contrib/tcpdump/print-ipnet.c
index e1cd59e19823..c4ff16aba2f6 100644
--- a/contrib/tcpdump/print-ipnet.c
+++ b/contrib/tcpdump/print-ipnet.c
@@ -76,11 +76,9 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 	        ip_print(ndo, p, length);
 		break;
 
-#ifdef INET6
 	case IPH_AF_INET6:
 		ip6_print(ndo, p, length);
 		break;
-#endif /*INET6*/
 
 	default:
 		if (!ndo->ndo_eflag)
diff --git a/contrib/tcpdump/print-isoclns.c b/contrib/tcpdump/print-isoclns.c
index 0f9ba3d769ca..c3e7e87ac99c 100644
--- a/contrib/tcpdump/print-isoclns.c
+++ b/contrib/tcpdump/print-isoclns.c
@@ -705,11 +705,9 @@ void isoclns_print(netdissect_options *ndo,
 		ip_print(ndo, p + 1, length - 1);
 		break;
 
-#ifdef INET6
 	case NLPID_IP6:
 		ip6_print(ndo, p + 1, length - 1);
 		break;
-#endif
 
 	case NLPID_PPP:
 		ppp_print(ndo, p + 1, length - 1);
@@ -1059,7 +1057,7 @@ esis_print(netdissect_options *ndo,
 
 	if (li < sizeof(struct esis_header_t) + 2) {
             ND_PRINT((ndo, " length indicator < min PDU size %d:", li));
-            while (--length != 0)
+            while (pptr < ndo->ndo_snapend)
                 ND_PRINT((ndo, "%02X", *pptr++));
             return;
 	}
@@ -1662,8 +1660,8 @@ isis_print_tlv_ip_reach(netdissect_options *ndo,
 static int
 isis_print_ip_reach_subtlv(netdissect_options *ndo,
                            const uint8_t *tptr, int subt, int subl,
-                           const char *ident) {
-
+                           const char *ident)
+{
         /* first lets see if we know the subTLVs name*/
 	ND_PRINT((ndo, "%s%s subTLV #%u, length: %u",
 	          ident, tok2str(isis_ext_ip_reach_subtlv_values, "unknown", subt),
@@ -1712,8 +1710,8 @@ isis_print_ip_reach_subtlv(netdissect_options *ndo,
 static int
 isis_print_is_reach_subtlv(netdissect_options *ndo,
                            const uint8_t *tptr, u_int subt, u_int subl,
-                           const char *ident) {
-
+                           const char *ident)
+{
         u_int te_class,priority_level,gmpls_switch_cap;
         union { /* int to float conversion buffer for several subTLVs */
             float f;
@@ -1872,8 +1870,8 @@ isis_print_is_reach_subtlv(netdissect_options *ndo,
 
 static int
 isis_print_ext_is_reach(netdissect_options *ndo,
-                        const uint8_t *tptr, const char *ident, int tlv_type) {
-
+                        const uint8_t *tptr, const char *ident, int tlv_type)
+{
     char ident_buffer[20];
     int subtlv_type,subtlv_len,subtlv_sum_len;
     int proc_bytes = 0; /* how many bytes did we process ? */
@@ -1922,8 +1920,8 @@ isis_print_ext_is_reach(netdissect_options *ndo,
 
 static int
 isis_print_mtid(netdissect_options *ndo,
-                const uint8_t *tptr, const char *ident) {
-
+                const uint8_t *tptr, const char *ident)
+{
     if (!ND_TTEST2(*tptr, 2))
         return(0);
 
@@ -1949,8 +1947,8 @@ isis_print_mtid(netdissect_options *ndo,
 
 static int
 isis_print_extd_ip_reach(netdissect_options *ndo,
-                         const uint8_t *tptr, const char *ident, uint16_t afi) {
-
+                         const uint8_t *tptr, const char *ident, uint16_t afi)
+{
     char ident_buffer[20];
 #ifdef INET6
     uint8_t prefix[sizeof(struct in6_addr)]; /* shared copy buffer for IPv4 and IPv6 prefixes */
@@ -2418,8 +2416,7 @@ isis_print(netdissect_options *ndo,
 	break;
 
     default:
-	if (!print_unknown_data(ndo, pptr, "\n\t  ", length))
-	    return(0);
+	(void)print_unknown_data(ndo, pptr, "\n\t  ", length);
 	return (0);
     }
 
@@ -3086,15 +3083,31 @@ osi_print_cksum(netdissect_options *ndo,
 {
         uint16_t calculated_checksum;
 
-        /* do not attempt to verify the checksum if it is zero */
-        if (!checksum) {
+        /* do not attempt to verify the checksum if it is zero,
+         * if the total length is nonsense,
+         * if the offset is nonsense,
+         * or the base pointer is not sane
+         */
+        if (!checksum
+            || length > (u_int)ndo->ndo_snaplen
+            || checksum_offset > (uint)ndo->ndo_snaplen
+            || checksum_offset > length) {
                 ND_PRINT((ndo, "(unverified)"));
         } else {
+                unsigned char *truncated = "trunc";
+#if 0
+                printf("\nosi_print_cksum: %p %u %u %u\n", pptr, checksum_offset, length, ndo->ndo_snaplen);
+                ND_TCHECK2(pptr, checksum_offset+length);
+#endif
                 calculated_checksum = create_osi_cksum(pptr, checksum_offset, length);
                 if (checksum == calculated_checksum) {
                         ND_PRINT((ndo, " (correct)"));
                 } else {
-                        ND_PRINT((ndo, " (incorrect should be 0x%04x)", calculated_checksum));
+                        truncated = "incorrect";
+#if 0
+                        trunc:
+#endif
+                        ND_PRINT((ndo, " (%s should be 0x%04x)", truncated, calculated_checksum));
                 }
         }
 }
diff --git a/contrib/tcpdump/print-juniper.c b/contrib/tcpdump/print-juniper.c
index f2aa8cfa1daa..e4bb77c9d7a3 100644
--- a/contrib/tcpdump/print-juniper.c
+++ b/contrib/tcpdump/print-juniper.c
@@ -480,11 +480,9 @@ juniper_ggsn_print(netdissect_options *ndo,
         case JUNIPER_PROTO_IPV4:
             ip_print(ndo, p, l2info.length);
             break;
-#ifdef INET6
         case JUNIPER_PROTO_IPV6:
             ip6_print(ndo, p, l2info.length);
             break;
-#endif /* INET6 */
         default:
             if (!ndo->ndo_eflag)
                 ND_PRINT((ndo, "unknown GGSN proto (%u)", gh->proto));
@@ -784,11 +782,9 @@ juniper_mlppp_print(netdissect_options *ndo,
             else
                 ip_print(ndo, p, l2info.length);
             return l2info.header_len;
-#ifdef INET6
         case JUNIPER_LSQ_L3_PROTO_IPV6:
             ip6_print(ndo, p,l2info.length);
             return l2info.header_len;
-#endif
         case JUNIPER_LSQ_L3_PROTO_MPLS:
             mpls_print(ndo, p, l2info.length);
             return l2info.header_len;
@@ -840,11 +836,9 @@ juniper_mfr_print(netdissect_options *ndo,
             case JUNIPER_LSQ_L3_PROTO_IPV4:
                 ip_print(ndo, p, l2info.length);
                 return l2info.header_len;
-#ifdef INET6
             case JUNIPER_LSQ_L3_PROTO_IPV6:
                 ip6_print(ndo, p,l2info.length);
                 return l2info.header_len;
-#endif
             case JUNIPER_LSQ_L3_PROTO_MPLS:
                 mpls_print(ndo, p, l2info.length);
                 return l2info.header_len;
@@ -1025,8 +1019,8 @@ juniper_atm2_print(netdissect_options *ndo,
  * a juniper router if the payload data is encapsulated using PPP */
 static int
 juniper_ppp_heuristic_guess(netdissect_options *ndo,
-                            register const u_char *p, u_int length) {
-
+                            register const u_char *p, u_int length)
+{
     switch(EXTRACT_16BITS(p)) {
     case PPP_IP :
     case PPP_OSI :
@@ -1055,8 +1049,8 @@ juniper_ppp_heuristic_guess(netdissect_options *ndo,
 
 static int
 ip_heuristic_guess(netdissect_options *ndo,
-                   register const u_char *p, u_int length) {
-
+                   register const u_char *p, u_int length)
+{
     switch(p[0]) {
     case 0x45:
     case 0x46:
@@ -1071,7 +1065,6 @@ ip_heuristic_guess(netdissect_options *ndo,
     case 0x4f:
 	    ip_print(ndo, p, length);
 	    break;
-#ifdef INET6
     case 0x60:
     case 0x61:
     case 0x62:
@@ -1090,7 +1083,6 @@ ip_heuristic_guess(netdissect_options *ndo,
     case 0x6f:
         ip6_print(ndo, p, length);
         break;
-#endif
     default:
         return 0; /* did not find a ip header */
         break;
@@ -1099,8 +1091,8 @@ ip_heuristic_guess(netdissect_options *ndo,
 }
 
 static int
-juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len) {
-
+juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len)
+{
    int tlv_value;
 
    /* TLVs < 128 are little endian encoded */
@@ -1147,8 +1139,8 @@ juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len) {
 
 static int
 juniper_parse_header(netdissect_options *ndo,
-                     const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info) {
-
+                     const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info)
+{
     const struct juniper_cookie_table_t *lp = juniper_cookie_table;
     u_int idx, jnx_ext_len, jnx_header_len = 0;
     uint8_t tlv_type,tlv_len;
diff --git a/contrib/tcpdump/print-ldp.c b/contrib/tcpdump/print-ldp.c
index fc5ff42e67fb..3f741d136ce4 100644
--- a/contrib/tcpdump/print-ldp.c
+++ b/contrib/tcpdump/print-ldp.c
@@ -209,7 +209,7 @@ static const struct tok ldp_fec_martini_ifparm_vccv_cv_values[] = {
     { 0, NULL}
 };
 
-static int ldp_msg_print(netdissect_options *, register const u_char *);
+static int ldp_pdu_print(netdissect_options *, register const u_char *);
 
 /*
  * ldp tlv header
@@ -233,8 +233,9 @@ static int ldp_msg_print(netdissect_options *, register const u_char *);
 
 static int
 ldp_tlv_print(netdissect_options *ndo,
-              register const u_char *tptr) {
-
+              register const u_char *tptr,
+              u_short msg_tlen)
+{
     struct ldp_tlv_header {
         uint8_t type[2];
         uint8_t length[2];
@@ -248,7 +249,12 @@ ldp_tlv_print(netdissect_options *ndo,
     int i;
 
     ldp_tlv_header = (const struct ldp_tlv_header *)tptr;
+    ND_TCHECK(*ldp_tlv_header);
     tlv_len=EXTRACT_16BITS(ldp_tlv_header->length);
+    if (tlv_len + 4 > msg_tlen) {
+        ND_PRINT((ndo, "\n\t\t TLV contents go past end of message"));
+        return 0;
+    }
     tlv_tlen=tlv_len;
     tlv_type=LDP_MASK_TLV_TYPE(EXTRACT_16BITS(ldp_tlv_header->type));
 
@@ -403,8 +409,11 @@ ldp_tlv_print(netdissect_options *ndo,
                    EXTRACT_32BITS(tptr+3),
 		   EXTRACT_32BITS(tptr+7),
                    vc_info_len));
-            if (vc_info_len < 4)
-                goto trunc; /* minimum 4, for the VC ID */
+            if (vc_info_len < 4) {
+                /* minimum 4, for the VC ID */
+                ND_PRINT((ndo, " (invalid, < 4"));
+                return(tlv_len+4); /* Type & Length fields not included */
+	    }
             vc_info_len -= 4; /* subtract out the VC ID, giving the length of the interface parameters */
 
             /* Skip past the fixed information and the VC ID */
@@ -536,11 +545,11 @@ ldp_tlv_print(netdissect_options *ndo,
 
 void
 ldp_print(netdissect_options *ndo,
-          register const u_char *pptr, register u_int len) {
-
+          register const u_char *pptr, register u_int len)
+{
     int processed;
     while (len > (sizeof(struct ldp_common_header) + sizeof(struct ldp_msg_header))) {
-        processed = ldp_msg_print(ndo, pptr);
+        processed = ldp_pdu_print(ndo, pptr);
         if (processed == 0)
             return;
         len -= processed;
@@ -549,9 +558,9 @@ ldp_print(netdissect_options *ndo,
 }
 
 static int
-ldp_msg_print(netdissect_options *ndo,
-              register const u_char *pptr) {
-
+ldp_pdu_print(netdissect_options *ndo,
+              register const u_char *pptr)
+{
     const struct ldp_common_header *ldp_com_header;
     const struct ldp_msg_header *ldp_msg_header;
     const u_char *tptr,*msg_tptr;
@@ -559,7 +568,6 @@ ldp_msg_print(netdissect_options *ndo,
     u_short pdu_len,msg_len,msg_type,msg_tlen;
     int hexdump,processed;
 
-    tptr=pptr;
     ldp_com_header = (const struct ldp_common_header *)pptr;
     ND_TCHECK(*ldp_com_header);
 
@@ -573,8 +581,17 @@ ldp_msg_print(netdissect_options *ndo,
 	return 0;
     }
 
-    /* print the LSR-ID, label-space & length */
     pdu_len = EXTRACT_16BITS(&ldp_com_header->pdu_length);
+    if (pdu_len < sizeof(const struct ldp_common_header)-4) {
+        /* length too short */
+        ND_PRINT((ndo, "%sLDP, pdu-length: %u (too short, < %u)",
+               (ndo->ndo_vflag < 1) ? "" : "\n\t",
+               pdu_len,
+               (u_int)(sizeof(const struct ldp_common_header)-4)));
+        return 0;
+    }
+
+    /* print the LSR-ID, label-space & length */
     ND_PRINT((ndo, "%sLDP, Label-Space-ID: %s:%u, pdu-length: %u",
            (ndo->ndo_vflag < 1) ? "" : "\n\t",
            ipaddr_string(ndo, &ldp_com_header->lsr_id),
@@ -586,10 +603,8 @@ ldp_msg_print(netdissect_options *ndo,
         return 0;
 
     /* ok they seem to want to know everything - lets fully decode it */
-    tlen=pdu_len;
-
-    tptr += sizeof(const struct ldp_common_header);
-    tlen -= sizeof(const struct ldp_common_header)-4;	/* Type & Length fields not included */
+    tptr = pptr + sizeof(const struct ldp_common_header);
+    tlen = pdu_len - (sizeof(const struct ldp_common_header)-4);	/* Type & Length fields not included */
 
     while(tlen>0) {
         /* did we capture enough for fully decoding the msg header ? */
@@ -599,6 +614,19 @@ ldp_msg_print(netdissect_options *ndo,
         msg_len=EXTRACT_16BITS(ldp_msg_header->length);
         msg_type=LDP_MASK_MSG_TYPE(EXTRACT_16BITS(ldp_msg_header->type));
 
+        if (msg_len < sizeof(struct ldp_msg_header)-4) {
+            /* length too short */
+            /* FIXME vendor private / experimental check */
+            ND_PRINT((ndo, "\n\t  %s Message (0x%04x), length: %u (too short, < %u)",
+                   tok2str(ldp_msg_values,
+                           "Unknown",
+                           msg_type),
+                   msg_type,
+                   msg_len,
+                   (u_int)(sizeof(struct ldp_msg_header)-4)));
+            return 0;
+        }
+
         /* FIXME vendor private / experimental check */
         ND_PRINT((ndo, "\n\t  %s Message (0x%04x), length: %u, Message ID: 0x%08x, Flags: [%s if unknown]",
                tok2str(ldp_msg_values,
@@ -609,11 +637,8 @@ ldp_msg_print(netdissect_options *ndo,
                EXTRACT_32BITS(&ldp_msg_header->id),
                LDP_MASK_U_BIT(EXTRACT_16BITS(&ldp_msg_header->type)) ? "continue processing" : "ignore"));
 
-        if (msg_len == 0) /* infinite loop protection */
-            return 0;
-
         msg_tptr=tptr+sizeof(struct ldp_msg_header);
-        msg_tlen=msg_len-sizeof(struct ldp_msg_header)+4; /* Type & Length fields not included */
+        msg_tlen=msg_len-(sizeof(struct ldp_msg_header)-4); /* Type & Length fields not included */
 
         /* did we capture enough for fully decoding the message ? */
         ND_TCHECK2(*tptr, msg_len);
@@ -630,7 +655,7 @@ ldp_msg_print(netdissect_options *ndo,
         case LDP_MSG_ADDRESS_WITHDRAW:
         case LDP_MSG_LABEL_WITHDRAW:
             while(msg_tlen >= 4) {
-                processed = ldp_tlv_print(ndo, msg_tptr);
+                processed = ldp_tlv_print(ndo, msg_tptr, msg_tlen);
                 if (processed == 0)
                     break;
                 msg_tlen-=processed;
diff --git a/contrib/tcpdump/print-lldp.c b/contrib/tcpdump/print-lldp.c
index e499507bba7e..ce3c09382a65 100644
--- a/contrib/tcpdump/print-lldp.c
+++ b/contrib/tcpdump/print-lldp.c
@@ -1265,8 +1265,8 @@ lldp_private_dcbx_print(netdissect_options *ndo,
 }
 
 static char *
-lldp_network_addr_print(netdissect_options *ndo, const u_char *tptr, u_int len) {
-
+lldp_network_addr_print(netdissect_options *ndo, const u_char *tptr, u_int len)
+{
     uint8_t af;
     static char buf[BUFSIZE];
     const char * (*pfunc)(netdissect_options *, const u_char *);
@@ -1311,8 +1311,8 @@ lldp_network_addr_print(netdissect_options *ndo, const u_char *tptr, u_int len)
 
 static int
 lldp_mgmt_addr_tlv_print(netdissect_options *ndo,
-                         const u_char *pptr, u_int len) {
-
+                         const u_char *pptr, u_int len)
+{
     uint8_t mgmt_addr_len, intf_num_subtype, oid_len;
     const u_char *tptr;
     u_int tlen;
@@ -1373,8 +1373,8 @@ lldp_mgmt_addr_tlv_print(netdissect_options *ndo,
 
 void
 lldp_print(netdissect_options *ndo,
-           register const u_char *pptr, register u_int len) {
-
+           register const u_char *pptr, register u_int len)
+{
     uint8_t subtype;
     uint16_t tlv, cap, ena_cap;
     u_int oui, tlen, hexdump, tlv_type, tlv_len;
diff --git a/contrib/tcpdump/print-lmp.c b/contrib/tcpdump/print-lmp.c
index 8d68e858fb7b..904dd712986e 100644
--- a/contrib/tcpdump/print-lmp.c
+++ b/contrib/tcpdump/print-lmp.c
@@ -354,8 +354,8 @@ static const struct tok lmp_ctype_values[] = {
 
 void
 lmp_print(netdissect_options *ndo,
-          register const u_char *pptr, register u_int len) {
-
+          register const u_char *pptr, register u_int len)
+{
     const struct lmp_common_header *lmp_com_header;
     const struct lmp_object_header *lmp_obj_header;
     const u_char *tptr,*obj_tptr;
diff --git a/contrib/tcpdump/print-lspping.c b/contrib/tcpdump/print-lspping.c
index 3124ca0815eb..888adfafbcdc 100644
--- a/contrib/tcpdump/print-lspping.c
+++ b/contrib/tcpdump/print-lspping.c
@@ -458,8 +458,8 @@ static const struct tok lspping_tlv_downstream_addr_values[] = {
 
 void
 lspping_print(netdissect_options *ndo,
-              register const u_char *pptr, register u_int len) {
-
+              register const u_char *pptr, register u_int len)
+{
     const struct lspping_common_header *lspping_com_header;
     const struct lspping_tlv_header *lspping_tlv_header;
     const struct lspping_tlv_header *lspping_subtlv_header;
@@ -768,7 +768,7 @@ lspping_print(netdissect_options *ndo,
 
         case LSPPING_TLV_DOWNSTREAM_MAPPING:
             /* that strange thing with the downstream map TLV is that until now
-             * we do not know if its IPv4 or IPv6 , after we found the adress-type
+             * we do not know if its IPv4 or IPv6 , after we found the address-type
              * lets recast the tlv_tptr and move on */
 
             tlv_ptr.lspping_tlv_downstream_map_ipv4= \
diff --git a/contrib/tcpdump/print-lwapp.c b/contrib/tcpdump/print-lwapp.c
index 6e02cd481c0e..5b8683f76905 100644
--- a/contrib/tcpdump/print-lwapp.c
+++ b/contrib/tcpdump/print-lwapp.c
@@ -12,7 +12,7 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *
- * Support for the Light Weight Access Point Protocol as per draft-ohara-capwap-lwapp-04
+ * Support for the Light Weight Access Point Protocol as per RFC 5412
  *
  * Original code by Carles Kishimoto 
  */
@@ -162,8 +162,8 @@ struct lwapp_message_header {
 
 void
 lwapp_control_print(netdissect_options *ndo,
-                    const u_char *pptr, u_int len, int has_ap_ident) {
-
+                    const u_char *pptr, u_int len, int has_ap_ident)
+{
     const struct lwapp_transport_header *lwapp_trans_header;
     const struct lwapp_control_header *lwapp_control_header;
     const u_char *tptr;
@@ -285,8 +285,8 @@ lwapp_control_print(netdissect_options *ndo,
 
 void
 lwapp_data_print(netdissect_options *ndo,
-                 const u_char *pptr, u_int len) {
-
+                 const u_char *pptr, u_int len)
+{
     const struct lwapp_transport_header *lwapp_trans_header;
     const u_char *tptr;
     int tlen;
diff --git a/contrib/tcpdump/print-mobility.c b/contrib/tcpdump/print-mobility.c
index 83447cff15d4..b6fa61e9dc74 100644
--- a/contrib/tcpdump/print-mobility.c
+++ b/contrib/tcpdump/print-mobility.c
@@ -69,6 +69,18 @@ struct ip6_mobility {
 #define IP6M_BINDING_UPDATE	5	/* Binding Update */
 #define IP6M_BINDING_ACK	6	/* Binding Acknowledgement */
 #define IP6M_BINDING_ERROR	7	/* Binding Error */
+#define IP6M_MAX		7
+
+static const unsigned ip6m_hdrlen[IP6M_MAX + 1] = {
+	IP6M_MINLEN,      /* IP6M_BINDING_REQUEST  */
+	IP6M_MINLEN + 8,  /* IP6M_HOME_TEST_INIT   */
+	IP6M_MINLEN + 8,  /* IP6M_CAREOF_TEST_INIT */
+	IP6M_MINLEN + 16, /* IP6M_HOME_TEST        */
+	IP6M_MINLEN + 16, /* IP6M_CAREOF_TEST      */
+	IP6M_MINLEN + 4,  /* IP6M_BINDING_UPDATE   */
+	IP6M_MINLEN + 4,  /* IP6M_BINDING_ACK      */
+	IP6M_MINLEN + 16, /* IP6M_BINDING_ERROR    */
+};
 
 /* XXX: unused */
 #define IP6MOPT_BU_MINLEN	10
@@ -95,16 +107,20 @@ mobility_opt_print(netdissect_options *ndo,
 	unsigned i, optlen;
 
 	for (i = 0; i < len; i += optlen) {
+		ND_TCHECK(bp[i]);
 		if (bp[i] == IP6MOPT_PAD1)
 			optlen = 1;
 		else {
-			if (i + 1 < len)
+			if (i + 1 < len) {
+				ND_TCHECK(bp[i + 1]);
 				optlen = bp[i + 1] + 2;
+			}
 			else
 				goto trunc;
 		}
 		if (i + optlen > len)
 			goto trunc;
+		ND_TCHECK(bp[i + optlen]);
 
 		switch (bp[i]) {
 		case IP6MOPT_PAD1:
@@ -203,6 +219,10 @@ mobility_print(netdissect_options *ndo,
 
 	ND_TCHECK(mh->ip6m_type);
 	type = mh->ip6m_type;
+	if (type <= IP6M_MAX && mhlen < ip6m_hdrlen[type]) {
+		ND_PRINT((ndo, "(header length %u is too small for type %u)", mhlen, type));
+		goto trunc;
+	}
 	switch (type) {
 	case IP6M_BINDING_REQUEST:
 		ND_PRINT((ndo, "mobility: BRR"));
diff --git a/contrib/tcpdump/print-mpcp.c b/contrib/tcpdump/print-mpcp.c
index 7ddfb1d12e38..9da3582d5409 100644
--- a/contrib/tcpdump/print-mpcp.c
+++ b/contrib/tcpdump/print-mpcp.c
@@ -122,8 +122,8 @@ static const struct tok mpcp_reg_ack_flag_values[] = {
 };
 
 void
-mpcp_print(netdissect_options *ndo, register const u_char *pptr, register u_int length) {
-
+mpcp_print(netdissect_options *ndo, register const u_char *pptr, register u_int length)
+{
     union {
         const struct mpcp_common_header_t *common_header;
         const struct mpcp_grant_t *grant;
diff --git a/contrib/tcpdump/print-mpls.c b/contrib/tcpdump/print-mpls.c
index 039781ada2d1..bc34d50623d3 100644
--- a/contrib/tcpdump/print-mpls.c
+++ b/contrib/tcpdump/print-mpls.c
@@ -186,11 +186,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 		break;
 
 	case PT_IPV6:
-#ifdef INET6
 		ip6_print(ndo, p, length - (p - bp));
-#else
-		ND_PRINT((ndo, "IPv6, length: %u", length));
-#endif
 		break;
 
 	case PT_OSI:
diff --git a/contrib/tcpdump/print-nflog.c b/contrib/tcpdump/print-nflog.c
index cd0428bc2862..95da4cba4f2d 100644
--- a/contrib/tcpdump/print-nflog.c
+++ b/contrib/tcpdump/print-nflog.c
@@ -145,11 +145,11 @@ nflog_if_print(netdissect_options *ndo,
 		ip_print(ndo, p, length);
 		break;
 
-#ifdef INET6
+#ifdef AF_INET6
 	case AF_INET6:
 		ip6_print(ndo, p, length);
 		break;
-#endif /*INET6*/
+#endif /* AF_INET6 */
 
 	default:
 		if (!ndo->ndo_eflag)
diff --git a/contrib/tcpdump/print-null.c b/contrib/tcpdump/print-null.c
index 02416e334f5c..d296089bede1 100644
--- a/contrib/tcpdump/print-null.c
+++ b/contrib/tcpdump/print-null.c
@@ -111,13 +111,11 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 		ip_print(ndo, p, length);
 		break;
 
-#ifdef INET6
 	case BSD_AFNUM_INET6_BSD:
 	case BSD_AFNUM_INET6_FREEBSD:
 	case BSD_AFNUM_INET6_DARWIN:
 		ip6_print(ndo, p, length);
 		break;
-#endif
 
 	case BSD_AFNUM_ISO:
 		isoclns_print(ndo, p, length, caplen);
diff --git a/contrib/tcpdump/print-olsr.c b/contrib/tcpdump/print-olsr.c
index 6fa0d76c3cd1..b90eea1aa304 100644
--- a/contrib/tcpdump/print-olsr.c
+++ b/contrib/tcpdump/print-olsr.c
@@ -178,7 +178,7 @@ struct olsr_lq_neighbor6 {
 /*
  * print a neighbor list with LQ extensions.
  */
-static void
+static int
 olsr_print_lq_neighbor4(netdissect_options *ndo,
                         const u_char *msg_data, u_int hello_len)
 {
@@ -187,6 +187,8 @@ olsr_print_lq_neighbor4(netdissect_options *ndo,
     while (hello_len >= sizeof(struct olsr_lq_neighbor4)) {
 
         lq_neighbor = (struct olsr_lq_neighbor4 *)msg_data;
+        if (!ND_TTEST(*lq_neighbor))
+            return (-1);
 
         ND_PRINT((ndo, "\n\t      neighbor %s, link-quality %.2lf%%"
                ", neighbor-link-quality %.2lf%%",
@@ -197,10 +199,11 @@ olsr_print_lq_neighbor4(netdissect_options *ndo,
         msg_data += sizeof(struct olsr_lq_neighbor4);
         hello_len -= sizeof(struct olsr_lq_neighbor4);
     }
+    return (0);
 }
 
 #if INET6
-static void
+static int
 olsr_print_lq_neighbor6(netdissect_options *ndo,
                         const u_char *msg_data, u_int hello_len)
 {
@@ -209,6 +212,8 @@ olsr_print_lq_neighbor6(netdissect_options *ndo,
     while (hello_len >= sizeof(struct olsr_lq_neighbor6)) {
 
         lq_neighbor = (struct olsr_lq_neighbor6 *)msg_data;
+        if (!ND_TTEST(*lq_neighbor))
+            return (-1);
 
         ND_PRINT((ndo, "\n\t      neighbor %s, link-quality %.2lf%%"
                ", neighbor-link-quality %.2lf%%",
@@ -219,13 +224,14 @@ olsr_print_lq_neighbor6(netdissect_options *ndo,
         msg_data += sizeof(struct olsr_lq_neighbor6);
         hello_len -= sizeof(struct olsr_lq_neighbor6);
     }
+    return (0);
 }
 #endif /* INET6 */
 
 /*
  * print a neighbor list.
  */
-static void
+static int
 olsr_print_neighbor(netdissect_options *ndo,
                     const u_char *msg_data, u_int hello_len)
 {
@@ -236,6 +242,8 @@ olsr_print_neighbor(netdissect_options *ndo,
 
     while (hello_len >= sizeof(struct in_addr)) {
 
+        if (!ND_TTEST2(*msg_data, sizeof(struct in_addr)))
+            return (-1);
         /* print 4 neighbors per line */
 
         ND_PRINT((ndo, "%s%s", ipaddr_string(ndo, msg_data),
@@ -244,6 +252,7 @@ olsr_print_neighbor(netdissect_options *ndo,
         msg_data += sizeof(struct in_addr);
         hello_len -= sizeof(struct in_addr);
     }
+    return (0);
 }
 
 
@@ -326,6 +335,9 @@ olsr_print(netdissect_options *ndo,
                     ME_TO_DOUBLE(msgptr.v6->vtime),
                     EXTRACT_16BITS(msgptr.v6->msg_seq),
                     msg_len, (msg_len_valid == 0) ? " (invalid)" : ""));
+            if (!msg_len_valid) {
+                return;
+            }
 
             msg_tlen = msg_len - sizeof(struct olsr_msg6);
             msg_data = tptr + sizeof(struct olsr_msg6);
@@ -354,6 +366,9 @@ olsr_print(netdissect_options *ndo,
                     ME_TO_DOUBLE(msgptr.v4->vtime),
                     EXTRACT_16BITS(msgptr.v4->msg_seq),
                     msg_len, (msg_len_valid == 0) ? " (invalid)" : ""));
+            if (!msg_len_valid) {
+                return;
+            }
 
             msg_tlen = msg_len - sizeof(struct olsr_msg4);
             msg_data = tptr + sizeof(struct olsr_msg4);
@@ -362,6 +377,8 @@ olsr_print(netdissect_options *ndo,
         switch (msg_type) {
         case OLSR_HELLO_MSG:
         case OLSR_HELLO_LQ_MSG:
+            if (msg_tlen < sizeof(struct olsr_hello))
+                goto trunc;
             ND_TCHECK2(*msg_data, sizeof(struct olsr_hello));
 
             ptr.hello = (struct olsr_hello *)msg_data;
@@ -401,15 +418,21 @@ olsr_print(netdissect_options *ndo,
                 msg_tlen -= sizeof(struct olsr_hello_link);
                 hello_len -= sizeof(struct olsr_hello_link);
 
+                ND_TCHECK2(*msg_data, hello_len);
                 if (msg_type == OLSR_HELLO_MSG) {
-                    olsr_print_neighbor(ndo, msg_data, hello_len);
+                    if (olsr_print_neighbor(ndo, msg_data, hello_len) == -1)
+                        goto trunc;
                 } else {
 #if INET6
-                    if (is_ipv6)
-                        olsr_print_lq_neighbor6(ndo, msg_data, hello_len);
-                    else
+                    if (is_ipv6) {
+                        if (olsr_print_lq_neighbor6(ndo, msg_data, hello_len) == -1)
+                            goto trunc;
+                    } else
 #endif
-                        olsr_print_lq_neighbor4(ndo, msg_data, hello_len);
+                    {
+                        if (olsr_print_lq_neighbor4(ndo, msg_data, hello_len) == -1)
+                            goto trunc;
+                    }
                 }
 
                 msg_data += hello_len;
@@ -419,6 +442,8 @@ olsr_print(netdissect_options *ndo,
 
         case OLSR_TC_MSG:
         case OLSR_TC_LQ_MSG:
+            if (msg_tlen < sizeof(struct olsr_tc))
+                goto trunc;
             ND_TCHECK2(*msg_data, sizeof(struct olsr_tc));
 
             ptr.tc = (struct olsr_tc *)msg_data;
@@ -428,14 +453,19 @@ olsr_print(netdissect_options *ndo,
             msg_tlen -= sizeof(struct olsr_tc);
 
             if (msg_type == OLSR_TC_MSG) {
-                olsr_print_neighbor(ndo, msg_data, msg_tlen);
+                if (olsr_print_neighbor(ndo, msg_data, msg_tlen) == -1)
+                    goto trunc;
             } else {
 #if INET6
-                if (is_ipv6)
-                    olsr_print_lq_neighbor6(ndo, msg_data, msg_tlen);
-                else
+                if (is_ipv6) {
+                    if (olsr_print_lq_neighbor6(ndo, msg_data, msg_tlen) == -1)
+                        goto trunc;
+                } else
 #endif
-                    olsr_print_lq_neighbor4(ndo, msg_data, msg_tlen);
+                {
+                    if (olsr_print_lq_neighbor4(ndo, msg_data, msg_tlen) == -1)
+                        goto trunc;
+                }
             }
             break;
 
@@ -579,7 +609,7 @@ olsr_print(netdissect_options *ndo,
 #endif
                     ND_PRINT((ndo, ", address %s, name \"",
                             ipaddr_string(ndo, msg_data)));
-                fn_printn(ndo, msg_data + addr_size, name_entry_len, NULL);
+                (void)fn_printn(ndo, msg_data + addr_size, name_entry_len, NULL);
                 ND_PRINT((ndo, "\""));
 
                 msg_data += addr_size + name_entry_len + name_entry_padding;
diff --git a/contrib/tcpdump/print-openflow-1.0.c b/contrib/tcpdump/print-openflow-1.0.c
index a26f2dc0cdb3..a36c32f3b29a 100644
--- a/contrib/tcpdump/print-openflow-1.0.c
+++ b/contrib/tcpdump/print-openflow-1.0.c
@@ -8,6 +8,16 @@
  *
  * [OF10] http://www.openflow.org/documents/openflow-spec-v1.0.0.pdf
  *
+ * Most functions in this file take 3 arguments into account:
+ * * cp -- the pointer to the first octet to decode
+ * * len -- the length of the current structure as declared on the wire
+ * * ep -- the pointer to the end of the captured frame
+ * They return either the pointer to the next not-yet-decoded part of the frame
+ * or the value of ep, which means the current frame processing is over as it
+ * has been fully decoded or is malformed or truncated. This way it is possible
+ * to chain and nest such functions uniformly to decode an OF1.0 message, which
+ * consists of several layers of nested structures.
+ *
  * Decoding of Ethernet frames nested in OFPT_PACKET_IN and OFPT_PACKET_OUT
  * messages is done only when the verbosity level set by command-line argument
  * is "-vvv" or higher. In that case the verbosity level is temporarily
@@ -15,6 +25,10 @@
  * tcpdump with "-vvvv" will do full decoding of OpenFlow and "-v" decoding of
  * the nested frames.
  *
+ * Partial decoding of Big Switch Networks vendor extensions is done after the
+ * oftest (OpenFlow Testing Framework) and Loxigen (library generator) source
+ * code.
+ *
  *
  * Copyright (c) 2013 The TCPDUMP project
  * All rights reserved.
@@ -55,6 +69,7 @@
 #include "ether.h"
 #include "ethertype.h"
 #include "ipproto.h"
+#include "oui.h"
 #include "openflow.h"
 
 static const char tstr[] = " [|openflow]";
@@ -580,8 +595,109 @@ static const struct tok empty_str[] = {
 #define SERIAL_NUM_LEN             32
 #define OFP_VLAN_NONE          0xffff
 
+/* vendor extensions */
+#define BSN_SET_IP_MASK                    0
+#define BSN_GET_IP_MASK_REQUEST            1
+#define BSN_GET_IP_MASK_REPLY              2
+#define BSN_SET_MIRRORING                  3
+#define BSN_GET_MIRRORING_REQUEST          4
+#define BSN_GET_MIRRORING_REPLY            5
+#define BSN_SHELL_COMMAND                  6
+#define BSN_SHELL_OUTPUT                   7
+#define BSN_SHELL_STATUS                   8
+#define BSN_GET_INTERFACES_REQUEST         9
+#define BSN_GET_INTERFACES_REPLY          10
+#define BSN_SET_PKTIN_SUPPRESSION_REQUEST 11
+#define BSN_SET_L2_TABLE_REQUEST          12
+#define BSN_GET_L2_TABLE_REQUEST          13
+#define BSN_GET_L2_TABLE_REPLY            14
+#define BSN_VIRTUAL_PORT_CREATE_REQUEST   15
+#define BSN_VIRTUAL_PORT_CREATE_REPLY     16
+#define BSN_VIRTUAL_PORT_REMOVE_REQUEST   17
+#define BSN_BW_ENABLE_SET_REQUEST         18
+#define BSN_BW_ENABLE_GET_REQUEST         19
+#define BSN_BW_ENABLE_GET_REPLY           20
+#define BSN_BW_CLEAR_DATA_REQUEST         21
+#define BSN_BW_CLEAR_DATA_REPLY           22
+#define BSN_BW_ENABLE_SET_REPLY           23
+#define BSN_SET_L2_TABLE_REPLY            24
+#define BSN_SET_PKTIN_SUPPRESSION_REPLY   25
+#define BSN_VIRTUAL_PORT_REMOVE_REPLY     26
+#define BSN_HYBRID_GET_REQUEST            27
+#define BSN_HYBRID_GET_REPLY              28
+                                       /* 29 */
+                                       /* 30 */
+#define BSN_PDU_TX_REQUEST                31
+#define BSN_PDU_TX_REPLY                  32
+#define BSN_PDU_RX_REQUEST                33
+#define BSN_PDU_RX_REPLY                  34
+#define BSN_PDU_RX_TIMEOUT                35
+
+static const struct tok bsn_subtype_str[] = {
+	{ BSN_SET_IP_MASK,                   "SET_IP_MASK"                   },
+	{ BSN_GET_IP_MASK_REQUEST,           "GET_IP_MASK_REQUEST"           },
+	{ BSN_GET_IP_MASK_REPLY,             "GET_IP_MASK_REPLY"             },
+	{ BSN_SET_MIRRORING,                 "SET_MIRRORING"                 },
+	{ BSN_GET_MIRRORING_REQUEST,         "GET_MIRRORING_REQUEST"         },
+	{ BSN_GET_MIRRORING_REPLY,           "GET_MIRRORING_REPLY"           },
+	{ BSN_SHELL_COMMAND,                 "SHELL_COMMAND"                 },
+	{ BSN_SHELL_OUTPUT,                  "SHELL_OUTPUT"                  },
+	{ BSN_SHELL_STATUS,                  "SHELL_STATUS"                  },
+	{ BSN_GET_INTERFACES_REQUEST,        "GET_INTERFACES_REQUEST"        },
+	{ BSN_GET_INTERFACES_REPLY,          "GET_INTERFACES_REPLY"          },
+	{ BSN_SET_PKTIN_SUPPRESSION_REQUEST, "SET_PKTIN_SUPPRESSION_REQUEST" },
+	{ BSN_SET_L2_TABLE_REQUEST,          "SET_L2_TABLE_REQUEST"          },
+	{ BSN_GET_L2_TABLE_REQUEST,          "GET_L2_TABLE_REQUEST"          },
+	{ BSN_GET_L2_TABLE_REPLY,            "GET_L2_TABLE_REPLY"            },
+	{ BSN_VIRTUAL_PORT_CREATE_REQUEST,   "VIRTUAL_PORT_CREATE_REQUEST"   },
+	{ BSN_VIRTUAL_PORT_CREATE_REPLY,     "VIRTUAL_PORT_CREATE_REPLY"     },
+	{ BSN_VIRTUAL_PORT_REMOVE_REQUEST,   "VIRTUAL_PORT_REMOVE_REQUEST"   },
+	{ BSN_BW_ENABLE_SET_REQUEST,         "BW_ENABLE_SET_REQUEST"         },
+	{ BSN_BW_ENABLE_GET_REQUEST,         "BW_ENABLE_GET_REQUEST"         },
+	{ BSN_BW_ENABLE_GET_REPLY,           "BW_ENABLE_GET_REPLY"           },
+	{ BSN_BW_CLEAR_DATA_REQUEST,         "BW_CLEAR_DATA_REQUEST"         },
+	{ BSN_BW_CLEAR_DATA_REPLY,           "BW_CLEAR_DATA_REPLY"           },
+	{ BSN_BW_ENABLE_SET_REPLY,           "BW_ENABLE_SET_REPLY"           },
+	{ BSN_SET_L2_TABLE_REPLY,            "SET_L2_TABLE_REPLY"            },
+	{ BSN_SET_PKTIN_SUPPRESSION_REPLY,   "SET_PKTIN_SUPPRESSION_REPLY"   },
+	{ BSN_VIRTUAL_PORT_REMOVE_REPLY,     "VIRTUAL_PORT_REMOVE_REPLY"     },
+	{ BSN_HYBRID_GET_REQUEST,            "HYBRID_GET_REQUEST"            },
+	{ BSN_HYBRID_GET_REPLY,              "HYBRID_GET_REPLY"              },
+	{ BSN_PDU_TX_REQUEST,                "PDU_TX_REQUEST"                },
+	{ BSN_PDU_TX_REPLY,                  "PDU_TX_REPLY"                  },
+	{ BSN_PDU_RX_REQUEST,                "PDU_RX_REQUEST"                },
+	{ BSN_PDU_RX_REPLY,                  "PDU_RX_REPLY"                  },
+	{ BSN_PDU_RX_TIMEOUT,                "PDU_RX_TIMEOUT"                },
+	{ 0, NULL }
+};
+
+#define BSN_ACTION_MIRROR                  1
+#define BSN_ACTION_SET_TUNNEL_DST          2
+                                        /* 3 */
+#define BSN_ACTION_CHECKSUM                4
+
+static const struct tok bsn_action_subtype_str[] = {
+	{ BSN_ACTION_MIRROR,                 "MIRROR"                        },
+	{ BSN_ACTION_SET_TUNNEL_DST,         "SET_TUNNEL_DST"                },
+	{ BSN_ACTION_CHECKSUM,               "CHECKSUM"                      },
+	{ 0, NULL }
+};
+
+static const struct tok bsn_mirror_copy_stage_str[] = {
+	{ 0, "INGRESS" },
+	{ 1, "EGRESS"  },
+	{ 0, NULL },
+};
+
+static const struct tok bsn_onoff_str[] = {
+	{ 0, "OFF" },
+	{ 1, "ON"  },
+	{ 0, NULL },
+};
+
 static const char *
-vlan_str(const uint16_t vid) {
+vlan_str(const uint16_t vid)
+{
 	static char buf[sizeof("65535 (bogus)")];
 	const char *fmt;
 
@@ -593,7 +709,8 @@ vlan_str(const uint16_t vid) {
 }
 
 static const char *
-pcp_str(const uint8_t pcp) {
+pcp_str(const uint8_t pcp)
+{
 	static char buf[sizeof("255 (bogus)")];
 	snprintf(buf, sizeof(buf), pcp <= 7 ? "%u" : "%u (bogus)", pcp);
 	return buf;
@@ -601,7 +718,8 @@ pcp_str(const uint8_t pcp) {
 
 static void
 of10_bitmap_print(netdissect_options *ndo,
-                  const struct tok *t, const uint32_t v, const uint32_t u) {
+                  const struct tok *t, const uint32_t v, const uint32_t u)
+{
 	const char *sep = " (";
 
 	if (v == 0)
@@ -618,7 +736,8 @@ of10_bitmap_print(netdissect_options *ndo,
 
 static const u_char *
 of10_data_print(netdissect_options *ndo,
-                const u_char *cp, const u_char *ep, const u_int len) {
+                const u_char *cp, const u_char *ep, const u_int len)
+{
 	if (len == 0)
 		return cp;
 	/* data */
@@ -633,16 +752,357 @@ of10_data_print(netdissect_options *ndo,
 	return ep;
 }
 
-/* Vendor ID is mandatory, data is optional. */
 static const u_char *
-of10_vendor_data_print(netdissect_options *ndo,
-                       const u_char *cp, const u_char *ep, const u_int len) {
+of10_bsn_message_print(netdissect_options *ndo,
+                       const u_char *cp, const u_char *ep, const u_int len)
+{
+	const u_char *cp0 = cp;
+	uint32_t subtype;
+
+	if (len < 4)
+		goto corrupt;
+	/* subtype */
+	ND_TCHECK2(*cp, 4);
+	subtype = EXTRACT_32BITS(cp);
+	cp += 4;
+	ND_PRINT((ndo, "\n\t subtype %s", tok2str(bsn_subtype_str, "unknown (0x%08x)", subtype)));
+	switch (subtype) {
+	case BSN_GET_IP_MASK_REQUEST:
+		/*
+		 *  0                   1                   2                   3
+		 *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+		 * +---------------+---------------+---------------+---------------+
+		 * |                            subtype                            |
+		 * +---------------+---------------+---------------+---------------+
+		 * |     index     |                      pad                      |
+		 * +---------------+---------------+---------------+---------------+
+		 * |                              pad                              |
+		 * +---------------+---------------+---------------+---------------+
+		 *
+		 */
+		if (len != 12)
+			goto corrupt;
+		/* index */
+		ND_TCHECK2(*cp, 1);
+		ND_PRINT((ndo, ", index %u", *cp));
+		cp += 1;
+		/* pad */
+		ND_TCHECK2(*cp, 7);
+		cp += 7;
+		break;
+	case BSN_SET_IP_MASK:
+	case BSN_GET_IP_MASK_REPLY:
+		/*
+		 *  0                   1                   2                   3
+		 *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+		 * +---------------+---------------+---------------+---------------+
+		 * |                            subtype                            |
+		 * +---------------+---------------+---------------+---------------+
+		 * |     index     |                      pad                      |
+		 * +---------------+---------------+---------------+---------------+
+		 * |                              mask                             |
+		 * +---------------+---------------+---------------+---------------+
+		 *
+		 */
+		if (len != 12)
+			goto corrupt;
+		/* index */
+		ND_TCHECK2(*cp, 1);
+		ND_PRINT((ndo, ", index %u", *cp));
+		cp += 1;
+		/* pad */
+		ND_TCHECK2(*cp, 3);
+		cp += 3;
+		/* mask */
+		ND_TCHECK2(*cp, 4);
+		ND_PRINT((ndo, ", mask %s", ipaddr_string(ndo, cp)));
+		cp += 4;
+		break;
+	case BSN_SET_MIRRORING:
+	case BSN_GET_MIRRORING_REQUEST:
+	case BSN_GET_MIRRORING_REPLY:
+		/*
+		 *  0                   1                   2                   3
+		 *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+		 * +---------------+---------------+---------------+---------------+
+		 * |                            subtype                            |
+		 * +---------------+---------------+---------------+---------------+
+		 * | report m. p.  |                      pad                      |
+		 * +---------------+---------------+---------------+---------------+
+		 *
+		 */
+		if (len != 8)
+			goto corrupt;
+		/* report_mirror_ports */
+		ND_TCHECK2(*cp, 1);
+		ND_PRINT((ndo, ", report_mirror_ports %s", tok2str(bsn_onoff_str, "bogus (%u)", *cp)));
+		cp += 1;
+		/* pad */
+		ND_TCHECK2(*cp, 3);
+		cp += 3;
+		break;
+	case BSN_GET_INTERFACES_REQUEST:
+	case BSN_GET_L2_TABLE_REQUEST:
+	case BSN_BW_ENABLE_GET_REQUEST:
+	case BSN_BW_CLEAR_DATA_REQUEST:
+	case BSN_HYBRID_GET_REQUEST:
+		/*
+		 *  0                   1                   2                   3
+		 *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+		 * +---------------+---------------+---------------+---------------+
+		 * |                            subtype                            |
+		 * +---------------+---------------+---------------+---------------+
+		 *
+		 */
+		if (len != 4)
+			goto corrupt;
+		break;
+	case BSN_VIRTUAL_PORT_REMOVE_REQUEST:
+		/*
+		 *  0                   1                   2                   3
+		 *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+		 * +---------------+---------------+---------------+---------------+
+		 * |                            subtype                            |
+		 * +---------------+---------------+---------------+---------------+
+		 * |                           vport_no                            |
+		 * +---------------+---------------+---------------+---------------+
+		 *
+		 */
+		if (len != 8)
+			goto corrupt;
+		/* vport_no */
+		ND_TCHECK2(*cp, 4);
+		ND_PRINT((ndo, ", vport_no %u", EXTRACT_32BITS(cp)));
+		cp += 4;
+		break;
+	case BSN_SHELL_COMMAND:
+		/*
+		 *  0                   1                   2                   3
+		 *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+		 * +---------------+---------------+---------------+---------------+
+		 * |                            subtype                            |
+		 * +---------------+---------------+---------------+---------------+
+		 * |                            service                            |
+		 * +---------------+---------------+---------------+---------------+
+		 * |                             data ...
+		 * +---------------+---------------+--------
+		 *
+		 */
+		if (len < 8)
+			goto corrupt;
+		/* service */
+		ND_TCHECK2(*cp, 4);
+		ND_PRINT((ndo, ", service %u", EXTRACT_32BITS(cp)));
+		cp += 4;
+		/* data */
+		ND_PRINT((ndo, ", data '"));
+		if (fn_printn(ndo, cp, len - 8, ep)) {
+			ND_PRINT((ndo, "'"));
+			goto trunc;
+		}
+		ND_PRINT((ndo, "'"));
+		cp += len - 8;
+		break;
+	case BSN_SHELL_OUTPUT:
+		/*
+		 *  0                   1                   2                   3
+		 *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+		 * +---------------+---------------+---------------+---------------+
+		 * |                            subtype                            |
+		 * +---------------+---------------+---------------+---------------+
+		 * |                             data ...
+		 * +---------------+---------------+--------
+		 *
+		 */
+		/* already checked that len >= 4 */
+		/* data */
+		ND_PRINT((ndo, ", data '"));
+		if (fn_printn(ndo, cp, len - 4, ep)) {
+			ND_PRINT((ndo, "'"));
+			goto trunc;
+		}
+		ND_PRINT((ndo, "'"));
+		cp += len - 4;
+		break;
+	case BSN_SHELL_STATUS:
+		/*
+		 *  0                   1                   2                   3
+		 *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+		 * +---------------+---------------+---------------+---------------+
+		 * |                            subtype                            |
+		 * +---------------+---------------+---------------+---------------+
+		 * |                            status                             |
+		 * +---------------+---------------+---------------+---------------+
+		 *
+		 */
+		if (len != 8)
+			goto corrupt;
+		/* status */
+		ND_TCHECK2(*cp, 4);
+		ND_PRINT((ndo, ", status 0x%08x", EXTRACT_32BITS(cp)));
+		cp += 4;
+		break;
+	default:
+		ND_TCHECK2(*cp, len - 4);
+		cp += len - 4;
+	}
+	return cp;
+
+corrupt: /* skip the undersized data */
+	ND_PRINT((ndo, "%s", cstr));
+	ND_TCHECK2(*cp0, len);
+	return cp0 + len;
+trunc:
+	ND_PRINT((ndo, "%s", tstr));
+	return ep;
+}
+
+static const u_char *
+of10_bsn_actions_print(netdissect_options *ndo,
+                       const u_char *cp, const u_char *ep, const u_int len)
+{
+	const u_char *cp0 = cp;
+	uint32_t subtype, vlan_tag;
+
+	if (len < 4)
+		goto corrupt;
+	/* subtype */
+	ND_TCHECK2(*cp, 4);
+	subtype = EXTRACT_32BITS(cp);
+	cp += 4;
+	ND_PRINT((ndo, "\n\t  subtype %s", tok2str(bsn_action_subtype_str, "unknown (0x%08x)", subtype)));
+	switch (subtype) {
+	case BSN_ACTION_MIRROR:
+		/*
+		 *  0                   1                   2                   3
+		 *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+		 * +---------------+---------------+---------------+---------------+
+		 * |                            subtype                            |
+		 * +---------------+---------------+---------------+---------------+
+		 * |                           dest_port                           |
+		 * +---------------+---------------+---------------+---------------+
+		 * |                           vlan_tag                            |
+		 * +---------------+---------------+---------------+---------------+
+		 * |  copy_stage   |                      pad                      |
+		 * +---------------+---------------+---------------+---------------+
+		 *
+		 */
+		if (len != 16)
+			goto corrupt;
+		/* dest_port */
+		ND_TCHECK2(*cp, 4);
+		ND_PRINT((ndo, ", dest_port %u", EXTRACT_32BITS(cp)));
+		cp += 4;
+		/* vlan_tag */
+		ND_TCHECK2(*cp, 4);
+		vlan_tag = EXTRACT_32BITS(cp);
+		cp += 4;
+		switch (vlan_tag >> 16) {
+		case 0:
+			ND_PRINT((ndo, ", vlan_tag none"));
+			break;
+		case ETHERTYPE_8021Q:
+			ND_PRINT((ndo, ", vlan_tag 802.1Q (%s)", ieee8021q_tci_string(vlan_tag & 0xffff)));
+			break;
+		default:
+			ND_PRINT((ndo, ", vlan_tag unknown (0x%04x)", vlan_tag >> 16));
+		}
+		/* copy_stage */
+		ND_TCHECK2(*cp, 1);
+		ND_PRINT((ndo, ", copy_stage %s", tok2str(bsn_mirror_copy_stage_str, "unknown (%u)", *cp)));
+		cp += 1;
+		/* pad */
+		ND_TCHECK2(*cp, 3);
+		cp += 3;
+		break;
+	default:
+		ND_TCHECK2(*cp, len - 4);
+		cp += len - 4;
+	}
+
+	return cp;
+
+corrupt:
+	ND_PRINT((ndo, "%s", cstr));
+	ND_TCHECK2(*cp0, len);
+	return cp0 + len;
+trunc:
+	ND_PRINT((ndo, "%s", tstr));
+	return ep;
+}
+
+static const u_char *
+of10_vendor_action_print(netdissect_options *ndo,
+                         const u_char *cp, const u_char *ep, const u_int len)
+{
+	uint32_t vendor;
+	const u_char *(*decoder)(netdissect_options *, const u_char *, const u_char *, const u_int);
+
 	if (len < 4)
 		goto corrupt;
 	/* vendor */
 	ND_TCHECK2(*cp, 4);
-	ND_PRINT((ndo, ", vendor 0x%08x", EXTRACT_32BITS(cp)));
+	vendor = EXTRACT_32BITS(cp);
 	cp += 4;
+	ND_PRINT((ndo, ", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)));
+	/* data */
+	decoder =
+		vendor == OUI_BSN         ? of10_bsn_actions_print         :
+		of10_data_print;
+	return decoder(ndo, cp, ep, len - 4);
+
+corrupt: /* skip the undersized data */
+	ND_PRINT((ndo, "%s", cstr));
+	ND_TCHECK2(*cp, len);
+	return cp + len;
+trunc:
+	ND_PRINT((ndo, "%s", tstr));
+	return ep;
+}
+
+static const u_char *
+of10_vendor_message_print(netdissect_options *ndo,
+                          const u_char *cp, const u_char *ep, const u_int len)
+{
+	uint32_t vendor;
+	const u_char *(*decoder)(netdissect_options *, const u_char *, const u_char *, u_int);
+
+	if (len < 4)
+		goto corrupt;
+	/* vendor */
+	ND_TCHECK2(*cp, 4);
+	vendor = EXTRACT_32BITS(cp);
+	cp += 4;
+	ND_PRINT((ndo, ", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)));
+	/* data */
+	decoder =
+		vendor == OUI_BSN         ? of10_bsn_message_print         :
+		of10_data_print;
+	return decoder(ndo, cp, ep, len - 4);
+
+corrupt: /* skip the undersized data */
+	ND_PRINT((ndo, "%s", cstr));
+	ND_TCHECK2(*cp, len);
+	return cp + len;
+trunc:
+	ND_PRINT((ndo, "%s", tstr));
+	return ep;
+}
+
+/* Vendor ID is mandatory, data is optional. */
+static const u_char *
+of10_vendor_data_print(netdissect_options *ndo,
+                       const u_char *cp, const u_char *ep, const u_int len)
+{
+	uint32_t vendor;
+
+	if (len < 4)
+		goto corrupt;
+	/* vendor */
+	ND_TCHECK2(*cp, 4);
+	vendor = EXTRACT_32BITS(cp);
+	cp += 4;
+	ND_PRINT((ndo, ", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)));
 	/* data */
 	return of10_data_print(ndo, cp, ep, len - 4);
 
@@ -657,7 +1117,8 @@ of10_vendor_data_print(netdissect_options *ndo,
 
 static const u_char *
 of10_packet_data_print(netdissect_options *ndo,
-                       const u_char *cp, const u_char *ep, const u_int len) {
+                       const u_char *cp, const u_char *ep, const u_int len)
+{
 	if (len == 0)
 		return cp;
 	/* data */
@@ -679,7 +1140,8 @@ of10_packet_data_print(netdissect_options *ndo,
 /* [OF10] Section 5.2.1 */
 static const u_char *
 of10_phy_ports_print(netdissect_options *ndo,
-                     const u_char *cp, const u_char *ep, u_int len) {
+                     const u_char *cp, const u_char *ep, u_int len)
+{
 	const u_char *cp0 = cp;
 	const u_int len0 = len;
 
@@ -753,7 +1215,8 @@ of10_phy_ports_print(netdissect_options *ndo,
 /* [OF10] Section 5.2.2 */
 static const u_char *
 of10_queue_props_print(netdissect_options *ndo,
-                       const u_char *cp, const u_char *ep, u_int len) {
+                       const u_char *cp, const u_char *ep, u_int len)
+{
 	const u_char *cp0 = cp;
 	const u_int len0 = len;
 	uint16_t property, plen, rate;
@@ -828,7 +1291,8 @@ of10_queue_props_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_queues_print(netdissect_options *ndo,
-                  const u_char *cp, const u_char *ep, u_int len) {
+                  const u_char *cp, const u_char *ep, u_int len)
+{
 	const u_char *cp0 = cp;
 	const u_int len0 = len;
 	uint16_t desclen;
@@ -875,7 +1339,8 @@ of10_queues_print(netdissect_options *ndo,
 /* [OF10] Section 5.2.3 */
 static const u_char *
 of10_match_print(netdissect_options *ndo,
-                 const char *pfx, const u_char *cp, const u_char *ep) {
+                 const char *pfx, const u_char *cp, const u_char *ep)
+{
 	uint32_t wildcards;
 	uint16_t dl_type;
 	uint8_t nw_proto;
@@ -979,7 +1444,8 @@ of10_match_print(netdissect_options *ndo,
 static const u_char *
 of10_actions_print(netdissect_options *ndo,
                    const char *pfx, const u_char *cp, const u_char *ep,
-                   u_int len) {
+                   u_int len)
+{
 	const u_char *cp0 = cp;
 	const u_int len0 = len;
 	uint16_t type, alen, output_port;
@@ -1118,7 +1584,7 @@ of10_actions_print(netdissect_options *ndo,
 			cp += 4;
 			break;
 		case OFPAT_VENDOR:
-			if (ep == (cp = of10_vendor_data_print(ndo, cp, ep, alen - 4)))
+			if (ep == (cp = of10_vendor_action_print(ndo, cp, ep, alen - 4)))
 				return ep; /* end of snapshot */
 			break;
 		case OFPAT_STRIP_VLAN:
@@ -1144,7 +1610,8 @@ of10_actions_print(netdissect_options *ndo,
 /* [OF10] Section 5.3.1 */
 static const u_char *
 of10_features_reply_print(netdissect_options *ndo,
-                          const u_char *cp, const u_char *ep, const u_int len) {
+                          const u_char *cp, const u_char *ep, const u_int len)
+{
 	/* datapath_id */
 	ND_TCHECK2(*cp, 8);
 	ND_PRINT((ndo, "\n\t dpid 0x%016" PRIx64, EXTRACT_64BITS(cp)));
@@ -1181,7 +1648,8 @@ of10_features_reply_print(netdissect_options *ndo,
 /* [OF10] Section 5.3.3 */
 static const u_char *
 of10_flow_mod_print(netdissect_options *ndo,
-                    const u_char *cp, const u_char *ep, const u_int len) {
+                    const u_char *cp, const u_char *ep, const u_int len)
+{
 	uint16_t command;
 
 	/* match */
@@ -1238,7 +1706,8 @@ of10_flow_mod_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_port_mod_print(netdissect_options *ndo,
-                    const u_char *cp, const u_char *ep) {
+                    const u_char *cp, const u_char *ep)
+{
 	/* port_no */
 	ND_TCHECK2(*cp, 2);
 	ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
@@ -1274,7 +1743,8 @@ of10_port_mod_print(netdissect_options *ndo,
 /* [OF10] Section 5.3.5 */
 static const u_char *
 of10_stats_request_print(netdissect_options *ndo,
-                         const u_char *cp, const u_char *ep, u_int len) {
+                         const u_char *cp, const u_char *ep, u_int len)
+{
 	const u_char *cp0 = cp;
 	const u_int len0 = len;
 	uint16_t type;
@@ -1357,7 +1827,8 @@ of10_stats_request_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_desc_stats_reply_print(netdissect_options *ndo,
-                            const u_char *cp, const u_char *ep, const u_int len) {
+                            const u_char *cp, const u_char *ep, const u_int len)
+{
 	if (len != OF_DESC_STATS_LEN)
 		goto corrupt;
 	/* mfr_desc */
@@ -1403,7 +1874,8 @@ of10_desc_stats_reply_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_flow_stats_reply_print(netdissect_options *ndo,
-                            const u_char *cp, const u_char *ep, u_int len) {
+                            const u_char *cp, const u_char *ep, u_int len)
+{
 	const u_char *cp0 = cp;
 	const u_int len0 = len;
 	uint16_t entry_len;
@@ -1484,7 +1956,8 @@ of10_flow_stats_reply_print(netdissect_options *ndo,
 static const u_char *
 of10_aggregate_stats_reply_print(netdissect_options *ndo,
                                  const u_char *cp, const u_char *ep,
-                                 const u_int len) {
+                                 const u_int len)
+{
 	if (len != OF_AGGREGATE_STATS_REPLY_LEN)
 		goto corrupt;
 	/* packet_count */
@@ -1515,7 +1988,8 @@ of10_aggregate_stats_reply_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_table_stats_reply_print(netdissect_options *ndo,
-                             const u_char *cp, const u_char *ep, u_int len) {
+                             const u_char *cp, const u_char *ep, u_int len)
+{
 	const u_char *cp0 = cp;
 	const u_int len0 = len;
 
@@ -1573,7 +2047,8 @@ of10_table_stats_reply_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_port_stats_reply_print(netdissect_options *ndo,
-                            const u_char *cp, const u_char *ep, u_int len) {
+                            const u_char *cp, const u_char *ep, u_int len)
+{
 	const u_char *cp0 = cp;
 	const u_int len0 = len;
 
@@ -1657,7 +2132,8 @@ of10_port_stats_reply_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_queue_stats_reply_print(netdissect_options *ndo,
-                             const u_char *cp, const u_char *ep, u_int len) {
+                             const u_char *cp, const u_char *ep, u_int len)
+{
 	const u_char *cp0 = cp;
 	const u_int len0 = len;
 
@@ -1704,7 +2180,8 @@ of10_queue_stats_reply_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_stats_reply_print(netdissect_options *ndo,
-                       const u_char *cp, const u_char *ep, const u_int len) {
+                       const u_char *cp, const u_char *ep, const u_int len)
+{
 	const u_char *cp0 = cp;
 	uint16_t type;
 
@@ -1743,7 +2220,8 @@ of10_stats_reply_print(netdissect_options *ndo,
 /* [OF10] Section 5.3.6 */
 static const u_char *
 of10_packet_out_print(netdissect_options *ndo,
-                      const u_char *cp, const u_char *ep, const u_int len) {
+                      const u_char *cp, const u_char *ep, const u_int len)
+{
 	const u_char *cp0 = cp;
 	const u_int len0 = len;
 	uint16_t actions_len;
@@ -1780,7 +2258,8 @@ of10_packet_out_print(netdissect_options *ndo,
 /* [OF10] Section 5.4.1 */
 static const u_char *
 of10_packet_in_print(netdissect_options *ndo,
-                     const u_char *cp, const u_char *ep, const u_int len) {
+                     const u_char *cp, const u_char *ep, const u_int len)
+{
 	/* buffer_id */
 	ND_TCHECK2(*cp, 4);
 	ND_PRINT((ndo, "\n\t buffer_id %s", tok2str(bufferid_str, "0x%08x", EXTRACT_32BITS(cp))));
@@ -1812,7 +2291,8 @@ of10_packet_in_print(netdissect_options *ndo,
 /* [OF10] Section 5.4.2 */
 static const u_char *
 of10_flow_removed_print(netdissect_options *ndo,
-                        const u_char *cp, const u_char *ep) {
+                        const u_char *cp, const u_char *ep)
+{
 	/* match */
 	if (ep == (cp = of10_match_print(ndo, "\n\t ", cp, ep)))
 		return ep; /* end of snapshot */
@@ -1865,7 +2345,8 @@ of10_flow_removed_print(netdissect_options *ndo,
 /* [OF10] Section 5.4.4 */
 static const u_char *
 of10_error_print(netdissect_options *ndo,
-                 const u_char *cp, const u_char *ep, const u_int len) {
+                 const u_char *cp, const u_char *ep, const u_int len)
+{
 	uint16_t type;
 	const struct tok *code_str;
 
@@ -1897,7 +2378,8 @@ of10_error_print(netdissect_options *ndo,
 const u_char *
 of10_header_body_print(netdissect_options *ndo,
                        const u_char *cp, const u_char *ep, const uint8_t type,
-                       const uint16_t len, const uint32_t xid) {
+                       const uint16_t len, const uint32_t xid)
+{
 	const u_char *cp0 = cp;
 	const u_int len0 = len;
 	/* Thus far message length is not less than the basic header size, but most
@@ -2003,7 +2485,7 @@ of10_header_body_print(netdissect_options *ndo,
 			goto corrupt;
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
-		return of10_vendor_data_print(ndo, cp, ep, len - OF_HEADER_LEN);
+		return of10_vendor_message_print(ndo, cp, ep, len - OF_HEADER_LEN);
 	case OFPT_PACKET_IN:
 		/* 2 mock octets count in OF_PACKET_IN_LEN but not in len */
 		if (len < OF_PACKET_IN_LEN - 2)
diff --git a/contrib/tcpdump/print-openflow.c b/contrib/tcpdump/print-openflow.c
index 9a675855302c..8825ae3d5c87 100644
--- a/contrib/tcpdump/print-openflow.c
+++ b/contrib/tcpdump/print-openflow.c
@@ -40,22 +40,44 @@
 #include "interface.h"
 #include "extract.h"
 #include "openflow.h"
+#include "oui.h"
 
 static const char tstr[] = " [|openflow]";
 static const char cstr[] = " (corrupt)";
 
 #define OF_VER_1_0    0x01
 
+const struct tok onf_exp_str[] = {
+	{ ONF_EXP_ONF,               "ONF Extensions"                                  },
+	{ ONF_EXP_BUTE,              "Budapest University of Technology and Economics" },
+	{ ONF_EXP_NOVIFLOW,          "NoviFlow"                                        },
+	{ ONF_EXP_L3,                "L3+ Extensions, Vendor Neutral"                  },
+	{ ONF_EXP_L4L7,              "L4-L7 Extensions"                                },
+	{ ONF_EXP_WMOB,              "Wireless and Mobility Extensions"                },
+	{ ONF_EXP_FABS,              "Forwarding Abstractions Extensions"              },
+	{ ONF_EXP_OTRANS,            "Optical Transport Extensions"                    },
+	{ 0, NULL }
+};
+
+const char *
+of_vendor_name(const uint32_t vendor)
+{
+	const struct tok *table = (vendor & 0xff000000) == 0 ? oui_values : onf_exp_str;
+	return tok2str(table, "unknown", vendor);
+}
+
 static void
 of_header_print(netdissect_options *ndo, const uint8_t version, const uint8_t type,
-                      const uint16_t length, const uint32_t xid) {
+                      const uint16_t length, const uint32_t xid)
+{
 	ND_PRINT((ndo, "\n\tversion unknown (0x%02x), type 0x%02x, length %u, xid 0x%08x",
 	       version, type, length, xid));
 }
 
 /* Print a single OpenFlow message. */
 static const u_char *
-of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
+of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{
 	uint8_t version, type;
 	uint16_t length;
 	uint32_t xid;
@@ -110,7 +132,8 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
 /* Print a TCP segment worth of OpenFlow messages presuming the segment begins
  * on a message boundary. */
 void
-openflow_print(netdissect_options *ndo, const u_char *cp, const u_int len) {
+openflow_print(netdissect_options *ndo, const u_char *cp, const u_int len)
+{
 	const u_char *ep = cp + len;
 
 	ND_PRINT((ndo, ": OpenFlow"));
diff --git a/contrib/tcpdump/print-ospf.c b/contrib/tcpdump/print-ospf.c
index b64438fa676f..3583417ad54c 100644
--- a/contrib/tcpdump/print-ospf.c
+++ b/contrib/tcpdump/print-ospf.c
@@ -181,8 +181,8 @@ static const struct tok ospf_lls_eo_options[] = {
 
 int
 ospf_print_grace_lsa(netdissect_options *ndo,
-                     const uint8_t *tptr, u_int ls_length) {
-
+                     const uint8_t *tptr, u_int ls_length)
+{
     u_int tlv_type, tlv_length;
 
 
@@ -264,8 +264,8 @@ ospf_print_grace_lsa(netdissect_options *ndo,
 
 int
 ospf_print_te_lsa(netdissect_options *ndo,
-                  const uint8_t *tptr, u_int ls_length) {
-
+                  const uint8_t *tptr, u_int ls_length)
+{
     u_int tlv_type, tlv_length, subtlv_type, subtlv_length;
     u_int priority_level, te_class, count_srlg;
     union { /* int to float conversion buffer for several subTLVs */
diff --git a/contrib/tcpdump/print-pflog.c b/contrib/tcpdump/print-pflog.c
index 4263a469b527..72ae276320ce 100644
--- a/contrib/tcpdump/print-pflog.c
+++ b/contrib/tcpdump/print-pflog.c
@@ -152,14 +152,16 @@ pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 		        ip_print(ndo, p, length);
 			break;
 
-#ifdef INET6
+#if defined(AF_INET6) || defined(OPENBSD_AF_INET6)
+#ifdef AF_INET6
 		case AF_INET6:
-#if OPENBSD_AF_INET6 != AF_INET6
+#endif /* AF_INET6 */
+#if !defined(AF_INET6) || OPENBSD_AF_INET6 != AF_INET6
 		case OPENBSD_AF_INET6:		/* XXX: read pcap files */
-#endif
+#endif /* !defined(AF_INET6) || OPENBSD_AF_INET6 != AF_INET6 */
 			ip6_print(ndo, p, length);
 			break;
-#endif
+#endif /* defined(AF_INET6) || defined(OPENBSD_AF_INET6) */
 
 	default:
 		/* address family not handled, print raw packet */
diff --git a/contrib/tcpdump/print-pim.c b/contrib/tcpdump/print-pim.c
index d6d6f10bb335..6738e37c6a50 100644
--- a/contrib/tcpdump/print-pim.c
+++ b/contrib/tcpdump/print-pim.c
@@ -770,11 +770,11 @@ pimv2_print(netdissect_options *ndo,
 		case 4:	/* IPv4 */
 			ip_print(ndo, bp, len);
 			break;
-#ifdef INET6
+
 		case 6:	/* IPv6 */
 			ip6_print(ndo, bp, len);
 			break;
-#endif
+
 		default:
 			ND_PRINT((ndo, "IP ver %d", IP_V(ip)));
 			break;
diff --git a/contrib/tcpdump/print-ppi.c b/contrib/tcpdump/print-ppi.c
index 2cff56c8144b..b40353636246 100644
--- a/contrib/tcpdump/print-ppi.c
+++ b/contrib/tcpdump/print-ppi.c
@@ -26,8 +26,8 @@ static inline void
 ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
 	const ppi_header_t *hdr;
-	uint32_t dlt;
 	uint16_t len;
+	uint32_t dlt;
 
 	hdr = (const ppi_header_t *)bp;
 
@@ -35,11 +35,11 @@ ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);
 
 	if (!ndo->ndo_qflag) {
-		ND_PRINT((ndo,", V.%d DLT %s (%d) len %d", hdr->ppi_ver,
+		ND_PRINT((ndo, "V.%d DLT %s (%d) len %d", hdr->ppi_ver,
 			  pcap_datalink_val_to_name(dlt), dlt,
                           len));
         } else {
-		ND_PRINT((ndo,", %s", pcap_datalink_val_to_name(dlt)));
+		ND_PRINT((ndo, "%s", pcap_datalink_val_to_name(dlt)));
         }
 
 	ND_PRINT((ndo, ", length %u: ", length));
@@ -54,21 +54,32 @@ ppi_print(netdissect_options *ndo,
 	ppi_header_t *hdr;
 	u_int caplen = h->caplen;
 	u_int length = h->len;
+	uint16_t len;
 	uint32_t dlt;
 
 	if (caplen < sizeof(ppi_header_t)) {
 		ND_PRINT((ndo, "[|ppi]"));
 		return;
 	}
+
 	hdr = (ppi_header_t *)p;
+	len = EXTRACT_LE_16BITS(&hdr->ppi_len);
+	if (len < sizeof(ppi_header_t)) {
+		ND_PRINT((ndo, "[|ppi]"));
+		return;
+	}
+	if (caplen < len) {
+		ND_PRINT((ndo, "[|ppi]"));
+		return;
+	}
 	dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);
 
 	if (ndo->ndo_eflag)
 		ppi_header_print(ndo, p, length);
 
-	length -= sizeof(ppi_header_t);
-	caplen -= sizeof(ppi_header_t);
-	p += sizeof(ppi_header_t);
+	length -= len;
+	caplen -= len;
+	p += len;
 
 	if ((printer = lookup_printer(dlt)) != NULL) {
 		printer(h, p);
@@ -76,8 +87,7 @@ ppi_print(netdissect_options *ndo,
 		ndo_printer(ndo, h, p);
 	} else {
 		if (!ndo->ndo_eflag)
-			ppi_header_print(ndo, (u_char *)hdr,
-					length + sizeof(ppi_header_t));
+			ppi_header_print(ndo, (u_char *)hdr, length + len);
 
 		if (!ndo->ndo_suppress_default_print)
 			ND_DEFAULTPRINT(p, caplen);
diff --git a/contrib/tcpdump/print-ppp.c b/contrib/tcpdump/print-ppp.c
index b1a4729d9357..7e4870d6e973 100644
--- a/contrib/tcpdump/print-ppp.c
+++ b/contrib/tcpdump/print-ppp.c
@@ -807,8 +807,8 @@ static const struct tok ppp_ml_flag_values[] = {
 
 static void
 handle_mlppp(netdissect_options *ndo,
-             const u_char *p, int length) {
-
+             const u_char *p, int length)
+{
     if (!ndo->ndo_eflag)
         ND_PRINT((ndo, "MLPPP, "));
 
@@ -1353,14 +1353,15 @@ static void
 ppp_hdlc(netdissect_options *ndo,
          const u_char *p, int length)
 {
-	u_char *b, *s, *t, c;
+	u_char *b, *t, c;
+	const u_char *s;
 	int i, proto;
 	const void *se;
 
         if (length <= 0)
                 return;
 
-	b = (uint8_t *)malloc(length);
+	b = (u_char *)malloc(length);
 	if (b == NULL)
 		return;
 
@@ -1369,14 +1370,13 @@ ppp_hdlc(netdissect_options *ndo,
 	 * Do this so that we dont overwrite the original packet
 	 * contents.
 	 */
-	for (s = (u_char *)p, t = b, i = length; i > 0; i--) {
+	for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) {
 		c = *s++;
 		if (c == 0x7d) {
-			if (i > 1) {
-				i--;
-				c = *s++ ^ 0x20;
-			} else
-				continue;
+			if (i <= 1 || !ND_TTEST(*s))
+				break;
+			i--;
+			c = *s++ ^ 0x20;
 		}
 		*t++ = c;
 	}
@@ -1394,11 +1394,9 @@ ppp_hdlc(netdissect_options *ndo,
         case PPP_IP:
 		ip_print(ndo, b + 1, length - 1);
 		goto cleanup;
-#ifdef INET6
         case PPP_IPV6:
 		ip6_print(ndo, b + 1, length - 1);
 		goto cleanup;
-#endif
         default: /* no luck - try next guess */
 		break;
         }
@@ -1468,12 +1466,10 @@ handle_ppp(netdissect_options *ndo,
 	case PPP_IP:
 		ip_print(ndo, p, length);
 		break;
-#ifdef INET6
 	case ETHERTYPE_IPV6:	/*XXX*/
 	case PPP_IPV6:
 		ip6_print(ndo, p, length);
 		break;
-#endif
 	case ETHERTYPE_IPX:	/*XXX*/
 	case PPP_IPX:
 		ipx_print(ndo, p, length);
@@ -1783,11 +1779,9 @@ ppp_bsdos_if_print(netdissect_options *ndo _U_,
 			case PPP_IP:
 				ip_print(ndo, p, length);
 				break;
-#ifdef INET6
 			case PPP_IPV6:
 				ip6_print(ndo, p, length);
 				break;
-#endif
 			case PPP_MPLS_UCAST:
 			case PPP_MPLS_MCAST:
 				mpls_print(ndo, p, length);
@@ -1802,11 +1796,9 @@ ppp_bsdos_if_print(netdissect_options *ndo _U_,
 			case PPP_IP:
 				ip_print(ndo, p, length);
 				break;
-#ifdef INET6
 			case PPP_IPV6:
 				ip6_print(ndo, p, length);
 				break;
-#endif
 			case PPP_MPLS_UCAST:
 			case PPP_MPLS_MCAST:
 				mpls_print(ndo, p, length);
@@ -1834,11 +1826,9 @@ ppp_bsdos_if_print(netdissect_options *ndo _U_,
 	case PPP_IP:
 		ip_print(p, length);
 		break;
-#ifdef INET6
 	case PPP_IPV6:
 		ip6_print(ndo, p, length);
 		break;
-#endif
 	case PPP_MPLS_UCAST:
 	case PPP_MPLS_MCAST:
 		mpls_print(ndo, p, length);
diff --git a/contrib/tcpdump/print-radius.c b/contrib/tcpdump/print-radius.c
index 7855fa269c1e..5cf8ad2b6f80 100644
--- a/contrib/tcpdump/print-radius.c
+++ b/contrib/tcpdump/print-radius.c
@@ -37,6 +37,12 @@
  * RFC 2869:
  *      "RADIUS Extensions"
  *
+ * RFC 4675:
+ *      "RADIUS Attributes for Virtual LAN and Priority Support"
+ *
+ * RFC 5176:
+ *      "Dynamic Authorization Extensions to RADIUS"
+ *
  * Alfredo Andres Omella (aandres@s21sec.com) v0.1 2000/09/15
  *
  * TODO: Among other things to print ok MacIntosh and Vendor values
@@ -78,17 +84,29 @@ static const char tstr[] = " [|radius]";
 #define RADCMD_ACCESS_CHA  11 /* Access-Challenge    */
 #define RADCMD_STATUS_SER  12 /* Status-Server       */
 #define RADCMD_STATUS_CLI  13 /* Status-Client       */
+#define RADCMD_DISCON_REQ  40 /* Disconnect-Request  */
+#define RADCMD_DISCON_ACK  41 /* Disconnect-ACK      */
+#define RADCMD_DISCON_NAK  42 /* Disconnect-NAK      */
+#define RADCMD_COA_REQ     43 /* CoA-Request         */
+#define RADCMD_COA_ACK     44 /* CoA-ACK             */
+#define RADCMD_COA_NAK     45 /* CoA-NAK             */
 #define RADCMD_RESERVED   255 /* Reserved            */
 
 static const struct tok radius_command_values[] = {
-    { RADCMD_ACCESS_REQ, "Access Request" },
-    { RADCMD_ACCESS_ACC, "Access Accept" },
-    { RADCMD_ACCESS_REJ, "Access Reject" },
-    { RADCMD_ACCOUN_REQ, "Accounting Request" },
-    { RADCMD_ACCOUN_RES, "Accounting Response" },
-    { RADCMD_ACCESS_CHA, "Access Challenge" },
-    { RADCMD_STATUS_SER, "Status Server" },
-    { RADCMD_STATUS_CLI, "Status Client" },
+    { RADCMD_ACCESS_REQ, "Access-Request" },
+    { RADCMD_ACCESS_ACC, "Access-Accept" },
+    { RADCMD_ACCESS_REJ, "Access-Reject" },
+    { RADCMD_ACCOUN_REQ, "Accounting-Request" },
+    { RADCMD_ACCOUN_RES, "Accounting-Response" },
+    { RADCMD_ACCESS_CHA, "Access-Challenge" },
+    { RADCMD_STATUS_SER, "Status-Server" },
+    { RADCMD_STATUS_CLI, "Status-Client" },
+    { RADCMD_DISCON_REQ, "Disconnect-Request" },
+    { RADCMD_DISCON_ACK, "Disconnect-ACK" },
+    { RADCMD_DISCON_NAK, "Disconnect-NAK" },
+    { RADCMD_COA_REQ,    "CoA-Request" },
+    { RADCMD_COA_ACK,    "CoA-ACK" },
+    { RADCMD_COA_NAK,    "CoA-NAK" },
     { RADCMD_RESERVED,   "Reserved" },
     { 0, NULL}
 };
@@ -109,6 +127,9 @@ static const struct tok radius_command_values[] = {
 #define ACCT_DELAY        41
 #define ACCT_SESSION_TIME 46
 
+#define EGRESS_VLAN_ID   56
+#define EGRESS_VLAN_NAME 58
+
 #define TUNNEL_TYPE        64
 #define TUNNEL_MEDIUM      65
 #define TUNNEL_CLIENT_END  66
@@ -131,6 +152,15 @@ static const struct tok radius_command_values[] = {
 /* End Radius Attribute types */
 /********************************/
 
+#define RFC4675_TAGGED   0x31
+#define RFC4675_UNTAGGED 0x32
+
+static const struct tok rfc4675_tagged[] = {
+    { RFC4675_TAGGED,   "Tagged" },
+    { RFC4675_UNTAGGED, "Untagged" },
+    { 0, NULL}
+};
+
 
 static void print_attr_string(netdissect_options *, register u_char *, u_int, u_short );
 static void print_attr_num(netdissect_options *, register u_char *, u_int, u_short );
@@ -210,6 +240,12 @@ static const char *term_action[]={ "Default",
                                    "RADIUS-Request",
                                  };
 
+/* Ingress-Filters Attribute standard values */
+static const char *ingress_filters[]={ NULL,
+                                       "Enabled",
+                                       "Disabled",
+                                     };
+
 /* NAS-Port-Type Attribute standard values */
 static const char *nas_port_type[]={ "Async",
                                      "Sync",
@@ -337,97 +373,97 @@ struct attrtype { const char *name;      /* Attribute name                 */
                 } attr_type[]=
   {
      { NULL,                              NULL, 0, 0, NULL               },
-     { "Username",                        NULL, 0, 0, print_attr_string  },
-     { "Password",                        NULL, 0, 0, NULL               },
-     { "CHAP Password",                   NULL, 0, 0, NULL               },
-     { "NAS IP Address",                  NULL, 0, 0, print_attr_address },
-     { "NAS Port",                        NULL, 0, 0, print_attr_num     },
-     { "Service Type",                    serv_type, TAM_SIZE(serv_type)-1, 1, print_attr_num },
-     { "Framed Protocol",                 frm_proto, TAM_SIZE(frm_proto)-1, 1, print_attr_num },
-     { "Framed IP Address",               NULL, 0, 0, print_attr_address },
-     { "Framed IP Network",               NULL, 0, 0, print_attr_address },
-     { "Framed Routing",                  frm_routing, TAM_SIZE(frm_routing), 0, print_attr_num },
-     { "Filter ID",                       NULL, 0, 0, print_attr_string  },
-     { "Framed MTU",                      NULL, 0, 0, print_attr_num     },
-     { "Framed Compression",              frm_comp, TAM_SIZE(frm_comp),   0, print_attr_num },
-     { "Login IP Host",                   NULL, 0, 0, print_attr_address },
-     { "Login Service",                   login_serv, TAM_SIZE(login_serv), 0, print_attr_num },
-     { "Login TCP Port",                  NULL, 0, 0, print_attr_num     },
+     { "User-Name",                       NULL, 0, 0, print_attr_string  },
+     { "User-Password",                   NULL, 0, 0, NULL               },
+     { "CHAP-Password",                   NULL, 0, 0, NULL               },
+     { "NAS-IP-Address",                  NULL, 0, 0, print_attr_address },
+     { "NAS-Port",                        NULL, 0, 0, print_attr_num     },
+     { "Service-Type",                    serv_type, TAM_SIZE(serv_type)-1, 1, print_attr_num },
+     { "Framed-Protocol",                 frm_proto, TAM_SIZE(frm_proto)-1, 1, print_attr_num },
+     { "Framed-IP-Address",               NULL, 0, 0, print_attr_address },
+     { "Framed-IP-Netmask",               NULL, 0, 0, print_attr_address },
+     { "Framed-Routing",                  frm_routing, TAM_SIZE(frm_routing), 0, print_attr_num },
+     { "Filter-Id",                       NULL, 0, 0, print_attr_string  },
+     { "Framed-MTU",                      NULL, 0, 0, print_attr_num     },
+     { "Framed-Compression",              frm_comp, TAM_SIZE(frm_comp),   0, print_attr_num },
+     { "Login-IP-Host",                   NULL, 0, 0, print_attr_address },
+     { "Login-Service",                   login_serv, TAM_SIZE(login_serv), 0, print_attr_num },
+     { "Login-TCP-Port",                  NULL, 0, 0, print_attr_num     },
      { "Unassigned",                      NULL, 0, 0, NULL }, /*17*/
-     { "Reply",                           NULL, 0, 0, print_attr_string },
-     { "Callback-number",                 NULL, 0, 0, print_attr_string },
-     { "Callback-ID",                     NULL, 0, 0, print_attr_string },
+     { "Reply-Message",                   NULL, 0, 0, print_attr_string },
+     { "Callback-Number",                 NULL, 0, 0, print_attr_string },
+     { "Callback-Id",                     NULL, 0, 0, print_attr_string },
      { "Unassigned",                      NULL, 0, 0, NULL }, /*21*/
-     { "Framed Route",                    NULL, 0, 0, print_attr_string },
-     { "Framed IPX Network",              NULL, 0, 0, print_attr_num    },
+     { "Framed-Route",                    NULL, 0, 0, print_attr_string },
+     { "Framed-IPX-Network",              NULL, 0, 0, print_attr_num    },
      { "State",                           NULL, 0, 0, print_attr_string },
      { "Class",                           NULL, 0, 0, print_attr_string },
-     { "Vendor Specific",                 NULL, 0, 0, print_vendor_attr },
-     { "Session Timeout",                 NULL, 0, 0, print_attr_num    },
-     { "Idle Timeout",                    NULL, 0, 0, print_attr_num    },
-     { "Termination Action",              term_action, TAM_SIZE(term_action), 0, print_attr_num },
-     { "Called Station",                  NULL, 0, 0, print_attr_string },
-     { "Calling Station",                 NULL, 0, 0, print_attr_string },
-     { "NAS ID",                          NULL, 0, 0, print_attr_string },
-     { "Proxy State",                     NULL, 0, 0, print_attr_string },
-     { "Login LAT Service",               NULL, 0, 0, print_attr_string },
-     { "Login LAT Node",                  NULL, 0, 0, print_attr_string },
-     { "Login LAT Group",                 NULL, 0, 0, print_attr_string },
-     { "Framed Appletalk Link",           NULL, 0, 0, print_attr_num    },
-     { "Framed Appltalk Net",             NULL, 0, 0, print_attr_num    },
-     { "Framed Appletalk Zone",           NULL, 0, 0, print_attr_string },
-     { "Accounting Status",               acct_status, TAM_SIZE(acct_status)-1, 1, print_attr_num },
-     { "Accounting Delay",                NULL, 0, 0, print_attr_num    },
-     { "Accounting Input Octets",         NULL, 0, 0, print_attr_num    },
-     { "Accounting Output Octets",        NULL, 0, 0, print_attr_num    },
-     { "Accounting Session ID",           NULL, 0, 0, print_attr_string },
-     { "Accounting Authentication",       acct_auth, TAM_SIZE(acct_auth)-1, 1, print_attr_num },
-     { "Accounting Session Time",         NULL, 0, 0, print_attr_num },
-     { "Accounting Input Packets",        NULL, 0, 0, print_attr_num },
-     { "Accounting Output Packets",       NULL, 0, 0, print_attr_num },
-     { "Accounting Termination Cause",    acct_term, TAM_SIZE(acct_term)-1, 1, print_attr_num },
-     { "Accounting Multilink Session ID", NULL, 0, 0, print_attr_string },
-     { "Accounting Link Count",           NULL, 0, 0, print_attr_num },
-     { "Accounting Input Giga",           NULL, 0, 0, print_attr_num },
-     { "Accounting Output Giga",          NULL, 0, 0, print_attr_num },
+     { "Vendor-Specific",                 NULL, 0, 0, print_vendor_attr },
+     { "Session-Timeout",                 NULL, 0, 0, print_attr_num    },
+     { "Idle-Timeout",                    NULL, 0, 0, print_attr_num    },
+     { "Termination-Action",              term_action, TAM_SIZE(term_action), 0, print_attr_num },
+     { "Called-Station-Id",               NULL, 0, 0, print_attr_string },
+     { "Calling-Station-Id",              NULL, 0, 0, print_attr_string },
+     { "NAS-Identifier",                  NULL, 0, 0, print_attr_string },
+     { "Proxy-State",                     NULL, 0, 0, print_attr_string },
+     { "Login-LAT-Service",               NULL, 0, 0, print_attr_string },
+     { "Login-LAT-Node",                  NULL, 0, 0, print_attr_string },
+     { "Login-LAT-Group",                 NULL, 0, 0, print_attr_string },
+     { "Framed-AppleTalk-Link",           NULL, 0, 0, print_attr_num    },
+     { "Framed-AppleTalk-Network",        NULL, 0, 0, print_attr_num    },
+     { "Framed-AppleTalk-Zone",           NULL, 0, 0, print_attr_string },
+     { "Acct-Status-Type",                acct_status, TAM_SIZE(acct_status)-1, 1, print_attr_num },
+     { "Acct-Delay-Time",                 NULL, 0, 0, print_attr_num    },
+     { "Acct-Input-Octets",               NULL, 0, 0, print_attr_num    },
+     { "Acct-Output-Octets",              NULL, 0, 0, print_attr_num    },
+     { "Acct-Session-Id",                 NULL, 0, 0, print_attr_string },
+     { "Acct-Authentic",                  acct_auth, TAM_SIZE(acct_auth)-1, 1, print_attr_num },
+     { "Acct-Session-Time",               NULL, 0, 0, print_attr_num },
+     { "Acct-Input-Packets",              NULL, 0, 0, print_attr_num },
+     { "Acct-Output-Packets",             NULL, 0, 0, print_attr_num },
+     { "Acct-Terminate-Cause",            acct_term, TAM_SIZE(acct_term)-1, 1, print_attr_num },
+     { "Acct-Multi-Session-Id",           NULL, 0, 0, print_attr_string },
+     { "Acct-Link-Count",                 NULL, 0, 0, print_attr_num },
+     { "Acct-Input-Gigawords",            NULL, 0, 0, print_attr_num },
+     { "Acct-Output-Gigawords",           NULL, 0, 0, print_attr_num },
      { "Unassigned",                      NULL, 0, 0, NULL }, /*54*/
-     { "Event Timestamp",                 NULL, 0, 0, print_attr_time },
-     { "Unassigned",                      NULL, 0, 0, NULL }, /*56*/
-     { "Unassigned",                      NULL, 0, 0, NULL }, /*57*/
-     { "Unassigned",                      NULL, 0, 0, NULL }, /*58*/
-     { "Unassigned",                      NULL, 0, 0, NULL }, /*59*/
-     { "CHAP challenge",                  NULL, 0, 0, print_attr_string },
-     { "NAS Port Type",                   nas_port_type, TAM_SIZE(nas_port_type), 0, print_attr_num },
-     { "Port Limit",                      NULL, 0, 0, print_attr_num },
-     { "Login LAT Port",                  NULL, 0, 0, print_attr_string }, /*63*/
-     { "Tunnel Type",                     tunnel_type, TAM_SIZE(tunnel_type)-1, 1, print_attr_num },
-     { "Tunnel Medium",                   tunnel_medium, TAM_SIZE(tunnel_medium)-1, 1, print_attr_num },
-     { "Tunnel Client End",               NULL, 0, 0, print_attr_string },
-     { "Tunnel Server End",               NULL, 0, 0, print_attr_string },
-     { "Accounting Tunnel connect",       NULL, 0, 0, print_attr_string },
-     { "Tunnel Password",                 NULL, 0, 0, print_attr_string  },
-     { "ARAP Password",                   NULL, 0, 0, print_attr_strange },
-     { "ARAP Feature",                    NULL, 0, 0, print_attr_strange },
-     { "ARAP Zone Acces",                 arap_zone, TAM_SIZE(arap_zone)-1, 1, print_attr_num }, /*72*/
-     { "ARAP Security",                   NULL, 0, 0, print_attr_string },
-     { "ARAP Security Data",              NULL, 0, 0, print_attr_string },
-     { "Password Retry",                  NULL, 0, 0, print_attr_num    },
+     { "Event-Timestamp",                 NULL, 0, 0, print_attr_time },
+     { "Egress-VLANID",                   NULL, 0, 0, print_attr_num },
+     { "Ingress-Filters",                 ingress_filters, TAM_SIZE(ingress_filters)-1, 1, print_attr_num },
+     { "Egress-VLAN-Name",                NULL, 0, 0, print_attr_string },
+     { "User-Priority-Table",             NULL, 0, 0, NULL },
+     { "CHAP-Challenge",                  NULL, 0, 0, print_attr_string },
+     { "NAS-Port-Type",                   nas_port_type, TAM_SIZE(nas_port_type), 0, print_attr_num },
+     { "Port-Limit",                      NULL, 0, 0, print_attr_num },
+     { "Login-LAT-Port",                  NULL, 0, 0, print_attr_string }, /*63*/
+     { "Tunnel-Type",                     tunnel_type, TAM_SIZE(tunnel_type)-1, 1, print_attr_num },
+     { "Tunnel-Medium-Type",              tunnel_medium, TAM_SIZE(tunnel_medium)-1, 1, print_attr_num },
+     { "Tunnel-Client-Endpoint",          NULL, 0, 0, print_attr_string },
+     { "Tunnel-Server-Endpoint",          NULL, 0, 0, print_attr_string },
+     { "Acct-Tunnel-Connection",          NULL, 0, 0, print_attr_string },
+     { "Tunnel-Password",                 NULL, 0, 0, print_attr_string  },
+     { "ARAP-Password",                   NULL, 0, 0, print_attr_strange },
+     { "ARAP-Features",                   NULL, 0, 0, print_attr_strange },
+     { "ARAP-Zone-Access",                arap_zone, TAM_SIZE(arap_zone)-1, 1, print_attr_num }, /*72*/
+     { "ARAP-Security",                   NULL, 0, 0, print_attr_string },
+     { "ARAP-Security-Data",              NULL, 0, 0, print_attr_string },
+     { "Password-Retry",                  NULL, 0, 0, print_attr_num    },
      { "Prompt",                          prompt, TAM_SIZE(prompt), 0, print_attr_num },
-     { "Connect Info",                    NULL, 0, 0, print_attr_string   },
-     { "Config Token",                    NULL, 0, 0, print_attr_string   },
-     { "EAP Message",                     NULL, 0, 0, print_attr_string   },
-     { "Message Authentication",          NULL, 0, 0, print_attr_string }, /*80*/
-     { "Tunnel Private Group",            NULL, 0, 0, print_attr_string },
-     { "Tunnel Assigned ID",              NULL, 0, 0, print_attr_string },
-     { "Tunnel Preference",               NULL, 0, 0, print_attr_num    },
-     { "ARAP Challenge Response",         NULL, 0, 0, print_attr_strange },
-     { "Accounting Interim Interval",     NULL, 0, 0, print_attr_num     },
-     { "Accounting Tunnel packets lost",  NULL, 0, 0, print_attr_num }, /*86*/
-     { "NAS Port ID",                     NULL, 0, 0, print_attr_string },
-     { "Framed Pool",                     NULL, 0, 0, print_attr_string },
-     { "Chargeable User Identity",        NULL, 0, 0, print_attr_string },
-     { "Tunnel Client Authentication ID", NULL, 0, 0, print_attr_string },
-     { "Tunnel Server Authentication ID", NULL, 0, 0, print_attr_string },
+     { "Connect-Info",                    NULL, 0, 0, print_attr_string   },
+     { "Configuration-Token",             NULL, 0, 0, print_attr_string   },
+     { "EAP-Message",                     NULL, 0, 0, print_attr_string   },
+     { "Message-Authenticator",           NULL, 0, 0, print_attr_string }, /*80*/
+     { "Tunnel-Private-Group-ID",         NULL, 0, 0, print_attr_string },
+     { "Tunnel-Assignment-ID",            NULL, 0, 0, print_attr_string },
+     { "Tunnel-Preference",               NULL, 0, 0, print_attr_num    },
+     { "ARAP-Challenge-Response",         NULL, 0, 0, print_attr_strange },
+     { "Acct-Interim-Interval",           NULL, 0, 0, print_attr_num     },
+     { "Acct-Tunnel-Packets-Lost",        NULL, 0, 0, print_attr_num }, /*86*/
+     { "NAS-Port-Id",                     NULL, 0, 0, print_attr_string },
+     { "Framed-Pool",                     NULL, 0, 0, print_attr_string },
+     { "CUI",                             NULL, 0, 0, print_attr_string },
+     { "Tunnel-Client-Auth-ID",           NULL, 0, 0, print_attr_string },
+     { "Tunnel-Server-Auth-ID",           NULL, 0, 0, print_attr_string },
      { "Unassigned",                      NULL, 0, 0, NULL }, /*92*/
      { "Unassigned",                      NULL, 0, 0, NULL }  /*93*/
   };
@@ -457,7 +493,9 @@ print_attr_string(netdissect_options *ndo,
               return;
            }
            if (*data && (*data <=0x1F) )
-              ND_PRINT((ndo, "Tag %u, ",*data));
+              ND_PRINT((ndo, "Tag[%u] ", *data));
+           else
+              ND_PRINT((ndo, "Tag[Unused] "));
            data++;
            length--;
            ND_PRINT((ndo, "Salt %u ", EXTRACT_16BITS(data)));
@@ -477,11 +515,21 @@ print_attr_string(netdissect_options *ndo,
                  ND_PRINT((ndo, "%s", tstr));
                  return;
               }
-              ND_PRINT((ndo, "Tag %u", *data));
+              if (*data)
+                ND_PRINT((ndo, "Tag[%u] ", *data));
+              else
+                ND_PRINT((ndo, "Tag[Unused] "));
               data++;
               length--;
            }
         break;
+      case EGRESS_VLAN_NAME:
+           ND_PRINT((ndo, "%s (0x%02x) ",
+                  tok2str(rfc4675_tagged,"Unknown tag",*data),
+                  *data));
+           data++;
+           length--;
+        break;
    }
 
    for (i=0; *data && i < length ; i++, data++)
@@ -565,7 +613,6 @@ static void
 print_attr_num(netdissect_options *ndo,
                register u_char *data, u_int length, u_short attr_code)
 {
-   uint8_t tag;
    uint32_t timeout;
 
    if (length != 4)
@@ -585,9 +632,9 @@ print_attr_num(netdissect_options *ndo,
       if ( (attr_code == TUNNEL_TYPE) || (attr_code == TUNNEL_MEDIUM) )
       {
          if (!*data)
-            ND_PRINT((ndo, "Tag[Unused]"));
+            ND_PRINT((ndo, "Tag[Unused] "));
          else
-            ND_PRINT((ndo, "Tag[%d]", *data));
+            ND_PRINT((ndo, "Tag[%d] ", *data));
          data++;
          data_value = EXTRACT_24BITS(data);
       }
@@ -648,12 +695,20 @@ print_attr_num(netdissect_options *ndo,
           break;
 
         case TUNNEL_PREFERENCE:
-            tag = *data;
-            data++;
-            if (tag == 0)
-               ND_PRINT((ndo, "Tag (Unused) %d", EXTRACT_24BITS(data)));
+            if (*data)
+               ND_PRINT((ndo, "Tag[%d] ", *data));
             else
-               ND_PRINT((ndo, "Tag (%d) %d", tag, EXTRACT_24BITS(data)));
+               ND_PRINT((ndo, "Tag[Unused] "));
+            data++;
+            ND_PRINT((ndo, "%d", EXTRACT_24BITS(data)));
+          break;
+
+        case EGRESS_VLAN_ID:
+            ND_PRINT((ndo, "%s (0x%02x) ",
+                   tok2str(rfc4675_tagged,"Unknown tag",*data),
+                   *data));
+            data++;
+            ND_PRINT((ndo, "%d", EXTRACT_24BITS(data)));
           break;
 
         default:
diff --git a/contrib/tcpdump/print-rpki-rtr.c b/contrib/tcpdump/print-rpki-rtr.c
index 5bb5df7b0541..34e2057b1aae 100644
--- a/contrib/tcpdump/print-rpki-rtr.c
+++ b/contrib/tcpdump/print-rpki-rtr.c
@@ -120,7 +120,7 @@ static const struct tok rpki_rtr_error_codes[] = {
 };
 
 /*
- * Build a identation string for a given identation level.
+ * Build a indentation string for a given indentation level.
  * XXX this should be really in util.c
  */
 static char *
@@ -178,6 +178,7 @@ rpki_rtr_pdu_print (netdissect_options *ndo, const u_char *tptr, u_int indent)
     pdu_header = (rpki_rtr_pdu *)tptr;
     pdu_type = pdu_header->pdu_type;
     pdu_len = EXTRACT_32BITS(pdu_header->length);
+    ND_TCHECK2(*tptr, pdu_len);
     hexdump = FALSE;
 
     ND_PRINT((ndo, "%sRPKI-RTRv%u, %s PDU (%u), length: %u",
@@ -250,10 +251,10 @@ rpki_rtr_pdu_print (netdissect_options *ndo, const u_char *tptr, u_int indent)
 	{
 	    rpki_rtr_pdu_error_report *pdu;
 	    u_int encapsulated_pdu_length, text_length, tlen, error_code;
-	    u_char buf[80];
 
 	    pdu = (rpki_rtr_pdu_error_report *)tptr;
 	    encapsulated_pdu_length = EXTRACT_32BITS(pdu->encapsulated_pdu_length);
+	    ND_TCHECK2(*tptr, encapsulated_pdu_length);
 	    tlen = pdu_len;
 
 	    error_code = EXTRACT_16BITS(pdu->pdu_header.u.error_code);
@@ -286,10 +287,10 @@ rpki_rtr_pdu_print (netdissect_options *ndo, const u_char *tptr, u_int indent)
 		tptr += 4;
 		tlen -= 4;
 	    }
+	    ND_TCHECK2(*tptr, text_length);
 	    if (text_length && (text_length <= tlen )) {
-		memcpy(buf, tptr, min(sizeof(buf)-1, text_length));
-		buf[text_length] = '\0';
-		ND_PRINT((ndo, "%sError text: %s", indent_string(indent+2), buf));
+		ND_PRINT((ndo, "%sError text: ", indent_string(indent+2)));
+		fn_printn(ndo, tptr, text_length, ndo->ndo_snapend);
 	    }
 	}
 	break;
@@ -306,11 +307,16 @@ rpki_rtr_pdu_print (netdissect_options *ndo, const u_char *tptr, u_int indent)
     if (ndo->ndo_vflag > 1 || (ndo->ndo_vflag && hexdump)) {
 	print_unknown_data(ndo,tptr,"\n\t  ", pdu_len);
     }
+    return;
+
+ trunc:
+    ND_PRINT((ndo, "|trunc"));
+    return;
 }
 
 void
-rpki_rtr_print(netdissect_options *ndo, register const u_char *pptr, register u_int len) {
-
+rpki_rtr_print(netdissect_options *ndo, register const u_char *pptr, register u_int len)
+{
     u_int tlen, pdu_type, pdu_len;
     const u_char *tptr;
     const rpki_rtr_pdu *pdu_header;
@@ -330,13 +336,13 @@ rpki_rtr_print(netdissect_options *ndo, register const u_char *pptr, register u_
 	pdu_header = (rpki_rtr_pdu *)tptr;
         pdu_type = pdu_header->pdu_type;
         pdu_len = EXTRACT_32BITS(pdu_header->length);
+        ND_TCHECK2(*tptr, pdu_len);
 
         /* infinite loop check */
         if (!pdu_type || !pdu_len) {
             break;
         }
 
-        ND_TCHECK2(*tptr, pdu_len);
         if (tlen < pdu_len) {
             goto trunc;
         }
diff --git a/contrib/tcpdump/print-rsvp.c b/contrib/tcpdump/print-rsvp.c
index 51ab9f8ad104..263ef3d4656a 100644
--- a/contrib/tcpdump/print-rsvp.c
+++ b/contrib/tcpdump/print-rsvp.c
@@ -486,8 +486,8 @@ static const struct tok rsvp_obj_generalized_uni_values[] = {
  */
 static int
 rsvp_intserv_print(netdissect_options *ndo,
-                   const u_char *tptr, u_short obj_tlen) {
-
+                   const u_char *tptr, u_short obj_tlen)
+{
     int parameter_id,parameter_length;
     union {
 	float f;
@@ -637,8 +637,8 @@ _U_
 _U_
 #endif
 , const u_char *tptr,
-                const char *ident, u_int tlen) {
-
+                const char *ident, u_int tlen)
+{
     const struct rsvp_object_header *rsvp_obj_header;
     const u_char *obj_tptr;
     union {
@@ -1795,8 +1795,8 @@ _U_
 
 void
 rsvp_print(netdissect_options *ndo,
-           register const u_char *pptr, register u_int len) {
-
+           register const u_char *pptr, register u_int len)
+{
     struct rsvp_common_header *rsvp_com_header;
     const u_char *tptr,*subtptr;
     u_short plen, tlen, subtlen;
diff --git a/contrib/tcpdump/print-rtsp.c b/contrib/tcpdump/print-rtsp.c
new file mode 100644
index 000000000000..d721b8dbd31c
--- /dev/null
+++ b/contrib/tcpdump/print-rtsp.c
@@ -0,0 +1,50 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code
+ * distributions retain the above copyright notice and this paragraph
+ * in its entirety, and (2) distributions including binary code include
+ * the above copyright notice and this paragraph in its entirety in
+ * the documentation or other materials provided with the distribution.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND
+ * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
+ * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header$";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include 
+
+#include 
+#include 
+
+#include "interface.h"
+#include "extract.h"
+
+static const char *rtspcmds[] = {
+	"DESCRIBE",
+	"ANNOUNCE",
+	"GET_PARAMETER",
+	"OPTIONS",
+	"PAUSE",
+	"PLAY",
+	"RECORD",
+	"REDIRECT",
+	"SETUP",
+	"SET_PARAMETER",
+	"TEARDOWN",
+	NULL
+};
+
+void
+rtsp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
+{
+	txtproto_print(ndo, pptr, len, "rtsp", rtspcmds, RESP_CODE_SECOND_TOKEN);
+}
diff --git a/contrib/tcpdump/print-sflow.c b/contrib/tcpdump/print-sflow.c
index da72848d15f7..24112f44ad1b 100644
--- a/contrib/tcpdump/print-sflow.c
+++ b/contrib/tcpdump/print-sflow.c
@@ -297,8 +297,8 @@ struct sflow_vlan_counter_t {
 
 static int
 print_sflow_counter_generic(netdissect_options *ndo,
-                            const u_char *pointer, u_int len) {
-
+                            const u_char *pointer, u_int len)
+{
     const struct sflow_generic_counter_t *sflow_gen_counter;
 
     if (len < sizeof(struct sflow_generic_counter_t))
@@ -343,8 +343,8 @@ print_sflow_counter_generic(netdissect_options *ndo,
 
 static int
 print_sflow_counter_ethernet(netdissect_options *ndo,
-                             const u_char *pointer, u_int len){
-
+                             const u_char *pointer, u_int len)
+{
     const struct sflow_ethernet_counter_t *sflow_eth_counter;
 
     if (len < sizeof(struct sflow_ethernet_counter_t))
@@ -373,15 +373,15 @@ print_sflow_counter_ethernet(netdissect_options *ndo,
 
 static int
 print_sflow_counter_token_ring(netdissect_options *ndo _U_,
-                               const u_char *pointer _U_, u_int len _U_) {
-
+                               const u_char *pointer _U_, u_int len _U_)
+{
     return 0;
 }
 
 static int
 print_sflow_counter_basevg(netdissect_options *ndo,
-                           const u_char *pointer, u_int len) {
-
+                           const u_char *pointer, u_int len)
+{
     const struct sflow_100basevg_counter_t *sflow_100basevg_counter;
 
     if (len < sizeof(struct sflow_100basevg_counter_t))
@@ -416,8 +416,8 @@ print_sflow_counter_basevg(netdissect_options *ndo,
 
 static int
 print_sflow_counter_vlan(netdissect_options *ndo,
-                         const u_char *pointer, u_int len) {
-
+                         const u_char *pointer, u_int len)
+{
     const struct sflow_vlan_counter_t *sflow_vlan_counter;
 
     if (len < sizeof(struct sflow_vlan_counter_t))
@@ -446,8 +446,8 @@ struct sflow_processor_counter_t {
 
 static int
 print_sflow_counter_processor(netdissect_options *ndo,
-                              const u_char *pointer, u_int len) {
-
+                              const u_char *pointer, u_int len)
+{
     const struct sflow_processor_counter_t *sflow_processor_counter;
 
     if (len < sizeof(struct sflow_processor_counter_t))
@@ -467,8 +467,8 @@ print_sflow_counter_processor(netdissect_options *ndo,
 
 static int
 sflow_print_counter_records(netdissect_options *ndo,
-                            const u_char *pointer, u_int len, u_int records) {
-
+                            const u_char *pointer, u_int len, u_int records)
+{
     u_int nrecords;
     const u_char *tptr;
     u_int tlen;
@@ -543,11 +543,10 @@ sflow_print_counter_records(netdissect_options *ndo,
     return 0;
 }
 
-
 static int
 sflow_print_counter_sample(netdissect_options *ndo,
-                           const u_char *pointer, u_int len) {
-
+                           const u_char *pointer, u_int len)
+{
     const struct sflow_counter_sample_t *sflow_counter_sample;
     u_int           nrecords;
     u_int           typesource;
@@ -579,8 +578,8 @@ sflow_print_counter_sample(netdissect_options *ndo,
 
 static int
 sflow_print_expanded_counter_sample(netdissect_options *ndo,
-                                    const u_char *pointer, u_int len) {
-
+                                    const u_char *pointer, u_int len)
+{
     const struct sflow_expanded_counter_sample_t *sflow_expanded_counter_sample;
     u_int           nrecords;
 
@@ -606,8 +605,8 @@ sflow_print_expanded_counter_sample(netdissect_options *ndo,
 
 static int
 print_sflow_raw_packet(netdissect_options *ndo,
-                       const u_char *pointer, u_int len) {
-
+                       const u_char *pointer, u_int len)
+{
     const struct sflow_expanded_flow_raw_t *sflow_flow_raw;
 
     if (len < sizeof(struct sflow_expanded_flow_raw_t))
@@ -629,8 +628,8 @@ print_sflow_raw_packet(netdissect_options *ndo,
 
 static int
 print_sflow_ethernet_frame(netdissect_options *ndo,
-                           const u_char *pointer, u_int len) {
-
+                           const u_char *pointer, u_int len)
+{
     const struct sflow_ethernet_frame_t *sflow_ethernet_frame;
 
     if (len < sizeof(struct sflow_ethernet_frame_t))
@@ -647,8 +646,8 @@ print_sflow_ethernet_frame(netdissect_options *ndo,
 
 static int
 print_sflow_extended_switch_data(netdissect_options *ndo,
-                                 const u_char *pointer, u_int len) {
-
+                                 const u_char *pointer, u_int len)
+{
     const struct sflow_extended_switch_data_t *sflow_extended_sw_data;
 
     if (len < sizeof(struct sflow_extended_switch_data_t))
@@ -666,8 +665,8 @@ print_sflow_extended_switch_data(netdissect_options *ndo,
 
 static int
 sflow_print_flow_records(netdissect_options *ndo,
-                         const u_char *pointer, u_int len, u_int records) {
-
+                         const u_char *pointer, u_int len, u_int records)
+{
     u_int nrecords;
     const u_char *tptr;
     u_int tlen;
@@ -752,8 +751,8 @@ sflow_print_flow_records(netdissect_options *ndo,
 
 static int
 sflow_print_flow_sample(netdissect_options *ndo,
-                        const u_char *pointer, u_int len) {
-
+                        const u_char *pointer, u_int len)
+{
     const struct sflow_flow_sample_t *sflow_flow_sample;
     u_int          nrecords;
     u_int          typesource;
@@ -789,8 +788,8 @@ sflow_print_flow_sample(netdissect_options *ndo,
 
 static int
 sflow_print_expanded_flow_sample(netdissect_options *ndo,
-                                 const u_char *pointer, u_int len) {
-
+                                 const u_char *pointer, u_int len)
+{
     const struct sflow_expanded_flow_sample_t *sflow_expanded_flow_sample;
     u_int nrecords;
 
@@ -818,8 +817,8 @@ sflow_print_expanded_flow_sample(netdissect_options *ndo,
 
 void
 sflow_print(netdissect_options *ndo,
-            const u_char *pptr, u_int len) {
-
+            const u_char *pptr, u_int len)
+{
     const struct sflow_datagram_t *sflow_datagram;
     const struct sflow_sample_header *sflow_sample;
 
diff --git a/contrib/tcpdump/print-sip.c b/contrib/tcpdump/print-sip.c
index 540cbf424267..d0fd349f25e7 100644
--- a/contrib/tcpdump/print-sip.c
+++ b/contrib/tcpdump/print-sip.c
@@ -11,6 +11,8 @@
  * FOR A PARTICULAR PURPOSE.
  *
  * Original code by Hannes Gredler (hannes@juniper.net)
+ * Turned into common "text protocol" code, which this uses, by
+ * Guy Harris.
  */
 
 #define NETDISSECT_REWORKED
@@ -23,34 +25,29 @@
 #include "interface.h"
 #include "extract.h"
 
+static const char *sipcmds[] = {
+	"ACK",
+	"BYE",
+	"CANCEL",
+	"DO",
+	"INFO",
+	"INVITE",
+	"MESSAGE",
+	"NOTIFY",
+	"OPTIONS",
+	"PRACK",
+	"QAUTH",
+	"REFER",
+	"REGISTER",
+	"SPRACK",
+	"SUBSCRIBE",
+	"UPDATE",
+	"PUBLISH",
+	NULL
+};
+
 void
-sip_print(netdissect_options *ndo,
-          register const u_char *pptr, register u_int len)
+sip_print(netdissect_options *ndo, const u_char *pptr, u_int len)
 {
-    u_int idx;
-
-    ND_PRINT((ndo, "SIP, length: %u%s", len, ndo->ndo_vflag ? "\n\t" : ""));
-
-    /* in non-verbose mode just lets print the protocol and length */
-    if (ndo->ndo_vflag < 1)
-        return;
-
-    for (idx = 0; idx < len; idx++) {
-        ND_TCHECK2(*(pptr+idx), 2);
-        if (EXTRACT_16BITS(pptr+idx) != 0x0d0a) { /* linefeed ? */
-            safeputchar(ndo, *(pptr + idx));
-        } else {
-            ND_PRINT((ndo, "\n\t"));
-            idx+=1;
-        }
-    }
-
-    /* do we want to see an additionally hexdump ? */
-    if (ndo->ndo_vflag > 1)
-        print_unknown_data(ndo, pptr, "\n\t", len);
-
-    return;
-
-trunc:
-    ND_PRINT((ndo, "[|sip]"));
+	txtproto_print(ndo, pptr, len, "sip", sipcmds, RESP_CODE_SECOND_TOKEN);
 }
diff --git a/contrib/tcpdump/print-sl.c b/contrib/tcpdump/print-sl.c
index 6b5d25441588..8d9eadcccc1b 100644
--- a/contrib/tcpdump/print-sl.c
+++ b/contrib/tcpdump/print-sl.c
@@ -80,11 +80,9 @@ sl_if_print(netdissect_options *ndo,
 	case 4:
 	        ip_print(ndo, (u_char *)ip, length);
 		break;
-#ifdef INET6
 	case 6:
 		ip6_print(ndo, (u_char *)ip, length);
 		break;
-#endif
 	default:
 		ND_PRINT((ndo, "ip v%d", IP_V(ip)));
 	}
diff --git a/contrib/tcpdump/print-sll.c b/contrib/tcpdump/print-sll.c
index 0ca36f53e46b..1f5f60084a20 100644
--- a/contrib/tcpdump/print-sll.c
+++ b/contrib/tcpdump/print-sll.c
@@ -280,10 +280,7 @@ sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 	        if (ndo->ndo_eflag) {
 	        	uint16_t tag = EXTRACT_16BITS(p);
 
-			ND_PRINT((ndo, "vlan %u, p %u%s, ",
-			    tag & 0xfff,
-			    tag >> 13,
-			    (tag & 0x1000) ? ", CFI" : ""));
+			ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag)));
 		}
 
 		ether_type = EXTRACT_16BITS(p + 2);
diff --git a/contrib/tcpdump/print-slow.c b/contrib/tcpdump/print-slow.c
index fec76cab3ff2..2db3581e2bf7 100644
--- a/contrib/tcpdump/print-slow.c
+++ b/contrib/tcpdump/print-slow.c
@@ -249,8 +249,8 @@ const struct slow_common_header_t *slow_com_header;
 
 void
 slow_print(netdissect_options *ndo,
-           register const u_char *pptr, register u_int len) {
-
+           register const u_char *pptr, register u_int len)
+{
     int print_version;
 
     slow_com_header = (const struct slow_common_header_t *)pptr;
@@ -332,8 +332,8 @@ slow_print(netdissect_options *ndo,
 
 static void
 slow_marker_lacp_print(netdissect_options *ndo,
-                       register const u_char *tptr, register u_int tlen) {
-
+                       register const u_char *tptr, register u_int tlen)
+{
     const struct tlv_header_t *tlv_header;
     const u_char *tlv_tptr;
     u_int tlv_len, tlv_tlen;
@@ -450,8 +450,8 @@ slow_marker_lacp_print(netdissect_options *ndo,
 
 static void
 slow_oam_print(netdissect_options *ndo,
-               register const u_char *tptr, register u_int tlen) {
-
+               register const u_char *tptr, register u_int tlen)
+{
     u_int hexdump;
 
     struct slow_oam_common_header_t {
diff --git a/contrib/tcpdump/print-smb.c b/contrib/tcpdump/print-smb.c
index 6bffa7cb33ff..f5be9ffc4428 100644
--- a/contrib/tcpdump/print-smb.c
+++ b/contrib/tcpdump/print-smb.c
@@ -1255,14 +1255,15 @@ smb_tcp_print(netdissect_options *ndo,
     if (smb_len >= 4 && caplen >= 4 && memcmp(data,"\377SMB",4) == 0) {
 	if ((int)smb_len > caplen) {
 	    if ((int)smb_len > length)
-		ND_PRINT((ndo, "WARNING: Packet is continued in later TCP segments\n"));
+		ND_PRINT((ndo, " WARNING: Packet is continued in later TCP segments\n"));
 	    else
-		ND_PRINT((ndo, "WARNING: Short packet. Try increasing the snap length by %d\n",
+		ND_PRINT((ndo, " WARNING: Short packet. Try increasing the snap length by %d\n",
 		    smb_len - caplen));
-	}
+	} else
+	    ND_PRINT((ndo, " "));
 	print_smb(ndo, data, maxbuf > data + smb_len ? data + smb_len : maxbuf);
     } else
-	ND_PRINT((ndo, "SMB-over-TCP packet:(raw data or continuation?)\n"));
+	ND_PRINT((ndo, " SMB-over-TCP packet:(raw data or continuation?)\n"));
     return;
 trunc:
     ND_PRINT((ndo, "%s", tstr));
diff --git a/contrib/tcpdump/print-smtp.c b/contrib/tcpdump/print-smtp.c
new file mode 100644
index 000000000000..fe0bbc2f224c
--- /dev/null
+++ b/contrib/tcpdump/print-smtp.c
@@ -0,0 +1,30 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code
+ * distributions retain the above copyright notice and this paragraph
+ * in its entirety, and (2) distributions including binary code include
+ * the above copyright notice and this paragraph in its entirety in
+ * the documentation or other materials provided with the distribution.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND
+ * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
+ * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include 
+
+#include 
+#include 
+
+#include "netdissect.h"
+#include "extract.h"
+
+void
+smtp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
+{
+	txtproto_print(ndo, pptr, len, "smtp", NULL, 0);
+}
diff --git a/contrib/tcpdump/print-tcp.c b/contrib/tcpdump/print-tcp.c
index 5b1133a6c30a..bc200e2f8e21 100644
--- a/contrib/tcpdump/print-tcp.c
+++ b/contrib/tcpdump/print-tcp.c
@@ -596,7 +596,7 @@ tcp_print(netdissect_options *ndo,
                                 switch(magic) {
 
                                 case 0xf989:
-                                        /* TCP Fast Open: draft-ietf-tcpm-fastopen-04 */
+                                        /* TCP Fast Open: RFC 7413 */
                                         if (datalen == 2) {
                                                 /* Fast Open Cookie Request */
                                                 ND_PRINT((ndo, "tfo cookiereq"));
@@ -674,8 +674,10 @@ tcp_print(netdissect_options *ndo,
         }
 
         if (sport == TELNET_PORT || dport == TELNET_PORT) {
-                if (!ndo->ndo_qflag && ndo->ndo_vflag)
-                        telnet_print(ndo, bp, length);
+                telnet_print(ndo, bp, length);
+        } else if (sport == SMTP_PORT || dport == SMTP_PORT) {
+                ND_PRINT((ndo, ": "));
+                smtp_print(ndo, bp, length);
         } else if (sport == BGP_PORT || dport == BGP_PORT)
                 bgp_print(ndo, bp, length);
         else if (sport == PPTP_PORT || dport == PPTP_PORT)
@@ -691,7 +693,18 @@ tcp_print(netdissect_options *ndo,
         else if (sport == OPENFLOW_PORT_OLD || dport == OPENFLOW_PORT_OLD ||
                  sport == OPENFLOW_PORT_IANA || dport == OPENFLOW_PORT_IANA)
                 openflow_print(ndo, bp, length);
-        else if (length > 2 &&
+        else if (sport == FTP_PORT || dport == FTP_PORT) {
+                ND_PRINT((ndo, ": "));
+                ftp_print(ndo, bp, length);
+        } else if (sport == HTTP_PORT || dport == HTTP_PORT ||
+            sport == HTTP_PORT_ALT || dport == HTTP_PORT_ALT) {
+                ND_PRINT((ndo, ": "));
+                http_print(ndo, bp, length);
+        } else if (sport == RTSP_PORT || dport == RTSP_PORT ||
+            sport == RTSP_PORT_ALT || dport == RTSP_PORT_ALT) {
+                ND_PRINT((ndo, ": "));
+                rtsp_print(ndo, bp, length);
+        } else if (length > 2 &&
                  (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT ||
                   sport == MULTICASTDNS_PORT || dport == MULTICASTDNS_PORT)) {
                 /*
diff --git a/contrib/tcpdump/print-telnet.c b/contrib/tcpdump/print-telnet.c
index 6a2680b413c8..fa59b1fe9531 100644
--- a/contrib/tcpdump/print-telnet.c
+++ b/contrib/tcpdump/print-telnet.c
@@ -510,6 +510,10 @@ telnet_print(netdissect_options *ndo, const u_char *sp, u_int length)
 	osp = sp;
 
 	while (length > 0 && *sp == IAC) {
+		/*
+		 * Parse the Telnet command without printing it,
+		 * to determine its length.
+		 */
 		l = telnet_parse(ndo, sp, length, 0);
 		if (l < 0)
 			break;
diff --git a/contrib/tcpdump/print-udp.c b/contrib/tcpdump/print-udp.c
index 58be945684c5..c9e6058f55e4 100644
--- a/contrib/tcpdump/print-udp.c
+++ b/contrib/tcpdump/print-udp.c
@@ -45,7 +45,6 @@
 
 #include "nameser.h"
 #include "nfs.h"
-#include "bootp.h"
 
 struct rtcphdr {
 	uint16_t rh_flags;	/* T:2 P:1 CNT:5 PT:8 */
@@ -370,7 +369,6 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 	else
 		ip6 = NULL;
 #endif /*INET6*/
-	cp = (u_char *)(up + 1);
 	if (!ND_TTEST(up->uh_dport)) {
 		udpipaddr_print(ndo, ip, -1, -1);
 		ND_PRINT((ndo, "[|udp]"));
@@ -385,20 +383,24 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 		ND_PRINT((ndo, "truncated-udp %d", length));
 		return;
 	}
+	ulen = EXTRACT_16BITS(&up->uh_ulen);
+	if (ulen < sizeof(struct udphdr)) {
+		udpipaddr_print(ndo, ip, sport, dport);
+		ND_PRINT((ndo, "truncated-udplength %d", ulen));
+		return;
+	}
+	ulen -= sizeof(struct udphdr);
 	length -= sizeof(struct udphdr);
+	if (ulen < length)
+		length = ulen;
 
+	cp = (u_char *)(up + 1);
 	if (cp > ndo->ndo_snapend) {
 		udpipaddr_print(ndo, ip, sport, dport);
 		ND_PRINT((ndo, "[|udp]"));
 		return;
 	}
 
-	ulen = EXTRACT_16BITS(&up->uh_ulen);
-	if (ulen < 8) {
-		udpipaddr_print(ndo, ip, sport, dport);
-		ND_PRINT((ndo, "truncated-udplength %d", ulen));
-		return;
-	}
 	if (ndo->ndo_packettype) {
 		register struct sunrpc_msg *rp;
 		enum sunrpc_msg_type direction;
@@ -444,7 +446,7 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 
 		case PT_CNFP:
 			udpipaddr_print(ndo, ip, sport, dport);
-			cnfp_print(ndo, cp, (const u_char *)ip);
+			cnfp_print(ndo, cp);
 			break;
 
 		case PT_TFTP:
@@ -573,7 +575,7 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 			timed_print(ndo, (const u_char *)(up + 1));
 		else if (ISPORT(TFTP_PORT))
 			tftp_print(ndo, (const u_char *)(up + 1), length);
-		else if (ISPORT(IPPORT_BOOTPC) || ISPORT(IPPORT_BOOTPS))
+		else if (ISPORT(BOOTPC_PORT) || ISPORT(BOOTPS_PORT))
 			bootp_print(ndo, (const u_char *)(up + 1), length);
 		else if (ISPORT(RIP_PORT))
 			rip_print(ndo, (const u_char *)(up + 1), length);
@@ -638,7 +640,8 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 		else if (ISPORT(RADIUS_PORT) ||
 			 ISPORT(RADIUS_NEW_PORT) ||
 			 ISPORT(RADIUS_ACCOUNTING_PORT) ||
-			 ISPORT(RADIUS_NEW_ACCOUNTING_PORT) )
+			 ISPORT(RADIUS_NEW_ACCOUNTING_PORT) ||
+			 ISPORT(RADIUS_COA_PORT) )
 			radius_print(ndo, (const u_char *)(up+1), length);
 		else if (dport == HSRP_PORT)
 			hsrp_print(ndo, (const u_char *)(up + 1), length);
@@ -678,12 +681,23 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
 			otv_print(ndo, (const u_char *)(up + 1), length);
                 else if (ISPORT(VXLAN_PORT))
 			vxlan_print(ndo, (const u_char *)(up + 1), length);
-		else
-			ND_PRINT((ndo, "UDP, length %u",
-			    (uint32_t)(ulen - sizeof(*up))));
+                else if (ISPORT(GENEVE_PORT))
+			geneve_print(ndo, (const u_char *)(up + 1), length);
+		else {
+			if (ulen > length)
+				ND_PRINT((ndo, "UDP, bad length %u > %u",
+				    ulen, length));
+			else
+				ND_PRINT((ndo, "UDP, length %u", ulen));
+		}
 #undef ISPORT
-	} else
-		ND_PRINT((ndo, "UDP, length %u", (uint32_t)(ulen - sizeof(*up))));
+	} else {
+		if (ulen > length)
+			ND_PRINT((ndo, "UDP, bad length %u > %u",
+			    ulen, length));
+		else
+			ND_PRINT((ndo, "UDP, length %u", ulen));
+	}
 }
 
 
diff --git a/contrib/tcpdump/print-vxlan.c b/contrib/tcpdump/print-vxlan.c
index 62b4b2ba0b1a..c4de68d5fb4f 100644
--- a/contrib/tcpdump/print-vxlan.c
+++ b/contrib/tcpdump/print-vxlan.c
@@ -24,7 +24,9 @@
 #include "extract.h"
 
 /*
- * VXLAN header, draft-mahalingam-dutt-dcops-vxlan-03
+ * VXLAN header, RFC7348
+ *               Virtual eXtensible Local Area Network (VXLAN): A Framework
+ *               for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks
  *
  *     0                   1                   2                   3
  *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
diff --git a/contrib/tcpdump/print-wb.c b/contrib/tcpdump/print-wb.c
index 49100fa48f4f..e10d532864cb 100644
--- a/contrib/tcpdump/print-wb.c
+++ b/contrib/tcpdump/print-wb.c
@@ -186,7 +186,7 @@ wb_id(netdissect_options *ndo,
 	int nid;
 
 	ND_PRINT((ndo, " wb-id:"));
-	if (len < sizeof(*id) || (u_char *)(id + 1) > ndo->ndo_snapend)
+	if (len < sizeof(*id) || !ND_TTEST(*id))
 		return (-1);
 	len -= sizeof(*id);
 
@@ -202,14 +202,14 @@ wb_id(netdissect_options *ndo,
 	len -= sizeof(*io) * nid;
 	io = (struct id_off *)(id + 1);
 	cp = (char *)(io + nid);
-	if ((u_char *)cp + len <= ndo->ndo_snapend) {
+	if (ND_TTEST2(cp, len)) {
 		ND_PRINT((ndo, "\""));
 		fn_print(ndo, (u_char *)cp, (u_char *)cp + len);
 		ND_PRINT((ndo, "\""));
 	}
 
 	c = '<';
-	for (i = 0; i < nid && (u_char *)(io + 1) <= ndo->ndo_snapend; ++io, ++i) {
+	for (i = 0; i < nid && ND_TTEST(*io); ++io, ++i) {
 		ND_PRINT((ndo, "%c%s:%u",
 		    c, ipaddr_string(ndo, &io->id), EXTRACT_32BITS(&io->off)));
 		c = ',';
@@ -226,7 +226,7 @@ wb_rreq(netdissect_options *ndo,
         const struct pkt_rreq *rreq, u_int len)
 {
 	ND_PRINT((ndo, " wb-rreq:"));
-	if (len < sizeof(*rreq) || (u_char *)(rreq + 1) > ndo->ndo_snapend)
+	if (len < sizeof(*rreq) || !ND_TTEST(*rreq))
 		return (-1);
 
 	ND_PRINT((ndo, " please repair %s %s:%u<%u:%u>",
@@ -243,7 +243,7 @@ wb_preq(netdissect_options *ndo,
         const struct pkt_preq *preq, u_int len)
 {
 	ND_PRINT((ndo, " wb-preq:"));
-	if (len < sizeof(*preq) || (u_char *)(preq + 1) > ndo->ndo_snapend)
+	if (len < sizeof(*preq) || !ND_TTEST(*preq))
 		return (-1);
 
 	ND_PRINT((ndo, " need %u/%s:%u",
@@ -267,7 +267,7 @@ wb_prep(netdissect_options *ndo,
 	}
 	n = EXTRACT_32BITS(&prep->pp_n);
 	ps = (const struct pgstate *)(prep + 1);
-	while (--n >= 0 && (u_char *)(ps + 1) <= ep) {
+	while (--n >= 0 && ND_TTEST(*ps)) {
 		const struct id_off *io, *ie;
 		char c = '<';
 
@@ -276,7 +276,7 @@ wb_prep(netdissect_options *ndo,
 		    ipaddr_string(ndo, &ps->page.p_sid),
 		    EXTRACT_32BITS(&ps->page.p_uid)));
 		io = (struct id_off *)(ps + 1);
-		for (ie = io + ps->nid; io < ie && (u_char *)(io + 1) <= ep; ++io) {
+		for (ie = io + ps->nid; io < ie && ND_TTEST(*io); ++io) {
 			ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo, &io->id),
 			    EXTRACT_32BITS(&io->off)));
 			c = ',';
@@ -308,12 +308,20 @@ static const char *dopstr[] = {
 };
 
 static int
-wb_dops(netdissect_options *ndo,
-        const struct dophdr *dh, uint32_t ss, uint32_t es)
+wb_dops(netdissect_options *ndo, const struct pkt_dop *dop,
+        uint32_t ss, uint32_t es)
 {
+	const struct dophdr *dh = (const struct dophdr *)((const u_char *)dop + sizeof(*dop));
+
 	ND_PRINT((ndo, " <"));
 	for ( ; ss <= es; ++ss) {
-		register int t = dh->dh_type;
+		int t;
+
+		if (!ND_TTEST(*dh)) {
+			ND_PRINT((ndo, "%s", tstr));
+			break;
+		}
+		t = dh->dh_type;
 
 		if (t > DT_MAXTYPE)
 			ND_PRINT((ndo, " dop-%d!", t));
@@ -331,10 +339,6 @@ wb_dops(netdissect_options *ndo,
 			}
 		}
 		dh = DOP_NEXT(dh);
-		if ((u_char *)dh > ndo->ndo_snapend) {
-			ND_PRINT((ndo, "%s", tstr));
-			break;
-		}
 	}
 	ND_PRINT((ndo, " >"));
 	return (0);
@@ -347,7 +351,7 @@ wb_rrep(netdissect_options *ndo,
 	const struct pkt_dop *dop = &rrep->pr_dop;
 
 	ND_PRINT((ndo, " wb-rrep:"));
-	if (len < sizeof(*rrep) || (u_char *)(rrep + 1) > ndo->ndo_snapend)
+	if (len < sizeof(*rrep) || !ND_TTEST(*rrep))
 		return (-1);
 	len -= sizeof(*rrep);
 
@@ -359,7 +363,7 @@ wb_rrep(netdissect_options *ndo,
 	    EXTRACT_32BITS(&dop->pd_eseq)));
 
 	if (ndo->ndo_vflag)
-		return (wb_dops(ndo, (const struct dophdr *)(dop + 1),
+		return (wb_dops(ndo, dop,
 		    EXTRACT_32BITS(&dop->pd_sseq),
 		    EXTRACT_32BITS(&dop->pd_eseq)));
 	return (0);
@@ -370,7 +374,7 @@ wb_drawop(netdissect_options *ndo,
           const struct pkt_dop *dop, u_int len)
 {
 	ND_PRINT((ndo, " wb-dop:"));
-	if (len < sizeof(*dop) || (u_char *)(dop + 1) > ndo->ndo_snapend)
+	if (len < sizeof(*dop) || !ND_TTEST(*dop))
 		return (-1);
 	len -= sizeof(*dop);
 
@@ -381,7 +385,7 @@ wb_drawop(netdissect_options *ndo,
 	    EXTRACT_32BITS(&dop->pd_eseq)));
 
 	if (ndo->ndo_vflag)
-		return (wb_dops(ndo, (const struct dophdr *)(dop + 1),
+		return (wb_dops(ndo, dop,
 				EXTRACT_32BITS(&dop->pd_sseq),
 				EXTRACT_32BITS(&dop->pd_eseq)));
 	return (0);
@@ -397,7 +401,7 @@ wb_print(netdissect_options *ndo,
 	register const struct pkt_hdr *ph;
 
 	ph = (const struct pkt_hdr *)hdr;
-	if (len < sizeof(*ph) || (u_char *)(ph + 1) > ndo->ndo_snapend) {
+	if (len < sizeof(*ph) || !ND_TTEST(*ph)) {
 		ND_PRINT((ndo, "%s", tstr));
 		return;
 	}
diff --git a/contrib/tcpdump/print-zeromq.c b/contrib/tcpdump/print-zeromq.c
index 0ef30517bd7c..ba22c96e72ad 100644
--- a/contrib/tcpdump/print-zeromq.c
+++ b/contrib/tcpdump/print-zeromq.c
@@ -76,7 +76,8 @@ static const char tstr[] = " [|zmtp1]";
  */
 
 static const u_char *
-zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
+zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{
 	uint64_t body_len_declared, body_len_captured, header_len;
 	uint8_t flags;
 
@@ -139,7 +140,8 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
 }
 
 void
-zmtp1_print(netdissect_options *ndo, const u_char *cp, u_int len) {
+zmtp1_print(netdissect_options *ndo, const u_char *cp, u_int len)
+{
 	const u_char *ep = min(ndo->ndo_snapend, cp + len);
 
 	ND_PRINT((ndo, ": ZMTP/1.0"));
@@ -164,7 +166,8 @@ zmtp1_print(netdissect_options *ndo, const u_char *cp, u_int len) {
  */
 
 static const u_char *
-zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u_int len) {
+zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u_int len)
+{
 	u_int frame_offset;
 	uint64_t remaining_len;
 
@@ -206,7 +209,8 @@ zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u
 }
 
 void
-zmtp1_print_datagram(netdissect_options *ndo, const u_char *cp, const u_int len) {
+zmtp1_print_datagram(netdissect_options *ndo, const u_char *cp, const u_int len)
+{
 	const u_char *ep = min(ndo->ndo_snapend, cp + len);
 
 	cp = zmtp1_print_intermediate_part(ndo, cp, len);
diff --git a/contrib/tcpdump/tcp.h b/contrib/tcpdump/tcp.h
index 3645486099cc..c18d1382511c 100644
--- a/contrib/tcpdump/tcp.h
+++ b/contrib/tcpdump/tcp.h
@@ -93,6 +93,9 @@ struct tcphdr {
 #ifndef TELNET_PORT
 #define TELNET_PORT             23
 #endif
+#ifndef SMTP_PORT
+#define SMTP_PORT		25
+#endif
 #ifndef BGP_PORT
 #define BGP_PORT                179
 #endif
@@ -116,3 +119,18 @@ struct tcphdr {
 #ifndef SMB_PORT
 #define SMB_PORT                445
 #endif
+#ifndef HTTP_PORT
+#define HTTP_PORT		80
+#endif
+#ifndef HTTP_PORT_ALT
+#define HTTP_PORT_ALT		8080
+#endif
+#ifndef RTSP_PORT
+#define RTSP_PORT		554
+#endif
+#ifndef RTSP_PORT_ALT
+#define RTSP_PORT_ALT		8554
+#endif
+#ifndef FTP_PORT
+#define FTP_PORT		21
+#endif
diff --git a/contrib/tcpdump/tcpdump.1.in b/contrib/tcpdump/tcpdump.1.in
index a96646928b09..f9522cb84b88 100644
--- a/contrib/tcpdump/tcpdump.1.in
+++ b/contrib/tcpdump/tcpdump.1.in
@@ -128,6 +128,10 @@ tcpdump \- dump traffic on a network
 [
 .BI \-\-time\-stamp\-precision= tstamp_precision
 ]
+.ti +8
+[
+.B \-\-immediate\-mode
+]
 [
 .B \-\-version
 ]
@@ -140,7 +144,9 @@ tcpdump \- dump traffic on a network
 .SH DESCRIPTION
 .LP
 \fITcpdump\fP prints out a description of the contents of packets on a
-network interface that match the boolean \fIexpression\fP.  It can also
+network interface that match the boolean \fIexpression\fP; the
+description is preceded by a time stamp, printed, by default, as hours,
+minutes, seconds, and fractions of a second since midnight.  It can also
 be run with the
 .B \-w
 flag, which causes it to save the packet data to a file for later
@@ -204,7 +210,9 @@ your ``status'' character, typically control-T, although on some
 platforms, such as Mac OS X, the ``status'' character is not set by
 default, so you must set it with
 .BR stty (1)
-in order to use it) and will continue capturing packets.
+in order to use it) and will continue capturing packets. On platforms that
+do not support the SIGINFO signal, the same can be achieved by using the
+SIGUSR1 signal.
 .LP
 Reading packets from a network interface may require that you have
 special privileges; see the
@@ -419,6 +427,13 @@ monitor mode will be shown; if
 is specified, only those link-layer types available when in monitor mode
 will be shown.
 .TP
+.BI \-\-immediate\-mode
+Capture in "immediate mode".  In this mode, packets are delivered to
+tcpdump as soon as they arrive, rather than being buffered for
+efficiency.  This is the default when printing packets rather than
+saving packets to a ``savefile'' if the packets are being printed to a
+terminal rather than to a file or pipe.
+.TP
 .BI \-j " tstamp_type"
 .PD 0
 .TP
@@ -655,14 +670,16 @@ an encapsulated PGM packet.
 \fIDon't\fP print a timestamp on each dump line.
 .TP
 .B \-tt
-Print an unformatted timestamp on each dump line.
+Print the timestamp, as seconds since January 1, 1970, 00:00:00, UTC, and
+fractions of a second since that time, on each dump line.
 .TP
 .B \-ttt
 Print a delta (micro-second resolution) between current and previous line
 on each dump line.
 .TP
 .B \-tttt
-Print a timestamp in default format proceeded by date on each dump line.
+Print a timestamp, as hours, minutes, seconds, and fractions of a second
+since midnight, preceded by the date, on each dump line.
 .TP
 .B \-ttttt
 Print a delta (micro-second resolution) between current and first line
diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c
index aca877c5c3f9..ed3ce5efb0e4 100644
--- a/contrib/tcpdump/tcpdump.c
+++ b/contrib/tcpdump/tcpdump.c
@@ -45,6 +45,17 @@ The Regents of the University of California.  All rights reserved.\n";
 #include "config.h"
 #endif
 
+/*
+ * Mac OS X may ship pcap.h from libpcap 0.6 with a libpcap based on
+ * 0.8.  That means it has pcap_findalldevs() but the header doesn't
+ * define pcap_if_t, meaning that we can't actually *use* pcap_findalldevs().
+ */
+#ifdef HAVE_PCAP_FINDALLDEVS
+#ifndef HAVE_PCAP_IF_T
+#undef HAVE_PCAP_FINDALLDEVS
+#endif
+#endif
+
 #include 
 
 #ifdef WIN32
@@ -68,12 +79,10 @@ extern int SIZE_BUF;
 #else
 #include "getopt_long.h"
 #endif
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+/* Capsicum-specific code requires macros from , which will fail
+ * to compile if  has already been included; including the headers
+ * in the opposite order works fine.
+ */
 #ifdef __FreeBSD__
 #include 
 #include 
@@ -89,6 +98,12 @@ extern int SIZE_BUF;
 #include 
 #include 
 #endif	/* HAVE_CAPSICUM */
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #ifndef WIN32
 #include 
 #include 
@@ -96,10 +111,18 @@ extern int SIZE_BUF;
 #include 
 #endif /* WIN32 */
 
-/* capabilities convinience library */
+/* capabilities convenience library */
+/* If a code depends on HAVE_LIBCAP_NG, it depends also on HAVE_CAP_NG_H.
+ * If HAVE_CAP_NG_H is not defined, undefine HAVE_LIBCAP_NG.
+ * Thus, the later tests are done only on HAVE_LIBCAP_NG.
+ */
+#ifdef HAVE_LIBCAP_NG
 #ifdef HAVE_CAP_NG_H
 #include 
+#else
+#undef HAVE_LIBCAP_NG
 #endif /* HAVE_CAP_NG_H */
+#endif /* HAVE_LIBCAP_NG */
 
 #include "netdissect.h"
 #include "interface.h"
@@ -598,6 +621,15 @@ show_devices_and_exit (void)
  *
  * OS X tcpdump uses -P to indicate that -w should write pcap-ng rather
  * than pcap files.
+ *
+ * OS X tcpdump also uses -Q to specify expressions that match packet
+ * metadata, including but not limited to the packet direction.
+ * The expression syntax is different from a simple "in|out|inout",
+ * and those expressions aren't accepted by OS X tcpdump, but the
+ * equivalents would be "in" = "dir=in", "out" = "dir=out", and
+ * "inout" = "dir=in or dir=out", and the parser could conceivably
+ * special-case "in", "out", and "inout" as expressions for backwards
+ * compatibility, so all is not (yet) lost.
  */
 
 /*
@@ -628,12 +660,6 @@ show_devices_and_exit (void)
 #define J_FLAG
 #endif /* PCAP_ERROR_TSTAMP_TYPE_NOTSUP */
 
-#ifdef HAVE_PCAP_FINDALLDEVS
-#ifndef HAVE_PCAP_IF_T
-#undef HAVE_PCAP_FINDALLDEVS
-#endif
-#endif
-
 #ifdef HAVE_PCAP_FINDALLDEVS
 #define D_FLAG	"D"
 #else
@@ -652,6 +678,8 @@ show_devices_and_exit (void)
 #define Q_FLAG
 #endif
 
+#define SHORTOPTS "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpq" Q_FLAG "r:Rs:StT:u" U_FLAG "vV:w:W:xXy:Yz:Z:#"
+
 /*
  * Long options.
  *
@@ -674,6 +702,7 @@ show_devices_and_exit (void)
  */
 #define OPTION_VERSION		128
 #define OPTION_TSTAMP_PRECISION	129
+#define OPTION_IMMEDIATE_MODE	130
 
 static const struct option longopts[] = {
 #if defined(HAVE_PCAP_CREATE) || defined(WIN32)
@@ -705,6 +734,9 @@ static const struct option longopts[] = {
 	{ "packet-buffered", no_argument, NULL, 'U' },
 #endif
 	{ "linktype", required_argument, NULL, 'y' },
+#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
+	{ "immediate-mode", no_argument, NULL, OPTION_IMMEDIATE_MODE },
+#endif
 #if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)
 	{ "debug-filter-parser", no_argument, NULL, 'Y' },
 #endif
@@ -735,21 +767,14 @@ droproot(const char *username, const char *chroot_dir)
 				exit(1);
 			}
 		}
-#ifdef HAVE_CAP_NG_H
+#ifdef HAVE_LIBCAP_NG
 		int ret = capng_change_id(pw->pw_uid, pw->pw_gid, CAPNG_NO_FLAG);
 		if (ret < 0) {
 			fprintf(stderr, "error : ret %d\n", ret);
 		}
 		else {
-			printf("dropped privs to %s\n", username);
+			fprintf(stderr, "dropped privs to %s\n", username);
 		}
-		/* We don't need CAP_SETUID and CAP_SETGID */
-		capng_update(CAPNG_DROP, CAPNG_EFFECTIVE, CAP_SETUID);
-		capng_update(CAPNG_DROP, CAPNG_EFFECTIVE, CAP_SETUID);
-		capng_update(CAPNG_DROP, CAPNG_PERMITTED, CAP_SETUID);
-		capng_update(CAPNG_DROP, CAPNG_PERMITTED, CAP_SETUID);
-		capng_apply(CAPNG_SELECT_BOTH);
-
 #else
 		if (initgroups(pw->pw_name, pw->pw_gid) != 0 ||
 		    setgid(pw->pw_gid) != 0 || setuid(pw->pw_uid) != 0) {
@@ -761,15 +786,26 @@ droproot(const char *username, const char *chroot_dir)
 			exit(1);
 		}
 		else {
-			printf("dropped privs to %s\n", username);
+			fprintf(stderr, "dropped privs to %s\n", username);
 		}
-#endif /* HAVE_CAP_NG_H */
+#endif /* HAVE_LIBCAP_NG */
 	}
 	else {
 		fprintf(stderr, "tcpdump: Couldn't find user '%.32s'\n",
 		    username);
 		exit(1);
 	}
+#ifdef HAVE_LIBCAP_NG
+	/* We don't need CAP_SETUID and CAP_SETGID any more. */
+	capng_updatev(
+		CAPNG_DROP,
+		CAPNG_EFFECTIVE | CAPNG_PERMITTED,
+		CAP_SETUID,
+		CAP_SETGID,
+		-1);
+	capng_apply(CAPNG_SELECT_BOTH);
+#endif /* HAVE_LIBCAP_NG */
+
 }
 #endif /* WIN32 */
 
@@ -934,6 +970,76 @@ tstamp_precision_to_string(int precision)
 }
 #endif
 
+#ifdef HAVE_CAPSICUM
+/*
+ * Ensure that, on a dump file's descriptor, we have all the rights
+ * necessary to make the standard I/O library work with an fdopen()ed
+ * FILE * from that descriptor.
+ *
+ * A long time ago, in a galaxy far far away, AT&T decided that, instead
+ * of providing separate APIs for getting and setting the FD_ flags on a
+ * descriptor, getting and setting the O_ flags on a descriptor, and
+ * locking files, they'd throw them all into a kitchen-sink fcntl() call
+ * along the lines of ioctl(), the fact that ioctl() operations are
+ * largely specific to particular character devices but fcntl() operations
+ * are either generic to all descriptors or generic to all descriptors for
+ * regular files nonwithstanding.
+ *
+ * The Capsicum people decided that fine-grained control of descriptor
+ * operations was required, so that you need to grant permission for
+ * reading, writing, seeking, and fcntl-ing.  The latter, courtesy of
+ * AT&T's decision, means that "fcntl-ing" isn't a thing, but a motley
+ * collection of things, so there are *individual* fcntls for which
+ * permission needs to be granted.
+ *
+ * The FreeBSD standard I/O people implemented some optimizations that
+ * requires that the standard I/O routines be able to determine whether
+ * the descriptor for the FILE * is open append-only or not; as that
+ * descriptor could have come from an open() rather than an fopen(),
+ * that requires that it be able to do an F_GETFL fcntl() to read
+ * the O_ flags.
+ *
+ * Tcpdump uses ftell() to determine how much data has been written
+ * to a file in order to, when used with -C, determine when it's time
+ * to rotate capture files.  ftell() therefore needs to do an lseek()
+ * to find out the file offset and must, thanks to the aforementioned
+ * optimization, also know whether the descriptor is open append-only
+ * or not.
+ *
+ * The net result of all the above is that we need to grant CAP_SEEK,
+ * CAP_WRITE, and CAP_FCNTL with the CAP_FCNTL_GETFL subcapability.
+ *
+ * Perhaps this is the universe's way of saying that either
+ *
+ *	1) there needs to be an fopenat() call and a pcap_dump_openat() call
+ *	   using it, so that Capsicum-capable tcpdump wouldn't need to do
+ *	   an fdopen()
+ *
+ * or
+ *
+ *	2) there needs to be a cap_fdopen() call in the FreeBSD standard
+ *	   I/O library that knows what rights are needed by the standard
+ *	   I/O library, based on the open mode, and assigns them, perhaps
+ *	   with an additional argument indicating, for example, whether
+ *	   seeking should be allowed, so that tcpdump doesn't need to know
+ *	   what the standard I/O library happens to require this week.
+ */
+static void
+set_dumper_capsicum_rights(pcap_dumper_t *p)
+{
+	int fd = fileno(pcap_dump_file(p));
+	cap_rights_t rights;
+
+	cap_rights_init(&rights, CAP_SEEK, CAP_WRITE, CAP_FCNTL);
+	if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS) {
+		error("unable to limit dump descriptor");
+	}
+	if (cap_fcntls_limit(fd, CAP_FCNTL_GETFL) < 0 && errno != ENOSYS) {
+		error("unable to limit dump descriptor fcntls");
+	}
+}
+#endif
+
 int
 main(int argc, char **argv)
 {
@@ -982,6 +1088,7 @@ main(int argc, char **argv)
 	gndo->ndo_error=ndo_error;
 	gndo->ndo_warning=ndo_warning;
 	gndo->ndo_snaplen = DEFAULT_SNAPLEN;
+	gndo->ndo_immediate = 0;
 
 	cnt = -1;
 	device = NULL;
@@ -996,6 +1103,13 @@ main(int argc, char **argv)
 	else
 		program_name = argv[0];
 
+	/*
+	 * On platforms where the CPU doesn't support unaligned loads,
+	 * force unaligned accesses to abort with SIGBUS, rather than
+	 * being fixed up (slowly) by the OS kernel; on those platforms,
+	 * misaligned accesses are bugs, and we want tcpdump to crash so
+	 * that the bugs are reported.
+	 */
 	if (abort_on_misalignment(ebuf, sizeof(ebuf)) < 0)
 		error("%s", ebuf);
 
@@ -1004,7 +1118,7 @@ main(int argc, char **argv)
 #endif
 
 	while (
-	    (op = getopt_long(argc, argv, "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpq" Q_FLAG "r:Rs:StT:u" U_FLAG "vV:w:W:xXy:Yz:Z:#", longopts, NULL)) != -1)
+	    (op = getopt_long(argc, argv, SHORTOPTS, longopts, NULL)) != -1)
 		switch (op) {
 
 		case 'a':
@@ -1382,6 +1496,12 @@ main(int argc, char **argv)
 			break;
 #endif
 
+#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
+		case OPTION_IMMEDIATE_MODE:
+			gndo->ndo_immediate = 1;
+			break;
+#endif
+
 		default:
 			print_usage();
 			exit(1);
@@ -1417,6 +1537,17 @@ main(int argc, char **argv)
 	if (VFileName != NULL && RFileName != NULL)
 		error("-V and -r are mutually exclusive.");
 
+#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
+	/*
+	 * If we're printing dissected packets to the standard output
+	 * rather than saving raw packets to a file, and the standard
+	 * output is a terminal, use immediate mode, as the user's
+	 * probably expecting to see packets pop up immediately.
+	 */
+	if (WFileName == NULL && isatty(1))
+		gndo->ndo_immediate = 1;
+#endif
+
 #ifdef WITH_CHROOT
 	/* if run as root, prepare for chrooting */
 	if (getuid() == 0 || geteuid() == 0) {
@@ -1542,6 +1673,15 @@ main(int argc, char **argv)
 				pcap_statustostr(status));
 #endif
 
+#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
+		if (gndo->ndo_immediate) {
+			status = pcap_set_immediate_mode(pd, 1);
+			if (status != 0)
+				error("%s: Can't set immediate mode: %s",
+				device,
+				pcap_statustostr(status));
+		}
+#endif
 		/*
 		 * Is this an interface that supports monitor mode?
 		 */
@@ -1578,7 +1718,7 @@ main(int argc, char **argv)
 			status = pcap_set_tstamp_type(pd, jflag);
 			if (status < 0)
 				error("%s: Can't set time stamp type: %s",
-			    	    device, pcap_statustostr(status));
+			              device, pcap_statustostr(status));
 		}
 #endif
 		status = pcap_activate(pd);
@@ -1751,27 +1891,28 @@ main(int argc, char **argv)
 	 * savefile doesn't handle the general case.
 	 */
 
-#ifdef HAVE_CAP_NG_H
-	/* We are running as root and we will be writing to savefile */
-	if ((getuid() == 0 || geteuid() == 0) && WFileName) {
-		if (username) {
-			/* Drop all capabilities from effective set */
-			capng_clear(CAPNG_EFFECTIVE);
-			/* Add capabilities we will need*/
-			capng_update(CAPNG_ADD, CAPNG_PERMITTED, CAP_SETUID);
-			capng_update(CAPNG_ADD, CAPNG_PERMITTED, CAP_SETGID);
-			capng_update(CAPNG_ADD, CAPNG_PERMITTED, CAP_DAC_OVERRIDE);
-
-			capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, CAP_SETUID);
-			capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, CAP_SETGID);
-			capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE);
-
-			capng_apply(CAPNG_SELECT_BOTH);
-		}
-	}
-#endif /* HAVE_CAP_NG_H */
-
 	if (getuid() == 0 || geteuid() == 0) {
+#ifdef HAVE_LIBCAP_NG
+		/* Initialize capng */
+		capng_clear(CAPNG_SELECT_BOTH);
+		if (username) {
+			capng_updatev(
+				CAPNG_ADD,
+				CAPNG_PERMITTED | CAPNG_EFFECTIVE,
+				CAP_SETUID,
+				CAP_SETGID,
+				-1);
+		}
+
+		if (WFileName) {
+			capng_update(
+				CAPNG_ADD,
+				CAPNG_PERMITTED | CAPNG_EFFECTIVE,
+				CAP_DAC_OVERRIDE
+				);
+		}
+		capng_apply(CAPNG_SELECT_BOTH);
+#endif /* HAVE_LIBCAP_NG */
 		if (username || chroot_dir)
 			droproot(username, chroot_dir);
 
@@ -1784,7 +1925,12 @@ main(int argc, char **argv)
 	if (RFileName == NULL && VFileName == NULL) {
 		static const unsigned long cmds[] = { BIOCGSTATS };
 
-		cap_rights_init(&rights, CAP_IOCTL, CAP_READ);
+		/*
+		 * The various libpcap devices use a combination of
+		 * read (bpf), ioctl (bpf, netmap), poll (netmap).
+		 * Grant the relevant access rights, sorted by name.
+		 */
+		cap_rights_init(&rights, CAP_EVENT, CAP_IOCTL, CAP_READ);
 		if (cap_rights_limit(pcap_fileno(pd), &rights) < 0 &&
 		    errno != ENOSYS) {
 			error("unable to limit pcap descriptor");
@@ -1810,18 +1956,23 @@ main(int argc, char **argv)
 		  MakeFilename(dumpinfo.CurrentFileName, WFileName, 0, 0);
 
 		p = pcap_dump_open(pd, dumpinfo.CurrentFileName);
-#ifdef HAVE_CAP_NG_H
-        /* Give up capabilities, clear Effective set */
-        capng_clear(CAPNG_EFFECTIVE);
-#endif
+#ifdef HAVE_LIBCAP_NG
+		/* Give up CAP_DAC_OVERRIDE capability.
+		 * Only allow it to be restored if the -C or -G flag have been
+		 * set since we may need to create more files later on.
+		 */
+		capng_update(
+			CAPNG_DROP,
+			(Cflag || Gflag ? 0 : CAPNG_PERMITTED)
+				| CAPNG_EFFECTIVE,
+			CAP_DAC_OVERRIDE
+			);
+		capng_apply(CAPNG_SELECT_BOTH);
+#endif /* HAVE_LIBCAP_NG */
 		if (p == NULL)
 			error("%s", pcap_geterr(pd));
 #ifdef HAVE_CAPSICUM
-		cap_rights_init(&rights, CAP_SEEK, CAP_WRITE);
-		if (cap_rights_limit(fileno(pcap_dump_file(p)), &rights) < 0 &&
-		    errno != ENOSYS) {
-			error("unable to limit dump descriptor");
-		}
+		set_dumper_capsicum_rights(p);
 #endif
 		if (Cflag != 0 || Gflag != 0) {
 #ifdef HAVE_CAPSICUM
@@ -1838,6 +1989,10 @@ main(int argc, char **argv)
 			    errno != ENOSYS) {
 				error("unable to limit directory rights");
 			}
+			if (cap_fcntls_limit(dumpinfo.dirfd, CAP_FCNTL_GETFL) < 0 &&
+			    errno != ENOSYS) {
+				error("unable to limit dump descriptor fcntls");
+			}
 #else	/* !HAVE_CAPSICUM */
 			dumpinfo.WFileName = WFileName;
 #endif
@@ -2145,9 +2300,6 @@ static void
 dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {
 	struct dump_info *dump_info;
-#ifdef HAVE_CAPSICUM
-	cap_rights_t rights;
-#endif
 
 	++packets_captured;
 
@@ -2230,10 +2382,10 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
 			else
 				MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, 0, 0);
 
-#ifdef HAVE_CAP_NG_H
+#ifdef HAVE_LIBCAP_NG
 			capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE);
-			capng_apply(CAPNG_EFFECTIVE);
-#endif /* HAVE_CAP_NG_H */
+			capng_apply(CAPNG_SELECT_BOTH);
+#endif /* HAVE_LIBCAP_NG */
 #ifdef HAVE_CAPSICUM
 			fd = openat(dump_info->dirfd,
 			    dump_info->CurrentFileName,
@@ -2251,18 +2403,14 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
 #else	/* !HAVE_CAPSICUM */
 			dump_info->p = pcap_dump_open(dump_info->pd, dump_info->CurrentFileName);
 #endif
-#ifdef HAVE_CAP_NG_H
+#ifdef HAVE_LIBCAP_NG
 			capng_update(CAPNG_DROP, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE);
-			capng_apply(CAPNG_EFFECTIVE);
-#endif /* HAVE_CAP_NG_H */
+			capng_apply(CAPNG_SELECT_BOTH);
+#endif /* HAVE_LIBCAP_NG */
 			if (dump_info->p == NULL)
 				error("%s", pcap_geterr(pd));
 #ifdef HAVE_CAPSICUM
-			cap_rights_init(&rights, CAP_SEEK, CAP_WRITE);
-			if (cap_rights_limit(fileno(pcap_dump_file(dump_info->p)),
-			    &rights) < 0 && errno != ENOSYS) {
-				error("unable to limit dump descriptor");
-			}
+			set_dumper_capsicum_rights(dump_info->p);
 #endif
 		}
 	}
@@ -2272,59 +2420,70 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
 	 * larger than Cflag - the last packet written to the
 	 * file could put it over Cflag.
 	 */
-	if (Cflag != 0 && pcap_dump_ftell(dump_info->p) > Cflag) {
+	if (Cflag != 0) {
+		long size = pcap_dump_ftell(dump_info->p);
+
+		if (size == -1)
+			error("ftell fails on output file");
+		if (size > Cflag) {
 #ifdef HAVE_CAPSICUM
-		FILE *fp;
-		int fd;
+			FILE *fp;
+			int fd;
 #endif
 
-		/*
-		 * Close the current file and open a new one.
-		 */
-		pcap_dump_close(dump_info->p);
+			/*
+			 * Close the current file and open a new one.
+			 */
+			pcap_dump_close(dump_info->p);
 
-		/*
-		 * Compress the file we just closed, if the user asked for it
-		 */
-		if (zflag != NULL)
-			compress_savefile(dump_info->CurrentFileName);
+			/*
+			 * Compress the file we just closed, if the user
+			 * asked for it.
+			 */
+			if (zflag != NULL)
+				compress_savefile(dump_info->CurrentFileName);
 
-		Cflag_count++;
-		if (Wflag > 0) {
-			if (Cflag_count >= Wflag)
-				Cflag_count = 0;
-		}
-		if (dump_info->CurrentFileName != NULL)
-			free(dump_info->CurrentFileName);
-		dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);
-		if (dump_info->CurrentFileName == NULL)
-			error("dump_packet_and_trunc: malloc");
-		MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars);
+			Cflag_count++;
+			if (Wflag > 0) {
+				if (Cflag_count >= Wflag)
+					Cflag_count = 0;
+			}
+			if (dump_info->CurrentFileName != NULL)
+				free(dump_info->CurrentFileName);
+			dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);
+			if (dump_info->CurrentFileName == NULL)
+				error("dump_packet_and_trunc: malloc");
+			MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars);
+#ifdef HAVE_LIBCAP_NG
+			capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE);
+			capng_apply(CAPNG_SELECT_BOTH);
+#endif /* HAVE_LIBCAP_NG */
 #ifdef HAVE_CAPSICUM
-		fd = openat(dump_info->dirfd, dump_info->CurrentFileName,
-		    O_CREAT | O_WRONLY | O_TRUNC, 0644);
-		if (fd < 0) {
-			error("unable to open file %s",
-			    dump_info->CurrentFileName);
-		}
-		fp = fdopen(fd, "w");
-		if (fp == NULL) {
-			error("unable to fdopen file %s",
-			    dump_info->CurrentFileName);
-		}
-		dump_info->p = pcap_dump_fopen(dump_info->pd, fp);
+			fd = openat(dump_info->dirfd, dump_info->CurrentFileName,
+			    O_CREAT | O_WRONLY | O_TRUNC, 0644);
+			if (fd < 0) {
+				error("unable to open file %s",
+				    dump_info->CurrentFileName);
+			}
+			fp = fdopen(fd, "w");
+			if (fp == NULL) {
+				error("unable to fdopen file %s",
+				    dump_info->CurrentFileName);
+			}
+			dump_info->p = pcap_dump_fopen(dump_info->pd, fp);
 #else	/* !HAVE_CAPSICUM */
-		dump_info->p = pcap_dump_open(dump_info->pd, dump_info->CurrentFileName);
+			dump_info->p = pcap_dump_open(dump_info->pd, dump_info->CurrentFileName);
 #endif
-		if (dump_info->p == NULL)
-			error("%s", pcap_geterr(pd));
+#ifdef HAVE_LIBCAP_NG
+			capng_update(CAPNG_DROP, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE);
+			capng_apply(CAPNG_SELECT_BOTH);
+#endif /* HAVE_LIBCAP_NG */
+			if (dump_info->p == NULL)
+				error("%s", pcap_geterr(pd));
 #ifdef HAVE_CAPSICUM
-		cap_rights_init(&rights, CAP_SEEK, CAP_WRITE);
-		if (cap_rights_limit(fileno(pcap_dump_file(dump_info->p)),
-		    &rights) < 0 && errno != ENOSYS) {
-			error("unable to limit dump descriptor");
-		}
+			set_dumper_capsicum_rights(dump_info->p);
 #endif
+		}
 	}
 
 	pcap_dump((u_char *)dump_info->p, h, sp);
@@ -2378,7 +2537,8 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 	/*
 	 * Some printers want to check that they're not walking off the
 	 * end of the packet.
-	 * Rather than pass it all the way down, we set this global.
+	 * Rather than pass it all the way down, we set this member
+	 * of the netdissect_options structure.
 	 */
 	ndo->ndo_snapend = sp + h->caplen;
 
@@ -2388,6 +2548,11 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                 hdrlen = (*print_info->p.printer)(h, sp);
         }
 
+	/*
+	 * Restore the original snapend, as a printer might have
+	 * changed it.
+	 */
+	ndo->ndo_snapend = sp + h->caplen;
 	if (ndo->ndo_Xflag) {
 		/*
 		 * Print the raw packet data in hex and ASCII.
@@ -2486,7 +2651,7 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 static void
 ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
-	hex_and_ascii_print(ndo, "\n\t", bp, length); /* pass on lf and identation string */
+	hex_and_ascii_print(ndo, "\n\t", bp, length); /* pass on lf and indentation string */
 }
 
 void
@@ -2588,6 +2753,9 @@ print_usage(void)
 	(void)fprintf(stderr, "[ --time-stamp-precision precision ]\n");
 	(void)fprintf(stderr,
 "\t\t");
+#endif
+#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
+	(void)fprintf(stderr, "[ --immediate-mode ] ");
 #endif
 	(void)fprintf(stderr, "[ -T type ] [ --version ] [ -V file ]\n");
 	(void)fprintf(stderr,
diff --git a/contrib/tcpdump/udp.h b/contrib/tcpdump/udp.h
index 4bc90a790c51..743ddfaf8590 100644
--- a/contrib/tcpdump/udp.h
+++ b/contrib/tcpdump/udp.h
@@ -44,6 +44,8 @@ struct udphdr {
 	uint16_t	uh_sum;			/* udp checksum */
 };
 
+#define BOOTPS_PORT 67		/* RFC951 */
+#define BOOTPC_PORT 68		/* RFC951 */
 #define TFTP_PORT 69		/*XXX*/
 #define KERBEROS_PORT 88	/*XXX*/
 #define SUNRPC_PORT 111		/*XXX*/
@@ -72,6 +74,7 @@ struct udphdr {
 #define RADIUS_NEW_PORT 1812
 #define RADIUS_ACCOUNTING_PORT 1646
 #define RADIUS_NEW_ACCOUNTING_PORT 1813
+#define RADIUS_COA_PORT 3799
 #define HSRP_PORT 1985		/*XXX*/
 #define LMP_PORT                701 /* rfc4204 */
 #define LWRES_PORT		921
@@ -84,16 +87,17 @@ struct udphdr {
 #define BFD_ECHO_PORT           3785 /* draft-katz-ward-bfd-v4v6-1hop-00.txt */
 #define WB_PORT			4567
 #define SFLOW_PORT              6343 /* http://www.sflow.org/developers/specifications.php */
-#define LWAPP_DATA_PORT         12222 /* draft-ohara-capwap-lwapp-04.txt */
-#define LWAPP_CONTROL_PORT      12223 /* draft-ohara-capwap-lwapp-04.txt */
+#define LWAPP_DATA_PORT         12222 /* RFC 5412 */
+#define LWAPP_CONTROL_PORT      12223 /* RFC 5412 */
 #define OTV_PORT                8472  /* draft-hasmit-otv-04 */
-#define VXLAN_PORT              4789  /* draft-mahalingam-dutt-dcops-vxlan-04 */
+#define VXLAN_PORT              4789  /* RFC 7348 */
+#define GENEVE_PORT             6081  /* draft-gross-geneve-02 */
 
 #ifdef INET6
-#define RIPNG_PORT 521		/*XXX*/
+#define RIPNG_PORT              521   /* RFC 2080 */
 #define DHCP6_SERV_PORT 546	/*XXX*/
 #define DHCP6_CLI_PORT 547	/*XXX*/
 #define AHCP_PORT 5359		/* draft-chroboczek-ahcp-00 */
-#define BABEL_PORT 6696
-#define BABEL_PORT_OLD 6697
+#define BABEL_PORT              6696  /* RFC 6126 errata */
+#define BABEL_PORT_OLD          6697  /* RFC 6126 */
 #endif
diff --git a/contrib/tcpdump/util.c b/contrib/tcpdump/util.c
index 5731ca7b376a..b37f3d819542 100644
--- a/contrib/tcpdump/util.c
+++ b/contrib/tcpdump/util.c
@@ -19,6 +19,22 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/*
+ * txtproto_print() derived from original code by Hannes Gredler
+ * (hannes@juniper.net):
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code
+ * distributions retain the above copyright notice and this paragraph
+ * in its entirety, and (2) distributions including binary code include
+ * the above copyright notice and this paragraph in its entirety in
+ * the documentation or other materials provided with the distribution.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND
+ * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
+ * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ */
+
 #define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -135,7 +151,11 @@ fn_printzp(netdissect_options *ndo,
  * Format the timestamp
  */
 static char *
-ts_format(netdissect_options *ndo, int sec, int usec)
+ts_format(netdissect_options *ndo
+#ifndef HAVE_PCAP_SET_TSTAMP_PRECISION
+_U_
+#endif
+, int sec, int usec)
 {
 	static char buf[sizeof("00:00:00.000000000")];
 	const char *format;
@@ -317,7 +337,7 @@ tok2strbuf(register const struct tok *lp, register const char *fmt,
  */
 const char *
 tok2str(register const struct tok *lp, register const char *fmt,
-	register int v)
+	register u_int v)
 {
 	static char buf[4][128];
 	static int idx = 0;
@@ -335,12 +355,12 @@ tok2str(register const struct tok *lp, register const char *fmt,
  */
 static char *
 bittok2str_internal(register const struct tok *lp, register const char *fmt,
-	   register int v, register int sep)
+	   register u_int v, const char *sep)
 {
         static char buf[256]; /* our stringbuffer */
         int buflen=0;
-        register int rotbit; /* this is the bit we rotate through all bitpositions */
-        register int tokval;
+        register u_int rotbit; /* this is the bit we rotate through all bitpositions */
+        register u_int tokval;
         const char * sepstr = "";
 
 	while (lp != NULL && lp->s != NULL) {
@@ -355,7 +375,7 @@ bittok2str_internal(register const struct tok *lp, register const char *fmt,
                     /* ok we have found something */
                     buflen+=snprintf(buf+buflen, sizeof(buf)-buflen, "%s%s",
                                      sepstr, lp->s);
-                    sepstr = sep ? ", " : "";
+                    sepstr = sep;
                     break;
                 }
                 rotbit=rotbit<<1; /* no match - lets shift and try again */
@@ -365,7 +385,7 @@ bittok2str_internal(register const struct tok *lp, register const char *fmt,
 
         if (buflen == 0)
             /* bummer - lets print the "unknown" message as advised in the fmt string if we got one */
-            (void)snprintf(buf, sizeof(buf), fmt == NULL ? "#%d" : fmt, v);
+            (void)snprintf(buf, sizeof(buf), fmt == NULL ? "#%08x" : fmt, v);
         return (buf);
 }
 
@@ -375,9 +395,9 @@ bittok2str_internal(register const struct tok *lp, register const char *fmt,
  */
 char *
 bittok2str_nosep(register const struct tok *lp, register const char *fmt,
-	   register int v)
+	   register u_int v)
 {
-    return (bittok2str_internal(lp, fmt, v, 0));
+    return (bittok2str_internal(lp, fmt, v, ""));
 }
 
 /*
@@ -386,9 +406,9 @@ bittok2str_nosep(register const struct tok *lp, register const char *fmt,
  */
 char *
 bittok2str(register const struct tok *lp, register const char *fmt,
-	   register int v)
+	   register u_int v)
 {
-    return (bittok2str_internal(lp, fmt, v, 1));
+    return (bittok2str_internal(lp, fmt, v, ", "));
 }
 
 /*
@@ -471,6 +491,249 @@ mask62plen(const u_char *mask)
 }
 #endif /* INET6 */
 
+/*
+ * Routine to print out information for text-based protocols such as FTP,
+ * HTTP, SMTP, RTSP, SIP, ....
+ */
+#define MAX_TOKEN	128
+
+/*
+ * Fetch a token from a packet, starting at the specified index,
+ * and return the length of the token.
+ *
+ * Returns 0 on error; yes, this is indistinguishable from an empty
+ * token, but an "empty token" isn't a valid token - it just means
+ * either a space character at the beginning of the line (this
+ * includes a blank line) or no more tokens remaining on the line.
+ */
+static int
+fetch_token(netdissect_options *ndo, const u_char *pptr, u_int idx, u_int len,
+    u_char *tbuf, size_t tbuflen)
+{
+	size_t toklen = 0;
+
+	for (; idx < len; idx++) {
+		if (!ND_TTEST(*(pptr + idx))) {
+			/* ran past end of captured data */
+			return (0);
+		}
+		if (!isascii(*(pptr + idx))) {
+			/* not an ASCII character */
+			return (0);
+		}
+		if (isspace(*(pptr + idx))) {
+			/* end of token */
+			break;
+		}
+		if (!isprint(*(pptr + idx))) {
+			/* not part of a command token or response code */
+			return (0);
+		}
+		if (toklen + 2 > tbuflen) {
+			/* no room for this character and terminating '\0' */
+			return (0);
+		}
+		tbuf[toklen] = *(pptr + idx);
+		toklen++;
+	}
+	if (toklen == 0) {
+		/* no token */
+		return (0);
+	}
+	tbuf[toklen] = '\0';
+
+	/*
+	 * Skip past any white space after the token, until we see
+	 * an end-of-line (CR or LF).
+	 */
+	for (; idx < len; idx++) {
+		if (!ND_TTEST(*(pptr + idx))) {
+			/* ran past end of captured data */
+			break;
+		}
+		if (*(pptr + idx) == '\r' || *(pptr + idx) == '\n') {
+			/* end of line */
+			break;
+		}
+		if (!isascii(*(pptr + idx)) || !isprint(*(pptr + idx))) {
+			/* not a printable ASCII character */
+			break;
+		}
+		if (!isspace(*(pptr + idx))) {
+			/* beginning of next token */
+			break;
+		}
+	}
+	return (idx);
+}
+
+/*
+ * Scan a buffer looking for a line ending - LF or CR-LF.
+ * Return the index of the character after the line ending or 0 if
+ * we encounter a non-ASCII or non-printable character or don't find
+ * the line ending.
+ */
+static u_int
+print_txt_line(netdissect_options *ndo, const char *protoname,
+    const char *prefix, const u_char *pptr, u_int idx, u_int len)
+{
+	u_int startidx;
+	u_int linelen;
+
+	startidx = idx;
+	while (idx < len) {
+		ND_TCHECK(*(pptr+idx));
+		if (*(pptr+idx) == '\n') {
+			/*
+			 * LF without CR; end of line.
+			 * Skip the LF and print the line, with the
+			 * exception of the LF.
+			 */
+			linelen = idx - startidx;
+			idx++;
+			goto print;
+		} else if (*(pptr+idx) == '\r') {
+			/* CR - any LF? */
+			if ((idx+1) >= len) {
+				/* not in this packet */
+				return (0);
+			}
+			ND_TCHECK(*(pptr+idx+1));
+			if (*(pptr+idx+1) == '\n') {
+				/*
+				 * CR-LF; end of line.
+				 * Skip the CR-LF and print the line, with
+				 * the exception of the CR-LF.
+				 */
+				linelen = idx - startidx;
+				idx += 2;
+				goto print;
+			}
+
+			/*
+			 * CR followed by something else; treat this
+			 * as if it were binary data, and don't print
+			 * it.
+			 */
+			return (0);
+		} else if (!isascii(*(pptr+idx)) ||
+		    (!isprint(*(pptr+idx)) && *(pptr+idx) != '\t')) {
+			/*
+			 * Not a printable ASCII character and not a tab;
+			 * treat this as if it were binary data, and
+			 * don't print it.
+			 */
+			return (0);
+		}
+		idx++;
+	}
+
+	/*
+	 * All printable ASCII, but no line ending after that point
+	 * in the buffer; treat this as if it were truncated.
+	 */
+trunc:
+	linelen = idx - startidx;
+	ND_PRINT((ndo, "%s%.*s[!%s]", prefix, (int)linelen, pptr + startidx,
+	    protoname));
+	return (0);
+
+print:
+	ND_PRINT((ndo, "%s%.*s", prefix, (int)linelen, pptr + startidx));
+	return (idx);
+}
+
+void
+txtproto_print(netdissect_options *ndo, const u_char *pptr, u_int len,
+    const char *protoname, const char **cmds, u_int flags)
+{
+	u_int idx, eol;
+	u_char token[MAX_TOKEN+1];
+	const char *cmd;
+	int is_reqresp = 0;
+	const char *pnp;
+
+	if (cmds != NULL) {
+		/*
+		 * This protocol has more than just request and
+		 * response lines; see whether this looks like a
+		 * request or response.
+		 */
+		idx = fetch_token(ndo, pptr, 0, len, token, sizeof(token));
+		if (idx != 0) {
+			/* Is this a valid request name? */
+			while ((cmd = *cmds++) != NULL) {
+				if (strcasecmp((const char *)token, cmd) == 0) {
+					/* Yes. */
+					is_reqresp = 1;
+					break;
+				}
+			}
+
+			/*
+			 * No - is this a valid response code (3 digits)?
+			 *
+			 * Is this token the response code, or is the next
+			 * token the response code?
+			 */
+			if (flags & RESP_CODE_SECOND_TOKEN) {
+				/*
+				 * Next token - get it.
+				 */
+				idx = fetch_token(ndo, pptr, idx, len, token,
+				    sizeof(token));
+			}
+			if (idx != 0) {
+				if (isdigit(token[0]) && isdigit(token[1]) &&
+				    isdigit(token[2]) && token[3] == '\0') {
+					/* Yes. */
+					is_reqresp = 1;
+				}
+			}
+		}
+	} else {
+		/*
+		 * This protocol has only request and response lines
+		 * (e.g., FTP, where all the data goes over a
+		 * different connection); assume the payload is
+		 * a request or response.
+		 */
+		is_reqresp = 1;
+	}
+
+	/* Capitalize the protocol name */
+	for (pnp = protoname; *pnp != '\0'; pnp++)
+		ND_PRINT((ndo, "%c", toupper(*pnp)));
+
+	if (is_reqresp) {
+		/*
+		 * In non-verbose mode, just print the protocol, followed
+		 * by the first line as the request or response info.
+		 *
+		 * In verbose mode, print lines as text until we run out
+		 * of characters or see something that's not a
+		 * printable-ASCII line.
+		 */
+		if (ndo->ndo_vflag) {
+			/*
+			 * We're going to print all the text lines in the
+			 * request or response; just print the length
+			 * on the first line of the output.
+			 */
+			ND_PRINT((ndo, ", length: %u", len));
+			for (idx = 0;
+			    idx < len && (eol = print_txt_line(ndo, protoname, "\n\t", pptr, idx, len)) != 0;
+			    idx = eol)
+				;
+		} else {
+			/*
+			 * Just print the first text line.
+			 */
+			print_txt_line(ndo, protoname, ": ", pptr, 0, len);
+		}
+	}
+}
+
 /* VARARGS */
 void
 error(const char *fmt, ...)
diff --git a/etc/inetd.conf b/etc/inetd.conf
index 77b4eda70fe5..98958d469831 100644
--- a/etc/inetd.conf
+++ b/etc/inetd.conf
@@ -68,6 +68,7 @@
 #walld/1	dgram rpc/udp wait root	/usr/libexec/rpc.rwalld	 rpc.rwalld
 #pcnfsd/1-2	dgram rpc/udp wait root	/usr/local/libexec/rpc.pcnfsd	 rpc.pcnfsd
 #rquotad/1	dgram rpc/udp wait root	/usr/libexec/rpc.rquotad rpc.rquotad
+#rquotad/1	dgram rpc/udp6 wait root	/usr/libexec/rpc.rquotad rpc.rquotad
 #sprayd/1	dgram rpc/udp wait root	/usr/libexec/rpc.sprayd	 rpc.sprayd
 #
 # example entry for the optional pop3 server
diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc
index 7ab7386fa2b4..b8b7780267c7 100644
--- a/etc/sendmail/freebsd.mc
+++ b/etc/sendmail/freebsd.mc
@@ -42,7 +42,6 @@ divert(-1)
 #  /usr/share/sendmail/cf/README or
 #  /usr/src/contrib/sendmail/cf/README
 # 
-#
 #  NOTE: If you enable RunAsUser, make sure that you adjust the permissions
 #  and owner of the SSL certificates and keys in /etc/mail/certs to be usable
 #  by that user.
diff --git a/etc/sendmail/freebsd.submit.mc b/etc/sendmail/freebsd.submit.mc
index c6ec65553598..aac040346405 100644
--- a/etc/sendmail/freebsd.submit.mc
+++ b/etc/sendmail/freebsd.submit.mc
@@ -7,7 +7,6 @@ divert(-1)
 # forth in the LICENSE file which can be found at the top level of
 # the sendmail distribution.
 #
-#
 
 #
 #  This is the FreeBSD configuration for a set-group-ID sm-msp sendmail
diff --git a/include/unistd.h b/include/unistd.h
index 0329122f7e7c..ef77133d0ba5 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -327,9 +327,9 @@ int	 close(int);
 void	 closefrom(int);
 int	 dup(int);
 int	 dup2(int, int);
-int	 execl(const char *, const char *, ...);
+int	 execl(const char *, const char *, ...) __sentinel;
 int	 execle(const char *, const char *, ...);
-int	 execlp(const char *, const char *, ...);
+int	 execlp(const char *, const char *, ...) __sentinel;
 int	 execv(const char *, char * const *);
 int	 execve(const char *, char * const *, char * const *);
 int	 execvp(const char *, char * const *);
diff --git a/lib/libc/aarch64/Symbol.map b/lib/libc/aarch64/Symbol.map
index 3d8ad2525596..25e13f4ccad2 100644
--- a/lib/libc/aarch64/Symbol.map
+++ b/lib/libc/aarch64/Symbol.map
@@ -21,6 +21,10 @@ FBSD_1.0 {
 	longjmp;
 	sigsetjmp;
 	siglongjmp;
+	htonl;
+	htons;
+	ntohl;
+	ntohs;
 	vfork;
 	brk;
 	sbrk;
diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/amd64/sys/Makefile.inc
index 46ea9550950f..cff6df10ea15 100644
--- a/lib/libc/amd64/sys/Makefile.inc
+++ b/lib/libc/amd64/sys/Makefile.inc
@@ -5,7 +5,7 @@ SRCS+=	amd64_get_fsbase.c amd64_get_gsbase.c amd64_set_fsbase.c \
 	amd64_set_gsbase.c __vdso_gettc.c
 
 MDASM=	vfork.S brk.S cerror.S exect.S getcontext.S pipe.S ptrace.S \
-	reboot.S sbrk.S setlogin.S sigreturn.S
+	sbrk.S setlogin.S sigreturn.S
 
 # Don't generate default code for these syscalls:
 NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
diff --git a/lib/libc/amd64/sys/reboot.S b/lib/libc/amd64/sys/reboot.S
deleted file mode 100644
index b9ad1c644b4e..000000000000
--- a/lib/libc/amd64/sys/reboot.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)reboot.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include 
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
-	WEAK_REFERENCE(__sys_reboot, _reboot)
-	WEAK_REFERENCE(__sys_reboot, reboot)
-ENTRY(__sys_reboot)
-	mov	$SYS_reboot,%rax
-	KERNCALL
-	jb	HIDENAME(cerror)
-	iretq
-END(__sys_reboot)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
index a5a3d49f2530..b83b439f6501 100644
--- a/lib/libc/gen/sysctl.c
+++ b/lib/libc/gen/sysctl.c
@@ -51,9 +51,21 @@ sysctl(const int *name, u_int namelen, void *oldp, size_t *oldlenp,
     const void *newp, size_t newlen)
 {
 	int retval;
+	size_t orig_oldlen;
 
+	orig_oldlen = oldlenp ? *oldlenp : 0;
 	retval = __sysctl(name, namelen, oldp, oldlenp, newp, newlen);
-	if (retval != -1 || errno != ENOENT || name[0] != CTL_USER)
+	/*
+	 * All valid names under CTL_USER have a dummy entry in the sysctl
+	 * tree (to support name lookups and enumerations) with an
+	 * empty/zero value, and the true value is supplied by this routine.
+	 * For all such names, __sysctl() is used solely to validate the
+	 * name.
+	 *
+	 * Return here unless there was a successful lookup for a CTL_USER
+	 * name.
+	 */
+	if (retval || name[0] != CTL_USER)
 		return (retval);
 
 	if (newp != NULL) {
@@ -67,7 +79,7 @@ sysctl(const int *name, u_int namelen, void *oldp, size_t *oldlenp,
 
 	switch (name[1]) {
 	case USER_CS_PATH:
-		if (oldp && *oldlenp < sizeof(_PATH_STDPATH)) {
+		if (oldp && orig_oldlen < sizeof(_PATH_STDPATH)) {
 			errno = ENOMEM;
 			return -1;
 		}
diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc
index ebaa4620152a..2841d8643d48 100644
--- a/lib/libc/i386/sys/Makefile.inc
+++ b/lib/libc/i386/sys/Makefile.inc
@@ -9,7 +9,7 @@ SRCS+=	i386_get_fsbase.c i386_get_gsbase.c i386_get_ioperm.c i386_get_ldt.c \
 	__vdso_gettc.c
 
 MDASM=	Ovfork.S brk.S cerror.S exect.S getcontext.S pipe.S ptrace.S \
-	reboot.S sbrk.S setlogin.S sigreturn.S syscall.S
+	sbrk.S setlogin.S sigreturn.S syscall.S
 
 # Don't generate default code for these syscalls:
 NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2
index acd376cd2272..a546666ef358 100644
--- a/lib/libc/sys/open.2
+++ b/lib/libc/sys/open.2
@@ -427,7 +427,7 @@ of
 .Dv O_RDWR
 and
 .Dv O_EXEC .
-.It Bq Eq EBADF
+.It Bq Er EBADF
 The
 .Fa path
 argument does not specify an absolute path and the
@@ -436,7 +436,7 @@ argument is
 neither
 .Dv AT_FDCWD
 nor a valid file descriptor open for searching.
-.It Bq Eq ENOTDIR
+.It Bq Er ENOTDIR
 The
 .Fa path
 argument is not an absolute path and
@@ -444,7 +444,7 @@ argument is not an absolute path and
 is neither
 .Dv AT_FDCWD
 nor a file descriptor associated with a directory.
-.It Bq Eq ENOTDIR
+.It Bq Er ENOTDIR
 .Dv O_DIRECTORY
 is specified and the file is not a directory.
 .El
diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile
index b30ba42e3af2..20f54c127e6b 100644
--- a/lib/libsm/Makefile
+++ b/lib/libsm/Makefile
@@ -29,7 +29,7 @@ SRCS+=	assert.c debug.c errstring.c exc.c heap.c match.c rpool.c \
 	smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c \
 	vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c \
 	wbuf.c wsetup.c string.c stringf.c \
-	xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c \
+	xtrap.c strto.c test.c strcasecmp.c strrevcmp.c \
 	signal.c clock.c config.c sem.c shm.c mbdb.c strexit.c cf.c ldap.c \
 	niprop.c mpeix.c memstat.c util.c inet6_ntop.c
 CLEANFILES+=sm_os.h
diff --git a/lib/libthr/thread/thr_create.c b/lib/libthr/thread/thr_create.c
index df3509dfd2c0..701a1bd92c16 100644
--- a/lib/libthr/thread/thr_create.c
+++ b/lib/libthr/thread/thr_create.c
@@ -165,7 +165,7 @@ _pthread_create(pthread_t * thread, const pthread_attr_t * attr,
 		param.flags |= THR_SYSTEM_SCOPE;
 	if (new_thread->attr.sched_inherit == PTHREAD_INHERIT_SCHED)
 		param.rtp = NULL;
-	else { 	 
+	else {
 		sched_param.sched_priority = new_thread->attr.prio;
 		_schedparam_to_rtp(new_thread->attr.sched_policy,
 			&sched_param, &rtp);
diff --git a/lib/libvmmapi/vmmapi.c b/lib/libvmmapi/vmmapi.c
index e87efc96ff05..fb8eb787a1d6 100644
--- a/lib/libvmmapi/vmmapi.c
+++ b/lib/libvmmapi/vmmapi.c
@@ -472,7 +472,7 @@ vm_create_devmem(struct vmctx *ctx, int segid, const char *name, size_t len)
 	if (error)
 		goto done;
 
-	strlcpy(pathname, "/dev/vmm/", sizeof(pathname));
+	strlcpy(pathname, "/dev/vmm.io/", sizeof(pathname));
 	strlcat(pathname, ctx->name, sizeof(pathname));
 	strlcat(pathname, ".", sizeof(pathname));
 	strlcat(pathname, name, sizeof(pathname));
diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c
index b515a1e9625f..4c8556b65732 100644
--- a/libexec/rtld-elf/aarch64/reloc.c
+++ b/libexec/rtld-elf/aarch64/reloc.c
@@ -341,7 +341,8 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, int flags,
 			if (def == NULL)
 				return (-1);
 
-			*where = (Elf_Addr)defobj->relocbase + def->st_value;
+			*where = (Elf_Addr)defobj->relocbase + def->st_value +
+			    rela->r_addend;
 			break;
 		case R_AARCH64_COPY:
 			/*
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index 34ed1df48611..e6e5433555cb 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -342,6 +342,10 @@
 	receiving the SIGINFO signal has been
 	fixed.
 
+      The &man.pw.8; utility has been updated
+	with a new flag, -R, that sets the root
+	directory within which the utility will operate.
+
       The &man.lockstat.1; utility has been
 	updated with several improvements:
@@ -403,10 +407,6 @@
 	Clang have been updated to
 	version 3.4.
 
-      Sendmail has been
-	updated from 8.14.7 to 8.14.9.
-
       file has been
 	updated to version 5.22.
 
@@ -476,6 +476,22 @@
 
       The &man.file.1; utility has been
 	updated to version 5.23.
+
+      sendmail has
+	been updated to 8.15.2.  Starting with &os; 11.0 and
+	sendmail 8.15, sendmail uses uncompressed IPv6 addresses by
+	default, i.e., they will not contain ::.  For
+	example, instead of ::1, it will be
+	0:0:0:0:0:0:0:1.  This permits a zero subnet to
+	have a more specific match, such as different map entries for
+	IPv6:0:0 vs IPv6:0.  This change requires that configuration
+	data (including maps, files, classes, custom ruleset, etc.)
+	must use the same format, so make certain such configuration
+	data is upgrading.  As a very simple check search for patterns
+	like 'IPv6:[0-9a-fA-F:]*::' and 'IPv6::'.  To return to the
+	old behavior, set the m4 option
+	confUSE_COMPRESSED_IPV6_ADDRESSES or the cf
+	option UseCompressedIPv6Addresses.
     
 
     
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 728e9f4e3d68..61eaa2215d84 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -725,10 +725,10 @@ populate_mfs_tree() {
     # /stand/crunch is our main binary, we extract its libs
     find_progs ${dst}/stand/crunch
     if [ -n "${u_libs}" ] ; then
-	mkdir -p ${dst}/lib && cp -p ${u_libs} ${dst}/lib
+	mkdir -p ${dst}/lib && (cp -p ${u_libs} ${dst}/lib || log "copy libs ${u_libs} failed" )
 	mkdir -p ${dst}/libexec
         create_includes_and_libraries2 libexec/rtld-elf
-        find_progs ld-elf.so.1 && cp -p ${u_progs} ${dst}/libexec
+        find_progs ld-elf.so.1 && ( cp -p ${u_progs} ${dst}/libexec || log "copy ${u_progs} failed" )
     fi
 
     [ -n "${copy_files}" ] && do_copyfiles ${dst} copy_files
@@ -959,6 +959,7 @@ set_build_parameters() {
 	export WITH_GNUCXX=yes
 	export WITHOUT_CLANG=yes
 	export WITHOUT_ICONV=yes
+	export WITHOUT_TESTS=yes
 
 	# XXX why change machine_arch ?
 	#-- export MACHINE_ARCH=`uname -m` MACHINE=`uname -m`
diff --git a/release/picobsd/floppy.tree/etc/ttys b/release/picobsd/floppy.tree/etc/ttys
index 1daea68d1314..e0ff48035b73 100644
--- a/release/picobsd/floppy.tree/etc/ttys
+++ b/release/picobsd/floppy.tree/etc/ttys
@@ -33,3 +33,4 @@ ttyp7	none			network secure
 ttyp8	none			network secure
 ttyp9	none			network secure
 ttyu0   "/usr/libexec/getty 3wire"   dialup  on secure
+ttyu1   "/usr/libexec/getty 3wire"   dialup  on secure
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 7f535810d16b..836bc87daa48 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -591,8 +591,8 @@ getnfsargs(char *spec, struct iovec **iov, int *iovlen)
 		 * For a Kerberized nfs mount where the "principal"
 		 * argument has not been set, add it here.
 		 */
-		if (got_principal == 0 && secflavor >= 0 &&
-		    secflavor != AUTH_SYS && ai_nfs->ai_canonname != NULL) {
+		if (got_principal == 0 && secflavor != AUTH_SYS &&
+		    ai_nfs->ai_canonname != NULL) {
 			snprintf(pname, sizeof (pname), "nfs@%s",
 			    ai_nfs->ai_canonname);
 			build_iovec(iov, iovlen, "principal", pname,
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index b21002a76712..498f905b2d7e 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -820,12 +820,12 @@ _ccd.4=		ccd.4
 .endif
 
 .if ${MK_CDDL} != "no"
-_dtrace_io.4=	dtrace-io.4
-_dtrace_ip.4=	dtrace-ip.4
-_dtrace_proc.4=	dtrace-proc.4
-_dtrace_sched.4= dtrace-sched.4
-_dtrace_tcp.4=	dtrace-tcp.4
-_dtrace_udp.4=	dtrace-udp.4
+_dtrace_io.4=	dtrace_io.4
+_dtrace_ip.4=	dtrace_ip.4
+_dtrace_proc.4=	dtrace_proc.4
+_dtrace_sched.4= dtrace_sched.4
+_dtrace_tcp.4=	dtrace_tcp.4
+_dtrace_udp.4=	dtrace_udp.4
 .endif
 
 .if ${MK_ISCSI} != "no"
diff --git a/share/man/man4/dtrace-io.4 b/share/man/man4/dtrace_io.4
similarity index 99%
rename from share/man/man4/dtrace-io.4
rename to share/man/man4/dtrace_io.4
index 4f81434ab9aa..dea622188b92 100644
--- a/share/man/man4/dtrace-io.4
+++ b/share/man/man4/dtrace_io.4
@@ -25,10 +25,10 @@
 .\" $FreeBSD$
 .\"
 .Dd April 18, 2015
-.Dt DTRACE-IO 4
+.Dt DTRACE_IO 4
 .Os
 .Sh NAME
-.Nm dtrace-io
+.Nm dtrace_io
 .Nd a DTrace provider for tracing events related to disk I/O
 .Sh SYNOPSIS
 .Fn io:::start "struct bio *" "struct devstat *"
diff --git a/share/man/man4/dtrace-ip.4 b/share/man/man4/dtrace_ip.4
similarity index 98%
rename from share/man/man4/dtrace-ip.4
rename to share/man/man4/dtrace_ip.4
index f0a4ea931243..62148e9c9a16 100644
--- a/share/man/man4/dtrace-ip.4
+++ b/share/man/man4/dtrace_ip.4
@@ -25,10 +25,10 @@
 .\" $FreeBSD$
 .\"
 .Dd April 18, 2015
-.Dt DTRACE-IP 4
+.Dt DTRACE_IP 4
 .Os
 .Sh NAME
-.Nm dtrace-ip
+.Nm dtrace_ip
 .Nd a DTrace provider for tracing events related to the IPv4 and IPv6 protocols
 .Sh SYNOPSIS
 .Fn ip:::receive "pktinfo_t *" "csinfo_t *" "ipinfo_t *" "ifinfo_t *" \
@@ -52,9 +52,9 @@ The arguments to these probes can be used to obtain detailed information about
 the IP headers of the corresponding packet, as well as the network interface on
 which the packet was sent or received.
 Unlike the
-.Xr dtrace-tcp 4
+.Xr dtrace_tcp 4
 and
-.Xr dtrace-udp 4
+.Xr dtrace_udp 4
 providers,
 .Nm ip
 provider probes are triggered by forwarded packets.
@@ -268,8 +268,8 @@ This provider is compatible with the
 providers found in Solaris and Darwin.
 .Sh SEE ALSO
 .Xr dtrace 1 ,
-.Xr dtrace-tcp 4 ,
-.Xr dtrace-udp 4 ,
+.Xr dtrace_tcp 4 ,
+.Xr dtrace_udp 4 ,
 .Xr ip 4 ,
 .Xr ip6 4 ,
 .Xr ifnet 9 ,
diff --git a/share/man/man4/dtrace-proc.4 b/share/man/man4/dtrace_proc.4
similarity index 99%
rename from share/man/man4/dtrace-proc.4
rename to share/man/man4/dtrace_proc.4
index 9ba74fb26069..8b27ac1e77f7 100644
--- a/share/man/man4/dtrace-proc.4
+++ b/share/man/man4/dtrace_proc.4
@@ -25,10 +25,10 @@
 .\" $FreeBSD$
 .\"
 .Dd April 18, 2015
-.Dt DTRACE-PROC 4
+.Dt DTRACE_PROC 4
 .Os
 .Sh NAME
-.Nm dtrace-proc
+.Nm dtrace_proc
 .Nd a DTrace provider for tracing events related to user processes
 .Sh SYNOPSIS
 .Fn proc:::create "struct proc *" "struct proc *" "int"
@@ -251,7 +251,7 @@ provider probes found in Solaris are not currently available on
 .Xr vfork 2 ,
 .Xr siginfo 3 ,
 .Xr signal 3 ,
-.Xr dtrace-sched 4 ,
+.Xr dtrace_sched 4 ,
 .Xr kproc 9
 .Sh HISTORY
 The
diff --git a/share/man/man4/dtrace-sched.4 b/share/man/man4/dtrace_sched.4
similarity index 99%
rename from share/man/man4/dtrace-sched.4
rename to share/man/man4/dtrace_sched.4
index 0b26e5eb1a18..5c45f401d052 100644
--- a/share/man/man4/dtrace-sched.4
+++ b/share/man/man4/dtrace_sched.4
@@ -25,10 +25,10 @@
 .\" $FreeBSD$
 .\"
 .Dd April 18, 2015
-.Dt DTRACE-SCHED 4
+.Dt DTRACE_SCHED 4
 .Os
 .Sh NAME
-.Nm dtrace-sched
+.Nm dtrace_sched
 .Nd a DTrace provider for tracing CPU scheduling events
 .Sh SYNOPSIS
 .Fn sched:::change-pri "struct thread *" "struct proc *" "uint8_t"
diff --git a/share/man/man4/dtrace-tcp.4 b/share/man/man4/dtrace_tcp.4
similarity index 97%
rename from share/man/man4/dtrace-tcp.4
rename to share/man/man4/dtrace_tcp.4
index 3c1ffa249527..f499ae4ae46d 100644
--- a/share/man/man4/dtrace-tcp.4
+++ b/share/man/man4/dtrace_tcp.4
@@ -24,11 +24,11 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 18, 2015
-.Dt DTRACE-TCP 4
+.Dd July 5, 2015
+.Dt DTRACE_TCP 4
 .Os
 .Sh NAME
-.Nm dtrace-tcp
+.Nm dtrace_tcp
 .Nd a DTrace provider for tracing events related to the
 .Xr tcp 4
 protocol
@@ -56,9 +56,9 @@ provider allows users to trace events in the
 .Xr tcp 4
 protocol implementation.
 This provider is similar to the
-.Xr dtrace-ip 4
+.Xr dtrace_ip 4
 and
-.Xr dtrace-udp 4
+.Xr dtrace_udp 4
 providers, but additionally contains probes corresponding to protocol events at
 a level higher than packet reception and transmission.
 All
@@ -120,12 +120,12 @@ and
 .Fn tcp:::receive
 probes fire when the host sends or receives a TCP packet, respectively.
 As with the
-.Xr dtrace-udp 4
+.Xr dtrace_udp 4
 provider,
 .Nm tcp
 probes fire only for packets sent by or to the local host; forwarded packets are
 handled in the IP layer and are only visible to the
-.Xr dtrace-ip 4
+.Xr dtrace_ip 4
 provider.
 .Pp
 The
@@ -168,7 +168,7 @@ The
 .Vt ipinfo_t
 type is a version-agnostic representation of fields from an IP header.
 Its fields are described in the
-.Xr dtrace-ip 4
+.Xr dtrace_ip 4
 manual page.
 .Pp
 The
@@ -373,8 +373,8 @@ This provider is compatible with the
 provider in Solaris.
 .Sh SEE ALSO
 .Xr dtrace 1 ,
-.Xr dtrace-ip 4 ,
-.Xr dtrace-udp 4 ,
+.Xr dtrace_ip 4 ,
+.Xr dtrace_udp 4 ,
 .Xr tcp 4 ,
 .Xr SDT 9
 .Sh HISTORY
@@ -388,10 +388,6 @@ This manual page was written by
 .An Mark Johnston Aq Mt markj@FreeBSD.org .
 .Sh BUGS
 The
-.Fn tcp:::state-change
-probe does not fire upon transitions to the TIME-WAIT state.
-.Pp
-The
 .Vt tcps_local
 and
 .Vt tcps_active
diff --git a/share/man/man4/dtrace-udp.4 b/share/man/man4/dtrace_udp.4
similarity index 98%
rename from share/man/man4/dtrace-udp.4
rename to share/man/man4/dtrace_udp.4
index 7ebc9066d497..e39cc7573d1e 100644
--- a/share/man/man4/dtrace-udp.4
+++ b/share/man/man4/dtrace_udp.4
@@ -25,10 +25,10 @@
 .\" $FreeBSD$
 .\"
 .Dd April 18, 2015
-.Dt DTRACE-UDP 4
+.Dt DTRACE_UDP 4
 .Os
 .Sh NAME
-.Nm dtrace-udp
+.Nm dtrace_udp
 .Nd a DTrace provider for tracing events related to the UDP protocol
 .Sh SYNOPSIS
 .Fn udp:::receive "pktinfo_t *" "csinfo_t *" "ipinfo_t *" "udpsinfo_t *" \
@@ -184,8 +184,8 @@ This provider is compatible with the
 provider in Solaris.
 .Sh SEE ALSO
 .Xr dtrace 1 ,
-.Xr dtrace-ip 4 ,
-.Xr dtrace-tcp 4 ,
+.Xr dtrace_ip 4 ,
+.Xr dtrace_tcp 4 ,
 .Xr udp 4 ,
 .Xr SDT 9
 .Sh HISTORY
diff --git a/share/man/man9/SDT.9 b/share/man/man9/SDT.9
index 2765c4c37a2c..2da0773a7b7e 100644
--- a/share/man/man9/SDT.9
+++ b/share/man/man9/SDT.9
@@ -305,12 +305,12 @@ SDT_PROBE_DEFINE1_XLATE(ip, , , receive, "struct icmp *",
 .Ed
 .Sh SEE ALSO
 .Xr dtrace 1 ,
-.Xr dtrace-io 4 ,
-.Xr dtrace-ip 4 ,
-.Xr dtrace-proc 4 ,
-.Xr dtrace-sched 4 ,
-.Xr dtrace-tcp 4 ,
-.Xr dtrace-udp 4
+.Xr dtrace_io 4 ,
+.Xr dtrace_ip 4 ,
+.Xr dtrace_proc 4 ,
+.Xr dtrace_sched 4 ,
+.Xr dtrace_tcp 4 ,
+.Xr dtrace_udp 4
 .Sh AUTHORS
 .An -nosplit
 DTrace and the
diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9
index 76ce70b90541..30d3b92526c2 100644
--- a/share/man/man9/locking.9
+++ b/share/man/man9/locking.9
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 30, 2013
+.Dd July 5, 2015
 .Dt LOCKING 9
 .Os
 .Sh NAME
@@ -387,6 +387,7 @@ At this time this is a rather easy to remember table.
 .It interrupt filter:  Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no
 .It interrupt thread:  Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no
 .It callout:    Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no
+.It direct callout:  Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no
 .It system call:    Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok
 .El
 .Sh SEE ALSO
@@ -401,7 +402,8 @@ At this time this is a rather easy to remember table.
 .Xr rwlock 9 ,
 .Xr sema 9 ,
 .Xr sleep 9 ,
-.Xr sx 9
+.Xr sx 9 ,
+.Xr timeout 9
 .Sh HISTORY
 These
 functions appeared in
diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9
index 14500b53f7b9..5d98e9cd4f92 100644
--- a/share/man/man9/pci.9
+++ b/share/man/man9/pci.9
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 28, 2015
+.Dd July 8, 2015
 .Dt PCI 9
 .Os
 .Sh NAME
@@ -445,7 +445,7 @@ The
 function is used to advertise that the given device
 .Pq and associated device driver
 supports PCI Single-Root I/O Virtualization
-.Po SR-IOV Pc .
+.Pq SR-IOV .
 A driver that supports SR-IOV must implement the
 .Xr PCI_IOV_INIT 9 ,
 .Xr PCI_IOV_ADD_VF 9
diff --git a/share/man/man9/pci_iov_schema.9 b/share/man/man9/pci_iov_schema.9
index 52e5c8b55f3d..b065b2e78dae 100644
--- a/share/man/man9/pci_iov_schema.9
+++ b/share/man/man9/pci_iov_schema.9
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 18, 2015
+.Dd July 8, 2015
 .Dt PCI_IOV_SCHEMA 9
 .Os
 .Sh NAME
@@ -227,7 +227,7 @@ type.
 Values of type
 .Vt uint32_t
 are unsigned integers in the range 0 to
-.Po 2**32 - 1 Pc ,
+.Pq 2**32 - 1 ,
 inclusive.
 .Pp
 The
@@ -241,7 +241,7 @@ type.
 Values of type
 .Vt uint64_t
 are unsigned integers in the range 0 to
-.Po 2**64 - 1 Pc ,
+.Pq 2**64 - 1 ,
 inclusive.
 .Pp
 The
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index ed65ac67b0ad..0af69aa4a271 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -26,7 +26,7 @@
 .\"	From: @(#)style	1.14 (Berkeley) 4/28/95
 .\" $FreeBSD$
 .\"
-.Dd January 7, 2010
+.Dd July 6, 2015
 .Dt STYLE 9
 .Os
 .Sh NAME
@@ -503,13 +503,14 @@ Code which is unreachable for non-obvious reasons may be marked /*
 .Pp
 Space after keywords
 .Pq Ic if , while , for , return , switch .
-No braces
+Two styles of braces
 .Ql ( \&{
 and
 .Ql \&} )
-are
-used for control statements with zero or only a single statement unless that
-statement is more than a single line in which case they are permitted.
+are allowed for single line statements.
+Either they are used for all single statements, or
+they are used only where needed for clarity.
+Usage within a function should be consistent.
 Forever loops are done with
 .Ic for Ns 's ,
 not
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index 2bf40d47b608..cdf8bab71d59 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -131,6 +131,7 @@ bruno [label="Bruno Ducrot\nbruno@FreeBSD.org\n2005/07/18"]
 bryanv [label="Bryan Venteicher\nbryanv@FreeBSD.org\n2012/11/03"]
 bschmidt [label="Bernhard Schmidt\nbschmidt@FreeBSD.org\n2010/02/06"]
 bz [label="Bjoern A. Zeeb\nbz@FreeBSD.org\n2004/07/27"]
+cem [label="Conrad Meyer\ncem@FreeBSD.org\n2015/07/05"]
 cognet [label="Olivier Houchard\ncognet@FreeBSD.org\n2002/10/09"]
 cokane [label="Coleman Kane\ncokane@FreeBSD.org\n2000/06/19"]
 cperciva [label="Colin Percival\ncperciva@FreeBSD.org\n2004/01/20"]
@@ -577,6 +578,8 @@ marcel -> marius
 marcel -> nwhitehorn
 marcel -> sjg
 
+markj -> cem
+
 markm -> jasone
 markm -> sheldonh
 
diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
index 6d5c6b6f3b43..7892d51ec19c 100644
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -84,6 +84,10 @@ u_int	atomic_fetchadd_int(volatile u_int *p, u_int v);
 u_long	atomic_fetchadd_long(volatile u_long *p, u_long v);
 int	atomic_testandset_int(volatile u_int *p, u_int v);
 int	atomic_testandset_long(volatile u_long *p, u_int v);
+void	atomic_thread_fence_acq(void);
+void	atomic_thread_fence_acq_rel(void);
+void	atomic_thread_fence_rel(void);
+void	atomic_thread_fence_seq_cst(void);
 
 #define	ATOMIC_LOAD(TYPE)					\
 u_##TYPE	atomic_load_acq_##TYPE(volatile u_##TYPE *p)
@@ -328,6 +332,34 @@ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)	\
 }								\
 struct __hack
 
+static __inline void
+atomic_thread_fence_acq(void)
+{
+
+	__compiler_membar();
+}
+
+static __inline void
+atomic_thread_fence_rel(void)
+{
+
+	__compiler_membar();
+}
+
+static __inline void
+atomic_thread_fence_acq_rel(void)
+{
+
+	__compiler_membar();
+}
+
+static __inline void
+atomic_thread_fence_seq_cst(void)
+{
+
+	__storeload_barrier();
+}
+
 #endif /* KLD_MODULE || !__GNUCLIKE_ASM */
 
 ATOMIC_ASM(set,	     char,  "orb %b1,%0",  "iq",  v);
diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c
index 4ef1482894b0..5cb415009325 100644
--- a/sys/amd64/vmm/vmm_dev.c
+++ b/sys/amd64/vmm/vmm_dev.c
@@ -943,7 +943,7 @@ devmem_create_cdev(const char *vmname, int segid, char *devname)
 	int error;
 
 	error = make_dev_p(MAKEDEV_CHECKNAME, &cdev, &devmemsw, NULL,
-	    UID_ROOT, GID_WHEEL, 0600, "vmm/%s.%s", vmname, devname);
+	    UID_ROOT, GID_WHEEL, 0600, "vmm.io/%s.%s", vmname, devname);
 	if (error)
 		return (error);
 
diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6
index c06ceae93009..c1c646bf15f2 100644
--- a/sys/arm/conf/std.armv6
+++ b/sys/arm/conf/std.armv6
@@ -5,6 +5,7 @@
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
+options 	IPSEC			# IP (v4/v6) security
 options 	SCTP			# Stream Control Transmission Protocol
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h
index 48b4a33ad2da..140a3bc36d8f 100644
--- a/sys/arm/include/atomic.h
+++ b/sys/arm/include/atomic.h
@@ -1103,6 +1103,34 @@ atomic_store_long(volatile u_long *dst, u_long src)
 	*dst = src;
 }
 
+static __inline void
+atomic_thread_fence_acq(void)
+{
+
+	dmb();
+}
+
+static __inline void
+atomic_thread_fence_rel(void)
+{
+
+	dmb();
+}
+
+static __inline void
+atomic_thread_fence_acq_rel(void)
+{
+
+	dmb();
+}
+
+static __inline void
+atomic_thread_fence_seq_cst(void)
+{
+
+	dmb();
+}
+
 #define atomic_clear_ptr		atomic_clear_32
 #define atomic_set_ptr			atomic_set_32
 #define atomic_cmpset_ptr		atomic_cmpset_32
diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c
index 1f5ff813dc6f..5dc2c0bea2ae 100644
--- a/sys/arm64/arm64/gic_v3.c
+++ b/sys/arm64/arm64/gic_v3.c
@@ -236,19 +236,18 @@ gic_v3_dispatch(device_t dev, struct trapframe *frame)
 			break;
 
 		if (__predict_true((active_irq >= GIC_FIRST_PPI &&
-		    active_irq <= GIC_LAST_SPI))) {
+		    active_irq <= GIC_LAST_SPI) || active_irq >= GIC_FIRST_LPI)) {
 			arm_dispatch_intr(active_irq, frame);
 			continue;
 		}
 
-		if (active_irq <= GIC_LAST_SGI || active_irq >= GIC_FIRST_LPI) {
+		if (active_irq <= GIC_LAST_SGI) {
 			/*
-			 * TODO: Implement proper SGI/LPI handling.
+			 * TODO: Implement proper SGI handling.
 			 *       Mask it if such is received for some reason.
 			 */
 			device_printf(dev,
-			    "Received unsupported interrupt type: %s\n",
-			    active_irq >= GIC_FIRST_LPI ? "LPI" : "SGI");
+			    "Received unsupported interrupt type: SGI\n");
 			PIC_MASK(dev, active_irq);
 		}
 	}
@@ -275,6 +274,8 @@ gic_v3_mask_irq(device_t dev, u_int irq)
 	} else if (irq >= GIC_FIRST_SPI && irq <= GIC_LAST_SPI) { /* SPIs in distributor */
 		gic_r_write(sc, 4, GICD_ICENABLER(irq), GICD_I_MASK(irq));
 		gic_v3_wait_for_rwp(sc, DIST);
+	} else if (irq >= GIC_FIRST_LPI) { /* LPIs */
+		lpi_mask_irq(dev, irq);
 	} else
 		panic("%s: Unsupported IRQ number %u", __func__, irq);
 }
@@ -293,6 +294,8 @@ gic_v3_unmask_irq(device_t dev, u_int irq)
 	} else if (irq >= GIC_FIRST_SPI && irq <= GIC_LAST_SPI) { /* SPIs in distributor */
 		gic_d_write(sc, 4, GICD_ISENABLER(irq), GICD_I_MASK(irq));
 		gic_v3_wait_for_rwp(sc, DIST);
+	} else if (irq >= GIC_FIRST_LPI) { /* LPIs */
+		lpi_unmask_irq(dev, irq);
 	} else
 		panic("%s: Unsupported IRQ number %u", __func__, irq);
 }
diff --git a/sys/arm64/arm64/gic_v3_fdt.c b/sys/arm64/arm64/gic_v3_fdt.c
index e42ac9e510db..33164cb88128 100644
--- a/sys/arm64/arm64/gic_v3_fdt.c
+++ b/sys/arm64/arm64/gic_v3_fdt.c
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -51,11 +53,27 @@ __FBSDID("$FreeBSD$");
 static int gic_v3_fdt_probe(device_t);
 static int gic_v3_fdt_attach(device_t);
 
+static struct resource *gic_v3_ofw_bus_alloc_res(device_t, device_t, int, int *,
+    u_long, u_long, u_long, u_int);
+static const struct ofw_bus_devinfo *gic_v3_ofw_get_devinfo(device_t, device_t);
+
 static device_method_t gic_v3_fdt_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		gic_v3_fdt_probe),
 	DEVMETHOD(device_attach,	gic_v3_fdt_attach),
 
+	/* Bus interface */
+	DEVMETHOD(bus_alloc_resource,		gic_v3_ofw_bus_alloc_res),
+	DEVMETHOD(bus_activate_resource,	bus_generic_activate_resource),
+
+	/* ofw_bus interface */
+	DEVMETHOD(ofw_bus_get_devinfo,	gic_v3_ofw_get_devinfo),
+	DEVMETHOD(ofw_bus_get_compat,	ofw_bus_gen_get_compat),
+	DEVMETHOD(ofw_bus_get_model,	ofw_bus_gen_get_model),
+	DEVMETHOD(ofw_bus_get_name,	ofw_bus_gen_get_name),
+	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
+	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
+
 	/* End */
 	DEVMETHOD_END
 };
@@ -70,6 +88,11 @@ EARLY_DRIVER_MODULE(gic_v3, simplebus, gic_v3_fdt_driver, gic_v3_fdt_devclass,
 EARLY_DRIVER_MODULE(gic_v3, ofwbus, gic_v3_fdt_driver, gic_v3_fdt_devclass,
     0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
 
+/*
+ * Helper functions declarations.
+ */
+static int gic_v3_ofw_bus_attach(device_t);
+
 /*
  * Device interface.
  */
@@ -109,6 +132,17 @@ gic_v3_fdt_attach(device_t dev)
 	err = gic_v3_attach(dev);
 	if (err)
 		goto error;
+	/*
+	 * Try to register ITS to this GIC.
+	 * GIC will act as a bus in that case.
+	 * Failure here will not affect main GIC functionality.
+	 */
+	if (gic_v3_ofw_bus_attach(dev) != 0) {
+		if (bootverbose) {
+			device_printf(dev,
+			    "Failed to attach ITS to this GIC\n");
+		}
+	}
 
 	return (err);
 
@@ -122,3 +156,155 @@ gic_v3_fdt_attach(device_t dev)
 
 	return (err);
 }
+
+/* OFW bus interface */
+struct gic_v3_ofw_devinfo {
+	struct ofw_bus_devinfo	di_dinfo;
+	struct resource_list	di_rl;
+};
+
+static const struct ofw_bus_devinfo *
+gic_v3_ofw_get_devinfo(device_t bus __unused, device_t child)
+{
+	struct gic_v3_ofw_devinfo *di;
+
+	di = device_get_ivars(child);
+	return (&di->di_dinfo);
+}
+
+static struct resource *
+gic_v3_ofw_bus_alloc_res(device_t bus, device_t child, int type, int *rid,
+    u_long start, u_long end, u_long count, u_int flags)
+{
+	struct gic_v3_ofw_devinfo *di;
+	struct resource_list_entry *rle;
+	int ranges_len;
+
+	if ((start == 0UL) && (end == ~0UL)) {
+		if ((di = device_get_ivars(child)) == NULL)
+			return (NULL);
+		if (type != SYS_RES_MEMORY)
+			return (NULL);
+
+		/* Find defaults for this rid */
+		rle = resource_list_find(&di->di_rl, type, *rid);
+		if (rle == NULL)
+			return (NULL);
+
+		start = rle->start;
+		end = rle->end;
+		count = rle->count;
+	}
+	/*
+	 * XXX: No ranges remap!
+	 *	Absolute address is expected.
+	 */
+	if (ofw_bus_has_prop(bus, "ranges")) {
+		ranges_len = OF_getproplen(ofw_bus_get_node(bus), "ranges");
+		if (ranges_len != 0) {
+			if (bootverbose) {
+				device_printf(child,
+				    "Ranges remap not supported\n");
+			}
+			return (NULL);
+		}
+	}
+	return (bus_generic_alloc_resource(bus, child, type, rid, start, end,
+	    count, flags));
+}
+
+/* Helper functions */
+
+/*
+ * Bus capability support for GICv3.
+ * Collects and configures device informations and finally
+ * adds ITS device as a child of GICv3 in Newbus hierarchy.
+ */
+static int
+gic_v3_ofw_bus_attach(device_t dev)
+{
+	struct gic_v3_ofw_devinfo *di;
+	device_t child;
+	phandle_t parent, node;
+	pcell_t addr_cells, size_cells;
+
+	parent = ofw_bus_get_node(dev);
+	if (parent > 0) {
+		addr_cells = 2;
+		OF_getencprop(parent, "#address-cells", &addr_cells,
+		    sizeof(addr_cells));
+		size_cells = 2;
+		OF_getencprop(parent, "#size-cells", &size_cells,
+		    sizeof(size_cells));
+		/* Iterate through all GIC subordinates */
+		for (node = OF_child(parent); node > 0; node = OF_peer(node)) {
+			/* Allocate and populate devinfo. */
+			di = malloc(sizeof(*di), M_GIC_V3, M_WAITOK | M_ZERO);
+			if (ofw_bus_gen_setup_devinfo(&di->di_dinfo, node)) {
+				if (bootverbose) {
+					device_printf(dev,
+					    "Could not set up devinfo for ITS\n");
+				}
+				free(di, M_GIC_V3);
+				continue;
+			}
+
+			/* Initialize and populate resource list. */
+			resource_list_init(&di->di_rl);
+			ofw_bus_reg_to_rl(dev, node, addr_cells, size_cells,
+			    &di->di_rl);
+
+			/* Should not have any interrupts, so don't add any */
+
+			/* Add newbus device for this FDT node */
+			child = device_add_child(dev, NULL, -1);
+			if (!child) {
+				if (bootverbose) {
+					device_printf(dev,
+					    "Could not add child: %s\n",
+					    di->di_dinfo.obd_name);
+				}
+				resource_list_free(&di->di_rl);
+				ofw_bus_gen_destroy_devinfo(&di->di_dinfo);
+				free(di, M_GIC_V3);
+				continue;
+			}
+
+			device_set_ivars(child, di);
+		}
+	}
+
+	return (bus_generic_attach(dev));
+}
+
+static int gic_v3_its_fdt_probe(device_t dev);
+
+static device_method_t gic_v3_its_fdt_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		gic_v3_its_fdt_probe),
+
+	/* End */
+	DEVMETHOD_END
+};
+
+DEFINE_CLASS_1(gic_v3_its, gic_v3_its_fdt_driver, gic_v3_its_fdt_methods,
+    sizeof(struct gic_v3_its_softc), gic_v3_its_driver);
+
+static devclass_t gic_v3_its_fdt_devclass;
+
+EARLY_DRIVER_MODULE(gic_v3_its, gic_v3, gic_v3_its_fdt_driver,
+    gic_v3_its_fdt_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+
+static int
+gic_v3_its_fdt_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (!ofw_bus_is_compatible(dev, GIC_V3_ITS_COMPSTR))
+		return (ENXIO);
+
+	device_set_desc(dev, GIC_V3_ITS_DEVSTR);
+	return (BUS_PROBE_DEFAULT);
+}
diff --git a/sys/arm64/arm64/gic_v3_its.c b/sys/arm64/arm64/gic_v3_its.c
new file mode 100644
index 000000000000..0a0b06b7ee1a
--- /dev/null
+++ b/sys/arm64/arm64/gic_v3_its.c
@@ -0,0 +1,1448 @@
+/*-
+ * Copyright (c) 2015 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Semihalf under
+ * the sponsorship of the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include "gic_v3_reg.h"
+#include "gic_v3_var.h"
+
+#include "pic_if.h"
+
+/* Device and PIC methods */
+static int gic_v3_its_attach(device_t);
+
+static device_method_t gic_v3_its_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_attach,	gic_v3_its_attach),
+	/*
+	 * PIC interface
+	 */
+	/* MSI-X */
+	DEVMETHOD(pic_alloc_msix,	gic_v3_its_alloc_msix),
+	DEVMETHOD(pic_map_msix,		gic_v3_its_map_msix),
+	/* MSI */
+	DEVMETHOD(pic_alloc_msi,	gic_v3_its_alloc_msi),
+	DEVMETHOD(pic_map_msi,		gic_v3_its_map_msix),
+
+	/* End */
+	DEVMETHOD_END
+};
+
+DEFINE_CLASS_0(gic_v3_its, gic_v3_its_driver, gic_v3_its_methods,
+    sizeof(struct gic_v3_its_softc));
+
+MALLOC_DEFINE(M_GIC_V3_ITS, "GICv3 ITS", GIC_V3_ITS_DEVSTR);
+
+static int its_alloc_tables(struct gic_v3_its_softc *);
+static void its_free_tables(struct gic_v3_its_softc *);
+static void its_init_commandq(struct gic_v3_its_softc *);
+static int its_init_cpu(struct gic_v3_its_softc *);
+static void its_init_cpu_collection(struct gic_v3_its_softc *);
+
+static int its_cmd_send(struct gic_v3_its_softc *, struct its_cmd_desc *);
+
+static void its_cmd_mapc(struct gic_v3_its_softc *, struct its_col *, uint8_t);
+static void its_cmd_mapvi(struct gic_v3_its_softc *, struct its_dev *, uint32_t,
+    uint32_t);
+static void its_cmd_mapi(struct gic_v3_its_softc *, struct its_dev *, uint32_t);
+static void its_cmd_inv(struct gic_v3_its_softc *, struct its_dev *, uint32_t);
+static void its_cmd_invall(struct gic_v3_its_softc *, struct its_col *);
+
+static void lpi_init_conftable(struct gic_v3_its_softc *);
+static void lpi_bitmap_init(struct gic_v3_its_softc *);
+static void lpi_init_cpu(struct gic_v3_its_softc *);
+static int lpi_config_cpu(struct gic_v3_its_softc *);
+
+const char *its_ptab_cache[] = {
+	[GITS_BASER_CACHE_NCNB] = "(NC,NB)",
+	[GITS_BASER_CACHE_NC] = "(NC)",
+	[GITS_BASER_CACHE_RAWT] = "(RA,WT)",
+	[GITS_BASER_CACHE_RAWB] = "(RA,WB)",
+	[GITS_BASER_CACHE_WAWT] = "(WA,WT)",
+	[GITS_BASER_CACHE_WAWB] = "(WA,WB)",
+	[GITS_BASER_CACHE_RAWAWT] = "(RAWA,WT)",
+	[GITS_BASER_CACHE_RAWAWB] = "(RAWA,WB)",
+};
+
+const char *its_ptab_share[] = {
+	[GITS_BASER_SHARE_NS] = "none",
+	[GITS_BASER_SHARE_IS] = "inner",
+	[GITS_BASER_SHARE_OS] = "outer",
+	[GITS_BASER_SHARE_RES] = "none",
+};
+
+const char *its_ptab_type[] = {
+	[GITS_BASER_TYPE_UNIMPL] = "Unimplemented",
+	[GITS_BASER_TYPE_DEV] = "Devices",
+	[GITS_BASER_TYPE_VP] = "Virtual Processors",
+	[GITS_BASER_TYPE_PP] = "Physical Processors",
+	[GITS_BASER_TYPE_IC] = "Interrupt Collections",
+	[GITS_BASER_TYPE_RES5] = "Reserved (5)",
+	[GITS_BASER_TYPE_RES6] = "Reserved (6)",
+	[GITS_BASER_TYPE_RES7] = "Reserved (7)",
+};
+
+static struct gic_v3_its_softc *its_sc;
+
+#define	gic_its_read(sc, len, reg)		\
+    bus_read_##len(&sc->its_res[0], reg)
+
+#define	gic_its_write(sc, len, reg, val)	\
+    bus_write_##len(&sc->its_res[0], reg, val)
+
+static int
+gic_v3_its_attach(device_t dev)
+{
+	struct gic_v3_its_softc *sc;
+	uint64_t gits_tmp;
+	uint32_t gits_pidr2;
+	int rid;
+	int ret;
+
+	sc = device_get_softc(dev);
+
+	/*
+	 * Initialize sleep & spin mutex for ITS
+	 */
+	/* Protects ITS device list and assigned LPIs bitmaps. */
+	mtx_init(&sc->its_mtx, "ITS sleep lock", NULL, MTX_DEF);
+	/* Protects access to ITS command circular buffer. */
+	mtx_init(&sc->its_spin_mtx, "ITS spin lock", NULL, MTX_SPIN);
+
+	rid = 0;
+	sc->its_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (sc->its_res == NULL) {
+		device_printf(dev, "Could not allocate memory\n");
+		return (ENXIO);
+	}
+
+	sc->dev = dev;
+
+	gits_pidr2 = gic_its_read(sc, 4, GITS_PIDR2);
+	switch (gits_pidr2 & GITS_PIDR2_ARCH_MASK) {
+	case GITS_PIDR2_ARCH_GICv3: /* fall through */
+	case GITS_PIDR2_ARCH_GICv4:
+		if (bootverbose) {
+			device_printf(dev, "ITS found. Architecture rev. %u\n",
+			    (u_int)(gits_pidr2 & GITS_PIDR2_ARCH_MASK) >> 4);
+		}
+		break;
+	default:
+		device_printf(dev, "No ITS found in the system\n");
+		gic_v3_its_detach(dev);
+		return (ENODEV);
+	}
+
+	/* 1. Initialize commands queue */
+	its_init_commandq(sc);
+
+	/* 2. Provide memory for any private ITS tables */
+	ret = its_alloc_tables(sc);
+	if (ret != 0) {
+		gic_v3_its_detach(dev);
+		return (ret);
+	}
+
+	/* 3. Allocate collections. One per-CPU */
+	sc->its_cols = malloc(sizeof(*sc->its_cols) * MAXCPU,
+	    M_GIC_V3_ITS, (M_WAITOK | M_ZERO));
+
+	/* 4. Enable ITS in GITS_CTLR */
+	gits_tmp = gic_its_read(sc, 4, GITS_CTLR);
+	gic_its_write(sc, 4, GITS_CTLR, gits_tmp | GITS_CTLR_EN);
+
+	/* 5. Initialize LPIs configuration table */
+	lpi_init_conftable(sc);
+
+	/* 6. LPIs bitmap init */
+	lpi_bitmap_init(sc);
+
+	/* 7. CPU init */
+	(void)its_init_cpu(sc);
+
+	/* 8. Init ITS devices list */
+	TAILQ_INIT(&sc->its_dev_list);
+
+	arm_register_msi_pic(dev);
+
+	/*
+	 * XXX ARM64TODO: We need to have ITS software context
+	 * when being called by the interrupt code (mask/unmask).
+	 * This may be used only when one ITS is present in
+	 * the system and eventually should be removed.
+	 */
+	KASSERT(its_sc == NULL,
+	    ("Trying to assign its_sc that is already set"));
+	its_sc = sc;
+
+	return (0);
+}
+
+/* Will not detach but use it for convenience */
+int
+gic_v3_its_detach(device_t dev)
+{
+	device_t parent;
+	struct gic_v3_softc *gic_sc;
+	struct gic_v3_its_softc *sc;
+	u_int cpuid;
+	int rid = 0;
+
+	sc = device_get_softc(dev);
+	cpuid = PCPU_GET(cpuid);
+
+	/* Release what's possible */
+
+	/* Command queue */
+	if ((void *)sc->its_cmdq_base != NULL) {
+		contigfree((void *)sc->its_cmdq_base,
+		    ITS_CMDQ_SIZE, M_GIC_V3_ITS);
+	}
+	/* ITTs */
+	its_free_tables(sc);
+	/* Collections */
+	free(sc->its_cols, M_GIC_V3_ITS);
+	/* LPI config table */
+	parent = device_get_parent(sc->dev);
+	gic_sc = device_get_softc(parent);
+	if ((void *)gic_sc->gic_redists.lpis.conf_base != NULL) {
+		contigfree((void *)gic_sc->gic_redists.lpis.conf_base,
+		    LPI_CONFTAB_SIZE, M_GIC_V3_ITS);
+	}
+	if ((void *)gic_sc->gic_redists.lpis.pend_base[cpuid] != NULL) {
+		contigfree((void *)gic_sc->gic_redists.lpis.pend_base[cpuid],
+		    roundup2(LPI_PENDTAB_SIZE, PAGE_SIZE_64K), M_GIC_V3_ITS);
+	}
+
+	/* Resource... */
+	bus_release_resource(dev, SYS_RES_MEMORY, rid, sc->its_res);
+
+	/* XXX ARM64TODO: Reset global pointer to ITS software context */
+	its_sc = NULL;
+
+	return (0);
+}
+
+static int
+its_alloc_tables(struct gic_v3_its_softc *sc)
+{
+	uint64_t gits_baser, gits_tmp;
+	uint64_t type, esize, cache, share, psz;
+	uint64_t gits_typer;
+	size_t page_size, npages, nitspages, nidents, tn;
+	size_t its_tbl_size;
+	vm_offset_t ptab_vaddr;
+	vm_paddr_t ptab_paddr;
+	boolean_t first = TRUE;
+
+	page_size = PAGE_SIZE_64K;
+
+	/* Read features first */
+	gits_typer = gic_its_read(sc, 8, GITS_TYPER);
+
+	for (tn = 0; tn < GITS_BASER_NUM; tn++) {
+		gits_baser = gic_its_read(sc, 8, GITS_BASER(tn));
+		type = GITS_BASER_TYPE(gits_baser);
+		/* Get the Table Entry size */
+		esize = GITS_BASER_ESIZE(gits_baser);
+
+		switch (type) {
+		case GITS_BASER_TYPE_UNIMPL: /* fall through */
+		case GITS_BASER_TYPE_RES5:
+		case GITS_BASER_TYPE_RES6:
+		case GITS_BASER_TYPE_RES7:
+			continue;
+		case GITS_BASER_TYPE_DEV:
+			nidents = (1 << GITS_TYPER_DEVB(gits_typer));
+			its_tbl_size = esize * nidents;
+			its_tbl_size = roundup2(its_tbl_size, page_size);
+			npages = howmany(its_tbl_size, PAGE_SIZE);
+			break;
+		default:
+			npages = howmany(page_size, PAGE_SIZE);
+			break;
+		}
+
+		/* Allocate required space */
+		ptab_vaddr = (vm_offset_t)contigmalloc(npages * PAGE_SIZE,
+		    M_GIC_V3_ITS, (M_WAITOK | M_ZERO), 0, ~0UL, PAGE_SIZE, 0);
+
+		sc->its_ptabs[tn].ptab_vaddr = ptab_vaddr;
+		sc->its_ptabs[tn].ptab_pgsz = PAGE_SIZE;
+		sc->its_ptabs[tn].ptab_npages = npages;
+
+		ptab_paddr = vtophys(ptab_vaddr);
+		KASSERT((ptab_paddr & GITS_BASER_PA_MASK) == ptab_paddr,
+		    ("%s: Unaligned PA for Interrupt Translation Table",
+		    device_get_name(sc->dev)));
+
+		/* Set defaults: WAWB, IS */
+		cache = GITS_BASER_CACHE_WAWB;
+		share = GITS_BASER_SHARE_IS;
+
+		for (;;) {
+			nitspages = howmany(its_tbl_size, page_size);
+
+			switch (page_size) {
+			case PAGE_SIZE:		/* 4KB */
+				psz = GITS_BASER_PSZ_4K;
+				break;
+			case PAGE_SIZE_16K:	/* 16KB */
+				psz = GITS_BASER_PSZ_4K;
+				break;
+			case PAGE_SIZE_64K:	/* 64KB */
+				psz = GITS_BASER_PSZ_64K;
+				break;
+			default:
+				device_printf(sc->dev,
+				    "Unsupported page size: %zuKB\n",
+				    (page_size / 1024));
+				its_free_tables(sc);
+				return (ENXIO);
+			}
+
+			/* Clear fields under modification first */
+			gits_baser &= ~(GITS_BASER_VALID |
+			    GITS_BASER_CACHE_MASK | GITS_BASER_TYPE_MASK |
+			    GITS_BASER_ESIZE_MASK | GITS_BASER_PA_MASK |
+			    GITS_BASER_SHARE_MASK | GITS_BASER_PSZ_MASK |
+			    GITS_BASER_SIZE_MASK);
+			/* Construct register value */
+			gits_baser |=
+			    (type << GITS_BASER_TYPE_SHIFT) |
+			    ((esize - 1) << GITS_BASER_ESIZE_SHIFT) |
+			    (cache << GITS_BASER_CACHE_SHIFT) |
+			    (share << GITS_BASER_SHARE_SHIFT) |
+			    (psz << GITS_BASER_PSZ_SHIFT) |
+			    ptab_paddr | (nitspages - 1) |
+			    GITS_BASER_VALID;
+
+			gic_its_write(sc, 8, GITS_BASER(tn), gits_baser);
+			/*
+			 * Verify.
+			 * Depending on implementation we may encounter
+			 * shareability and page size mismatch.
+			 */
+			gits_tmp = gic_its_read(sc, 8, GITS_BASER(tn));
+			if (((gits_tmp ^ gits_baser) & GITS_BASER_SHARE_MASK) != 0) {
+				share = gits_tmp & GITS_BASER_SHARE_MASK;
+				share >>= GITS_BASER_SHARE_SHIFT;
+				continue;
+			}
+
+			if (((gits_tmp ^ gits_baser) & GITS_BASER_PSZ_MASK) != 0) {
+				switch (page_size) {
+				case PAGE_SIZE_16K:
+					/* Drop to 4KB page */
+					page_size = PAGE_SIZE;
+					continue;
+				case PAGE_SIZE_64K:
+					/* Drop to 16KB page */
+					page_size = PAGE_SIZE_16K;
+					continue;
+				}
+			}
+			/*
+			 * All possible adjustments should
+			 * be applied by now so just break the loop.
+			 */
+			break;
+		}
+		/*
+		 * Do not compare Cacheability field since
+		 * it is implementation defined.
+		 */
+		gits_tmp &= ~GITS_BASER_CACHE_MASK;
+		gits_baser &= ~GITS_BASER_CACHE_MASK;
+
+		if (gits_tmp != gits_baser) {
+			device_printf(sc->dev,
+			    "Could not allocate ITS tables\n");
+			its_free_tables(sc);
+			return (ENXIO);
+		}
+
+		if (bootverbose) {
+			if (first) {
+				device_printf(sc->dev,
+				    "Allocated ITS private tables:\n");
+				first = FALSE;
+			}
+			device_printf(sc->dev,
+			    "\tPTAB%zu for %s: PA 0x%lx,"
+			    " %lu entries,"
+			    " cache policy %s, %s shareable,"
+			    " page size %zuKB\n",
+			    tn, its_ptab_type[type], ptab_paddr,
+			    (page_size * nitspages) / esize,
+			    its_ptab_cache[cache], its_ptab_share[share],
+			    page_size / 1024);
+		}
+	}
+
+	return (0);
+}
+
+static void
+its_free_tables(struct gic_v3_its_softc *sc)
+{
+	vm_offset_t ptab_vaddr;
+	size_t size;
+	size_t tn;
+
+	for (tn = 0; tn < GITS_BASER_NUM; tn++) {
+		ptab_vaddr = sc->its_ptabs[tn].ptab_vaddr;
+		if (ptab_vaddr == 0)
+			continue;
+		size = sc->its_ptabs[tn].ptab_pgsz;
+		size *= sc->its_ptabs[tn].ptab_npages;
+
+		if ((void *)ptab_vaddr != NULL)
+			contigfree((void *)ptab_vaddr, size, M_GIC_V3_ITS);
+
+		/* Clear the table description */
+		memset(&sc->its_ptabs[tn], 0, sizeof(sc->its_ptabs[tn]));
+	}
+}
+
+static void
+its_init_commandq(struct gic_v3_its_softc *sc)
+{
+	uint64_t gits_cbaser, gits_tmp;
+	uint64_t cache, share;
+	vm_paddr_t cmdq_paddr;
+	device_t dev;
+
+	dev = sc->dev;
+	/* Allocate memory for command queue */
+	sc->its_cmdq_base = contigmalloc(ITS_CMDQ_SIZE, M_GIC_V3_ITS,
+	    (M_WAITOK | M_ZERO), 0, ~0UL, ITS_CMDQ_SIZE, 0);
+	/* Set command queue write pointer (command queue empty) */
+	sc->its_cmdq_write = sc->its_cmdq_base;
+
+	/* Save command queue pointer and attributes */
+	cmdq_paddr = vtophys(sc->its_cmdq_base);
+
+	/* Set defaults: Normal Inner WAWB, IS */
+	cache = GITS_CBASER_CACHE_NIWAWB;
+	share = GITS_CBASER_SHARE_IS;
+
+	gits_cbaser = (cmdq_paddr |
+	    (cache << GITS_CBASER_CACHE_SHIFT) |
+	    (share << GITS_CBASER_SHARE_SHIFT) |
+	    /* Number of 4KB pages - 1 */
+	    ((ITS_CMDQ_SIZE / PAGE_SIZE) - 1) |
+	    /* Valid bit */
+	    GITS_CBASER_VALID);
+
+	gic_its_write(sc, 8, GITS_CBASER, gits_cbaser);
+	gits_tmp = gic_its_read(sc, 8, GITS_CBASER);
+
+	if (((gits_tmp ^ gits_cbaser) & GITS_CBASER_SHARE_MASK) != 0) {
+		if (bootverbose) {
+			device_printf(dev,
+			    "Will use cache flushing for commands queue\n");
+		}
+		/* Command queue needs cache flushing */
+		sc->its_flags |= ITS_FLAGS_CMDQ_FLUSH;
+	}
+
+	gic_its_write(sc, 8, GITS_CWRITER, 0x0);
+}
+
+static int
+its_init_cpu(struct gic_v3_its_softc *sc)
+{
+	device_t parent;
+	struct gic_v3_softc *gic_sc;
+
+	/*
+	 * Check for LPIs support on this Re-Distributor.
+	 */
+	parent = device_get_parent(sc->dev);
+	gic_sc = device_get_softc(parent);
+	if ((gic_r_read(gic_sc, 4, GICR_TYPER) & GICR_TYPER_PLPIS) == 0) {
+		if (bootverbose) {
+			device_printf(sc->dev,
+			    "LPIs not supported on CPU%u\n", PCPU_GET(cpuid));
+		}
+		return (ENXIO);
+	}
+
+	/* Initialize LPIs for this CPU */
+	lpi_init_cpu(sc);
+
+	/* Initialize collections */
+	its_init_cpu_collection(sc);
+
+	return (0);
+}
+
+static void
+its_init_cpu_collection(struct gic_v3_its_softc *sc)
+{
+	device_t parent;
+	struct gic_v3_softc *gic_sc;
+	uint64_t typer;
+	uint64_t target;
+	vm_offset_t redist_base;
+	u_int cpuid;
+
+	cpuid = PCPU_GET(cpuid);
+	parent = device_get_parent(sc->dev);
+	gic_sc = device_get_softc(parent);
+
+	typer = gic_its_read(sc, 8, GITS_TYPER);
+	if ((typer & GITS_TYPER_PTA) != 0) {
+		redist_base =
+		    rman_get_bushandle(gic_sc->gic_redists.pcpu[cpuid]);
+		/*
+		 * Target Address correspond to the base physical
+		 * address of Re-Distributors.
+		 */
+		target = vtophys(redist_base);
+	} else {
+		/* Target Address correspond to unique processor numbers */
+		typer = gic_r_read(gic_sc, 8, GICR_TYPER);
+		target = GICR_TYPER_CPUNUM(typer);
+	}
+
+	sc->its_cols[cpuid].col_target = target;
+	sc->its_cols[cpuid].col_id = cpuid;
+
+	its_cmd_mapc(sc, &sc->its_cols[cpuid], 1);
+	its_cmd_invall(sc, &sc->its_cols[cpuid]);
+}
+
+static void
+lpi_init_conftable(struct gic_v3_its_softc *sc)
+{
+	device_t parent;
+	struct gic_v3_softc *gic_sc;
+	vm_offset_t conf_base;
+	uint8_t prio_default;
+
+	parent = device_get_parent(sc->dev);
+	gic_sc = device_get_softc(parent);
+	/*
+	 * LPI Configuration Table settings.
+	 * Notice that Configuration Table is shared among all
+	 * Re-Distributors, so this is going to be created just once.
+	 */
+	conf_base = (vm_offset_t)contigmalloc(LPI_CONFTAB_SIZE,
+	    M_GIC_V3_ITS, (M_WAITOK | M_ZERO), 0, ~0UL, PAGE_SIZE_64K, 0);
+
+	if (bootverbose) {
+		device_printf(sc->dev,
+		    "LPI Configuration Table at PA: 0x%lx\n",
+		    vtophys(conf_base));
+	}
+
+	/*
+	 * Let the default priority be aligned with all other
+	 * interrupts assuming that each interrupt is assigned
+	 * MAX priority at startup. MAX priority on the other
+	 * hand cannot be higher than 0xFC for LPIs.
+	 */
+	prio_default = GIC_PRIORITY_MAX;
+
+	/* Write each settings byte to LPI configuration table */
+	memset((void *)conf_base,
+	    (prio_default & LPI_CONF_PRIO_MASK) | LPI_CONF_GROUP1,
+	    LPI_CONFTAB_SIZE);
+
+	cpu_dcache_wb_range((vm_offset_t)conf_base, roundup2(LPI_CONFTAB_SIZE,
+	    PAGE_SIZE_64K));
+
+	gic_sc->gic_redists.lpis.conf_base = conf_base;
+}
+
+static void
+lpi_init_cpu(struct gic_v3_its_softc *sc)
+{
+	device_t parent;
+	struct gic_v3_softc *gic_sc;
+	vm_offset_t pend_base;
+	u_int cpuid;
+
+	parent = device_get_parent(sc->dev);
+	gic_sc = device_get_softc(parent);
+
+	/*
+	 * LPI Pending Table settings.
+	 * This has to be done for each Re-Distributor, hence for each CPU.
+	 */
+	cpuid = PCPU_GET(cpuid);
+
+	pend_base = (vm_offset_t)contigmalloc(
+	    roundup2(LPI_PENDTAB_SIZE, PAGE_SIZE_64K), M_GIC_V3_ITS,
+	    (M_WAITOK | M_ZERO), 0, ~0UL, PAGE_SIZE_64K, 0);
+
+	/* Clean D-cache so that ITS can see zeroed pages */
+	cpu_dcache_wb_range((vm_offset_t)pend_base,
+	    roundup2(LPI_PENDTAB_SIZE, PAGE_SIZE_64K));
+
+	if (bootverbose) {
+		device_printf(sc->dev,
+		    "LPI Pending Table for CPU%u at PA: 0x%lx\n",
+		    cpuid, vtophys(pend_base));
+	}
+
+	gic_sc->gic_redists.lpis.pend_base[cpuid] = pend_base;
+
+	lpi_config_cpu(sc);
+}
+
+static int
+lpi_config_cpu(struct gic_v3_its_softc *sc)
+{
+	device_t parent;
+	struct gic_v3_softc *gic_sc;
+	vm_offset_t conf_base, pend_base;
+	uint64_t gicr_xbaser, gicr_temp;
+	uint64_t cache, share, idbits;
+	uint32_t gicr_ctlr;
+	u_int cpuid;
+
+	parent = device_get_parent(sc->dev);
+	gic_sc = device_get_softc(parent);
+	cpuid = PCPU_GET(cpuid);
+
+	conf_base = gic_sc->gic_redists.lpis.conf_base;
+	pend_base = gic_sc->gic_redists.lpis.pend_base[cpuid];
+
+	/* Disable LPIs */
+	gicr_ctlr = gic_r_read(gic_sc, 4, GICR_CTLR);
+	gicr_ctlr &= ~GICR_CTLR_LPI_ENABLE;
+	gic_r_write(gic_sc, 4, GICR_CTLR, gicr_ctlr);
+	/* Perform full system barrier */
+	dsb(sy);
+
+	/*
+	 * Set GICR_PROPBASER
+	 */
+
+	/*
+	 * Find out how many bits do we need for LPI identifiers.
+	 * Remark 1.: Even though we have (LPI_CONFTAB_SIZE / 8) LPIs
+	 *	      the notified LPI ID still starts from 8192
+	 *	      (GIC_FIRST_LPI).
+	 * Remark 2.: This could be done on compilation time but there
+	 *	      seems to be no sufficient macro.
+	 */
+	idbits = flsl(LPI_CONFTAB_SIZE + GIC_FIRST_LPI) - 1;
+
+	/* Set defaults: Normal Inner WAWB, IS */
+	cache = GICR_PROPBASER_CACHE_NIWAWB;
+	share = GICR_PROPBASER_SHARE_IS;
+
+	gicr_xbaser = vtophys(conf_base) |
+	    ((idbits - 1) & GICR_PROPBASER_IDBITS_MASK) |
+	    (cache << GICR_PROPBASER_CACHE_SHIFT) |
+	    (share << GICR_PROPBASER_SHARE_SHIFT);
+
+	gic_r_write(gic_sc, 8, GICR_PROPBASER, gicr_xbaser);
+	gicr_temp = gic_r_read(gic_sc, 8, GICR_PROPBASER);
+
+	if (((gicr_xbaser ^ gicr_temp) & GICR_PROPBASER_SHARE_MASK) != 0) {
+		if (bootverbose) {
+			device_printf(sc->dev,
+			    "Will use cache flushing for LPI "
+			    "Configuration Table\n");
+		}
+		gic_sc->gic_redists.lpis.flags |= LPI_FLAGS_CONF_FLUSH;
+	}
+
+	/*
+	 * Set GICR_PENDBASER
+	 */
+
+	/* Set defaults: Normal Inner WAWB, IS */
+	cache = GICR_PENDBASER_CACHE_NIWAWB;
+	share = GICR_PENDBASER_SHARE_IS;
+
+	gicr_xbaser = vtophys(pend_base) |
+	    (cache << GICR_PENDBASER_CACHE_SHIFT) |
+	    (share << GICR_PENDBASER_SHARE_SHIFT);
+
+	gic_r_write(gic_sc, 8, GICR_PENDBASER, gicr_xbaser);
+
+	/* Enable LPIs */
+	gicr_ctlr = gic_r_read(gic_sc, 4, GICR_CTLR);
+	gicr_ctlr |= GICR_CTLR_LPI_ENABLE;
+	gic_r_write(gic_sc, 4, GICR_CTLR, gicr_ctlr);
+
+	dsb(sy);
+
+	return (0);
+}
+
+static void
+lpi_bitmap_init(struct gic_v3_its_softc *sc)
+{
+	device_t parent;
+	struct gic_v3_softc *gic_sc;
+	uint32_t lpi_id_num;
+	size_t lpi_chunks_num;
+	size_t bits_in_chunk;
+
+	parent = device_get_parent(sc->dev);
+	gic_sc = device_get_softc(parent);
+
+	lpi_id_num = (1 << gic_sc->gic_idbits) - 1;
+	/* Substract IDs dedicated for SGIs, PPIs and SPIs */
+	lpi_id_num -= GIC_FIRST_LPI;
+
+	sc->its_lpi_maxid = lpi_id_num;
+
+	bits_in_chunk = sizeof(*sc->its_lpi_bitmap) * NBBY;
+
+	/*
+	 * Round up to the number of bits in chunk.
+	 * We will need to take care to avoid using invalid LPI IDs later.
+	 */
+	lpi_id_num = roundup2(lpi_id_num, bits_in_chunk);
+	lpi_chunks_num = lpi_id_num / bits_in_chunk;
+
+	sc->its_lpi_bitmap =
+	    contigmalloc((lpi_chunks_num * sizeof(*sc->its_lpi_bitmap)),
+	    M_GIC_V3_ITS, (M_WAITOK | M_ZERO), 0, ~0UL,
+	    sizeof(*sc->its_lpi_bitmap), 0);
+}
+
+static int
+lpi_alloc_chunk(struct gic_v3_its_softc *sc, struct lpi_chunk *lpic,
+    u_int nvecs)
+{
+	int fclr; /* First cleared bit */
+	uint8_t *bitmap;
+	size_t nb, i;
+
+	bitmap = (uint8_t *)sc->its_lpi_bitmap;
+
+	fclr = 0;
+retry:
+	/* Check other bits - sloooow */
+	for (i = 0, nb = fclr; i < nvecs; i++, nb++) {
+		if (nb > sc->its_lpi_maxid)
+			return (EINVAL);
+
+		if (isset(bitmap, nb)) {
+			/* To little free bits in this area. Move on. */
+			fclr = nb + 1;
+			goto retry;
+		}
+	}
+	/* This area is free. Take it. */
+	bit_nset(bitmap, fclr, fclr + nvecs - 1);
+	lpic->lpi_base = fclr + GIC_FIRST_LPI;
+	lpic->lpi_num = nvecs;
+	lpic->lpi_free = lpic->lpi_num;
+
+	return (0);
+}
+
+static void
+lpi_configure(struct gic_v3_its_softc *sc, struct its_dev *its_dev,
+    uint32_t lpinum, boolean_t unmask)
+{
+	device_t parent;
+	struct gic_v3_softc *gic_sc;
+	uint8_t *conf_byte;
+
+	parent = device_get_parent(sc->dev);
+	gic_sc = device_get_softc(parent);
+
+	conf_byte = (uint8_t *)gic_sc->gic_redists.lpis.conf_base;
+	conf_byte += (lpinum - GIC_FIRST_LPI);
+
+	if (unmask)
+		*conf_byte |= LPI_CONF_ENABLE;
+	else
+		*conf_byte &= ~LPI_CONF_ENABLE;
+
+	if ((gic_sc->gic_redists.lpis.flags & LPI_FLAGS_CONF_FLUSH) != 0) {
+		/* Clean D-cache under configuration byte */
+		cpu_dcache_wb_range((vm_offset_t)conf_byte, sizeof(*conf_byte));
+	} else {
+		/* DSB inner shareable, store */
+		dsb(ishst);
+	}
+
+	its_cmd_inv(sc, its_dev, lpinum);
+}
+
+static void
+lpi_map_to_device(struct gic_v3_its_softc *sc, struct its_dev *its_dev,
+    uint32_t id, uint32_t pid)
+{
+
+	if ((pid < its_dev->lpis.lpi_base) ||
+	    (pid >= (its_dev->lpis.lpi_base + its_dev->lpis.lpi_num)))
+		panic("Trying to map ivalid LPI %u for the device\n", pid);
+
+	its_cmd_mapvi(sc, its_dev, id, pid);
+}
+
+static void
+lpi_xmask_irq(device_t parent, uint32_t irq, boolean_t unmask)
+{
+	struct its_dev *its_dev;
+
+	TAILQ_FOREACH(its_dev, &its_sc->its_dev_list, entry) {
+		if (irq >= its_dev->lpis.lpi_base &&
+		    irq < (its_dev->lpis.lpi_base + its_dev->lpis.lpi_num)) {
+			lpi_configure(its_sc, its_dev, irq, unmask);
+			return;
+		}
+	}
+
+	panic("Trying to %s not existing LPI: %u\n",
+	    (unmask == TRUE) ? "unmask" : "mask", irq);
+}
+
+void
+lpi_unmask_irq(device_t parent, uint32_t irq)
+{
+
+	lpi_xmask_irq(parent, irq, 1);
+}
+
+void
+lpi_mask_irq(device_t parent, uint32_t irq)
+{
+
+	lpi_xmask_irq(parent, irq, 0);
+}
+
+/*
+ * Commands handling.
+ */
+
+static __inline void
+cmd_format_command(struct its_cmd *cmd, uint8_t cmd_type)
+{
+	/* Command field: DW0 [7:0] */
+	cmd->cmd_dword[0] &= ~CMD_COMMAND_MASK;
+	cmd->cmd_dword[0] |= cmd_type;
+}
+
+static __inline void
+cmd_format_devid(struct its_cmd *cmd, uint32_t devid)
+{
+	/* Device ID field: DW0 [63:32] */
+	cmd->cmd_dword[0] &= ~CMD_DEVID_MASK;
+	cmd->cmd_dword[0] |= ((uint64_t)devid << CMD_DEVID_SHIFT);
+}
+
+static __inline void
+cmd_format_size(struct its_cmd *cmd, uint16_t size)
+{
+	/* Size field: DW1 [4:0] */
+	cmd->cmd_dword[1] &= ~CMD_SIZE_MASK;
+	cmd->cmd_dword[1] |= (size & CMD_SIZE_MASK);
+}
+
+static __inline void
+cmd_format_id(struct its_cmd *cmd, uint32_t id)
+{
+	/* ID field: DW1 [31:0] */
+	cmd->cmd_dword[1] &= ~CMD_ID_MASK;
+	cmd->cmd_dword[1] |= id;
+}
+
+static __inline void
+cmd_format_pid(struct its_cmd *cmd, uint32_t pid)
+{
+	/* Physical ID field: DW1 [63:32] */
+	cmd->cmd_dword[1] &= ~CMD_PID_MASK;
+	cmd->cmd_dword[1] |= ((uint64_t)pid << CMD_PID_SHIFT);
+}
+
+static __inline void
+cmd_format_col(struct its_cmd *cmd, uint16_t col_id)
+{
+	/* Collection field: DW2 [16:0] */
+	cmd->cmd_dword[2] &= ~CMD_COL_MASK;
+	cmd->cmd_dword[2] |= col_id;
+}
+
+static __inline void
+cmd_format_target(struct its_cmd *cmd, uint64_t target)
+{
+	/* Target Address field: DW2 [47:16] */
+	cmd->cmd_dword[2] &= ~CMD_TARGET_MASK;
+	cmd->cmd_dword[2] |= (target & CMD_TARGET_MASK);
+}
+
+static __inline void
+cmd_format_itt(struct its_cmd *cmd, uint64_t itt)
+{
+	/* ITT Address field: DW2 [47:8] */
+	cmd->cmd_dword[2] &= ~CMD_ITT_MASK;
+	cmd->cmd_dword[2] |= (itt & CMD_ITT_MASK);
+}
+
+static __inline void
+cmd_format_valid(struct its_cmd *cmd, uint8_t valid)
+{
+	/* Valid field: DW2 [63] */
+	cmd->cmd_dword[2] &= ~CMD_VALID_MASK;
+	cmd->cmd_dword[2] |= ((uint64_t)valid << CMD_VALID_SHIFT);
+}
+
+static __inline void
+cmd_fix_endian(struct its_cmd *cmd)
+{
+	size_t i;
+
+	for (i = 0; i < nitems(cmd->cmd_dword); i++)
+		cmd->cmd_dword[i] = htole64(cmd->cmd_dword[i]);
+}
+
+static void
+its_cmd_mapc(struct gic_v3_its_softc *sc, struct its_col *col, uint8_t valid)
+{
+	struct its_cmd_desc desc;
+
+	desc.cmd_type = ITS_CMD_MAPC;
+	desc.cmd_desc_mapc.col = col;
+	/*
+	 * Valid bit set - map the collection.
+	 * Valid bit cleared - unmap the collection.
+	 */
+	desc.cmd_desc_mapc.valid = valid;
+
+	its_cmd_send(sc, &desc);
+}
+
+static void
+its_cmd_mapvi(struct gic_v3_its_softc *sc, struct its_dev *its_dev,
+    uint32_t id, uint32_t pid)
+{
+	struct its_cmd_desc desc;
+
+	desc.cmd_type = ITS_CMD_MAPVI;
+	desc.cmd_desc_mapvi.its_dev = its_dev;
+	desc.cmd_desc_mapvi.id = id;
+	desc.cmd_desc_mapvi.pid = pid;
+
+	its_cmd_send(sc, &desc);
+}
+
+static void __unused
+its_cmd_mapi(struct gic_v3_its_softc *sc, struct its_dev *its_dev,
+    uint32_t lpinum)
+{
+	struct its_cmd_desc desc;
+
+	desc.cmd_type = ITS_CMD_MAPI;
+	desc.cmd_desc_mapi.its_dev = its_dev;
+	desc.cmd_desc_mapi.lpinum = lpinum;
+
+	its_cmd_send(sc, &desc);
+}
+
+static void
+its_cmd_mapd(struct gic_v3_its_softc *sc, struct its_dev *its_dev,
+    uint8_t valid)
+{
+	struct its_cmd_desc desc;
+
+	desc.cmd_type = ITS_CMD_MAPD;
+	desc.cmd_desc_mapd.its_dev = its_dev;
+	desc.cmd_desc_mapd.valid = valid;
+
+	its_cmd_send(sc, &desc);
+}
+
+static void
+its_cmd_inv(struct gic_v3_its_softc *sc, struct its_dev *its_dev,
+    uint32_t lpinum)
+{
+	struct its_cmd_desc desc;
+
+	desc.cmd_type = ITS_CMD_INV;
+	desc.cmd_desc_inv.lpinum = lpinum - its_dev->lpis.lpi_base;
+	desc.cmd_desc_inv.its_dev = its_dev;
+
+	its_cmd_send(sc, &desc);
+}
+
+static void
+its_cmd_invall(struct gic_v3_its_softc *sc, struct its_col *col)
+{
+	struct its_cmd_desc desc;
+
+	desc.cmd_type = ITS_CMD_INVALL;
+	desc.cmd_desc_invall.col = col;
+
+	its_cmd_send(sc, &desc);
+}
+
+/*
+ * Helper routines for commands processing.
+ */
+static __inline boolean_t
+its_cmd_queue_full(struct gic_v3_its_softc *sc)
+{
+	size_t read_idx, write_idx;
+
+	write_idx = (size_t)(sc->its_cmdq_write - sc->its_cmdq_base);
+	read_idx = gic_its_read(sc, 4, GITS_CREADR) / sizeof(struct its_cmd);
+
+	/*
+	 * The queue is full when the write offset points
+	 * at the command before the current read offset.
+	 */
+	if (((write_idx + 1) % ITS_CMDQ_NENTRIES) == read_idx)
+		return (TRUE);
+
+	return (FALSE);
+}
+
+static __inline void
+its_cmd_sync(struct gic_v3_its_softc *sc, struct its_cmd *cmd)
+{
+
+	if ((sc->its_flags & ITS_FLAGS_CMDQ_FLUSH) != 0) {
+		/* Clean D-cache under command. */
+		cpu_dcache_wb_range((vm_offset_t)cmd, sizeof(*cmd));
+	} else {
+		/* DSB inner shareable, store */
+		dsb(ishst);
+	}
+
+}
+
+static struct its_cmd *
+its_cmd_alloc_locked(struct gic_v3_its_softc *sc)
+{
+	struct its_cmd *cmd;
+	size_t us_left;
+
+	/*
+	 * XXX ARM64TODO: This is obviously a significant delay.
+	 * The reason for that is that currently the time frames for
+	 * the command to complete (and therefore free the descriptor)
+	 * are not known.
+	 */
+	us_left = 1000000;
+
+	mtx_assert(&sc->its_spin_mtx, MA_OWNED);
+	while (its_cmd_queue_full(sc)) {
+		if (us_left-- == 0) {
+			/* Timeout while waiting for free command */
+			device_printf(sc->dev,
+			    "Timeout while waiting for free command\n");
+			return (NULL);
+		}
+		DELAY(1);
+	}
+
+	cmd = sc->its_cmdq_write;
+	sc->its_cmdq_write++;
+
+	if (sc->its_cmdq_write == (sc->its_cmdq_base + ITS_CMDQ_NENTRIES)) {
+		/* Wrap the queue */
+		sc->its_cmdq_write = sc->its_cmdq_base;
+	}
+
+	return (cmd);
+}
+
+static uint64_t
+its_cmd_prepare(struct its_cmd *cmd, struct its_cmd_desc *desc)
+{
+	uint64_t target;
+	uint8_t cmd_type;
+	u_int size;
+	boolean_t error;
+
+	error = FALSE;
+	cmd_type = desc->cmd_type;
+	target = ITS_TARGET_NONE;
+
+	switch (cmd_type) {
+	case ITS_CMD_SYNC:	/* Wait for previous commands completion */
+		target = desc->cmd_desc_sync.col->col_target;
+		cmd_format_command(cmd, ITS_CMD_SYNC);
+		cmd_format_target(cmd, target);
+		break;
+	case ITS_CMD_MAPD:	/* Assign ITT to device */
+		target = desc->cmd_desc_mapd.its_dev->col->col_target;
+		cmd_format_command(cmd, ITS_CMD_MAPD);
+		cmd_format_itt(cmd, vtophys(desc->cmd_desc_mapd.its_dev->itt));
+		/*
+		 * Size describes number of bits to encode interrupt IDs
+		 * supported by the device minus one.
+		 * When V (valid) bit is zero, this field should be written
+		 * as zero.
+		 */
+		if (desc->cmd_desc_mapd.valid != 0) {
+			size = fls(desc->cmd_desc_mapd.its_dev->lpis.lpi_num);
+			size = MAX(1, size) - 1;
+		} else
+			size = 0;
+
+		cmd_format_size(cmd, size);
+		cmd_format_devid(cmd, desc->cmd_desc_mapd.its_dev->devid);
+		cmd_format_valid(cmd, desc->cmd_desc_mapd.valid);
+		break;
+	case ITS_CMD_MAPC:	/* Map collection to Re-Distributor */
+		target = desc->cmd_desc_mapc.col->col_target;
+		cmd_format_command(cmd, ITS_CMD_MAPC);
+		cmd_format_col(cmd, desc->cmd_desc_mapc.col->col_id);
+		cmd_format_valid(cmd, desc->cmd_desc_mapc.valid);
+		cmd_format_target(cmd, target);
+		break;
+	case ITS_CMD_MAPVI:
+		target = desc->cmd_desc_mapvi.its_dev->col->col_target;
+		cmd_format_command(cmd, ITS_CMD_MAPVI);
+		cmd_format_devid(cmd, desc->cmd_desc_mapvi.its_dev->devid);
+		cmd_format_id(cmd, desc->cmd_desc_mapvi.id);
+		cmd_format_pid(cmd, desc->cmd_desc_mapvi.pid);
+		cmd_format_col(cmd, desc->cmd_desc_mapvi.its_dev->col->col_id);
+		break;
+	case ITS_CMD_MAPI:
+		target = desc->cmd_desc_mapi.its_dev->col->col_target;
+		cmd_format_command(cmd, ITS_CMD_MAPI);
+		cmd_format_devid(cmd, desc->cmd_desc_mapi.its_dev->devid);
+		cmd_format_id(cmd, desc->cmd_desc_mapi.lpinum);
+		cmd_format_col(cmd, desc->cmd_desc_mapi.its_dev->col->col_id);
+		break;
+	case ITS_CMD_INV:
+		target = desc->cmd_desc_inv.its_dev->col->col_target;
+		cmd_format_command(cmd, ITS_CMD_INV);
+		cmd_format_devid(cmd, desc->cmd_desc_inv.its_dev->devid);
+		cmd_format_id(cmd, desc->cmd_desc_inv.lpinum);
+		break;
+	case ITS_CMD_INVALL:
+		cmd_format_command(cmd, ITS_CMD_INVALL);
+		cmd_format_col(cmd, desc->cmd_desc_invall.col->col_id);
+		break;
+	default:
+		error = TRUE;
+		break;
+	}
+
+	if (!error)
+		cmd_fix_endian(cmd);
+
+	return (target);
+}
+
+static __inline uint64_t
+its_cmd_cwriter_offset(struct gic_v3_its_softc *sc, struct its_cmd *cmd)
+{
+	uint64_t off;
+
+	off = (cmd - sc->its_cmdq_base) * sizeof(*cmd);
+
+	return (off);
+}
+
+static void
+its_cmd_wait_completion(struct gic_v3_its_softc *sc, struct its_cmd *cmd_first,
+    struct its_cmd *cmd_last)
+{
+	uint64_t first, last, read;
+	size_t us_left;
+
+	/*
+	 * XXX ARM64TODO: This is obviously a significant delay.
+	 * The reason for that is that currently the time frames for
+	 * the command to complete are not known.
+	 */
+	us_left = 1000000;
+
+	first = its_cmd_cwriter_offset(sc, cmd_first);
+	last = its_cmd_cwriter_offset(sc, cmd_last);
+
+	for (;;) {
+		read = gic_its_read(sc, 8, GITS_CREADR);
+		if (read < first || read >= last)
+			break;
+
+		if (us_left-- == 0) {
+			/* This means timeout */
+			device_printf(sc->dev,
+			    "Timeout while waiting for CMD completion.\n");
+			return;
+		}
+		DELAY(1);
+	}
+}
+
+static int
+its_cmd_send(struct gic_v3_its_softc *sc, struct its_cmd_desc *desc)
+{
+	struct its_cmd *cmd, *cmd_sync;
+	struct its_col col_sync;
+	struct its_cmd_desc desc_sync;
+	uint64_t target, cwriter;
+
+	mtx_lock_spin(&sc->its_spin_mtx);
+	cmd = its_cmd_alloc_locked(sc);
+	mtx_unlock_spin(&sc->its_spin_mtx);
+	if (cmd == NULL) {
+		device_printf(sc->dev, "could not allocate ITS command\n");
+		return (EBUSY);
+	}
+
+	target = its_cmd_prepare(cmd, desc);
+	its_cmd_sync(sc, cmd);
+
+	if (target != ITS_TARGET_NONE) {
+		mtx_lock_spin(&sc->its_spin_mtx);
+		cmd_sync = its_cmd_alloc_locked(sc);
+		mtx_unlock_spin(&sc->its_spin_mtx);
+		if (cmd_sync == NULL)
+			goto end;
+		desc_sync.cmd_type = ITS_CMD_SYNC;
+		col_sync.col_target = target;
+		desc_sync.cmd_desc_sync.col = &col_sync;
+		its_cmd_prepare(cmd_sync, &desc_sync);
+		its_cmd_sync(sc, cmd_sync);
+	}
+end:
+	/* Update GITS_CWRITER */
+	mtx_lock_spin(&sc->its_spin_mtx);
+	cwriter = its_cmd_cwriter_offset(sc, sc->its_cmdq_write);
+	gic_its_write(sc, 8, GITS_CWRITER, cwriter);
+	mtx_unlock_spin(&sc->its_spin_mtx);
+
+	its_cmd_wait_completion(sc, cmd, sc->its_cmdq_write);
+
+	return (0);
+}
+
+static struct its_dev *
+its_device_find_locked(struct gic_v3_its_softc *sc, device_t pci_dev)
+{
+	struct its_dev *its_dev;
+
+	mtx_assert(&sc->its_mtx, MA_OWNED);
+	/* Find existing device if any */
+	TAILQ_FOREACH(its_dev, &sc->its_dev_list, entry) {
+		if (its_dev->pci_dev == pci_dev)
+			return (its_dev);
+	}
+
+	return (NULL);
+}
+
+static struct its_dev *
+its_device_alloc_locked(struct gic_v3_its_softc *sc, device_t pci_dev,
+    u_int nvecs)
+{
+	struct its_dev *newdev;
+	uint64_t typer;
+	uint32_t devid;
+	u_int cpuid;
+	size_t esize;
+
+	mtx_assert(&sc->its_mtx, MA_OWNED);
+	/* Find existing device if any */
+	newdev = its_device_find_locked(sc, pci_dev);
+	if (newdev != NULL)
+		return (newdev);
+
+	devid = PCI_DEVID(pci_dev);
+
+	/* There was no previously created device. Create one now */
+	newdev = malloc(sizeof(*newdev), M_GIC_V3_ITS, (M_WAITOK | M_ZERO));
+	newdev->pci_dev = pci_dev;
+	newdev->devid = devid;
+
+	if (lpi_alloc_chunk(sc, &newdev->lpis, nvecs) != 0) {
+		free(newdev, M_GIC_V3_ITS);
+		return (NULL);
+	}
+
+	/* Get ITT entry size */
+	typer = gic_its_read(sc, 8, GITS_TYPER);
+	esize = GITS_TYPER_ITTES(typer);
+	/*
+	 * Allocate ITT for this device.
+	 * PA has to be 256 B aligned. At least two entries for device.
+	 */
+	newdev->itt = (vm_offset_t)contigmalloc(
+	    roundup2(roundup2(nvecs, 2) * esize, 0x100), M_GIC_V3_ITS,
+	    (M_WAITOK | M_ZERO), 0, ~0UL, 0x100, 0);
+
+	/*
+	 * XXX ARM64TODO: Currently all interrupts are going
+	 * to be bound to the CPU that performs the configuration.
+	 */
+	cpuid = PCPU_GET(cpuid);
+	newdev->col = &sc->its_cols[cpuid];
+
+	TAILQ_INSERT_TAIL(&sc->its_dev_list, newdev, entry);
+
+	/* Map device to its ITT */
+	its_cmd_mapd(sc, newdev, 1);
+
+	return (newdev);
+}
+
+static __inline void
+its_device_asign_lpi_locked(struct gic_v3_its_softc *sc,
+    struct its_dev *its_dev, u_int *irq)
+{
+
+	mtx_assert(&sc->its_mtx, MA_OWNED);
+	if (its_dev->lpis.lpi_free == 0) {
+		panic("Requesting more LPIs than allocated for this device. "
+		    "LPI num: %u, free %u", its_dev->lpis.lpi_num,
+		    its_dev->lpis.lpi_free);
+	}
+	*irq = its_dev->lpis.lpi_base + (its_dev->lpis.lpi_num -
+	    its_dev->lpis.lpi_free);
+	its_dev->lpis.lpi_free--;
+}
+/*
+ * Message signalled interrupts handling.
+ */
+
+/*
+ * XXX ARM64TODO: Watch out for "irq" type.
+ *
+ * In theory GIC can handle up to (2^32 - 1) interrupt IDs whereas
+ * we pass "irq" pointer of type integer. This is obviously wrong but
+ * is determined by the way as PCI layer wants it to be done.
+ */
+int
+gic_v3_its_alloc_msix(device_t dev, device_t pci_dev, int *irq)
+{
+	struct gic_v3_its_softc *sc;
+	struct its_dev *its_dev;
+	u_int nvecs;
+
+	sc = device_get_softc(dev);
+
+	mtx_lock(&sc->its_mtx);
+	nvecs = PCI_MSIX_NUM(pci_dev);
+
+	/*
+	 * Allocate device as seen by ITS if not already available.
+	 * Notice that MSI-X interrupts are allocated on one-by-one basis.
+	 */
+	its_dev = its_device_alloc_locked(sc, pci_dev, nvecs);
+	if (its_dev == NULL) {
+		mtx_unlock(&sc->its_mtx);
+		return (ENOMEM);
+	}
+
+	its_device_asign_lpi_locked(sc, its_dev, irq);
+	mtx_unlock(&sc->its_mtx);
+
+	return (0);
+}
+
+int
+gic_v3_its_alloc_msi(device_t dev, device_t pci_dev, int count, int *irqs)
+{
+	struct gic_v3_its_softc *sc;
+	struct its_dev *its_dev;
+
+	sc = device_get_softc(dev);
+
+	/* Allocate device as seen by ITS if not already available. */
+	mtx_lock(&sc->its_mtx);
+	its_dev = its_device_alloc_locked(sc, pci_dev, count);
+	if (its_dev == NULL) {
+		mtx_unlock(&sc->its_mtx);
+		return (ENOMEM);
+	}
+
+	for (; count > 0; count--) {
+		its_device_asign_lpi_locked(sc, its_dev, irqs);
+		irqs++;
+	}
+	mtx_unlock(&sc->its_mtx);
+
+	return (0);
+}
+
+int
+gic_v3_its_map_msix(device_t dev, device_t pci_dev, int irq, uint64_t *addr,
+    uint32_t *data)
+{
+	struct gic_v3_its_softc *sc;
+	bus_space_handle_t its_bsh;
+	struct its_dev *its_dev;
+	uint64_t its_pa;
+	uint32_t id;
+
+	sc = device_get_softc(dev);
+	/* Verify that this device is allocated and owns this LPI */
+	mtx_lock(&sc->its_mtx);
+	its_dev = its_device_find_locked(sc, pci_dev);
+	mtx_unlock(&sc->its_mtx);
+	if (its_dev == NULL)
+		return (EINVAL);
+
+	id = irq - its_dev->lpis.lpi_base;
+	lpi_map_to_device(sc, its_dev, id, irq);
+
+	its_bsh = rman_get_bushandle(&sc->its_res[0]);
+	its_pa = vtophys(its_bsh);
+
+	*addr = (its_pa + GITS_TRANSLATER);
+	*data = id;
+
+	return (0);
+}
diff --git a/sys/arm64/arm64/gic_v3_reg.h b/sys/arm64/arm64/gic_v3_reg.h
index 7f0b5508856c..2a2072fa57d5 100644
--- a/sys/arm64/arm64/gic_v3_reg.h
+++ b/sys/arm64/arm64/gic_v3_reg.h
@@ -101,17 +101,100 @@
 #define	GICR_PIDR2_ARCH_GICv4	(0x40)
 
 /* Redistributor registers */
+#define	GICR_CTLR		GICD_CTLR
+#define		GICR_CTLR_LPI_ENABLE	(1 << 0)
+
 #define	GICR_PIDR2		GICD_PIDR2
 
 #define	GICR_TYPER		(0x0008)
+#define	GICR_TYPER_PLPIS	(1 << 0)
 #define	GICR_TYPER_VLPIS	(1 << 1)
 #define	GICR_TYPER_LAST		(1 << 4)
+#define	GICR_TYPER_CPUNUM_SHIFT	(8)
+#define	GICR_TYPER_CPUNUM_MASK	(0xFFFUL << GICR_TYPER_CPUNUM_SHIFT)
+#define	GICR_TYPER_CPUNUM(x)	\
+	    (((x) & GICR_TYPER_CPUNUM_MASK) >> GICR_TYPER_CPUNUM_SHIFT)
 #define	GICR_TYPER_AFF_SHIFT	(32)
 
 #define	GICR_WAKER		(0x0014)
 #define	GICR_WAKER_PS		(1 << 1) /* Processor sleep */
 #define	GICR_WAKER_CA		(1 << 2) /* Children asleep */
 
+#define	GICR_PROPBASER		(0x0070)
+#define		GICR_PROPBASER_IDBITS_MASK	0x1FUL
+/*
+ * Cacheability
+ * 0x0 - Device-nGnRnE
+ * 0x1 - Normal Inner Non-cacheable
+ * 0x2 - Normal Inner Read-allocate, Write-through
+ * 0x3 - Normal Inner Read-allocate, Write-back
+ * 0x4 - Normal Inner Write-allocate, Write-through
+ * 0x5 - Normal Inner Write-allocate, Write-back
+ * 0x6 - Normal Inner Read-allocate, Write-allocate, Write-through
+ * 0x7 - Normal Inner Read-allocate, Write-allocate, Write-back
+ */
+#define		GICR_PROPBASER_CACHE_SHIFT	7
+#define		GICR_PROPBASER_CACHE_DnGnRnE	0x0UL
+#define		GICR_PROPBASER_CACHE_NIN	0x1UL
+#define		GICR_PROPBASER_CACHE_NIRAWT	0x2UL
+#define		GICR_PROPBASER_CACHE_NIRAWB	0x3UL
+#define		GICR_PROPBASER_CACHE_NIWAWT	0x4UL
+#define		GICR_PROPBASER_CACHE_NIWAWB	0x5UL
+#define		GICR_PROPBASER_CACHE_NIRAWAWT	0x6UL
+#define		GICR_PROPBASER_CACHE_NIRAWAWB	0x7UL
+
+/*
+ * Shareability
+ * 0x0 - Non-shareable
+ * 0x1 - Inner-shareable
+ * 0x2 - Outer-shareable
+ * 0x3 - Reserved. Threated as 0x0
+ */
+#define		GICR_PROPBASER_SHARE_SHIFT	10
+#define		GICR_PROPBASER_SHARE_NS		0x0UL
+#define		GICR_PROPBASER_SHARE_IS		0x1UL
+#define		GICR_PROPBASER_SHARE_OS		0x2UL
+#define		GICR_PROPBASER_SHARE_RES	0x3UL
+#define		GICR_PROPBASER_SHARE_MASK	\
+		    (0x3UL << GICR_PROPBASER_SHARE_SHIFT)
+
+#define	GICR_PENDBASER		(0x0078)
+/*
+ * Cacheability
+ * 0x0 - Device-nGnRnE
+ * 0x1 - Normal Inner Non-cacheable
+ * 0x2 - Normal Inner Read-allocate, Write-through
+ * 0x3 - Normal Inner Read-allocate, Write-back
+ * 0x4 - Normal Inner Write-allocate, Write-through
+ * 0x5 - Normal Inner Write-allocate, Write-back
+ * 0x6 - Normal Inner Read-allocate, Write-allocate, Write-through
+ * 0x7 - Normal Inner Read-allocate, Write-allocate, Write-back
+ */
+#define		GICR_PENDBASER_CACHE_SHIFT	7
+#define		GICR_PENDBASER_CACHE_DnGnRnE	0x0UL
+#define		GICR_PENDBASER_CACHE_NIN	0x1UL
+#define		GICR_PENDBASER_CACHE_NIRAWT	0x2UL
+#define		GICR_PENDBASER_CACHE_NIRAWB	0x3UL
+#define		GICR_PENDBASER_CACHE_NIWAWT	0x4UL
+#define		GICR_PENDBASER_CACHE_NIWAWB	0x5UL
+#define		GICR_PENDBASER_CACHE_NIRAWAWT	0x6UL
+#define		GICR_PENDBASER_CACHE_NIRAWAWB	0x7UL
+
+/*
+ * Shareability
+ * 0x0 - Non-shareable
+ * 0x1 - Inner-shareable
+ * 0x2 - Outer-shareable
+ * 0x3 - Reserved. Threated as 0x0
+ */
+#define		GICR_PENDBASER_SHARE_SHIFT	10
+#define		GICR_PENDBASER_SHARE_NS		0x0UL
+#define		GICR_PENDBASER_SHARE_IS		0x1UL
+#define		GICR_PENDBASER_SHARE_OS		0x2UL
+#define		GICR_PENDBASER_SHARE_RES	0x3UL
+#define		GICR_PENDBASER_SHARE_MASK	\
+		    (0x3UL << GICR_PENDBASER_SHARE_SHIFT)
+
 /* Re-distributor registers for SGIs and PPIs */
 #define	GICR_RD_BASE_SIZE	PAGE_SIZE_64K
 #define	GICR_SGI_BASE_SIZE	PAGE_SIZE_64K
@@ -125,6 +208,151 @@
 
 #define		GICR_I_PER_IPRIORITYn		(GICD_I_PER_IPRIORITYn)
 
+/* ITS registers */
+#define	GITS_PIDR2		GICR_PIDR2
+#define	GITS_PIDR2_ARCH_MASK	GICR_PIDR2_ARCH_MASK
+#define	GITS_PIDR2_ARCH_GICv3	GICR_PIDR2_ARCH_GICv3
+#define	GITS_PIDR2_ARCH_GICv4	GICR_PIDR2_ARCH_GICv4
+
+#define	GITS_CTLR		(0x0000)
+#define		GITS_CTLR_EN	(1 << 0)
+
+#define	GITS_CBASER		(0x0080)
+#define		GITS_CBASER_VALID	(1UL << 63)
+/*
+ * Cacheability
+ * 0x0 - Device-nGnRnE
+ * 0x1 - Normal Inner Non-cacheable
+ * 0x2 - Normal Inner Read-allocate, Write-through
+ * 0x3 - Normal Inner Read-allocate, Write-back
+ * 0x4 - Normal Inner Write-allocate, Write-through
+ * 0x5 - Normal Inner Write-allocate, Write-back
+ * 0x6 - Normal Inner Read-allocate, Write-allocate, Write-through
+ * 0x7 - Normal Inner Read-allocate, Write-allocate, Write-back
+ */
+#define		GITS_CBASER_CACHE_SHIFT		59
+#define		GITS_CBASER_CACHE_DnGnRnE	0x0UL
+#define		GITS_CBASER_CACHE_NIN		0x1UL
+#define		GITS_CBASER_CACHE_NIRAWT	0x2UL
+#define		GITS_CBASER_CACHE_NIRAWB	0x3UL
+#define		GITS_CBASER_CACHE_NIWAWT	0x4UL
+#define		GITS_CBASER_CACHE_NIWAWB	0x5UL
+#define		GITS_CBASER_CACHE_NIRAWAWT	0x6UL
+#define		GITS_CBASER_CACHE_NIRAWAWB	0x7UL
+#define		GITS_CBASER_CACHE_MASK	(0x7UL << GITS_CBASER_TYPE_SHIFT)
+/*
+ * Shareability
+ * 0x0 - Non-shareable
+ * 0x1 - Inner-shareable
+ * 0x2 - Outer-shareable
+ * 0x3 - Reserved. Threated as 0x0
+ */
+#define		GITS_CBASER_SHARE_SHIFT		10
+#define		GITS_CBASER_SHARE_NS		0x0UL
+#define		GITS_CBASER_SHARE_IS		0x1UL
+#define		GITS_CBASER_SHARE_OS		0x2UL
+#define		GITS_CBASER_SHARE_RES		0x3UL
+#define		GITS_CBASER_SHARE_MASK		\
+		    (0x3UL << GITS_CBASER_SHARE_SHIFT)
+
+#define		GITS_CBASER_PA_SHIFT	12
+#define		GITS_CBASER_PA_MASK	(0xFFFFFFFFFUL << GITS_CBASER_PA_SHIFT)
+
+#define	GITS_CWRITER		(0x0088)
+#define	GITS_CREADR		(0x0090)
+
+#define	GITS_BASER_BASE		(0x0100)
+#define	GITS_BASER(x)		(GITS_BASER_BASE + (x) * 8)
+
+#define		GITS_BASER_VALID	(1UL << 63)
+
+#define		GITS_BASER_TYPE_SHIFT	56
+#define		GITS_BASER_TYPE(x)	\
+		    (((x) & GITS_BASER_TYPE_MASK) >> GITS_BASER_TYPE_SHIFT)
+#define		GITS_BASER_TYPE_UNIMPL	0x0UL	/* Unimplemented */
+#define		GITS_BASER_TYPE_DEV	0x1UL	/* Devices */
+#define		GITS_BASER_TYPE_VP	0x2UL	/* Virtual Processors */
+#define		GITS_BASER_TYPE_PP	0x3UL	/* Physical Processors */
+#define		GITS_BASER_TYPE_IC	0x4UL	/* Interrupt Collections */
+#define		GITS_BASER_TYPE_RES5	0x5UL	/* Reserved */
+#define		GITS_BASER_TYPE_RES6	0x6UL	/* Reserved */
+#define		GITS_BASER_TYPE_RES7	0x7UL	/* Reserved */
+#define		GITS_BASER_TYPE_MASK	(0x7UL << GITS_BASER_TYPE_SHIFT)
+/*
+ * Cacheability
+ * 0x0 - Non-cacheable, non-bufferable
+ * 0x1 - Non-cacheable
+ * 0x2 - Read-allocate, Write-through
+ * 0x3 - Read-allocate, Write-back
+ * 0x4 - Write-allocate, Write-through
+ * 0x5 - Write-allocate, Write-back
+ * 0x6 - Read-allocate, Write-allocate, Write-through
+ * 0x7 - Read-allocate, Write-allocate, Write-back
+ */
+#define		GITS_BASER_CACHE_SHIFT	59
+#define		GITS_BASER_CACHE_NCNB	0x0UL
+#define		GITS_BASER_CACHE_NC	0x1UL
+#define		GITS_BASER_CACHE_RAWT	0x2UL
+#define		GITS_BASER_CACHE_RAWB	0x3UL
+#define		GITS_BASER_CACHE_WAWT	0x4UL
+#define		GITS_BASER_CACHE_WAWB	0x5UL
+#define		GITS_BASER_CACHE_RAWAWT	0x6UL
+#define		GITS_BASER_CACHE_RAWAWB	0x7UL
+#define		GITS_BASER_CACHE_MASK	(0x7UL << GITS_BASER_CACHE_SHIFT)
+
+#define		GITS_BASER_ESIZE_SHIFT	48
+#define		GITS_BASER_ESIZE_MASK	(0x1FUL << GITS_BASER_ESIZE_SHIFT)
+#define		GITS_BASER_ESIZE(x)	\
+		    ((((x) & GITS_BASER_ESIZE_MASK) >> GITS_BASER_ESIZE_SHIFT) + 1)
+
+#define		GITS_BASER_PA_SHIFT	12
+#define		GITS_BASER_PA_MASK	(0xFFFFFFFFFUL << GITS_BASER_PA_SHIFT)
+
+/*
+ * Shareability
+ * 0x0 - Non-shareable
+ * 0x1 - Inner-shareable
+ * 0x2 - Outer-shareable
+ * 0x3 - Reserved. Threated as 0x0
+ */
+#define		GITS_BASER_SHARE_SHIFT	10
+#define		GITS_BASER_SHARE_NS	0x0UL
+#define		GITS_BASER_SHARE_IS	0x1UL
+#define		GITS_BASER_SHARE_OS	0x2UL
+#define		GITS_BASER_SHARE_RES	0x3UL
+#define		GITS_BASER_SHARE_MASK	(0x3UL << GITS_BASER_SHARE_SHIFT)
+
+#define		GITS_BASER_PSZ_SHIFT	8
+#define		GITS_BASER_PSZ_4K	0x0UL
+#define		GITS_BASER_PSZ_16K	0x1UL
+#define		GITS_BASER_PSZ_64K	0x2UL
+#define		GITS_BASER_PSZ_MASK	(0x3UL << GITS_BASER_PSZ_SHIFT)
+
+#define		GITS_BASER_SIZE_MASK	0xFFUL
+
+#define		GITS_BASER_NUM		8
+
+#define	GITS_TYPER		(0x0008)
+#define		GITS_TYPER_PTA		(1UL << 19)
+#define		GITS_TYPER_DEVB_SHIFT	13
+#define		GITS_TYPER_DEVB_MASK	(0x1FUL << GITS_TYPER_DEVB_SHIFT)
+/* Number of device identifiers implemented */
+#define		GITS_TYPER_DEVB(x)	\
+		    ((((x) & GITS_TYPER_DEVB_MASK) >> GITS_TYPER_DEVB_SHIFT) + 1)
+#define		GITS_TYPER_ITTES_SHIFT	4
+#define		GITS_TYPER_ITTES_MASK	(0xFUL << GITS_TYPER_ITTES_SHIFT)
+/* Number of bytes per ITT Entry */
+#define		GITS_TYPER_ITTES(x)	\
+		    ((((x) & GITS_TYPER_ITTES_MASK) >> GITS_TYPER_ITTES_SHIFT) + 1)
+
+#define	GITS_TRANSLATER		(0x10040)
+/*
+ * LPI related
+ */
+#define		LPI_CONF_PRIO_MASK	(0xFC)
+#define		LPI_CONF_GROUP1		(1 << 1)
+#define		LPI_CONF_ENABLE		(1 << 0)
+
 /*
  * CPU interface
  */
diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h
index 2e511b4af6b7..486e93808c1b 100644
--- a/sys/arm64/arm64/gic_v3_var.h
+++ b/sys/arm64/arm64/gic_v3_var.h
@@ -36,6 +36,17 @@
 
 DECLARE_CLASS(gic_v3_driver);
 
+#define	LPI_FLAGS_CONF_FLUSH	(1UL << 0)
+#define	LPI_CONFTAB_SIZE	PAGE_SIZE_64K
+/* 1 bit per LPI + 1 KB more for the obligatory PPI, SGI, SPI stuff */
+#define	LPI_PENDTAB_SIZE	((LPI_CONFTAB_SIZE / 8) + 0x400)
+
+struct redist_lpis {
+	vm_offset_t		conf_base;
+	vm_offset_t		pend_base[MAXCPU];
+	uint64_t		flags;
+};
+
 struct gic_redists {
 	/*
 	 * Re-Distributor region description.
@@ -47,6 +58,8 @@ struct gic_redists {
 	u_int			nregions;
 	/* Per-CPU Re-Distributor handler */
 	struct resource *	pcpu[MAXCPU];
+	/* LPIs data */
+	struct redist_lpis	lpis;
 };
 
 struct gic_v3_softc {
@@ -70,6 +83,167 @@ MALLOC_DECLARE(M_GIC_V3);
 int gic_v3_attach(device_t dev);
 int gic_v3_detach(device_t dev);
 
+/*
+ * ITS
+ */
+#define	GIC_V3_ITS_DEVSTR	"ARM GIC Interrupt Translation Service"
+#define	GIC_V3_ITS_COMPSTR	"arm,gic-v3-its"
+
+DECLARE_CLASS(gic_v3_its_driver);
+
+/* LPI chunk owned by ITS device */
+struct lpi_chunk {
+	u_int	lpi_base;
+	u_int	lpi_num;
+	u_int	lpi_free;	/* First free LPI in set */
+};
+
+/* ITS device */
+struct its_dev {
+	TAILQ_ENTRY(its_dev)	entry;
+	/* PCI device */
+	device_t		pci_dev;
+	/* Device ID (i.e. PCI device ID) */
+	uint32_t		devid;
+	/* List of assigned LPIs */
+	struct lpi_chunk	lpis;
+	/* Virtual address of ITT */
+	vm_offset_t		itt;
+	/* Interrupt collection */
+	struct its_col *	col;
+};
+TAILQ_HEAD(its_dev_list, its_dev);
+
+/* ITS private table description */
+struct its_ptab {
+	vm_offset_t	ptab_vaddr;	/* Virtual Address of table */
+	size_t		ptab_pgsz;	/* Page size */
+	size_t		ptab_npages;	/* Number of pages */
+};
+
+/* ITS collection description. */
+struct its_col {
+	uint64_t	col_target;	/* Target Re-Distributor */
+	uint64_t	col_id;		/* Collection ID */
+};
+
+/* ITS command. Each command is 32 bytes long */
+struct its_cmd {
+	uint64_t	cmd_dword[4];	/* ITS command double word */
+};
+
+/* ITS commands encoding */
+#define	ITS_CMD_SYNC		(0x05)
+#define	ITS_CMD_MAPD		(0x08)
+#define	ITS_CMD_MAPC		(0x09)
+#define	ITS_CMD_MAPVI		(0x0a)
+#define	ITS_CMD_MAPI		(0x0b)
+#define	ITS_CMD_INV		(0x0c)
+#define	ITS_CMD_INVALL		(0x0d)
+/* Command */
+#define	CMD_COMMAND_MASK	(0xFFUL)
+/* PCI device ID */
+#define	CMD_DEVID_SHIFT		(32)
+#define	CMD_DEVID_MASK		(0xFFFFFFFFUL << CMD_DEVID_SHIFT)
+/* Size of IRQ ID bitfield */
+#define	CMD_SIZE_MASK		(0xFFUL)
+/* Virtual LPI ID */
+#define	CMD_ID_MASK		(0xFFFFFFFFUL)
+/* Physical LPI ID */
+#define	CMD_PID_SHIFT		(32)
+#define	CMD_PID_MASK		(0xFFFFFFFFUL << CMD_PID_SHIFT)
+/* Collection */
+#define	CMD_COL_MASK		(0xFFFFUL)
+/* Target (CPU or Re-Distributor) */
+#define	CMD_TARGET_SHIFT	(16)
+#define	CMD_TARGET_MASK		(0xFFFFFFFFUL << CMD_TARGET_SHIFT)
+/* Interrupt Translation Table address */
+#define	CMD_ITT_MASK		(0xFFFFFFFFFF00UL)
+/* Valid command bit */
+#define	CMD_VALID_SHIFT		(63)
+#define	CMD_VALID_MASK		(1UL << CMD_VALID_SHIFT)
+
+/*
+ * ITS command descriptor.
+ * Idea for command description passing taken from Linux.
+ */
+struct its_cmd_desc {
+	uint8_t cmd_type;
+
+	union {
+		struct {
+			struct its_col *col;
+		} cmd_desc_sync;
+
+		struct {
+			struct its_col *col;
+			uint8_t valid;
+		} cmd_desc_mapc;
+
+		struct {
+			struct its_dev *its_dev;
+			uint32_t pid;
+			uint32_t id;
+		} cmd_desc_mapvi;
+
+		struct {
+			struct its_dev *its_dev;
+			uint32_t lpinum;
+		} cmd_desc_mapi;
+
+		struct {
+			struct its_dev *its_dev;
+			uint8_t valid;
+		} cmd_desc_mapd;
+
+		struct {
+			struct its_dev *its_dev;
+			uint32_t lpinum;
+		} cmd_desc_inv;
+
+		struct {
+			struct its_col *col;
+		} cmd_desc_invall;
+	};
+};
+
+#define	ITS_CMDQ_SIZE		PAGE_SIZE_64K
+#define	ITS_CMDQ_NENTRIES	(ITS_CMDQ_SIZE / sizeof(struct its_cmd))
+
+#define	ITS_FLAGS_CMDQ_FLUSH	(1UL << 0)
+
+#define	ITS_TARGET_NONE		0xFBADBEEF
+
+struct gic_v3_its_softc {
+	device_t		dev;
+	struct resource	*	its_res;
+
+	struct its_cmd *	its_cmdq_base;	/* ITS command queue base */
+	struct its_cmd *	its_cmdq_write;	/* ITS command queue write ptr */
+	struct its_ptab		its_ptabs[GITS_BASER_NUM];/* ITS private tables */
+	struct its_col *	its_cols;	/* Per-CPU collections */
+
+	uint64_t		its_flags;
+
+	struct its_dev_list	its_dev_list;
+
+	unsigned long *		its_lpi_bitmap;
+	uint32_t		its_lpi_maxid;
+
+	struct mtx		its_mtx;
+	struct mtx		its_spin_mtx;
+};
+
+extern devclass_t gic_v3_its_devclass;
+
+int gic_v3_its_detach(device_t);
+
+int gic_v3_its_alloc_msix(device_t, device_t, int *);
+int gic_v3_its_alloc_msi(device_t, device_t, int, int *);
+int gic_v3_its_map_msix(device_t, device_t, int, uint64_t *, uint32_t *);
+
+void lpi_unmask_irq(device_t, uint32_t);
+void lpi_mask_irq(device_t, uint32_t);
 /*
  * GIC Distributor accessors.
  * Notice that only GIC sofc can be passed.
@@ -103,4 +277,28 @@ int gic_v3_detach(device_t dev);
 	    reg, val);				\
 })
 
+#define	PCI_DEVID(pci_dev)				\
+({							\
+	(((pci_get_domain(pci_dev) >> 2) << 19) |	\
+	 ((pci_get_domain(pci_dev) % 4) << 16) |	\
+	 (pci_get_bus(pci_dev) << 8) |			\
+	 (pci_get_slot(pci_dev) << 3) |			\
+	 (pci_get_function(pci_dev) << 0));		\
+})
+
+/*
+ * Request number of maximum MSI-X vectors for this device.
+ * Device can ask for less vectors than maximum supported but not more.
+ */
+#define	PCI_MSIX_NUM(pci_dev)			\
+({						\
+	struct pci_devinfo *dinfo;		\
+	pcicfgregs *cfg;			\
+						\
+	dinfo = device_get_ivars(pci_dev);	\
+	cfg = &dinfo->cfg;			\
+						\
+	cfg->msix.msix_msgnum;			\
+})
+
 #endif /* _GIC_V3_VAR_H_ */
diff --git a/sys/arm64/arm64/intr_machdep.c b/sys/arm64/arm64/intr_machdep.c
index 7ff6f112e88f..4a69187bfe95 100644
--- a/sys/arm64/arm64/intr_machdep.c
+++ b/sys/arm64/arm64/intr_machdep.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -473,9 +474,16 @@ arm_init_secondary(void)
 void
 ipi_all_but_self(u_int ipi)
 {
+	cpuset_t other_cpus;
 
-	/* ARM64TODO: We should support this */
-	panic("ipi_all_but_self");
+	other_cpus = all_cpus;
+	CPU_CLR(PCPU_GET(cpuid), &other_cpus);
+
+	/* ARM64TODO: This will be fixed with arm_intrng */
+	ipi += 16;
+
+	CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi);
+	PIC_IPI_SEND(root_pic, other_cpus, ipi);
 }
 
 void
diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index 27e38716f9ad..41c32346a04d 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -844,17 +844,19 @@ pmap_kextract(vm_offset_t va)
  ***************************************************/
 
 void
-pmap_kenter_device(vm_offset_t va, vm_size_t size, vm_paddr_t pa)
+pmap_kenter_device(vm_offset_t sva, vm_size_t size, vm_paddr_t pa)
 {
 	pt_entry_t *l3;
+	vm_offset_t va;
 
 	KASSERT((pa & L3_OFFSET) == 0,
 	   ("pmap_kenter_device: Invalid physical address"));
-	KASSERT((va & L3_OFFSET) == 0,
+	KASSERT((sva & L3_OFFSET) == 0,
 	   ("pmap_kenter_device: Invalid virtual address"));
 	KASSERT((size & PAGE_MASK) == 0,
 	    ("pmap_kenter_device: Mapping is not page-sized"));
 
+	va = sva;
 	while (size != 0) {
 		l3 = pmap_l3(kernel_pmap, va);
 		KASSERT(l3 != NULL, ("Invalid page table, va: 0x%lx", va));
@@ -866,6 +868,7 @@ pmap_kenter_device(vm_offset_t va, vm_size_t size, vm_paddr_t pa)
 		pa += PAGE_SIZE;
 		size -= PAGE_SIZE;
 	}
+	pmap_invalidate_range(kernel_pmap, sva, va);
 }
 
 /*
@@ -884,18 +887,21 @@ pmap_kremove(vm_offset_t va)
 		cpu_dcache_wb_range(va, L3_SIZE);
 	pmap_load_clear(l3);
 	PTE_SYNC(l3);
+	pmap_invalidate_page(kernel_pmap, va);
 }
 
 void
-pmap_kremove_device(vm_offset_t va, vm_size_t size)
+pmap_kremove_device(vm_offset_t sva, vm_size_t size)
 {
 	pt_entry_t *l3;
+	vm_offset_t va;
 
-	KASSERT((va & L3_OFFSET) == 0,
+	KASSERT((sva & L3_OFFSET) == 0,
 	   ("pmap_kremove_device: Invalid virtual address"));
 	KASSERT((size & PAGE_MASK) == 0,
 	    ("pmap_kremove_device: Mapping is not page-sized"));
 
+	va = sva;
 	while (size != 0) {
 		l3 = pmap_l3(kernel_pmap, va);
 		KASSERT(l3 != NULL, ("Invalid page table, va: 0x%lx", va));
@@ -905,6 +911,7 @@ pmap_kremove_device(vm_offset_t va, vm_size_t size)
 		va += PAGE_SIZE;
 		size -= PAGE_SIZE;
 	}
+	pmap_invalidate_range(kernel_pmap, sva, va);
 }
 
 /*
@@ -954,6 +961,7 @@ pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count)
 
 		va += L3_SIZE;
 	}
+	pmap_invalidate_range(kernel_pmap, sva, va);
 }
 
 /*
@@ -964,12 +972,21 @@ pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count)
 void
 pmap_qremove(vm_offset_t sva, int count)
 {
+	pt_entry_t *l3;
 	vm_offset_t va;
 
+	KASSERT(sva >= VM_MIN_KERNEL_ADDRESS, ("usermode va %lx", sva));
+
 	va = sva;
 	while (count-- > 0) {
-		KASSERT(va >= VM_MIN_KERNEL_ADDRESS, ("usermode va %lx", va));
-		pmap_kremove(va);
+		l3 = pmap_l3(kernel_pmap, va);
+		KASSERT(l3 != NULL, ("pmap_kremove: Invalid address"));
+
+		if (pmap_l3_valid_cacheable(pmap_load(l3)))
+			cpu_dcache_wb_range(va, L3_SIZE);
+		pmap_load_clear(l3);
+		PTE_SYNC(l3);
+
 		va += PAGE_SIZE;
 	}
 	pmap_invalidate_range(kernel_pmap, sva, va);
@@ -1054,6 +1071,7 @@ _pmap_unwire_l3(pmap_t pmap, vm_offset_t va, vm_page_t m, struct spglist *free)
 		pdpg = PHYS_TO_VM_PAGE(*pmap_l1(pmap, va) & ~ATTR_MASK);
 		pmap_unwire_l3(pmap, va, pdpg, free);
 	}
+	pmap_invalidate_page(pmap, va);
 
 	/*
 	 * This is a release store so that the ordinary store unmapping
@@ -1239,11 +1257,6 @@ pmap_alloc_l3(pmap_t pmap, vm_offset_t va, struct rwlock **lockp)
 		if (m == NULL && lockp != NULL)
 			goto retry;
 	}
-	/*
-	 * XXXARM64: I'm not sure why we need this but it fixes a crash
-	 * when running things from a shell script.
-	 */
-	pmap_invalidate_all(pmap);
 	return (m);
 }
 
@@ -1346,6 +1359,7 @@ pmap_growkernel(vm_offset_t addr)
 		paddr = VM_PAGE_TO_PHYS(nkpg);
 		pmap_load_store(l2, paddr | L2_TABLE);
 		PTE_SYNC(l2);
+		pmap_invalidate_page(kernel_pmap, kernel_vm_end);
 
 		kernel_vm_end = (kernel_vm_end + L2_SIZE) & ~L2_OFFSET;
 		if (kernel_vm_end - 1 >= kernel_map->max_offset) {
@@ -1626,6 +1640,7 @@ pmap_remove_l3(pmap_t pmap, pt_entry_t *l3, vm_offset_t va,
 		cpu_dcache_wb_range(va, L3_SIZE);
 	old_l3 = pmap_load_clear(l3);
 	PTE_SYNC(l3);
+	pmap_invalidate_page(pmap, va);
 	if (old_l3 & ATTR_SW_WIRED)
 		pmap->pm_stats.wired_count -= 1;
 	pmap_resident_count_dec(pmap, 1);
@@ -1782,6 +1797,7 @@ pmap_remove_all(vm_page_t m)
 			cpu_dcache_wb_range(pv->pv_va, L3_SIZE);
 		tl3 = pmap_load_clear(l3);
 		PTE_SYNC(l3);
+		pmap_invalidate_page(pmap, pv->pv_va);
 		if (tl3 & ATTR_SW_WIRED)
 			pmap->pm_stats.wired_count--;
 		if ((tl3 & ATTR_AF) != 0)
@@ -1793,7 +1809,6 @@ pmap_remove_all(vm_page_t m)
 		if (pmap_page_dirty(tl3))
 			vm_page_dirty(m);
 		pmap_unuse_l3(pmap, pv->pv_va, *l2, &free);
-		pmap_invalidate_page(pmap, pv->pv_va);
 		TAILQ_REMOVE(&m->md.pv_list, pv, pv_next);
 		m->md.pv_gen++;
 		free_pv_entry(pmap, pv);
@@ -1852,6 +1867,8 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
 			if (pmap_l3_valid(l3)) {
 				pmap_set(l3p, ATTR_AP(ATTR_AP_RO));
 				PTE_SYNC(l3p);
+				/* XXX: Use pmap_invalidate_range */
+				pmap_invalidate_page(pmap, va);
 			}
 		}
 	}
@@ -1899,6 +1916,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 		new_l3 |= ATTR_AP(ATTR_AP_USER);
 	new_l3 |= ATTR_IDX(m->md.pv_memattr);
 
+	CTR2(KTR_PMAP, "pmap_enter: %.16lx -> %.16lx", va, pa);
+
 	mpte = NULL;
 
 	lock = NULL;
@@ -1909,6 +1928,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 		nosleep = (flags & PMAP_ENTER_NOSLEEP) != 0;
 		mpte = pmap_alloc_l3(pmap, va, nosleep ? NULL : &lock);
 		if (mpte == NULL && nosleep) {
+			CTR0(KTR_PMAP, "pmap_enter: mpte == NULL");
 			if (lock != NULL)
 				rw_wunlock(lock);
 			rw_runlock(&pvh_global_lock);
@@ -1953,6 +1973,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 			PTE_SYNC(l2);
 			l3 = pmap_l2_to_l3(l2, va);
 		}
+		pmap_invalidate_page(pmap, va);
 	}
 
 	om = NULL;
@@ -2051,12 +2072,11 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 			if ((orig_l3 & ATTR_SW_MANAGED) != 0)
 				vm_page_dirty(m);
 		}
-		if ((orig_l3 & ATTR_AF) != 0)
-			pmap_invalidate_page(pmap, va);
 	} else {
 		pmap_load_store(l3, new_l3);
 		PTE_SYNC(l3);
 	}
+	pmap_invalidate_page(pmap, va);
 	if ((pmap != pmap_kernel()) && (pmap == &curproc->p_vmspace->vm_pmap))
 	    cpu_icache_sync_range(va, PAGE_SIZE);
 
@@ -2146,6 +2166,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m,
 	rw_assert(&pvh_global_lock, RA_LOCKED);
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 
+	CTR2(KTR_PMAP, "pmap_enter_quick_locked: %p %lx", pmap, va);
 	/*
 	 * In the case that a page table page is not
 	 * resident, we are creating it here.
@@ -2193,7 +2214,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m,
 	}
 	if (l3 == NULL)
 		panic("pmap_enter_quick_locked: No l3");
-	if (*l3) {
+	if (pmap_load(l3) != 0) {
 		if (mpte != NULL) {
 			mpte->wire_count--;
 			mpte = NULL;
@@ -2579,6 +2600,7 @@ pmap_remove_pages(pmap_t pmap)
 					cpu_dcache_wb_range(pv->pv_va, L3_SIZE);
 				pmap_load_clear(l3);
 				PTE_SYNC(l3);
+				pmap_invalidate_page(pmap, pv->pv_va);
 
 				/*
 				 * Update the vm_page_t clean/reference bits.
@@ -2972,6 +2994,7 @@ pmap_activate(struct thread *td)
 	pmap = vmspace_pmap(td->td_proc->p_vmspace);
 	td->td_pcb->pcb_l1addr = vtophys(pmap->pm_l1);
 	__asm __volatile("msr ttbr0_el1, %0" : : "r"(td->td_pcb->pcb_l1addr));
+	pmap_invalidate_all(pmap);
 	critical_exit();
 }
 
diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S
index 2d547fd4cb67..bf69b8697027 100644
--- a/sys/arm64/arm64/swtch.S
+++ b/sys/arm64/arm64/swtch.S
@@ -246,10 +246,31 @@ ENTRY(fork_trampoline)
 END(fork_trampoline)
 
 ENTRY(savectx)
-	adr	x0, .Lsavectx_panic_str
-	bl	panic
+	/* Store the callee-saved registers */
+	stp	x8,  x9,  [x0, #PCB_REGS + 8 * 8]
+	stp	x10, x11, [x0, #PCB_REGS + 10 * 8]
+	stp	x12, x13, [x0, #PCB_REGS + 12 * 8]
+	stp	x14, x15, [x0, #PCB_REGS + 14 * 8]
+	stp	x16, x17, [x0, #PCB_REGS + 16 * 8]
+	stp	x18, x19, [x0, #PCB_REGS + 18 * 8]
+	stp	x20, x21, [x0, #PCB_REGS + 20 * 8]
+	stp	x22, x23, [x0, #PCB_REGS + 22 * 8]
+	stp	x24, x25, [x0, #PCB_REGS + 24 * 8]
+	stp	x26, x27, [x0, #PCB_REGS + 26 * 8]
+	stp	x28, x29, [x0, #PCB_REGS + 28 * 8]
+	str	x30, [x0, #PCB_REGS + 30 * 8]
+	/* And the old stack pointer */
+	mov	x5, sp
+	mrs	x6, tpidr_el0
+	stp	x5, x6, [x0, #PCB_SP]
+
+	/* Store the VFP registers */
+#ifdef VFP
+	mov	x29, lr
+	bl	vfp_save_state
+	mov	lr, x29
+#endif
+
 	ret
-.Lsavectx_panic_str:
-	.asciz "savectx"
 END(savectx)
 
diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c
index 23ea30b42a3b..500dce3c971d 100644
--- a/sys/arm64/arm64/trap.c
+++ b/sys/arm64/arm64/trap.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -79,13 +80,14 @@ void do_el0_error(struct trapframe *);
 int (*dtrace_invop_jump_addr)(struct trapframe *);
 
 static __inline void
-call_trapsignal(struct thread *td, int sig, u_long code)
+call_trapsignal(struct thread *td, int sig, int code, void *addr)
 {
 	ksiginfo_t ksi;
 
 	ksiginfo_init_trap(&ksi);
 	ksi.ksi_signo = sig;
-	ksi.ksi_code = (int)code;
+	ksi.ksi_code = code;
+	ksi.ksi_addr = addr;
 	trapsignal(td, &ksi);
 }
 
@@ -151,7 +153,7 @@ data_abort(struct trapframe *frame, uint64_t esr, int lower)
 	vm_prot_t ftype;
 	vm_offset_t va;
 	uint64_t far;
-	int error, sig;
+	int error, sig, ucode;
 
 	td = curthread;
 	pcb = td->td_pcb;
@@ -204,13 +206,14 @@ data_abort(struct trapframe *frame, uint64_t esr, int lower)
 		error = vm_fault(map, va, ftype, VM_FAULT_NORMAL);
 	}
 
-	if (error != 0) {
+	if (error != KERN_SUCCESS) {
 		if (lower) {
-			if (error == ENOMEM)
-				sig = SIGKILL;
+			sig = SIGSEGV;
+			if (error == KERN_PROTECTION_FAILURE)
+				ucode = SEGV_ACCERR;
 			else
-				sig = SIGSEGV;
-			call_trapsignal(td, sig, 0);
+				ucode = SEGV_MAPERR;
+			call_trapsignal(td, sig, ucode, (void *)far);
 		} else {
 			if (td->td_intr_nesting_level == 0 &&
 			    pcb->pcb_onfault != 0) {
diff --git a/sys/arm64/arm64/vm_machdep.c b/sys/arm64/arm64/vm_machdep.c
index 11591f0c094a..bd6d980145ee 100644
--- a/sys/arm64/arm64/vm_machdep.c
+++ b/sys/arm64/arm64/vm_machdep.c
@@ -184,15 +184,25 @@ void
 cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg,
 	stack_t *stack)
 {
+	struct trapframe *tf = td->td_frame;
 
-	panic("cpu_set_upcall_kse");
+	tf->tf_sp = STACKALIGN(stack->ss_sp + stack->ss_size);
+	tf->tf_elr = (register_t)entry;
+	tf->tf_x[0] = (register_t)arg;
 }
 
 int
 cpu_set_user_tls(struct thread *td, void *tls_base)
 {
+	struct pcb *pcb;
 
-	panic("cpu_set_user_tls");
+	if ((uintptr_t)tls_base >= VM_MAXUSER_ADDRESS)
+		return (EINVAL);
+
+	pcb = td->td_pcb;
+	pcb->pcb_tpidr_el0 = (register_t)tls_base;
+
+	return (0);
 }
 
 void
diff --git a/sys/arm64/include/_types.h b/sys/arm64/include/_types.h
index c2857ec5d6ce..8720ca883c5b 100644
--- a/sys/arm64/include/_types.h
+++ b/sys/arm64/include/_types.h
@@ -94,7 +94,7 @@ typedef	__uint64_t	__vm_pindex_t;
 typedef	__uint64_t	__vm_size_t;
 typedef	unsigned int	___wchar_t;
 
-#define	__WCHAR_MIN	__UINT_MIN	/* min value for a wchar_t */
+#define	__WCHAR_MIN	0		/* min value for a wchar_t */
 #define	__WCHAR_MAX	__UINT_MAX	/* max value for a wchar_t */
 
 /*
diff --git a/sys/arm64/include/atomic.h b/sys/arm64/include/atomic.h
index 99252b8f6800..4c9d7188e735 100644
--- a/sys/arm64/include/atomic.h
+++ b/sys/arm64/include/atomic.h
@@ -728,6 +728,34 @@ atomic_subtract_rel_64(volatile uint64_t *p, uint64_t val)
 	);
 }
 
+static __inline void
+atomic_thread_fence_acq(void)
+{
+
+	dmb(ld);
+}
+
+static __inline void
+atomic_thread_fence_rel(void)
+{
+
+	dmb(sy);
+}
+
+static __inline void
+atomic_thread_fence_acq_rel(void)
+{
+
+	dmb(sy);
+}
+
+static __inline void
+atomic_thread_fence_seq_cst(void)
+{
+
+	dmb(sy);
+}
+
 #define	atomic_add_rel_long		atomic_add_rel_64
 #define	atomic_clear_rel_long		atomic_clear_rel_64
 #define	atomic_cmpset_rel_long		atomic_cmpset_rel_64
diff --git a/sys/arm64/include/param.h b/sys/arm64/include/param.h
index 412e619360d1..47fd533c5901 100644
--- a/sys/arm64/include/param.h
+++ b/sys/arm64/include/param.h
@@ -82,6 +82,10 @@
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)	/* Page size */
 #define	PAGE_MASK	(PAGE_SIZE - 1)
 
+#define	PAGE_SHIFT_16K	14
+#define	PAGE_SIZE_16K	(1 << PAGE_SHIFT_16K)
+#define	PAGE_MASK_16K	(PAGE_SIZE_16K - 1)
+
 #define	PAGE_SHIFT_64K	16
 #define	PAGE_SIZE_64K	(1 << PAGE_SHIFT_64K)
 #define	PAGE_MASK_64K	(PAGE_SIZE_64K - 1)
diff --git a/sys/boot/efi/libefi/efipart.c b/sys/boot/efi/libefi/efipart.c
index 13dc0ac17edb..0831a98d69a0 100644
--- a/sys/boot/efi/libefi/efipart.c
+++ b/sys/boot/efi/libefi/efipart.c
@@ -63,13 +63,14 @@ static int
 efipart_init(void) 
 {
 	EFI_BLOCK_IO *blkio;
-	EFI_DEVICE_PATH *devpath, *node;
+	EFI_DEVICE_PATH *devpath, *devpathcpy, *tmpdevpath, *node;
 	EFI_HANDLE *hin, *hout, *aliases, handle;
 	EFI_STATUS status;
 	UINTN sz;
 	CHAR16 *path;
 	u_int n, nin, nout;
 	int err;
+	size_t devpathlen;
 
 	sz = 0;
 	hin = NULL;
@@ -98,9 +99,15 @@ efipart_init(void)
 		if (EFI_ERROR(status)) {
 			continue;
 		}
+
 		node = devpath;
-		while (!IsDevicePathEnd(NextDevicePathNode(node)))
+		devpathlen = DevicePathNodeLength(node);
+		while (!IsDevicePathEnd(NextDevicePathNode(node))) {
 			node = NextDevicePathNode(node);
+			devpathlen += DevicePathNodeLength(node);
+		}
+		devpathlen += DevicePathNodeLength(NextDevicePathNode(node));
+
 		status = BS->HandleProtocol(hin[n], &blkio_guid,
 		    (void**)&blkio);
 		if (EFI_ERROR(status))
@@ -117,10 +124,16 @@ efipart_init(void)
 		 */
 		if (DevicePathType(node) == MEDIA_DEVICE_PATH &&
 		    DevicePathSubType(node) == MEDIA_CDROM_DP) {
-			node->Type = END_DEVICE_PATH_TYPE;
-			node->SubType = END_ENTIRE_DEVICE_PATH_SUBTYPE;
-			status = BS->LocateDevicePath(&blkio_guid, &devpath,
+			devpathcpy = malloc(devpathlen);
+			memcpy(devpathcpy, devpath, devpathlen);
+			node = devpathcpy;
+			while (!IsDevicePathEnd(NextDevicePathNode(node)))
+				node = NextDevicePathNode(node);
+			SetDevicePathEndNode(node);
+			tmpdevpath = devpathcpy;
+			status = BS->LocateDevicePath(&blkio_guid, &tmpdevpath,
 			    &handle);
+			free(devpathcpy);
 			if (EFI_ERROR(status))
 				continue;
 			hout[nout] = handle;
diff --git a/lib/libc/i386/sys/reboot.S b/sys/boot/fdt/dts/arm/bananapi.dts
similarity index 58%
rename from lib/libc/i386/sys/reboot.S
rename to sys/boot/fdt/dts/arm/bananapi.dts
index f11000e52c53..6ac321a6a194 100644
--- a/lib/libc/i386/sys/reboot.S
+++ b/sys/boot/fdt/dts/arm/bananapi.dts
@@ -1,10 +1,7 @@
 /*-
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 2013 Ganbold Tsagaankhuu 
  * All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,14 +10,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -28,18 +22,58 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ * 
+ * $FreeBSD$
  */
 
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)reboot.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include 
-__FBSDID("$FreeBSD$");
+/dts-v1/;
 
-#include "SYS.h"
+/include/ "sun7i-a20.dtsi"
 
-SYSCALL(reboot)
-	iret
-END(__sys_reboot)
+/ {
+	model = "BananaPi";
 
-	.section .note.GNU-stack,"",%progbits
+	memory {
+		device_type = "memory";
+		reg = < 0x40000000 0x40000000 >;	/* 1GB RAM */
+	};
+
+	aliases {
+		soc = &SOC;
+		UART0 = &UART0;
+	};
+
+	SOC: a20 {
+
+		usb1: usb@01c14000 {
+			status = "okay";
+		};
+
+		usb2: usb@01c1c000 {
+			status = "okay";
+		};
+
+		UART0: serial@01c28000 {
+			status = "okay";
+		};
+
+		mmc0: mmc@01c0f000 {
+			status = "okay";
+		};
+
+		gmac@01c50000 {
+			phy-type = "rgmii-bpi";
+			status = "okay";
+		};
+
+		ahci: sata@01c18000 {
+			status = "okay";
+		};
+	};
+
+	chosen {
+		bootargs = "-v";
+		stdin = "UART0";
+		stdout = "UART0";
+	};
+};
diff --git a/sys/boot/fdt/dts/arm/sun7i-a20.dtsi b/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
index dfaa00e0836a..b58fc928ca7d 100644
--- a/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
+++ b/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
@@ -141,6 +141,20 @@
 			reg = <0x01c0b000 0x1000>;
 			interrupts = <55>;
 			interrupt-parent = <&GIC>;
+			status = "disabled";
+		};
+
+		gmac@01c50000 {
+			compatible = "allwinner,sun7i-a20-gmac";
+			reg = <0x01c50000 0x10000>;
+			interrupts = <85>;
+			interrupt-parent = <&GIC>;
+			snps,pbl = <2>;
+			snps,fixed-burst;
+			snps,force_sf_dma_mode;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 	};
 };
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index 6bd019613c1d..367d8c9fb6bd 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -75,6 +75,7 @@ __FBSDID("$FreeBSD$");
 struct ctlfe_softc {
 	struct ctl_port port;
 	path_id_t path_id;
+	target_id_t target_id;
 	u_int	maxio;
 	struct cam_sim *sim;
 	char port_name[DEV_IDLEN];
@@ -357,6 +358,7 @@ ctlfeasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 		}
 
 		softc->path_id = cpi->ccb_h.path_id;
+		softc->target_id = cpi->initiator_id;
 		softc->sim = xpt_path_sim(path);
 		if (cpi->maxio != 0)
 			softc->maxio = cpi->maxio;
@@ -1557,6 +1559,8 @@ ctlfe_onoffline(void *arg, int online)
 	}
 	ccb = xpt_alloc_ccb();
 	xpt_setup_ccb(&ccb->ccb_h, path, CAM_PRIORITY_NONE);
+	ccb->ccb_h.func_code = XPT_GET_SIM_KNOB;
+	xpt_action(ccb);
 
 	/*
 	 * Copan WWN format:
@@ -1570,15 +1574,7 @@ ctlfe_onoffline(void *arg, int online)
 	 *					3 == NL-Port
 	 * Bits 7-0:			0 == Node Name, >0 == Port Number
 	 */
-
 	if (online != 0) {
-
-		ccb->ccb_h.func_code = XPT_GET_SIM_KNOB;
-
-
-		xpt_action(ccb);
-
-
 		if ((ccb->knob.xport_specific.valid & KNOB_VALID_ADDRESS) != 0){
 #ifdef RANDOM_WWNN
 			uint64_t random_bits;
@@ -1677,9 +1673,9 @@ ctlfe_onoffline(void *arg, int online)
 		ccb->knob.xport_specific.valid |= KNOB_VALID_ADDRESS;
 
 	if (online != 0)
-		ccb->knob.xport_specific.fc.role = KNOB_ROLE_TARGET;
+		ccb->knob.xport_specific.fc.role |= KNOB_ROLE_TARGET;
 	else
-		ccb->knob.xport_specific.fc.role = KNOB_ROLE_NONE;
+		ccb->knob.xport_specific.fc.role &= ~KNOB_ROLE_TARGET;
 
 	xpt_action(ccb);
 
@@ -1809,7 +1805,7 @@ ctlfe_lun_enable(void *arg, int lun_id)
 	bus_softc = (struct ctlfe_softc *)arg;
 
 	status = xpt_create_path(&path, /*periph*/ NULL,
-				  bus_softc->path_id, 0, lun_id);
+				  bus_softc->path_id, bus_softc->target_id, lun_id);
 	/* XXX KDM need some way to return status to CTL here? */
 	if (status != CAM_REQ_CMP) {
 		printf("%s: could not create path, status %#x\n", __func__,
diff --git a/sys/cddl/compat/opensolaris/sys/file.h b/sys/cddl/compat/opensolaris/sys/file.h
index f9349fdd2f8e..f392d9e9154a 100644
--- a/sys/cddl/compat/opensolaris/sys/file.h
+++ b/sys/cddl/compat/opensolaris/sys/file.h
@@ -52,9 +52,10 @@ static __inline void
 releasef(int fd)
 {
 	struct file *fp;
+	cap_rights_t rights;
 
 	/* No CAP_ rights required, as we're only releasing. */
-	if (fget(curthread, fd, NULL, &fp) == 0) {
+	if (fget(curthread, fd, cap_rights_init(&rights), &fp) == 0) {
 		fdrop(fp, curthread);
 		fdrop(fp, curthread);
 	}
diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index 05d335adf468..84ade7b275d6 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -139,13 +139,14 @@ translate_fd_major_minor(struct thread *td, int fd, struct stat *buf)
 {
 	struct file *fp;
 	struct vnode *vp;
+	cap_rights_t rights;
 	int major, minor;
 
 	/*
 	 * No capability rights required here.
 	 */
 	if ((!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) ||
-	    fget(td, fd, 0, &fp) != 0)
+	    fget(td, fd, cap_rights_init(&rights), &fp) != 0)
 		return;
 	vp = fp->f_vnode;
 	if (vp != NULL && vp->v_rdev != NULL &&
diff --git a/sys/conf/files b/sys/conf/files
index 65ad1026f911..c101c3869f01 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3902,17 +3902,17 @@ ofed/drivers/infiniband/hw/mthca/mthca_uar.c		optional mthca	\
 
 # crypto support
 opencrypto/cast.c		optional crypto | ipsec
-opencrypto/criov.c		optional crypto
-opencrypto/crypto.c		optional crypto
+opencrypto/criov.c		optional crypto | ipsec
+opencrypto/crypto.c		optional crypto | ipsec
 opencrypto/cryptodev.c		optional cryptodev
-opencrypto/cryptodev_if.m	optional crypto
-opencrypto/cryptosoft.c		optional crypto
-opencrypto/cryptodeflate.c	optional crypto
-opencrypto/gmac.c		optional crypto
-opencrypto/gfmult.c		optional crypto
+opencrypto/cryptodev_if.m	optional crypto | ipsec
+opencrypto/cryptosoft.c		optional crypto | ipsec
+opencrypto/cryptodeflate.c	optional crypto | ipsec
+opencrypto/gmac.c		optional crypto | ipsec
+opencrypto/gfmult.c		optional crypto | ipsec
 opencrypto/rmd160.c		optional crypto | ipsec
-opencrypto/skipjack.c		optional crypto
-opencrypto/xform.c		optional crypto
+opencrypto/skipjack.c		optional crypto | ipsec
+opencrypto/xform.c		optional crypto | ipsec
 rpc/auth_none.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/auth_unix.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/authunix_prot.c		optional krpc | nfslockd | nfscl | nfsd
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 1b255540d93e..d4301ac4575d 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -27,6 +27,7 @@ arm64/arm64/gic_acpi.c		optional	acpi
 arm64/arm64/gic_fdt.c		optional	fdt
 arm64/arm64/gic_v3.c		standard
 arm64/arm64/gic_v3_fdt.c	optional	fdt
+arm64/arm64/gic_v3_its.c	standard
 arm64/arm64/identcpu.c		standard
 arm64/arm64/intr_machdep.c	standard
 arm64/arm64/in_cksum.c		optional	inet | inet6
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 167fa4236310..f44ba74e7b89 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -99,7 +99,6 @@ libkern/qdivrem.c		optional	powerpc
 libkern/ucmpdi2.c		optional	powerpc
 libkern/udivdi3.c		optional	powerpc
 libkern/umoddi3.c		optional	powerpc
-powerpc/aim/interrupt.c		optional	aim
 powerpc/aim/locore.S		optional	aim no-obj
 powerpc/aim/aim_machdep.c	optional	aim
 powerpc/aim/mmu_oea.c		optional	aim powerpc
@@ -108,7 +107,6 @@ powerpc/aim/moea64_if.m		optional	aim
 powerpc/aim/moea64_native.c	optional	aim
 powerpc/aim/mp_cpudep.c		optional	aim
 powerpc/aim/slb.c		optional	aim powerpc64
-powerpc/booke/interrupt.c	optional	booke
 powerpc/booke/locore.S		optional	booke no-obj
 powerpc/booke/booke_machdep.c	optional	booke
 powerpc/booke/machdep_e500.c	optional	booke_e500
@@ -197,6 +195,7 @@ powerpc/powerpc/fpu.c		standard
 powerpc/powerpc/fuswintr.c	standard
 powerpc/powerpc/gdb_machdep.c	optional	gdb
 powerpc/powerpc/in_cksum.c	optional	inet | inet6
+powerpc/powerpc/interrupt.c	standard
 powerpc/powerpc/intr_machdep.c	standard
 powerpc/powerpc/iommu_if.m	standard
 powerpc/powerpc/machdep.c	standard
diff --git a/sys/crypto/aesni/aesencdec.h b/sys/crypto/aesni/aesencdec.h
index 76e640356a80..80951a48aad4 100644
--- a/sys/crypto/aesni/aesencdec.h
+++ b/sys/crypto/aesni/aesencdec.h
@@ -1,5 +1,6 @@
 /*-
  * Copyright 2013 John-Mark Gurney 
+ * Copyright 2015 Netflix, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,6 +28,9 @@
  *
  */
 
+#ifndef _AESENCDEC_H_
+#define _AESENCDEC_H_
+
 #include 
 
 #include 
@@ -105,6 +109,7 @@ aesni_dec8(int rounds, const __m128i *keysched, __m128i a,
 	out[7] = _mm_aesdeclast_si128(h, keysched[i + 1]);
 }
 
+/* rounds is passed in as rounds - 1 */
 static inline __m128i
 aesni_enc(int rounds, const __m128i *keysched, const __m128i from)
 {
@@ -112,11 +117,13 @@ aesni_enc(int rounds, const __m128i *keysched, const __m128i from)
 	int i;
 
 	tmp = from ^ keysched[0];
-
-	for (i = 0; i < rounds; i++)
+	for (i = 1; i < rounds; i += 2) {
+		tmp = _mm_aesenc_si128(tmp, keysched[i]);
 		tmp = _mm_aesenc_si128(tmp, keysched[i + 1]);
+	}
 
-	return _mm_aesenclast_si128(tmp, keysched[i + 1]);
+	tmp = _mm_aesenc_si128(tmp, keysched[rounds]);
+	return _mm_aesenclast_si128(tmp, keysched[rounds + 1]);
 }
 
 static inline __m128i
@@ -127,8 +134,13 @@ aesni_dec(int rounds, const __m128i *keysched, const __m128i from)
 
 	tmp = from ^ keysched[0];
 
-	for (i = 0; i < rounds; i++)
+	for (i = 1; i < rounds; i += 2) {
+		tmp = _mm_aesdec_si128(tmp, keysched[i]);
 		tmp = _mm_aesdec_si128(tmp, keysched[i + 1]);
+	}
 
-	return _mm_aesdeclast_si128(tmp, keysched[i + 1]);
+	tmp = _mm_aesdec_si128(tmp, keysched[rounds]);
+	return _mm_aesdeclast_si128(tmp, keysched[rounds + 1]);
 }
+
+#endif /* _AESENCDEC_H_ */
diff --git a/sys/crypto/aesni/aesni.c b/sys/crypto/aesni/aesni.c
index 25357509c739..7f143cb0e745 100644
--- a/sys/crypto/aesni/aesni.c
+++ b/sys/crypto/aesni/aesni.c
@@ -206,8 +206,7 @@ aesni_newsession(device_t dev, uint32_t *sidp, struct cryptoini *cri)
 			rw_wunlock(&sc->lock);
 			return (ENOMEM);
 		}
-		ses->fpu_ctx = fpu_kern_alloc_ctx(FPU_KERN_NORMAL |
-		    FPU_KERN_NOWAIT);
+		ses->fpu_ctx = fpu_kern_alloc_ctx(FPU_KERN_NOWAIT);
 		if (ses->fpu_ctx == NULL) {
 			free(ses, M_AESNI);
 			rw_wunlock(&sc->lock);
@@ -451,6 +450,7 @@ static int
 aesni_cipher_process(struct aesni_session *ses, struct cryptodesc *enccrd,
     struct cryptodesc *authcrd, struct cryptop *crp)
 {
+	uint8_t iv[AES_BLOCK_LEN];
 	uint8_t tag[GMAC_DIGEST_LEN];
 	struct thread *td;
 	uint8_t *buf, *authbuf;
@@ -505,15 +505,23 @@ aesni_cipher_process(struct aesni_session *ses, struct cryptodesc *enccrd,
 		break;
 	}
 
-	/* Setup ses->iv */
-	bzero(ses->iv, sizeof ses->iv);
-	if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0)
-		bcopy(enccrd->crd_iv, ses->iv, ivlen);
-	else if (encflag && ((enccrd->crd_flags & CRD_F_IV_PRESENT) != 0))
-		arc4rand(ses->iv, ivlen, 0);
-	else
-		crypto_copydata(crp->crp_flags, crp->crp_buf,
-		    enccrd->crd_inject, ivlen, ses->iv);
+	/* Setup iv */
+	if (encflag) {
+		if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0)
+			bcopy(enccrd->crd_iv, iv, ivlen);
+		else
+			arc4rand(iv, ivlen, 0);
+		
+		if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0)
+			crypto_copyback(crp->crp_flags, crp->crp_buf,
+			    enccrd->crd_inject, ivlen, iv);
+	} else {
+		if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0)
+			bcopy(enccrd->crd_iv, iv, ivlen);
+		else
+			crypto_copydata(crp->crp_flags, crp->crp_buf,
+			    enccrd->crd_inject, ivlen, iv);
+	}
 
 	if (authcrd != NULL && !encflag)
 		crypto_copydata(crp->crp_flags, crp->crp_buf,
@@ -526,33 +534,33 @@ aesni_cipher_process(struct aesni_session *ses, struct cryptodesc *enccrd,
 	case CRYPTO_AES_CBC:
 		if (encflag)
 			aesni_encrypt_cbc(ses->rounds, ses->enc_schedule,
-			    enccrd->crd_len, buf, buf, ses->iv);
+			    enccrd->crd_len, buf, buf, iv);
 		else
 			aesni_decrypt_cbc(ses->rounds, ses->dec_schedule,
-			    enccrd->crd_len, buf, ses->iv);
+			    enccrd->crd_len, buf, iv);
 		break;
 	case CRYPTO_AES_ICM:
 		/* encryption & decryption are the same */
 		aesni_encrypt_icm(ses->rounds, ses->enc_schedule,
-		    enccrd->crd_len, buf, buf, ses->iv);
+		    enccrd->crd_len, buf, buf, iv);
 		break;
 	case CRYPTO_AES_XTS:
 		if (encflag)
 			aesni_encrypt_xts(ses->rounds, ses->enc_schedule,
 			    ses->xts_schedule, enccrd->crd_len, buf, buf,
-			    ses->iv);
+			    iv);
 		else
 			aesni_decrypt_xts(ses->rounds, ses->dec_schedule,
 			    ses->xts_schedule, enccrd->crd_len, buf, buf,
-			    ses->iv);
+			    iv);
 		break;
 	case CRYPTO_AES_NIST_GCM_16:
 		if (encflag)
-			AES_GCM_encrypt(buf, buf, authbuf, ses->iv, tag,
+			AES_GCM_encrypt(buf, buf, authbuf, iv, tag,
 			    enccrd->crd_len, authcrd->crd_len, ivlen,
 			    ses->enc_schedule, ses->rounds);
 		else {
-			if (!AES_GCM_decrypt(buf, buf, authbuf, ses->iv, tag,
+			if (!AES_GCM_decrypt(buf, buf, authbuf, iv, tag,
 			    enccrd->crd_len, authcrd->crd_len, ivlen,
 			    ses->enc_schedule, ses->rounds))
 				error = EBADMSG;
@@ -564,13 +572,6 @@ aesni_cipher_process(struct aesni_session *ses, struct cryptodesc *enccrd,
 		crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_skip,
 		    enccrd->crd_len, buf);
 
-	/*
-	 * OpenBSD doesn't copy this back.  This primes the IV for the next
-	 * chain.  Why do we not do it for decrypt?
-	 */
-	if (encflag && enccrd->crd_alg == CRYPTO_AES_CBC)
-		bcopy(buf + enccrd->crd_len - AES_BLOCK_LEN, ses->iv, AES_BLOCK_LEN);
-
 	if (!error && authcrd != NULL) {
 		crypto_copyback(crp->crp_flags, crp->crp_buf,
 		    authcrd->crd_inject, GMAC_DIGEST_LEN, tag);
diff --git a/sys/crypto/aesni/aesni.h b/sys/crypto/aesni/aesni.h
index 5cd89252b859..2210f7f391ea 100644
--- a/sys/crypto/aesni/aesni.h
+++ b/sys/crypto/aesni/aesni.h
@@ -56,7 +56,6 @@ struct aesni_session {
 	uint8_t enc_schedule[AES_SCHED_LEN] __aligned(16);
 	uint8_t dec_schedule[AES_SCHED_LEN] __aligned(16);
 	uint8_t xts_schedule[AES_SCHED_LEN] __aligned(16);
-	uint8_t iv[AES_BLOCK_LEN];
 	int algo;
 	int rounds;
 	/* uint8_t *ses_ictx; */
diff --git a/sys/dev/ahci/ahci.h b/sys/dev/ahci/ahci.h
index 2e9b9b049105..ac81737cfdda 100644
--- a/sys/dev/ahci/ahci.h
+++ b/sys/dev/ahci/ahci.h
@@ -600,8 +600,8 @@ enum ahci_err_type {
 	"\020SATA1_UNIT0"	\
 	"\021ABAR0"		\
 	"\0221MSI"              \
-	"\022FORCE_PI"          \
-	"\023RESTORE_CAP"
+	"\023FORCE_PI"          \
+	"\024RESTORE_CAP"
 
 int ahci_attach(device_t dev);
 int ahci_detach(device_t dev);
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index c1782971424b..0ec89e819b39 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -1052,7 +1052,7 @@ void t4_update_fl_bufsize(struct ifnet *);
 int parse_pkt(struct mbuf **);
 void *start_wrq_wr(struct sge_wrq *, int, struct wrq_cookie *);
 void commit_wrq_wr(struct sge_wrq *, void *, struct wrq_cookie *);
-int tnl_cong(struct port_info *);
+int tnl_cong(struct port_info *, int);
 
 /* t4_tracer.c */
 struct t4_tracer;
diff --git a/sys/dev/cxgbe/t4_netmap.c b/sys/dev/cxgbe/t4_netmap.c
index 9c70c95070e9..f54a67fe94c0 100644
--- a/sys/dev/cxgbe/t4_netmap.c
+++ b/sys/dev/cxgbe/t4_netmap.c
@@ -77,6 +77,15 @@ int holdoff_tmr_idx = 2;
 SYSCTL_INT(_hw_cxgbe, OID_AUTO, nm_holdoff_tmr_idx, CTLFLAG_RWTUN,
     &holdoff_tmr_idx, 0, "Holdoff timer index for netmap rx queues.");
 
+/*
+ * Congestion drops.
+ * -1: no congestion feedback (not recommended).
+ *  0: backpressure the channel instead of dropping packets right away.
+ *  1: no backpressure, drop packets for the congested queue immediately.
+ */
+static int nm_cong_drop = 1;
+TUNABLE_INT("hw.cxgbe.nm_cong_drop", &nm_cong_drop);
+
 /* netmap ifnet routines */
 static void cxgbe_nm_init(void *);
 static int cxgbe_nm_ioctl(struct ifnet *, unsigned long, caddr_t);
@@ -503,7 +512,7 @@ cxgbe_netmap_on(struct adapter *sc, struct port_info *pi, struct ifnet *ifp,
 	nm_set_native_flags(na);
 
 	for_each_nm_rxq(pi, i, nm_rxq) {
-		alloc_nm_rxq_hwq(pi, nm_rxq, tnl_cong(pi));
+		alloc_nm_rxq_hwq(pi, nm_rxq, tnl_cong(pi, nm_cong_drop));
 		nm_rxq->fl_hwidx = hwidx;
 		slot = netmap_reset(na, NR_RX, i, 0);
 		MPASS(slot != NULL);	/* XXXNM: error check, not assert */
diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c
index 1054fb166595..ea0bd7a1e145 100644
--- a/sys/dev/cxgbe/t4_sge.c
+++ b/sys/dev/cxgbe/t4_sge.c
@@ -472,12 +472,6 @@ t4_tweak_chip_settings(struct adapter *sc)
 	    V_TIMERVALUE5(us_to_core_ticks(sc, intr_timer[5]));
 	t4_write_reg(sc, A_SGE_TIMER_VALUE_4_AND_5, v);
 
-	if (cong_drop == 0) {
-		m = F_TUNNELCNGDROP0 | F_TUNNELCNGDROP1 | F_TUNNELCNGDROP2 |
-		    F_TUNNELCNGDROP3;
-		t4_set_reg_field(sc, A_TP_PARA_REG3, m, 0);
-	}
-
 	/* 4K, 16K, 64K, 256K DDP "page sizes" */
 	v = V_HPZ0(0) | V_HPZ1(2) | V_HPZ2(4) | V_HPZ3(6);
 	t4_write_reg(sc, A_ULP_RX_TDDP_PSZ, v);
@@ -685,17 +679,6 @@ t4_read_chip_settings(struct adapter *sc)
 	s->timer_val[4] = G_TIMERVALUE4(r) / core_ticks_per_usec(sc);
 	s->timer_val[5] = G_TIMERVALUE5(r) / core_ticks_per_usec(sc);
 
-	if (cong_drop == 0) {
-		m = F_TUNNELCNGDROP0 | F_TUNNELCNGDROP1 | F_TUNNELCNGDROP2 |
-		    F_TUNNELCNGDROP3;
-		r = t4_read_reg(sc, A_TP_PARA_REG3);
-		if (r & m) {
-			device_printf(sc->dev,
-			    "invalid TP_PARA_REG3(0x%x)\n", r);
-			rc = EINVAL;
-		}
-	}
-
 	v = V_HPZ0(0) | V_HPZ1(2) | V_HPZ2(4) | V_HPZ3(6);
 	r = t4_read_reg(sc, A_ULP_RX_TDDP_PSZ);
 	if (r != v) {
@@ -2920,12 +2903,12 @@ free_mgmtq(struct adapter *sc)
 }
 
 int
-tnl_cong(struct port_info *pi)
+tnl_cong(struct port_info *pi, int drop)
 {
 
-	if (cong_drop == -1)
+	if (drop == -1)
 		return (-1);
-	else if (cong_drop == 1)
+	else if (drop == 1)
 		return (0);
 	else
 		return (pi->rx_chan_map);
@@ -2939,7 +2922,8 @@ alloc_rxq(struct port_info *pi, struct sge_rxq *rxq, int intr_idx, int idx,
 	struct sysctl_oid_list *children;
 	char name[16];
 
-	rc = alloc_iq_fl(pi, &rxq->iq, &rxq->fl, intr_idx, tnl_cong(pi));
+	rc = alloc_iq_fl(pi, &rxq->iq, &rxq->fl, intr_idx,
+	    tnl_cong(pi, cong_drop));
 	if (rc != 0)
 		return (rc);
 
diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c
index 7ca16ace8e09..939ce541a5b5 100644
--- a/sys/dev/dwc/if_dwc.c
+++ b/sys/dev/dwc/if_dwc.c
@@ -89,21 +89,21 @@ __FBSDID("$FreeBSD$");
 
 #define	DWC_LOCK(sc)			mtx_lock(&(sc)->mtx)
 #define	DWC_UNLOCK(sc)			mtx_unlock(&(sc)->mtx)
-#define	DWC_ASSERT_LOCKED(sc)		mtx_assert(&(sc)->mtx, MA_OWNED);
-#define	DWC_ASSERT_UNLOCKED(sc)		mtx_assert(&(sc)->mtx, MA_NOTOWNED);
+#define	DWC_ASSERT_LOCKED(sc)		mtx_assert(&(sc)->mtx, MA_OWNED)
+#define	DWC_ASSERT_UNLOCKED(sc)		mtx_assert(&(sc)->mtx, MA_NOTOWNED)
 
-#define	DDESC_TDES0_OWN			(1 << 31)
-#define	DDESC_TDES0_TXINT		(1 << 30)
-#define	DDESC_TDES0_TXLAST		(1 << 29)
-#define	DDESC_TDES0_TXFIRST		(1 << 28)
-#define	DDESC_TDES0_TXCRCDIS		(1 << 27)
-#define	DDESC_TDES0_TXRINGEND		(1 << 21)
-#define	DDESC_TDES0_TXCHAIN		(1 << 20)
+#define	DDESC_TDES0_OWN			(1U << 31)
+#define	DDESC_TDES0_TXINT		(1U << 30)
+#define	DDESC_TDES0_TXLAST		(1U << 29)
+#define	DDESC_TDES0_TXFIRST		(1U << 28)
+#define	DDESC_TDES0_TXCRCDIS		(1U << 27)
+#define	DDESC_TDES0_TXRINGEND		(1U << 21)
+#define	DDESC_TDES0_TXCHAIN		(1U << 20)
 
-#define	DDESC_RDES0_OWN			(1 << 31)
+#define	DDESC_RDES0_OWN			(1U << 31)
 #define	DDESC_RDES0_FL_MASK		0x3fff
 #define	DDESC_RDES0_FL_SHIFT		16	/* Frame Length */
-#define	DDESC_RDES1_CHAINED		(1 << 14)
+#define	DDESC_RDES1_CHAINED		(1U << 14)
 
 struct dwc_bufmap {
 	bus_dmamap_t	map;
@@ -149,8 +149,6 @@ struct dwc_softc {
 	struct mtx		mtx;
 	void *			intr_cookie;
 	struct callout		dwc_callout;
-	uint8_t			phy_conn_type;
-	uint8_t			mactype;
 	boolean_t		link_is_up;
 	boolean_t		is_attached;
 	boolean_t		is_detaching;
@@ -331,7 +329,7 @@ static void
 dwc_stop_locked(struct dwc_softc *sc)
 {
 	struct ifnet *ifp;
-	int reg;
+	uint32_t reg;
 
 	DWC_ASSERT_LOCKED(sc);
 
@@ -365,7 +363,7 @@ dwc_stop_locked(struct dwc_softc *sc)
 
 static void dwc_clear_stats(struct dwc_softc *sc)
 {
-	int reg;
+	uint32_t reg;
 
 	reg = READ4(sc, MMC_CONTROL);
 	reg |= (MMC_CONTROL_CNTRST);
@@ -448,7 +446,7 @@ static void
 dwc_init_locked(struct dwc_softc *sc)
 {
 	struct ifnet *ifp = sc->ifp;
-	int reg;
+	uint32_t reg;
 
 	DWC_ASSERT_LOCKED(sc);
 
@@ -618,15 +616,8 @@ dwc_setup_rxfilter(struct dwc_softc *sc)
 {
 	struct ifmultiaddr *ifma;
 	struct ifnet *ifp;
-	uint8_t *eaddr;
-	uint32_t crc;
-	uint8_t val;
-	int hashbit;
-	int hashreg;
-	int ffval;
-	int reg;
-	int lo;
-	int hi;
+	uint8_t *eaddr, val;
+	uint32_t crc, ffval, hashbit, hashreg, hi, lo, reg;
 
 	DWC_ASSERT_LOCKED(sc);
 
@@ -759,6 +750,7 @@ dwc_txfinish_locked(struct dwc_softc *sc)
 		dwc_setup_txdesc(sc, sc->tx_idx_tail, 0, 0);
 		sc->tx_idx_tail = next_txidx(sc, sc->tx_idx_tail);
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	}
 
 	/* If there are no buffers outstanding, muzzle the watchdog. */
@@ -773,10 +765,8 @@ dwc_rxfinish_locked(struct dwc_softc *sc)
 	struct ifnet *ifp;
 	struct mbuf *m0;
 	struct mbuf *m;
-	int error;
-	int rdes0;
-	int idx;
-	int len;
+	int error, idx, len;
+	uint32_t rdes0;
 
 	ifp = sc->ifp;
 
@@ -908,10 +898,8 @@ setup_dma(struct dwc_softc *sc)
 	}
 
 	for (idx = 0; idx < TX_DESC_COUNT; idx++) {
-		sc->txdesc_ring[idx].tdes0 = DDESC_TDES0_TXCHAIN;
-		sc->txdesc_ring[idx].tdes1 = 0;
 		nidx = next_txidx(sc, idx);
-		sc->txdesc_ring[idx].addr_next = sc->txdesc_ring_paddr + \
+		sc->txdesc_ring[idx].addr_next = sc->txdesc_ring_paddr +
 		    (nidx * sizeof(struct dwc_hwdesc));
 	}
 
@@ -1028,9 +1016,7 @@ setup_dma(struct dwc_softc *sc)
 static int
 dwc_get_hwaddr(struct dwc_softc *sc, uint8_t *hwaddr)
 {
-	int rnd;
-	int lo;
-	int hi;
+	uint32_t hi, lo, rnd;
 
 	/*
 	 * Try to recover a MAC address from the running hardware. If there's
@@ -1083,9 +1069,8 @@ dwc_attach(device_t dev)
 	uint8_t macaddr[ETHER_ADDR_LEN];
 	struct dwc_softc *sc;
 	struct ifnet *ifp;
-	int error;
-	int reg;
-	int i;
+	int error, i;
+	uint32_t reg;
 
 	sc = device_get_softc(dev);
 	sc->dev = dev;
@@ -1250,7 +1235,7 @@ dwc_miibus_statchg(device_t dev)
 {
 	struct dwc_softc *sc;
 	struct mii_data *mii;
-	int reg;
+	uint32_t reg;
 
 	/*
 	 * Called by the MII bus driver when the PHY establishes
diff --git a/sys/dev/dwc/if_dwc.h b/sys/dev/dwc/if_dwc.h
index 918ef0085edf..f6179bfa6849 100644
--- a/sys/dev/dwc/if_dwc.h
+++ b/sys/dev/dwc/if_dwc.h
@@ -44,7 +44,7 @@
 #define	 CONF_TE		(1 << 3)
 #define	 CONF_RE		(1 << 2)
 #define	MAC_FRAME_FILTER	0x4
-#define	 FRAME_FILTER_RA	(1 << 31)	/* Receive All */
+#define	 FRAME_FILTER_RA	(1U << 31)	/* Receive All */
 #define	 FRAME_FILTER_HPF	(1 << 10)	/* Hash or Perfect Filter */
 #define	 FRAME_FILTER_PM	(1 << 4)	/* Pass multicast */
 #define	 FRAME_FILTER_HMC	(1 << 2)
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index dd203a46fade..0e600d1a7b60 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -2233,9 +2233,6 @@ isp_del_all_init_entries(ispsoftc_t *isp, int chan)
 		lp = &fcp->portdb[i];
 		if (lp->state == FC_PORTDB_STATE_NIL || lp->target_mode)
 			continue;
-		/*
-		 * It's up to the outer layers to clear isp_dev_map.
-		 */
 		lp->state = FC_PORTDB_STATE_NIL;
 		isp_async(isp, ISPASYNC_DEV_GONE, chan, lp, 1);
 		if (lp->autologin == 0) {
@@ -3007,9 +3004,6 @@ isp_pdb_sync(ispsoftc_t *isp, int chan)
 		switch (lp->state) {
 		case FC_PORTDB_STATE_PROBATIONAL:
 		case FC_PORTDB_STATE_DEAD:
-			/*
-			 * It's up to the outer layers to clear isp_dev_map.
-			 */
 			lp->state = FC_PORTDB_STATE_NIL;
 			isp_async(isp, ISPASYNC_DEV_GONE, chan, lp, 0);
 			if (lp->autologin == 0) {
@@ -3029,10 +3023,6 @@ isp_pdb_sync(ispsoftc_t *isp, int chan)
 			 */
 			break;
 		case FC_PORTDB_STATE_NEW:
-			/*
-			 * It's up to the outer layers to assign a virtual
-			 * target id in isp_dev_map (if any).
-			 */
 			lp->portid = lp->new_portid;
 			lp->prli_word3 = lp->new_prli_word3;
 			lp->state = FC_PORTDB_STATE_VALID;
@@ -3054,10 +3044,6 @@ isp_pdb_sync(ispsoftc_t *isp, int chan)
 		case FC_PORTDB_STATE_PENDING_VALID:
 			lp->portid = lp->new_portid;
 			lp->prli_word3 = lp->new_prli_word3;
-			if (lp->dev_map_idx) {
-				int t = lp->dev_map_idx - 1;
-				fcp->isp_dev_map[t] = dbidx + 1;
-			}
 			lp->state = FC_PORTDB_STATE_VALID;
 			isp_async(isp, ISPASYNC_DEV_STAYED, chan, lp);
 			if (dbidx != FL_ID) {
@@ -4354,7 +4340,8 @@ isp_start(XS_T *xs)
 	ispreq_t *reqp;
 	void *cdbp, *qep;
 	uint16_t *tptr;
-	int target, dmaresult, hdlidx = 0;
+	fcportdb_t *lp;
+	int target, dmaresult;
 
 	XS_INITERR(xs);
 	isp = XS_ISP(xs);
@@ -4403,29 +4390,23 @@ isp_start(XS_T *xs)
 			return (CMD_RQLATER);
 		}
 
-		if (XS_TGT(xs) >= MAX_FC_TARG) {
-			isp_prt(isp, ISP_LOG_WARN1, "%d.%d.%d target too big", XS_CHANNEL(xs), target, XS_LUN(xs));
+		isp_prt(isp, ISP_LOGDEBUG2, "XS_TGT(xs)=%d", target);
+		lp = &fcp->portdb[target];
+		if (target < 0 || target >= MAX_FC_TARG ||
+		    lp->dev_map_idx == 0) {
 			XS_SETERR(xs, HBA_SELTIMEOUT);
 			return (CMD_COMPLETE);
 		}
-
-		hdlidx = fcp->isp_dev_map[XS_TGT(xs)] - 1;
-		isp_prt(isp, ISP_LOGDEBUG2, "XS_TGT(xs)=%d- hdlidx value %d", XS_TGT(xs), hdlidx);
-		if (hdlidx < 0 || hdlidx >= MAX_FC_TARG) {
-			XS_SETERR(xs, HBA_SELTIMEOUT);
-			return (CMD_COMPLETE);
-		}
-		if (fcp->portdb[hdlidx].state == FC_PORTDB_STATE_ZOMBIE) {
+		if (lp->state == FC_PORTDB_STATE_ZOMBIE) {
 			isp_prt(isp, ISP_LOGDEBUG1, "%d.%d.%d target zombie", XS_CHANNEL(xs), target, XS_LUN(xs));
 			return (CMD_RQLATER);
 		}
-		if (fcp->portdb[hdlidx].state != FC_PORTDB_STATE_VALID) {
-			isp_prt(isp, ISP_LOGDEBUG1, "%d.%d.%d bad db port state 0x%x", XS_CHANNEL(xs), target, XS_LUN(xs), fcp->portdb[hdlidx].state);
+		if (lp->state != FC_PORTDB_STATE_VALID) {
+			isp_prt(isp, ISP_LOGDEBUG1, "%d.%d.%d bad db port state 0x%x", XS_CHANNEL(xs), target, XS_LUN(xs), lp->state);
 			XS_SETERR(xs, HBA_SELTIMEOUT);
 			return (CMD_COMPLETE);
 		}
-		target = fcp->portdb[hdlidx].handle;
-		fcp->portdb[hdlidx].dirty = 1;
+		lp->dirty = 1;
 	} else {
 		sdparam *sdp = SDPARAM(isp, XS_CHANNEL(xs));
 		if ((sdp->role & ISP_ROLE_INITIATOR) == 0) {
@@ -4567,7 +4548,6 @@ isp_start(XS_T *xs)
 		reqp->req_cdblen = cdblen;
 	} else if (IS_24XX(isp)) {
 		ispreqt7_t *t7 = (ispreqt7_t *)local;
-		fcportdb_t *lp;
 
 		if (cdblen > sizeof (t7->req_cdb)) {
 			isp_prt(isp, ISP_LOGERR, "Command Length %u too long for this chip", cdblen);
@@ -4575,8 +4555,7 @@ isp_start(XS_T *xs)
 			return (CMD_COMPLETE);
 		}
 
-		lp = &FCPARAM(isp, XS_CHANNEL(xs))->portdb[hdlidx];
-		t7->req_nphdl = target;
+		t7->req_nphdl = lp->handle;
 		t7->req_tidlo = lp->portid;
 		t7->req_tidhi = lp->portid >> 16;
 		t7->req_vpidx = ISP_GET_VPIDX(isp, XS_CHANNEL(xs));
@@ -4596,14 +4575,12 @@ isp_start(XS_T *xs)
 		cdbp = t7->req_cdb;
 	} else {
 		ispreqt2_t *t2 = (ispreqt2_t *)local;
-		fcportdb_t *lp;
 
 		if (cdblen > sizeof t2->req_cdb) {
 			isp_prt(isp, ISP_LOGERR, "Command Length %u too long for this chip", cdblen);
 			XS_SETERR(xs, HBA_BOTCH);
 			return (CMD_COMPLETE);
 		}
-		lp = &FCPARAM(isp, XS_CHANNEL(xs))->portdb[hdlidx];
 		if (FCPARAM(isp, XS_CHANNEL(xs))->fctape_enabled && (lp->prli_word3 & PRLI_WD3_RETRY)) {
 			if (FCP_NEXT_CRN(isp, &t2->req_crn, xs)) {
 				isp_prt(isp, ISP_LOG_WARN1, "%d.%d.%d cannot generate next CRN", XS_CHANNEL(xs), target, XS_LUN(xs));
@@ -4613,16 +4590,16 @@ isp_start(XS_T *xs)
 		}
 		if (ISP_CAP_2KLOGIN(isp)) {
 			ispreqt2e_t *t2e = (ispreqt2e_t *)local;
-			t2e->req_target = target;
+			t2e->req_target = lp->handle;
 			t2e->req_scclun = XS_LUN(xs);
 			cdbp = t2e->req_cdb;
 		} else if (ISP_CAP_SCCFW(isp)) {
 			ispreqt2_t *t2 = (ispreqt2_t *)local;
-			t2->req_target = target;
+			t2->req_target = lp->handle;
 			t2->req_scclun = XS_LUN(xs);
 			cdbp = t2->req_cdb;
 		} else {
-			t2->req_target = target;
+			t2->req_target = lp->handle;
 			t2->req_lun_trn = XS_LUN(xs);
 			cdbp = t2->req_cdb;
 		}
@@ -4720,16 +4697,15 @@ isp_control(ispsoftc_t *isp, ispctl_t ctl, ...)
 			isp24xx_statusreq_t *sp;
 			fcparam *fcp = FCPARAM(isp, chan);
 			fcportdb_t *lp;
-			int hdlidx;
 
-			hdlidx = fcp->isp_dev_map[tgt] - 1;
-			if (hdlidx < 0 || hdlidx >= MAX_FC_TARG) {
-				isp_prt(isp, ISP_LOGWARN, "Chan %d bad handle %d trying to reset target %d", chan, hdlidx, tgt);
+			if (tgt < 0 || tgt >= MAX_FC_TARG) {
+				isp_prt(isp, ISP_LOGWARN, "Chan %d trying to reset bad target %d", chan, tgt);
 				break;
 			}
-			lp = &fcp->portdb[hdlidx];
-			if (lp->state != FC_PORTDB_STATE_VALID) {
-				isp_prt(isp, ISP_LOGWARN, "Chan %d handle %d for abort of target %d no longer valid", chan, hdlidx, tgt);
+			lp = &fcp->portdb[tgt];
+			if (lp->dev_map_idx == 0 ||
+			    lp->state != FC_PORTDB_STATE_VALID) {
+				isp_prt(isp, ISP_LOGWARN, "Chan %d abort of no longer valid target %d", chan, tgt);
 				break;
 			}
 
@@ -4810,17 +4786,16 @@ isp_control(ispsoftc_t *isp, ispctl_t ctl, ...)
 			isp24xx_abrt_t local, *ab = &local, *ab2;
 			fcparam *fcp;
 			fcportdb_t *lp;
-			int hdlidx;
 
 			fcp = FCPARAM(isp, chan);
-			hdlidx = fcp->isp_dev_map[tgt] - 1;
-			if (hdlidx < 0 || hdlidx >= MAX_FC_TARG) {
-				isp_prt(isp, ISP_LOGWARN, "Chan %d bad handle %d trying to abort target %d", chan, hdlidx, tgt);
+			if (tgt < 0 || tgt >= MAX_FC_TARG) {
+				isp_prt(isp, ISP_LOGWARN, "Chan %d trying to abort bad target %d", chan, tgt);
 				break;
 			}
-			lp = &fcp->portdb[hdlidx];
-			if (lp->state != FC_PORTDB_STATE_VALID) {
-				isp_prt(isp, ISP_LOGWARN, "Chan %d handle %d for abort of target %d no longer valid", chan, hdlidx, tgt);
+			lp = &fcp->portdb[tgt];
+			if (lp->dev_map_idx == 0 ||
+			    lp->state != FC_PORTDB_STATE_VALID) {
+				isp_prt(isp, ISP_LOGWARN, "Chan %d abort of no longer valid target %d", chan, tgt);
 				break;
 			}
 			isp_prt(isp, ISP_LOGALL, "Chan %d Abort Cmd for N-Port 0x%04x @ Port 0x%06x", chan, lp->handle, lp->portid);
@@ -4860,7 +4835,7 @@ isp_control(ispsoftc_t *isp, ispctl_t ctl, ...)
 			if (ab->abrt_nphdl == ISP24XX_ABRT_OKAY) {
 				return (0);
 			}
-			isp_prt(isp, ISP_LOGWARN, "Chan %d handle %d abort returned 0x%x", chan, hdlidx, ab->abrt_nphdl);
+			isp_prt(isp, ISP_LOGWARN, "Chan %d handle %d abort returned 0x%x", chan, tgt, ab->abrt_nphdl);
 			break;
 		} else if (IS_FC(isp)) {
 			if (ISP_CAP_SCCFW(isp)) {
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index 0ca540fd41b8..db7d788da7ec 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -462,24 +462,11 @@ ispioctl(struct cdev *dev, u_long c, caddr_t addr, int flags, struct thread *td)
 			retval = EINVAL;
 			break;
 		}
-		if (IS_FC(isp)) {
-			/*
-			 * We don't really support dual role at present on FC cards.
-			 *
-			 * We should, but a bunch of things are currently broken,
-			 * so don't allow it.
-			 */
-			if (nr == ISP_ROLE_BOTH) {
-				isp_prt(isp, ISP_LOGERR, "cannot support dual role at present");
-				retval = EINVAL;
-				break;
-			}
-			ISP_LOCK(isp);
+		ISP_LOCK(isp);
+		if (IS_FC(isp))
 			*(int *)addr = FCPARAM(isp, chan)->role;
-		} else {
-			ISP_LOCK(isp);
+		else
 			*(int *)addr = SDPARAM(isp, chan)->role;
-		}
 		retval = isp_control(isp, ISPCTL_CHANGE_ROLE, chan, nr);
 		ISP_UNLOCK(isp);
 		retval = 0;
@@ -1262,11 +1249,6 @@ isp_enable_lun(ispsoftc_t *isp, union ccb *ccb)
 	target = ccb->ccb_h.target_id;
 	lun = ccb->ccb_h.target_lun;
 	ISP_PATH_PRT(isp, ISP_LOGTDEBUG0|ISP_LOGCONFIG, ccb->ccb_h.path, "enabling lun %u\n", lun);
-	if (target != CAM_TARGET_WILDCARD && target != 0) {
-		ccb->ccb_h.status = CAM_TID_INVALID;
-		xpt_done(ccb);
-		return;
-	}
 	if (target == CAM_TARGET_WILDCARD && lun != CAM_LUN_WILDCARD) {
 		ccb->ccb_h.status = CAM_LUN_INVALID;
 		xpt_done(ccb);
@@ -1479,12 +1461,6 @@ isp_disable_lun(ispsoftc_t *isp, union ccb *ccb)
 	target = ccb->ccb_h.target_id;
 	lun = ccb->ccb_h.target_lun;
 	ISP_PATH_PRT(isp, ISP_LOGTDEBUG0|ISP_LOGCONFIG, ccb->ccb_h.path, "disabling lun %u\n", lun);
-	if (target != CAM_TARGET_WILDCARD && target != 0) {
-		ccb->ccb_h.status = CAM_TID_INVALID;
-		xpt_done(ccb);
-		return;
-	}
-
 	if (target == CAM_TARGET_WILDCARD && lun != CAM_LUN_WILDCARD) {
 		ccb->ccb_h.status = CAM_LUN_INVALID;
 		xpt_done(ccb);
@@ -4684,7 +4660,7 @@ isp_gdt_task(void *arg, int pending)
 	ispsoftc_t *isp = fc->isp;
 	int chan = fc - isp->isp_osinfo.pc.fc;
 	fcportdb_t *lp;
-	int dbidx, tgt, more_to_do = 0;
+	int dbidx, more_to_do = 0;
 
 	ISP_LOCK(isp);
 	isp_prt(isp, ISP_LOGDEBUG0, "Chan %d GDT timer expired", chan);
@@ -4703,12 +4679,10 @@ isp_gdt_task(void *arg, int pending)
 			more_to_do++;
 			continue;
 		}
-		tgt = lp->dev_map_idx - 1;
-		FCPARAM(isp, chan)->isp_dev_map[tgt] = 0;
 		lp->dev_map_idx = 0;
 		lp->state = FC_PORTDB_STATE_NIL;
-		isp_prt(isp, ISP_LOGCONFIG, prom3, chan, lp->portid, tgt, "Gone Device Timeout");
-		isp_make_gone(isp, lp, chan, tgt);
+		isp_prt(isp, ISP_LOGCONFIG, prom3, chan, lp->portid, dbidx, "Gone Device Timeout");
+		isp_make_gone(isp, lp, chan, dbidx);
 	}
 	if (fc->ready) {
 		if (more_to_do) {
@@ -4744,7 +4718,7 @@ isp_ldt_task(void *arg, int pending)
 	ispsoftc_t *isp = fc->isp;
 	int chan = fc - isp->isp_osinfo.pc.fc;
 	fcportdb_t *lp;
-	int dbidx, tgt, i;
+	int dbidx, i;
 
 	ISP_LOCK(isp);
 	isp_prt(isp, ISP_LOG_SANCFG|ISP_LOGDEBUG0, "Chan %d Loop Down Timer expired @ %lu", chan, (unsigned long) time_uptime);
@@ -4777,7 +4751,7 @@ isp_ldt_task(void *arg, int pending)
 			if ((xs = isp->isp_xflist[i].cmd) == NULL) {
 				continue;
                         }
-			if (dbidx != (FCPARAM(isp, chan)->isp_dev_map[XS_TGT(xs)] - 1)) {
+			if (dbidx != XS_TGT(xs)) {
 				continue;
 			}
 			isp_prt(isp, ISP_LOGWARN, "command handle 0x%x for %d.%d.%d orphaned by loop down timeout",
@@ -4788,20 +4762,10 @@ isp_ldt_task(void *arg, int pending)
 		 * Mark that we've announced that this device is gone....
 		 */
 		lp->announced = 1;
-
-		/*
-		 * but *don't* change the state of the entry. Just clear
-		 * any target id stuff and announce to CAM that the
-		 * device is gone. This way any necessary PLOGO stuff
-		 * will happen when loop comes back up.
-		 */
-
-		tgt = lp->dev_map_idx - 1;
-		FCPARAM(isp, chan)->isp_dev_map[tgt] = 0;
 		lp->dev_map_idx = 0;
 		lp->state = FC_PORTDB_STATE_NIL;
-		isp_prt(isp, ISP_LOGCONFIG, prom3, chan, lp->portid, tgt, "Loop Down Timeout");
-		isp_make_gone(isp, lp, chan, tgt);
+		isp_prt(isp, ISP_LOGCONFIG, prom3, chan, lp->portid, dbidx, "Loop Down Timeout");
+		isp_make_gone(isp, lp, chan, dbidx);
 	}
 
 	if (FCPARAM(isp, chan)->role & ISP_ROLE_INITIATOR) {
@@ -5297,7 +5261,6 @@ isp_action(struct cam_sim *sim, union ccb *ccb)
 			fcparam *fcp = FCPARAM(isp, bus);
 			struct ccb_trans_settings_scsi *scsi = &cts->proto_specific.scsi;
 			struct ccb_trans_settings_fc *fc = &cts->xport_specific.fc;
-			unsigned int hdlidx;
 
 			cts->protocol = PROTO_SCSI;
 			cts->protocol_version = SCSI_REV_2;
@@ -5309,9 +5272,8 @@ isp_action(struct cam_sim *sim, union ccb *ccb)
 			fc->valid = CTS_FC_VALID_SPEED;
 			fc->bitrate = 100000;
 			fc->bitrate *= fcp->isp_gbspeed;
-			hdlidx = fcp->isp_dev_map[tgt] - 1;
-			if (hdlidx < MAX_FC_TARG) {
-				fcportdb_t *lp = &fcp->portdb[hdlidx];
+			if (tgt < MAX_FC_TARG) {
+				fcportdb_t *lp = &fcp->portdb[tgt];
 				fc->wwnn = lp->node_wwn;
 				fc->wwpn = lp->port_wwn;
 				fc->port = lp->portid;
@@ -5451,21 +5413,10 @@ isp_action(struct cam_sim *sim, union ccb *ccb)
 				}
 				break;
 			case KNOB_ROLE_BOTH:
-#if 0
 				if (fcp->role != ISP_ROLE_BOTH) {
 					rchange = 1;
 					newrole = ISP_ROLE_BOTH;
 				}
-#else
-				/*
-				 * We don't really support dual role at present on FC cards.
-				 *
-				 * We should, but a bunch of things are currently broken,
-				 * so don't allow it.
-				 */
-				isp_prt(isp, ISP_LOGERR, "cannot support dual role at present");
-				ccb->ccb_h.status = CAM_REQ_INVALID;
-#endif
 				break;
 			}
 			if (rchange) {
@@ -5632,17 +5583,9 @@ isp_done(XS_T *sccb)
 		else if ((IS_FC(isp))
 		      && (XS_TGT(sccb) < MAX_FC_TARG)) {
 			fcparam *fcp;
-			int hdlidx;
 
 			fcp = FCPARAM(isp, XS_CHANNEL(sccb));
-			hdlidx = fcp->isp_dev_map[XS_TGT(sccb)] - 1;
-			/*
-			 * Note that we have reported that this device is
-			 * gone.  If it reappears, we'll need to issue a
-			 * rescan.
-			 */
-			if (hdlidx >= 0 && hdlidx < MAX_FC_TARG)
-				fcp->portdb[hdlidx].reported_gone = 1;
+			fcp->portdb[XS_TGT(sccb)].reported_gone = 1;
 		}
 		if ((sccb->ccb_h.status & CAM_DEV_QFRZN) == 0) {
 			sccb->ccb_h.status |= CAM_DEV_QFRZN;
@@ -5811,24 +5754,7 @@ isp_async(ispsoftc_t *isp, ispasync_t cmd, ...)
 		lp->announced = 0;
 		lp->gone_timer = 0;
 		if ((FCPARAM(isp, bus)->role & ISP_ROLE_INITIATOR) && (lp->prli_word3 & PRLI_WD3_TARGET_FUNCTION)) {
-			int dbidx = lp - FCPARAM(isp, bus)->portdb;
-			int i;
-
-			for (i = 0; i < MAX_FC_TARG; i++) {
-				if (i >= FL_ID && i <= SNS_ID) {
-					continue;
-				}
-				if (FCPARAM(isp, bus)->isp_dev_map[i] == 0) {
-					break;
-				}
-			}
-			if (i < MAX_FC_TARG) {
-				FCPARAM(isp, bus)->isp_dev_map[i] = dbidx + 1;
-				lp->dev_map_idx = i + 1;
-			} else {
-				isp_prt(isp, ISP_LOGWARN, "out of target ids");
-				isp_dump_portdb(isp, bus);
-			}
+			lp->dev_map_idx = (lp - FCPARAM(isp, bus)->portdb) + 1;
 		}
 		isp_gen_role_str(buf, sizeof (buf), lp->prli_word3);
 		if (lp->dev_map_idx) {
@@ -5852,7 +5778,6 @@ isp_async(ispsoftc_t *isp, ispasync_t cmd, ...)
 			lp->state = FC_PORTDB_STATE_NIL;
 			if (lp->dev_map_idx) {
 				tgt = lp->dev_map_idx - 1;
-				FCPARAM(isp, bus)->isp_dev_map[tgt] = 0;
 				lp->dev_map_idx = 0;
 				isp_prt(isp, ISP_LOGCONFIG, prom3, bus, lp->portid, tgt, "change is bad");
 				isp_make_gone(isp, lp, bus, tgt);
@@ -5866,8 +5791,6 @@ isp_async(ispsoftc_t *isp, ispasync_t cmd, ...)
 			lp->prli_word3 = lp->new_prli_word3;
 			isp_gen_role_str(buf, sizeof (buf), lp->prli_word3);
 			if (lp->dev_map_idx) {
-				int t = lp->dev_map_idx - 1;
-				FCPARAM(isp, bus)->isp_dev_map[t] = (lp - FCPARAM(isp, bus)->portdb) + 1;
 				tgt = lp->dev_map_idx - 1;
 				isp_prt(isp, ISP_LOGCONFIG, prom2, bus, lp->portid, lp->handle, buf, "changed at", tgt,
 				    (uint32_t) (lp->port_wwn >> 32), (uint32_t) lp->port_wwn);
@@ -5922,7 +5845,6 @@ isp_async(ispsoftc_t *isp, ispasync_t cmd, ...)
 		if (lp->dev_map_idx && lp->announced == 0 && now) {
 			lp->announced = 1;
 			tgt = lp->dev_map_idx - 1;
-			FCPARAM(isp, bus)->isp_dev_map[tgt] = 0;
 			lp->dev_map_idx = 0;
 			isp_make_gone(isp, lp, bus, tgt);
 			isp_prt(isp, ISP_LOGCONFIG, prom2, bus, lp->portid, lp->handle, buf, "gone at", tgt, (uint32_t) (lp->port_wwn >> 32), (uint32_t) lp->port_wwn);
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 150073ef6534..27167faa7907 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -344,12 +344,7 @@ typedef struct {
  * devices) or by the driver (e.g., for fabric devices).
  *
  * It has a state. If the state if VALID, that means that we've logged into
- * the device. We also *may* have a initiator map index entry. This is a value
- * from 0..MAX_FC_TARG that is used to index into the isp_dev_map array. If
- * the value therein is non-zero, then that value minus one is used to index
- * into the Port Database to find the handle for forming commands. There is
- * back-index minus one value within to Port Database entry that tells us
- * which entry in isp_dev_map points to us (to avoid searching).
+ * the device.
  *
  * Local loop devices the firmware automatically performs PLOGI on for us
  * (which is why that handle is imposed upon us). Fabric devices we assign
@@ -395,7 +390,6 @@ typedef struct {
 
 	/*
 	 * The dev_map_idx, if nonzero, is the system virtual target ID (+1)
-	 * as a cross-reference with the isp_dev_map.
 	 *
 	 * A device is 'autologin' if the firmware automatically logs into
 	 * it (re-logins as needed). Basically, local private loop devices.
@@ -491,15 +485,6 @@ typedef struct {
 	 */
 	fcportdb_t		portdb[MAX_FC_TARG];
 
-	/*
-	 * This maps system virtual 'target' id to a portdb entry.
-	 *
-	 * The mapping function is to take any non-zero entry and
-	 * subtract one to get the portdb index. This means that
-	 * entries which are zero are unmapped (i.e., don't exist).
-	 */
-	uint16_t		isp_dev_map[MAX_FC_TARG];
-
 #ifdef	ISP_TARGET_MODE
 	/*
 	 * This maps N-Port Handle to portdb entry so we
diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c
index f3cf2ae05230..3cd5d7b066dd 100644
--- a/sys/dev/iwn/if_iwn.c
+++ b/sys/dev/iwn/if_iwn.c
@@ -6503,6 +6503,34 @@ iwn5000_runtime_calib(struct iwn_softc *sc)
 	return iwn_cmd(sc, IWN5000_CMD_CALIB_CONFIG, &cmd, sizeof(cmd), 0);
 }
 
+static uint32_t
+iwn_get_rxon_ht_flags(struct iwn_softc *sc, struct ieee80211_channel *c)
+{
+	uint32_t htflags = 0;
+	struct ifnet *ifp = sc->sc_ifp;
+	struct ieee80211com *ic = ifp->if_l2com;
+
+	if (! IEEE80211_IS_CHAN_HT(c))
+		return (0);
+
+	htflags |= IWN_RXON_HT_PROTMODE(ic->ic_curhtprotmode);
+
+	if (IEEE80211_IS_CHAN_HT40(c)) {
+		switch (ic->ic_curhtprotmode) {
+		case IEEE80211_HTINFO_OPMODE_HT20PR:
+			htflags |= IWN_RXON_HT_MODEPURE40;
+			break;
+		default:
+			htflags |= IWN_RXON_HT_MODEMIXED;
+			break;
+		}
+	}
+	if (IEEE80211_IS_CHAN_HT40D(c))
+		htflags |= IWN_RXON_HT_HT40MINUS;
+
+	return (htflags);
+}
+
 static int
 iwn_config(struct iwn_softc *sc)
 {
@@ -6633,7 +6661,12 @@ iwn_config(struct iwn_softc *sc)
 	    __func__,
 	    sc->rxchainmask,
 	    sc->nrxchains);
-	DPRINTF(sc, IWN_DEBUG_RESET, "%s: setting configuration\n", __func__);
+
+	sc->rxon->flags |= htole32(iwn_get_rxon_ht_flags(sc, ic->ic_curchan));
+
+	DPRINTF(sc, IWN_DEBUG_RESET,
+	    "%s: setting configuration; flags=0x%08x\n",
+	    __func__, le32toh(sc->rxon->flags));
 	if (sc->sc_is_scanning)
 		device_printf(sc->sc_dev,
 		    "%s: is_scanning set, before RXON\n",
@@ -7036,6 +7069,10 @@ iwn_auth(struct iwn_softc *sc, struct ieee80211vap *vap)
 		sc->rxon->cck_mask  = 0x03;
 		sc->rxon->ofdm_mask = 0x15;
 	}
+
+	/* try HT */
+	sc->rxon->flags |= htole32(iwn_get_rxon_ht_flags(sc, ic->ic_curchan));
+
 	DPRINTF(sc, IWN_DEBUG_STATE, "rxon chan %d flags %x cck %x ofdm %x\n",
 	    sc->rxon->chan, sc->rxon->flags, sc->rxon->cck_mask,
 	    sc->rxon->ofdm_mask);
@@ -7080,7 +7117,6 @@ iwn_run(struct iwn_softc *sc, struct ieee80211vap *vap)
 	struct ieee80211com *ic = ifp->if_l2com;
 	struct ieee80211_node *ni = vap->iv_bss;
 	struct iwn_node_info node;
-	uint32_t htflags = 0;
 	int error;
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
@@ -7119,25 +7155,11 @@ iwn_run(struct iwn_softc *sc, struct ieee80211vap *vap)
 		sc->rxon->cck_mask  = 0x0f;
 		sc->rxon->ofdm_mask = 0x15;
 	}
-	if (IEEE80211_IS_CHAN_HT(ni->ni_chan)) {
-		htflags |= IWN_RXON_HT_PROTMODE(ic->ic_curhtprotmode);
-		if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) {
-			switch (ic->ic_curhtprotmode) {
-			case IEEE80211_HTINFO_OPMODE_HT20PR:
-				htflags |= IWN_RXON_HT_MODEPURE40;
-				break;
-			default:
-				htflags |= IWN_RXON_HT_MODEMIXED;
-				break;
-			}
-		}
-		if (IEEE80211_IS_CHAN_HT40D(ni->ni_chan))
-			htflags |= IWN_RXON_HT_HT40MINUS;
-	}
-	sc->rxon->flags |= htole32(htflags);
+	/* try HT */
+	sc->rxon->flags |= htole32(iwn_get_rxon_ht_flags(sc, ni->ni_chan));
 	sc->rxon->filter |= htole32(IWN_FILTER_BSS);
-	DPRINTF(sc, IWN_DEBUG_STATE, "rxon chan %d flags %x\n",
-	    sc->rxon->chan, sc->rxon->flags);
+	DPRINTF(sc, IWN_DEBUG_STATE, "rxon chan %d flags %x, curhtprotmode=%d\n",
+	    sc->rxon->chan, le32toh(sc->rxon->flags), ic->ic_curhtprotmode);
 	if (sc->sc_is_scanning)
 		device_printf(sc->sc_dev,
 		    "%s: is_scanning set, before RXON\n",
diff --git a/sys/dev/iwn/if_iwnreg.h b/sys/dev/iwn/if_iwnreg.h
index ed65c0bf0c7a..05ababf39204 100644
--- a/sys/dev/iwn/if_iwnreg.h
+++ b/sys/dev/iwn/if_iwnreg.h
@@ -586,9 +586,13 @@ struct iwn_rxon {
 #define IWN_RXON_ANTENNA_B	(1 <<  9)
 #define IWN_RXON_TSF		(1 << 15)
 #define IWN_RXON_HT_HT40MINUS	(1 << 22)
+
 #define IWN_RXON_HT_PROTMODE(x)	(x << 23)
+
+/* 0=legacy, 1=pure40, 2=mixed */
 #define IWN_RXON_HT_MODEPURE40	(1 << 25)
 #define IWN_RXON_HT_MODEMIXED	(2 << 25)
+
 #define IWN_RXON_CTS_TO_SELF	(1 << 30)
 
 	uint32_t	filter;
diff --git a/sys/dev/wi/if_wi_macio.c b/sys/dev/wi/if_wi_macio.c
index ab1d8753e3ea..ad931b4859cd 100644
--- a/sys/dev/wi/if_wi_macio.c
+++ b/sys/dev/wi/if_wi_macio.c
@@ -73,6 +73,8 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
+#include 
+
 static int wi_macio_probe(device_t);
 static int wi_macio_attach(device_t);
 
@@ -129,6 +131,7 @@ wi_macio_attach(device_t dev)
 
 	error = wi_alloc(dev, 0);
 	if (error == 0) {
+		macio_enable_wireless(device_get_parent(dev), 1);
 		/* Make sure interrupts are disabled. */
 		CSR_WRITE_2(sc, WI_INT_EN, 0);
 		CSR_WRITE_2(sc, WI_EVENT_ACK, 0xFFFF);
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 15f3bd4a2a4a..1b0e56928271 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -288,6 +288,7 @@ fdesc_lookup(ap)
 	struct thread *td = cnp->cn_thread;
 	struct file *fp;
 	struct fdesc_get_ino_args arg;
+	cap_rights_t rights;
 	int nlen = cnp->cn_namelen;
 	u_int fd, fd1;
 	int error;
@@ -332,7 +333,7 @@ fdesc_lookup(ap)
 	/*
 	 * No rights to check since 'fp' isn't actually used.
 	 */
-	if ((error = fget(td, fd, NULL, &fp)) != 0)
+	if ((error = fget(td, fd, cap_rights_init(&rights), &fp)) != 0)
 		goto bad;
 
 	/* Check if we're looking up ourselves. */
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 618090b70a81..64e1e29c014c 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -199,7 +199,7 @@ nullfs_mount(struct mount *mp)
 	}
 	mp->mnt_kern_flag |= MNTK_LOOKUP_EXCL_DOTDOT;
 	mp->mnt_kern_flag |= lowerrootvp->v_mount->mnt_kern_flag &
-	    (MNTK_SUSPENDABLE | MNTK_USES_BCACHE);
+	    MNTK_USES_BCACHE;
 	MNT_IUNLOCK(mp);
 	mp->mnt_data = xmp;
 	vfs_getnewfsid(mp);
diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c
index 2942e5a166b2..f1ba960e1eb7 100644
--- a/sys/fs/tmpfs/tmpfs_vfsops.c
+++ b/sys/fs/tmpfs/tmpfs_vfsops.c
@@ -75,6 +75,7 @@ static int	tmpfs_root(struct mount *, int flags, struct vnode **);
 static int	tmpfs_fhtovp(struct mount *, struct fid *, int,
 		    struct vnode **);
 static int	tmpfs_statfs(struct mount *, struct statfs *);
+static void	tmpfs_susp_clean(struct mount *);
 
 static const char *tmpfs_opts[] = {
 	"from", "size", "maxfilesize", "inodes", "uid", "gid", "mode", "export",
@@ -256,7 +257,7 @@ tmpfs_mount(struct mount *mp)
 
 	MNT_ILOCK(mp);
 	mp->mnt_flag |= MNT_LOCAL;
-	mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_SUSPENDABLE;
+	mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED;
 	MNT_IUNLOCK(mp);
 
 	mp->mnt_data = tmp;
@@ -462,6 +463,14 @@ tmpfs_sync(struct mount *mp, int waitfor)
 	return (0);
 }
 
+/*
+ * The presence of a susp_clean method tells the VFS to track writes.
+ */
+static void
+tmpfs_susp_clean(struct mount *mp __unused)
+{
+}
+
 /*
  * tmpfs vfs operations.
  */
@@ -473,5 +482,6 @@ struct vfsops tmpfs_vfsops = {
 	.vfs_statfs =			tmpfs_statfs,
 	.vfs_fhtovp =			tmpfs_fhtovp,
 	.vfs_sync =			tmpfs_sync,
+	.vfs_susp_clean =		tmpfs_susp_clean,
 };
 VFS_SET(tmpfs_vfsops, tmpfs, VFCF_JAIL);
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index f65ee8c248e7..f4b83bbc24bc 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -294,9 +294,6 @@ unionfs_domount(struct mount *mp)
 	if ((ump->um_lowervp->v_mount->mnt_flag & MNT_LOCAL) &&
 	    (ump->um_uppervp->v_mount->mnt_flag & MNT_LOCAL))
 		mp->mnt_flag |= MNT_LOCAL;
-
-	if ((ump->um_uppervp->v_mount->mnt_kern_flag & MNTK_SUSPENDABLE) != 0)
-		mp->mnt_kern_flag |= MNTK_SUSPENDABLE;
 	MNT_IUNLOCK(mp);
 
 	/*
diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h
index 9d365bc48241..adc86cac623a 100644
--- a/sys/i386/include/atomic.h
+++ b/sys/i386/include/atomic.h
@@ -86,6 +86,10 @@ void atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
 int	atomic_cmpset_int(volatile u_int *dst, u_int expect, u_int src);
 u_int	atomic_fetchadd_int(volatile u_int *p, u_int v);
 int	atomic_testandset_int(volatile u_int *p, u_int v);
+void	atomic_thread_fence_acq(void);
+void	atomic_thread_fence_acq_rel(void);
+void	atomic_thread_fence_rel(void);
+void	atomic_thread_fence_seq_cst(void);
 
 #define	ATOMIC_LOAD(TYPE)					\
 u_##TYPE	atomic_load_acq_##TYPE(volatile u_##TYPE *p)
@@ -310,6 +314,34 @@ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)	\
 }								\
 struct __hack
 
+static __inline void
+atomic_thread_fence_acq(void)
+{
+
+	__compiler_membar();
+}
+
+static __inline void
+atomic_thread_fence_rel(void)
+{
+
+	__compiler_membar();
+}
+
+static __inline void
+atomic_thread_fence_acq_rel(void)
+{
+
+	__compiler_membar();
+}
+
+static __inline void
+atomic_thread_fence_seq_cst(void)
+{
+
+	__storeload_barrier();
+}
+
 #ifdef _KERNEL
 
 #ifdef WANT_FUNCTIONS
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 272228343409..79f66957c0b2 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -404,9 +404,10 @@ kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg)
 	struct flock fl;
 	struct __oflock ofl;
 	intptr_t arg1;
-	int error;
+	int error, newcmd;
 
 	error = 0;
+	newcmd = cmd;
 	switch (cmd) {
 	case F_OGETLK:
 	case F_OSETLK:
@@ -424,13 +425,13 @@ kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg)
 
 		switch (cmd) {
 		case F_OGETLK:
-			cmd = F_GETLK;
+			newcmd = F_GETLK;
 			break;
 		case F_OSETLK:
-			cmd = F_SETLK;
+			newcmd = F_SETLK;
 			break;
 		case F_OSETLKW:
-			cmd = F_SETLKW;
+			newcmd = F_SETLKW;
 			break;
 		}
 		arg1 = (intptr_t)&fl;
@@ -448,7 +449,7 @@ kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg)
 	}
 	if (error)
 		return (error);
-	error = kern_fcntl(td, fd, cmd, arg1);
+	error = kern_fcntl(td, fd, newcmd, arg1);
 	if (error)
 		return (error);
 	if (cmd == F_OGETLK) {
@@ -2423,13 +2424,10 @@ _fget(struct thread *td, int fd, struct file **fpp, int flags,
 {
 	struct filedesc *fdp;
 	struct file *fp;
-	cap_rights_t needrights;
 	int error;
 
 	*fpp = NULL;
 	fdp = td->td_proc->p_fd;
-	if (needrightsp == NULL)
-		needrightsp = cap_rights_init(&needrights);
 	error = fget_unlocked(fdp, fd, needrightsp, &fp, seqp);
 	if (error != 0)
 		return (error);
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index c09f5f393b45..52075e47045d 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1784,7 +1784,7 @@ userland_sysctl(struct thread *td, int *name, u_int namelen, void *old,
 		ktrsysctl(name, namelen);
 #endif
 
-	if (req.oldlen > PAGE_SIZE) {
+	if (req.oldptr && req.oldlen > PAGE_SIZE) {
 		memlocked = 1;
 		sx_xlock(&sysctlmemlock);
 	} else
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index 17371e7fe258..47278527c2c4 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -356,26 +356,6 @@ SDT_PROBE_DEFINE(sched, , , remain__cpu);
 SDT_PROBE_DEFINE2(sched, , , surrender, "struct thread *", 
     "struct proc *");
 
-#ifdef SMP
-/*
- * We need some randomness. Implement the classic Linear Congruential
- * generator X_{n+1}=(aX_n+c) mod m. These values are optimized for
- * m = 2^32, a = 69069 and c = 5. We only return the upper 16 bits
- * of the random state (in the low bits of our answer) to return
- * the maximum randomness.
- */
-static uint32_t
-sched_random(void) 
-{
-	uint32_t *rndptr;
-
-	rndptr = DPCPU_PTR(randomval);
-	*rndptr = *rndptr * 69069 + 5;
-
-	return (*rndptr >> 16);
-} 
-#endif
-
 /*
  * Print the threads waiting on a run-queue.
  */
@@ -625,6 +605,24 @@ tdq_setlowpri(struct tdq *tdq, struct thread *ctd)
 }
 
 #ifdef SMP
+/*
+ * We need some randomness. Implement a classic Linear Congruential
+ * Generator X_{n+1}=(aX_n+c) mod m. These values are optimized for
+ * m = 2^32, a = 69069 and c = 5. We only return the upper 16 bits
+ * of the random state (in the low bits of our answer) to keep
+ * the maximum randomness.
+ */
+static uint32_t
+sched_random(void)
+{
+	uint32_t *rndptr;
+
+	rndptr = DPCPU_PTR(randomval);
+	*rndptr = *rndptr * 69069 + 5;
+
+	return (*rndptr >> 16);
+}
+
 struct cpu_search {
 	cpuset_t cs_mask;
 	u_int	cs_prefer;
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index 12808073387e..ab494cebb65c 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -1221,7 +1221,7 @@ witness_checkorder(struct lock_object *lock, int flags, const char *file,
 	for (j = 0, lle = lock_list; lle != NULL; lle = lle->ll_next) {
 		for (i = lle->ll_count - 1; i >= 0; i--, j++) {
 
-			MPASS(j < witness_count);
+			MPASS(j < LOCK_CHILDCOUNT * LOCK_NCHILDREN);
 			lock1 = &lle->ll_children[i];
 
 			/*
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 07d835815bda..582b41ab5863 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -58,25 +58,27 @@ static void
 ctty_clone(void *arg, struct ucred *cred, char *name, int namelen,
     struct cdev **dev)
 {
+	struct proc *p;
 
 	if (*dev != NULL)
 		return;
 	if (strcmp(name, "tty"))
 		return;
+	p = curproc;
 	sx_sunlock(&clone_drain_lock);
 	sx_slock(&proctree_lock);
 	sx_slock(&clone_drain_lock);
 	dev_lock();
-	if (!(curthread->td_proc->p_flag & P_CONTROLT))
+	if (!(p->p_flag & P_CONTROLT))
 		*dev = ctty;
-	else if (curthread->td_proc->p_session->s_ttyvp == NULL)
+	else if (p->p_session->s_ttyvp == NULL)
 		*dev = ctty;
-	else if (curthread->td_proc->p_session->s_ttyvp->v_type == VBAD ||
-	    curthread->td_proc->p_session->s_ttyvp->v_rdev == NULL) {
+	else if (p->p_session->s_ttyvp->v_type == VBAD ||
+	    p->p_session->s_ttyvp->v_rdev == NULL) {
 		/* e.g. s_ttyvp was revoked */
 		*dev = ctty;
 	} else
-		*dev = curthread->td_proc->p_session->s_ttyvp->v_rdev;
+		*dev = p->p_session->s_ttyvp->v_rdev;
 	dev_refl(*dev);
 	dev_unlock();
 	sx_sunlock(&proctree_lock);
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 0bfcf2d09578..e9fdc9980eed 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -583,7 +583,7 @@ aio_init_aioinfo(struct proc *p)
 	struct kaioinfo *ki;
 
 	ki = uma_zalloc(kaio_zone, M_WAITOK);
-	mtx_init(&ki->kaio_mtx, "aiomtx", NULL, MTX_DEF);
+	mtx_init(&ki->kaio_mtx, "aiomtx", NULL, MTX_DEF | MTX_NEW);
 	ki->kaio_flags = 0;
 	ki->kaio_maxactive_count = max_aio_per_proc;
 	ki->kaio_active_count = 0;
@@ -2058,6 +2058,7 @@ sys_aio_cancel(struct thread *td, struct aio_cancel_args *uap)
 	struct aiocblist *cbe, *cbn;
 	struct file *fp;
 	struct socket *so;
+	cap_rights_t rights;
 	int error;
 	int remove;
 	int cancelled = 0;
@@ -2065,7 +2066,7 @@ sys_aio_cancel(struct thread *td, struct aio_cancel_args *uap)
 	struct vnode *vp;
 
 	/* Lookup file object. */
-	error = fget(td, uap->fd, NULL, &fp);
+	error = fget(td, uap->fd, cap_rights_init(&rights), &fp);
 	if (error)
 		return (error);
 
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index f2ffab2e9bfe..5dc07dc56d33 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -99,6 +99,16 @@ static int lookup_shared = 1;
 SYSCTL_INT(_vfs, OID_AUTO, lookup_shared, CTLFLAG_RWTUN, &lookup_shared, 0,
     "Enables/Disables shared locks for path name translation");
 
+static void
+namei_cleanup_cnp(struct componentname *cnp)
+{
+	uma_zfree(namei_zone, cnp->cn_pnbuf);
+#ifdef DIAGNOSTIC
+	cnp->cn_pnbuf = NULL;
+	cnp->cn_nameptr = NULL;
+#endif
+}
+
 /*
  * Convert a pathname into a pointer to a locked vnode.
  *
@@ -119,16 +129,6 @@ SYSCTL_INT(_vfs, OID_AUTO, lookup_shared, CTLFLAG_RWTUN, &lookup_shared, 0,
  *		if symbolic link, massage name in buffer and continue
  *	}
  */
-static void
-namei_cleanup_cnp(struct componentname *cnp)
-{
-	uma_zfree(namei_zone, cnp->cn_pnbuf);
-#ifdef DIAGNOSTIC
-	cnp->cn_pnbuf = NULL;
-	cnp->cn_nameptr = NULL;
-#endif
-}
-
 int
 namei(struct nameidata *ndp)
 {
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 1f1a7b6cb8ba..30aea6221b61 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1612,16 +1612,7 @@ buf_vlist_add(struct buf *bp, struct bufobj *bo, b_xflags_t xflags)
 }
 
 /*
- * Lookup a buffer using the splay tree.  Note that we specifically avoid
- * shadow buffers used in background bitmap writes.
- *
- * This code isn't quite efficient as it could be because we are maintaining
- * two sorted lists and do not know which list the block resides in.
- *
- * During a "make buildworld" the desired buffer is found at one of
- * the roots more than 60% of the time.  Thus, checking both roots
- * before performing either splay eliminates unnecessary splays on the
- * first tree splayed.
+ * Look up a buffer using the buffer tries.
  */
 struct buf *
 gbincore(struct bufobj *bo, daddr_t lblkno)
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 0b073b9cf110..c8c49810b503 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -1589,22 +1589,10 @@ vn_closefile(fp, td)
 }
 
 static bool
-vn_suspendable_mp(struct mount *mp)
+vn_suspendable(struct mount *mp)
 {
 
-	return ((mp->mnt_kern_flag & MNTK_SUSPENDABLE) != 0);
-}
-
-static bool
-vn_suspendable(struct vnode *vp, struct mount **mpp)
-{
-
-	if (vp != NULL)
-		*mpp = vp->v_mount;
-	if (*mpp == NULL)
-		return (false);
-
-	return (vn_suspendable_mp(*mpp));
+	return (mp->mnt_op->vfs_susp_clean != NULL);
 }
 
 /*
@@ -1657,11 +1645,6 @@ vn_start_write(struct vnode *vp, struct mount **mpp, int flags)
 
 	KASSERT((flags & V_MNTREF) == 0 || (*mpp != NULL && vp == NULL),
 	    ("V_MNTREF requires mp"));
-	if (!vn_suspendable(vp, mpp)) {
-		if ((flags & V_MNTREF) != 0)
-			vfs_rel(*mpp);
-		return (0);
-	}
 
 	error = 0;
 	/*
@@ -1679,6 +1662,12 @@ vn_start_write(struct vnode *vp, struct mount **mpp, int flags)
 	if ((mp = *mpp) == NULL)
 		return (0);
 
+	if (!vn_suspendable(mp)) {
+		if (vp != NULL || (flags & V_MNTREF) != 0)
+			vfs_rel(mp);
+		return (0);
+	}
+
 	/*
 	 * VOP_GETWRITEMOUNT() returns with the mp refcount held through
 	 * a vfs_ref().
@@ -1708,11 +1697,6 @@ vn_start_secondary_write(struct vnode *vp, struct mount **mpp, int flags)
 
 	KASSERT((flags & V_MNTREF) == 0 || (*mpp != NULL && vp == NULL),
 	    ("V_MNTREF requires mp"));
-	if (!vn_suspendable(vp, mpp)) {
-		if ((flags & V_MNTREF) != 0)
-			vfs_rel(*mpp);
-		return (0);
-	}
 
  retry:
 	if (vp != NULL) {
@@ -1730,6 +1714,12 @@ vn_start_secondary_write(struct vnode *vp, struct mount **mpp, int flags)
 	if ((mp = *mpp) == NULL)
 		return (0);
 
+	if (!vn_suspendable(mp)) {
+		if (vp != NULL || (flags & V_MNTREF) != 0)
+			vfs_rel(mp);
+		return (0);
+	}
+
 	/*
 	 * VOP_GETWRITEMOUNT() returns with the mp refcount held through
 	 * a vfs_ref().
@@ -1772,7 +1762,7 @@ void
 vn_finished_write(mp)
 	struct mount *mp;
 {
-	if (mp == NULL || !vn_suspendable_mp(mp))
+	if (mp == NULL || !vn_suspendable(mp))
 		return;
 	MNT_ILOCK(mp);
 	MNT_REL(mp);
@@ -1795,7 +1785,7 @@ void
 vn_finished_secondary_write(mp)
 	struct mount *mp;
 {
-	if (mp == NULL || !vn_suspendable_mp(mp))
+	if (mp == NULL || !vn_suspendable(mp))
 		return;
 	MNT_ILOCK(mp);
 	MNT_REL(mp);
@@ -1818,7 +1808,7 @@ vfs_write_suspend(struct mount *mp, int flags)
 {
 	int error;
 
-	MPASS(vn_suspendable_mp(mp));
+	MPASS(vn_suspendable(mp));
 
 	MNT_ILOCK(mp);
 	if (mp->mnt_susp_owner == curthread) {
@@ -1861,7 +1851,7 @@ void
 vfs_write_resume(struct mount *mp, int flags)
 {
 
-	MPASS(vn_suspendable_mp(mp));
+	MPASS(vn_suspendable(mp));
 
 	MNT_ILOCK(mp);
 	if ((mp->mnt_kern_flag & MNTK_SUSPEND) != 0) {
@@ -1896,7 +1886,7 @@ vfs_write_suspend_umnt(struct mount *mp)
 {
 	int error;
 
-	MPASS(vn_suspendable_mp(mp));
+	MPASS(vn_suspendable(mp));
 	KASSERT((curthread->td_pflags & TDP_IGNSUSP) == 0,
 	    ("vfs_write_suspend_umnt: recursed"));
 
diff --git a/sys/mips/include/atomic.h b/sys/mips/include/atomic.h
index b43cc61bc2bc..d4b951edd811 100644
--- a/sys/mips/include/atomic.h
+++ b/sys/mips/include/atomic.h
@@ -496,6 +496,34 @@ atomic_fetchadd_64(__volatile uint64_t *p, uint64_t v)
 }
 #endif
 
+static __inline void
+atomic_thread_fence_acq(void)
+{
+
+	mips_sync();
+}
+
+static __inline void
+atomic_thread_fence_rel(void)
+{
+
+	mips_sync();
+}
+
+static __inline void
+atomic_thread_fence_acq_rel(void)
+{
+
+	mips_sync();
+}
+
+static __inline void
+atomic_thread_fence_seq_cst(void)
+{
+
+	mips_sync();
+}
+
 /* Operations on chars. */
 #define	atomic_set_char		atomic_set_8
 #define	atomic_set_acq_char	atomic_set_acq_8
diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile
index 705b597ef24a..660ca97d7a64 100644
--- a/sys/modules/dtb/allwinner/Makefile
+++ b/sys/modules/dtb/allwinner/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 # All the dts files for allwinner systems we support.
 DTS=	\
+	bananapi.dts \
 	cubieboard.dts \
 	cubieboard2.dts
 
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 058f51887ae8..f4ac8b4e729a 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -229,7 +229,7 @@ looutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 	if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 
 	/* BPF writes need to be handled specially. */
-	if (dst->sa_family == AF_UNSPEC)
+	if (dst->sa_family == AF_UNSPEC || dst->sa_family == pseudo_AF_HDRCMPLT)
 		bcopy(dst->sa_data, &af, sizeof(af));
 	else
 		af = dst->sa_family;
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
index a0cfbcd1d109..67ca43ba5d98 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
@@ -398,7 +398,7 @@ ng_l2cap_l2ca_con_ind(ng_l2cap_chan_p ch)
 		ip->lcid = ch->scid;
 		ip->psm = ch->psm;
 		ip->ident = ch->ident;
-
+		ip->linktype = ch->con->linktype;
 		NG_SEND_MSG_HOOK(error, l2cap->node, msg, l2cap->l2c, 0);
 	}
 
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
index a2190c78a618..f0cd01e0ab4a 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -1339,6 +1339,8 @@ ng_btsocket_rfcomm_session_create(ng_btsocket_rfcomm_session_p *sp,
 	l2sa.l2cap_family = AF_BLUETOOTH;
 	l2sa.l2cap_psm = (dst == NULL)? htole16(NG_L2CAP_PSM_RFCOMM) : 0;
 	bcopy(src, &l2sa.l2cap_bdaddr, sizeof(l2sa.l2cap_bdaddr));
+	l2sa.l2cap_cid = 0;
+	l2sa.l2cap_bdaddr_type = BDADDR_BREDR;
 
 	error = sobind(s->l2so, (struct sockaddr *) &l2sa, td);
 	if (error != 0)
@@ -1360,6 +1362,8 @@ ng_btsocket_rfcomm_session_create(ng_btsocket_rfcomm_session_p *sp,
 		l2sa.l2cap_family = AF_BLUETOOTH;
 		l2sa.l2cap_psm = htole16(NG_L2CAP_PSM_RFCOMM);
 	        bcopy(dst, &l2sa.l2cap_bdaddr, sizeof(l2sa.l2cap_bdaddr));
+		l2sa.l2cap_cid = 0;
+		l2sa.l2cap_bdaddr_type = BDADDR_BREDR;
 
 		error = soconnect(s->l2so, (struct sockaddr *) &l2sa, td);
 		if (error != 0)
diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c
index bb22c2747681..adc096e9fd08 100644
--- a/sys/netinet/sctp_sysctl.c
+++ b/sys/netinet/sctp_sysctl.c
@@ -511,6 +511,7 @@ sctp_sysctl_handle_assoclist(SYSCTL_HANDLER_ARGS)
 				xraddr.mtu = net->mtu;
 				xraddr.rtt = net->rtt / 1000;
 				xraddr.heartbeat_interval = net->heart_beat_delay;
+				xraddr.ssthresh = net->ssthresh;
 				xraddr.start_time.tv_sec = (uint32_t) net->start_time.tv_sec;
 				xraddr.start_time.tv_usec = (uint32_t) net->start_time.tv_usec;
 				SCTP_INP_RUNLOCK(inp);
diff --git a/sys/netinet/sctp_uio.h b/sys/netinet/sctp_uio.h
index fd78d3493e02..619638331380 100644
--- a/sys/netinet/sctp_uio.h
+++ b/sys/netinet/sctp_uio.h
@@ -1228,7 +1228,8 @@ struct xsctp_raddr {
 	struct sctp_timeval start_time;	/* sctpAssocLocalRemEntry 8   */
 	uint32_t rtt;
 	uint32_t heartbeat_interval;
-	uint32_t extra_padding[31];	/* future */
+	uint32_t ssthresh;
+	uint32_t extra_padding[30];	/* future */
 };
 
 #define SCTP_MAX_LOGGING_SIZE 30000
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index b6c6a6ae0cbf..34e8c413f274 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -6088,16 +6088,21 @@ key_getprop(const struct secasindex *saidx)
 static int
 key_acquire(const struct secasindex *saidx, struct secpolicy *sp)
 {
-	struct mbuf *result = NULL, *m;
+	union sockaddr_union addr;
+	struct mbuf *result, *m;
 	struct secacq *newacq;
-	u_int8_t satype;
-	int error = -1;
 	u_int32_t seq;
+	int error;
+	u_int16_t ul_proto;
+	u_int8_t mask, satype;
 
 	IPSEC_ASSERT(saidx != NULL, ("null saidx"));
 	satype = key_proto2satype(saidx->proto);
 	IPSEC_ASSERT(satype != 0, ("null satype, protocol %u", saidx->proto));
 
+	error = -1;
+	result = NULL;
+	ul_proto = IPSEC_ULPROTO_ANY;
 	/*
 	 * We never do anything about acquirng SA.  There is anather
 	 * solution that kernel blocks to send SADB_ACQUIRE message until
@@ -6134,17 +6139,64 @@ key_acquire(const struct secasindex *saidx, struct secpolicy *sp)
 	 * anything related to NAT-T at this time.
 	 */
 
-	/* set sadb_address for saidx's. */
-	m = key_setsadbaddr(SADB_EXT_ADDRESS_SRC,
-	    &saidx->src.sa, FULLMASK, IPSEC_ULPROTO_ANY);
+	/*
+	 * set sadb_address for saidx's.
+	 *
+	 * Note that if sp is supplied, then we're being called from
+	 * key_checkrequest and should supply port and protocol information.
+	 */
+	if (sp != NULL && (sp->spidx.ul_proto == IPPROTO_TCP ||
+	    sp->spidx.ul_proto == IPPROTO_UDP))
+		ul_proto = sp->spidx.ul_proto;
+
+	addr = saidx->src;
+	mask = FULLMASK;
+	if (ul_proto != IPSEC_ULPROTO_ANY) {
+		switch (sp->spidx.src.sa.sa_family) {
+		case AF_INET:
+			if (sp->spidx.src.sin.sin_port != IPSEC_PORT_ANY) {
+				addr.sin.sin_port = sp->spidx.src.sin.sin_port;
+				mask = sp->spidx.prefs;
+			}
+			break;
+		case AF_INET6:
+			if (sp->spidx.src.sin6.sin6_port != IPSEC_PORT_ANY) {
+				addr.sin6.sin6_port = sp->spidx.src.sin6.sin6_port;
+				mask = sp->spidx.prefs;
+			}
+			break;
+		default:
+			break;
+		}
+	}
+	m = key_setsadbaddr(SADB_EXT_ADDRESS_SRC, &addr.sa, mask, ul_proto);
 	if (!m) {
 		error = ENOBUFS;
 		goto fail;
 	}
 	m_cat(result, m);
 
-	m = key_setsadbaddr(SADB_EXT_ADDRESS_DST,
-	    &saidx->dst.sa, FULLMASK, IPSEC_ULPROTO_ANY);
+	addr = saidx->dst;
+	mask = FULLMASK;
+	if (ul_proto != IPSEC_ULPROTO_ANY) {
+		switch (sp->spidx.dst.sa.sa_family) {
+		case AF_INET:
+			if (sp->spidx.dst.sin.sin_port != IPSEC_PORT_ANY) {
+				addr.sin.sin_port = sp->spidx.dst.sin.sin_port;
+				mask = sp->spidx.prefd;
+			}
+			break;
+		case AF_INET6:
+			if (sp->spidx.dst.sin6.sin6_port != IPSEC_PORT_ANY) {
+				addr.sin6.sin6_port = sp->spidx.dst.sin6.sin6_port;
+				mask = sp->spidx.prefd;
+			}
+			break;
+		default:
+			break;
+		}
+	}
+	m = key_setsadbaddr(SADB_EXT_ADDRESS_DST, &addr.sa, mask, ul_proto);
 	if (!m) {
 		error = ENOBUFS;
 		goto fail;
diff --git a/sys/opencrypto/criov.c b/sys/opencrypto/criov.c
index f94631ec8ca0..499bfe34e08c 100644
--- a/sys/opencrypto/criov.c
+++ b/sys/opencrypto/criov.c
@@ -193,7 +193,7 @@ crypto_apply(int flags, caddr_t buf, int off, int len,
 	return (error);
 }
 
-void
+int
 crypto_mbuftoiov(struct mbuf *mbuf, struct iovec **iovptr, int *cnt,
     int *allocated)
 {
@@ -216,7 +216,9 @@ crypto_mbuftoiov(struct mbuf *mbuf, struct iovec **iovptr, int *cnt,
 			while ((mtmp = mtmp->m_next) != NULL)
 				j++;
 			iov = malloc(sizeof *iov * (i + j), M_CRYPTO_DATA,
-			    M_WAITOK);
+			    M_NOWAIT);
+			if (iov == NULL)
+				return ENOMEM;
 			*allocated = 1;
 			*cnt = i + j;
 			memcpy(iov, *iovptr, sizeof *iov * i);
@@ -235,4 +237,5 @@ crypto_mbuftoiov(struct mbuf *mbuf, struct iovec **iovptr, int *cnt,
 
 	*iovptr = iov;
 	*cnt = i;
+	return 0;
 }
diff --git a/sys/opencrypto/cryptodev.h b/sys/opencrypto/cryptodev.h
index f434843c289d..ab34b9e5c979 100644
--- a/sys/opencrypto/cryptodev.h
+++ b/sys/opencrypto/cryptodev.h
@@ -465,7 +465,7 @@ extern	int cuio_apply(struct uio *uio, int off, int len,
 
 struct mbuf;
 struct iovec;
-extern	void crypto_mbuftoiov(struct mbuf *mbuf, struct iovec **iovptr,
+extern	int crypto_mbuftoiov(struct mbuf *mbuf, struct iovec **iovptr,
 	    int *cnt, int *allocated);
 
 extern	void crypto_copyback(int flags, caddr_t buf, int off, int size,
diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c
index d769eea2ca21..77ab5076be26 100644
--- a/sys/opencrypto/cryptosoft.c
+++ b/sys/opencrypto/cryptosoft.c
@@ -147,8 +147,10 @@ swcr_encdec(struct cryptodesc *crd, struct swcr_data *sw, caddr_t buf,
 	iovalloc = 0;
 	uio = &uiolcl;
 	if ((flags & CRYPTO_F_IMBUF) != 0) {
-		crypto_mbuftoiov((struct mbuf *)buf, &iov, &iovcnt,
+		error = crypto_mbuftoiov((struct mbuf *)buf, &iov, &iovcnt,
 		    &iovalloc);
+		if (error)
+			return (error);
 		uio->uio_iov = iov;
 		uio->uio_iovcnt = iovcnt;
 	} else if ((flags & CRYPTO_F_IOV) != 0)
diff --git a/sys/powerpc/booke/interrupt.c b/sys/powerpc/booke/interrupt.c
deleted file mode 100644
index 3786c689dff4..000000000000
--- a/sys/powerpc/booke/interrupt.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*-
- * Copyright (C) 2006 Semihalf, Rafal Jaworowski 
- * Copyright 2002 by Peter Grehan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-/*
- * Interrupts are dispatched to here from locore asm
- */
-
-#include "opt_hwpmc_hooks.h"
-
-#include                   /* RCS ID & Copyright macro defns */
-__FBSDID("$FreeBSD$");
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#ifdef HWPMC_HOOKS
-#include 
-#endif
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "pic_if.h"
-
-extern void decr_intr(struct trapframe *);
-
-void powerpc_decr_interrupt(struct trapframe *);
-void powerpc_extr_interrupt(struct trapframe *);
-void powerpc_crit_interrupt(struct trapframe *);
-void powerpc_mchk_interrupt(struct trapframe *);
-#ifdef HWPMC_HOOKS
-void powerpc_pmc_interrupt(struct trapframe *framep);
-#endif
-
-static void dump_frame(struct trapframe *framep);
-
-static void
-dump_frame(struct trapframe *frame)
-{
-	int i;
-
-	printf("\n*** *** STACK FRAME DUMP *** ***\n");
-	printf("  exc  = 0x%x\n", frame->exc);
-	printf("  srr0 = 0x%08x\n", frame->srr0);
-	printf("  srr1 = 0x%08x\n", frame->srr1);
-	printf("  dear = 0x%08x\n", frame->dar);
-	printf("  esr  = 0x%08x\n", frame->cpu.booke.esr);
-	printf("  lr   = 0x%08x\n", frame->lr);
-	printf("  cr   = 0x%08x\n", frame->cr);
-	printf("  sp   = 0x%08x\n", frame->fixreg[1]);
-
-	for (i = 0; i < 32; i++) {
-		printf("  R%02d = 0x%08x", i, frame->fixreg[i]);
-		if ((i & 0x3) == 3)
-			printf("\n");
-	}
-	printf("\n");
-}
-
-void powerpc_crit_interrupt(struct trapframe *framep)
-{
-
-	printf("powerpc_crit_interrupt: critical interrupt!\n");
-	dump_frame(framep);
-	trap(framep);
-}
-
-void powerpc_mchk_interrupt(struct trapframe *framep)
-{
-
-	printf("powerpc_mchk_interrupt: machine check interrupt!\n");
-	dump_frame(framep);
-	trap(framep);
-}
-
-/*
- * Decrementer interrupt routine
- */
-void
-powerpc_decr_interrupt(struct trapframe *framep)
-{
-	struct thread *td;
-	struct trapframe *oldframe;
-
-	td = curthread;
-	critical_enter();
-	atomic_add_int(&td->td_intr_nesting_level, 1);
-	oldframe = td->td_intr_frame;
-	td->td_intr_frame = framep;
-	decr_intr(framep);
-	td->td_intr_frame = oldframe;
-	atomic_subtract_int(&td->td_intr_nesting_level, 1);
-	critical_exit();
-	framep->srr1 &= ~PSL_WE;
-}
-
-/*
- * External input interrupt routine
- */
-void
-powerpc_extr_interrupt(struct trapframe *framep)
-{
-
-	critical_enter();
-	PIC_DISPATCH(root_pic, framep);
-	critical_exit();
-	framep->srr1 &= ~PSL_WE;
-}
-
-#ifdef HWPMC_HOOKS
-/*
- * Performance Counter interrupt routine
- */
-void
-powerpc_pmc_interrupt(struct trapframe *framep)
-{
-
-	critical_enter();
-	KASSERT(pmc_intr != NULL, ("Performance exception, but no handler!"));
-	(*pmc_intr)(PCPU_GET(cpuid), framep);
-	critical_exit();
-	if (pmc_hook && (PCPU_GET(curthread)->td_pflags & TDP_CALLCHAIN))
-		pmc_hook(PCPU_GET(curthread), PMC_FN_USER_CALLCHAIN, framep);
-}
-#endif
diff --git a/sys/powerpc/booke/trap_subr.S b/sys/powerpc/booke/trap_subr.S
index c585f1426458..9e240f4aa4fb 100644
--- a/sys/powerpc/booke/trap_subr.S
+++ b/sys/powerpc/booke/trap_subr.S
@@ -401,7 +401,7 @@ INTERRUPT(int_critical_input)
 	STANDARD_PROLOG(SPR_SPRG2, PC_BOOKE_CRITSAVE, SPR_CSRR0, SPR_CSRR1)
 	FRAME_SETUP(SPR_SPRG2, PC_BOOKE_CRITSAVE, EXC_CRIT)
 	addi	%r3, %r1, 8
-	bl	CNAME(powerpc_crit_interrupt)
+	bl	CNAME(powerpc_interrupt)
 	FRAME_LEAVE(SPR_CSRR0, SPR_CSRR1)
 	rfci
 
@@ -413,7 +413,7 @@ INTERRUPT(int_machine_check)
 	STANDARD_PROLOG(SPR_SPRG3, PC_BOOKE_MCHKSAVE, SPR_MCSRR0, SPR_MCSRR1)
 	FRAME_SETUP(SPR_SPRG3, PC_BOOKE_MCHKSAVE, EXC_MCHK)
 	addi	%r3, %r1, 8
-	bl	CNAME(powerpc_mchk_interrupt)
+	bl	CNAME(powerpc_interrupt)
 	FRAME_LEAVE(SPR_MCSRR0, SPR_MCSRR1)
 	rfmci
 
@@ -443,8 +443,8 @@ INTERRUPT(int_external_input)
 	STANDARD_PROLOG(SPR_SPRG1, PC_TEMPSAVE, SPR_SRR0, SPR_SRR1)
 	FRAME_SETUP(SPR_SPRG1, PC_TEMPSAVE, EXC_EXI)
 	addi	%r3, %r1, 8
-	bl	CNAME(powerpc_extr_interrupt)
-	b	trapexit
+	bl	CNAME(powerpc_interrupt)
+	b	clear_we
 
 
 INTERRUPT(int_alignment)
@@ -475,8 +475,8 @@ INTERRUPT(int_decrementer)
 	STANDARD_PROLOG(SPR_SPRG1, PC_TEMPSAVE, SPR_SRR0, SPR_SRR1)
 	FRAME_SETUP(SPR_SPRG1, PC_TEMPSAVE, EXC_DECR)
 	addi	%r3, %r1, 8
-	bl	CNAME(powerpc_decr_interrupt)
-	b	trapexit
+	bl	CNAME(powerpc_interrupt)
+	b	clear_we
 
 
 /*****************************************************************************
@@ -505,7 +505,7 @@ INTERRUPT(int_performance_counter)
 	STANDARD_PROLOG(SPR_SPRG3, PC_TEMPSAVE, SPR_SRR0, SPR_SRR1)
 	FRAME_SETUP(SPR_SPRG3, PC_TEMPSAVE, EXC_PERF)
 	addi	%r3, %r1, 8
-	bl	CNAME(powerpc_pmc_interrupt)
+	bl	CNAME(powerpc_interrupt)
 	b	trapexit
 #endif
 
@@ -879,6 +879,12 @@ dbleave:
 	rfi
 #endif /* KDB */
 
+clear_we:
+	lwz	%r3, (FRAME_SRR1+8)(%r1)
+	rlwinm	%r3, %r3, 0, 14, 12
+	stw	%r3, (FRAME_SRR1+8)(%r1)
+	b	trapexit
+
 #ifdef SMP
 ENTRY(tlb_lock)
 	GET_CPUINFO(%r5)
diff --git a/sys/powerpc/include/atomic.h b/sys/powerpc/include/atomic.h
index 60d6d5c41473..92fe279bf407 100644
--- a/sys/powerpc/include/atomic.h
+++ b/sys/powerpc/include/atomic.h
@@ -730,4 +730,45 @@ atomic_swap_64(volatile u_long *p, u_long v)
 #undef __ATOMIC_REL
 #undef __ATOMIC_ACQ
 
+static __inline void
+atomic_thread_fence_acq(void)
+{
+
+	/* See above comment about lwsync being broken on Book-E. */
+#ifdef __powerpc64__
+	__asm __volatile("lwsync" : : : "memory");
+#else
+	__asm __volatile("sync" : : : "memory");
+#endif
+}
+
+static __inline void
+atomic_thread_fence_rel(void)
+{
+
+#ifdef __powerpc64__
+	__asm __volatile("lwsync" : : : "memory");
+#else
+	__asm __volatile("sync" : : : "memory");
+#endif
+}
+
+static __inline void
+atomic_thread_fence_acq_rel(void)
+{
+
+#ifdef __powerpc64__
+	__asm __volatile("lwsync" : : : "memory");
+#else
+	__asm __volatile("sync" : : : "memory");
+#endif
+}
+
+static __inline void
+atomic_thread_fence_seq_cst(void)
+{
+
+	__asm __volatile("sync" : : : "memory");
+}
+
 #endif /* ! _MACHINE_ATOMIC_H_ */
diff --git a/sys/powerpc/aim/interrupt.c b/sys/powerpc/powerpc/interrupt.c
similarity index 100%
rename from sys/powerpc/aim/interrupt.c
rename to sys/powerpc/powerpc/interrupt.c
diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c
index 0895596f04c9..57008e9e46b4 100644
--- a/sys/powerpc/powerpc/trap.c
+++ b/sys/powerpc/powerpc/trap.c
@@ -426,11 +426,10 @@ printtrap(u_int vector, struct trapframe *frame, int isfatal, int user)
 		ver = mfpvr() >> 16;
 #if defined(AIM)
 		if (MPC745X_P(ver))
-			printf("    msssr0         = 0x%x\n",
-			    mfspr(SPR_MSSSR0));
+			printf("    msssr0         = 0x%lx\n",
+			    (u_long)mfspr(SPR_MSSSR0));
 #elif defined(BOOKE)
-		printf("    mcsr           = 0x%x\n",
-		    mfspr(SPR_MCSR));
+		printf("    mcsr           = 0x%lx\n", (u_long)mfspr(SPR_MCSR));
 #endif
 		break;
 	}
diff --git a/sys/security/audit/audit_bsm_klib.c b/sys/security/audit/audit_bsm_klib.c
index 2f5a92e88f84..b687a15dcf64 100644
--- a/sys/security/audit/audit_bsm_klib.c
+++ b/sys/security/audit/audit_bsm_klib.c
@@ -32,6 +32,7 @@
 __FBSDID("$FreeBSD$");
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -467,6 +468,7 @@ audit_canon_path(struct thread *td, int dirfd, char *path, char *cpath)
 	char *rbuf, *fbuf, *copy;
 	struct filedesc *fdp;
 	struct sbuf sbf;
+	cap_rights_t rights;
 	int error, needslash;
 
 	WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "%s: at %s:%d",
@@ -495,7 +497,7 @@ audit_canon_path(struct thread *td, int dirfd, char *path, char *cpath)
 			vhold(cvnp);
 		} else {
 			/* XXX: fgetvp() that vhold()s vnode instead of vref()ing it would be better */
-			error = fgetvp(td, dirfd, NULL, &cvnp);
+			error = fgetvp(td, dirfd, cap_rights_init(&rights), &cvnp);
 			if (error) {
 				FILEDESC_SUNLOCK(fdp);
 				cpath[0] = '\0';
diff --git a/sys/sparc64/include/atomic.h b/sys/sparc64/include/atomic.h
index 0ceced869ec3..789ed2410ab0 100644
--- a/sys/sparc64/include/atomic.h
+++ b/sys/sparc64/include/atomic.h
@@ -279,6 +279,35 @@ atomic_store_rel_ ## name(volatile ptype p, vtype v)			\
 	atomic_st_rel((p), (v), sz);					\
 }
 
+static __inline void
+atomic_thread_fence_acq(void)
+{
+
+	__compiler_membar();
+}
+
+static __inline void
+atomic_thread_fence_rel(void)
+{
+
+	__compiler_membar();
+}
+
+static __inline void
+atomic_thread_fence_acq_rel(void)
+{
+
+	__compiler_membar();
+}
+
+static __inline void
+atomic_thread_fence_seq_cst(void)
+{
+
+	membar(LoadLoad | LoadStore | StoreStore | StoreLoad);
+}
+
+
 ATOMIC_GEN(int, u_int *, u_int, u_int, 32);
 ATOMIC_GEN(32, uint32_t *, uint32_t, uint32_t, 32);
 
diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h
index 4ea5b08cf911..2a9d2ed348ca 100644
--- a/sys/sys/bus_dma.h
+++ b/sys/sys/bus_dma.h
@@ -282,13 +282,25 @@ int bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map);
 
 /*
- * Perform a synchronization operation on the given map.
+ * Perform a synchronization operation on the given map. If the map
+ * is NULL we have a fully IO-coherent system. On every ARM architecture
+ * there must be a memory barrier placed to ensure that all data
+ * accesses are visible before going any further.
  */
 void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t);
+#if defined(__arm__)
+	#define __BUS_DMAMAP_SYNC_DEFAULT		mb();
+#elif defined(__aarch64__)
+	#define	__BUS_DMAMAP_SYNC_DEFAULT		dmb(sy);
+#else
+	#define	__BUS_DMAMAP_SYNC_DEFAULT		{}
+#endif
 #define bus_dmamap_sync(dmat, dmamap, op) 			\
 	do {							\
 		if ((dmamap) != NULL)				\
 			_bus_dmamap_sync(dmat, dmamap, op);	\
+		else						\
+			__BUS_DMAMAP_SYNC_DEFAULT		\
 	} while (0)
 
 /*
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index b1678457fa7e..e4eb43d41ebe 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -362,7 +362,7 @@ void          __mnt_vnode_markerfree_active(struct vnode **mvp, struct mount *);
 #define	MNTK_SUSPEND	0x08000000	/* request write suspension */
 #define	MNTK_SUSPEND2	0x04000000	/* block secondary writes */
 #define	MNTK_SUSPENDED	0x10000000	/* write operations are suspended */
-#define	MNTK_SUSPENDABLE	0x20000000 /* writes can be suspended */
+#define	MNTK_UNUSED1	0x20000000
 #define MNTK_LOOKUP_SHARED	0x40000000 /* FS supports shared lock lookups */
 #define	MNTK_NOKNOTE	0x80000000	/* Don't send KNOTEs from VOP hooks */
 
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 5d8a501f6567..1f59a86c4a87 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1055,8 +1055,7 @@ ffs_mountfs(devvp, mp, td)
 	 */
 	MNT_ILOCK(mp);
 	mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED |
-	    MNTK_NO_IOPF | MNTK_UNMAPPED_BUFS | MNTK_SUSPENDABLE |
-	    MNTK_USES_BCACHE;
+	    MNTK_NO_IOPF | MNTK_UNMAPPED_BUFS | MNTK_USES_BCACHE;
 	MNT_IUNLOCK(mp);
 #ifdef UFS_EXTATTR
 #ifdef UFS_EXTATTR_AUTOSTART
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 8118c0ae2fed..ca48df86c3f9 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -1414,6 +1414,7 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot,
 		return (EINVAL);
 
 	size = round_page(size);
+	object = NULL;
 	writecounted = FALSE;
 
 	/*
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index cd3077232f96..dcbd54c4a79d 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -227,6 +227,7 @@ struct vm_domain {
 	long vmd_segs;	/* bitmask of the segments */
 	boolean_t vmd_oom;
 	int vmd_pass;	/* local pagedaemon pass */
+	int vmd_last_active_scan;
 	struct vm_page vmd_marker; /* marker for pagedaemon private use */
 };
 
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 26eda8cd90b3..91affa0633f3 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -1028,9 +1028,10 @@ vm_pageout_scan(struct vm_domain *vmd, int pass)
 	vm_page_t m, next;
 	struct vm_pagequeue *pq;
 	vm_object_t object;
+	long min_scan;
 	int act_delta, addl_page_shortage, deficit, maxscan, page_shortage;
 	int vnodes_skipped = 0;
-	int maxlaunder;
+	int maxlaunder, scan_tick, scanned;
 	boolean_t queues_locked;
 
 	/*
@@ -1351,34 +1352,37 @@ vm_pageout_scan(struct vm_domain *vmd, int pass)
 	 * If we're just idle polling attempt to visit every
 	 * active page within 'update_period' seconds.
 	 */
-	if (pass == 0 && vm_pageout_update_period != 0) {
-		maxscan /= vm_pageout_update_period;
-		page_shortage = maxscan;
-	}
+	scan_tick = ticks;
+	if (vm_pageout_update_period != 0) {
+		min_scan = pq->pq_cnt;
+		min_scan *= scan_tick - vmd->vmd_last_active_scan;
+		min_scan /= hz * vm_pageout_update_period;
+	} else
+		min_scan = 0;
+	if (min_scan > 0 || (page_shortage > 0 && maxscan > 0))
+		vmd->vmd_last_active_scan = scan_tick;
 
 	/*
-	 * Scan the active queue for things we can deactivate. We nominally
-	 * track the per-page activity counter and use it to locate
-	 * deactivation candidates.
+	 * Scan the active queue for pages that can be deactivated.  Update
+	 * the per-page activity counter and use it to identify deactivation
+	 * candidates.
 	 */
-	m = TAILQ_FIRST(&pq->pq_pl);
-	while (m != NULL && maxscan-- > 0 && page_shortage > 0) {
+	for (m = TAILQ_FIRST(&pq->pq_pl), scanned = 0; m != NULL && (scanned <
+	    min_scan || (page_shortage > 0 && scanned < maxscan)); m = next,
+	    scanned++) {
 
 		KASSERT(m->queue == PQ_ACTIVE,
 		    ("vm_pageout_scan: page %p isn't active", m));
 
 		next = TAILQ_NEXT(m, plinks.q);
-		if ((m->flags & PG_MARKER) != 0) {
-			m = next;
+		if ((m->flags & PG_MARKER) != 0)
 			continue;
-		}
 		KASSERT((m->flags & PG_FICTITIOUS) == 0,
 		    ("Fictitious page %p cannot be in active queue", m));
 		KASSERT((m->oflags & VPO_UNMANAGED) == 0,
 		    ("Unmanaged page %p cannot be in active queue", m));
 		if (!vm_pageout_page_lock(m, &next)) {
 			vm_page_unlock(m);
-			m = next;
 			continue;
 		}
 
@@ -1430,7 +1434,6 @@ vm_pageout_scan(struct vm_domain *vmd, int pass)
 		} else
 			vm_page_requeue_locked(m);
 		vm_page_unlock(m);
-		m = next;
 	}
 	vm_pagequeue_unlock(pq);
 #if !defined(NO_SWAPPING)
@@ -1620,6 +1623,7 @@ vm_pageout_worker(void *arg)
 	 */
 
 	KASSERT(domain->vmd_segs != 0, ("domain without segments"));
+	domain->vmd_last_active_scan = ticks;
 	vm_pageout_init_marker(&domain->vmd_marker, PQ_INACTIVE);
 
 	/*
diff --git a/tests/sys/file/flock_test.sh b/tests/sys/file/flock_test.sh
index ac3e79957329..f963cdeb23c4 100755
--- a/tests/sys/file/flock_test.sh
+++ b/tests/sys/file/flock_test.sh
@@ -32,7 +32,6 @@
 
 # Testcase # 11 is racy; uses an undocumented kernel interface for testing
 #            locking
-# Testcase # 16 is racy/doesn't handle EINTR properly
 last_testcase=16
 
 echo "1..$last_testcase"
@@ -42,10 +41,6 @@ for n in `seq 1 $last_testcase`; do
 
 	if [ $n -eq 11 ]; then
 		todomsg=" # TODO: racy testcase"
-	# Test 16 fails:
-	# F_SETLKW on locked region by two threads: FAIL ((uintptr_t)res != 0)
-	elif [ $n -eq 16 ]; then
-		todomsg=" # TODO: racy testcase (doesn't handle EINTR properly)"
 	fi
 
 	$(dirname $0)/flock_helper . $n | grep -q SUCCEED
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
index 5557e49bf192..7a052a721129 100644
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -13,8 +13,8 @@ SRCDIR=	tools/lldb/tools/driver
 SRCS=	Driver.cpp \
 	Platform.cpp
 
-lldb.1:
-	ln -fs ${LLDB_SRCS}/docs/lldb.1 ${.TARGET}
+# Man page directory
+.PATH: ${LLDB_SRCS}/docs
 
 LIBADD=	edit panel ncursesw execinfo z
 
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index ddfcea032fcf..c4b4cc313121 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -570,7 +570,7 @@ getnfsquota(struct statfs *fst, struct quotause *qup, long id, int quotatype)
 	struct getquota_rslt gq_rslt;
 	struct dqblk *dqp = &qup->dqblk;
 	struct timeval tv;
-	char *cp;
+	char *cp, host[NI_MAXHOST];
 
 	if (fst->f_flags & MNT_LOCAL)
 		return (0);
@@ -584,33 +584,29 @@ getnfsquota(struct statfs *fst, struct quotause *qup, long id, int quotatype)
 	/*
 	 * must be some form of "hostname:/path"
 	 */
-	cp = strchr(fst->f_mntfromname, ':');
+	cp = fst->f_mntfromname;
+	do {
+		cp = strrchr(cp, ':');
+	} while (cp != NULL && *(cp + 1) != '/');
 	if (cp == NULL) {
 		warnx("cannot find hostname for %s", fst->f_mntfromname);
 		return (0);
 	}
+	memset(host, 0, sizeof(host));
+	memcpy(host, fst->f_mntfromname, cp - fst->f_mntfromname);
+	host[sizeof(host) - 1] = '\0';
  
-	*cp = '\0';
-	if (*(cp+1) != '/') {
-		*cp = ':';
-		return (0);
-	}
-
 	/* Avoid attempting the RPC for special amd(8) filesystems. */
 	if (strncmp(fst->f_mntfromname, "pid", 3) == 0 &&
-	    strchr(fst->f_mntfromname, '@') != NULL) {
-		*cp = ':';
+	    strchr(fst->f_mntfromname, '@') != NULL)
 		return (0);
-	}
 
 	gq_args.gqa_pathp = cp + 1;
 	gq_args.gqa_uid = id;
-	if (callaurpc(fst->f_mntfromname, RQUOTAPROG, RQUOTAVERS,
+	if (callaurpc(host, RQUOTAPROG, RQUOTAVERS,
 	    RQUOTAPROC_GETQUOTA, (xdrproc_t)xdr_getquota_args, (char *)&gq_args,
-	    (xdrproc_t)xdr_getquota_rslt, (char *)&gq_rslt) != 0) {
-		*cp = ':';
+	    (xdrproc_t)xdr_getquota_rslt, (char *)&gq_rslt) != 0)
 		return (0);
-	}
 
 	switch (gq_rslt.status) {
 	case Q_NOQUOTA:
@@ -643,13 +639,12 @@ getnfsquota(struct statfs *fst, struct quotause *qup, long id, int quotatype)
 		    tv.tv_sec + gq_rslt.getquota_rslt_u.gqr_rquota.rq_btimeleft;
 		dqp->dqb_itime =
 		    tv.tv_sec + gq_rslt.getquota_rslt_u.gqr_rquota.rq_ftimeleft;
-		*cp = ':';
 		return (1);
 	default:
 		warnx("bad rpc result, host: %s", fst->f_mntfromname);
 		break;
 	}
-	*cp = ':';
+
 	return (0);
 }
  
@@ -657,26 +652,17 @@ static int
 callaurpc(char *host, int prognum, int versnum, int procnum,
     xdrproc_t inproc, char *in, xdrproc_t outproc, char *out)
 {
-	struct sockaddr_in server_addr;
 	enum clnt_stat clnt_stat;
-	struct hostent *hp;
 	struct timeval timeout, tottimeout;
  
 	CLIENT *client = NULL;
-	int sock = RPC_ANYSOCK;
- 
-	if ((hp = gethostbyname(host)) == NULL)
-		return ((int) RPC_UNKNOWNHOST);
+
+ 	client = clnt_create(host, prognum, versnum, "udp");
+	if (client == NULL)
+		return ((int)rpc_createerr.cf_stat);
 	timeout.tv_usec = 0;
 	timeout.tv_sec = 6;
-	bcopy(hp->h_addr, &server_addr.sin_addr,
-			MIN(hp->h_length,(int)sizeof(server_addr.sin_addr)));
-	server_addr.sin_family = AF_INET;
-	server_addr.sin_port =  0;
-
-	if ((client = clntudp_create(&server_addr, prognum,
-	    versnum, timeout, &sock)) == NULL)
-		return ((int) rpc_createerr.cf_stat);
+	CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT, (char *)(void *)&timeout);
 
 	client->cl_auth = authunix_create_default();
 	tottimeout.tv_sec = 25;
diff --git a/usr.sbin/bhyve/uart_emul.c b/usr.sbin/bhyve/uart_emul.c
index 4242e5ce9548..538bf5834c78 100644
--- a/usr.sbin/bhyve/uart_emul.c
+++ b/usr.sbin/bhyve/uart_emul.c
@@ -272,6 +272,37 @@ uart_opentty(struct uart_softc *sc)
 	assert(sc->mev != NULL);
 }
 
+static uint8_t
+modem_status(uint8_t mcr)
+{
+	uint8_t msr;
+
+	if (mcr & MCR_LOOPBACK) {
+		/*
+		 * In the loopback mode certain bits from the MCR are
+		 * reflected back into MSR.
+		 */
+		msr = 0;
+		if (mcr & MCR_RTS)
+			msr |= MSR_CTS;
+		if (mcr & MCR_DTR)
+			msr |= MSR_DSR;
+		if (mcr & MCR_OUT1)
+			msr |= MSR_RI;
+		if (mcr & MCR_OUT2)
+			msr |= MSR_DCD;
+	} else {
+		/*
+		 * Always assert DCD and DSR so tty open doesn't block
+		 * even if CLOCAL is turned off.
+		 */
+		msr = MSR_DCD | MSR_DSR;
+	}
+	assert((msr & MSR_DELTA_MASK) == 0);
+
+	return (msr);
+}
+
 /*
  * The IIR returns a prioritized interrupt reason:
  * - receive data available
@@ -304,6 +335,7 @@ uart_reset(struct uart_softc *sc)
 	divisor = DEFAULT_RCLK / DEFAULT_BAUD / 16;
 	sc->dll = divisor;
 	sc->dlh = divisor >> 16;
+	sc->msr = modem_status(sc->mcr);
 
 	rxfifo_reset(sc, 1);	/* no fifo until enabled by software */
 }
@@ -363,7 +395,7 @@ uart_write(struct uart_softc *sc, int offset, uint8_t value)
 	uint8_t msr;
 
 	pthread_mutex_lock(&sc->mtx);
-	
+
 	/*
 	 * Take care of the special case DLAB accesses first
 	 */
@@ -426,22 +458,7 @@ uart_write(struct uart_softc *sc, int offset, uint8_t value)
 		case REG_MCR:
 			/* Apply mask so that bits 5-7 are 0 */
 			sc->mcr = value & 0x1F;
-
-			msr = 0;
-			if (sc->mcr & MCR_LOOPBACK) {
-				/*
-				 * In the loopback mode certain bits from the
-				 * MCR are reflected back into MSR
-				 */
-				if (sc->mcr & MCR_RTS)
-					msr |= MSR_CTS;
-				if (sc->mcr & MCR_DTR)
-					msr |= MSR_DSR;
-				if (sc->mcr & MCR_OUT1)
-					msr |= MSR_RI;
-				if (sc->mcr & MCR_OUT2)
-					msr |= MSR_DCD;
-			}
+			msr = modem_status(sc->mcr);
 
 			/*
 			 * Detect if there has been any change between the
diff --git a/usr.sbin/iovctl/iovctl.8 b/usr.sbin/iovctl/iovctl.8
index b58ee549b074..5ba170644640 100644
--- a/usr.sbin/iovctl/iovctl.8
+++ b/usr.sbin/iovctl/iovctl.8
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 21, 2014
+.Dd July 8, 2015
 .Dt IOVCTL 8
 .Os
 .Sh NAME
@@ -49,7 +49,7 @@ The
 utility creates or destroys PCI Single-Root I/O Virtualization
 .Pq SR-IOV
 Virtual Functions
-.Po VFs Pc .
+.Pq VFs .
 When invoked with the
 .Fl C
 flag,
diff --git a/usr.sbin/iovctl/iovctl.conf.5 b/usr.sbin/iovctl/iovctl.conf.5
index f7a605265268..3617b1cb66ec 100644
--- a/usr.sbin/iovctl/iovctl.conf.5
+++ b/usr.sbin/iovctl/iovctl.conf.5
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 21, 2014
+.Dd July 8, 2015
 .Dt IOVCTL.CONF 5
 .Os
 .Sh NAME
@@ -77,7 +77,7 @@ The second section type is the VF section.
 This section has the key "VF-" followed by a VF index.
 VF indices start at 0 and always increment by 1.
 Valid VF indices are in the range of 0 to
-.Po num_vfs - 1 Pc .
+.Pq num_vfs - 1 .
 The VF index must be given as a decimal integer with no leading zeros.
 This section defines configuration parameters that apply to a single VF.
 .Pp
@@ -103,13 +103,17 @@ xx:xx:xx:xx:xx:xx, where xx is one or two hexadecimal digits.
 .It string
 Accepts any string value.
 .It uint8_t
-Accepts any integer in the range 0-255, inclusive.
+Accepts any integer in the range 0 to 255, inclusive.
 .It uint16_t
-Accepts any integer in the range 0-65535, inclusive.
+Accepts any integer in the range 0 to 65535, inclusive.
 .It uint32_t
-Accepts any integer in the range 0-2**32, inclusive.
+Accepts any integer in the range 0 to
+.Pq 2**32 - 1 ,
+inclusive.
 .It uint64_t
-Accepts any integer in the range 0-2**64, inclusive.
+Accepts any integer in the range 0 to
+.Pq 2**64 - 1 ,
+inclusive.
 .El
 .Sh OPTIONS
 The following parameters are accepted by all PF drivers:
diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c
index 582020965136..87b8ef9675a6 100644
--- a/usr.sbin/jail/config.c
+++ b/usr.sbin/jail/config.c
@@ -111,8 +111,8 @@ static const struct ipspec intparams[] = {
 #ifdef INET6
     [KP_IP6_ADDR] =		{"ip6.addr",		0},
 #endif
-    [KP_JID] =			{"jid",			0},
-    [KP_NAME] =			{"name",		0},
+    [KP_JID] =			{"jid",			PF_IMMUTABLE},
+    [KP_NAME] =			{"name",		PF_IMMUTABLE},
     [KP_PATH] =			{"path",		0},
     [KP_PERSIST] =		{"persist",		0},
     [KP_SECURELEVEL] =		{"securelevel",		0},
@@ -130,9 +130,8 @@ load_config(void)
 	struct cfjail *j, *tj, *wj;
 	struct cfparam *p, *vp, *tp;
 	struct cfstring *s, *vs, *ns;
-	struct cfvar *v;
+	struct cfvar *v, *vv;
 	char *ep;
-	size_t varoff;
 	int did_self, jseq, pgen;
 
 	if (!strcmp(cfname, "-")) {
@@ -191,7 +190,6 @@ load_config(void)
 		    p->gen = ++pgen;
 		find_vars:
 		    TAILQ_FOREACH(s, &p->val, tq) {
-			varoff = 0;
 			while ((v = STAILQ_FIRST(&s->vars))) {
 				TAILQ_FOREACH(vp, &j->params, tq)
 					if (!strcmp(vp->name, v->name))
@@ -233,11 +231,13 @@ load_config(void)
 					goto bad_var;
 				}
 				s->s = erealloc(s->s, s->len + vs->len + 1);
-				memmove(s->s + v->pos + varoff + vs->len,
-				    s->s + v->pos + varoff,
-				    s->len - (v->pos + varoff) + 1);
-				memcpy(s->s + v->pos + varoff, vs->s, vs->len);
-				varoff += vs->len;
+				memmove(s->s + v->pos + vs->len,
+				    s->s + v->pos,
+				    s->len - v->pos + 1);
+				memcpy(s->s + v->pos, vs->s, vs->len);
+				vv = v;
+				while ((vv = STAILQ_NEXT(vv, tq)))
+					vv->pos += vs->len;
 				s->len += vs->len;
 				while ((vs = TAILQ_NEXT(vs, tq))) {
 					ns = emalloc(sizeof(struct cfstring));
@@ -362,6 +362,11 @@ add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum,
 				break;
 	if (dp != NULL) {
 		/* Found it - append or replace. */
+		if (dp->flags & PF_IMMUTABLE) {
+			jail_warnx(j, "cannot redefine variable \"%s\".",
+			    dp->name);
+			return;
+		}
 		if (strcmp(dp->name, name)) {
 			free(dp->name);
 			dp->name = estrdup(name);
diff --git a/usr.sbin/jail/jailp.h b/usr.sbin/jail/jailp.h
index bfefca56c10b..d2c929e32f08 100644
--- a/usr.sbin/jail/jailp.h
+++ b/usr.sbin/jail/jailp.h
@@ -51,6 +51,7 @@
 #define PF_INT		0x20	/* Integer parameter */
 #define PF_CONV		0x40	/* Parameter duplicated in converted form */
 #define PF_REV		0x80	/* Run commands in reverse order on stopping */
+#define	PF_IMMUTABLE	0x100	/* Immutable parameter */
 
 #define JF_START	0x0001	/* -c */
 #define JF_SET		0x0002	/* -m */
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h
index 2a0a0ebbe1a7..30c325f36038 100644
--- a/usr.sbin/ntp/config.h
+++ b/usr.sbin/ntp/config.h
@@ -1418,7 +1418,7 @@
 #define PACKAGE_NAME "ntp"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ntp 4.2.8p2"
+#define PACKAGE_STRING "ntp 4.2.8p3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "ntp"
@@ -1427,7 +1427,7 @@
 #define PACKAGE_URL "http://www.ntp.org./"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.2.8p2"
+#define PACKAGE_VERSION "4.2.8p3"
 
 /* data dir */
 #define PERLLIBDIR "/usr/local/share/ntp/lib"
@@ -1608,7 +1608,7 @@ typedef unsigned int	uintptr_t;
 /* #undef USE_UDP_SIGPOLL */
 
 /* Version number of package */
-#define VERSION "4.2.8p2"
+#define VERSION "4.2.8p3"
 
 /* vsnprintf expands "%m" to strerror(errno) */
 /* #undef VSNPRINTF_PERCENT_M */
diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile
index f83322f66b86..1e4848323a01 100644
--- a/usr.sbin/ntp/libntp/Makefile
+++ b/usr.sbin/ntp/libntp/Makefile
@@ -21,7 +21,8 @@ NTP_SRCS= systime.c	a_md5encrypt.c	adjtime.c	atoint.c \
 	ntp_crypto_rnd.c		ntp_intres.c	ntp_libopts.c \
 	ntp_lineedit.c	ntp_random.c	ntp_rfc2553.c	ntp_worker.c \
 	numtoa.c	numtohost.c	octtoint.c	prettydate.c \
-	recvbuff.c	refnumtoa.c	snprintf.c	socket.c \
+	recvbuff.c	refidsmear.c	\
+	refnumtoa.c	snprintf.c	socket.c \
 	socktoa.c	socktohost.c	ssl_init.c	statestr.c \
 	strdup.c	strl_obsd.c	syssignal.c	timetoa.c \
 	timevalops.c	uglydate.c	vint64ops.c	work_fork.c \
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index 9f80b15eaff3..905ff3c5de14 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -13,6 +13,7 @@ SRCS=	cmd_args.c ntp_config.c ntp_control.c ntp_crypto.c ntp_filegen.c \
 	ntp_io.c ntp_leapsec.c ntp_loopfilter.c ntp_monitor.c ntp_parser.c \
 	ntp_peer.c ntp_proto.c ntp_refclock.c ntp_request.c ntp_restrict.c \
 	ntp_scanner.c ntp_signd.c ntp_timer.c ntp_util.c ntpd-opts.c ntpd.c \
+	rc_cmdlength.c \
 	refclock_acts.c refclock_arbiter.c refclock_arc.c refclock_as2201.c \
 	refclock_atom.c refclock_bancomm.c refclock_chronolog.c \
 	refclock_chu.c refclock_conf.c refclock_datum.c refclock_dumbclock.c \
diff --git a/usr.sbin/pw/psdate.c b/usr.sbin/pw/psdate.c
index 3f4c0105b75b..8e3a951ef85b 100644
--- a/usr.sbin/pw/psdate.c
+++ b/usr.sbin/pw/psdate.c
@@ -33,25 +33,12 @@ static const char rcsid[] =
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include "psdate.h"
 
 
-static int
-a2i(char const ** str)
-{
-	int             i = 0;
-	char const     *s = *str;
-
-	if (isdigit((unsigned char)*s)) {
-		i = atoi(s);
-		while (isdigit((unsigned char)*s))
-			++s;
-		*str = s;
-	}
-	return i;
-}
-
 static int
 numerics(char const * str)
 {
@@ -95,61 +82,73 @@ weekday(char const ** str)
 	return aindex(days, str, 3);
 }
 
-static int
-month(char const ** str)
-{
-	static char const *months[] =
-	{"jan", "feb", "mar", "apr", "may", "jun", "jul",
-	"aug", "sep", "oct", "nov", "dec", NULL};
-
-	return aindex(months, str, 3);
-}
-
 static void
-parse_time(char const * str, int *hour, int *min, int *sec)
+parse_datesub(char const * str, struct tm *t)
 {
-	*hour = a2i(&str);
-	if ((str = strchr(str, ':')) == NULL)
-		*min = *sec = 0;
-	else {
-		++str;
-		*min = a2i(&str);
-		*sec = ((str = strchr(str, ':')) == NULL) ? 0 : atoi(++str);
+	struct tm	 tm;
+	locale_t	 l;
+	int		 i;
+	char		*ret;
+	const char	*valid_formats[] = {
+		"%d-%b-%y",
+		"%d-%b-%Y",
+		"%d-%m-%y",
+		"%d-%m-%Y",
+		"%H:%M %d-%b-%y",
+		"%H:%M %d-%b-%Y",
+		"%H:%M %d-%m-%y",
+		"%H:%M %d-%m-%Y",
+		"%H:%M:%S %d-%b-%y",
+		"%H:%M:%S %d-%b-%Y",
+		"%H:%M:%S %d-%m-%y",
+		"%H:%M:%S %d-%m-%Y",
+		"%d-%b-%y %H:%M",
+		"%d-%b-%Y %H:%M",
+		"%d-%m-%y %H:%M",
+		"%d-%m-%Y %H:%M",
+		"%d-%b-%y %H:%M:%S",
+		"%d-%b-%Y %H:%M:%S",
+		"%d-%m-%y %H:%M:%S",
+		"%d-%m-%Y %H:%M:%S",
+		"%H:%M\t%d-%b-%y",
+		"%H:%M\t%d-%b-%Y",
+		"%H:%M\t%d-%m-%y",
+		"%H:%M\t%d-%m-%Y",
+		"%H:%M\t%S %d-%b-%y",
+		"%H:%M\t%S %d-%b-%Y",
+		"%H:%M\t%S %d-%m-%y",
+		"%H:%M\t%S %d-%m-%Y",
+		"%d-%b-%y\t%H:%M",
+		"%d-%b-%Y\t%H:%M",
+		"%d-%m-%y\t%H:%M",
+		"%d-%m-%Y\t%H:%M",
+		"%d-%b-%y\t%H:%M:%S",
+		"%d-%b-%Y\t%H:%M:%S",
+		"%d-%m-%y\t%H:%M:%S",
+		"%d-%m-%Y\t%H:%M:%S",
+		NULL,
+	};
+
+	l = newlocale(LC_ALL_MASK, "C", NULL);
+
+	memset(&tm, 0, sizeof(tm));
+	for (i=0; valid_formats[i] != NULL; i++) {
+		ret = strptime_l(str, valid_formats[i], &tm, l);
+		if (ret && *ret == '\0') {
+			t->tm_mday = tm.tm_mday;
+			t->tm_mon = tm.tm_mon;
+			t->tm_year = tm.tm_year;
+			t->tm_hour = tm.tm_hour;
+			t->tm_min = tm.tm_min;
+			t->tm_sec = tm.tm_sec;
+			freelocale(l);
+			return;
+		}
 	}
-}
 
+	freelocale(l);
 
-static void
-parse_datesub(char const * str, int *day, int *mon, int *year)
-{
-	int             i;
-
-	static char const nchrs[] = "0123456789 \t,/-.";
-
-	if ((i = month(&str)) != -1) {
-		*mon = i;
-		if ((i = a2i(&str)) != 0)
-			*day = i;
-	} else if ((i = a2i(&str)) != 0) {
-		*day = i;
-		while (*str && strchr(nchrs + 10, *str) != NULL)
-			++str;
-		if ((i = month(&str)) != -1)
-			*mon = i;
-		else if ((i = a2i(&str)) != 0)
-			*mon = i - 1;
-	} else
-		return;
-
-	while (*str && strchr(nchrs + 10, *str) != NULL)
-		++str;
-	if (isdigit((unsigned char)*str)) {
-		*year = atoi(str);
-		if (*year > 1900)
-			*year -= 1900;
-		else if (*year < 32)
-			*year += 100;
-	}
+	errx(EXIT_FAILURE, "Invalid date");
 }
 
 
@@ -256,39 +255,7 @@ parse_date(time_t dt, char const * str)
 			}
 		}
 
-		/*
-		 * See if there is a time hh:mm[:ss]
-		 */
-		if ((p = strchr(tmp, ':')) == NULL) {
-
-			/*
-			 * No time string involved
-			 */
-			T->tm_hour = T->tm_min = T->tm_sec = 0;
-			parse_datesub(tmp, &T->tm_mday, &T->tm_mon, &T->tm_year);
-		} else {
-			char            datestr[64], timestr[64];
-
-			/*
-			 * Let's chip off the time string
-			 */
-			if ((q = strpbrk(p, " \t")) != NULL) {	/* Time first? */
-				int             l = q - str;
-
-				strlcpy(timestr, str, l + 1);
-				strlcpy(datestr, q + 1, sizeof(datestr));
-				parse_time(timestr, &T->tm_hour, &T->tm_min, &T->tm_sec);
-				parse_datesub(datestr, &T->tm_mday, &T->tm_mon, &T->tm_year);
-			} else if ((q = strrchr(tmp, ' ')) != NULL) {	/* Time last */
-				int             l = q - tmp;
-
-				strlcpy(timestr, q + 1, sizeof(timestr));
-				strlcpy(datestr, tmp, l + 1);
-			} else	/* Bail out */
-				return dt;
-			parse_time(timestr, &T->tm_hour, &T->tm_min, &T->tm_sec);
-			parse_datesub(datestr, &T->tm_mday, &T->tm_mon, &T->tm_year);
-		}
+		parse_datesub(tmp, T);
 		dt = mktime(T);
 	}
 	return dt;
diff --git a/usr.sbin/pw/pw_vpw.c b/usr.sbin/pw/pw_vpw.c
index 99663bebded9..a23c66e111f4 100644
--- a/usr.sbin/pw/pw_vpw.c
+++ b/usr.sbin/pw/pw_vpw.c
@@ -38,6 +38,7 @@ static const char rcsid[] =
 #include 
 #include 
 #include 
+#include 
 
 #include "pwupd.h"
 
@@ -80,6 +81,9 @@ vnextpwent(char const *nam, uid_t uid, int doclose)
 			if (line[linelen - 1 ] == '\n')
 				line[linelen - 1] = '\0';
 			pw = pw_scan(line, PWSCAN_MASTER);
+			if (pw == NULL)
+				errx(EXIT_FAILURE, "Invalid user entry in '%s':"
+				    " '%s'", getpwpath(_MASTERPASSWD), line);
 			if (uid != (uid_t)-1) {
 				if (uid == pw->pw_uid)
 					break;
@@ -160,6 +164,9 @@ vnextgrent(char const *nam, gid_t gid, int doclose)
 			if (line[linelen - 1 ] == '\n')
 				line[linelen - 1] = '\0';
 			gr = gr_scan(line);
+			if (gr == NULL)
+				errx(EXIT_FAILURE, "Invalid group entry in '%s':"
+				    " '%s'", getgrpath(_GROUP), line);
 			if (gid != (gid_t)-1) {
 				if (gid == gr->gr_gid)
 					break;
diff --git a/usr.sbin/pw/tests/pw_useradd.sh b/usr.sbin/pw/tests/pw_useradd.sh
index 27a8624b60ee..32d3b9d7139d 100755
--- a/usr.sbin/pw/tests/pw_useradd.sh
+++ b/usr.sbin/pw/tests/pw_useradd.sh
@@ -176,6 +176,61 @@ user_add_name_too_long_body() {
 		${PW} useradd name_very_vert_very_very_very_long
 }
 
+atf_test_case user_add_expiration
+user_add_expiration_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 \
+		${PW} useradd foo -e 20-03-2043
+	atf_check -o inline:"foo:*:1001:1001::0:2310422400:User &:/home/foo:/bin/sh\n" \
+		-s exit:0 grep "^foo" ${HOME}/master.passwd
+	atf_check -s exit:0 ${PW} userdel foo
+	atf_check -s exit:0 \
+		${PW} useradd foo -e 20-03-43
+	atf_check -o inline:"foo:*:1001:1001::0:2310422400:User &:/home/foo:/bin/sh\n" \
+		-s exit:0 grep "^foo" ${HOME}/master.passwd
+	atf_check -s exit:0 ${PW} userdel foo
+	atf_check -s exit:0 \
+		${PW} useradd foo -e 20-Mar-2043
+	atf_check -o inline:"foo:*:1001:1001::0:2310422400:User &:/home/foo:/bin/sh\n" \
+		-s exit:0 grep "^foo" ${HOME}/master.passwd
+	atf_check -s exit:0 ${PW} userdel foo
+	atf_check -e inline:"pw: Invalid date\n" -s exit:1 \
+		${PW} useradd foo -e 20-Foo-2043
+	atf_check -e inline:"pw: Invalid date\n" -s exit:1 \
+		${PW} useradd foo -e 20-13-2043
+	atf_check -s exit:0 ${PW} useradd foo -e "12:00 20-03-2043"
+	atf_check -s exit:0 ${PW} userdel foo
+	atf_check -e inline:"pw: Invalid date\n" -s exit:1 \
+		${PW} useradd foo -e "12 20-03-2043"
+	atf_check -s exit:0 ${PW} useradd foo -e "20-03-2043	12:00"
+	atf_check -s exit:0 ${PW} userdel foo
+}
+
+atf_test_case user_add_invalid_user_entry
+user_add_invalid_user_entry_body() {
+	touch ${HOME}/master.passwd
+	touch ${HOME}/group
+
+	pwd_mkdb -p -d ${HOME} ${HOME}/master.passwd || \
+		atf_fail "generate passwd from master.passwd"
+	atf_check -s exit:0 ${PW} useradd foo
+	echo "foo1:*:1002" >> ${HOME}/master.passwd
+	atf_check -s exit:1 -e match:"Invalid user entry" ${PW} useradd foo2
+}
+
+atf_test_case user_add_invalid_group_entry
+user_add_invalid_group_entry_body() {
+	touch ${HOME}/master.passwd
+	touch ${HOME}/group
+
+	pwd_mkdb -p -d ${HOME} ${HOME}/master.passwd || \
+		atf_fail "generate passwd from master.passwd"
+	atf_check -s exit:0 ${PW} useradd foo
+	echo 'foo1:*:1002' >> group
+	atf_check -s exit:1 -e match:"Invalid group entry" ${PW} useradd foo2
+}
+
 atf_init_test_cases() {
 	atf_add_test_case user_add
 	atf_add_test_case user_add_noupdate
@@ -193,4 +248,7 @@ atf_init_test_cases() {
 	atf_add_test_case user_add_password_expiration_date_month
 	atf_add_test_case user_add_password_expiration_date_relative
 	atf_add_test_case user_add_name_too_long
+	atf_add_test_case user_add_expiration
+	atf_add_test_case user_add_invalid_user_entry
+	atf_add_test_case user_add_invalid_group_entry
 }
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index 1537d33ff1ef..d201d91f2eb3 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -43,7 +43,7 @@ CFLAGS+= ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
 CFLAGS+= -DNETINET6
 .endif
 
-WARNS?=	1
+WARNS?=	0
 
 LIBADD=	util wrap sm smutil
 
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index 00d768e2b56a..d54b9bf93e38 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -58,13 +58,17 @@ SRCS=	addrtoname.c \
 	print-fddi.c \
 	print-forces.c \
 	print-fr.c \
+	print-ftp.c \
+	print-geneve.c \
 	print-geonet.c \
 	print-gre.c \
 	print-hsrp.c \
+	print-http.c \
 	print-icmp.c \
 	print-igmp.c \
 	print-igrp.c \
 	print-ip.c \
+	print-ip6.c \
 	print-ipcomp.c \
 	print-ipfc.c \
 	print-ipnet.c \
@@ -111,6 +115,7 @@ SRCS=	addrtoname.c \
 	print-rpki-rtr.c \
 	print-rrcp.c \
 	print-rsvp.c \
+	print-rtsp.c \
 	print-rx.c \
 	print-sctp.c \
 	print-sflow.c \
@@ -119,6 +124,7 @@ SRCS=	addrtoname.c \
 	print-sll.c \
 	print-slow.c \
 	print-smb.c \
+	print-smtp.c \
 	print-snmp.c \
 	print-stp.c \
 	print-sunatm.c \
@@ -158,7 +164,6 @@ SRCS+=	print-babel.c \
 	print-dhcp6.c \
 	print-frag6.c \
 	print-icmp6.c \
-	print-ip6.c \
 	print-ip6opts.c \
 	print-mobility.c \
 	print-ospf6.c \
diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h
index 84dc094b2b26..a3e6f3ddb6f5 100644
--- a/usr.sbin/tcpdump/tcpdump/config.h
+++ b/usr.sbin/tcpdump/tcpdump/config.h
@@ -23,8 +23,8 @@
 /* Define to 1 if you have the `cap_ioctls_limit' function. */
 #define HAVE_CAP_IOCTLS_LIMIT 1
 
-/* Define to 1 if you have the `cap_rights_init' function. */
-/* #undef HAVE_CAP_RIGHTS_INIT */
+/* Define to 1 if you have the  header file. */
+/* #undef HAVE_CAP_NG_H */
 
 /* Define to 1 if you have the `cap_rights_limit' function. */
 #define HAVE_CAP_RIGHTS_LIMIT 1
@@ -60,6 +60,9 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_INTTYPES_H 1
 
+/* Define to 1 if you have the `cap-ng' library (-lcap-ng). */
+/* #undef HAVE_LIBCAP_NG */
+
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
 /* See Makefile */
 /* #undef HAVE_LIBCRYPTO */
@@ -144,6 +147,9 @@
 /* Define to 1 if you have the `pcap_set_datalink' function. */
 #define HAVE_PCAP_SET_DATALINK 1
 
+/* Define to 1 if you have the `pcap_set_immediate_mode' function. */
+#define HAVE_PCAP_SET_IMMEDIATE_MODE 1
+
 /* Define to 1 if you have the `pcap_set_tstamp_precision' function. */
 #define HAVE_PCAP_SET_TSTAMP_PRECISION 1
 
@@ -219,6 +225,9 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_SYS_TYPES_H 1
 
+/* Define to 1 if the system has the type `uintptr_t'. */
+#define HAVE_UINTPTR_T 1
+
 /* Define to 1 if you have the  header file. */
 #define HAVE_UNISTD_H 1
 
@@ -391,3 +400,7 @@
 /* Define to the type of an unsigned integer type of width exactly 8 bits if
    such a type exists and the standard includes do not define it. */
 /* #undef uint8_t */
+
+/* Define to the type of an unsigned integer type wide enough to hold a
+   pointer, if such a type exists, and if the system does not define it. */
+/* #undef uintptr_t */
diff --git a/usr.sbin/tcpdump/tcpdump/tcpdump.1 b/usr.sbin/tcpdump/tcpdump/tcpdump.1
index bef56908db3d..2a2388c931d0 100644
--- a/usr.sbin/tcpdump/tcpdump/tcpdump.1
+++ b/usr.sbin/tcpdump/tcpdump/tcpdump.1
@@ -129,6 +129,10 @@ tcpdump \- dump traffic on a network
 [
 .BI \-\-time\-stamp\-precision= tstamp_precision
 ]
+.ti +8
+[
+.B \-\-immediate\-mode
+]
 [
 .B \-\-version
 ]
@@ -141,7 +145,9 @@ tcpdump \- dump traffic on a network
 .SH DESCRIPTION
 .LP
 \fITcpdump\fP prints out a description of the contents of packets on a
-network interface that match the boolean \fIexpression\fP.  It can also
+network interface that match the boolean \fIexpression\fP; the
+description is preceded by a time stamp, printed, by default, as hours,
+minutes, seconds, and fractions of a second since midnight.  It can also
 be run with the
 .B \-w
 flag, which causes it to save the packet data to a file for later
@@ -205,7 +211,9 @@ your ``status'' character, typically control-T, although on some
 platforms, such as Mac OS X, the ``status'' character is not set by
 default, so you must set it with
 .BR stty (1)
-in order to use it) and will continue capturing packets.
+in order to use it) and will continue capturing packets. On platforms that
+do not support the SIGINFO signal, the same can be achieved by using the
+SIGUSR1 signal.
 .LP
 Reading packets from a network interface may require that you have
 special privileges; see the
@@ -420,6 +428,13 @@ monitor mode will be shown; if
 is specified, only those link-layer types available when in monitor mode
 will be shown.
 .TP
+.BI \-\-immediate\-mode
+Capture in "immediate mode".  In this mode, packets are delivered to
+tcpdump as soon as they arrive, rather than being buffered for
+efficiency.  This is the default when printing packets rather than
+saving packets to a ``savefile'' if the packets are being printed to a
+terminal rather than to a file or pipe.
+.TP
 .BI \-j " tstamp_type"
 .PD 0
 .TP
@@ -656,14 +671,16 @@ an encapsulated PGM packet.
 \fIDon't\fP print a timestamp on each dump line.
 .TP
 .B \-tt
-Print an unformatted timestamp on each dump line.
+Print the timestamp, as seconds since January 1, 1970, 00:00:00, UTC, and
+fractions of a second since that time, on each dump line.
 .TP
 .B \-ttt
 Print a delta (micro-second resolution) between current and previous line
 on each dump line.
 .TP
 .B \-tttt
-Print a timestamp in default format proceeded by date on each dump line.
+Print a timestamp, as hours, minutes, seconds, and fractions of a second
+since midnight, preceded by the date, on each dump line.
 .TP
 .B \-ttttt
 Print a delta (micro-second resolution) between current and first line