[Bug 2824] Convert update-leap to perl. (also see 2769)

bk: 556ffd20WPTLQl6LBAutaC48o_lvaw

diff --git a/configure.ac b/configure.ac
index 035a53b1dac5f7fa0e3227f013f49ea1d81489f5..37f492afe4ab075740c821d6399484794400c8cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4385,6 +4385,7 @@ AC_CONFIG_FILES([scripts/ntpver], [chmod +x scripts/ntpver])
 AC_CONFIG_FILES([scripts/plot_summary],        [chmod +x scripts/plot_summary])
 AC_CONFIG_FILES([scripts/summary],     [chmod +x scripts/summary])
 AC_CONFIG_FILES([scripts/update-leap/Makefile])
+AC_CONFIG_FILES([scripts/update-leap/update-leap], [chmod +x scripts/update-leap/update-leap])
 AC_CONFIG_FILES([tests/Makefile])
 AC_CONFIG_FILES([tests/libntp/Makefile])
 AC_CONFIG_FILES([tests/ntpd/Makefile])

diff --git a/scripts/update-leap/update-leap.in b/scripts/update-leap/update-leap.in
index 5397dc4e265a2baafb2037bf37d64181f0413f7b..a22b50a5a2be4aa5e4bcc1459bb3b98852079943 100755 (executable)
--- a/scripts/update-leap/update-leap.in
+++ b/scripts/update-leap/update-leap.in
@@ -1,4 +1,4 @@
-#! @PERL_PATH@ -w
+#! @PATH_PERL@ -w
 
 # Copyright (C) 2015 Network Time Foundation
 # Author: Harlan Stenn
@@ -17,7 +17,7 @@ use strict;
 use Digest::SHA qw(sha1_hex);
 use File::Copy qw(move);
 use File::Fetch;
-use Getopt::Long qw(:config no_ignore_case bundling);
+use Getopt::Long qw(:config auto_help no_ignore_case bundling);
 use Sys::Syslog;
 
 my $VERSION="1.003";
@@ -140,7 +140,6 @@ GetOptions(\%opt,
        'e:60',
        'F',
        'f=s',
-       'h',
        'i:10',
        'L',
        'l',