]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge ntp-build.tal1.ntfo.org:/ntpbuild/data/master/ntp-stable
authorNTP Release Engineering <stenn@ntp.org>
Tue, 9 Apr 2019 04:19:31 +0000 (21:19 -0700)
committerNTP Release Engineering <stenn@ntp.org>
Tue, 9 Apr 2019 04:19:31 +0000 (21:19 -0700)
into  ntp-build.tal1.ntfo.org:/ntpbuild/data/newdev/ntp-dev

bk: 5cac1d53nqwwXwGIIku1cjcNVARRHw

1  2 
ChangeLog

diff --cc ChangeLog
index 352850e3d3bc16f9f31b694c8df0f76aaa8c1312,a70f03329761b2cbd20098d178be237c40523b7f..4a84e308a2822fccb95e3495a63056b29c46a9e0
+++ b/ChangeLog
@@@ -1,8 -1,15 +1,20 @@@
 -(4.2.8p9-win) 2017/02/01 Released by Harlan Stenn <stenn@ntp.org>
 -(4.2.8p9-win) 2017/02/01 Released by Harlan Stenn <stenn@ntp.org>
 +* Clean up sntp/Makefile.am rule for scm-rev.  <stenn@ntp.org>
++
++From ntp-4.2.8p9-win:
+ ---
+ (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.3.94) 2019/04/07 Released by Harlan Stenn <stenn@ntp.org>
 +* Tweak scripts/build/addChangeLogTag <stenn@ntp.org>
 +* Pick up tweaks to autogen-5.18.5 <stenn@ntp.org>
 +From ntp-4.2.8p9:
  ---
  (4.2.8p9) 2016/11/21 Released by Harlan Stenn <stenn@ntp.org>