From: Harlan Stenn Date: Mon, 27 Jul 2015 12:00:25 +0000 (+0000) Subject: NTP_4_3_65 X-Git-Tag: NTP_4_3_65^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04ad333915e0df868c945bf676226427f2520717;p=thirdparty%2Fntp.git NTP_4_3_65 bk: 55b61d59GthfHkboN-JBng3Oeq5bLw --- diff --git a/ChangeLog b/ChangeLog index 8c3a2891a..95e6e3427 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.65) 2015/07/27 Released by Harlan Stenn Below are from 4.2.8p4: * [Bug 2595] ntpdate man page quirks. Hal Murray, Harlan Stenn. * [Bug 2625] Deprecate flag1 in local refclock. Hal Murray, Harlan Stenn. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index e9506e8a9..bc78a0bb8 100644 --- a/ntpd/invoke-ntp.conf.texi +++ b/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed July 26, 2015 at 11:57:33 AM by AutoGen 5.18.5 +# It has been AutoGen-ed July 27, 2015 at 11:58:11 AM by AutoGen 5.18.5 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -1837,7 +1837,7 @@ re-associate accordingly. Some administrators prefer to avoid running @code{ntpd(1ntpdmdoc)} continuously and run either -@code{ntpdate(8)} +@code{sntp(1sntpmdoc)} or @code{ntpd(1ntpdmdoc)} @code{-q} diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index 56a589562..719b9a66d 100644 --- a/ntpd/invoke-ntp.keys.texi +++ b/ntpd/invoke-ntp.keys.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.keys.texi) # -# It has been AutoGen-ed July 26, 2015 at 11:57:36 AM by AutoGen 5.18.5 +# It has been AutoGen-ed July 27, 2015 at 11:58:14 AM by AutoGen 5.18.5 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index d32507791..ed4142b97 100644 --- a/ntpd/invoke-ntpd.texi +++ b/ntpd/invoke-ntpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpd.texi) # -# It has been AutoGen-ed July 26, 2015 at 11:57:38 AM by AutoGen 5.18.5 +# It has been AutoGen-ed July 27, 2015 at 11:58:16 AM by AutoGen 5.18.5 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -142,7 +142,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.3.64 +ntpd - NTP daemon program - Ver. 4.3.65 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index f23fe76f2..a09c45acf 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5man "26 Jul 2015" "4.3.64" "File Formats" +.TH ntp.conf 5man "27 Jul 2015" "4.3.65" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-8waOQx/ag-OxaGPx) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-EyaWYi/ag-QyaOXi) .\" -.\" It has been AutoGen-ed July 26, 2015 at 11:57:20 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 27, 2015 at 11:57:58 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2080,7 +2080,7 @@ re-associate accordingly. Some administrators prefer to avoid running \fCntpd\f[]\fR(1ntpdmdoc)\f[] continuously and run either -\fCntpdate\f[]\fR(8)\f[] +\fCsntp\f[]\fR(1sntpmdoc)\f[] or \fCntpd\f[]\fR(1ntpdmdoc)\f[] \f\*[B-Font]\-q\f[] diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 96007956c..965954bc5 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd July 26 2015 +.Dd July 27 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed July 26, 2015 at 11:57:41 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 27, 2015 at 11:58:18 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -1903,7 +1903,7 @@ re\-associate accordingly. Some administrators prefer to avoid running .Xr ntpd 1ntpdmdoc continuously and run either -.Xr ntpdate 8 +.Xr sntp 1sntpmdoc or .Xr ntpd 1ntpdmdoc .Fl q diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index ccceb7b7b..57b84ec78 100644 --- a/ntpd/ntp.conf.html +++ b/ntpd/ntp.conf.html @@ -33,7 +33,7 @@ Up: (dir)

This document describes the configuration file for the NTP Project's ntpd program. -

This document applies to version 4.3.64 of ntp.conf. +

This document applies to version 4.3.65 of ntp.conf.

Short Contents

@@ -1922,7 +1922,7 @@ will be discarded if there are at least peers remaining. This value defaults to 1, but can be changed to any number from 1 to 15. -
minclock minclock
The clustering algorithm repeatedly casts out outlyer +
minclock minclock
The clustering algorithm repeatedly casts out outlier associations until no more than minclock associations remain. diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 5f455daa7..45a73d7a0 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5 "26 Jul 2015" "4.3.64" "File Formats" +.TH ntp.conf 5 "27 Jul 2015" "4.3.65" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-8waOQx/ag-OxaGPx) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-EyaWYi/ag-QyaOXi) .\" -.\" It has been AutoGen-ed July 26, 2015 at 11:57:20 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 27, 2015 at 11:57:58 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2080,7 +2080,7 @@ re-associate accordingly. Some administrators prefer to avoid running \fCntpd\f[]\fR(@NTPD_MS@)\f[] continuously and run either -\fCntpdate\f[]\fR(8)\f[] +\fCsntp\f[]\fR(@SNTP_MS@)\f[] or \fCntpd\f[]\fR(@NTPD_MS@)\f[] \f\*[B-Font]\-q\f[] diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 2454a38ac..e3b0c43ff 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd July 26 2015 +.Dd July 27 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed July 26, 2015 at 11:57:41 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 27, 2015 at 11:58:18 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -1903,7 +1903,7 @@ re\-associate accordingly. Some administrators prefer to avoid running .Xr ntpd @NTPD_MS@ continuously and run either -.Xr ntpdate 8 +.Xr sntp @SNTP_MS@ or .Xr ntpd @NTPD_MS@ .Fl q diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index abb07ceb3..ce05fd8e7 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "26 Jul 2015" "4.3.64" "File Formats" +.TH ntp.keys 5man "27 Jul 2015" "4.3.65" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed July 26, 2015 at 11:57:25 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 27, 2015 at 11:58:03 AM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc index 9ced84b7a..12dc80feb 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd July 26 2015 +.Dd July 27 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed July 26, 2015 at 11:57:45 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 27, 2015 at 11:58:22 AM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.html b/ntpd/ntp.keys.html index 5b8ceaede..fefe22d4d 100644 --- a/ntpd/ntp.keys.html +++ b/ntpd/ntp.keys.html @@ -33,7 +33,7 @@ Up: (dir)

This document describes the symmetric key file for the NTP Project's ntpd program. -

This document applies to version 4.3.64 of ntp.keys. +

This document applies to version 4.3.65 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 47bd02409..63db078f8 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "26 Jul 2015" "4.3.64" "File Formats" +.TH ntp.keys 5 "27 Jul 2015" "4.3.65" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed July 26, 2015 at 11:57:25 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 27, 2015 at 11:58:03 AM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in index e883caefc..6c181b11b 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd July 26 2015 +.Dd July 27 2015 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed July 26, 2015 at 11:57:45 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 27, 2015 at 11:58:22 AM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 587ce58e1..01eaf02a1 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 July 26, 2015 at 11:55:20 AM by AutoGen 5.18.5 + * It has been AutoGen-ed July 27, 2015 at 11:55:59 AM by AutoGen 5.18.5 * From the definitions ntpd-opts.def * and the template file options * @@ -75,7 +75,7 @@ extern FILE * option_usage_fp; * static const strings for ntpd options */ static char const ntpd_opt_strs[3126] = -/* 0 */ "ntpd 4.3.64\n" +/* 0 */ "ntpd 4.3.65\n" "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -205,12 +205,12 @@ static char const ntpd_opt_strs[3126] = /* 2899 */ "output version information and exit\0" /* 2935 */ "version\0" /* 2943 */ "NTPD\0" -/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.64\n" +/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.65\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3078 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3112 */ "\n\0" -/* 3114 */ "ntpd 4.3.64"; +/* 3114 */ "ntpd 4.3.65"; /** * ipv4 option description with @@ -1529,7 +1529,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.3.64\n\ + puts(_("ntpd 4.3.65\n\ Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -1670,7 +1670,7 @@ implied warranty.\n")); puts(_("output version information and exit")); /* referenced via ntpdOptions.pzUsageTitle */ - puts(_("ntpd - NTP daemon program - Ver. 4.3.64\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.3.65\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1678,7 +1678,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.3.64")); + puts(_("ntpd 4.3.65")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 51ac38932..b499de6e6 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 July 26, 2015 at 11:55:18 AM by AutoGen 5.18.5 + * It has been AutoGen-ed July 27, 2015 at 11:55:58 AM by AutoGen 5.18.5 * From the definitions ntpd-opts.def * and the template file options * @@ -106,9 +106,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 38 /** ntpd version */ -#define NTPD_VERSION "4.3.64" +#define NTPD_VERSION "4.3.65" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.3.64" +#define NTPD_FULL_VERSION "ntpd 4.3.65" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index a7542a22b..7be7465bf 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpd 1ntpdman "26 Jul 2015" "4.3.64" "User Commands" +.TH ntpd 1ntpdman "27 Jul 2015" "4.3.65" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-HGaa.y/ag-VGa48y) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-gFaigk/ag-sFaafk) .\" -.\" It has been AutoGen-ed July 26, 2015 at 11:57:29 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 27, 2015 at 11:58:06 AM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -602,6 +602,8 @@ when you have permission to do so from the owner of the target host. Finally, in the past many startup scripts would run \fCntpdate\f[]\fR(1ntpdatemdoc)\f[] +or +\fCsntp\f[]\fR(1sntpmdoc)\f[] to get the system clock close to correct before starting \fCntpd\f[]\fR(1ntpdmdoc)\f[], but this was never more than a mediocre hack and is no longer needed. @@ -611,7 +613,9 @@ and you still need to set the system time before starting \f\*[B-Font]ntpd\fP, please open a bug report and document what is going on, and then look at using -\fCsntp\f[]\fR(1sntpmdoc)\f[]. +\fCsntp\f[]\fR(1sntpmdoc)\f[] +if you really need to set the clock before starting +\f\*[B-Font]ntpd\fP. .sp \n(Ppu .ne 2 diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 836dee6e0..6014245fe 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd July 26 2015 +.Dd July 27 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed July 26, 2015 at 11:57:46 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 27, 2015 at 11:58:24 AM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -532,6 +532,8 @@ when you have permission to do so from the owner of the target host. Finally, in the past many startup scripts would run .Xr ntpdate 1ntpdatemdoc +or +.Xr sntp 1sntpmdoc to get the system clock close to correct before starting .Xr ntpd 1ntpdmdoc , but this was never more than a mediocre hack and is no longer needed. @@ -541,7 +543,9 @@ and you still need to set the system time before starting .Nm , please open a bug report and document what is going on, and then look at using -.Xr sntp 1sntpmdoc . +.Xr sntp 1sntpmdoc +if you really need to set the clock before starting +.Nm . .Pp There is a way to start .Xr ntpd 1ntpdmdoc diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index 74ad21580..c819a3ae2 100644 --- a/ntpd/ntpd.html +++ b/ntpd/ntpd.html @@ -39,7 +39,7 @@ The program can operate in any of several modes, including client/server, symmetric and broadcast modes, and with both symmetric-key and public-key cryptography. -

This document applies to version 4.3.64 of ntpd. +

This document applies to version 4.3.65 of ntpd.