From: Harlan Stenn Date: Mon, 21 Feb 2011 09:21:02 +0000 (+0000) Subject: NTP_4_2_7P131 X-Git-Tag: NTP_4_2_7P131^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3b88b3cd9048cb26241021c244b42ede5ea7ffd;p=thirdparty%2Fntp.git NTP_4_2_7P131 bk: 4d622e7ek-JZZ4W-Mpa6HRQirxhymg --- diff --git a/ChangeLog b/ChangeLog index a2f9f7421..92d70c316 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p131) 2011/02/21 Released by Harlan Stenn * [Bug 1087] -v/--normalverbose conflicts with -v/--version in sntp. * [Bug 1088] sntp should (only) report the time difference without -s/-a. * older autoconf sometimes dislikes []. diff --git a/clockstuff/clktest-opts.c b/clockstuff/clktest-opts.c index 10d9f2bc6..644521ea6 100644 --- a/clockstuff/clktest-opts.c +++ b/clockstuff/clktest-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (clktest-opts.c) * - * It has been AutoGen-ed February 12, 2011 at 11:05:29 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 21, 2011 at 09:20:29 AM by AutoGen 5.11.6pre7 * From the definitions clktest-opts.def * and the template file options * @@ -325,7 +325,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[8] = "CLKTEST"; static char const zUsageTitle[129] = -"clktest - test the clock line discipline - Ver. 4.2.7p130\n\ +"clktest - test the clock line discipline - Ver. 4.2.7p131\n\ USAGE: %s [ - [] | --[{=| }] ]... \n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/clockstuff/clktest-opts.h b/clockstuff/clktest-opts.h index 00c283fd8..d9aa05d7b 100644 --- a/clockstuff/clktest-opts.h +++ b/clockstuff/clktest-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (clktest-opts.h) * - * It has been AutoGen-ed February 12, 2011 at 11:05:29 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 21, 2011 at 09:20:29 AM by AutoGen 5.11.6pre7 * From the definitions clktest-opts.def * and the template file options * @@ -63,8 +63,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 10 -#define CLKTEST_VERSION "4.2.7p130" -#define CLKTEST_FULL_VERSION "clktest - test the clock line discipline - Ver. 4.2.7p130" +#define CLKTEST_VERSION "4.2.7p131" +#define CLKTEST_FULL_VERSION "clktest - test the clock line discipline - Ver. 4.2.7p131" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index aac4293a5..c07552685 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 February 12, 2011 at 10:57:22 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 21, 2011 at 09:18:28 AM by AutoGen 5.11.6pre7 * From the definitions ntpd-opts.def * and the template file options * @@ -1006,7 +1006,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[5] = "NTPD"; static char const zUsageTitle[133] = -"ntpd - NTP daemon program - Ver. 4.2.7p130\n\ +"ntpd - NTP daemon program - Ver. 4.2.7p131\n\ USAGE: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n"; #define zRcName NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 477d6109a..60bdc30f8 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 February 12, 2011 at 10:57:17 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 21, 2011 at 09:18:28 AM by AutoGen 5.11.6pre7 * From the definitions ntpd-opts.def * and the template file options * @@ -89,8 +89,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 36 -#define NTPD_VERSION "4.2.7p130" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p130" +#define NTPD_VERSION "4.2.7p131" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p131" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index eb0b92284..01021c752 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 February 12, 2011 at 11:01:15 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed February 21, 2011 at 09:19:48 AM by AutoGen 5.11.6pre7 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -64,7 +64,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p130 +ntpd - NTP daemon program - Ver. 4.2.7p131 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 8338f88dd..586f3eb65 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2011-02-12 "( 4.2.7p130)" "Programmer's Manual" +.TH NTPD 1 2011-02-21 "( 4.2.7p131)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed February 12, 2011 at 11:01:13 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed February 21, 2011 at 09:19:47 AM by AutoGen 5.11.6pre7 .\" 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 e99e4e3be..55f368675 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 February 12, 2011 at 11:02:09 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 21, 2011 at 09:19:59 AM by AutoGen 5.11.6pre7 * From the definitions ntpdc-opts.def * and the template file options * @@ -451,7 +451,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[6] = "NTPDC"; static char const zUsageTitle[129] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p130\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p131\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index d5f17a518..be62ee0b7 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 February 12, 2011 at 11:02:09 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 21, 2011 at 09:19:59 AM by AutoGen 5.11.6pre7 * From the definitions ntpdc-opts.def * and the template file options * @@ -68,8 +68,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.7p130" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p130" +#define NTPDC_VERSION "4.2.7p131" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p131" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index db96f5180..6eb7b1c5e 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 February 12, 2011 at 11:02:49 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed February 21, 2011 at 09:20:08 AM by AutoGen 5.11.6pre7 # 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.7p130 +ntpdc - vendor-specific NTP query program - Ver. 4.2.7p131 USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ 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 da1403159..1c75389f4 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2011-02-12 "( 4.2.7p130)" "Programmer's Manual" +.TH NTPDC 1 2011-02-21 "( 4.2.7p131)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed February 12, 2011 at 11:02:47 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed February 21, 2011 at 09:20:08 AM by AutoGen 5.11.6pre7 .\" 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 2f7fcf3af..89549fbd6 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 February 12, 2011 at 11:02:57 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 21, 2011 at 09:20:09 AM by AutoGen 5.11.6pre7 * From the definitions ntpq-opts.def * and the template file options * @@ -428,7 +428,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[5] = "NTPQ"; static char const zUsageTitle[121] = -"ntpq - standard NTP query program - Ver. 4.2.7p130\n\ +"ntpq - standard NTP query program - Ver. 4.2.7p131\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 16405748c..9a6867df8 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 February 12, 2011 at 11:02:57 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 21, 2011 at 09:20:09 AM by AutoGen 5.11.6pre7 * From the definitions ntpq-opts.def * and the template file options * @@ -67,8 +67,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 14 -#define NTPQ_VERSION "4.2.7p130" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p130" +#define NTPQ_VERSION "4.2.7p131" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p131" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 0bfd90419..938f188a0 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 February 12, 2011 at 11:03:53 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed February 21, 2011 at 09:20:20 AM by AutoGen 5.11.6pre7 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -47,7 +47,7 @@ This is the automatically generated usage text for ntpq: @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.7p130 +ntpq - standard NTP query program - Ver. 4.2.7p131 USAGE: ntpq [ - [] | --[@{=| @}] ]... [ 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 104a49a02..ae7ae693e 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2011-02-12 "( 4.2.7p130)" "Programmer's Manual" +.TH NTPQ 1 2011-02-21 "( 4.2.7p131)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed February 12, 2011 at 11:03:51 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed February 21, 2011 at 09:20:20 AM by AutoGen 5.11.6pre7 .\" 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 3af4d2510..6077865dd 100644 --- a/ntpsnmpd/ntpsnmpd-opts.c +++ b/ntpsnmpd/ntpsnmpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) * - * It has been AutoGen-ed February 12, 2011 at 11:04:14 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 21, 2011 at 09:20:21 AM by AutoGen 5.11.6pre7 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -255,7 +255,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[9] = "NTPSNMPD"; static char const zUsageTitle[105] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p130\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p131\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 9affdf5cf..b205f785d 100644 --- a/ntpsnmpd/ntpsnmpd-opts.h +++ b/ntpsnmpd/ntpsnmpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) * - * It has been AutoGen-ed February 12, 2011 at 11:04:14 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed February 21, 2011 at 09:20:21 AM by AutoGen 5.11.6pre7 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -61,8 +61,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 8 -#define NTPSNMPD_VERSION "4.2.7p130" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p130" +#define NTPSNMPD_VERSION "4.2.7p131" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p131" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index c0ae2c4e8..f7fc8f81e 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 February 12, 2011 at 11:04:52 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed February 21, 2011 at 09:20:28 AM by AutoGen 5.11.6pre7 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -34,7 +34,7 @@ This is the automatically generated usage text for ntpsnmpd: @exampleindent 0 @example -ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p130 +ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p131 USAGE: ntpsnmpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -n no nofork Do not fork diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index dd4ad7108..a47787ef2 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2011-02-12 "( 4.2.7p130)" "Programmer's Manual" +.TH NTPSNMPD 1 2011-02-21 "( 4.2.7p131)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed February 12, 2011 at 11:04:52 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed February 21, 2011 at 09:20:27 AM by AutoGen 5.11.6pre7 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 5fddaf608..271eca241 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=130 +point=131 ### betapoint is normally modified by script. # ntp-stable Beta number (betapoint) diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 97a16b8bd..5fd4f3a91 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 February 7, 2011 at 02:10:40 AM by AutoGen 5.11.6pre20 + * It has been AutoGen-ed February 21, 2011 at 09:18:09 AM by AutoGen 5.11.6pre7 * From the definitions sntp-opts.def * and the template file options * @@ -642,7 +642,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[5] = "SNTP"; static char const zUsageTitle[154] = -"sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p120\n\ +"sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p131\n\ USAGE: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ hostname-or-IP ...]\n"; static char const zRcName[7] = ".ntprc"; @@ -654,14 +654,14 @@ static char const * const apzHomeList[3] = { static char const zBugsAddr[34] = "http://bugs.ntp.org, bugs@ntp.org"; static char const zExplain[] = "\n\n"; static char const zDetail[351] = "\n\ -sntp implements the Simple Network Time Protocol and is used to query an\n\ -NTP or SNTP server and either display the time or set the local system's\n\ -time (given suitable privilege).\n\n\ +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\n\ -RFC 1305.\n"; +NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC\n\ +1305.\n"; static char const zFullVersion[] = SNTP_FULL_VERSION; -/* extracted from /usr/local/share/autogen/optcode.tlib near line 504 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 504 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -678,22 +678,6 @@ static char const zFullVersion[] = SNTP_FULL_VERSION; # define PKGDATADIR "" #endif -#ifndef WITH_PACKAGER -# define sntp_packager_info NULL -#else -static char const sntp_packager_info[] = - "Packaged by " WITH_PACKAGER - -# ifdef WITH_PACKAGER_VERSION - " ("WITH_PACKAGER_VERSION")" -# endif - -# ifdef WITH_PACKAGER_BUG_REPORTS - "\nReport sntp bugs to " WITH_PACKAGER_BUG_REPORTS -# endif - "\n"; -#endif - tOptions sntpOptions = { OPTIONS_STRUCT_VERSION, 0, NULL, /* original argc + argv */ @@ -712,7 +696,7 @@ tOptions sntpOptions = { zExplain, zDetail, optDesc, zBugsAddr, /* address to send bugs to */ NULL, NULL, /* extensions/saved state */ - optionUsage, /* usage procedure */ + optionUsage, /* usage procedure */ translate_option_strings, /* translation procedure */ /* * Indexes to special options @@ -725,7 +709,7 @@ tOptions sntpOptions = { 24 /* full option count */, 19 /* user option count */, sntp_full_usage, sntp_short_usage, NULL, NULL, - PKGDATADIR, sntp_packager_info + PKGDATADIR }; /* @@ -907,7 +891,7 @@ doOptNtpversion(tOptions* pOptions, tOptDesc* pOptDesc) } pOptDesc->optArg.argInt = val; } -/* extracted from /usr/local/share/autogen/optmain.tlib near line 107 */ +/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ #if defined(TEST_SNTP_OPTS) /* TEST MAIN PROCEDURE: */ @@ -925,7 +909,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_SNTP_OPTS */ -/* extracted from /usr/local/share/autogen/optcode.tlib near line 657 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 641 */ #if ENABLE_NLS #include @@ -969,6 +953,7 @@ translate_option_strings(void) * been changed by the first pass through this code. One shot only. */ if (option_usage_text.field_ct != 0) { + /* * Do the translations. The first pointer follows the field count * field. The field count field is the size of a pointer. @@ -988,7 +973,6 @@ translate_option_strings(void) COERSION(pzUsageTitle); COERSION(pzExplain); COERSION(pzDetail); - COERSION(pzPackager); option_usage_text.field_ct = 0; for (ix = sntpOptions.optCt; ix > 0; ix--, pOD++) diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index abdc7005e..6c29620d4 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 February 7, 2011 at 02:10:40 AM by AutoGen 5.11.6pre20 + * It has been AutoGen-ed February 21, 2011 at 09:18:09 AM by AutoGen 5.11.6pre7 * From the definitions sntp-opts.def * and the template file options * @@ -77,8 +77,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 24 -#define SNTP_VERSION "4.2.7p120" -#define SNTP_FULL_VERSION "sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p120" +#define SNTP_VERSION "4.2.7p131" +#define SNTP_FULL_VERSION "sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p131" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -276,7 +276,7 @@ typedef enum { sntpOptions.pzCurOpt = NULL) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*sntpOptions.pUsageProc)(&sntpOptions, c) -/* extracted from /usr/local/share/autogen/opthead.tlib near line 435 */ +/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */ /* * * * * * * diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 30fe1ef4d..1e88ffbd3 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 February 7, 2011 at 02:10:44 AM by AutoGen 5.11.6pre20 +# It has been AutoGen-ed February 21, 2011 at 09:18:24 AM by AutoGen 5.11.6pre7 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore @@ -76,8 +76,7 @@ This is the automatically generated usage text for sntp: @exampleindent 0 @example - 7 Feb 02:10:44 sntp[16648]: sntp 4.2.7p120@@1.2505-o Mon Feb 7 07:10:42 UTC 2011 (16) -sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p120 +sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p131 USAGE: sntp [ - [] | --[@{=| @}] ]... \ [ hostname-or-IP ...] Flg Arg Option-Name Description @@ -130,14 +129,14 @@ The following option preset mechanisms are supported: - reading file ./.ntprc - examining environment variables named SNTP_* -sntp implements the Simple Network Time Protocol and is used to query an -NTP or SNTP server and either display the time or set the local system's -time (given suitable privilege). +sntp implements the Simple Network Time Protocol and is used to query +an NTP or SNTP server and either display the time or set the local +system's time (given suitable privilege). It can be run interactively from the command line or as a cron job. -NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and -RFC 1305. +NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC +1305. please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example diff --git a/sntp/sntp.1 b/sntp/sntp.1 index 5772d84fa..3922aaf90 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2011-02-07 "( 4.2.7p120)" "Programmer's Manual" +.TH SNTP 1 2011-02-21 "( 4.2.7p131)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed February 7, 2011 at 02:10:44 AM by AutoGen 5.11.6pre20 +.\" It has been AutoGen-ed February 21, 2011 at 09:18:23 AM by AutoGen 5.11.6pre7 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/sntp/sntp.html b/sntp/sntp.html index 93b720d4b..d895f8aa4 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -3,7 +3,7 @@ Sntp User's Manual - + @@ -14,20 +14,18 @@ pre.smallformat { font-family:inherit; font-size:smaller } pre.smallexample { font-size:smaller } pre.smalllisp { font-size:smaller } - span.sc { font-variant:small-caps } - span.roman { font-family:serif; font-weight:normal; } - span.sansserif { font-family:sans-serif; font-weight:normal; } + span.sc { font-variant:small-caps } + span.roman { font-family: serif; font-weight: normal; } -->

Sntp User's Manual

- -Next: , +Next: , Previous: (dir), Up: (dir) - +

Simple Network Time Protocol User Manual

@@ -38,7 +36,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. -

This document applies to version {No value for `VERSION'} of sntp. +

This document applies to version 4.2.7p116 of sntp.

The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -59,8 +57,7 @@ IETF specification.

- - +
@@ -81,8 +78,7 @@ error bound of the system clock relative to the server clock.

- - +

Invoking sntp

@@ -115,7 +111,7 @@ is believed to be correct to within seconds.

This section was generated by AutoGen, -the aginfo template and the option descriptions for the sntp program. It documents the sntp usage text and option meanings. +the aginfo template and the option descriptions for the sntp program. It documents the sntp usage text and option meanings.

This software is released under a specialized copyright license. @@ -144,10 +140,9 @@ the aginfo template and the option descriptions for the

- -Next: , +Next: , Up: sntp Invocation - +

sntp usage help (-?)

@@ -155,8 +150,7 @@ Up: sntp Invocation

This is the automatically generated usage text for sntp: -

 7 Feb 02:10:44 sntp[16648]: sntp 4.2.7p120@1.2505-o Mon Feb  7 07:10:42 UTC 2011 (16)
-sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p120
+
sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p131
 USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -209,24 +203,23 @@ The following option preset mechanisms are supported:
  - reading file ./.ntprc
  - examining environment variables named SNTP_*
 
-sntp implements the Simple Network Time Protocol and is used to query an
-NTP or SNTP server and either display the time or set the local system's
-time (given suitable privilege).
+sntp implements the Simple Network Time Protocol and is used to query
+an NTP or SNTP server and either display the time or set the local
+system's time (given suitable privilege).
 
 It can be run interactively from the command line or as a cron job.
 
-NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and
-RFC 1305.
+NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC
+1305.
 
 please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 

   

 

-
-Next: ,
+Next: ,
 Previous: sntp usage,
 Up: sntp Invocation
-
+

 

 
 
authentication option (-a)

@@ -239,11 +232,10 @@ key's identifier. See the keyfile option (-k) for more details.
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp authentication,
 Up: sntp Invocation
-
+

 

 
 
bctimeout option (-B)

@@ -255,11 +247,10 @@ of seconds specified before giving up.  Default 68 seconds.
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp bctimeout,
 Up: sntp Invocation
-
+

 

 
 
broadcast option (-b)

@@ -278,11 +269,10 @@ for NTP broadcasts.  The default maximum wait time,
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp broadcast,
 Up: sntp Invocation
-
+

 

 
 
concurrent option (-c)

@@ -307,12 +297,10 @@ so we can send concurrent queries.
 
 

 

-
-
-Next: ,
+Next: ,
 Previous: sntp concurrent,
 Up: sntp Invocation
-
+

 

 
 
debug-level option (-d)

@@ -329,11 +317,10 @@ This is the “increase output debug message level” option.
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp debug-level,
 Up: sntp Invocation
-
+

 

 
 
filelog option (-l)

@@ -345,11 +332,10 @@ logfile.
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp filelog,
 Up: sntp Invocation
-
+

 

 
 
headspace option (-h)

@@ -364,11 +350,10 @@ Default 10 milliseconds.
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp headspace,
 Up: sntp Invocation
-
+

 

 
 
ipv4 option (-4)

@@ -387,11 +372,10 @@ to the IPv4 namespace.
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp ipv4,
 Up: sntp Invocation
-
+

 

 
 
ipv6 option (-6)

@@ -410,11 +394,10 @@ to the IPv6 namespace.
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp ipv6,
 Up: sntp Invocation
-
+

 

 
 
keyfile option (-k)

@@ -437,11 +420,10 @@ M  Key in a 1-to-8 character ASCII string using the MD5 authentication scheme.
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp keyfile,
 Up: sntp Invocation
-
+

 

 
 
kod option (-K)

@@ -454,11 +436,10 @@ responses received from servers.  The default is
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp kod,
 Up: sntp Invocation
-
+

 

 
 
ntpversion option (-o)

@@ -470,12 +451,10 @@ NTP protocol version <ntpversion> .
 
 

 

-
-
-Next: ,
+Next: ,
 Previous: sntp ntpversion,
 Up: sntp Invocation
-
+

 

 
 
set-debug-level option (-D)

@@ -493,11 +472,10 @@ but each overrides the previous value(s).
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp set-debug-level,
 Up: sntp Invocation
-
+

 

 
 
slew option (-s)

@@ -507,11 +485,10 @@ This is the “ok to 'slew' the time with adjtime()” option.
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp slew,
 Up: sntp Invocation
-
+

 

 
 
step option (-S)

@@ -521,11 +498,10 @@ This is the “ok to 'step' the time with settimeofday()” option.
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp step,
 Up: sntp Invocation
-
+

 

 
 
steplimit option (-M)

@@ -536,11 +512,10 @@ If the time adjustment is less than steplimit milliseconds, slew the amount usin
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp steplimit,
 Up: sntp Invocation
-
+

 

 
 
uctimeout option (-u)

@@ -552,11 +527,10 @@ of seconds specified before giving up.  Default 5 seconds.
 
 

 

-
-Next: ,
+Next: ,
 Previous: sntp uctimeout,
 Up: sntp Invocation
-
+

 

 
 
usereservedport option (-r)

@@ -567,10 +541,9 @@ Use port 123, which is reserved for NTP, for our network communications.
 
 

 

-
-Previous: sntp usereservedport,
+Previous: sntp usereservedport,
 Up: sntp Invocation
-
+

 

 
 
wait option

@@ -588,8 +561,7 @@ This is the “wait for pending replies (if not setting the time)” opt
 

 

 
-
-
+

 

 
 
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 7212fe78c..75587c210 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  February 12, 2011 at 11:06:07 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  February 21, 2011 at 09:20:32 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -757,7 +757,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 static char const zPROGNAME[11] = "NTP_KEYGEN";
 static char const zUsageTitle[116] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p130\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p131\n\
 USAGE:  %s [ - [] | --[{=| }] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index e4fce2638..ea27b3e2c 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  February 12, 2011 at 11:06:06 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  February 21, 2011 at 09:20:32 AM by AutoGen 5.11.6pre7
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -77,8 +77,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define NTP_KEYGEN_VERSION       "4.2.7p130"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p130"
+#define NTP_KEYGEN_VERSION       "4.2.7p131"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p131"
 
 /*
  *  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 10367b7e2..2025fc348 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  February 12, 2011 at 11:06:40 AM by AutoGen 5.11.6pre7
+# It has been AutoGen-ed  February 21, 2011 at 09:20:41 AM by AutoGen 5.11.6pre7
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -51,7 +51,7 @@ This is the automatically generated usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p130
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p131
 USAGE:  ntp-keygen [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index d419a4d8e..7b1bcc4c6 100644
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2011-02-12 "(ntp 4.2.7p130)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2011-02-21 "(ntp 4.2.7p131)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  February 12, 2011 at 11:06:39 AM by AutoGen 5.11.6pre7
+.\"  It has been AutoGen-ed  February 21, 2011 at 09:20:41 AM by AutoGen 5.11.6pre7
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"