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

Harlan Stenn stenn at deacon.udel.edu
Sun Dec 25 00:09:52 UTC 2011


#### ChangeSet ####
2011-12-24 18:34:58-05:00, stenn at deacon.udel.edu
  NTP_4_2_6P5
  TAG: NTP_4_2_6P5

==== ChangeLog ====
2011-12-24 18:34:54-05:00, stenn at deacon.udel.edu +1 -0
  NTP_4_2_6P5

--- 1.496.26.185/ChangeLog	2011-12-23 22:47:29 -05:00
+++ 1.496.26.186/ChangeLog	2011-12-24 18:34:54 -05:00
@@ -1,5 +1,6 @@
 ---
 (4.2.6p5) 2011/12/24 Released by Harlan Stenn <stenn at ntp.org>
+(4.2.6p5) 2011/12/24 Released by Harlan Stenn <stenn at ntp.org>
 
 ---
 (4.2.6p5-RC3) 2011/12/08 Released by Harlan Stenn <stenn at ntp.org>

==== ntpd/ntpd-opts.c ====
2011-12-24 18:34:54-05:00, stenn at deacon.udel.edu +5 -5
  NTP_4_2_6P5

--- 1.248.42.1/ntpd/ntpd-opts.c	2011-12-08 21:09:03 -05:00
+++ 1.248.43.1/ntpd/ntpd-opts.c	2011-12-24 18:34:54 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  December  8, 2011 at 09:07:57 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  December 24, 2011 at 06:34:01 PM by AutoGen 5.12
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -37,8 +37,8 @@ extern FILE * option_usage_fp;
 
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
-static char const zCopyright[42] =
-"ntpd 4.2.6p5-RC3\n\
+static char const zCopyright[38] =
+"ntpd 4.2.6p5\n\
 see html/copyright.html\n";
 static char const zLicenseDescrip[25] =
 "see html/copyright.html\n";
@@ -947,8 +947,8 @@ static tOptDesc optDesc[OPTION_CT] = {
  *  Define the Ntpd Option Environment
  */
 static char const zPROGNAME[5] = "NTPD";
-static char const zUsageTitle[103] =
-"ntpd - NTP daemon program - Ver. 4.2.6p5-RC3\n\
+static char const zUsageTitle[99] =
+"ntpd - NTP daemon program - Ver. 4.2.6p5\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 #define zRcName     NULL
 #define apzHomeList NULL

==== ntpd/ntpd-opts.h ====
2011-12-24 18:34:54-05:00, stenn at deacon.udel.edu +3 -3
  NTP_4_2_6P5

--- 1.248.42.1/ntpd/ntpd-opts.h	2011-12-08 21:09:03 -05:00
+++ 1.248.43.1/ntpd/ntpd-opts.h	2011-12-24 18:34:54 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  December  8, 2011 at 09:07:57 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  December 24, 2011 at 06:34:00 PM by AutoGen 5.12
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -87,8 +87,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    35
-#define NTPD_VERSION       "4.2.6p5-RC3"
-#define NTPD_FULL_VERSION  "ntpd 4.2.6p5-RC3"
+#define NTPD_VERSION       "4.2.6p5"
+#define NTPD_FULL_VERSION  "ntpd 4.2.6p5"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpd/ntpd-opts.texi ====
2011-12-24 18:34:54-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.246.41.1/ntpd/ntpd-opts.texi	2011-12-08 21:09:03 -05:00
+++ 1.246.42.1/ntpd/ntpd-opts.texi	2011-12-24 18:34:54 -05:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpd-opts.texi)
 # 
-# It has been AutoGen-ed  December  8, 2011 at 09:08:17 PM by AutoGen 5.12
+# It has been AutoGen-ed  December 24, 2011 at 06:34:12 PM by AutoGen 5.12
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -63,7 +63,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-ntpd - NTP daemon program - Ver. 4.2.6p5-RC3
+ntpd - NTP daemon program - Ver. 4.2.6p5
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution

==== ntpd/ntpd.1 ====
2011-12-24 18:34:54-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.246.41.1/ntpd/ntpd.1	2011-12-08 21:09:03 -05:00
+++ 1.246.42.1/ntpd/ntpd.1	2011-12-24 18:34:54 -05:00
@@ -1,7 +1,7 @@
-.TH NTPD 1 2011-12-08 "( 4.2.6p5-RC3)" "Programmer's Manual"
+.TH NTPD 1 2011-12-24 "( 4.2.6p5)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December  8, 2011 at 09:08:17 PM by AutoGen 5.12
+.\"  It has been AutoGen-ed  December 24, 2011 at 06:34:12 PM by AutoGen 5.12
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== ntpdc/ntpdc-opts.c ====
2011-12-24 18:34:54-05:00, stenn at deacon.udel.edu +5 -5
  NTP_4_2_6P5

--- 1.244.42.1/ntpdc/ntpdc-opts.c	2011-12-08 21:09:03 -05:00
+++ 1.244.43.1/ntpdc/ntpdc-opts.c	2011-12-24 18:34:54 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  December  8, 2011 at 09:08:24 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  December 24, 2011 at 06:34:16 PM by AutoGen 5.12
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -37,8 +37,8 @@ extern FILE * option_usage_fp;
 
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
-static char const zCopyright[43] =
-"ntpdc 4.2.6p5-RC3\n\
+static char const zCopyright[39] =
+"ntpdc 4.2.6p5\n\
 see html/copyright.html\n";
 static char const zLicenseDescrip[25] =
 "see html/copyright.html\n";
@@ -444,8 +444,8 @@ static tOptDesc optDesc[OPTION_CT] = {
  *  Define the Ntpdc Option Environment
  */
 static char const zPROGNAME[6] = "NTPDC";
-static char const zUsageTitle[131] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p5-RC3\n\
+static char const zUsageTitle[127] =
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p5\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {

==== ntpdc/ntpdc-opts.h ====
2011-12-24 18:34:54-05:00, stenn at deacon.udel.edu +3 -3
  NTP_4_2_6P5

--- 1.244.42.1/ntpdc/ntpdc-opts.h	2011-12-08 21:09:03 -05:00
+++ 1.244.43.1/ntpdc/ntpdc-opts.h	2011-12-24 18:34:54 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  December  8, 2011 at 09:08:22 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  December 24, 2011 at 06:34:16 PM by AutoGen 5.12
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -67,8 +67,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.6p5-RC3"
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.6p5-RC3"
+#define NTPDC_VERSION       "4.2.6p5"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.6p5"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpdc/ntpdc-opts.texi ====
2011-12-24 18:34:54-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.243.41.1/ntpdc/ntpdc-opts.texi	2011-12-08 21:09:03 -05:00
+++ 1.243.42.1/ntpdc/ntpdc-opts.texi	2011-12-24 18:34:54 -05:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpdc-opts.texi)
 # 
-# It has been AutoGen-ed  December  8, 2011 at 09:08:33 PM by AutoGen 5.12
+# It has been AutoGen-ed  December 24, 2011 at 06:34:25 PM by AutoGen 5.12
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -58,7 +58,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTP query program - Ver. 4.2.6p5-RC3
+ntpdc - vendor-specific NTP query program - Ver. 4.2.6p5
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution

==== ntpdc/ntpdc.1 ====
2011-12-24 18:34:54-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.243.41.1/ntpdc/ntpdc.1	2011-12-08 21:09:03 -05:00
+++ 1.243.42.1/ntpdc/ntpdc.1	2011-12-24 18:34:54 -05:00
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2011-12-08 "( 4.2.6p5-RC3)" "Programmer's Manual"
+.TH NTPDC 1 2011-12-24 "( 4.2.6p5)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  December  8, 2011 at 09:08:33 PM by AutoGen 5.12
+.\"  It has been AutoGen-ed  December 24, 2011 at 06:34:25 PM by AutoGen 5.12
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== ntpq/ntpq-opts.c ====
2011-12-24 18:34:54-05:00, stenn at deacon.udel.edu +5 -5
  NTP_4_2_6P5

--- 1.245.42.1/ntpq/ntpq-opts.c	2011-12-08 21:09:03 -05:00
+++ 1.245.43.1/ntpq/ntpq-opts.c	2011-12-24 18:34:54 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  December  8, 2011 at 09:08:34 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  December 24, 2011 at 06:34:27 PM by AutoGen 5.12
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -37,8 +37,8 @@ extern FILE * option_usage_fp;
 
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
-static char const zCopyright[42] =
-"ntpq 4.2.6p5-RC3\n\
+static char const zCopyright[38] =
+"ntpq 4.2.6p5\n\
 see html/copyright.html\n";
 static char const zLicenseDescrip[25] =
 "see html/copyright.html\n";
@@ -421,8 +421,8 @@ static tOptDesc optDesc[OPTION_CT] = {
  *  Define the Ntpq Option Environment
  */
 static char const zPROGNAME[5] = "NTPQ";
-static char const zUsageTitle[123] =
-"ntpq - standard NTP query program - Ver. 4.2.6p5-RC3\n\
+static char const zUsageTitle[119] =
+"ntpq - standard NTP query program - Ver. 4.2.6p5\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {

==== ntpq/ntpq-opts.h ====
2011-12-24 18:34:54-05:00, stenn at deacon.udel.edu +3 -3
  NTP_4_2_6P5

--- 1.245.42.1/ntpq/ntpq-opts.h	2011-12-08 21:09:03 -05:00
+++ 1.245.43.1/ntpq/ntpq-opts.h	2011-12-24 18:34:54 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  December  8, 2011 at 09:08:34 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  December 24, 2011 at 06:34:27 PM by AutoGen 5.12
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -66,8 +66,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.6p5-RC3"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.6p5-RC3"
+#define NTPQ_VERSION       "4.2.6p5"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.6p5"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpq/ntpq-opts.texi ====
2011-12-24 18:34:54-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.244.41.1/ntpq/ntpq-opts.texi	2011-12-08 21:09:03 -05:00
+++ 1.244.42.1/ntpq/ntpq-opts.texi	2011-12-24 18:34:54 -05:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  December  8, 2011 at 09:08:42 PM by AutoGen 5.12
+# It has been AutoGen-ed  December 24, 2011 at 06:34:35 PM by AutoGen 5.12
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -47,7 +47,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.6p5-RC3
+ntpq - standard NTP query program - Ver. 4.2.6p5
 USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution

==== ntpq/ntpq.1 ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.244.41.1/ntpq/ntpq.1	2011-12-08 21:09:03 -05:00
+++ 1.244.42.1/ntpq/ntpq.1	2011-12-24 18:34:55 -05:00
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2011-12-08 "( 4.2.6p5-RC3)" "Programmer's Manual"
+.TH NTPQ 1 2011-12-24 "( 4.2.6p5)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  December  8, 2011 at 09:08:42 PM by AutoGen 5.12
+.\"  It has been AutoGen-ed  December 24, 2011 at 06:34:35 PM by AutoGen 5.12
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== ntpsnmpd/ntpsnmpd-opts.c ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +5 -5
  NTP_4_2_6P5

--- 1.123.43.1/ntpsnmpd/ntpsnmpd-opts.c	2011-12-08 21:09:03 -05:00
+++ 1.123.44.1/ntpsnmpd/ntpsnmpd-opts.c	2011-12-24 18:34:55 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *  
- *  It has been AutoGen-ed  December  8, 2011 at 09:08:43 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  December 24, 2011 at 06:34:36 PM by AutoGen 5.12
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -37,8 +37,8 @@ extern FILE * option_usage_fp;
 
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
-static char const zCopyright[46] =
-"ntpsnmpd 4.2.6p5-RC3\n\
+static char const zCopyright[42] =
+"ntpsnmpd 4.2.6p5\n\
 see html/copyright.html\n";
 static char const zLicenseDescrip[25] =
 "see html/copyright.html\n";
@@ -248,8 +248,8 @@ static tOptDesc optDesc[OPTION_CT] = {
  *  Define the Ntpsnmpd Option Environment
  */
 static char const zPROGNAME[9] = "NTPSNMPD";
-static char const zUsageTitle[107] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p5-RC3\n\
+static char const zUsageTitle[103] =
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p5\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {

==== ntpsnmpd/ntpsnmpd-opts.h ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +3 -3
  NTP_4_2_6P5

--- 1.123.43.1/ntpsnmpd/ntpsnmpd-opts.h	2011-12-08 21:09:03 -05:00
+++ 1.123.44.1/ntpsnmpd/ntpsnmpd-opts.h	2011-12-24 18:34:55 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *  
- *  It has been AutoGen-ed  December  8, 2011 at 09:08:43 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  December 24, 2011 at 06:34:36 PM by AutoGen 5.12
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -60,8 +60,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.6p5-RC3"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.6p5-RC3"
+#define NTPSNMPD_VERSION       "4.2.6p5"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.6p5"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpsnmpd/ntpsnmpd-opts.texi ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.123.42.1/ntpsnmpd/ntpsnmpd-opts.texi	2011-12-08 21:09:03 -05:00
+++ 1.123.43.1/ntpsnmpd/ntpsnmpd-opts.texi	2011-12-24 18:34:55 -05:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.texi)
 # 
-# It has been AutoGen-ed  December  8, 2011 at 09:08:46 PM by AutoGen 5.12
+# It has been AutoGen-ed  December 24, 2011 at 06:34:39 PM by AutoGen 5.12
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -34,7 +34,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p5-RC3
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p5
 USAGE:  ntpsnmpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork

==== ntpsnmpd/ntpsnmpd.1 ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.122.42.1/ntpsnmpd/ntpsnmpd.1	2011-12-08 21:09:03 -05:00
+++ 1.122.43.1/ntpsnmpd/ntpsnmpd.1	2011-12-24 18:34:55 -05:00
@@ -1,7 +1,7 @@
-.TH NTPSNMPD 1 2011-12-08 "( 4.2.6p5-RC3)" "Programmer's Manual"
+.TH NTPSNMPD 1 2011-12-24 "( 4.2.6p5)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December  8, 2011 at 09:08:46 PM by AutoGen 5.12
+.\"  It has been AutoGen-ed  December 24, 2011 at 06:34:39 PM by AutoGen 5.12
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== packageinfo.sh ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.255.40.1/packageinfo.sh	2011-12-24 18:21:46 -05:00
+++ 1.255.40.2/packageinfo.sh	2011-12-24 18:34:55 -05:00
@@ -61,7 +61,7 @@ version=${proto}.${major}.${minor}
 special=
 
 # prerelease can be empty, 'beta', or 'rc'.
-prerelease=rc
+prerelease=
 
 # ChangeLog starting tag (see also CommitLog-4.1.0)
 CLTAG=NTP_4_2_0
@@ -92,4 +92,4 @@ betapoint=0
 # - - prerelease is emptied
 # else (not in RC)
 # - rcpoint is empty and unused (for now).
-rcpoint=GO
+rcpoint=

==== sntp/sntp-opts.c ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +5 -5
  NTP_4_2_6P5

--- 1.117.41.1/sntp/sntp-opts.c	2011-12-08 21:09:03 -05:00
+++ 1.117.42.1/sntp/sntp-opts.c	2011-12-24 18:34:55 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  December  8, 2011 at 09:07:50 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  December 24, 2011 at 06:33:53 PM by AutoGen 5.12
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -37,8 +37,8 @@ extern FILE * option_usage_fp;
 
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
-static char const zCopyright[42] =
-"sntp 4.2.6p5-RC3\n\
+static char const zCopyright[38] =
+"sntp 4.2.6p5\n\
 see html/copyright.html\n";
 static char const zLicenseDescrip[25] =
 "see html/copyright.html\n";
@@ -466,8 +466,8 @@ static tOptDesc optDesc[OPTION_CT] = {
  *  Define the Sntp Option Environment
  */
 static char const zPROGNAME[5] = "SNTP";
-static char const zUsageTitle[156] =
-"sntp - standard Simple Network Time Protocol program - Ver. 4.2.6p5-RC3\n\
+static char const zUsageTitle[152] =
+"sntp - standard Simple Network Time Protocol program - Ver. 4.2.6p5\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ hostname-or-IP ...]\n";
 static char const zRcName[7] = ".ntprc";

==== sntp/sntp-opts.h ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +3 -3
  NTP_4_2_6P5

--- 1.117.41.1/sntp/sntp-opts.h	2011-12-08 21:09:03 -05:00
+++ 1.117.42.1/sntp/sntp-opts.h	2011-12-24 18:34:55 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  December  8, 2011 at 09:07:50 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  December 24, 2011 at 06:33:53 PM by AutoGen 5.12
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -69,8 +69,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    17
-#define SNTP_VERSION       "4.2.6p5-RC3"
-#define SNTP_FULL_VERSION  "sntp 4.2.6p5-RC3"
+#define SNTP_VERSION       "4.2.6p5"
+#define SNTP_FULL_VERSION  "sntp 4.2.6p5"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== sntp/sntp-opts.texi ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.117.40.1/sntp/sntp-opts.texi	2011-12-08 21:09:03 -05:00
+++ 1.117.41.1/sntp/sntp-opts.texi	2011-12-24 18:34:55 -05:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  December  8, 2011 at 09:07:56 PM by AutoGen 5.12
+# It has been AutoGen-ed  December 24, 2011 at 06:34:00 PM by AutoGen 5.12
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -69,7 +69,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol program - Ver. 4.2.6p5-RC3
+sntp - standard Simple Network Time Protocol program - Ver. 4.2.6p5
 USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description

==== sntp/sntp.1 ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.117.40.1/sntp/sntp.1	2011-12-08 21:09:04 -05:00
+++ 1.117.41.1/sntp/sntp.1	2011-12-24 18:34:55 -05:00
@@ -1,7 +1,7 @@
-.TH SNTP 1 2011-12-08 "( 4.2.6p5-RC3)" "Programmer's Manual"
+.TH SNTP 1 2011-12-24 "( 4.2.6p5)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  December  8, 2011 at 09:07:55 PM by AutoGen 5.12
+.\"  It has been AutoGen-ed  December 24, 2011 at 06:33:59 PM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== sntp/sntp.html ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.7.41.1/sntp/sntp.html	2011-12-08 21:09:04 -05:00
+++ 1.7.42.1/sntp/sntp.html	2011-12-24 18:34:55 -05:00
@@ -36,7 +36,7 @@ display the time offset of the system cl
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  <p>This document applies to version 4.2.6p5-RC3 of <code>sntp</code>.
+  <p>This document applies to version 4.2.6p5 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -139,7 +139,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href=
 <p><a name="index-sntp-usage-3"></a>
 This is the automatically generated usage text for sntp:
 
-<pre class="example">sntp - standard Simple Network Time Protocol program - Ver. 4.2.6p5-RC3
+<pre class="example">sntp - standard Simple Network Time Protocol program - Ver. 4.2.6p5
 USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description

==== util/ntp-keygen-opts.c ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +5 -5
  NTP_4_2_6P5

--- 1.247.42.1/util/ntp-keygen-opts.c	2011-12-08 21:09:04 -05:00
+++ 1.247.43.1/util/ntp-keygen-opts.c	2011-12-24 18:34:55 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  December  8, 2011 at 09:08:47 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  December 24, 2011 at 06:34:40 PM by AutoGen 5.12
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -37,8 +37,8 @@ extern FILE * option_usage_fp;
 
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
-static char const zCopyright[54] =
-"ntp-keygen (ntp) 4.2.6p5-RC3\n\
+static char const zCopyright[50] =
+"ntp-keygen (ntp) 4.2.6p5\n\
 see html/copyright.html\n";
 static char const zLicenseDescrip[25] =
 "see html/copyright.html\n";
@@ -719,8 +719,8 @@ static tOptDesc optDesc[OPTION_CT] = {
  *  Define the Ntp_Keygen Option Environment
  */
 static char const zPROGNAME[11] = "NTP_KEYGEN";
-static char const zUsageTitle[118] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p5-RC3\n\
+static char const zUsageTitle[114] =
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p5\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {

==== util/ntp-keygen-opts.h ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +3 -3
  NTP_4_2_6P5

--- 1.247.42.1/util/ntp-keygen-opts.h	2011-12-08 21:09:04 -05:00
+++ 1.247.43.1/util/ntp-keygen-opts.h	2011-12-24 18:34:55 -05:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  December  8, 2011 at 09:08:47 PM by AutoGen 5.12
+ *  It has been AutoGen-ed  December 24, 2011 at 06:34:40 PM by AutoGen 5.12
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -75,8 +75,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define NTP_KEYGEN_VERSION       "4.2.6p5-RC3"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.6p5-RC3"
+#define NTP_KEYGEN_VERSION       "4.2.6p5"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.6p5"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== util/ntp-keygen-opts.texi ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.246.41.1/util/ntp-keygen-opts.texi	2011-12-08 21:09:04 -05:00
+++ 1.246.42.1/util/ntp-keygen-opts.texi	2011-12-24 18:34:55 -05:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  December  8, 2011 at 09:08:53 PM by AutoGen 5.12
+# It has been AutoGen-ed  December 24, 2011 at 06:34:45 PM by AutoGen 5.12
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -50,7 +50,7 @@ This is the automatically generated usag
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p5-RC3
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p5
 USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme

==== util/ntp-keygen.1 ====
2011-12-24 18:34:55-05:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_6P5

--- 1.246.41.1/util/ntp-keygen.1	2011-12-08 21:09:04 -05:00
+++ 1.246.42.1/util/ntp-keygen.1	2011-12-24 18:34:55 -05:00
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2011-12-08 "(ntp 4.2.6p5-RC3)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2011-12-24 "(ntp 4.2.6p5)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  December  8, 2011 at 09:08:53 PM by AutoGen 5.12
+.\"  It has been AutoGen-ed  December 24, 2011 at 06:34:45 PM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"

#### ChangeSet ####
2011-12-24 18:21:54-05:00, stenn at deacon.udel.edu
  ntp-4.2.6p5

==== packageinfo.sh ====
2011-12-24 18:21:46-05:00, stenn at deacon.udel.edu +3 -2
  ntp-4.2.6p5

--- 1.255.39.1/packageinfo.sh	2011-12-08 21:09:03 -05:00
+++ 1.255.40.1/packageinfo.sh	2011-12-24 18:21:46 -05:00
@@ -34,7 +34,8 @@
 # To skip over -stable beta1 directly to -RC1, set prerelease=rc.
 #
 # To skip all -stable prereleases and move from one primary or point 
-#   release directly to the next point release, set rcpoint=GO.
+#   release directly to the next point release, or to go from RC to
+#   release, set rcpoint=GO.
 #
 ##
 #
@@ -91,4 +92,4 @@ betapoint=0
 # - - prerelease is emptied
 # else (not in RC)
 # - rcpoint is empty and unused (for now).
-rcpoint=3
+rcpoint=GO

#### ChangeSet ####
2011-12-24 18:08:51-05:00, stenn at deacon.udel.edu
  fix typos

==== NEWS ====
2011-12-24 18:08:34-05:00, stenn at deacon.udel.edu +8 -8
  fix typos

--- 1.122.1.4/NEWS	2011-12-24 17:46:55 -05:00
+++ 1.122.1.5/NEWS	2011-12-24 18:08:34 -05:00
@@ -9,7 +9,7 @@ This is a recommended upgrade. 
 
 This release updates sys_rootdisp and sys_jitter calculations to match the
 RFC specification, fixes a potential IPv6 address matching error for the
-"nic" and "interface" configuration directives, supresses the creation of
+"nic" and "interface" configuration directives, suppresses the creation of
 extraneous ephemeral associations for certain broadcastclient and
 multicastclient configurations, cleans up some ntpq display issues, and
 includes improvements to orphan mode, minor bugs fixes and code clean-ups.
@@ -23,8 +23,8 @@ ntpd
    using the address/prefix format (e.g. fe80::/64)
  * Fix orphan mode stratum incorrectly counting to infinity
  * Orphan parent selection metric updated to includes missing ntohl()
- * Nonprintable stratum 16 refid no longer sent to ntp
- * Duplicate ephemeral associations suppressed for brodcastclient and
+ * Non-printable stratum 16 refid no longer sent to ntp
+ * Duplicate ephemeral associations suppressed for broadcastclient and
    multicastclient without broadcastdelay
  * Exclude undetermined sys_refid from use in loopback TEST12
  * Exclude MODE_SERVER responses from KoD rate limiting
@@ -64,8 +64,8 @@ Build system 
  
 ntpd 
  
-* Backported several fixes for Coverity warnings from ntp-dev 
-* Fix a rare boundry condition in UNLINK_EXPR_SLIST() 
+* Back-ported several fixes for Coverity warnings from ntp-dev 
+* Fix a rare boundary condition in UNLINK_EXPR_SLIST() 
 * Allow "logconfig =allall" configuration directive 
 * Bind tentative IPv6 addresses on Linux 
 * Correct WWVB/Spectracom driver to timestamp CR instead of LF 
@@ -77,7 +77,7 @@ ntpd 
 * Prefer an Orphan Mode Parent over the Undisciplined Local Clock or ACTS 
   drivers 
 * Improved support of the Parse Refclock trusttime flag in Meinberg mode 
-* Backport utility routines from ntp-dev: mprintf(), emalloc_zero() 
+* Back-port utility routines from ntp-dev: mprintf(), emalloc_zero() 
 * Added the NTPD_TICKADJ_PPM environment variable for specifying baseline 
   clock slew on Microsoft Windows 
 * Code cleanup in libntpq 
@@ -140,7 +140,7 @@ ntpd
 * NMEA refclock improvements.
 * Oncore debug message cleanup.
 * Palisade refclock now builds under Linux.
-* Give RAWDCF more baudrates.
+* Give RAWDCF more baud rates.
 * Support Truetime Satellite clocks under Windows.
 * Support Arbiter 1093C Satellite clocks under Windows.
 * Make sure that the "filegen" configuration command defaults to "enable".
@@ -267,7 +267,7 @@ THIS IS A STRONGLY RECOMMENDED UPGRADE.
 ---
 ntpd now syncs to refclocks right away.
 
-Backward-Incomatible changes:
+Backward-Incompatible changes:
 
 ntpd no longer accepts '-v name' or '-V name' to define internal variables.
 Use '--var name' or '--dvar name' instead. (Bug 817)

#### ChangeSet ####
2011-12-24 17:47:02-05:00, stenn at deacon.udel.edu
  NEWS cleanup

==== NEWS ====
2011-12-24 17:46:55-05:00, stenn at deacon.udel.edu +25 -21
  NEWS cleanup

--- 1.122.1.3/NEWS	2011-12-23 22:47:30 -05:00
+++ 1.122.1.4/NEWS	2011-12-24 17:46:55 -05:00
@@ -1,5 +1,5 @@
 --- 
-NTP 4.2.6p5-RC3 (Harlan Stenn <stenn at ntp.org>, 2011/12/xx) 
+NTP 4.2.6p5 (Harlan Stenn <stenn at ntp.org>, 2011/12/24) 
  
 Focus: Bug fixes
  
@@ -7,32 +7,36 @@ Severity: Medium 
  
 This is a recommended upgrade. 
 
-This release includes a fix for a mismatch problem with IP addresses
-specified in "nic" or "interface" directives in the ntpd configuration
-file using the address/prefix format, such as "fe80::/64" erroneously
-matching localhost [::1] and wildcard [::].  It also includes fixes
-for orphan mode, extraneous creation of ephemeral associations from
-certain broadcastclient and multicastclient configurations, and some
-display issues with ntpq.
+This release updates sys_rootdisp and sys_jitter calculations to match the
+RFC specification, fixes a potential IPv6 address matching error for the
+"nic" and "interface" configuration directives, supresses the creation of
+extraneous ephemeral associations for certain broadcastclient and
+multicastclient configurations, cleans up some ntpq display issues, and
+includes improvements to orphan mode, minor bugs fixes and code clean-ups.
+
+New features / changes in this release:
 
 ntpd
 
- * Correctly match IP address prefixes for "nic" and "interface".
- * Fix orphan mode stratum incorrectly counting to infinity.
- * Orphan parent selection metric was missing ntohl().
- * No longer send nonprintable stratum 16 refid to ntpq.
- * broadcastclient, multicastclient would spin up duplicate
-   ephemeral associations without broadcastdelay.
- * Exclude not-yet-determined sys_refid from use in loopback TEST12.
- * Never send KoD rate limiting response to MODE_SERVER response.
- * clock_update() sys_rootdisp calculation now includes root delay.
- * get_systime() is no longer offset by sys_residual.
- * sys_jitter calculation properly weights sys.peer jitter.
+ * Updated "nic" and "interface" IPv6 address handling to prevent 
+   mismatches with localhost [::1] and wildcard [::] which resulted from
+   using the address/prefix format (e.g. fe80::/64)
+ * Fix orphan mode stratum incorrectly counting to infinity
+ * Orphan parent selection metric updated to includes missing ntohl()
+ * Nonprintable stratum 16 refid no longer sent to ntp
+ * Duplicate ephemeral associations suppressed for brodcastclient and
+   multicastclient without broadcastdelay
+ * Exclude undetermined sys_refid from use in loopback TEST12
+ * Exclude MODE_SERVER responses from KoD rate limiting
+ * Include root delay in clock_update() sys_rootdisp calculations
+ * get_systime() updated to exclude sys_residual offset (which only
+   affected bits "below" sys_tick, the precision threshold)
+ * sys.peer jitter weighting corrected in sys_jitter calculation
 
 ntpq
 
- * Optional billboard column "server" now honors -n.
- * lopeers ipv6 "local" no longer overruns its column.
+ * -n option extended to include the billboard "server" column
+ * IPv6 addresses in the local column truncated to prevent overruns
 
 --- 
 NTP 4.2.6p4 (Harlan Stenn <stenn at ntp.org>, 2011/09/22) 

#### ChangeSet ####
2011-12-23 22:48:14-05:00, stenn at deacon.udel.edu
  NEWS file cleanup

==== ChangeLog ====
2011-12-23 22:47:29-05:00, stenn at deacon.udel.edu +3 -0
  NEWS file cleanup

--- 1.496.26.184/ChangeLog	2011-12-08 21:09:03 -05:00
+++ 1.496.26.185/ChangeLog	2011-12-23 22:47:29 -05:00
@@ -1,4 +1,7 @@
 ---
+(4.2.6p5) 2011/12/24 Released by Harlan Stenn <stenn at ntp.org>
+
+---
 (4.2.6p5-RC3) 2011/12/08 Released by Harlan Stenn <stenn at ntp.org>
 
 * [Bug 2082] 3-char refid sent by ntpd 4.2.6p5-RC2 ends with extra dot.

==== NEWS ====
2011-12-23 22:47:30-05:00, stenn at deacon.udel.edu +6 -8
  NEWS file cleanup

--- 1.122.1.2/NEWS	2011-12-08 00:21:14 -05:00
+++ 1.122.1.3/NEWS	2011-12-23 22:47:30 -05:00
@@ -1,7 +1,7 @@
 --- 
 NTP 4.2.6p5-RC3 (Harlan Stenn <stenn at ntp.org>, 2011/12/xx) 
  
-Focus: Bug fix
+Focus: Bug fixes
  
 Severity: Medium 
  
@@ -25,16 +25,14 @@ ntpd
    ephemeral associations without broadcastdelay.
  * Exclude not-yet-determined sys_refid from use in loopback TEST12.
  * Never send KoD rate limiting response to MODE_SERVER response.
- * Fix 3-char refid sent by ntpd 4.2.6p5-RC2 that ends with extra dot.
- * clock_update() sys_rootdisp calculation should include root delay.
- * get_systime() should not offset by sys_residual.
- * sys_jitter calculation overweights sys.peer jitter.
- * Ensure NULL peer->dstadr is not accessed in orphan parent selection.
+ * clock_update() sys_rootdisp calculation now includes root delay.
+ * get_systime() is no longer offset by sys_residual.
+ * sys_jitter calculation properly weights sys.peer jitter.
 
 ntpq
 
- * Optional billboard column "server" did not honor -n.
- * lopeers ipv6 "local" used to overrun its column.
+ * Optional billboard column "server" now honors -n.
+ * lopeers ipv6 "local" no longer overruns its column.
 
 --- 
 NTP 4.2.6p4 (Harlan Stenn <stenn at ntp.org>, 2011/09/22) 


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