Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3cc50613txbdnQgiXLvTuQVSNAUukg

Fix the header problem with the simulator.

bk: 3cc50555TNZI0aEoNh052Q-MnoXdYQ

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3cc4b6583F68gwDV1vgEhC2C5MmUaQ

Simulator option fixes.
libntpsim.a dependency cleanup.

bk: 3cc4b5a9c4spNf8iiS27u_PhZzhPZg

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3cbf7208ZkwTifGVIlu5Vaz484pKnQ

We still need to distribute ntptrace/ .

bk: 3cbf7060JovFnrAQleRzpOA-lQJtvw

IPV6 cleanup of the simulator patches.

bk: 3cbe72cfjRN6w61SuLPJJlNSG5e1vw

Simulator auto* changes from Harlan.
Crypto changes from Dave.
Simulator code from Harish Nair <hari@udel.edu>.

bk: 3cbe7047LLFdyDTNSL-KcWPR_3e_5g

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3cbe6537vUU3P0dRtKXAomC3esXN2w

Crypto improvements from Dave.

bk: 3cbe6442qnlrU0W-T7BQjAhNu9UYCQ

Merge

bk: 3cafd4c7LGRCHyMrAFDJSm3sL_RWGg

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3cad5329DBvHSXmmKtPNFz60sRUzgw

Dave made a lot of improvements and changes to ntp_crypto.c .

bk: 3cad4fe0AjoFJLOI80ZVs092oUiihQ

ipv6 cleanup.

bk: 3caaba841gvkl59nvqgc1IC2a4vWSg

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3caa905cjpEz0EPia2fTkXpIb73P_g

expire_all(): Call resetmanycast() before we leave.

bk: 3caa8f6aAfcWpmxMGReWH9p0PXhzxA

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3ca6c379QN5C7EVv-y2Q3vyl_YJR3A

Merge whimsy.udel.edu:/backroom/ntp-stable
into whimsy.udel.edu:/backroom/ntp-dev

bk: 3ca6c2be53Q2P3uIUBk4bTNfXv61qQ

Trigger improvements/fixes.

bk: 3ca6c208i6DROk2m-YuO1S3O9xJNYg

Trigger cleanup.

bk: 3ca6be7fdE_l_HYCl6wmj4uvv5yLVw

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3ca6a3278G4UuUytqDttazkviyHThQ

Generate the ntptrace script.

bk: 3ca6a1c2tr3EdMJxXnt7QcSSb0Djow

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3ca69aba_90UvuvEOJReNqLaAnRF0A

Ntptrace: out with the old, in with the new...

bk: 3ca69963YLNVo2_l7dNjXzHmLoDsWQ

Merge resolution

bk: 3ca675dbx35Y6tAxCtvEtNQVzVtrAw

Local variable cleanup for OpenSSL.

bk: 3ca672fa96FqmpzuFY-DcOHBaTnNHw

Merge resolution.

bk: 3ca55f29F_HaWn5W-EVNbN1F9SrIdw

Merge resolution.

bk: 3ca55b36o5TFVUb-ok0qhm8KfAapiA

clocktypes.c, ntp.h:
  Add REFCLK_TT560.

bk: 3ca55752bBlBOa19O9TYBwATOxK2fg

Merge cleanup.

bk: 3ca54c43TlMy-8l1hi6-4RmTni3Ttw

Typo fix.

bk: 3ca54146PySq5MfG3qQxpRM_NDrRXg

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-hms

bk: 3ca54078u0RIZCMEUFQyJIHtAXZ4oA

ntp_config.h:
  Add CONF_CRYPT_KEYS.

bk: 3ca53e05tU5kg9_MtboXXiP-tCYU0A

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-hms

bk: 3ca531d97_xJLK7QXIhoHR7Jx0Veyg

ntp_proto.c:
  For burst, use NTP_BURST instead of NTP_SHIFT for peer->burst.
ntp_peer.c:
  Improve statstr diagnostic message.
ntp_crypto.c:
  Dave made a ton of changes and improvements.
ntp_control.c:
  Add REFCLOCK_TT560 (Harlan)
  Code cleanup (Dave)
ntp_config.c:
  Added "keysdir" and CRYPTO_CONF_KEYS.
ntp.h:
  Added NTP_BURST and FLAG_CLUST.
  Changed the X509 version variable name.
Makefile.am:
  Disable all installation for now. (Harlan)

bk: 3ca529d4s9AxZZnYHjMR_KHUwLASRw

Backport the TrueTime 560 IRIG driver so the clock numbers
don't change on the Zyfer.

bk: 3ca3aff8Cyq-NZ0Fv_X8-3zuDS_LDw

Finish the integration of strstr.c

bk: 3ca12772NnzW3ZEE_WBPHwzAY5VUCQ

ntp-stable -> ntp-dev integration wibbles.

bk: 3ca11eecJbmm0bg09BMXuHljipCCOA

Zyfer PPS fixes.

bk: 3ca0a058WtV0cxEkBbBsjEYSKl9QLg

Auto* cleanup.

bk: 3ca037f9ynux35tzvFRMVO0VTvYd-w

Merge bk://www.ntp.org/home/bk/ntp-stable
into dog.pfcs.com:/a/local/etc/amd.stage/spot/._d/da3s1f/src/Networking/Xntp/ntp-stable

bk: 3c9ecf90KRFw78dJZJoOSKa_6ymTJQ

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c9eb17dx4qUmrvHyLf9EoLZwt-qxQ

Merge

bk: 3c9eb016vhBPULdF_ysTjF8zw6YH3Q

configure.in: Comment out the LIBOBJS hack for ANSI2KNR.
We needed it at one time, but 2.52 doesn't need it and 2.53 hates it.

bk: 3c9eab51-1QiRP3QT2urmsv-awsBgQ

WINNT specific includes were included in wrong place.
Casting issue fixes.

bk: 3c9e6e80xvPZzo_xnYNpNgXh6DN-bw

This is a miscellaneous set of fixes necessary to build on WINNT. Some of the
fixes are errors in the non-WINNT specific areas related to type mismatches and
casting issues.

bk: 3c9d35dbq9EEm0Z35fFq9W90FF4f1A

Merge resolution.

bk: 3c9cdeb4bjIRvvaI9jRi5bCW7E4J-w

Merge stenn@whimsy.udel.edu:/backroom/ntp-dev
into dog.pfcs.com:/a/local/etc/amd.stage/spot/._d/da3s1f/src/Networking/Xntp/ntp-dev

bk: 3c9c1cd1ItrT46ej4Vv2TdAU9k3eOA

Integrate Dave's certificate changes.

bk: 3c9c1bb5IplTt5Z_etMFsxy3tbOxvg

ntp-genkeys improvements.

bk: 3c9c0e4cT-8X2eUaXFvLo5KrjLt_vw

Merge bk://www.ntp.org/home/bk/ntp-stable
into dog.pfcs.com:/a/local/etc/amd.stage/spot/._d/da3s1f/src/Networking/Xntp/ntp-stable

bk: 3c9bf105O71bTsKXvZV4AfKO6hoKcQ

libntp's Makefile.am has some additional source modules.

bk: 3c9ab008Ygfv9S2W0HU2y6C4L4m0xw

Provide strstr.c .
ntp-genkeys should be usable now.

bk: 3c9aa9faD6XYHrq1XotIKNQm6lm7jQ

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c958757NOmNFaIPrLqZAzimMouWFg

ntp-genkeys improvements.

bk: 3c9586b7BkvXRBDUMxBSVzrLPGen5g

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c9581d3SLLZCt5FoFfiLJQp3c5ZDA

ntp-genkeys is mostly functional now.  Mostly.

bk: 3c9580e5-earp-RhbAl5KjIgz8BBwg

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c9565b90S3F2nrPSNM_ueqvPdXr1g

ntp-genkeys is real close now...

bk: 3c9563fciUoJpknFbag5_XuJ6grRmw

ntp-genkeys cleanup and improvements.

bk: 3c943d0ajwdFsHuQEUVJlScZ67cmgQ

Added pps-api to EXTRA_PROGRAMS.

bk: 3c941951Jjrg1WB-xhDaLWW3eUcvFw

More progress on ntp-genkeys.

Add in the pps-api.c test program from P-HK.

bk: 3c941828yGBa-FY1i6yOw8hRvgIDTA

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c8e9afbmIs0wOmOKxuCzxelROvHTQ

Lose PUBKEY - it's really obsolete.

bk: 3c8e9a17S3GRxjUiSQO2ZIhYnDCi_A

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c8d7661ZAqgodxX0PBkgZhNtz9h6g

Make ntp-genkeys compile in the absence of OPENSSL.

bk: 3c8d12ceB3-rRTNE4aXYqUnJJn1plQ

More ntp-genkeys work.

bk: 3c8ac21f-pYYT6cNaFlL43pVqFLn_A

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c8a88dauRp2dyD_94Ijar_0Fw5PWQ

Merge stenn@whimsy.udel.edu:/backroom/ntp-dev
into dog.pfcs.com:/a/local/etc/amd.stage/spot/._d/da3s1f/src/Networking/Xntp/ntp-dev

bk: 3c8a87a7Mg7Cq8iZkqXOAAmIaxUsxQ

QNX cleanup.
From:   Dmitry Alexeyev <D.Alexeyev@qnx.org.ru>

bk: 3c8a84d20q1TBiZ9iDChkjpFSKGdgQ

ntp-genkeys: Begin the cert bitmask stuff.

bk: 3c89d328wNMT9I4gMZ19d6IX5NiBsA

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c891dd8OTL_3lQkt2EVXLqYT449gg

Include arlib/'s copying permission statement.

bk: 3c891d256cuNDRzaJXu2X8_7cBn-OA

Check in recent ntp-genkeys work.

bk: 3c887cc4TVup1MpWCKBEsDLLvNOY9Q

Merge resolution.

bk: 3c882ec6zroJO_dxtAHebiDv2jAb4g

Update config.guess and config.sub.

bk: 3c882a22G9DZw4gL40Ej7Jv6esnT_A

Take a stab at finishing the QNX patches sent in from Dmitry Alexeyev <D.Alexeyev@qnx.org.ru>

bk: 3c8824bezZ5p7nYY8NcN4yDtH_rOLg

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c8801a5iz2Uvjjfo1olVSNxBoZe7Q

Build both genkeys and ntp-genkeys while we're waiting for ntp-genkeys
to be finished.

bk: 3c880004fHm8-kuZ4tOuYVNCF3blsA

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c87fb47WIjZrKmajkXMReCXYMrL6g

audio.c: Linux doesn't do AIOGFMT and snd_chan_param.

bk: 3c87fa12GybyhLq1u06JStN3187F7Q

Merge stenn@whimsy.udel.edu:/backroom/ntp-dev
into dog.pfcs.com:/a/local/etc/amd.stage/spot/._d/da3s1f/src/Networking/Xntp/ntp-dev

bk: 3c87b340_uPw1HxbWZnzrFHtYb-upA

AC_CANONICAL_SYSTEM ($host/$target/$build) cleanup.

bk: 3c87b2baxX-mua75PPdGondYQxu1sg

Control compilation of arlib/ via --with-arlib

bk: 3c872782V60SbleIn1ewFQnC0gITzA

arlib/ checkin.

bk: 3c871986f7B_hiGYZVZkFTtjlamyUg

Add in conditional support for building the async resolver library.
We're not using this (yet).

bk: 3c831491FD0dOS5lGHy4d3mP5o57jw

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c814820Tp9WLZ8AxU_0FRItNmQfNQ

Patches to html2man.pl

bk: 3c814730M9c-nandMBe7vvv4gQkZhw

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c814420QXavtOfEGwOgeLOAENDJLg

Ignore generated man pages.

bk: 3c8140077Fc6X_dGD2gp9jpH6AYidQ

PCM_SOUND: Check for struct snd_size - apparently it's not in Linux.

bk: 3c813f58oOPbh--u6-bdeY8pcJ8vNg

Merge stenn@whimsy.udel.edu:/backroom/ntp-dev
into dog.pfcs.com:/a/local/etc/amd.stage/spot/._d/da3s1f/src/Networking/Xntp/ntp-dev

bk: 3c7e913dLbWLgek76tKGB6vGoXIiUg

Added html2man script.

From: Peter Boettcher <boettcher@ll.mit.edu>

bk: 3c7e906aq7edmElIHAhKM4nbsbgbdQ

Merge whimsy.udel.edu:/backroom/ntp-dev
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c7c7f9djjWcRqxwx2sA0AVy-qNfzQ

Resolve the automerge - ntp-dev's version number is the one we want.

bk: 3c7c7edefKdQ8vdLMy9BLiI6LLNy1g

ntp-4.1.1

bk: 3c7c5622SUWDP1yk_pk__3F3jx-Bfg

Apparently, the TPRO refclock didn't get updated when the refclockproc
structure changed the usec member to nsec.  Fix it now.

bk: 3c7b4f03F8tgxjnptCvGdVkuv5nrMQ

Generate X509v3 certificate requests.

bk: 3c7b4974siyuJDH5PHYwu1jcxx--kw

New program: util/audio-pcm, used for debugging the PCM audio stuff.

bk: 3c789467T4P0FX0U4HNHRrmKSvYCwg

Finish off the /etc/ntp.audio config file processing.

bk: 3c7893a0KQr65WMSob0T8IGKflqcGw