From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 9 Dec 2009 10:06:49 +0000 (-0500)
Subject: Merge bk://maccarony/ntp-dev
X-Git-Tag: NTP_4_2_7~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc156dce4cacebea84cf410df55b8423b6436745;p=thirdparty%2Fntp.git

Merge bk://maccarony/ntp-dev
into  pogo.udel.edu:/pogo/users/hart/ntp-dev-1407

bk: 4b1f76b993M3pJLRI4deETebPuuYEA
---

dc156dce4cacebea84cf410df55b8423b6436745
diff --cc ChangeLog
index d763bcc41,e8f992507..96d8be5ac
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,8 +1,9 @@@
 +* [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
+ 
+ ---
+ (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
+ * Include (4.2.4p8) - [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.
+ * [Bug 508] Fixed leap second handling for Windows.
  (4.2.5p250-RC) 2009/11/30 Released by Harlan Stenn <stenn@ntp.org>
  * sntp documentation updates.
  * [Bug 761] internal resolver does not seem to honor -4/-6 qualifiers