[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at deacon.udel.edu
Sat Aug 4 03:16:04 UTC 2012


#### ChangeSet ####
2012-08-03 23:15:30-04:00, stenn at psp-deb1.ntp.org
  Cleanup kclk_sel240x.o rules in libparse/Makefile.am

==== ChangeLog ====
2012-08-03 23:15:22-04:00, stenn at psp-deb1.ntp.org +1 -0
  Cleanup kclk_sel240x.o rules in libparse/Makefile.am

--- 1.1206/ChangeLog	2012-08-03 23:10:59 -04:00
+++ 1.1207/ChangeLog	2012-08-03 23:15:22 -04:00
@@ -1,5 +1,6 @@
 * [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.
 * Documentation cleanup from Mike T.
+* Cleanup kclk_sel240x.o rules in libparse/Makefile.am.
 (4.2.7p292) 2012/08/02 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 1545] Note why we are logging the Version string.
 * [Bug 1872] Remove legacy ppsclock fdpps, #ifdef PPS.

==== libparse/Makefile.am ====
2012-08-03 23:15:22-04:00, stenn at psp-deb1.ntp.org +1 -4
  Cleanup kclk_sel240x.o rules in libparse/Makefile.am

--- 1.29/libparse/Makefile.am	2012-07-19 19:25:51 -04:00
+++ 1.30/libparse/Makefile.am	2012-08-03 23:15:22 -04:00
@@ -50,7 +50,7 @@ libparse_kernel_a_LIBADD =	\
 	kclk_trimtsip.o		\
 	kclk_varitext.o		\
 	kclk_wharton.o		\
-	kclk_sel240x$u.o	\
+	kclk_sel240x.o		\
 	kbinio.o		\
 	kieee754io.o		\
 	kmfp_mul.o		\
@@ -114,9 +114,6 @@ kclk_varitext.o: $(srcdir)/clk_varitext.
 
 kclk_wharton.o: $(srcdir)/clk_wharton.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_wharton.c -o $@
-
-kclk_sel240x.o: $(srcdir)/clk_sel240x.c
-	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_sel240x.c -o $@
 
 kclk_sel240x.o: $(srcdir)/clk_sel240x.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_sel240x.c -o $@

#### ChangeSet ####
2012-08-03 23:11:04-04:00, stenn at psp-deb1.ntp.org
  Documentation cleanup from Mike T.

==== ChangeLog ====
2012-08-03 23:10:59-04:00, stenn at psp-deb1.ntp.org +1 -0
  Documentation cleanup from Mike T.

--- 1.1205/ChangeLog	2012-08-03 02:50:56 -04:00
+++ 1.1206/ChangeLog	2012-08-03 23:10:59 -04:00
@@ -1,4 +1,5 @@
 * [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.
+* Documentation cleanup from Mike T.
 (4.2.7p292) 2012/08/02 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 1545] Note why we are logging the Version string.
 * [Bug 1872] Remove legacy ppsclock fdpps, #ifdef PPS.

==== html/authentic.html ====
2012-08-03 23:10:32-04:00, stenn at psp-deb1.ntp.org +2 -2
  Documentation cleanup from Mike T.

--- 1.9/html/authentic.html	2011-10-09 16:46:53 -04:00
+++ 1.10/html/authentic.html	2012-08-03 23:10:32 -04:00
@@ -55,8 +55,8 @@ required.</p>
 </div>
 <p>Figure 1 shows a typical keys file used by the reference implementation when the OpenSSL library is installed.   In this figure, for key IDs in he range 1-10, the  key is interpreted as a printable ASCII string. For key IDs in the range 11-20, the key is  a 40-character hex digit string.   The key  is truncated or zero-filled internally to either 128 or 160 bits, depending on the key type. The line can be edited later or new lines can be added to change any field.  The key can be  change  to a  password,  such as   <tt>2late4Me</tt> for key ID 10. Note that two or more keys files can be combined in any order as long as the key IDs are distinct.</p>
 <p>When <tt>ntpd</tt> is  started, it reads the keys file specified by the <tt>keys</tt> command and installs the keys in the key cache. However, individual keys must be activated with the <tt>trustedkey</tt> configuration command before use. This allows, for instance, the installation of possibly several batches of keys and then activating a key remotely using <tt>ntpq</tt> or <tt>ntpdc</tt>. The <tt>requestkey</tt> command selects the key ID used as the password for the <tt>ntpdc</tt> utility, while the <tt>controlkey</tt> command selects the key ID used as the password for the <tt>ntpq</tt> utility.</p>
-<h4>Microsoft Windows Authentication</h4>
-<p>In addition to the above means, <tt>ntpd</tt> now supports Microsoft Windows MS-SNTP authentication using Active Directory services. This support was contributed by the Samba Team and is still in development. It is enabled using the <tt>mssntp</tt> flag of the <tt>restrict</tt> command described on the <a href="authopt.html">Access Control Options</a> page. <span class="style1">Note: Potential users should be aware that these services involve a TCP connection to another process that could potentially block, denying services to other users. Therefore, this flag should be used only for a dedicated server with no clients other than MS-SNTP.</span></p>
+<h4 id="windows">Microsoft Windows Authentication</h4>
+<p>In addition to the above means, <tt>ntpd</tt> now supports Microsoft Windows MS-SNTP authentication using Active Directory services. This support was contributed by the Samba Team and is still in development. It is enabled using the <tt>mssntp</tt> flag of the <tt>restrict</tt> command described on the <a href="accopt.html#restrict">Access Control Options</a> page. <span class="style1">Note: Potential users should be aware that these services involve a TCP connection to another process that could potentially block, denying services to other users. Therefore, this flag should be used only for a dedicated server with no clients other than MS-SNTP.</span></p>
 <h4 id="pub">Public Key Cryptography</h4>
 <p>See the <a href="autokey.html">Autokey Public-Key Authentication</a> page.</p>
 <hr>

==== html/decode.html ====
2012-08-03 23:10:32-04:00, stenn at psp-deb1.ntp.org +1 -1
  Documentation cleanup from Mike T.

--- 1.18/html/decode.html	2011-10-12 02:27:50 -04:00
+++ 1.19/html/decode.html	2012-08-03 23:10:32 -04:00
@@ -77,7 +77,7 @@
     <td>never synchronized</td>
   </tr>
 </table>
-<p>The Source Field displays the current synchronization source coded as follows:.</p>
+<p>The Source Field displays the current synchronization source coded as follows:</p>
 <table width="100%" border="1" cellspacing="2" cellpadding="2">
   <tr>
     <td>Code</td>

==== html/drivers/driver1.html ====
2012-08-03 23:10:32-04:00, stenn at psp-deb1.ntp.org +1 -1
  Documentation cleanup from Mike T.

--- 1.18/html/drivers/driver1.html	2010-10-21 23:41:43 -04:00
+++ 1.19/html/drivers/driver1.html	2012-08-03 23:10:32 -04:00
@@ -30,7 +30,7 @@ Last update:
   <dt><tt>time2 <i>time</i></tt></dt>
   <dd>Specifies the frequency offset calibration factor, in parts per million, with default 0.0.</dd>
   <dt><tt>stratum <i>number</i></tt></dt>
-  <dd>Specifies the driver stratum, in decimal from 0 to 15, with default 3.</dd>
+  <dd>Specifies the driver stratum, in decimal from 0 to 15, with default 5.</dd>
   <dt><tt>refid <i>string</i></tt></dt>
   <dd>Specifies the driver reference identifier, an ASCII string from one to four characters, with default <tt>LOCL</tt>.</dd>
   <dt><tt>flag1 0 | 1</tt></dt>

==== html/miscopt.html ====
2012-08-03 23:10:32-04:00, stenn at psp-deb1.ntp.org +2 -2
  Documentation cleanup from Mike T.

--- 1.68/html/miscopt.html	2011-11-06 01:36:57 -04:00
+++ 1.69/html/miscopt.html	2012-08-03 23:10:32 -04:00
@@ -109,9 +109,9 @@
       <dt><tt>freq <i>freq</i></tt></dt>
       <dd>Specifies the frequency offset in parts-per-million (PPM). This option is mutually exclusive with the driftfile command.</dd>
       <dt><tt>huffpuff <i>huffpuff</i></tt></dt>
-      <dd>Sp edifies the huff-n'-puff filter span, which determines the most recent interval the algorithm will search for a minimum delay. The lower limit is 900 s (15 min), but a more reasonable value is 7200 (2 hours).See the <a href="huffpuff.html">Huff-n'-Puff Filter</a> page for further information.</dd>
+      <dd>Specifies the huff-n'-puff filter span, which determines the most recent interval the algorithm will search for a minimum delay. The lower limit is 900 s (15 min), but a more reasonable value is 7200 (2 hours).See the <a href="huffpuff.html">Huff-n'-Puff Filter</a> page for further information.</dd>
       <dt><tt>panic <i>panic</i></tt></dt>
-      <dd>Sp edifies the panic threshold in seconds with default 1000 s. If set to zero, the panic sanity check is disabled and a clock offset of any value will be accepted.</dd>
+      <dd>Specifies the panic threshold in seconds with default 1000 s. If set to zero, the panic sanity check is disabled and a clock offset of any value will be accepted.</dd>
       <dt><tt>step <i>step</i></tt></dt>
       <dd>Specifies the step threshold in seconds. The default without this command is 0.128 s. If set to zero, step adjustments will never occur. Note: The kernel time discipline is disabled if the step threshold is set to zero or greater than 0.5
         s. Further details are on the <a href="clock.html">Clock State Machine</a> page.</dd>

#### ChangeSet ####
2012-08-03 02:51:04-04:00, stenn at psp-deb1.ntp.org
  [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.

==== BitKeeper/deleted/55/driver2.htm~3aed0663 ====
2012-08-03 02:36:23-04:00, stenn at psp-deb1.ntp.org +0 -0
  Delete: html/drivers/driver2.html

==== ChangeLog ====
2012-08-03 02:50:56-04:00, stenn at psp-deb1.ntp.org +1 -0
  [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.

--- 1.1204/ChangeLog	2012-08-02 07:34:15 -04:00
+++ 1.1205/ChangeLog	2012-08-03 02:50:56 -04:00
@@ -1,3 +1,4 @@
+* [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.
 (4.2.7p292) 2012/08/02 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 1545] Note why we are logging the Version string.
 * [Bug 1872] Remove legacy ppsclock fdpps, #ifdef PPS.

==== html/refclock.html ====
2012-08-03 02:50:25-04:00, stenn at psp-deb1.ntp.org +0 -1
  [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.

--- 1.35/html/refclock.html	2010-09-11 01:55:53 -04:00
+++ 1.36/html/refclock.html	2012-08-03 02:50:25 -04:00
@@ -41,7 +41,6 @@
 <p>Following is a list showing the type and title of each driver currently implemented. The compile-time identifier for each is shown in parentheses. Click on a selected type for specific description and configuration documentation, including the clock address, reference ID, driver ID, device name and serial line speed. For those drivers without specific documentation, please contact the author listed in the <a href="copyright.html">Copyright Notice</a> page.</p>
 <ul>
   <li class="inline"><a href="drivers/driver1.html">Type 1</a> Undisciplined Local Clock (<tt>LOCAL</tt>)</li>
-  <li class="inline"><a href="drivers/driver2.html">Type 2</a> Trak 8820 GPS Receiver (<tt>GPS_TRAK</tt>)</li>
   <li class="inline"><a href="drivers/driver3.html">Type 3</a> PSTI/Traconex 1020 WWV/WWVH Receiver (<tt>WWV_PST</tt>)</li>
   <li class="inline"><a href="drivers/driver4.html">Type 4</a> Spectracom WWVB/GPS Receivers (<tt>WWVB_SPEC</tt>)</li>
   <li class="inline"><a href="drivers/driver5.html">Type 5</a> TrueTime GPS/GOES/OMEGA Receivers (<tt>TRUETIME</tt>)</li>

==== ntpd/ntp_control.c ====
2012-08-03 02:50:25-04:00, stenn at psp-deb1.ntp.org +1 -1
  [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.

--- 1.181/ntpd/ntp_control.c	2012-06-18 01:01:48 -04:00
+++ 1.182/ntpd/ntp_control.c	2012-08-03 02:50:25 -04:00
@@ -688,7 +688,7 @@ static const u_char clocktypes[] = {
 	CTL_SST_TS_HF,		/* REFCLK_WWV_PST (3) */
 	CTL_SST_TS_LF,		/* REFCLK_WWVB_SPECTRACOM (4) */
 	CTL_SST_TS_UHF, 	/* REFCLK_TRUETIME (5) */
-	CTL_SST_TS_UHF, 	/* REFCLK_GOES_TRAK (6) IRIG_AUDIO? */
+	CTL_SST_TS_UHF, 	/* REFCLK_IRIG_AUDIO (6) */
 	CTL_SST_TS_HF,		/* REFCLK_CHU (7) */
 	CTL_SST_TS_LF,		/* REFCLOCK_PARSE (default) (8) */
 	CTL_SST_TS_LF,		/* REFCLK_GPS_MX4200 (9) */

==== ntpd/refclock_conf.c ====
2012-08-03 02:50:25-04:00, stenn at psp-deb1.ntp.org +0 -6
  [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.

--- 1.32/ntpd/refclock_conf.c	2012-03-20 02:18:58 -04:00
+++ 1.33/ntpd/refclock_conf.c	2012-08-03 02:50:25 -04:00
@@ -24,12 +24,6 @@ extern	struct refclock	refclock_local;
 #define	refclock_local	refclock_none
 #endif
 
-#if 0 && defined(CLOCK_TRAK) && defined(PPS)
-extern	struct refclock	refclock_trak;
-#else
-#define	refclock_trak	refclock_none
-#endif
-
 #ifdef CLOCK_PST
 extern	struct refclock	refclock_pst;
 #else


More information about the bk-ntp-dev-send mailing list