From: Harlan Stenn Date: Thu, 8 Jan 2009 11:21:48 +0000 (-0500) Subject: NTP_4_2_4P6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afb7385547df77137ca2fa5f36c1896ec752453e;p=thirdparty%2Fntp.git NTP_4_2_4P6 bk: 4965e1cctqmLFOoypyArbo_VeLiZdA --- diff --git a/ChangeLog b/ChangeLog index 45549acb09..f26fece5e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,5 @@ --- -(4.2.4p5) 2009/01/08 Released by Harlan Stenn -(4.2.4p6) 2009/01/07 Released by Harlan Stenn +(4.2.4p6) 2009/01/08 Released by Harlan Stenn * [Bug 1113] Fixed build errors with recent versions of openSSL. * [Sec 1111] Fix incorrect check of EVP_VerifyFinal()'s return value. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 64f3bb7fda..7fa977f47d 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 Thursday January 8, 2009 at 04:40:47 AM EST + * It has been AutoGen-ed Thursday January 8, 2009 at 06:11:55 AM EST * 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.4p5\n\ +"ntpd - NTP daemon program - Ver. 4.2.4p6\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index d8bd088ed1..b73a93fa86 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 Thursday January 8, 2009 at 04:40:46 AM EST + * It has been AutoGen-ed Thursday January 8, 2009 at 06:11:54 AM EST * 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.4p5" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p5" +#define NTPD_VERSION "4.2.4p6" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p6" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 7e31510266..cf7892987f 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 Thursday January 8, 2009 at 04:40:50 AM EST +# It has been AutoGen-ed Thursday January 8, 2009 at 06:11:58 AM EST # 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 94bfe060be..ef342c1e7f 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-01-08 "( 4.2.4p5)" "Programmer's Manual" +.TH NTPD 1 2009-01-08 "( 4.2.4p6)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed Thursday January 8, 2009 at 04:40:48 AM EST +.\" It has been AutoGen-ed Thursday January 8, 2009 at 06:11:57 AM EST .\" 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 9fd619ae39..c0bb1758ac 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 Thursday January 8, 2009 at 04:40:52 AM EST + * It has been AutoGen-ed Thursday January 8, 2009 at 06:12:00 AM EST * 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.4p5\n\ +"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p6\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index 1ea8edb228..630e7fa8fb 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 Thursday January 8, 2009 at 04:40:51 AM EST + * It has been AutoGen-ed Thursday January 8, 2009 at 06:11:59 AM EST * 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.4p5" -#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p5" +#define NTPDSIM_VERSION "4.2.4p6" +#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p6" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi index 5d29d1b896..36baba2531 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 Thursday January 8, 2009 at 04:40:55 AM EST +# It has been AutoGen-ed Thursday January 8, 2009 at 06:12:03 AM EST # 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 c178a93a45..8598eba2d1 100644 --- a/ntpd/ntpdsim.1 +++ b/ntpd/ntpdsim.1 @@ -1,7 +1,7 @@ -.TH NTPDSIM 1 2009-01-08 "( 4.2.4p5)" "Programmer's Manual" +.TH NTPDSIM 1 2009-01-08 "( 4.2.4p6)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdsim.1) .\" -.\" It has been AutoGen-ed Thursday January 8, 2009 at 04:40:54 AM EST +.\" It has been AutoGen-ed Thursday January 8, 2009 at 06:12:02 AM EST .\" 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 18bfdbd3a9..926b4fee6f 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 Thursday January 8, 2009 at 04:47:15 AM EST + * It has been AutoGen-ed Thursday January 8, 2009 at 06:18:23 AM EST * 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.4p5\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p6\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 0349fd43b6..0129877c81 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 Thursday January 8, 2009 at 04:47:15 AM EST + * It has been AutoGen-ed Thursday January 8, 2009 at 06:18:22 AM EST * 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.4p5" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p5" +#define NTPDC_VERSION "4.2.4p6" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p6" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 84384bfb78..8f84cea749 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 Thursday January 8, 2009 at 04:47:17 AM EST +# It has been AutoGen-ed Thursday January 8, 2009 at 06:18:25 AM EST # 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 6ef671e9ba..bc752b18b1 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-01-08 "( 4.2.4p5)" "Programmer's Manual" +.TH NTPDC 1 2009-01-08 "( 4.2.4p6)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed Thursday January 8, 2009 at 04:47:16 AM EST +.\" It has been AutoGen-ed Thursday January 8, 2009 at 06:18:25 AM EST .\" 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 9a1d39aef9..02cbc743dc 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 Thursday January 8, 2009 at 04:47:46 AM EST + * It has been AutoGen-ed Thursday January 8, 2009 at 06:18:56 AM EST * 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.4p5\n\ +"ntpq - standard NTP query program - Ver. 4.2.4p6\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index b0bc038b5b..11de1ecc66 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 Thursday January 8, 2009 at 04:47:46 AM EST + * It has been AutoGen-ed Thursday January 8, 2009 at 06:18:56 AM EST * 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.4p5" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p5" +#define NTPQ_VERSION "4.2.4p6" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p6" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 2d00a847f5..4ba3ff435e 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 Thursday January 8, 2009 at 04:47:49 AM EST +# It has been AutoGen-ed Thursday January 8, 2009 at 06:18:59 AM EST # 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 a2fa46bb14..37e3127fd4 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-01-08 "( 4.2.4p5)" "Programmer's Manual" +.TH NTPQ 1 2009-01-08 "( 4.2.4p6)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed Thursday January 8, 2009 at 04:47:47 AM EST +.\" It has been AutoGen-ed Thursday January 8, 2009 at 06:18:57 AM EST .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index fe1a4ba1f5..b469d96ac0 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=5 +point=6 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 51479b1a61..b50f1700d9 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 Thursday January 8, 2009 at 04:48:15 AM EST + * It has been AutoGen-ed Thursday January 8, 2009 at 06:19:26 AM EST * 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.4p5\n\ +"sntp - standard SNTP program - Ver. 4.2.4p6\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 9943ea6260..69a7400212 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 Thursday January 8, 2009 at 04:48:14 AM EST + * It has been AutoGen-ed Thursday January 8, 2009 at 06:19:25 AM EST * 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.4p5" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.4p5" +#define SNTP_VERSION "4.2.4p6" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.4p6" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 70af78157f..2130ad39ab 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 Thursday January 8, 2009 at 04:48:18 AM EST +# It has been AutoGen-ed Thursday January 8, 2009 at 06:19:29 AM EST # 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 a35e144c89..1368b97bc4 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 Thursday January 8, 2009 at 04:48:26 AM EST + * It has been AutoGen-ed Thursday January 8, 2009 at 06:19:36 AM EST * 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.4p5\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p6\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index feb253b3c4..860d26c6fa 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 Thursday January 8, 2009 at 04:48:25 AM EST + * It has been AutoGen-ed Thursday January 8, 2009 at 06:19:35 AM EST * 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.4p5" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p5" +#define NTP_KEYGEN_VERSION "4.2.4p6" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p6" /* * 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 9dfcf83e76..877a19ff51 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 Thursday January 8, 2009 at 04:48:28 AM EST +# It has been AutoGen-ed Thursday January 8, 2009 at 06:19:38 AM EST # 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 1b53fa1fd2..c847164cfc 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2009-01-08 "(ntp 4.2.4p5)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-01-08 "(ntp 4.2.4p6)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed Thursday January 8, 2009 at 04:48:28 AM EST +.\" It has been AutoGen-ed Thursday January 8, 2009 at 06:19:37 AM EST .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"