From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 23 Sep 2011 03:38:30 +0000 (+0000)
Subject: NTP_4_2_6P4
X-Git-Tag: NTP_4_2_6P4^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eede33f87e02167c97ace1bd3a5fbb6f02f01f1c;p=thirdparty%2Fntp.git

NTP_4_2_6P4

bk: 4e7bff3691UD2isHYlLlMHLtoI07rA
---

diff --git a/ChangeLog b/ChangeLog
index 4c781b1e0..daf1c0b30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 ---
+(4.2.6p4) 2011/09/23 Released by Harlan Stenn <stenn@ntp.org>
 (4.2.6p4) 2011/09/22 Released by Harlan Stenn <stenn@ntp.org>
 
 * [Bug 1984] ntp/libisc fails to compile on OS X 10.7 (Lion).
diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index b2ecc1cbe..f6e294fdc 100644
--- a/ntpd/ntpd-opts.c
+++ b/ntpd/ntpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  August  4, 2011 at 04:46:34 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 23, 2011 at 03:36:04 AM 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.6p4-RC2\n\
+static char const zCopyright[38] =
+"ntpd 4.2.6p4\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.6p4-RC2\n\
+static char const zUsageTitle[99] =
+"ntpd - NTP daemon program - Ver. 4.2.6p4\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 #define zRcName     NULL
 #define apzHomeList NULL
diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index f0e5cb32c..00affbb81 100644
--- a/ntpd/ntpd-opts.h
+++ b/ntpd/ntpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  August  4, 2011 at 04:46:33 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 23, 2011 at 03:36:04 AM 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.6p4-RC2"
-#define NTPD_FULL_VERSION  "ntpd 4.2.6p4-RC2"
+#define NTPD_VERSION       "4.2.6p4"
+#define NTPD_FULL_VERSION  "ntpd 4.2.6p4"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index 2a791c17b..a43fbf6a2 100644
--- a/ntpd/ntpd-opts.texi
+++ b/ntpd/ntpd-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpd-opts.texi)
 # 
-# It has been AutoGen-ed  August  4, 2011 at 04:47:29 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 23, 2011 at 03:36:53 AM 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 usage text for ntpd:
 
 @exampleindent 0
 @example
-ntpd - NTP daemon program - Ver. 4.2.6p4-RC2
+ntpd - NTP daemon program - Ver. 4.2.6p4
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index f2068f729..faf4f9930 100644
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2011-08-04 "( 4.2.6p4-RC2)" "Programmer's Manual"
+.TH NTPD 1 2011-09-23 "( 4.2.6p4)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  August  4, 2011 at 04:47:28 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 23, 2011 at 03:36:52 AM by AutoGen 5.12
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index abd79bf16..136d45de9 100644
--- a/ntpdc/ntpdc-opts.c
+++ b/ntpdc/ntpdc-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  August  4, 2011 at 04:47:45 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 23, 2011 at 03:37:01 AM 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.6p4-RC2\n\
+static char const zCopyright[39] =
+"ntpdc 4.2.6p4\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.6p4-RC2\n\
+static char const zUsageTitle[127] =
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p4\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index eb8356b30..79b34b1c1 100644
--- a/ntpdc/ntpdc-opts.h
+++ b/ntpdc/ntpdc-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  August  4, 2011 at 04:47:44 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 23, 2011 at 03:37:01 AM 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.6p4-RC2"
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.6p4-RC2"
+#define NTPDC_VERSION       "4.2.6p4"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.6p4"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index c710b2a1e..cd332a126 100644
--- a/ntpdc/ntpdc-opts.texi
+++ b/ntpdc/ntpdc-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpdc-opts.texi)
 # 
-# It has been AutoGen-ed  August  4, 2011 at 04:48:22 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 23, 2011 at 03:37:20 AM 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 usage text for ntpdc:
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTP query program - Ver. 4.2.6p4-RC2
+ntpdc - vendor-specific NTP query program - Ver. 4.2.6p4
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1
index f7e866d3f..56dc6f92d 100644
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2011-08-04 "( 4.2.6p4-RC2)" "Programmer's Manual"
+.TH NTPDC 1 2011-09-23 "( 4.2.6p4)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  August  4, 2011 at 04:48:20 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 23, 2011 at 03:37:18 AM by AutoGen 5.12
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index e8a40171b..c902b9ef6 100644
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  August  4, 2011 at 04:48:24 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 23, 2011 at 03:37:21 AM 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.6p4-RC2\n\
+static char const zCopyright[38] =
+"ntpq 4.2.6p4\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.6p4-RC2\n\
+static char const zUsageTitle[119] =
+"ntpq - standard NTP query program - Ver. 4.2.6p4\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index c062d8216..cd8cd5038 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  August  4, 2011 at 04:48:24 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 23, 2011 at 03:37:21 AM 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.6p4-RC2"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.6p4-RC2"
+#define NTPQ_VERSION       "4.2.6p4"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.6p4"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 5efed4454..2d536a21c 100644
--- a/ntpq/ntpq-opts.texi
+++ b/ntpq/ntpq-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  August  4, 2011 at 04:48:57 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 23, 2011 at 03:37:47 AM 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 usage text for ntpq:
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.6p4-RC2
+ntpq - standard NTP query program - Ver. 4.2.6p4
 USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index 8911322c6..050baacef 100644
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2011-08-04 "( 4.2.6p4-RC2)" "Programmer's Manual"
+.TH NTPQ 1 2011-09-23 "( 4.2.6p4)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  August  4, 2011 at 04:48:55 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 23, 2011 at 03:37:45 AM by AutoGen 5.12
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 0fe6c2c70..85caa8d9a 100644
--- a/ntpsnmpd/ntpsnmpd-opts.c
+++ b/ntpsnmpd/ntpsnmpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *  
- *  It has been AutoGen-ed  August  4, 2011 at 04:48:59 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 23, 2011 at 03:37:48 AM 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.6p4-RC2\n\
+static char const zCopyright[42] =
+"ntpsnmpd 4.2.6p4\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.6p4-RC2\n\
+static char const zUsageTitle[103] =
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p4\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 083c869ac..f9204fb39 100644
--- a/ntpsnmpd/ntpsnmpd-opts.h
+++ b/ntpsnmpd/ntpsnmpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *  
- *  It has been AutoGen-ed  August  4, 2011 at 04:48:59 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 23, 2011 at 03:37:48 AM 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.6p4-RC2"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.6p4-RC2"
+#define NTPSNMPD_VERSION       "4.2.6p4"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.6p4"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index 220c6a6ed..e285b88df 100644
--- a/ntpsnmpd/ntpsnmpd-opts.texi
+++ b/ntpsnmpd/ntpsnmpd-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.texi)
 # 
-# It has been AutoGen-ed  August  4, 2011 at 04:49:13 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 23, 2011 at 03:37:56 AM 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 usage text for ntpsnmpd:
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p4-RC2
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p4
 USAGE:  ntpsnmpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1
index 1a01ad12b..aea99a7f6 100644
--- a/ntpsnmpd/ntpsnmpd.1
+++ b/ntpsnmpd/ntpsnmpd.1
@@ -1,7 +1,7 @@
-.TH NTPSNMPD 1 2011-08-04 "( 4.2.6p4-RC2)" "Programmer's Manual"
+.TH NTPSNMPD 1 2011-09-23 "( 4.2.6p4)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd.1)
 .\"  
-.\"  It has been AutoGen-ed  August  4, 2011 at 04:49:12 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 23, 2011 at 03:37:55 AM by AutoGen 5.12
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/packageinfo.sh b/packageinfo.sh
index 3ea7d02ac..2ea06bf8f 100644
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -60,7 +60,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
@@ -77,7 +77,7 @@ point=4
 # Should be zeroed at release, and left at zero until first beta.
 # The first beta is -beta1.
 # betapoint is always zero in ntp-dev.
-betapoint=2
+betapoint=0
 
 ### rcpoint is normally modified by script except for GO.
 # RC number (rcpoint)
@@ -91,4 +91,4 @@ betapoint=2
 # - - prerelease is emptied
 # else (not in RC)
 # - rcpoint is empty and unused (for now).
-rcpoint=GO
+rcpoint=
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index ca22d60d3..2513c0bab 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  August  4, 2011 at 03:43:18 PM by AutoGen 5.11.10pre10
+ *  It has been AutoGen-ed  September 23, 2011 at 03:35:46 AM 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.6p4-RC2\n\
+static char const zCopyright[38] =
+"sntp 4.2.6p4\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.6p4-RC2\n\
+static char const zUsageTitle[152] =
+"sntp - standard Simple Network Time Protocol program - Ver. 4.2.6p4\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ hostname-or-IP ...]\n";
 static char const zRcName[7] = ".ntprc";
@@ -483,8 +483,8 @@ sntp implements the Simple Network Time Protocol, and is used to query an\n\
 NTP or SNTP server and either display the time or set the local system's\n\
 time (given suitable privilege).\n\n\
 It can be run interactively from the command line or as a cron job.\n\n\
-NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and\n\
-RFC 1305.\n";
+NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC\n\
+1305.\n";
 static char const zFullVersion[] = SNTP_FULL_VERSION;
 /* extracted from optcode.tlib near line 515 */
 
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 60109061a..208e8cb21 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  August  4, 2011 at 03:43:18 PM by AutoGen 5.11.10pre10
+ *  It has been AutoGen-ed  September 23, 2011 at 03:35:46 AM 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.6p4-RC2"
-#define SNTP_FULL_VERSION  "sntp 4.2.6p4-RC2"
+#define SNTP_VERSION       "4.2.6p4"
+#define SNTP_FULL_VERSION  "sntp 4.2.6p4"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 6e91e20b3..b5ba4390c 100644
--- a/sntp/sntp-opts.texi
+++ b/sntp/sntp-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  August  4, 2011 at 03:43:21 PM by AutoGen 5.11.10pre10
+# It has been AutoGen-ed  September 23, 2011 at 03:36:03 AM 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 usage text for sntp:
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol program - Ver. 4.2.6p4-RC2
+sntp - standard Simple Network Time Protocol program - Ver. 4.2.6p4
 USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -121,8 +121,8 @@ time (given suitable privilege).
 
 It can be run interactively from the command line or as a cron job.
 
-NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and
-RFC 1305.
+NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC
+1305.
 
 please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
diff --git a/sntp/sntp.1 b/sntp/sntp.1
index 5d94e077c..9832e7596 100644
--- a/sntp/sntp.1
+++ b/sntp/sntp.1
@@ -1,7 +1,7 @@
-.TH SNTP 1 2011-08-04 "( 4.2.6p4-RC2)" "Programmer's Manual"
+.TH SNTP 1 2011-09-23 "( 4.2.6p4)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  August  4, 2011 at 03:43:20 PM by AutoGen 5.11.10pre10
+.\"  It has been AutoGen-ed  September 23, 2011 at 03:36:02 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/sntp/sntp.html b/sntp/sntp.html
index c27dfce8c..dff04506e 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -3,7 +3,7 @@
 <title>Sntp User's Manual</title>
 <meta http-equiv="Content-Type" content="text/html">
 <meta name="description" content="Sntp User's Manual">
-<meta name="generator" content="makeinfo 4.13">
+<meta name="generator" content="makeinfo 4.7">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <meta http-equiv="Content-Style-Type" content="text/css">
@@ -14,20 +14,18 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 --></style>
 </head>
 <body>
 <h1 class="settitle">Sntp User's Manual</h1>
 <div class="node">
-<a name="Top"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-Description">sntp Description</a>,
+<a name="Top"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-Description">sntp Description</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#dir">(dir)</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
-
+<br>
 </div>
 
 <h2 class="unnumbered">Simple Network Time Protocol User Manual</h2>
@@ -38,7 +36,7 @@ display the time offset of the system clock relative to the server
 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.6p4-RC2 of <code>sntp</code>.
+  <p>This document applies to version 4.2.6p4 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -57,10 +55,9 @@ IETF specification.
 </ul>
 
 <div class="node">
-<a name="sntp-Description"></a>
 <p><hr>
-
-
+<a name="sntp-Description"></a>
+<br>
 </div>
 
 <!-- node-name,  next,  previous,  up -->
@@ -75,10 +72,9 @@ standard output in the format:
 error bound of the system clock relative to the server clock.
 
 <div class="node">
-<a name="sntp-Invocation"></a>
 <p><hr>
-
-
+<a name="sntp-Invocation"></a>
+<br>
 </div>
 
 <h3 class="section">Invoking sntp</h3>
@@ -111,7 +107,7 @@ is believed to be correct to within
 seconds.
 
   <p>This section was generated by <strong>AutoGen</strong>,
-the aginfo template and the option descriptions for the <samp><span class="command">sntp</span></samp> program.  It documents the <samp><span class="command">sntp</span></samp> usage text and option meanings.
+the aginfo template and the option descriptions for the <span class="command">sntp</span> program.  It documents the <span class="command">sntp</span> usage text and option meanings.
 
   <p>This software is released under a specialized copyright license.
 
@@ -132,11 +128,10 @@ the aginfo template and the option descriptions for the <samp><span class="comma
 </ul>
 
 <div class="node">
-<a name="sntp-usage"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-adjtime">sntp adjtime</a>,
+<a name="sntp-usage"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-adjtime">sntp adjtime</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">sntp usage help (-?)</h4>
@@ -144,7 +139,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <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.6p4-RC2
+<pre class="example">sntp - standard Simple Network Time Protocol program - Ver. 4.2.6p4
 USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -196,18 +191,17 @@ time (given suitable privilege).
 
 It can be run interactively from the command line or as a cron job.
 
-NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and
-RFC 1305.
+NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC
+1305.
 
 please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 </pre>
   <div class="node">
-<a name="sntp-adjtime"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-authentication">sntp authentication</a>,
+<a name="sntp-adjtime"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-authentication">sntp authentication</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-usage">sntp usage</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">adjtime option (-j)</h4>
@@ -222,12 +216,11 @@ settod.
 </ul>
 
 <div class="node">
-<a name="sntp-authentication"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-broadcast">sntp broadcast</a>,
+<a name="sntp-authentication"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-broadcast">sntp broadcast</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-adjtime">sntp adjtime</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">authentication option (-a)</h4>
@@ -239,12 +232,11 @@ The argument of this option is the keyid, a number specified in the keyfile as t
 key's identifier. See the keyfile option (-k) for more details.
 
 <div class="node">
-<a name="sntp-broadcast"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-ipv4">sntp ipv4</a>,
+<a name="sntp-broadcast"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-ipv4">sntp ipv4</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-authentication">sntp authentication</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">broadcast option (-b)</h4>
@@ -256,12 +248,11 @@ for NTP broadcasts.  The default maximum wait time,
 68 seconds, can be modified with -t.
 
 <div class="node">
-<a name="sntp-ipv4"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-ipv6">sntp ipv6</a>,
+<a name="sntp-ipv4"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-ipv6">sntp ipv6</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-broadcast">sntp broadcast</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">ipv4 option (-4)</h4>
@@ -279,12 +270,11 @@ ipv6.
 to the IPv4 namespace.
 
 <div class="node">
-<a name="sntp-ipv6"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-keyfile">sntp keyfile</a>,
+<a name="sntp-ipv6"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-keyfile">sntp keyfile</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-ipv4">sntp ipv4</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">ipv6 option (-6)</h4>
@@ -302,12 +292,11 @@ ipv4.
 to the IPv6 namespace.
 
 <div class="node">
-<a name="sntp-keyfile"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-kod">sntp kod</a>,
+<a name="sntp-keyfile"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-kod">sntp kod</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-ipv6">sntp ipv6</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">keyfile option (-k)</h4>
@@ -329,12 +318,11 @@ M  Key in a 1-to-8 character ASCII string using the MD5 authentication scheme.
   <p>For more information see ntp.keys(5).
 
 <div class="node">
-<a name="sntp-kod"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-logfile">sntp logfile</a>,
+<a name="sntp-kod"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-logfile">sntp logfile</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-keyfile">sntp keyfile</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">kod option (-K)</h4>
@@ -346,12 +334,11 @@ responses received from servers.  The default is
 /var/db/ntp-kod.
 
 <div class="node">
-<a name="sntp-logfile"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-normalverbose">sntp normalverbose</a>,
+<a name="sntp-logfile"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-normalverbose">sntp normalverbose</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-kod">sntp kod</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">logfile option (-l)</h4>
@@ -369,12 +356,11 @@ syslog.
 logfile.
 
 <div class="node">
-<a name="sntp-normalverbose"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-settod">sntp settod</a>,
+<a name="sntp-normalverbose"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-settod">sntp settod</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-logfile">sntp logfile</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">normalverbose option (-d)</h4>
@@ -387,12 +373,11 @@ produce a diagnostic.  This option should be set when there is a
 suspected problem with the server, network or the source.
 
 <div class="node">
-<a name="sntp-settod"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-syslog">sntp syslog</a>,
+<a name="sntp-settod"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-syslog">sntp syslog</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-normalverbose">sntp normalverbose</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">settod option (-s)</h4>
@@ -407,12 +392,11 @@ adjtime.
 </ul>
 
 <div class="node">
-<a name="sntp-syslog"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-timeout">sntp timeout</a>,
+<a name="sntp-syslog"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-timeout">sntp timeout</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-settod">sntp settod</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">syslog option (-p)</h4>
@@ -429,11 +413,10 @@ logfile.
   <p>When this option is set all logging will be done using syslog.
 
 <div class="node">
-<a name="sntp-timeout"></a>
 <p><hr>
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-syslog">sntp syslog</a>,
+<a name="sntp-timeout"></a>Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-syslog">sntp syslog</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">timeout option (-t)</h4>
@@ -444,10 +427,9 @@ When waiting for a broadcast packet SNTP will wait the number
 of seconds specified before giving up.  Default 68 seconds.
 
 <div class="node">
-<a name="Usage"></a>
 <p><hr>
-
-
+<a name="Usage"></a>
+<br>
 </div>
 
 <!-- node-name,  next,  previous,  up -->
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 979ac18da..057a901c6 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  August  4, 2011 at 04:49:17 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 23, 2011 at 03:37:57 AM 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.6p4-RC2\n\
+static char const zCopyright[50] =
+"ntp-keygen (ntp) 4.2.6p4\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.6p4-RC2\n\
+static char const zUsageTitle[114] =
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p4\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index ad31966bc..d77d9d0b8 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  August  4, 2011 at 04:49:16 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 23, 2011 at 03:37:57 AM 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.6p4-RC2"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.6p4-RC2"
+#define NTP_KEYGEN_VERSION       "4.2.6p4"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.6p4"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index c8b70773d..4b7725a7d 100644
--- a/util/ntp-keygen-opts.texi
+++ b/util/ntp-keygen-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  August  4, 2011 at 04:49:43 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 23, 2011 at 03:38:12 AM 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 usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p4-RC2
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p4
 USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index a9f7315e6..e82463759 100644
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2011-08-04 "(ntp 4.2.6p4-RC2)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2011-09-23 "(ntp 4.2.6p4)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  August  4, 2011 at 04:49:41 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 23, 2011 at 03:38:11 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"