From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 30 Mar 2009 11:47:41 +0000 (-0500)
Subject: NTP_4_2_4P7_RC1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7638be3f8358fbc272f08d7425f90a4d47b81acb;p=thirdparty%2Fntp.git

NTP_4_2_4P7_RC1

bk: 49d0b15d9zILahQgMz2dz8zv_erm0Q
---

diff --git a/ChangeLog b/ChangeLog
index 613e35bf08..26053ea57d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+(4.2.4p7-RC1) 2009/03/30 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1131] UDP sockets should not use SIGPOLL on Solaris.
 * build system email address cleanup
 * [Bug 774] parsesolaris.c does not compile under the new Solaris
diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 7fa977f47d..6fd6fab0d3 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  Thursday January  8, 2009 at 06:11:55 AM EST
+ *  It has been AutoGen-ed  Monday March 30, 2009 at 06:39:19 AM EST
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -835,7 +835,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPD";
 tSCC   zUsageTitle[] =
-"ntpd - NTP daemon program - Ver. 4.2.4p6\n\
+"ntpd - NTP daemon program - Ver. 4.2.4p7-RC1\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 b73a93fa86..790bb40850 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  Thursday January  8, 2009 at 06:11:54 AM EST
+ *  It has been AutoGen-ed  Monday March 30, 2009 at 06:39:18 AM EST
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -87,8 +87,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    32
-#define NTPD_VERSION       "4.2.4p6"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.4p6"
+#define NTPD_VERSION       "4.2.4p7-RC1"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.4p7-RC1"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index cf7892987f..2ecb065b40 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  Thursday January  8, 2009 at 06:11:58 AM EST
+# It has been AutoGen-ed  Monday March 30, 2009 at 06:39:21 AM EST
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -60,7 +60,7 @@ This is the automatically generated usage text for ntpd:
 
 @exampleindent 0
 @example
-ntpd - NTP daemon program - Ver. 4.2.5p134
+ntpd - NTP daemon program - Ver. 4.2.5p158
 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 ef342c1e7f..e27ad19b36 100644
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2009-01-08 "( 4.2.4p6)" "Programmer's Manual"
+.TH NTPD 1 2009-03-30 "( 4.2.4p7-RC1)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday January  8, 2009 at 06:11:57 AM EST
+.\"  It has been AutoGen-ed  Monday March 30, 2009 at 06:39:20 AM EST
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpd/ntpdsim-opts.c b/ntpd/ntpdsim-opts.c
index c0bb1758ac..ac536e42a7 100644
--- a/ntpd/ntpdsim-opts.c
+++ b/ntpd/ntpdsim-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdsim-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday January  8, 2009 at 06:12:00 AM EST
+ *  It has been AutoGen-ed  Monday March 30, 2009 at 06:39:23 AM EST
  *  From the definitions    ntpdsim-opts.def
  *  and the template file   options
  *
@@ -1072,7 +1072,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPDSIM";
 tSCC   zUsageTitle[] =
-"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p6\n\
+"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p7-RC1\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h
index 630e7fa8fb..cf8b82a29f 100644
--- a/ntpd/ntpdsim-opts.h
+++ b/ntpd/ntpdsim-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdsim-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday January  8, 2009 at 06:11:59 AM EST
+ *  It has been AutoGen-ed  Monday March 30, 2009 at 06:39:22 AM EST
  *  From the definitions    ntpdsim-opts.def
  *  and the template file   options
  *
@@ -98,8 +98,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    43
-#define NTPDSIM_VERSION       "4.2.4p6"
-#define NTPDSIM_FULL_VERSION  "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p6"
+#define NTPDSIM_VERSION       "4.2.4p7-RC1"
+#define NTPDSIM_FULL_VERSION  "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p7-RC1"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi
index 36baba2531..2a1050ee5d 100644
--- a/ntpd/ntpdsim-opts.texi
+++ b/ntpd/ntpdsim-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpdsim-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday January  8, 2009 at 06:12:03 AM EST
+# It has been AutoGen-ed  Monday March 30, 2009 at 06:39:26 AM EST
 # From the definitions    ntpdsim-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/ntpd/ntpdsim.1 b/ntpd/ntpdsim.1
index 8598eba2d1..ecb127239f 100644
--- a/ntpd/ntpdsim.1
+++ b/ntpd/ntpdsim.1
@@ -1,7 +1,7 @@
-.TH NTPDSIM 1 2009-01-08 "( 4.2.4p6)" "Programmer's Manual"
+.TH NTPDSIM 1 2009-03-30 "( 4.2.4p7-RC1)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdsim.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday January  8, 2009 at 06:12:02 AM EST
+.\"  It has been AutoGen-ed  Monday March 30, 2009 at 06:39:24 AM EST
 .\"  From the definitions    ntpdsim-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 926b4fee6f..1355c90e60 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  Thursday January  8, 2009 at 06:18:23 AM EST
+ *  It has been AutoGen-ed  Monday March 30, 2009 at 06:45:37 AM EST
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -462,7 +462,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPDC";
 tSCC   zUsageTitle[] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p6\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p7-RC1\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 0129877c81..8cb6d16843 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  Thursday January  8, 2009 at 06:18:22 AM EST
+ *  It has been AutoGen-ed  Monday March 30, 2009 at 06:45:36 AM EST
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -70,8 +70,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.4p6"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p6"
+#define NTPDC_VERSION       "4.2.4p7-RC1"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p7-RC1"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index 8f84cea749..bfc8ffc00d 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  Thursday January  8, 2009 at 06:18:25 AM EST
+# It has been AutoGen-ed  Monday March 30, 2009 at 06:45:39 AM EST
 # 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.5p134
+ntpdc - vendor-specific NTP query program - Ver. 4.2.5p158
 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 bc752b18b1..f955a62c81 100644
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2009-01-08 "( 4.2.4p6)" "Programmer's Manual"
+.TH NTPDC 1 2009-03-30 "( 4.2.4p7-RC1)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday January  8, 2009 at 06:18:25 AM EST
+.\"  It has been AutoGen-ed  Monday March 30, 2009 at 06:45:38 AM EST
 .\"  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 02cbc743dc..24dbd908e8 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  Thursday January  8, 2009 at 06:18:56 AM EST
+ *  It has been AutoGen-ed  Monday March 30, 2009 at 06:46:07 AM EST
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -410,7 +410,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPQ";
 tSCC   zUsageTitle[] =
-"ntpq - standard NTP query program - Ver. 4.2.4p6\n\
+"ntpq - standard NTP query program - Ver. 4.2.4p7-RC1\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 11de1ecc66..fefb31cf19 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  Thursday January  8, 2009 at 06:18:56 AM EST
+ *  It has been AutoGen-ed  Monday March 30, 2009 at 06:46:07 AM EST
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -68,8 +68,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    13
-#define NTPQ_VERSION       "4.2.4p6"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.4p6"
+#define NTPQ_VERSION       "4.2.4p7-RC1"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.4p7-RC1"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 4ba3ff435e..9c42db94c6 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  Thursday January  8, 2009 at 06:18:59 AM EST
+# It has been AutoGen-ed  Monday March 30, 2009 at 06:46:09 AM EST
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -46,7 +46,7 @@ This is the automatically generated usage text for ntpq:
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.5p134
+ntpq - standard NTP query program - Ver. 4.2.5p158
 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 37e3127fd4..bbfa7c21d0 100644
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2009-01-08 "( 4.2.4p6)" "Programmer's Manual"
+.TH NTPQ 1 2009-03-30 "( 4.2.4p7-RC1)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday January  8, 2009 at 06:18:57 AM EST
+.\"  It has been AutoGen-ed  Monday March 30, 2009 at 06:46:09 AM EST
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/packageinfo.sh b/packageinfo.sh
index 2df846e305..21b9a5b06f 100644
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -9,7 +9,7 @@ version=${proto}.${major}.${minor}
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=6
+point=7
 # Special.  Normally unused.  A suffix.
 #special=ag
 special=
@@ -27,5 +27,5 @@ CLTAG=NTP_4_2_0
 # - - rcpoint gets set to 0
 # - - releasecandidate gets set to no
 # - GRONK is for -dev
-rcpoint=
+rcpoint=1
 #rcpoint=GRONK
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index b50f1700d9..6d311dd708 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  Thursday January  8, 2009 at 06:19:26 AM EST
+ *  It has been AutoGen-ed  Monday March 30, 2009 at 06:46:34 AM EST
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -513,7 +513,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "SNTP";
 tSCC   zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.4p6\n\
+"sntp - standard SNTP program - Ver. 4.2.4p7-RC1\n\
 USAGE:  %s [ -<flag> | --<name> ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 69a7400212..b3e62103b6 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  Thursday January  8, 2009 at 06:19:25 AM EST
+ *  It has been AutoGen-ed  Monday March 30, 2009 at 06:46:34 AM EST
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -147,8 +147,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    13
-#define SNTP_VERSION       "4.2.4p6"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.4p6"
+#define SNTP_VERSION       "4.2.4p7-RC1"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.4p7-RC1"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 2130ad39ab..5047826e7f 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  Thursday January  8, 2009 at 06:19:29 AM EST
+# It has been AutoGen-ed  Monday March 30, 2009 at 06:46:36 AM EST
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 1368b97bc4..6961eb29f5 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  Thursday January  8, 2009 at 06:19:36 AM EST
+ *  It has been AutoGen-ed  Monday March 30, 2009 at 06:46:45 AM EST
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -799,7 +799,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTP_KEYGEN";
 tSCC   zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p6\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p7-RC1\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 860d26c6fa..90c6fcb004 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  Thursday January  8, 2009 at 06:19:35 AM EST
+ *  It has been AutoGen-ed  Monday March 30, 2009 at 06:46:44 AM EST
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -79,8 +79,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define NTP_KEYGEN_VERSION       "4.2.4p6"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p6"
+#define NTP_KEYGEN_VERSION       "4.2.4p7-RC1"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p7-RC1"
 
 /*
  *  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 877a19ff51..f6901dd6af 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  Thursday January  8, 2009 at 06:19:38 AM EST
+# It has been AutoGen-ed  Monday March 30, 2009 at 06:46:47 AM EST
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -52,7 +52,7 @@ This is the automatically generated usage text for ntp-keygen:
 @exampleindent 0
 @example
 Using OpenSSL version 90704f
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p134
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p158
 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 c847164cfc..4a37db3106 100644
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2009-01-08 "(ntp 4.2.4p6)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2009-03-30 "(ntp 4.2.4p7-RC1)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday January  8, 2009 at 06:19:37 AM EST
+.\"  It has been AutoGen-ed  Monday March 30, 2009 at 06:46:46 AM EST
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"