Commit Graph

179 Commits

Author SHA1 Message Date
Simon J. Gerraty
cc3f4b9965 Merge from head 2014-05-08 23:54:15 +00:00
Warner Losh
c6063d0da8 Use src.opts.mk in preference to bsd.own.mk except where we need stuff
from the latter.
2014-05-06 04:22:01 +00:00
Simon J. Gerraty
3b8f084595 Merge head 2014-04-28 07:50:45 +00:00
Warner Losh
3bdf775801 NO_MAN= has been deprecated in favor of MAN= for some time, go ahead
and finish the job. ncurses is now the only Makefile in the tree that
uses it since it wasn't a simple mechanical change, and will be
addressed in a future commit.
2014-04-13 05:21:56 +00:00
Dag-Erling Smørgrav
7661de35d1 We install the tool, so why not the man page?
MFC after:	3 days
2014-02-27 13:05:56 +00:00
Simon J. Gerraty
3caf0790a8 Merge head@256284 2013-10-13 02:35:19 +00:00
Simon J. Gerraty
34b33809b7 Updated dependencies 2013-10-13 00:24:00 +00:00
Ollivier Robert
be77ef1b5f Meinberg clocks support was inadvertently removed during the last vendor
import.  Add it back.

PR:		bin/182545
Submitted by:	Joerg Pulz <Joerg.Pulz@frm2.tum.de>
Approved by:	re (delphij)
MFC after:	1 week
2013-10-02 21:47:25 +00:00
Simon J. Gerraty
7cf3a1c6b2 Updated dependencies 2013-03-11 17:21:52 +00:00
Simon J. Gerraty
f5f7c05209 Updated dependencies 2013-02-16 01:23:54 +00:00
Simon J. Gerraty
7cd2dcf076 Updated/new Makefile.depend 2012-11-08 21:24:17 +00:00
Marcel Moolenaar
7750ad47a9 Sync FreeBSD's bmake branch with Juniper's internal bmake branch.
Requested by: Simon Gerraty <sjg@juniper.net>
2012-08-22 19:25:57 +00:00
Glen Barber
7b1d17a1bc General mdoc(7) and typo fixes.
PR:		167804
Submitted by:	Nobuyuki Koganemaru (kogane!jp.freebsd.org)
MFC after:	3 days
2012-05-12 15:08:22 +00:00
Joel Dahl
c0cbd1c6f1 Remove superfluous paragraph macro. 2012-03-25 09:18:34 +00:00
Ulrich Spörlein
3df5ecac8c Spelling fixes for usr.sbin/ 2011-12-30 10:58:14 +00:00
David E. O'Brien
1e3f14466b * Add the readline(3) API to libedit. The libedit versions of
{readline,history}.h are in /usr/include/edit so as to not conflict with
  the GNU libreadline versions.  To use the libedit readline(3) one should
  add "-I/usr/include/edit" to their Makefile
  (spelled "-I${DESTDIR}/${INCLUDEDIR}/edit" within the FreeBSD source tree).

* Enable its use in the BSD licensed utilities that support readline(3).

* To make it easier to sync libedit development with NetBSD, histedit.h
  is moved into libedit's directory as history shows shown we keep merging
  it into that location.

Obtained from:	NetBSD
Sponsored by:	Juniper Networks
2011-04-05 18:41:01 +00:00
Ulrich Spörlein
c9bb895ec8 Fix some duplicate-word typos in manpages.
Submitted by:	arundel
MFC after:	1 week
2011-03-02 21:59:53 +00:00
Gleb Smirnoff
d48088aab1 Enable the shared memory reference clock driver. The GPS devices are
getting more and more popular, as source of precise time, and the gpsd
daemon from ports is using the shared memory to synchronize with ntpd.

Reviewed by:	roberto
2010-10-14 11:20:23 +00:00
Joel Dahl
f6ac23919b Fix typos and spelling mistakes. 2010-08-06 14:33:42 +00:00
Benedict Reuschling
fdb2feee16 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
2010-05-18 18:14:12 +00:00
Antoine Brodin
b8cf11192e Complete ntptrace(8) removal:
- do not install man page
- update ObsoleteFiles.inc

Approved by:	roberto@
2010-01-03 22:29:06 +00:00
Ed Schouten
71ccf09269 The last big commit: let usr.sbin/ use WARNS=6 by default. 2010-01-02 11:07:44 +00:00
Ed Schouten
918592df59 Disable the unneeded inclusion of <utmp.h>.
The utmp code in systime.c is not enabled, so including <utmp.h> has no
effect in our setup. This makes it a little easier for me to migrate to
<utmpx.h>.

Approved by:	roberto
2009-12-26 18:32:35 +00:00
Ollivier Robert
09d432fc4a ntpd 4.2.4p8 is now in the tree, ntptrace is dead RIP.
Security:	CVE-2009-3563
2009-12-15 14:59:58 +00:00
Ed Maste
6ff4bdaef5 Correct typo: thetime -> the time
PR:		docs/139447
Submitted by:	Guido Falsi  mad at madpilot dot net
2009-10-13 12:56:23 +00:00
Colin Percival
96a65baf76 Apply the ntp-related part of r195626 to the correct part of the tree --
the mkver which is used in builds is the one in usr.sbin/ntp/scripts,
not the one in contrib/ntp/scripts.

Pointy hat to:	cperciva
Approved by:	re (rwatson)
2009-08-12 11:55:26 +00:00
Daniel Gerzo
9adaba2ecc - fix typo
PR:		docs/128973
Submitted by:	tabthorpe
2008-11-18 23:38:47 +00:00
Ollivier Robert
943b1a0f32 Makefile.inc already defines OPENSSL if crypto is available/wanted.
PR:		bin/127296
Submitted by:	oliver
MFC after:	3 days
2008-09-11 20:32:06 +00:00
Ollivier Robert
d9759c011c Allow again compilation w/o GNU readline. There are conditionals in
{ntpdc,ntpq}/Makefile.

Submitted by:	Ben Kelly <bkelly@vadev.org>
2008-09-02 14:00:17 +00:00
Ollivier Robert
867624a678 Use the correct systime.c file instead of the "simulation mode" one.
Should fix the current weirdness in ntpd/ntpdate where the current system
time is not read/updated.

Submitted by:	naddy
MFC after:	2 weeks
Pointy hat to:	me
2008-08-24 23:28:56 +00:00
Ollivier Robert
718daf0805 Add forgotten libopts subdir.
MFC after:	2 weeks
2008-08-22 20:04:35 +00:00
Ollivier Robert
271c3a9060 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
2008-08-22 16:00:48 +00:00
Motoyuki Konno
226095ae8b 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
2007-06-12 13:28:55 +00:00
Chin-San Huang
18ecc1de7a - Fix typo in ntpd(8).
Noticed by:	Ben Kaduk (minimarmot _at_ gmail.com)
Approved by:	delphij@ (mentor)
2007-04-02 04:18:49 +00:00
Ceri Davies
c9ffd81332 Fix typo. 2006-12-31 18:53:45 +00:00
Ceri Davies
af0673c204 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
2006-12-21 19:08:25 +00:00
Ruslan Ermilov
66f6e0e5df Revise markup. 2006-09-30 19:07:03 +00:00
Ruslan Ermilov
bc84aa4ba3 Markup fixes. 2006-09-29 17:57:04 +00:00
Pav Lucistnik
1572020a71 - Fix markup
PR:		docs/98471
Submitted by:	Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
MFC after:	1 day
2006-06-04 15:39:19 +00:00
Pav Lucistnik
a0ff005ba5 - Update to ntp-4.2.0
PR:		docs/79857
Submitted by:	Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
2006-05-17 10:50:35 +00:00
Ruslan Ermilov
e1fe3dba5c 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)
2006-03-17 18:54:44 +00:00
Ruslan Ermilov
897c6f17c9 If we don't want HTML docs, we might still want manpages.
If we don't want manpages, we might still want HTML docs.
2006-03-15 11:17:31 +00:00
Ruslan Ermilov
d14ab6edd5 Add NO_OBJ, remove redundant SCRIPTSNAME. 2005-09-28 07:52:27 +00:00
Giorgos Keramidas
6fb9b618f5 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.
2005-07-31 03:30:48 +00:00
Ollivier Robert
c0027f5b49 Add Meinberg clocks to the default ntpd. It contains both a DCF77 and a GPS
receiver.

PR:				bin/78207
Submitted by:	Joerg Pulz <Joerg.Pulz@frm2.tum.de>
Approved by:    re (scottl)
2005-06-23 21:37:27 +00:00
Dag-Erling Smørgrav
ee66677a7a Remove kludges intended to support src trees with partial obj trees.
Discussed with:	ru
2005-06-10 06:12:53 +00:00
Giorgos Keramidas
8b5db03764 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>
2005-06-09 11:25:50 +00:00
Sheldon Hearn
ff7f0e8636 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.
2005-05-25 16:30:43 +00:00
Ruslan Ermilov
0227791b40 Expand *n't contractions. 2005-02-13 22:25:33 +00:00
Ruslan Ermilov
254dd1666e Let bsd.prog.mk set SRCS and MAN to their default values. 2005-01-28 16:08:11 +00:00
Ruslan Ermilov
a216173556 NOCRYPT -> NO_CRYPT 2004-12-21 10:16:04 +00:00
Ruslan Ermilov
e653b48c80 Start the dreaded NOFOO -> NO_FOO conversion.
OK'ed by:	core
2004-12-21 08:47:35 +00:00
Ruslan Ermilov
a35d88931c For variables that are only checked with defined(), don't provide
any fake value.
2004-10-24 15:33:08 +00:00
Simon L. B. Nielsen
3127ce5d60 Fix typo.
Submitted by:	Patrick Oonk <patrick@cookie.monster.org>
PR:		docs/72912
MFC after:	1 week
2004-10-20 10:11:12 +00:00
Ollivier Robert
76d3d14692 ntptimeset is not build anymore by default so remove it for the time being.
Prodded by:	imp
2004-08-13 09:10:38 +00:00
Colin Percival
d37df47d31 Join the 21st century: Cryptography is no longer an optional component
of releases.  The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.

Approved by:	re (scottl), markm
Discussed on:	freebsd-current, in late April 2004
2004-08-06 07:27:08 +00:00
Ollivier Robert
e47c4441d3 mlockall(2) was introduced during the 5.0-CURRENT lifetime. 2004-07-25 22:02:30 +00:00
Ollivier Robert
0883223a5f Include support for NOCRYPT & NO_OPENSSL world.
It does survive « make release ».

Uses an upcoming patch from the vendor branch (ntp-stable) of ntp-keygen.

Submitted by:	Marius Strobl <marius@alchemy.franken.de>
2004-07-22 09:10:52 +00:00
Ollivier Robert
5c1361654f Correct another cut/paste mistake. Sorry folks.
Pointy hat to:	me
Submitted by:	Marius Strobl <marius@alchemy.franken.de>
2004-07-22 08:38:14 +00:00
Ollivier Robert
065c74d54b Remove arlib (libares.a) from the build. It is not IPv6 compatible, not
really tested and probably not 64 bits-safe.

Discussed with:	Harlann Stenn <www.ntp.org>
2004-07-22 08:35:41 +00:00
Ollivier Robert
4384c42d17 Correct a cut/paste error. 2004-07-22 08:32:17 +00:00
Ollivier Robert
d060ebf7b2 Allow ntpd to be compiled w/o readline when NO_GNU is defined. Part of a
larger patchset to get a GNU-free world.

Patch rewritten to cope with the 4.2.0 changes.

Submitted by:	des
2004-07-22 08:14:37 +00:00
Ollivier Robert
c98323078d Add missing Makefile from previous commit. 2004-07-20 15:45:04 +00:00
Ollivier Robert
6cb84f0c29 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/)
2004-07-20 15:44:32 +00:00
Ruslan Ermilov
455fb174df Eliminated double whitespace. 2004-07-03 18:35:53 +00:00
Ruslan Ermilov
07bfccd71e Mechanically kill hard sentence breaks. 2004-07-02 23:13:00 +00:00
Colin Percival
0bf534c254 Add missing spaces after "logconfig" in example lines.
PR:		docs/64082
Submitted by:	Tsurutani Naoki
MFC after:	3 days
2004-03-13 09:51:43 +00:00
Maxim Sobolev
a5a1c411b0 Xref police: ntp.conf(8) -> ntp.conf(5). 2003-06-17 09:51:17 +00:00
Ollivier Robert
b6bf7843a3 Follow the trend of moving MAINTAINER lines from Makefile into
src/MAINTAINERS.
2003-06-05 05:03:01 +00:00
David E. O'Brien
052238b16c style.Makefile(5) 2003-04-04 17:49:21 +00:00
Jens Schweikhardt
9d5abbddbf Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup,
especially in troff files.
2003-01-01 18:49:04 +00:00
Jens Schweikhardt
d64ada501a Fix typos, mostly s/ an / a / where appropriate and a few s/an/and/
Add FreeBSD Id tag where missing.
2002-12-30 21:18:15 +00:00
Jens Schweikhardt
57bd0fc6e8 english(4) police. 2002-12-27 12:15:40 +00:00
Ruslan Ermilov
facc67676f mdoc(7) police: Deal with self-xrefs. 2002-12-24 13:41:48 +00:00
Ruslan Ermilov
8d5d039f80 Uniformly refer to a file system as "file system".
Approved by:	re
2002-12-12 17:26:04 +00:00
Ruslan Ermilov
34eafd490b mdoc(7) police: kill whitespace at EOL.
Approved by:	re
2002-11-27 15:25:07 +00:00
Ollivier Robert
ef7b1083bb These two patches makes it easier to compile custom versions of
NTP on FreeBSD:

The first one allows one to avoid installing the html files.

The second one allows one to override the CLOCKDEFS on the
make command line.

Submitted by:	phk
2002-11-16 08:06:43 +00:00
Ollivier Robert
e265e481d7 Update ntpd to 4.1.1b. There are two new drivers and the usual bunch of
fixes. See contrib/ntp/ChangeLog for details.

MFC after:	1 month
Prodded by:	jhay
Tested on:	sparc64 (panther), alpha (beast) and i386.
2002-11-04 19:44:26 +00:00
Ollivier Robert
a5b1043f74 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
2002-10-29 20:20:36 +00:00
Philippe Charnier
490d5836b5 The .Nm utility 2002-07-14 14:47:15 +00:00
Jens Schweikhardt
148aadf8bc Fix spelling errors: minumum, overriden, inheritted
MFC after:	3 weeks
2002-06-02 10:41:43 +00:00
Tom Rhodes
67c8020f12 Consistancy check: s/file system/filesystem/g 2002-05-16 02:28:39 +00:00
Ruslan Ermilov
46f8fdc34e Removed now unused INTERNALSTATICLIB.
INTERNALLIB now implies NOPIC and NOPROFILE.
Removed gratuitous NOMAN.
2002-05-13 11:09:07 +00:00
Sheldon Hearn
3419a3b021 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>
2002-04-02 08:55:49 +00:00
Sheldon Hearn
73e0ebaf27 There are 4 key formats, not 3.
PR:		33586
Submitted by:	Norihiro Kumagai <kuma@12-225-156-18.client.attbi.com>
2002-04-02 08:47:56 +00:00
Ollivier Robert
a6f7ec3ba2 Correct typos and macro usage.
PR:		33179, 33181, 33295
Submitted by:	Norihiro Kumagai <kumagai@attbi.com>
Reviewed by:	sheldonh (MAINTAINER)
MFC after:	2 days
2002-01-21 20:12:02 +00:00
Ruslan Ermilov
dbee1004f9 Install files via FILES. 2001-12-17 16:21:59 +00:00
Ruslan Ermilov
3f7ec6a843 Re-connect NTP docs to build. 2001-11-27 13:20:07 +00:00
Ruslan Ermilov
51845aff29 mdoc(7) police: This still can be done with one-line display. 2001-09-04 14:10:41 +00:00
Bruce Evans
2b51efa03a Fixed breakage of NOSHARED worlds in previous commit. -lreadline was
added but not its postrequisite -ltermcap.

Fixed breakage of DPADD in previous commit.  ${LIBREADLINE} was misspelled
-lreadline.  This should have been fatal since there is no file named
-lreadline, but it worked because of an undcumented bugfeature in make(1)
(or its configuration files): missing source files named -l* are silently
assumed to be up to date libraries.  `make checkdpadd' also fails to detect
this error.
2001-08-30 10:37:28 +00:00
Ollivier Robert
b545166c6e Add forgotten ntp-genkeys directory/Makefile. 2001-08-29 16:23:52 +00:00
Sheldon Hearn
083a83a73e Connect the new ntp-genkeys.8 page to the build. 2001-08-29 15:46:46 +00:00
Ollivier Robert
7f81b32fea Update for the import of 4.1.0. 2001-08-29 15:03:54 +00:00
Sheldon Hearn
f3277e826c 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.
2001-08-29 14:50:56 +00:00
Ruslan Ermilov
94ba280c59 mdoc(7) police: join split punctuation to macro calls. 2001-08-10 17:35:21 +00:00
Sheldon Hearn
f42dadce1e Miscellaneous fixes.
In particularly, the -h and -m flags were incorrectly described.
2001-08-03 11:31:39 +00:00
David E. O'Brien
90e655ea4e Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.
2001-07-20 06:20:32 +00:00
Ruslan Ermilov
5521ff5a4d mdoc(7) police: sort SEE ALSO xrefs (sort -b -f +2 -3 +1 -2). 2001-07-06 16:46:48 +00:00
Ruslan Ermilov
345e52e742 - Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.
2001-03-26 14:42:20 +00:00
Ruslan Ermilov
afcf05e46a setlocale(3) has been fixed to match POSIX standard:
LC_ALL takes precedence over other LC_* envariables.
2001-03-02 16:52:14 +00:00