Merge psp-deb2.ntp.org:/home/perlinger/ntp-stable-timex/

into  psp-deb2.ntp.org:/home/stenn/ntp-stable-p14

bk: 5d1dcef7ueuxAOVU7LURmM89dK1H0A

diff --cc ChangeLog
index 7044d4ec34e589d14692801343d411e3d7eb8472,4f79e0c84b8a4c37c2aaf2ebf75e976367e9ef5a..9807a64b1546ba6dfd0c8dc5a25483f37f0f70c8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,42 +1,44 @@@
  ---
- (4.2.8p13)
  
 +* [Bug 3569] cleanup MOD_NANO/STA_NANO handling for 'ntpadjtimex()' <perlinger@ntp.org>
 +  - sidekick: service port resolution in 'ntpdate'
+ * [Bug 3550] Reproducible build: Respect SOURCE_DATE_EPOCH <perlinger@ntp.org>
+   - applied patch by Douglas Royds
+ * [Bug 3542] ntpdc monlist parameters cannot be set <perlinger@ntp.org>
+ * [Bug 3533] ntpdc peer_info ipv6 issues <perlinger@ntp.org>
+   - applied patch by Gerry Garvey
+ * [Bug 3531] make check: test-decodenetnum fails <perlinger@ntp.org>
+   - try to harden 'decodenetnum()' against 'getaddrinfo()' errors
+   - fix wrong cond-compile tests in unit tests
+ * [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 3491] Signed values of LFP datatypes should always display a sign
+   - applied patch by Gerry Garvey & fixed unit tests <perlinger@ntp.org>
+ * [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>
+ 
+ * [Sec 3565] Crafted null dereference attack in authenticated
+            mode 6 packet <perlinger@ntp.org>
+   - reported by Magnus Stubman
  * [Bug 3560] Fix build when HAVE_DROPROOT is not defined <perlinger@ntp.org>
    - applied patch by Ian Lepore
  * [Bug 3558] Crash and integer size bug <perlinger@ntp.org>

diff --cc ntpd/ntp_control.c
Simple merge