Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-phpi01

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p14

bk: 5d1c87e2nb8HcLTpxWXY5CY4XTH7Eg

diff --cc ChangeLog
index 554e404dda519c2828fa5190ba421ea89d91ab9c,236f25e1deac2e7c3bb1c6e5a942e217828d952c..fcd0dfc5b516a3a55973de4a21d459e5437f52c3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,13 +1,25 @@@
  ---
 +
+ * [Bug 3517] Reducing build noise <perlinger@ntp.org>
+ * [Bug 3516] Require tooling from this decade <perlinger@ntp.org>
+   - patch by Philipp Prindeville
+ * [Bug 3515] Refactor ntpdmain() dispatcher loop and group common code <perlinger@ntp.org>
+   - patch by Philipp Prindeville
+ * [Bug 3511] Get rid of AC_LANG_SOURCE() warnings <perlinger@ntp.org>
+   - patch by Philipp Prindeville
+ * [Bug 3510] Flatten out the #ifdef nesting in ntpdmain() <perlinger@ntp.org>
+   - partial application of patch by Philipp Prindeville
 +* [Bug 3490] Patch to support Trimble Resolution Receivers <perlinger@ntp.org>
 +  - applied (modified) patch by Richard Steedman
 +* [Bug 3132] Building 4.2.8p8 with disabled local libopts fails <perlinger@ntp.org>
 +  - applied patch by Miroslav Lichvar
 +* [Bug 3094] ntpd trying to listen for broadcasts on a completely ipv6 network
 +  <perlinger@ntp.org>
 +* [Bug 2420] ntpd doesn't run and exits with retval 0 when invalid user
 +             is specified with -u <perlinger@ntp.org>
 +  - monitor daemon child startup & propagate exit codes
 +* [Bug 1433] runtime check whether the kernel really supports capabilities
 +  - (modified) patch by Kurt Roeckx <perlinger@ntp.org>
  
  ---
  (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn@ntp.org>

diff --cc configure.ac
Simple merge

diff --cc ntpd/ntpd.c
index b93612d87c5db290b3c8eac03e25ca6319b4db80,e3595c0e3fb6b55ddb1c91b3916ebc93f51f8278..86c608fbdecd6239e1f18bf94c8a0bcc03535b98
--- 1/ntpd/ntpd.c
--- 2/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@@ -1418,15 -1359,14 +1414,18 @@@ int scmp_sc[] = 
        }
  #endif /* LIBSECCOMP and KERN_SECCOMP */
  
 -#ifdef SYS_WINNT
 +#if defined(SYS_WINNT)
        ntservice_isup();
 -#endif
 +#elif defined(HAVE_WORKING_FORK)
 +      if (daemon_pipe[1] != -1) {
 +              write(daemon_pipe[1], "R\n", 2);
 +      }
 +#endif /* HAVE_WORKING_FORK */
  
- # ifdef HAVE_IO_COMPLETION_PORT
+ # ifndef HAVE_IO_COMPLETION_PORT
+       BLOCK_IO_AND_ALARM();
+       was_alarmed = FALSE;
+ # endif
  
        for (;;) {
  #if !defined(SIM) && defined(SIGDIE1)