NTP_4_2_7P97

bk: 4d0dd27e37kIOu-X3R3qlRsVPVX7fw

diff --git a/ChangeLog b/ChangeLog
index 653aec2e1918c9780bdd8dd91791cfc014dd37c3..7743fdd2c08e7e7baab16bc0ea082af7fb05e79f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+(4.2.7p97) 2010/12/19 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1760] from 4.2.6p3-RC12: ntpd Windows interpolation cannot be
   disabled.
 * from 4.2.6p3-RC12: Upgrade to libopts 34.0.9 from AutoGen 5.11.6pre5.

diff --git a/clockstuff/clktest-opts.c b/clockstuff/clktest-opts.c
index 6874d533f944d4e796a57254c0d1d62ca95077d2..3b4b57af14c92f279248a93ca06d19c160f5127f 100644 (file)
--- a/clockstuff/clktest-opts.c
+++ b/clockstuff/clktest-opts.c
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (clktest-opts.c)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:27:20 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:37:35 AM by AutoGen 5.11.6pre5
  *  From the definitions    clktest-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -323,24 +323,24 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *
  *  Define the Clktest Option Environment
  */
-tSCC   zPROGNAME[]   = "CLKTEST";
-tSCC   zUsageTitle[] =
-"clktest - test the clock line discipline - Ver. 4.2.7p96\n\
+static char const zPROGNAME[8] = "CLKTEST";
+static char const zUsageTitle[128] =
+"clktest - test the clock line discipline - Ver. 4.2.7p97\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... <tty_device>\n";
-tSCC   zRcName[]     = ".ntprc";
-tSCC*  apzHomeList[] = {
-       "$HOME",
-       ".",
-       NULL };
+static char const zRcName[7] = ".ntprc";
+static char const * const apzHomeList[3] = {
+    "$HOME",
+    ".",
+    NULL };
 
-tSCC   zBugsAddr[]    = "http://bugs.ntp.org, bugs@ntp.org";
+static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
 #define zExplain NULL
-tSCC    zDetail[]     = "\n\
+static char const zDetail[164] = "\n\
 Clktest can be used to test the clock line discipline (CLKLDISC,\n\
 it must be available), and to take a look at radio clocks attached\n\
 to a serial port.\n";
-tSCC    zFullVersion[] = CLKTEST_FULL_VERSION;
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 493 */
+static char const zFullVersion[] = CLKTEST_FULL_VERSION;
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -353,6 +353,10 @@ tSCC    zFullVersion[] = CLKTEST_FULL_VERSION;
 
 #define clktest_full_usage NULL
 #define clktest_short_usage NULL
+#ifndef  PKGDATADIR
+# define PKGDATADIR ""
+#endif
+
 tOptions clktestOptions = {
     OPTIONS_STRUCT_VERSION,
     0, NULL,                    /* original argc + argv    */
@@ -383,7 +387,8 @@ tOptions clktestOptions = {
     },
     10 /* full option count */, 5 /* user option count */,
     clktest_full_usage, clktest_short_usage,
-    NULL, NULL
+    NULL, NULL,
+    PKGDATADIR
 };
 
 /*
@@ -528,7 +533,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_CLKTEST_OPTS */
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 626 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/clockstuff/clktest-opts.h b/clockstuff/clktest-opts.h
index d06d7a19bd1bc1093998cb04e9ee288fb24452a0..e9f1cbb5e4bd0156d7e39ad1741c934bbfc709b5 100644 (file)
--- a/clockstuff/clktest-opts.h
+++ b/clockstuff/clktest-opts.h
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (clktest-opts.h)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:27:20 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:37:35 AM by AutoGen 5.11.6pre5
  *  From the definitions    clktest-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -39,7 +39,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 135173
+#define AO_TEMPLATE_VERSION 139264
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -63,8 +63,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    10
-#define CLKTEST_VERSION       "4.2.7p96"
-#define CLKTEST_FULL_VERSION  "clktest - test the clock line discipline - Ver. 4.2.7p96"
+#define CLKTEST_VERSION       "4.2.7p97"
+#define CLKTEST_FULL_VERSION  "clktest - test the clock line discipline - Ver. 4.2.7p97"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 75a596e38eb9c761f478ebeefa4e2e503c734d87..4a0b581712ad12a61a02dd2c2ca27a7efcc7cf4a 100644 (file)
--- a/ntpd/ntpd-opts.c
+++ b/ntpd/ntpd-opts.c
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:21:19 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:36:18 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -1004,19 +1004,19 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *
  *  Define the Ntpd Option Environment
  */
-tSCC   zPROGNAME[]   = "NTPD";
-tSCC   zUsageTitle[] =
-"ntpd - NTP daemon program - Ver. 4.2.7p96\n\
+static char const zPROGNAME[5] = "NTPD";
+static char const zUsageTitle[132] =
+"ntpd - NTP daemon program - Ver. 4.2.7p97\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ <server1> ... <serverN> ]\n";
 #define zRcName     NULL
 #define apzHomeList NULL
 
-tSCC   zBugsAddr[]    = "http://bugs.ntp.org, bugs@ntp.org";
+static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
 #define zExplain NULL
-tSCC    zDetail[]     = "\n\n";
-tSCC    zFullVersion[] = NTPD_FULL_VERSION;
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 493 */
+static char const zDetail[7] = "\n\n";
+static char const zFullVersion[] = NTPD_FULL_VERSION;
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -1029,6 +1029,10 @@ tSCC    zFullVersion[] = NTPD_FULL_VERSION;
 
 #define ntpd_full_usage NULL
 #define ntpd_short_usage NULL
+#ifndef  PKGDATADIR
+# define PKGDATADIR ""
+#endif
+
 tOptions ntpdOptions = {
     OPTIONS_STRUCT_VERSION,
     0, NULL,                    /* original argc + argv    */
@@ -1058,7 +1062,8 @@ tOptions ntpdOptions = {
     },
     36 /* full option count */, 33 /* user option count */,
     ntpd_full_usage, ntpd_short_usage,
-    NULL, NULL
+    NULL, NULL,
+    PKGDATADIR
 };
 
 /*
@@ -1106,7 +1111,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTPD_OPTS */
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 626 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index 93337b2a1cfee569d3aa0af3a8fc2363c41b115e..858b2981d88276593f441b771578ab8c73f641d9 100644 (file)
--- a/ntpd/ntpd-opts.h
+++ b/ntpd/ntpd-opts.h
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:21:19 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:36:18 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -39,7 +39,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 135173
+#define AO_TEMPLATE_VERSION 139264
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -89,8 +89,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    36
-#define NTPD_VERSION       "4.2.7p96"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.7p96"
+#define NTPD_VERSION       "4.2.7p97"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.7p97"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index 4f4a16f0819d80b5155e7e65664a7fe6d8ecf8a0..0613dee55a3a0c9667419a147a35080618d9a2a7 100644 (file)
--- 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  December 18, 2010 at 11:23:30 AM by AutoGen 5.11.6pre3
+# It has been AutoGen-ed  December 19, 2010 at 09:36:47 AM by AutoGen 5.11.6pre5
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index 4c6d16f372605dffc9cfed1bcdfc0b0c285cdbc5..b514ddde12106e15c3485b51118c560cd4f53800 100644 (file)
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2010-12-18 "( 4.2.7p96)" "Programmer's Manual"
+.TH NTPD 1 2010-12-19 "( 4.2.7p97)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December 18, 2010 at 11:23:29 AM by AutoGen 5.11.6pre3
+.\"  It has been AutoGen-ed  December 19, 2010 at 09:36:47 AM by AutoGen 5.11.6pre5
 .\"  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 381bef28c5917bd0768efcbc75862863553c2411..50e96357fdf540580158e12791b4747b866bdb62 100644 (file)
--- a/ntpdc/ntpdc-opts.c
+++ b/ntpdc/ntpdc-opts.c
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:24:03 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:36:57 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -449,19 +449,19 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *
  *  Define the Ntpdc Option Environment
  */
-tSCC   zPROGNAME[]   = "NTPDC";
-tSCC   zUsageTitle[] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p96\n\
+static char const zPROGNAME[6] = "NTPDC";
+static char const zUsageTitle[128] =
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p97\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
-tSCC   zRcName[]     = ".ntprc";
-tSCC*  apzHomeList[] = {
-       "$HOME",
-       ".",
-       NULL };
+static char const zRcName[7] = ".ntprc";
+static char const * const apzHomeList[3] = {
+    "$HOME",
+    ".",
+    NULL };
 
-tSCC   zBugsAddr[]    = "http://bugs.ntp.org, bugs@ntp.org";
+static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
 #define zExplain NULL
-tSCC    zDetail[]     = "\n\
+static char const zDetail[618] = "\n\
 The\n\
 [= prog-name =]\n\
 utility program is used to query an NTP daemon about its\n\
@@ -478,8 +478,8 @@ In addition, nearly all the\n\
 configuration options which can be specified at startup using\n\
 ntpd's configuration file may also be specified at run time using\n\
 [= prog-name =] .\n";
-tSCC    zFullVersion[] = NTPDC_FULL_VERSION;
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 493 */
+static char const zFullVersion[] = NTPDC_FULL_VERSION;
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -492,6 +492,10 @@ tSCC    zFullVersion[] = NTPDC_FULL_VERSION;
 
 #define ntpdc_full_usage NULL
 #define ntpdc_short_usage NULL
+#ifndef  PKGDATADIR
+# define PKGDATADIR ""
+#endif
+
 tOptions ntpdcOptions = {
     OPTIONS_STRUCT_VERSION,
     0, NULL,                    /* original argc + argv    */
@@ -521,7 +525,8 @@ tOptions ntpdcOptions = {
     },
     15 /* full option count */, 10 /* user option count */,
     ntpdc_full_usage, ntpdc_short_usage,
-    NULL, NULL
+    NULL, NULL,
+    PKGDATADIR
 };
 
 /*
@@ -567,7 +572,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTPDC_OPTS */
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 626 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 6a81eeca45a925830c30a0e304ed57c14a953107..efba3dfb97adbabd1f4cee2873d2802acef0a7fb 100644 (file)
--- a/ntpdc/ntpdc-opts.h
+++ b/ntpdc/ntpdc-opts.h
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:24:03 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:36:57 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -39,7 +39,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 135173
+#define AO_TEMPLATE_VERSION 139264
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -68,8 +68,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.7p96"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p96"
+#define NTPDC_VERSION       "4.2.7p97"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p97"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index 62849f63b4a3853e8afdc00061d4b2a9425dbe12..8f6e0930bd422b4caf2f82237866789dfab50df2 100644 (file)
--- 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  December 18, 2010 at 11:26:33 AM by AutoGen 5.11.6pre3
+# It has been AutoGen-ed  December 19, 2010 at 09:37:11 AM by AutoGen 5.11.6pre5
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1
index f76044a0108de9387375899094607f2e33fb3f80..b8cee8210b1b03e953b39af034fa62531a9d60fc 100644 (file)
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2010-12-18 "( 4.2.7p96)" "Programmer's Manual"
+.TH NTPDC 1 2010-12-19 "( 4.2.7p97)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  December 18, 2010 at 11:26:32 AM by AutoGen 5.11.6pre3
+.\"  It has been AutoGen-ed  December 19, 2010 at 09:37:10 AM by AutoGen 5.11.6pre5
 .\"  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 9b3b5262e0058009df6d1e1ce6630137e4278f2b..9f37b0d6ff0b467abe7361664cd133a9f81ffd78 100644 (file)
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:26:34 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:37:11 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -426,19 +426,19 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *
  *  Define the Ntpq Option Environment
  */
-tSCC   zPROGNAME[]   = "NTPQ";
-tSCC   zUsageTitle[] =
-"ntpq - standard NTP query program - Ver. 4.2.7p96\n\
+static char const zPROGNAME[5] = "NTPQ";
+static char const zUsageTitle[120] =
+"ntpq - standard NTP query program - Ver. 4.2.7p97\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
-tSCC   zRcName[]     = ".ntprc";
-tSCC*  apzHomeList[] = {
-       "$HOME",
-       ".",
-       NULL };
+static char const zRcName[7] = ".ntprc";
+static char const * const apzHomeList[3] = {
+    "$HOME",
+    ".",
+    NULL };
 
-tSCC   zBugsAddr[]    = "http://bugs.ntp.org, bugs@ntp.org";
+static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
 #define zExplain NULL
-tSCC    zDetail[]     = "\n\
+static char const zDetail[389] = "\n\
 The\n\
 [= prog-name =]\n\
 utility program is used to query NTP servers which\n\
@@ -447,8 +447,8 @@ in Appendix B of the NTPv3 specification RFC1305, requesting\n\
 information about current state and/or changes in that state.\n\
 The same formats are used in NTPv4, although some of the\n\
 variables have changed and new ones added.\n";
-tSCC    zFullVersion[] = NTPQ_FULL_VERSION;
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 493 */
+static char const zFullVersion[] = NTPQ_FULL_VERSION;
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -461,6 +461,10 @@ tSCC    zFullVersion[] = NTPQ_FULL_VERSION;
 
 #define ntpq_full_usage NULL
 #define ntpq_short_usage NULL
+#ifndef  PKGDATADIR
+# define PKGDATADIR ""
+#endif
+
 tOptions ntpqOptions = {
     OPTIONS_STRUCT_VERSION,
     0, NULL,                    /* original argc + argv    */
@@ -490,7 +494,8 @@ tOptions ntpqOptions = {
     },
     14 /* full option count */, 9 /* user option count */,
     ntpq_full_usage, ntpq_short_usage,
-    NULL, NULL
+    NULL, NULL,
+    PKGDATADIR
 };
 
 /*
@@ -536,7 +541,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTPQ_OPTS */
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 626 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 8df0016f4b43aeffae9f6a672ecbc9b43b621430..dc61c89d8b75102c0a20e77cf866004ce241fb39 100644 (file)
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:26:33 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:37:11 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -39,7 +39,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 135173
+#define AO_TEMPLATE_VERSION 139264
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -67,8 +67,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p96"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.7p96"
+#define NTPQ_VERSION       "4.2.7p97"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.7p97"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 91ebead7abbf8bf5ba2e9a2fca97a51c9637b1e1..c8fa76912759070da82100802ac83b0280c004a5 100644 (file)
--- 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  December 18, 2010 at 11:27:06 AM by AutoGen 5.11.6pre3
+# It has been AutoGen-ed  December 19, 2010 at 09:37:26 AM by AutoGen 5.11.6pre5
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index 776dfb50bbca0da9e90954004d4dd0920665bdde..b58cd1a9c7f487d00d22b90ce6e51bd2497d7cad 100644 (file)
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2010-12-18 "( 4.2.7p96)" "Programmer's Manual"
+.TH NTPQ 1 2010-12-19 "( 4.2.7p97)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  December 18, 2010 at 11:27:05 AM by AutoGen 5.11.6pre3
+.\"  It has been AutoGen-ed  December 19, 2010 at 09:37:25 AM by AutoGen 5.11.6pre5
 .\"  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 a9ca4a9ed54aa1a5a3c97ebd382fc0db88f09f26..851e42a3aad8f51da33818a9322c7d2d7871a4e4 100644 (file)
--- a/ntpsnmpd/ntpsnmpd-opts.c
+++ b/ntpsnmpd/ntpsnmpd-opts.c
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:27:06 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:37:26 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -253,21 +253,21 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *
  *  Define the Ntpsnmpd Option Environment
  */
-tSCC   zPROGNAME[]   = "NTPSNMPD";
-tSCC   zUsageTitle[] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p96\n\
+static char const zPROGNAME[9] = "NTPSNMPD";
+static char const zUsageTitle[104] =
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p97\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
-tSCC   zRcName[]     = ".ntprc";
-tSCC*  apzHomeList[] = {
-       "$HOME",
-       ".",
-       NULL };
+static char const zRcName[7] = ".ntprc";
+static char const * const apzHomeList[3] = {
+    "$HOME",
+    ".",
+    NULL };
 
-tSCC   zBugsAddr[]    = "http://bugs.ntp.org, bugs@ntp.org";
+static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
 #define zExplain NULL
 #define zDetail         NULL
-tSCC    zFullVersion[] = NTPSNMPD_FULL_VERSION;
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 493 */
+static char const zFullVersion[] = NTPSNMPD_FULL_VERSION;
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -280,6 +280,10 @@ tSCC    zFullVersion[] = NTPSNMPD_FULL_VERSION;
 
 #define ntpsnmpd_full_usage NULL
 #define ntpsnmpd_short_usage NULL
+#ifndef  PKGDATADIR
+# define PKGDATADIR ""
+#endif
+
 tOptions ntpsnmpdOptions = {
     OPTIONS_STRUCT_VERSION,
     0, NULL,                    /* original argc + argv    */
@@ -310,7 +314,8 @@ tOptions ntpsnmpdOptions = {
     },
     8 /* full option count */, 3 /* user option count */,
     ntpsnmpd_full_usage, ntpsnmpd_short_usage,
-    NULL, NULL
+    NULL, NULL,
+    PKGDATADIR
 };
 
 /*
@@ -342,7 +347,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTPSNMPD_OPTS */
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 626 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 70a1e110219d57b625688862a76933faab11a064..28cece48a587da3e52302342dc4fcc94dda799d8 100644 (file)
--- a/ntpsnmpd/ntpsnmpd-opts.h
+++ b/ntpsnmpd/ntpsnmpd-opts.h
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:27:06 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:37:26 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -39,7 +39,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 135173
+#define AO_TEMPLATE_VERSION 139264
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -61,8 +61,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p96"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p96"
+#define NTPSNMPD_VERSION       "4.2.7p97"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p97"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index 92b94d0f1372330623551922aa5c860ad0017a06..013aa3ca90eb71350ce49a8bd153231e66b80c3a 100644 (file)
--- 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  December 18, 2010 at 11:27:19 AM by AutoGen 5.11.6pre3
+# It has been AutoGen-ed  December 19, 2010 at 09:37:34 AM by AutoGen 5.11.6pre5
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1
index 3972c5fd22e7213464d4c612ec78a87765546c79..98a5b4d172e4503beaf935980b4b097a603ac1db 100644 (file)
--- a/ntpsnmpd/ntpsnmpd.1
+++ b/ntpsnmpd/ntpsnmpd.1
@@ -1,7 +1,7 @@
-.TH NTPSNMPD 1 2010-12-18 "( 4.2.7p96)" "Programmer's Manual"
+.TH NTPSNMPD 1 2010-12-19 "( 4.2.7p97)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December 18, 2010 at 11:27:19 AM by AutoGen 5.11.6pre3
+.\"  It has been AutoGen-ed  December 19, 2010 at 09:37:34 AM by AutoGen 5.11.6pre5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/packageinfo.sh b/packageinfo.sh
index c5d90817e29e54c0cab3caf4587bab7082f958f6..059174e6bcd6cc15bf4b64c86bcd759a057229f3 100644 (file)
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -57,7 +57,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=96
+point=97
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)

diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index fb56028594fd9fd038ce920ab4084b8db769a90b..6c904c737c311a9d2ee45ea075568afd5382aafd 100644 (file)
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:20:49 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:36:08 AM by AutoGen 5.11.6pre5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -471,27 +471,27 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *
  *  Define the Sntp Option Environment
  */
-tSCC   zPROGNAME[]   = "SNTP";
-tSCC   zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.7p96\n\
+static char const zPROGNAME[5] = "SNTP";
+static char const zUsageTitle[122] =
+"sntp - standard SNTP program - Ver. 4.2.7p97\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... hostname-or-IP ...\n";
-tSCC   zRcName[]     = ".ntprc";
-tSCC*  apzHomeList[] = {
-       "$HOME",
-       ".",
-       NULL };
-
-tSCC   zBugsAddr[]    = "http://bugs.ntp.org, bugs@ntp.org";
-tSCC   zExplain[]     = "\n\n";
-tSCC    zDetail[]     = "\n\
+static char const zRcName[7] = ".ntprc";
+static char const * const apzHomeList[3] = {
+    "$HOME",
+    ".",
+    NULL };
+
+static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
+static char const zExplain[] = "\n\n";
+static char const zDetail[352] = "\n\
 sntp implements the Simple Network Time Protocol, and is used to query\n\
 an NTP or SNTP server and either display the time or set the local\n\
 system's 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 RFC\n\
 1305.\n";
-tSCC    zFullVersion[] = SNTP_FULL_VERSION;
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 493 */
+static char const zFullVersion[] = SNTP_FULL_VERSION;
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -504,6 +504,10 @@ tSCC    zFullVersion[] = SNTP_FULL_VERSION;
 
 #define sntp_full_usage NULL
 #define sntp_short_usage NULL
+#ifndef  PKGDATADIR
+# define PKGDATADIR ""
+#endif
+
 tOptions sntpOptions = {
     OPTIONS_STRUCT_VERSION,
     0, NULL,                    /* original argc + argv    */
@@ -534,7 +538,8 @@ tOptions sntpOptions = {
     },
     17 /* full option count */, 12 /* user option count */,
     sntp_full_usage, sntp_short_usage,
-    NULL, NULL
+    NULL, NULL,
+    PKGDATADIR
 };
 
 /*
@@ -566,7 +571,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_SNTP_OPTS */
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 626 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 65a2aaf1c8e68e9a9e26647252b0b77796c248ff..4b17db2ac01ea21a9260abfb64d9c9f44bcfe9aa 100644 (file)
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:20:49 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:36:08 AM by AutoGen 5.11.6pre5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -39,7 +39,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 135173
+#define AO_TEMPLATE_VERSION 139264
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -70,8 +70,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    17
-#define SNTP_VERSION       "4.2.7p96"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.7p96"
+#define SNTP_VERSION       "4.2.7p97"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.7p97"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 24e84f7e43a79ab4ad842f5362d567b84b3dc999..4094bba7b396b2a1b77d6b3a765c7a8827611e4c 100644 (file)
--- 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  December 18, 2010 at 11:21:09 AM by AutoGen 5.11.6pre3
+# It has been AutoGen-ed  December 19, 2010 at 09:36:17 AM by AutoGen 5.11.6pre5
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/sntp/sntp.1 b/sntp/sntp.1
index 6f7509b53f435d15135e7f26128e270a482d72d4..4106e431990d6be2bee4a203c94ace1893b18944 100644 (file)
--- a/sntp/sntp.1
+++ b/sntp/sntp.1
@@ -1,7 +1,7 @@
-.TH SNTP 1 2010-12-18 "( 4.2.7p96)" "Programmer's Manual"
+.TH SNTP 1 2010-12-19 "( 4.2.7p97)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  December 18, 2010 at 11:21:09 AM by AutoGen 5.11.6pre3
+.\"  It has been AutoGen-ed  December 19, 2010 at 09:36:16 AM by AutoGen 5.11.6pre5
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/sntp/sntp.html b/sntp/sntp.html
index c4e88d3b3d211a356648a70c3b082d90aa5712b5..de6c5a4834c841ed5d29afcb39049c63b3c30c83 100644 (file)
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -36,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.7p96 of <code>sntp</code>.
+  <p>This document applies to version 4.2.7p97 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.

diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 689c164c11b0c404878233abaf791f07002eb8cf..f374722a755ed6b1baa3b143032b273cc852d323 100644 (file)
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:27:21 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:37:37 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -755,23 +755,23 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *
  *  Define the Ntp_Keygen Option Environment
  */
-tSCC   zPROGNAME[]   = "NTP_KEYGEN";
-tSCC   zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p96\n\
+static char const zPROGNAME[11] = "NTP_KEYGEN";
+static char const zUsageTitle[115] =
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p97\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
-tSCC   zRcName[]     = ".ntprc";
-tSCC*  apzHomeList[] = {
-       "$HOME",
-       ".",
-       NULL };
+static char const zRcName[7] = ".ntprc";
+static char const * const apzHomeList[3] = {
+    "$HOME",
+    ".",
+    NULL };
 
-tSCC   zBugsAddr[]    = "http://bugs.ntp.org, bugs@ntp.org";
+static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
 #define zExplain NULL
-tSCC    zDetail[]     = "\n\
+static char const zDetail[98] = "\n\
 If there is no new host key, look for an existing one.\n\
 If one is not found, create it.\n";
-tSCC    zFullVersion[] = NTP_KEYGEN_FULL_VERSION;
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 493 */
+static char const zFullVersion[] = NTP_KEYGEN_FULL_VERSION;
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -784,6 +784,10 @@ tSCC    zFullVersion[] = NTP_KEYGEN_FULL_VERSION;
 
 #define ntp_keygen_full_usage NULL
 #define ntp_keygen_short_usage NULL
+#ifndef  PKGDATADIR
+# define PKGDATADIR ""
+#endif
+
 tOptions ntp_keygenOptions = {
     OPTIONS_STRUCT_VERSION,
     0, NULL,                    /* original argc + argv    */
@@ -814,7 +818,8 @@ tOptions ntp_keygenOptions = {
     },
     24 /* full option count */, 19 /* user option count */,
     ntp_keygen_full_usage, ntp_keygen_short_usage,
-    NULL, NULL
+    NULL, NULL,
+    PKGDATADIR
 };
 
 /*
@@ -912,7 +917,7 @@ main(int argc, char** argv)
     return res;
 }
 #endif  /* defined TEST_NTP_KEYGEN_OPTS */
-/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 626 */
+/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */
 
 #if ENABLE_NLS
 #include <stdio.h>

diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 37782331acfcdf8f15808865b2a0fb6882ac2187..e6c2c93e2f32211230db3df157492247c5f07295 100644 (file)
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  December 18, 2010 at 11:27:21 AM by AutoGen 5.11.6pre3
+ *  It has been AutoGen-ed  December 19, 2010 at 09:37:37 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 33:5:8 templates.
+ * Generated from AutoOpts 34:0:9 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -39,7 +39,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 135173
+#define AO_TEMPLATE_VERSION 139264
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -77,8 +77,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define NTP_KEYGEN_VERSION       "4.2.7p96"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p96"
+#define NTP_KEYGEN_VERSION       "4.2.7p97"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p97"
 
 /*
  *  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 8e0c848587de2d2b0cb5d7925ecaa9fd45dfaba9..0fef269995ba7f00e1fb05583cde6a19c9389594 100644 (file)
--- 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  December 18, 2010 at 11:28:20 AM by AutoGen 5.11.6pre3
+# It has been AutoGen-ed  December 19, 2010 at 09:37:48 AM by AutoGen 5.11.6pre5
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore

diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index fc6c354fdefbccf00520552936eef9682eb0ff47..f413465c02604e97228ffee2de4646ef7634a505 100644 (file)
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2010-12-18 "(ntp 4.2.7p96)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2010-12-19 "(ntp 4.2.7p97)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  December 18, 2010 at 11:28:15 AM by AutoGen 5.11.6pre3
+.\"  It has been AutoGen-ed  December 19, 2010 at 09:37:48 AM by AutoGen 5.11.6pre5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"