From: NTP Release Engineering Date: Thu, 1 Jun 2023 08:43:35 +0000 (-0700) Subject: NTP_4_3_102 X-Git-Tag: NTP_4_3_102^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5da92d5b3bb4187f26ead5eac4bbdf542271e058;p=thirdparty%2Fntp.git NTP_4_3_102 bk: 64785a378988ZZ396qhfU7yOsQ2m7w --- diff --git a/ChangeLog b/ChangeLog index cd0b54875..645145b47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.102) 2023/06/01 Released by Harlan Stenn From ntp-4.2.8p16: --- (4.2.8p16) 2023/05/31 Released by Harlan Stenn diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 299f5a5b5..1f6ff0a4e 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 May 17, 2023 at 12:44:23 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 1, 2023 at 01:29:25 AM by AutoGen 5.18.16 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -1456,17 +1456,27 @@ client abuse. The @code{average} subcommand specifies the minimum average packet -spacing, while the +spacing in log2 seconds, defaulting to 3 (8s), while the @code{minimum} -subcommand specifies the minimum packet spacing. +subcommand specifies the minimum packet spacing +in seconds, defaulting to 2. Packets that violate these minima are discarded and a kiss-o'-death packet returned if enabled. -The default -minimum average and minimum are 5 and 2, respectively. The @code{monitor} -subcommand specifies the probability of discard -for packets that overflow the rate-control window. +subcommand indirectly specifies the probability of +replacing the oldest entry from the monitor (MRU) +list of recent requests used to enforce rate controls, +when that list is at its maximum size. The probability +of replacing the oldest entry is the age of that entry +in seconds divided by the +@code{monitor} +value, default 3000. For example, if the oldest entry +in the MRU list represents a request 300 seconds ago, +by default the probability of replacing it with an +entry representing the client request being processed +now is 10%. Conversely, if the oldest entry is more +than 3000 seconds old, the probability is 100%. @item @code{restrict} @code{address} @code{[@code{mask} @kbd{mask}]} @code{[@code{ippeerlimit} @kbd{int}]} @code{[@kbd{flag} @kbd{...}]} The @kbd{address} @@ -2775,7 +2785,7 @@ For the JJY driver (type 40 mode 100 - 180), the argument is one telephone number used to dial the telephone JJY service. The Hayes command ATDT is normally prepended to the number. The number can contain other modem control codes as well. -@item @code{pollskewlist} @code{[@kbd{poll} @kbd{value} | @kbd{value}]} @kbd{...} @code{[@code{default} @kbd{value} | @kbd{value}]} +@item @code{pollskewlist} @code{[@kbd{poll} @kbd{early} @kbd{late}]} @kbd{...} @code{[@code{default} @kbd{early} @kbd{late}]} Enable skewing of our poll requests to our servers. @kbd{poll} is a number between 3 and 17 inclusive, identifying a specific poll interval. @@ -2786,9 +2796,11 @@ a poll interval of 17 corresponds to 131,072 seconds, or about a day and a half. The next two numbers must be between 0 and one-half of the poll interval, inclusive. -The first number specifies how early the poll may start, +Ar early +specifies how early the poll may start, while -the second number specifies how late the poll may be delayed. +Ar late +specifies how late the poll may be delayed. With no arguments, internally specified default values are chosen. @item @code{reset} @code{[@code{allpeers}]} @code{[@code{auth}]} @code{[@code{ctl}]} @code{[@code{io}]} @code{[@code{mem}]} @code{[@code{sys}]} @code{[@code{timer}]} Reset one or more groups of counters maintained by diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index 8c88e9a24..261392c14 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 May 17, 2023 at 12:44:25 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 1, 2023 at 01:29:28 AM by AutoGen 5.18.16 # 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 a809e5fff..0abf31ee0 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 May 17, 2023 at 12:44:27 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 1, 2023 at 01:29:30 AM by AutoGen 5.18.16 # 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.101 +ntpd - NTP daemon program - Ver. 4.3.102 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description @@ -210,7 +210,7 @@ hyphen and the flag character. The following option preset mechanisms are supported: - examining environment variables named NTPD_* -Please send bug reports to: +Please send bug reports to: @end example @exampleindent 4 @@ -685,7 +685,7 @@ The command line options relating to configuration and/or usage help are: Print the program version to standard out, optionally with licensing information, then exit 0. The optional argument specifies how much licensing -detail to provide. The default is to print just the version. The licensing infomation may be selected with an option argument. +detail to provide. The default is to print just the version. The licensing information may be selected with an option argument. Only the first letter of the argument is examined: @table @samp diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 84330a9ee..bf664abeb 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 "17 May 2023" "4.3.101" "File Formats" +.TH ntp.conf 5man "01 Jun 2023" "4.3.102" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 17, 2023 at 12:44:29 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 1, 2023 at 01:29:32 AM by AutoGen 5.18.16 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -1657,17 +1657,27 @@ client abuse. The \f\*[B-Font]average\f[] subcommand specifies the minimum average packet -spacing, while the +spacing in log2 seconds, defaulting to 3 (8s), while the \f\*[B-Font]minimum\f[] -subcommand specifies the minimum packet spacing. +subcommand specifies the minimum packet spacing +in seconds, defaulting to 2. Packets that violate these minima are discarded and a kiss-o'-death packet returned if enabled. -The default -minimum average and minimum are 5 and 2, respectively. The \f\*[B-Font]monitor\f[] -subcommand specifies the probability of discard -for packets that overflow the rate-control window. +subcommand indirectly specifies the probability of +replacing the oldest entry from the monitor (MRU) +list of recent requests used to enforce rate controls, +when that list is at its maximum size. The probability +of replacing the oldest entry is the age of that entry +in seconds divided by the +\f\*[B-Font]monitor\f[] +value, default 3000. For example, if the oldest entry +in the MRU list represents a request 300 seconds ago, +by default the probability of replacing it with an +entry representing the client request being processed +now is 10%. Conversely, if the oldest entry is more +than 3000 seconds old, the probability is 100%. .TP 7 .NOP \f\*[B-Font]restrict\f[] \f\*[B-Font]address\f[] [\f\*[B-Font]mask\f[] \f\*[I-Font]mask\f[]] [\f\*[B-Font]ippeerlimit\f[] \f\*[I-Font]int\f[]] [\f\*[I-Font]flag\f[] \f\*[I-Font]...\f[]] The @@ -3101,7 +3111,7 @@ one telephone number used to dial the telephone JJY service. The Hayes command ATDT is normally prepended to the number. The number can contain other modem control codes as well. .TP 7 -.NOP \f\*[B-Font]pollskewlist\f[] [\f\*[I-Font]poll\f[] \f\*[I-Font]value\f[] | \f\*[I-Font]value\f[]] \f\*[I-Font]...\f[] [\f\*[B-Font]default\f[] \f\*[I-Font]value\f[] | \f\*[I-Font]value\f[]] +.NOP \f\*[B-Font]pollskewlist\f[] [\f\*[I-Font]poll\f[] \f\*[I-Font]early\f[] \f\*[I-Font]late\f[]] \f\*[I-Font]...\f[] [\f\*[B-Font]default\f[] \f\*[I-Font]early\f[] \f\*[I-Font]late\f[]] Enable skewing of our poll requests to our servers. \f\*[I-Font]poll\f[] is a number between 3 and 17 inclusive, identifying a specific poll interval. @@ -3112,9 +3122,11 @@ a poll interval of 17 corresponds to 131,072 seconds, or about a day and a half. The next two numbers must be between 0 and one-half of the poll interval, inclusive. -The first number specifies how early the poll may start, +Ar early +specifies how early the poll may start, while -the second number specifies how late the poll may be delayed. +Ar late +specifies how late the poll may be delayed. With no arguments, internally specified default values are chosen. .TP 7 .NOP \f\*[B-Font]reset\f[] [\f\*[B-Font]allpeers\f[]] [\f\*[B-Font]auth\f[]] [\f\*[B-Font]ctl\f[]] [\f\*[B-Font]io\f[]] [\f\*[B-Font]mem\f[]] [\f\*[B-Font]sys\f[]] [\f\*[B-Font]timer\f[]] @@ -3449,7 +3461,7 @@ RFC5905 .SH "AUTHORS" The University of Delaware and Network Time Foundation .SH "COPYRIGHT" -Copyright (C) 1992-2020 The University of Delaware and Network Time Foundation all rights reserved. +Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .SH BUGS The syntax checking is not picky; some combinations of @@ -3467,7 +3479,7 @@ services when they become universally available. .sp \n(Ppu .ne 2 -Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org +Please send bug reports to: https://bugs.ntp.org, bugs@ntp.org .SH NOTES This document was derived from FreeBSD. .sp \n(Ppu diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 9bb94de5c..fc84ca1ff 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd May 17 2023 +.Dd June 1 2023 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed May 17, 2023 at 12:44:18 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 1, 2023 at 01:29:19 AM by AutoGen 5.18.16 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -1525,17 +1525,27 @@ client abuse. The .Cm average subcommand specifies the minimum average packet -spacing, while the +spacing in log2 seconds, defaulting to 3 (8s), while the .Cm minimum -subcommand specifies the minimum packet spacing. +subcommand specifies the minimum packet spacing +in seconds, defaulting to 2. Packets that violate these minima are discarded and a kiss\-o'\-death packet returned if enabled. -The default -minimum average and minimum are 5 and 2, respectively. The .Ic monitor -subcommand specifies the probability of discard -for packets that overflow the rate\-control window. +subcommand indirectly specifies the probability of +replacing the oldest entry from the monitor (MRU) +list of recent requests used to enforce rate controls, +when that list is at its maximum size. The probability +of replacing the oldest entry is the age of that entry +in seconds divided by the +.Ic monitor +value, default 3000. For example, if the oldest entry +in the MRU list represents a request 300 seconds ago, +by default the probability of replacing it with an +entry representing the client request being processed +now is 10%. Conversely, if the oldest entry is more +than 3000 seconds old, the probability is 100%. .It Xo Ic restrict address .Op Cm mask Ar mask .Op Cm ippeerlimit Ar int @@ -2932,12 +2942,12 @@ The number can contain other modem control codes as well. .It Xo Cm pollskewlist .Oo .Ar poll -.Ar value | value +.Ar early late .Oc .Ar ... .Oo .Cm default -.Ar value | value +.Ar early late .Oc .Xc Enable skewing of our poll requests to our servers. @@ -2950,9 +2960,11 @@ a poll interval of 17 corresponds to 131,072 seconds, or about a day and a half. The next two numbers must be between 0 and one\-half of the poll interval, inclusive. -The first number specifies how early the poll may start, +Ar early +specifies how early the poll may start, while -the second number specifies how late the poll may be delayed. +Ar late +specifies how late the poll may be delayed. With no arguments, internally specified default values are chosen. .It Xo Ic reset .Oo @@ -3290,7 +3302,7 @@ A snapshot of this documentation is available in HTML format in .Sh "AUTHORS" The University of Delaware and Network Time Foundation .Sh "COPYRIGHT" -Copyright (C) 1992\-2020 The University of Delaware and Network Time Foundation all rights reserved. +Copyright (C) 1992\-2023 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS The syntax checking is not picky; some combinations of @@ -3304,7 +3316,7 @@ certificates. These should be obtained via secure directory services when they become universally available. .Pp -Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org +Please send bug reports to: https://bugs.ntp.org, bugs@ntp.org .Sh NOTES This document was derived from FreeBSD. .Pp diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index 87b507352..3ceb6781a 100644 --- a/ntpd/ntp.conf.html +++ b/ntpd/ntp.conf.html @@ -1,6 +1,6 @@ - + NTP Configuration File User’s Manual @@ -16,23 +16,14 @@ + NTP Symmetric Key @@ -16,23 +16,14 @@ + ntpd: Network Time Protocol (NTP) Daemon User’s Manual @@ -16,23 +16,14 @@ + ntpdc: NTPD Control User’s Manual @@ -16,23 +16,14 @@ + ntpq: Network Time Protocol Query User’s Manual @@ -16,23 +16,14 @@ + ntpsnmpd: Network Time Protocol SNMP Daemon User’s Manual @@ -16,23 +16,14 @@ + calc_tickadj User’s Manual @@ -16,23 +16,14 @@ + Ntp-wait User’s Manual @@ -16,23 +16,14 @@ + ntpsweep User’s Manual @@ -16,23 +16,14 @@ + Ntptrace User’s Manual @@ -16,23 +16,14 @@ + Plot_summary User’s Manual @@ -16,23 +16,14 @@ + Summary User’s Manual @@ -16,23 +16,14 @@ + Sntp User’s Manual @@ -16,23 +16,14 @@ + Ntp-keygen User’s Manual @@ -16,23 +16,14 @@