From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 13 Dec 2014 05:41:20 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_8~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1743b12437d5f0d3328975a4394f3375e4952a4f;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-sec

bk: 548bd1800vh-yfQetwMqVGDmB8OG-Q
---

1743b12437d5f0d3328975a4394f3375e4952a4f
diff --cc ChangeLog
index 0de380a8e,8600853ef..d9473edea
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,4 +1,8 @@@
 +* [Sec 2667] buffer overflow in crypto_recv().
 +* [Sec 2668] buffer overflow in ctl_putdata().
 +* [Sec 2669] buffer overflow in configure().
 +* [Sec 2670] Missing return; from error clause.
+ (4.2.7p485-RC) 2014/12/12 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2686] refclock_gpsdjson needs strtoll(), which is not always present.
  (4.2.7p484-RC) 2014/12/11 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.7p483) 2014/12/08 Released by Harlan Stenn <stenn@ntp.org>