From: Harlan Stenn Date: Sat, 2 May 2015 11:59:09 +0000 (+0000) Subject: NTP_4_3_26 X-Git-Tag: NTP_4_3_26^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77548dc280205dc18df97eeab37b2384a94c6cab;p=thirdparty%2Fntp.git NTP_4_3_26 bk: 5544bc0dvTqniuKd94L0Hoxe-MWvYA --- diff --git a/ChangeLog b/ChangeLog index 1fde38f86..8c63cd0f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.26) 2015/05/02 Released by Harlan Stenn Below are from 4.2.8p3: * CID 1296235: Fix refclock_jjy.c and correcting type of the driver40-ja.html (4.3.25) 2015/05/01 Released by Harlan Stenn diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index fea29def5..f14ae0262 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 May 1, 2015 at 11:56:52 AM by AutoGen 5.18.5 +# It has been AutoGen-ed May 2, 2015 at 11:56:53 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 b5795055f..5ea32cb92 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 May 1, 2015 at 11:56:54 AM by AutoGen 5.18.5 +# It has been AutoGen-ed May 2, 2015 at 11:56:56 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 c0335d8a2..a160f3b25 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 May 1, 2015 at 11:56:56 AM by AutoGen 5.18.5 +# It has been AutoGen-ed May 2, 2015 at 11:56:58 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.25 +ntpd - NTP daemon program - Ver. 4.3.26 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index ae920b7af..fb81e2092 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 "01 May 2015" "4.3.25" "File Formats" +.TH ntp.conf 5man "02 May 2015" "4.3.26" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-vWaWar/ag-IWaO_q) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Zbaq_k/ag-acai.k) .\" -.\" It has been AutoGen-ed May 1, 2015 at 11:56:38 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 2, 2015 at 11:56:41 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 bfb653bc0..8139bb945 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd May 1 2015 +.Dd May 2 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed May 1, 2015 at 11:56:59 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 2, 2015 at 11:57:00 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 8b598d460..2f79616de 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.25 of ntp.conf. +

This document applies to version 4.3.26 of ntp.conf.

Short Contents

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 95e8c6810..ba4f35a1f 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 "01 May 2015" "4.3.25" "File Formats" +.TH ntp.conf 5 "02 May 2015" "4.3.26" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-vWaWar/ag-IWaO_q) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Zbaq_k/ag-acai.k) .\" -.\" It has been AutoGen-ed May 1, 2015 at 11:56:38 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 2, 2015 at 11:56:41 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 b05ad0d09..d429a9489 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 1 2015 +.Dd May 2 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed May 1, 2015 at 11:56:59 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 2, 2015 at 11:57:00 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 5abef6388..77ff91766 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "01 May 2015" "4.3.25" "File Formats" +.TH ntp.keys 5man "02 May 2015" "4.3.26" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed May 1, 2015 at 11:56:43 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 2, 2015 at 11:56:45 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 fb46589ca..b359b5d71 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd May 1 2015 +.Dd May 2 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed May 1, 2015 at 11:57:02 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 2, 2015 at 11:57:04 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 685022df8..8fe549b8b 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.25 of ntp.keys. +

This document applies to version 4.3.26 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 9c849b77d..7b51f6cb9 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "01 May 2015" "4.3.25" "File Formats" +.TH ntp.keys 5 "02 May 2015" "4.3.26" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed May 1, 2015 at 11:56:43 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 2, 2015 at 11:56:45 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 5735ce384..effcc3605 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 1 2015 +.Dd May 2 2015 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed May 1, 2015 at 11:57:02 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 2, 2015 at 11:57:04 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 1e3efaf1e..5353a0d02 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 May 1, 2015 at 11:54:11 AM by AutoGen 5.18.5 + * It has been AutoGen-ed May 2, 2015 at 11:54:15 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.25\n" +/* 0 */ "ntpd 4.3.26\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.25\n" +/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.26\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3078 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3112 */ "\n\0" -/* 3114 */ "ntpd 4.3.25"; +/* 3114 */ "ntpd 4.3.26"; /** * ipv4 option description with @@ -1529,7 +1529,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.3.25\n\ + puts(_("ntpd 4.3.26\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.25\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.3.26\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1678,7 +1678,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.3.25")); + puts(_("ntpd 4.3.26")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 59fc457dc..3542cf1c1 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 May 1, 2015 at 11:54:10 AM by AutoGen 5.18.5 + * It has been AutoGen-ed May 2, 2015 at 11:54:14 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.25" +#define NTPD_VERSION "4.3.26" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.3.25" +#define NTPD_FULL_VERSION "ntpd 4.3.26" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index af1f22958..ccb0ee3b4 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 "01 May 2015" "4.3.25" "User Commands" +.TH ntpd 1ntpdman "02 May 2015" "4.3.26" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-aZayus/ag-nZaqts) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Mda4sm/ag-YdaWrm) .\" -.\" It has been AutoGen-ed May 1, 2015 at 11:56:47 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 2, 2015 at 11:56:49 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 2cc7ad22d..d12da8628 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd May 1 2015 +.Dd May 2 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed May 1, 2015 at 11:57:04 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 2, 2015 at 11:57:06 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 bbaa5c6da..c0c164379 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.25 of ntpd. +

This document applies to version 4.3.26 of ntpd.