From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 14 Nov 2017 08:58:32 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=910889853de648cc6231ec4a90ffa4ceebb55a68;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p11

bk: 5a0ab038m_4sDDUGdLG8k4DmYecBEA
---

910889853de648cc6231ec4a90ffa4ceebb55a68
diff --cc ChangeLog
index 399f09a58,add12209e..b1e84a899
--- a/ChangeLog
+++ b/ChangeLog
@@@ -50,7 -47,7 +50,8 @@@
  * test_ntp_scanner_LDADD needs ntpd/ntp_io.o.  HStenn.
  * refclock_jjy.c: Add missing "%s" to an msyslog() call.  HStenn.
  * Build ntpq and libntpq.a with NTP_HARD_*FLAGS.  perlinger@ntp.org
 +* Fix trivial warnings from 'make check'. perlinger@ntp.org
+ * Fix bug in the override portion of the compiler hardening macro. HStenn.
  
  ---
  (4.2.8p10) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>