From: Harlan Stenn Date: Tue, 15 Dec 2009 10:28:39 +0000 (-0500) Subject: NTP_4_2_7P1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d77c1c42b1f2b596af28382e31b4bdeefd525fbd;p=thirdparty%2Fntp.git NTP_4_2_7P1 bk: 4b2764d7tsv-1pA4eMYm5nMMuHVJ_A --- diff --git a/ChangeLog b/ChangeLog index 373d111025..d98eb4469c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p1) 2009/12/15 Released by Harlan Stenn * [Bug 1348] ntpd Windows port should wait for sendto() completion. * [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes. * [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index d20f205261..f906791a7e 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 13, 2009 at 05:22:12 AM by AutoGen 5.10 + * It has been AutoGen-ed December 15, 2009 at 05:22:05 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.7p0\n\ +"ntpd - NTP daemon program - Ver. 4.2.7p1\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 003723d1c6..43ec1138d5 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 13, 2009 at 05:22:12 AM by AutoGen 5.10 + * It has been AutoGen-ed December 15, 2009 at 05:22:05 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.7p0" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p0" +#define NTPD_VERSION "4.2.7p1" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 95fcd4643e..210d37f944 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 13, 2009 at 05:22:35 AM by AutoGen 5.10 +# It has been AutoGen-ed December 15, 2009 at 05:22:37 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 c2a146e8da..16cdac1373 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-12-13 "( 4.2.7p0)" "Programmer's Manual" +.TH NTPD 1 2009-12-15 "( 4.2.7p1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed December 13, 2009 at 05:22:14 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 15, 2009 at 05:22:07 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 23fe2af62a..6c76f8d3ba 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 13, 2009 at 05:23:09 AM by AutoGen 5.10 + * It has been AutoGen-ed December 15, 2009 at 05:23:20 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.7p0\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p1\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index f4dd021686..5ec5483763 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 13, 2009 at 05:23:09 AM by AutoGen 5.10 + * It has been AutoGen-ed December 15, 2009 at 05:23: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.7p0" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p0" +#define NTPDC_VERSION "4.2.7p1" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 7b4c5e1fc6..ea74ed1a15 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 13, 2009 at 05:23:35 AM by AutoGen 5.10 +# It has been AutoGen-ed December 15, 2009 at 05:23: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 bf6574afcc..09a08184dc 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-12-13 "( 4.2.7p0)" "Programmer's Manual" +.TH NTPDC 1 2009-12-15 "( 4.2.7p1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed December 13, 2009 at 05:23:10 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 15, 2009 at 05:23:21 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 450567bea4..bbe0232015 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 13, 2009 at 05:23:37 AM by AutoGen 5.10 + * It has been AutoGen-ed December 15, 2009 at 05:23:47 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.7p0\n\ +"ntpq - standard NTP query program - Ver. 4.2.7p1\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index f079f628af..659e8a97a4 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 13, 2009 at 05:23:36 AM by AutoGen 5.10 + * It has been AutoGen-ed December 15, 2009 at 05:23: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.7p0" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p0" +#define NTPQ_VERSION "4.2.7p1" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index ce8c0aa74b..a90eb930d1 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 13, 2009 at 05:24:01 AM by AutoGen 5.10 +# It has been AutoGen-ed December 15, 2009 at 05:24: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 e8da8fe0eb..eeab18b296 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-12-13 "( 4.2.7p0)" "Programmer's Manual" +.TH NTPQ 1 2009-12-15 "( 4.2.7p1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed December 13, 2009 at 05:23:37 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 15, 2009 at 05:23:48 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 0aa31e6ba2..1480dbf18c 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 13, 2009 at 05:24:02 AM by AutoGen 5.10 + * It has been AutoGen-ed December 15, 2009 at 05:24: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.7p0\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p1\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index ebb960d16c..f2990355e3 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 13, 2009 at 05:24:01 AM by AutoGen 5.10 + * It has been AutoGen-ed December 15, 2009 at 05:24: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.7p0" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p0" +#define NTPSNMPD_VERSION "4.2.7p1" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index a9702ea1ac..3f7e9cf388 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 13, 2009 at 05:24:17 AM by AutoGen 5.10 +# It has been AutoGen-ed December 15, 2009 at 05:24: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 efcbc106bf..2486c35662 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2009-12-13 "( 4.2.7p0)" "Programmer's Manual" +.TH NTPSNMPD 1 2009-12-15 "( 4.2.7p1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed December 13, 2009 at 05:24:03 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 15, 2009 at 05:24: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 d7a8b51444..805756ac26 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=0 +point=1 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 0f54fb0f4c..4f69527f86 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 13, 2009 at 05:27:44 AM by AutoGen 5.10 + * It has been AutoGen-ed December 15, 2009 at 05:27:52 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.7p0\n\ +"sntp - standard SNTP program - Ver. 4.2.7p1\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 d8f88416e7..b6ee2a4e4d 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 13, 2009 at 05:27:44 AM by AutoGen 5.10 + * It has been AutoGen-ed December 15, 2009 at 05:27:51 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.7p0" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p0" +#define SNTP_VERSION "4.2.7p1" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 02333fdfe4..6899495ac1 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 13, 2009 at 05:27:49 AM by AutoGen 5.10 +# It has been AutoGen-ed December 15, 2009 at 05:27:57 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 2ec3169042..dce64fbc93 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2009-12-13 "( 4.2.7p0)" "Programmer's Manual" +.TH SNTP 1 2009-12-15 "( 4.2.7p1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed December 13, 2009 at 05:27:50 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 15, 2009 at 05:27:58 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 df3d99925b..2061d58006 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.7p0 of sntp. +

This document applies to version 4.2.7p1 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 c8bf373a4e..3893792536 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 13, 2009 at 05:27:57 AM by AutoGen 5.10 + * It has been AutoGen-ed December 15, 2009 at 05:28:04 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.7p0\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p1\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index ffe9ea99e3..e4cfe3b9c7 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 13, 2009 at 05:27:56 AM by AutoGen 5.10 + * It has been AutoGen-ed December 15, 2009 at 05:28:04 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.7p0" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p0" +#define NTP_KEYGEN_VERSION "4.2.7p1" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p1" /* * 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 75db993dd0..db5c535808 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 13, 2009 at 05:28:12 AM by AutoGen 5.10 +# It has been AutoGen-ed December 15, 2009 at 05:28:20 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 185c43087a..9544802c15 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2009-12-13 "(ntp 4.2.7p0)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-12-15 "(ntp 4.2.7p1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed December 13, 2009 at 05:27:58 AM by AutoGen 5.10 +.\" It has been AutoGen-ed December 15, 2009 at 05:28:05 AM by AutoGen 5.10 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"