<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4380d3b9e06c2ee49b7fc32d4a4d8929dc1efe13">https://github.com/macports/macports-ports/commit/4380d3b9e06c2ee49b7fc32d4a4d8929dc1efe13</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4380d3b ntpsec: update to 1.1.1
</span>4380d3b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4380d3b9e06c2ee49b7fc32d4a4d8929dc1efe13
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Wed Jun 20 10:08:44 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: update to 1.1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This includes the changes for compatibility with macOS<10.13,
</span><span style='display:block; white-space:pre;color:#404040;'> which can also be seen at:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://gitlab.com/fhgwright/ntpsec/tree/macports_1_1_1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Defers shebang rewrite to destroot copy, for better consistency
</span><span style='display:block; white-space:pre;color:#404040;'> between patched sources and quasi-upstream version. Also, if
</span><span style='display:block; white-space:pre;color:#404040;'> upstream ever provided shebang rewriting, it almost certainly
</span><span style='display:block; white-space:pre;color:#404040;'> would not apply to the original sources.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> NOTE:
</span><span style='display:block; white-space:pre;color:#404040;'> The "upstream fork" containing the fixes for MacPorts has now
</span><span style='display:block; white-space:pre;color:#404040;'> been reorganized to use a single branch with tags, rather than
</span><span style='display:block; white-space:pre;color:#404040;'> a per-release branch. The branch can be found at:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://gitlab.com/fhgwright/ntpsec/tree/macports-releases
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In particular, note that the 1.1.0 version formerly found at
</span><span style='display:block; white-space:pre;color:#404040;'> the NTPsec_1_1_0_macports branch (and mentioned in the commit
</span><span style='display:block; white-space:pre;color:#404040;'> message for 31b309b046) is now found on the macports-releases
</span><span style='display:block; white-space:pre;color:#404040;'> branch at the macports_1_1_0 tag.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Built and ran on MacPro 10.9, MacBookPro 10.9, PowerBook 10.5,
</span><span style='display:block; white-space:pre;color:#404040;'> and VMs for 10.5-10.13.
</span><span style='display:block; white-space:pre;color:#404040;'> Also verified that build works with default Python set to 2.4,
</span><span style='display:block; white-space:pre;color:#404040;'> confirming that the "old Python" fix still works.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56657
</span>---
sysutils/ntpsec/Portfile | 16 ++-
sysutils/ntpsec/files/patch-OldPython.diff | 20 ---
sysutils/ntpsec/files/patch-PreHighSierra.diff | 163 ++++++++++++-------------
3 files changed, 85 insertions(+), 114 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ntpsec/Portfile b/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a4304a..dbfd2f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,7 @@ PortGroup waf 1.0
</span> PortGroup python 1.0
name ntpsec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.1
</span> categories sysutils net
maintainers {lbschenkel @lbschenkel} {fwright.net:fw @fhgwright} \
openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,19 +19,18 @@ homepage https://www.ntpsec.org/
</span> conflicts ntp openntpd
master_sites ftp://ftp.ntpsec.org/pub/releases/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 65e6f3a2339b98ffa0b0cdf7310dd850cd3082a6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 65333385e56fb571d6a9bae8174a74c805c3ea4e79fbe450db98c3825caafddb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2448580
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6c11e9993f6f24402b8afd6021628f4bfd2627cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d06052b662ca3948841b7767a962cb8935c3da9deca7cabdba6b1bd689803262 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2451415
</span>
depends_build port:bison
depends_lib path:lib/libssl.dylib:openssl port:python${python.version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-PreHighSierra.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-OldPython.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-PreHighSierra.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span> foreach f {ntpdig ntpkeygen ntploggps ntplogtemp ntpmon ntpq ntpsnmpd ntpsweep ntptrace ntpviz ntpwait} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,^#!/usr/bin/env python,#!${python.bin}," ${worksrcpath}/ntpclients/$f.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,^#!/usr/bin/env python,#!${python.bin}," ${destroot}${prefix}/bin/$f
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ntpsec/files/patch-OldPython.diff b/sysutils/ntpsec/files/patch-OldPython.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c6e72a8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/files/patch-OldPython.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pylib/wscript.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pylib/wscript 2018-03-30 16:01:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ctx(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- before=['pyc', 'pyo'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cwd=srcnode,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rule='${SRC} >${TGT}',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rule='${PYTHON} ${SRC} >${TGT}',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- source=["../wafhelpers/pythonize-header", "../include/ntp_control.h"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target=target1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ctx(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- before=['pyc', 'pyo'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cwd=srcnode,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rule='${SRC} >${TGT}',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rule='${PYTHON} ${SRC} >${TGT}',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- source=["../wafhelpers/pythonize-header", "../include/ntp.h"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target=target2,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ntpsec/files/patch-PreHighSierra.diff b/sysutils/ntpsec/files/patch-PreHighSierra.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c591c67..2976d59 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/files/patch-PreHighSierra.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ntpsec/files/patch-PreHighSierra.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- attic/digest-timing.c.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ attic/digest-timing.c 2018-03-17 20:07:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- attic/digest-timing.c.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ attic/digest-timing.c 2018-06-19 23:14:59.000000000 -0700
</span> @@ -33,6 +33,8 @@
#include <openssl/rand.h>
#include <openssl/objects.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,8 +73,8 @@
</span> fast = (stop.tv_sec-start.tv_sec)*1E9 + (stop.tv_nsec-start.tv_nsec);
printf("%10s %2d %2d %2lu %6.0f %6.3f",
name, keylength, pktlength, digestlength, fast/NUM, fast/1E9);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/ntp_machine.h.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_machine.h 2018-03-17 20:07:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/ntp_machine.h.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/ntp_machine.h 2018-06-19 23:14:59.000000000 -0700
</span> @@ -13,14 +13,53 @@
#ifndef CLOCK_REALTIME
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,8 +134,8 @@
</span>
int ntp_set_tod (struct timespec *tvs);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/ntp_stdlib.h.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_stdlib.h 2018-03-17 20:07:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/ntp_stdlib.h.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/ntp_stdlib.h 2018-06-19 23:14:59.000000000 -0700
</span> @@ -113,7 +113,9 @@
extern const char * ceventstr (int);
extern const char * res_match_flags(unsigned short);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,8 +146,8 @@
</span> extern char * statustoa (int, int);
extern sockaddr_u * netof6 (sockaddr_u *);
extern char * numtoa (uint32_t);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/ntp_syscall.h.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_syscall.h 2018-03-17 20:07:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/ntp_syscall.h.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/ntp_syscall.h 2018-06-19 23:14:59.000000000 -0700
</span> @@ -9,9 +9,11 @@
#ifndef GUARD_NTP_SYSCALL_H
#define GUARD_NTP_SYSCALL_H
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,8 +160,8 @@
</span>
/*
* The units of the maxerror and esterror fields vary by platform. If
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- libntp/clockwork.c.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libntp/clockwork.c 2018-03-17 20:07:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libntp/clockwork.c.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libntp/clockwork.c 2018-06-19 23:14:59.000000000 -0700
</span> @@ -5,8 +5,10 @@
#include "config.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,8 +190,8 @@
</span> errno = saved_errno; /* for %m below */
TPRINT(1, ("ntp_set_tod: Final result: clock_settime: %d %m\n", rc));
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- libntp/statestr.c.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libntp/statestr.c 2018-03-17 20:07:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libntp/statestr.c.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libntp/statestr.c 2018-06-19 23:14:59.000000000 -0700
</span> @@ -12,7 +12,9 @@
#include "lib_strbuf.h"
#include "ntp_refclock.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -290,9 +290,9 @@
</span>
/*
* statustoa - return a descriptive string for a peer status
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ntpd/ntp_control.c.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/ntp_control.c 2018-03-17 20:07:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1437,6 +1437,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ntpd/ntp_control.c.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpd/ntp_control.c 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1469,6 +1469,7 @@
</span> char str[256];
double dtemp;
const char *ss;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,7 +300,7 @@
</span> static struct timex ntx;
static unsigned long ntp_adjtime_time;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1451,6 +1452,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1483,6 +1484,7 @@
</span> else
ntp_adjtime_time = current_time;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -308,7 +308,7 @@
</span>
switch (varid) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1823,50 +1825,93 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1856,50 +1858,93 @@
</span> break;
/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,11 +341,11 @@
</span> +#endif
case CS_K_OFFSET:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctl_putdblf(sys_var[varid].text, 0, -1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ctl_putdblf(sys_var[varid].text, false, -1,
</span> - ntp_error_in_seconds(ntx.offset) * MS_PER_S);
+ CTL_IF_KERNLOOP(
+ ctl_putdblf,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (sys_var[varid].text, 0, -1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (sys_var[varid].text, false, -1,
</span> + ntp_error_in_seconds(ntx.offset) * MS_PER_S)
+ );
break;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -359,21 +359,21 @@
</span> break;
case CS_K_MAXERR:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctl_putdblf(sys_var[varid].text, 0, 6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ctl_putdblf(sys_var[varid].text, false, 6,
</span> - ntp_error_in_seconds(ntx.maxerror) * MS_PER_S);
+ CTL_IF_KERNLOOP(
+ ctl_putdblf,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (sys_var[varid].text, 0, 6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (sys_var[varid].text, false, 6,
</span> + ntp_error_in_seconds(ntx.maxerror) * MS_PER_S)
+ );
break;
case CS_K_ESTERR:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctl_putdblf(sys_var[varid].text, 0, 6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ctl_putdblf(sys_var[varid].text, false, 6,
</span> - ntp_error_in_seconds(ntx.esterror) * MS_PER_S);
+ CTL_IF_KERNLOOP(
+ ctl_putdblf,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (sys_var[varid].text, 0, 6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (sys_var[varid].text, false, 6,
</span> + ntp_error_in_seconds(ntx.esterror) * MS_PER_S)
+ );
break;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -396,11 +396,11 @@
</span> break;
case CS_K_PRECISION:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctl_putdblf(sys_var[varid].text, 0, 6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ctl_putdblf(sys_var[varid].text, false, 6,
</span> - ntp_error_in_seconds(ntx.precision) * MS_PER_S);
+ CTL_IF_KERNLOOP(
+ ctl_putdblf,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (sys_var[varid].text, 0, 6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (sys_var[varid].text, false, 6,
</span> + ntp_error_in_seconds(ntx.precision) * MS_PER_S)
+ );
break;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -414,8 +414,8 @@
</span> break;
case CS_K_PPS_FREQ:
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ntpd/ntp_loopfilter.c.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/ntp_loopfilter.c 2018-03-17 20:07:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ntpd/ntp_loopfilter.c.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpd/ntp_loopfilter.c 2018-06-19 23:14:59.000000000 -0700
</span> @@ -23,8 +23,10 @@
#define NTP_MAXFREQ 500e-6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -453,24 +453,17 @@
</span>
/*
* Clock state machine control flags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,13 +158,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool pll_control = false; /* kernel support available */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool kern_enable = true; /* kernel support enabled */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool hardpps_enable; /* kernel PPS discipline enabled */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_KERNEL_PLL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static bool ext_enable; /* external clock enabled */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* HAVE_KERNEL_PLL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool allow_panic = false; /* allow panic correction (-g) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool force_step_once = false; /* always step time once at startup (-G) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool mode_ntpdate = false; /* exit on first clock set (-q) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,7 +166,9 @@
</span> int freq_cnt; /* initial frequency clamp */
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> static int freq_set; /* initial set frequency switch */
<span style='display:block; white-space:pre;background:#ffe0e0;'>--static bool ext_enable; /* external clock enabled */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_KERNEL_PLL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool ext_enable; /* external clock enabled */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* HAVE_KERNEL_PLL */
</span>
/*
* Clock state machine variables
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -178,6 +185,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,6 +188,7 @@
</span> static int sys_huffptr; /* huff-n'-puff filter pointer */
static double sys_mindly; /* huff-n'-puff filter min delay */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -478,7 +471,7 @@
</span> /* Emacs cc-mode goes nuts if we split the next line... */
#define MOD_BITS (MOD_OFFSET | MOD_MAXERROR | MOD_ESTERROR | \
MOD_STATUS | MOD_TIMECONST)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,7 +195,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -189,7 +198,9 @@
</span> static struct sigaction newsigsys; /* new sigaction status */
static sigjmp_buf env; /* environment var. for pll_trap() */
#endif /* SIGSYS */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -488,7 +481,7 @@
</span> #ifndef ENABLE_LOCKCLOCK
static void
sync_status(const char *what, int ostatus, int nstatus)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -213,6 +223,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -215,6 +226,7 @@
</span> }
return this_file;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -496,7 +489,7 @@
</span>
/*
* init_loopfilter - initialize loop filter data
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -228,6 +239,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -230,6 +242,7 @@
</span> freq_cnt = (int)clock_minstep;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -504,7 +497,7 @@
</span> /*
* ntp_adjtime_error_handler - process errors from ntp_adjtime
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -430,6 +442,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -428,6 +441,7 @@
</span> }
return;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -512,7 +505,7 @@
</span>
/*
* local_clock - the NTP logical clock loop filter.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -455,7 +468,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -453,7 +467,9 @@
</span> #else
int rval; /* return code */
int osys_poll; /* old system poll */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -522,7 +515,7 @@
</span> double mu; /* interval since last update */
double clock_frequency; /* clock frequency */
double dtemp, etemp; /* double temps */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -724,6 +739,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -722,6 +738,7 @@
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -530,7 +523,7 @@
</span> /*
* This code segment works when clock adjustments are made using
* precision time kernel support and the ntp_adjtime() system
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -839,6 +855,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -837,6 +854,7 @@
</span> }
#endif /* STA_NANO */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -538,38 +531,38 @@
</span>
/*
* Clamp the frequency within the tolerance range and calculate
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -952,8 +969,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -950,8 +968,10 @@
</span> } else if (freq_cnt > 0) {
offset_adj = clock_offset / (CLOCK_PLL * ULOGTOD(1));
freq_cnt--;
+#ifdef HAVE_KERNEL_PLL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (pll_control && kern_enable) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (clock_ctl.pll_control && clock_ctl.kern_enable) {
</span> offset_adj = 0.;
+#endif /* HAVE_KERNEL_PLL */
} else {
offset_adj = clock_offset / (CLOCK_PLL * ULOGTOD(sys_poll));
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -964,9 +983,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -962,9 +982,11 @@
</span> * set_freq(). Otherwise it is a component of the adj_systime()
* offset.
*/
+#ifdef HAVE_KERNEL_PLL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (pll_control && kern_enable)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clock_ctl.pll_control && clock_ctl.kern_enable)
</span> freq_adj = 0.;
else
+#endif /* HAVE_KERNEL_PLL */
freq_adj = drift_comp;
/* Bound absolute value of total adjustment to NTP_MAXFREQ. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1058,6 +1079,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1056,6 +1078,7 @@
</span>
drift_comp = freq;
loop_desc = "ntpd";
+#ifdef HAVE_KERNEL_PLL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (pll_control) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clock_ctl.pll_control) {
</span> int ntp_adj_ret;
ZERO(ntv);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1070,11 +1092,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1068,11 +1091,13 @@
</span> ntp_adjtime_error_handler(__func__, &ntv, ntp_adj_ret, errno, false, false, __LINE__ - 1);
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -583,7 +576,7 @@
</span> static void
start_kern_loop(void)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1135,8 +1159,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1133,8 +1158,10 @@
</span> "kernel time sync enabled");
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -594,7 +587,7 @@
</span> static void
stop_kern_loop(void)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1144,6 +1170,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1142,6 +1169,7 @@
</span> report_event(EVNT_KERN, NULL,
"kernel time sync disabled");
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -602,17 +595,17 @@
</span>
/*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1156,17 +1183,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1154,17 +1182,21 @@
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (kern_enable == use_kern_loop)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clock_ctl.kern_enable == use_kern_loop)
</span> return;
+#ifdef HAVE_KERNEL_PLL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (pll_control && !use_kern_loop)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clock_ctl.pll_control && !use_kern_loop)
</span> stop_kern_loop();
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- kern_enable = use_kern_loop;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clock_ctl.kern_enable = use_kern_loop;
</span> +#ifdef HAVE_KERNEL_PLL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (pll_control && use_kern_loop)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clock_ctl.pll_control && use_kern_loop)
</span> start_kern_loop();
+#endif
/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -622,15 +615,15 @@
</span> */
-#if !defined(ENABLE_LOCKCLOCK)
+#if defined(HAVE_KERNEL_PLL) && !defined(ENABLE_LOCKCLOCK)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (pll_control && loop_started)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clock_ctl.pll_control && loop_started)
</span> set_freq(drift_comp);
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1217,10 +1248,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1215,10 +1247,12 @@
</span> */
case LOOP_DRIFTINIT:
#ifndef ENABLE_LOCKCLOCK
+#ifdef HAVE_KERNEL_PLL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (mode_ntpdate)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clock_ctl.mode_ntpdate)
</span> break;
start_kern_loop();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -638,7 +631,7 @@
</span>
/*
* Initialize frequency if given; otherwise, begin frequency
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1238,13 +1271,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1236,13 +1270,16 @@
</span> rstclock(EVNT_FSET, 0);
else
rstclock(EVNT_NSET, 0);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -652,10 +645,10 @@
</span> #if 0 /* XXX: needs more review, and how can we get here? */
#ifndef ENABLE_LOCKCLOCK
+# ifdef HAVE_KERNEL_PLL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (pll_control && kern_enable) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clock_ctl.pll_control && clock_ctl.kern_enable) {
</span> memset((char *)&ntv, 0, sizeof(ntv));
ntv.modes = MOD_STATUS;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1254,6 +1290,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1252,6 +1289,7 @@
</span> pll_status,
ntv.status);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -663,7 +656,7 @@
</span> #endif /* ENABLE_LOCKCLOCK */
#endif
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1333,7 +1370,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1331,7 +1369,7 @@
</span> }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -672,14 +665,14 @@
</span> /*
* _trap - trap processor for undefined syscalls
*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1351,4 +1388,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pll_control = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1349,4 +1387,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clock_ctl.pll_control = false;
</span> siglongjmp(env, 1);
}
-#endif /* SIGSYS */
+#endif /* HAVE_KERNEL_PLL && SIGSYS */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ntpd/ntp_timer.c.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/ntp_timer.c 2018-03-17 20:07:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ntpd/ntp_timer.c.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpd/ntp_timer.c 2018-06-19 23:14:59.000000000 -0700
</span> @@ -13,7 +13,9 @@
#include <signal.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -690,20 +683,20 @@
</span>
#ifdef HAVE_TIMER_CREATE
/* TC_ERR represents the timer_create() error return value. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -374,7 +376,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -373,7 +375,11 @@
</span>
leap_result_t lsdata;
uint32_t lsprox;
+#ifdef HAVE_KERNEL_PLL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- leapsec_electric((pll_control && kern_enable) ? electric_on : electric_off);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ leapsec_electric((clock_ctl.pll_control && clock_ctl.kern_enable) ? electric_on : electric_off);
</span> +#else
+ leapsec_electric(electric_off);
+#endif
#ifdef ENABLE_LEAP_SMEAR
leap_smear.enabled = (leap_smear_intv != 0);
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ntpd/refclock_local.c.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/refclock_local.c 2018-03-17 20:07:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ntpd/refclock_local.c.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpd/refclock_local.c 2018-06-19 23:14:59.000000000 -0700
</span> @@ -131,6 +131,9 @@
struct peer *peer
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -738,8 +731,8 @@
</span> pp->lastref = pp->lastrec;
refclock_receive(peer);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ntpfrob/precision.c.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpfrob/precision.c 2018-03-17 20:07:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ntpfrob/precision.c.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpfrob/precision.c 2018-06-19 23:14:59.000000000 -0700
</span> @@ -11,6 +11,7 @@
#include "ntp_types.h"
#include "ntp_calendar.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -748,8 +741,8 @@
</span>
#define DEFAULT_SYS_PRECISION -99
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- wafhelpers/options.py.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wafhelpers/options.py 2018-03-17 20:07:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wafhelpers/options.py.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wafhelpers/options.py 2018-06-19 23:14:59.000000000 -0700
</span> @@ -21,6 +21,8 @@
default=False, help="Enable seccomp (restricts syscalls).")
grp.add_option('--disable-dns-lookup', action='store_true',
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -759,9 +752,9 @@
</span> grp.add_option('--disable-mdns-registration', action='store_true',
default=False, help="Disable MDNS registration.")
grp.add_option(
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- wscript.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wscript 2018-03-17 21:02:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -553,13 +553,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wscript.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wscript 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -562,13 +562,13 @@
</span> ctx.define("__EXTENSIONS__", "1", quote=False)
structures = (
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -781,7 +774,7 @@
</span>
# waf's SNIP_FIELD should likely include this header itself
# This is needed on some systems to get size_t for following checks
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -616,8 +616,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -625,8 +625,6 @@
</span> ('adjtimex', ["sys/time.h", "sys/timex.h"]),
('backtrace_symbols_fd', ["execinfo.h"]),
('closefrom', ["stdlib.h"]),
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -790,7 +783,7 @@
</span> ('ntp_adjtime', ["sys/time.h", "sys/timex.h"]), # BSD
('ntp_gettime', ["sys/time.h", "sys/timex.h"]), # BSD
('res_init', ["netinet/in.h", "arpa/nameser.h", "resolv.h"]),
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -763,6 +761,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -771,6 +769,21 @@
</span> ctx.define("HAVE_WORKING_FORK", 1,
comment="Whether a working fork() exists")
</pre><pre style='margin:0'>
</pre>