From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 12 May 2015 04:08:01 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_33~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2a0b183fbf692ed24dab790de9b3f94f2a98b0a;p=thirdparty%2Fntp.git

merge cleanup

bk: 55517ca1sIk3Q4EMmqp_M_W7wigcwQ
---

diff --git a/ChangeLog b/ChangeLog
index 192de0b26..a0d06618e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Below are from 4.2.8p3:
+* [Bug 2745] ntpd -x steps clock on leap second 
+   Do leap second stepping only of the step adjustment is beyond the
+   proper jump distance limit and step correction is allowed at all. 
 (4.3.32) 2015/05/09 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 2792] If the IFF_RUNNING interface flag is supported then an
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 95540be66..39acc6d93 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  9, 2015 at 11:48:21 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  May 12, 2015 at 03:31:55 AM by AutoGen 5.18.5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -70,7 +70,7 @@ extern FILE * option_usage_fp;
  *  static const strings for sntp options
  */
 static char const sntp_opt_strs[2546] =
-/*     0 */ "sntp 4.3.32\n"
+/*     0 */ "sntp 4.3.30\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"
@@ -155,7 +155,7 @@ static char const sntp_opt_strs[2546] =
 /*  2297 */ "LOAD_OPTS\0"
 /*  2307 */ "no-load-opts\0"
 /*  2320 */ "SNTP\0"
-/*  2325 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.3.32\n"
+/*  2325 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.3.30\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
 /*  2483 */ "$HOME\0"
@@ -163,7 +163,7 @@ static char const sntp_opt_strs[2546] =
 /*  2491 */ ".ntprc\0"
 /*  2498 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2532 */ "\n\0"
-/*  2534 */ "sntp 4.3.32";
+/*  2534 */ "sntp 4.3.30";
 
 /**
  *  ipv4 option description with
@@ -1173,7 +1173,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via sntpOptions.pzCopyright */
-  puts(_("sntp 4.3.32\n\
+  puts(_("sntp 4.3.30\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\
@@ -1263,7 +1263,7 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via sntpOptions.pzUsageTitle */
-  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.3.32\n\
+  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.3.30\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ hostname-or-IP ...]\n"));
 
@@ -1271,7 +1271,7 @@ Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
   puts(_("\n"));
 
   /* referenced via sntpOptions.pzFullVersion */
-  puts(_("sntp 4.3.32"));
+  puts(_("sntp 4.3.30"));
 
   /* referenced via sntpOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index f8f5aa509..a5b2af066 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  9, 2015 at 11:48:20 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  May 12, 2015 at 03:31:54 AM by AutoGen 5.18.5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -91,9 +91,9 @@ typedef enum {
 /** count of all options for sntp */
 #define OPTION_CT    23
 /** sntp version */
-#define SNTP_VERSION       "4.3.32"
+#define SNTP_VERSION       "4.3.30"
 /** Full sntp version text */
-#define SNTP_FULL_VERSION  "sntp 4.3.32"
+#define SNTP_FULL_VERSION  "sntp 4.3.30"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED