From: Harlan Stenn Date: Tue, 23 Oct 2007 11:44:01 +0000 (-0400) Subject: NTP_4_2_5P88 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be605437ed81250c5700c62da0f8723b8a3beb8f;p=thirdparty%2Fntp.git NTP_4_2_5P88 bk: 471dde81Dy0J-06Hcpvg4DISxX16aA --- diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 1eec64d4d9..a1e8ae5181 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 Sunday October 21, 2007 at 07:38:58 AM EDT + * It has been AutoGen-ed Tuesday October 23, 2007 at 07:35:15 AM EDT * From the definitions ntpd-opts.def * and the template file options * @@ -853,7 +853,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.5p87\n\ +"ntpd - NTP daemon program - Ver. 4.2.5p88\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 6dfdfd7d56..674ddbd299 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 Sunday October 21, 2007 at 07:38:57 AM EDT + * It has been AutoGen-ed Tuesday October 23, 2007 at 07:35:14 AM EDT * From the definitions ntpd-opts.def * and the template file options * @@ -87,8 +87,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 32 -#define NTPD_VERSION "4.2.5p87" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p87" +#define NTPD_VERSION "4.2.5p88" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p88" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -310,7 +310,7 @@ typedef enum { #define VALUE_OPT_DVAR 27 #define VALUE_OPT_SLEW 'x' -#define VALUE_OPT_VERSION 'v' +#define VALUE_OPT_VERSION INDEX_OPT_VERSION #define VALUE_OPT_HELP '?' #define VALUE_OPT_MORE_HELP '!' /* diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 53574e683d..b75679969c 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 Sunday October 21, 2007 at 07:39:01 AM EDT +# It has been AutoGen-ed Tuesday October 23, 2007 at 07:35:18 AM EDT # 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 7329fea4bd..491ba5d8b5 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2007-10-21 "( 4.2.5p87)" "Programmer's Manual" +.TH NTPD 1 2007-10-23 "( 4.2.5p88)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed Sunday October 21, 2007 at 07:38:59 AM EDT +.\" It has been AutoGen-ed Tuesday October 23, 2007 at 07:35:16 AM EDT .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" @@ -269,7 +269,7 @@ Display usage information and exit. .BR \-! , " \--more-help" Extended usage information passed thru pager. .TP -.BR \-v " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]" +.BR \- " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]" Output version of program and exit. The default mode is `v', a simple version. The `c' mode will print copyright information and `n' will print the full copyright notice. diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index aced8a8cbb..c3a6121ead 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 Sunday October 21, 2007 at 07:45:45 AM EDT + * It has been AutoGen-ed Tuesday October 23, 2007 at 07:42:03 AM EDT * From the definitions ntpdc-opts.def * and the template file options * @@ -462,7 +462,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p87\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p88\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 57222cd559..d05facf21e 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 Sunday October 21, 2007 at 07:45:44 AM EDT + * It has been AutoGen-ed Tuesday October 23, 2007 at 07:42:03 AM EDT * From the definitions ntpdc-opts.def * and the template file options * @@ -70,8 +70,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.5p87" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p87" +#define NTPDC_VERSION "4.2.5p88" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p88" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -171,7 +171,7 @@ typedef enum { #endif /* DEBUG */ #define VALUE_OPT_NUMERIC 'n' -#define VALUE_OPT_VERSION 'v' +#define VALUE_OPT_VERSION INDEX_OPT_VERSION #define VALUE_OPT_HELP '?' #define VALUE_OPT_MORE_HELP '!' #define VALUE_OPT_SAVE_OPTS '>' diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index c374327875..e004fcc54e 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 Sunday October 21, 2007 at 07:45:47 AM EDT +# It has been AutoGen-ed Tuesday October 23, 2007 at 07:42:05 AM EDT # 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 e77a6b186b..b4c9b0fafa 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2007-10-21 "( 4.2.5p87)" "Programmer's Manual" +.TH NTPDC 1 2007-10-23 "( 4.2.5p88)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed Sunday October 21, 2007 at 07:45:46 AM EDT +.\" It has been AutoGen-ed Tuesday October 23, 2007 at 07:42:05 AM EDT .\" From the definitions ntpdc-opts.def .\" and the template file agman1.tpl .\" @@ -125,7 +125,7 @@ The \fIno-load-opts\fP form will disable the loading of earlier RC/INI files. \fI--no-load-opts\fP is handled early, out of order. .TP -.BR \-v " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]" +.BR \- " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]" Output version of program and exit. The default mode is `v', a simple version. The `c' mode will print copyright information and `n' will print the full copyright notice. diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c index 8f2bac2b51..8d27171468 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 Sunday October 21, 2007 at 07:46:16 AM EDT + * It has been AutoGen-ed Tuesday October 23, 2007 at 07:42:33 AM EDT * From the definitions ntpq-opts.def * and the template file options * @@ -410,7 +410,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.5p87\n\ +"ntpq - standard NTP query program - Ver. 4.2.5p88\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 111ce42327..dfc1acdb35 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 Sunday October 21, 2007 at 07:46:15 AM EDT + * It has been AutoGen-ed Tuesday October 23, 2007 at 07:42:33 AM EDT * From the definitions ntpq-opts.def * and the template file options * @@ -68,8 +68,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define NTPQ_VERSION "4.2.5p87" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p87" +#define NTPQ_VERSION "4.2.5p88" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p88" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -157,7 +157,7 @@ typedef enum { #define VALUE_OPT_INTERACTIVE 'i' #define VALUE_OPT_NUMERIC 'n' -#define VALUE_OPT_VERSION 'v' +#define VALUE_OPT_VERSION INDEX_OPT_VERSION #define VALUE_OPT_HELP '?' #define VALUE_OPT_MORE_HELP '!' #define VALUE_OPT_SAVE_OPTS '>' diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 468f4669ac..d596b011e8 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 Sunday October 21, 2007 at 07:46:18 AM EDT +# It has been AutoGen-ed Tuesday October 23, 2007 at 07:42:36 AM EDT # 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 0fda9ced70..93192017dc 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2007-10-21 "( 4.2.5p87)" "Programmer's Manual" +.TH NTPQ 1 2007-10-23 "( 4.2.5p88)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed Sunday October 21, 2007 at 07:46:17 AM EDT +.\" It has been AutoGen-ed Tuesday October 23, 2007 at 07:42:34 AM EDT .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" @@ -352,7 +352,7 @@ The \fIno-load-opts\fP form will disable the loading of earlier RC/INI files. \fI--no-load-opts\fP is handled early, out of order. .TP -.BR \-v " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]" +.BR \- " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]" Output version of program and exit. The default mode is `v', a simple version. The `c' mode will print copyright information and `n' will print the full copyright notice. diff --git a/packageinfo.sh b/packageinfo.sh index d763ac7535..46a321b277 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -9,7 +9,7 @@ version=${proto}.${major}.${minor} # - Numeric values increment # - empty 'increments' to 1 # - NEW 'increments' to empty -point=87 +point=88 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 2cf6761e24..968d3bf547 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 Sunday October 21, 2007 at 07:46:45 AM EDT + * It has been AutoGen-ed Tuesday October 23, 2007 at 07:43:02 AM EDT * From the definitions sntp-opts.def * and the template file options * @@ -513,7 +513,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.5p87\n\ +"sntp - standard SNTP program - Ver. 4.2.5p88\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index a1aee95c0e..35a43a252f 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 Sunday October 21, 2007 at 07:46:44 AM EDT + * It has been AutoGen-ed Tuesday October 23, 2007 at 07:43:01 AM EDT * From the definitions sntp-opts.def * and the template file options * @@ -147,8 +147,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define SNTP_VERSION "4.2.5p87" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p87" +#define SNTP_VERSION "4.2.5p88" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p88" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 71c95bba3a..266e9d79bd 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 Sunday October 21, 2007 at 07:46:47 AM EDT +# It has been AutoGen-ed Tuesday October 23, 2007 at 07:43:04 AM EDT # 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 7b6f6e9732..52eb3fde6b 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2007-10-21 "( 4.2.5p87)" "Programmer's Manual" +.TH SNTP 1 2007-10-23 "( 4.2.5p88)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed Sunday October 21, 2007 at 07:46:46 AM EDT +.\" It has been AutoGen-ed Tuesday October 23, 2007 at 07:43:03 AM EDT .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index 1d5b118628..2d84b3f660 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 Sunday October 21, 2007 at 07:46:55 AM EDT + * It has been AutoGen-ed Tuesday October 23, 2007 at 07:43:11 AM EDT * From the definitions ntp-keygen-opts.def * and the template file options * @@ -800,7 +800,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTP_KEYGEN"; tSCC zUsageTitle[] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p87\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p88\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index d8b5124d47..74d6d1ce26 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 Sunday October 21, 2007 at 07:46:54 AM EDT + * It has been AutoGen-ed Tuesday October 23, 2007 at 07:43:11 AM EDT * From the definitions ntp-keygen-opts.def * and the template file options * @@ -79,8 +79,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 24 -#define NTP_KEYGEN_VERSION "4.2.5p87" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p87" +#define NTP_KEYGEN_VERSION "4.2.5p88" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p88" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -267,7 +267,7 @@ typedef enum { #define OPT_VALUE_MV_KEYS (DESC(MV_KEYS).optArg.argInt) #endif /* OPENSSL */ -#define VALUE_OPT_VERSION 'v' +#define VALUE_OPT_VERSION INDEX_OPT_VERSION #define VALUE_OPT_HELP '?' #define VALUE_OPT_MORE_HELP '!' #define VALUE_OPT_SAVE_OPTS '>' diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index f891620556..afd5fdc2be 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 Sunday October 21, 2007 at 07:46:57 AM EDT +# It has been AutoGen-ed Tuesday October 23, 2007 at 07:43:14 AM EDT # 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 578751fdfc..9edcd76368 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2007-10-21 "(ntp 4.2.5p87)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2007-10-23 "(ntp 4.2.5p88)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed Sunday October 21, 2007 at 07:46:56 AM EDT +.\" It has been AutoGen-ed Tuesday October 23, 2007 at 07:43:13 AM EDT .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\" @@ -163,7 +163,7 @@ The \fIno-load-opts\fP form will disable the loading of earlier RC/INI files. \fI--no-load-opts\fP is handled early, out of order. .TP -.BR \-v " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]" +.BR \- " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]" Output version of program and exit. The default mode is `v', a simple version. The `c' mode will print copyright information and `n' will print the full copyright notice.