From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 3 Jul 2019 10:48:02 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-phpi01
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cef752d2403a7a0d52886b5d0a60b050f4c420c4;p=thirdparty%2Fntp.git

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
---

cef752d2403a7a0d52886b5d0a60b050f4c420c4
diff --cc ChangeLog
index 554e404dd,236f25e1d..fcd0dfc5b
--- a/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 ntpd/ntpd.c
index b93612d87,e3595c0e3..86c608fbd
--- a/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)