head	1.3;
access;
symbols
	RELENG_8_4:1.3.0.8
	RELENG_9_1_0_RELEASE:1.3
	RELENG_9_1:1.3.0.6
	RELENG_9_1_BP:1.3
	RELENG_8_3_0_RELEASE:1.2
	RELENG_8_3:1.2.0.10
	RELENG_8_3_BP:1.2
	RELENG_9_0_0_RELEASE:1.3
	RELENG_9_0:1.3.0.4
	RELENG_9_0_BP:1.3
	RELENG_9:1.3.0.2
	RELENG_9_BP:1.3
	RELENG_7_4_0_RELEASE:1.1.1.3.18.1
	RELENG_8_2_0_RELEASE:1.2
	RELENG_7_4:1.1.1.3.18.1.0.8
	RELENG_7_4_BP:1.1.1.3.18.1
	RELENG_8_2:1.2.0.8
	RELENG_8_2_BP:1.2
	RELENG_8_1_0_RELEASE:1.2
	RELENG_8_1:1.2.0.6
	RELENG_8_1_BP:1.2
	RELENG_7_3_0_RELEASE:1.1.1.3.18.1
	RELENG_7_3:1.1.1.3.18.1.0.6
	RELENG_7_3_BP:1.1.1.3.18.1
	RELENG_8_0_0_RELEASE:1.2
	RELENG_8_0:1.2.0.4
	RELENG_8_0_BP:1.2
	RELENG_8:1.2.0.2
	RELENG_8_BP:1.2
	RELENG_7_2_0_RELEASE:1.1.1.3.18.1
	RELENG_7_2:1.1.1.3.18.1.0.4
	RELENG_7_2_BP:1.1.1.3.18.1
	RELENG_7_1_0_RELEASE:1.1.1.3.18.1
	RELENG_6_4_0_RELEASE:1.1.1.3.8.1
	RELENG_7_1:1.1.1.3.18.1.0.2
	RELENG_7_1_BP:1.1.1.3.18.1
	RELENG_6_4:1.1.1.3.8.1.0.2
	RELENG_6_4_BP:1.1.1.3.8.1
	RELENG_7_0_0_RELEASE:1.1.1.3
	RELENG_6_3_0_RELEASE:1.1.1.3
	RELENG_7_0:1.1.1.3.0.22
	RELENG_7_0_BP:1.1.1.3
	RELENG_6_3:1.1.1.3.0.20
	RELENG_6_3_BP:1.1.1.3
	RELENG_7:1.1.1.3.0.18
	RELENG_7_BP:1.1.1.3
	RELENG_6_2_0_RELEASE:1.1.1.3
	RELENG_6_2:1.1.1.3.0.16
	RELENG_6_2_BP:1.1.1.3
	RELENG_5_5_0_RELEASE:1.1.1.3
	RELENG_5_5:1.1.1.3.0.14
	RELENG_5_5_BP:1.1.1.3
	RELENG_6_1_0_RELEASE:1.1.1.3
	RELENG_6_1:1.1.1.3.0.12
	RELENG_6_1_BP:1.1.1.3
	RELENG_6_0_0_RELEASE:1.1.1.3
	RELENG_6_0:1.1.1.3.0.10
	RELENG_6_0_BP:1.1.1.3
	RELENG_6:1.1.1.3.0.8
	RELENG_6_BP:1.1.1.3
	RELENG_5_4_0_RELEASE:1.1.1.3
	RELENG_5_4:1.1.1.3.0.6
	RELENG_5_4_BP:1.1.1.3
	RELENG_5_3_0_RELEASE:1.1.1.3
	RELENG_5_3:1.1.1.3.0.4
	RELENG_5_3_BP:1.1.1.3
	RELENG_5:1.1.1.3.0.2
	RELENG_5_BP:1.1.1.3
	v4_2_0:1.1.1.3
	RELENG_5_2_1_RELEASE:1.1.1.2
	RELENG_5_2_0_RELEASE:1.1.1.2
	RELENG_5_2:1.1.1.2.0.6
	RELENG_5_2_BP:1.1.1.2
	RELENG_5_1_0_RELEASE:1.1.1.2
	RELENG_5_1:1.1.1.2.0.4
	RELENG_5_1_BP:1.1.1.2
	RELENG_5_0_0_RELEASE:1.1.1.2
	RELENG_5_0:1.1.1.2.0.2
	RELENG_5_0_BP:1.1.1.2
	v4_1_1b:1.1.1.2
	v4_1_1a:1.1.1.1
	DMILLS:1.1.1;
locks; strict;
comment	@# @;


1.3
date	2009.12.15.14.58.10;	author roberto;	state Exp;
branches
	1.3.8.1;
next	1.2;

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

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

1.3.8.1
date	2009.12.15.14.58.10;	author svnexp;	state dead;
branches;
next	1.3.8.2;

1.3.8.2
date	2013.03.28.13.01.44;	author svnexp;	state Exp;
branches;
next	;

1.1.1.1
date	2002.10.29.19.56.51;	author roberto;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2002.11.04.19.34.46;	author roberto;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2004.07.20.15.01.01;	author roberto;	state Exp;
branches
	1.1.1.3.8.1
	1.1.1.3.18.1;
next	;

1.1.1.3.8.1
date	2008.09.04.12.49.54;	author roberto;	state Exp;
branches;
next	;

1.1.1.3.18.1
date	2008.09.03.08.49.07;	author roberto;	state Exp;
branches;
next	;


desc
@@


1.3
log
@SVN rev 200576 on 2009-12-15 14:58:10Z by roberto

Merge 4.2.4p8 into contrib (r200452 & r200454).

Subversion is being difficult here so take a hammer and get it in.

MFC after:		2 weeks
Security:		CVE-2009-3563
@
text
@1.1612
@


1.3.8.1
log
@file version was added on branch RELENG_8_4 on 2013-03-28 13:01:44 +0000
@
text
@d1 1
@


1.3.8.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 1
1.1541
@


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
@d1 1
a1 1
1.1541
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
1.791
@


1.1.1.1
log
@Virgin import of ntpd 4.1.1a
@
text
@@


1.1.1.2
log
@Virgin import of ntpd 4.1.1b
@
text
@d1 1
a1 1
1.829
@


1.1.1.3
log
@Virgin import of ntpd 4.2.0
@
text
@d1 1
a1 1
1.1161
@


1.1.1.3.8.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
@d1 1
a1 1
1.1541
@


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

MFH ntpd 4.2.4p5.

Approved by:	re (kensmith)
@
text
@d1 1
a1 1
1.1541
@


