Commit Graph

12 Commits

Author SHA1 Message Date
Ollivier Robert
eb6d21b4ca 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
2009-12-15 14:58:10 +00:00
Ollivier Robert
ea906c4152 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
2008-08-22 15:58:00 +00:00
Ollivier Robert
cce65f4396 Flatten the dist and various 4.n.n trees in preparation of future ntp imports. 2008-08-17 17:37:33 +00:00
Ollivier Robert
8c24a1e0ff Fix compilation with gcc 4.1. This is imported on the vendor branch as it
was applied in the mainstream source and a later complete import of
4.2.2p3 will complete the fix.

Submitted by:	kan
2006-09-28 16:02:34 +00:00
Ollivier Robert
3fa694fea6 This commit was generated by cvs2svn to compensate for changes in r162735,
which included commits to RCS files with non-trunk default branches.
2006-09-28 16:02:34 +00:00
Ollivier Robert
f0adf7f5cd Merge conflicts.
Lots of added files, some removed and quite a large number of renames :(
2004-07-20 15:19:51 +00:00
Ollivier Robert
9c2daa00c2 Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
Ollivier Robert
ba371819a7 Virgin import of ntpd 4.1.1b 2002-11-04 19:36:11 +00:00
Ollivier Robert
ce265a549d Virgin import of ntpd 4.1.1a 2002-10-29 19:58:12 +00:00
Ollivier Robert
224ba2bd37 Virgin import of ntpd 4.1.0 2001-08-29 14:35:15 +00:00
Ollivier Robert
a151a66c2a Virgin import of ntpd 4.0.99b 2000-01-28 14:55:50 +00:00
Ollivier Robert
c0b746e5e8 Virgin import of ntpd 4.0.98f 1999-12-09 13:01:21 +00:00