From: Harlan Stenn Date: Sat, 13 Jun 2015 19:10:52 +0000 (+0000) Subject: NTP_4_3_40 X-Git-Tag: NTP_4_3_40^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68502cd8aa65e07f1193040268898da4ccb95d30;p=thirdparty%2Fntp.git NTP_4_3_40 bk: 557c803ctxElDMp4FoamQ2tLVaQ2XQ --- diff --git a/ChangeLog b/ChangeLog index 205dfb4f5..533f3595c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.40) 2015/06/13 Released by Harlan Stenn Below are from 4.2.8p3: * [Bug 2845] Harden memory allocation in ntpd. * Unity test framework diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 668504159..5a8a1ac8c 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 12, 2015 at 11:56:48 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 13, 2015 at 03:07:55 PM by AutoGen 5.18.5 # 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 378cd8657..bc0c04930 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 12, 2015 at 11:56:51 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 13, 2015 at 03:07:57 PM 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 fcd427c84..8946cd415 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 12, 2015 at 11:56:53 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 13, 2015 at 03:08:00 PM 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.39 +ntpd - NTP daemon program - Ver. 4.3.40 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index f174f7b14..6e4185816 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 "12 Jun 2015" "4.3.39" "File Formats" +.TH ntp.conf 5man "13 Jun 2015" "4.3.40" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-zEayAt/ag-LEaqzt) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-FcaWO1/ag-ScaON1) .\" -.\" It has been AutoGen-ed June 12, 2015 at 11:56:35 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 13, 2015 at 03:07:41 PM by AutoGen 5.18.5 .\" 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 ade868ad2..3becff3fd 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd June 12 2015 +.Dd June 13 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 12, 2015 at 11:56:55 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 13, 2015 at 03:08:03 PM by AutoGen 5.18.5 .\" 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 e8fad9f81..76104e860 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.39 of ntp.conf. +

This document applies to version 4.3.40 of ntp.conf.

Short Contents

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 226510aef..1825db0cb 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 "12 Jun 2015" "4.3.39" "File Formats" +.TH ntp.conf 5 "13 Jun 2015" "4.3.40" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-zEayAt/ag-LEaqzt) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-FcaWO1/ag-ScaON1) .\" -.\" It has been AutoGen-ed June 12, 2015 at 11:56:35 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 13, 2015 at 03:07:41 PM by AutoGen 5.18.5 .\" 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 d63e89148..539837d3e 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 12 2015 +.Dd June 13 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 12, 2015 at 11:56:55 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 13, 2015 at 03:08:03 PM by AutoGen 5.18.5 .\" 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 fba12aca3..d87c05a76 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "12 Jun 2015" "4.3.39" "File Formats" +.TH ntp.keys 5man "13 Jun 2015" "4.3.40" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed June 12, 2015 at 11:56:40 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 13, 2015 at 03:07:46 PM 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 edfb3f81a..37daef442 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd June 12 2015 +.Dd June 13 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 12, 2015 at 11:56:59 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 13, 2015 at 03:08:06 PM 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 5039e15db..fcddf7cc6 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.39 of ntp.keys. +

This document applies to version 4.3.40 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 0ec8c5352..2bc798fb6 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "12 Jun 2015" "4.3.39" "File Formats" +.TH ntp.keys 5 "13 Jun 2015" "4.3.40" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed June 12, 2015 at 11:56:40 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 13, 2015 at 03:07:46 PM 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 8baca7e86..9603f0a90 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 12 2015 +.Dd June 13 2015 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 12, 2015 at 11:56:59 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 13, 2015 at 03:08:06 PM 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 5d0464ef5..2d80fa5ad 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 12, 2015 at 11:54:08 AM by AutoGen 5.18.5 + * It has been AutoGen-ed June 13, 2015 at 03:05:10 PM 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.39\n" +/* 0 */ "ntpd 4.3.40\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.39\n" +/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.40\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3078 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3112 */ "\n\0" -/* 3114 */ "ntpd 4.3.39"; +/* 3114 */ "ntpd 4.3.40"; /** * ipv4 option description with @@ -1529,7 +1529,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.3.39\n\ + puts(_("ntpd 4.3.40\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.39\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.3.40\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1678,7 +1678,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.3.39")); + puts(_("ntpd 4.3.40")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index cb096650d..54b568939 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 12, 2015 at 11:54:06 AM by AutoGen 5.18.5 + * It has been AutoGen-ed June 13, 2015 at 03:05:09 PM 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.39" +#define NTPD_VERSION "4.3.40" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.3.39" +#define NTPD_FULL_VERSION "ntpd 4.3.40" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 7b24f6a3d..26fb8ea9b 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 "12 Jun 2015" "4.3.39" "User Commands" +.TH ntpd 1ntpdman "13 Jun 2015" "4.3.40" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-OGaaUu/ag-0Ga4Su) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Slay82/ag-5laq72) .\" -.\" It has been AutoGen-ed June 12, 2015 at 11:56:44 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 13, 2015 at 03:07:49 PM 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 09fc6d9e6..dea2c1019 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd June 12 2015 +.Dd June 13 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed June 12, 2015 at 11:57:00 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 13, 2015 at 03:08:08 PM 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 7498e4231..a20dd6474 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.39 of ntpd. +

This document applies to version 4.3.40 of ntpd.