From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 29 Mar 2015 04:10:31 +0000 (+0000)
Subject: [Bug 2769] cleannup for update-leap
X-Git-Tag: NTP_4_3_11~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=756d8de603f5931c897a23f92f459fa9072a8b18;p=thirdparty%2Fntp.git

[Bug 2769] cleannup for update-leap

bk: 55177b378lScqYXOBLNOo8rytaCMkw
---

diff --git a/NEWS b/NEWS
index d33f05998..47d67002c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+* New script: update-leap
+The update-leap script will verify and if necessary, update the
+leap-second definition file.
+It requires the following commands in order to work:
+
+	wget logger tr sed shasum
+
+Some may choose to run this from cron.
 ---
 NTP 4.2.8p1 (Harlan Stenn <stenn@ntp.org>, 2015/02/04) 
 
diff --git a/scripts/update-leap/Makefile.am b/scripts/update-leap/Makefile.am
index 10e7b4880..163810233 100644
--- a/scripts/update-leap/Makefile.am
+++ b/scripts/update-leap/Makefile.am
@@ -28,6 +28,7 @@ endif
 EXTRA_DIST =				\
 	invoke-update-leap.menu		\
 	invoke-update-leap.texi		\
+	update-leap			\
 	update-leap-opts.def		\
 	update-leap-opts		\
 	update-leap.1update-leapman	\
diff --git a/scripts/update-leap/update-leap-opts.def b/scripts/update-leap/update-leap-opts.def
index 2f90d1f91..9e73916ba 100644
--- a/scripts/update-leap/update-leap-opts.def
+++ b/scripts/update-leap/update-leap-opts.def
@@ -88,7 +88,7 @@ flag = {
     doc         = <<-  _EndOfDoc_
 	Specify location of ntp.conf (used to make sure leapfile directive is
 	present and to default  leapfile)
-	$NTPCONF
+	/etc/ntp.conf
 	_EndOfDoc_;
 };
 
@@ -117,10 +117,11 @@ doc-section     = {
   ds-format     = 'mdoc';
   ds-text       = <<- _END_PROG_MDOC_DESCRIP
 .Nm
-will validate the file currently on the local syste
+will validate the file currently on the local system
 and if necessary, updates leap-second definition file.
 .Pp
-Ordinarily, the file is found using the "leapfile" directive in $NTPCONF.
+Ordinarily, the file is found using the "leapfile" directive in
+.Xr ntp.conf 5 .
 However, an alternate location can be specified on the command line.
 .Pp
 If the file does not exist, is not valid, has expired, or is expiring soon,