From: Harlan Stenn Date: Wed, 20 Jun 2007 11:45:57 +0000 (-0400) Subject: NTP_4_2_4P2 X-Git-Tag: NTP_4_2_4P2^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6182deab583ceb64703f0740c53a635f48180e0d;p=thirdparty%2Fntp.git NTP_4_2_4P2 bk: 467913754Y2I0WaaBcyuTeDuMEyoPw --- diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index d3289892b..e34d9c2cc 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpd-opts.c) * - * It has been AutoGen-ed Sunday June 10, 2007 at 07:50:21 AM EDT + * It has been AutoGen-ed Wednesday June 20, 2007 at 07:37:23 AM EDT * From the definitions ntpd-opts.def * and the template file options * @@ -836,7 +836,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.4p2-RC6\n\ +"ntpd - NTP daemon program - Ver. 4.2.4p2\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 7110e293d..45a6f0393 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpd-opts.h) * - * It has been AutoGen-ed Sunday June 10, 2007 at 07:50:21 AM EDT + * It has been AutoGen-ed Wednesday June 20, 2007 at 07:37:22 AM EDT * From the definitions ntpd-opts.def * and the template file options * @@ -88,8 +88,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 32 -#define NTPD_VERSION "4.2.4p2-RC6" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p2-RC6" +#define NTPD_VERSION "4.2.4p2" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p2" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 7a6a291e7..c4c9cd29c 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpd-opts.texi) # -# It has been AutoGen-ed Sunday June 10, 2007 at 07:50:24 AM EDT +# It has been AutoGen-ed Wednesday June 20, 2007 at 07:37:26 AM EDT # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -61,7 +61,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.5p29 +ntpd - NTP daemon program - Ver. 4.2.5p52 USAGE: ntpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution @@ -98,9 +98,9 @@ USAGE: ntpd [ - [] | --[@{=| @}] ]... -t Str trustedkey Trusted key number - may appear multiple times -u Str user Run as userid (or userid:groupid) - -v Str var make ARG an ntp variable (RW) + Str var make ARG an ntp variable (RW) - may appear multiple times - -V Str dvar make ARG an ntp variable (RW|DEF) + 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 diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index b4a3845fd..d35233a8d 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2007-06-10 "( 4.2.4p2-RC6)" "Programmer's Manual" +.TH NTPD 1 2007-06-20 "( 4.2.4p2)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpd.1) .\" -.\" It has been AutoGen-ed Sunday June 10, 2007 at 07:50:23 AM EDT +.\" It has been AutoGen-ed Wednesday June 20, 2007 at 07:37:24 AM EDT .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpd/ntpdsim-opts.c b/ntpd/ntpdsim-opts.c index 3276efdaf..d9a70c501 100644 --- a/ntpd/ntpdsim-opts.c +++ b/ntpd/ntpdsim-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpdsim-opts.c) * - * It has been AutoGen-ed Sunday June 10, 2007 at 07:50:26 AM EDT + * It has been AutoGen-ed Wednesday June 20, 2007 at 07:37:28 AM EDT * From the definitions ntpdsim-opts.def * and the template file options * @@ -1073,7 +1073,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDSIM"; tSCC zUsageTitle[] = -"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p2-RC6\n\ +"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p2\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index f7603b080..e067e09c5 100644 --- a/ntpd/ntpdsim-opts.h +++ b/ntpd/ntpdsim-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpdsim-opts.h) * - * It has been AutoGen-ed Sunday June 10, 2007 at 07:50:25 AM EDT + * It has been AutoGen-ed Wednesday June 20, 2007 at 07:37:27 AM EDT * From the definitions ntpdsim-opts.def * and the template file options * @@ -99,8 +99,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 43 -#define NTPDSIM_VERSION "4.2.4p2-RC6" -#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p2-RC6" +#define NTPDSIM_VERSION "4.2.4p2" +#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p2" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi index ea6c0d7af..b4aa02532 100644 --- a/ntpd/ntpdsim-opts.texi +++ b/ntpd/ntpdsim-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpdsim-opts.texi) # -# It has been AutoGen-ed Sunday June 10, 2007 at 07:50:29 AM EDT +# It has been AutoGen-ed Wednesday June 20, 2007 at 07:37:30 AM EDT # From the definitions ntpdsim-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpd/ntpdsim.1 b/ntpd/ntpdsim.1 index d4cf3aeea..05393b260 100644 --- a/ntpd/ntpdsim.1 +++ b/ntpd/ntpdsim.1 @@ -1,7 +1,7 @@ -.TH NTPDSIM 1 2007-06-10 "( 4.2.4p2-RC6)" "Programmer's Manual" +.TH NTPDSIM 1 2007-06-20 "( 4.2.4p2)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpdsim.1) .\" -.\" It has been AutoGen-ed Sunday June 10, 2007 at 07:50:28 AM EDT +.\" It has been AutoGen-ed Wednesday June 20, 2007 at 07:37:29 AM EDT .\" From the definitions ntpdsim-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index a9fb121ef..e725c02e4 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpdc-opts.c) * - * It has been AutoGen-ed Sunday June 10, 2007 at 07:56:53 AM EDT + * It has been AutoGen-ed Wednesday June 20, 2007 at 07:43:48 AM EDT * From the definitions ntpdc-opts.def * and the template file options * @@ -463,7 +463,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p2-RC6\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p2\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index a6228c883..a71844af1 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpdc-opts.h) * - * It has been AutoGen-ed Sunday June 10, 2007 at 07:56:52 AM EDT + * It has been AutoGen-ed Wednesday June 20, 2007 at 07:43:47 AM EDT * From the definitions ntpdc-opts.def * and the template file options * @@ -71,8 +71,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.4p2-RC6" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p2-RC6" +#define NTPDC_VERSION "4.2.4p2" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p2" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 85e64a735..7d082e5c6 100644 --- a/ntpdc/ntpdc-opts.texi +++ b/ntpdc/ntpdc-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpdc-opts.texi) # -# It has been AutoGen-ed Sunday June 10, 2007 at 07:56:55 AM EDT +# It has been AutoGen-ed Wednesday June 20, 2007 at 07:43:50 AM EDT # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -59,7 +59,7 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc - vendor-specific NTP query program - Ver. 4.2.5p29 +ntpdc - vendor-specific NTP query program - Ver. 4.2.5p52 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 2226fc9ca..15f9b790b 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2007-06-10 "( 4.2.4p2-RC6)" "Programmer's Manual" +.TH NTPDC 1 2007-06-20 "( 4.2.4p2)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpdc.1) .\" -.\" It has been AutoGen-ed Sunday June 10, 2007 at 07:56:54 AM EDT +.\" It has been AutoGen-ed Wednesday June 20, 2007 at 07:43:49 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 cdaf2307b..6bd292bba 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpq-opts.c) * - * It has been AutoGen-ed Sunday June 10, 2007 at 07:57:23 AM EDT + * It has been AutoGen-ed Wednesday June 20, 2007 at 07:44:19 AM EDT * From the definitions ntpq-opts.def * and the template file options * @@ -411,7 +411,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.4p2-RC6\n\ +"ntpq - standard NTP query program - Ver. 4.2.4p2\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index d2cf6a926..19ffbefa3 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpq-opts.h) * - * It has been AutoGen-ed Sunday June 10, 2007 at 07:57:23 AM EDT + * It has been AutoGen-ed Wednesday June 20, 2007 at 07:44:19 AM EDT * From the definitions ntpq-opts.def * and the template file options * @@ -69,8 +69,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define NTPQ_VERSION "4.2.4p2-RC6" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p2-RC6" +#define NTPQ_VERSION "4.2.4p2" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p2" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index b55c00aa0..bbe1a7ac6 100644 --- a/ntpq/ntpq-opts.texi +++ b/ntpq/ntpq-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpq-opts.texi) # -# It has been AutoGen-ed Sunday June 10, 2007 at 07:57:25 AM EDT +# It has been AutoGen-ed Wednesday June 20, 2007 at 07:44:21 AM EDT # 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.5p29 +ntpq - standard NTP query program - Ver. 4.2.5p52 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 746cfd2fc..e05adbc00 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2007-06-10 "( 4.2.4p2-RC6)" "Programmer's Manual" +.TH NTPQ 1 2007-06-20 "( 4.2.4p2)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpq.1) .\" -.\" It has been AutoGen-ed Sunday June 10, 2007 at 07:57:24 AM EDT +.\" It has been AutoGen-ed Wednesday June 20, 2007 at 07:44:20 AM EDT .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 5c7775221..fef3d9a93 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -16,7 +16,7 @@ special= # [???] To start an RC cycle: RC->yes # To release from an RC cycle: rcpoint-> GO # ReleaseCandidate. 'yes' or 'no'. -releasecandidate=yes +releasecandidate=no #releasecandidate=no # ChangeLog tag CLTAG=NTP_4_2_0 @@ -27,5 +27,5 @@ CLTAG=NTP_4_2_0 # - - rcpoint gets set to 0 # - - releasecandidate gets set to no # - GRONK is for -dev -rcpoint=GO +rcpoint= #rcpoint=GRONK diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 8bd4afeaa..ebd3702df 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 Sunday June 10, 2007 at 07:57:52 AM EDT + * It has been AutoGen-ed Wednesday June 20, 2007 at 07:44:48 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.4p2-RC6\n\ +"sntp - standard SNTP program - Ver. 4.2.4p2\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 7bcb50458..233463db4 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 Sunday June 10, 2007 at 07:57:52 AM EDT + * It has been AutoGen-ed Wednesday June 20, 2007 at 07:44:47 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.4p2-RC6" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.4p2-RC6" +#define SNTP_VERSION "4.2.4p2" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.4p2" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index f758589b6..7f4cb70a0 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 Sunday June 10, 2007 at 07:57:55 AM EDT +# It has been AutoGen-ed Wednesday June 20, 2007 at 07:44:50 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 682727a2b..491ef90bf 100644 --- a/util/ntp-keygen-opts.c +++ b/util/ntp-keygen-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntp-keygen-opts.c) * - * It has been AutoGen-ed Sunday June 10, 2007 at 07:58:03 AM EDT + * It has been AutoGen-ed Wednesday June 20, 2007 at 07:44:57 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.4p2-RC6\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p2\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 22b5c80b3..9e3479628 100644 --- a/util/ntp-keygen-opts.h +++ b/util/ntp-keygen-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntp-keygen-opts.h) * - * It has been AutoGen-ed Sunday June 10, 2007 at 07:58:02 AM EDT + * It has been AutoGen-ed Wednesday June 20, 2007 at 07:44:56 AM EDT * From the definitions ntp-keygen-opts.def * and the template file options * @@ -80,8 +80,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 24 -#define NTP_KEYGEN_VERSION "4.2.4p2-RC6" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p2-RC6" +#define NTP_KEYGEN_VERSION "4.2.4p2" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p2" /* * 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 7c087c8e9..ce3434536 100644 --- a/util/ntp-keygen-opts.texi +++ b/util/ntp-keygen-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntp-keygen-opts.texi) # -# It has been AutoGen-ed Sunday June 10, 2007 at 07:58:05 AM EDT +# It has been AutoGen-ed Wednesday June 20, 2007 at 07:44:59 AM EDT # From the definitions ntp-keygen-opts.def # and the template file aginfo.tpl @end ignore @@ -53,7 +53,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.5p29 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p52 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 71453879c..67cb457a9 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2007-06-10 "(ntp 4.2.4p2-RC6)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2007-06-20 "(ntp 4.2.4p2)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntp-keygen.1) .\" -.\" It has been AutoGen-ed Sunday June 10, 2007 at 07:58:05 AM EDT +.\" It has been AutoGen-ed Wednesday June 20, 2007 at 07:44:58 AM EDT .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"