From: Harlan Stenn Date: Wed, 26 Feb 2014 10:06:59 +0000 (+0000) Subject: NTP_4_2_7P425 X-Git-Tag: NTP_4_2_7P425^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81a753d6059dce1428d3c384e1130d52bae98345;p=thirdparty%2Fntp.git NTP_4_2_7P425 bk: 530dbcc3Xw5hV1JuuRhKiSWlEW37aA --- diff --git a/ChangeLog b/ChangeLog index 8d8971eb7..41464a72d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p425) 2014/02/26 Released by Harlan Stenn * Copyright file update. (4.2.7p424) 2014/02/24 Released by Harlan Stenn * [Bug 2541] ntpd terminates itself with SIGHUP unexpectedly. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 6304707fb..4bcf1fca8 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 February 24, 2014 at 05:55:58 AM by AutoGen 5.18.3pre11 +# It has been AutoGen-ed February 25, 2014 at 10:53:15 AM by AutoGen 5.18.3pre11 # 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 2dca6ac02..ac60b0296 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 February 24, 2014 at 05:56:00 AM by AutoGen 5.18.3pre11 +# It has been AutoGen-ed February 25, 2014 at 10:53:18 AM by AutoGen 5.18.3pre11 # 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 f9a6f7c9f..ff251b06e 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 February 24, 2014 at 05:56:02 AM by AutoGen 5.18.3pre11 +# It has been AutoGen-ed February 25, 2014 at 10:53:20 AM by AutoGen 5.18.3pre11 # 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.2.7p424 +ntpd - NTP daemon program - Ver. 4.2.7p425 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 1679539a5..0a592ab1e 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 "24 Feb 2014" "4.2.7p424" "File Formats" +.TH ntp.conf 5man "25 Feb 2014" "4.2.7p425" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-4Yaqiv/ag-yZaqhv) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-AvaGkx/ag-gwaGjx) .\" -.\" It has been AutoGen-ed February 24, 2014 at 05:55:44 AM by AutoGen 5.18.3pre11 +.\" It has been AutoGen-ed February 25, 2014 at 10:52:54 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2902,11 +2902,11 @@ by loading values from environment variables named: \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad -.TH ntp.conf 5man "24 Feb 2014" "4.2.7p424" "File Formats" +.TH ntp.conf 5man "25 Feb 2014" "4.2.7p425" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-4Yaqiv/ag-yZaqhv) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-AvaGkx/ag-gwaGjx) .\" -.\" It has been AutoGen-ed February 24, 2014 at 05:55:44 AM by AutoGen 5.18.3pre11 +.\" It has been AutoGen-ed February 25, 2014 at 10:52:54 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -3012,7 +3012,7 @@ services when they become universally available. Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p424 of NTP. +This document corresponds to version 4.2.7p425 of NTP. This document was derived from FreeBSD. .sp \n(Ppu .ne 2 diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index d530f3a78..08e7a6b24 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd February 24 2014 +.Dd February 25 2014 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed February 24, 2014 at 05:56:05 AM by AutoGen 5.18.3pre11 +.\" It has been AutoGen-ed February 25, 2014 at 10:53:25 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2809,7 +2809,7 @@ services when they become universally available. .Pp Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p424 of NTP. +This document corresponds to version 4.2.7p425 of NTP. This document was derived from FreeBSD. .Pp This manual page was \fIAutoGen\fP\-erated from the \fBntp.conf\fP diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index adc1a8a8c..647a30113 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.2.7p424 of ntp.conf. +

This document applies to version 4.2.7p425 of ntp.conf.

Short Contents

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 8b28c9f8c..0be0a1c26 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 "24 Feb 2014" "4.2.7p424" "File Formats" +.TH ntp.conf 5 "25 Feb 2014" "4.2.7p425" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-4Yaqiv/ag-yZaqhv) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-AvaGkx/ag-gwaGjx) .\" -.\" It has been AutoGen-ed February 24, 2014 at 05:55:44 AM by AutoGen 5.18.3pre11 +.\" It has been AutoGen-ed February 25, 2014 at 10:52:54 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2902,11 +2902,11 @@ by loading values from environment variables named: \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad -.TH ntp.conf 5 "24 Feb 2014" "4.2.7p424" "File Formats" +.TH ntp.conf 5 "25 Feb 2014" "4.2.7p425" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-4Yaqiv/ag-yZaqhv) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-AvaGkx/ag-gwaGjx) .\" -.\" It has been AutoGen-ed February 24, 2014 at 05:55:44 AM by AutoGen 5.18.3pre11 +.\" It has been AutoGen-ed February 25, 2014 at 10:52:54 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -3012,7 +3012,7 @@ services when they become universally available. Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p424 of NTP. +This document corresponds to version 4.2.7p425 of NTP. This document was derived from FreeBSD. .sp \n(Ppu .ne 2 diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 5355ec935..8a0609bdb 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd February 24 2014 +.Dd February 25 2014 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed February 24, 2014 at 05:56:05 AM by AutoGen 5.18.3pre11 +.\" It has been AutoGen-ed February 25, 2014 at 10:53:25 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2809,7 +2809,7 @@ services when they become universally available. .Pp Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p424 of NTP. +This document corresponds to version 4.2.7p425 of NTP. This document was derived from FreeBSD. .Pp This manual page was \fIAutoGen\fP\-erated from the \fBntp.conf\fP diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index 684334805..6671548a2 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "24 Feb 2014" "4.2.7p424" "File Formats" +.TH ntp.keys 5man "25 Feb 2014" "4.2.7p425" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed February 24, 2014 at 05:55:50 AM by AutoGen 5.18.3pre11 +.\" It has been AutoGen-ed February 25, 2014 at 10:53:04 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME @@ -177,7 +177,7 @@ This program is released under the terms of the NTP license, (dir)

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

This document applies to version 4.2.7p424 of ntp.keys. +

This document applies to version 4.2.7p425 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index fde687c8f..8a494bb70 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "24 Feb 2014" "4.2.7p424" "File Formats" +.TH ntp.keys 5 "25 Feb 2014" "4.2.7p425" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed February 24, 2014 at 05:55:50 AM by AutoGen 5.18.3pre11 +.\" It has been AutoGen-ed February 25, 2014 at 10:53:04 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME @@ -177,7 +177,7 @@ This program is released under the terms of the NTP license, [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 2960 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2994 */ "\n\0" -/* 2996 */ "ntpd 4.2.7p424"; +/* 2996 */ "ntpd 4.2.7p425"; /** * ipv4 option description with @@ -1558,7 +1558,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.2.7p424\n\ + puts(_("ntpd 4.2.7p425\n\ Copyright (C) 1970-2013 The University of Delaware, 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\ @@ -1695,7 +1695,7 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("output version information and exit")); /* referenced via ntpdOptions.pzUsageTitle */ - puts(_("ntpd - NTP daemon program - Ver. 4.2.7p424\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.2.7p425\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1703,7 +1703,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.2.7p424")); + puts(_("ntpd 4.2.7p425")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 19d6af517..8b2af4c2a 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 February 24, 2014 at 05:52:42 AM by AutoGen 5.18.3pre11 + * It has been AutoGen-ed February 25, 2014 at 10:45:30 AM by AutoGen 5.18.3pre11 * 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.2.7p424" +#define NTPD_VERSION "4.2.7p425" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.2.7p424" +#define NTPD_FULL_VERSION "ntpd 4.2.7p425" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 0b722c837..0d6befdf8 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 "24 Feb 2014" "4.2.7p424" "User Commands" +.TH ntpd 1ntpdman "25 Feb 2014" "4.2.7p425" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-BdaaEw/ag-NdaaDw) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-TkaqGy/ag-nlaqFy) .\" -.\" It has been AutoGen-ed February 24, 2014 at 05:55:53 AM by AutoGen 5.18.3pre11 +.\" It has been AutoGen-ed February 25, 2014 at 10:53:09 AM by AutoGen 5.18.3pre11 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -434,11 +434,11 @@ by loading values from environment variables named: \fBNTPD_\fP or \fBNTPD\fP .fi .ad -.TH ntpd 1ntpdman "24 Feb 2014" "4.2.7p424" "User Commands" +.TH ntpd 1ntpdman "25 Feb 2014" "4.2.7p425" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-BdaaEw/ag-NdaaDw) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-TkaqGy/ag-nlaqFy) .\" -.\" It has been AutoGen-ed February 24, 2014 at 05:55:53 AM by AutoGen 5.18.3pre11 +.\" It has been AutoGen-ed February 25, 2014 at 10:53:09 AM by AutoGen 5.18.3pre11 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -999,7 +999,7 @@ mind. Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p424 of NTP. +This document corresponds to version 4.2.7p425 of NTP. Portions of this document came from FreeBSD. .sp \n(Ppu .ne 2 diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 9ef36d080..eff4b267f 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd February 24 2014 +.Dd February 25 2014 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed February 24, 2014 at 05:56:10 AM by AutoGen 5.18.3pre11 +.\" It has been AutoGen-ed February 25, 2014 at 10:53:32 AM by AutoGen 5.18.3pre11 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -895,7 +895,7 @@ mind. .Pp Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p424 of NTP. +This document corresponds to version 4.2.7p425 of NTP. Portions of this document came from FreeBSD. .Pp This manual page was \fIAutoGen\fP\-erated from the \fBntpd\fP diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index 663b24be4..500894f56 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.2.7p424 of ntpd. +

This document applies to version 4.2.7p425 of ntpd.