From: Harlan Stenn Date: Thu, 1 Aug 2013 06:45:33 +0000 (+0000) Subject: NTP_4_2_7P378 X-Git-Tag: NTP_4_2_7P378^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d1a48a6c4545e7979976f2dcc55cba33910da35;p=thirdparty%2Fntp.git NTP_4_2_7P378 bk: 51fa040d3zGwY8gbSJnRH-gjDUPmKg --- diff --git a/ChangeLog b/ChangeLog index 6cc7e1929..b98a6360c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p378) 2013/08/01 Released by Harlan Stenn * [Bug 2425] move part of input handler code from ntpd.c to ntp_io.c and fix select()-only platforms calling input_handler directly. * [Bug 2446] Quiet warnings from Oracle's Studio compiler. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index f9728b043..56140cc8b 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 August 1, 2013 at 02:31:57 AM by AutoGen 5.18.1pre3 +# It has been AutoGen-ed August 1, 2013 at 06:37:50 AM by AutoGen 5.18.1pre3 # 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 17e2b0702..00bc4d209 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 August 1, 2013 at 02:31:59 AM by AutoGen 5.18.1pre3 +# It has been AutoGen-ed August 1, 2013 at 06:37:52 AM by AutoGen 5.18.1pre3 # 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 6b6879020..a0cfacddd 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 August 1, 2013 at 02:32:00 AM by AutoGen 5.18.1pre3 +# It has been AutoGen-ed August 1, 2013 at 02:40:42 AM by AutoGen 5.18.1pre3 # 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.7p377 +ntpd - NTP daemon program - Ver. 4.2.7p378 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 49bed9cb3..6f115e872 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -1,8 +1,8 @@ -.TH ntp.conf 5man "01 Aug 2013" "4.2.7p377" "File Formats" +.TH ntp.conf 5man "01 Aug 2013" "4.2.7p378" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed August 1, 2013 at 02:32:02 AM by AutoGen 5.18.1pre3 +.\" It has been AutoGen-ed August 1, 2013 at 06:37:37 AM by AutoGen 5.18.1pre3 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -2892,6 +2892,25 @@ by loading values from environment variables named: \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad +cvt_prog='/usr/local/gnu/share/autogen/texi2man' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation-notes environment files examples exit-status errors + compatibility see-also conforming-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end-doc + rm \-f $list + list=`ls \-1 *`' .end-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES @@ -2957,7 +2976,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.7p377 of NTP. +This document corresponds to version 4.2.7p378 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.5mdoc b/ntpd/ntp.conf.5mdoc index 6eb676609..555663e3e 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ .Dd August 1 2013 .Dt NTP_CONF 5mdoc File Formats -.Os FreeBSD 6.4-STABLE +.Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed August 1, 2013 at 02:31:45 AM by AutoGen 5.18.1pre3 +.\" It has been AutoGen-ed August 1, 2013 at 02:40:44 AM by AutoGen 5.18.1pre3 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2724,6 +2724,25 @@ by loading values from environment variables named: \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad +cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option\-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation\-notes environment files examples exit\-status errors + compatibility see\-also conforming\-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end\-doc + rm \-f $list + list=`ls \-1 *`' .end\-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES @@ -2785,7 +2804,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.7p377 of NTP. +This document corresponds to version 4.2.7p378 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 b6c494700..66d1c97c6 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.7p377 of ntp.conf. +

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