head	1.2;
access;
symbols
	RELENG_7_4_0_RELEASE:1.1.1.1.44.1
	RELENG_7_4:1.1.1.1.44.1.0.8
	RELENG_7_4_BP:1.1.1.1.44.1
	RELENG_7_3_0_RELEASE:1.1.1.1.44.1
	RELENG_7_3:1.1.1.1.44.1.0.6
	RELENG_7_3_BP:1.1.1.1.44.1
	RELENG_7_2_0_RELEASE:1.1.1.1.44.1
	RELENG_7_2:1.1.1.1.44.1.0.4
	RELENG_7_2_BP:1.1.1.1.44.1
	RELENG_7_1_0_RELEASE:1.1.1.1.44.1
	RELENG_6_4_0_RELEASE:1.1.1.1.34.1
	RELENG_7_1:1.1.1.1.44.1.0.2
	RELENG_7_1_BP:1.1.1.1.44.1
	RELENG_6_4:1.1.1.1.34.1.0.2
	RELENG_6_4_BP:1.1.1.1.34.1
	RELENG_7_0_0_RELEASE:1.1.1.1
	RELENG_6_3_0_RELEASE:1.1.1.1
	RELENG_7_0:1.1.1.1.0.48
	RELENG_7_0_BP:1.1.1.1
	RELENG_6_3:1.1.1.1.0.46
	RELENG_6_3_BP:1.1.1.1
	RELENG_7:1.1.1.1.0.44
	RELENG_7_BP:1.1.1.1
	RELENG_6_2_0_RELEASE:1.1.1.1
	RELENG_6_2:1.1.1.1.0.42
	RELENG_6_2_BP:1.1.1.1
	RELENG_5_5_0_RELEASE:1.1.1.1
	RELENG_5_5:1.1.1.1.0.40
	RELENG_5_5_BP:1.1.1.1
	RELENG_6_1_0_RELEASE:1.1.1.1
	RELENG_6_1:1.1.1.1.0.38
	RELENG_6_1_BP:1.1.1.1
	RELENG_6_0_0_RELEASE:1.1.1.1
	RELENG_6_0:1.1.1.1.0.36
	RELENG_6_0_BP:1.1.1.1
	RELENG_6:1.1.1.1.0.34
	RELENG_6_BP:1.1.1.1
	RELENG_5_4_0_RELEASE:1.1.1.1
	RELENG_5_4:1.1.1.1.0.32
	RELENG_5_4_BP:1.1.1.1
	RELENG_4_11_0_RELEASE:1.1.1.1
	RELENG_4_11:1.1.1.1.0.30
	RELENG_4_11_BP:1.1.1.1
	RELENG_5_3_0_RELEASE:1.1.1.1
	RELENG_5_3:1.1.1.1.0.28
	RELENG_5_3_BP:1.1.1.1
	RELENG_5:1.1.1.1.0.26
	RELENG_5_BP:1.1.1.1
	v4_2_0:1.1.1.1
	RELENG_4_10_0_RELEASE:1.1.1.1
	RELENG_4_10:1.1.1.1.0.24
	RELENG_4_10_BP:1.1.1.1
	RELENG_5_2_1_RELEASE:1.1.1.1
	RELENG_5_2_0_RELEASE:1.1.1.1
	RELENG_5_2:1.1.1.1.0.22
	RELENG_5_2_BP:1.1.1.1
	RELENG_4_9_0_RELEASE:1.1.1.1
	RELENG_4_9:1.1.1.1.0.20
	RELENG_4_9_BP:1.1.1.1
	RELENG_5_1_0_RELEASE:1.1.1.1
	RELENG_5_1:1.1.1.1.0.18
	RELENG_5_1_BP:1.1.1.1
	RELENG_4_8_0_RELEASE:1.1.1.1
	RELENG_4_8:1.1.1.1.0.16
	RELENG_4_8_BP:1.1.1.1
	RELENG_5_0_0_RELEASE:1.1.1.1
	RELENG_5_0:1.1.1.1.0.14
	RELENG_5_0_BP:1.1.1.1
	v4_1_1b:1.1.1.1
	v4_1_1a:1.1.1.1
	RELENG_4_7_0_RELEASE:1.1.1.1
	RELENG_4_7:1.1.1.1.0.12
	RELENG_4_7_BP:1.1.1.1
	RELENG_4_6_2_RELEASE:1.1.1.1
	RELENG_4_6_1_RELEASE:1.1.1.1
	RELENG_4_6_0_RELEASE:1.1.1.1
	RELENG_4_6:1.1.1.1.0.10
	RELENG_4_6_BP:1.1.1.1
	RELENG_4_5_0_RELEASE:1.1.1.1
	RELENG_4_5:1.1.1.1.0.8
	RELENG_4_5_BP:1.1.1.1
	RELENG_4_4_0_RELEASE:1.1.1.1
	RELENG_4_4:1.1.1.1.0.6
	RELENG_4_4_BP:1.1.1.1
	v4_1_0:1.1.1.1
	RELENG_4_3_0_RELEASE:1.1.1.1
	RELENG_4_3:1.1.1.1.0.4
	RELENG_4_3_BP:1.1.1.1
	RELENG_4_2_0_RELEASE:1.1.1.1
	RELENG_4_1_1_RELEASE:1.1.1.1
	PRE_SMPNG:1.1.1.1
	RELENG_4_1_0_RELEASE:1.1.1.1
	RELENG_4_0_0_RELEASE:1.1.1.1
	RELENG_4:1.1.1.1.0.2
	RELENG_4_BP:1.1.1.1
	v4_0_99b:1.1.1.1
	v4_0_98f:1.1.1.1
	DMILLS:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2008.08.22.15.58.00;	author roberto;	state dead;
branches;
next	1.1;

1.1
date	99.12.09.13.01.21;	author roberto;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.12.09.13.01.21;	author roberto;	state Exp;
branches
	1.1.1.1.34.1
	1.1.1.1.44.1;
next	;

1.1.1.1.34.1
date	2008.09.04.12.49.54;	author roberto;	state dead;
branches;
next	;

1.1.1.1.44.1
date	2008.09.03.08.49.07;	author roberto;	state dead;
branches;
next	;


desc
@@


1.2
log
@SVN rev 182007 on 2008-08-22 15:58:00Z by roberto

Merge ntpd & friends 4.2.4p5 from vendor/ntp/dist into head.  Next commit
will update usr.sbin/ntp to match this.

MFC after:	2 weeks
@
text
@Ulrich Windl <Ulrich.Windl@@rz.uni-regensburg.de> (xntpd/refclock_parse.c):
	- Added support to supply power from RS232 with CLOCK_RAWDCF.
	  Known to work with Linux 1.2.
	- Made Linux ignore parity errors with CLOCK_RAWDCF.

Ulrich Windl <Ulrich.Windl@@rz.uni-regensburg.de> (parse/util/dcfd.c):
	- Removed conflicting prototype for Linux (sscanf)
	- Corrected spelling error
	- Made Linux ignore parity errors.
	- Added support to supply power from RS232 with CLOCK_RAWDCF.

Ulrich Windl <Ulrich.Windl@@rz.uni-regensburg.de> (parse/util/testdcf.c):
	- Made Linux ignore parity errors.
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Virgin import of ntpd 4.0.98f
@
text
@@


1.1.1.1.34.1
log
@SVN rev 182752 on 2008-09-04 12:49:54Z by roberto

MFH ntpd 4.2.4p5.

Main difference with the stable/7 merge is that 6.x does not support -lrt and
the corresponding *timer functions.

Approved by:	re (kensmith)
@
text
@@


1.1.1.1.44.1
log
@SVN rev 182716 on 2008-09-03 08:49:07Z by roberto

MFH ntpd 4.2.4p5.

Approved by:	re (kensmith)
@
text
@@

