[Git][NTPsec/ntpsec][master] 2 commits: Python 3 is now acceptable.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
14f73ad5 by Eric S. Raymond at 2016-06-18T00:10:55-04:00
Python 3 is now acceptable.

- - - - -
e7d11140 by Eric S. Raymond at 2016-06-18T08:51:37-04:00
Fix for Classic [Bug 3047]: refclock_jjy does not work with C-DEX JST2000

- - - - -


4 changed files:

- NEWS
- devel/hacking.txt
- docs/driver40.txt
- ntpd/refclock_jjy.c


Changes:

=====================================
NEWS
=====================================
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,10 @@ NTP Classic:
 https://lists.ntpsec.org/pipermail/devel/2016-June/001299.html provides
 additional information on this issue.
 
+It also includes the following fix cross-ported from Classic:
+
+[Bug 3047] refclock_jjy does not work with C-DEX JST2000
+
 == 2016-05-17: 0.9.3 ==
 
 The long-deprecated Autokey feature has been removed.


=====================================
devel/hacking.txt
=====================================
--- a/devel/hacking.txt
+++ b/devel/hacking.txt
@@ -255,7 +255,7 @@ The file "dot.emacs" has the emacs C-mode indentation style that Dave likes.
 === Other languages ===
 
 The only scripting languages allowed and supported are POSIX sh and
-Python 2.5 or later, but not Python 3. If you find code in the
+Python 2.5 or later. If you find code in the
 distribution that is in a scripting language and not one of these,
 you would be doing us a favor by translating it into Python or sh.
 


=====================================
docs/driver40.txt
=====================================
--- a/docs/driver40.txt
+++ b/docs/driver40.txt
@@ -77,7 +77,7 @@ RS-232C, 9600 BPS, 8-bits, no parity, 1 stop bit;;
 Time code format::
 +
 Command        -\-> Reply +
-+{ENQ}1J{ETX}+ -\-> +{STX}JYYMMDD HHMMSSS{ETX}+
++{ENQ}1J{ETX}+ -\-> +{STX}JYYMMDDWHHMMSSS{ETX}+
 
 * [[mode-3]]Echo Keisokuki Co.,Ltd. LT-2000 link:http://www.clock.co.jp/[] (domain no longer registered)
 +


=====================================
ntpd/refclock_jjy.c
=====================================
--- a/ntpd/refclock_jjy.c
+++ b/ntpd/refclock_jjy.c
@@ -83,6 +83,10 @@
 /*  2015/05/15							      */
 /*    [Add]    Support the SEIKO TIME SYSTEMS TDC-300		      */
 /*								      */
+/*  2015/05/08							      */
+/*    [Fix]    C-DEX JST2000                                          */
+/*             Thanks to Mr. Kuramatsu for the report and the patch.  */
+/*								      */
 /**********************************************************************/
 
 #include <config.h>
@@ -1458,9 +1462,9 @@ jjy_receive_cdex_jst2000 ( struct recvbuf *rbufp )
 		return JJY_RECEIVE_ERROR ;
 	}
 
-	/* JYYMMDD HHMMSSS */
+	/* JYYMMDDWHHMMSSS */
 
-	rc = sscanf ( pBuf, "J%2d%2d%2d %2d%2d%2d%1d",
+	rc = sscanf ( pBuf, "J%2d%2d%2d%*1d%2d%2d%2d%1d",
 		      &up->year, &up->month, &up->day,
 		      &up->hour, &up->minute, &up->second,
 		      &up->msecond ) ;



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/766777c8a4291ba159276aac11d9200fc159f70c...e7d11140c1d02305490eca18c0d92da4a5770e23
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160618/21427c1e/attachment.html>