MFC r355388:

Chase r352304. The default rlimit memlock is no memory locking.

Reported by: egypcio@

MFC r338126: MFV r338092: ntp 4.2.8p12.

Relnotes: yes

MFC r330104: MFV r330102: ntp 4.2.8p11

MFC r314451,r314452,r314453,r314456,r314457,r314458,r314459,r314460,r314461,r314462,r314464,r314466,r314468,r314470,r314472,r314478:

r314451:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

The SRCTOP conversion simplifies pathing in make/displayed output.

Also, while here, change a hardcoded path to ar5523.bin.uu in the make target
with ${.ALLSRC} .

r314452:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

r314453:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

r314456:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314457:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

The SRCTOP conversion simplifies pathing in make/displayed output.

Also, while here, change a hardcoded path to ${RPCDIR}/ypupdate_prot.x in
the make targets with ${.ALLSRC} .

r314458:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314459:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314460:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314461:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314462:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

The SRCTOP conversion simplifies pathing in make/displayed output.

Also, while here, change a hardcoded path to ${RPCDIR}/ypxfrd.x in
the make targets with ${.ALLSRC} .

r314464:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314466:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314468:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

Also, use :H where possible/sensical to manipulate .CURDIR-relative paths

This simplifies pathing in make/displayed output.

r314470:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314472:

Simplify/improve idioms in usr.sbin/ntp Makefiles

- Use SRCTOP-relative paths to other directories instead of
.CURDIR-relative ones. This simplifies pathing in make/displayed output.
- Also, use :H where possible/sensical to manipulate .CURDIR-relative
paths
- Remove superfluous bsd.own.mk .includes which are already handled via
src.opts.mk .includes

r314478:

Simplify idioms in Makefiles further

- Use SRCTOP-relative paths instead of .CURDIR-relative ones where possible
- Use :H to manipulate .CURDIR in areas instead of ..-relative paths.

MFC r315871: MFV r315791: ntp 4.2.8p10.

MFC r314896:

Remove extraneous arguments and options, which don't make sense for
a file documented in volume 5.

MFC r314768:

Fix mismerge of r280849.

Reported by: des

MFC r311005

Fix up grammar.

MFC r308957: MFV r308954:

ntp 4.2.8p9.

Approved by: so

MFC r304721:

Fixup man page formatting.

Submitted by: Steve Kargl <sgk@troutmask.apl.washington.edu>
Discussed with: bjk@

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

MFV r301238:

ntp 4.2.8p8.

Security: CVE-2016-4957, CVE-2016-4953, CVE-2016-4954
Security: CVE-2016-4955, CVE-2016-4956
Security: FreeBSD-SA-16:24.ntp
With hat: so

MFV r298691:

ntp 4.2.8p7.

Security: CVE-2016-1547, CVE-2016-1548, CVE-2016-1549, CVE-2016-1550
Security: CVE-2016-1551, CVE-2016-2516, CVE-2016-2517, CVE-2016-2518
Security: CVE-2016-2519
Security: FreeBSD-SA-16:16.ntp
With hat: so

MFV r294491: ntp 4.2.8p6.

Security: CVE-2015-7973, CVE-2015-7974, CVE-2015-7975
Security: CVE-2015-7976, CVE-2015-7977, CVE-2015-7978
Security: CVE-2015-7979, CVE-2015-8138, CVE-2015-8139
Security: CVE-2015-8140, CVE-2015-8158
With hat: so

MFV r293415:

ntp 4.2.8p5

Reviewed by: cy, roberto
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D4828

META MODE: Update dependencies with 'the-lot' and add missing directories.

This is not properly respecting WITHOUT or ARCH dependencies in target/.
Doing so requires a massive effort to rework targets/ to do so. A
better approach will be to either include the SUBDIR Makefiles directly
and map to DIRDEPS or just dynamically lookup the SUBDIR. These lose
the benefit of having a userland/lib, userland/libexec, etc, though and
results in a massive package. The current implementation of targets/ is
very unmaintainable.

Currently rescue/rescue and sys/modules are still not connected.

Sponsored by: EMC / Isilon Storage Division

MFV ntp-4.2.8p4 (r289715)

Security: VuXML: c4a18a12-77fc-11e5-a687-206a8a720317
Security: CVE-2015-7871
Security: CVE-2015-7855
Security: CVE-2015-7854
Security: CVE-2015-7853
Security: CVE-2015-7852
Security: CVE-2015-7851
Security: CVE-2015-7850
Security: CVE-2015-7849
Security: CVE-2015-7848
Security: CVE-2015-7701
Security: CVE-2015-7703
Security: CVE-2015-7704, CVE-2015-7705
Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Security: http://support.ntp.org/bin/view/Main/SecurityNotice#October_2015_NTP_Security_Vulner
Sponsored by: Nginx, Inc.

Add META_MODE support.

Off by default, build behaves normally.
WITH_META_MODE we get auto objdir creation, the ability to
start build from anywhere in the tree.

Still need to add real targets under targets/ to build packages.

Differential Revision: D2796
Reviewed by: brooks imp

- remove -l option from ntpdate manpage, as it is no longer an option

Differential Revision: https://reviews.freebsd.org/D2358
Submitted by: gnn@
Approved by: wblock (mentor)
MFC after: after 1 week

MFV ntp 4.2.8p1 (r258945, r275970, r276091, r276092, r276093, r278284)

Thanks to roberto for providing pointers to wedge this into HEAD.

Approved by: roberto

Use src.opts.mk in preference to bsd.own.mk except where we need stuff
from the latter.

General mdoc(7) and typo fixes.

PR: 167804
Submitted by: Nobuyuki Koganemaru (kogane!jp.freebsd.org)
MFC after: 3 days

Remove superfluous paragraph macro.

Spelling fixes for usr.sbin/

Fix some duplicate-word typos in manpages.

Submitted by: arundel
MFC after: 1 week

Fix typos and spelling mistakes.

Add a sentence to the man page explaining that the -d option
can only be used when ntpd is compiled with DEBUG support.

PR: docs/138206
Submitted by: Oliver Pinter (oliver dot pntr at gmail dot com)
MFC after: 5 days
Approved by: roberto

Complete ntptrace(8) removal:
- do not install man page
- update ObsoleteFiles.inc

Approved by: roberto@

Correct typo: thetime -> the time

PR: docs/139447
Submitted by: Guido Falsi mad at madpilot dot net

- fix typo

PR: docs/128973
Submitted by: tabthorpe

Update the various files to sync with vendor import of 4.2.4p5.
sntp includes a copy of libopts in itself in vendor code, rewrite the
Makefile to compile and use only one copy. It is an internal library, not
installed.

MFC after: 2 weeks

Delete description of non-existent options: "-4" and "-6".

ntpd's "-4" and "-6" options are described in the original documentation
(contrib/ntp/html/ntpd.html). It may be original's doc bug.

PR: docs/112642
Submitted by: Seth Hieronymus<shieronymus@speakeasy.net>
Discussed with: ume
MFC after: 1 week

- Fix typo in ntpd(8).

Noticed by: Ben Kaduk (minimarmot _at_ gmail.com)
Approved by: delphij@ (mentor)

Fix typo.

Correct the description of minpoll and maxpoll.

Note that while later versions of the ntpd documentation use the term
"dual logarithm", the text added here is consistent with the remainder
of the current document.

PR: docs/106926
Submitted by: Jeremy Chadwick

Revise markup.

Markup fixes.

- Fix markup

PR: docs/98471
Submitted by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
MFC after: 1 day

- Update to ntp-4.2.0

PR: docs/79857
Submitted by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>

Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)

If we don't want HTML docs, we might still want manpages.
If we don't want manpages, we might still want HTML docs.

Fix all the spelling mistakes I could find in the man pages for words
that have at least 3 characters.

MFC after: 1 week
Thanks to: Music band ``Chingon''
for keeping me company while searching for these.

Document that /etc/rc.d/ntpdate will read this file to find out a list
of NTP hosts, if ntpdate_hosts is unset or empty.

PR: conf/79712
Submitted by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
mdoc text by: Matteo Riondato <rionda@gufi.org>

Release maintainership. More ambitious minds have plans for the ntp
docs. Last I heard, Harlan Stenn was considering using FreeBSD's
pages as a starting point for the ISC NTP distribution's own pages.
If that happens, everyone wins and these can go away, to be replaced
by imported versions in contrib/ntp.

Expand *n't contractions.

Fix typo.

Submitted by: Patrick Oonk <patrick@cookie.monster.org>
PR: docs/72912
MFC after: 1 week

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/)

Eliminated double whitespace.

Mechanically kill hard sentence breaks.

Add missing spaces after "logconfig" in example lines.

PR: docs/64082
Submitted by: Tsurutani Naoki
MFC after: 3 days

Xref police: ntp.conf(8) -> ntp.conf(5).

Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup,
especially in troff files.

Fix typos, mostly s/ an / a / where appropriate and a few s/an/and/
Add FreeBSD Id tag where missing.

english(4) police.

mdoc(7) police: Deal with self-xrefs.

Uniformly refer to a file system as "file system".

Approved by: re

mdoc(7) police: kill whitespace at EOL.

Approved by: re

Update ntpd to 4.1.1a. This contains many bug fixes made on the STABLE
branch and a few new drivers. See contrib/ntp/ChangeLog for details.

Hide kernel header sys/lock.h from ntp [1]

PR: bin/33914
Submitted by: thomas, bde[1]
MFC after: 1 month

The .Nm utility

Fix spelling errors: minumum, overriden, inheritted

MFC after: 3 weeks

Consistancy check: s/file system/filesystem/g

Various fixes, mostly for problems introduced by my mdoc transcription,
rather than problems that existed in the original HTML "source".

PR: docs/33585
Submitted: Norihiro Kumagai <kumagai@attbi.com>

There are 4 key formats, not 3.

PR: 33586
Submitted by: Norihiro Kumagai <kuma@12-225-156-18.client.attbi.com>

Correct typos and macro usage.

PR: 33179, 33181, 33295
Submitted by: Norihiro Kumagai <kumagai@attbi.com>
Reviewed by: sheldonh (MAINTAINER)
MFC after: 2 days

Install files via FILES.

mdoc(7) police: This still can be done with one-line display.

Connect the new ntp-genkeys.8 page to the build.

Update the mdoc NTP documentation transcribed from the HTML documentation
for ntp-4.1.0.

Unfortunately, David Mills insists on managing the documentation in
such a way as to make it impossible for me to make things easy on our
translators, without printing out the documentation and reading through
it side-by-side with a finger on each page.

mdoc(7) police: join split punctuation to macro calls.

Miscellaneous fixes.

In particularly, the -h and -m flags were incorrectly described.

mdoc(7) police: sort SEE ALSO xrefs (sort -b -f +2 -3 +1 -2).

- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.

Preceed/preceeding are not english words. Use precede and preceding.

mdoc(7) police: split punctuation characters + misc fixes.

Prepare for mdoc(7)NG.

mdoc(7) police: use the new features of the Nm macro.

Fix cross-references which referred to xntp* instead of ntp*.

PR: 22483
Submitted by: Philipp Mergenthaler <un1i@rz.uni-karlsruhe.de>

Improve some slightly confused formatting.

Reviewed by: sheldonh

Fix more HTML -> mdoc transcription errors.

Submitted by: Kazu TAKAMUNE <takamune@avrl.mei.co.jp>

Remove trailing whitespace.

Work around mdoc macro argument limit.

PR: 18562
Submitted by: takamune@avrl.mei.co.jp (Kazu TAKAMUNE)

Work around the mdoc argument limit in the Nd name description.

PR: 18465
Submitted by: Kazu TAKAMUNE <takamune@avrl.mei.co.jp>

Fix a typo inherited from the HTML documentation:
assocation -> association

PR: 17501
Submitted by: Yoshihiko SARUMARU <mistral@imasy.org>

Replace erroneous use of Ic (internal command) with the intended
It (list item) and remove a duplicated list entry obscured by this
mistake.

PR: 17500
Submitted by: Yoshihiko SARUMARU <mistral@imasy.org>

Remove single-space hard sentence breaks. These degrade the quality
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.

Merge into the manual pages the changes from 4.0.99b:
ntpd.8:
add -gx to SYNOPSIS
clarify explanation of -g
ntp.conf.5:
add missing field description for rawstats lines

Install audio.htm, driver3[567].htm and qth.htm.

Add myself as ntp docs maintainer, with roberto's permission.

Move the Variables section of the old ntp_misc(8) manual page to
the correct location in the ntpd(8) page.

Abandon hope of keeping in line with the author's structure,
in favour of placing information in the correct sections.

The ntp_acc(8), ntp_auth(8), ntp_clock(8), ntp_conf(8),
ntp_misc(8) and ntp_mon(8) pages have been merged into
ntp.conf(5) and ntp.keys(5).

Requested by: rgrimes, wollman

Add selected manual pages transcribed from the HTML documentation.
Those pages which have not been transcribed are referenced as
gracefully as possible.

There is no perfect section for the ntp_* files, which document
configuration options for the NTP suite, so I'm putting them in
the same section as the pages for the utilities themselves.

Install ntp html docs as /usr/share/doc/ntp