From: Harlan Stenn Date: Sun, 19 Dec 2010 09:38:06 +0000 (+0000) Subject: NTP_4_2_7P97 X-Git-Tag: NTP_4_2_7P97^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d338b42ceedbb6b862e6259acbbf3fe814305df;p=thirdparty%2Fntp.git NTP_4_2_7P97 bk: 4d0dd27e37kIOu-X3R3qlRsVPVX7fw --- diff --git a/ChangeLog b/ChangeLog index 653aec2e1..7743fdd2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p97) 2010/12/19 Released by Harlan Stenn * [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 6874d533f..3b4b57af1 100644 --- 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 [ - [] | --[{=| }] ]... \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 diff --git a/clockstuff/clktest-opts.h b/clockstuff/clktest-opts.h index d06d7a19b..e9f1cbb5e 100644 --- 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 75a596e38..4a0b58171 100644 --- 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 [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\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 diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 93337b2a1..858b2981d 100644 --- 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 4f4a16f08..0613dee55 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 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 4c6d16f37..b514ddde1 100644 --- 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 381bef28c..50e96357f 100644 --- 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 [ - [] | --[{=| }] ]... [ 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 diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 6a81eeca4..efba3dfb9 100644 --- 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 62849f63b..8f6e0930b 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 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 f76044a01..b8cee8210 100644 --- 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 9b3b5262e..9f37b0d6f 100644 --- 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 [ - [] | --[{=| }] ]... [ 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 diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 8df0016f4..dc61c89d8 100644 --- 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 91ebead7a..c8fa76912 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 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 776dfb50b..b58cd1a9c 100644 --- 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 a9ca4a9ed..851e42a3a 100644 --- 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 [ - [] | --[{=| }] ]...\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 diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 70a1e1102..28cece48a 100644 --- 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 92b94d0f1..013aa3ca9 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 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 3972c5fd2..98a5b4d17 100644 --- 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 c5d90817e..059174e6b 100644 --- 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 fb5602859..6c904c737 100644 --- 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 [ - [] | --[{=| }] ]... 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 diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 65a2aaf1c..4b17db2ac 100644 --- 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 24e84f7e4..4094bba7b 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 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 6f7509b53..4106e4319 100644 --- 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 c4e88d3b3..de6c5a483 100644 --- 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. -

This document applies to version 4.2.7p96 of sntp. +

This document applies to version 4.2.7p97 of sntp.

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 689c164c1..f374722a7 100644 --- 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 [ - [] | --[{=| }] ]...\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 diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 37782331a..e6c2c93e2 100644 --- 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 8e0c84858..0fef26999 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 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 fc6c354fd..f413465c0 100644 --- 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 .\"