Update our ntpd to the long awaited 4.2.0 version.

This bring us several things:
- updated drivers
- IPv6 support at last
- ntp-genkeys is replaced by ntp-keygen
- ntptrace is now a script (courtesy of John Hay)
- lots of renamed files from .htm to .html (while I prefer .html, I
  find the change a bit gratuitous)
- still no manpages :(

Please test and report.

Commit very much helped by: GNU arch (http://gnuarch.org/)

2 files changed, 19 insertions, 226 deletions

diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile
index b52cae4..fd6a195 100644
--- a/usr.sbin/ntp/doc/Makefile
+++ b/usr.sbin/ntp/doc/Makefile
@@ -4,26 +4,27 @@ MAINTAINER=	sheldonh
 
 FILESDIR=	${SHAREDIR}/doc/ntp
 
-FILES=	accopt.htm assoc.htm audio.htm authopt.htm biblio.htm build.htm \
-	clockopt.htm \
-	config.htm confopt.htm copyright.htm debug.htm driver1.htm \
-	driver10.htm driver11.htm driver12.htm driver16.htm driver18.htm \
-	driver19.htm driver2.htm driver20.htm driver22.htm driver23.htm \
-	driver24.htm driver26.htm driver27.htm driver28.htm driver29.htm \
-	driver3.htm driver30.htm driver32.htm driver33.htm driver34.htm \
-	driver35.htm driver36.htm driver37.htm \
-	driver4.htm driver5.htm driver6.htm driver7.htm driver8.htm \
-	driver9.htm exec.htm extern.htm gadget.htm hints.htm \
-	howto.htm htmlprimer.htm index.htm kern.htm kernpps.htm \
-	ldisc.htm measure.htm miscopt.htm monopt.htm mx4200data.htm \
-	notes.htm ntpd.htm ntpdate.htm ntpdc.htm ntpq.htm ntptime.htm \
-	ntptrace.htm parsedata.htm parsenew.htm patches.htm porting.htm \
-	pps.htm prefer.htm qth.htm quick.htm rdebug.htm refclock.htm \
-	release.htm tickadj.htm
+FILES=	accopt.html assoc.html audio.html authopt.html build.html \
+	clockopt.html \
+	config.html confopt.html copyright.html debug.html driver1.html \
+	driver10.html driver11.html driver12.html driver16.html driver18.html \
+	driver19.html driver2.html driver20.html driver22.html driver23.html \
+	driver24.html driver26.html driver27.html driver28.html driver29.html \
+	driver3.html driver30.html driver32.html driver33.html driver34.html \
+	driver35.html driver36.html driver37.html \
+	driver4.html driver5.html driver6.html driver7.html driver8.html \
+	driver9.html extern.html hints.html \
+	howto.html index.html kern.html \
+	ldisc.html measure.html miscopt.html monopt.html mx4200data.html \
+	notes.html ntpd.html ntpdate.html ntpdc.html ntpq.html ntptime.html \
+	ntptrace.html parsedata.html parsenew.html patches.html porting.html \
+	pps.html prefer.html quick.html rdebug.html refclock.html \
+	release.html tickadj.html
 
 MAN=	ntp.conf.5 ntp.keys.5
-MAN+=	ntp-genkeys.8 ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 ntptrace.8
+MAN+=	ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 ntptrace.8
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/html
+.PATH: ${.CURDIR}/../../../contrib/ntp/html \
+	${.CURDIR}/../../../contrib/ntp/html/drivers
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/doc/ntp-genkeys.8 b/usr.sbin/ntp/doc/ntp-genkeys.8
deleted file mode 100644
index c5c41dd..0000000
--- a/usr.sbin/ntp/doc/ntp-genkeys.8
+++ /dev/null
@@ -1,208 +0,0 @@
-.\"
-.\" $FreeBSD$
-.\"
-.Dd August 2, 2001
-.Dt NTP_GENKEYS 8
-.Os
-.Sh NAME
-.Nm ntp-genkeys
-.Nd generate public and private keys
-.Sh SYNOPSIS
-.Nm
-.Op Fl dfhlnt
-.Op Fl c Ar conffile
-.Op Fl g Ar target
-.Op Fl k Ar keyfile
-.Sh DESCRIPTION
-The
-.Nm
-utility generates random keys used by either or both the
-NTPv3/NTPv4 symmetric key or the NTPv4 public key (Autokey)
-cryptographic authentication schemes.
-.Pp
-The following options are available:
-.Bl -tag -width indent
-.It Fl c Ar conffile
-Location of
-.Xr ntp.conf 5
-file.
-.It Fl d
-enable debug messages (can be used multiple times)
-.It Fl f
-force installation of generated keys.
-.It Fl g target
-Generate file or files indicated by the characters in the
-.Ar target
-string:
-.Bl -tag -width X
-.It Li d
-Generate D-H parameter file.
-.It Li m
-Generate MD5 key file.
-.It Li r
-Generate RSA keys.
-.El
-.It Fl h
-Build keys here (current directory).
-Implies
-.Fl l .
-.It Fl k Ar keyfile
-Location of key file.
-.It Fl l
-Do not make the symlinks.
-.It Fl n
-Do not actually do anything, just say what would be done.
-.It Fl t
-Trash the (old) files at the end of symlink.
-.El
-.Pp
-By default the program
-generates the
-.Xr ntp.keys 5
-file containing 16 random symmetric
-keys.
-In addition, if the
-rsaref20
-package is configured
-for the software build, the program generates cryptographic values
-used by the Autokey scheme.
-These values are incorporated as a set
-of three files,
-.Pa ntpkey
-containing the RSA private key,
-.Pa ntpkey_ Ns Ar host
-containing the RSA public key, where
-.Ar host
-is the DNS name of the generating machine, and
-.Pa ntpkey_dh
-containing the parameters for the Diffie-Hellman
-key-agreement algorithm.
-All files and are in printable ASCII
-format.
-A timestamp in NTP seconds is appended to each.
-Since the
-algorithms are seeded by the system clock, each run of this program
-produces a different file and file name.
-.Pp
-The
-.Xr ntp.keys 5
-file contains 16 MD5 keys.
-Each key
-consists of 16 characters randomized over the ASCII 95-character
-printing subset.
-The file is read by the daemon at the location
-specified by the
-.Ic keys
-configuration file command and made
-visible only to root.
-An additional key consisting of an easily
-remembered password should be added by hand for use with the
-.Xr ntpq 8
-and
-.Xr ntpdc 8
-programs.
-The file must be
-distributed by secure means to other servers and clients sharing
-the same security compartment.
-While the key identifiers for MD5
-and DES keys must be in the range 1-65534, inclusive, the
-.Nm
-utility uses only the identifiers from 1 to
-16.
-The key identifier for each association is specified as the key
-argument in the
-.Ic server
-or
-.Ic peer
-configuration file command.
-.Pp
-The
-.Pa ntpkey
-file contains the RSA private key.
-It is
-read by the daemon at the location specified by the
-.Ar privatekey
-argument of the
-.Ic crypto
-configuration
-file command and made visible only to root.
-This file is useful
-only to the machine that generated it and never shared with any
-other daemon or application program.
-.Pp
-The
-.Pa ntpkey_ Ns Ar host
-file contains the RSA public
-key, where
-.Ar host
-is the DNS name of the host that
-generated it.
-The file is read by the daemon at the location
-specified by the
-.Ar publickey
-argument to the
-.Ic server
-or
-.Ic peer
-configuration file command.
-This file can be
-widely distributed and stored without using secure means, since the
-data are public values.
-.Pp
-The
-.Pa ntp_dh
-file contains two Diffie-Hellman parameters:
-the prime modulus and the generator.
-The file is read by the daemon
-at the location specified by the
-.Ar dhparams
-argument of the
-.Ic crypto
-configuration file command.
-The file can be
-distributed by insecure means to other servers and clients sharing
-the same key agreement compartment, since the data are public
-values.
-.Pp
-The file formats begin with two lines, the first containing the
-generating system DNS name and the second the datestamp.
-Lines
-beginning with
-.Ql #
-are considered comments and ignored by
-the daemon.
-In the
-.Xr ntp.keys 5
-file, the next 16 lines
-contain the MD5 keys in order.
-If necessary, this file can be
-further customized by an ordinary text editor.
-The format is
-described in the following section.
-In the
-.Pa ntpkey
-and
-.Pa ntpkey_ Ns Ar host
-files, the next line contains the
-modulus length in bits followed by the key as a PEM encoded string.
-In the
-.Pa ntpkey_dh
-file, the next line contains the prime
-length in bytes followed by the prime as a PEM encoded string, and
-the next and final line contains the generator length in bytes
-followed by the generator as a PEM encoded string.
-.Pp
-Note: See the file
-.Pa ./source/rsaref.h
-in the
-rsaref20
-package for explanation of return values, if
-necessary.
-.Sh SEE ALSO
-.Xr ntp.keys 5 ,
-.Xr ntpdc 8 ,
-.Xr ntpq 8
-.Sh BUGS
-It can take quite a while to generate the RSA public/private key
-pair and Diffie-Hellman parameters, from a few seconds on a modern
-workstation to several minutes on older machines.