From: Harlan Stenn Date: Mon, 11 Jul 2011 03:03:48 +0000 (-0400) Subject: NTP_4_2_6P4_RC1 X-Git-Tag: NTP_4_2_6P4_RC1^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f4ff01d5336f5ab05f13c24bfc307189ebed045;p=thirdparty%2Fntp.git NTP_4_2_6P4_RC1 bk: 4e1a6814wcYAATHzuS4zm8DlMDcD6w --- diff --git a/ChangeLog b/ChangeLog index a09d26458..75873eca1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ --- +(4.2.6p4-RC1) 2011/07/10 Released by Harlan Stenn * [Bug 1134] ntpd fails binding to tentative IPv6 addresses. * [Bug 1790] Update config.guess and config.sub to detect AIX6. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 3ef2d14f0..f0d6a7db4 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 25, 2011 at 01:20:33 AM by AutoGen 5.11.9 + * It has been AutoGen-ed July 10, 2011 at 10:55:09 PM by AutoGen 5.12 * From the definitions ntpd-opts.def * and the template file options * @@ -17,10 +17,8 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpd copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved - * - * see html/copyright.html - * + * see html/copyright.html + * */ #include @@ -39,8 +37,8 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ -static char const zCopyright[44] = -"ntpd 4.2.6p4-beta2\n\ +static char const zCopyright[42] = +"ntpd 4.2.6p4-RC1\n\ see html/copyright.html\n"; static char const zLicenseDescrip[25] = "see html/copyright.html\n"; @@ -949,8 +947,8 @@ static tOptDesc optDesc[OPTION_CT] = { * Define the Ntpd Option Environment */ static char const zPROGNAME[5] = "NTPD"; -static char const zUsageTitle[105] = -"ntpd - NTP daemon program - Ver. 4.2.6p4-beta2\n\ +static char const zUsageTitle[103] = +"ntpd - NTP daemon program - Ver. 4.2.6p4-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 6412da98a..4f6db2c04 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 25, 2011 at 01:20:33 AM by AutoGen 5.11.9 + * It has been AutoGen-ed July 10, 2011 at 10:55:08 PM by AutoGen 5.12 * From the definitions ntpd-opts.def * and the template file options * @@ -17,10 +17,8 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpd copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved - * - * see html/copyright.html - * + * see html/copyright.html + * */ /* * This file contains the programmatic interface to the Automated @@ -89,8 +87,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 35 -#define NTPD_VERSION "4.2.6p4-beta2" -#define NTPD_FULL_VERSION "ntpd 4.2.6p4-beta2" +#define NTPD_VERSION "4.2.6p4-RC1" +#define NTPD_FULL_VERSION "ntpd 4.2.6p4-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -356,10 +354,10 @@ extern tOptions ntpdOptions; #if defined(ENABLE_NLS) # ifndef _ # include - static inline char* aoGetsText(char const* pz) { - if (pz == NULL) return NULL; - return (char*)gettext(pz); - } +static inline char* aoGetsText(char const* pz) { + if (pz == NULL) return NULL; + return (char*)gettext(pz); +} # define _(s) aoGetsText(s) # endif /* _() */ diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index f86ee5d57..7ac2df4a7 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpd-opts.texi) # -# It has been AutoGen-ed May 25, 2011 at 01:22:41 AM by AutoGen 5.11.9 +# It has been AutoGen-ed July 10, 2011 at 10:56:14 PM by AutoGen 5.12 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -15,7 +15,7 @@ This program has no explanation. This section was generated by @strong{AutoGen}, -the aginfo template and the option descriptions for the @command{ntpd} program. It documents the ntpd usage text and option meanings. +the aginfo template and the option descriptions for the @command{ntpd} program. It documents the @command{ntpd} usage text and option meanings. This software is released under a specialized copyright license. @@ -63,7 +63,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.6p4-beta2 +ntpd - NTP daemon program - Ver. 4.2.6p4-RC1 USAGE: ntpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 2bdef0155..4382dd360 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2011-05-25 "( 4.2.6p4-beta2)" "Programmer's Manual" +.TH NTPD 1 2011-07-10 "( 4.2.6p4-RC1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed May 25, 2011 at 01:22:40 AM by AutoGen 5.11.9 +.\" It has been AutoGen-ed July 10, 2011 at 10:56:12 PM by AutoGen 5.12 .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index e789277bd..0dd8aa39a 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed May 25, 2011 at 01:22:50 AM by AutoGen 5.11.9 + * It has been AutoGen-ed July 10, 2011 at 10:56:37 PM by AutoGen 5.12 * From the definitions ntpdc-opts.def * and the template file options * @@ -17,10 +17,8 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpdc copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved - * - * see html/copyright.html - * + * see html/copyright.html + * */ #include @@ -39,8 +37,8 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ -static char const zCopyright[45] = -"ntpdc 4.2.6p4-beta2\n\ +static char const zCopyright[43] = +"ntpdc 4.2.6p4-RC1\n\ see html/copyright.html\n"; static char const zLicenseDescrip[25] = "see html/copyright.html\n"; @@ -446,8 +444,8 @@ static tOptDesc optDesc[OPTION_CT] = { * Define the Ntpdc Option Environment */ static char const zPROGNAME[6] = "NTPDC"; -static char const zUsageTitle[133] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p4-beta2\n\ +static char const zUsageTitle[131] = +"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p4-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 3a4fb57a0..4956ff4ae 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed May 25, 2011 at 01:22:50 AM by AutoGen 5.11.9 + * It has been AutoGen-ed July 10, 2011 at 10:56:36 PM by AutoGen 5.12 * From the definitions ntpdc-opts.def * and the template file options * @@ -17,10 +17,8 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpdc copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved - * - * see html/copyright.html - * + * see html/copyright.html + * */ /* * This file contains the programmatic interface to the Automated @@ -69,8 +67,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.6p4-beta2" -#define NTPDC_FULL_VERSION "ntpdc 4.2.6p4-beta2" +#define NTPDC_VERSION "4.2.6p4-RC1" +#define NTPDC_FULL_VERSION "ntpdc 4.2.6p4-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -206,10 +204,10 @@ extern tOptions ntpdcOptions; #if defined(ENABLE_NLS) # ifndef _ # include - static inline char* aoGetsText(char const* pz) { - if (pz == NULL) return NULL; - return (char*)gettext(pz); - } +static inline char* aoGetsText(char const* pz) { + if (pz == NULL) return NULL; + return (char*)gettext(pz); +} # define _(s) aoGetsText(s) # endif /* _() */ diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index c6821f851..aa7a8ff3a 100644 --- a/ntpdc/ntpdc-opts.texi +++ b/ntpdc/ntpdc-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpdc-opts.texi) # -# It has been AutoGen-ed May 25, 2011 at 01:23:01 AM by AutoGen 5.11.9 +# It has been AutoGen-ed July 10, 2011 at 10:57:21 PM by AutoGen 5.12 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -32,7 +32,7 @@ ntpd's configuration file may also be specified at run time using This section was generated by @strong{AutoGen}, -the aginfo template and the option descriptions for the @command{ntpdc} program. It documents the ntpdc usage text and option meanings. +the aginfo template and the option descriptions for the @command{ntpdc} program. It documents the @command{ntpdc} usage text and option meanings. This software is released under a specialized copyright license. @@ -58,7 +58,7 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc - vendor-specific NTP query program - Ver. 4.2.6p4-beta2 +ntpdc - vendor-specific NTP query program - Ver. 4.2.6p4-RC1 USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index f3efe5fdb..6d805a219 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2011-05-25 "( 4.2.6p4-beta2)" "Programmer's Manual" +.TH NTPDC 1 2011-07-10 "( 4.2.6p4-RC1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed May 25, 2011 at 01:23:01 AM by AutoGen 5.11.9 +.\" It has been AutoGen-ed July 10, 2011 at 10:57:19 PM by AutoGen 5.12 .\" From the definitions ntpdc-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c index 3978e7fdb..f297b3047 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.c) * - * It has been AutoGen-ed May 25, 2011 at 01:23:02 AM by AutoGen 5.11.9 + * It has been AutoGen-ed July 10, 2011 at 10:57:24 PM by AutoGen 5.12 * From the definitions ntpq-opts.def * and the template file options * @@ -17,10 +17,8 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpq copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved - * - * see html/copyright.html - * + * see html/copyright.html + * */ #include @@ -39,8 +37,8 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ -static char const zCopyright[44] = -"ntpq 4.2.6p4-beta2\n\ +static char const zCopyright[42] = +"ntpq 4.2.6p4-RC1\n\ see html/copyright.html\n"; static char const zLicenseDescrip[25] = "see html/copyright.html\n"; @@ -423,8 +421,8 @@ static tOptDesc optDesc[OPTION_CT] = { * Define the Ntpq Option Environment */ static char const zPROGNAME[5] = "NTPQ"; -static char const zUsageTitle[125] = -"ntpq - standard NTP query program - Ver. 4.2.6p4-beta2\n\ +static char const zUsageTitle[123] = +"ntpq - standard NTP query program - Ver. 4.2.6p4-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index da09ad1d2..d2f3f1fed 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) * - * It has been AutoGen-ed May 25, 2011 at 01:23:02 AM by AutoGen 5.11.9 + * It has been AutoGen-ed July 10, 2011 at 10:57:23 PM by AutoGen 5.12 * From the definitions ntpq-opts.def * and the template file options * @@ -17,10 +17,8 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpq copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved - * - * see html/copyright.html - * + * see html/copyright.html + * */ /* * This file contains the programmatic interface to the Automated @@ -68,8 +66,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 14 -#define NTPQ_VERSION "4.2.6p4-beta2" -#define NTPQ_FULL_VERSION "ntpq 4.2.6p4-beta2" +#define NTPQ_VERSION "4.2.6p4-RC1" +#define NTPQ_FULL_VERSION "ntpq 4.2.6p4-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -199,10 +197,10 @@ extern tOptions ntpqOptions; #if defined(ENABLE_NLS) # ifndef _ # include - static inline char* aoGetsText(char const* pz) { - if (pz == NULL) return NULL; - return (char*)gettext(pz); - } +static inline char* aoGetsText(char const* pz) { + if (pz == NULL) return NULL; + return (char*)gettext(pz); +} # define _(s) aoGetsText(s) # endif /* _() */ diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 3e0ac3df7..baed8566c 100644 --- a/ntpq/ntpq-opts.texi +++ b/ntpq/ntpq-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpq-opts.texi) # -# It has been AutoGen-ed May 25, 2011 at 01:23:19 AM by AutoGen 5.11.9 +# It has been AutoGen-ed July 10, 2011 at 10:58:52 PM by AutoGen 5.12 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -22,7 +22,7 @@ The same formats are used in NTPv4, although some of the variables have changed and new ones added. This section was generated by @strong{AutoGen}, -the aginfo template and the option descriptions for the @command{ntpq} program. It documents the ntpq usage text and option meanings. +the aginfo template and the option descriptions for the @command{ntpq} program. It documents the @command{ntpq} usage text and option meanings. This software is released under a specialized copyright license. @@ -47,7 +47,7 @@ This is the automatically generated usage text for ntpq: @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.6p4-beta2 +ntpq - standard NTP query program - Ver. 4.2.6p4-RC1 USAGE: ntpq [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index 7fb18a9e4..a5aee764e 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2011-05-25 "( 4.2.6p4-beta2)" "Programmer's Manual" +.TH NTPQ 1 2011-07-10 "( 4.2.6p4-RC1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed May 25, 2011 at 01:23:19 AM by AutoGen 5.11.9 +.\" It has been AutoGen-ed July 10, 2011 at 10:58:46 PM by AutoGen 5.12 .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c index 93cabba13..5d0e81350 100644 --- a/ntpsnmpd/ntpsnmpd-opts.c +++ b/ntpsnmpd/ntpsnmpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) * - * It has been AutoGen-ed May 25, 2011 at 01:23:20 AM by AutoGen 5.11.9 + * It has been AutoGen-ed July 10, 2011 at 10:59:10 PM by AutoGen 5.12 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -17,10 +17,8 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpsnmpd copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved - * - * see html/copyright.html - * + * see html/copyright.html + * */ #include @@ -39,8 +37,8 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ -static char const zCopyright[48] = -"ntpsnmpd 4.2.6p4-beta2\n\ +static char const zCopyright[46] = +"ntpsnmpd 4.2.6p4-RC1\n\ see html/copyright.html\n"; static char const zLicenseDescrip[25] = "see html/copyright.html\n"; @@ -250,8 +248,8 @@ static tOptDesc optDesc[OPTION_CT] = { * Define the Ntpsnmpd Option Environment */ static char const zPROGNAME[9] = "NTPSNMPD"; -static char const zUsageTitle[109] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p4-beta2\n\ +static char const zUsageTitle[107] = +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p4-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index bb7315518..450343b73 100644 --- a/ntpsnmpd/ntpsnmpd-opts.h +++ b/ntpsnmpd/ntpsnmpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) * - * It has been AutoGen-ed May 25, 2011 at 01:23:20 AM by AutoGen 5.11.9 + * It has been AutoGen-ed July 10, 2011 at 10:59:08 PM by AutoGen 5.12 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -17,10 +17,8 @@ * * This source file is copyrighted and licensed under the following terms: * - * ntpsnmpd copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved - * - * see html/copyright.html - * + * see html/copyright.html + * */ /* * This file contains the programmatic interface to the Automated @@ -62,8 +60,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 8 -#define NTPSNMPD_VERSION "4.2.6p4-beta2" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd 4.2.6p4-beta2" +#define NTPSNMPD_VERSION "4.2.6p4-RC1" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd 4.2.6p4-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -157,10 +155,10 @@ extern tOptions ntpsnmpdOptions; #if defined(ENABLE_NLS) # ifndef _ # include - static inline char* aoGetsText(char const* pz) { - if (pz == NULL) return NULL; - return (char*)gettext(pz); - } +static inline char* aoGetsText(char const* pz) { + if (pz == NULL) return NULL; + return (char*)gettext(pz); +} # define _(s) aoGetsText(s) # endif /* _() */ diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index 7e08b1ebc..0e1bfe74f 100644 --- a/ntpsnmpd/ntpsnmpd-opts.texi +++ b/ntpsnmpd/ntpsnmpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.texi) # -# It has been AutoGen-ed May 25, 2011 at 01:23:29 AM by AutoGen 5.11.9 +# It has been AutoGen-ed July 10, 2011 at 11:00:02 PM by AutoGen 5.12 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -15,7 +15,7 @@ This program has no explanation. This section was generated by @strong{AutoGen}, -the aginfo template and the option descriptions for the @command{ntpsnmpd} program. It documents the ntpsnmpd usage text and option meanings. +the aginfo template and the option descriptions for the @command{ntpsnmpd} program. It documents the @command{ntpsnmpd} usage text and option meanings. This software is released under a specialized copyright license. @@ -34,7 +34,7 @@ This is the automatically generated usage text for ntpsnmpd: @exampleindent 0 @example -ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p4-beta2 +ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p4-RC1 USAGE: ntpsnmpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -n no nofork Do not fork diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index 1a9fa98ce..05e801371 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2011-05-25 "( 4.2.6p4-beta2)" "Programmer's Manual" +.TH NTPSNMPD 1 2011-07-10 "( 4.2.6p4-RC1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed May 25, 2011 at 01:23:29 AM by AutoGen 5.11.9 +.\" It has been AutoGen-ed July 10, 2011 at 10:59:59 PM by AutoGen 5.12 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 0c28a17d0..125a1fd88 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -91,4 +91,4 @@ betapoint=2 # - - prerelease is emptied # else (not in RC) # - rcpoint is empty and unused (for now). -rcpoint= +rcpoint=1 diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index eefe9b0fd..86011f401 100644 --- a/sntp/sntp-opts.c +++ b/sntp/sntp-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.c) * - * It has been AutoGen-ed May 25, 2011 at 05:14:52 AM by AutoGen 5.11.9 + * It has been AutoGen-ed July 10, 2011 at 10:54:33 PM by AutoGen 5.12 * From the definitions sntp-opts.def * and the template file options * @@ -17,10 +17,8 @@ * * This source file is copyrighted and licensed under the following terms: * - * sntp copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved - * - * see html/copyright.html - * + * see html/copyright.html + * */ #include @@ -39,8 +37,8 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ -static char const zCopyright[44] = -"sntp 4.2.6p4-beta2\n\ +static char const zCopyright[42] = +"sntp 4.2.6p4-RC1\n\ see html/copyright.html\n"; static char const zLicenseDescrip[25] = "see html/copyright.html\n"; @@ -468,8 +466,8 @@ static tOptDesc optDesc[OPTION_CT] = { * Define the Sntp Option Environment */ static char const zPROGNAME[5] = "SNTP"; -static char const zUsageTitle[127] = -"sntp - standard SNTP program - Ver. 4.2.6p4-beta2\n\ +static char const zUsageTitle[125] = +"sntp - standard SNTP program - Ver. 4.2.6p4-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]... hostname-or-IP ...\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index cbaa2d5ce..2835611a2 100644 --- a/sntp/sntp-opts.h +++ b/sntp/sntp-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.h) * - * It has been AutoGen-ed May 25, 2011 at 05:14:52 AM by AutoGen 5.11.9 + * It has been AutoGen-ed July 10, 2011 at 10:54:32 PM by AutoGen 5.12 * From the definitions sntp-opts.def * and the template file options * @@ -17,10 +17,8 @@ * * This source file is copyrighted and licensed under the following terms: * - * sntp copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved - * - * see html/copyright.html - * + * see html/copyright.html + * */ /* * This file contains the programmatic interface to the Automated @@ -71,8 +69,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 17 -#define SNTP_VERSION "4.2.6p4-beta2" -#define SNTP_FULL_VERSION "sntp 4.2.6p4-beta2" +#define SNTP_VERSION "4.2.6p4-RC1" +#define SNTP_FULL_VERSION "sntp 4.2.6p4-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -224,10 +222,10 @@ extern tOptions sntpOptions; #if defined(ENABLE_NLS) # ifndef _ # include - static inline char* aoGetsText(char const* pz) { - if (pz == NULL) return NULL; - return (char*)gettext(pz); - } +static inline char* aoGetsText(char const* pz) { + if (pz == NULL) return NULL; + return (char*)gettext(pz); +} # define _(s) aoGetsText(s) # endif /* _() */ diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 43d47360f..f09ce0479 100644 --- a/sntp/sntp-opts.texi +++ b/sntp/sntp-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (sntp-opts.texi) # -# It has been AutoGen-ed May 25, 2011 at 01:20:32 AM by AutoGen 5.11.9 +# It has been AutoGen-ed July 10, 2011 at 10:55:06 PM by AutoGen 5.12 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore @@ -41,7 +41,7 @@ is believed to be correct to within seconds. This section was generated by @strong{AutoGen}, -the aginfo template and the option descriptions for the @command{sntp} program. It documents the sntp usage text and option meanings. +the aginfo template and the option descriptions for the @command{sntp} program. It documents the @command{sntp} usage text and option meanings. This software is released under a specialized copyright license. @@ -69,7 +69,7 @@ This is the automatically generated usage text for sntp: @exampleindent 0 @example -sntp - standard SNTP program - Ver. 4.2.6p4-beta2 +sntp - standard SNTP program - Ver. 4.2.6p4-RC1 USAGE: sntp [ - [] | --[@{=| @}] ]... hostname-or-IP ... Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/sntp/sntp.1 b/sntp/sntp.1 index 083b652c3..afebbac81 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2011-05-25 "( 4.2.6p4-beta2)" "Programmer's Manual" +.TH SNTP 1 2011-07-10 "( 4.2.6p4-RC1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed May 25, 2011 at 01:20:31 AM by AutoGen 5.11.9 +.\" It has been AutoGen-ed July 10, 2011 at 10:55:04 PM by AutoGen 5.12 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/sntp/sntp.html b/sntp/sntp.html index 81302f77a..c29422cc6 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. -

This document applies to version 4.2.6p4-beta2 of sntp. +

This document applies to version 4.2.6p4-RC1 of sntp.

The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -107,7 +107,7 @@ is believed to be correct to within seconds.

This section was generated by AutoGen, -the aginfo template and the option descriptions for the sntp program. It documents the sntp usage text and option meanings. +the aginfo template and the option descriptions for the sntp program. It documents the sntp usage text and option meanings.

This software is released under a specialized copyright license. @@ -139,7 +139,7 @@ Up: sntp Invocation

This is the automatically generated usage text for sntp: -

sntp - standard SNTP program - Ver. 4.2.6p4-beta2
+
sntp - standard SNTP program - Ver. 4.2.6p4-RC1
 USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... hostname-or-IP ...
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index ccf44c576..daabbf4e3 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  May 25, 2011 at 01:23:31 AM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  July 10, 2011 at 11:00:12 PM by AutoGen 5.12
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -17,10 +17,8 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntp-keygen copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
- *
- * see html/copyright.html
- * 
+ *  see html/copyright.html
+ *  
  */
 
 #include 
@@ -39,8 +37,8 @@ extern FILE * option_usage_fp;
 
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
-static char const zCopyright[56] =
-"ntp-keygen (ntp) 4.2.6p4-beta2\n\
+static char const zCopyright[54] =
+"ntp-keygen (ntp) 4.2.6p4-RC1\n\
 see html/copyright.html\n";
 static char const zLicenseDescrip[25] =
 "see html/copyright.html\n";
@@ -721,8 +719,8 @@ static tOptDesc optDesc[OPTION_CT] = {
  *  Define the Ntp_Keygen Option Environment
  */
 static char const zPROGNAME[11] = "NTP_KEYGEN";
-static char const zUsageTitle[120] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p4-beta2\n\
+static char const zUsageTitle[118] =
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p4-RC1\n\
 USAGE:  %s [ - [] | --[{=| }] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index e344fc7af..838a4e707 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  May 25, 2011 at 01:23:31 AM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  July 10, 2011 at 11:00:09 PM by AutoGen 5.12
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -17,10 +17,8 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntp-keygen copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
- *
- * see html/copyright.html
- * 
+ *  see html/copyright.html
+ *  
  */
 /*
  *  This file contains the programmatic interface to the Automated
@@ -77,8 +75,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define NTP_KEYGEN_VERSION       "4.2.6p4-beta2"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.6p4-beta2"
+#define NTP_KEYGEN_VERSION       "4.2.6p4-RC1"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.6p4-RC1"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -274,10 +272,10 @@ extern tOptions ntp_keygenOptions;
 #if defined(ENABLE_NLS)
 # ifndef _
 #   include 
-    static inline char* aoGetsText(char const* pz) {
-        if (pz == NULL) return NULL;
-        return (char*)gettext(pz);
-    }
+static inline char* aoGetsText(char const* pz) {
+    if (pz == NULL) return NULL;
+    return (char*)gettext(pz);
+}
 #   define _(s)  aoGetsText(s)
 # endif /* _() */
 
diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index 9796ad470..44b823d5a 100644
--- a/util/ntp-keygen-opts.texi
+++ b/util/ntp-keygen-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  May 25, 2011 at 01:23:40 AM by AutoGen 5.11.9
+# It has been AutoGen-ed  July 10, 2011 at 11:01:50 PM by AutoGen 5.12
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -16,7 +16,7 @@ If there is no new host key, look for an existing one.
 If one is not found, create it.
 
 This section was generated by @strong{AutoGen},
-the aginfo template and the option descriptions for the @command{ntp-keygen} program.  It documents the ntp-keygen usage text and option meanings.
+the aginfo template and the option descriptions for the @command{ntp-keygen} program.  It documents the @command{ntp-keygen} usage text and option meanings.
 
 This software is released under a specialized copyright license.
 
@@ -50,7 +50,7 @@ This is the automatically generated usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p4-beta2
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p4-RC1
 USAGE:  ntp-keygen [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index 0229be911..0a5c374c4 100644
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2011-05-25 "(ntp 4.2.6p4-beta2)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2011-07-10 "(ntp 4.2.6p4-RC1)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  May 25, 2011 at 01:23:39 AM by AutoGen 5.11.9
+.\"  It has been AutoGen-ed  July 10, 2011 at 11:01:43 PM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"