<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4050fce72b0ccbcf2463591eb30e128a74c937f7">https://github.com/macports/macports-ports/commit/4050fce72b0ccbcf2463591eb30e128a74c937f7</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 4050fce72b0 ntpsec: update to 1.2.0
</span>4050fce72b0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4050fce72b0ccbcf2463591eb30e128a74c937f7
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sat Oct 10 17:27:40 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: update to 1.2.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This includes the patches for compatibility with macOS<10.13,
</span><span style='display:block; white-space:pre;color:#404040;'> which can also be seen (more readably) 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_2_0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes a bad side effect of the python PortGroup, which mysteriously
</span><span style='display:block; white-space:pre;color:#404040;'> didn't cause trouble before.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The new FFI-based Python client library doesn't currently work
</span><span style='display:block; white-space:pre;color:#404040;'> properly on the Mac, so it uses the old extension-based version.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now specifies the target Python version explicitly, in case the
</span><span style='display:block; white-space:pre;color:#404040;'> waf Python version changes.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Removes obsolete shebang rewriting.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Simplifies the default ntp.conf due to code fixes.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Updates the notes to include basic doc and installation info.
</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;'> Tested (including building the usual set of variant combinations)
</span><span style='display:block; white-space:pre;color:#404040;'> on 10.4-10.5 ppc, 10.4-10.6 i386, and 10.6-10.15 x86_64.
</span>---
sysutils/ntpsec/Portfile | 32 +++--
sysutils/ntpsec/files/ntp.conf | 7 +-
sysutils/ntpsec/files/patch-PreHighSierra.diff | 182 +++++++++++--------------
3 files changed, 96 insertions(+), 125 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 72409616ef5..93d186cd48e 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,7 +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.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2.0
</span> revision 0
categories sysutils net
maintainers {fwright.net:fw @fhgwright} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,20 +19,23 @@ 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 ff7d8c93a18d9020b327b843dc121c3f53fbce26 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0acade979a807a047c2a8fd7f497235d9d6a5d0d54726e5d27505506d6ec00cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2606066
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c9b30c514feca77d9c65ea7bea9f0e22ca80a767 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6a7c7561a750519fe3441cbbaf1f684b379b97b655da4bf9cf0dd2052a4a02c8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2625968
</span>
# To avoid breaking any code that uses our Python package, keep the Python
# version at 2.7 until we add variants for Python versions. The upstream
# code itself works with 2.6, 2.7, and 3.3+.
python.versions 27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note that the upstream --python option doesn't work correctly, so waf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note that the upstream --python option may not work correctly, so waf
</span> # must be run with the target Python version. The waf PortGroup doesn't
# currently allow selecting its Python version, but since it's hard-coded
# for 2.7, we can ignore this for now.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also note that the new ffi-based Python client library doesn't work properly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# on the Mac, so we use the old extension-based version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:bison port:pkgconfig
# NOTE: doesn't work with libressl
depends_lib-append port:openssl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,22 +43,17 @@ depends_lib-append port:openssl \
</span>
patchfiles patch-PreHighSierra.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f {ntpdig ntpkeygen ntploggps ntplogtemp ntpmon ntpq ntpsnmpd ntpsweep ntptrace ntpviz ntpwait} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Some programs may not exist, e.g. ntploggps w/o gpsd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${destroot}${prefix}/bin/$f]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,^#!/usr/bin/env python,#!${python.bin}," ${destroot}${prefix}/bin/$f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure yes
configure.post_args-delete --nocache
configure.args --alltests \
--define=CONFIG_FILE=${prefix}/etc/ntp.conf \
--disable-manpage \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --python=${python.bin} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-pylib=ext \
</span> --pythondir=${python.pkgd} \
--pythonarchdir=${python.pkgd}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Make sure we use waf, not setup.py for build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${waf.python} ./waf
</span> destroot.cmd ${build.cmd}
default_variants +doc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +95,11 @@ post-activate {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "The default access restrictions have changed; this may affect ntpq."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "See \"man 8 ntpd\" for documentation; \"man ntpd\" may reflect Apple's."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes-append "To replace Apple's ntpd,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ disable \"Set date and time automatically\"\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in the Date & Time Preferences."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes-append "Configuration is in ${prefix}/etc/ntp.conf."
</span>
startupitem.create yes
startupitem.netchange yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ntpsec/files/ntp.conf b/sysutils/ntpsec/files/ntp.conf
</span><span style='display:block; white-space:pre;color:#808080;'>index 17282d0b6f6..50928c89919 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/files/ntp.conf
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ntpsec/files/ntp.conf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,8 @@
</span> # Limit network machines to time queries only
<span style='display:block; white-space:pre;background:#ffe0e0;'>-restrict -4 default kod limited nomodify nopeer noquery
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-restrict -6 default kod limited nomodify nopeer noquery
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+restrict default kod limited nomodify nopeer noquery
</span>
# localhost is unrestricted
<span style='display:block; white-space:pre;background:#ffe0e0;'>-restrict -4 127.0.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-restrict -6 ::1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+restrict 127.0.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+restrict ::1
</span>
server time.apple.com
<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 8c8fcf6b9db..583db74dbba 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/backwards.c.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/backwards.c 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/backwards.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/backwards.c 2020-10-08 17:43:39.000000000 -0700
</span> @@ -7,6 +7,8 @@
#include <stdlib.h>
#include <time.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,8 @@
</span> #define UNUSED_ARG(arg) ((void)(arg))
static void ts_print(struct timespec *ts0, struct timespec *ts1);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./attic/clocks.c.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/clocks.c 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/clocks.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/clocks.c 2020-10-08 17:43:39.000000000 -0700
</span> @@ -5,6 +5,8 @@
#include <stdio.h>
#include <time.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,19 +20,30 @@
</span> struct table {
const int type;
const char* name;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./attic/digest-timing.c.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/digest-timing.c 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +34,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <openssl/rand.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <openssl/objects.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/cmac-timing.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/cmac-timing.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/params.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "ntp_machine.h" /* For clock_gettime fallback */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define UNUSED_ARG(arg) ((void)(arg))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/digest-timing.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/digest-timing.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/ssl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span>
+#include "ntp_machine.h" /* For clock_gettime fallback */
+
#define UNUSED_ARG(arg) ((void)(arg))
#ifndef EVP_MD_CTX_reset
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./attic/random.c.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/random.c 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/random.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/random.c 2020-10-08 17:43:39.000000000 -0700
</span> @@ -10,6 +10,8 @@
#include <openssl/opensslv.h> /* for OPENSSL_VERSION_NUMBER */
#include <openssl/rand.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +53,8 @@
</span> #define BATCHSIZE 1000000
#define BILLION 1000000000
#define HISTSIZE 2500
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./include/ntp_machine.h.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_machine.h 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_machine.h.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_machine.h 2020-10-08 17:43:39.000000000 -0700
</span> @@ -13,14 +13,145 @@
#ifndef CLOCK_REALTIME
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,8 +207,8 @@
</span>
int ntp_set_tod (struct timespec *tvs);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./include/ntp_stdlib.h.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_stdlib.h 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_stdlib.h.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_stdlib.h 2020-10-08 17:43:39.000000000 -0700
</span> @@ -95,7 +95,9 @@ extern const char * eventstr (int);
extern const char * ceventstr (int);
extern const char * res_match_flags(unsigned short);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,8 +219,8 @@
</span> extern char * statustoa (int, int);
extern const char * socktoa (const sockaddr_u *);
extern const char * socktoa_r (const sockaddr_u *sock, char *buf, size_t buflen);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./include/ntp_syscall.h.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_syscall.h 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_syscall.h.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_syscall.h 2020-10-08 17:43:39.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;'>@@ -222,8 +233,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 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./libntp/clockwork.c 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./libntp/clockwork.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libntp/clockwork.c 2020-10-08 17:43:39.000000000 -0700
</span> @@ -5,8 +5,10 @@
#include "config.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -237,8 +248,8 @@
</span>
#include "ntp.h"
#include "ntp_machine.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./libntp/statestr.c.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./libntp/statestr.c 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./libntp/statestr.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libntp/statestr.c 2020-10-08 17:43:39.000000000 -0700
</span> @@ -12,7 +12,9 @@
#include "lib_strbuf.h"
#include "ntp_refclock.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,23 +350,9 @@
</span>
/*
* statustoa - return a descriptive string for a peer status
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpclients/ntpviz.py.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpclients/ntpviz.py 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1612,7 +1612,10 @@ Python by ESR, concept and gnuplot code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if 2 < args.debug_level:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.stderr.write("ntpviz: INFO: now running at nice: %s\n" % nice)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for fontpath in ("/usr/share/fonts/liberation",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for fontpath in ("@PREFIX@/share/fonts/liberation",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@PREFIX@/share/fonts/liberation-fonts",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@PREFIX@/share/fonts/truetype/liberation",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "/usr/share/fonts/liberation",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "/usr/share/fonts/liberation-fonts",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "/usr/share/fonts/truetype/liberation"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpd/ntp_control.c.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_control.c 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1366,6 +1366,7 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_control.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_control.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1368,6 +1368,7 @@ ctl_putsys(
</span> char str[256];
double dtemp;
const char *ss;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -363,7 +360,7 @@
</span> static struct timex ntx;
static unsigned long ntp_adjtime_time;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1381,6 +1382,7 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1383,6 +1384,7 @@ ctl_putsys(
</span> else
ntp_adjtime_time = current_time;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -371,7 +368,7 @@
</span>
switch (varid) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1780,50 +1782,93 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1782,50 +1784,93 @@ ctl_putsys(
</span> break;
/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -477,8 +474,8 @@
</span> break;
case CS_K_PPS_FREQ:
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpd/ntp_loopfilter.c.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_loopfilter.c 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_loopfilter.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_loopfilter.c 2020-10-08 17:43:39.000000000 -0700
</span> @@ -23,8 +23,10 @@
#define NTP_MAXFREQ 500e-6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -516,7 +513,7 @@
</span>
/*
* Clock state machine variables
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -172,10 +178,19 @@ static int sys_hufflen; /* huff-n'-puff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,10 +178,13 @@ static int sys_hufflen; /* huff-n'-puff
</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;'>@@ -524,19 +521,13 @@
</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;'>-+#ifdef SIGSYS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void pll_trap (int); /* configuration trap */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static struct sigaction sigsys; /* current sigaction status */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static struct sigaction newsigsys; /* new sigaction status */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static sigjmp_buf env; /* environment var. for pll_trap() */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* SIGSYS */
</span> +#endif /* HAVE_KERNEL_PLL */
+#ifdef HAVE_KERNEL_PLL
static void
sync_status(const char *what, int ostatus, int nstatus) {
/* only used in non-lockclock case */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -199,6 +214,7 @@ static char *file_name(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -199,6 +208,7 @@ static char *file_name(void) {
</span> }
return this_file;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -544,7 +535,7 @@
</span>
/*
* init_loopfilter - initialize loop filter data
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -213,6 +229,7 @@ init_loopfilter(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -213,6 +223,7 @@ init_loopfilter(void) {
</span> freq_cnt = (int)clock_minstep;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -552,7 +543,7 @@
</span> /*
* ntp_adjtime_error_handler - process errors from ntp_adjtime
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -411,6 +428,7 @@ or, from ntp_adjtime():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -411,6 +422,7 @@ or, from ntp_adjtime():
</span> }
return;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -560,7 +551,7 @@
</span>
/*
* local_clock - the NTP logical clock loop filter.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -444,7 +462,9 @@ local_clock(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -444,7 +456,9 @@ local_clock(
</span>
int rval; /* return code */
int osys_poll; /* old system poll */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -570,7 +561,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;'>-@@ -701,6 +721,7 @@ local_clock(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -701,6 +715,7 @@ local_clock(
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -578,7 +569,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;'>-@@ -817,6 +838,7 @@ local_clock(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -817,6 +832,7 @@ local_clock(
</span> }
#endif /* STA_NANO */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -586,7 +577,7 @@
</span>
/*
* Clamp the frequency within the tolerance range and calculate
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -928,8 +950,10 @@ adj_host_clock(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -928,8 +944,10 @@ adj_host_clock(
</span> } else if (freq_cnt > 0) {
offset_adj = clock_offset / (CLOCK_PLL * ULOGTOD(1));
freq_cnt--;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -597,7 +588,7 @@
</span> } else {
offset_adj = clock_offset / (CLOCK_PLL * ULOGTOD(clkstate.sys_poll));
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -940,9 +964,11 @@ adj_host_clock(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -940,9 +958,11 @@ adj_host_clock(
</span> * set_freq(). Otherwise it is a component of the adj_systime()
* offset.
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -609,7 +600,7 @@
</span> freq_adj = loop_data.drift_comp;
/* Bound absolute value of total adjustment to NTP_MAXFREQ. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1031,6 +1057,7 @@ set_freq(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1031,6 +1051,7 @@ set_freq(
</span>
loop_data.drift_comp = freq;
loop_desc = "ntpd";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -617,7 +608,7 @@
</span> if (clock_ctl.pll_control) {
int ntp_adj_ret;
ZERO(ntv);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1043,10 +1070,12 @@ set_freq(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1043,10 +1064,12 @@ set_freq(
</span> ntp_adjtime_error_handler(__func__, &ntv, ntp_adj_ret, errno, false, false, __LINE__ - 1);
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -630,7 +621,7 @@
</span> static void
start_kern_loop(void)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1082,8 +1111,10 @@ start_kern_loop(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1082,8 +1105,10 @@ start_kern_loop(void)
</span> "kernel time sync enabled");
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -641,7 +632,7 @@
</span> static void
stop_kern_loop(void)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1091,6 +1122,7 @@ stop_kern_loop(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1091,6 +1116,7 @@ stop_kern_loop(void)
</span> report_event(EVNT_KERN, NULL,
"kernel time sync disabled");
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -649,7 +640,7 @@
</span>
/*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1103,11 +1135,15 @@ select_loop(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1103,11 +1129,15 @@ select_loop(
</span> {
if (clock_ctl.kern_enable == use_kern_loop)
return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -665,7 +656,7 @@
</span> /*
* If this loop selection change occurs after initial startup,
* call set_freq() to switch the frequency compensation to or
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1163,10 +1199,12 @@ loop_config(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1163,10 +1193,12 @@ loop_config(
</span> * variables. Otherwise, continue leaving no harm behind.
*/
case LOOP_DRIFTINIT:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -678,7 +669,7 @@
</span>
/*
* Initialize frequency if given; otherwise, begin frequency
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1185,11 +1223,14 @@ loop_config(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1185,11 +1217,14 @@ loop_config(
</span> rstclock(EVNT_FSET, 0);
else
rstclock(EVNT_NSET, 0);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -693,7 +684,7 @@
</span> if (!loop_data.lockclock && (clock_ctl.pll_control && clock_ctl.kern_enable)) {
memset((char *)&ntv, 0, sizeof(ntv));
ntv.modes = MOD_STATUS;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1199,6 +1240,7 @@ loop_config(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1199,6 +1234,7 @@ loop_config(
</span> pll_status,
ntv.status);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -701,34 +692,13 @@
</span> #endif
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1280,3 +1322,25 @@ loop_config(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1279,4 +1315,3 @@ loop_config(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CONFIG: loop_config: unsupported option %d", item);
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(HAVE_KERNEL_PLL) && defined(SIGSYS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * _trap - trap processor for undefined syscalls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * This nugget is called by the kernel when the SYS_ntp_adjtime()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * syscall bombs because the silly thing has not been implemented in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * the kernel. In this case the phase-lock loop is emulated by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * the stock adjtime() syscall and a lot of indelicate abuse.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * FIXME: Doing this check in real time is crazy.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+pll_trap(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int arg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ UNUSED_ARG(arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ clock_ctl.pll_control = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ siglongjmp(env, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* HAVE_KERNEL_PLL && SIGSYS */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpd/ntp_timer.c.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_timer.c 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_timer.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_timer.c 2020-10-08 17:43:39.000000000 -0700
</span> @@ -13,7 +13,9 @@
#include <signal.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -751,8 +721,8 @@
</span> #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 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/refclock_local.c 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/refclock_local.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/refclock_local.c 2020-10-08 17:43:39.000000000 -0700
</span> @@ -158,6 +158,7 @@ local_poll(
* If another process is disciplining the system clock, we set
* the leap bits and quality indicators from the kernel.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -775,8 +745,8 @@
</span> pp->lastref = pp->lastrec;
refclock_receive(peer);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpfrob/precision.c.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpfrob/precision.c 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpfrob/precision.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpfrob/precision.c 2020-10-08 17:43:39.000000000 -0700
</span> @@ -11,6 +11,7 @@
#include "ntp_types.h"
#include "ntp_calendar.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -785,8 +755,8 @@
</span>
#define DEFAULT_SYS_PRECISION -99
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./tests/libntp/statestr.c.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./tests/libntp/statestr.c 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./tests/libntp/statestr.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./tests/libntp/statestr.c 2020-10-08 17:43:39.000000000 -0700
</span> @@ -4,7 +4,9 @@
#include "unity.h"
#include "unity_fixture.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -807,9 +777,9 @@
</span> }
// statustoa
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./wafhelpers/bin_test.py.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wafhelpers/bin_test.py 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,6 +97,12 @@ def cmd_bin_test(ctx, config):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wafhelpers/bin_test.py.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wafhelpers/bin_test.py 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,6 +95,12 @@ def cmd_bin_test(ctx, config):
</span> if ctx.env['PYTHON_CURSES']:
cmd_map_python.update(cmd_map_python_curses)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -822,8 +792,8 @@
</span> for cmd in sorted(cmd_map):
if not run(cmd, cmd_map[cmd], False):
fails += 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./wafhelpers/options.py.orig 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wafhelpers/options.py 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wafhelpers/options.py.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wafhelpers/options.py 2020-10-08 17:43:39.000000000 -0700
</span> @@ -21,6 +21,8 @@ def options_cmd(ctx, config):
help="Droproot earlier (breaks SHM and NetBSD).")
grp.add_option('--enable-seccomp', action='store_true',
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -833,9 +803,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 2020-05-23 20:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wscript 2020-05-27 19:21:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -544,7 +544,7 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wscript.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wscript 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -563,7 +563,7 @@ int main(int argc, char **argv) {
</span> structures = (
("struct if_laddrconf", ["sys/types.h", "net/if6.h"], False),
("struct if_laddrreq", ["sys/types.h", "net/if6.h"], False),
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -844,7 +814,7 @@
</span> ("struct ntptimeval", ["sys/time.h", "sys/timex.h"], False),
)
for (s, h, r) in structures:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -755,6 +755,21 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -774,6 +774,21 @@ int main(int argc, char **argv) {
</span> ctx.define("ENABLE_FUZZ", 1,
comment="Enable fuzzing low bits of time")
</pre><pre style='margin:0'>
</pre>