From: Harlan Stenn Date: Sat, 1 Aug 2015 11:59:23 +0000 (+0000) Subject: NTP_4_3_69 X-Git-Tag: NTP_4_3_69^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35f0cbc2e1a6171a50579320eab9da479ce8bf5a;p=thirdparty%2Fntp.git NTP_4_3_69 bk: 55bcb49bdcmw-zxwZQ-lpf8AmaJ_oA --- diff --git a/ChangeLog b/ChangeLog index cac406ecf..b4221acd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.69) 2015/08/01 Released by Harlan Stenn Below are from 4.2.8p4: * [Bug 2821] minor build issues: fixed refclock_gpsdjson.c. perlinger@ntp.org (4.3.68) 2015/07/31 Released by Harlan Stenn diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 624329e48..19726d6ec 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 July 31, 2015 at 11:57:09 AM by AutoGen 5.18.5 +# It has been AutoGen-ed August 1, 2015 at 11:57:12 AM 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 ee4032508..b1c52b712 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 July 31, 2015 at 11:57:12 AM by AutoGen 5.18.5 +# It has been AutoGen-ed August 1, 2015 at 11:57:15 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 a8d4d41f9..9f0e208d5 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 July 31, 2015 at 11:57:14 AM by AutoGen 5.18.5 +# It has been AutoGen-ed August 1, 2015 at 11:57:17 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.68 +ntpd - NTP daemon program - Ver. 4.3.69 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 79144a9c5..a4f29b389 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 "31 Jul 2015" "4.3.68" "File Formats" +.TH ntp.conf 5man "01 Aug 2015" "4.3.69" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-wzaGtn/ag-Izaysn) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-75aa9Y/ag-h6a47Y) .\" -.\" It has been AutoGen-ed July 31, 2015 at 11:56:56 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 1, 2015 at 11:56:59 AM 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 2fe580eac..711fc0772 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd July 31 2015 +.Dd August 1 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed July 31, 2015 at 11:57:17 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 1, 2015 at 11:57:20 AM 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 e635a02d8..030a4d831 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.68 of ntp.conf. +

This document applies to version 4.3.69 of ntp.conf.

Short Contents

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index a495f624e..11ab7ae1e 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 "31 Jul 2015" "4.3.68" "File Formats" +.TH ntp.conf 5 "01 Aug 2015" "4.3.69" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-wzaGtn/ag-Izaysn) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-75aa9Y/ag-h6a47Y) .\" -.\" It has been AutoGen-ed July 31, 2015 at 11:56:56 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 1, 2015 at 11:56:59 AM 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 36a13afda..61e4fa44f 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd July 31 2015 +.Dd August 1 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed July 31, 2015 at 11:57:17 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 1, 2015 at 11:57:20 AM 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 8dd9f096c..fad1b2d0f 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "31 Jul 2015" "4.3.68" "File Formats" +.TH ntp.keys 5man "01 Aug 2015" "4.3.69" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed July 31, 2015 at 11:57:01 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 1, 2015 at 11:57:05 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 36f98e599..bcbc0c88d 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd July 31 2015 +.Dd August 1 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed July 31, 2015 at 11:57:20 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 1, 2015 at 11:57:23 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 7c27afa50..b805fdb7b 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.68 of ntp.keys. +

This document applies to version 4.3.69 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 1446fd0d8..141428883 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "31 Jul 2015" "4.3.68" "File Formats" +.TH ntp.keys 5 "01 Aug 2015" "4.3.69" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed July 31, 2015 at 11:57:01 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 1, 2015 at 11:57:05 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 c8ec0cdc1..f7b2df470 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd July 31 2015 +.Dd August 1 2015 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed July 31, 2015 at 11:57:20 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 1, 2015 at 11:57:23 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 2701e1140..3f9b4d238 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 July 31, 2015 at 11:54:56 AM by AutoGen 5.18.5 + * It has been AutoGen-ed August 1, 2015 at 11:55:00 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.68\n" +/* 0 */ "ntpd 4.3.69\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.68\n" +/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.69\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3078 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3112 */ "\n\0" -/* 3114 */ "ntpd 4.3.68"; +/* 3114 */ "ntpd 4.3.69"; /** * ipv4 option description with @@ -1529,7 +1529,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.3.68\n\ + puts(_("ntpd 4.3.69\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.68\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.3.69\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1678,7 +1678,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.3.68")); + puts(_("ntpd 4.3.69")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 0ecc4da6a..435bd9345 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 July 31, 2015 at 11:54:55 AM by AutoGen 5.18.5 + * It has been AutoGen-ed August 1, 2015 at 11:54:59 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.68" +#define NTPD_VERSION "4.3.69" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.3.68" +#define NTPD_FULL_VERSION "ntpd 4.3.69" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 870dad0ee..f648cf515 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 "31 Jul 2015" "4.3.68" "User Commands" +.TH ntpd 1ntpdman "01 Aug 2015" "4.3.69" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-9Aa4Mo/ag-jBaWLo) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-79ayq0/ag-h.aqp0) .\" -.\" It has been AutoGen-ed July 31, 2015 at 11:57:05 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 1, 2015 at 11:57:08 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 fd1380bc7..0537c5f9e 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd July 31 2015 +.Dd August 1 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed July 31, 2015 at 11:57:22 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 1, 2015 at 11:57:25 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 b8cb63d0c..89bf3744c 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.68 of ntpd. +

This document applies to version 4.3.69 of ntpd.