Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Mar 2017 22:06:06 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r315871 - in head: contrib/ntp contrib/ntp/adjtimed contrib/ntp/clockstuff contrib/ntp/html contrib/ntp/include contrib/ntp/include/isc contrib/ntp/kernel contrib/ntp/kernel/sys contrib...
Message-ID:  <201703232206.v2NM66R8034912@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Thu Mar 23 22:06:06 2017
New Revision: 315871
URL: https://svnweb.freebsd.org/changeset/base/315871

Log:
  MFV r315791: ntp 4.2.8p10.

Added:
  head/contrib/ntp/sntp/harden/
     - copied from r315791, vendor/ntp/dist/sntp/harden/
  head/contrib/ntp/sntp/m4/ntp_harden.m4
     - copied unchanged from r315791, vendor/ntp/dist/sntp/m4/ntp_harden.m4
  head/contrib/ntp/sntp/scripts/genHardFlags
     - copied unchanged from r315791, vendor/ntp/dist/sntp/scripts/genHardFlags
Deleted:
  head/contrib/ntp/compile
  head/contrib/ntp/config.guess
  head/contrib/ntp/config.sub
  head/contrib/ntp/depcomp
  head/contrib/ntp/install-sh
  head/contrib/ntp/ltmain.sh
  head/contrib/ntp/missing
  head/contrib/ntp/sntp/compile
  head/contrib/ntp/sntp/config.guess
  head/contrib/ntp/sntp/config.sub
  head/contrib/ntp/sntp/depcomp
  head/contrib/ntp/sntp/install-sh
  head/contrib/ntp/sntp/ltmain.sh
  head/contrib/ntp/sntp/missing
  head/contrib/ntp/tests/
  head/contrib/ntp/ylwrap
Modified:
  head/contrib/ntp/COPYRIGHT
  head/contrib/ntp/ChangeLog
  head/contrib/ntp/CommitLog
  head/contrib/ntp/Makefile.in
  head/contrib/ntp/NEWS
  head/contrib/ntp/aclocal.m4
  head/contrib/ntp/adjtimed/Makefile.am
  head/contrib/ntp/adjtimed/Makefile.in
  head/contrib/ntp/clockstuff/Makefile.am
  head/contrib/ntp/clockstuff/Makefile.in
  head/contrib/ntp/config.h.in
  head/contrib/ntp/configure
  head/contrib/ntp/configure.ac
  head/contrib/ntp/html/copyright.html
  head/contrib/ntp/include/Makefile.in
  head/contrib/ntp/include/isc/Makefile.in
  head/contrib/ntp/include/libssl_compat.h
  head/contrib/ntp/include/ntp_crypto.h
  head/contrib/ntp/include/ntp_fp.h
  head/contrib/ntp/include/ntp_md5.h
  head/contrib/ntp/include/ntp_stdlib.h
  head/contrib/ntp/include/ntpd.h
  head/contrib/ntp/include/ssl_applink.c
  head/contrib/ntp/kernel/Makefile.in
  head/contrib/ntp/kernel/sys/Makefile.in
  head/contrib/ntp/lib/isc/inet_pton.c
  head/contrib/ntp/libntp/Makefile.am
  head/contrib/ntp/libntp/Makefile.in
  head/contrib/ntp/libntp/a_md5encrypt.c
  head/contrib/ntp/libntp/audio.c
  head/contrib/ntp/libntp/authkeys.c
  head/contrib/ntp/libntp/emalloc.c
  head/contrib/ntp/libntp/libssl_compat.c
  head/contrib/ntp/libntp/ntp_intres.c
  head/contrib/ntp/libntp/recvbuff.c
  head/contrib/ntp/libntp/ssl_init.c
  head/contrib/ntp/libntp/statestr.c
  head/contrib/ntp/libntp/work_fork.c
  head/contrib/ntp/libparse/Makefile.am
  head/contrib/ntp/libparse/Makefile.in
  head/contrib/ntp/libparse/clk_trimtsip.c
  head/contrib/ntp/libparse/gpstolfp.c
  head/contrib/ntp/ntpd/Makefile.am
  head/contrib/ntp/ntpd/Makefile.in
  head/contrib/ntp/ntpd/invoke-ntp.conf.texi
  head/contrib/ntp/ntpd/invoke-ntp.keys.texi
  head/contrib/ntp/ntpd/invoke-ntpd.texi
  head/contrib/ntp/ntpd/ntp.conf.5man
  head/contrib/ntp/ntpd/ntp.conf.5mdoc
  head/contrib/ntp/ntpd/ntp.conf.html
  head/contrib/ntp/ntpd/ntp.conf.man.in
  head/contrib/ntp/ntpd/ntp.conf.mdoc.in
  head/contrib/ntp/ntpd/ntp.keys.5man
  head/contrib/ntp/ntpd/ntp.keys.5mdoc
  head/contrib/ntp/ntpd/ntp.keys.html
  head/contrib/ntp/ntpd/ntp.keys.man.in
  head/contrib/ntp/ntpd/ntp.keys.mdoc.in
  head/contrib/ntp/ntpd/ntp_config.c
  head/contrib/ntp/ntpd/ntp_control.c
  head/contrib/ntp/ntpd/ntp_crypto.c
  head/contrib/ntp/ntpd/ntp_io.c
  head/contrib/ntp/ntpd/ntp_loopfilter.c
  head/contrib/ntp/ntpd/ntp_parser.c
  head/contrib/ntp/ntpd/ntp_parser.h
  head/contrib/ntp/ntpd/ntp_peer.c
  head/contrib/ntp/ntpd/ntp_proto.c
  head/contrib/ntp/ntpd/ntp_restrict.c
  head/contrib/ntp/ntpd/ntp_scanner.c
  head/contrib/ntp/ntpd/ntpd-opts.c
  head/contrib/ntp/ntpd/ntpd-opts.h
  head/contrib/ntp/ntpd/ntpd.1ntpdman
  head/contrib/ntp/ntpd/ntpd.1ntpdmdoc
  head/contrib/ntp/ntpd/ntpd.c
  head/contrib/ntp/ntpd/ntpd.html
  head/contrib/ntp/ntpd/ntpd.man.in
  head/contrib/ntp/ntpd/ntpd.mdoc.in
  head/contrib/ntp/ntpd/refclock_datum.c
  head/contrib/ntp/ntpd/refclock_gpsdjson.c
  head/contrib/ntp/ntpd/refclock_jjy.c
  head/contrib/ntp/ntpd/refclock_mx4200.c
  head/contrib/ntp/ntpd/refclock_nmea.c
  head/contrib/ntp/ntpd/refclock_oncore.c
  head/contrib/ntp/ntpd/refclock_parse.c
  head/contrib/ntp/ntpdate/Makefile.am
  head/contrib/ntp/ntpdate/Makefile.in
  head/contrib/ntp/ntpdate/ntpdate.c
  head/contrib/ntp/ntpdc/Makefile.am
  head/contrib/ntp/ntpdc/Makefile.in
  head/contrib/ntp/ntpdc/invoke-ntpdc.texi
  head/contrib/ntp/ntpdc/ntpdc-opts.c
  head/contrib/ntp/ntpdc/ntpdc-opts.h
  head/contrib/ntp/ntpdc/ntpdc.1ntpdcman
  head/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
  head/contrib/ntp/ntpdc/ntpdc.c
  head/contrib/ntp/ntpdc/ntpdc.html
  head/contrib/ntp/ntpdc/ntpdc.man.in
  head/contrib/ntp/ntpdc/ntpdc.mdoc.in
  head/contrib/ntp/ntpdc/ntpdc_ops.c
  head/contrib/ntp/ntpq/Makefile.am
  head/contrib/ntp/ntpq/Makefile.in
  head/contrib/ntp/ntpq/invoke-ntpq.texi
  head/contrib/ntp/ntpq/libntpq.c
  head/contrib/ntp/ntpq/ntpq-opts.c
  head/contrib/ntp/ntpq/ntpq-opts.h
  head/contrib/ntp/ntpq/ntpq-subs.c
  head/contrib/ntp/ntpq/ntpq.1ntpqman
  head/contrib/ntp/ntpq/ntpq.1ntpqmdoc
  head/contrib/ntp/ntpq/ntpq.c
  head/contrib/ntp/ntpq/ntpq.html
  head/contrib/ntp/ntpq/ntpq.man.in
  head/contrib/ntp/ntpq/ntpq.mdoc.in
  head/contrib/ntp/ntpsnmpd/Makefile.am
  head/contrib/ntp/ntpsnmpd/Makefile.in
  head/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
  head/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
  head/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
  head/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
  head/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
  head/contrib/ntp/ntpsnmpd/ntpsnmpd.html
  head/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
  head/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
  head/contrib/ntp/packageinfo.sh
  head/contrib/ntp/parseutil/Makefile.am
  head/contrib/ntp/parseutil/Makefile.in
  head/contrib/ntp/scripts/Makefile.in
  head/contrib/ntp/scripts/build/Makefile.in
  head/contrib/ntp/scripts/calc_tickadj/Makefile.in
  head/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
  head/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
  head/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
  head/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
  head/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
  head/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
  head/contrib/ntp/scripts/invoke-plot_summary.texi
  head/contrib/ntp/scripts/invoke-summary.texi
  head/contrib/ntp/scripts/lib/Makefile.in
  head/contrib/ntp/scripts/ntp-wait/Makefile.in
  head/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
  head/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
  head/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
  head/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
  head/contrib/ntp/scripts/ntp-wait/ntp-wait.html
  head/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
  head/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
  head/contrib/ntp/scripts/ntpsweep/Makefile.in
  head/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
  head/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
  head/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
  head/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
  head/contrib/ntp/scripts/ntpsweep/ntpsweep.html
  head/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
  head/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
  head/contrib/ntp/scripts/ntptrace/Makefile.in
  head/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
  head/contrib/ntp/scripts/ntptrace/ntptrace-opts
  head/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
  head/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
  head/contrib/ntp/scripts/ntptrace/ntptrace.html
  head/contrib/ntp/scripts/ntptrace/ntptrace.man.in
  head/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
  head/contrib/ntp/scripts/plot_summary-opts
  head/contrib/ntp/scripts/plot_summary.1plot_summaryman
  head/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
  head/contrib/ntp/scripts/plot_summary.html
  head/contrib/ntp/scripts/plot_summary.man.in
  head/contrib/ntp/scripts/plot_summary.mdoc.in
  head/contrib/ntp/scripts/summary-opts
  head/contrib/ntp/scripts/summary.1summaryman
  head/contrib/ntp/scripts/summary.1summarymdoc
  head/contrib/ntp/scripts/summary.html
  head/contrib/ntp/scripts/summary.man.in
  head/contrib/ntp/scripts/summary.mdoc.in
  head/contrib/ntp/scripts/update-leap/Makefile.in
  head/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
  head/contrib/ntp/scripts/update-leap/update-leap-opts
  head/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
  head/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
  head/contrib/ntp/scripts/update-leap/update-leap.html
  head/contrib/ntp/scripts/update-leap/update-leap.man.in
  head/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
  head/contrib/ntp/sntp/COPYRIGHT
  head/contrib/ntp/sntp/Makefile.am
  head/contrib/ntp/sntp/Makefile.in
  head/contrib/ntp/sntp/aclocal.m4
  head/contrib/ntp/sntp/config.h.in
  head/contrib/ntp/sntp/configure
  head/contrib/ntp/sntp/configure.ac
  head/contrib/ntp/sntp/crypto.c
  head/contrib/ntp/sntp/include/Makefile.in
  head/contrib/ntp/sntp/include/copyright.def
  head/contrib/ntp/sntp/include/version.def
  head/contrib/ntp/sntp/include/version.texi
  head/contrib/ntp/sntp/invoke-sntp.texi
  head/contrib/ntp/sntp/kod_management.c
  head/contrib/ntp/sntp/libevent/Makefile.am
  head/contrib/ntp/sntp/libevent/Makefile.in
  head/contrib/ntp/sntp/libevent/build-aux/compile
  head/contrib/ntp/sntp/libevent/build-aux/config.guess
  head/contrib/ntp/sntp/libevent/build-aux/config.sub
  head/contrib/ntp/sntp/libevent/build-aux/depcomp
  head/contrib/ntp/sntp/libevent/build-aux/install-sh
  head/contrib/ntp/sntp/libevent/build-aux/ltmain.sh
  head/contrib/ntp/sntp/libevent/build-aux/missing
  head/contrib/ntp/sntp/libevent/build-aux/ylwrap
  head/contrib/ntp/sntp/libevent/config.h.in
  head/contrib/ntp/sntp/libevent/configure
  head/contrib/ntp/sntp/libevent/configure.ac
  head/contrib/ntp/sntp/libevent/m4/libtool.m4
  head/contrib/ntp/sntp/libevent/m4/ltoptions.m4
  head/contrib/ntp/sntp/libevent/m4/ltsugar.m4
  head/contrib/ntp/sntp/libevent/m4/ltversion.m4
  head/contrib/ntp/sntp/libevent/m4/lt~obsolete.m4
  head/contrib/ntp/sntp/libevent/test/regress_ssl.c
  head/contrib/ntp/sntp/libopts/Makefile.am
  head/contrib/ntp/sntp/libopts/Makefile.in
  head/contrib/ntp/sntp/m4/libtool.m4
  head/contrib/ntp/sntp/m4/ltoptions.m4
  head/contrib/ntp/sntp/m4/ltsugar.m4
  head/contrib/ntp/sntp/m4/ltversion.m4
  head/contrib/ntp/sntp/m4/lt~obsolete.m4
  head/contrib/ntp/sntp/m4/ntp_compiler.m4
  head/contrib/ntp/sntp/m4/ntp_libevent.m4
  head/contrib/ntp/sntp/m4/ntp_libntp.m4
  head/contrib/ntp/sntp/m4/ntp_openssl.m4
  head/contrib/ntp/sntp/m4/ntp_prog_cc.m4
  head/contrib/ntp/sntp/m4/version.m4
  head/contrib/ntp/sntp/scm-rev
  head/contrib/ntp/sntp/scripts/Makefile.am
  head/contrib/ntp/sntp/scripts/Makefile.in
  head/contrib/ntp/sntp/sntp-opts.c
  head/contrib/ntp/sntp/sntp-opts.h
  head/contrib/ntp/sntp/sntp.1sntpman
  head/contrib/ntp/sntp/sntp.1sntpmdoc
  head/contrib/ntp/sntp/sntp.html
  head/contrib/ntp/sntp/sntp.man.in
  head/contrib/ntp/sntp/sntp.mdoc.in
  head/contrib/ntp/sntp/tests/Makefile.am
  head/contrib/ntp/sntp/tests/Makefile.in
  head/contrib/ntp/sntp/unity/Makefile.am
  head/contrib/ntp/sntp/unity/Makefile.in
  head/contrib/ntp/sntp/version.c
  head/contrib/ntp/util/Makefile.am
  head/contrib/ntp/util/Makefile.in
  head/contrib/ntp/util/invoke-ntp-keygen.texi
  head/contrib/ntp/util/ntp-keygen-opts.c
  head/contrib/ntp/util/ntp-keygen-opts.h
  head/contrib/ntp/util/ntp-keygen.1ntp-keygenman
  head/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
  head/contrib/ntp/util/ntp-keygen.c
  head/contrib/ntp/util/ntp-keygen.html
  head/contrib/ntp/util/ntp-keygen.man.in
  head/contrib/ntp/util/ntp-keygen.mdoc.in
  head/usr.sbin/ntp/config.h
  head/usr.sbin/ntp/doc/ntp-keygen.8
  head/usr.sbin/ntp/doc/ntp.conf.5
  head/usr.sbin/ntp/doc/ntp.keys.5
  head/usr.sbin/ntp/doc/ntpd.8
  head/usr.sbin/ntp/doc/ntpdc.8
  head/usr.sbin/ntp/doc/ntpq.8
  head/usr.sbin/ntp/doc/sntp.8
  head/usr.sbin/ntp/scripts/mkver
Directory Properties:
  head/contrib/ntp/   (props changed)

Modified: head/contrib/ntp/COPYRIGHT
==============================================================================
--- head/contrib/ntp/COPYRIGHT	Thu Mar 23 21:18:10 2017	(r315870)
+++ head/contrib/ntp/COPYRIGHT	Thu Mar 23 22:06:06 2017	(r315871)
@@ -4,7 +4,7 @@ This file is automatically generated fro
   
    jpg "Clone me," says Dolly sheepishly.
    
-   Last update: 17-Jan-2015 00:16 UTC
+   Last update: 2-Jan-2017 11:58 UTC
      _________________________________________________________________
    
    The following copyright notice applies to all files collectively
@@ -33,7 +33,7 @@ This file is automatically generated fro
    Burnicki is:
 ***********************************************************************
 *                                                                     *
-* Copyright (c) Network Time Foundation 2011-2015                     *
+* Copyright (c) Network Time Foundation 2011-2017                     *
 *                                                                     *
 * All Rights Reserved                                                 *
 *                                                                     *

Modified: head/contrib/ntp/ChangeLog
==============================================================================
--- head/contrib/ntp/ChangeLog	Thu Mar 23 21:18:10 2017	(r315870)
+++ head/contrib/ntp/ChangeLog	Thu Mar 23 22:06:06 2017	(r315871)
@@ -1,6 +1,77 @@
 ---
+(4.2.8p10-win-beta1) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>
+(4.2.8p10)
+
+* [Sec 3389] NTP-01-016: Denial of Service via Malformed Config
+  (Pentest report 01.2017) <perlinger@ntp.org>
+* [Sec 3388] NTP-01-014: Buffer Overflow in DPTS Clock
+  (Pentest report 01.2017) <perlinger@ntp.org>
+* [Sec 3387] NTP-01-012: Authenticated DoS via Malicious Config Option
+  (Pentest report 01.2017) <perlinger@ntp.org>
+* [Sec 3386] NTP-01-011: ntpq_stripquotes() returns incorrect Value
+  (Pentest report 01.2017) <perlinger@ntp.org>
+* [Sec 3385] NTP-01-010: ereallocarray()/eallocarray() underused. HStenn
+* [Sec 3384] NTP-01-009: Privileged execution of User Library code
+  (Pentest report 01.2017) <perlinger@ntp.org>
+* [Sec 3383] NTP-01-008: Stack Buffer Overflow from Command Line
+  (Pentest report 01.2017) <perlinger@ntp.org>
+* [Sec 3382] NTP-01-007: Data Structure terminated insufficiently
+  (Pentest report 01.2017) <perlinger@ntp.org>
+* [Sec 3380] NTP-01-005: Off-by-one in Oncore GPS Receiver
+  (Pentest report 01.2017) <perlinger@ntp.org>
+* [Sec 3379] NTP-01-004: Potential Overflows in ctl_put() functions
+  (Pentest report 01.2017) <perlinger@ntp.org>
+* [Sec 3378] NTP-01-003: Improper use of snprintf() in mx4200_send()
+  (Pentest report 01.2017) <perlinger@ntp.org>
+* [Sec 3377] NTP-01-002: Buffer Overflow in ntpq when fetching reslist
+  (Pentest report 01.2017) <perlinger@ntp.org
+* [Sec 3376] Support build "hardening" flags.  stenn@ntp.org
+* [Sec 3361] 0rigin (zero origin) DoS.  HStenn.
+* [Bug 3393] clang scan-build findings <perlinger@ntp.org>
+* [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 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.
+* bk-7 trigger updates
+
+---
+(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>
-(4.2.8p9) 2016/MM/DD Released by Harlan Stenn <stenn@ntp.org>
 
 * [Sec 3119] Trap crash <perlinger@ntp.org>
 * [Sec 3118] Mode 6 information disclosure and DDoS vector <perlinger@ntp.org>

Modified: head/contrib/ntp/CommitLog
==============================================================================
--- head/contrib/ntp/CommitLog	Thu Mar 23 21:18:10 2017	(r315870)
+++ head/contrib/ntp/CommitLog	Thu Mar 23 22:06:06 2017	(r315871)
@@ -1,3 +1,441 @@
+ChangeSet@1.3729, 2017-02-01 07:39:35-05:00, stenn@deacon.udel.edu
+  NTP_4_2_8P9_WIN
+  TAG: NTP_4_2_8P9_WIN
+
+  ChangeLog@1.1857 +3 -0
+    NTP_4_2_8P9_WIN
+
+  ntpd/invoke-ntp.conf.texi@1.204 +1 -1
+    NTP_4_2_8P9_WIN
+
+  ntpd/invoke-ntp.keys.texi@1.193 +1 -1
+    NTP_4_2_8P9_WIN
+
+  ntpd/invoke-ntpd.texi@1.509 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntp.conf.5man@1.238 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntp.conf.5mdoc@1.238 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntp.conf.html@1.188 +1 -1
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntp.conf.man.in@1.238 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntp.conf.mdoc.in@1.238 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntp.keys.5man@1.227 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntp.keys.5mdoc@1.227 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntp.keys.html@1.189 +1 -1
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntp.keys.man.in@1.227 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntp.keys.mdoc.in@1.227 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntpd-opts.c@1.531 +245 -245
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntpd-opts.h@1.530 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntpd.1ntpdman@1.338 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntpd.1ntpdmdoc@1.338 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntpd.html@1.182 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntpd.man.in@1.338 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpd/ntpd.mdoc.in@1.338 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpdc/invoke-ntpdc.texi@1.506 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpdc/ntpdc-opts.c@1.524 +107 -107
+    NTP_4_2_8P9_WIN
+
+  ntpdc/ntpdc-opts.h@1.523 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpdc/ntpdc.1ntpdcman@1.337 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpdc/ntpdc.1ntpdcmdoc@1.337 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpdc/ntpdc.html@1.350 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpdc/ntpdc.man.in@1.337 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpdc/ntpdc.mdoc.in@1.337 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpq/invoke-ntpq.texi@1.514 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpq/ntpq-opts.c@1.531 +114 -114
+    NTP_4_2_8P9_WIN
+
+  ntpq/ntpq-opts.h@1.529 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpq/ntpq.1ntpqman@1.342 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpq/ntpq.1ntpqmdoc@1.342 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpq/ntpq.html@1.179 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpq/ntpq.man.in@1.342 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpq/ntpq.mdoc.in@1.342 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpsnmpd/invoke-ntpsnmpd.texi@1.508 +11 -10
+    NTP_4_2_8P9_WIN
+
+  ntpsnmpd/ntpsnmpd-opts.c@1.526 +68 -68
+    NTP_4_2_8P9_WIN
+
+  ntpsnmpd/ntpsnmpd-opts.h@1.525 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.337 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.337 +2 -2
+    NTP_4_2_8P9_WIN
+
+  ntpsnmpd/ntpsnmpd.html@1.177 +1 -1
+    NTP_4_2_8P9_WIN
+
+  ntpsnmpd/ntpsnmpd.man.in@1.337 +3 -3
+    NTP_4_2_8P9_WIN
+
+  ntpsnmpd/ntpsnmpd.mdoc.in@1.337 +2 -2
+    NTP_4_2_8P9_WIN
+
+  packageinfo.sh@1.534 +1 -1
+    NTP_4_2_8P9_WIN
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.98 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.99 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/calc_tickadj/calc_tickadj.html@1.100 +1 -1
+    NTP_4_2_8P9_WIN
+
+  scripts/calc_tickadj/calc_tickadj.man.in@1.97 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/calc_tickadj/calc_tickadj.mdoc.in@1.99 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/calc_tickadj/invoke-calc_tickadj.texi@1.102 +1 -1
+    NTP_4_2_8P9_WIN
+
+  scripts/invoke-plot_summary.texi@1.120 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/invoke-summary.texi@1.119 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntp-wait/invoke-ntp-wait.texi@1.329 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntp-wait/ntp-wait-opts@1.65 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitman@1.326 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.327 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntp-wait/ntp-wait.html@1.346 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntp-wait/ntp-wait.man.in@1.326 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/ntp-wait/ntp-wait.mdoc.in@1.327 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntpsweep/invoke-ntpsweep.texi@1.117 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntpsweep/ntpsweep-opts@1.67 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepman@1.105 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.105 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntpsweep/ntpsweep.html@1.118 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntpsweep/ntpsweep.man.in@1.105 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/ntpsweep/ntpsweep.mdoc.in@1.106 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntptrace/invoke-ntptrace.texi@1.118 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntptrace/ntptrace-opts@1.67 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntptrace/ntptrace.1ntptraceman@1.105 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/ntptrace/ntptrace.1ntptracemdoc@1.106 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntptrace/ntptrace.html@1.119 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/ntptrace/ntptrace.man.in@1.105 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/ntptrace/ntptrace.mdoc.in@1.107 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/plot_summary-opts@1.68 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/plot_summary.1plot_summaryman@1.118 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/plot_summary.1plot_summarymdoc@1.118 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/plot_summary.html@1.121 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/plot_summary.man.in@1.118 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/plot_summary.mdoc.in@1.118 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/summary-opts@1.67 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/summary.1summaryman@1.117 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/summary.1summarymdoc@1.117 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/summary.html@1.120 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/summary.man.in@1.117 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/summary.mdoc.in@1.117 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/update-leap/invoke-update-leap.texi@1.18 +1 -1
+    NTP_4_2_8P9_WIN
+
+  scripts/update-leap/update-leap-opts@1.18 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/update-leap/update-leap.1update-leapman@1.18 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/update-leap/update-leap.1update-leapmdoc@1.18 +2 -2
+    NTP_4_2_8P9_WIN
+
+  scripts/update-leap/update-leap.html@1.18 +1 -1
+    NTP_4_2_8P9_WIN
+
+  scripts/update-leap/update-leap.man.in@1.18 +3 -3
+    NTP_4_2_8P9_WIN
+
+  scripts/update-leap/update-leap.mdoc.in@1.18 +2 -2
+    NTP_4_2_8P9_WIN
+
+  sntp/invoke-sntp.texi@1.506 +2 -2
+    NTP_4_2_8P9_WIN
+
+  sntp/sntp-opts.c@1.525 +159 -159
+    NTP_4_2_8P9_WIN
+
+  sntp/sntp-opts.h@1.523 +3 -3
+    NTP_4_2_8P9_WIN
+
+  sntp/sntp.1sntpman@1.341 +3 -3
+    NTP_4_2_8P9_WIN
+
+  sntp/sntp.1sntpmdoc@1.341 +2 -2
+    NTP_4_2_8P9_WIN
+
+  sntp/sntp.html@1.521 +2 -2
+    NTP_4_2_8P9_WIN
+
+  sntp/sntp.man.in@1.341 +3 -3
+    NTP_4_2_8P9_WIN
+
+  sntp/sntp.mdoc.in@1.341 +2 -2
+    NTP_4_2_8P9_WIN
+
+  util/invoke-ntp-keygen.texi@1.509 +2 -2
+    NTP_4_2_8P9_WIN
+
+  util/ntp-keygen-opts.c@1.527 +173 -173
+    NTP_4_2_8P9_WIN
+
+  util/ntp-keygen-opts.h@1.525 +3 -3
+    NTP_4_2_8P9_WIN
+
+  util/ntp-keygen.1ntp-keygenman@1.337 +3 -3
+    NTP_4_2_8P9_WIN
+
+  util/ntp-keygen.1ntp-keygenmdoc@1.337 +2 -2
+    NTP_4_2_8P9_WIN
+
+  util/ntp-keygen.html@1.183 +2 -2
+    NTP_4_2_8P9_WIN
+
+  util/ntp-keygen.man.in@1.337 +3 -3
+    NTP_4_2_8P9_WIN
+
+  util/ntp-keygen.mdoc.in@1.337 +2 -2
+    NTP_4_2_8P9_WIN
+
+ChangeSet@1.3728, 2017-01-28 09:32:36-05:00, stenn@pogo.udel.edu
+  typos
+
+  sntp/m4/ntp_openssl.m4@1.26 +13 -13
+    typos
+
+ChangeSet@1.3726, 2017-01-27 11:21:38+00:00, stenn@psp-deb1.ntp.org
+  ntp-4.2.8p9-win
+
+  ChangeLog@1.1855 +4 -1
+    ntp-4.2.8p9-win
+
+  packageinfo.sh@1.533 +1 -1
+    ntp-4.2.8p9-win
+
+ChangeSet@1.3725, 2017-01-27 11:09:20+00:00, stenn@psp-deb1.ntp.org
+  bk-7 repos don't have a ChangeSet file
+
+  sntp/Makefile.am@1.89 +1 -1
+    bk-7 repos don't have a ChangeSet file
+
+ChangeSet@1.3724, 2017-01-21 15:12:35+01:00, perlinger@ntp.org
+  [Bug 3144] NTP does not build without openSSL <perlinger@ntp.org>
+   - pulled missing changeset, minor warning fixes
+
+  ChangeLog@1.1854 +2 -1
+    [Bug 3144] NTP does not build without openSSL <perlinger@ntp.org>
+     - pulled missing changeset, minor warning fixes
+
+  include/ssl_applink.c@1.3 +9 -1
+    [Bug 3144] NTP does not build without openSSL <perlinger@ntp.org>
+     - minor warning fixes
+
+  ports/winnt/ntpd/ntservice.c@1.31 +1 -0
+    [Bug 3144] NTP does not build without openSSL <perlinger@ntp.org>
+     - pulled missing changeset, minor warning fixes
+
+ChangeSet@1.3720.1.2, 2017-01-10 06:07:05-05:00, stenn@pogo.udel.edu
+  configure.ac cleanup
+
+  ChangeLog@1.1852.1.1 +5 -0
+    configure.ac cleanup
+
+  configure.ac@1.607 +1 -1
+    configure.ac cleanup
+
+ChangeSet@1.3720.1.1, 2017-01-10 06:05:44-05:00, stenn@pogo.udel.edu
+  openssl configure cleanup
+
+  sntp/m4/ntp_libntp.m4@1.34 +1 -3
+    openssl configure cleanup
+
+  sntp/m4/ntp_openssl.m4@1.25 +19 -1
+    openssl configure cleanup
+
+ChangeSet@1.3722, 2016-11-23 08:34:52+01:00, perlinger@ntp.org
+  Bug 3144 - NTP does not build without openSSL
+   - fix SNTP to build '--without-crypto',too
+   - remove some warnings that result from '--without-crypto'
+
+  ntpd/ntp_control.c@1.215 +4 -1
+    Bug 3144 - NTP does not build without openSSL
+     - remove some warnings that result from '--without-crypto'
+
+  ntpd/ntp_proto.c@1.398 +1 -1
+    Bug 3144 - NTP does not build without openSSL
+     - remove some warnings that result from '--without-crypto'
+
+  sntp/crypto.c@1.24 +1 -1
+    Bug 3144 - NTP does not build without openSSL
+     - fix SNTP to build '--without-crypto', too
+
+ChangeSet@1.3721, 2016-11-22 22:22:46+01:00, perlinger@ntp.org
+  [Bug 3144] NTP does not build without openSSL
+
+  ChangeLog@1.1853 +3 -1
+    [Bug 3144] NTP does not build without openSSL
+
+  include/ntp_md5.h@1.11 +4 -0
+    [Bug 3144] NTP does not build without openSSL
+     - pull in "libssl_compat.h" if built with openssl
+     - provide compliant API otherwise
+
+  libntp/a_md5encrypt.c@1.40 +0 -1
+    [Bug 3144] NTP does not build without openSSL
+     - do not directly include "libssl_compat.h" -- comes with "ntp_md5.h"
+
+  libntp/libssl_compat.c@1.2.1.1 +10 -7
+    [Bug 3144] NTP does not build without openSSL
+     - compiles code only if openssl is indeed required
+
+  ntpd/ntp_control.c@1.214 +1 -3
+    [Bug 3144] NTP does not build without openSSL
+     - do not directly include "libssl_compat.h" -- comes with "ntp_md5.h"
+     - fix long-standing warning
+
+  ntpd/ntp_io.c@1.418 +9 -5
+    [Bug 3144] NTP does not build without openSSL
+     - sidekick: Fix annoying warnings for Debug Build (Win64/32 issue)
+
+  ports/winnt/ntpd/ntp_iocompletionport.c@1.78 +4 -6
+    [Bug 3144] NTP does not build without openSSL
+     - sidekick: Fix annoying warnings MSVC emits
+
 ChangeSet@1.3720, 2016-11-21 08:08:21-05:00, stenn@deacon.udel.edu
   NTP_4_2_8P9
   TAG: NTP_4_2_8P9
@@ -557,7 +995,6 @@ ChangeSet@1.3701, 2016-10-24 07:37:25+02
     [winio2 - unlocked]
      - eliminate critical section, simplify API
      - the great renaming
-    
 
 ChangeSet@1.3698.1.7, 2016-10-23 05:18:04+00:00, stenn@psp-deb1.ntp.org
   ntp-4.2.8p9-PRE
@@ -889,7 +1326,7 @@ ChangeSet@1.3698.1.7, 2016-10-23 05:18:0
   util/ntp-keygen.mdoc.in@1.335 +2 -2
     ntp-4.2.8p9-PRE
 
-ChangeSet@1.3688.4.1, 2016-10-20 19:28:06+00:00, stenn@psp-deb1.ntp.org
+ChangeSet@1.3688.5.1, 2016-10-20 19:28:06+00:00, stenn@psp-deb1.ntp.org
   cleanup
 
   ChangeLog@1.1836.4.1 +1 -0
@@ -910,7 +1347,6 @@ ChangeSet@1.3686.19.1, 2016-10-20 09:21:
 
   ChangeLog@1.1834.19.1 +4 -0
     [Sec 3113] Broadcast Mode Poll Interval Enforcement DoS
-    
 
   include/ntp.h@1.220.1.1 +1 -1
     [Sec 3113] Broadcast Mode Poll Interval Enforcement DoS
@@ -953,7 +1389,7 @@ ChangeSet@1.3698.1.2, 2016-10-10 22:34:5
 
   tests/bug-3102/zeroorg.py@1.0 +0 -0
 
-ChangeSet@1.3688.3.2, 2016-10-10 01:46:05-07:00, harlan@max.pfcs.com
+ChangeSet@1.3688.4.1, 2016-10-10 01:46:05-07:00, harlan@max.pfcs.com
   Fix typos in include/ntp.h
 
   ChangeLog@1.1836.3.1 +1 -0
@@ -989,6 +1425,89 @@ ChangeSet@1.3699, 2016-10-04 08:36:17+02
     [Bug 3125] NTPD doesn't fully start when ntp.conf entries are out of order using the loopback-ppsapi-provider.dll
      - fix wrong instance initialisation
 
+ChangeSet@1.3688.3.2, 2016-10-02 09:01:53+02:00, perlinger@ntp.org
+  [Bug 3095] Compatibility with openssl 1.1
+   - add autolib hader
+   - fix linker input selection
+
+  include/ssl_applink.c@1.2 +15 -3
+    [Bug 3095] Compatibility with openssl 1.1
+     - the graet renaming of v1.1.0
+
+  libntp/libssl_compat.c@1.3 +4 -0
+    [Bug 3095] Compatibility with openssl 1.1
+     - make sure 'inttypes.h' is included before SSL headers (macro definitiion order)
+
+  ports/winnt/include/msvc_ssl_autolib.h@1.1 +94 -0
+    [Bug 3095] Compatibility with openssl 1.1
+     create automagic library selection header
+
+  ports/winnt/include/msvc_ssl_autolib.h@1.0 +0 -0
+
+  ports/winnt/vs2008/debug-x64.vsprops@1.2 +2 -2
+    [Bug 3095] Compatibility with openssl 1.1
+     - fix linker input selection
+
+  ports/winnt/vs2008/debug.vsprops@1.2 +1 -1
+    [Bug 3095] Compatibility with openssl 1.1
+     - fix linker input selection
+
+  ports/winnt/vs2008/release-x64.vsprops@1.2 +1 -1
+    [Bug 3095] Compatibility with openssl 1.1
+     - fix linker input selection
+
+  ports/winnt/vs2008/release.vsprops@1.2 +1 -1
+    [Bug 3095] Compatibility with openssl 1.1
+     - fix linker input selection
+
+  ports/winnt/vs2013/debug-x64.props@1.3 +1 -1
+    [Bug 3095] Compatibility with openssl 1.1
+     - fix linker input selection
+
+  ports/winnt/vs2013/debug.props@1.2 +1 -1
+    [Bug 3095] Compatibility with openssl 1.1
+     - fix linker input selection
+
+  ports/winnt/vs2013/libntp/libntp.vcxproj@1.13 +2 -1
+    [Bug 3095] Compatibility with openssl 1.1
+     - add autolib hader
+
+  ports/winnt/vs2013/libntp/libntp.vcxproj.filters@1.11 +3 -0
+    [Bug 3095] Compatibility with openssl 1.1
+     - add autolib hader
+
+  ports/winnt/vs2013/release-x64.props@1.3 +1 -1
+    [Bug 3095] Compatibility with openssl 1.1
+     - fix linker input selection
+
+  ports/winnt/vs2013/release.props@1.2 +1 -1
+    [Bug 3095] Compatibility with openssl 1.1
+     - fix linker input selection
+
+  ports/winnt/vs2015/debug-x64.props@1.2 +1 -1
+    [Bug 3095] Compatibility with openssl 1.1
+     - fix linker input selection
+
+  ports/winnt/vs2015/debug.props@1.2 +1 -1
+    [Bug 3095] Compatibility with openssl 1.1
+     - fix linker input selection
+
+  ports/winnt/vs2015/libntp/libntp.vcxproj@1.3 +1 -0
+    [Bug 3095] Compatibility with openssl 1.1
+     - add autolib hader
+
+  ports/winnt/vs2015/libntp/libntp.vcxproj.filters@1.3 +3 -0
+    [Bug 3095] Compatibility with openssl 1.1
+     - add autolib hader
+
+  ports/winnt/vs2015/release-x64.props@1.2 +1 -1
+    [Bug 3095] Compatibility with openssl 1.1
+     - fix linker input selection
+
+  ports/winnt/vs2015/release.props@1.2 +1 -1
+    [Bug 3095] Compatibility with openssl 1.1
+     - fix linker input selection
+
 ChangeSet@1.3698, 2016-10-01 10:52:11+00:00, stenn@psp-deb1.ntp.org
   Update NEWS for 3119
 
@@ -8089,31 +8608,24 @@ ChangeSet@1.3552.1.13, 2015-08-20 10:15:
 
   sntp/libevent/test/bench_httpclient.c@1.8 +5 -1
     reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
-    
 
   sntp/libevent/test/regress.c@1.8 +6 -2
     reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
-    
 
   sntp/libevent/test/regress_dns.c@1.10 +6 -5
     reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
-    
 
   sntp/libevent/test/regress_http.c@1.10 +8 -4
     reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
-    
 
   sntp/libevent/test/regress_minheap.c@1.5 +2 -1
     reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
-    
 
   sntp/libevent/test/test-ratelim.c@1.11 +6 -2
     reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
-    
 
   sntp/libevent/test/test-time.c@1.7 +2 -1
     reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
-    
 
 ChangeSet@1.3552.1.12, 2015-08-20 01:10:57+02:00, viperus@ubuntu.(none)
   Makefile.am:
@@ -8151,67 +8663,51 @@ ChangeSet@1.3552.1.10, 2015-08-20 00:23:
 
   ntpd/refclock_palisade.c@1.43 +2 -2
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   ntpq/ntpq.c@1.161 +7 -7
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   sntp/libevent/sample/http-server.c@1.11 +2 -2
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   sntp/libevent/test/bench_httpclient.c@1.7 +1 -1
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   sntp/libevent/test/regress.c@1.7 +2 -2
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   sntp/libevent/test/regress_dns.c@1.9 +4 -4
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   sntp/libevent/test/regress_http.c@1.9 +3 -3
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   sntp/libevent/test/regress_minheap.c@1.4 +1 -1
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   sntp/libevent/test/test-ratelim.c@1.10 +2 -2
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   sntp/libevent/test/test-time.c@1.6 +1 -1
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   sntp/libopts/compat/pathfind.c@1.12 +5 -5
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   sntp/tests/fileHandlingTest.c@1.3 +1 -1
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   sntp/tests/packetProcessing.c@1.8 +1 -1
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   tests/libntp/a_md5encrypt.c@1.12 +1 -1
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   tests/libntp/calendar.c@1.6.1.1 +4 -4
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
   tests/libntp/caljulian.c@1.10 +1 -1
     Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
-    
 
 ChangeSet@1.3552.1.9, 2015-08-17 13:56:23+02:00, viperus@ubuntu.(none)
   Makefile.am:
@@ -8595,7 +9091,6 @@ ChangeSet@1.3548.1.13, 2015-08-06 20:41:
 
   tests/libntp/socktoa.c@1.9 +2 -2
     fixed. Tests are skipped when you do ./build --disable-ipv6
-    
 
   tests/ntpq/Makefile.am@1.2 +8 -37
     changes
@@ -8636,7 +9131,6 @@ ChangeSet@1.3548.1.11, 2015-08-06 10:27:
 
   tests/libntp/run-socktoa.c@1.11 +7 -7
     Minor changes due to the autogenerated ruby script
-    
 
   tests/libntp/socktoa.c@1.8 +22 -6
     update
@@ -8811,8 +9305,6 @@ ChangeSet@1.3548.1.2, 2015-08-01 22:40:5
     Added test ntp_singd again, renamed it to ntp_signdT (including the original ntp_signd.c doesn't work if you have 2 files with the same name).
     I included the original ntp_signd.c, so static functions can be tested.
     Additional .o objects had to be added for everyhting to work.
-    
-    
 
   tests/ntpd/ntp_signdT.c@1.2 +17 -2
     MUST ADD #define HAVE_NTP_NAME above the #include "ntp_NAME.c"
@@ -8918,15 +9410,12 @@ ChangeSet@1.3529.1.18, 2015-07-27 19:46:
 
   tests/libntp/run-lfptostr.c@1.6 +11 -11
     update
-    
 
   tests/libntp/run-netof.c@1.6 +0 -1
     update
-    
 
   tests/libntp/run-socktoa.c@1.9 +6 -6
     update
-    
 
   tests/ntpd/Makefile.am@1.6.1.4 +8 -3
     Merge
@@ -8942,11 +9431,9 @@ ChangeSet@1.3529.1.18, 2015-07-27 19:46:
 
   tests/ntpd/run-ntp_signd.c@1.3 +2 -2
     update
-    
 
   tests/ntpd/run-rc_cmdlength.c@1.2 +8 -3
     update
-    
 
 ChangeSet@1.3543, 2015-07-27 04:11:08+00:00, stenn@psp-at1.ntp.org
   [Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn
@@ -9192,165 +9679,126 @@ ChangeSet@1.3529.1.10, 2015-07-25 16:54:
 
   tests/libntp/netof.c@1.3.1.1 +8 -0
     adding declarations
-    
 
   tests/libntp/numtoa.c@1.6 +2 -0
     adding declarations
-    
 
   tests/libntp/numtohost.c@1.5 +2 -0
     adding declarations
-    
 
   tests/libntp/octtoint.c@1.3.1.1 +10 -0
     adding declarations
-    
 
   tests/libntp/prettydate.c@1.3 +3 -0
     adding declarations
-    
 
   tests/libntp/recvbuff.c@1.5 +4 -0
     adding declarations
-    
 
   tests/libntp/refidsmear.c@1.5 +6 -3
     adding declarations
-    
 
   tests/libntp/refnumtoa.c@1.5 +4 -0
     adding declarations
-    
 
   tests/libntp/run-clocktime.c@1.9 +1 -1
     update
 
   tests/libntp/run-lfpfunc.c@1.16 +9 -9
     update
-    
 
   tests/libntp/run-netof.c@1.5 +4 -4
     update
-    
 
   tests/libntp/run-numtoa.c@1.9 +2 -2
     update
-    
 
   tests/libntp/run-numtohost.c@1.9 +1 -1
     update
-    
 
   tests/libntp/run-octtoint.c@1.6 +7 -7
     update
-    
 
   tests/libntp/run-prettydate.c@1.4 +1 -1
     update
-    
 
   tests/libntp/run-recvbuff.c@1.4 +3 -3
     update
-    
 
   tests/libntp/run-refidsmear.c@1.5 +1 -1
     update
-    
 
   tests/libntp/run-refnumtoa.c@1.7 +2 -2
     update
-    
 
   tests/libntp/run-sfptostr.c@1.4 +7 -7
     update
-    
 
   tests/libntp/run-socktoa.c@1.8 +6 -6
     update
-    
 
   tests/libntp/run-ssl_init.c@1.8 +5 -5
     update
-    
 
   tests/libntp/run-statestr.c@1.9 +4 -4
     update
-    
 
   tests/libntp/run-strtolfp.c@1.4 +6 -6
     update
-    
 
   tests/libntp/run-timespecops.c@1.9 +28 -28
     update
-    
 
   tests/libntp/run-timevalops.c@1.11 +28 -28
     update
-    
 
   tests/libntp/run-tstotv.c@1.4 +3 -3
     update
-    
 
   tests/libntp/run-tvtots.c@1.5 +3 -3
     update
-    
 
   tests/libntp/run-vi64ops.c@1.7 +3 -3
     update
-    
 
   tests/libntp/run-ymd2yd.c@1.10 +4 -4
     update
-    
 
   tests/libntp/sfptostr.c@1.3 +10 -0
     update
-    
 
   tests/libntp/sockaddrtest.c@1.2 +1 -0
     update
-    
 
   tests/libntp/socktoa.c@1.3.1.1 +6 -0
     added declarations
 
   tests/libntp/ssl_init.c@1.8 +6 -0
     added declarations
-    
 
   tests/libntp/statestr.c@1.5 +4 -0
     added declarations
-    
 
   tests/libntp/strtolfp.c@1.2.1.1 +9 -0
     added declarations
-    
 
   tests/libntp/timespecops.c@1.8 +40 -1
     added declarations
-    
 
   tests/libntp/timevalops.c@1.11 +37 -1
     added declarations
-    
 
   tests/libntp/tstotv.c@1.3 +5 -0
     added declarations
-    
 
   tests/libntp/tvtots.c@1.5 +3 -0
     added declarations
-    
 
   tests/libntp/vi64ops.c@1.6 +6 -0
     added declarations
-    
 
   tests/libntp/ymd2yd.c@1.6 +5 -0
     added declarations
-    
 
 ChangeSet@1.3536, 2015-07-25 02:08:32+02:00, tomek@tomek-n56vz.(none)
   run-ntp_restrict.c:
@@ -9408,57 +9856,45 @@ ChangeSet@1.3529.1.9, 2015-07-24 18:38:0
 
   tests/libntp/calendar.c@1.6 +42 -18
     added function declarations + minor comment fixes
-    
 
   tests/libntp/caljulian.c@1.9 +10 -0
     added declarations
 
   tests/libntp/caltontp.c@1.3 +5 -0
     added declarations
-    

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703232206.v2NM66R8034912>