diff options
author | delphij <delphij@FreeBSD.org> | 2016-12-22 16:19:05 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2016-12-22 16:19:05 +0000 |
commit | d0a626af58b2092996e20b0bcb07067a6f709539 (patch) | |
tree | 7565ae572473ac8f7ef771e6ea2ed0eec9799fb9 /contrib/ntp/scripts/update-leap | |
parent | b416700da72fd8eab0a75d60f0634e254cbb9347 (diff) | |
download | FreeBSD-src-d0a626af58b2092996e20b0bcb07067a6f709539.zip FreeBSD-src-d0a626af58b2092996e20b0bcb07067a6f709539.tar.gz |
Fix multiple vulnerabilities of ntp.
Approved by: so
Diffstat (limited to 'contrib/ntp/scripts/update-leap')
8 files changed, 19 insertions, 16 deletions
diff --git a/contrib/ntp/scripts/update-leap/invoke-update-leap.texi b/contrib/ntp/scripts/update-leap/invoke-update-leap.texi index 3e538f0..23de3d8 100644 --- a/contrib/ntp/scripts/update-leap/invoke-update-leap.texi +++ b/contrib/ntp/scripts/update-leap/invoke-update-leap.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-update-leap.texi) # -# It has been AutoGen-ed June 2, 2016 at 07:25:12 AM by AutoGen 5.18.5 +# It has been AutoGen-ed November 21, 2016 at 07:59:14 AM by AutoGen 5.18.5 # From the definitions update-leap-opts.def # and the template file agtexi-cmd.tpl @end ignore diff --git a/contrib/ntp/scripts/update-leap/update-leap-opts b/contrib/ntp/scripts/update-leap/update-leap-opts index 2f32d66..893f3b6 100644 --- a/contrib/ntp/scripts/update-leap/update-leap-opts +++ b/contrib/ntp/scripts/update-leap/update-leap-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (update-leap-opts) # -# It has been AutoGen-ed June 2, 2016 at 07:25:39 AM by AutoGen 5.18.5 +# It has been AutoGen-ed November 21, 2016 at 07:59:22 AM by AutoGen 5.18.5 # From the definitions update-leap-opts.def # and the template file perlopt @@ -46,7 +46,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -update-leap - leap-seconds file manager/updater - Ver. 4.2.8p8 +update-leap - leap-seconds file manager/updater - Ver. 4.2.8p9 USAGE: update-leap [ -<flag> [<val>] | --<name>[{=| }<val>] ]... -s, --source-url=str The URL of the master copy of the leapseconds file diff --git a/contrib/ntp/scripts/update-leap/update-leap.1update-leapman b/contrib/ntp/scripts/update-leap/update-leap.1update-leapman index d105806..92d83f2 100644 --- a/contrib/ntp/scripts/update-leap/update-leap.1update-leapman +++ b/contrib/ntp/scripts/update-leap/update-leap.1update-leapman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH update-leap 1update-leapman "02 Jun 2016" "ntp (4.2.8p8)" "User Commands" +.TH update-leap 1update-leapman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-qJaG0O/ag-DJaOZO) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Oraiqc/ag-1raqpc) .\" -.\" It has been AutoGen-ed June 2, 2016 at 07:25:07 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed November 21, 2016 at 07:59:10 AM by AutoGen 5.18.5 .\" From the definitions update-leap-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc b/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc index 2e9c479..e1652ff 100644 --- a/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc +++ b/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc @@ -1,9 +1,9 @@ -.Dd June 2 2016 +.Dd November 21 2016 .Dt UPDATE_LEAP 1update-leapmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (update-leap-opts.mdoc) .\" -.\" It has been AutoGen-ed June 2, 2016 at 07:25:37 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed November 21, 2016 at 07:59:20 AM by AutoGen 5.18.5 .\" From the definitions update-leap-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/contrib/ntp/scripts/update-leap/update-leap.html b/contrib/ntp/scripts/update-leap/update-leap.html index e2e4ad3..69fe61a 100644 --- a/contrib/ntp/scripts/update-leap/update-leap.html +++ b/contrib/ntp/scripts/update-leap/update-leap.html @@ -30,7 +30,7 @@ Up: <a rel="up" accesskey="u" href="#dir">(dir)</a> <p>This document describes the use of the NTP Project's <code>update-leap</code> program. - <p>This document applies to version 4.2.8p8 of <code>update-leap</code>. + <p>This document applies to version 4.2.8p9 of <code>update-leap</code>. <div class="shortcontents"> <h2>Short Contents</h2> diff --git a/contrib/ntp/scripts/update-leap/update-leap.in b/contrib/ntp/scripts/update-leap/update-leap.in index a22b50a..bd7ed18 100755 --- a/contrib/ntp/scripts/update-leap/update-leap.in +++ b/contrib/ntp/scripts/update-leap/update-leap.in @@ -34,7 +34,10 @@ my $QUIET = ""; my $VERBOSE = ""; # Where to get the file -my $LEAPSRC="ftp://time.nist.gov/pub/leap-seconds.list"; +# Choices: +# https://www.ietf.org/timezones/data/leap-seconds.list +# ftp://time.nist.gov/pub/leap-seconds.list +my $LEAPSRC="https://www.ietf.org/timezones/data/leap-seconds.list"; my $LEAPFILE; # How many times to try to download new file @@ -300,7 +303,7 @@ sub verifySHA { open(LF, $NTPCONF) || die "Can't open <$NTPCONF>: $!\n"; while (<LF>) { chomp; - if (/^ *leapfile\s+(\S+)/) { + if (/^ *leapfile\s+"(\S+)"/) { $LEAPFILE = $1; } } diff --git a/contrib/ntp/scripts/update-leap/update-leap.man.in b/contrib/ntp/scripts/update-leap/update-leap.man.in index d105806..92d83f2 100644 --- a/contrib/ntp/scripts/update-leap/update-leap.man.in +++ b/contrib/ntp/scripts/update-leap/update-leap.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH update-leap 1update-leapman "02 Jun 2016" "ntp (4.2.8p8)" "User Commands" +.TH update-leap 1update-leapman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-qJaG0O/ag-DJaOZO) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Oraiqc/ag-1raqpc) .\" -.\" It has been AutoGen-ed June 2, 2016 at 07:25:07 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed November 21, 2016 at 07:59:10 AM by AutoGen 5.18.5 .\" From the definitions update-leap-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/contrib/ntp/scripts/update-leap/update-leap.mdoc.in b/contrib/ntp/scripts/update-leap/update-leap.mdoc.in index 2e9c479..e1652ff 100644 --- a/contrib/ntp/scripts/update-leap/update-leap.mdoc.in +++ b/contrib/ntp/scripts/update-leap/update-leap.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 2 2016 +.Dd November 21 2016 .Dt UPDATE_LEAP 1update-leapmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (update-leap-opts.mdoc) .\" -.\" It has been AutoGen-ed June 2, 2016 at 07:25:37 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed November 21, 2016 at 07:59:20 AM by AutoGen 5.18.5 .\" From the definitions update-leap-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME |