Merge bk://ntp.bkbits.net/ntp-stable

into  pogo.udel.edu:/pogo/users/kardel/main-line/ntp-stable

bk: 4657de37z7LTluZvVuo0myJmSHBZBw

diff --cc ChangeLog
index 0d01ee1216d9797a6cbe727196d4d868be857977,149ab5c508940811c955399040be4e0488a6bde3..1ff648547c6521ad297e64fc8251b62ba9ddfaf1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,9 +1,13 @@@
- (4.2.4p1) Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 789] Fix multicast client crypto authentication and make sure arriving
 +          multicast packets do not disturb the autokey dance.
 +* [Bug 785] improve handling of multicast interfaces
 +          (multicast routers still need to run a multicast routing software/daemon)
+ (4.2.4p2) Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 527] Don't write from source address length to wrong location
+ * Upgraded autogen and libopts.
  * [Bug 811] ntpd should not read a .ntprc file.
+ (4.2.4p1) (skipped)
+ (4.2.4p0) Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 793] Update Hans Lambermont's email address in ntpsweep.
  * [Bug 776] Remove unimplemented "rate" flag from ntpdate.
  * [Bug 586] Avoid lookups if AI_NUMERICHOST is set.