Commit Graph

35 Commits

Author SHA1 Message Date
Xin LI
c1950318d1 Vendor import of ntp-4.2.8p7. 2016-04-27 05:37:54 +00:00
Xin LI
cbb26d1b66 Vendor import of ntp-4.2.8p6. 2016-01-21 08:50:56 +00:00
Xin LI
c373d9289d Vendor import of ntp-4.2.8p5. 2016-01-08 08:06:14 +00:00
Gleb Smirnoff
49b7d96337 Remove svn:keywords from contributed files. 2015-10-26 15:40:47 +00:00
Gleb Smirnoff
0b0c40a74f Merge NTP 4.2.8p4 into dist. 2015-10-21 19:16:13 +00:00
Gleb Smirnoff
2cf53bda1c Move FREEBSD-* files out of dist into vendor/ntp. 2015-10-21 17:49:54 +00:00
Cy Schubert
873997f35a Vendor import ntp-4.2.8p3.
Approved by:	delphij (implicit, using SO hat)
Security:	VuXML: 0d0f3050-1f69-11e5-9ba9-d050996490d0
Security:	http://bugs.ntp.org/show_bug.cgi?id=2853
Security:	https://www.kb.cert.org/vuls/id/668167
Security:	http://support.ntp.org/bin/view/Main/SecurityNotice#June_2015_NTP_Security_Vulnerabi
2015-07-01 03:12:13 +00:00
Cy Schubert
4ba32eb5a8 Vendor import ntp 4.2.8p2
Approved by:	delphij
Security:	CVE-2015-1798, CVE-2015-1799
Security:	VuXML ebd84c96-dd7e-11e4-854e-3c970e169bc2
2015-04-10 01:26:02 +00:00
Cy Schubert
f7cba3a80d Vendor import ntp-4.2.8p1.
Approved by:	roberto
2015-02-05 20:53:33 +00:00
Ollivier Robert
44a728f815 Add the two patches from the port in net/ntp/files to fix compilation
issues with vendor code. r375210 & r375215.
2014-12-22 22:22:10 +00:00
Ollivier Robert
c59fb7145e Remove files that should not be merged into head when updating ntp. 2014-12-22 22:15:31 +00:00
Ollivier Robert
bd4312b94e Add back these files deleted by the previous vendor import.
Next commit will remove some files from this tree in order to avoid merging
them into head as they were never merged before.

Forgotten by:	cy
2014-12-22 22:14:20 +00:00
Cy Schubert
b5e14a1344 Vendor import ntp 4.2.8.
Reviewed by:	roberto
Security:	VUXML: 4033d826-87dd-11e4-9079-3c970e169bc2
Security:	http://www.kb.cert.org/vuls/id/852879
Security:	CVE-2014-9293
Security	CVE-2014-9294
Security	CVE-2014-9295
Security	CVE-2014-9296
2014-12-20 22:52:39 +00:00
Ollivier Robert
2b45e011ca Virgin import of ntpd 4.2.6p5.
When the series of commits is complete, things like
https://cert.litnet.lt/en/docs/ntp-distributed-reflection-dos-attacks
should be fixed.

PR:		bin/148836 (except that we import a newer version)
Asked by:	Too many
MFC after:	2 weeks
2013-12-04 21:33:17 +00:00
Bjoern A. Zeeb
9b5bd0a264 Record the two ntp bugfixes that can be dropped when updating to
later versions of ntp.

Discussed with:	roberto
2011-06-29 13:06:42 +00:00
Bjoern A. Zeeb
a851a10842 Mention r222444, NTP bug 1936 we locally fixed already to be considered
on next update(s).

Requested by:	roberto
2011-05-29 07:44:24 +00:00
Ollivier Robert
7e3cc4cfce Update ntp vendor code to 4.2.4p8.
This is mainly to fix CVE-2009-3563, a remote DOS.

MFC after:	3 days
Security:	CVE-2009-3563
2009-12-12 22:29:30 +00:00
Ollivier Robert
8c0610b960 Prevent a buffer overflow in ntpq. Patch taken from the PR database
after being committed to the official ntp tree and present in 4.2.4p7-rc2.

It will be MFH to the upcoming 7.2 pending re approval.

Obtained from:	https://support.ntp.org/bugs/show_bug.cgi?id=1144
MFC after:	    3 days
Security:	    http://www.securityfocus.com/bid/34481
                CVE-2009-0159
2009-04-19 23:34:52 +00:00
Ollivier Robert
a3275ecc3f Re-apply patch from bin/92839 to avoid two possible buffer overflows. For an
unknown reason, this seems to have never been applied to vendor sources.

PR:		bin/92839
Submitted by:	Helge Oldach <freebsdntpd@oldach.net>
2008-09-07 22:08:10 +00:00
Ollivier Robert
f1c13ed374 Update instructions with svn usage. 2008-08-18 14:41:31 +00:00
Ollivier Robert
e1e2a20591 Move FREEBSD-upgrade as well. 2008-08-18 14:37:44 +00:00
Ollivier Robert
0f58a72abb Move FREEBSD-Xlist in a more proper location. 2008-08-18 14:36:57 +00:00
Ollivier Robert
ff717da2cf Import ntp 4.2.4p5 in the vendor code area. Far too many changes to list here,
please see CommitLog for detailed changes.

XXX html/build/hints/solaris.xtra.4095849 is not being imported as it conflicts
    with the detect-merge-conflict.sh script in our repo.
2008-08-18 14:26:05 +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
b9bb0f5d00 Merge from the main BK repository for ntp: put two midly annoying messages
under #ifdef DEBUG. Merge of revision 1.45 by H. Stenn.

Done on the vendor branch to minimise future imports.

Reminded by:	obrien
2004-12-06 14:33:29 +00:00
Ollivier Robert
5e91a9b700 The following patch has been taken from the ntp-stable vendor branch.
Put everything OpenSSL related between #ifdef OPENSSL..#endif.

This also fixes bugs #252, #275 & #293.

See
<http://ntp.bkbits.net:8080/ntp-stable/hist/util/ntp-keygen.c?nav=index.html|src/+|src/util>
for reference.

Submitted by:	Marius Strobl <marius@alchemy.franken.de>
2004-07-22 09:16:04 +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
eaabcee53b Remove files not present in 4.1.1a import. 2002-10-29 20:11:45 +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
1c80946020 Fix potential alignement problems on Alpha + IPv6.
This is done on the vendor branch to avoid spamming the tree. It has been
sent to the NTP maintainers already.

Submitted by:	shin
2000-03-03 17:06:31 +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