From: Harlan Stenn Date: Thu, 9 Apr 2009 11:44:06 +0000 (-0400) Subject: NTP_4_2_4P7_RC2 X-Git-Tag: NTP_4_2_4P7_RC2^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7af92c49afb42b0529f799f1e0283872e475ad1;p=thirdparty%2Fntp.git NTP_4_2_4P7_RC2 bk: 49dddf863n3UTDjRxXbuDI2-3Wp75Q --- diff --git a/ChangeLog b/ChangeLog index bc3747858..90a5dc560 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ --- +(4.2.4p7-RC2) 2009/04/09 Released by Harlan Stenn * [Sec 1144] limited buffer overflow in ntpq. CVE-2009-0159 * [Sec 1149] use SO_EXCLUSIVEADDRUSE on Windows diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 6fd6fab0d..aeac13a1a 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 Monday March 30, 2009 at 06:39:19 AM EST + * It has been AutoGen-ed Thursday April 9, 2009 at 07:35:19 AM EDT * From the definitions ntpd-opts.def * and the template file options * @@ -835,7 +835,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.4p7-RC1\n\ +"ntpd - NTP daemon program - Ver. 4.2.4p7-RC2\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 790bb4085..be03e902e 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 Monday March 30, 2009 at 06:39:18 AM EST + * It has been AutoGen-ed Thursday April 9, 2009 at 07:35:18 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.4p7-RC1" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p7-RC1" +#define NTPD_VERSION "4.2.4p7-RC2" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p7-RC2" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 2ecb065b4..897a501a2 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 Monday March 30, 2009 at 06:39:21 AM EST +# It has been AutoGen-ed Thursday April 9, 2009 at 07:35:22 AM EDT # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -60,7 +60,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.5p158 +ntpd - NTP daemon program - Ver. 4.2.5p161 USAGE: ntpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index e27ad19b3..44477d0f2 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-03-30 "( 4.2.4p7-RC1)" "Programmer's Manual" +.TH NTPD 1 2009-04-09 "( 4.2.4p7-RC2)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed Monday March 30, 2009 at 06:39:20 AM EST +.\" It has been AutoGen-ed Thursday April 9, 2009 at 07:35:20 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 ac536e42a..dce99ea6f 100644 --- a/ntpd/ntpdsim-opts.c +++ b/ntpd/ntpdsim-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.c) * - * It has been AutoGen-ed Monday March 30, 2009 at 06:39:23 AM EST + * It has been AutoGen-ed Thursday April 9, 2009 at 07:35:24 AM EDT * From the definitions ntpdsim-opts.def * and the template file options * @@ -1072,7 +1072,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDSIM"; tSCC zUsageTitle[] = -"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p7-RC1\n\ +"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p7-RC2\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index cf8b82a29..5e015daa2 100644 --- a/ntpd/ntpdsim-opts.h +++ b/ntpd/ntpdsim-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.h) * - * It has been AutoGen-ed Monday March 30, 2009 at 06:39:22 AM EST + * It has been AutoGen-ed Thursday April 9, 2009 at 07:35:23 AM EDT * From the definitions ntpdsim-opts.def * and the template file options * @@ -98,8 +98,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 43 -#define NTPDSIM_VERSION "4.2.4p7-RC1" -#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p7-RC1" +#define NTPDSIM_VERSION "4.2.4p7-RC2" +#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p7-RC2" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi index 2a1050ee5..5414a8609 100644 --- a/ntpd/ntpdsim-opts.texi +++ b/ntpd/ntpdsim-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpdsim-opts.texi) # -# It has been AutoGen-ed Monday March 30, 2009 at 06:39:26 AM EST +# It has been AutoGen-ed Thursday April 9, 2009 at 07:35:27 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 ecb127239..cd19d8919 100644 --- a/ntpd/ntpdsim.1 +++ b/ntpd/ntpdsim.1 @@ -1,7 +1,7 @@ -.TH NTPDSIM 1 2009-03-30 "( 4.2.4p7-RC1)" "Programmer's Manual" +.TH NTPDSIM 1 2009-04-09 "( 4.2.4p7-RC2)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdsim.1) .\" -.\" It has been AutoGen-ed Monday March 30, 2009 at 06:39:24 AM EST +.\" It has been AutoGen-ed Thursday April 9, 2009 at 07:35:25 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 1355c90e6..7e6e7d99c 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 Monday March 30, 2009 at 06:45:37 AM EST + * It has been AutoGen-ed Thursday April 9, 2009 at 07:41:52 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.4p7-RC1\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p7-RC2\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 8cb6d1684..c076a0c2a 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 Monday March 30, 2009 at 06:45:36 AM EST + * It has been AutoGen-ed Thursday April 9, 2009 at 07:41:51 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.4p7-RC1" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p7-RC1" +#define NTPDC_VERSION "4.2.4p7-RC2" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p7-RC2" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index bfc8ffc00..3bcacd681 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 Monday March 30, 2009 at 06:45:39 AM EST +# It has been AutoGen-ed Thursday April 9, 2009 at 07:41:53 AM EDT # 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.5p158 +ntpdc - vendor-specific NTP query program - Ver. 4.2.5p161 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 f955a62c8..4ca903324 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-03-30 "( 4.2.4p7-RC1)" "Programmer's Manual" +.TH NTPDC 1 2009-04-09 "( 4.2.4p7-RC2)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed Monday March 30, 2009 at 06:45:38 AM EST +.\" It has been AutoGen-ed Thursday April 9, 2009 at 07:41:53 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 24dbd908e..637e69d0e 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 Monday March 30, 2009 at 06:46:07 AM EST + * It has been AutoGen-ed Thursday April 9, 2009 at 07:42:24 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.4p7-RC1\n\ +"ntpq - standard NTP query program - Ver. 4.2.4p7-RC2\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index fefb31cf1..d8fdedc38 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 Monday March 30, 2009 at 06:46:07 AM EST + * It has been AutoGen-ed Thursday April 9, 2009 at 07:42:23 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.4p7-RC1" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p7-RC1" +#define NTPQ_VERSION "4.2.4p7-RC2" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p7-RC2" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 9c42db94c..a3bc58207 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 Monday March 30, 2009 at 06:46:09 AM EST +# It has been AutoGen-ed Thursday April 9, 2009 at 07:42:26 AM EDT # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -46,7 +46,7 @@ This is the automatically generated usage text for ntpq: @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.5p158 +ntpq - standard NTP query program - Ver. 4.2.5p161 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 bbfa7c21d..2ff8a905e 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-03-30 "( 4.2.4p7-RC1)" "Programmer's Manual" +.TH NTPQ 1 2009-04-09 "( 4.2.4p7-RC2)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed Monday March 30, 2009 at 06:46:09 AM EST +.\" It has been AutoGen-ed Thursday April 9, 2009 at 07:42:25 AM EDT .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 21b9a5b06..22df770e5 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -27,5 +27,5 @@ CLTAG=NTP_4_2_0 # - - rcpoint gets set to 0 # - - releasecandidate gets set to no # - GRONK is for -dev -rcpoint=1 +rcpoint=2 #rcpoint=GRONK diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 6d311dd70..85bfd0afa 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 Monday March 30, 2009 at 06:46:34 AM EST + * It has been AutoGen-ed Thursday April 9, 2009 at 07:42:53 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.4p7-RC1\n\ +"sntp - standard SNTP program - Ver. 4.2.4p7-RC2\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index b3e62103b..2ce95830b 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 Monday March 30, 2009 at 06:46:34 AM EST + * It has been AutoGen-ed Thursday April 9, 2009 at 07:42:52 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.4p7-RC1" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.4p7-RC1" +#define SNTP_VERSION "4.2.4p7-RC2" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.4p7-RC2" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 5047826e7..19bbdf86d 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 Monday March 30, 2009 at 06:46:36 AM EST +# It has been AutoGen-ed Thursday April 9, 2009 at 07:42:55 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 6961eb29f..08b0eaa13 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 Monday March 30, 2009 at 06:46:45 AM EST + * It has been AutoGen-ed Thursday April 9, 2009 at 07:43:02 AM EDT * From the definitions ntp-keygen-opts.def * and the template file options * @@ -799,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.4p7-RC1\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p7-RC2\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 90c6fcb00..261ecf302 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 Monday March 30, 2009 at 06:46:44 AM EST + * It has been AutoGen-ed Thursday April 9, 2009 at 07:43:01 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.4p7-RC1" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p7-RC1" +#define NTP_KEYGEN_VERSION "4.2.4p7-RC2" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p7-RC2" /* * 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 f6901dd6a..b2c046973 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 Monday March 30, 2009 at 06:46:47 AM EST +# It has been AutoGen-ed Thursday April 9, 2009 at 07:43:04 AM EDT # From the definitions ntp-keygen-opts.def # and the template file aginfo.tpl @end ignore @@ -52,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.5p158 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p161 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 4a37db310..572b78f22 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2009-03-30 "(ntp 4.2.4p7-RC1)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-04-09 "(ntp 4.2.4p7-RC2)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed Monday March 30, 2009 at 06:46:46 AM EST +.\" It has been AutoGen-ed Thursday April 9, 2009 at 07:43:03 AM EDT .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"