From: Harlan Stenn Date: Fri, 5 Jun 2015 11:59:14 +0000 (+0000) Subject: NTP_4_3_35 X-Git-Tag: NTP_4_3_35^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e3169899b49a39354dbe6d816b52b0dfd4d7a3e;p=thirdparty%2Fntp.git NTP_4_3_35 bk: 55718f12n6oJKAzHLzEiKoCWeEbtkQ --- diff --git a/ChangeLog b/ChangeLog index 20f9491c7..77316904f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.35) 2015/06/05 Released by Harlan Stenn Below are from 4.2.8p3: * [Bug 2830] ntpd doesn't always transfer the correct TAI offset via autokey NTPD transfers the current TAI (instead of an announcement) now. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 2ebaa9811..18fc6b240 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 June 4, 2015 at 03:36:00 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 5, 2015 at 11:56:53 AM by AutoGen 5.18.5 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -2570,11 +2570,11 @@ option). The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. @item @code{stacksize} @kbd{N4kPages} Specifies the maximum size of the process stack on systems with the -@item @code{filenum} @kbd{Nfiledescriptors} -Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. @code{mlockall()} function. Defaults to 50 4k pages (200 4k pages in OpenBSD). +@item @code{filenum} @kbd{Nfiledescriptors} +Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. @end table @item @code{trap} @kbd{host_address} @code{[@code{port} @kbd{port_number}]} @code{[@code{interface} @kbd{interface_address}]} This command configures a trap receiver at the given host diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index 284ca393a..f6e1b6f26 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 June 4, 2015 at 03:36:03 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 5, 2015 at 11:56:56 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 4c2c2f005..94ca9df29 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 June 4, 2015 at 03:36:05 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 5, 2015 at 11:56:58 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.34 +ntpd - NTP daemon program - Ver. 4.3.35 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 325d4c146..91b5b0351 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 "04 Jun 2015" "4.3.34" "File Formats" +.TH ntp.conf 5man "05 Jun 2015" "4.3.35" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-H8aWnL/ag-T8aOmL) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-NFaaIr/ag-ZFa4Gr) .\" -.\" It has been AutoGen-ed June 4, 2015 at 03:35:46 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 5, 2015 at 11:56:40 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2888,12 +2888,12 @@ The default is 32 megabytes. Setting this to zero will prevent any attemp to loc .TP 7 .NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[] Specifies the maximum size of the process stack on systems with the -.TP 7 -.NOP \f\*[B-Font]filenum\f[] \f\*[I-Font]Nfiledescriptors\f[] -Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. \fBmlockall\fR()\f[] function. Defaults to 50 4k pages (200 4k pages in OpenBSD). +.TP 7 +.NOP \f\*[B-Font]filenum\f[] \f\*[I-Font]Nfiledescriptors\f[] +Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. .RE .TP 7 .NOP \f\*[B-Font]trap\f[] \f\*[I-Font]host_address\f[] [\f\*[B-Font]port\f[] \f\*[I-Font]port_number\f[]] [\f\*[B-Font]interface\f[] \f\*[I-Font]interface_address\f[]] diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 6952948de..b7e5212f9 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd June 4 2015 +.Dd June 5 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 4, 2015 at 03:36:08 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 5, 2015 at 11:57:00 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2717,11 +2717,11 @@ option). The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. .It Cm stacksize Ar N4kPages Specifies the maximum size of the process stack on systems with the -.It Cm filenum Ar Nfiledescriptors -Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. .Fn mlockall function. Defaults to 50 4k pages (200 4k pages in OpenBSD). +.It Cm filenum Ar Nfiledescriptors +Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. .El .It Xo Ic trap Ar host_address .Op Cm port Ar port_number diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index 274efe09e..aa5698448 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.34 of ntp.conf. +

This document applies to version 4.3.35 of ntp.conf.

Short Contents

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 7ca87082d..fd3e636ee 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 "04 Jun 2015" "4.3.34" "File Formats" +.TH ntp.conf 5 "05 Jun 2015" "4.3.35" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-H8aWnL/ag-T8aOmL) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-NFaaIr/ag-ZFa4Gr) .\" -.\" It has been AutoGen-ed June 4, 2015 at 03:35:46 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 5, 2015 at 11:56:40 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2888,12 +2888,12 @@ The default is 32 megabytes. Setting this to zero will prevent any attemp to loc .TP 7 .NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[] Specifies the maximum size of the process stack on systems with the -.TP 7 -.NOP \f\*[B-Font]filenum\f[] \f\*[I-Font]Nfiledescriptors\f[] -Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. \fBmlockall\fR()\f[] function. Defaults to 50 4k pages (200 4k pages in OpenBSD). +.TP 7 +.NOP \f\*[B-Font]filenum\f[] \f\*[I-Font]Nfiledescriptors\f[] +Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. .RE .TP 7 .NOP \f\*[B-Font]trap\f[] \f\*[I-Font]host_address\f[] [\f\*[B-Font]port\f[] \f\*[I-Font]port_number\f[]] [\f\*[B-Font]interface\f[] \f\*[I-Font]interface_address\f[]] diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 6a9ce63f1..dae4a314a 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 4 2015 +.Dd June 5 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 4, 2015 at 03:36:08 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 5, 2015 at 11:57:00 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2717,11 +2717,11 @@ option). The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. .It Cm stacksize Ar N4kPages Specifies the maximum size of the process stack on systems with the -.It Cm filenum Ar Nfiledescriptors -Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. .Fn mlockall function. Defaults to 50 4k pages (200 4k pages in OpenBSD). +.It Cm filenum Ar Nfiledescriptors +Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. .El .It Xo Ic trap Ar host_address .Op Cm port Ar port_number diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index ec3924512..7e2e0b7d2 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "04 Jun 2015" "4.3.34" "File Formats" +.TH ntp.keys 5man "05 Jun 2015" "4.3.35" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed June 4, 2015 at 03:35:51 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 5, 2015 at 11:56:45 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 c3c93413d..305c82907 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd June 4 2015 +.Dd June 5 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 4, 2015 at 03:36:11 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 5, 2015 at 11:57:04 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 8cbe4f770..f53addf59 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.34 of ntp.keys. +

This document applies to version 4.3.35 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index c05d718cf..78b770f99 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "04 Jun 2015" "4.3.34" "File Formats" +.TH ntp.keys 5 "05 Jun 2015" "4.3.35" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed June 4, 2015 at 03:35:51 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 5, 2015 at 11:56:45 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 49eff41f0..7baa4888b 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 4 2015 +.Dd June 5 2015 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 4, 2015 at 03:36:11 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 5, 2015 at 11:57:04 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 bd614d1bc..291d5c5c9 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 June 4, 2015 at 03:33:18 AM by AutoGen 5.18.5 + * It has been AutoGen-ed June 5, 2015 at 11:54:12 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.34\n" +/* 0 */ "ntpd 4.3.35\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.34\n" +/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.35\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3078 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3112 */ "\n\0" -/* 3114 */ "ntpd 4.3.34"; +/* 3114 */ "ntpd 4.3.35"; /** * ipv4 option description with @@ -1529,7 +1529,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.3.34\n\ + puts(_("ntpd 4.3.35\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.34\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.3.35\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1678,7 +1678,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.3.34")); + puts(_("ntpd 4.3.35")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 91cbc3e23..15618732e 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 June 4, 2015 at 03:33:17 AM by AutoGen 5.18.5 + * It has been AutoGen-ed June 5, 2015 at 11:54:11 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.34" +#define NTPD_VERSION "4.3.35" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.3.34" +#define NTPD_FULL_VERSION "ntpd 4.3.35" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 292c2b3af..299b76270 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 "04 Jun 2015" "4.3.34" "User Commands" +.TH ntpd 1ntpdman "05 Jun 2015" "4.3.35" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-MeaGHM/ag-ZeayGM) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-0JaO1s/ag-bKaG0s) .\" -.\" It has been AutoGen-ed June 4, 2015 at 03:35:55 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 5, 2015 at 11:56:49 AM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 303632714..3c52bcfb1 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd June 4 2015 +.Dd June 5 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed June 4, 2015 at 03:36:13 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 5, 2015 at 11:57:06 AM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index 30b08d070..07cf825c1 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.34 of ntpd. +

This document applies to version 4.3.35 of ntpd.