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

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p12-sec

bk: 5b6583d9zs_zYYJQzx9P6lcPA6Y8cQ

diff --cc ChangeLog
index 7572d1ec9876a987300bb5fb16b4d1b2407a8520,ccceb6ece13e943d883a7aeff533da2cbbd14c6d..cafa818c765907d7b0f3b101b52f86c03eafb66f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,7 +1,13 @@@
  ---
  
 +* [Sec 3505] CVE-2018-12327 - Arbitrary Code Execution Vulnerability
 +  - fixed stack buffer overflow in the openhost() command-line call
 +    of NTPQ/NTPDC <perlinger@ntp.org>
  * [Sec 3012] noepeer tweaks.  <stenn@ntp.org>
+ * [Bug 3521] Fix a logic bug in the INVALIDNAK checks.  <stenn@ntp.org>
 +* [Bug 3509] Add support for running as non-root on FreeBSD, Darwin,
 +             other TrustedBSD platforms
 +  - applied patch by Ian Lepore <perlinger@ntp.org>
  * [Bug 3506] Service Control Manager interacts poorly with NTPD <perlinger@ntp.org>
    - changed interaction with SCM to signal pending startup
  * [Bug 3486] Buffer overflow in ntpq/ntpq.c:tstflags() <perlinger@ntp.org>

diff --cc NEWS
index 99d37683bfb283c066e11f024c7e792500291c08,91f4b20b1205cc355d463cc436f6bea4031a46d7..26430550b4d0eb51d022e11b04709448aab099d6
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -11,16 -11,12 +11,17 @@@ This release fixes a "hole" in the noep
  in ntp-4.2.8p11, and a buffer overflow in the openhost() function used by
  ntpq and ntpdc.  It also provides 26 other bugfixes, and 4 other improvements:
  
 -* [Sec 3505]
 +* [Sec 3505] Buffer overflow in the openhost() call of ntpq and ntpdc.
  
 -* [Sec 3012] 
 +* [Sec 3012] Fix a hole in the new "noepeer" processing.
  
  * Bug Fixes:
+  [Bug 3521] Fix a logic bug in the INVALIDNAK checks.  <stenn@ntp.org>
 + [Bug 3509] Add support for running as non-root on FreeBSD, Darwin,
 +            other TrustedBSD platforms
 + - applied patch by Ian Lepore <perlinger@ntp.org>
 + [Bug 3506] Service Control Manager interacts poorly with NTPD <perlinger@ntp.org>
 + - changed interaction with SCM to signal pending startup
   [Bug 3486] Buffer overflow in ntpq/ntpq.c:tstflags() <perlinger@ntp.org>
   - applied patch by Gerry Garvey
   [Bug 3485] Undefined sockaddr used in error messages in ntp_config.c <perlinger@ntp.org>