From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 2 Feb 2017 14:23:46 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fe3d7633692ef2f4c2be5db0eeda9a5dc9e0050;p=thirdparty%2Fntp.git

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

bk: 589340f2d2wzBkaROzC3z5aA7HbUBw
---

4fe3d7633692ef2f4c2be5db0eeda9a5dc9e0050
diff --cc ChangeLog
index a46f082b8,595a3d776..fea59795f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,41 -1,13 +1,47 @@@
 +---
 +(4.2.8p10)
 +
 +* [Bug 3363] Support for openssl-1.1.0 without compatibility modes
 +  - rework of patch set from <ntp.org@eroen.eu>. <perlinger@ntp.org>
 +* [Bug 3356] Bugfix 3072 breaks multicastclient <perlinger@ntp.org>
 +* [Bug 3216] libntp audio ioctl() args incorrectly cast to int
 +  on 4.4BSD-Lite derived platforms <perlinger@ntp.org>
 +  - original patch by Majdi S. Abbas
 +* [Bug 3215] 'make distcheck' fails with new BK repo format <perlinger@ntp.org>
 +* [Bug 3173] forking async worker: interrupted pipe I/O <perlinger@ntp.org>
 +  - initial patch by Christos Zoulas
- * [Bug 3144] NTP does not build without openSSL. <perlinger@ntp.org>
 +* [Bug 3139] (...) time_pps_create: Exec format error <perlinger@ntp.org>
 +  - move loader API from 'inline' to proper source
 +  - augment pathless dlls with absolute path to NTPD
 +  - use 'msyslog()' instead of 'printf() 'for reporting trouble
 +* [Bug 3107] Incorrect Logic for Peer Event Limiting <perlinger@ntp.org>
 +  - applied patch by Matthew Van Gundy
 +* [Bug 3065] Quiet warnings on NetBSD <perlinger@ntp.org>
 +  - applied some of the patches provided by Havard. Not all of them
 +    still match the current code base, and I did not touch libopt.
 +* [Bug 3062] Change the process name of forked DNS worker <perlinger@ntp.org>
 +  - applied patch by Reinhard Max. See bugzilla for limitations.
 +* [Bug 2923] Trap Configuration Fail <perlinger@ntp.org>
 +  - fixed dependency inversion from [Bug 2837]
 +* [Bug 2896] Nothing happens if minsane < maxclock < minclock
 +  - produce ERROR log message about dysfunctional daemon. <perlinger@ntp.org>
 +* [Bug 2851] allow -4/-6 on restrict line with mask <perlinger@ntp.org>
 +  - applied patch by Miroslav Lichvar for ntp4.2.6 compat
 +* [Bug 2645] out-of-bound pointers in ctl_putsys and decode_bitflags
 +  - Fixed these and some more locations of this pattern.
 +    Probably din't get them all, though. <perlinger@ntp.org>
 +* Update copyright year.
- * configure.ac cleanup.  stenn@ntp.org
- * openssl configure cleanup.  stenn@ntp.org
++
+ ---
+ (4.2.8p9-win) 2017/02/01 Released by Harlan Stenn <stenn@ntp.org>
+ 
+ * [Bug 3144] NTP does not build without openSSL. <perlinger@ntp.org>
    - added missed changeset for automatic openssl lib detection
    - fixed some minor warning issues
+ * [Bug 3095]  More compatibility with openssl 1.1. <perlinger@ntp.org>
+ * configure.ac cleanup.  stenn@ntp.org
+ * openssl configure cleanup.  stenn@ntp.org
+ 
  ---
  (4.2.8p9) 2016/11/21 Released by Harlan Stenn <stenn@ntp.org>
  
diff --cc ntpdc/ntpdc.html
index 9b1fd617d,ff2c3747e..5cf93c38b
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@@ -154,10 -149,10 +154,10 @@@ This is the automatically generated usa
  the usage text by passing it through a pager program. 
  <code>more-help</code> is disabled on platforms without a working
  <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
 -used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 +used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
  with a status code of 0.
  
- <pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p9
+ <pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p9-win
  Usage:  ntpdc [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [ host ...]
    Flg Arg Option-Name    Description
     -4 no  ipv4           Force IPv4 DNS name resolution
diff --cc scripts/ntp-wait/ntp-wait.html
index 76490c2d6,12f96e595..226b3db71
--- a/scripts/ntp-wait/ntp-wait.html
+++ b/scripts/ntp-wait/ntp-wait.html
@@@ -117,10 -111,10 +117,10 @@@ This is the automatically generated usa
  the usage text by passing it through a pager program. 
  <code>more-help</code> is disabled on platforms without a working
  <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
 -used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 +used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
  with a status code of 0.
  
- <pre class="example">ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p9
+ <pre class="example">ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p9-win
  USAGE: ntp-wait [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]...
  
      -n, --tries=num              Number of times to check ntpd
diff --cc scripts/ntpsweep/ntpsweep.html
index b4321dd5a,070dc8ac6..fa30b79de
--- a/scripts/ntpsweep/ntpsweep.html
+++ b/scripts/ntpsweep/ntpsweep.html
@@@ -91,10 -87,10 +91,10 @@@ This is the automatically generated usa
  the usage text by passing it through a pager program. 
  <code>more-help</code> is disabled on platforms without a working
  <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
 -used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 +used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
  with a status code of 0.
  
- <pre class="example">ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p9
+ <pre class="example">ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p9-win
  USAGE: ntpsweep [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [hostfile]
  
      -l, --host-list=str          Host to execute actions on
diff --cc scripts/ntptrace/ntptrace.html
index da4f013ae,bb5952640..7f7d3cb62
--- a/scripts/ntptrace/ntptrace.html
+++ b/scripts/ntptrace/ntptrace.html
@@@ -108,10 -104,10 +108,10 @@@ This is the automatically generated usa
  the usage text by passing it through a pager program. 
  <code>more-help</code> is disabled on platforms without a working
  <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
 -used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 +used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
  with a status code of 0.
  
- <pre class="example">ntptrace - Trace peers of an NTP server - Ver. 4.2.8p9
+ <pre class="example">ntptrace - Trace peers of an NTP server - Ver. 4.2.8p9-win
  USAGE: ntptrace [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [host]
  
      -n, --numeric                Print IP addresses instead of hostnames
diff --cc scripts/plot_summary.html
index 4a3c42340,06c9468e8..093b87b15
--- a/scripts/plot_summary.html
+++ b/scripts/plot_summary.html
@@@ -92,10 -86,10 +92,10 @@@ This is the automatically generated usa
  the usage text by passing it through a pager program. 
  <code>more-help</code> is disabled on platforms without a working
  <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
 -used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 +used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
  with a status code of 0.
  
- <pre class="example">plot_summary - plot statistics generated by summary script - Ver. 4.2.8p9
+ <pre class="example">plot_summary - plot statistics generated by summary script - Ver. 4.2.8p9-win
  USAGE: plot_summary [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]...
  
          --directory=str          Where the summary files are
diff --cc scripts/summary.html
index 7965dc7ca,04a50728a..4bbbbec79
--- a/scripts/summary.html
+++ b/scripts/summary.html
@@@ -89,10 -85,10 +89,10 @@@ This is the automatically generated usa
  the usage text by passing it through a pager program. 
  <code>more-help</code> is disabled on platforms without a working
  <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
 -used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 +used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
  with a status code of 0.
  
- <pre class="example">summary - compute various stastics from NTP stat files - Ver. 4.2.8p9
+ <pre class="example">summary - compute various stastics from NTP stat files - Ver. 4.2.8p9-win
  USAGE: summary [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]...
  
          --directory=str          Directory containing stat files
diff --cc sntp/sntp.html
index e47ed539a,34197bc57..934dbe9b0
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@@ -178,10 -173,10 +178,10 @@@ This is the automatically generated usa
  the usage text by passing it through a pager program. 
  <code>more-help</code> is disabled on platforms without a working
  <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
 -used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 +used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
  with a status code of 0.
  
- <pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p9
+ <pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p9-win
  Usage:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... \
                  [ hostname-or-IP ...]
    Flg Arg Option-Name    Description