From: Harlan Stenn Date: Thu, 24 Dec 2009 10:27:41 +0000 (+0000) Subject: NTP_4_2_7P4 X-Git-Tag: NTP_4_2_7P4^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afda6d5e987b9c4f7f27be5447062e87d0f17e2d;p=thirdparty%2Fntp.git NTP_4_2_7P4 bk: 4b33421d6cL5GP-7NboHOrd_Bfd3Yg --- diff --git a/ChangeLog b/ChangeLog index 264c47448..a1b3e0290 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(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 . (4.2.7p3) 2009/12/22 Released by Harlan Stenn diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 774bfda6f..ec8072e9b 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 22, 2009 at 05:22:53 AM by AutoGen 5.10 + * It has been AutoGen-ed December 24, 2009 at 10:20:54 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.7p3\n\ +"ntpd - NTP daemon program - Ver. 4.2.7p4\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 8cc15078e..f9bf4496f 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 22, 2009 at 05:22:53 AM by AutoGen 5.10 + * It has been AutoGen-ed December 24, 2009 at 10:20:53 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.7p3" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p3" +#define NTPD_VERSION "4.2.7p4" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p4" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 905bc8203..2242fc233 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 22, 2009 at 05:23:34 AM by AutoGen 5.10 +# It has been AutoGen-ed December 24, 2009 at 10:21:36 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 05b6112f0..003b596af 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-12-22 "( 4.2.7p3)" "Programmer's Manual" +.TH NTPD 1 2009-12-24 "( 4.2.7p4)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed December 22, 2009 at 05:22:55 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 24, 2009 at 10:20:55 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 ffc1ce887..00c13e350 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 22, 2009 at 05:24:08 AM by AutoGen 5.10 + * It has been AutoGen-ed December 24, 2009 at 10:22:21 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.7p3\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p4\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 4735faa43..ac89860b2 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 22, 2009 at 05:24:07 AM by AutoGen 5.10 + * It has been AutoGen-ed December 24, 2009 at 10:22:20 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.7p3" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p3" +#define NTPDC_VERSION "4.2.7p4" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p4" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 091690e87..675e31817 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 22, 2009 at 05:24:34 AM by AutoGen 5.10 +# It has been AutoGen-ed December 24, 2009 at 10:22:46 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 909664724..640d8974f 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-12-22 "( 4.2.7p3)" "Programmer's Manual" +.TH NTPDC 1 2009-12-24 "( 4.2.7p4)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed December 22, 2009 at 05:24:09 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 24, 2009 at 10:22:22 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 808563fde..b5ac5239e 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 22, 2009 at 05:24:35 AM by AutoGen 5.10 + * It has been AutoGen-ed December 24, 2009 at 10:22:48 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.7p3\n\ +"ntpq - standard NTP query program - Ver. 4.2.7p4\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 3e033b0d3..d821af79d 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 22, 2009 at 05:24:35 AM by AutoGen 5.10 + * It has been AutoGen-ed December 24, 2009 at 10:22:47 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.7p3" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p3" +#define NTPQ_VERSION "4.2.7p4" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p4" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index a3dfddf0b..d802855e4 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 22, 2009 at 05:24:59 AM by AutoGen 5.10 +# It has been AutoGen-ed December 24, 2009 at 10:23:12 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 1a845718c..b418092cd 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-12-22 "( 4.2.7p3)" "Programmer's Manual" +.TH NTPQ 1 2009-12-24 "( 4.2.7p4)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed December 22, 2009 at 05:24:36 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 24, 2009 at 10:22:49 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 8e56fa6df..a4c78c379 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 22, 2009 at 05:25:00 AM by AutoGen 5.10 + * It has been AutoGen-ed December 24, 2009 at 10:23:13 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.7p3\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p4\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 2fb8264ba..b8e14f776 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 22, 2009 at 05:25:00 AM by AutoGen 5.10 + * It has been AutoGen-ed December 24, 2009 at 10:23:13 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.7p3" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p3" +#define NTPSNMPD_VERSION "4.2.7p4" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p4" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index b5d0c2c36..191af45c3 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 22, 2009 at 05:25:14 AM by AutoGen 5.10 +# It has been AutoGen-ed December 24, 2009 at 10:23:27 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 9371b9cdb..bbe57af63 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2009-12-22 "( 4.2.7p3)" "Programmer's Manual" +.TH NTPSNMPD 1 2009-12-24 "( 4.2.7p4)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed December 22, 2009 at 05:25:01 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 24, 2009 at 10:23:14 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 a417764fe..c683a8572 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=3 +point=4 ### betapoint is normally modified by script. # ntp-stable Beta number (betapoint) diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 3cad2996c..dc6e06d58 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 22, 2009 at 05:28:39 AM by AutoGen 5.10 + * It has been AutoGen-ed December 24, 2009 at 10:26:53 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.7p3\n\ +"sntp - standard SNTP program - Ver. 4.2.7p4\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 23a411c55..1cfeb4b56 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 22, 2009 at 05:28:38 AM by AutoGen 5.10 + * It has been AutoGen-ed December 24, 2009 at 10:26:53 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.7p3" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p3" +#define SNTP_VERSION "4.2.7p4" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p4" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 686717b20..e5b62850f 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 22, 2009 at 05:28:44 AM by AutoGen 5.10 +# It has been AutoGen-ed December 24, 2009 at 10:26:59 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 a8a721ad8..a8f6b7fd1 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2009-12-22 "( 4.2.7p3)" "Programmer's Manual" +.TH SNTP 1 2009-12-24 "( 4.2.7p4)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed December 22, 2009 at 05:28:45 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 24, 2009 at 10:26:59 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 9250663fc..ac5f46b7a 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.7p3 of sntp. +

This document applies to version 4.2.7p4 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 a408d3471..6221253d7 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 22, 2009 at 05:28:52 AM by AutoGen 5.10 + * It has been AutoGen-ed December 24, 2009 at 10:27:06 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.7p3\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p4\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index e957b4d84..5f39a2240 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 22, 2009 at 05:28:51 AM by AutoGen 5.10 + * It has been AutoGen-ed December 24, 2009 at 10:27:06 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.7p3" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p3" +#define NTP_KEYGEN_VERSION "4.2.7p4" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p4" /* * 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 ebbdfc0bd..90c441787 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 22, 2009 at 05:29:07 AM by AutoGen 5.10 +# It has been AutoGen-ed December 24, 2009 at 10:27:21 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 a67ecae82..ad116e7ff 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2009-12-22 "(ntp 4.2.7p3)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-12-24 "(ntp 4.2.7p4)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed December 22, 2009 at 05:28:53 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 24, 2009 at 10:27:07 AM by AutoGen 5.10 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"