Merge stenn.chi1.ntfo.org:/home/nfs1.chi1/stenn/ntp-stable

into  stenn.chi1.ntfo.org:/home/nfs1.chi1/stenn/ntp-stable-3753

bk: 661df360xA7cboEUEkQzzGbNwVrOAg

diff --cc ChangeLog
index 0179e4e16de8fc437bc1ac633a0f8e144eb99516,b9a2a1a5da8e6de89d4e5f6f0a7425ad2a4ee638..096504f7ca677e385a3ca6b0e18a5495f43d51a8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -53,7 -54,9 +54,12 @@@
               is disabled.  <burnicki@ntp.org>
  * [Bug 3825] Don't touch HTML files unless building inside a BK repo.
               Fix the script checkHtmlFileDates.  <burnicki@ntp.org>
- * [Bug 3753] ntpd won't start with FIPS-enabled OpenSSL 3.x. <hart@ntp.org>
++* Remove extraneous */ from libparse/ieee754io.c
++* Fix .datecheck target line in Makefile.am.  <stenn@ntp.org>
++* [Bug 3753] ntpd fails to start with FIPS-enabled OpenSSL 3. <hart@ntp.org>
+ * Log failures to allocate receive buffers.  <hart@ntp.org>
+ * Remove extraneous */ from libparse/ieee754io.c
+ * Fix .datecheck target line in Makefile.am.  <stenn@ntp.org>
  * Update the copyright year.  <stenn@ntp.org>
  * Update ntp.conf documentation to add "delrestrict" and correct information
    about KoD rate limiting.  <hart@ntp.org>
@@@ -89,18 -93,8 +95,20 @@@
  * Add configure --enable-verbose-ssl to trace SSL detection. <hart@ntp.org>
  * Add build test coverage for --disable-saveconfig to flock-build script.
    <hart@ntp.org>
 +* Remove deprecated configure --with-arlib option. <hart@ntp.org>
 +* Remove configure support for ISC UNIX ca. 1998. <hart@ntp.org>
 +* Move NTP_OPENSSL and NTP_CRYPTO_RAND invocations from configure.ac files
 +  to NTP_LIBNTP. <hart@ntp.org>
 +* Move ENABLE_CMAC to ntp_openssl.m4, enabling sntp/tests CMAC unit tests.
 +  <hart@ntp.org>
 +* Remove dead code: HAVE_U_INT32_ONLY_WITH_DNS. <hart@ntp.org>
 +* Eliminate [v]snprintf redefinition warnings on macOS. <hart@ntp.org>
 +* Fix clang 14 cast increases alignment warning on Linux. <hart@ntp.org>
 +* Move ENABLE_CMAC to ntp_openssl.m4, reviving sntp/tests CMAC unit tests.
 +  <hart@ntp.org>
 +* Use NTP_HARD_CPPFLAGS in libopts tearoff. <hart@ntp.org>
+ * wire in --enable-build-framework-help
+ * ntp_openssl.m4: openssl detection cleanup.  <stenn@ntp.org>
  
  ---
  (4.2.8p17) 2023/06/06 Released by Harlan Stenn <stenn@ntp.org>

diff --cc configure.ac
Simple merge

diff --cc ntpd/ntp_proto.c
Simple merge

diff --cc sntp/m4/ntp_openssl.m4
Simple merge