From: Harlan Stenn Date: Sun, 27 Sep 2009 11:50:18 +0000 (-0400) Subject: NTP_4_2_5P222 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c2d3cf950711d9eff5bb6562f8ab679e0782776;p=thirdparty%2Fntp.git NTP_4_2_5P222 bk: 4abf517aAE3LXnbNssqDagnj34Ad0g --- diff --git a/ChangeLog b/ChangeLog index 9c088ddcf7..1ce2bde684 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.5p222) 2009/09/27 Released by Harlan Stenn * Update libisc code using bind-9.6.1-P1.tar.gz, rearrange our copy to mirror the upstream layout (lib/isc/...), and merge in NTP-local modifications to libisc. There is a new procedure to ease future diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index e793e59e6c..dce9176e5e 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 September 26, 2009 at 07:32:59 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 27, 2009 at 07:40:32 AM by AutoGen 5.9.9pre5 * From the definitions ntpd-opts.def * and the template file options * @@ -918,7 +918,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.5p221\n\ +"ntpd - NTP daemon program - Ver. 4.2.5p222\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index e2f6cae71a..33fb8e6828 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 September 26, 2009 at 07:32:58 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 27, 2009 at 07:40:30 AM by AutoGen 5.9.9pre5 * From the definitions ntpd-opts.def * and the template file options * @@ -89,8 +89,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 34 -#define NTPD_VERSION "4.2.5p221" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p221" +#define NTPD_VERSION "4.2.5p222" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p222" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index a21ea952f3..bd552f1963 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 September 26, 2009 at 07:33:02 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed September 27, 2009 at 07:40:35 AM by AutoGen 5.9.9pre5 # 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 7e3e40c15d..900d1f3d69 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-09-26 "( 4.2.5p221)" "Programmer's Manual" +.TH NTPD 1 2009-09-27 "( 4.2.5p222)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed September 26, 2009 at 07:33:00 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed September 27, 2009 at 07:40:33 AM by AutoGen 5.9.9pre5 .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index 18f352d0fd..c0c730a477 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 September 26, 2009 at 07:34:33 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 27, 2009 at 07:42:28 AM by AutoGen 5.9.9pre5 * From the definitions ntpdc-opts.def * and the template file options * @@ -460,7 +460,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p221\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p222\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index a54f024086..401035c235 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 September 26, 2009 at 07:34:32 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 27, 2009 at 07:42:27 AM by AutoGen 5.9.9pre5 * 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.5p221" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p221" +#define NTPDC_VERSION "4.2.5p222" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p222" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index b93eeb0f6c..73ac1ecc94 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 September 26, 2009 at 07:34:35 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed September 27, 2009 at 07:42:30 AM by AutoGen 5.9.9pre5 # 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 fff009e20b..56eec3e6c0 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-09-26 "( 4.2.5p221)" "Programmer's Manual" +.TH NTPDC 1 2009-09-27 "( 4.2.5p222)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed September 26, 2009 at 07:34:35 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed September 27, 2009 at 07:42:29 AM by AutoGen 5.9.9pre5 .\" 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 18598d466d..2f7983d02f 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 September 26, 2009 at 07:35:04 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 27, 2009 at 07:43:00 AM by AutoGen 5.9.9pre5 * From the definitions ntpq-opts.def * and the template file options * @@ -414,7 +414,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.5p221\n\ +"ntpq - standard NTP query program - Ver. 4.2.5p222\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 33d9281051..11ff7093ec 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 September 26, 2009 at 07:35:03 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 27, 2009 at 07:42:59 AM by AutoGen 5.9.9pre5 * 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.5p221" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p221" +#define NTPQ_VERSION "4.2.5p222" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p222" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 6e490e4501..b8cacbd503 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 September 26, 2009 at 07:35:07 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed September 27, 2009 at 07:43:03 AM by AutoGen 5.9.9pre5 # 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 e1027a4bed..eff5ffd772 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-09-26 "( 4.2.5p221)" "Programmer's Manual" +.TH NTPQ 1 2009-09-27 "( 4.2.5p222)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed September 26, 2009 at 07:35:06 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed September 27, 2009 at 07:43:01 AM by AutoGen 5.9.9pre5 .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c index 6440593078..7c9c38a5e3 100644 --- a/ntpsnmpd/ntpsnmpd-opts.c +++ b/ntpsnmpd/ntpsnmpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) * - * It has been AutoGen-ed September 26, 2009 at 07:35:34 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 27, 2009 at 07:43:32 AM by AutoGen 5.9.9pre5 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -226,7 +226,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPSNMPD"; tSCC zUsageTitle[] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p221\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p222\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 76cc5fc047..ee826f87c2 100644 --- a/ntpsnmpd/ntpsnmpd-opts.h +++ b/ntpsnmpd/ntpsnmpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) * - * It has been AutoGen-ed September 26, 2009 at 07:35:33 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 27, 2009 at 07:43:31 AM by AutoGen 5.9.9pre5 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -62,8 +62,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 7 -#define NTPSNMPD_VERSION "4.2.5p221" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p221" +#define NTPSNMPD_VERSION "4.2.5p222" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p222" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index a2e6d75b89..0bac3a598f 100644 --- a/ntpsnmpd/ntpsnmpd-opts.texi +++ b/ntpsnmpd/ntpsnmpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.texi) # -# It has been AutoGen-ed September 26, 2009 at 07:35:36 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed September 27, 2009 at 07:43:34 AM by AutoGen 5.9.9pre5 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index 9a5b5889ba..fcc20caf4a 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2009-09-26 "( 4.2.5p221)" "Programmer's Manual" +.TH NTPSNMPD 1 2009-09-27 "( 4.2.5p222)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed September 26, 2009 at 07:35:35 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed September 27, 2009 at 07:43:33 AM by AutoGen 5.9.9pre5 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 14112f2889..1454083dcf 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=221 +point=222 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 2ca8ab5099..1592c2cee5 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 September 26, 2009 at 07:40:37 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 27, 2009 at 07:48:40 AM by AutoGen 5.9.9pre5 * From the definitions sntp-opts.def * and the template file options * @@ -458,7 +458,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.5p221\n\ +"sntp - standard SNTP program - Ver. 4.2.5p222\n\ USAGE: %s [ - [] | --[{=| }] ]... ...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 1407d5de22..6de3163316 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 September 26, 2009 at 07:40:37 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 27, 2009 at 07:48:39 AM by AutoGen 5.9.9pre5 * From the definitions sntp-opts.def * and the template file options * @@ -72,8 +72,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 17 -#define SNTP_VERSION "4.2.5p221" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p221" +#define SNTP_VERSION "4.2.5p222" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p222" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index c334db4b61..28f302eb1b 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 September 26, 2009 at 07:40:40 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed September 27, 2009 at 07:48:43 AM by AutoGen 5.9.9pre5 # 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 bcd4f69e01..24bc2ee7d0 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2009-09-26 "( 4.2.5p221)" "Programmer's Manual" +.TH SNTP 1 2009-09-27 "( 4.2.5p222)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed September 26, 2009 at 07:40:39 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed September 27, 2009 at 07:48:41 AM by AutoGen 5.9.9pre5 .\" 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 fbaa148487..9dbf93dc0c 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 September 26, 2009 at 07:41:01 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 27, 2009 at 07:49:09 AM by AutoGen 5.9.9pre5 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -769,7 +769,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTP_KEYGEN"; tSCC zUsageTitle[] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p221\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p222\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 7693ca5618..47b2b2f2d8 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 September 26, 2009 at 07:41:00 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 27, 2009 at 07:49:08 AM by AutoGen 5.9.9pre5 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -78,8 +78,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 23 -#define NTP_KEYGEN_VERSION "4.2.5p221" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p221" +#define NTP_KEYGEN_VERSION "4.2.5p222" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p222" /* * 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 9a9b993b40..45c2b998bd 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 September 26, 2009 at 07:41:04 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed September 27, 2009 at 07:49:11 AM by AutoGen 5.9.9pre5 # 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 001c52e055..c76d421953 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2009-09-26 "(ntp 4.2.5p221)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-09-27 "(ntp 4.2.5p222)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed September 26, 2009 at 07:41:03 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed September 27, 2009 at 07:49:10 AM by AutoGen 5.9.9pre5 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"