Merge perlinger@psp-deb1.ntp.org:ntp-dev-2466

into  hydra.(none):/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-dev-2466

bk: 52f5e420ZMgdXbOS0TYNUwgGYfqyBQ

diff --cc ChangeLog
index 632a3e4b1032451186dbad289b3db76d989ea63a,e5dec22ce31251c807dabb7f8709a8848f0427db..3fb8a0d06194d69593d461f523e5b6fa77653baf
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,39 -1,4 +1,40 @@@
+ * [Bug 2466] Wrap NMEA timestamps in 1024 week cycles
 +(4.2.7p418) 2014/02/05 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2551] --disable-local-libevent breaks the build.
 +(4.2.7p417) 2014/02/02 Released by Harlan Stenn <stenn@ntp.org>
 +* Bug 2539: doc and code tweaks for NMEA driver
 +* Add check for enable stats to ntpd/complete.conf.in
 +* Fix typo in html/confopt.html
 +(4.2.7p416) 2014/01/31 Released by Harlan Stenn <stenn@ntp.org>
 +* Tweak the 'Modified' line on appropriate html pages.
 +* Note in the deprecation of ntpdc in its documentation.
 +* [Bug 2332] Be more careful about when we use 'libgcc_s'.
 +(4.2.7p415) 2014/01/28 Released by Harlan Stenn <stenn@ntp.org>
 +* Fix the man page installation for the scripts/ files.
 +(4.2.7p414) 2014/01/28 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 792] TrueTime TL-3 WWV refclock support.
 +* [Bug 898] Documentation fixes.
 +* [Bug 930] ntpdc docs refer to 'clockinfo', but mean 'clockstat'.
 +* [Bug 1002] ntp-keygen option and documentation updates: -p/--pvt-passwd
 +  is now -p/--password, and -q/--get-pvt-passwd is now -q/--export-passwd.
 +* [Bug 1349] statistics command not documented in HTML documentation.
 +  In html/monopt.html, add statistics id, definition, description, and
 +  correct typo.
 +  In html/scripts/monopt.txt, add statistics item, href, and comment.
 +  In ntpd/ntp.conf.def, under statistics correct four to eight kinds.
 +  In ntpd/complete.conf.in, add all eight kinds to statistics.
 +  In html/comdex.html, remove duplicate footer.
 +* [Bug 1734] Include man page for ntp.conf (fixed in 4.2.7p297).
 +* [Bug 2049] Clarify ntpdate's -d option behavior.
 +* [Bug 2366] ntpdc.html: burst/iburst only work on servers.
 +* [Bug 2493] ntptrace needs a man page (fixed in 4.2.7p402).
 +* [Bug 2545] Cleanup of scripts/monitoring/ntptrap.
 +(4.2.7p413) 2014/01/27 Released by Harlan Stenn <stenn@ntp.org>
 +* Require a version string for perl scripts that use autogen.
 +* html/ cleanup.
 +(4.2.7p412) 2014/01/20 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2540] bootstrap script needs to 'touch' files in finer-grained groups.
 +(4.2.7p411) 2014/01/12 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2532] Note in ntpdc docs that "enable pps" only works on older ntpd.
  (4.2.7p410) 2014/01/08 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2332] Force reference to 'libgcc_s' when using GCC, because

diff --cc ntpd/refclock_nmea.c
index 1b930ab354a046f666086bcb9c7b4fd56aaf915c,3a84009e360043c15a0dcded3b2301074bf67ebd..abe310842e4406f82366456e6b70fb1071e51ddb
--- 1/ntpd/refclock_nmea.c
--- 2/ntpd/refclock_nmea.c
+++ b/ntpd/refclock_nmea.c
@@@ -87,7 -87,8 +87,8 @@@
  #define NMEA_BAUDRATE_SHIFT   4
  
  #define NMEA_DELAYMEAS_MASK   0x80
- #define NMEA_EXTLOG_MASK      0x010000U
 -#define NMEA_EXTLOG_MASK      0x01000000U
++#define NMEA_EXTLOG_MASK      0x00010000U
+ #define NMEA_DATETRUST_MASK   0x02000000U
  
  #define NMEA_PROTO_IDLEN      5       /* tag name must be at least 5 chars */
  #define NMEA_PROTO_MINLEN     6       /* min chars in sentence, excluding CS */