Merge tl.ntp.md:C:/ntp/stable/tracking

into  tl.ntp.md:C:/ntp/stable/3847

bk: 6541f2a8_QomvZTsnE4EzIqf2NUF5w

diff --cc ChangeLog
index 25f5ad5a04a4b33ba73cf12471665bcb64b9db89,374eb96334e6b319fbe054282a193db3b7443a7c..84e45b3979e5e10cbab30dd024e2bb123af8a6ca
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -22,6 -17,6 +22,8 @@@
  * [Bug 3850] ntpq -c apeers breaks column formatting s2 w/refclock refid.
               <hart@ntp.org>
  * [Bug 3849] ntpd --wait-sync times out. <hart@ntp.org>
++* [Bug 3847] SSL detection in configure should run-test if runpath is needed.
++             <hart@ntp.org>
  * [Bug 3846] Use -Wno-format-truncation by default. <hart@ntp.org>
  * [Bug 3845] accelerate pool clock_sync when IPv6 has only link-local access.
               <hart@ntp.org>
@@@ -48,7 -41,13 +50,14 @@@
  * Provide ntpd thread names to debugger on Windows. <hart@ntp.org>
  * Remove dead code libntp/numtohost.c and its unit tests. <hart@ntp.org>
  * Remove class A, B, C IPv4 distinctions in netof(). <hart@ntp.org>
 +* Use NONEMPTY_COMPILATION_UNIT in more conditionally-compiled files.
+ * Use @configure_input@ in various *.in files to include a comment that
+   the file is generated from another pointing to the *.in. <hart@ntp.org>
+ * Correct underquoting, indents in ntp_facilitynames.m4. <hart@ntp.org>
+ * Clean up a few warnings seen building with older gcc. <hart@ntp.org>
+ * Fix build on older FreeBSD lacking sys/procctl.h. <hart@ntp.org>
+ * Disable [Bug 3627] workaround on newer FreeBSD which has the kernel fix
+   that makes it unnecessary, re-enabling ASLR stack gap. <hart@ntp.org>
  
  ---
  (4.2.8p17) 2023/06/06 Released by Harlan Stenn <stenn@ntp.org>

diff --cc configure.ac
Simple merge

diff --cc ntpd/complete.conf.in
index 117e84b6f62eaee7bca853ac2e20c2b6d57f3c3f,b046e9d8c3a7d0de1f55ac1b5aeb858701adfe5a..adda4e4fa921b6c0a66dcb349379cfcb57250ab5
--- 1/ntpd/complete.conf.in
--- 2/ntpd/complete.conf.in
+++ b/ntpd/complete.conf.in
@@@ -33,35 -33,30 +33,35 @@@ tinker allan 1500 dispersion 15 freq 0 
  broadcastclient
  server 127.127.1.0 mode 4294967295 prefer true
  fudge 127.127.1.0 time1 0 time2 1.1 stratum 7 refid Abcd minjitter 0.2
- pool 0.north-america.pool.ntp.org. iburst preempt
- server 1.north-america.pool.ntp.org. iburst
- server -4 2.north-america.pool.ntp.org. minpoll 6 maxpoll 10 iburst
- server -6 ntp.davehart.net. minpoll 6 maxpoll 10 version 5 burst iburst
- peer -6 example.com. ident "autokey-group" xleave autokey
- peer -4 192.168.192.168 key 1 noselect
+ pool 2.ubuntu.pool.ntp.org. iburst preempt
+ pool 2.freebsd.pool.ntp.org. iburst
+ server -6 2.debian.pool.ntp.org. minpoll 6 maxpoll 10 iburst
+ server -4 ntp.davehart.net. minpoll 6 maxpoll 10 version 5 burst iburst
+ peer -6 ntp.md. ident "autokey-group" xleave autokey
+ peer -4 198.51.100.123 key 1 noselect
  server [fe80::123%1] xmtnonce
- broadcast 192.168.192.255
+ broadcast 192.0.2.255
 -manycastclient 224.0.1.1
 -manycastclient ff05::101
 +manycastclient 224.0.1.1 key 14 iburst
 +manycastclient ff05::101 maxpoll 6 key 1
  manycastserver 224.0.1.1 ff05::101
  multicastclient 224.0.1.1 ff05::101
  mru maxage 64 mindepth 600 initalloc 600 initmem 16 incalloc 99 incmem 4 maxdepth 1024 maxmem 4096
  discard minimum 1 average 3 monitor 3000
  pollskewlist 3 1|2 4 3|4 default 6|7
 -restrict default ippeerlimit -1
 -restrict default ippeerlimit 0 nomodify limited kod noserve nomrulist
 +restrict default
 +restrict default ippeerlimit 0 nomodify limited kod nopeer noserve nomrulist
  restrict source ippeerlimit 1
  restrict source ippeerlimit 2 nomodify limited kod
 -restrict trusted.host.name.example.com. ippeerlimit -1 nomodify
 -restrict [fe80::1] mask [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff] ippeerlimit -1
 -restrict 127.0.0.1 mask 255.0.0.0 ippeerlimit -1
 -restrict 198.51.100.123 ippeerlimit -1 serverresponse fuzz
 -restrict ::1 ippeerlimit -1
 +restrict trusted.host.name.example.com. nomodify
 +delrestrict trusted.host.name.example.com.
 +restrict 192.0.2.66 epeer flake lowpriotrap mssntp noepeer noquery notrap notrust ntpport version
 +delrestrict source 192.0.2.123
 +delrestrict source [2001:db8::123]
 +restrict fe80::1
 +restrict 127.0.0.1
 +restrict ::1
- restrict 192.0.2.2 serverresponse fuzz
++restrict 198.51.100.123 serverresponse fuzz
 +restrict fec0:: mask [ffff::] ignore
  interface drop ipv6
  interface ignore ipv4
  interface drop wildcard

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_util.c
Simple merge

diff --cc ntpd/ntpd.c
Simple merge