From: Harlan Stenn Date: Thu, 8 Jan 2009 09:49:23 +0000 (-0500) Subject: NTP_4_2_4P5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40e647c83a2bea54caa72b83c8b5ded7c3502831;p=thirdparty%2Fntp.git NTP_4_2_4P5 bk: 4965cc23BedVvdKraQPcePpBBMBncA --- diff --git a/ChangeLog b/ChangeLog index 7bf3cecbc7..45549acb09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ --- +(4.2.4p5) 2009/01/08 Released by Harlan Stenn (4.2.4p6) 2009/01/07 Released by Harlan Stenn * [Bug 1113] Fixed build errors with recent versions of openSSL. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index eae28cb301..64f3bb7fda 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 Sunday August 17, 2008 at 05:20:10 AM EDT + * It has been AutoGen-ed Thursday January 8, 2009 at 04:40:47 AM EST * From the definitions ntpd-opts.def * and the template file options * diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 45d0de5a5e..d8bd088ed1 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 Sunday August 17, 2008 at 05:20:09 AM EDT + * It has been AutoGen-ed Thursday January 8, 2009 at 04:40:46 AM EST * From the definitions ntpd-opts.def * and the template file options * diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 5a99b58abc..7e31510266 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 Sunday August 17, 2008 at 05:20:12 AM EDT +# It has been AutoGen-ed Thursday January 8, 2009 at 04:40:50 AM EST # 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.5p113 +ntpd - NTP daemon program - Ver. 4.2.5p134 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 25aee4117f..94bfe060be 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2008-08-17 "( 4.2.4p5)" "Programmer's Manual" +.TH NTPD 1 2009-01-08 "( 4.2.4p5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed Sunday August 17, 2008 at 05:20:11 AM EDT +.\" It has been AutoGen-ed Thursday January 8, 2009 at 04:40:48 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 4f09c0fa9d..9fd619ae39 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 Sunday August 17, 2008 at 05:20:14 AM EDT + * It has been AutoGen-ed Thursday January 8, 2009 at 04:40:52 AM EST * From the definitions ntpdsim-opts.def * and the template file options * diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index 1c63654d77..1ea8edb228 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 Sunday August 17, 2008 at 05:20:13 AM EDT + * It has been AutoGen-ed Thursday January 8, 2009 at 04:40:51 AM EST * From the definitions ntpdsim-opts.def * and the template file options * diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi index 49b54398dd..5d29d1b896 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 Sunday August 17, 2008 at 05:20:17 AM EDT +# It has been AutoGen-ed Thursday January 8, 2009 at 04:40:55 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 2a7ea4667d..c178a93a45 100644 --- a/ntpd/ntpdsim.1 +++ b/ntpd/ntpdsim.1 @@ -1,7 +1,7 @@ -.TH NTPDSIM 1 2008-08-17 "( 4.2.4p5)" "Programmer's Manual" +.TH NTPDSIM 1 2009-01-08 "( 4.2.4p5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdsim.1) .\" -.\" It has been AutoGen-ed Sunday August 17, 2008 at 05:20:16 AM EDT +.\" It has been AutoGen-ed Thursday January 8, 2009 at 04:40:54 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 d3c2549af8..18bfdbd3a9 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 Sunday August 17, 2008 at 05:26:25 AM EDT + * It has been AutoGen-ed Thursday January 8, 2009 at 04:47:15 AM EST * From the definitions ntpdc-opts.def * and the template file options * diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index a4bf99fd1e..0349fd43b6 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 Sunday August 17, 2008 at 05:26:25 AM EDT + * It has been AutoGen-ed Thursday January 8, 2009 at 04:47:15 AM EST * From the definitions ntpdc-opts.def * and the template file options * diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index dbce64c9cf..84384bfb78 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 Sunday August 17, 2008 at 05:26:27 AM EDT +# It has been AutoGen-ed Thursday January 8, 2009 at 04:47:17 AM EST # 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.5p113 +ntpdc - vendor-specific NTP query program - Ver. 4.2.5p134 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 c653b62f94..6ef671e9ba 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2008-08-17 "( 4.2.4p5)" "Programmer's Manual" +.TH NTPDC 1 2009-01-08 "( 4.2.4p5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed Sunday August 17, 2008 at 05:26:27 AM EDT +.\" It has been AutoGen-ed Thursday January 8, 2009 at 04:47:16 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 0e73886b72..9a1d39aef9 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 Sunday August 17, 2008 at 05:26:55 AM EDT + * It has been AutoGen-ed Thursday January 8, 2009 at 04:47:46 AM EST * From the definitions ntpq-opts.def * and the template file options * diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index bbd35ca343..b0bc038b5b 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 Sunday August 17, 2008 at 05:26:55 AM EDT + * It has been AutoGen-ed Thursday January 8, 2009 at 04:47:46 AM EST * From the definitions ntpq-opts.def * and the template file options * diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 0c4ca7d9c6..2d00a847f5 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 Sunday August 17, 2008 at 05:26:58 AM EDT +# It has been AutoGen-ed Thursday January 8, 2009 at 04:47:49 AM EST # 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.5p113 +ntpq - standard NTP query program - Ver. 4.2.5p134 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 d418636715..a2fa46bb14 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2008-08-17 "( 4.2.4p5)" "Programmer's Manual" +.TH NTPQ 1 2009-01-08 "( 4.2.4p5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed Sunday August 17, 2008 at 05:26:57 AM EDT +.\" It has been AutoGen-ed Thursday January 8, 2009 at 04:47:47 AM EST .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 9fe600320f..fe1a4ba1f5 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 939c9772cc..51479b1a61 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 Sunday August 17, 2008 at 05:27:24 AM EDT + * It has been AutoGen-ed Thursday January 8, 2009 at 04:48:15 AM EST * From the definitions sntp-opts.def * and the template file options * diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 3c701241eb..9943ea6260 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 Sunday August 17, 2008 at 05:27:23 AM EDT + * It has been AutoGen-ed Thursday January 8, 2009 at 04:48:14 AM EST * From the definitions sntp-opts.def * and the template file options * diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 8cc0d2c74f..70af78157f 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 Sunday August 17, 2008 at 05:27:25 AM EDT +# It has been AutoGen-ed Thursday January 8, 2009 at 04:48:18 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 edc9c5b41d..a35e144c89 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 Sunday August 17, 2008 at 05:27:33 AM EDT + * It has been AutoGen-ed Thursday January 8, 2009 at 04:48:26 AM EST * From the definitions ntp-keygen-opts.def * and the template file options * diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index a22a5e7fe6..feb253b3c4 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 Sunday August 17, 2008 at 05:27:32 AM EDT + * It has been AutoGen-ed Thursday January 8, 2009 at 04:48:25 AM EST * From the definitions ntp-keygen-opts.def * and the template file options * diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index 19b77f8095..9dfcf83e76 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 Sunday August 17, 2008 at 05:27:34 AM EDT +# It has been AutoGen-ed Thursday January 8, 2009 at 04:48:28 AM EST # 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.5p113 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p134 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 3bf7d0cd86..1b53fa1fd2 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2008-08-17 "(ntp 4.2.4p5)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-01-08 "(ntp 4.2.4p5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed Sunday August 17, 2008 at 05:27:34 AM EDT +.\" It has been AutoGen-ed Thursday January 8, 2009 at 04:48:28 AM EST .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"