From: Harlan Stenn Date: Fri, 25 Dec 2009 10:34:17 +0000 (+0000) Subject: NTP_4_2_7P5 X-Git-Tag: NTP_4_2_7P5^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a22441ea78e36f9e5c07ad2bb24e0b37cdc2f969;p=thirdparty%2Fntp.git NTP_4_2_7P5 bk: 4b349529StsPCphb6S0G2Xee9k_tFw --- diff --git a/ChangeLog b/ChangeLog index c3363bcee..6be5234ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p5) 2009/12/25 Released by Harlan Stenn (4.2.7p4) 2009/12/24 Released by Harlan Stenn * [Bug 1429] ntpd -4 option does not reliably force IPv4 resolution. * [Bug 1431] System headers must come before ntp headers in ntp_intres.c . diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index ec8072e9b..2330dd0d4 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 December 24, 2009 at 10:20:54 AM by AutoGen 5.10 + * It has been AutoGen-ed December 25, 2009 at 10:26:36 AM by AutoGen 5.10 * From the definitions ntpd-opts.def * and the template file options * @@ -956,7 +956,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.7p4\n\ +"ntpd - NTP daemon program - Ver. 4.2.7p5\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index f9bf4496f..6d1492c01 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 December 24, 2009 at 10:20:53 AM by AutoGen 5.10 + * It has been AutoGen-ed December 25, 2009 at 10:26:36 AM by AutoGen 5.10 * From the definitions ntpd-opts.def * and the template file options * @@ -90,8 +90,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 35 -#define NTPD_VERSION "4.2.7p4" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p4" +#define NTPD_VERSION "4.2.7p5" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p5" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 2242fc233..7ac6800f2 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 December 24, 2009 at 10:21:36 AM by AutoGen 5.10 +# It has been AutoGen-ed December 25, 2009 at 10:27:12 AM by AutoGen 5.10 # 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 003b596af..2d2988387 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-12-24 "( 4.2.7p4)" "Programmer's Manual" +.TH NTPD 1 2009-12-25 "( 4.2.7p5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed December 24, 2009 at 10:20:55 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 25, 2009 at 10:26:38 AM by AutoGen 5.10 .\" 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 00c13e350..cea4caadf 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 December 24, 2009 at 10:22:21 AM by AutoGen 5.10 + * It has been AutoGen-ed December 25, 2009 at 10:27:59 AM by AutoGen 5.10 * From the definitions ntpdc-opts.def * and the template file options * @@ -452,7 +452,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p4\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p5\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index ac89860b2..56be8e4e8 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 December 24, 2009 at 10:22:20 AM by AutoGen 5.10 + * It has been AutoGen-ed December 25, 2009 at 10:27:59 AM by AutoGen 5.10 * 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.7p4" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p4" +#define NTPDC_VERSION "4.2.7p5" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p5" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 675e31817..826992952 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 December 24, 2009 at 10:22:46 AM by AutoGen 5.10 +# It has been AutoGen-ed December 25, 2009 at 10:28:27 AM by AutoGen 5.10 # 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 640d8974f..d98b20f4b 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-12-24 "( 4.2.7p4)" "Programmer's Manual" +.TH NTPDC 1 2009-12-25 "( 4.2.7p5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed December 24, 2009 at 10:22:22 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 25, 2009 at 10:28:00 AM by AutoGen 5.10 .\" 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 b5ac5239e..f4fce8cf9 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 December 24, 2009 at 10:22:48 AM by AutoGen 5.10 + * It has been AutoGen-ed December 25, 2009 at 10:28:28 AM by AutoGen 5.10 * From the definitions ntpq-opts.def * and the template file options * @@ -427,7 +427,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.7p4\n\ +"ntpq - standard NTP query program - Ver. 4.2.7p5\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index d821af79d..7618950a8 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 December 24, 2009 at 10:22:47 AM by AutoGen 5.10 + * It has been AutoGen-ed December 25, 2009 at 10:28:28 AM by AutoGen 5.10 * From the definitions ntpq-opts.def * and the template file options * @@ -69,8 +69,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 14 -#define NTPQ_VERSION "4.2.7p4" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p4" +#define NTPQ_VERSION "4.2.7p5" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p5" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index d802855e4..de10cd4f4 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 December 24, 2009 at 10:23:12 AM by AutoGen 5.10 +# It has been AutoGen-ed December 25, 2009 at 10:28:56 AM by AutoGen 5.10 # 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 b418092cd..72e95fa8e 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-12-24 "( 4.2.7p4)" "Programmer's Manual" +.TH NTPQ 1 2009-12-25 "( 4.2.7p5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed December 24, 2009 at 10:22:49 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 25, 2009 at 10:28:29 AM by AutoGen 5.10 .\" 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 a4c78c379..b6270c8d1 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 December 24, 2009 at 10:23:13 AM by AutoGen 5.10 + * It has been AutoGen-ed December 25, 2009 at 10:28:58 AM by AutoGen 5.10 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -233,7 +233,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPSNMPD"; tSCC zUsageTitle[] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p4\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p5\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index b8e14f776..1fc6ae3c0 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 December 24, 2009 at 10:23:13 AM by AutoGen 5.10 + * It has been AutoGen-ed December 25, 2009 at 10:28:57 AM by AutoGen 5.10 * 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.7p4" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p4" +#define NTPSNMPD_VERSION "4.2.7p5" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p5" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index 191af45c3..387812e7f 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 December 24, 2009 at 10:23:27 AM by AutoGen 5.10 +# It has been AutoGen-ed December 25, 2009 at 10:29:19 AM by AutoGen 5.10 # 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 bbe57af63..57526a043 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2009-12-24 "( 4.2.7p4)" "Programmer's Manual" +.TH NTPSNMPD 1 2009-12-25 "( 4.2.7p5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed December 24, 2009 at 10:23:14 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 25, 2009 at 10:28:59 AM by AutoGen 5.10 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index c683a8572..3c7a9fab5 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -57,7 +57,7 @@ CLTAG=NTP_4_2_0 # - Numeric values increment # - empty 'increments' to 1 # - NEW 'increments' to empty -point=4 +point=5 ### betapoint is normally modified by script. # ntp-stable Beta number (betapoint) diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index dc6e06d58..e4024b8ed 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 December 24, 2009 at 10:26:53 AM by AutoGen 5.10 + * It has been AutoGen-ed December 25, 2009 at 10:33:17 AM by AutoGen 5.10 * From the definitions sntp-opts.def * and the template file options * @@ -474,7 +474,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.7p4\n\ +"sntp - standard SNTP program - Ver. 4.2.7p5\n\ USAGE: %s [ - [] | --[{=| }] ]... hostname-or-IP ...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 1cfeb4b56..91a5ff4f7 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 December 24, 2009 at 10:26:53 AM by AutoGen 5.10 + * It has been AutoGen-ed December 25, 2009 at 10:33:16 AM by AutoGen 5.10 * 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.7p4" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p4" +#define SNTP_VERSION "4.2.7p5" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p5" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index e5b62850f..e642e1e13 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 December 24, 2009 at 10:26:59 AM by AutoGen 5.10 +# It has been AutoGen-ed December 25, 2009 at 10:33:27 AM by AutoGen 5.10 # 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 a8f6b7fd1..df2147e6a 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2009-12-24 "( 4.2.7p4)" "Programmer's Manual" +.TH SNTP 1 2009-12-25 "( 4.2.7p5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed December 24, 2009 at 10:26:59 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 25, 2009 at 10:33:28 AM by AutoGen 5.10 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/sntp/sntp.html b/sntp/sntp.html index ac5f46b7a..47335dbbc 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -38,7 +38,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. -

This document applies to version 4.2.7p4 of sntp. +

This document applies to version 4.2.7p5 of sntp.

The program implements the SNTP protocol as defined by the draft NTPv4 IETF specification. diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index 6221253d7..9badfeabb 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 December 24, 2009 at 10:27:06 AM by AutoGen 5.10 + * It has been AutoGen-ed December 25, 2009 at 10:33:35 AM by AutoGen 5.10 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -738,7 +738,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTP_KEYGEN"; tSCC zUsageTitle[] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p4\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p5\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 5f39a2240..a339a83a5 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 December 24, 2009 at 10:27:06 AM by AutoGen 5.10 + * It has been AutoGen-ed December 25, 2009 at 10:33:35 AM by AutoGen 5.10 * 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.7p4" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p4" +#define NTP_KEYGEN_VERSION "4.2.7p5" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p5" /* * 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 90c441787..5683adb78 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 December 24, 2009 at 10:27:21 AM by AutoGen 5.10 +# It has been AutoGen-ed December 25, 2009 at 10:33:54 AM by AutoGen 5.10 # 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 ad116e7ff..e919e3e69 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2009-12-24 "(ntp 4.2.7p4)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-12-25 "(ntp 4.2.7p5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed December 24, 2009 at 10:27:07 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 25, 2009 at 10:33:37 AM by AutoGen 5.10 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"