From: Harlan Stenn Date: Fri, 6 Mar 2015 11:58:57 +0000 (+0000) Subject: NTP_4_3_6 X-Git-Tag: NTP_4_3_6^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31728d2a5a1de9eef8a5362b2e942f25cbec71c2;p=thirdparty%2Fntp.git NTP_4_3_6 bk: 54f996816V0KTSHVa4H5PpFRru1E_g --- diff --git a/ChangeLog b/ChangeLog index f1f549227..57bb9a6a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.6) 2015/03/06 Released by Harlan Stenn Below are from 4.2.8p2: * [Bug 2782] Refactor refclock_shm.c, add memory barrier protection. (4.3.5) 2015/03/05 Released by Harlan Stenn diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 03ce8b488..fdc233b73 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 March 5, 2015 at 11:56:50 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed March 6, 2015 at 11:56:39 AM by AutoGen 5.18.5pre4 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index bd31e3894..a196ebf88 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 March 5, 2015 at 11:56:53 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed March 6, 2015 at 11:56:42 AM by AutoGen 5.18.5pre4 # 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 bd08dd6c9..173e9a747 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 March 5, 2015 at 11:56:55 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed March 6, 2015 at 11:56:44 AM by AutoGen 5.18.5pre4 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -141,7 +141,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.3.5 +ntpd - NTP daemon program - Ver. 4.3.6 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 5ca3a118f..8a851380e 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 "05 Mar 2015" "4.3.5" "File Formats" +.TH ntp.conf 5man "06 Mar 2015" "4.3.6" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-q5aiSu/ag-D5aaRu) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-_4aqeY/ag-m5aidY) .\" -.\" It has been AutoGen-ed March 5, 2015 at 11:56:38 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed March 6, 2015 at 11:56:27 AM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 9274c37e4..830ce4b46 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd March 5 2015 +.Dd March 6 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed March 5, 2015 at 11:56:58 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed March 6, 2015 at 11:56:46 AM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index 2966f11ae..b7d2be7ba 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.5 of ntp.conf. +

This document applies to version 4.3.6 of ntp.conf.

Short Contents

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index fb57d75f5..5d68b30b5 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 "05 Mar 2015" "4.3.5" "File Formats" +.TH ntp.conf 5 "06 Mar 2015" "4.3.6" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-q5aiSu/ag-D5aaRu) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-_4aqeY/ag-m5aidY) .\" -.\" It has been AutoGen-ed March 5, 2015 at 11:56:38 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed March 6, 2015 at 11:56:27 AM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 4ca3a6531..4bd0caf51 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd March 5 2015 +.Dd March 6 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed March 5, 2015 at 11:56:58 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed March 6, 2015 at 11:56:46 AM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index eaa851338..de93755da 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "05 Mar 2015" "4.3.5" "File Formats" +.TH ntp.keys 5man "06 Mar 2015" "4.3.6" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed March 5, 2015 at 11:56:43 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed March 6, 2015 at 11:56:31 AM by AutoGen 5.18.5pre4 .\" 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 df512d31c..83cd6a582 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd March 5 2015 +.Dd March 6 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed March 5, 2015 at 11:57:01 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed March 6, 2015 at 11:56:50 AM by AutoGen 5.18.5pre4 .\" 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 4dbb3e0ed..253139f6d 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.5 of ntp.keys. +

This document applies to version 4.3.6 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 5709387cc..4fa278cff 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "05 Mar 2015" "4.3.5" "File Formats" +.TH ntp.keys 5 "06 Mar 2015" "4.3.6" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed March 5, 2015 at 11:56:43 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed March 6, 2015 at 11:56:31 AM by AutoGen 5.18.5pre4 .\" 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 48384f8d0..5000c72fb 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd March 5 2015 +.Dd March 6 2015 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed March 5, 2015 at 11:57:01 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed March 6, 2015 at 11:56:50 AM by AutoGen 5.18.5pre4 .\" 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 f60e69b55..a079d061f 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 March 5, 2015 at 11:54:17 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed March 6, 2015 at 11:54:07 AM by AutoGen 5.18.5pre4 * 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[3055] = -/* 0 */ "ntpd 4.3.5\n" +/* 0 */ "ntpd 4.3.6\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" @@ -202,12 +202,12 @@ static char const ntpd_opt_strs[3055] = /* 2830 */ "output version information and exit\0" /* 2866 */ "version\0" /* 2874 */ "NTPD\0" -/* 2879 */ "ntpd - NTP daemon program - Ver. 4.3.5\n" +/* 2879 */ "ntpd - NTP daemon program - Ver. 4.3.6\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3008 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3042 */ "\n\0" -/* 3044 */ "ntpd 4.3.5"; +/* 3044 */ "ntpd 4.3.6"; /** * ipv4 option description with @@ -1502,7 +1502,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.3.5\n\ + puts(_("ntpd 4.3.6\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\ @@ -1640,7 +1640,7 @@ implied warranty.\n")); puts(_("output version information and exit")); /* referenced via ntpdOptions.pzUsageTitle */ - puts(_("ntpd - NTP daemon program - Ver. 4.3.5\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.3.6\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1648,7 +1648,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.3.5")); + puts(_("ntpd 4.3.6")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index d596d13b8..13d6a90f9 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 March 5, 2015 at 11:54:16 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed March 6, 2015 at 11:54:06 AM by AutoGen 5.18.5pre4 * From the definitions ntpd-opts.def * and the template file options * @@ -105,9 +105,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 37 /** ntpd version */ -#define NTPD_VERSION "4.3.5" +#define NTPD_VERSION "4.3.6" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.3.5" +#define NTPD_FULL_VERSION "ntpd 4.3.6" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 10eb106a8..1ddfe8b0a 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 "05 Mar 2015" "4.3.5" "User Commands" +.TH ntpd 1ntpdman "06 Mar 2015" "4.3.6" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-u4aW_v/ag-H4aO.v) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Y9a4xZ/ag-_9aWwZ) .\" -.\" It has been AutoGen-ed March 5, 2015 at 11:56:46 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed March 6, 2015 at 11:56:35 AM by AutoGen 5.18.5pre4 .\" 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 6584fc6f5..36b6f761a 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd March 5 2015 +.Dd March 6 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed March 5, 2015 at 11:57:03 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed March 6, 2015 at 11:56:51 AM by AutoGen 5.18.5pre4 .\" 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 99740bf6f..3f3aea4ac 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.5 of ntpd. +

This document applies to version 4.3.6 of ntpd.