From: Harlan Stenn Date: Tue, 20 May 2008 07:51:01 +0000 (-0400) Subject: NTP_4_2_4P5_RC1 X-Git-Tag: NTP_4_2_4P5_RC1^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89179cbb2e093ad0c1c66298b256aa41956cab2e;p=thirdparty%2Fntp.git NTP_4_2_4P5_RC1 bk: 483282e5iOIHF8dJsBu7_4kLBHJa0w --- diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index ae7a996e4..a113a5714 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,8 +1,7 @@ -/* -*- buffer-read-only: t -*- vi: set ro: +/* + * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * DO NOT EDIT THIS FILE (ntpd-opts.c) - * - * It has been AutoGen-ed Monday September 10, 2007 at 08:31:16 PM EDT + * It has been AutoGen-ed Tuesday May 20, 2008 at 03:42:30 AM EDT * From the definitions ntpd-opts.def * and the template file options * @@ -20,7 +19,7 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpd copyright 1970-2007 David L. Mills and/or others - all rights reserved + * ntpd copyright 1970-2008 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -35,7 +34,7 @@ extern "C" { #endif tSCC zCopyright[] = - "ntpd copyright (c) 1970-2007 David L. Mills and/or others, all rights reserved"; + "ntpd copyright (c) 1970-2008 David L. Mills and/or others, all rights reserved"; tSCC zCopyrightNotice[] = /* extracted from ../include/copyright.def near line 8 */ @@ -836,7 +835,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.4p4\n\ +"ntpd - NTP daemon program - Ver. 4.2.4p5-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index a27443405..9098d55c7 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,8 +1,7 @@ -/* -*- buffer-read-only: t -*- vi: set ro: +/* + * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * DO NOT EDIT THIS FILE (ntpd-opts.h) - * - * It has been AutoGen-ed Monday September 10, 2007 at 08:31:15 PM EDT + * It has been AutoGen-ed Tuesday May 20, 2008 at 03:42:29 AM EDT * From the definitions ntpd-opts.def * and the template file options * @@ -20,7 +19,7 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpd copyright 1970-2007 David L. Mills and/or others - all rights reserved + * ntpd copyright 1970-2008 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -88,8 +87,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 32 -#define NTPD_VERSION "4.2.4p4" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p4" +#define NTPD_VERSION "4.2.4p5-RC1" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p5-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index ed50e13a9..ac2f8ae5b 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -3,11 +3,10 @@ @pindex ntpd @cindex NTP daemon program @ignore -# -*- buffer-read-only: t -*- vi: set ro: # -# DO NOT EDIT THIS FILE (ntpd-opts.texi) +# EDIT THIS FILE WITH CAUTION (ntpd-opts.texi) # -# It has been AutoGen-ed Monday September 10, 2007 at 08:31:19 PM EDT +# It has been AutoGen-ed Tuesday May 20, 2008 at 03:42:32 AM EDT # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -61,7 +60,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.5p71 +ntpd - NTP daemon program - Ver. 4.2.5p113 USAGE: ntpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution @@ -81,8 +80,7 @@ USAGE: ntpd [ - [] | --[@{=| @}] ]... - may appear multiple times -f Str driftfile frequency drift file name -g no panicgate Allow the first adjustment to be Big - -i Str jaildir Jail directory - -I Str interface Listen on interface + -I Str interface Listen on the specified interface or IP - may appear multiple times -k Str keyfile path to symmetric keys -l Str logfile path to the log file @@ -93,17 +91,16 @@ USAGE: ntpd [ - [] | --[@{=| @}] ]... -P Num priority Process priority -q no quit Set the time and quit -r Str propagationdelay Broadcast/propagation delay - -U Num updateinterval interval in seconds between scans for new or dropped interfaces -s Str statsdir Statistics file location -t Str trustedkey Trusted key number - may appear multiple times - -u Str user Run as userid (or userid:groupid) + -U Num updateinterval interval in seconds between scans for new or dropped interfaces Str var make ARG an ntp variable (RW) - may appear multiple times Str dvar make ARG an ntp variable (RW|DEF) - may appear multiple times -x no slew Slew up to 600 seconds - -v opt version Output version information and exit + opt version Output version information and exit -? no help Display usage information and exit -! no more-help Extended usage information passed thru pager @@ -115,7 +112,7 @@ The following option preset mechanisms are supported: -please send bug reports to: http://bugs.ntp.isc.org, bugs@@ntp.org +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 @@ -405,7 +402,7 @@ This is the ``interval in seconds between scans for new or dropped interfaces'' Give the time in seconds between two scans for new or dropped interfaces. For systems with routing socket support the scans will be performed shortly after the interface change has been detected by the system. -Use 0 to disable scanning. 60 seconds is the minimum time between scans. +Use 0 to disable scanning. @node ntpd statsdir @subsection statsdir option (-s) diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index dfb993bf9..dc7284d35 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2007-09-10 "( 4.2.4p4)" "Programmer's Manual" -.\" DO NOT EDIT THIS FILE (ntpd.1) +.TH NTPD 1 2008-05-20 "( 4.2.4p5-RC1)" "Programmer's Manual" +.\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed Monday September 10, 2007 at 08:31:18 PM EDT +.\" It has been AutoGen-ed Tuesday May 20, 2008 at 03:42:31 AM EDT .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" @@ -207,7 +207,7 @@ This option takes an integer number as its argument. Give the time in seconds between two scans for new or dropped interfaces. For systems with routing socket support the scans will be performed shortly after the interface change has been detected by the system. -Use 0 to disable scanning. 60 seconds is the minimum time between scans. +Use 0 to disable scanning. .TP .BR \-s " \fIstring\fP, " \--statsdir "=" \fIstring\fP Statistics file location. diff --git a/ntpd/ntpdsim-opts.c b/ntpd/ntpdsim-opts.c index 886c28cbe..55b6938d3 100644 --- a/ntpd/ntpdsim-opts.c +++ b/ntpd/ntpdsim-opts.c @@ -1,8 +1,7 @@ -/* -*- buffer-read-only: t -*- vi: set ro: +/* + * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.c) * - * DO NOT EDIT THIS FILE (ntpdsim-opts.c) - * - * It has been AutoGen-ed Monday September 10, 2007 at 08:31:21 PM EDT + * It has been AutoGen-ed Tuesday May 20, 2008 at 03:42:34 AM EDT * From the definitions ntpdsim-opts.def * and the template file options * @@ -20,7 +19,7 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpdsim copyright 1970-2007 David L. Mills and/or others - all rights reserved + * ntpdsim copyright 1970-2008 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -35,7 +34,7 @@ extern "C" { #endif tSCC zCopyright[] = - "ntpdsim copyright (c) 1970-2007 David L. Mills and/or others, all rights reserved"; + "ntpdsim copyright (c) 1970-2008 David L. Mills and/or others, all rights reserved"; tSCC zCopyrightNotice[] = /* extracted from ../include/copyright.def near line 8 */ @@ -1073,7 +1072,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDSIM"; tSCC zUsageTitle[] = -"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p4\n\ +"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p5-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index 0fd4c193e..2461f415e 100644 --- a/ntpd/ntpdsim-opts.h +++ b/ntpd/ntpdsim-opts.h @@ -1,8 +1,7 @@ -/* -*- buffer-read-only: t -*- vi: set ro: +/* + * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.h) * - * DO NOT EDIT THIS FILE (ntpdsim-opts.h) - * - * It has been AutoGen-ed Monday September 10, 2007 at 08:31:20 PM EDT + * It has been AutoGen-ed Tuesday May 20, 2008 at 03:42:33 AM EDT * From the definitions ntpdsim-opts.def * and the template file options * @@ -20,7 +19,7 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpdsim copyright 1970-2007 David L. Mills and/or others - all rights reserved + * ntpdsim copyright 1970-2008 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -99,8 +98,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 43 -#define NTPDSIM_VERSION "4.2.4p4" -#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p4" +#define NTPDSIM_VERSION "4.2.4p5-RC1" +#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p5-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi index 194db0292..9cde96dd1 100644 --- a/ntpd/ntpdsim-opts.texi +++ b/ntpd/ntpdsim-opts.texi @@ -3,11 +3,10 @@ @pindex ntpdsim @cindex NTP daemon simulation program @ignore -# -*- buffer-read-only: t -*- vi: set ro: # -# DO NOT EDIT THIS FILE (ntpdsim-opts.texi) +# EDIT THIS FILE WITH CAUTION (ntpdsim-opts.texi) # -# It has been AutoGen-ed Monday September 10, 2007 at 08:31:24 PM EDT +# It has been AutoGen-ed Tuesday May 20, 2008 at 03:42:37 AM EDT # From the definitions ntpdsim-opts.def # and the template file aginfo.tpl @end ignore @@ -388,7 +387,7 @@ This is the ``interval in seconds between scans for new or dropped interfaces'' Give the time in seconds between two scans for new or dropped interfaces. For systems with routing socket support the scans will be performed shortly after the interface change has been detected by the system. -Use 0 to disable scanning. 60 seconds is the minimum time between scans. +Use 0 to disable scanning. @node ntpdsim statsdir @subsection statsdir option (-s) diff --git a/ntpd/ntpdsim.1 b/ntpd/ntpdsim.1 index 4155f9a78..4836e54f3 100644 --- a/ntpd/ntpdsim.1 +++ b/ntpd/ntpdsim.1 @@ -1,7 +1,7 @@ -.TH NTPDSIM 1 2007-09-10 "( 4.2.4p4)" "Programmer's Manual" -.\" DO NOT EDIT THIS FILE (ntpdsim.1) +.TH NTPDSIM 1 2008-05-20 "( 4.2.4p5-RC1)" "Programmer's Manual" +.\" EDIT THIS FILE WITH CAUTION (ntpdsim.1) .\" -.\" It has been AutoGen-ed Monday September 10, 2007 at 08:31:23 PM EDT +.\" It has been AutoGen-ed Tuesday May 20, 2008 at 03:42:35 AM EDT .\" From the definitions ntpdsim-opts.def .\" and the template file agman1.tpl .\" @@ -227,7 +227,7 @@ This option takes an integer number as its argument. Give the time in seconds between two scans for new or dropped interfaces. For systems with routing socket support the scans will be performed shortly after the interface change has been detected by the system. -Use 0 to disable scanning. 60 seconds is the minimum time between scans. +Use 0 to disable scanning. .TP .BR \-s " \fIstring\fP, " \--statsdir "=" \fIstring\fP Statistics file location. diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index 79c93196a..3935f06dd 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,8 +1,7 @@ -/* -*- buffer-read-only: t -*- vi: set ro: +/* + * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * DO NOT EDIT THIS FILE (ntpdc-opts.c) - * - * It has been AutoGen-ed Monday September 10, 2007 at 08:37:50 PM EDT + * It has been AutoGen-ed Tuesday May 20, 2008 at 03:48:57 AM EDT * From the definitions ntpdc-opts.def * and the template file options * @@ -20,7 +19,7 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpdc copyright 1970-2007 David L. Mills and/or others - all rights reserved + * ntpdc copyright 1970-2008 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -35,7 +34,7 @@ extern "C" { #endif tSCC zCopyright[] = - "ntpdc copyright (c) 1970-2007 David L. Mills and/or others, all rights reserved"; + "ntpdc copyright (c) 1970-2008 David L. Mills and/or others, all rights reserved"; tSCC zCopyrightNotice[] = /* extracted from ../include/copyright.def near line 8 */ @@ -463,7 +462,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p4\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p5-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 6ac638ff4..3162c9bdb 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,8 +1,7 @@ -/* -*- buffer-read-only: t -*- vi: set ro: +/* + * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * DO NOT EDIT THIS FILE (ntpdc-opts.h) - * - * It has been AutoGen-ed Monday September 10, 2007 at 08:37:49 PM EDT + * It has been AutoGen-ed Tuesday May 20, 2008 at 03:48:56 AM EDT * From the definitions ntpdc-opts.def * and the template file options * @@ -20,7 +19,7 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpdc copyright 1970-2007 David L. Mills and/or others - all rights reserved + * ntpdc copyright 1970-2008 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -71,8 +70,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.4p4" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p4" +#define NTPDC_VERSION "4.2.4p5-RC1" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p5-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 270ce3515..1851b71fe 100644 --- a/ntpdc/ntpdc-opts.texi +++ b/ntpdc/ntpdc-opts.texi @@ -3,11 +3,10 @@ @pindex ntpdc @cindex vendor-specific NTP query program @ignore -# -*- buffer-read-only: t -*- vi: set ro: # -# DO NOT EDIT THIS FILE (ntpdc-opts.texi) +# EDIT THIS FILE WITH CAUTION (ntpdc-opts.texi) # -# It has been AutoGen-ed Monday September 10, 2007 at 08:37:51 PM EDT +# It has been AutoGen-ed Tuesday May 20, 2008 at 03:48:58 AM EDT # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -59,7 +58,7 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc - vendor-specific NTP query program - Ver. 4.2.5p71 +ntpdc - vendor-specific NTP query program - Ver. 4.2.5p113 USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution @@ -87,7 +86,7 @@ USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] -D Str set-debug-level Set the output debug message level - may appear multiple times -n no numeric numeric host addresses - -v opt version Output version information and exit + opt version Output version information and exit -? no help Display usage information and exit -! no more-help Extended usage information passed thru pager -> opt save-opts Save the option state to a config file @@ -120,7 +119,7 @@ configuration options which can be specified at startup using ntpd's configuration file may also be specified at run time using [= prog-name =] . -please send bug reports to: http://bugs.ntp.isc.org, bugs@@ntp.org +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index 21e850158..98f62eb05 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2007-09-10 "( 4.2.4p4)" "Programmer's Manual" -.\" DO NOT EDIT THIS FILE (ntpdc.1) +.TH NTPDC 1 2008-05-20 "( 4.2.4p5-RC1)" "Programmer's Manual" +.\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed Monday September 10, 2007 at 08:37:51 PM EDT +.\" It has been AutoGen-ed Tuesday May 20, 2008 at 03:48:58 AM EDT .\" 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 a62536056..f46c08250 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -1,8 +1,7 @@ -/* -*- buffer-read-only: t -*- vi: set ro: +/* + * EDIT THIS FILE WITH CAUTION (ntpq-opts.c) * - * DO NOT EDIT THIS FILE (ntpq-opts.c) - * - * It has been AutoGen-ed Monday September 10, 2007 at 08:38:18 PM EDT + * It has been AutoGen-ed Tuesday May 20, 2008 at 03:49:27 AM EDT * From the definitions ntpq-opts.def * and the template file options * @@ -20,7 +19,7 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpq copyright 1970-2007 David L. Mills and/or others - all rights reserved + * ntpq copyright 1970-2008 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -35,7 +34,7 @@ extern "C" { #endif tSCC zCopyright[] = - "ntpq copyright (c) 1970-2007 David L. Mills and/or others, all rights reserved"; + "ntpq copyright (c) 1970-2008 David L. Mills and/or others, all rights reserved"; tSCC zCopyrightNotice[] = /* extracted from ../include/copyright.def near line 8 */ @@ -411,7 +410,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.4p4\n\ +"ntpq - standard NTP query program - Ver. 4.2.4p5-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 50dd9d64c..e18afcfb9 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -1,8 +1,7 @@ -/* -*- buffer-read-only: t -*- vi: set ro: +/* + * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) * - * DO NOT EDIT THIS FILE (ntpq-opts.h) - * - * It has been AutoGen-ed Monday September 10, 2007 at 08:38:18 PM EDT + * It has been AutoGen-ed Tuesday May 20, 2008 at 03:49:26 AM EDT * From the definitions ntpq-opts.def * and the template file options * @@ -20,7 +19,7 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpq copyright 1970-2007 David L. Mills and/or others - all rights reserved + * ntpq copyright 1970-2008 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -69,8 +68,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define NTPQ_VERSION "4.2.4p4" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p4" +#define NTPQ_VERSION "4.2.4p5-RC1" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p5-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 0de74ce0e..69a639881 100644 --- a/ntpq/ntpq-opts.texi +++ b/ntpq/ntpq-opts.texi @@ -3,11 +3,10 @@ @pindex ntpq @cindex standard NTP query program @ignore -# -*- buffer-read-only: t -*- vi: set ro: # -# DO NOT EDIT THIS FILE (ntpq-opts.texi) +# EDIT THIS FILE WITH CAUTION (ntpq-opts.texi) # -# It has been AutoGen-ed Monday September 10, 2007 at 08:38:20 PM EDT +# It has been AutoGen-ed Tuesday May 20, 2008 at 03:49:30 AM EDT # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -47,7 +46,7 @@ This is the automatically generated usage text for ntpq: @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.5p71 +ntpq - standard NTP query program - Ver. 4.2.5p113 USAGE: ntpq [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution @@ -67,7 +66,7 @@ USAGE: ntpq [ - [] | --[@{=| @}] ]... [ host ...] command peers -n no numeric numeric host addresses - -v opt version Output version information and exit + opt version Output version information and exit -? no help Display usage information and exit -! no more-help Extended usage information passed thru pager -> opt save-opts Save the option state to a config file @@ -92,7 +91,7 @@ information about current state and/or changes in that state. The same formats are used in NTPv4, although some of the variables have changed and new ones added. -please send bug reports to: http://bugs.ntp.isc.org, bugs@@ntp.org +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index 62149a96b..c20b5d3b5 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2007-09-10 "( 4.2.4p4)" "Programmer's Manual" -.\" DO NOT EDIT THIS FILE (ntpq.1) +.TH NTPQ 1 2008-05-20 "( 4.2.4p5-RC1)" "Programmer's Manual" +.\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed Monday September 10, 2007 at 08:38:19 PM EDT +.\" It has been AutoGen-ed Tuesday May 20, 2008 at 03:49:28 AM EDT .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index e87db638f..0344193fc 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=4 +point=5 # Special. Normally unused. A suffix. #special=ag special= @@ -27,5 +27,5 @@ CLTAG=NTP_4_2_0 # - - rcpoint gets set to 0 # - - releasecandidate gets set to no # - GRONK is for -dev -rcpoint= +rcpoint=1 #rcpoint=GRONK diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index c7a1973b7..814712df0 100644 --- a/sntp/sntp-opts.c +++ b/sntp/sntp-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (sntp-opts.c) * - * It has been AutoGen-ed Monday September 10, 2007 at 08:38:47 PM EDT + * It has been AutoGen-ed Tuesday May 20, 2008 at 03:49:55 AM EDT * From the definitions sntp-opts.def * and the template file options * @@ -514,7 +514,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.4p4\n\ +"sntp - standard SNTP program - Ver. 4.2.4p5-RC1\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 53a92e076..ce22c0ebd 100644 --- a/sntp/sntp-opts.h +++ b/sntp/sntp-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (sntp-opts.h) * - * It has been AutoGen-ed Monday September 10, 2007 at 08:38:47 PM EDT + * It has been AutoGen-ed Tuesday May 20, 2008 at 03:49:54 AM EDT * From the definitions sntp-opts.def * and the template file options * @@ -148,8 +148,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define SNTP_VERSION "4.2.4p4" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.4p4" +#define SNTP_VERSION "4.2.4p5-RC1" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.4p5-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 1b512b34b..5fe64234d 100644 --- a/sntp/sntp-opts.texi +++ b/sntp/sntp-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (sntp-opts.texi) # -# It has been AutoGen-ed Monday September 10, 2007 at 08:38:50 PM EDT +# It has been AutoGen-ed Tuesday May 20, 2008 at 03:49:58 AM EDT # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index f076fe978..dcae0005c 100644 --- a/util/ntp-keygen-opts.c +++ b/util/ntp-keygen-opts.c @@ -1,8 +1,7 @@ -/* -*- buffer-read-only: t -*- vi: set ro: +/* + * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.c) * - * DO NOT EDIT THIS FILE (ntp-keygen-opts.c) - * - * It has been AutoGen-ed Monday September 10, 2007 at 08:39:20 PM EDT + * It has been AutoGen-ed Tuesday May 20, 2008 at 03:50:05 AM EDT * From the definitions ntp-keygen-opts.def * and the template file options * @@ -20,7 +19,7 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntp-keygen copyright 1970-2007 David L. Mills and/or others - all rights reserved + * ntp-keygen copyright 1970-2008 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -35,7 +34,7 @@ extern "C" { #endif tSCC zCopyright[] = - "ntp-keygen copyright (c) 1970-2007 David L. Mills and/or others, all rights reserved"; + "ntp-keygen copyright (c) 1970-2008 David L. Mills and/or others, all rights reserved"; tSCC zCopyrightNotice[] = /* extracted from ../include/copyright.def near line 8 */ @@ -800,7 +799,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTP_KEYGEN"; tSCC zUsageTitle[] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p4\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p5-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 6105cfdb2..8e8c4f41e 100644 --- a/util/ntp-keygen-opts.h +++ b/util/ntp-keygen-opts.h @@ -1,8 +1,7 @@ -/* -*- buffer-read-only: t -*- vi: set ro: +/* + * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.h) * - * DO NOT EDIT THIS FILE (ntp-keygen-opts.h) - * - * It has been AutoGen-ed Monday September 10, 2007 at 08:39:19 PM EDT + * It has been AutoGen-ed Tuesday May 20, 2008 at 03:50:04 AM EDT * From the definitions ntp-keygen-opts.def * and the template file options * @@ -20,7 +19,7 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntp-keygen copyright 1970-2007 David L. Mills and/or others - all rights reserved + * ntp-keygen copyright 1970-2008 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -80,8 +79,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 24 -#define NTP_KEYGEN_VERSION "4.2.4p4" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p4" +#define NTP_KEYGEN_VERSION "4.2.4p5-RC1" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p5-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index 1807e458b..aa1fe7f71 100644 --- a/util/ntp-keygen-opts.texi +++ b/util/ntp-keygen-opts.texi @@ -3,11 +3,10 @@ @pindex ntp-keygen @cindex Create a NTP host key @ignore -# -*- buffer-read-only: t -*- vi: set ro: # -# DO NOT EDIT THIS FILE (ntp-keygen-opts.texi) +# EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.texi) # -# It has been AutoGen-ed Monday September 10, 2007 at 08:39:22 PM EDT +# It has been AutoGen-ed Tuesday May 20, 2008 at 03:50:07 AM EDT # From the definitions ntp-keygen-opts.def # and the template file aginfo.tpl @end ignore @@ -53,7 +52,7 @@ This is the automatically generated usage text for ntp-keygen: @exampleindent 0 @example Using OpenSSL version 90704f -ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p71 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p113 USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -c Str certificate certificate scheme @@ -61,12 +60,11 @@ USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... - may appear multiple times -D Str set-debug-level Set the output debug message level - may appear multiple times - -e no id-key Write identity keys + -e no id-key Write IFF or GQ identity keys -G no gq-params Generate GQ parameters and keys - -g no gq-keys update GQ keys -H no host-key generate RSA host key -I no iffkey generate IFF parameters - -i no issuer-name set issuer name + -i Str issuer-name set issuer name -M no md5key generate MD5 keys -m Num modulus modulus it must lie in the range: 256 to 2048 @@ -78,7 +76,7 @@ USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... -T no trusted-cert trusted certificate (TC scheme) -V Num mv-params generate MV parameters -v Num mv-keys update MV keys - -v opt version Output version information and exit + opt version Output version information and exit -? no help Display usage information and exit -! no more-help Extended usage information passed thru pager -> opt save-opts Save the option state to a config file @@ -97,7 +95,7 @@ The following option preset mechanisms are supported: If there is no new host key, look for an existing one. If one is not found, create it. -please send bug reports to: http://bugs.ntp.isc.org, bugs@@ntp.org +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1 index 8587ab379..f0d645cbc 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2007-09-10 "(ntp 4.2.4p4)" "Programmer's Manual" -.\" DO NOT EDIT THIS FILE (ntp-keygen.1) +.TH NTP-KEYGEN 1 2008-05-20 "(ntp 4.2.4p5-RC1)" "Programmer's Manual" +.\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed Monday September 10, 2007 at 08:39:21 PM EDT +.\" It has been AutoGen-ed Tuesday May 20, 2008 at 03:50:07 AM EDT .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"