<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Gary E. Miller pushed to branch master
at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/5aa6ba4cd97dbcec04626d7da59ce459bdf6de89">5aa6ba4c</a></strong>
<div>
<span>by Gary E. Miller</span>
<i>at 2018-12-07T04:21:02Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">ntpleapfile: fix parsing of ntp.conf on osX and FreeBSD.
Both osX and FreeBSD use a copy of sed that is not gnu sed
compatible. So finesse.
</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/7c253cb97ac8712a3067728682691c479eaade0a">7c253cb9</a></strong>
<div>
<span>by Gary E. Miller</span>
<i>at 2018-12-07T04:49:17Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">ntpleapfetch: fix for current leap file.
The last line used to be "#h\t ". Now it is "#h \t". Fix code
so we don't care.
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#906c49bdad1a53ff27bdc6b1ab8bec35b7ee171a">
ntpclients/ntpleapfetch
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="906c49bdad1a53ff27bdc6b1ab8bec35b7ee171a">
<a href="https://gitlab.com/NTPsec/ntpsec/compare/462a3b10e5170f2e113ece14194451851ed03dfc...7c253cb97ac8712a3067728682691c479eaade0a#906c49bdad1a53ff27bdc6b1ab8bec35b7ee171a"><strong>ntpclients/ntpleapfetch</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="301" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="301" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -301,12 +301,10 @@ verifySHA1() {</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="301" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
301
</td>
<td class="diff-line-num new_line" data-linenumber="301" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
301
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC301" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># Extract the file's hash. Restore any leading zeroes in hash segments.</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="302" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
302
</td>
<td class="diff-line-num new_line" data-linenumber="302" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
302
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC302" class="line" lang="shell"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="303" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
303
</td>
<td class="diff-line-num new_line" data-linenumber="303" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
303
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC303" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># The sed [] includes a tab (\t) and space; #h is followed by a tab and space</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="304" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
304
</td>
<td class="diff-line-num new_line old" data-linenumber="304" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC304" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># The file of 8-Jul-2016 uses \r\n as line delimiters. This must</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="305" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
305
</td>
<td class="diff-line-num new_line old" data-linenumber="304" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC305" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># be corrected on UNIX systems, else the extra \r is read from the</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="306" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
306
</td>
<td class="diff-line-num new_line old" data-linenumber="304" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC306" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># last line. I am not clear if this is an error in the NIST file,</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="307" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
307
</td>
<td class="diff-line-num new_line old" data-linenumber="304" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC307" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># or intentional. Nevertheless - Sanjeev Gupta 20180105</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="308" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="304" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
304
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC304" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># or maybe a space and a tab. remove the tab, whereever it may be. Add some 0x</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="308" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="305" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
305
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC305" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># so it can be run throught printf to restore missing leading zeros.</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="308" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
308
</td>
<td class="diff-line-num new_line" data-linenumber="306" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
306
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC306" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;">#</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="309" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
309
</td>
<td class="diff-line-num new_line old" data-linenumber="307" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC309" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">local </span><span class="nv" style="color: teal;">FSHA1</span><span class="o" style="font-weight: 600;">=</span><span class="s2" style="color: #d14;">"</span><span class="sb" style="color: #d14;">`</span><span class="nb" style="color: #0086b3;"><span class="idiff left">echo</span></span><span class="idiff"> </span><span class="se" style="color: #d14;"><span class="idiff">\"</span></span><span class="nv" style="color: teal;"><span class="idiff">$RAW</span></span><span class="se" style="color: #d14;"><span class="idiff">\"</span></span><span class="idiff"> | </span><span class="nb" style="color: #0086b3;"><span class="idiff">sed</span></span><span class="idiff"> </span><span class="nt" style="color: navy;"><span class="idiff">-e</span></span><span class="s1" style="color: #d14;"><span class="idiff">'s/\r//'</span></span><span class="idiff"> | </span><span class="nb" style="color: #0086b3;"><span class="idiff">sed</span></span><span class="idiff"> </span><span class="nt" style="color: navy;"><span class="idiff">-e</span></span><span class="s1" style="color: #d14;"><span class="idiff">'/^#h/!d'</span></span><span class="idiff"> </span><span class="nt" style="color: navy;"><span class="idiff">-e</span></span><span class="s1" style="color: #d14;"><span class="idiff">'s/^#h//'</span></span><span class="idiff"> </span><span class="nt" style="color: navy;"><span class="idiff">-e</span></span><span class="s1" style="color: #d14;"><span class="idiff right">'s/[ ] *</span>/ 0x/g'</span><span class="sb" style="color: #d14;">`</span><span class="s2" style="color: #d14;">"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="310" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="307" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
307
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC307" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">local </span><span class="nv" style="color: teal;">FSHA1</span><span class="o" style="font-weight: 600;">=</span><span class="s2" style="color: #d14;">"</span><span class="sb" style="color: #d14;">`</span><span class="nb" style="color: #0086b3;"><span class="idiff left">grep</span></span><span class="idiff"> </span><span class="s1" style="color: #d14;"><span class="idiff">'^#h'</span></span><span class="idiff"> </span><span class="nv" style="color: teal;"><span class="idiff">$1</span></span><span class="idiff"> | </span><span class="nb" style="color: #0086b3;"><span class="idiff">tr</span></span><span class="idiff"> </span><span class="nt" style="color: navy;"><span class="idiff">-d</span></span><span class="idiff"> </span><span class="s1" style="color: #d14;"><span class="idiff">'[:cntrl:]'</span></span><span class="idiff"> | </span><span class="nb" style="color: #0086b3;"><span class="idiff">sed</span></span><span class="idiff"> </span><span class="nt" style="color: navy;"><span class="idiff">-e</span></span><span class="s1" style="color: #d14;"><span class="idiff">'s/^#h//'</span></span><span class="idiff"> </span><span class="nt" style="color: navy;"><span class="idiff">-e</span></span><span class="s1" style="color: #d14;"><span class="idiff right">'s/ </span>/ 0x/g'</span><span class="sb" style="color: #d14;">`</span><span class="s2" style="color: #d14;">"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="310" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
310
</td>
<td class="diff-line-num new_line" data-linenumber="308" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
308
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC308" class="line" lang="shell"> <span class="nv" style="color: teal;">FSHA1</span><span class="o" style="font-weight: 600;">=</span><span class="sb" style="color: #d14;">`</span><span class="nb" style="color: #0086b3;">printf</span> <span class="s1" style="color: #d14;">'%08x%08x%08x%08x%08x'</span> <span class="nv" style="color: teal;">$FSHA1</span><span class="sb" style="color: #d14;">`</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="311" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
311
</td>
<td class="diff-line-num new_line" data-linenumber="309" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
309
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC309" class="line" lang="shell"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="312" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
312
</td>
<td class="diff-line-num new_line" data-linenumber="310" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
310
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC310" class="line" lang="shell"> <span class="k" style="font-weight: 600;">if</span> <span class="o" style="font-weight: 600;">[</span> <span class="nt" style="color: navy;">-n</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: teal;">$FSHA1</span><span class="s2" style="color: #d14;">"</span> <span class="nt" style="color: navy;">-a</span> <span class="se" style="color: #d14;">\(</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: teal;">$FSHA1</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: teal;">$DSHA1</span><span class="s2" style="color: #d14;">"</span> <span class="se" style="color: #d14;">\)</span> <span class="o" style="font-weight: 600;">]</span><span class="p">;</span> <span class="k" style="font-weight: 600;">then</span></span>
</pre>
</td>
</tr>
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="341" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="339" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -341,8 +339,7 @@ if ! [ -f "$NTPCONF" ]; then</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="341" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
341
</td>
<td class="diff-line-num new_line" data-linenumber="339" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
339
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC339" class="line" lang="shell"><span class="k" style="font-weight: 600;">fi</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="342" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
342
</td>
<td class="diff-line-num new_line" data-linenumber="340" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
340
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC340" class="line" lang="shell"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="343" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
343
</td>
<td class="diff-line-num new_line" data-linenumber="341" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
341
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC341" class="line" lang="shell"><span class="c" style="color: #998; font-style: italic;"># Parse ntp.conf for leapfile directive</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="344" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
344
</td>
<td class="diff-line-num new_line old" data-linenumber="342" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC344" class="line" lang="shell"><span class="c" style="color: #998; font-style: italic;"># FIXME broken on MacOS/macports</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="345" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
345
</td>
<td class="diff-line-num new_line old" data-linenumber="342" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC345" class="line" lang="shell"><span class="nv" style="color: teal;">LEAPFILE</span><span class="o" style="font-weight: 600;">=</span><span class="s2" style="color: #d14;">"</span><span class="sb" style="color: #d14;">`</span><span class="nb" style="color: #0086b3;">sed</span> <span class="nv" style="color: teal;">$NTPCONF</span> <span class="nt" style="color: navy;">-e</span><span class="s1" style="color: #d14;">'/^ *leapfile *.*$/!d'</span> <span class="nt" style="color: navy;">-e</span><span class="s1" style="color: #d14;">'s/^ *leapfile *//'</span><span class="sb" style="color: #d14;">`</span><span class="s2" style="color: #d14;">"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="346" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="342" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
342
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC342" class="line" lang="shell"><span class="nv" style="color: teal;">LEAPFILE</span><span class="o" style="font-weight: 600;">=</span><span class="s2" style="color: #d14;">"</span><span class="sb" style="color: #d14;">`</span><span class="nb" style="color: #0086b3;">grep</span> <span class="nt" style="color: navy;">-x</span> <span class="s1" style="color: #d14;">'leapfile *.*'</span> <span class="nv" style="color: teal;">$NTPCONF</span> | <span class="nb" style="color: #0086b3;">grep</span> <span class="nt" style="color: navy;">-o</span> <span class="s1" style="color: #d14;">' [^ ]*.*'</span><span class="sb" style="color: #d14;">`</span><span class="s2" style="color: #d14;">"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="346" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
346
</td>
<td class="diff-line-num new_line" data-linenumber="343" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
343
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC343" class="line" lang="shell"><span class="k" style="font-weight: 600;">if</span> <span class="o" style="font-weight: 600;">[</span> <span class="nt" style="color: navy;">-z</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: teal;">$LEAPFILE</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">]</span><span class="p">;</span> <span class="k" style="font-weight: 600;">then</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="347" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
347
</td>
<td class="diff-line-num new_line" data-linenumber="344" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
344
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC344" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span>log <span class="s2" style="color: #d14;">"warning"</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: teal;">$NTPCONF</span><span class="s2" style="color: #d14;"> does not specify a leapfile"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="348" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
348
</td>
<td class="diff-line-num new_line" data-linenumber="345" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
345
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC345" class="line" lang="shell"><span class="k" style="font-weight: 600;">fi</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777777;">
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/compare/462a3b10e5170f2e113ece14194451851ed03dfc...7c253cb97ac8712a3067728682691c479eaade0a">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
</p>
</div>
</body>
</html>